diff --git a/io/serialport/25-serial.js b/io/serialport/25-serial.js
index 172ffbd7..2d9b4f2c 100644
--- a/io/serialport/25-serial.js
+++ b/io/serialport/25-serial.js
@@ -41,6 +41,19 @@ module.exports = function(RED) {
node.port = serialPool.get(this.serialConfig);
node.on("input",function(msg) {
+ if (msg.hasOwnProperty("baudrate")) {
+ var baud = parseInt(msg.baudrate);
+ if (isNaN(baud)) {
+ node.error(RED._("serial.errors.badbaudrate"),msg);
+ } else {
+ node.port.update({baudRate: baud},function(err,res) {
+ if (err) {
+ var errmsg = err.toString().replace("Serialport","Serialport "+node.port.serial.path);
+ node.error(errmsg,msg);
+ }
+ });
+ }
+ }
if (!msg.hasOwnProperty("payload")) { return; } // do nothing unless we have a payload
var payload = node.port.encodePayload(msg.payload);
node.port.write(payload,function(err,res) {
@@ -121,6 +134,19 @@ module.exports = function(RED) {
node.port = serialPool.get(this.serialConfig);
// Serial Out
node.on("input",function(msg) {
+ if (msg.hasOwnProperty("baudrate")) {
+ var baud = parseInt(msg.baudrate);
+ if (isNaN(baud)) {
+ node.error(RED._("serial.errors.badbaudrate"),msg);
+ } else {
+ node.port.update({baudRate: baud},function(err,res) {
+ if (err) {
+ var errmsg = err.toString().replace("Serialport","Serialport "+node.port.serial.path);
+ node.error(errmsg,msg);
+ }
+ });
+ }
+ }
if (!msg.hasOwnProperty("payload")) { return; } // do nothing unless we have a payload
if (msg.hasOwnProperty("count") && (typeof msg.count === "number") && (node.serialConfig.out === "count")) {
node.serialConfig.newline = msg.count;
@@ -249,6 +275,7 @@ module.exports = function(RED) {
return payload;
},
write: function(m,cb) { this.serial.write(m,cb); },
+ update: function(m,cb) { this.serial.update(m,cb); },
enqueue: function(msg,sender,cb) {
var payload = this.encodePayload(msg.payload);
var qobj = {
diff --git a/io/serialport/locales/en-US/25-serial.json b/io/serialport/locales/en-US/25-serial.json
index fd52c996..03ef70e6 100644
--- a/io/serialport/locales/en-US/25-serial.json
+++ b/io/serialport/locales/en-US/25-serial.json
@@ -66,7 +66,8 @@
"unexpected-close": "serial port __port__ closed unexpectedly",
"disconnected": "serial port __port__ disconnected",
"closed": "serial port __port__ closed",
- "list": "Failed to list ports. Please enter manually."
+ "list": "Failed to list ports. Please enter manually.",
+ "badbaudrate": "Baudrate is invalid"
}
}
}
diff --git a/io/serialport/locales/ja/25-serial.json b/io/serialport/locales/ja/25-serial.json
index f2189c85..647ed53c 100644
--- a/io/serialport/locales/ja/25-serial.json
+++ b/io/serialport/locales/ja/25-serial.json
@@ -51,7 +51,8 @@
"unexpected-close": "serial port __port__ closed unexpectedly",
"disconnected": "serial port __port__ disconnected",
"closed": "serial port __port__ closed",
- "list": "ポートのリスト化に失敗しました。手動で入力してください。"
+ "list": "ポートのリスト化に失敗しました。手動で入力してください。",
+ "badbaudrate": "ボーレートが不正です"
}
}
}
diff --git a/io/serialport/package.json b/io/serialport/package.json
index d553ad75..d8f237ed 100644
--- a/io/serialport/package.json
+++ b/io/serialport/package.json
@@ -1,9 +1,9 @@
{
"name" : "node-red-node-serialport",
- "version" : "0.10.3",
+ "version" : "0.11.0",
"description" : "Node-RED nodes to talk to serial ports",
"dependencies" : {
- "serialport" : "^8.0.8"
+ "serialport" : "^9.0.1"
},
"repository" : {
"type":"git",
diff --git a/io/snmp/README.md b/io/snmp/README.md
index e71c82f8..5067b11b 100644
--- a/io/snmp/README.md
+++ b/io/snmp/README.md
@@ -107,7 +107,7 @@ Values depends on the oids being requested.
### snmp-subtree
-Simple SNMP oid subtree fetcher. Triggered by any input.
+Simple SNMP oid subtree fetcher. Triggered by any input. Reads from OID specified and any below it.
`msg.host` may contain the host.
@@ -127,7 +127,7 @@ Values depends on the oids being requested.
### snmp-walker
-Simple SNMP oid walker fetcher. Triggered by any input.
+Simple SNMP oid walker fetcher. Triggered by any input. Reads from OID specified to the end of the table.
`msg.host` may contain the host.
diff --git a/io/snmp/package.json b/io/snmp/package.json
index 89a7a457..c2c118f7 100644
--- a/io/snmp/package.json
+++ b/io/snmp/package.json
@@ -1,6 +1,6 @@
{
"name" : "node-red-node-snmp",
- "version" : "0.0.24",
+ "version" : "0.0.25",
"description" : "A Node-RED node that looks for SNMP oids.",
"dependencies" : {
"net-snmp" : "1.2.4"
diff --git a/io/snmp/snmp.html b/io/snmp/snmp.html
index 4676dfb1..4cd13ef8 100644
--- a/io/snmp/snmp.html
+++ b/io/snmp/snmp.html
@@ -224,7 +224,7 @@
+
+
+
+
+
diff --git a/social/email/61-email.js b/social/email/61-email.js
index 2dbfad24..272c7390 100644
--- a/social/email/61-email.js
+++ b/social/email/61-email.js
@@ -1,3 +1,4 @@
+/* eslint-disable indent */
/**
* POP3 protocol - RFC1939 - https://www.ietf.org/rfc/rfc1939.txt
@@ -11,11 +12,13 @@
module.exports = function(RED) {
"use strict";
- var nodemailer = require("nodemailer");
+ var util = require("util");
var Imap = require('imap');
var POP3Client = require("poplib");
- var SimpleParser = require("mailparser").simpleParser;
- var util = require("util");
+ var nodemailer = require("nodemailer");
+ var simpleParser = require("mailparser").simpleParser;
+ var SMTPServer = require("smtp-server").SMTPServer;
+ //var microMTA = require("micromta").microMTA;
if (parseInt(process.version.split("v")[1].split(".")[0]) < 8) {
throw "Error : Requires nodejs version >= 8.";
@@ -291,8 +294,8 @@ module.exports = function(RED) {
// We have now received a new email message. Create an instance of a mail parser
// and pass in the email message. The parser will signal when it has parsed the message.
- SimpleParser(data, {}, function(err, parsed) {
- //node.log(util.format("SimpleParser: on(end): %j", mailObject));
+ simpleParser(data, {}, function(err, parsed) {
+ //node.log(util.format("simpleParser: on(end): %j", mailObject));
if (err) {
node.status({fill:"red", shape:"ring", text:"email.status.parseerror"});
node.error(RED._("email.errors.parsefail", {folder:node.box}), err);
@@ -341,17 +344,29 @@ module.exports = function(RED) {
ss = true;
node.status({fill:"blue", shape:"dot", text:"email.status.fetching"});
//console.log("> ready");
- // Open the inbox folder
+ // Open the folder
imap.openBox(node.box, // Mailbox name
false, // Open readonly?
function(err, box) {
//console.log("> Inbox err : %j", err);
//console.log("> Inbox open: %j", box);
if (err) {
- s = false;
+ var boxs = [];
+ imap.getBoxes(function(err,boxes) {
+ if (err) { return; }
+ for (var prop in boxes) {
+ if (boxes.hasOwnProperty(prop)) {
+ if (boxes[prop].children) {
+ boxs.push(prop+"/{"+Object.keys(boxes[prop].children)+'}');
+ }
+ else { boxs.push(prop); }
+ }
+ }
+ node.error(RED._("email.errors.fetchfail", {folder:node.box+". Folders - "+boxs.join(', ')}),err);
+ });
node.status({fill:"red", shape:"ring", text:"email.status.foldererror"});
- node.error(RED._("email.errors.fetchfail", {folder:node.box}),err);
imap.end();
+ s = false;
setInputRepeatTimeout();
return;
}
@@ -394,7 +409,7 @@ module.exports = function(RED) {
//console.log("> Fetch message - msg=%j, seqno=%d", imapMessage, seqno);
imapMessage.on('body', function(stream, info) {
//console.log("> message - body - stream=?, info=%j", info);
- SimpleParser(stream, {}, function(err, parsed) {
+ simpleParser(stream, {}, function(err, parsed) {
if (err) {
node.status({fill:"red", shape:"ring", text:"email.status.parseerror"});
node.error(RED._("email.errors.parsefail", {folder:node.box}),err);
@@ -412,19 +427,21 @@ module.exports = function(RED) {
var cleanup = function() {
imap.end();
s = false;
+ setInputRepeatTimeout();
};
- if (this.disposition === "Delete") {
+ if (node.disposition === "Delete") {
imap.addFlags(results, "\Deleted", cleanup);
- } else if (this.disposition === "Read") {
+ } else if (node.disposition === "Read") {
imap.addFlags(results, "\Seen", cleanup);
} else {
cleanup();
}
- setInputRepeatTimeout();
});
fetch.once('error', function(err) {
console.log('Fetch error: ' + err);
+ imap.end();
+ s = false;
setInputRepeatTimeout();
});
}
@@ -442,7 +459,7 @@ module.exports = function(RED) {
if (node.protocol === "POP3") {
checkPOP3(msg);
} else if (node.protocol === "IMAP") {
- if (s === false) { checkIMAP(msg); }
+ if (s === false && ss == false) { checkIMAP(msg); }
}
} // End of checkEmail
@@ -499,4 +516,61 @@ module.exports = function(RED) {
global: { type:"boolean" }
}
});
+
+
+ function EmailMtaNode(n) {
+ RED.nodes.createNode(this,n);
+ this.port = n.port;
+ var node = this;
+
+ node.mta = new SMTPServer({
+ secure: false,
+ logger: false,
+ disabledCommands: ['AUTH', 'STARTTLS'],
+
+ onData: function (stream, session, callback) {
+ simpleParser(stream, { skipTextToHtml:true, skipTextLinks:true }, (err, parsed) => {
+ if (err) { node.error(RED._("email.errors.parsefail"),err); }
+ else {
+ node.status({fill:"green", shape:"dot", text:""});
+ var msg = {}
+ msg.payload = parsed.text;
+ msg.topic = parsed.subject;
+ msg.date = parsed.date;
+ msg.header = {};
+ parsed.headers.forEach((v, k) => {msg.header[k] = v;});
+ if (parsed.html) { msg.html = parsed.html; }
+ if (parsed.to) {
+ if (typeof(parsed.to) === "string" && parsed.to.length > 0) { msg.to = parsed.to; }
+ else if (parsed.to.hasOwnProperty("text") && parsed.to.text.length > 0) { msg.to = parsed.to.text; }
+ }
+ if (parsed.cc) {
+ if (typeof(parsed.cc) === "string" && parsed.cc.length > 0) { msg.cc = parsed.cc; }
+ else if (parsed.cc.hasOwnProperty("text") && parsed.cc.text.length > 0) { msg.cc = parsed.cc.text; }
+ }
+ if (parsed.cc && parsed.cc.length > 0) { msg.cc = parsed.cc; }
+ if (parsed.bcc && parsed.bcc.length > 0) { msg.bcc = parsed.bcc; }
+ if (parsed.from && parsed.from.value && parsed.from.value.length > 0) { msg.from = parsed.from.value[0].address; }
+ if (parsed.attachments) { msg.attachments = parsed.attachments; }
+ else { msg.attachments = []; }
+ node.send(msg); // Propagate the message down the flow
+ setTimeout(function() { node.status({})}, 500);
+ }
+ callback();
+ });
+ }
+ });
+
+ node.mta.listen(node.port);
+
+ node.mta.on("error", err => {
+ node.error("Error: " + err.message, err);
+ });
+
+ node.on("close", function() {
+ node.mta.close();
+ });
+ }
+ RED.nodes.registerType("e-mail mta",EmailMtaNode);
+
};
diff --git a/social/email/locales/en-US/61-email.html b/social/email/locales/en-US/61-email.html
index 3f54dba8..282ff3b2 100644
--- a/social/email/locales/en-US/61-email.html
+++ b/social/email/locales/en-US/61-email.html
@@ -26,7 +26,7 @@
Additionally msg.header contains the complete header object including
to, cc and other potentially useful properties.
It can optionally mark the message as Read (default), Delete it, or leave unmarked (None).
- Uses the node-imap module - see that page for
+
Uses the node-imap module - see that page for
information on the msg.criteria format if needed.
Note: uses IMAP with SSL to port 993.
Any attachments supplied in the incoming email can be found in the msg.attachments property. This will be an array of objects where
@@ -51,3 +51,13 @@
+
\ No newline at end of file
diff --git a/social/email/locales/en-US/61-email.json b/social/email/locales/en-US/61-email.json
index 9bc3a8fc..cca6fa1d 100644
--- a/social/email/locales/en-US/61-email.json
+++ b/social/email/locales/en-US/61-email.json
@@ -34,7 +34,8 @@
"default-message": "__description__\n\nFile from Node-RED is attached: __filename__",
"tip": {
"cred": "Note: Copied credentials from global emailkeys.js file.",
- "recent": "Tip: Only retrieves the single most recent email."
+ "recent": "Tip: Only retrieves the single most recent email.",
+ "mta": "Note: To use ports below 1024 you may need elevated (root) privileges. See help sidebar."
},
"status": {
"messagesent": "Message sent: __response__",
@@ -47,6 +48,7 @@
"inboxzero": "you have achieved Inbox Zero",
"sending": "sending",
"sendfail": "send failed",
+ "parseerror": "Failed to parse message",
"connecterror": "connect error"
},
"errors": {
@@ -56,6 +58,7 @@
"nosmtptransport": "No SMTP transport. See info panel.",
"nopayload": "No payload to send",
"fetchfail": "Failed to fetch folder: __folder__",
+ "parsefail": "Failed to parse message",
"messageerror": "Fetch message error: __error__",
"refreshtoolarge": "Refresh interval too large. Limiting to 2147483 seconds"
}
diff --git a/social/email/locales/ja/61-email.html b/social/email/locales/ja/61-email.html
index 560dcb8b..d8dbfac9 100644
--- a/social/email/locales/ja/61-email.html
+++ b/social/email/locales/ja/61-email.html
@@ -38,3 +38,13 @@
POP3プロトコルでのデフォルトポート番号は、素のTCPでは110番、SSLでは995番です。IMAPプロトコルでは、素のTCPでは143番、SSLでは993番です。
+
+
\ No newline at end of file
diff --git a/social/email/locales/ja/61-email.json b/social/email/locales/ja/61-email.json
index 08d04197..0938a236 100644
--- a/social/email/locales/ja/61-email.json
+++ b/social/email/locales/ja/61-email.json
@@ -21,7 +21,8 @@
"default-message": "__description__\n\nNode-REDからファイルが添付されました: __filename__",
"tip": {
"cred": "注釈: emailkeys.jsファイルから認証情報をコピーしました。",
- "recent": "注釈: 最新のメールを1件のみ取得します。"
+ "recent": "注釈: 最新のメールを1件のみ取得します。",
+ "mta": "注釈: 1024未満のポートを使用するには、昇格された(root)特権が必要です。ヘルプサイドバーを参照してください。"
},
"status": {
"messagesent": "メッセージを送信しました: __response__",
@@ -34,6 +35,7 @@
"inboxzero": "受信トレイにメールがありません",
"sending": "送信中",
"sendfail": "送信が失敗しました",
+ "parseerror": "メッセージのパースに失敗",
"connecterror": "接続エラー"
},
"errors": {
@@ -43,6 +45,7 @@
"nosmtptransport": "SMTP転送が設定されていません。「情報」タブを参照してください",
"nopayload": "送信するペイロードがありません",
"fetchfail": "フォルダの受信に失敗しました: __folder__",
+ "parsefail": "メッセージのパースに失敗",
"messageerror": "メッセージ受信エラー: __error__"
}
}
diff --git a/social/email/package.json b/social/email/package.json
index 56375b20..d9f4f93c 100644
--- a/social/email/package.json
+++ b/social/email/package.json
@@ -1,12 +1,13 @@
{
"name": "node-red-node-email",
- "version": "1.7.8",
- "description": "Node-RED nodes to send and receive simple emails",
+ "version": "1.8.1",
+ "description": "Node-RED nodes to send and receive simple emails.",
"dependencies": {
"imap": "^0.8.19",
- "mailparser": "^2.7.7",
- "nodemailer": "^6.4.6",
- "poplib": "^0.1.7"
+ "poplib": "^0.1.7",
+ "mailparser": "^3.0.0",
+ "nodemailer": "~6.4.10",
+ "smtp-server": "^3.7.0"
},
"repository": {
"type": "git",
@@ -18,7 +19,8 @@
"email",
"gmail",
"imap",
- "pop"
+ "pop",
+ "mta"
],
"node-red": {
"nodes": {
diff --git a/social/pushbullet/57-pushbullet.js b/social/pushbullet/57-pushbullet.js
index 5c49f222..199547aa 100644
--- a/social/pushbullet/57-pushbullet.js
+++ b/social/pushbullet/57-pushbullet.js
@@ -3,9 +3,7 @@ module.exports = function(RED) {
"use strict";
var PushBullet = require('pushbullet');
var fs = require('fs');
- var util = require('util');
var when = require('when');
- var nodefn = require('when/node');
var EventEmitter = require('events').EventEmitter;
function onError(err, node) {
@@ -127,17 +125,19 @@ module.exports = function(RED) {
stream.on('close', function() {
self.emitter.emit('stream_disconnected');
if (!closing) {
+ if (tout) { clearTimeout(tout); }
tout = setTimeout(function() {
stream.connect();
- },15000);
+ }, 15000);
}
});
stream.on('error', function(err) {
self.emitter.emit('stream_error', err);
if (!closing) {
+ if (tout) { clearTimeout(tout); }
tout = setTimeout(function() {
stream.connect();
- },15000);
+ }, 15000);
}
});
stream.connect();
@@ -229,10 +229,14 @@ module.exports = function(RED) {
msg.payload = incoming.body;
}
else if (incoming.type === 'dismissal') {
- msg.topic = "dismissal";
msg.topic = "Push dismissed";
msg.payload = incoming.iden;
}
+ else if (incoming.type === 'sms_changed') {
+ msg.topic = "SMS: "+ incoming.notifications[0].title;
+ msg.payload = incoming.notifications[0].body;
+ msg.message = incoming;
+ }
else {
this.error("unknown push type: " + incoming.type + " content: " + JSON.stringify(incoming));
return;
@@ -257,8 +261,7 @@ module.exports = function(RED) {
try {
pushkeys = RED.settings.pushbullet || require(process.env.NODE_RED_HOME+"/../pushkey.js");
}
- catch(err) {
- }
+ catch(err) { }
var cred = RED.nodes.getCredentials(n.id);
// get old apikey
@@ -327,7 +330,7 @@ module.exports = function(RED) {
try {
this.deviceid = this.credentials.deviceid;
}
- catch(err) {}
+ catch(err) { }
}
if (configNode) {
diff --git a/social/pushbullet/package.json b/social/pushbullet/package.json
index c63731d4..2463fdcd 100644
--- a/social/pushbullet/package.json
+++ b/social/pushbullet/package.json
@@ -1,6 +1,6 @@
{
"name" : "node-red-node-pushbullet",
- "version" : "0.0.14",
+ "version" : "0.0.17",
"description" : "A Node-RED node to send alerts via Pushbullet",
"dependencies" : {
"pushbullet": "^2.4.0",
diff --git a/social/pushover/57-pushover.js b/social/pushover/57-pushover.js
index 65a27ca1..947528c1 100644
--- a/social/pushover/57-pushover.js
+++ b/social/pushover/57-pushover.js
@@ -103,8 +103,8 @@ module.exports = function(RED) {
if (err) { node.error(err,msg); }
else {
try {
- response = JSON.parse(response);
- if (response.status !== 1) { node.error("[57-pushover.js] Error: "+response); }
+ var responseObject = JSON.parse(response);
+ if (responseObject.status !== 1) { node.error("[57-pushover.js] Error: "+response); }
}
catch(e) {
node.error("[57-pushover.js] Error: "+response);
diff --git a/social/xmpp/92-xmpp.js b/social/xmpp/92-xmpp.js
index b625eb2e..9035dbae 100644
--- a/social/xmpp/92-xmpp.js
+++ b/social/xmpp/92-xmpp.js
@@ -155,7 +155,7 @@ module.exports = function(RED) {
}
}
else if(stanza.attrs.type === 'result'){
- // AM To-Do check for 'bind' result with our current jid
+ // To-Do check for 'bind' result with our current jid
var query = stanza.getChild('query');
if (RED.settings.verbose || LOGITALL) {that.log("result!");}
if (RED.settings.verbose || LOGITALL) {that.log(query);}
@@ -164,7 +164,6 @@ module.exports = function(RED) {
}
});
-
// We shouldn't have any errors here that the input/output nodes can't handle
// if you need to see everything though; uncomment this block
// this.client.on('error', err => {
@@ -497,6 +496,10 @@ module.exports = function(RED) {
node.error("Server doesn't exist "+xmpp.options.service,err);
node.status({fill:"red",shape:"ring",text:"bad address"});
}
+ if (err.errno === "ENOTFOUND") {
+ node.error("Server doesn't exist "+xmpp.options.service,err);
+ node.status({fill:"red",shape:"ring",text:"bad address"});
+ }
else if (err === "XMPP authentication failure") {
node.error(err,err);
node.status({fill:"red",shape:"ring",text:"XMPP authentication failure"});
diff --git a/social/xmpp/package.json b/social/xmpp/package.json
index 2225f826..2670f699 100644
--- a/social/xmpp/package.json
+++ b/social/xmpp/package.json
@@ -1,6 +1,6 @@
{
"name": "node-red-node-xmpp",
- "version": "0.2.4",
+ "version": "0.3.0",
"description": "A Node-RED node to talk to an XMPP server",
"dependencies": {
"@xmpp/client": "^0.11.1"
diff --git a/storage/mongodb/66-mongodb.html b/storage/mongodb/66-mongodb.html
index f3180d65..12f904e5 100644
--- a/storage/mongodb/66-mongodb.html
+++ b/storage/mongodb/66-mongodb.html
@@ -1,11 +1,29 @@
-
+
-
-
-
-