node-red-contrib-alice 2.1.3 → 2.1.5

package/nodes/alice-color.js

@@ -168,6 +168,7 @@ module.exports = function(RED) {
           }
           break;
         case 'number':
+          value = Math.round(value);
           if (value>=this.temperature_min && value<=this.temperature_max){
             state.value = value;
             state.instance = 'temperature_k';

package/nodes/alice-device.js

@@ -1,6 +1,5 @@
 const axios = require('axios');
 
-
 module.exports = function(RED) {
     // ***************************** Alice DEVICE ****************************
   function AliceDevice(config){
@@ -42,37 +41,65 @@ module.exports = function(RED) {
       this.initState = true;
     };
 // функция обновления информации об устройстве    
-    this._updateDeviceInfo= (now)=>{
-      let data;
-      if (deviceconfig === null || (deviceconfig.capabilities.length==0 && deviceconfig.properties.length==0)){
-        data = '';
-      }else{
-        data = JSON.stringify(deviceconfig);
-      };
-      if (now){
-        this.debug("Updating Device info ...");
-        service.send2gate('$me/device/state/'+this.id, data ,true);
+    this._updateDeviceInfo= _=>{
+      let now = false;
+
+      if (deviceconfig.capabilities.length==0 && deviceconfig.properties.length==0){
+        this.debug("DELETE Device config from gateway ...");
+        /// отправка по http 
+        const option = {
+          timeout: 5000,
+          method: 'POST',
+          url: 'https://api.nodered-home.ru/gtw/device/config',
+          headers: {
+            'content-type': 'application/json',
+            'Authorization': "Bearer "+service.getToken()
+          },
+          data: {
+            id: this.id,
+            config: deviceconfig
+          }
+        };
+        axios.request(option)
+        .then(res=>{
+          this.trace("Device config deleted on gateway successfully");
+        })
+        .catch(error=>{
+          this.debug("Error when delete device config on gateway: "+error.message);
+        });
         return;
       };
+
       if (!updating){
         updating = true;
         setTimeout(() => {
-          this.debug("Updating Device info ...");
+          this.debug("Updating Device config ...");
           updating = false;
-          let nData = JSON.stringify(deviceconfig);
-          if (deviceconfig === null){ nData = ''};
-          service.send2gate('$me/device/state/'+this.id, nData ,true);
-        }, 300);
+          const option = {
+            timeout: 5000,
+            method: 'POST',
+            url: 'https://api.nodered-home.ru/gtw/device/config',
+            headers: {
+              'content-type': 'application/json',
+              'Authorization': "Bearer "+service.getToken()
+            },
+            data: {
+              id: this.id,
+              config: deviceconfig
+            }
+          };
+          axios.request(option)
+          .then(res=>{
+            this.trace("Device config updated successfully");
+          })
+          .catch(error=>{
+            this.debug("Error when update device config: "+error.message);
+          });
+        }, 1000);
       }
     };
 // функция обновления состояния устройства (умений и сенсоров) 
     this._updateDeviceState= (event=null)=>{
-      // if (states === null || (states.capabilities.length==0 && states.properties.length==0)){
-      //   data = '';
-      // }else{
-      //   data = JSON.stringify(states);
-      // };
-      // service.send2gate('$me/device/state/'+this.id+'/states', data ,true);
       const option = {
         timeout: 5000,
         method: 'POST',
@@ -82,6 +109,7 @@ module.exports = function(RED) {
           'Authorization': "Bearer "+service.getToken()
         },
         data: {
+          id: this.id,
           event: event,
           state: states
         }
@@ -254,16 +282,17 @@ module.exports = function(RED) {
     this.on('close', (removed, done)=>{
       this.emit('offline');
       if (removed){
-        deviceconfig = null;
+        deviceconfig.capabilities = [];
+        deviceconfig.properties = [];
         states.capabilities = [];
         states.properties = [];
         this._updateDeviceState();
-        this._updateDeviceInfo(true);
+        this._updateDeviceInfo();
       };
       setTimeout(()=>{
         // this.emit('offline');
         done();
-      },300)
+      },500)
     });
   };
   RED.nodes.registerType("alice-device",AliceDevice);

package/nodes/alice.html

@@ -56,6 +56,7 @@
             });
     };
     function GetToken(code){
+        console.log(this.id);
         RED.notify("Request has been sent. Please, wait",{type:"compact"});
         $('#verification_code').prop('disabled', true);
         $('#submit_button').prop('disabled', true);
@@ -84,8 +85,19 @@
             $('#submit_button').prop('disabled', false);
         });
     }
