@node-red/nodes
Advanced tools
Comparing version 0.20.0-alpha.0 to 0.20.0-beta.2
@@ -31,3 +31,3 @@ /** | ||
http://docs.oasis-open.org/mqtt/mqtt/v5.0/cs02/mqtt-v5.0-cs02.html#_Toc514345522 | ||
4.8.2 describes shares like: | ||
@@ -41,3 +41,3 @@ $share/{ShareName}/{filter} | ||
ts = ts.replace(/^\$share\/[^#+/]+\/(.*)/g,"$1"); | ||
} | ||
@@ -86,3 +86,3 @@ var re = new RegExp("^"+ts.replace(/([\[\]\?\(\)\\\\$\^\*\.|])/g,"\\$1").replace(/\+/g,"[^/]+").replace(/\/#$/,"(\/.*)?")+"$"); | ||
retain: n.closeRetain=="true"|| n.closeRetain===true | ||
}; | ||
}; | ||
} | ||
@@ -427,5 +427,8 @@ | ||
} | ||
this.on('close', function(done) { | ||
this.on('close', function(removed, done) { | ||
if (node.brokerConn) { | ||
node.brokerConn.unsubscribe(node.topic,node.id); | ||
if (removed) { | ||
// This node has been removed so remove any subscriptions | ||
node.brokerConn.unsubscribe(node.topic,node.id); | ||
} | ||
node.brokerConn.deregister(node,done); | ||
@@ -483,2 +486,2 @@ } | ||
RED.nodes.registerType("mqtt out",MQTTOutNode); | ||
}; | ||
}; |
@@ -95,2 +95,11 @@ /** | ||
opts.proxy = null; | ||
if (msg.requestTimeout) { | ||
if (isNaN(msg.requestTimeout)) { | ||
node.warn(RED._("httpin.errors.timeout-isnan")); | ||
} else if (msg.requestTimeout < 0) { | ||
node.warn(RED._("httpin.errors.timeout-isnegative")); | ||
} else { | ||
opts.timeout = msg.requestTimeout; | ||
} | ||
} | ||
var ctSet = "Content-Type"; // set default camel case | ||
@@ -126,4 +135,12 @@ var clSet = "Content-Length"; | ||
} | ||
var redirectList = []; | ||
if (!opts.hasOwnProperty('followRedirect') || opts.followRedirect) { | ||
opts.followRedirect = function(res) { | ||
var redirectInfo = { | ||
location: res.headers.location, | ||
}; | ||
if (res.headers.hasOwnProperty('set-cookie')) { | ||
redirectInfo.cookies = extractCookies(res.headers['set-cookie']); | ||
} | ||
redirectList.push(redirectInfo); | ||
if (this.headers.cookie) { | ||
@@ -252,13 +269,6 @@ delete this.headers.cookie; | ||
msg.payload = body; | ||
msg.redirectList = redirectList; | ||
if (msg.headers.hasOwnProperty('set-cookie')) { | ||
msg.responseCookies = {}; | ||
msg.headers['set-cookie'].forEach(function(c) { | ||
var parsedCookie = cookie.parse(c); | ||
var eq_idx = c.indexOf('='); | ||
var key = c.substr(0, eq_idx).trim() | ||
parsedCookie.value = parsedCookie[key]; | ||
delete parsedCookie[key]; | ||
msg.responseCookies[key] = parsedCookie; | ||
}); | ||
msg.responseCookies = extractCookies(msg.headers['set-cookie']); | ||
} | ||
@@ -296,2 +306,15 @@ msg.headers['x-node-red-request-node'] = hashSum(msg.headers); | ||
}); | ||
function extractCookies(setCookie) { | ||
var cookies = {}; | ||
setCookie.forEach(function(c) { | ||
var parsedCookie = cookie.parse(c); | ||
var eq_idx = c.indexOf('='); | ||
var key = c.substr(0, eq_idx).trim() | ||
parsedCookie.value = parsedCookie[key]; | ||
delete parsedCookie[key]; | ||
cookies[key] = parsedCookie; | ||
}); | ||
return cookies; | ||
} | ||
} | ||
@@ -298,0 +321,0 @@ |
@@ -206,3 +206,3 @@ { | ||
"template": "Template", | ||
"property": "Set property", | ||
"property": "Property", | ||
"format": "Syntax Highlight", | ||
@@ -414,3 +414,5 @@ "syntax": "Format", | ||
"deprecated-call":"Deprecated call to __method__", | ||
"invalid-transport":"non-http transport requested" | ||
"invalid-transport":"non-http transport requested", | ||
"timeout-isnan": "Timeout value is not a valid number, ignoring", | ||
"timeout-isnegative": "Timeout value is negative, ignoring" | ||
}, | ||
@@ -827,17 +829,2 @@ "status": { | ||
}, | ||
"tail": { | ||
"tail": "tail", | ||
"label": { | ||
"filename": "Filename", | ||
"type": "File type", | ||
"splitlines": "Split lines on \\n?" | ||
}, | ||
"action": { | ||
"text": "Text - returns String", | ||
"binary": "Binary - returns Buffer" | ||
}, | ||
"errors": { | ||
"windowsnotsupport": "Not currently supported on Windows." | ||
} | ||
}, | ||
"file": { | ||
@@ -844,0 +831,0 @@ "label": { |
@@ -127,2 +127,3 @@ { | ||
"clearLog": "ログを削除", | ||
"filterLog": "ログのフィルタリング", | ||
"openWindow": "新しいウィンドウで開く" | ||
@@ -206,3 +207,3 @@ }, | ||
"template": "テンプレート", | ||
"property": "設定先", | ||
"property": "プロパティ", | ||
"format": "構文", | ||
@@ -366,3 +367,4 @@ "syntax": "形式", | ||
"string": "文字列", | ||
"base64": "Base64文字列" | ||
"base64": "Base64文字列", | ||
"auto": "自動判定" | ||
}, | ||
@@ -414,3 +416,5 @@ "true": "する", | ||
"deprecated-call": "非推奨の呼び出しです __method__", | ||
"invalid-transport": "httpでないトランスポートが要求されました" | ||
"invalid-transport": "httpでないトランスポートが要求されました", | ||
"timeout-isnan": "タイムアウト値が数値ではないため無視します", | ||
"timeout-isnegative": "タイムアウト値が負数のため無視します" | ||
}, | ||
@@ -825,17 +829,2 @@ "status": { | ||
}, | ||
"tail": { | ||
"tail": "tail", | ||
"label": { | ||
"filename": "ファイル名", | ||
"type": "ファイル形式", | ||
"splitlines": "改行でメッセージを分割" | ||
}, | ||
"action": { | ||
"text": "文字列", | ||
"binary": "バイナリバッファ" | ||
}, | ||
"errors": { | ||
"windowsnotsupport": "現在Windows上での動作は対応していません" | ||
} | ||
}, | ||
"file": { | ||
@@ -842,0 +831,0 @@ "label": { |
@@ -199,3 +199,3 @@ { | ||
"template": "模版", | ||
"property": "设定属性", | ||
"property": "属性", | ||
"format": "语法高亮", | ||
@@ -788,16 +788,2 @@ "syntax": "格式", | ||
}, | ||
"tail": { | ||
"label": { | ||
"filename": "文件名", | ||
"type": "文件类型", | ||
"splitlines": "以\\n来拆分行?" | ||
}, | ||
"action": { | ||
"text": "文本 - 返回字符串", | ||
"binary": "二进制 - 返回Buffer" | ||
}, | ||
"errors": { | ||
"windowsnotsupport": "Windows目前不支持." | ||
} | ||
}, | ||
"file": { | ||
@@ -804,0 +790,0 @@ "label": { |
{ | ||
"name": "@node-red/nodes", | ||
"version": "0.20.0-alpha.0", | ||
"version": "0.20.0-beta.2", | ||
"license": "Apache-2.0", | ||
@@ -10,7 +10,11 @@ "repository": { | ||
"contributors": [ | ||
{ "name": "Nick O'Leary" }, | ||
{ "name": "Dave Conway-Jones"} | ||
{ | ||
"name": "Nick O'Leary" | ||
}, | ||
{ | ||
"name": "Dave Conway-Jones" | ||
} | ||
], | ||
"dependencies": { | ||
"ajv": "6.5.4", | ||
"ajv": "6.6.1", | ||
"body-parser": "1.18.3", | ||
@@ -20,6 +24,6 @@ "cheerio": "0.22.0", | ||
"cookie": "0.3.1", | ||
"cors": "2.8.4", | ||
"cron": "1.5.0", | ||
"denque": "1.3.0", | ||
"fs-extra": "5.0.0", | ||
"cors": "2.8.5", | ||
"cron": "1.5.1", | ||
"denque": "1.4.0", | ||
"fs-extra": "7.0.1", | ||
"fs.notify": "0.0.4", | ||
@@ -30,6 +34,6 @@ "hash-sum": "1.0.2", | ||
"js-yaml": "3.12.0", | ||
"media-typer": "0.3.0", | ||
"media-typer": "1.0.1", | ||
"mqtt": "2.18.8", | ||
"multer": "1.4.1", | ||
"mustache": "2.3.2", | ||
"mustache": "3.0.1", | ||
"on-headers": "1.0.1", | ||
@@ -36,0 +40,0 @@ "raw-body": "2.3.3", |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
1028801
196
7
10946
+ Addedajv@6.6.1(transitive)
+ Addedcors@2.8.5(transitive)
+ Addedcron@1.5.1(transitive)
+ Addeddenque@1.4.0(transitive)
+ Addedfs-extra@7.0.1(transitive)
+ Addedmedia-typer@1.0.1(transitive)
+ Addedmustache@3.0.1(transitive)
- Removedajv@6.5.4(transitive)
- Removedcors@2.8.4(transitive)
- Removedcron@1.5.0(transitive)
- Removeddenque@1.3.0(transitive)
- Removedfs-extra@5.0.0(transitive)
- Removedmustache@2.3.2(transitive)
Updatedajv@6.6.1
Updatedcors@2.8.5
Updatedcron@1.5.1
Updateddenque@1.4.0
Updatedfs-extra@7.0.1
Updatedmedia-typer@1.0.1
Updatedmustache@3.0.1