@node-red/nodes 3.0.0-beta.1 → 3.0.0-beta.4

package/core/storage/10-file.html

@@ -198,8 +198,8 @@
         category: 'storage',
         defaults: {
             name: {value:""},
-            filename: {value:"filename"},
-            filenameType: {value:"msg"},
+            filename: {value:""},
+            filenameType: {value:"str"},
             appendNewline: {value:true},
             createDir: {value:false},
             overwriteFile: {value:"false"},
@@ -236,8 +236,8 @@
                 label: node._("file.encoding.setbymsg")
             }).text(label).appendTo(encSel);
             $("#node-input-filename").typedInput({
-                default: "msg",
-                types:[{ value: "str", label:"", icon:"red/images/typedInput/az.svg"}, "msg", "jsonata", "env"],
+                default: "str",
+                types: [{label:RED._("node-red:file.label.path"), value:"str", icon:""}, "msg", "jsonata", "env"],
                 typeField: $("#node-input-filenameType")
             });
             if(typeof node.filenameType == 'undefined') {
@@ -297,8 +297,8 @@
         category: 'storage',
         defaults: {
             name: {value:""},
-            filename: {value:"filename"},
-            filenameType: {value:"msg"},
+            filename: {value:""},
+            filenameType: {value:"str"},
             format: {value:"utf8"},
             chunk: {value:false},
             sendError: {value: false},
@@ -341,8 +341,8 @@
                 label: label
             }).text(label).appendTo(encSel);
             $("#node-input-filename").typedInput({
-                default: "msg",
-                types:[{ value: "str", label:"", icon:"red/images/typedInput/az.svg"}, "msg", "jsonata", "env"],
+                default: "str",
+                types: [{label:RED._("node-red:file.label.path"), value:"str", icon:""}, "msg", "jsonata", "env"],
                 typeField: $("#node-input-filenameType")
             });
             if(typeof node.filenameType == 'undefined') {

package/examples/function/delay/06 - Simple Queue with release

@@ -0,0 +1,149 @@
+[
+    {
+        "id": "48d660b3a4109400",
+        "type": "inject",
+        "z": "9e5f48c16729e4f0",
+        "name": "inject",
+        "props": [
+            {
+                "p": "payload"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "",
+        "payloadType": "date",
+        "x": 185,
+        "y": 795,
+        "wires": [
+            [
+                "e0f9e206681f3504"
+            ]
+        ]
+    },
+    {
+        "id": "e0f9e206681f3504",
+        "type": "delay",
+        "z": "9e5f48c16729e4f0",
+        "name": "",
+        "pauseType": "rate",
+        "timeout": "5",
+        "timeoutUnits": "seconds",
+        "rate": "1",
+        "nbRateUnits": "30",
+        "rateUnits": "second",
+        "randomFirst": "1",
+        "randomLast": "5",
+        "randomUnits": "seconds",
+        "drop": false,
+        "allowrate": false,
+        "outputs": 1,
+        "x": 430,
+        "y": 795,
+        "wires": [
+            [
+                "e470f1d794e1bef9",
+                "af7cea1dfb797a75"
+            ]
+        ]
+    },
+    {
+        "id": "943543cf7a1958e4",
+        "type": "change",
+        "z": "9e5f48c16729e4f0",
+        "name": "set flush to 1",
+        "rules": [
+            {
+                "t": "set",
+                "p": "flush",
+                "pt": "msg",
+                "to": "1",
+                "tot": "num"
+            },
+            {
+                "t": "delete",
+                "p": "payload",
+                "pt": "msg"
+            }
+        ],
+        "action": "",
+        "property": "",
+        "from": "",
+        "to": "",
+        "reg": false,
+        "x": 510,
+        "y": 915,
+        "wires": [
+            [
+                "e0f9e206681f3504"
+            ]
+        ]
+    },
+    {
+        "id": "e470f1d794e1bef9",
+        "type": "function",
+        "z": "9e5f48c16729e4f0",
+        "name": "Do something that takes a few seconds",
+        "func": "\n//send on the message between 3 and 6 seconds later\nsetTimeout(\n    function() { \n        node.send(msg) \n    }, \n    Math.random() * 3000 + 3000\n);\nreturn null;",
+        "outputs": 1,
+        "noerr": 0,
+        "initialize": "",
+        "finalize": "",
+        "libs": [],
+        "x": 760,
+        "y": 795,
+        "wires": [
+            [
+                "943543cf7a1958e4",
+                "859258551b8389b7"
+            ]
+        ]
+    },
+    {
+        "id": "af7cea1dfb797a75",
+        "type": "debug",
+        "z": "9e5f48c16729e4f0",
+        "name": "IN",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": false,
+        "complete": "payload",
+        "targetType": "msg",
+        "statusVal": "",
+        "statusType": "auto",
+        "x": 710,
+        "y": 735,
+        "wires": []
+    },
+    {
+        "id": "859258551b8389b7",
+        "type": "debug",
+        "z": "9e5f48c16729e4f0",
+        "name": "OUT",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": false,
+        "complete": "payload",
+        "targetType": "msg",
+        "statusVal": "",
+        "statusType": "auto",
+        "x": 895,
+        "y": 735,
+        "wires": []
+    },
+    {
+        "id": "ecaaf26326da10ee",
+        "type": "comment",
+        "z": "9e5f48c16729e4f0",
+        "name": "Simple Queue with release",
+        "info": "This example shows how to use a delay node set to rate limit mode as a simple queue to feed a\nprocess that may take some time to complete. Once that process completes the feedback is then\nset to flush out the next message - thus running the \"loop\" as fast as possible with no overlaps.\n\n**Note**: only the `msg.flush` property msut be set - otherwise the other properties that are fed \nback will be added as another new message to the queue.",
+        "x": 235,
+        "y": 915,
+        "wires": []
+    }
+]

package/locales/en-US/common/60-link.html

@@ -54,9 +54,10 @@
     <p>If no response is received within the configured timeout, default 30 seconds, the node
        will log an error that can be caught using the <code>catch</code> node.</p>
     <p>When the option <b>Link Type</b> is set to "Dynamic target" <code>msg.target</code> can be used to call a
-       <code>link in</code> by name. The target <code>link in</code> node must be named.
+       <code>link in</code> by name or id. 
     <ul>
-      <li>If there are 2 <code>link in</code> nodes with the same name, an error will be raised</li>
+      <li>If there is a <code>link in</code> nodes with the same id, it will be called</li>
+      <li>If there are two or more <code>link in</code> nodes with the same name, an error will be raised</li>
       <li>A <code>link call</code> cannot call a <code>link in</code> node inside a subflow</li>
     </ul>
     </p>

package/locales/en-US/messages.json

@@ -137,6 +137,7 @@
         "toConsole": "system console",
         "toStatus": "node status (32 characters)",
         "severity": "Level",
+        "node": "node",
         "notification": {
             "activated": "Successfully activated: __label__",
             "deactivated": "Successfully deactivated: __label__"
@@ -193,22 +194,22 @@
             "key": "Private Key",
             "passphrase": "Passphrase",
             "ca": "CA Certificate",
-            "verify-server-cert":"Verify server certificate",
+            "verify-server-cert": "Verify server certificate",
             "servername": "Server Name",
             "alpnprotocol": "ALPN Protocol"
         },
         "placeholder": {
-            "cert":"path to certificate (PEM format)",
-            "key":"path to private key (PEM format)",
-            "ca":"path to CA certificate (PEM format)",
-            "passphrase":"private key passphrase (optional)",
-            "servername":"for use with SNI",
-            "alpnprotocol":"for use with ALPN"
+            "cert": "path to certificate (PEM format)",
+            "key": "path to private key (PEM format)",
+            "ca": "path to CA certificate (PEM format)",
+            "passphrase": "private key passphrase (optional)",
+            "servername": "for use with SNI",
+            "alpnprotocol": "for use with ALPN"
         },
         "error": {
             "missing-file": "No certificate/key file provided",
-	    "invalid-cert": "Certificate not specified",
-	    "invalid-key": "Private key not specified"
+            "invalid-cert": "Certificate not specified",
+            "invalid-key": "Private key not specified"
         }
     },
     "exec": {
@@ -262,10 +263,10 @@
             "moduleLoadError": "Failed to load module __module__: __error__",
             "moduleNameError": "Invalid module variable name: __name__",
             "moduleNameReserved": "Reserved variable name: __name__",
-            "inputListener":"Cannot add listener to 'input' event within Function",
-            "non-message-returned":"Function tried to send a message of type __type__",
-	    "invalid-js": "Error in JavaScript code",
-	    "missing-module": "Module __module__ missing"
+            "inputListener": "Cannot add listener to 'input' event within Function",
+            "non-message-returned": "Function tried to send a message of type __type__",
+            "invalid-js": "Error in JavaScript code",
+            "missing-module": "Module __module__ missing"
         }
     },
     "template": {
@@ -319,35 +320,35 @@
             "limit": "limit",
             "limitTopic": "limit topic",
             "random": "random",
-	    "rate": "rate",
-	    "random-first": "first random value",
-	    "random-last": "last random value",
-            "units" : {
+            "rate": "rate",
+            "random-first": "first random value",
+            "random-last": "last random value",
+            "units": {
                 "second": {
-                    "plural" : "Seconds",
+                    "plural": "Seconds",
                     "singular": "Second"
                 },
                 "minute": {
-                    "plural" : "Minutes",
+                    "plural": "Minutes",
                     "singular": "Minute"
                 },
                 "hour": {
-                    "plural" : "Hours",
+                    "plural": "Hours",
                     "singular": "Hour"
                 },
                 "day": {
-                    "plural" : "Days",
+                    "plural": "Days",
                     "singular": "Day"
                 }
             }
         },
         "errors": {
-            "too-many" : "too many pending messages in delay node",
-	    "invalid-timeout": "Invalid delay value",
-	    "invalid-rate": "Invalid rate value",
-	    "invalid-rate-unit": "Invalid rate unit value",
-	    "invalid-random-first": "Invalid first random value",
-	    "invalid-random-last": "Invalid last random value"
+            "too-many": "too many pending messages in delay node",
+            "invalid-timeout": "Invalid delay value",
+            "invalid-rate": "Invalid rate value",
+            "invalid-rate-unit": "Invalid rate unit value",
+            "invalid-random-first": "Invalid first random value",
+            "invalid-random-last": "Invalid last random value"
         }
     },
     "trigger": {
@@ -382,11 +383,11 @@
             "trigger-block": "trigger & block",
             "trigger-loop": "resend every",
             "reset": "Reset the trigger if:",
-            "resetMessage":"msg.reset is set",
-            "resetPayload":"msg.payload equals",
+            "resetMessage": "msg.reset is set",
+            "resetPayload": "msg.payload equals",
             "resetprompt": "optional",
-	    "duration": "duration",
-	    "topic": "topic"
+            "duration": "duration",
+            "topic": "topic"
         }
     },
     "comment": {
@@ -411,8 +412,8 @@
             "cleansession": "Use clean session",
             "cleanstart": "Use clean start",
             "use-tls": "Use TLS",
-            "tls-config":"TLS Configuration",
-            "verify-server-cert":"Verify server certificate",
+            "tls-config": "TLS Configuration",
+            "verify-server-cert": "Verify server certificate",
             "compatmode": "Use legacy MQTT 3.1 support",
             "userProperties": "User Properties",
             "subscriptionIdentifier": "Subscription ID",
@@ -447,10 +448,10 @@
             "auto-connect": "Connect automatically",
             "auto-mode-depreciated": "This option is depreciated. Please use the new auto-detect mode."
         },
