node-red-contrib-alice 2.2.5 → 2.3.3

package/nodes/alice-sensor.js

@@ -1,107 +1,106 @@
-module.exports = function(RED) {
-// ************** ON/OFF *******************
-function AliceSensor(config){
-    RED.nodes.createNode(this,config);
-    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 stype = config.stype;
-    const reportable = true;
-    const retrievable = true;
-    const unit = config.unit;
-    const instance = config.instance;
-    let initState = false;
-    // this.value;
-    let curentState= {
-      type:stype,
-      state:{
-        instance: instance,
-        value: 0
-      }
-    };
-
-    this.status({fill:"red",shape:"dot",text:"offline"});
-
-    this.init = ()=>{
-      this.debug("Starting sensor initilization ...");
-      let sensor = {
-        type: stype,
-        reportable: reportable,
-        retrievable: retrievable,
-        parameters: {
-          instance: instance,
-          unit: unit
-        }
-      };
-
-      device.setSensor(id,sensor)
-        .then(res=>{
-          this.debug("Sensor initilization - success!");
-          this.status({fill:"green",shape:"dot",text:"online"});
-          initState = true;
-        })
-        .catch(err=>{
-          this.error("Error on create sensor: " +err.message);
-          this.status({fill:"red",shape:"dot",text:"error"});
+"use strict";
+module.exports = (RED) => {
+    function AliceSensor(config) {
+        RED.nodes.createNode(this, config);
+        const device = RED.nodes.getNode(config.device);
+        device.setMaxListeners(device.getMaxListeners() + 1);
+        const id = JSON.parse(JSON.stringify(this.id));
+        const stype = config.stype;
+        const unit = config.unit;
+        const instance = config.instance;
+        const curentState = {
+            type: stype,
+            state: {
+                instance: instance,
+                value: 0
+            }
+        };
+        let lastUpdateTime = 0;
+        const UPDATE_INTERVAL = 10 * 60 * 1000;
+        this.status({ fill: "red", shape: "dot", text: "offline" });
+        const init = () => {
+            this.debug("Starting sensor initilization ...");
+            const sensor = {
+                type: stype,
+                reportable: true,
+                retrievable: true,
+                parameters: {
+                    instance: instance,
+                    unit: unit
+                }
+            };
+            device.setSensor(id, sensor)
+                .then(() => {
+                this.debug("Sensor initilization - success!");
+                this.status({ fill: "green", shape: "dot", text: "online" });
+            })
+                .catch(err => {
+                this.error("Error on create sensor: " + err.message);
+                this.status({ fill: "red", shape: "dot", text: "error" });
+            });
+        };
+        if (device.initState)
+            init();
+        device.on("online", () => {
+            init();
         });
-    };
-
-// Проверяем сам девайс уже инициирован 
-    if (device.initState) this.init();
-
-    device.on("online",()=>{
-      this.init();
-    });
-
-    device.on("offline",()=>{
-      this.status({fill:"red",shape:"dot",text:"offline"});
-    });
-
-    this.on('input', (msg, send, done)=>{
-      if (typeof msg.payload != 'number'){
-        this.error("Wrong type! msg.payload must be number.");
-        if (done) {done();}
-        return;
-      };
-      if (unit == 'unit.temperature.celsius' || unit == 'unit.ampere'){
-        msg.payload = +msg.payload.toFixed(1);
-      }else {
-        msg.payload = +msg.payload.toFixed(0);
-      };
-      if (curentState.state.value == msg.payload){
-        this.debug("Value not changed. Cancel update");
-        if (done) {done();}
-        return;
-      };
-      curentState.state.value = msg.payload;
-      device.updateSensorState(id,curentState)
-      .then(ref=>{
-        this.status({fill:"green",shape:"dot",text: msg.payload});
-        if (done) {done();}
-      })
-      .catch(err=>{
-        this.error("Error on update sensor state: " +err.message);
-        this.status({fill:"red",shape:"dot",text:"Error"});
-        if (done) {done();}
-      })
-    });
-
-    this.on('close', function(removed, done) {
-      if (removed) {
-        device.delSensor(id)
-        .then(res=>{
-          done()
-        })
-        .catch(err=>{
-          this.error("Error on delete property: " +err.message);
-          done();
-        })
-      }else{
-        device.setMaxListeners(device.getMaxListeners() - 1);
-        done();
-      }
-    });
-  }  
-  RED.nodes.registerType("Sensor",AliceSensor);
-};
+        device.on("offline", () => {
+            this.status({ fill: "red", shape: "dot", text: "offline" });
+        });
+        this.on('input', (msg, _send, done) => {
+            if (typeof msg.payload != 'number') {
+                this.error("Wrong type! msg.payload must be number.");
+                if (done) {
+                    done();
+                }
+                return;
+            }
+            if (unit == 'unit.temperature.celsius' || unit == 'unit.ampere' || unit == 'unit.pressure.bar') {
+                msg.payload = +msg.payload.toFixed(1);
+            }
+            else {
+                msg.payload = +msg.payload.toFixed(0);
+            }
+            const timeSinceLastUpdate = Date.now() - lastUpdateTime;
+            if (curentState.state.value == msg.payload && timeSinceLastUpdate < UPDATE_INTERVAL) {
+                this.debug("Value not changed. Cancel update");
+                if (done) {
+                    done();
+                }
+                return;
+            }
+            curentState.state.value = msg.payload;
+            lastUpdateTime = Date.now();
+            device.updateSensorState(id, curentState)
+                .then(() => {
+                this.status({ fill: "green", shape: "dot", text: String(msg.payload) });
+                if (done) {
+                    done();
+                }
+            })
+                .catch(err => {
+                this.error("Error on update sensor state: " + err.message);
+                this.status({ fill: "red", shape: "dot", text: "Error" });
+                if (done) {
+                    done();
+                }
+            });
+        });
+        this.on('close', (removed, done) => {
+            if (removed) {
+                device.delSensor(id)
+                    .then(() => { done(); })
+                    .catch(err => {
+                    this.error("Error on delete property: " + err.message);
+                    done();
+                });
+            }
+            else {
+                device.setMaxListeners(device.getMaxListeners() - 1);
+                done();
+            }
+        });
+    }
+    RED.nodes.registerType("Sensor", AliceSensor);
+};
+//# sourceMappingURL=alice-sensor.js.map

package/nodes/alice-togle.js

@@ -1,127 +1,120 @@
-module.exports = function(RED) {
- // ************** Toggle *******************
-  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;
-    this.response = config.response;
-    this.initState = false;
-    this.value = false;
-
-    if (config.response === undefined){
-        this.response = true;
-    }
-
-    this.status({fill:"red",shape:"dot",text:"offline"});
-
-    this.init = ()=>{
-      this.debug("Starting capability initilization ...");
-      let capab = {
-        type: this.ctype,
-        retrievable: true,
-        reportable: true,
-        parameters: {
-          instance: this.instance,
+"use strict";
+module.exports = (RED) => {
+    function AliceToggle(config) {
+        RED.nodes.createNode(this, config);
+        const device = RED.nodes.getNode(config.device);
+        device.setMaxListeners(device.getMaxListeners() + 1);
+        const ctype = 'devices.capabilities.toggle';
+        const instance = config.instance || '';
+        let response = config.response;
+        let value = false;
+        if (config.response === undefined) {
+            response = true;
         }
-      };
-      this.device.setCapability(this.id,capab)
-        .then(res=>{
-          this.initState = true;
-          // this.value = capab.state.value;
-          this.debug("Capability initilization - success!");
-          this.status({fill:"green",shape:"dot",text:"online"});
-        })
-        .catch(err=>{
-          this.error("Error on create capability: " + err.message);
-          this.status({fill:"red",shape:"dot",text:"error"});
+        this.status({ fill: "red", shape: "dot", text: "offline" });
+        const init = () => {
+            this.debug("Starting capability initilization ...");
+            const capab = {
+                type: ctype,
+                retrievable: true,
+                reportable: true,
+                parameters: {
+                    instance: instance,
+                }
+            };
+            device.setCapability(this.id, capab)
+                .then(() => {
+                this.debug("Capability initilization - success!");
+                this.status({ fill: "green", shape: "dot", text: "online" });
+            })
+                .catch(err => {
+                this.error("Error on create capability: " + err.message);
+                this.status({ fill: "red", shape: "dot", text: "error" });
+            });
+        };
+        if (device.initState)
+            init();
+        device.on("online", () => {
+            init();
         });
-    };
-
-    // Проверяем сам девайс уже инициирован 
-    if (this.device.initState) this.init();
-
-    this.device.on("online",()=>{
-      this.init();
-    });
-
-    this.device.on("offline",()=>{
-      this.status({fill:"red",shape:"dot",text:"offline"});
-    });
-
-    this.device.on(this.id,(val)=>{
-      this.debug("Received a new value from Yandex...");
-      this.send({
-        payload: val
-      });
-      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)
-        .then (res=>{
-          this.value = val;
-          this.status({fill:"green",shape:"dot",text:val});
-        })
-        .catch(err=>{
-          this.error("Error on update capability state: " + err.message);
-          this.status({fill:"red",shape:"dot",text:"Error"});
-        })
-      };
-    })
-
-    this.on('input', (msg, send, done)=>{
-      if (typeof msg.payload != 'boolean'){
-        this.error("Wrong type! msg.payload must be boolean.");
-        if (done) {done();}
-        return;
-      };
-      if (msg.payload === this.value){
-        this.debug("Value not changed. Cancel update");
-        if (done) {done();}
-        return;
-      };
-      let state= {
-        type:this.ctype,
-        state:{
-          instance: this.instance,
-          value: msg.payload
-        }
-      };
-      this.device.updateCapabState(this.id,state)
-      .then(ref=>{
-        this.value = msg.payload;
-        this.status({fill:"green",shape:"dot",text:msg.payload.toString()});
-        if (done) {done();}
-      })
-      .catch(err=>{
-        this.error("Error on update capability state: " + err.message);
-        this.status({fill:"red",shape:"dot",text:"Error"});
-        if (done) {done();}
-      })
-    });
-
-    this.on('close', (removed, done)=>{
-      if (removed) {
-        this.device.delCapability(this.id)
-        .then(res=>{
-          done()
-        })
-        .catch(err=>{
-          this.error("Error on delete capability: " + err.message);
-          done();
-        })
-      }else{
-        done();
-      }
-    });
-  }  
-  RED.nodes.registerType("Toggle",AliceToggle);
-};
+        device.on("offline", () => {
+            this.status({ fill: "red", shape: "dot", text: "offline" });
+        });
+        device.on(this.id, (val) => {
+            this.debug("Received a new value from Yandex...");
+            this.send({ payload: val });
+            const state = {
+                type: ctype,
+                state: {
+                    instance: instance,
+                    value: val
+                }
+            };
+            if (response) {
+                this.debug("Automatic confirmation is true, sending confirmation to Yandex ...");
+                device.updateCapabState(this.id, state)
+                    .then(() => {
+                    value = val;
+                    this.status({ fill: "green", shape: "dot", text: String(val) });
+                })
+                    .catch(err => {
+                    this.error("Error on update capability state: " + err.message);
+                    this.status({ fill: "red", shape: "dot", text: "Error" });
+                });
+            }
+        });
+        this.on('input', (msg, _send, done) => {
+            if (typeof msg.payload != 'boolean') {
+                this.error("Wrong type! msg.payload must be boolean.");
+                if (done) {
+                    done();
+                }
+                return;
+            }
+            if (msg.payload === value) {
+                this.debug("Value not changed. Cancel update");
+                if (done) {
+                    done();
+                }
+                return;
+            }
+            const state = {
+                type: ctype,
+                state: {
+                    instance: instance,
+                    value: msg.payload
+                }
+            };
+            device.updateCapabState(this.id, state)
+                .then(() => {
+                value = msg.payload;
+                this.status({ fill: "green", shape: "dot", text: String(msg.payload) });
+                if (done) {
+                    done();
+                }
+            })
+                .catch(err => {
+                this.error("Error on update capability state: " + err.message);
+                this.status({ fill: "red", shape: "dot", text: "Error" });
+                if (done) {
+                    done();
+                }
+            });
+        });
+        this.on('close', (removed, done) => {
+            if (removed) {
+                device.delCapability(this.id)
+                    .then(() => { done(); })
+                    .catch(err => {
+                    this.error("Error on delete capability: " + err.message);
+                    done();
+                });
+            }
+            else {
+                done();
+            }
+        });
+    }
+    RED.nodes.registerType("Toggle", AliceToggle);
+};
+//# sourceMappingURL=alice-togle.js.map