Merge branch 'dev' into pr_3438

2025-03-01 10:36:34 +00:00 · 2022-04-26 13:53:35 +01:00
parent 48a528a4b8 5aba66ea78
commit f4bb62adbc
228 changed files with 28117 additions and 21477 deletions
--- a/packages/node_modules/@node-red/nodes/locales/de/messages.json
+++ b/packages/node_modules/@node-red/nodes/locales/de/messages.json
@@ -423,6 +423,7 @@
            "string": "Ein String",
            "base64": "Ein Base64-kodierter String",
            "auto": "Auto-Erkennung (string oder buffer)",
+            "auto-detect": "Auto-Erkennung (parsed JSON-Objekt, string oder buffer)",
            "json": "Ein analysiertes (parsed) JSON-Objekt"
        },
        "true": "wahr",
--- a/packages/node_modules/@node-red/nodes/locales/en-US/common/60-link.html
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/common/60-link.html
@@ -29,8 +29,8 @@
    <p>Create virtual wires between flows.</p>
    <h3>Details</h3>
    <p>This node can be configured to either send messages to all <code>link in</code>
-        nodes it is connected to, or to send a response back to the <code>link call</code>
-        node that triggered the flow.</p>
+       nodes it is connected to, or to send a response back to the <code>link call</code>
+       node that triggered the flow.</p>
    <p>When in 'send to all' mode, the wires between link nodes are only displayed when
       the node is selected. If there are any wires to other tabs, a virtual node
       is shown that can be clicked on to jump to the appropriate tab.</p>
@@ -39,12 +39,27 @@

 <script type="text/html" data-help-name="link call">
    <p>Calls a flow that starts with a <code>link in</code> node and passes on the response.</p>
+    <h3>Inputs</h3>
+    <dl class="message-properties">
+      <dt class="optional">target<span class="property-type">string</span></dt>
+      <dd>When the option <b>Link Type</b> is set to "Dynamic target", set <code>msg.target</code> to the name of the
+          <code>link in</code> node you wish to call.</dd>
+    </dl>
    <h3>Details</h3>
    <p>This node can be connected to a <code>link in</code> node that exists on any tab.
       The flow connected to that node must end with a <code>link out</code> node configured
       in 'return' mode.</p>
    <p>When this node receives a message, it is passed to the connected <code>link in</code> node.
-       It then waits for a response which it then sends on.</o>
+       It then waits for a response which it then sends on.</p>
    <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.
+    <ul>
+      <li>If there are 2 <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>
+    The flow connected to that node must end with a <code>link out</code> node configured
+    in 'return' mode.</p>
 </script>
--- a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
@@ -174,7 +174,11 @@
        "outMode": "Mode",
        "sendToAll": "Send to all connected link nodes",
        "returnToCaller": "Return to calling link node",
-	"timeout": "timeout",
+        "timeout": "timeout",
+        "linkCallType": "Link Type",
+        "staticLinkCall": "Fixed target",
+        "dynamicLinkCall": "Dynamic target (msg.target)",
+        "dynamicLinkLabel": "Dynamic",
        "error": {
            "missingReturn": "Missing return node information"
        }
@@ -439,7 +443,8 @@
            "action": "Action",
            "staticTopic": "Subscribe to single topic",
            "dynamicTopic": "Dynamic subscription",
-            "auto-connect": "Connect automatically"
+            "auto-connect": "Connect automatically",
+            "auto-mode-depreciated": "This option is depreciated. Please use the new auto-detect mode."
        },
        "sections-label":{
            "birth-message": "Message sent on connection (birth message)",
@@ -470,6 +475,7 @@
            "string": "a String",
            "base64": "a Base64 encoded string",
            "auto": "auto-detect (string or buffer)",
+            "auto-detect": "auto-detect (parsed JSON object, string or buffer)",
            "json": "a parsed JSON object"
        },
        "true": "true",
@@ -607,7 +613,8 @@
            "ms": "ms",
            "chars": "chars",
            "close": "Close",
