1
0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00

Merge branch 'pr_1947' into dev

This commit is contained in:
Nick O'Leary 2018-10-29 21:49:43 +00:00
commit d0bf4a5329
No known key found for this signature in database
GPG Key ID: 4F2157149161A6C9
5 changed files with 42 additions and 1 deletions

View File

@ -28,6 +28,15 @@
<option value="2">2</option> <option value="2">2</option>
</select> </select>
</div> </div>
<div class="form-row">
<label for="node-input-datatype"><i class="fa fa-sign-out"></i> <span data-i18n="mqtt.label.output"></span></label>
<select id="node-input-datatype" style="width:70%;">
<option value="auto" data-i18n="mqtt.output.auto"></option>
<option value="buffer" data-i18n="mqtt.output.buffer"></option>
<option value="utf8" data-i18n="mqtt.output.string"></option>
<option value="base64" data-i18n="mqtt.output.base64"></option>
</select>
</div>
<div class="form-row"> <div class="form-row">
<label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="common.label.name"></span></label> <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="common.label.name"></span></label>
<input type="text" id="node-input-name" data-i18n="[placeholder]common.label.name"> <input type="text" id="node-input-name" data-i18n="[placeholder]common.label.name">
@ -61,6 +70,7 @@
name: {value:""}, name: {value:""},
topic: {value:"",required:true,validate: RED.validators.regex(/^(#$|(\+|[^+#]*)(\/(\+|[^+#]*))*(\/(\+|#|[^+#]*))?$)/)}, topic: {value:"",required:true,validate: RED.validators.regex(/^(#$|(\+|[^+#]*)(\/(\+|[^+#]*))*(\/(\+|#|[^+#]*))?$)/)},
qos: {value: "2"}, qos: {value: "2"},
datatype: {value:"auto",required:true},
broker: {type:"mqtt-broker", required:true} broker: {type:"mqtt-broker", required:true}
}, },
color:"#d8bfd8", color:"#d8bfd8",
@ -77,6 +87,9 @@
if (this.qos === undefined) { if (this.qos === undefined) {
$("#node-input-qos").val("2"); $("#node-input-qos").val("2");
} }
if (this.datatype === undefined) {
$("#node-input-datatype").val("auto");
}
} }
}); });
</script> </script>

View File

@ -392,13 +392,22 @@ module.exports = function(RED) {
if (!/^(#$|(\+|[^+#]*)(\/(\+|[^+#]*))*(\/(\+|#|[^+#]*))?$)/.test(this.topic)) { if (!/^(#$|(\+|[^+#]*)(\/(\+|[^+#]*))*(\/(\+|#|[^+#]*))?$)/.test(this.topic)) {
return this.warn(RED._("mqtt.errors.invalid-topic")); return this.warn(RED._("mqtt.errors.invalid-topic"));
} }
this.datatype = n.datatype || "utf8";
var node = this; var node = this;
if (this.brokerConn) { if (this.brokerConn) {
this.status({fill:"red",shape:"ring",text:"node-red:common.status.disconnected"}); this.status({fill:"red",shape:"ring",text:"node-red:common.status.disconnected"});
if (this.topic) { if (this.topic) {
node.brokerConn.register(this); node.brokerConn.register(this);
this.brokerConn.subscribe(this.topic,this.qos,function(topic,payload,packet) { this.brokerConn.subscribe(this.topic,this.qos,function(topic,payload,packet) {
if (node.datatype =="buffer") {
// payload = payload;
} else if (node.datatype =="base64") {
payload = payload.toString('base64');
} else if (node.datatype =="utf8") {
payload = payload.toString('utf8');
} else {
if (isUtf8(payload)) { payload = payload.toString(); } if (isUtf8(payload)) { payload = payload.toString(); }
}
var msg = {topic:topic,payload:payload, qos: packet.qos, retain: packet.retain}; var msg = {topic:topic,payload:payload, qos: packet.qos, retain: packet.retain};
if ((node.brokerConn.broker === "localhost")||(node.brokerConn.broker === "127.0.0.1")) { if ((node.brokerConn.broker === "localhost")||(node.brokerConn.broker === "127.0.0.1")) {
msg._topic = topic; msg._topic = topic;

View File

@ -324,6 +324,7 @@
"label": { "label": {
"broker": "Server", "broker": "Server",
"example": "e.g. localhost", "example": "e.g. localhost",
"output": "Output",
"qos": "QoS", "qos": "QoS",
"retain": "Retain", "retain": "Retain",
"clientid": "Client ID", "clientid": "Client ID",
@ -358,6 +359,12 @@
"connect-failed": "Connection failed to broker: __broker__" "connect-failed": "Connection failed to broker: __broker__"
}, },
"retain": "Retain", "retain": "Retain",
"output": {
"buffer": "a Buffer",
"string": "a String",
"base64": "a Base64 encoded string",
"auto": "auto-detect"
},
"true": "true", "true": "true",
"false": "false", "false": "false",
"tip": "Tip: Leave topic, qos or retain blank if you want to set them via msg properties.", "tip": "Tip: Leave topic, qos or retain blank if you want to set them via msg properties.",

View File

@ -323,6 +323,7 @@
"label": { "label": {
"broker": "サーバ", "broker": "サーバ",
"example": "例) localhost", "example": "例) localhost",
"output": "出力",
"qos": "QoS", "qos": "QoS",
"retain": "保持", "retain": "保持",
"clientid": "クライアント", "clientid": "クライアント",
@ -357,6 +358,11 @@
"connect-failed": "ブローカへの接続に失敗しました: __broker__" "connect-failed": "ブローカへの接続に失敗しました: __broker__"
}, },
"retain": "保持", "retain": "保持",
"output": {
"buffer": "バイナリバッファ",
"string": "文字列",
"base64": "Base64文字列"
},
"true": "する", "true": "する",
"false": "しない", "false": "しない",
"tip": "注釈: トピックやQoSをメッセージのプロパティを用いて設定する場合は、無記入にしてください。", "tip": "注釈: トピックやQoSをメッセージのプロパティを用いて設定する場合は、無記入にしてください。",

View File

@ -313,6 +313,7 @@
"label": { "label": {
"broker": "服务端", "broker": "服务端",
"example": "e.g. localhost", "example": "e.g. localhost",
"output": "输出",
"qos": "QoS", "qos": "QoS",
"clientid": "客户端ID", "clientid": "客户端ID",
"port": "端口", "port": "端口",
@ -341,6 +342,11 @@
"connect-failed": "与服务端 __broker__ 的连接失败" "connect-failed": "与服务端 __broker__ 的连接失败"
}, },
"retain": "保留", "retain": "保留",
"output": {
"buffer": "Buffer",
"string": "字符串",
"base64": "Base64编码字符串"
},
"true": "是", "true": "是",
"false": "否", "false": "否",
"tip": "提示: 若希望通过msg属性对topic(信息), qos及retain(保留)进行设置, 则将上述项留白", "tip": "提示: 若希望通过msg属性对topic(信息), qos及retain(保留)进行设置, 则将上述项留白",