-        "sections-label":{
+        "sections-label": {
             "birth-message": "Message sent on connection (birth message)",
-            "will-message":"Message sent on an unexpected disconnection (will message)",
-            "close-message":"Message sent before disconnecting (close message)"
+            "will-message": "Message sent on an unexpected disconnection (will message)",
+            "close-message": "Message sent before disconnecting (close message)"
         },
         "tabs-label": {
             "connection": "Connection",
@@ -459,7 +460,7 @@
         },
         "placeholder": {
             "clientid": "Leave blank for auto generated",
-            "clientid-nonclean":"Must be set for non-clean sessions",
+            "clientid-nonclean": "Must be set for non-clean sessions",
             "will-topic": "Leave blank to disable will message",
             "birth-topic": "Leave blank to disable birth message",
             "close-topic": "Leave blank to disable close message"
@@ -492,8 +493,7 @@
             "invalid-action-action": "Invalid action specified",
             "invalid-action-alreadyconnected": "Disconnect from broker before connecting",
             "invalid-action-badsubscription": "msg.topic is missing or invalid",
-	    "invalid-client-id": "Missing Client ID"
-
+            "invalid-client-id": "Missing Client ID"
         }
     },
     "httpin": {
@@ -506,7 +506,7 @@
             "status": "Status code",
             "headers": "Headers",
             "other": "other",
-            "paytoqs" : {
+            "paytoqs": {
                 "ignore": "Ignore",
                 "query": "Append to query-string parameters",
                 "body": "Send as request body"
@@ -520,7 +520,7 @@
         "setby": "- set by msg.method -",
         "basicauth": "Use authentication",
         "use-tls": "Enable secure (SSL/TLS) connection",
-        "tls-config":"TLS Configuration",
+        "tls-config": "TLS Configuration",
         "basic": "basic authentication",
         "digest": "digest authentication",
         "bearer": "bearer authentication",
@@ -545,8 +545,8 @@
             "no-response": "No response object",
             "json-error": "JSON parse error",
             "no-url": "No url specified",
-            "deprecated-call":"Deprecated call to __method__",
-            "invalid-transport":"non-http transport requested",
+            "deprecated-call": "Deprecated call to __method__",
+            "invalid-transport": "non-http transport requested",
             "timeout-isnan": "Timeout value is not a valid number, ignoring",
             "timeout-isnegative": "Timeout value is negative, ignoring",
             "invalid-payload": "Invalid payload",
@@ -584,8 +584,8 @@
             "send-error": "An error occurred while sending: ",
             "missing-conf": "Missing server configuration",
             "duplicate-path": "Cannot have two WebSocket listeners on the same path: __path__",
-	    "missing-server": "Missing server configuration",
-	    "missing-client": "Missing client configuration"
+            "missing-server": "Missing server configuration",
+            "missing-client": "Missing client configuration"
         }
     },
     "watch": {
@@ -645,7 +645,6 @@
             "connection-closed": "connection closed from __host__:__port__",
             "connections": "__count__ connection",
             "connections_plural": "__count__ connections"
-
         },
         "errors": {
             "connection-lost": "connection lost to __host__:__port__",
@@ -657,8 +656,8 @@
             "connect-timeout": "connect timeout",
             "connect-fail": "connect failed",
             "bad-string": "failed to convert to string",
-	    "invalid-host": "Invalid host",
-	    "invalid-port": "Invalid port"
+            "invalid-host": "Invalid host",
+            "invalid-port": "Invalid port"
         }
     },
     "udp": {
@@ -673,7 +672,7 @@
             "toport": "to port",
             "address": "Address",
             "decode-base64": "Decode Base64 encoded payload?",
-	    "port": "port"
+            "port": "port"
         },
         "placeholder": {
             "interface": "(optional) local interface or address to bind to",
@@ -721,7 +720,7 @@
             "port-invalid": "udp: port number not valid",
             "alreadyused": "udp: port __port__ already in use",
             "ifnotfound": "udp: interface __iface__ not found",
-	    "invalid-group": "invalid multicast group"
+            "invalid-group": "invalid multicast group"
         }
     },
     "switch": {
@@ -729,7 +728,9 @@
         "label": {
             "property": "Property",
             "rule": "rule",
-            "repair": "recreate message sequences"
+            "repair": "recreate message sequences",
+            "value-rules": "value rules",
+            "sequence-rules": "sequence rules"
         },
         "previous": "previous value",
         "and": "and",
@@ -786,8 +787,8 @@
             "invalid-json": "Invalid 'to' JSON property",
             "invalid-expr": "Invalid JSONata expression: __error__",
             "no-override": "Cannot set property of non-object type: __property__",
-	    "invalid-prop": "Invalid property expression: __property__",
-	    "invalid-json-data": "Invalid JSON data: __error__"
+            "invalid-prop": "Invalid property expression: __property__",
+            "invalid-json-data": "Invalid JSON data: __error__"
         }
     },
     "range": {
@@ -799,10 +800,10 @@
             "from": "from",
             "to": "to",
             "roundresult": "Round result to the nearest integer?",
-	    "minin": "input from",
-	    "maxin": "input to",
-	    "minout": "target from",
-	    "maxout": "target to"
+            "minin": "input from",
+            "maxin": "input to",
+            "minout": "target from",
+            "maxout": "target to"
         },
         "placeholder": {
             "min": "e.g. 0",
@@ -899,8 +900,8 @@
             "property": "Property",
             "actions": {
                 "toggle": "Convert between JSON String & Object",
-                "str":"Always convert to JSON String",
-                "obj":"Always convert to JavaScript Object"
+                "str": "Always convert to JSON String",
+                "obj": "Always convert to JavaScript Object"
             }
         }
     },
