Merge pull request #488 from smartdevicelink/bugfix/release-1.5-prep

Version 1.5 Release Prep
smartdevicelink · Oct 7, 2021 · 809f48c · 809f48c
2 parents a717391 + 7a7abde
commit 809f48c
Show file tree

Hide file tree

Showing 4 changed files with 64 additions and 10 deletions.
diff --git a/lib/js/src/manager/lifecycle/_LifecycleManager.js b/lib/js/src/manager/lifecycle/_LifecycleManager.js
@@ -580,7 +580,7 @@ class _LifecycleManager {
     }
 }
 
-_LifecycleManager.MAX_RPC_VERSION = new Version(7, 1, 0);
+_LifecycleManager.MAX_RPC_VERSION = new Version(8, 0, 0);
 _LifecycleManager.REGISTER_APP_INTERFACE_CORRELATION_ID = 65529;
 _LifecycleManager.UNREGISTER_APP_INTERFACE_CORRELATION_ID = 65530;
 

diff --git a/lib/js/src/rpc/structs/TireStatus.js b/lib/js/src/rpc/structs/TireStatus.js
@@ -66,7 +66,13 @@ class TireStatus extends RpcStruct {
      * @returns {WarningLightStatus} - the KEY_PRESSURE_TELLTALE value
      */
     getPressureTelltale () {
-        return this.getObject(WarningLightStatus, TireStatus.KEY_PRESSURE_TELLTALE);
+        let warningLightStatus = this.getObject(WarningLightStatus, TireStatus.KEY_PRESSURE_TELLTALE);
+        if (warningLightStatus === null) {
+            warningLightStatus = WarningLightStatus.WLS_NOT_USED;
+            this.setParameter(TireStatus.KEY_PRESSURE_TELLTALE, warningLightStatus);
+            console.warn('TireStatus\'s pressureTelltale was null and will be set to WarningLightStatus.WLS_NOT_USED. In the future, this will change to be nullable.');
+        }
+        return warningLightStatus;
     }
 
     /**
@@ -86,7 +92,15 @@ class TireStatus extends RpcStruct {
      * @returns {SingleTireStatus} - the KEY_LEFT_FRONT value
      */
     getLeftFront () {
-        return this.getObject(SingleTireStatus, TireStatus.KEY_LEFT_FRONT);
+        let tireStatus = this.getObject(SingleTireStatus, TireStatus.KEY_LEFT_FRONT);
+        if (tireStatus === null) {
+            tireStatus = new SingleTireStatus({
+                status: 'UNKNOWN',
+            });
+            this.setParameter(TireStatus.KEY_LEFT_FRONT, tireStatus);
+            console.warn('TireStatus\'s leftFront was null and will have its status set to UNKNOWN. In the future, this will change to be nullable.');
+        }
+        return tireStatus;
     }
 
     /**
@@ -106,7 +120,15 @@ class TireStatus extends RpcStruct {
      * @returns {SingleTireStatus} - the KEY_RIGHT_FRONT value
      */
     getRightFront () {
-        return this.getObject(SingleTireStatus, TireStatus.KEY_RIGHT_FRONT);
+        let tireStatus = this.getObject(SingleTireStatus, TireStatus.KEY_RIGHT_FRONT);
+        if (tireStatus === null) {
+            tireStatus = new SingleTireStatus({
+                status: 'UNKNOWN',
+            });
+            this.setParameter(TireStatus.KEY_RIGHT_FRONT, tireStatus);
+            console.warn('TireStatus\'s rightFront was null and will have its status set to UNKNOWN. In the future, this will change to be nullable.');
+        }
+        return tireStatus;
     }
 
     /**
@@ -126,7 +148,15 @@ class TireStatus extends RpcStruct {
      * @returns {SingleTireStatus} - the KEY_LEFT_REAR value
      */
     getLeftRear () {
-        return this.getObject(SingleTireStatus, TireStatus.KEY_LEFT_REAR);
+        let tireStatus = this.getObject(SingleTireStatus, TireStatus.KEY_LEFT_REAR);
+        if (tireStatus === null) {
+            tireStatus = new SingleTireStatus({
+                status: 'UNKNOWN',
+            });
+            this.setParameter(TireStatus.KEY_LEFT_REAR, tireStatus);
+            console.warn('TireStatus\'s leftRear was null and will have its status set to UNKNOWN. In the future, this will change to be nullable.');
+        }
+        return tireStatus;
     }
 
     /**
@@ -146,7 +176,15 @@ class TireStatus extends RpcStruct {
      * @returns {SingleTireStatus} - the KEY_RIGHT_REAR value
      */
     getRightRear () {
-        return this.getObject(SingleTireStatus, TireStatus.KEY_RIGHT_REAR);
+        let tireStatus = this.getObject(SingleTireStatus, TireStatus.KEY_RIGHT_REAR);
+        if (tireStatus === null) {
+            tireStatus = new SingleTireStatus({
+                status: 'UNKNOWN',
+            });
+            this.setParameter(TireStatus.KEY_RIGHT_REAR, tireStatus);
+            console.warn('TireStatus\'s rightRear was null and will have its status set to UNKNOWN. In the future, this will change to be nullable.');
+        }
+        return tireStatus;
     }
 
     /**
@@ -166,7 +204,15 @@ class TireStatus extends RpcStruct {
      * @returns {SingleTireStatus} - the KEY_INNER_LEFT_REAR value
      */
     getInnerLeftRear () {
-        return this.getObject(SingleTireStatus, TireStatus.KEY_INNER_LEFT_REAR);
+        let tireStatus = this.getObject(SingleTireStatus, TireStatus.KEY_INNER_LEFT_REAR);
+        if (tireStatus === null) {
+            tireStatus = new SingleTireStatus({
+                status: 'UNKNOWN',
+            });
+            this.setParameter(TireStatus.KEY_INNER_LEFT_REAR, tireStatus);
+            console.warn('TireStatus\'s innerLeftRear was null and will have its status set to UNKNOWN. In the future, this will change to be nullable.');
+        }
+        return tireStatus;
     }
 
     /**
@@ -186,7 +232,15 @@ class TireStatus extends RpcStruct {
      * @returns {SingleTireStatus} - the KEY_INNER_RIGHT_REAR value
      */
     getInnerRightRear () {
-        return this.getObject(SingleTireStatus, TireStatus.KEY_INNER_RIGHT_REAR);
+        let tireStatus = this.getObject(SingleTireStatus, TireStatus.KEY_INNER_RIGHT_REAR);
+        if (tireStatus === null) {
+            tireStatus = new SingleTireStatus({
+                status: 'UNKNOWN',
+            });
+            this.setParameter(TireStatus.KEY_INNER_RIGHT_REAR, tireStatus);
+            console.warn('TireStatus\'s innerRightRear was null and will have its status set to UNKNOWN. In the future, this will change to be nullable.');
+        }
+        return tireStatus;
     }
 }
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sdl_javascript_suite",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "description": "The official JavaScript SDK for SmartDeviceLink.",
   "main": "/lib/js/dist/SDL.js",
   "engines": {