node-red-contrib-alice 2.1.4 → 2.2.0

package/nodes/alice-device.html

@@ -66,6 +66,12 @@
             <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>

package/nodes/alice-device.js

@@ -1,6 +1,5 @@
 const axios = require('axios');
 
-
 module.exports = function(RED) {
     // ***************************** Alice DEVICE ****************************
   function AliceDevice(config){

package/nodes/alice-sensor.html

@@ -86,7 +86,6 @@
                         .end()
                         .append('<option value="unit.temperature.celsius">Celsius</option>')
                         .append('<option value="unit.temperature.kelvin">Kelvin</option>')
-                        // .val('unit.temperature.celsius')
                         .prop('disabled', false);
                     if (this.unit && this.unit.includes("unit.temperature")){
                         $('#node-input-unit').val(this.unit);
@@ -174,6 +173,51 @@
                         .val('unit.density.mcg_m3')
                         .prop('disabled', 'disabled');
                     break;
+                    case 'electricity_meter':
+                    $('#node-input-unit')
+                        .find('option')
+                        .remove()
+                        .end()
+                        .append('<option value="unit.kilowatt_hour">kW⋅h</option>')
+                        .val('unit.kilowatt_hour')
+                        .prop('disabled', 'disabled');
+                    break;
+                    case 'gas_meter':
+                    $('#node-input-unit')
+                        .find('option')
+                        .remove()
+                        .end()
+                        .append('<option value="unit.cubic_meter">m3</option>')
+                        .val('unit.cubic_meter')
+                        .prop('disabled', 'disabled');
+                    break;
+                    case 'heat_meter':
+                    $('#node-input-unit')
+                        .find('option')
+                        .remove()
+                        .end()
+                        .append('<option value="unit.gigacalorie">Gcal</option>')
+                        .val('unit.gigacalorie')
+                        .prop('disabled', 'disabled');
+                    break;
+                    case 'water_meter':
+                    $('#node-input-unit')
+                        .find('option')
+                        .remove()
+                        .end()
+                        .append('<option value="unit.cubic_meter">m3</option>')
+                        .val('unit.cubic_meter')
+                        .prop('disabled', 'disabled');
+                    break;
+                    case 'meter':
+                    $('#node-input-unit')
+                        .find('option')
+                        .remove()
+                        .end()
+                        // .append('<option value="unit.gigacalorie">Gcal</option>')
+                        // .val('unit.gigacalorie')
+                        .prop('disabled', 'disabled');
+                    break;
                     default:
                     $('#node-input-unit').prop('disabled', 'disabled');
                         break;
@@ -212,15 +256,13 @@
             <option value="tvoc">TVOC</option>
             <option value="voltage">Voltage</option>
             <option value="water_level">Water level</option>
+            <option value="electricity_meter">Electricity counter</option>
+            <option value="gas_meter">Gas counter</option>
+            <option value="water_meter">Water counter</option>
+            <option value="meter">Universal counter</option>
         </select>
     </div>
-    <!-- <div class="form-row">
-        <label for="node-input-stype">Data Type</label>
-        <select id="node-input-stype" style="width: 70%;" disabled>
-            <option value="devices.properties.float">Number (float)</option>
-            <option value="devices.properties.bool">Boolean (true/false)</option>
-        </select>
-    </div> -->
+
     <div class="form-row">
         <label for="node-input-unit">Unit</label>
         <select id="node-input-unit" style="width: 70%;">

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.4",
+  "version": "2.2.0",
   "description": "",
   "main": "alice.js",
   "scripts": {