homey-api 3.0.0-rc.1 → 3.0.0-rc.3

package/assets/types/homey-api.d.ts

@@ -1063,62 +1063,6 @@
     
 
     
-      makeCapabilityInstance(
-        
-          
-  
-    
-      capabilityId: string,
-    
-  
-    
-      listener: {
-  
-    
-      value: number | boolean | string,
-    
-  
-},
-    
-  
-
-        
-      ):
-        HomeyAPIV2.ManagerDevices.Device.DeviceCapability;
-    
-      setCapabilityValue(
-        
-          
-  
-    
-      opts: {
-  
-    
-      capabilityId: string,
-    
-  
-    
-      value: number | boolean | string,
-    
-  
-    
-      opts: {
-  
-    
-      duration: number,
-    
-  
-},
-    
-  
-},
-    
-  
-
-        
-      ):
-        Promise<void>;
-    
   }
 
     }
@@ -14573,6 +14517,10 @@
 
   
 
+  
+
+  
+
   
 
   

package/assets/types/homey-api.private.d.ts

@@ -6411,62 +6411,6 @@
     
 
     
-      makeCapabilityInstance(
-        
-          
-  
-    
-      capabilityId: string,
-    
-  
-    
-      listener: {
-  
-    
-      value: number | boolean | string,
-    
-  
-},
-    
-  
-
-        
-      ):
-        HomeyAPIV2.ManagerDevices.Device.DeviceCapability;
-    
-      setCapabilityValue(
-        
-          
-  
-    
-      opts: {
-  
-    
-      capabilityId: string,
-    
-  
-    
-      value: number | boolean | string,
-    
-  
-    
-      opts: {
-  
-    
-      duration: number,
-    
-  
-},
-    
-  
-},
-    
-  
-
-        
-      ):
-        Promise<void>;
-    
   }
 
     }
@@ -20621,6 +20565,10 @@
 
   
 
+  
+
+  
+
   
 
   

package/lib/HomeyAPI/HomeyAPI.js

@@ -139,10 +139,6 @@ class HomeyAPI {
       throw new Error('Invalid Homey');
     }
 
-    if (homey.platform !== 'local') {
-      throw new Error(`Invalid Homey Platform: ${homey.platform}`);
-    }
-
     const props = {
       debug,
       token: await homey.api.getOwnerApiToken(),
@@ -154,16 +150,21 @@ class HomeyAPI {
       },
     };
 
-    if (homey.platformVersion === 1) {
+    if (homey.platform === 'local' && homey.platformVersion === 1) {
       const HomeyAPIV2 = require('./HomeyAPIV2');
       return new HomeyAPIV2(props);
     }
 
-    if (homey.platformVersion === 2) {
+    if (homey.platform === 'local' && homey.platformVersion === 2) {
       const HomeyAPIV3Local = require('./HomeyAPIV3Local');
       return new HomeyAPIV3Local(props);
     }
 
+    if (homey.platform === 'cloud' && homey.platformVersion === 2) {
+      const HomeyAPIV3Cloud = require('./HomeyAPIV3Cloud');
+      return new HomeyAPIV3Cloud(props);
+    }
+
     throw new Error(`Invalid Homey Platform Version: ${homey.platformVersion}`);
   }
 

package/lib/HomeyAPI/HomeyAPIV2/ManagerDevices.js

@@ -12,20 +12,6 @@ class ManagerDevices extends Manager {
     Device,
   }
 
-  async getCapability({
-    $cache = true,
-    id,
-  }) {
-    if ($cache === true && this.__cache['capability'][id]) {
-      return this.__cache['capability'][id];
-    }
-
-    return this.__super__getCapability({
-      id: id.split(':').reverse()[0],
-      uri: id.split(':', 3).join(':'),
-    });
-  }
-
 }
 
 module.exports = ManagerDevices;

package/lib/HomeyAPI/HomeyAPIV2/ManagerDrivers/PairSession.js

@@ -0,0 +1,20 @@
+'use strict';
+
+const PairSessionV3 = require('../../HomeyAPIV3/ManagerDrivers/PairSession');
+
+class PairSession extends PairSessionV3 {
+
+  static transform(item) {
+    item = super.transform(item);
+
+    item.driverId = `${item.driverUri}:${item.driverId}`;
+    item.ownerUri = item.driverUri;
+
+    delete item.driverUri;
+
+    return item;
+  }
+
+}
+
+module.exports = PairSession;

