smart-nodes 0.3.36 → 0.4.0

package/light/locales/en-US/light.json

@@ -0,0 +1,24 @@
+{
+    "light": {
+        "ui": {
+            "name": "Name",
+            "text": "Text",
+            "controlled_by_words": "This node can be controlled using the words entered. Multiple words are separated by a comma.",
+            "time_on": "Time On",
+            "alarm_on": "Alarm On",
+            "alarm_off": "Alarm Off",
+            "controlled_by_central": "This block is controlled by the following central blocks:",
+
+            "milliseconds": "Milliseconds",
+            "seconds": "Seconds",
+            "minutes": "Minutes",
+            "hours": "Hours",
+
+            "no_action": "No action",
+            "turn_on": "Turn on",
+            "turn_off": "Turn off",
+            "last_state": "Last state",
+            "last_sended_state": "Last sent state"
+        }
+    }
+}

package/logic/locales/de-DE/logic.html

@@ -0,0 +1,12 @@
+<script type="text/html" data-help-name="smart_logic">
+    <p>Dieser Knoten bietet verschiedene Logikoperationen, wie AND, OR und XOR an.</p>
+    <p>Alle Eingänge, sowie der Ausgang lassen sich gezielt invertieren, womit weitere komplexe Logiken abgebildet werden können.</p>
+    <p>Um beispielsweise eine NOT Logik zu erstellen, wird die Anzahl der Eingänge auf 1 gesetzt, die Logik auf AND oder OR und der Ausgang invertiert.</p>
+    <p>
+        <b>Hinweis:</b> Smart Nodes verwenden Topics im Format <code>name#nummer</code>, damit können verschiedene Smart Nodes mit dem gleichen Topic angesteuert werden.<br/>
+        Diese Node verwendet nur den Teil <code>nummer</code>. <code>name</code> und <code>#</code> sind dabei optional.
+    </p>
+    <p>
+        <strong>Hinweis:</strong> <code>msg.payload</code> wird automatisch auf das Logik-Ergebnis gesetzt, sofern es nicht bereits in der Konfiguration gesetzt wurde.
+    </p>
+</script>

package/logic/locales/de-DE/logic.json

@@ -0,0 +1,26 @@
+{
+    "logic": {
+        "ui": {
+            "name": "Name",
+            "logic": "Logik",
+            "inputs": "Eingänge",
+            "invert": "Invertieren",
+            "output": "Ausgang",
+            "output_messages": "Ausgangsnachrichten",
+            "true": "Wahr",
+            "false": "Falsch",
+            "send": "Senden",
+            "outputs": "Ausgänge",
+            "note": "Hinweis:",
+            "note_text": "<code>msg.payload</code> wird automatisch auf das Logik-Ergebnis gesetzt,<br/>sofern es nicht bereits hier in der Konfiguration gesetzt wurde.",
+            "system_start": "Systemstart",
+            "save_state": "Zustand speichern",
+            "send_after_start": "Letze Nachricht 10 Sekunden nach dem Start senden",
+
+            "send_only_change": "Nur bei Änderung",
+            "always": "Immer",
+            "common_output": "Gemeinsamer Ausgang",
+            "separate_output": "Separate Ausgänge"
+        }
+    }
+}

package/logic/locales/en-US/logic.html

@@ -0,0 +1,12 @@
+<script type="text/html" data-help-name="smart_logic">
+    <p>This node offers various logic operations, such as AND, OR and XOR.</p>
+    <p>All inputs and the output can be specifically inverted, which can be used to map further complex logic.</p>
+    <p>For example, to create a NOT logic, the number of inputs is set to 1, the logic to AND or OR and the output is inverted.</p>
+    <p>
+        <b>Note:</b> Smart Nodes use topics in the format <code>name#number</code>, so that different Smart Nodes can be controlled with the same topic.<br />
+        This node only uses the <code>number</code> part. <code>name</code> and <code>#</code> are optional.
+    </p>
+    <p>
+        <strong>Note:</strong> <code>msg.payload</code> is automatically set to the logic result if it has not already been set in the configuration.
+    </p>
+</script>