@@ -927,6 +928,7 @@
             "write": "write file",
             "read": "read file",
             "filename": "Filename",
+            "path": "path",
             "action": "Action",
             "addnewline": "Add newline (\\n) to each payload?",
             "createdir": "Create directory if it doesn't exist?",
@@ -986,15 +988,15 @@
     },
     "split": {
         "split": "split",
-        "intro":"Split <code>msg.payload</code> based on type:",
-        "object":"<b>Object</b>",
-        "objectSend":"Send a message for each key/value pair",
-        "strBuff":"<b>String</b> / <b>Buffer</b>",
-        "array":"<b>Array</b>",
-        "splitUsing":"Split using",
-        "splitLength":"Fixed length of",
-        "stream":"Handle as a stream of messages",
-        "addname":" Copy key to "
+        "intro": "Split <code>msg.payload</code> based on type:",
+        "object": "<b>Object</b>",
+        "objectSend": "Send a message for each key/value pair",
+        "strBuff": "<b>String</b> / <b>Buffer</b>",
+        "array": "<b>Array</b>",
+        "splitUsing": "Split using",
+        "splitLength": "Fixed length of",
+        "stream": "Handle as a stream of messages",
+        "addname": " Copy key to "
     },
     "join": {
         "join": "join",
@@ -1027,7 +1029,7 @@
         "complete": "After a message with the <code>msg.complete</code> property set",
         "tip": "This mode assumes this node is either paired with a <i>split</i> node or the received messages will have a properly configured <code>msg.parts</code> property.",
         "too-many": "too many pending messages in join node",
-	"message-prop": "message property",
+        "message-prop": "message property",
         "merge": {
             "topics-label": "Merged Topics",
             "topics": "topics",
@@ -1046,51 +1048,51 @@
             "invalid-type": "Cannot join __error__ to buffer"
         }
     },
