Node-Red
/
node-red
mirror of https://github.com/node-red/node-red.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5156 from node-red/pr_4989 

Ensure generated mqtt clientId uses only valid chars
pull/5160/head
Nick O'Leary 2025-06-06 11:50:57 +01:00 committed by GitHub
parent f9de98d88a f43d4e9465
commit 1dbce32ab5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/node_modules/@node-red/nodes/core/network/10-mqtt.js vendored
View File

@ -675,7 +675,7 @@ module.exports = function(RED) {
node.options.password = node.password;
node.options.keepalive = node.keepalive;
node.options.clean = node.cleansession;
node.options.clientId = node.clientid || 'nodered_' + RED.util.generateId();
node.options.clientId = node.clientid || 'nodered' + RED.util.generateId();
node.options.reconnectPeriod = RED.settings.mqttReconnectTime||5000;
delete node.options.protocolId; //V4+ default
delete node.options.protocolVersion; //V4 default

4
test/nodes/core/network/21-mqtt_spec.js
View File

@ -58,7 +58,7 @@ describe('MQTT Nodes', function () {
mqttBroker.should.have.property('options');
mqttBroker.options.should.have.property('clean', true);
mqttBroker.options.should.have.property('clientId');
mqttBroker.options.clientId.should.containEql('nodered_');
mqttBroker.options.clientId.should.containEql('nodered');
mqttBroker.options.should.have.property('keepalive').type("number");
mqttBroker.options.should.have.property('reconnectPeriod').type("number");
//as this is not a v5 connection, ensure v5 properties are not present
@ -894,4 +894,4 @@ function nextTopic(topic) {
return (base_topic + topic + String(topicNo));
}
//#endregion HELPERS
//#endregion HELPERS