node-red-contrib-alice 2.2.3 → 2.2.5

package/.eslintrc.json

@@ -0,0 +1,20 @@
+{
+    "env": {
+        "browser": true,
+        "es2021": true
+    },
+    "extends": [
+        "eslint:recommended",
+        "plugin:@typescript-eslint/recommended"
+    ],
+    "parser": "@typescript-eslint/parser",
+    "parserOptions": {
+        "ecmaVersion": "latest",
+        "sourceType": "module"
+    },
+    "plugins": [
+        "@typescript-eslint"
+    ],
+    "rules": {
+    }
+}

package/nodes/alice-device.html

@@ -16,7 +16,9 @@
                 types: [
                     {
                         options: [
-                            { value: "devices.types.light", label: "Light" }, 
+                            { value: "devices.types.light", label: "Light" },
+                            { value: "devices.types.light.ceiling", label: "Light Сeiling" },
+                            { value: "devices.types.light.strip", label: "Light Strip" },
                             { value: "devices.types.socket", label: "Socket" },
                             { value: "devices.types.switch", label: "Switch" },
                             { value: "devices.types.thermostat", label: "Thermostat"  },
@@ -32,8 +34,11 @@
                             { value: "devices.types.cooking.multicooker", label: "Multicooker" },
                             { value: "devices.types.openable", label: "Door, gate, window, shutters" },
                             { value: "devices.types.openable.curtain", label: "Curtains, blinds" },
+                            { value: "devices.types.openable.valve", label: "Valve (ball valve)" },
                             { value: "devices.types.humidifier", label: "Humidifier" },
                             { value: "devices.types.purifier", label: "Air purifier" },
+                            { value: "devices.types.ventilation", label: "Ventilation" },
+                            { value: "devices.types.ventilation.fan", label: "Fan" },
                             { value: "devices.types.vacuum_cleaner", label: "Vacuum cleaner robot" },
                             { value: "devices.types.washing_machine", label: "Washing machine" },
                             { value: "devices.types.dishwasher", label: "Dishwasher" },
@@ -86,50 +91,4 @@
         <label for="node-config-input-dtype">Type</label>
         <input type="text" id="node-config-input-dtype">
     </div>
-    <!-- <div class="form-row">
-        <label for="node-config-input-dtype">Type</label>
-        <select id="node-config-input-dtype" style="width: 70%;">
-            <option value="devices.types.light">Light</option>
-            <option value="devices.types.socket">Socket</option>
-            <option value="devices.types.switch" >Switch</option>
-            <option value="devices.types.thermostat">Thermostat</option>
-            <option value="devices.types.thermostat.ac">Air conditioning</option>
-            <option value="devices.types.media_device">Multimedia</option>
-            <option value="devices.types.media_device.tv">TV</option>
-            <option value="devices.types.media_device.tv_box">TV Box</option>
-            <option value="devices.types.media_device.receiver">AV Receiver</option>
-            <option value="devices.types.camera">Camera</option>
-            <option value="devices.types.cooking">Kitchen appliances</option>
-            <option value="devices.types.cooking.coffee_maker">Coffee machine</option>
-            <option value="devices.types.cooking.kettle">Smart kettle</option>
-            <option value="devices.types.cooking.multicooker">Multicooker</option>
-            <option value="devices.types.openable">Door, gate, window, shutters</option>
-            <option value="devices.types.openable.curtain">Curtains, blinds</option>
-            <option value="devices.types.humidifier">Humidifier</option>
-            <option value="devices.types.purifier">Air purifier</option>
-            <option value="devices.types.vacuum_cleaner">Vacuum cleaner robot</option>
-            <option value="devices.types.washing_machine">Washing machine</option>
-            <option value="devices.types.dishwasher">Dishwasher</option>
-            <option value="devices.types.iron">Iron, steam generator</option>
-            <option value="devices.types.sensor">Sensor</option>
-            <option value="devices.types.sensor.motion">Sensor motion</option>
-            <option value="devices.types.sensor.vibration">Sensor vibration</option>
-            <option value="devices.types.sensor.illumination">Sensor illumination</option>
-            <option value="devices.types.sensor.open">Sensor open</option>
-            <option value="devices.types.sensor.climate">Sensor climate</option>
-            <option value="devices.types.sensor.water_leak">Sensor water_leak</option>
-            <option value="devices.types.sensor.button">Sensor button</option>
-            <option value="devices.types.sensor.gas">Sensor gas</option>
-            <option value="devices.types.sensor.smoke">Sensor smoke</option>
-            <option value="devices.types.smart_meter">Counter</option>
-            <option value="devices.types.smart_meter.cold_water">Cold Water counter</option>
-            <option value="devices.types.smart_meter.hot_water">Hot Water counter</option>
-            <option value="devices.types.smart_meter.electricity">Electricity counter</option>
-            <option value="devices.types.smart_meter.gas">Gas counter</option>
-            <option value="devices.types.smart_meter.heat">Heat Water counter</option>
-            <option value="devices.types.pet_drinking_fountain">Pet drinking fountain</option>
-            <option value="devices.types.pet_feeder">Pet feeder</option>
-            <option value="devices.types.other">Other</option>
-        </select>
-    </div> -->
 </script>

package/nodes/alice-get.html

@@ -0,0 +1,91 @@
+<script type="text/javascript">
+    let udyaconfig={};
+    RED.nodes.registerType('Alice-Get',{
+        category: 'alice',
+        inputs:1,
+        outputs:1,
+        icon: "alice.png",
+        color: "#D8BFD8",
+        defaults:{
+            service: {value:"", type:"alice-service"},
+            device: {value:undefined}
+        },
+        label: function(){
+            return this.name || "Alice-Get";
+        },
+        oneditprepare: ()=>{
+            $("#node-input-service").change(function(e){
+                if (this.value &&this.value!='_ADD_'){
+                    $.ajax({
+                        url: "/noderedhome/"+this.value+"/getfullconfig",
+                        type:"GET"
+                    })
+                    .done(result=>{
+                        // RED.notify("Full Alice SmartHome config successfully retrieved", {type:"success"});
+                        console.log(result);
+                        udyaconfig=result;
+                        updateHouse(result.households);
+                    })
+                    .fail(error=>{
+                        RED.notify("Error when retrieve Alice SmartHome config", {type:"error"});
+                    });
+                }
+            });
+            $('#node-input-home')
+                .prop('disabled', 'disabled')
+                .change((e)=>{
+                    let val = $('#node-input-home').find(":selected").val();
+                    console.log(val);
+                });
+
+            $('#node-input-room').prop('disabled', 'disabled');
+            $('#node-input-device').prop('disabled', 'disabled');
+
+        }
+    });
+    function updateHouse(data){
+        $('#node-input-home')
+            .find('option')
+            .remove()
+            .end();
+        udyaconfig.households.forEach(h => {
+            $('#node-input-home')
+                .append('<option value="'+h.id+'">'+h.name+'</option>');
+        });
+        $('#node-input-home')
+            .prop('disabled', false);
+    };
+    function updaterooms(house){
+        $('#node-input-room')
+            .find('option')
+            .remove()
+            .end();
+        udyaconfig.households.forEach(h => {
+            if (h.household_id==house){
+                $('#node-input-room')
+                    .append('<option value="'+h.id+'">'+h.name+'</option>');
+            }
+        });
+        $('#node-input-room').prop('disabled', false);
+    };
+
+</script>
+
+<script type="text/x-red" data-template-name="Alice-Get">
+    <div class="form-row">
+        <label for="node-input-service">Account</label>
+        <input id="node-input-service">
+    </div>
+    <div class="form-row">
+        <label for="node-input-home">Home</label>
+        <select id="node-input-home" style="width: 70%;"></select>
+    </div>
+    <div class="form-row">
+        <label for="node-input-room">Room</label>
+        <select id="node-input-room" style="width: 70%;"></select>
+    </div>
+    <div class="form-row">
+        <label for="node-input-device">Room</label>
+        <select id="node-input-device" style="width: 70%;"></select>
+    </div>
+</script>

package/nodes/alice-get.js

@@ -0,0 +1,10 @@
+"use strict";
+;
+module.exports = (RED) => {
+    function AliceGet(config) {
+        RED.nodes.createNode(this, config);
+        const service = RED.nodes.getNode(config.service);
+    }
+    ;
+    RED.nodes.registerType("Alice-Get", AliceGet);
+};

package/nodes/alice-onoff.html

@@ -4,7 +4,7 @@
         defaults:{
             device: {value:"", type:"alice-device"},
             name: {value:""},
-            retrievable: {value:true},
+            // retrievable: {value:true},
             response:{value:true},
             split: {value:false}
         },

package/nodes/alice-onoff.js

@@ -5,7 +5,6 @@ function AliceOnOff(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 ctype = 'devices.capabilities.on_off';
     const instance = 'on';
     let response = config.response;
@@ -22,8 +21,8 @@ function AliceOnOff(config){
     if (config.response === undefined){
         response = true;
     };
-    if (!config.retrievable){
-      split = true;
+    if (config.split === undefined){
+      split = false;
     };
 
     this.status({fill:"red",shape:"dot",text:"offline"});

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:

package/nodes/alice-sensor.js

@@ -64,7 +64,7 @@ function AliceSensor(config){
         if (done) {done();}
         return;
       };
-      if (unit == 'unit.temperature.celsius'){
+      if (unit == 'unit.temperature.celsius' || unit == 'unit.ampere'){
         msg.payload = +msg.payload.toFixed(1);
       }else {
         msg.payload = +msg.payload.toFixed(0);

package/nodes/alice.js

@@ -1,125 +1,137 @@
-const mqtt = require('mqtt');
-const axios = require('axios');
-
-module.exports = function(RED) {
-  //Sevice node, Alice-Service (credential)
-  function AliceService(config) {
-    RED.nodes.createNode(this,config);
-    this.debug("Starting Alice service...");
-
-    const email = this.credentials.email;
-    const login = this.credentials.id;
-    const password = this.credentials.password;
-    const token = this.credentials.token;
-
-    const suburl = Buffer.from(email).toString('base64');
-    RED.httpAdmin.get("/noderedhome/"+suburl+"/clearalldevice",(req,res)=>{
-      const option = {
-        method: 'POST',
-        url: 'https://api.nodered-home.ru/gtw/device/clearallconfigs',
-        headers: {
-          'content-type': 'application/json',
-          'Authorization': "Bearer "+this.getToken()
-        },
-        data: {}
-      };
-      axios.request(option)
-      .then(result=>{
-        this.trace("All devices configs deleted on gateway successfully");
-        // console.log(result)
-        res.sendStatus(200);
-      })
-      .catch(error=>{
-        this.debug("Error when delete All devices configs deleted on gateway: "+error.message);
-        res.sendStatus(500);
-      });
-    });
-
-    this.isOnline = false;
-    if (!token){
-      this.error("Authentication is required!!!");
-      return;
-    };
-    const mqttClient = mqtt.connect("mqtts://mqtt.cloud.yandex.net",{
-      port: 8883,
-      clientId: login,
-      rejectUnauthorized: false,
-      username: login,
-      password: password,
-      reconnectPeriod: 10000
-    });
-    mqttClient.on("message",(topic, payload)=>{
-      const arrTopic = topic.split('/');
-      const data = JSON.parse(payload);
-      this.trace("Incoming:" + topic +" timestamp:"+new Date().getTime());
-      if (payload.length && typeof data === 'object'){
-        if (arrTopic[3]=='message'){
-          this.warn(data.text);
-        }else{
-          this.emit(arrTopic[3],data);
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+const axios_1 = __importDefault(require("axios"));
+const mqtt_1 = __importDefault(require("mqtt"));
+;
+;
+;
+module.exports = (RED) => {
+    function AliceService(config) {
+        RED.nodes.createNode(this, config);
+        this.debug("Starting Alice service... ID: " + this.id);
+        const email = this.credentials.email;
+        const login = this.credentials.id;
+        const password = this.credentials.password;
+        const token = this.credentials.token;
+        const suburl = Buffer.from(email).toString('base64');
+        RED.httpAdmin.get("/noderedhome/" + suburl + "/clearalldevice", (req, res) => {
+            const option = {
+                method: 'POST',
+                url: 'https://api.nodered-home.ru/gtw/device/clearallconfigs',
+                headers: {
+                    'content-type': 'application/json',
+                    'Authorization': "Bearer " + this.getToken()
+                },
+                data: {}
+            };
+            axios_1.default.request(option)
+                .then(result => {
+                this.trace("All devices configs deleted on gateway successfully");
+                res.sendStatus(200);
+            })
+                .catch(error => {
+                this.debug("Error when delete All devices configs deleted on gateway: " + error.message);
+                res.sendStatus(500);
+            });
+        });
+        RED.httpAdmin.get("/noderedhome/" + this.id + "/getfullconfig", (req, res) => {
+            const option = {
+                method: 'GET',
+                url: 'https://api.iot.yandex.net/v1.0/user/info',
+                headers: {
+                    'content-type': 'application/json',
+                    'Authorization': "Bearer " + this.getToken()
+                }
+            };
+            axios_1.default.request(option)
+                .then(result => {
+                this.trace("Full Alice SmartHome config successfully retrieved");
+                res.json(result.data);
+            })
+                .catch(error => {
+                this.debug("Error when retrieve Alice SmartHome config: " + error.message);
+                res.sendStatus(500);
+            });
+        });
+        this.isOnline = false;
+        if (!token) {
+            this.error("Authentication is required!!!");
+            return;
+        }
+        ;
+        const mqttClient = mqtt_1.default.connect("mqtts://mqtt.cloud.yandex.net", {
+            port: 8883,
+            clientId: login,
+            rejectUnauthorized: false,
+            username: login,
+            password: password,
+            reconnectPeriod: 10000
+        });
+        mqttClient.on("message", (topic, payload) => {
+            const arrTopic = topic.split('/');
+            const data = JSON.parse(payload);
+            this.trace("Incoming:" + topic + " timestamp:" + new Date().getTime());
+            if (payload.length && typeof data === 'object') {
+                if (arrTopic[3] == 'message') {
+                    this.warn(data.text);
+                }
+                else {
+                    this.emit(arrTopic[3], data);
+                }
+                ;
+            }
+        });
+        mqttClient.on("connect", () => {
+            this.debug("Yandex IOT client connected. ");
+            this.emit('online');
+            mqttClient.subscribe("$me/device/commands/+", _ => {
+                this.debug("Yandex IOT client subscribed to the command");
+            });
+        });
+        mqttClient.on("offline", () => {
+            this.debug("Yandex IOT client offline. ");
+            this.emit('offline');
+        });
+        mqttClient.on("disconnect", () => {
+            this.debug("Yandex IOT client disconnect.");
+            this.emit('offline');
+        });
+        mqttClient.on("reconnect", () => {
+            this.debug("Yandex IOT client reconnecting ...");
+        });
+        mqttClient.on("error", (err) => {
+            this.error("Yandex IOT client Error: " + err.message);
+            this.emit('offline');
+        });
+        this.on('offline', () => {
+            this.isOnline = false;
+        });
+        this.on('online', () => {
+            this.isOnline = true;
+        });
+        this.on('close', (done) => {
+            this.emit('offline');
+            setTimeout(() => {
+                mqttClient.end(false, done);
+            }, 500);
+        });
+        this.send2gate = (path, data, retain) => {
+            this.trace("Outgoing: " + path);
+            mqttClient.publish(path, data, { qos: 0, retain: retain });
+        };
+        this.getToken = () => {
+            return JSON.parse(token).access_token;
         };
-      }
-    });
-    mqttClient.on("connect",()=>{
-      this.debug("Yandex IOT client connected. ");
-      this.emit('online');
-      // Подписываемся на получение комманд 
-      mqttClient.subscribe("$me/device/commands/+",_=>{
-        this.debug("Yandex IOT client subscribed to the command");
-      });
-    });
-    mqttClient.on("offline",()=>{
-      this.debug("Yandex IOT client offline. ");
-      this.emit('offline');
-    });
-    mqttClient.on("disconnect",()=>{
-      this.debug("Yandex IOT client disconnect.");
-      this.emit('offline');
-    });
-    mqttClient.on("reconnect",(err)=>{
-      this.debug("Yandex IOT client reconnecting ...");
-    });
-    mqttClient.on("error",(err)=>{
-      this.error("Yandex IOT client Error: "+ err.message);
-      this.emit('offline');
-    });
-
-    this.on('offline', ()=>{
-      this.isOnline = false;
-    })
-
-    this.on('online', ()=>{
-      this.isOnline = true;
-    })
-
-    this.on('close',(done)=>{
-      this.emit('offline');
-      setTimeout(()=>{
-        mqttClient.end(false,done);
-      },500)
-    });
-
-    this.send2gate= (path,data,retain)=>{
-      // this.debug(path);
-      // this.debug(data);
-      this.trace("Outgoing: "+path);
-      mqttClient.publish(path, data ,{ qos: 0, retain: retain });
-    }
-
-    this.getToken = ()=>{
-      return JSON.parse(token).access_token; 
-    }
-
-  };
-  RED.nodes.registerType("alice-service",AliceService,{
-    credentials: {
-      email: {type: "text"},
-      password: {type: "password"},
-      token: {type: "password"},
-      id:{type:"text"}
     }
-  });
+    ;
+    RED.nodes.registerType("alice-service", AliceService, {
+        credentials: {
+            email: { type: "text" },
+            password: { type: "password" },
+            token: { type: "password" },
+            id: { type: "text" }
+        }
+    });
 };
-
-
-

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "node-red-contrib-alice",
-  "version": "2.2.3",
+  "version": "2.2.5",
   "description": "",
-  "main": "alice.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "start": "npm run build && node-red",
+    "build": "tsc && npm run copy-html",
+    "copy-html": "cp ./src/*.html ./nodes/"
   },
   "repository": {
     "type": "git",
@@ -44,5 +45,35 @@
   "dependencies": {
     "axios": "^1.4.0",
     "mqtt": "^4.3.8"
+  },
+  "devDependencies": {
+    "@types/axios": "^0.14.0",
+    "@types/mqtt": "^2.5.0",
+    "@types/node": "^20.11.16",
+    "@types/node-red": "^1.3.4",
+    "@typescript-eslint/eslint-plugin": "^6.20.0",
+    "@typescript-eslint/parser": "^6.20.0",
+    "eslint": "^8.56.0",
+    "nodemon": "^3.0.3",
+    "typescript": "^5.3.3"
+  },
+  "nodemonConfig": {
+    "ignoreRoot" : [".git", "test"],
+    "restartable": "rs",
+    "ignore": [
+      "node_modules/**/node_modules",
+      "node_modules/**/test",
+      "*.log"
+    ],
+    "verbose": true,
+    "delay": "1000",
+    "events": {
+      "restart": "echo ------ restarted due to: $FILENAME ------"
+    },
+    "watch": [
+      "src/",
+      "node_modules/node-red-*"
+    ],
+    "ext": "js json htm html css"
   }
 }

package/src/alice-get.html

@@ -0,0 +1,91 @@
+<script type="text/javascript">
+    let udyaconfig={};
+    RED.nodes.registerType('Alice-Get',{
+        category: 'alice',
+        inputs:1,
+        outputs:1,
+        icon: "alice.png",
+        color: "#D8BFD8",
+        defaults:{
+            service: {value:"", type:"alice-service"},
+            device: {value:undefined}
+        },
+        label: function(){
+            return this.name || "Alice-Get";
+        },
+        oneditprepare: ()=>{
+            $("#node-input-service").change(function(e){
+                if (this.value &&this.value!='_ADD_'){
+                    $.ajax({
+                        url: "/noderedhome/"+this.value+"/getfullconfig",
+                        type:"GET"
+                    })
+                    .done(result=>{
+                        // RED.notify("Full Alice SmartHome config successfully retrieved", {type:"success"});
+                        console.log(result);
+                        udyaconfig=result;
+                        updateHouse(result.households);
+                    })
+                    .fail(error=>{
+                        RED.notify("Error when retrieve Alice SmartHome config", {type:"error"});
+                    });
+                }
+            });
+            $('#node-input-home')
+                .prop('disabled', 'disabled')
+                .change((e)=>{
+                    let val = $('#node-input-home').find(":selected").val();
+                    console.log(val);
+                });
+
+            $('#node-input-room').prop('disabled', 'disabled');
+            $('#node-input-device').prop('disabled', 'disabled');
+
+        }
+    });
+    function updateHouse(data){
+        $('#node-input-home')
+            .find('option')
+            .remove()
+            .end();
+        udyaconfig.households.forEach(h => {
+            $('#node-input-home')
+                .append('<option value="'+h.id+'">'+h.name+'</option>');
+        });
+        $('#node-input-home')
+            .prop('disabled', false);
+    };
+    function updaterooms(house){
+        $('#node-input-room')
+            .find('option')
+            .remove()
+            .end();
+        udyaconfig.households.forEach(h => {
+            if (h.household_id==house){
+                $('#node-input-room')
+                    .append('<option value="'+h.id+'">'+h.name+'</option>');
+            }
+        });
+        $('#node-input-room').prop('disabled', false);
+    };
+
+</script>
+
+<script type="text/x-red" data-template-name="Alice-Get">
+    <div class="form-row">
+        <label for="node-input-service">Account</label>
+        <input id="node-input-service">
+    </div>
+    <div class="form-row">
+        <label for="node-input-home">Home</label>
+        <select id="node-input-home" style="width: 70%;"></select>
+    </div>
+    <div class="form-row">
+        <label for="node-input-room">Room</label>
+        <select id="node-input-room" style="width: 70%;"></select>
+    </div>
+    <div class="form-row">
+        <label for="node-input-device">Room</label>
+        <select id="node-input-device" style="width: 70%;"></select>
+    </div>
+</script>