-            "optional": "(optional)"
+            "optional": "(optional)",
+            "reattach": "re-attach delimiter"
        },
        "type": {
            "listen": "Listen on",
--- a/packages/node_modules/@node-red/nodes/locales/en-US/network/21-httprequest.html
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/network/21-httprequest.html
@@ -25,7 +25,7 @@
        <dd>If not configured in the node, this optional property sets the HTTP method of the request.
            Must be one of <code>GET</code>, <code>PUT</code>, <code>POST</code>, <code>PATCH</code> or <code>DELETE</code>.</dd>
        <dt class="optional">headers <span class="property-type">object</span></dt>
-        <dd>Sets the HTTP headers of the request.</dd>
+        <dd>Sets the HTTP headers of the request. NOTE: Any headers set in the node configuration will overwrite any matching headers in <code>msg.headers</code> </dd>
        <dt class="optional">cookies <span class="property-type">object</span></dt>
        <dd>If set, can be used to send cookies with the request.</dd>
        <dt class="optional">payload</dt>
--- a/packages/node_modules/@node-red/nodes/locales/ja/common/60-link.html
+++ b/packages/node_modules/@node-red/nodes/locales/ja/common/60-link.html
@@ -32,9 +32,21 @@

 <script type="text/html" data-help-name="link call">
    <p><code>link in</code> で始まり、応答を返すフローを呼び出します。</p>
+    <h3>入力</h3>
+    <dl class="message-properties">
+      <dt class="optional">target<span class="property-type">文字列</span></dt>
+      <dd><b>リンクの種類</b>で"対象を動的に指定"を選択した場合、<code>msg.target</code>に呼び出したい<code>link in</code>ノードの名前を指定します。</dd>
+    </dl>
    <h3>詳細</h3>
    <p>本ノードは、任意のタブ内に存在する <code>link in</code> ノードに接続できます。 接続先のフローは、`返却`モードが設定された <code>link out</code> ノードで終了する必要があります。</p>
    <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>ノードには、名前を付ける必要があります。
+    <ul>
+      <li>もし、同じ名前を付けた<code>link in</code>ノードが2つある場合、エラーが発生します。</li>
+      <li><code>link call</code>は、サブフローの中の<code>link in</code>ノードを呼び出すことはできません。</li>
+    </ul>
+    </p>
+    本ノードから呼び出すフローは、終端の<code>link out</code>ノードに'返却'モードを設定する必要があります。</p>
 </script>
--- a/packages/node_modules/@node-red/nodes/locales/ja/messages.json
+++ b/packages/node_modules/@node-red/nodes/locales/ja/messages.json
@@ -174,7 +174,11 @@
        "outMode": "モード",
        "sendToAll": "接続された全てのlinkノードへ送信",
        "returnToCaller": "link callノードへ返却",
-	"timeout": "タイムアウト",
+        "timeout": "タイムアウト",
+        "linkCallType": "リンクの種類",
+        "staticLinkCall": "対象を固定で指定",
+        "dynamicLinkCall": "対象を動的に指定 (msg.target)",
+        "dynamicLinkLabel": "動的",
        "error": {
            "missingReturn": "返却するノードの情報が存在しません"
        }
@@ -300,8 +304,8 @@
        "hour": "時間",
        "days": "日",
        "day": "日",
-        "between": "頻度",
-        "and": "回／",
+        "between": "範囲",
+        "and": "〜",
        "rate": "流量",
        "msgper": "メッセージ／",
        "queuemsg": "中間メッセージをキューに追加",
@@ -470,6 +474,7 @@
            "string": "文字列",
            "base64": "Base64文字列",
            "auto": "自動判定(文字列もしくはバイナリバッファ)",
+            "auto-detect": "自動判定(JSONオブジェクト、文字列もしくはバイナリバッファ)",
            "json": "JSONオブジェクト"
        },
        "true": "する",
--- a/packages/node_modules/@node-red/nodes/locales/ko/messages.json
+++ b/packages/node_modules/@node-red/nodes/locales/ko/messages.json
@@ -362,6 +362,7 @@
            "string": "문자열",
            "base64": "Base64문자열",
            "auto": "자동판정(문자열혹은 바이너리버퍼)",
+            "auto-detect": "자동판정(JSON오브젝트, 문자열혹은 바이너리버퍼)",
            "json": "JSON오브젝트"
        },
        "true": "한다",
--- a/packages/node_modules/@node-red/nodes/locales/ru/messages.json
+++ b/packages/node_modules/@node-red/nodes/locales/ru/messages.json
@@ -385,6 +385,7 @@
            "string": "строка",
            "base64": "строка в кодировке Base64",
            "auto": "автоопределение (строка или буфер)",
+            "auto-detect": "автоопределение (разобрать объект JSON, строка или буфер)",
            "json": "объект JSON"
        },
        "true": "да",
--- a/packages/node_modules/@node-red/nodes/locales/zh-CN/messages.json
+++ b/packages/node_modules/@node-red/nodes/locales/zh-CN/messages.json
@@ -382,6 +382,7 @@
            "string": "字符串",
            "base64": "Base64编码字符串",
            "auto": "自动检测 (字符串或buffer)",
+            "auto-detect": "自动检测 (已解析的JSON对象、字符串或buffer)",
            "json": "解析的JSON对象"
        },
        "true": "是",
--- a/packages/node_modules/@node-red/nodes/locales/zh-TW/messages.json
+++ b/packages/node_modules/@node-red/nodes/locales/zh-TW/messages.json
@@ -386,6 +386,7 @@
            "string": "字串",
            "base64": "Base64編碼字串",
            "auto": "自動檢測 (字符串或buffer)",
+            "auto-detect": "自动检测 (已解析的JSON对象、字符串或buffer)",
            "json": "解析的JSON對象"
        },
        "true": "是",