node-red-contrib-alice 2.1.2 → 2.1.4

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

@@ -42,42 +42,67 @@ 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);
-      if (states === null){
-        return;
-      };
       const option = {
-        timeout: 4000,
+        timeout: 5000,
         method: 'POST',
         url: 'https://api.nodered-home.ru/gtw/device/state',
         headers: {
@@ -85,6 +110,7 @@ module.exports = function(RED) {
           'Authorization': "Bearer "+service.getToken()
         },
         data: {
+          id: this.id,
           event: event,
           state: states
         }
@@ -94,7 +120,7 @@ module.exports = function(RED) {
         this.trace("Device state updated successfully");
       })
       .catch(error=>{
-        this.error("Error when update device state: "+error.message);
+        this.debug("Error when update device state: "+error.message);
       })
     };
 // отправка эвентов
@@ -221,6 +247,7 @@ module.exports = function(RED) {
         if (stateindex>-1){
             states.properties.splice(stateindex, 1);
         };
+        this._updateDeviceState();
         resolve(true);
       })
     };
@@ -256,15 +283,17 @@ module.exports = function(RED) {
     this.on('close', (removed, done)=>{
       this.emit('offline');
       if (removed){
-        deviceconfig = null;
-        states = 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-alice",
-  "version": "2.1.2",
+  "version": "2.1.4",
   "description": "",
   "main": "alice.js",
   "scripts": {
@@ -11,7 +11,7 @@
     "url": "git+https://github.com/efa2000/node-red-contrib-alice.git"
   },
   "engines": {
-    "node": ">=12.0.0"
+    "node": ">=14.0.0"
   },
   "keywords": [
     "node-red",