Sends the msg.payload as an email, with a subject of msg.topic.
The default message recipient can be configured in the node, if it is left
blank it should be set using the msg.to property of the incoming message. If left blank
- you can also specify any or all of: msg.cc, msg.bcc, msg.replyTo, msg.inReplyTo, msg.references properties.
msg.cc, msg.bcc, msg.replyTo,
+ msg.inReplyTo, msg.references, msg.headers, or msg.priority properties.
You may optionally set msg.from in the payload which will override the userid
default value.
GMail users
diff --git a/social/email/locales/en-US/61-email.json b/social/email/locales/en-US/61-email.json index cca6fa1d..606580b7 100644 --- a/social/email/locales/en-US/61-email.json +++ b/social/email/locales/en-US/61-email.json @@ -60,7 +60,8 @@ "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" + "refreshtoolarge": "Refresh interval too large. Limiting to 2147483 seconds", + "invalidattachment": "Invalid attachment content. Must be String or buffer" } } } diff --git a/social/email/locales/ja/61-email.html b/social/email/locales/ja/61-email.html index d8dbfac9..7e7f64c5 100644 --- a/social/email/locales/ja/61-email.html +++ b/social/email/locales/ja/61-email.html @@ -2,7 +2,7 @@ - - - + + diff --git a/storage/sqlite/locales/en-US/sqlite.json b/storage/sqlite/locales/en-US/sqlite.json new file mode 100644 index 00000000..059f1194 --- /dev/null +++ b/storage/sqlite/locales/en-US/sqlite.json @@ -0,0 +1,20 @@ +{ + "sqlite": { + "label": { + "database": "Database", + "sqlQuery": "SQL Query", + "viaMsgTopic": "Via msg.topic", + "fixedStatement": "Fixed Statement", + "preparedStatement": "Prepared Statement", + "batchWithoutResponse": "Batch without response", + "sqlStatement": "SQL Statement", + "mode": "Mode", + "readWriteCreate": "Read-Write-Create", + "readWrite": "Read-Write", + "readOnly": "Read-Only" + }, + "tips": { + "memoryDb": "Note: Setting the database name to:memory: will create a non-persistant in memory database."
+ }
+ }
+}
diff --git a/storage/sqlite/locales/ja/sqlite.html b/storage/sqlite/locales/ja/sqlite.html
new file mode 100644
index 00000000..5c6e8da1
--- /dev/null
+++ b/storage/sqlite/locales/ja/sqlite.html
@@ -0,0 +1,26 @@
+
+
+
diff --git a/storage/sqlite/locales/ja/sqlite.json b/storage/sqlite/locales/ja/sqlite.json
new file mode 100644
index 00000000..dda91077
--- /dev/null
+++ b/storage/sqlite/locales/ja/sqlite.json
@@ -0,0 +1,20 @@
+{
+ "sqlite": {
+ "label": {
+ "database": "データベース",
+ "sqlQuery": "SQLクエリ",
+ "viaMsgTopic": "msg.topic経由",
+ "fixedStatement": "固定文",
+ "preparedStatement": "事前定義文",
+ "batchWithoutResponse": "一括(応答なし)",
+ "sqlStatement": "SQL文",
+ "mode": "モード",
+ "readWriteCreate": "読み取り-書き込み-作成",
+ "readWrite": "読み取り-書き込み",
+ "readOnly": "読み取りのみ"
+ },
+ "tips": {
+ "memoryDb": "注釈: データベース名に :memory: を設定すると、非永続的なメモリデータベースを作成します。"
+ }
+ }
+}
diff --git a/storage/sqlite/sqlite.html b/storage/sqlite/sqlite.html
index ceeca265..faca8ab7 100644
--- a/storage/sqlite/sqlite.html
+++ b/storage/sqlite/sqlite.html
@@ -1,19 +1,17 @@
-
-
-
-
-
-
-
+
+
+
+
diff --git a/utility/annotate-image/annotate.js b/utility/annotate-image/annotate.js
new file mode 100644
index 00000000..bf12fc72
--- /dev/null
+++ b/utility/annotate-image/annotate.js
@@ -0,0 +1,192 @@
+module.exports = function(RED) {
+ "use strict";
+ const pureimage = require("pureimage");
+ const Readable = require("stream").Readable;
+ const Writable = require("stream").Writable;
+ const path = require("path");
+
+ let fontLoaded = false;
+ function loadFont() {
+ if (!fontLoaded) {
+ const fnt = pureimage.registerFont(path.join(__dirname,'./SourceSansPro-Regular.ttf'),'Source Sans Pro');
+ fnt.load();
+ fontLoaded = true;
+ }
+ }
+
+ function AnnotateNode(n) {
+ RED.nodes.createNode(this,n);
+ var node = this;
+ const defaultFill = n.fill || "";
+ const defaultStroke = n.stroke || "#ffC000";
+ const defaultLineWidth = parseInt(n.lineWidth) || 5;
+ const defaultFontSize = n.fontSize || 24;
+ const defaultFontColor = n.fontColor || "#ffC000";
+ loadFont();
+
+ this.on("input", function(msg) {
+ if (Buffer.isBuffer(msg.payload)) {
+ if (msg.payload[0] !== 0xFF || msg.payload[1] !== 0xD8) {
+ node.error("Not a JPEG image",msg);
+ } else if (Array.isArray(msg.annotations) && msg.annotations.length > 0) {
+ const stream = new Readable();
+ stream.push(msg.payload);
+ stream.push(null);
+ pureimage.decodeJPEGFromStream(stream).then(img => {
+ const c = pureimage.make(img.width, img.height);
+ const ctx = c.getContext('2d');
+ ctx.drawImage(img,0,0,img.width,img.height);
+
+ ctx.lineJoin = 'bevel';
+
+ msg.annotations.forEach(function(annotation) {
+ ctx.fillStyle = annotation.fill || defaultFill;
+ ctx.strokeStyle = annotation.stroke || defaultStroke;
+ ctx.lineWidth = annotation.lineWidth || defaultLineWidth;
+ ctx.lineJoin = 'bevel';
+ let x,y,r,w,h;
+
+ if (!annotation.type && annotation.bbox) {
+ annotation.type = 'rect';
+ }
+
+ switch(annotation.type) {
+ case 'rect':
+ if (annotation.bbox) {
+ x = annotation.bbox[0]
+ y = annotation.bbox[1]
+ w = annotation.bbox[2]
+ h = annotation.bbox[3]
+ } else {
+ x = annotation.x
+ y = annotation.y
+ w = annotation.w
+ h = annotation.h
+ }
+
+ if (x < 0) {
+ w += x;
+ x = 0;
+ }
+ if (y < 0) {
+ h += y;
+ y = 0;
+ }
+ ctx.beginPath();
+ ctx.lineWidth = annotation.lineWidth || defaultLineWidth;
+ ctx.rect(x,y,w,h);
+ ctx.closePath();
+ ctx.stroke();
+
+ if (annotation.label) {
+ ctx.font = `${annotation.fontSize || defaultFontSize}pt 'Source Sans Pro'`;
+ ctx.fillStyle = annotation.fontColor || defaultFontColor;
+ ctx.textBaseline = "top";
+ ctx.textAlign = "left";
+ //set offset value so txt is above or below image
+ if (annotation.labelLocation) {
+ if (annotation.labelLocation === "top") {
+ y = y - (20+((defaultLineWidth*0.5)+(Number(defaultFontSize))));
+ if (y < 0)
+ {
+ y = 0;
+ }
+ }
+ else if (annotation.labelLocation === "bottom") {
+ y = y + (10+h+(((defaultLineWidth*0.5)+(Number(defaultFontSize)))));
+ ctx.textBaseline = "bottom";
+
+ }
+ }
+ //if not user defined make best guess for top or bottom based on location
+ else {
+ //not enought room above imagebox, put label on the bottom
+ if (y < 0 + (20+((defaultLineWidth*0.5)+(Number(defaultFontSize))))) {
+ y = y + (10+h+(((defaultLineWidth*0.5)+(Number(defaultFontSize)))));
+ ctx.textBaseline = "bottom";
+ }
+ //else put the label on the top
+ else {
+ y = y - (20+((defaultLineWidth*0.5)+(Number(defaultFontSize))));
+ if (y < 0) {
+ y = 0;
+ }
+ }
+ }
+
+
+ ctx.fillText(annotation.label, x,y);
+ }
+ break;
+ case 'circle':
+ if (annotation.bbox) {
+ x = annotation.bbox[0] + annotation.bbox[2]/2
+ y = annotation.bbox[1] + annotation.bbox[3]/2
+ r = Math.min(annotation.bbox[2],annotation.bbox[3])/2;
+ } else {
+ x = annotation.x
+ y = annotation.y
+ r = annotation.r;
+ }
+ ctx.beginPath();
+ ctx.lineWidth = annotation.lineWidth || defaultLineWidth;
+ ctx.arc(x,y,r,0,Math.PI*2);
+ ctx.closePath();
+ ctx.stroke();
+ if (annotation.label) {
+ ctx.font = `${annotation.fontSize || defaultFontSize}pt 'Source Sans Pro'`;
+ ctx.fillStyle = annotation.fontColor || defaultFontColor;
+ ctx.textBaseline = "middle";
+ ctx.textAlign = "center";
+ ctx.fillText(annotation.label, x+2,y)
+ }
+ break;
+ }
+ });
+ const bufferOutput = getWritableBuffer();
+ pureimage.encodeJPEGToStream(c,bufferOutput.stream,90).then(() => {
+ msg.payload = bufferOutput.getBuffer();
+ node.send(msg);
+ })
+ }).catch(err => {
+ node.error(err,msg);
+ })
+ } else {
+ // No annotations to make - send the message on
+ node.send(msg);
+ }
+ } else {
+ node.error("Payload not a Buffer",msg)
+ }
+ return msg;
+ });
+ }
+ RED.nodes.registerType("annotate-image",AnnotateNode);
+
+
+
+ function getWritableBuffer() {
+ var currentSize = 0;
+ var buffer = null;
+ const stream = new Writable({
+ write(chunk, encoding, callback) {
+ if (!buffer) {
+ buffer = Buffer.from(chunk);
+ } else {
+ var newBuffer = Buffer.allocUnsafe(currentSize + chunk.length);
+ buffer.copy(newBuffer);
+ chunk.copy(newBuffer,currentSize);
+ buffer = newBuffer;
+ }
+ currentSize += chunk.length
+ callback();
+ }
+ });
+ return {
+ stream: stream,
+ getBuffer: function() {
+ return buffer;
+ }
+ }
+ }
+}
diff --git a/utility/annotate-image/package.json b/utility/annotate-image/package.json
new file mode 100644
index 00000000..8b3564e4
--- /dev/null
+++ b/utility/annotate-image/package.json
@@ -0,0 +1,26 @@
+{
+ "name": "node-red-node-annotate-image",
+ "version": "0.1.1",
+ "description": "A Node-RED node that can annotate an image",
+ "dependencies": {
+ "pureimage": "^0.2.5"
+ },
+ "repository": {
+ "type": "git",
+ "url": "https://github.com/node-red/node-red-nodes/tree/master/utility/iamge-annotate"
+ },
+ "license": "Apache-2.0",
+ "keywords": [
+ "node-red"
+ ],
+ "node-red": {
+ "nodes": {
+ "annotate": "annotate.js"
+ }
+ },
+ "contributors": [
+ {
+ "name": "Nick O'Leary"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/utility/exif/94-exif.html b/utility/exif/94-exif.html
index 3b019849..3f7d99ac 100644
--- a/utility/exif/94-exif.html
+++ b/utility/exif/94-exif.html
@@ -1,17 +1,31 @@
-
-
diff --git a/utility/exif/94-exif.js b/utility/exif/94-exif.js
index 93ba0b3b..ff7e07e1 100644
--- a/utility/exif/94-exif.js
+++ b/utility/exif/94-exif.js
@@ -1,7 +1,6 @@
module.exports = function(RED) {
"use strict";
- var ExifImage = require('exif').ExifImage;
function convertDegreesMinutesSecondsToDecimals(degrees, minutes, seconds) {
var result;
@@ -11,7 +10,11 @@ module.exports = function(RED) {
function ExifNode(n) {
RED.nodes.createNode(this,n);
+ this.mode = n.mode || "normal";
+ if (this.mode === "worldmap") { this.property = "payload.content"; }
+ else { this.property = n.property || "payload"; }
var node = this;
+ var ExifImage = require('exif').ExifImage;
/***
* Extracts GPS location information from Exif data. If enough information is
@@ -20,7 +23,7 @@ module.exports = function(RED) {
* Assumes that the msg object will always have exifData available as msg.exif.
* Assume that the GPS data saved into Exif provides a valid value
*/
- function addMsgLocationDataFromExifGPSData(msg) {
+ function addMsgLocationDataFromExifGPSData(msg,val) {
var gpsData = msg.exif.gps; // declaring variable purely to make checks more readable
if (gpsData.GPSAltitude) {
/* istanbul ignore else */
@@ -31,14 +34,12 @@ module.exports = function(RED) {
// The data provided in Exif is in degrees, minutes, seconds, this is to be converted into a single floating point degree
if (gpsData.GPSLatitude.length === 3) { // OK to convert latitude
if (gpsData.GPSLongitude.length === 3) { // OK to convert longitude
-
var latitude = convertDegreesMinutesSecondsToDecimals(gpsData.GPSLatitude[0], gpsData.GPSLatitude[1], gpsData.GPSLatitude[2]);
latitude = Math.round(latitude * 100000)/100000; // 5dp is approx 1m resolution...
// (N)orth means positive latitude, (S)outh means negative latitude
if (gpsData.GPSLatitudeRef.toString() === 'S' || gpsData.GPSLatitudeRef.toString() === 's') {
latitude = latitude * -1;
}
-
var longitude = convertDegreesMinutesSecondsToDecimals(gpsData.GPSLongitude[0], gpsData.GPSLongitude[1], gpsData.GPSLongitude[2]);
longitude = Math.round(longitude * 100000)/100000; // 5dp is approx 1m resolution...
// (E)ast means positive longitude, (W)est means negative longitude
@@ -49,7 +50,6 @@ module.exports = function(RED) {
if (!msg.location) { msg.location = {}; }
msg.location.lat = latitude;
msg.location.lon = longitude;
- return;
}
else {
node.log("Invalid longitude data, no location information has been added to the message.");
@@ -62,21 +62,49 @@ module.exports = function(RED) {
else {
node.log("The location of this image cannot be determined safely so no location information has been added to the message.");
}
+ msg.location.arc = {
+ ranges: [500,1000,2000],
+ pan: gpsData.GPSImgDirection,
+ fov: (2 * Math.atan(36 / (2 * msg.exif.exif.FocalLengthIn35mmFormat)) * 180 / Math.PI),
+ color: '#910000'
+ }
+ msg.location.icon = "fa-camera";
+ var na;
+ if (val.hasOwnProperty("name")) { na = val.name; }
+ else if (msg.hasOwnProperty("filename")) { na = msg.filename.split('/').pop(); }
+ else { na = msg.exif.image.Make+"_"+msg.exif.image.ModifyDate; }
+ msg.location.name = na;
+ msg.location.layer = "Images";
+ msg.location.popup = '
'
}
this.on("input", function(msg) {
+ if (node.mode === "worldmap" && Buffer.isBuffer(msg.payload)) { node.property = "payload"; }
+ else if (node.mode === "worldmap" && (msg.payload.action !== "file" || msg.payload.type.indexOf("image") === -1)) { return; } // in case worldmap-in not filtered.
try {
- if (msg.payload) {
- if (Buffer.isBuffer(msg.payload)) {
- new ExifImage({ image : msg.payload }, function (error, exifData) {
+ var value = RED.util.getMessageProperty(msg,node.property);
+ if (value !== undefined) {
+ if (typeof value === "string") { // it must be a base64 encoded inline image type
+ if (value.indexOf('data:image') !== -1) {
+ value = new Buffer.from(value.replace(/^data:image\/[a-z]+;base64,/, ""), 'base64');
+ }
+ }
+ if (Buffer.isBuffer(value)) { // or a proper jpg buffer
+ new ExifImage({ image:value }, function (error, exifData) {
if (error) {
- node.log(error.toString());
+ if (node.mode !== "worldmap") {
+ node.log(error.toString());
+ }
+ else {
+ msg.location = {name:msg.payload.name, lat:msg.payload.lat, lon:msg.payload.lon, layer:"Images", icon:"fa-camera", draggable:true};
+ msg.location.popup = ''; + } } else { if (exifData) { msg.exif = exifData; if ((exifData.hasOwnProperty("gps")) && (Object.keys(exifData.gps).length !== 0)) { - addMsgLocationDataFromExifGPSData(msg); + addMsgLocationDataFromExifGPSData(msg,value); } //else { node.log("The incoming image did not contain Exif GPS data."); } } @@ -84,6 +112,10 @@ module.exports = function(RED) { node.warn("The incoming image did not contain any Exif data, nothing to do."); } } + if (node.mode === "worldmap") { + msg.payload = msg.location; + delete msg.location; + } node.send(msg); }); } @@ -93,7 +125,7 @@ module.exports = function(RED) { } } else { - node.error("No payload received, the Exif node cannot proceed, no messages sent.",msg); + node.warn("No input received, the Exif node cannot proceed, no messages sent.",msg); return; } } diff --git a/utility/exif/package.json b/utility/exif/package.json index fec3db6c..89c587d5 100644 --- a/utility/exif/package.json +++ b/utility/exif/package.json @@ -1,23 +1,30 @@ { - "name" : "node-red-node-exif", - "version" : "0.0.7", - "description" : "A Node-RED node that extracts Exif information from JPEG image buffers.", - "dependencies" : { - "exif": "0.4.0" + "name": "node-red-node-exif", + "version": "0.2.1", + "description": "A Node-RED node that extracts Exif information from JPEG image buffers.", + "dependencies": { + "exif": "^0.6.0" }, - "repository" : { - "type":"git", - "url":"https://github.com/node-red/node-red-nodes/tree/master/utility/exif" + "repository": { + "type": "git", + "url": "https://github.com/node-red/node-red-nodes/tree/master/utility/exif" }, "license": "Apache-2.0", - "keywords": [ "node-red", "exif"], - "node-red" : { - "nodes" : { + "keywords": [ + "node-red", + "exif" + ], + "node-red": { + "nodes": { "exif": "94-exif.js" } }, "contributors": [ - {"name": "Dave Conway-Jones"}, - {"name": "Zoltan Balogh"} + { + "name": "Dave Conway-Jones" + }, + { + "name": "Zoltan Balogh" + } ] }