node-red-contrib-alice 2.2.4 → 2.3.1

package/nodes/alice-video.js

@@ -1,132 +1,88 @@
-module.exports = function(RED) {
-// ************** VIDEO *******************
-function AliceVideo(config){
-    RED.nodes.createNode(this,config);
-    const device = RED.nodes.getNode(config.device);
-    device.setMaxListeners(device.getMaxListeners() + 1); // увеличиваем лимит для event
-    const id =this.id;
-    const name = config.name;
-    const ctype = 'devices.capabilities.video_stream';
-    const instance = 'get_stream';
-    const stream_url = config.stream_url;
-    const protocol = config.protocol;
-    const response = true;
-    const retrievable = false;
-    const reportable = false;
-    let initState = false;
-    let curentState = {
-      type:ctype,
-      state:{
-        instance: instance,
-        value: {
-          stream_url: stream_url,
-          protocol: protocol
-        }
-      }
-    };
-
-    this.status({fill:"red",shape:"dot",text:"offline"});
-
-    this.init = ()=>{
-      this.debug("Starting capability initilization ...");
-      let capab = {
-        type: ctype,
-        retrievable: retrievable,
-        reportable: reportable,
-        parameters: {
-          instance: instance,
-          protocols: [protocol]
-        }
-      };
-
-      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=>{
-            str_url = stream_url.slice(0,25) + "...";
-            this.status({fill:"green",shape:"dot",text:str_url});
-          })
-          .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("Video",AliceVideo);
-};
+"use strict";
+module.exports = (RED) => {
+    function AliceVideo(config) {
+        RED.nodes.createNode(this, config);
+        const device = RED.nodes.getNode(config.device);
+        device.setMaxListeners(device.getMaxListeners() + 1);
+        const id = this.id;
+        const ctype = 'devices.capabilities.video_stream';
+        const instance = 'get_stream';
+        const stream_url = config.stream_url;
+        const protocol = config.protocol;
+        const curentState = {
+            type: ctype,
+            state: {
+                instance: instance,
+                value: {
+                    stream_url: stream_url,
+                    protocol: protocol
+                }
+            }
+        };
+        this.status({ fill: "red", shape: "dot", text: "offline" });
+        const init = () => {
+            this.debug("Starting capability initilization ...");
+            const capab = {
+                type: ctype,
+                retrievable: false,
+                reportable: false,
+                parameters: {
+                    instance: instance,
+                    protocols: [protocol]
+                }
+            };
+            device.setCapability(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" });
+            });
+            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, () => {
+            device.updateCapabState(id, curentState)
+                .then(() => {
+                const str_url = stream_url.slice(0, 25) + "...";
+                this.status({ fill: "green", shape: "dot", text: str_url });
+            })
+                .catch(err => {
+                this.error("Error on update capability state: " + err.message);
+                this.status({ fill: "red", shape: "dot", text: "Error" });
+            });
+        });
+        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("Video", AliceVideo);
+};
+//# sourceMappingURL=alice-video.js.map

package/nodes/alice.js

@@ -1,125 +1,130 @@
-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) => {
+            axios_1.default.request({
+                method: 'POST',
+                url: 'https://api.nodered-home.ru/gtw/device/clearallconfigs',
+                headers: {
+                    'content-type': 'application/json',
+                    'Authorization': "Bearer " + this.getToken()
+                },
+                data: {}
+            })
+                .then(() => {
+                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) => {
+            axios_1.default.request({
+                method: 'GET',
+                url: 'https://api.iot.yandex.net/v1.0/user/info',
+                headers: {
+                    'content-type': 'application/json',
+                    'Authorization': "Bearer " + this.getToken()
+                }
+            })
+                .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.toString());
+            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" }
+        }
+    });
 };
-
-
-
+//# sourceMappingURL=alice.js.map

package/nodes/types.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=types.js.map

package/package.json

@@ -1,13 +1,11 @@
 {
   "name": "node-red-contrib-alice",
-  "version": "2.2.4",
+  "version": "2.3.1",
   "description": "",
-  "main": "alice.js",
   "scripts": {
     "start": "npm run build && node-red",
     "build": "tsc && npm run copy-html",
-    "copy-html": "cp ./src/*.html ./nodes/",
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "copy-html": "cp ./src/*.html ./nodes/"
   },
   "repository": {
     "type": "git",
@@ -49,12 +47,28 @@
     "mqtt": "^4.3.8"
   },
   "devDependencies": {
-    "@types/axios": "^0.14.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"
   }
 }