homey-api 3.0.10 → 3.0.12

package/lib/HomeyAPI/HomeyAPIV3/ManagerInsights/Log.js

@@ -24,6 +24,21 @@ class Log extends Item {
     return item;
   }
 
+  get uri() {
+    console.warn('Log.uri is deprecated. Use Log.ownerUri instead.');
+    return undefined;
+  }
+
+  get uriObj() {
+    console.warn('Log.uriObj is deprecated.');
+    return undefined;
+  }
+
+  get ownerName() {
+    console.warn('Log.ownerName is deprecated.');
+    return undefined;
+  }
+
 }
 
 module.exports = Log;

package/lib/HomeyAPI/HomeyAPIV3/ManagerUsers.js

@@ -0,0 +1,57 @@
+'use strict';
+
+const Manager = require('./Manager');
+
+class ManagerUsers extends Manager {
+
+  __userMe = null;
+
+  async getUserMe(...args) {
+    const options = args[0] ?? {};
+
+    if (this.__userMe != null && options.$cache !== false) {
+      return await this.__userMe;
+    }
+
+    // TODO
+    // 
+    // - remove on disconnect manager users
+
+    this.__userMe = this.__super__getUserMe(...args)
+      .then((result) => {
+        const ItemClass = this.itemClasses.User;
+        const props = ItemClass.transformGet(result);
+
+        if (this.isConnected()) {
+          if (this.__cache[ItemClass.ID][props.id] != null) {
+            this.__cache[ItemClass.ID][props.id].__update(props);
+          } else {
+            this.__cache[ItemClass.ID][props.id] = new ItemClass({
+              id: props.id,
+              homey: this.homey,
+              manager: this,
+              properties: props,
+            });
+          }
+
+          return this.__cache[ItemClass.ID][props.id];
+        }
+
+        return new ItemClass({
+          id: props.id,
+          homey: this.homey,
+          manager: this,
+          properties: props,
+        });
+      })
+      .catch(err => {
+        this.__userMe = null;
+        throw err;
+      });
+
+    return await this.__userMe;
+  }
+
+}
+
+module.exports = ManagerUsers;

package/lib/HomeyAPI/HomeyAPIV3.js

@@ -11,6 +11,7 @@ const ManagerDevices = require('./HomeyAPIV3/ManagerDevices');
 const ManagerFlow = require('./HomeyAPIV3/ManagerFlow');
 const ManagerFlowToken = require('./HomeyAPIV3/ManagerFlowToken');
 const ManagerInsights = require('./HomeyAPIV3/ManagerInsights');
+const ManagerUsers = require('./HomeyAPIV3/ManagerUsers');
 
 // eslint-disable-next-line no-unused-vars
 const Manager = require('./HomeyAPIV3/Manager');
@@ -30,6 +31,7 @@ class HomeyAPIV3 extends HomeyAPI {
     ManagerFlow,
     ManagerFlowToken,
     ManagerInsights,
+    ManagerUsers,
   };
 
   constructor({
@@ -143,8 +145,9 @@ class HomeyAPIV3 extends HomeyAPI {
         if (!this.__managers[managerName]) {
           const ManagerClass = this.constructor.MANAGERS[managerName]
             ? this.constructor.MANAGERS[managerName]
-            // eslint-disable-next-line no-eval
-            : eval(`(class ${managerName} extends Manager {})`);
+            : (() => {
+              return class extends Manager {};
+            })();
 
           ManagerClass.ID = manager.id;
 
@@ -416,6 +419,11 @@ class HomeyAPIV3 extends HomeyAPI {
 
     const resStatusText = res.status;
     const resHeadersContentType = res.headers.get('Content-Type');
+    const version = res.headers.get('x-homey-version');
+    if (version) this.version = version;
+    const tier = res.headers.get('x-homey-tier');
+    if (tier) this.tier = tier;
+
     const resBodyText = await res.text();
     let resBodyJson;
     if (resHeadersContentType && resHeadersContentType.startsWith('application/json')) {
@@ -545,7 +553,11 @@ class HomeyAPIV3 extends HomeyAPI {
     await new Promise((resolve, reject) => {
       this.__ioNamespace.once('disconnect', reject);
       this.__ioNamespace.emit('subscribe', uri, err => {
-        if (err) return reject(err);
+        if (err) {
+          this.__debug('Failed to subscribe', uri, err);
+          return reject(err)
+        }
+      
         return resolve();
       });
     });
@@ -570,7 +582,11 @@ class HomeyAPIV3 extends HomeyAPI {
         await this.connect();
         await new Promise((resolve, reject) => {
           this.__ioNamespace.emit('subscribe', uri, err => {
-            if (err) return reject(err);
+            if (err) {
+              this.__debug('Failed to subscribe', uri, err);
+              return reject(err)
+            }
+            
             return resolve();
           });
         });

package/package.json

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