homey-api 3.0.0-rc.5 → 3.0.0-rc.7

package/lib/HomeyAPI/HomeyAPIV2/ManagerDevices/Capability.js

@@ -4,8 +4,8 @@ const CapabilityV3 = require('../../HomeyAPIV3/ManagerDevices/Capability');
 
 class Capability extends CapabilityV3 {
 
-  static transform(item) {
-    item = super.transform(item);
+  static transformGet(item) {
+    item = super.transformGet(item);
 
     item.id = `${item.uri}:${item.id}`;
     item.ownerUri = item.uri;

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

@@ -4,8 +4,8 @@ const DeviceV3 = require('../../HomeyAPIV3/ManagerDevices/Device');
 
 class Device extends DeviceV3 {
 
-  static transform(item) {
-    item = super.transform(item);
+  static transformGet(item) {
+    item = super.transformGet(item);
 
     item.driverId = `${item.driverUri}:${item.driverId}`;
     delete item.driverUri;

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

@@ -4,8 +4,8 @@ const DriverV3 = require('../../HomeyAPIV3/ManagerDrivers/Driver');
 
 class Driver extends DriverV3 {
 
-  static transform(item) {
-    item = super.transform(item);
+  static transformGet(item) {
+    item = super.transformGet(item);
 
     item.ownerId = item.id;
     item.ownerUri = item.uri;

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

@@ -4,8 +4,8 @@ const PairSessionV3 = require('../../HomeyAPIV3/ManagerDrivers/PairSession');
 
 class PairSession extends PairSessionV3 {
 
-  static transform(item) {
-    item = super.transform(item);
+  static transformGet(item) {
+    item = super.transformGet(item);
 
     item.driverId = `${item.driverUri}:${item.driverId}`;
     item.ownerUri = item.driverUri;

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

@@ -4,7 +4,7 @@ const AdvancedFlowV3 = require('../../HomeyAPIV3/ManagerFlow/Flow');
 
 class AdvancedFlow extends AdvancedFlowV3 {
 
-  static transform(item) {
+  static transformGet(item) {
     if (item.cards) {
       for (const card of Object.values(item.cards)) {
         card.id = `${card.ownerUri}:${card.id}`;
@@ -14,7 +14,7 @@ class AdvancedFlow extends AdvancedFlowV3 {
     return item;
   }
 
-  static transformSave(item) {
+  static transformSet(item) {
     if (item.cards) {
       for (const card of Object.values(item.cards)) {
         card.ownerUri = card.id.split(':', 3).join(':');

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

@@ -4,8 +4,8 @@ const FlowV3 = require('../../HomeyAPIV3/ManagerFlow/Flow');
 
 class Flow extends FlowV3 {
 
-  static transform(item) {
-    item = super.transform(item);
+  static transformGet(item) {
+    item = super.transformGet(item);
 
     if (item.trigger) {
       item.trigger.id = `${item.trigger.uri}:${item.trigger.id}`;
@@ -29,7 +29,7 @@ class Flow extends FlowV3 {
     return item;
   }
 
-  static transformSave(item) {
+  static transformSet(item) {
     if (item.trigger) {
       item.trigger.uri = item.trigger.id.split(':', 3).join(':');
       item.trigger.id = item.trigger.id.split(':').reverse()[0];

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

@@ -4,8 +4,8 @@ const FlowCardActionV3 = require('../../HomeyAPIV3/ManagerFlow/FlowCardAction');
 
 class FlowCardAction extends FlowCardActionV3 {
 
-  static transform(item) {
-    item = super.transform(item);
+  static transformGet(item) {
+    item = super.transformGet(item);
 
     item.id = `${item.uri}:${item.id}`;
     item.ownerUri = item.uri;

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

@@ -4,8 +4,8 @@ const FlowCardConditionV3 = require('../../HomeyAPIV3/ManagerFlow/FlowCardCondit
 
 class FlowCardCondition extends FlowCardConditionV3 {
 
-  static transform(item) {
-    item = super.transform(item);
+  static transformGet(item) {
+    item = super.transformGet(item);
 
     item.id = `${item.uri}:${item.id}`;
     item.ownerUri = item.uri;

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

@@ -4,8 +4,8 @@ const FlowCardTriggerV3 = require('../../HomeyAPIV3/ManagerFlow/FlowCardTrigger'
 
 class FlowCardTrigger extends FlowCardTriggerV3 {
 
-  static transform(item) {
-    item = super.transform(item);
+  static transformGet(item) {
+    item = super.transformGet(item);
 
     item.id = `${item.uri}:${item.id}`;
     item.ownerUri = item.uri;

package/lib/HomeyAPI/HomeyAPIV2/ManagerFlow.js

@@ -23,7 +23,7 @@ class ManagerFlow extends Manager {
     ...props
   }) {
     return this.__super__.createFlow({
-      flow: Flow.transformSave(flow),
+      flow: Flow.transformSet(flow),
       ...props,
     });
   }
@@ -33,7 +33,7 @@ class ManagerFlow extends Manager {
     ...props
   }) {
     return this.__super__.updateFlow({
-      flow: Flow.transformSave(flow),
+      flow: Flow.transformSet(flow),
       ...props,
     });
   }
@@ -43,7 +43,7 @@ class ManagerFlow extends Manager {
     ...props
   }) {
     return this.__super__.createAdvancedFlow({
-      advancedflow: AdvancedFlow.transformSave(advancedflow),
+      advancedflow: AdvancedFlow.transformSet(advancedflow),
       ...props,
     });
   }
@@ -53,7 +53,7 @@ class ManagerFlow extends Manager {
     ...props
   }) {
     return this.__super__.updateAdvancedFlow({
-      advancedflow: AdvancedFlow.transformSave(advancedflow),
+      advancedflow: AdvancedFlow.transformSet(advancedflow),
       ...props,
     });
   }

package/lib/HomeyAPI/HomeyAPIV2/ManagerFlowToken/FlowToken.js

@@ -4,15 +4,15 @@ const FlowTokenV3 = require('../../HomeyAPIV3/ManagerFlowToken/FlowToken');
 
 class FlowToken extends FlowTokenV3 {
 
-  static transform(item) {
+  static transformGet(item) {
     // TODO: Remove FlowTokenV3.transform and uncomment this after front-end does not use FlowToken.uri|id|uriObj anymore!
-    // item = super.transform(item);
+    // item = super.transformGet(item);
 
     item.ownerUri = item.uri;
     item.ownerId = item.id;
-    item.ownerName = item.uriObj.name;
     item.id = `${item.ownerUri}:${item.ownerId}`;
 
+    delete item.ownerName; // Prepare for back-end change
     delete item.uri;
     delete item.uriObj;
 

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

@@ -4,12 +4,11 @@ const LogV3 = require('../../HomeyAPIV3/ManagerInsights/Log');
 
 class Log extends LogV3 {
 
-  static transform(item) {
-    item = super.transform(item);
+  static transformGet(item) {
+    item = super.transformGet(item);
 
     item.ownerId = item.id;
     item.ownerUri = item.uri;
-    item.ownerName = item.uriObj.name;
     item.id = `${item.uri}:${item.id}`;
 
     delete item.uri;

package/lib/HomeyAPI/HomeyAPIV3/Item.js

@@ -68,6 +68,13 @@ class Item extends EventEmitter {
 
       this[key] = value;
     }
+
+    this.emit('update', properties);
+  }
+
+  __delete() {
+    this.destroy();
+    this.emit('delete');
   }
 
   async connect() {
@@ -173,7 +180,11 @@ class Item extends EventEmitter {
     this.disconnect().catch(() => { });
   }
 
-  static transform(item) {
+  static transformGet(item) {
+    return item;
+  }
+
+  static transformSet(item) {
     return item;
   }
 

package/lib/HomeyAPI/HomeyAPIV3/Manager.js

@@ -258,7 +258,7 @@ class Manager extends EventEmitter {
               switch (operation.crud.type) {
                 case 'getOne': {
                   let item = { ...result };
-                  item = Item.transform(item);
+                  item = Item.transformGet(item);
                   item = new Item({
                     id: item.id,
                     homey: this.homey,
@@ -277,7 +277,7 @@ class Manager extends EventEmitter {
 
                   // Add all to cache
                   for (let item of Object.values(result)) {
-                    item = Item.transform(item);
+                    item = Item.transformGet(item);
                     if (this.__cache[itemId][item.id]) {
                       items[item.id] = this.__cache[itemId][item.id];
                       items[item.id].__update(item);
@@ -314,13 +314,13 @@ class Manager extends EventEmitter {
                 case 'createOne':
                 case 'updateOne': {
                   let item = { ...result };
-                  item = Item.transform(item);
+                  item = Item.transformGet(item);
 
                   if (this.__cache[itemId][item.id]) {
                     item = this.__cache[itemId][item.id];
                     item.__update(item);
                   } else {
-                    item = Item.transform(item);
+                    item = Item.transformGet(item);
                     item = new Item({
                       id: item.id,
                       homey: this.homey,
@@ -412,53 +412,38 @@ class Manager extends EventEmitter {
 
               switch (operation) {
                 case 'create': {
-                  let item = { ...data };
-                  item = Item.transform(item);
-                  item = new Item({
-                    id: item.id,
+                  data = Item.transformGet(data);
+
+                  const item = new Item({
+                    id: data.id,
                     homey: this.homey,
                     manager: this,
-                    properties: { ...item },
+                    properties: { ...data },
                   });
+                  this.__cache[itemId][data.id] = item;
 
-                  this.__cache[itemId][item.id] = item;
-                  this.__cache[itemId][item.id].emit('create');
-
-                  return this.emit(`${itemId}.create`, item);
+                  break;
                 }
                 case 'update': {
-                  let item = { ...data };
-                  item = Item.transform(item);
+                  data = Item.transformGet(data);
 
-                  if (this.__cache[itemId][item.id]) {
-                    item = this.__cache[itemId][item.id];
-                    item.__update(item);
-                    item.emit('update');
-                  } else {
-                    item = new Item({
-                      id: item.id,
-                      homey: this.homey,
-                      manager: this,
-                      properties: { ...item },
-                    });
-                    this.__cache[itemId][item.id] = item;
+                  if (this.__cache[itemId][data.id]) {
+                    const item = this.__cache[itemId][data.id];
+                    item.__update(data);
                   }
 
-                  return this.emit(`${itemId}.update`, item);
+                  break;
                 }
                 case 'delete': {
-                  let item = Item.transform({ ...data });
-                  item = Item.transform(item);
+                  data = Item.transformGet(data);
 
-                  if (this.__cache[itemId][item.id]) {
-                    this.__cache[itemId][item.id].emit('delete');
-                    this.__cache[itemId][item.id].destroy();
+                  if (this.__cache[itemId][data.id]) {
+                    const item = this.__cache[itemId][data.id];
+                    item.__delete();
                     delete this.__cache[itemId][item.id];
                   }
 
-                  return this.emit(`${itemId}.delete`, {
-                    id: item.id,
-                  });
+                  break;
                 }
                 default:
                   break;

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

@@ -195,7 +195,9 @@ class Device extends Item {
       }), {});
   }
 
-  static transform(item) {
+  static transformGet(item) {
+    item = super.transformGet(item);
+
     if (item.capabilitiesObj) {
       for (const capabilityObj of Object.values(item.capabilitiesObj)) {
         if (capabilityObj.lastUpdated) {

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

@@ -4,6 +4,14 @@ const Item = require('../Item');
 
 class FlowCard extends Item {
 
+  static transformGet(item) {
+    item = super.transformGet(item);
+
+    delete item.ownerName; // Prepare for back-end change
+
+    return item;
+  }
+
 }
 
 module.exports = FlowCard;

package/lib/HomeyAPI/HomeyAPIV3/ManagerFlowToken/FlowToken.js

@@ -5,10 +5,13 @@ const Item = require('../Item');
 class FlowToken extends Item {
 
   // TODO: Remove when back-end has removed these properties.
-  static transform(item) {
+  static transformGet(item) {
+    item = super.transformGet(item);
+
     delete item.uri;
     delete item.id;
     delete item.uriObj;
+    delete item.ownerName; // Prepare for back-end change
   }
 
 }

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

@@ -10,6 +10,14 @@ class Log extends Item {
     });
   }
 
+  static transformGet(item) {
+    item = super.transformGet(item);
+
+    delete item.ownerName; // Prepare for back-end change
+
+    return item;
+  }
+
 }
 
 module.exports = Log;

package/package.json

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