package/lib/HomeyAPI/HomeyAPIV2/ManagerDrivers.js

@@ -2,12 +2,14 @@
 
 const ManagerDriversV3 = require('../HomeyAPIV3/ManagerDrivers');
 const Driver = require('./ManagerDrivers/Driver');
+const PairSession = require('./ManagerDrivers/PairSession');
 
 class ManagerDrivers extends ManagerDriversV3 {
 
   static CRUD = {
     ...super.CRUD,
     Driver,
+    PairSession,
   }
 
   async getDriver({
@@ -24,6 +26,21 @@ class ManagerDrivers extends ManagerDriversV3 {
     });
   }
 
+  async createPairSession({
+    pairsession,
+    ...props
+  }) {
+    if (pairsession.driverId) {
+      pairsession.driverUri = pairsession.driverId.split(':', 3).join(':');
+      pairsession.driverId = pairsession.driverId.split(':').reverse()[0];
+    }
+
+    return this.__super__createPairSession({
+      pairsession,
+      ...props,
+    });
+  }
+
 }
 
 module.exports = ManagerDrivers;

package/lib/HomeyAPI/HomeyAPIV2/ManagerFlow.js

@@ -18,22 +18,45 @@ class ManagerFlow extends Manager {
     FlowCardAction,
   }
 
-  // TODO: Transform card IDs
-  // async createFlow() {
-
-  // }
-
-  // async updateFlow() {
-
-  // }
-
-  // async createAdvancedFlow() {
+  async createFlow({
+    flow,
+    ...props
+  }) {
+    return this.__super__.createFlow({
+      flow: Flow.transform(flow),
+      ...props,
+    });
+  }
 
-  // }
+  async updateFlow({
+    flow,
+    ...props
+  }) {
+    return this.__super__.updateFlow({
+      flow: Flow.transform(flow),
+      ...props,
+    });
+  }
 
-  // async updateAdvancedFlow() {
+  async createAdvancedFlow({
+    advancedflow,
+    ...props
+  }) {
+    return this.__super__.createAdvancedFlow({
+      advancedflow: AdvancedFlow.transform(advancedflow),
+      ...props,
+    });
+  }
 
-  // }
+  async updateAdvancedFlow({
+    advancedflow,
+    ...props
+  }) {
+    return this.__super__.updateAdvancedFlow({
+      advancedflow: AdvancedFlow.transform(advancedflow),
+      ...props,
+    });
+  }
 
   async getFlowCardTrigger({
     $cache = true,

package/lib/HomeyAPI/HomeyAPIV2/ManagerInsights.js

@@ -24,6 +24,23 @@ class ManagerInsights extends ManagerInsightsV3 {
     });
   }
 
+  async getLogEntries({ id }) {
+    return this.__super__getLogEntries({
+      id: id.split(':').reverse()[0],
+      uri: id.split(':', 3).join(':'),
+    });
+  }
+
+  async deleteLogEntries({ id }) {
+    return this.__super__deleteLogEntries({
+      id: id.split(':').reverse()[0],
+      uri: id.split(':', 3).join(':'),
+    });
+  }
+
+  // deleteLog
+  // updateLog
+
 }
 
 module.exports = ManagerInsights;

package/lib/HomeyAPI/HomeyAPIV3/Item.js