-    "sort" : {
+    "sort": {
         "sort": "sort",
-        "target" : "Sort",
-        "seq" : "message sequence",
-        "key" : "Key",
-        "elem" : "element value",
-        "order" : "Order",
-        "ascending" : "ascending",
-        "descending" : "descending",
-        "as-number" : "as number",
-        "invalid-exp" : "Invalid JSONata expression in sort node: __message__",
-        "too-many" : "Too many pending messages in sort node",
-        "clear" : "clear pending message in sort node"
+        "target": "Sort",
+        "seq": "message sequence",
+        "key": "Key",
+        "elem": "element value",
+        "order": "Order",
+        "ascending": "ascending",
+        "descending": "descending",
+        "as-number": "as number",
+        "invalid-exp": "Invalid JSONata expression in sort node: __message__",
+        "too-many": "Too many pending messages in sort node",
+        "clear": "clear pending message in sort node"
     },
-    "batch" : {
+    "batch": {
         "batch": "batch",
         "mode": {
-            "label" : "Mode",
-            "num-msgs" : "Group by number of messages",
-            "interval" : "Group by time interval",
-            "concat" : "Concatenate sequences"
+            "label": "Mode",
+            "num-msgs": "Group by number of messages",
+            "interval": "Group by time interval",
+            "concat": "Concatenate sequences"
         },
         "count": {
-            "label" : "Number of messages",
-            "overlap" : "Overlap",
-            "count" : "count",
-            "invalid" : "Invalid count and overlap"
+            "label": "Number of messages",
+            "overlap": "Overlap",
+            "count": "count",
+            "invalid": "Invalid count and overlap"
         },
         "interval": {
-            "label" : "Interval",
-            "seconds" : "seconds",
-            "empty" : "send empty message when no message arrives"
+            "label": "Interval",
+            "seconds": "seconds",
+            "empty": "send empty message when no message arrives"
         },
         "concat": {
             "topics-label": "Topics",
-            "topic" : "topic"
-        },
-        "too-many" : "too many pending messages in batch node",
-        "unexpected" : "unexpected mode",
-        "no-parts" : "no parts property in message",
-	"error": {
-	    "invalid-count": "Invalid count",
-	    "invalid-overlap": "Invalid overlap",
-	    "invalid-interval": "Invalid interval"
-	}
+            "topic": "topic"
+        },
+        "too-many": "too many pending messages in batch node",
+        "unexpected": "unexpected mode",
+        "no-parts": "no parts property in message",
+        "error": {
+            "invalid-count": "Invalid count",
+            "invalid-overlap": "Invalid overlap",
+            "invalid-interval": "Invalid interval"
+        }
     },
     "rbe": {
         "rbe": "filter",
@@ -1100,11 +1102,11 @@
             "start": "Start value",
             "name": "Name",
             "septopics": "Apply mode separately for each ",
-	    "gap": "value change",
-	    "property": "property",
-	    "topic": "topic"
+            "gap": "value change",
+            "property": "property",
+            "topic": "topic"
         },
-        "placeholder":{
+        "placeholder": {
             "bandgap": "e.g. 10 or 5%",
             "start": "leave blank to use first data received"
         },

package/locales/ja/common/60-link.html

@@ -42,9 +42,10 @@
     <p>本ノードはメッセージを受信すると、メッセージを接続した <code>link in</code> ノードへ渡します。
        その後、応答を待った後にメッセージを送信します。</o>
     <p>もし、設定したタイムアウト(デフォルト30秒)以内に応答がない場合は、<code>catch</code> ノードを用いてエラーをログに記録することもできます。</p>
-    <p><b>リンクの種類</b>で"対象を動的に指定"を選択した場合、<code>link in</code>ノードの名前を<code>msg.target</code>に指定して呼び出すことができます。対象となる<code>link in</code>ノードには、名前を付ける必要があります。
+    <p><b>リンクの種類</b>で"対象を動的に指定"を選択した場合、<code>link in</code>ノードのIDもしくは名前を<code>msg.target</code>に指定して呼び出すことができます。
     <ul>
-      <li>もし、同じ名前を付けた<code>link in</code>ノードが2つある場合、エラーが発生します。</li>
+      <li>同じIDの<code>link in</code>ノードがある場合、それを呼び出します。</li>
+      <li>もし、同じ名前を付けた<code>link in</code>ノードが2つ以上ある場合、エラーが発生します。</li>
       <li><code>link call</code>は、サブフローの中の<code>link in</code>ノードを呼び出すことはできません。</li>
     </ul>
     </p>