homey-api 3.4.18 → 3.4.19

package/lib/APIError.js

@@ -12,7 +12,7 @@ class APIError extends Error {
    * @param {number} statusCode
    */
   constructor(message, statusCode) {
-    super(message);
+    super(message || 'Unknown API Error');
 
     /**
      * Error message

package/lib/HomeyAPI/HomeyAPIV3/Manager.js

@@ -287,27 +287,25 @@ class Manager extends EventEmitter {
               uri: this.uri,
             },
             (err, result) => {
-              // String Error
-              if (typeof err === 'string') {
-                err = new HomeyAPIError(
-                  {
-                    error: err,
-                  },
-                  500
-                );
-                return reject(err);
-              }
-
-              // Object Error
-              if (typeof err === 'object' && err !== null) {
-                err = new HomeyAPIError(
-                  {
-                    stack: err.stack,
-                    error: err.error,
-                    error_description: err.error_description,
-                  },
-                  err.statusCode || err.code || 500
-                );
+              if (err != null) {            
+                if (typeof err === 'object') {
+                  err = new HomeyAPIError(
+                    {
+                      stack: err.stack,
+                      error: err.error,
+                      error_description: err.error_description,
+                    },
+                    err.statusCode || err.code || 500
+                  );
+                } else if (typeof err === 'string') {
+                  err = new HomeyAPIError(
+                    {
+                      error: err,
+                    },
+                    500
+                  );
+                }
+  
                 return reject(err);
               }
 

package/lib/HomeyAPI/HomeyAPIV3.js

@@ -843,7 +843,20 @@ class HomeyAPIV3 extends HomeyAPI {
 
         this.__homeySocket.once('connect_error', err => {
           this.__debug(`SocketIOClient.Namespace[${namespace}].onConnectError`, err.message);
-          reject(err);
+          if (err) {
+            if (err instanceof Error) {
+              return reject(err);
+            }
+
+            // .statusCode for homey-core .code for homey-client.
+            if (typeof err === 'object') {
+              return reject(new HomeyAPIError({ error_description: err.message }, err.statusCode || err.code));
+            }
+
+            return reject(new Error(String(err)));
+          }
+
+          reject(new Error(`Unknown error connecting to namespace ${namespace}.`));
         });
 
         this.__homeySocket.on('disconnect', reason => {
@@ -875,17 +888,26 @@ class HomeyAPIV3 extends HomeyAPI {
             homeyId: this.id,
           },
           (err, result) => {
-            if (err) {
-              if (err instanceof Error) {
-                return reject(err);
-              }
-
-              // .statusCode for homey-core .code for homey-client.
+            if (err != null) {            
               if (typeof err === 'object') {
-                return reject(new HomeyAPIError({ error_description: err.message }, err.statusCode || err.code));
+                err = new HomeyAPIError(
+                  {
+                    stack: err.stack,
+                    error: err.error,
+                    error_description: err.error_description,
+                  },
+                  err.statusCode || err.code || 500
+                );
+              } else if (typeof err === 'string') {
+                err = new HomeyAPIError(
+                  {
+                    error: err,
+                  },
+                  500
+                );
               }
 
-              return reject(new Error(String(err)));
+              return reject(err);
             }
 
             return resolve(result);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "homey-api",
-  "version": "3.4.18",
+  "version": "3.4.19",
   "description": "Homey API",
   "main": "index.js",
   "files": [