node-red-contrib-deconz - npm Package Compare versions

Comparing version 2.0.0-beta.15 to 2.0.0-beta.16

nodes/battery.js

@@ -10,2 +10,4 @@ const OutputMsgFormatter = require("../src/runtime/OutputMsgFormatter");
         topic: "",
+        statustext: "",
+        statustext_type: 'auto',
         search_type: 'device',
@@ -36,2 +38,4 @@ device_list: [],
 
+            node.status({});
+
             //get server node
@@ -38,0 +42,0 @@ node.server = RED.nodes.getNode(node.config.server);

nodes/event.js

@@ -9,2 +9,4 @@ module.exports = function (RED) {
 
+            node.status({});
+
             //get server node
@@ -11,0 +13,0 @@ node.server = RED.nodes.getNode(node.config.server);

nodes/get.js

@@ -15,2 +15,4 @@ const ConfigMigration = require("../src/migration/ConfigMigration");
         name: "",
+        statustext: "",
+        statustext_type: 'auto',
         search_type: 'device',
@@ -31,2 +33,5 @@ device_list: [],
 
+            node.cleanStatusTimer = null;
+            node.status({});
+
             //get server node
@@ -70,2 +75,4 @@ node.server = RED.nodes.getNode(node.config.server);
             node.on('input', async (message_in) => {
+                if (node.config.statustext_type === 'auto')
+                    clearTimeout(node.cleanStatusTimer);
                 // Wait until the server is ready
@@ -143,3 +150,6 @@ if (node.server.ready === false) {
                 });
-
+                if (node.config.statustext_type === 'auto')
+                    node.cleanStatusTimer = setTimeout(function () {
+                        node.status({}); //clean
+                    }, 3000);
             });
@@ -146,0 +156,0 @@ }

nodes/in.js

@@ -20,2 +20,4 @@ const dotProp = require('dot-prop');
         topic: "",
+        statustext: "",
+        statustext_type: 'auto',
         search_type: 'device',
@@ -36,2 +38,4 @@ device_list: [],
 
+            node.status({});
+
             //get server node
@@ -38,0 +42,0 @@ node.server = RED.nodes.getNode(node.config.server);

nodes/locales/en-US/server.json

@@ -24,2 +24,4 @@ {
     "connected": "connected",
+    "received": "received",
+    "done": "done",
     "wait_for_server_start": "waiting for server",
@@ -26,0 +28,0 @@ "server_node_error": "server node error",

nodes/out.js

@@ -40,2 +40,5 @@ const CommandParser = require("../src/runtime/CommandParser");
     const defaultConfig = {
+        name: "",
+        statustext: "",
+        statustext_type: 'auto',
         search_type: 'device',
@@ -59,3 +62,4 @@ device_list: [],
 
-            node.status({}); //clean
+            node.cleanStatusTimer = null;
+            node.status({});
 
@@ -87,5 +91,6 @@ //get server node
 
-            node.cleanTimer = null;
+            this.on('input', async (message_in, send, done) => {
+                if (node.config.statustext_type === 'auto')
+                    clearTimeout(node.cleanStatusTimer);
 
-            this.on('input', async (message_in, send, done) => {
                 // Wait until the server is ready
@@ -169,15 +174,15 @@ if (node.server.ready === false) {
                             try {
-                                if (requests.length > 1)
-                                    node.status({
-                                        fill: "blue",
-                                        shape: "dot",
-                                        text: RED._("node-red-contrib-deconz/server:status.out_commands.main")
-                                            .replace('{{index}}', (command_id + 1).toString())
-                                            .replace('{{count}}', command_count)
-                                            .replace('{{status}}',
-                                                RED._("node-red-contrib-deconz/server:status.out_commands.request")
-                                                    .replace('{{index}}', (request_id + 1).toString())
-                                                    .replace('{{count}}', request_count)
-                                            )
-                                    });
+                                node.status({
+                                    fill: "blue",
+                                    shape: "dot",
+                                    text: RED._("node-red-contrib-deconz/server:status.out_commands.main")
+                                        .replace('{{index}}', (command_id + 1).toString())
+                                        .replace('{{count}}', command_count)
+                                        .replace('{{status}}',
+                                            RED._("node-red-contrib-deconz/server:status.out_commands.request")
+                                                .replace('{{index}}', (request_id + 1).toString())
+                                                .replace('{{count}}', request_count)
+                                        )
+                                });
+
                                 const response = await got(
@@ -280,3 +285,2 @@ node.server.api.url.main() + request.endpoint,
                 }
-                node.status({});
 
@@ -291,2 +295,7 @@ if (resultTiming === 'at_end') {
 
+                node.server.updateNodeStatus(node, null);
+                if (node.config.statustext_type === 'auto')
+                    node.cleanStatusTimer = setTimeout(function () {
+                        node.status({}); //clean
+                    }, 3000);
             });
@@ -293,0 +302,0 @@

nodes/server.js

@@ -509,2 +509,13 @@ const got = require('got');
 
+        getDefaultMsg(nodeType) {
+            switch (nodeType) {
+                case 'deconz-input':
+                    return 'node-red-contrib-deconz/server:status.connected';
+                case 'deconz-get':
+                    return 'node-red-contrib-deconz/server:status.received';
+                case 'deconz-output':
+                    return 'node-red-contrib-deconz/server:status.done';
+            }
+        }
+
         updateNodeStatus(node, msgToSend) {
@@ -524,3 +535,3 @@ if (node.config.search_type === "device" && node.config.device_list.length === 0) {
                     shape: "dot",
-                    text: "node-red-contrib-deconz/server:status.connected"
+                    text: this.getDefaultMsg(node.type)
                 });
@@ -574,9 +585,7 @@ return;
                                     shape: "dot",
-                                    text: node.type === 'deconz-get' ?
-                                        'node-red-contrib-deconz/server:status.received' :
-                                        'node-red-contrib-deconz/server:status.connected'
+                                    text: this.getDefaultMsg(node.type)
                                 });
                             }
                             break;
-                        case'deconz-battery':
+                        case 'deconz-battery':
                             let battery = dotProp.get(firstmsg, 'meta.config.battery');
@@ -583,0 +592,0 @@ if (battery === undefined) return;

package.json

@@ -51,3 +51,3 @@ {
   },
-  "version": "2.0.0-beta.15",
+  "version": "2.0.0-beta.16",
   "devDependencies": {
@@ -54,0 +54,0 @@ "grunt": "^1.3.0",

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

452070

increased by0.28%

Lines of code

6343

increased by0.55%

No dependency changes