package/logic/locales/en-US/logic.json

@@ -0,0 +1,26 @@
+{
+    "logic": {
+        "ui": {
+            "name": "Name",
+            "logic": "Logic",
+            "inputs": "Inputs",
+            "invert": "Invert",
+            "output": "Output",
+            "output_messages": "Output messages",
+            "true": "True",
+            "false": "False",
+            "send": "Send",
+            "outputs": "Outputs",
+            "note": "Note:",
+            "note_text": "<code>msg.payload</code> is automatically set to the logic result<br/>if it has not already been set here in the configuration.",
+            "system_start": "System start",
+            "save_state": "Save state",
+            "send_after_start": "Send last message 10 seconds after start",
+
+            "send_only_change": "Only on change",
+            "always": "Always",
+            "common_output": "Common output",
+            "separate_output": "Separate outputs"
+        }
+    }
+}

package/logic/logic.html

@@ -31,17 +31,18 @@
         },
         oneditprepare: function ()
         {
+            let node = this;
+
             $("#node-input-logic").typedInput({
-                types: [
-                    {
-                        default: "AND",
-                        options: [
-                            { value: "AND", label: "AND" },
-                            { value: "OR", label: "OR" },
-                            { value: "XOR", label: "XOR" }
-                        ],
-                    },
-                ],
+                types: [{
+                    value: "logic",
+                    default: "AND",
+                    options: [
+                        { value: "AND", label: "AND" },
+                        { value: "OR", label: "OR" },
+                        { value: "XOR", label: "XOR" }
+                    ],
+                }],
             });
 
             $("#node-input-logic_inputs").spinner({
@@ -61,12 +62,11 @@
 
             $("#node-input-inverts")
                 .typedInput({
-                    types: [
-                        {
-                            multiple: true,
-                            options: []
-                        },
-                    ],
+                    types: [{
+                        value: "inverts",
+                        multiple: true,
+                        options: []
+                    }],
                 });
             refreshInverts(this.logic_inputs);
             $("#node-input-inverts").typedInput("value", this.inverts);
@@ -75,8 +75,8 @@
             $("#node-input-out_true").typedInput({
                 type: "json",
                 types: ["json", {
-                    value: "null",
-                    label: "Nichts senden",
+                    value: "NOTHING",
+                    label: node._("logic.ui.send_nothing"),
                     icon: "fa fa-times",
                     hasValue: false,
                 }],
@@ -86,8 +86,8 @@
             $("#node-input-out_false").typedInput({
                 type: "json",
                 types: ["json", {
-                    value: "null",
-                    label: "Nichts senden",
+                    value: "NOTING",
+                    label: node._("logic.ui.send_nothing"),
                     icon: "fa fa-times",
                     hasValue: false,
                 }],
@@ -97,10 +97,10 @@
             $("#node-input-send_only_change").typedInput({
                 type: "bool",
                 types: [{
-                    value: "1",
+                    value: "send_only_change",
                     options: [
-                        { value: "true", label: "Nur bei Änderung" },
-                        { value: "false", label: "Immer" },
+                        { value: "true", label: node._("logic.ui.send_only_change") },
+                        { value: "false", label: node._("logic.ui.always") },
                     ]
                 }]
             });
@@ -108,16 +108,15 @@
             $("#node-input-outputs").typedInput({
                 type: "num",
                 types: [{
-                    value: "1",
+                    value: "outputs",
                     options: [
-                        { value: "1", label: "Gemeinsamer Ausgang" },
-                        { value: "2", label: "Separate Ausgänge" },
+                        { value: "1", label: node._("logic.ui.common_output") },
+                        { value: "2", label: node._("logic.ui.separate_output") },
                     ]
                 }]
             });
 
 
-
             $("#node-input-save_state").on("change", ev =>
             {
                 if (ev.target.checked)
@@ -143,12 +142,11 @@
         }
 
         $("#node-input-inverts")
-            .typedInput('types', [
-                {
-                    multiple: true,
-                    options: options
-                },
-            ]);
+            .typedInput("types", [{
+                value: "inverts",
+                multiple: true,
+                options: options
+            }]);
 
         $("#node-input-inverts").typedInput("value", newValues.join(","));
     }
@@ -156,72 +154,58 @@
 
 <script type="text/html" data-template-name="smart_logic">
     <div class="form-row">
-        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
-        <input type="text" id="node-input-name" placeholder="Name" />
+        <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="logic.ui.name"></span></label>
+        <input type="text" id="node-input-name" data-i18n="[placeholder]logic.ui.name" />
     </div>
     <div class="form-row">
-        <label for="node-input-logic"><i class="fa fa-microchip"></i> Logik</label>
+        <label for="node-input-logic"><i class="fa fa-microchip"></i> <span data-i18n="logic.ui.logic"></span></label>
         <input id="node-input-logic" />
     </div>
     <div class="form-row">
-        <label for="node-input-logic_inputs"><i class="fa fa-hashtag"></i> Eingänge</label>
+        <label for="node-input-logic_inputs"><i class="fa fa-hashtag"></i> <span data-i18n="logic.ui.inputs"></span></label>
         <input id="node-input-logic_inputs" />
     </div>
     <div class="form-row">
-        <label for="node-input-inverts"><i class="fa fa-circle-o"></i> Invertieren</label>
+        <label for="node-input-inverts"><i class="fa fa-circle-o"></i> <span data-i18n="logic.ui.invert"></span></label>
         <input id="node-input-inverts" />
     </div>
     <div class="form-row">
-        <label for="node-input-invert_output"><i class="fa fa-circle-o"></i> Ausgang</label>
+        <label for="node-input-invert_output"><i class="fa fa-circle-o"></i> <span data-i18n="logic.ui.output"></span></label>
         <input type="checkbox" id="node-input-invert_output" style="width: unset; margin: 0;" />
-        <label for="node-input-invert_output">&nbsp;Invertieren</label>
+        <label for="node-input-invert_output" data-i18n="logic.ui.invert"></label>
     </div>
     <hr/>
-    <h4 style="margin: 0.5rem 0;">Ausgangsnachrichten</h4>
+    <h4 style="margin: 0.5rem 0;" data-i18n="logic.ui.output_messages"></h4>
     <div class="form-row">
-        <label for="node-input-out_true"><i class="fa fa-check-circle"></i> Wahr</label>
+        <label for="node-input-out_true"><i class="fa fa-check-circle"></i> <span data-i18n="logic.ui.true"></span></label>
         <input type="text" id="node-input-out_true"/>
         <input type="hidden" id="node-input-out_true_type">
     </div>
     <div class="form-row">
-        <label for="node-input-out_false"><i class="fa fa-times-circle"></i> Falsch</label>
+        <label for="node-input-out_false"><i class="fa fa-times-circle"></i> <span data-i18n="logic.ui.false"></span></label>
         <input type="text" id="node-input-out_false" />
         <input type="hidden" id="node-input-out_false_type">
     </div>
     <div class="form-row">
-        <label for="node-input-send_only_change"><i class="fa fa-repeat"></i> Senden</label>
+        <label for="node-input-send_only_change"><i class="fa fa-repeat"></i> <span data-i18n="logic.ui.send"></span></label>
         <input id="node-input-send_only_change" />
     </div>
     <div class="form-row">
-        <label for="node-input-outputs"><i class="fa fa-hashtag"></i> Ausgänge</label>
+        <label for="node-input-outputs"><i class="fa fa-hashtag"></i> <span data-i18n="logic.ui.outputs"></span></label>
         <input id="node-input-outputs" />
     </div>
     <div class="form-row">
-        <div><strong>Hinweis:</strong></div>
-        <div><code>msg.payload</code> wird automatisch auf das Logik-Ergebnis gesetzt,</div>
-        <div>sofern es nicht bereits hier in der Konfiguration gesetzt wurde.</div>
+        <div><strong data-i18n="logic.ui.note"></strong></div>
+        <div data-i18n="[html]logic.ui.note_text"></div>
     </div>
     <hr/>
-    <h4 style="margin: 0.5rem 0;">Systemstart</h4>
+    <h4 style="margin: 0.5rem 0;" data-i18n="logic.ui.system_start"></h4>
     <div class="form-row">
         <input type="checkbox" id="node-input-save_state" style="width: 20px;" />
-        <label for="node-input-save_state" style="width: calc(100% - 30px);">Zustand speichern</label>
+        <label for="node-input-save_state" style="width: calc(100% - 30px);" data-i18n="logic.ui.save_state"></label>
     </div>
     <div class="form-row" id="resend_on_start_row">
         <input type="checkbox" id="node-input-resend_on_start" style="width: 20px;" />
-        <label for="node-input-resend_on_start" style="width: calc(100% - 30px);">Letze Nachricht 10 Sekunden nach dem Start senden</label>
+        <label for="node-input-resend_on_start" style="width: calc(100% - 30px);" data-i18n="logic.ui.send_after_start"></label>
     </div>
-</script>
-
-<script type="text/html" data-help-name="smart_logic">
-    <p>Dieser Knoten bietet verschiedene Logikoperationen, wie AND, OR und XOR an.</p>
-    <p>Alle Eingänge, sowie der Ausgang lassen sich gezielt invertieren, womit weitere komplexe Logiken abgebildet werden können.</p>
-    <p>Um beispielsweise eine NOT Logik zu erstellen, wird die Anzahl der Eingänge auf 1 gesetzt, die Logik auf AND oder OR und der Ausgang invertiert.</p>
-    <p>
-        <b>Hinweis:</b> Smart Nodes verwenden Topics im Format <code>name#nummer</code>, damit können verschiedene Smart Nodes mit dem gleichen Topic angesteuert werden.<br/>
-        Diese Node verwendet nur den Teil <code>nummer</code>. <code>name</code> und <code>#</code> sind dabei optional.
-    </p>
-    <p>
-        <strong>Hinweis:</strong> <code>msg.payload</code> wird automatisch auf das Logik-Ergebnis gesetzt, sofern es nicht bereits in der Konfiguration gesetzt wurde.
-    </p>
 </script>

package/logic/logic.js

@@ -7,28 +7,38 @@ module.exports = function (RED)
         const node = this;
         RED.nodes.createNode(node, config);
 
+        // ###################
+        // # Class constants #
+        // ###################
+
+
+        // #######################
+        // # Global help objects #
+        // #######################
         const smart_context = require("../persistence.js")(RED);
         const helper = require("../smart_helper.js");
 
-        // persistant values
+
+        // #####################
+        // # persistent values #
+        // #####################
         var node_settings = {
             input_states: Array.from({ length: config.logic_inputs }).fill(false),
             last_result: null,
             last_message: null,
         };
 
+
+        // load or delete saved values
         if (config.save_state)
-        {
-            // load old saved values
             node_settings = Object.assign(node_settings, smart_context.get(node.id));
-        }
         else
-        {
-            // delete old saved values
             smart_context.del(node.id);
-        }
 
-        // dynamic config
+
+        // ##################
+        // # Dynamic config #
+        // ##################
         let logic = config.logic;
         let out_true = helper.evaluateNodeProperty(RED, config.out_true, config.out_true_type || "json");
         let out_false = helper.evaluateNodeProperty(RED, config.out_false, config.out_false_type || "json");
@@ -38,29 +48,59 @@ module.exports = function (RED)
         let send_only_change = helper.evaluateNodeProperty(RED, config.send_only_change, "bool");
         let outputs = helper.evaluateNodeProperty(RED, config.outputs, "num");
 
-        // runtime values
 
+        // ##################
+        // # Runtime values #
+        // ##################
+
+
+        // ###############
+        // # Node events #
+        // ###############
         node.on("input", function (msg)
         {
-            if (typeof msg.topic === "undefined")
-            {
-                node.error("Topic not set");
-                return;
-            }
-            let input = helper.getTopicNumber(msg.topic);
+            handleTopic(msg);
+
+            setStatus();
+
+            if (config.save_state)
+                smart_context.set(node.id, node_settings);
+        });
 
-            if (input == null || input < 1 || input > logic_inputs)    
+        node.on("close", function ()
+        {
+        });
+
+
+        // #####################
+        // # Private functions #
+        // #####################
+
+        // This is the main function which handles all topics that was received.
+        let handleTopic = msg =>
+        {
+            helper.log("handle topic:");
+            helper.log(msg);
+
+            let real_topic_number = helper.getTopicNumber(msg.topic);
+
+            if (real_topic_number == null || real_topic_number < 1 || real_topic_number > logic_inputs)    
             {
                 node.error("Topic has to be >= 1 and <= " + logic_inputs + ", send: " + msg.topic);
                 return;
             }
 
-            if (inverts.includes(input))
-                node_settings.input_states[input - 1] = !msg.payload;
+            if (inverts.includes(real_topic_number))
+                node_settings.input_states[real_topic_number - 1] = !msg.payload;
             else
-                node_settings.input_states[input - 1] = !!msg.payload; // !! => Convert to boolean
+                node_settings.input_states[real_topic_number - 1] = !!msg.payload; // !! => Convert to boolean
 
             let result = getResult();
+
+            helper.log("getResult:");
+            helper.log(result);
+            helper.log(node_settings);
+
             let out_msg = null;
 
             setStatus();
@@ -72,12 +112,12 @@ module.exports = function (RED)
             if (result)
             {
                 if (out_true !== null)
-                    out_msg = Object.assign({}, out_true);
+                    out_msg = helper.cloneObject(out_true);
             }
             else
             {
                 if (out_false !== null)
-                    out_msg = Object.assign({}, out_false);
+                    out_msg = helper.cloneObject(out_false);
             }
 
             if (out_msg !== null)
@@ -103,13 +143,7 @@ module.exports = function (RED)
             node_settings.last_result = result;
             node_settings.last_message = out_msg;
 
-            if (config.save_state)
-                smart_context.set(node.id, node_settings);
-        });
-
-        node.on("close", function ()
-        {
-        });
+        }
 
         let getResult = () =>
         {
@@ -187,7 +221,7 @@ module.exports = function (RED)
         {
             setTimeout(() =>
             {
-                node.send(node_settings.last_message);
+                node.send(helper.cloneObject(node_settings.last_message));
             }, 10000);
         }
 

package/long-press/locales/de-DE/long-press.html

@@ -0,0 +1,5 @@
+<script type="text/html" data-help-name="smart_long-press-control">
+    <p>Diese Node kann unterscheiden, wie lange ein Taster gedrückt wurde. Die Zeit, ab wann ein Tastendruck als lang gilt, kann in den Eigenschaften der Node eingestellt werden.</p>
+    <p>Ein langer Tastendruck wird sofort ausgelöst, wenn die maximal Zeit überschritten wurde.</p>
+    <p>Die Node misst die Zeit zwischen <code>msg.payload = true;</code> und <code>msg.payload = false;</code> und gibt eine entsprechende Nachricht aus.</p>
+</script>

package/long-press/locales/de-DE/long-press.json

@@ -0,0 +1,13 @@
+{
+    "long-press": {
+        "ui": {
+            "name": "Name",
+            "time_for_long": "Zeit für lang",
+            "time_for_long_placeholder": "Zeit in ms für einen langen Druck",
+            "milliseconds": "Millisekunden",
+            "output_messages": "Ausgangsnachrichten",
+            "short": "Kurz",
+            "long": "Lang"
+        }
+    }
+}

package/long-press/locales/en-US/long-press.html

@@ -0,0 +1,5 @@
+<script type="text/html" data-help-name="smart_long-press-control">
+    <p>This node can distinguish how long a button has been pressed. The time from which a button press is considered long can be set in the properties of the node.</p>
+    <p>A long button press is triggered immediately if the maximum time has been exceeded.</p>
+    <p>The node measures the time between <code>msg.payload = true;</code> and <code>msg.payload = false;</code> and outputs a corresponding message.</p>
+</script>

package/long-press/locales/en-US/long-press.json

@@ -0,0 +1,13 @@
+{
+    "long-press": {
+        "ui": {
+            "name": "Name",
+            "time_for_long": "Time for long",
+            "time_for_long_placeholder": "Time in ms for a long press",
+            "milliseconds": "Milliseconds",
+            "output_messages": "Output messages",
+            "short": "Short",
+            "long": "Long"
+        }
+    }
+}

package/{long-press-control/long-press-control.html → long-press/long-press.html}

@@ -19,6 +19,8 @@
         },
         oneditprepare: function ()
         {
+            let node = this;
+
             $("#node-input-long_press_ms").spinner({
                 min: 1,
                 change: function (event, ui)
@@ -47,28 +49,22 @@
 
 <script type="text/html" data-template-name="smart_long-press-control">
     <div class="form-row">
-        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
-        <input type="text" id="node-input-name" placeholder="Name" />
+        <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="long-press.ui.name"></span></label>
+        <input type="text" id="node-input-name" data-i18n="[placeholder]long-press.ui.name" />
     </div>
     <div class="form-row">
-        <label for="node-input-long_press_ms"><i class="fa fa-clock-o"></i> Zeit für lang</label>
-        <input id="node-input-long_press_ms" placeholder="Zeit in ms für einen langen Druck" />
-        <span> Millisekunden</span>
+        <label for="node-input-long_press_ms"><i class="fa fa-clock-o"></i><span data-i18n="long-press.ui.time_for_long"></span></label>
+        <input id="node-input-long_press_ms" data-i18n="[placeholder]long-press.ui.time_for_long_placeholder" />
+        <span data-i18n="long-press.ui.milliseconds"></span>
     </div>
     <hr/>
-    <h4 style="margin: 0.5rem 0;">Ausgangsnachrichten</h4>
+    <h4 style="margin: 0.5rem 0;" data-i18n="long-press.ui.output_messages"></h4>
     <div class="form-row">
-        <label for="node-input-short"><i class="fa fa-hand-o-up"></i> Kurz</label>
+        <label for="node-input-short"><i class="fa fa-hand-o-up"></i> <span data-i18n="long-press.ui.short"></span></label>
         <input type="text" id="node-input-short" />
     </div>
     <div class="form-row">
-        <label for="node-input-long"><i class="fa fa-hand-o-up"></i> Lang</label>
+        <label for="node-input-long"><i class="fa fa-hand-o-up"></i> <span data-i18n="long-press.ui.long"></span></label>
         <input type="text" id="node-input-long" />
     </div>
-</script>
-
-<script type="text/html" data-help-name="smart_long-press-control">
-    <p>Diese Node kann unterscheiden, wie lange ein Taster gedrückt wurde. Die Zeit, ab wann ein Tastendruck als lang gilt, kann in den Eigenschaften der Node eingestellt werden.</p>
-    <p>Ein langer Tastendruck wird sofort ausgelöst, wenn die maximal Zeit überschritten wurde.</p>
-    <p>Die Node misst die Zeit zwischen <code>msg.payload = true;</code> und <code>msg.payload = false;</code> und gibt eine entsprechende Nachricht aus.</p>
 </script>