@@ -64,6 +64,8 @@ class Item extends EventEmitter {
 
   __update(properties) {
     for (const [key, value] of Object.entries(properties)) {
+      if (key === 'id') continue;
+
       this[key] = value;
     }
   }

package/lib/HomeyAPI/HomeyAPIV3/Manager.js

@@ -260,7 +260,6 @@ class Manager extends EventEmitter {
                   let item = { ...result };
                   item = Item.transform(item);
                   item = new Item({
-                    itemId,
                     id: item.id,
                     homey: this.homey,
                     manager: this,
@@ -280,11 +279,10 @@ class Manager extends EventEmitter {
                   for (let item of Object.values(result)) {
                     item = Item.transform(item);
                     if (this.__cache[itemId][item.id]) {
-                      this.__cache[itemId][item.id].__update(item);
                       items[item.id] = this.__cache[itemId][item.id];
+                      items[item.id].__update(item);
                     } else {
                       items[item.id] = new Item({
-                        itemId,
                         id: item.id,
                         homey: this.homey,
                         manager: this,
@@ -317,12 +315,13 @@ class Manager extends EventEmitter {
                 case 'updateOne': {
                   let item = { ...result };
                   item = Item.transform(item);
+
                   if (this.__cache[itemId][item.id]) {
-                    item = this.__cache[itemId][item.id].__update(item);
+                    item = this.__cache[itemId][item.id];
+                    item.__update(item);
                   } else {
                     item = Item.transform(item);
                     item = new Item({
-                      itemId,
                       id: item.id,
                       homey: this.homey,
                       manager: this,
@@ -416,7 +415,6 @@ class Manager extends EventEmitter {
                   let item = { ...data };
                   item = Item.transform(item);
                   item = new Item({
-                    itemId,
                     id: item.id,
                     homey: this.homey,
                     manager: this,
@@ -438,7 +436,6 @@ class Manager extends EventEmitter {
                     item.emit('update');
                   } else {
                     item = new Item({
-                      itemId,
                       id: item.id,
                       homey: this.homey,
                       manager: this,

package/lib/HomeyAPI/HomeyAPIV3/ManagerDevices/Device.js

@@ -17,17 +17,13 @@ class Device extends Item {
     });
   }
 
-  get uri() {
-    return `homey:device:${this.id}`;
-  }
-
   /**
-   * Creates an {@link HomeyAPIV2.DeviceCapability} for realtime capability updates.
+   * Creates an {@link HomeyAPIV3.DeviceCapability} for realtime capability updates.
    * @param {string} capabilityId
    * @param {Function} listener
    * @param {number|boolean|string} listener.value
-   * @returns {HomeyAPIV2.ManagerDevices.Device.DeviceCapability}
-   * @function HomeyAPIV2.ManagerDevices.Device#makeCapabilityInstance
+   * @returns {HomeyAPIV3.ManagerDevices.Device.DeviceCapability}
+   * @function HomeyAPIV3.ManagerDevices.Device#makeCapabilityInstance
    * @example
    *
    *  const onOffInstance = device.makeCapabilityInstance('onoff', value => {
@@ -76,7 +72,7 @@ class Device extends Item {
    * @param {object} [opts.opts]
    * @param {number} [opts.opts.duration]
    * @returns {Promise<void>}
-   * @function HomeyAPIV2.ManagerDevices.Device#setCapabilityValue
+   * @function HomeyAPIV3.ManagerDevices.Device#setCapabilityValue
    */
   async setCapabilityValue(options, ...args) {
     // Legacy compatibility from node-athom-api

package/lib/HomeyAPI/HomeyAPIV3/ManagerDrivers/PairSession.js

@@ -0,0 +1,9 @@
+'use strict';
+
+const Item = require('../Item');
+
+class PairSession extends Item {
+
+}
+
+module.exports = PairSession;

package/lib/HomeyAPI/HomeyAPIV3/ManagerDrivers.js

@@ -2,12 +2,14 @@
 
 const Manager = require('./Manager');
 const Driver = require('./ManagerDrivers/Driver');
+const PairSession = require('./ManagerDrivers/PairSession');
 
 class ManagerDrivers extends Manager {
 
   static CRUD = {
     ...super.CRUD,
     Driver,
+    PairSession,
   }
 
 }

package/lib/HomeyAPI/HomeyAPIV3/ManagerFlow/Flow.js

@@ -4,6 +4,14 @@ const Item = require('../Item');
 
 class Flow extends Item {
 
+  /**
+   * Check whether this Flow misses one or more {@link FlowCard} or {@link FlowToken}.
+   * @returns Promise<Boolean>
+   */
+  async isBroken() {
+    throw new Error('Not Implemented');
+  }
+
 }
 
 module.exports = Flow;

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

@@ -4,6 +4,12 @@ const Item = require('../Item');
 
 class Log extends Item {
 
+  async getEntries() {
+    return this.manager.getLogEntries({
+      id: this.id,
+    });
+  }
+
 }
 
 module.exports = Log;

package/package.json

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