"+RED.text.bidi.enforceTextDirectionWithUCC(label)+"
"+RED.text.bidi.enforceTextDirectionWithUCC(label)+""+type+"
"+RED._("palette.noInfo")+"
',{style:"font-size: 0.8em"}).text(metaData).appendTo(popOverContent); + } } catch(err) { // Malformed HTML may cause errors. TODO: need to understand what can break // NON-NLS: internal debug @@ -129,9 +142,9 @@ RED.palette = (function() { } function setIcon(element,sf) { - var icon_url = RED.utils.getNodeIcon(sf._def,sf); + var icon_url = RED.utils.getNodeIcon(sf._def); var iconContainer = element.find(".palette_icon_container"); - RED.utils.createIconElement(icon_url, iconContainer, true); + RED.utils.createIconElement(icon_url, iconContainer, true, sf._def); } function escapeNodeType(nt) { @@ -169,7 +182,7 @@ RED.palette = (function() { if (def.icon) { var icon_url = RED.utils.getNodeIcon(def); var iconContainer = $('
This node can be used to create a timeout within a flow. By default, when it receives a message, it sends on a message with a payload of 1. It then waits 250ms before sending a second message with a payload of 0. - This could be used, for example, to blink an LED attached to a Raspberry PI GPIO pin.
payload
1
0
The payloads of each message sent can be configured to a variety of values, including the option to not send anything. For example, setting the initial message to nothing and selecting the option to extend the timer with each received message, the node will diff --git a/packages/node_modules/@node-red/nodes/core/io/06-httpproxy.html b/packages/node_modules/@node-red/nodes/core/io/06-httpproxy.html new file mode 100644 index 000000000..e4d03d1db --- /dev/null +++ b/packages/node_modules/@node-red/nodes/core/io/06-httpproxy.html @@ -0,0 +1,136 @@ + + + + + + + diff --git a/packages/node_modules/@node-red/nodes/core/io/06-httpproxy.js b/packages/node_modules/@node-red/nodes/core/io/06-httpproxy.js new file mode 100644 index 000000000..abcee66f6 --- /dev/null +++ b/packages/node_modules/@node-red/nodes/core/io/06-httpproxy.js @@ -0,0 +1,33 @@ +/** + * Copyright JS Foundation and other contributors, http://js.foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + **/ + +module.exports = function(RED) { + 'use strict'; + + function HTTPProxyConfig(n) { + RED.nodes.createNode(this, n); + this.name = n.name; + this.url = n.url; + this.noproxy = n.noproxy; + }; + + RED.nodes.registerType('http proxy', HTTPProxyConfig, { + credentials: { + username: {type:'text'}, + password: {type:'password'} + } + }); +}; diff --git a/packages/node_modules/@node-red/nodes/core/io/21-httprequest.html b/packages/node_modules/@node-red/nodes/core/io/21-httprequest.html index f3c4c0228..e0d1f5ba2 100644 --- a/packages/node_modules/@node-red/nodes/core/io/21-httprequest.html +++ b/packages/node_modules/@node-red/nodes/core/io/21-httprequest.html @@ -53,6 +53,13 @@
example.com/{{{topic}}}
msg.topic
Note: If running behind a proxy, the standard http_proxy=... environment variable should be set and Node-RED restarted.
http_proxy=...
Note: If running behind a proxy, the standard http_proxy=... environment variable should be set and Node-RED restarted, or use Proxy Configuration. If Proxy Configuration was set, the configuration take precedence over environment variable.
In order to use more than one of these nodes in the same flow, care must be taken with the msg.headers property. The first node will set this property with @@ -141,7 +148,8 @@ method:{value:"GET"}, ret: {value:"txt"}, url:{value:"",validate:function(v) { return (v.trim().length === 0) || (v.indexOf("://") === -1) || (v.trim().indexOf("http") === 0)} }, - tls: {type:"tls-config",required: false} + tls: {type:"tls-config",required: false}, + proxy: {type:"http proxy",required: false} }, credentials: { user: {type:"text"}, @@ -192,6 +200,24 @@ $("#node-input-usetls").on("click",function() { updateTLSOptions(); }); + + function updateProxyOptions() { + if ($("#node-input-useProxy").is(":checked")) { + $("#node-input-useProxy-row").show(); + } else { + $("#node-input-useProxy-row").hide(); + } + } + if (this.proxy) { + $("#node-input-useProxy").prop("checked", true); + } else { + $("#node-input-useProxy").prop("checked", false); + } + updateProxyOptions(); + $("#node-input-useProxy").on("click", function() { + updateProxyOptions(); + }); + $("#node-input-ret").change(function() { if ($("#node-input-ret").val() === "obj") { $("#tip-json").show(); @@ -204,6 +230,9 @@ if (!$("#node-input-usetls").is(':checked')) { $("#node-input-tls").val("_ADD_"); } + if (!$("#node-input-useProxy").is(":checked")) { + $("#node-input-proxy").val("_ADD_"); + } } }); diff --git a/packages/node_modules/@node-red/nodes/core/io/21-httprequest.js b/packages/node_modules/@node-red/nodes/core/io/21-httprequest.js index 28d67d077..59f4f8fdc 100644 --- a/packages/node_modules/@node-red/nodes/core/io/21-httprequest.js +++ b/packages/node_modules/@node-red/nodes/core/io/21-httprequest.js @@ -41,6 +41,13 @@ module.exports = function(RED) { if (process.env.no_proxy != null) { noprox = process.env.no_proxy.split(","); } if (process.env.NO_PROXY != null) { noprox = process.env.NO_PROXY.split(","); } + var proxyConfig = null; + if (n.proxy) { + proxyConfig = RED.nodes.getNode(n.proxy); + prox = proxyConfig.url; + noprox = proxyConfig.noproxy; + } + this.on("input",function(msg) { var preRequestTimestamp = process.hrtime(); node.status({fill:"blue",shape:"dot",text:"httpin.status.requesting"}); @@ -84,6 +91,7 @@ module.exports = function(RED) { opts.encoding = null; // Force NodeJs to return a Buffer (instead of a string) opts.maxRedirects = 21; opts.jar = request.jar(); + opts.proxy = null; var ctSet = "Content-Type"; // set default camel case var clSet = "Content-Length"; if (msg.headers) { @@ -206,6 +214,15 @@ module.exports = function(RED) { opts.proxy = null; } } + if (proxyConfig && proxyConfig.credentials && opts.proxy == proxyConfig.url) { + var proxyUsername = proxyConfig.credentials.username || ''; + var proxyPassword = proxyConfig.credentials.password || ''; + if (proxyUsername || proxyPassword) { + opts.headers['proxy-authorization'] = + 'Basic ' + + Buffer.from(proxyUsername + ':' + proxyPassword).toString('base64'); + } + } if (tlsNode) { tlsNode.addTLSOptions(opts); } else { diff --git a/packages/node_modules/@node-red/nodes/core/storage/50-file.js b/packages/node_modules/@node-red/nodes/core/storage/50-file.js index d55782785..99a539a43 100644 --- a/packages/node_modules/@node-red/nodes/core/storage/50-file.js +++ b/packages/node_modules/@node-red/nodes/core/storage/50-file.js @@ -28,9 +28,11 @@ module.exports = function(RED) { this.createDir = n.createDir || false; var node = this; node.wstream = null; - node.data = []; + node.msgQueue = []; + node.closing = false; + node.closeCallback = null; - this.on("input",function(msg) { + function processMsg(msg, done) { var filename = node.filename || msg.filename || ""; if ((!node.filename) && (!node.tout)) { node.tout = setTimeout(function() { @@ -41,6 +43,7 @@ module.exports = function(RED) { } if (filename === "") { node.warn(RED._("file.errors.nofilename")); + done(); } else if (node.overwriteFile === "delete") { fs.unlink(filename, function (err) { if (err) { @@ -51,6 +54,7 @@ module.exports = function(RED) { } node.send(msg); } + done(); }); } else if (msg.hasOwnProperty("payload") && (typeof msg.payload !== "undefined")) { var dir = path.dirname(filename); @@ -59,6 +63,7 @@ module.exports = function(RED) { fs.ensureDirSync(dir); } catch(err) { node.error(RED._("file.errors.createfail",{error:err.toString()}),msg); + done(); return; } } @@ -70,85 +75,142 @@ module.exports = function(RED) { if (typeof data === "boolean") { data = data.toString(); } if (typeof data === "number") { data = data.toString(); } if ((node.appendNewline) && (!Buffer.isBuffer(data))) { data += os.EOL; } - node.data.push({msg:msg,data:Buffer.from(data)}); - - while (node.data.length > 0) { - if (node.overwriteFile === "true") { - (function(packet) { - node.wstream = fs.createWriteStream(filename, { encoding:'binary', flags:'w', autoClose:true }); - node.wstream.on("error", function(err) { - node.error(RED._("file.errors.writefail",{error:err.toString()}),msg); - }); - node.wstream.on("open", function() { - node.wstream.end(packet.data, function() { - node.send(packet.msg); - }); - }) - })(node.data.shift()); - } - else { - // Append mode - var recreateStream = !node.wstream || !node.filename; - if (node.wstream && node.wstreamIno) { - // There is already a stream open and we have the inode - // of the file. Check the file hasn't been deleted - // or deleted and recreated. - try { - var stat = fs.statSync(filename); - // File exists - check the inode matches - if (stat.ino !== node.wstreamIno) { - // The file has been recreated. Close the current - // stream and recreate it - recreateStream = true; - node.wstream.end(); - delete node.wstream; - delete node.wstreamIno; - } - } catch(err) { - // File does not exist + if (node.overwriteFile === "true") { + var wstream = fs.createWriteStream(filename, { encoding:'binary', flags:'w', autoClose:true }); + node.wstream = wstream; + wstream.on("error", function(err) { + node.error(RED._("file.errors.writefail",{error:err.toString()}),msg); + done(); + }); + wstream.on("open", function() { + wstream.end(data, function() { + node.send(msg); + done(); + }); + }) + return; + } + else { + // Append mode + var recreateStream = !node.wstream || !node.filename; + if (node.wstream && node.wstreamIno) { + // There is already a stream open and we have the inode + // of the file. Check the file hasn't been deleted + // or deleted and recreated. + try { + var stat = fs.statSync(filename); + // File exists - check the inode matches + if (stat.ino !== node.wstreamIno) { + // The file has been recreated. Close the current + // stream and recreate it recreateStream = true; node.wstream.end(); delete node.wstream; delete node.wstreamIno; } - } - if (recreateStream) { - node.wstream = fs.createWriteStream(filename, { encoding:'binary', flags:'a', autoClose:true }); - node.wstream.on("open", function(fd) { - try { - var stat = fs.statSync(filename); - node.wstreamIno = stat.ino; - } catch(err) { - } - }); - node.wstream.on("error", function(err) { - node.error(RED._("file.errors.appendfail",{error:err.toString()}),msg); - }); - } - if (node.filename) { - // Static filename - write and reuse the stream next time - var packet = node.data.shift() - node.wstream.write(packet.data, function() { - node.send(packet.msg); - }); - - } else { - // Dynamic filename - write and close the stream - var packet = node.data.shift() - node.wstream.end(packet.data, function() { - node.send(packet.msg); - }); + } catch(err) { + // File does not exist + recreateStream = true; + node.wstream.end(); delete node.wstream; delete node.wstreamIno; } } + if (recreateStream) { + node.wstream = fs.createWriteStream(filename, { encoding:'binary', flags:'a', autoClose:true }); + node.wstream.on("open", function(fd) { + try { + var stat = fs.statSync(filename); + node.wstreamIno = stat.ino; + } catch(err) { + } + }); + node.wstream.on("error", function(err) { + node.error(RED._("file.errors.appendfail",{error:err.toString()}),msg); + done(); + }); + } + if (node.filename) { + // Static filename - write and reuse the stream next time + node.wstream.write(data, function() { + node.send(msg); + done(); + }); + } else { + // Dynamic filename - write and close the stream + node.wstream.end(data, function() { + node.send(msg); + delete node.wstream; + delete node.wstreamIno; + done(); + }); + } } } + else { + done(); + } + } + + function processQ(queue) { + var msg = queue[0]; + processMsg(msg, function() { + queue.shift(); + if (queue.length > 0) { + processQ(queue); + } + else if (node.closing) { + closeNode(); + } + }); + } + + this.on("input", function(msg) { + var msgQueue = node.msgQueue; + if (msgQueue.push(msg) > 1) { + // pending write exists + return; + } + try { + processQ(msgQueue); + } + catch (e) { + node.msgQueue = []; + if (node.closing) { + closeNode(); + } + throw e; + } }); - this.on('close', function() { + + function closeNode() { if (node.wstream) { node.wstream.end(); } if (node.tout) { clearTimeout(node.tout); } node.status({}); + var cb = node.closeCallback; + node.closeCallback = null; + node.closing = false; + if (cb) { + cb(); + } + } + + this.on('close', function(done) { + if (node.closing) { + // already closing + return; + } + node.closing = true; + if (done) { + node.closeCallback = done; + } + if (node.msgQueue.length > 0) { + // close after queue processed + return; + } + else { + closeNode(); + } }); } RED.nodes.registerType("file",FileNode); diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json index ef5592e02..13521d53f 100644 --- a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json +++ b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json @@ -311,7 +311,7 @@ "title": "Title", "body": "Body" }, - "tip": "Tip: The body text can be styled as Github flavoured Markdown" + "tip": "Tip: The body text can be styled as GitHub flavoured Markdown" }, "unknown": { "label": { @@ -382,6 +382,10 @@ "basicauth": "Use basic authentication", "use-tls": "Enable secure (SSL/TLS) connection", "tls-config":"TLS Configuration", + "use-proxy": "Use proxy", + "proxy-config": "Proxy Configuration", + "use-proxyauth": "Use proxy authentication", + "noproxy-hosts": "Ignore hosts", "utf8": "a UTF-8 string", "binary": "a binary buffer", "json": "a parsed JSON object", diff --git a/packages/node_modules/@node-red/nodes/locales/ja/core/89-trigger.html b/packages/node_modules/@node-red/nodes/locales/ja/core/89-trigger.html index 28ce551aa..51ab465f9 100644 --- a/packages/node_modules/@node-red/nodes/locales/ja/core/89-trigger.html +++ b/packages/node_modules/@node-red/nodes/locales/ja/core/89-trigger.html @@ -15,7 +15,7 @@ --> diff --git a/packages/node_modules/@node-red/nodes/locales/ja/io/21-httpin.html b/packages/node_modules/@node-red/nodes/locales/ja/io/21-httpin.html index 881088bed..8ffc5f95c 100644 --- a/packages/node_modules/@node-red/nodes/locales/ja/io/21-httpin.html +++ b/packages/node_modules/@node-red/nodes/locales/ja/io/21-httpin.html @@ -59,7 +59,7 @@
msg.headers
statusCodeとheadersはノードの設定で指定することも可能です。ノードの設定でプロパティを指定した場合には、対応するメッセージプロパティは使用しません。
statusCode
headers
cookiesはキー/値の組からなるオブジェクトとします。値にはデフォルトオプションを使ってクッキーの値として設定する文字列、もしくは、オプションを含むオブジェクトを指定できます。
cookies
-
以下の例では2つのクッキーを設定しています。1つ目はnameでその値はnick、2つ目はsessionで値は1234,、有効期限として15分を指定しています。
name
nick
session
1234,
以下の例では2つのクッキーを設定しています。1つ目はnameでその値はnick、2つ目はsessionで値は1234、有効期限として15分を指定しています。
1234
msg.cookies = { name: 'nick', diff --git a/packages/node_modules/@node-red/nodes/locales/ja/io/21-httprequest.html b/packages/node_modules/@node-red/nodes/locales/ja/io/21-httprequest.html index 662367343..a22be8f3d 100644 --- a/packages/node_modules/@node-red/nodes/locales/ja/io/21-httprequest.html +++ b/packages/node_modules/@node-red/nodes/locales/ja/io/21-httprequest.html @@ -49,7 +49,7 @@ 詳細 ノードの設定でurlプロパティを指定する場合、mustache形式のタグを含めることができます。これにより、URLを入力メッセージの値から構成することができます。例えば、urlがexample.com/{{{topic}}}の場合、msg.topicの値による置き換えを自動的に行います。{{{...}}}表記を使うと、/、&といった文字をmustacheがエスケープするのを抑止できます。 - 注: proxyサーバを利用している場合、環境変数http_proxy=...を設定して、Node-REDを再起動してください。 + 注: proxyサーバを利用している場合、環境変数http_proxy=...を設定して、Node-REDを再起動するか、あるいはプロキシ設定をしてください。 複数のHTTPリクエストノードの利用 同一フローで本ノードを複数利用するためには、msg.headersプロパティの扱いに注意しなくてはなりません。例えば、最初のノードがレスポンスヘッダにこのプロパティを設定し、次のノードがこのプロパティをリクエストヘッダに利用するというのは一般的には期待する動作ではありません。msg.headersプロパティをノード間で変更しないままとすると、2つ目のノードで無視されることになります。カスタムヘッダを設定するためには、msg.headersをまず削除もしくは空のオブジェクト{}にリセットします。 クッキーの扱い diff --git a/packages/node_modules/@node-red/nodes/locales/ja/io/23-watch.html b/packages/node_modules/@node-red/nodes/locales/ja/io/23-watch.html index 18ba9d5ec..45f658c05 100644 --- a/packages/node_modules/@node-red/nodes/locales/ja/io/23-watch.html +++ b/packages/node_modules/@node-red/nodes/locales/ja/io/23-watch.html @@ -19,7 +19,7 @@ カンマ区切りでディレクトリおよびファイルのリストを指定します。空白を含む場合は、引用符で"..."のように囲んでください。 Windowsでは、2重バックスラッシュ\\をディレクトリ名に使用します。 実際に変化したファイルのフルパス名をmsg.payloadに、検知対象リストの文字列をmsg.topicに返します。 - msg.fileは変化したファイルのファイル名表します。msg.typeは変化した対象の種別(fileもしくはdirectory)を、msg.sizeはファイルサイズ(バイト数)を表します。 + msg.fileは変化したファイルのファイル名を表します。msg.typeは変化した対象の種別(fileもしくはdirectory)を、msg.sizeはファイルサイズ(バイト数)を表します。 Linuxではファイルとして表されるもの全てが、検知対象にできます。 注: 検知対象のディレクトリもしくはファイルは存在していなくてはなりません。対象ファイルもしくはディレクトリが削除された場合、再作成されても検知対象から外れたままです。 diff --git a/packages/node_modules/@node-red/nodes/locales/ja/messages.json b/packages/node_modules/@node-red/nodes/locales/ja/messages.json index 5f2f66cd3..624c59c0e 100644 --- a/packages/node_modules/@node-red/nodes/locales/ja/messages.json +++ b/packages/node_modules/@node-red/nodes/locales/ja/messages.json @@ -311,13 +311,13 @@ "title": "タイトル", "body": "本文" }, - "tip": "注釈: 本文はGithubのMarkdown形式として整形されます。" + "tip": "注釈: 本文はGitHubのMarkdown形式として整形されます。" }, "unknown": { "label": { "unknown": "unknown" }, - "tip": "現在のNode-RED環境では、本ノードの型が不明です。現在の状態でに本ノードをデプロイすると設定は保存されますが、不明なノードがインストールされるまでフローは実行されません。詳細はノードの「情報」を参照してください。" + "tip": "現在のNode-RED環境では、本ノードの型が不明です。現在の状態で本ノードをデプロイすると設定は保存されますが、不明なノードがインストールされるまでフローは実行されません。詳細はノードの「情報」を参照してください。" }, "mqtt": { "label": { @@ -382,6 +382,10 @@ "basicauth": "ベーシック認証を使用", "use-tls": "SSL/TLS接続を有効化", "tls-config": "TLS設定", + "use-proxy": "プロキシを使用", + "proxy-config": "プロキシ設定", + "use-proxyauth": "プロキシ認証を使用", + "noproxy-hosts": "例外ホスト", "utf8": "文字列", "binary": "バイナリバッファ", "json": "JSON", diff --git a/packages/node_modules/@node-red/nodes/locales/zh-CN/messages.json b/packages/node_modules/@node-red/nodes/locales/zh-CN/messages.json index dfa120b53..d58d2a413 100644 --- a/packages/node_modules/@node-red/nodes/locales/zh-CN/messages.json +++ b/packages/node_modules/@node-red/nodes/locales/zh-CN/messages.json @@ -301,7 +301,7 @@ "title": "标题", "body": "主体" }, - "tip": "提示: 主题内容可被格式化为 Github风格的Markdown" + "tip": "提示: 主题内容可被格式化为 GitHub风格的Markdown" }, "unknown": { "label": { diff --git a/packages/node_modules/@node-red/registry/lib/installer.js b/packages/node_modules/@node-red/registry/lib/installer.js index 9ec84a2f3..66768a620 100644 --- a/packages/node_modules/@node-red/registry/lib/installer.js +++ b/packages/node_modules/@node-red/registry/lib/installer.js @@ -21,6 +21,7 @@ var fs = require("fs"); var registry = require("./registry"); var library = require("./library"); var log; +var exec; var events; @@ -36,6 +37,7 @@ function init(runtime) { events = runtime.events; settings = runtime.settings; log = runtime.log; + exec = runtime.exec; } var activePromise = Promise.resolve(); @@ -104,50 +106,40 @@ function installModule(module,version) { var installDir = settings.userDir || process.env.NODE_RED_HOME || "."; var args = ['install','--save','--save-prefix="~"','--production',installName]; log.trace(npmCommand + JSON.stringify(args)); - var child = child_process.spawn(npmCommand,args,{ - cwd: installDir, - shell: true - }); - var output = ""; - child.stdout.on('data', (data) => { - output += data; - }); - child.stderr.on('data', (data) => { - output += data; - }); - child.on('close', (code) => { - if (code !== 0) { - var e; - var lookFor404 = new RegExp(" 404 .*"+module,"m"); - var lookForVersionNotFound = new RegExp("version not found: "+module+"@"+version,"m"); - if (lookFor404.test(output)) { - log.warn(log._("server.install.install-failed-not-found",{name:module})); - e = new Error("Module not found"); - e.code = 404; - reject(e); - } else if (isUpgrade && lookForVersionNotFound.test(output)) { - log.warn(log._("server.install.upgrade-failed-not-found",{name:module})); - e = new Error("Module not found"); - e.code = 404; - reject(e); - } else { - log.warn(log._("server.install.install-failed-long",{name:module})); - log.warn("------------------------------------------"); - log.warn(output); - log.warn("------------------------------------------"); - reject(new Error(log._("server.install.install-failed"))); - } + exec.run(npmCommand,args,{ + cwd: installDir + }, true).then(result => { + if (!isUpgrade) { + log.info(log._("server.install.installed",{name:module})); + resolve(require("./index").addModule(module).then(reportAddedModules)); } else { - if (!isUpgrade) { - log.info(log._("server.install.installed",{name:module})); - resolve(require("./index").addModule(module).then(reportAddedModules)); - } else { - log.info(log._("server.install.upgraded",{name:module, version:version})); - events.emit("runtime-event",{id:"restart-required",payload:{type:"warning",text:"notification.warnings.restartRequired"},retain:true}); - resolve(require("./registry").setModulePendingUpdated(module,version)); - } + log.info(log._("server.install.upgraded",{name:module, version:version})); + events.emit("runtime-event",{id:"restart-required",payload:{type:"warning",text:"notification.warnings.restartRequired"},retain:true}); + resolve(require("./registry").setModulePendingUpdated(module,version)); } - }); + }).catch(result => { + var output = result.stderr; + var e; + var lookFor404 = new RegExp(" 404 .*"+module,"m"); + var lookForVersionNotFound = new RegExp("version not found: "+module+"@"+version,"m"); + if (lookFor404.test(output)) { + log.warn(log._("server.install.install-failed-not-found",{name:module})); + e = new Error("Module not found"); + e.code = 404; + reject(e); + } else if (isUpgrade && lookForVersionNotFound.test(output)) { + log.warn(log._("server.install.upgrade-failed-not-found",{name:module})); + e = new Error("Module not found"); + e.code = 404; + reject(e); + } else { + log.warn(log._("server.install.install-failed-long",{name:module})); + log.warn("------------------------------------------"); + log.warn(output); + log.warn("------------------------------------------"); + reject(new Error(log._("server.install.install-failed"))); + } + }) }); }).catch(err => { // In case of error, reset activePromise to be resolvable @@ -208,25 +200,21 @@ function uninstallModule(module) { var args = ['remove','--save',module]; log.trace(npmCommand + JSON.stringify(args)); - var child = child_process.execFile(npmCommand,args, - { - cwd: installDir - }, - function(err, stdin, stdout) { - if (err) { - log.warn(log._("server.install.uninstall-failed-long",{name:module})); - log.warn("------------------------------------------"); - log.warn(err.toString()); - log.warn("------------------------------------------"); - reject(new Error(log._("server.install.uninstall-failed",{name:module}))); - } else { - log.info(log._("server.install.uninstalled",{name:module})); - reportRemovedModules(list); - library.removeExamplesDir(module); - resolve(list); - } - } - ); + exec.run(npmCommand,args,{ + cwd: installDir, + },true).then(result => { + log.info(log._("server.install.uninstalled",{name:module})); + reportRemovedModules(list); + library.removeExamplesDir(module); + resolve(list); + }).catch(result => { + var output = result.stderr; + log.warn(log._("server.install.uninstall-failed-long",{name:module})); + log.warn("------------------------------------------"); + log.warn(output.toString()); + log.warn("------------------------------------------"); + reject(new Error(log._("server.install.uninstall-failed",{name:module}))); + }); }); }).catch(err => { // In case of error, reset activePromise to be resolvable diff --git a/packages/node_modules/@node-red/runtime/lib/api/comms.js b/packages/node_modules/@node-red/runtime/lib/api/comms.js index 3ab361f3d..7713fd3dc 100644 --- a/packages/node_modules/@node-red/runtime/lib/api/comms.js +++ b/packages/node_modules/@node-red/runtime/lib/api/comms.js @@ -42,6 +42,21 @@ function handleRuntimeEvent(event) { runtime.log.trace("runtime event: "+JSON.stringify(event)); publish("notification/"+event.id,event.payload||{},event.retain); } +function handleEventLog(event) { + var type = event.payload.type; + var id = event.id; + if (event.payload.data) { + var data = event.payload.data; + if (data.endsWith('\n')) { + data = data.substring(0,data.length-1); + } + var lines = data.split(/\n/); + lines.forEach(line => { + runtime.log.debug((type?("["+type+"] "):"")+line) + }) + } + publish("event-log/"+event.id,event.payload||{}); +} function publish(topic,data,retain) { if (retain) { @@ -64,6 +79,8 @@ var api = module.exports = { runtime.events.on("runtime-event",handleRuntimeEvent); runtime.events.removeListener("comms",handleCommsEvent); runtime.events.on("comms",handleCommsEvent); + runtime.events.removeListener("event-log",handleEventLog); + runtime.events.on("event-log",handleEventLog); }, /** diff --git a/packages/node_modules/@node-red/runtime/lib/exec.js b/packages/node_modules/@node-red/runtime/lib/exec.js new file mode 100644 index 000000000..0ef3c069c --- /dev/null +++ b/packages/node_modules/@node-red/runtime/lib/exec.js @@ -0,0 +1,69 @@ +/** + * Copyright JS Foundation and other contributors, http://js.foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + **/ + +const child_process = require('child_process'); +const { util } = require('@node-red/util'); + +var events; + +function logLines(id,type,data) { + events.emit("event-log", {id:id,payload:{ts: Date.now(),data:data,type:type}}); +} + +module.exports = { + init: function(_runtime) { + events = _runtime.events; + }, + run: function(command,args,options,emit) { + var invocationId = util.generateId(); + + emit && events.emit("event-log", {ts: Date.now(),id:invocationId,payload:{ts: Date.now(),data:command+" "+args.join(" ")}}); + + return new Promise((resolve, reject) => { + let stdout = ""; + let stderr = ""; + const child = child_process.spawn(command,args,options); + child.stdout.on('data', (data) => { + const str = ""+data; + stdout += str; + emit && logLines(invocationId,"out",str); + }); + child.stderr.on('data', (data) => { + const str = ""+data; + stderr += str; + emit && logLines(invocationId,"err",str); + }); + child.on('error', function(err) { + stderr = err.toString(); + emit && logLines(invocationId,"err",stderr); + }) + child.on('close', (code) => { + let result = { + code: code, + stdout: stdout, + stderr: stderr + } + emit && events.emit("event-log", {id:invocationId,payload:{ts: Date.now(),data:"rc="+code}}); + + if (code === 0) { + resolve(result) + } else { + reject(result); + } + }); + }) + } +} diff --git a/packages/node_modules/@node-red/runtime/lib/index.js b/packages/node_modules/@node-red/runtime/lib/index.js index fb4e74b93..fd6e59794 100644 --- a/packages/node_modules/@node-red/runtime/lib/index.js +++ b/packages/node_modules/@node-red/runtime/lib/index.js @@ -23,6 +23,7 @@ var storage = require("./storage"); var library = require("./library"); var events = require("./events"); var settings = require("./settings"); +var exec = require("./exec"); var express = require("express"); var path = require('path'); @@ -71,6 +72,7 @@ function init(userSettings,_redUtil,_adminApi) { redNodes.init(runtime); library.init(runtime); externalAPI.init(runtime); + exec.init(runtime); } var version; @@ -248,6 +250,7 @@ var runtime = { events: events, nodes: redNodes, library: library, + exec: exec, util: require("@node-red/util").util, get adminApi() { return adminApi }, get nodeApp() { return nodeApp }, diff --git a/packages/node_modules/@node-red/runtime/lib/nodes/context/index.js b/packages/node_modules/@node-red/runtime/lib/nodes/context/index.js index 6f63344e3..2716d2ad8 100644 --- a/packages/node_modules/@node-red/runtime/lib/nodes/context/index.js +++ b/packages/node_modules/@node-red/runtime/lib/nodes/context/index.js @@ -104,7 +104,7 @@ function load() { try { plugin = require("./"+plugins[pluginName].module); } catch(err) { - return reject(new Error(log._("context.error-loading-module", {module:plugins[pluginName].module,message:err.toString()}))); + return reject(new Error(log._("context.error-loading-module2", {module:plugins[pluginName].module,message:err.toString()}))); } } else { // Assume `module` is an already-required module we can use @@ -123,7 +123,7 @@ function load() { } log.info(log._("context.log-store-init", {name:pluginName, info:"module="+moduleInfo})); } catch(err) { - return reject(new Error(log._("context.error-loading-module",{module:pluginName,message:err.toString()}))); + return reject(new Error(log._("context.error-loading-module2",{module:pluginName,message:err.toString()}))); } } else { // Plugin does not specify a 'module' diff --git a/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/git/index.js b/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/git/index.js index b6f3fa61a..d5c23ccb6 100644 --- a/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/git/index.js +++ b/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/git/index.js @@ -15,8 +15,9 @@ **/ var when = require('when'); -var exec = require('child_process').exec; -var spawn = require('child_process').spawn; + +var exec = require("../../../../exec"); + var authResponseServer = require('./authServer').ResponseServer; var sshResponseServer = require('./authServer').ResponseSSHServer; var clone = require('clone'); @@ -26,83 +27,70 @@ var gitCommand = "git"; var gitVersion; var log; -function runGitCommand(args,cwd,env) { +function runGitCommand(args,cwd,env,emit) { log.trace(gitCommand + JSON.stringify(args)); - return when.promise(function(resolve,reject) { - args.unshift("credential.helper=") - args.unshift("-c"); - var child = spawn(gitCommand, args, {cwd:cwd, detached:true, env:env}); - var stdout = ""; - var stderr = ""; - child.stdout.on('data', function(data) { - stdout += data; - }); - child.stderr.on('data', function(data) { - stderr += data; - }); - child.on('error', function(err) { - stderr = err.toString(); - }) - child.on('close', function(code) { - if (code !== 0) { - var err = new Error(stderr); - err.stdout = stdout; - err.stderr = stderr; - if (/Connection refused/i.test(stderr)) { - err.code = "git_connection_failed"; - } else if (/Connection timed out/i.test(stderr)) { - err.code = "git_connection_failed"; - } else if (/fatal: could not read/i.test(stderr)) { - // Username/Password - err.code = "git_auth_failed"; - } else if(/HTTP Basic: Access denied/i.test(stderr)) { - err.code = "git_auth_failed"; - } else if(/Permission denied \(publickey\)/i.test(stderr)) { - err.code = "git_auth_failed"; - } else if(/Host key verification failed/i.test(stderr)) { - // TODO: handle host key verification errors separately - err.code = "git_auth_failed"; - } else if (/commit your changes or stash/i.test(stderr)) { - err.code = "git_local_overwrite"; - } else if (/CONFLICT/.test(err.stdout)) { - err.code = "git_pull_merge_conflict"; - } else if (/not fully merged/i.test(stderr)) { - err.code = "git_delete_branch_unmerged"; - } else if (/remote .* already exists/i.test(stderr)) { - err.code = "git_remote_already_exists"; - } else if (/does not appear to be a git repository/i.test(stderr)) { - err.code = "git_not_a_repository"; - } else if (/Repository not found/i.test(stderr)) { - err.code = "git_repository_not_found"; - } else if (/repository '.*' does not exist/i.test(stderr)) { - err.code = "git_repository_not_found"; - } else if (/refusing to merge unrelated histories/i.test(stderr)) { - err.code = "git_pull_unrelated_history" - } else if (/Please tell me who you are/i.test(stderr)) { - err.code = "git_missing_user"; - } else if (/name consists only of disallowed characters/i.test(stderr)) { - err.code = "git_missing_user"; - } - return reject(err); - } - resolve(stdout); - }); - }); + args.unshift("credential.helper=") + args.unshift("-c"); + return exec.run(gitCommand, args, {cwd:cwd, env:env}, emit).then(result => { + return result.stdout; + }).catch(result => { + var err = new Error(stderr); + var stdout = result.stdout; + var stderr = result.stderr; + err.stdout = stdout; + err.stderr = stderr; + if (/Connection refused/i.test(stderr)) { + err.code = "git_connection_failed"; + } else if (/Connection timed out/i.test(stderr)) { + err.code = "git_connection_failed"; + } else if (/fatal: could not read/i.test(stderr)) { + // Username/Password + err.code = "git_auth_failed"; + } else if(/HTTP Basic: Access denied/i.test(stderr)) { + err.code = "git_auth_failed"; + } else if(/Permission denied \(publickey\)/i.test(stderr)) { + err.code = "git_auth_failed"; + } else if(/Host key verification failed/i.test(stderr)) { + // TODO: handle host key verification errors separately + err.code = "git_auth_failed"; + } else if (/commit your changes or stash/i.test(stderr)) { + err.code = "git_local_overwrite"; + } else if (/CONFLICT/.test(err.stdout)) { + err.code = "git_pull_merge_conflict"; + } else if (/not fully merged/i.test(stderr)) { + err.code = "git_delete_branch_unmerged"; + } else if (/remote .* already exists/i.test(stderr)) { + err.code = "git_remote_already_exists"; + } else if (/does not appear to be a git repository/i.test(stderr)) { + err.code = "git_not_a_repository"; + } else if (/Repository not found/i.test(stderr)) { + err.code = "git_repository_not_found"; + } else if (/repository '.*' does not exist/i.test(stderr)) { + err.code = "git_repository_not_found"; + } else if (/refusing to merge unrelated histories/i.test(stderr)) { + err.code = "git_pull_unrelated_history" + } else if (/Please tell me who you are/i.test(stderr)) { + err.code = "git_missing_user"; + } else if (/name consists only of disallowed characters/i.test(stderr)) { + err.code = "git_missing_user"; + } + throw err; + }) } -function runGitCommandWithAuth(args,cwd,auth) { +function runGitCommandWithAuth(args,cwd,auth,emit) { return authResponseServer(auth).then(function(rs) { var commandEnv = clone(process.env); commandEnv.GIT_ASKPASS = path.join(__dirname,"node-red-ask-pass.sh"); commandEnv.NODE_RED_GIT_NODE_PATH = process.execPath; commandEnv.NODE_RED_GIT_SOCK_PATH = rs.path; commandEnv.NODE_RED_GIT_ASKPASS_PATH = path.join(__dirname,"authWriter.js"); - return runGitCommand(args,cwd,commandEnv).finally(function() { + return runGitCommand(args,cwd,commandEnv,emit).finally(function() { rs.close(); }); }) } -function runGitCommandWithSSHCommand(args,cwd,auth) { +function runGitCommandWithSSHCommand(args,cwd,auth,emit) { return sshResponseServer(auth).then(function(rs) { var commandEnv = clone(process.env); commandEnv.SSH_ASKPASS = path.join(__dirname,"node-red-ask-pass.sh"); @@ -116,7 +104,7 @@ function runGitCommandWithSSHCommand(args,cwd,auth) { // GIT_SSH_COMMAND - added in git 2.3.0 commandEnv.GIT_SSH_COMMAND = "ssh -i " + auth.key_path + " -F /dev/null"; // console.log('commandEnv:', commandEnv); - return runGitCommand(args,cwd,commandEnv).finally(function() { + return runGitCommand(args,cwd,commandEnv,emit).finally(function() { rs.close(); }); }) @@ -448,13 +436,13 @@ module.exports = { var promise; if (auth) { if ( auth.key_path ) { - promise = runGitCommandWithSSHCommand(args,cwd,auth); + promise = runGitCommandWithSSHCommand(args,cwd,auth,true); } else { - promise = runGitCommandWithAuth(args,cwd,auth); + promise = runGitCommandWithAuth(args,cwd,auth,true); } } else { - promise = runGitCommand(args,cwd) + promise = runGitCommand(args,cwd,undefined,true) } return promise; // .catch(function(err) { @@ -485,13 +473,13 @@ module.exports = { var promise; if (auth) { if ( auth.key_path ) { - promise = runGitCommandWithSSHCommand(args,cwd,auth); + promise = runGitCommandWithSSHCommand(args,cwd,auth,true); } else { - promise = runGitCommandWithAuth(args,cwd,auth); + promise = runGitCommandWithAuth(args,cwd,auth,true); } } else { - promise = runGitCommand(args,cwd) + promise = runGitCommand(args,cwd,undefined,true) } return promise.catch(function(err) { if (err.code === 'git_error') { @@ -517,13 +505,13 @@ module.exports = { args.push("."); if (auth) { if ( auth.key_path ) { - return runGitCommandWithSSHCommand(args,cwd,auth); + return runGitCommandWithSSHCommand(args,cwd,auth,true); } else { - return runGitCommandWithAuth(args,cwd,auth); + return runGitCommandWithAuth(args,cwd,auth,true); } } else { - return runGitCommand(args,cwd); + return runGitCommand(args,cwd,undefined,true); } }, getStatus: getStatus, diff --git a/packages/node_modules/@node-red/runtime/locales/en-US/runtime.json b/packages/node_modules/@node-red/runtime/locales/en-US/runtime.json index 2a328c0bb..8d47d8215 100644 --- a/packages/node_modules/@node-red/runtime/locales/en-US/runtime.json +++ b/packages/node_modules/@node-red/runtime/locales/en-US/runtime.json @@ -30,11 +30,10 @@ "installed": "Installed module: __name__", "install-failed": "Install failed", "install-failed-long": "Installation of module __name__ failed:", - "install-failed-not-found": "$t(install-failed-long) module not found", + "install-failed-not-found": "$t(server.install.install-failed-long) module not found", "upgrading": "Upgrading module: __name__ to version: __version__", "upgraded": "Upgraded module: __name__. Restart Node-RED to use the new version", "upgrade-failed-not-found": "$t(server.install.install-failed-long) version not found", - "install-failed-not-found": "$t(server.install.install-failed-long) module not found", "uninstalling": "Uninstalling module: __name__", "uninstall-failed": "Uninstall failed", "uninstall-failed-long": "Uninstall of module __name__ failed:", @@ -160,12 +159,12 @@ "context": { "log-store-init": "Context store : '__name__' [__info__]", - "error-loading-module": "Error loading context store '__module__': __message__ ", + "error-loading-module": "Error loading context store: __message__", + "error-loading-module2": "Error loading context store '__module__': __message__", "error-module-not-defined": "Context store '__storage__' missing 'module' option", "error-invalid-module-name": "Invalid context store name: '__name__'", "error-invalid-default-module": "Default context store unknown: '__storage__'", "unknown-store": "Unknown context store '__name__' specified. Using default store.", - "error-loading-module": "Error loading context store: __message__", "localfilesystem": { "error-circular": "Context __scope__ contains a circular reference that cannot be persisted", "error-write": "Error writing context: __message__" diff --git a/packages/node_modules/@node-red/runtime/locales/ja/runtime.json b/packages/node_modules/@node-red/runtime/locales/ja/runtime.json index 9eee93651..e4f4f7baf 100644 --- a/packages/node_modules/@node-red/runtime/locales/ja/runtime.json +++ b/packages/node_modules/@node-red/runtime/locales/ja/runtime.json @@ -8,7 +8,6 @@ "httpStatic": "HTTP Static : __path__" } }, - "server": { "loading": "パレットノードのロード", "palette-editor": { @@ -26,15 +25,14 @@ "removed-types": "削除したノード:", "install": { "invalid": "不正なモジュール名", - "installing": "モジュール__name__, バージョン: __version__をインスートールします", + "installing": "モジュール__name__, バージョン: __version__ をインストールします", "installed": "モジュール __name__ をインストールしました", "install-failed": "インストールに失敗しました", "install-failed-long": "モジュール __name__ のインストールに失敗しました:", - "install-failed-not-found": "$t(install-failed-long) モジュールが見つかりません", + "install-failed-not-found": "$t(server.install.install-failed-long) モジュールが見つかりません", "upgrading": "モジュール __name__ をバージョン __version__ に更新します", "upgraded": "モジュール __name__ を更新しました。新しいバージョンを使うには、Node-REDを再起動してください。", "upgrade-failed-not-found": "$t(server.install.install-failed-long) バージョンが見つかりません", - "install-failed-not-found": "$t(server.install.install-failed-long) モジュールが見つかりません", "uninstalling": "モジュールをアンインストールします: __name__", "uninstall-failed": "アンインストールに失敗しました", "uninstall-failed-long": "モジュール __name__ のアンインストールに失敗しました:", @@ -49,7 +47,6 @@ "headless-mode": "ヘッドレスモードで実行中です", "httpadminauth-deprecated": "httpAdminAuthは非推奨です。代わりに adminAuth を使用してください" }, - "api": { "flows": { "error-save": "フローの保存エラー: __message__", @@ -67,27 +64,25 @@ "error-enable": "ノードの有効化に失敗しました:" } }, - "comms": { "error": "通信チャネルエラー: __message__", "error-server": "サーバエラー: __message__", "error-send": "送信エラー: __message__" }, - "settings": { "user-not-available": "ユーザ設定を保存できません: __message__", "not-available": "設定が利用できません", "property-read-only": "プロパティ '__prop__' は読み出し専用です" }, - "nodes": { "credentials": { - "error":"クレデンシャルの読み込みエラー: __message__", - "error-saving":"クレデンシャルの保存エラー: __message__", + "error": "クレデンシャルの読み込みエラー: __message__", + "error-saving": "クレデンシャルの保存エラー: __message__", "not-registered": "クレデンシャル '__type__' は登録されていません", "system-key-warning": "\n\n---------------------------------------------------------------------\nフローのクレデンシャルファイルはシステム生成キーで暗号化されています。\n\nシステム生成キーを何らかの理由で失った場合、クレデンシャルファイルを\n復元することはできません。その場合、ファイルを削除してクレデンシャルを\n再入力しなければなりません。\n\n設定ファイル内で 'credentialSecret' オプションを使って独自キーを設定\nします。変更を次にデプロイする際、Node-REDは選択したキーを用いてクレ\nデンシャルを再暗号化します。 \n\n---------------------------------------------------------------------\n" }, "flows": { + "safe-mode": "セーフモードでフローを停止しました。開始するためにはデプロイしてください", "registered-missing": "欠落しているノードを登録します: __type__", "error": "フローの読み込みエラー: __message__", "starting-modified-nodes": "更新されたノードを開始します", @@ -128,7 +123,6 @@ } } }, - "storage": { "index": { "forbidden-flow-name": "不正なフロー名" @@ -156,14 +150,17 @@ } } }, - "context": { - "log-store-init": "コンテクストストア : '__name__' [__info__]", - "error-loading-module": "コンテクストストア '__module__' のロードでエラーが発生しました: __message__ ", - "error-module-not-defined": "コンテクストストア '__storage__' に 'module' オプションが指定されていません", - "error-invalid-module-name": "不正なコンテクストストア名: '__name__'", - "error-invalid-default-module": "デフォルトコンテクストストアが不明: '__storage__'", - "unknown-store": "不明なコンテクストストア '__name__' が指定されました。デフォルトストアを使用します。" - } - + "log-store-init": "コンテキストストア : '__name__' [__info__]", + "error-loading-module": "コンテキストストアのロードでエラーが発生しました: __message__", + "error-loading-module2": "コンテキストストア '__module__' のロードでエラーが発生しました: __message__", + "error-module-not-defined": "コンテキストストア '__storage__' に 'module' オプションが指定されていません", + "error-invalid-module-name": "不正なコンテキストストア名: '__name__'", + "error-invalid-default-module": "デフォルトコンテキストストアが不明: '__storage__'", + "unknown-store": "不明なコンテキストストア '__name__' が指定されました。デフォルトストアを使用します。", + "localfilesystem": { + "error-circular": "コンテキスト __scope__ は永続化できない循環参照を含んでいます", + "error-write": "コンテキスト書込みエラー: __message__" + } + } } diff --git a/packages/node_modules/@node-red/util/index.js b/packages/node_modules/@node-red/util/index.js index 7fa63fc7d..cc7f502f8 100644 --- a/packages/node_modules/@node-red/util/index.js +++ b/packages/node_modules/@node-red/util/index.js @@ -30,19 +30,22 @@ module.exports = { log.init(settings); i18n.init(); }, + /** * Logging utilities * @see module:@node-red/util.module:log */ log: log, + /** * Internationalization utilities * @see module:@node-red/util.module:i18n */ i18n: i18n, + /** * General utilities * @see module:@node-red/util.module:util */ - util: util + util: util, } diff --git a/packages/node_modules/node-red/lib/red.js b/packages/node_modules/node-red/lib/red.js index b6eed50ac..a25b30fd3 100644 --- a/packages/node_modules/node-red/lib/red.js +++ b/packages/node_modules/node-red/lib/red.js @@ -38,18 +38,6 @@ function checkVersion(userSettings) { } } -function checkBuild() { - console.log("Skipping red.js/checkBuild"); - // var editorFile = path.resolve(path.join(__dirname,"..","..","..","..","public","red","red.min.js")); - // try { - // var stats = fs.statSync(editorFile); - // } catch(err) { - // var e = new Error("Node-RED not built"); - // e.code = "not_built"; - // throw e; - // } -} - module.exports = { init: function(httpServer,userSettings) { if (!userSettings) { @@ -59,7 +47,6 @@ module.exports = { if (!userSettings.SKIP_BUILD_CHECK) { checkVersion(userSettings); - checkBuild(); } if (!userSettings.coreNodesDir) { diff --git a/packages/node_modules/node-red/settings.js b/packages/node_modules/node-red/settings.js index 6d6c6948b..724cb5a28 100644 --- a/packages/node_modules/node-red/settings.js +++ b/packages/node_modules/node-red/settings.js @@ -148,7 +148,7 @@ module.exports = { // The following property can be used to cause insecure HTTP connections to // be redirected to HTTPS. - //requireHttps: true + //requireHttps: true, // The following property can be used to disable the editor. The admin API // is not affected by this option. To disable both the editor and the admin @@ -181,6 +181,11 @@ module.exports = { // next(); //}, + // The following property can be used to pass custom options to the Express.js + // server used by Node-RED. For a full list of available options, refer + // to http://expressjs.com/en/api.html#app.settings.table + //httpServerOptions: { }, + // The following property can be used to verify websocket connection attempts. // This allows, for example, the HTTP request headers to be checked to ensure // they include valid authentication information. @@ -256,5 +261,5 @@ module.exports = { // To enable the Projects feature, set this value to true enabled: false } - }, + } } diff --git a/test/editor/editor_helper.js b/test/editor/editor_helper.js index 281988484..2cf103188 100644 --- a/test/editor/editor_helper.js +++ b/test/editor/editor_helper.js @@ -21,7 +21,7 @@ var fs = require('fs-extra'); var path = require('path'); var app = express(); -var RED = require("../../red/red.js"); +var RED = require("nr-test-utils").require("node-red/lib/red.js"); var utilPage = require("./pageobjects/util/util_page"); diff --git a/test/editor/pageobjects/editor/workspace_page.js b/test/editor/pageobjects/editor/workspace_page.js index e62eb686f..e1a57d86d 100644 --- a/test/editor/pageobjects/editor/workspace_page.js +++ b/test/editor/pageobjects/editor/workspace_page.js @@ -16,7 +16,7 @@ var when = require("when"); -var events = require("../../../../red/runtime/events.js"); +var events = require("nr-test-utils").require("@node-red/runtime/lib/events.js"); var palette = require("./palette_page"); var nodeFactory = require("../nodes/nodefactory_page"); diff --git a/test/editor/pageobjects/nodes/core/core/58-debug_page.js b/test/editor/pageobjects/nodes/core/core/58-debug_page.js index c8c1d8871..0dc4c298e 100644 --- a/test/editor/pageobjects/nodes/core/core/58-debug_page.js +++ b/test/editor/pageobjects/nodes/core/core/58-debug_page.js @@ -29,7 +29,7 @@ debugNode.prototype.setOutput = function(complete) { browser.clickWithWait('//*[contains(@class, "red-ui-typedInput-container")]/button'); if (complete !== 'true') { // Select the "msg" type. - browser.clickWithWait('/html/body/div[11]/a[1]'); + browser.clickWithWait('//div[@class="red-ui-typedInput-options"][1]/a[1]'); // Input the path in msg. browser.clickWithWait('//*[contains(@class, "red-ui-typedInput-input")]/input'); browser.keys(['Control', 'a', 'Control']); diff --git a/test/editor/pageobjects/nodes/core/logic/15-change_page.js b/test/editor/pageobjects/nodes/core/logic/15-change_page.js index 1336e8069..51589f7b5 100644 --- a/test/editor/pageobjects/nodes/core/logic/15-change_page.js +++ b/test/editor/pageobjects/nodes/core/logic/15-change_page.js @@ -54,8 +54,8 @@ changeNode.prototype.ruleSet = function(p, pt, to, tot, index) { setT("set", index); if (pt) { browser.clickWithWait('//*[@id="node-input-rule-container"]/li[' + index + ']/div/div[1]/div/button[1]'); - var num = 5 * index + 6; - var ptXPath = '/html/body/div[' + num + ']/a[' + ptType[pt] + ']'; + var num = 5 * (index - 1) + 1; + var ptXPath = '//div[@class="red-ui-typedInput-options"][' + num + ']/a[' + ptType[pt] + ']'; browser.clickWithWait(ptXPath); } if (p) { @@ -63,8 +63,8 @@ changeNode.prototype.ruleSet = function(p, pt, to, tot, index) { } if (tot) { browser.clickWithWait('//*[@id="node-input-rule-container"]/li[' + index + ']/div/div[2]/div[2]/button[1]'); - var num = 5 * index + 7; - var totXPath = '/html/body/div[' + num + ']/a[' + totType[tot] + ']'; + var num = 5 * (index - 1) + 2; + var totXPath = '//div[@class="red-ui-typedInput-options"][' + num + ']/a[' + totType[tot] + ']'; browser.clickWithWait(totXPath); } if (to) { diff --git a/test/editor/specs/scenario/cookbook_endpoint_uispec.js b/test/editor/specs/scenario/cookbook_endpoint_uispec.js index bb54da557..da672a747 100644 --- a/test/editor/specs/scenario/cookbook_endpoint_uispec.js +++ b/test/editor/specs/scenario/cookbook_endpoint_uispec.js @@ -315,8 +315,9 @@ describe('cookbook', function() { debugTab.open(); debugTab.clearMessage(); injectNode.clickLeftButton(); - var message = debugTab.getMessage(); - message[1].indexOf('application/json').should.not.eql(-1); + var messages = debugTab.getMessage(); + var contents = messages.join([separator = ""]); + contents.indexOf('application/json').should.not.eql(-1); }); it('serve a local file', function () { diff --git a/test/nodes/core/core/75-exec_spec.js b/test/nodes/core/core/75-exec_spec.js index 113e84292..0f588e204 100644 --- a/test/nodes/core/core/75-exec_spec.js +++ b/test/nodes/core/core/75-exec_spec.js @@ -365,6 +365,138 @@ describe('exec node', function() { }); }); + it('should preserve existing properties on msg object', function(done) { + var flow = [{id:"n1",type:"exec",wires:[["n2"],["n3"],["n4"]],command:"echo", addpay:false, append:"", oldrc:"false"}, + {id:"n2", type:"helper"},{id:"n3", type:"helper"},{id:"n4", type:"helper"}]; + var spy = sinon.stub(child_process, 'exec', + function(arg1, arg2, arg3, arg4) { + // arg3(error,stdout,stderr); + arg3(null,arg1,arg1.toUpperCase()); + }); + + helper.load(execNode, flow, function() { + var n1 = helper.getNode("n1"); + var n2 = helper.getNode("n2"); + var n3 = helper.getNode("n3"); + var n4 = helper.getNode("n4"); + var received = 0; + var messages = [null,null,null]; + var completeTest = function() { + received = received + 1; + if (received < 3) { + return; + } + try { + var msg = messages[0]; + msg.should.have.property("payload"); + msg.payload.should.be.a.String(); + msg.payload.should.equal("echo"); + msg.should.have.property("rc"); + msg.rc.should.have.property("code",0); + msg.should.have.property("foo","bar"); + + msg = messages[1]; + msg.should.have.property("payload"); + msg.payload.should.be.a.String(); + msg.payload.should.equal("ECHO"); + msg.should.have.property("rc"); + msg.rc.should.have.property("code",0); + msg.should.have.property("foo","bar"); + + msg = messages[2]; + msg.should.have.property("payload"); + msg.payload.should.have.property("code",0); + msg.should.have.property("foo","bar"); + + child_process.exec.restore(); + done(); + } + catch(err) { + child_process.exec.restore(); + done(err); + } + }; + n2.on("input", function(msg) { + messages[0] = msg; + completeTest(); + }); + n3.on("input", function(msg) { + messages[1] = msg; + completeTest(); + }); + n4.on("input", function(msg) { + messages[2] = msg; + completeTest(); + }); + n1.receive({payload:"and", foo:"bar"}); + }); + }); + + it('should preserve existing properties on msg object for a failing command', function(done) { + var flow = [{id:"n1",type:"exec",wires:[["n2"],["n3"],["n4"]],command:"error", addpay:false, append:"", oldrc:"false"}, + {id:"n2", type:"helper"},{id:"n3", type:"helper"},{id:"n4", type:"helper"}]; + var spy = sinon.stub(child_process, 'exec', + function(arg1, arg2, arg3, arg4) { + // arg3(error,stdout,stderr); + arg3({code: 1},arg1,arg1.toUpperCase()); + }); + helper.load(execNode, flow, function() { + var n1 = helper.getNode("n1"); + var n2 = helper.getNode("n2"); + var n3 = helper.getNode("n3"); + var n4 = helper.getNode("n4"); + var received = 0; + var messages = [null,null,null]; + var completeTest = function() { + received++; + if (received < 3) { + return; + } + try { + var msg = messages[0]; + msg.should.have.property("payload"); + msg.payload.should.be.a.String(); + msg.payload.should.equal("error"); + msg.should.have.property("rc"); + msg.rc.should.have.property("code",1); + msg.rc.should.have.property("message",undefined); + msg.should.have.property("foo",null); + + msg = messages[1]; + msg.should.have.property("payload"); + msg.payload.should.be.a.String(); + msg.payload.should.equal("ERROR"); + msg.should.have.property("foo",null); + + msg = messages[2]; + msg.should.have.property("payload"); + msg.payload.should.have.property("code",1); + msg.should.have.property("foo",null); + + child_process.exec.restore(); + done(); + } + catch(err) { + child_process.exec.restore(); + done(err); + } + }; + n2.on("input", function(msg) { + messages[0] = msg; + completeTest(); + }); + n3.on("input", function(msg) { + messages[1] = msg; + completeTest(); + }); + n4.on("input", function(msg) { + messages[2] = msg; + completeTest(); + }); + n1.receive({payload:"and", foo:null}); + }); + }); + }); describe('calling spawn', function() { @@ -672,5 +804,116 @@ describe('exec node', function() { }); }); + it('should preserve existing properties on msg object', function(done) { + var flow; + var expected; + if (osType === "Windows_NT") { + flow = [{id:"n1",type:"exec",wires:[["n2"],["n3"],["n4"]],command:"cmd /C echo this now works", addpay:false, append:"", useSpawn:"true", oldrc:"false"}, + {id:"n2", type:"helper"},{id:"n3", type:"helper"},{id:"n4", type:"helper"}]; + expected = "this now works\r\n"; + } else { + flow = [{id:"n1",type:"exec",wires:[["n2"],["n3"],["n4"]],command:"echo this now works", addpay:false, append:"", useSpawn:"true", oldrc:"false"}, + {id:"n2", type:"helper"},{id:"n3", type:"helper"},{id:"n4", type:"helper"}]; + expected = "this now works\n"; + } + helper.load(execNode, flow, function() { + var n1 = helper.getNode("n1"); + var n2 = helper.getNode("n2"); + var n3 = helper.getNode("n3"); + var n4 = helper.getNode("n4"); + var received = 0; + var messages = [null,null]; + var completeTest = function() { + received++; + if (received < 2) { + return; + } + try { + var msg = messages[0]; + msg.should.have.property("payload"); + msg.payload.should.be.a.String(); + msg.payload.should.equal(expected); + msg.should.have.property("foo",123); + + msg = messages[1]; + msg.should.have.property("payload"); + should.exist(msg.payload); + msg.payload.should.have.property("code",0); + msg.should.have.property("foo",123); + + done(); + } + catch(err) { + done(err); + } + }; + + n2.on("input", function(msg) { + messages[0] = msg; + completeTest(); + }); + n4.on("input", function(msg) { + messages[1] = msg; + completeTest(); + }); + n1.receive({payload:null,foo:123}); + }); + }); + + it('should preserve existing properties on msg object for a failing command', function(done) { + var flow; + var expected; + if (osType === "Windows_NT") { + // Cannot use mkdir because Windows mkdir command automatically creates non-existent directories. + flow = [{id:"n1",type:"exec",wires:[["n2"],["n3"],["n4"]],command:"ping /foo/bar/doo/dah", addpay:false, append:"", useSpawn:"true", oldrc:"false"}, + {id:"n2", type:"helper"},{id:"n3", type:"helper"},{id:"n4", type:"helper"}]; + expected = "IP address must be specified."; + } else { + flow = [{id:"n1",type:"exec",wires:[["n2"],["n3"],["n4"]],command:"mkdir /foo/bar/doo/dah", addpay:false, append:"", useSpawn:"true", oldrc:"false"}, + {id:"n2", type:"helper"},{id:"n3", type:"helper"},{id:"n4", type:"helper"}]; + expected = ' directory'; + } + helper.load(execNode, flow, function() { + var n1 = helper.getNode("n1"); + var n2 = helper.getNode("n2"); + var n3 = helper.getNode("n3"); + var n4 = helper.getNode("n4"); + var received = 0; + var messages = [null,null]; + var completeTest = function() { + received++; + if (received < 2) { + return; + } + try { + var msg = messages[0]; + msg.should.have.property("payload"); + msg.payload.should.be.a.String(); + msg.should.have.property("foo","baz"); + + msg = messages[1]; + msg.should.have.property("payload"); + msg.payload.should.have.property("code",1); + msg.should.have.property("foo","baz"); + + done(); + } + catch(err) { + done(err); + } + }; + + n3.on("input", function(msg) { + messages[0] = msg; + completeTest(); + }); + n4.on("input", function(msg) { + messages[1] = msg; + completeTest(); + }); + n1.receive({payload:null,foo:"baz"}); + }); + }); + }); }); diff --git a/test/nodes/core/io/21-httprequest_spec.js b/test/nodes/core/io/21-httprequest_spec.js index e7e8625b3..1633d6c38 100644 --- a/test/nodes/core/io/21-httprequest_spec.js +++ b/test/nodes/core/io/21-httprequest_spec.js @@ -24,6 +24,7 @@ var stoppable = require('stoppable'); var helper = require("node-red-node-test-helper"); var httpRequestNode = require("nr-test-utils").require("@node-red/nodes/core/io/21-httprequest.js"); var tlsNode = require("nr-test-utils").require("@node-red/nodes/core/io/05-tls.js"); +var httpProxyNode = require("nr-test-utils").require("@node-red/nodes/core/io/06-httpproxy.js"); var hashSum = require("hash-sum"); var httpProxy = require('http-proxy'); var cookieParser = require('cookie-parser'); @@ -1194,6 +1195,80 @@ describe('HTTP Request Node', function() { n1.receive({payload:"foo"}); }); }); + + it('should use http-proxy-config', function(done) { + var flow = [ + {id:"n1",type:"http request",wires:[["n2"]],method:"POST",ret:"obj",url:getTestURL('/postInspect'),proxy:"n3"}, + {id:"n2",type:"helper"}, + {id:"n3",type:"http proxy",url:"http://localhost:" + testProxyPort} + ]; + var testNode = [ httpRequestNode, httpProxyNode ]; + deleteProxySetting(); + helper.load(testNode, flow, function() { + var n1 = helper.getNode("n1"); + var n2 = helper.getNode("n2"); + n2.on("input", function(msg) { + try { + msg.should.have.property('statusCode',200); + msg.payload.should.have.property('headers'); + msg.payload.headers.should.have.property('x-testproxy-header','foobar'); + done(); + } catch(err) { + done(err); + } + }); + n1.receive({payload:"foo"}); + }); + }); + + it('should not use http-proxy-config when invalid url is specified', function(done) { + var flow = [ + {id:"n1",type:"http request",wires:[["n2"]],method:"POST",ret:"obj",url:getTestURL('/postInspect'),proxy:"n3"}, + {id:"n2", type:"helper"}, + {id:"n3",type:"http proxy",url:"invalidvalue"} + ]; + var testNode = [ httpRequestNode, httpProxyNode ]; + deleteProxySetting(); + helper.load(testNode, flow, function() { + var n1 = helper.getNode("n1"); + var n2 = helper.getNode("n2"); + n2.on("input", function(msg) { + try { + msg.should.have.property('statusCode',200); + msg.payload.should.have.property('headers'); + msg.payload.headers.should.not.have.property('x-testproxy-header','foobar'); + done(); + } catch(err) { + done(err); + } + }); + n1.receive({payload:"foo"}); + }); + }); + + it('should use http-proxy-config when valid noproxy is specified', function(done) { + var flow = [ + {id:"n1",type:"http request",wires:[["n2"]],method:"POST",ret:"obj",url:getTestURL('/postInspect'),proxy:"n3"}, + {id:"n2", type:"helper"}, + {id:"n3",type:"http proxy",url:"http://localhost:" + testProxyPort,noproxy:["foo","localhost"]} + ]; + var testNode = [ httpRequestNode, httpProxyNode ]; + deleteProxySetting(); + helper.load(testNode, flow, function() { + var n1 = helper.getNode("n1"); + var n2 = helper.getNode("n2"); + n2.on("input", function(msg) { + try { + msg.should.have.property('statusCode',200); + msg.payload.headers.should.not.have.property('x-testproxy-header','foobar'); + done(); + } catch(err) { + done(err); + } + }); + n1.receive({payload:"foo"}); + }); + }); }); describe('authentication', function() { @@ -1264,6 +1339,63 @@ describe('HTTP Request Node', function() { n1.receive({payload:"foo"}); }); }); + + it('should authenticate on proxy server(http-proxy-config)', function(done) { + var flow = [ + {id:"n1",type:"http request", wires:[["n2"]],method:"GET",ret:"obj",url:getTestURL('/proxyAuthenticate'),proxy:"n3"}, + {id:"n2", type:"helper"}, + {id:"n3",type:"http proxy",url:"http://localhost:" + testProxyPort} + ]; + var testNode = [ httpRequestNode, httpProxyNode ]; + deleteProxySetting(); + helper.load(testNode, flow, function() { + var n1 = helper.getNode("n1"); + var n2 = helper.getNode("n2"); + var n3 = helper.getNode("n3"); + n3.credentials = {username:'foouser', password:'barpassword'}; + n2.on("input", function(msg) { + try { + msg.should.have.property('statusCode',200); + msg.payload.should.have.property('user', 'foouser'); + msg.payload.should.have.property('pass', 'barpassword'); + msg.payload.should.have.property('headers'); + msg.payload.headers.should.have.property('x-testproxy-header','foobar'); + done(); + } catch(err) { + done(err); + } + }); + n1.receive({payload:"foo"}); + }); + }); + + it('should output an error when proxy authentication was failed(http-proxy-config)', function(done) { + var flow = [ + {id:"n1",type:"http request", wires:[["n2"]],method:"GET",ret:"obj",url:getTestURL('/proxyAuthenticate'),proxy:"n3"}, + {id:"n2", type:"helper"}, + {id:"n3",type:"http proxy",url:"http://@localhost:" + testProxyPort} + ]; + var testNode = [ httpRequestNode, httpProxyNode ]; + deleteProxySetting(); + helper.load(testNode, flow, function() { + var n1 = helper.getNode("n1"); + var n2 = helper.getNode("n2"); + var n3 = helper.getNode("n3"); + n3.credentials = {username:'xxxuser', password:'barpassword'}; + n2.on("input", function(msg) { + try { + msg.should.have.property('statusCode',407); + msg.headers.should.have.property('proxy-authenticate', 'BASIC realm="test"'); + msg.payload.should.have.property('headers'); + msg.payload.headers.should.have.property('x-testproxy-header','foobar'); + done(); + } catch(err) { + done(err); + } + }); + n1.receive({payload:"foo"}); + }); + }); }); describe('redirect-cookie', function() { diff --git a/test/nodes/core/storage/50-file_spec.js b/test/nodes/core/storage/50-file_spec.js index 901592ecc..4ec9b4fd0 100644 --- a/test/nodes/core/storage/50-file_spec.js +++ b/test/nodes/core/storage/50-file_spec.js @@ -46,14 +46,14 @@ describe('file Nodes', function() { it('should be loaded', function(done) { var flow = [{id:"fileNode1", type:"file", name: "fileNode", "filename":fileToTest, "appendNewline":true, "overwriteFile":true}]; helper.load(fileNode, flow, function() { - try { + try { var fileNode1 = helper.getNode("fileNode1"); fileNode1.should.have.property('name', 'fileNode'); done(); - } - catch (e) { - done(e); - } + } + catch (e) { + done(e); + } }); }); @@ -64,16 +64,16 @@ describe('file Nodes', function() { var n1 = helper.getNode("fileNode1"); var n2 = helper.getNode("helperNode1"); n2.on("input", function(msg) { - try { - var f = fs.readFileSync(fileToTest); - f.should.have.length(4); - fs.unlinkSync(fileToTest); - msg.should.have.property("payload", "test"); - done(); - } - catch (e) { - done(e); - } + try { + var f = fs.readFileSync(fileToTest); + f.should.have.length(4); + fs.unlinkSync(fileToTest); + msg.should.have.property("payload", "test"); + done(); + } + catch (e) { + done(e); + } }); n1.receive({payload:"test"}); }); @@ -93,26 +93,26 @@ describe('file Nodes', function() { var data = ["test2", true, 999, [2]]; n2.on("input", function (msg) { - try { - msg.should.have.property("payload"); - data.should.containDeep([msg.payload]); - if (count === 3) { + try { + msg.should.have.property("payload"); + data.should.containDeep([msg.payload]); + if (count === 3) { var f = fs.readFileSync(fileToTest).toString(); if (os.type() !== "Windows_NT") { - f.should.have.length(19); - f.should.equal("test2\ntrue\n999\n[2]\n"); + f.should.have.length(19); + f.should.equal("test2\ntrue\n999\n[2]\n"); } else { - f.should.have.length(23); - f.should.equal("test2\r\ntrue\r\n999\r\n[2]\r\n"); + f.should.have.length(23); + f.should.equal("test2\r\ntrue\r\n999\r\n[2]\r\n"); } done(); - } - count++; - } - catch (e) { - done(e); - } + } + count++; + } + catch (e) { + done(e); + } }); n1.receive({payload:"test2"}); // string @@ -142,37 +142,37 @@ describe('file Nodes', function() { var count = 0; n2.on("input", function (msg) { - try { - msg.should.have.property("payload"); - data.should.containDeep([msg.payload]); - try { + try { + msg.should.have.property("payload"); + data.should.containDeep([msg.payload]); + try { if (count === 1) { - // Check they got appended as expected - var f = fs.readFileSync(fileToTest).toString(); - f.should.equal("onetwo"); + // Check they got appended as expected + var f = fs.readFileSync(fileToTest).toString(); + f.should.equal("onetwo"); - // Delete the file - fs.unlinkSync(fileToTest); - setTimeout(function() { + // Delete the file + fs.unlinkSync(fileToTest); + setTimeout(function() { // Send two more messages to the file n1.receive({payload:"three"}); n1.receive({payload:"four"}); - }, wait); + }, wait); } if (count === 3) { - var f = fs.readFileSync(fileToTest).toString(); - f.should.equal("threefour"); - fs.unlinkSync(fileToTest); - done(); + var f = fs.readFileSync(fileToTest).toString(); + f.should.equal("threefour"); + fs.unlinkSync(fileToTest); + done(); } - } catch(err) { + } catch(err) { done(err); - } - count++; - } - catch (e) { - done(e); - } + } + count++; + } + catch (e) { + done(e); + } }); // Send two messages to the file @@ -197,7 +197,7 @@ describe('file Nodes', function() { n2.on("input", function (msg) { try { msg.should.have.property("payload"); - data.should.containDeep([msg.payload]); + data.should.containDeep([msg.payload]); if (count == 1) { // Check they got appended as expected var f = fs.readFileSync(fileToTest).toString(); @@ -256,25 +256,25 @@ describe('file Nodes', function() { var n2 = helper.getNode("helperNode1"); n2.on("input", function (msg) { - try { - msg.should.have.property("payload", "fine"); - msg.should.have.property("filename", fileToTest); + try { + msg.should.have.property("payload", "fine"); + msg.should.have.property("filename", fileToTest); - var f = fs.readFileSync(fileToTest).toString(); - if (os.type() !== "Windows_NT") { + var f = fs.readFileSync(fileToTest).toString(); + if (os.type() !== "Windows_NT") { f.should.have.length(5); f.should.equal("fine\n"); - } - else { + } + else { f.should.have.length(6); f.should.equal("fine\r\n"); - } - done(); - } - catch (e) { - done(e); - } - }); + } + done(); + } + catch (e) { + done(e); + } + }); n1.receive({payload:"fine", filename:fileToTest}); }); @@ -540,6 +540,93 @@ describe('file Nodes', function() { }); }); + it('should write to multiple files', function(done) { + var flow = [{id:"fileNode1", type:"file", name: "fileNode", "appendNewline":true, "overwriteFile":true, "createDir":true, wires: [["helperNode1"]]}, + {id:"helperNode1", type:"helper"}]; + var tmp_path = path.join(resourcesDir, "tmp"); + var len = 1024*1024*10; + var file_count = 5; + helper.load(fileNode, flow, function() { + var n1 = helper.getNode("fileNode1"); + var n2 = helper.getNode("helperNode1"); + var count = 0; + n2.on("input", function(msg) { + try { + count++; + if (count == file_count) { + for(var i = 0; i < file_count; i++) { + var name = path.join(tmp_path, String(i)); + var f = fs.readFileSync(name); + f.should.have.length(len); + f[0].should.have.equal(i); + } + fs.removeSync(tmp_path); + done(); + } + } + catch (e) { + try { + fs.removeSync(tmp_path); + } + catch (e1) { + } + done(e); + } + }); + for(var i = 0; i < file_count; i++) { + var data = new Buffer(len); + data.fill(i); + var name = path.join(tmp_path, String(i)); + var msg = {payload:data, filename:name}; + n1.receive(msg); + } + }); + }); + + it('should write to multiple files if node is closed', function(done) { + var flow = [{id:"fileNode1", type:"file", name: "fileNode", "appendNewline":true, "overwriteFile":true, "createDir":true, wires: [["helperNode1"]]}, + {id:"helperNode1", type:"helper"}]; + var tmp_path = path.join(resourcesDir, "tmp"); + var len = 1024*1024*10; + var file_count = 5; + helper.load(fileNode, flow, function() { + var n1 = helper.getNode("fileNode1"); + var n2 = helper.getNode("helperNode1"); + var count = 0; + n2.on("input", function(msg) { + try { + count++; + if (count == file_count) { + for(var i = 0; i < file_count; i++) { + var name = path.join(tmp_path, String(i)); + var f = fs.readFileSync(name); + f.should.have.length(len); + f[0].should.have.equal(i); + } + fs.removeSync(tmp_path); + done(); + } + } + catch (e) { + try { + fs.removeSync(tmp_path); + } + catch (e1) { + } + done(e); + } + }); + for(var i = 0; i < file_count; i++) { + var data = new Buffer(len); + data.fill(i); + var name = path.join(tmp_path, String(i)); + var msg = {payload:data, filename:name}; + n1.receive(msg); + } + n1.close(); + }); + }); + }); @@ -573,7 +660,7 @@ describe('file Nodes', function() { it('should read in a file and output a buffer', function(done) { var flow = [{id:"fileInNode1", type:"file in", name:"fileInNode", "filename":fileToTest, "format":"", wires:[["n2"]]}, - {id:"n2", type:"helper"}]; + {id:"n2", type:"helper"}]; helper.load(fileNode, flow, function() { var n1 = helper.getNode("fileInNode1"); var n2 = helper.getNode("n2"); @@ -590,7 +677,7 @@ describe('file Nodes', function() { it('should read in a file and output a utf8 string', function(done) { var flow = [{id:"fileInNode1", type:"file in", name: "fileInNode", "filename":fileToTest, "format":"utf8", wires:[["n2"]]}, - {id:"n2", type:"helper"}]; + {id:"n2", type:"helper"}]; helper.load(fileNode, flow, function() { var n1 = helper.getNode("fileInNode1"); var n2 = helper.getNode("n2"); @@ -632,7 +719,7 @@ describe('file Nodes', function() { it('should read in a file and output split lines with parts', function(done) { var flow = [{id:"fileInNode1", type:"file in", name: "fileInNode", filename:fileToTest, format:"lines", wires:[["n2"]]}, - {id:"n2", type:"helper"}]; + {id:"n2", type:"helper"}]; helper.load(fileNode, flow, function() { var n1 = helper.getNode("fileInNode1"); var n2 = helper.getNode("n2"); @@ -670,7 +757,7 @@ describe('file Nodes', function() { var line = data.join("\n"); fs.writeFileSync(fileToTest, line); var flow = [{id:"fileInNode1", type:"file in", name: "fileInNode", filename:fileToTest, format:"lines", wires:[["n2"]]}, - {id:"n2", type:"helper"}]; + {id:"n2", type:"helper"}]; helper.load(fileNode, flow, function() { var n1 = helper.getNode("fileInNode1"); var n2 = helper.getNode("n2"); @@ -703,7 +790,7 @@ describe('file Nodes', function() { it('should read in a file and output a buffer with parts', function(done) { var flow = [{id:"fileInNode1", type:"file in", name: "fileInNode", filename:fileToTest, format:"stream", wires:[["n2"]]}, - {id:"n2", type:"helper"}]; + {id:"n2", type:"helper"}]; helper.load(fileNode, flow, function() { var n1 = helper.getNode("fileInNode1"); var n2 = helper.getNode("n2"); diff --git a/test/unit/@node-red/editor-api/lib/auth/tokens_spec.js b/test/unit/@node-red/editor-api/lib/auth/tokens_spec.js index be6165b2e..2b06932c7 100644 --- a/test/unit/@node-red/editor-api/lib/auth/tokens_spec.js +++ b/test/unit/@node-red/editor-api/lib/auth/tokens_spec.js @@ -94,6 +94,29 @@ describe("api/auth/tokens", function() { }); }); }); + + it('returns a valid api token', function(done) { + Tokens.init({ + tokens: [{ + token: "1234", + user: "fred", + }] + },{ + getSessions:function() { + return when.resolve({}); + } + }).then(function() { + Tokens.get("1234").then(function(token) { + try { + token.should.have.a.property("user","fred"); + done(); + } catch(err) { + done(err); + } + }); + }); + + }); }); describe("#create",function() { diff --git a/test/unit/@node-red/editor-api/lib/editor/locales_spec.js b/test/unit/@node-red/editor-api/lib/editor/locales_spec.js index d9cb1c600..2de9d4799 100644 --- a/test/unit/@node-red/editor-api/lib/editor/locales_spec.js +++ b/test/unit/@node-red/editor-api/lib/editor/locales_spec.js @@ -91,6 +91,30 @@ describe("api/editor/locales", function() { done(); }); }); + + it('returns for locale defined only with primary tag ', function(done) { + var orig = i18n.i.getResourceBundle; + i18n.i.getResourceBundle = function (lang, ns) { + if (lang === "ja-JP") { + return undefined; + } + return orig(lang, ns); + }; + request(app) + // returns `ja` instead of `ja-JP` + .get("/locales/message-catalog?lng=ja-JP") + .expect(200) + .end(function(err,res) { + i18n.i.getResourceBundle = orig; + if (err) { + return done(err); + } + res.body.should.have.property('namespace','message-catalog'); + res.body.should.have.property('lang','ja'); + done(); + }); + }); + }); // describe('get all node resource catalogs',function() { diff --git a/test/unit/@node-red/editor-api/lib/editor/theme_spec.js b/test/unit/@node-red/editor-api/lib/editor/theme_spec.js index 62d2b10fd..b7f3e62ec 100644 --- a/test/unit/@node-red/editor-api/lib/editor/theme_spec.js +++ b/test/unit/@node-red/editor-api/lib/editor/theme_spec.js @@ -26,46 +26,52 @@ var NR_TEST_UTILS = require("nr-test-utils"); var theme = NR_TEST_UTILS.require("@node-red/editor-api/lib/editor/theme"); -describe("api/editor/theme", function() { - beforeEach(function() { - sinon.stub(fs,"statSync",function() { return true; }); +describe("api/editor/theme", function () { + beforeEach(function () { + sinon.stub(fs, "statSync", function () { return true; }); }); - afterEach(function() { - theme.init({settings:{}}); + afterEach(function () { + theme.init({settings: {}}); fs.statSync.restore(); }); - it("applies the default theme", function() { + it("applies the default theme", function () { var result = theme.init({}); should.not.exist(result); var context = theme.context(); context.should.have.a.property("page"); - context.page.should.have.a.property("title","Node-RED"); - context.page.should.have.a.property("favicon","favicon.ico"); + context.page.should.have.a.property("title", "Node-RED"); + context.page.should.have.a.property("favicon", "favicon.ico"); + context.page.should.have.a.property("tabicon", "red/images/node-red-icon-black.svg"); context.should.have.a.property("header"); - context.header.should.have.a.property("title","Node-RED"); - context.header.should.have.a.property("image","red/images/node-red.png"); + context.header.should.have.a.property("title", "Node-RED"); + context.header.should.have.a.property("image", "red/images/node-red.png"); + context.should.have.a.property("asset"); + context.asset.should.have.a.property("red", "red/red.min.js"); + context.asset.should.have.a.property("main", "red/main.min.js"); should.not.exist(theme.settings()); }); - it("picks up custom theme", function() { + it("picks up custom theme", function () { theme.init({ editorTheme: { page: { title: "Test Page Title", - favicon: "/absolute/path/to/theme/icon", + favicon: "/absolute/path/to/theme/favicon", + tabicon: "/absolute/path/to/theme/tabicon", css: "/absolute/path/to/custom/css/file.css", scripts: "/absolute/path/to/script.js" }, header: { title: "Test Header Title", + url: "http://nodered.org", image: "/absolute/path/to/header/image" // or null to remove image }, deployButton: { - type:"simple", - label:"Save", + type: "simple", + label: "Save", icon: "/absolute/path/to/deploy/button/image" // or null to remove image }, @@ -83,6 +89,16 @@ describe("api/editor/theme", function() { login: { image: "/absolute/path/to/login/page/big/image" // a 256x256 image + }, + + palette: { + editable: true, + catalogues: ['https://catalogue.nodered.org/catalogue.json'], + theme: [{ category: ".*", type: ".*", color: "#f0f" }] + }, + + projects: { + enabled: false } } }); @@ -91,22 +107,40 @@ describe("api/editor/theme", function() { var context = theme.context(); context.should.have.a.property("page"); - context.page.should.have.a.property("title","Test Page Title"); + context.page.should.have.a.property("title", "Test Page Title"); + context.page.should.have.a.property("favicon", "theme/favicon/favicon"); + context.page.should.have.a.property("tabicon", "theme/tabicon/tabicon"); context.should.have.a.property("header"); - context.header.should.have.a.property("title","Test Header Title"); + context.header.should.have.a.property("title", "Test Header Title"); + context.header.should.have.a.property("url", "http://nodered.org"); + context.header.should.have.a.property("image", "theme/header/image"); context.page.should.have.a.property("css"); context.page.css.should.have.lengthOf(1); context.page.css[0].should.eql('theme/css/file.css'); - context.page.should.have.a.property("scripts"); context.page.scripts.should.have.lengthOf(1); context.page.scripts[0].should.eql('theme/scripts/script.js'); + context.should.have.a.property("login"); + context.login.should.have.a.property("image", "theme/login/image"); var settings = theme.settings(); settings.should.have.a.property("deployButton"); + settings.deployButton.should.have.a.property("type", "simple"); + settings.deployButton.should.have.a.property("label", "Save"); + settings.deployButton.should.have.a.property("icon", "theme/deploy/image"); settings.should.have.a.property("userMenu"); + settings.userMenu.should.be.eql(false); settings.should.have.a.property("menu"); - + settings.menu.should.have.a.property("menu-item-import-library", false); + settings.menu.should.have.a.property("menu-item-export-library", false); + settings.menu.should.have.a.property("menu-item-keyboard-shortcuts", false); + settings.menu.should.have.a.property("menu-item-help", { label: "Alternative Help Link Text", url: "http://example.com" }); + settings.should.have.a.property("palette"); + settings.palette.should.have.a.property("editable", true); + settings.palette.should.have.a.property("catalogues", ['https://catalogue.nodered.org/catalogue.json']); + settings.palette.should.have.a.property("theme", [{ category: ".*", type: ".*", color: "#f0f" }]); + settings.should.have.a.property("projects"); + settings.projects.should.have.a.property("enabled", false); }); }); diff --git a/test/unit/@node-red/registry/lib/installer_spec.js b/test/unit/@node-red/registry/lib/installer_spec.js index 65747d185..f3bae8b3a 100644 --- a/test/unit/@node-red/registry/lib/installer_spec.js +++ b/test/unit/@node-red/registry/lib/installer_spec.js @@ -21,9 +21,6 @@ var path = require("path"); var fs = require('fs'); var EventEmitter = require('events'); -var child_process = require('child_process'); - - var NR_TEST_UTILS = require("nr-test-utils"); var installer = NR_TEST_UTILS.require("@node-red/registry/lib/installer"); @@ -42,16 +39,21 @@ describe('nodes/registry/installer', function() { _: function() { return "abc"} } - before(function() { - installer.init({log:mockLog, settings:{}, events: new EventEmitter()}); + beforeEach(function() { + installer.init({log:mockLog, settings:{}, events: new EventEmitter(), exec: { + run: function() { + return Promise.resolve(""); + } + }}); }); + function initInstaller(execResult) { + installer.init({log:mockLog, settings:{}, events: new EventEmitter(), exec: { + run: function() { + return execResult; + } + }}); + } afterEach(function() { - if (child_process.spawn.restore) { - child_process.spawn.restore(); - } - if (child_process.execFile.restore) { - child_process.execFile.restore(); - } if (registry.addModule.restore) { registry.addModule.restore(); } @@ -76,39 +78,33 @@ describe('nodes/registry/installer', function() { describe("installs module", function() { it("rejects when npm returns a 404", function(done) { - sinon.stub(child_process,"spawn",function(cmd,args,opt) { - var ee = new EventEmitter(); - ee.stdout = new EventEmitter(); - ee.stderr = new EventEmitter(); - setTimeout(function() { - ee.stderr.emit('data'," 404 this_wont_exist"); - ee.emit('close',1); - },10) - return ee; - }); - + var res = { + code: 1, + stdout:"", + stderr:" 404 this_wont_exist" + } + var p = Promise.reject(res); + p.catch((err)=>{}); + initInstaller(p) installer.installModule("this_wont_exist").catch(function(err) { err.should.have.property("code",404); done(); }); }); it("rejects when npm does not find specified version", function(done) { - sinon.stub(child_process,"spawn",function(cmd,args,opt) { - var ee = new EventEmitter(); - ee.stdout = new EventEmitter(); - ee.stderr = new EventEmitter(); - setTimeout(function() { - ee.stderr.emit('data'," version not found: this_wont_exist@0.1.2"); - ee.emit('close',1); - },10) - return ee; - }); + var res = { + code: 1, + stdout:"", + stderr:" version not found: this_wont_exist@0.1.2" + } + var p = Promise.reject(res); + p.catch((err)=>{}); + initInstaller(p) sinon.stub(typeRegistry,"getModuleInfo", function() { return { version: "0.1.1" } }); - installer.installModule("this_wont_exist","0.1.2").catch(function(err) { err.code.should.be.eql(404); done(); @@ -126,17 +122,14 @@ describe('nodes/registry/installer', function() { }); }); it("rejects with generic error", function(done) { - sinon.stub(child_process,"spawn",function(cmd,args,opt,cb) { - var ee = new EventEmitter(); - ee.stdout = new EventEmitter(); - ee.stderr = new EventEmitter(); - setTimeout(function() { - ee.stderr.emit('data'," kaboom!"); - ee.emit('close',1); - },10) - return ee; - }); - + var res = { + code: 1, + stdout:"", + stderr:" kaboom!" + } + var p = Promise.reject(res); + p.catch((err)=>{}); + initInstaller(p) installer.installModule("this_wont_exist").then(function() { done(new Error("Unexpected success")); }).catch(function(err) { @@ -145,15 +138,16 @@ describe('nodes/registry/installer', function() { }); it("succeeds when module is found", function(done) { var nodeInfo = {nodes:{module:"foo",types:["a"]}}; - sinon.stub(child_process,"spawn",function(cmd,args,opt) { - var ee = new EventEmitter(); - ee.stdout = new EventEmitter(); - ee.stderr = new EventEmitter(); - setTimeout(function() { - ee.emit('close',0); - },10) - return ee; - }); + + var res = { + code: 0, + stdout:"", + stderr:"" + } + var p = Promise.resolve(res); + p.catch((err)=>{}); + initInstaller(p) + var addModule = sinon.stub(registry,"addModule",function(md) { return when.resolve(nodeInfo); }); @@ -191,15 +185,15 @@ describe('nodes/registry/installer', function() { return when.resolve(nodeInfo); }); var resourcesDir = path.resolve(path.join(__dirname,"resources","local","TestNodeModule","node_modules","TestNodeModule")); - sinon.stub(child_process,"spawn",function(cmd,args,opt) { - var ee = new EventEmitter(); - ee.stdout = new EventEmitter(); - ee.stderr = new EventEmitter(); - setTimeout(function() { - ee.emit('close',0); - },10) - return ee; - }); + + var res = { + code: 0, + stdout:"", + stderr:"" + } + var p = Promise.resolve(res); + p.catch((err)=>{}); + initInstaller(p) installer.installModule(resourcesDir).then(function(info) { info.should.eql(nodeInfo); done(); @@ -226,9 +220,14 @@ describe('nodes/registry/installer', function() { var removeModule = sinon.stub(registry,"removeModule",function(md) { return when.resolve(nodeInfo); }); - sinon.stub(child_process,"execFile",function(cmd,args,opt,cb) { - cb(new Error("test_error"),"",""); - }); + var res = { + code: 1, + stdout:"", + stderr:"error" + } + var p = Promise.reject(res); + p.catch((err)=>{}); + initInstaller(p) installer.uninstallModule("this_wont_exist").then(function() { done(new Error("Unexpected success")); @@ -244,9 +243,14 @@ describe('nodes/registry/installer', function() { var getModuleInfo = sinon.stub(registry,"getModuleInfo",function(md) { return {nodes:[]}; }); - sinon.stub(child_process,"execFile",function(cmd,args,opt,cb) { - cb(null,"",""); - }); + var res = { + code: 0, + stdout:"", + stderr:"" + } + var p = Promise.resolve(res); + p.catch((err)=>{}); + initInstaller(p) sinon.stub(fs,"statSync", function(fn) { return {}; }); diff --git a/test/unit/@node-red/runtime/lib/exec_spec.js b/test/unit/@node-red/runtime/lib/exec_spec.js new file mode 100644 index 000000000..e0369e07c --- /dev/null +++ b/test/unit/@node-red/runtime/lib/exec_spec.js @@ -0,0 +1,22 @@ +/** + * Copyright JS Foundation and other contributors, http://js.foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + **/ +var should = require("should"); +var sinon = require("sinon"); +var path = require("path"); + +var NR_TEST_UTILS = require("nr-test-utils"); + +var exec = NR_TEST_UTILS.require("@node-red/runtime/lib/exec");
ノードの設定でurlプロパティを指定する場合、mustache形式のタグを含めることができます。これにより、URLを入力メッセージの値から構成することができます。例えば、urlがexample.com/{{{topic}}}の場合、msg.topicの値による置き換えを自動的に行います。{{{...}}}表記を使うと、/、&といった文字をmustacheがエスケープするのを抑止できます。
注: proxyサーバを利用している場合、環境変数http_proxy=...を設定して、Node-REDを再起動してください。
注: proxyサーバを利用している場合、環境変数http_proxy=...を設定して、Node-REDを再起動するか、あるいはプロキシ設定をしてください。
同一フローで本ノードを複数利用するためには、msg.headersプロパティの扱いに注意しなくてはなりません。例えば、最初のノードがレスポンスヘッダにこのプロパティを設定し、次のノードがこのプロパティをリクエストヘッダに利用するというのは一般的には期待する動作ではありません。msg.headersプロパティをノード間で変更しないままとすると、2つ目のノードで無視されることになります。カスタムヘッダを設定するためには、msg.headersをまず削除もしくは空のオブジェクト{}にリセットします。
{}
カンマ区切りでディレクトリおよびファイルのリストを指定します。空白を含む場合は、引用符で"..."のように囲んでください。
Windowsでは、2重バックスラッシュ\\をディレクトリ名に使用します。
実際に変化したファイルのフルパス名をmsg.payloadに、検知対象リストの文字列をmsg.topicに返します。
msg.payload
msg.fileは変化したファイルのファイル名表します。msg.typeは変化した対象の種別(fileもしくはdirectory)を、msg.sizeはファイルサイズ(バイト数)を表します。
msg.file
msg.type
msg.size
msg.fileは変化したファイルのファイル名を表します。msg.typeは変化した対象の種別(fileもしくはdirectory)を、msg.sizeはファイルサイズ(バイト数)を表します。
Linuxではファイルとして表されるもの全てが、検知対象にできます。
注: 検知対象のディレクトリもしくはファイルは存在していなくてはなりません。対象ファイルもしくはディレクトリが削除された場合、再作成されても検知対象から外れたままです。
現在のNode-RED環境では、本ノードの型が不明です。
現在の状態でに本ノードをデプロイすると設定は保存されますが、不明なノードがインストールされるまでフローは実行されません。
詳細はノードの「情報」を参照してください。
現在の状態で本ノードをデプロイすると設定は保存されますが、不明なノードがインストールされるまでフローは実行されません。