-    function ClearDataOnGateway(jToken) {
-
+    function ClearDevicesConfigOnGateway(email) {
+        RED.notify("Request has been sent. Please, wait",{type:"compact"});
+        const suburl = btoa(email);
+        $.ajax({
+            url: "/noderedhome/"+suburl+"/clearalldevice",
+            type:"GET"
+        })
+        .done(result=>{
+            RED.notify("All configs have been successfully cleared", {type:"success"});
+        })
+        .fail(error=>{
+            RED.notify("Error when deleting configs on the gateway", {type:"error"});
+        })
     };
     function pay(id, email) {
         console.log("Start pay");
@@ -203,11 +215,6 @@
                 <span> - By purchasing a subscription, you agree to the terms of the <a href="https://nodered-home.ru/public_offer.pdf" target="_blank">public offer</a></span><br>
                 <span> - View and manage your subscriptions <a href="https://my.cloudpayments.ru/ru/unsubscribe" target="_blank">here</a></span>
                 <div style="text-align: end">
-                    <!-- <label for="node-input-subList" style="text-align: start">Period:</label>
-                    <select id="node-input-subList" style="width:70%; margin-top:10px; margin-bottom:10px;">
-                        <option value=1>1 month - 199 rubles</option>
-                        <option value=12>12 month - 2 300 rubles</option>
-                    </select> -->
                     <button id="subscribe-button"
                         onclick="pay($('#node-config-input-id').val(), $('#node-config-input-email').val())"
                         class="ui-button">Buy a subscription
@@ -217,21 +224,18 @@
         </div>
     </div>
     <hr>
-    <div name="Clearing" style="display: none;">
-        <div class="form-row"><b>Сlear all data on the gateway</b></div>
-        <div class="form-row">
-            <p>1. Click the clear button</p>
-            <p>2. Wait for the success message</p>
-            <p>3. Сlose the window and do a full deploy</p>
-            <button 
-                style="margin-left: 150px; margin-top: 10px;"
-                onclick="ClearDataOnGateway($('#node-config-input-token').val())"
-                class="ui-button">
-                Сlear data on the gateway
-            </button>
-        </div>
+    <div name="Clearing">
+        <div class="form-row"><b>Сlear all data and configs on the gateway</b></div>
         <div class="form-tips" id="node-tip">
-            <span>Tip: Сlear all data on the gateway may take up to 15 seconds, please wait for success or error message.</span>
+            <span>Tip: Сlear all data on the gateway may take up to 15 seconds, please wait for success or error message. When finished, make a full deployment to update the settings on the gateway.</span>
+            <div style="text-align: end">
+                <button 
+                    style="margin-left: 150px; margin-top: 10px;"
+                    onclick="ClearDevicesConfigOnGateway($('#node-config-input-email').val())"
+                    class="ui-button">
+                    Сlear data on the gateway
+                </button>
+            </div>
         </div>  
     </div>
 </script>

package/nodes/alice.js

@@ -1,4 +1,5 @@
 const mqtt = require('mqtt');
+const axios = require('axios');
 
 module.exports = function(RED) {
   //Sevice node, Alice-Service (credential)
@@ -11,6 +12,29 @@ module.exports = function(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 = {
+        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!!!");
@@ -97,3 +121,5 @@ module.exports = function(RED) {
   });
 };
 
+
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-alice",
-  "version": "2.1.3",
+  "version": "2.1.5",
   "description": "",
   "main": "alice.js",
   "scripts": {