Merge pull request #173 from smartdevicelink/bugfix/scm-fixes

Protect against null values in SCM and have better error logging

Author: crokita

examples/js/hello-sdl/SDL.min.js

@@ -41,7 +41,9 @@ const tree = parseDir('/src', {});
 
 // generate the file
 
-let output = `/*
+let output = `/* eslint-disable camelcase */
+/* eslint-disable object-curly-spacing */
+/*
 * Copyright (c) ${new Date().getFullYear()}, Livio, Inc.
 * All rights reserved.
 *

examples/node/hello-sdl-tcp/SDL.min.js

@@ -150,9 +150,14 @@ class SystemCapabilityManager extends SubManagerBase {
 
         // Create a window capability object for the default MAIN window
         const defaultWindowCapability = new WindowCapability();
-        defaultWindowCapability.setWindowID(PredefinedWindows.DEFAULT_WINDOW)
-            .setButtonCapabilities(buttonCapabilities)
-            .setSoftButtonCapabilities(softButtonCapabilities);
+        defaultWindowCapability.setWindowID(PredefinedWindows.DEFAULT_WINDOW);
+        // do null checks against the capabilities
+        if (buttonCapabilities !== null) {
+            defaultWindowCapability.setButtonCapabilities(buttonCapabilities);
+        }
+        if (softButtonCapabilities !== null) {
+            defaultWindowCapability.setSoftButtonCapabilities(softButtonCapabilities);
+        }
 
         // return if display capabilities don't exist.
         if (displayCapabilities === null || displayCapabilities === undefined) {
@@ -404,8 +409,8 @@ class SystemCapabilityManager extends SubManagerBase {
 
         const response = await this._lifecycleManager.sendRpcMessage(request)
             .catch(err => {
-                if (err.prototype instanceof RpcResponse) {
-                    console.error(new Error(`GetSystemCapability returned with response code ${err.getResultCode()}`));
+                if (err instanceof RpcResponse) {
+                    console.error(`GetSystemCapability for type ${systemCapabilityType} returned with response code ${err.getResultCode()}`);
                 } else {
                     console.error(new Error(err));
                 }