node-red-contrib-alice 0.6.11 → 1.0.0

package/README.md

@@ -10,6 +10,7 @@
 ![NPM Downloads per month](https://img.shields.io/npm/dm/node-red-contrib-alice)
 [![issues](https://img.shields.io/github/issues/efa2000/node-red-contrib-alice?logo=github)](https://github.com/efa2000/node-red-contrib-alice/issues)
 
+## ВАЖНО !!!! с 28-го марта 2022 г. в связи с необходимостью перехода на новую версию, временно приостанавливается работа сервиса 
 
 **NodeRed Home** (node-red-contrib-alice) - это бесплатный сервис который позволит, в несколько простых шагов, подключить любые ваши устройства заведенные в Node-RED к умному дому от Яндекса и управлять ими с помощью голосового помощника Алиса.
 

package/nodes/alice-color.js

@@ -4,6 +4,7 @@ module.exports = function(RED) {
   function AliceColor(config){
     RED.nodes.createNode(this,config);
     this.device = RED.nodes.getNode(config.device);
+    this.device.setMaxListeners(this.device.getMaxListeners() + 1); // увеличиваем лимит для event
     this.name = config.name;
     this.ctype = 'devices.capabilities.color_setting';
     this.instance = 'color_model';
@@ -30,7 +31,6 @@ module.exports = function(RED) {
     };
 
     this.init = ()=>{
-      this.ref = this.device.getRef(this.id);
       var value = 0;
       if (this.scheme=="hsv"){
         value = {
@@ -46,10 +46,6 @@ module.exports = function(RED) {
         parameters: {
           // instance: this.scheme,//this.instance,
           // color_model: this.scheme
-        },
-        state: {
-          updatedfrom:"node-red",
-          updated: this.device.getTime()
         }
       };
       if (!this.color_support && !this.temperature_k && this.color_scene.length<1){
@@ -65,31 +61,31 @@ module.exports = function(RED) {
         capab.parameters.color_scene = {
           scenes:scenes
         };
-        capab.state.instance = 'scene';
-        capab.state.value = this.color_scene[0];
+        // capab.state.instance = 'scene';
+        // capab.state.value = this.color_scene[0];
       };
       if (this.color_support){
         capab.parameters.color_model = this.scheme;
-        capab.state.instance = this.scheme;
-        if (this.scheme=="hsv"){
-          capab.state.value = {h:0,s:0,v:0};
-        }else{
-          capab.state.value = 0;
-        }
+        // capab.state.instance = this.scheme;
+        // if (this.scheme=="hsv"){
+        //   capab.state.value = {h:0,s:0,v:0};
+        // }else{
+        //   capab.state.value = 0;
+        // }
       };
       if (this.temperature_k){
         capab.parameters.temperature_k = {
           min: this.temperature_min,
           max: this.temperature_max
         };
-        capab.state.instance = 'temperature_k';
-        capab.state.value = this.temperature_min;
+        // capab.state.instance = 'temperature_k';
+        // capab.state.value = this.temperature_min;
       };
 
       this.device.setCapability(this.id,capab)
         .then(res=>{
           this.initState = true;
-          this.value = JSON.stringify(capab.state.value);
+          // this.value = JSON.stringify(capab.state.value);
           this.status({fill:"green",shape:"dot",text:"online"});
         })
         .catch(err=>{
@@ -133,12 +129,13 @@ module.exports = function(RED) {
           break;
       }
       this.send(outmsgs);
-// возвращаем подтверждение в базу 
-      let state = {
-        instance: newstate.instance,
-        value: val,
-        updatedfrom: "node-red",
-        updated: this.device.getTime()
+// возвращаем подтверждение в базу
+      let state= {
+        type:this.ctype,
+        state:{
+          instance:  newstate.instance,
+          value: val
+        }
       };
       if (this.response){
         this.device.updateCapabState(this.id,state)
@@ -155,10 +152,7 @@ module.exports = function(RED) {
 
     this.on('input', (msg, send, done)=>{
       let value = msg.payload;
-      let state = {
-        updatedfrom: "node-red",
-        updated: this.device.getTime()
-      };
+      let state = {};
       switch (typeof value) {
         case 'object':
           if ((value.r>-1 && value.g>-1 && value.b>-1) || (value.h>-1 && value.s>-1 && value.v>-1)){
@@ -204,8 +198,11 @@ module.exports = function(RED) {
         if (done) {done();}
         return;
       };
-
-      this.device.updateCapabState(this.id,state)
+      let upState= {
+        type:this.ctype,
+        state:state
+      };
+      this.device.updateCapabState(this.id,upState)
       .then(ref=>{
         this.value = JSON.stringify(value);
         this.status({fill:"green",shape:"dot",text:JSON.stringify(msg.payload)});

package/nodes/alice-mode.js

@@ -38,17 +38,11 @@ module.exports = function(RED) {
         parameters: {
           instance: this.instance,
           modes: cfgModes
-        },
-        state: {
-          value: this.modes[0],
-          updatedfrom:"node-red",
-          updated: this.device.getTime()
         }
       };
       this.device.setCapability(this.id,capab)
       .then(res=>{
         this.initState = true;
-        this.value = capab.state.value;
         this.status({fill:"green",shape:"dot",text:"online"});
       })
       .catch(err=>{
@@ -73,15 +67,17 @@ module.exports = function(RED) {
       this.send({
         payload: value
       });
-      let state = {
-        value: value,
-        updatedfrom: "node-red",
-        updated: this.device.getTime()
+      let state= {
+        type:this.ctype,
+        state:{
+          instance: this.instance,
+          value: value
+        }
       };
       if (this.response){
         this.device.updateCapabState(this.id,state)
         .then (res=>{
-          this.value = val;
+          this.value = value;
           this.status({fill:"green",shape:"dot",text:"online"});
         })
         .catch(err=>{
@@ -110,10 +106,12 @@ module.exports = function(RED) {
         if (done) {done();}
         return;
       };
-      let state = {
-        value: value,
-        updatedfrom: "node-red",
-        updated: this.device.getTime()
+      let state= {
+        type:this.ctype,
+        state:{
+          instance: this.instance,
+          value: value
+        }
       };
       this.device.updateCapabState(this.id,state)
       .then(ref=>{

package/nodes/alice-onoff.js

@@ -2,24 +2,26 @@ module.exports = function(RED) {
 // ************** ON/OFF *******************
 function AliceOnOff(config){
     RED.nodes.createNode(this,config);
-    this.device = RED.nodes.getNode(config.device);
-    this.name = config.name;
-    this.response = config.response;
-    this.ctype = 'devices.capabilities.on_off';
-    this.retrievable = config.retrievable;
-    this.split = false;
-    this.instance = 'on';
-    this.initState = false;
-    this.value;
+    const device = RED.nodes.getNode(config.device);
+    device.setMaxListeners(device.getMaxListeners() + 1); // увеличиваем лимит для event
+    const id =JSON.parse(JSON.stringify(this.id));
+    const name = config.name;
+    const ctype = 'devices.capabilities.on_off';
+    const instance = 'on';
+    let response = config.response;
+    let retrievable = config.retrievable;
+    let split = false;
+    let value;
+    let initState = false;
 
     if (config.response === undefined){
-        this.response = true;
+        response = true;
     };
     if (config.retrievable === undefined){
-      this.retrievable = true;
+      retrievable = true;
     };
-    if (!this.retrievable){
-      this.split = true;
+    if (!retrievable){
+      split = true;
     };
 
     this.status({fill:"red",shape:"dot",text:"offline"});
@@ -27,23 +29,18 @@ function AliceOnOff(config){
     this.init = ()=>{
       this.debug("Starting capability initilization ...");
       let capab = {
-        type: this.ctype,
-        retrievable: this.retrievable,
+        type: ctype,
+        retrievable: retrievable,
         parameters: {
-          instance: this.instance,
-          split: this.split
-        },
-        state: {
-          value: false,
-          updatedfrom:"node-red",
-          updated: this.device.getTime()
+          instance: instance,
+          split: split
         }
       };
-      this.device.setCapability(this.id,capab)
+
+      device.setCapability(id,capab)
       .then(res=>{
         this.debug("Capability initilization - success!");
-        this.initState = true;
-        this.value = capab.state.value;
+        initState = true;
         this.status({fill:"green",shape:"dot",text:"online"});
       })
       .catch(err=>{
@@ -53,30 +50,32 @@ function AliceOnOff(config){
     };
 
     // Проверяем сам девайс уже инициирован 
-    if (this.device.initState) this.init();
+    if (device.initState) this.init();
 
-    this.device.on("online",()=>{
+    device.on("online",()=>{
       this.init();
     });
 
-    this.device.on("offline",()=>{
+    device.on("offline",()=>{
       this.status({fill:"red",shape:"dot",text:"offline"});
     });
 
-    this.device.on(this.id,(val)=>{
+    device.on(id,(val)=>{
       this.send({
         payload: val
       });
-      let state = {
-        value: val,
-        updatedfrom: "node-red",
-        updated: this.device.getTime()
+      let state= {
+        type:ctype,
+        state:{
+          instance: instance,
+          value: val
+        }
       };
-      if (this.response){
-          this.device.updateCapabState(this.id,state)
+      if (response){
+          device.updateCapabState(id,state)
           .then (res=>{
-            this.value = val;
-            this.status({fill:"green",shape:"dot",text:"online"});
+            value = val;
+            this.status({fill:"green",shape:"dot",text:val.toString()});
           })
           .catch(err=>{
             this.error("Error on update capability state: " + err.message);
@@ -91,19 +90,21 @@ function AliceOnOff(config){
         if (done) {done();}
         return;
       };
-      if (msg.payload === this.value){
+      if (msg.payload === value){
         this.debug("Value not changed. Cancel update");
         if (done) {done();}
         return;
       };
-      let state = {
-        value: msg.payload,
-        updatedfrom: "node-red",
-        updated: this.device.getTime()
+      let state= {
+        type:ctype,
+        state:{
+          instance: instance,
+          value: msg.payload
+        }
       };
-      this.device.updateCapabState(this.id,state)
+      device.updateCapabState(id,state)
       .then(ref=>{
-        this.value = msg.payload;
+        value = msg.payload;
         this.status({fill:"green",shape:"dot",text:msg.payload.toString()});
         if (done) {done();}
       })
@@ -115,8 +116,9 @@ function AliceOnOff(config){
     });
 
     this.on('close', (removed, done)=>{
+      device.setMaxListeners(device.getMaxListeners() - 1);
       if (removed) {
-        this.device.delCapability(this.id)
+        device.delCapability(id)
         .then(res=>{
           done()
         })
@@ -124,9 +126,9 @@ function AliceOnOff(config){
           this.error("Error on delete capability: " + err.message);
           done();
         })
-      }else{
-        done();
-      }
+      };
+      done();
+      return;
     });
   }  
   RED.nodes.registerType("On_Off",AliceOnOff);

package/nodes/alice-range.js

@@ -3,6 +3,7 @@ module.exports = function(RED) {
   function AliceRange(config){
     RED.nodes.createNode(this,config);
     this.device = RED.nodes.getNode(config.device);
+    this.device.setMaxListeners(this.device.getMaxListeners() + 1); // увеличиваем лимит для event
     this.name = config.name;
     this.ctype = 'devices.capabilities.range';
     this.retrievable = config.retrievable;
@@ -26,7 +27,6 @@ module.exports = function(RED) {
     this.status({fill:"red",shape:"dot",text:"offline"});
 
     this.init = ()=>{
-      this.ref = this.device.getRef(this.id);
       let capab = {
         type: this.ctype,
         retrievable: this.retrievable,
@@ -39,11 +39,6 @@ module.exports = function(RED) {
               max: this.max,
               precision: this.precision
           }
-        },
-        state: {
-          value: this.min,
-          updatedfrom:"node-red",
-          updated: this.device.getTime()
         }
       };
       // если unit не пременим к параметру, то нужно удалить 
@@ -54,7 +49,6 @@ module.exports = function(RED) {
       this.device.setCapability(this.id,capab)
       .then(res=>{
         this.initState = true;
-        this.value = capab.state.value;
         this.status({fill:"green",shape:"dot",text:"online"});
       })
       .catch(err=>{
@@ -85,13 +79,15 @@ module.exports = function(RED) {
       this.send({
         payload: value
       });
-//      this.value = value;
-      let state = {
-        value: value,
-        updatedfrom: "node-red",
-        updated: this.device.getTime()
+      let state= {
+        type:this.ctype,
+        state:{
+          instance: this.instance,
+          value: value
+        }
       };
       // если установлено требование немедленно отвечать, отвечаем
+      console.log(this.response);
       if (this.response){
         this.device.updateCapabState(this.id,state)
         .then (res=>{
@@ -117,10 +113,12 @@ module.exports = function(RED) {
         if (done) {done();}
         return;
       };
-      let state = {
-        value: value,
-        updatedfrom: "node-red",
-        updated: this.device.getTime()
+      let state= {
+        type:this.ctype,
+        state:{
+          instance: this.instance,
+          value: value
+        }
       };
       this.device.updateCapabState(this.id,state)
       .then(ref=>{
@@ -135,7 +133,8 @@ module.exports = function(RED) {
       })
     });
 
-    this.on('close', function(removed, done) {
+    this.on('close', (removed, done)=>{
+      this.device.setMaxListeners(this.device.getMaxListeners() - 1); // уменьшаем лимит для event
       if (removed) {
         this.device.delCapability(this.id)
         .then(res=>{

package/nodes/alice-sensor.js

@@ -3,6 +3,7 @@ module.exports = function(RED) {
 function AliceSensor(config){
     RED.nodes.createNode(this,config);
     this.device = RED.nodes.getNode(config.device);
+    this.device.setMaxListeners(this.device.getMaxListeners() + 1); // увеличиваем лимит для event
     this.name = config.name;
     this.stype = config.stype;
     this.reportable = true;
@@ -15,6 +16,7 @@ function AliceSensor(config){
     this.status({fill:"red",shape:"dot",text:"offline"});
 
     this.init = ()=>{
+      this.debug("Starting sensor initilization ...");
       let sensor = {
         type: this.stype,
         reportable: this.reportable,
@@ -22,20 +24,12 @@ function AliceSensor(config){
         parameters: {
           instance: this.instance,
           unit: this.unit
-        },
-        state: {
-          value: 0,
-          updatedfrom:"node-red",
-          updated: this.device.getTime()
         }
       };
-      if (this.stype == 'devices.properties.bool'){
-        delete sensor.parameters.unit;
-        sensor.state.value=false;
-      }
-      this.value = sensor.state.value;
+
       this.device.setSensor(this.id,sensor)
         .then(res=>{
+          this.debug("Sensor initilization - success!");
           this.status({fill:"green",shape:"dot",text:"online"});
           this.initState = true;
         })
@@ -57,11 +51,6 @@ function AliceSensor(config){
     });
 
     this.on('input', (msg, send, done)=>{
-      // if (this.stype =='devices.properties.bool' && typeof msg.payload != 'boolean'){
-      //   this.error("Wrong type! msg.payload must be boolean.");
-      //   if (done) {done();}
-      //   return;
-      // };
       if (this.stype =='devices.properties.float' && typeof msg.payload != 'number'){
         this.error("Wrong type! msg.payload must be number.");
         if (done) {done();}
@@ -77,11 +66,14 @@ function AliceSensor(config){
         if (done) {done();}
         return;
       };
-      this.device.updateSensorState(this.id,{
-        value: msg.payload,
-        updatedfrom: "node-red",
-        updated: this.device.getTime()
-      })
+      let state= {
+        type:this.stype,
+        state:{
+          instance: this.instance,
+          value: msg.payload
+        }
+      };
+      this.device.updateSensorState(this.id,state)
       .then(ref=>{
         this.value = msg.payload;
         this.status({fill:"green",shape:"dot",text: msg.payload});

package/nodes/alice-togle.js

@@ -3,6 +3,7 @@ module.exports = function(RED) {
   function AliceToggle(config){
     RED.nodes.createNode(this,config);
     this.device = RED.nodes.getNode(config.device);
+    this.device.setMaxListeners(this.device.getMaxListeners() + 1); // увеличиваем лимит для event
     this.name = config.name;
     this.ctype = 'devices.capabilities.toggle';
     this.instance = config.instance;
@@ -17,24 +18,20 @@ module.exports = function(RED) {
     this.status({fill:"red",shape:"dot",text:"offline"});
 
     this.init = ()=>{
-      this.ref = this.device.getRef(this.id);
+      this.debug("Starting capability initilization ...");
       let capab = {
         type: this.ctype,
         retrievable: true,
         reportable: true,
         parameters: {
           instance: this.instance,
-        },
-        state: {
-          value: false,
-          updatedfrom:"node-red",
-          updated: this.device.getTime()
         }
       };
       this.device.setCapability(this.id,capab)
         .then(res=>{
           this.initState = true;
-          this.value = capab.state.value;
+          // this.value = capab.state.value;
+          this.debug("Capability initilization - success!");
           this.status({fill:"green",shape:"dot",text:"online"});
         })
         .catch(err=>{
@@ -59,11 +56,13 @@ module.exports = function(RED) {
       this.send({
         payload: val
       });
-      let state={
-          value: val,
-          updatedfrom: "node-red",
-          updated: this.device.getTime()
-        };
+      let state= {
+        type:this.ctype,
+        state:{
+          instance: this.instance,
+          value: val
+        }
+      };
       if (this.response){
         this.debug("Automatic confirmation is true, sending confirmation to Yandex ...");
         this.device.updateCapabState(this.id,state)
@@ -89,10 +88,12 @@ module.exports = function(RED) {
         if (done) {done();}
         return;
       };
-      let state = {
-        value: msg.payload,
-        updatedfrom: "node-red",
-        updated: this.device.getTime()
+      let state= {
+        type:this.ctype,
+        state:{
+          instance: this.instance,
+          value: msg.payload
+        }
       };
       this.device.updateCapabState(this.id,state)
       .then(ref=>{