node-red-contrib-alice 2.2.4 → 2.3.2

package/nodes/alice-onoff.js

@@ -1,131 +1,127 @@
-module.exports = function(RED) {
-// ************** ON/OFF *******************
-function AliceOnOff(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 ctype = 'devices.capabilities.on_off';
-    const instance = 'on';
-    let response = config.response;
-    let split = config.split;
-    let initState = false;
-    let curentState = {
-      type:ctype,
-      state:{
-        instance: instance,
-        value: false
-      }
-    };
-
-    if (config.response === undefined){
-        response = true;
-    };
-    if (config.split === undefined){
-      split = false;
-    };
-
-    this.status({fill:"red",shape:"dot",text:"offline"});
-
-    this.init = ()=>{
-      this.debug("Starting capability initilization ...");
-      let capab = {
-        type: ctype,
-        retrievable: true,
-        reportable: true,
-        parameters: {
-          instance: instance,
-          split: split
+"use strict";
+module.exports = (RED) => {
+    function AliceOnOff(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 ctype = 'devices.capabilities.on_off';
+        const instance = 'on';
+        let response = config.response;
+        let split = config.split;
+        let initState = false;
+        const curentState = {
+            type: ctype,
+            state: {
+                instance: instance,
+                value: false
+            }
+        };
+        if (config.response === undefined) {
+            response = true;
         }
-      };
-
-      device.setCapability(id,capab)
-      .then(res=>{
-        this.debug("Capability initilization - success!");
-        initState = true;
-        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"});
-      });
-      device.updateCapabState(id,curentState)
-      .then (res=>{
-        this.status({fill:"green",shape:"dot",text:"online"});
-      })
-      .catch(err=>{
-        this.error("Error on update capability state: " + err.message);
-        this.status({fill:"red",shape:"dot",text:"Error"});
-      });
-    };
-
-    // Проверяем сам девайс уже инициирован 
-    if (device.initState) this.init();
-
-    device.on("online",()=>{
-      this.init();
-    });
-
-    device.on("offline",()=>{
-      this.status({fill:"red",shape:"dot",text:"offline"});
-    });
-
-    device.on(id,(val)=>{
-      this.send({
-        payload: val
-      });
-      if (response){
-          curentState.state.value = val;
-          device.updateCapabState(id,curentState)
-          .then (res=>{
-            this.status({fill:"green",shape:"dot",text:val.toString()});
-          })
-          .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 === curentState.state.value){
-        this.debug("Value not changed. Cancel update");
-        if (done) {done();}
-        return;
-      };
-      curentState.state.value = msg.payload;
-      device.updateCapabState(id,curentState)
-      .then(ref=>{
-        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)=>{
-      device.setMaxListeners(device.getMaxListeners() - 1);
-      if (removed) {
-        device.delCapability(id)
-        .then(res=>{
-          done()
-        })
-        .catch(err=>{
-          this.error("Error on delete capability: " + err.message);
-          done();
-        })
-      };
-      done();
-      return;
-    });
-  }  
-  RED.nodes.registerType("On_Off",AliceOnOff);
-};
+        if (config.split === undefined) {
+            split = false;
+        }
+        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,
+                    split: split
+                }
+            };
+            device.setCapability(id, capab)
+                .then(() => {
+                this.debug("Capability initilization - success!");
+                initState = true;
+                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" });
+            });
+            device.updateCapabState(id, curentState)
+                .then(() => {
+                this.status({ fill: "green", shape: "dot", text: "online" });
+            })
+                .catch(err => {
+                this.error("Error on update capability state: " + err.message);
+                this.status({ fill: "red", shape: "dot", text: "Error" });
+            });
+        };
+        if (device.initState)
+            init();
+        device.on("online", () => {
+            init();
+        });
+        device.on("offline", () => {
+            this.status({ fill: "red", shape: "dot", text: "offline" });
+        });
+        device.on(id, (val) => {
+            this.send({ payload: val });
+            if (response) {
+                curentState.state.value = val;
+                device.updateCapabState(id, curentState)
+                    .then(() => {
+                    this.status({ fill: "green", shape: "dot", text: val.toString() });
+                })
+                    .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 === curentState.state.value) {
+                this.debug("Value not changed. Cancel update");
+                if (done) {
+                    done();
+                }
+                return;
+            }
+            curentState.state.value = msg.payload;
+            device.updateCapabState(id, curentState)
+                .then(() => {
+                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) => {
+            device.setMaxListeners(device.getMaxListeners() - 1);
+            if (removed) {
+                device.delCapability(id)
+                    .then(() => { done(); })
+                    .catch(err => {
+                    this.error("Error on delete capability: " + err.message);
+                    done();
+                });
+            }
+            else {
+                done();
+            }
+        });
+    }
+    RED.nodes.registerType("On_Off", AliceOnOff);
+};
+//# sourceMappingURL=alice-onoff.js.map

package/nodes/alice-range.js

@@ -1,153 +1,147 @@
-module.exports = function(RED) {
-      // ************** Range  *******************
-  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;
-    this.instance = config.instance;
-    this.unit = config.unit;
-    this.random_access = true;
-    this.min = parseFloat(config.min);
-    this.max = parseFloat(config.max);
-    this.precision = parseFloat(config.precision);
-    this.response = config.response;
-    this.initState = false;
-    this.value = null;
-
-    if (config.response === undefined){
-      this.response = true;
-    };
-    if (typeof this.min != 'number'){this.min = 0};
-    if (typeof this.max != 'number'){this.max = 100};
-    if (typeof this.precision != 'number'){this.precision = 1};
-
-    this.status({fill:"red",shape:"dot",text:"offline"});
-
-    this.init = ()=>{
-      let capab = {
-        type: this.ctype,
-        retrievable: this.retrievable,
-        reportable: true,
-        parameters: {
-          instance: this.instance,
-          unit: this.unit,
-          random_access: this.random_access,
-          range: {
-              min: this.min,
-              max: this.max,
-              precision: this.precision
-          }
+"use strict";
+module.exports = (RED) => {
+    function AliceRange(config) {
+        RED.nodes.createNode(this, config);
+        const device = RED.nodes.getNode(config.device);
+        device.setMaxListeners(device.getMaxListeners() + 1);
+        const ctype = 'devices.capabilities.range';
+        const retrievable = config.retrievable;
+        const instance = config.instance || '';
+        const unit = config.unit;
+        const random_access = true;
+        let min = parseFloat(config.min);
+        let max = parseFloat(config.max);
+        let precision = parseFloat(config.precision);
+        let response = config.response;
+        let value = null;
+        if (config.response === undefined) {
+            response = true;
         }
-      };
-      // если unit не пременим к параметру, то нужно удалить 
-      if (this.unit == "unit.number"){
-        delete capab.parameters.unit;
-      };
-
-      this.device.setCapability(this.id,capab)
-      .then(res=>{
-        this.initState = true;
-        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 (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, fullstate)=>{
-      let value = val;
-      //проверка является ли значение относительным и нужно ли отдавать полное значение
-      if (fullstate.relative && this.retrievable){
-        value = this.value + val;
-        if (val<0 && value<this.min) value=this.min;
-        if (val>0 && value>this.max) value=this.max;
-      };
-      this.send({
-        payload: value
-      });
-      let state= {
-        type:this.ctype,
-        state:{
-          instance: this.instance,
-          value: value
+        if (typeof min != 'number' || isNaN(min)) {
+            min = 0;
         }
-      };
-      // если установлено требование немедленно отвечать, отвечаем
-      if (this.response){
-        this.device.updateCapabState(this.id,state)
-        .then (res=>{
-          this.value = value;
-          this.status({fill:"green",shape:"dot",text:"online"});
-        })
-        .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)=>{
-      const value = msg.payload;
-      if (typeof value != 'number'){
-        this.error("Wrong type! msg.payload must be Number.");
-        if (done) {done();}
-        return;
-      }
-      if (value === this.value){
-        this.debug("Value not changed. Cancel update");
-        if (done) {done();}
-        return;
-      };
-      let state= {
-        type:this.ctype,
-        state:{
-          instance: this.instance,
-          value: value
+        if (typeof max != 'number' || isNaN(max)) {
+            max = 100;
         }
-      };
-      this.device.updateCapabState(this.id,state)
-      .then(ref=>{
-        this.value = value;
-        this.status({fill:"green",shape:"dot",text:value});
-        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)=>{
-      this.device.setMaxListeners(this.device.getMaxListeners() - 1); // уменьшаем лимит для event
-      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("Range",AliceRange);
-};
+        if (typeof precision != 'number' || isNaN(precision)) {
+            precision = 1;
+        }
+        this.status({ fill: "red", shape: "dot", text: "offline" });
+        const init = () => {
+            const parameters = {
+                instance: instance,
+                unit: unit,
+                random_access: random_access,
+                range: { min, max, precision }
+            };
+            if (unit == "unit.number") {
+                delete parameters.unit;
+            }
+            device.setCapability(this.id, {
+                type: ctype,
+                retrievable: retrievable,
+                reportable: true,
+                parameters: parameters
+            })
+                .then(() => {
+                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();
+        });
+        device.on("offline", () => {
+            this.status({ fill: "red", shape: "dot", text: "offline" });
+        });
+        device.on(this.id, (val, fullstate) => {
+            let newValue = val;
+            if (fullstate.relative && retrievable && value !== null) {
+                newValue = value + val;
+                if (val < 0 && newValue < min)
+                    newValue = min;
+                if (val > 0 && newValue > max)
+                    newValue = max;
+            }
+            this.send({ payload: newValue });
+            const state = {
+                type: ctype,
+                state: {
+                    instance: instance,
+                    value: newValue
+                }
+            };
+            if (response) {
+                device.updateCapabState(this.id, state)
+                    .then(() => {
+                    value = newValue;
+                    this.status({ fill: "green", shape: "dot", text: "online" });
+                })
+                    .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) => {
+            const newValue = msg.payload;
+            if (typeof newValue != 'number') {
+                this.error("Wrong type! msg.payload must be Number.");
+                if (done) {
+                    done();
+                }
+                return;
+            }
+            if (newValue === value) {
+                this.debug("Value not changed. Cancel update");
+                if (done) {
+                    done();
+                }
+                return;
+            }
+            const state = {
+                type: ctype,
+                state: {
+                    instance: instance,
+                    value: newValue
+                }
+            };
+            device.updateCapabState(this.id, state)
+                .then(() => {
+                value = newValue;
+                this.status({ fill: "green", shape: "dot", text: String(newValue) });
+                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) => {
+            device.setMaxListeners(device.getMaxListeners() - 1);
+            if (removed) {
+                device.delCapability(this.id)
+                    .then(() => { done(); })
+                    .catch(err => {
+                    this.error("Error on delete capability: " + err.message);
+                    done();
+                });
+            }
+            else {
+                done();
+            }
+        });
+    }
+    RED.nodes.registerType("Range", AliceRange);
+};
+//# sourceMappingURL=alice-range.js.map

package/nodes/alice-sensor.html

@@ -214,8 +214,6 @@
                         .find('option')
                         .remove()
                         .end()
-                        // .append('<option value="unit.gigacalorie">Gcal</option>')
-                        // .val('unit.gigacalorie')
                         .prop('disabled', 'disabled');
                     break;
                     default: