homey-api 3.0.22 → 3.0.24

package/lib/HomeyAPI/HomeyAPI.js

@@ -1,13 +1,14 @@
 'use strict';
 
 const Util = require('../Util');
+const EventEmitter = require('../EventEmitter');
 
 /**
  * An authenticated Homey API. Do not construct this class manually.
  * @class
  * @hideconstructor
  */
-class HomeyAPI {
+class HomeyAPI extends EventEmitter {
 
   /**
    * Platforms
@@ -46,6 +47,8 @@ class HomeyAPI {
     properties = {},
     debug = () => { },
   }) {
+    super();
+
     // Set Debug Enabled
     Object.defineProperty(this, '__debugFunction', {
       value: debug,

package/lib/HomeyAPI/HomeyAPIV2/ManagerFlow/FlowCardAction.js

@@ -9,10 +9,11 @@ class FlowCardAction extends FlowCardActionV3 {
 
     item.id = `${item.uri}:${item.id}`;
     item.ownerUri = item.uri;
-    item.ownerId = item.uriObj.id;
-    item.ownerName = item.uriObj.name;
-    item.color = item.uriObj.color;
-    item.iconObj = item.uriObj.iconObj;
+    // I dont know how uriObj can be null but it is possible.
+    item.ownerId = item.uriObj != null ? item.uriObj.id : null;
+    item.ownerName = item.uriObj != null ? item.uriObj.name : null;
+    item.color = item.uriObj != null ? item.uriObj.color : null;
+    item.iconObj = item.uriObj != null ? item.uriObj.iconObj : null;
 
     delete item.uri;
     delete item.uriObj;

package/lib/HomeyAPI/HomeyAPIV2/ManagerFlow/FlowCardCondition.js

@@ -9,10 +9,11 @@ class FlowCardCondition extends FlowCardConditionV3 {
 
     item.id = `${item.uri}:${item.id}`;
     item.ownerUri = item.uri;
-    item.ownerId = item.uriObj.id;
-    item.ownerName = item.uriObj.name;
-    item.color = item.uriObj.color;
-    item.iconObj = item.uriObj.iconObj;
+    // I dont know how uriObj can be null but it is possible.
+    item.ownerId = item.uriObj != null ? item.uriObj.id : null;
+    item.ownerName = item.uriObj != null ? item.uriObj.name : null;
+    item.color = item.uriObj != null ? item.uriObj.color : null;
+    item.iconObj = item.uriObj != null ? item.uriObj.iconObj : null;
 
     delete item.uri;
     delete item.uriObj;

package/lib/HomeyAPI/HomeyAPIV2/ManagerFlow/FlowCardTrigger.js

@@ -9,10 +9,11 @@ class FlowCardTrigger extends FlowCardTriggerV3 {
 
     item.id = `${item.uri}:${item.id}`;
     item.ownerUri = item.uri;
-    item.ownerId = item.uriObj.id;
-    item.ownerName = item.uriObj.name;
-    item.color = item.uriObj.color;
-    item.iconObj = item.uriObj.iconObj;
+    // I dont know how uriObj can be null but it is possible.
+    item.ownerId = item.uriObj != null ? item.uriObj.id : null;
+    item.ownerName = item.uriObj != null ? item.uriObj.name : null;
+    item.color = item.uriObj != null ? item.uriObj.color : null;
+    item.iconObj = item.uriObj != null ? item.uriObj.iconObj : null;
 
     delete item.uri;
     delete item.uriObj;

package/lib/HomeyAPI/HomeyAPIV3/Manager.js

@@ -275,7 +275,7 @@ class Manager extends EventEmitter {
     if (this.homey.isConnected() && $socket === true) {
       result = await Util.timeout(new Promise((resolve, reject) => {
         this.__debug(`IO ${operationId}`);
-        this.homey.__ioNamespace.emit('api', {
+        this.homey.__homeySocket.emit('api', {
           args,
           operation: operationId,
           uri: this.uri,
@@ -480,11 +480,17 @@ class Manager extends EventEmitter {
             this.__debug(`onDisconnect Reason:${reason}`);
             this.__connected = false;
 
+            // Disable for now. We should probably only set the cache to invalid.
+
             // Clear CRUD Item cache
-            for (const itemId of Object.keys(this.__cache)) {
-              this.__cache[itemId] = {};
-              this.__cacheAllComplete[itemId] = false;
-            }
+            // for (const itemId of Object.keys(this.__cache)) {
+            //   this.__cache[itemId] = {};
+            //   this.__cacheAllComplete[itemId] = false;
+            // }
+          },
+          onReconnect: () => {
+            this.__debug(`onReconnect`);
+            this.__connected = true;
           },
           onEvent: (event, data) => {
             this.__debug('onEvent', event);
@@ -561,7 +567,7 @@ class Manager extends EventEmitter {
   }
 
   /**
-   * Discconnect from this manager's Socket.io namespace.
+   * Disconnect from this manager's Socket.io namespace.
    * @returns {Promise<void>}
    */
   async disconnect() {

package/lib/HomeyAPI/HomeyAPIV3.js

@@ -102,12 +102,6 @@ class HomeyAPIV3 extends HomeyAPI {
       writable: true,
     });
 
-    Object.defineProperty(this, '__connected', {
-      value: false,
-      enumerable: false,
-      writable: true,
-    });
-
     this.generateManagersFromSpecification();
   }
 
@@ -559,7 +553,7 @@ class HomeyAPIV3 extends HomeyAPI {
    * @returns {Boolean}
    */
   isConnected() {
-    return this.__connected === true;
+    return this.__homeySocket && this.__homeySocket.connected;
   }
 
   async subscribe(uri, {
@@ -572,12 +566,12 @@ class HomeyAPIV3 extends HomeyAPI {
     this.__debug('subscribe', uri);
 
     await this.connect();
-    await new Promise((resolve, reject) => {
-      this.__ioNamespace.once('disconnect', (reason) => {
+    await Util.timeout(new Promise((resolve, reject) => {
+      this.__homeySocket.once('disconnect', (reason) => {
         reject(new Error(reason));
       });
       this.__debug('subscribing', uri);
-      this.__ioNamespace.emit('subscribe', uri, err => {
+      this.__homeySocket.emit('subscribe', uri, err => {
         if (err) {
           this.__debug('Failed to subscribe', uri, err);
           return reject(err)
@@ -586,13 +580,13 @@ class HomeyAPIV3 extends HomeyAPI {
         this.__debug('subscribed', uri);
         return resolve();
       });
-    });
+    }), 5000, `Failed to subscribe to ${uri} (Timeout after 5000ms).`);
 
     // On Connect
     const __onEvent = (event, data) => {
       onEvent(event, data);
     };
-    this.__ioNamespace.on(uri, __onEvent);
+    this.__homeySocket.on(uri, __onEvent);
 
     onConnect();
 
@@ -600,43 +594,48 @@ class HomeyAPIV3 extends HomeyAPI {
     const __onDisconnect = reason => {
       onDisconnect(reason);
     };
-    this.__io.on('disconnect', __onDisconnect);
+    this.__socket.on('disconnect', __onDisconnect);
 
     // On Reconnect
     const __onReconnect = () => {
       Promise.resolve().then(async () => {
         await this.connect();
-        await new Promise((resolve, reject) => {
-          this.__ioNamespace.emit('subscribe', uri, err => {
+        await Util.timeout(new Promise((resolve, reject) => {
+          this.__homeySocket.once('disconnect', (reason) => {
+            reject(new Error(reason));
+          });
+          this.__debug('subscribing', uri);
+          this.__homeySocket.emit('subscribe', uri, err => {
             if (err) {
               this.__debug('Failed to subscribe', uri, err);
               return reject(err)
             }
-            
+          
+            this.__debug('subscribed', uri);
             return resolve();
           });
-        });
+        }), 5000, `Failed to subscribe to ${uri} (Timeout after 5000ms).`);
 
-        this.__ioNamespace.on(uri, __onEvent);
+        this.__homeySocket.on(uri, __onEvent);
 
         onReconnect();
       }).catch(err => onReconnectError(err));
     };
-    this.__io.on('reconnect', __onReconnect);
+    this.__socket.on('reconnect', __onReconnect);
 
     return {
       unsubscribe: () => {
-        this.__ioNamespace.emit('unsubscribe', uri);
-        this.__ioNamespace.removeListener(uri, __onEvent);
-        this.__io.removeListener('disconnect', __onDisconnect);
-        this.__io.removeListener('reconnect', __onReconnect);
+        this.__homeySocket.emit('unsubscribe', uri);
+        this.__homeySocket.removeListener(uri, __onEvent);
+        this.__socket.removeListener('disconnect', __onDisconnect);
+        this.__socket.removeListener('reconnect', __onReconnect);
       },
     };
   }
 
   async connect() {
-    if (!this.io) {
-      this.io = Promise.resolve().then(async () => {
+    if (!this.__connectPromise) {
+      this.__connectPromise = Promise.resolve().then(async () => {
         // Ensure Base URL
         const baseUrl = await this.baseUrl;
 
@@ -645,8 +644,9 @@ class HomeyAPIV3 extends HomeyAPI {
 
         return new Promise((resolve, reject) => {
           this.__debug(`SocketIOClient ${baseUrl}`);
-          this.__io = SocketIOClient(baseUrl, {
-            autoConnect: true,
+
+          this.__socket = SocketIOClient(baseUrl, {
+            autoConnect: false,
             transports: ['websocket'],
             transportOptions: {
               pingTimeout: 8000,
@@ -655,65 +655,40 @@ class HomeyAPIV3 extends HomeyAPI {
             reconnection: true,
           });
 
-          this.__io.on('disconnect', reason => {
+          this.__socket.on('disconnect', reason => {
             this.__debug('SocketIOClient.onDisconnect', reason);
-            this.__connected = false;
-
-            if (this.__ioNamespace) {
-              this.__ioNamespace.disconnect();
-              this.__ioNamespace.destroy();
-              this.__ioNamespace.removeAllListeners();
-            }
-
-            if (reason === 'io server disconnect') {
-              // The disconnect was initiated by the server.
-              this.__io.connect();
-            }
-
-            reject(new Error('Disconnected'));
           });
 
-          this.__io.on('error', err => {
+          this.__socket.on('error', err => {
             this.__debug('SocketIOClient.onError', err.message);
           });
 
-          this.__io.on('reconnect', () => {
+          this.__socket.on('reconnect', () => {
             this.__debug('SocketIOClient.onReconnect');
-            this.__handshakeClient()
-              .then(() => {
-                this.__debug('SocketIOClient.onReconnect.onHandshakeClientSuccess');
-                this.__connected = true;
-                resolve();
-              })
-              .catch(err => {
-                this.__debug('SocketIOClient.onReconnect.onHandshakeClientError', err.message);
-                reject(err);
-              });
           });
           
-          this.__io.on('reconnect_attempt', () => {
+          this.__socket.on('reconnect_attempt', () => {
             this.__debug(`SocketIOClient.onReconnectAttempt`);
           });
 
-          this.__io.on('reconnecting', attempt => {
+          this.__socket.on('reconnecting', attempt => {
             this.__debug(`SocketIOClient.onReconnecting (Attempt #${attempt})`);
           });
 
-          this.__io.on('reconnect_error', err => {
+          this.__socket.on('reconnect_error', err => {
             this.__debug('SocketIOClient.onReconnectError', err.message);
           });
 
-          this.__io.on('connect_error', err => {
+          this.__socket.on('connect_error', err => {
             this.__debug('SocketIOClient.onConnectError', err.message);
             reject(err);
           });
 
-          this.__io.on('connect', () => {
+          this.__socket.on('connect', () => {
             this.__debug('SocketIOClient.onConnect');
             this.__handshakeClient()
               .then(() => {
                 this.__debug('SocketIOClient.onConnect.onHandshakeClientSuccess');
-                this.__connected = true;
                 resolve();
               })
               .catch(err => {
@@ -721,34 +696,39 @@ class HomeyAPIV3 extends HomeyAPI {
                 reject(err);
               });
           });
-          // this.__io.connect();
+
+          this.__socket.open();
         });
       });
 
-      this.io.catch(err => {
+      this.__connectPromise.catch(err => {
         this.__debug('SocketIOClient Error', err.message);
+        delete this.__connectPromise;
       });
     }
 
-    return this.io;
+    return this.__connectPromise;
   }
 
   async disconnect() {
-    if (this.__io) {
+    // Should we wait for connect here?
+
+    if (this.__socket) {
       await new Promise(resolve => {
-        this.__io.once('disconnect', resolve());
-        this.__io.disconnect();
-        this.__io.removeAllListeners();
-        this.__io = null;
+        this.__socket.once('disconnect', resolve());
+        this.__socket.disconnect();
+        this.__socket.removeAllListeners();
+        this.__socket = null;
       });
     }
+    
     // TODO todo what?
   }
 
   destroy() {
-    if (this.__io) {
-      this.__io.removeAllListeners();
-      this.__io.close();
+    if (this.__socket) {
+      this.__socket.removeAllListeners();
+      this.__socket.close();
     }
   }
 
@@ -756,7 +736,7 @@ class HomeyAPIV3 extends HomeyAPI {
     this.__debug('__handshakeClient');
 
     return new Promise((resolve, reject) => {
-      this.__io.emit('handshakeClient', {
+      this.__socket.emit('handshakeClient', {
         token: this.__token,
         homeyId: this.id,
       }, (err, result) => {
@@ -772,7 +752,7 @@ class HomeyAPIV3 extends HomeyAPI {
           await this.login();
 
           return new Promise((resolve, reject) => {
-            this.__io.emit('handshakeClient', {
+            this.__socket.emit('handshakeClient', {
               token: this.__token,
               homeyId: this.id,
             }, (err, result) => {
@@ -788,43 +768,35 @@ class HomeyAPIV3 extends HomeyAPI {
         this.__debug('SocketIOClient.onHandshakeClientSuccess', `Namespace: ${namespace}`);
 
         return new Promise((resolve, reject) => {
-          this.__ioNamespace = this.__io.io.socket(namespace);
-
-          this.__debug(this.__ioNamespace);
+          this.__homeySocket = this.__socket.io.socket(namespace);
 
-          // Assuming this.__ioNamespace is your namespace object
-          if (this.__ioNamespace.connected) {
-            this.__debug(`SocketIOClient.Namespace[${namespace}].connected`);
-          }
-
-          this.__ioNamespace.once('connect', () => {
+          this.__homeySocket.once('connect', () => {
             this.__debug(`SocketIOClient.Namespace[${namespace}].onConnect`);
             resolve();
           });
 
-          this.__ioNamespace.once('connect_error', err => {
+          this.__homeySocket.once('connect_error', err => {
             this.__debug(`SocketIOClient.Namespace[${namespace}].onConnectError`, err.message);
             reject(err);
           });
 
-          this.__ioNamespace.on('reconnecting', attempt => {
+          this.__homeySocket.on('disconnect', reason => {
+            this.__debug(`SocketIOClient.Namespace[${namespace}].onDisconnect`, reason);
+          });
+
+          this.__homeySocket.on('reconnecting', attempt => {
             this.__debug(`SocketIOClient.Namespace[${namespace}].onReconnecting (Attempt #${attempt})`);
           });
 
-          this.__ioNamespace.on('reconnect', () => {
+          this.__homeySocket.on('reconnect', () => {
             this.__debug(`SocketIOClient.Namespace[${namespace}].onReconnect`);
           });
 
-          this.__ioNamespace.on('reconnect_error', err => {
+          this.__homeySocket.on('reconnect_error', err => {
             this.__debug(`SocketIOClient.Namespace[${namespace}].onReconnectError`, err.message);
           });
 
-          this.__ioNamespace.on('disconnect', reason => {
-            this.__debug(`SocketIOClient.Namespace[${namespace}].onDisconnect`, reason);
-          });
-
-          this.__debug(`SocketIOClient.Namespace[${namespace}].disconnected`, this.__ioNamespace.disconnected);
-          this.__debug(`SocketIOClient.Namespace[${namespace}].connected`, this.__ioNamespace.connected);
+          this.__homeySocket.open();
         });
       });
   }

package/lib/Util.js

@@ -56,16 +56,24 @@ class Util {
   static async timeout(promise, timeoutMillis = 5000, message = `Timeout after ${timeoutMillis}ms`) {
     const timeoutError = new APIErrorTimeout(message);
     let timeoutRef;
-    return Promise.race([
+    
+    const returnPromise = Promise.race([
       promise,
       new Promise((_, reject) => {
         timeoutRef = setTimeout(() => {
           reject(timeoutError);
         }, timeoutMillis);
       }),
-    ]).finally(() => {
-      clearTimeout(timeoutRef);
-    });
+    ]);
+    
+    returnPromise
+      // eslint-disable-next-line no-unused-vars
+      .catch(err => { })
+      .finally(() => {
+        clearTimeout(timeoutRef);
+      });
+
+    return returnPromise;
   }
 
   /**

package/package.json

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