node-red-contrib-alice 2.2.5 → 2.3.3

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

@@ -4,9 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 const axios_1 = __importDefault(require("axios"));
 const mqtt_1 = __importDefault(require("mqtt"));
-;
-;
-;
 module.exports = (RED) => {
     function AliceService(config) {
         RED.nodes.createNode(this, config);
@@ -16,8 +13,8 @@ module.exports = (RED) => {
         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 = {
+        RED.httpAdmin.get("/noderedhome/" + suburl + "/clearalldevice", (_req, res) => {
+            axios_1.default.request({
                 method: 'POST',
                 url: 'https://api.nodered-home.ru/gtw/device/clearallconfigs',
                 headers: {
@@ -25,9 +22,8 @@ module.exports = (RED) => {
                     'Authorization': "Bearer " + this.getToken()
                 },
                 data: {}
-            };
-            axios_1.default.request(option)
-                .then(result => {
+            })
+                .then(() => {
                 this.trace("All devices configs deleted on gateway successfully");
                 res.sendStatus(200);
             })
@@ -36,16 +32,15 @@ module.exports = (RED) => {
                 res.sendStatus(500);
             });
         });
-        RED.httpAdmin.get("/noderedhome/" + this.id + "/getfullconfig", (req, res) => {
-            const option = {
+        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()
                 }
-            };
-            axios_1.default.request(option)
+            })
                 .then(result => {
                 this.trace("Full Alice SmartHome config successfully retrieved");
                 res.json(result.data);
@@ -60,7 +55,6 @@ module.exports = (RED) => {
             this.error("Authentication is required!!!");
             return;
         }
-        ;
         const mqttClient = mqtt_1.default.connect("mqtts://mqtt.cloud.yandex.net", {
             port: 8883,
             clientId: login,
@@ -71,7 +65,7 @@ module.exports = (RED) => {
         });
         mqttClient.on("message", (topic, payload) => {
             const arrTopic = topic.split('/');
-            const data = JSON.parse(payload);
+            const data = JSON.parse(payload.toString());
             this.trace("Incoming:" + topic + " timestamp:" + new Date().getTime());
             if (payload.length && typeof data === 'object') {
                 if (arrTopic[3] == 'message') {
@@ -80,13 +74,12 @@ module.exports = (RED) => {
                 else {
                     this.emit(arrTopic[3], data);
                 }
-                ;
             }
         });
         mqttClient.on("connect", () => {
             this.debug("Yandex IOT client connected. ");
             this.emit('online');
-            mqttClient.subscribe("$me/device/commands/+", _ => {
+            mqttClient.subscribe("$me/device/commands/+", () => {
                 this.debug("Yandex IOT client subscribed to the command");
             });
         });
@@ -114,7 +107,7 @@ module.exports = (RED) => {
         this.on('close', (done) => {
             this.emit('offline');
             setTimeout(() => {
-                mqttClient.end(false, done);
+                mqttClient.end(false, {}, done);
             }, 500);
         });
         this.send2gate = (path, data, retain) => {
@@ -125,7 +118,6 @@ module.exports = (RED) => {
             return JSON.parse(token).access_token;
         };
     }
-    ;
     RED.nodes.registerType("alice-service", AliceService, {
         credentials: {
             email: { type: "text" },
@@ -135,3 +127,4 @@ module.exports = (RED) => {
         }
     });
 };
+//# 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,6 +1,6 @@
 {
   "name": "node-red-contrib-alice",
-  "version": "2.2.5",
+  "version": "2.3.3",
   "description": "",
   "scripts": {
     "start": "npm run build && node-red",
@@ -47,18 +47,13 @@
     "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"],
+    "ignoreRoot": [".git", "test"],
     "restartable": "rs",
     "ignore": [
       "node_modules/**/node_modules",

package/src/alice-color.html

@@ -0,0 +1,255 @@
+<script type="text/javascript">
+    RED.nodes.registerType('Color',{
+        category: 'alice',
+        defaults:{
+            device: {value:"", type:"alice-device"},
+            name: {value:""},
+            color_support:{value:true},
+            scheme: {value:"rgb_normal"},
+            response:{value:true},
+            temperature_k: {value:false},
+            temperature_min: {value:2000, validate:function(v){
+                let value = parseInt(v);
+                return value>=2000;
+            }},
+            temperature_max: {value:9000, validate:function(v){
+                let value = parseInt(v);
+                return value<=9000;
+            }},
+            color_scene: {value:[]}
+        },
+        inputs:1,
+        outputs:3,
+        outputLabels: ["color","temperature_k","color_scene"],
+        icon: "alice.png",
+        color: "#D8BFD8",
+        label: function(){
+            return this.name + ":Color";
+        },
+        oneditprepare: function(){
+            if (this.response === undefined){
+                $( "#node-input-response").prop('checked', true);
+            };
+            if (this.color_support === undefined){
+                $( "#node-input-color_support").prop('checked', true);
+            };
+            if (this.temperature_min === undefined){
+                $('#node-input-temperature_min').val(2000);
+            };
+            if (this.temperature_max === undefined){
+                $('#node-input-temperature_max').val(9000);
+            };
+            $('#node-input-color_support').on('change',()=>{
+                if ($('#node-input-color_support').is(":checked")){
+                    $('#node-input-scheme').prop('disabled', false);
+                }else{
+                    $('#node-input-scheme').prop('disabled', true);
+                };
+            });
+            $('#node-input-temperature_k').on('change',()=>{
+                if ($('#node-input-temperature_k').is(":checked")){
+                    $('#node-input-temperature_min').prop('disabled', false);
+                    $('#node-input-temperature_max').prop('disabled', false);
+                }else{
+                    $('#node-input-temperature_min').prop('disabled', true);
+                    $('#node-input-temperature_max').prop('disabled', true);
+                };
+            });
+            updateAllScenes(this.color_scene);
+        },
+        oneditsave: function(){
+            deivcename = $('#node-input-device option:selected').text();
+            $('#node-input-name').val(deivcename);
+            this.color_scene = getCurrentScenes();
+        }
+    })
+    function updateAllScenes(scenes){
+        deleteAllScenes();
+        scenes.forEach((s,i)=>{
+            addScene2List(s,i);
+        });
+    };
+    function deleteAllScenes() {
+        $('#node-input-color_scene-container').empty();
+    };
+    function addScene2List(scene,index){
+        $('#node-input-color_scene-container').append('<li rel="'+scene+'" class="red-ui-editableList-item-sortable red-ui-editableList-item-removable"><div class="red-ui-editableList-item-content" style="overflow: hidden; white-space: nowrap;"><span>'+scene+'</span></div><a href="#" onclick="delScene('+index+')" class="red-ui-editableList-item-remove red-ui-button red-ui-button-small"><i class="fa fa-remove"></i></a></li>')        
+    };
+    function getCurrentScenes() {
+        let scenes = [];
+        $('#node-input-color_scene-container li').each(function(){ 
+            scenes.push($(this).attr('rel')); 
+        });
+        return scenes;
+    };
+    function addScene() {
+        let scene = $('#select-custom-scene').find(":selected").val();
+        let scenes = getCurrentScenes();
+        if (scenes.indexOf(scene)>-1){
+            return;
+        }else{
+            scenes.push(scene);
+            updateAllScenes(scenes);
+        }
+    };
+    function delScene(index) {
+        let scenes = getCurrentScenes();
+        scenes.splice(index, 1);
+        updateAllScenes(scenes);
+    };
+</script>
+
+<script type="text/x-red" data-template-name="Color">
+    <input type="hidden" id="node-input-name">
+    <div class="form-row" style="border-bottom: 1px solid #ddd; padding-bottom: 12px;">
+        <label for="node-input-device">Device</label>
+        <input id="node-input-device">
+    </div>
+    <div class="form-row" style="border-bottom: 1px solid #ddd; padding-bottom: 12px;">
+        <label for="node-input-color_support"><span >Color</span></label>
+        <label for="node-input-color_support" style="width:70%">
+        <input type="checkbox" id="node-input-color_support" style="display:inline-block; width:22px; vertical-align:baseline;" autocomplete="off"><span> supports color change</span>
+        </label>
+        <label for="node-input-scheme">Scheme</label>
+        <select id="node-input-scheme" style="width: 70%;">
+            <option value="rgb_normal">RGB</option>
+            <!-- <option value="rgb">RGB (24bit)</option> -->
+            <option value="hsv">HSV</option>
+        </select>
+    </div>
+    <div class="form-row" style="border-bottom: 1px solid #ddd; padding-bottom: 12px;">
+        <label for="node-input-temperature_k"><span>Wite Temp</span></label>
+        <label for="node-input-temperature_k" style="width:70%">
+            <input type="checkbox" id="node-input-temperature_k" style="display:inline-block; width:22px; vertical-align:baseline;" autocomplete="off">
+            <span> white temperature support</span>
+        </label>
+        <div>
+            <label for="node-input-temperature_x"><span>Temp Range</span></label>
+            <span style="padding-left: 4px;"> Min</span>
+            <input id="node-input-temperature_min" type="number" style="width: 70px;">
+            <span> K</span>
+            <span style="padding-left: 10px;"> Max</span>
+            <input id="node-input-temperature_max" type="number" style="width: 70px;">
+            <span> K</span>
+        </div>
+    </div>
+
+    <div class="form-row node-input-rule-container-row" style="border-bottom: 1px solid #ddd; padding-bottom: 12px;">
+        <label for="node-input-color_scene" style="width:auto">Supported color scenes</label>
+        <div class="red-ui-editableList">
+            <div class="red-ui-editableList-border red-ui-editableList-container" style="min-height: 150px; max-height: none; overflow-y: scroll; height: 308.4px;">
+                <ol id="node-input-color_scene-container" class="red-ui-editableList-list" style="min-height: 100px; min-width: 150px; ">
+                    <li class="red-ui-editableList-item-sortable red-ui-editableList-item-removable">
+                        <div class="red-ui-editableList-item-content" style="overflow: hidden; white-space: nowrap;">
+                            <span>Tets</span>
+                        </div>
+                        <i class="red-ui-editableList-item-handle fa fa-bullhorn" style="cursor:auto"></i><a href="#" class="red-ui-editableList-item-remove red-ui-button red-ui-button-small"><i class="fa fa-remove"></i></a>
+                    </li>
+                    <li class="red-ui-editableList-item-sortable red-ui-editableList-item-removable">
+                        <div class="red-ui-editableList-item-content" style="overflow: hidden; white-space: nowrap;">
+                            <span>Tets2</span>
+                        </div>
+                    <i class="red-ui-editableList-item-handle fa fa-bullhorn" style="cursor:auto"></i><a href="#" class="red-ui-editableList-item-remove red-ui-button red-ui-button-small"><i class="fa fa-remove"></i></a>
+                    </li>
+                </ol>
+            </div>
+            <div style="margin-top:4px">
+                <select id="select-custom-scene">
+                    <option value="alarm">alarm</option>
+                    <option value="alice">alice</option>
+                    <option value="candle">candle</option>
+                    <option value="dinner">dinner</option>
+                    <option value="fantasy">fantasy</option>
+                    <option value="garland">garland</option>
+                    <option value="jungle">jungle</option>
+                    <option value="movie">movie</option>
+                    <option value="neon">neon</option>
+                    <option value="night">night</option>
+                    <option value="ocean">ocean</option>
+                    <option value="party">party</option>
+                    <option value="reading">reading</option>
+                    <option value="rest">rest</option>
+                    <option value="romance">romance</option>
+                    <option value="siren">siren</option>
+                    <option value="sunrise">sunrise</option>
+                    <option value="sunset">sunset</option>
+                </select>
+                <a id="button-addScene" href="#" class="red-ui-button" onclick="addScene()" style="margin-top: 4px;"><i class="fa fa-plus"></i></a>
+            </div>
+        </div>
+    </div>
+
+    <div class="form-row">
+        <label for="node-input-response"><i class="fa fa-refresh"></i> <span >Response</span></label>
+        <label for="node-input-response" style="width:70%">
+        <input type="checkbox" id="node-input-response" style="display:inline-block; width:22px; vertical-align:baseline;" autocomplete="off"><span>Always answer Alice with success</span>
+        </label>
+    </div>
+</script>
+
+<script type="text/x-red" data-help-name="Color">
+    <p>Change the color of their luminous elements to any one from the HSV model or from the RGB model;</p>
+    
+    <h3>Property</h3>
+    <dl class="message-properties">
+        <dt>Device
+            <span class="property-type">Select</span>
+        </dt>
+        <dd> The device to which this feature is connected </dd>
+        <dt>Color Scheme
+            <span class="property-type">Select</span>
+        </dt>
+        <dd> Color scheme selection (RGB or HSV) </dd>
+        <dt>White temperature support
+            <span class="property-type">Integer</span>
+        </dt>
+        <dd>White temperature support, min and max value in Kelvin</dd>
+        <dd>Min value must be above 2000 kelvin</dd>
+        <dd>Max value must be below 9000 kelvin</dd>
+        <dt>Supported color scenes
+            <span class="property-type">array of strings</span>
+        </dt>
+        <dd>List of supported color scenes</dd>
+        <dt>Response
+            <span class="property-type">checkbox</span>
+        </dt>
+        <dd> In order for the device to respond to Alice that the command was successful, the corresponding value should arrive at the input within 2.5 seconds.
+            If your device takes longer or doesn’t return a confirmation at all, just check this box. </dd>
+    </dl>
+
+    <h3>Inputs</h3>
+        <dl class="message-properties">
+            <dt>payload
+                <span class="property-type">Object || Integer || String</span>
+            </dt>
+            <dd> If you want to set the color, msg.payload must be RGB or HSV Object </br><i>{r,g,b} or {h,s,v}</i></dd>
+            <dd> If you want white temperature, msg.payload must be Integer >=MIN and <=MAX</dd>
+            <dd> If you want to set the color scene, the msg.payload must be String set in the settings</dd>
+        </dl>
+    
+    <h3>Outputs 1</h3>
+        <dl class="message-properties">
+            <dt>payload
+                <span class="property-type">Object</span>
+            </dt>
+            <dd> RGB or HSV Object </br><i>{r,g,b} or {h,s,v}</i></dd>
+        </dl>
+    <h3>Outputs 2</h3>
+        <dl class="message-properties">
+            <dt>payload
+                <span class="property-type">Integer</span>
+            </dt>
+            <dd> White temperature in Kelvin</dd>
+        </dl>
+    <h3>Outputs 3</h3>
+        <dl class="message-properties">
+            <dt>payload
+                <span class="property-type">String</span>
+            </dt>
+            <dd> Color scene text name</dd>
+        </dl>
+    <h3>References</h3>
+        <ul>
+            <li><a href="https://yandex.ru/dev/dialogs/alice/doc/smart-home/concepts/color_setting-docpage/"> Yandex documentation</a></li>
+        </ul>
+</script>