homey-api 1.5.23 → 1.5.26

package/lib/HomeyAPI/HomeyAPIV2/Item.js

@@ -13,7 +13,7 @@ class Item extends EventEmitter {
   }) {
     super();
 
-    // Set Manager
+    // Set Homey
     Object.defineProperty(this, 'homey', {
       value: homey,
       enumerable: false,
@@ -98,10 +98,9 @@ class Item extends EventEmitter {
             this.onReconnect();
           },
           onEvent: (event, data) => {
-            // // Fire event listeners
-            if (Array.isArray(this.__listeners[event])) {
-              this.__listeners[event].forEach(listener => listener(data));
-            }
+            this.__debug('onEvent', event, data);
+
+            this.emit(event, data);
           },
         });
       }

package/lib/HomeyAPI/HomeyAPIV2/Manager.js

@@ -352,6 +352,7 @@ class Manager extends EventEmitter {
                     result = new ItemClass({
                       key,
                       uri,
+                      homey: this.homey,
                       manager: this,
                       properties: result,
                     });
@@ -415,8 +416,8 @@ class Manager extends EventEmitter {
             this.__debug('onConnect');
             this.__connected = true;
           },
-          onDisconnect: () => {
-            this.__debug('onDisconnect');
+          onDisconnect: reason => {
+            this.__debug(`onDisconnect Reason:${reason}`);
             this.__connected = false;
 
             // Clear CRUD Item cache
@@ -447,6 +448,7 @@ class Manager extends EventEmitter {
                   this.__cache[itemId][key] = new ItemClass({
                     key,
                     uri,
+                    homey: this.homey,
                     manager: this,
                     properties: { ...data },
                   });
@@ -464,6 +466,7 @@ class Manager extends EventEmitter {
                     this.__cache[itemId][key] = new ItemClass({
                       key,
                       uri,
+                      homey: this.homey,
                       manager: this,
                       properties: { ...data },
                     });

package/lib/HomeyAPI/HomeyAPIV2.js

@@ -437,7 +437,10 @@ class HomeyAPIV2 extends HomeyAPI {
         // and then sending the JWT token to Homey.
         this.__debug('Retrieving token...');
         const jwtToken = await this.__api.createDelegationToken({ audience: 'homey' });
-        const token = await this.users.login({ token: jwtToken });
+        const token = await this.users.login({
+          $socket: false,
+          token: jwtToken,
+        });
         await this.__setStore({ token });
         this.__debug('Got token');
 
@@ -486,6 +489,7 @@ class HomeyAPIV2 extends HomeyAPI {
 
     await this.connect();
     await new Promise((resolve, reject) => {
+      this.__ioNamespace.once('disconnect', reject);
       this.__ioNamespace.emit('subscribe', uri, err => {
         if (err) return reject(err);
         return resolve();
@@ -501,8 +505,8 @@ class HomeyAPIV2 extends HomeyAPI {
     onConnect();
 
     // On Disconnect
-    const __onDisconnect = () => {
-      onDisconnect();
+    const __onDisconnect = reason => {
+      onDisconnect(reason);
     };
     this.__io.on('disconnect', __onDisconnect);
 
@@ -546,6 +550,7 @@ class HomeyAPIV2 extends HomeyAPI {
         return new Promise((resolve, reject) => {
           this.__debug(`SocketIOClient ${baseUrl}`);
           this.__io = SocketIOClient(baseUrl, {
+            autoConnect: false,
             transports: ['websocket'],
             transportOptions: {
               pingTimeout: 8000,
@@ -603,6 +608,7 @@ class HomeyAPIV2 extends HomeyAPI {
                 reject(err);
               });
           });
+          this.__io.connect();
         });
       });
       this.io.catch(err => {
@@ -663,28 +669,29 @@ class HomeyAPIV2 extends HomeyAPI {
         throw err;
       })
       .then(({ namespace }) => {
+        this.__debug('SocketIOClient.onHandshakeClientSuccess', `Namespace: ${namespace}`);
+
         return new Promise((resolve, reject) => {
-          this.__debug('SocketIOClient.onHandshakeClientSuccess', `Namespace: ${namespace}`);
           this.__ioNamespace = this.__io.io.socket(namespace);
           this.__ioNamespace.once('connect', () => {
-            this.__debug('SocketIOClient.Namespace.onConnect');
+            this.__debug(`SocketIOClient.Namespace[${namespace}].onConnect`);
             resolve();
           });
           this.__ioNamespace.once('connect_error', err => {
-            this.__debug('SocketIOClient.Namespace.onConnectError', err.message);
+            this.__debug(`SocketIOClient.Namespace[${namespace}].onConnectError`, err.message);
             reject(err);
           });
           this.__ioNamespace.on('reconnecting', attempt => {
-            this.__debug(`SocketIOClient.Namespace.onReconnecting (Attempt #${attempt})`);
+            this.__debug(`SocketIOClient.Namespace[${namespace}].onReconnecting (Attempt #${attempt})`);
           });
           this.__ioNamespace.on('reconnect', () => {
-            this.__debug('SocketIOClient.Namespace.onReconnect');
+            this.__debug(`SocketIOClient.Namespace[${namespace}].onReconnect`);
           });
           this.__ioNamespace.on('reconnect_error', err => {
-            this.__debug('SocketIOClient.Namespace.onReconnectError', err.message);
+            this.__debug(`SocketIOClient.Namespace[${namespace}].onReconnectError`, err.message);
           });
           this.__ioNamespace.on('disconnect', reason => {
-            this.__debug('SocketIOClient.Namespace.onDisconnect', reason);
+            this.__debug(`SocketIOClient.Namespace[${namespace}].onDisconnect`, reason);
           });
           this.__ioNamespace.connect();
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "homey-api",
-  "version": "1.5.23",
+  "version": "1.5.26",
   "description": "Homey API",
   "main": "index.js",
   "types": "assets/types/homey-api.d.ts",