Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update @alcalzone/release-script-plugin-iobroker requirement from ^3.5.9 to ^3.6.0 #79

Open
wants to merge 26 commits into
base: master
Choose a base branch
from
Open

Update @alcalzone/release-script-plugin-iobroker requirement from ^3.5.9 to ^3.6.0 #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
6ec3ff1
mqtt wildcard patterns
MichaelDvP Apr 10, 2023
ecdeeb4
fix typo in qos2 resend of pubrel
MichaelDvP Apr 10, 2023
52f8d44
add log
MichaelDvP Apr 11, 2023
43f5170
test
MichaelDvP Apr 11, 2023
f9a0181
resend pubrec
MichaelDvP Apr 11, 2023
92cbe97
4 retries
MichaelDvP Apr 11, 2023
0826ed7
retries fixed, set dup
MichaelDvP Apr 11, 2023
8a0ec27
no resend of pubrec/pubrel
MichaelDvP Apr 11, 2023
1e4c9f3
test
MichaelDvP Apr 12, 2023
b1e4c36
Merge branch 'ioBroker:master' into master
MichaelDvP May 19, 2023
3891524
qos2
MichaelDvP May 31, 2023
5afeb6d
Merge branch 'master' of https://github.com/MichaelDvP/ioBroker.mqtt
MichaelDvP May 31, 2023
23da9ad
next test
MichaelDvP May 31, 2023
d1c444e
Bump @iobroker/legacy-testing from 0.1.1 to 0.3.6
dependabot[bot] Jun 1, 2023
8059273
timeout 5s, pubrec on dup
MichaelDvP Jun 1, 2023
f6da32c
logs
MichaelDvP Jun 1, 2023
c640fb4
Merge pull request #76 from MichaelDvP/dependabot/npm_and_yarn/iobrok…
MichaelDvP Jun 1, 2023
df2cfd3
Update package.json
MichaelDvP Jun 1, 2023
a0af2a0
don't show pubrec timeout
MichaelDvP Jun 1, 2023
4c7e4e8
do not store pubrec
MichaelDvP Jun 2, 2023
a7c5381
add back store
MichaelDvP Jun 2, 2023
59c4430
fix pubrec remove
MichaelDvP Jun 2, 2023
2a31fc4
next try
MichaelDvP Jun 2, 2023
31bd30f
fix
MichaelDvP Jun 2, 2023
1b6b042
no warning for missing pubrel
MichaelDvP Jun 3, 2023
badd2d6
Update @alcalzone/release-script-plugin-iobroker requirement
dependabot[bot] Aug 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
95 changes: 53 additions & 42 deletions lib/server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ function MQTTServer(adapter, states) {
cb();
cb = null;
}
}, 2000);
}, 5000);
}
if (server) {
tasks++;
Expand Down Expand Up @@ -571,28 +571,28 @@ function MQTTServer(adapter, states) {
*/
function pattern2RegEx(pattern) {
pattern = convertTopic2id(pattern, true, adapter.config.prefix, adapter.namespace);
pattern = pattern.replace(/#/g, '*');
if (pattern === '#') {
return '.*';
}
if (pattern === '+') {
return '[^.]*';
}
pattern = pattern.replace(/\$/g, '\\$');
pattern = pattern.replace(/\^/g, '\\^');

if (pattern !== '*') {
if (pattern[0] === '*' && pattern[pattern.length - 1] !== '*') {
pattern += '$';
}
if (pattern[0] !== '*' && pattern[pattern.length - 1] === '*') {
pattern = '^' + pattern;
}
if (pattern[0] === '+') {
pattern = '^[^.]*' + pattern.substring(1);
}
if (pattern[pattern.length - 1] === '+') {
pattern = pattern.substring(0, pattern.length - 1) + '[^.]*$';
}
} else {
return '.*';
if (pattern.length > 2 && (
(pattern[0] === '#' && pattern[1] !== '.') ||
(pattern[0] === '+' && pattern[1] !== '.') ||
(pattern[pattern.length - 1] === '#' && pattern[pattern.length - 2] !== '.') ||
(pattern[pattern.length - 1] === '+' && pattern[pattern.length - 2] !== '.'))) {
return '';
}
pattern = '^' + pattern + '$';
pattern = pattern.replace(/#/g, '*');
pattern = pattern.replace(/\./g, '\\.');
pattern = pattern.replace(/\\\.\*/g, '\\..*');
if (pattern[1] === '*') {
pattern = '^.' + pattern.substring(1);
}
pattern = pattern.replace(/\\\.\*/g, '(\\..*)?');
pattern = pattern.replace(/\+/g, '[^.]*');
return pattern;
}
Expand Down Expand Up @@ -860,7 +860,7 @@ function MQTTServer(adapter, states) {
}

if (adapter.config.debug) {
adapter.log.debug(`Client [${client.id}] received publish package ${JSON.stringify(packet)}`);
adapter.log.debug(`Client [${client.id}] received publish ${packet.messageId} ${JSON.stringify(packet)}`);
}

if (persistentSessions[client.id]) {
Expand All @@ -872,19 +872,21 @@ function MQTTServer(adapter, states) {
client.puback({messageId: packet.messageId});
} else if (packet.qos === 2) {
const pack = client._messages && client._messages.find(e => e.messageId === packet.messageId);
if (pack) {
if (pack && packet.dup === false) {
// duplicate message => ignore
adapter.log.info(`Client [${client.id}] Ignored duplicate message with ID: ${packet.messageId}`);
return;
} else if (pack) {
client.pubrec({messageId: packet.messageId});
return;
} else {
packet.ts = Date.now();
packet.cmd = 'pubrel';
packet.cmd = 'pubrec';
packet.count = 0;
client._messages = client._messages || [];
client._messages.push(packet);

client.pubrec({messageId: packet.messageId});
return;
// return;
}
}

Expand All @@ -899,19 +901,28 @@ function MQTTServer(adapter, states) {
}

if (adapter.config.debug) {
adapter.log.debug(`Client [${client.id}] received pubrec package ${JSON.stringify(packet)}`);
adapter.log.debug(`Client [${client.id}] received pubrec ${packet.messageId} ${JSON.stringify(packet)}`);
}

if (persistentSessions[client.id]) {
persistentSessions[client.id].lastSeen = Date.now();
}

let pos = -1;
// remove this message from queue
const frame = client._messages && client._messages.find(e => e.messageId === packet.messageId);
if (frame) {
if (client._messages) {
pos = client._messages.findIndex(e => e.messageId === packet.messageId);
}
if (pos !== -1) {
client._messages.splice(pos, 1);
packet.ts = Date.now();
packet.cmd = 'pubrel';
packet.count = 0;
client._messages = client._messages || [];
client._messages.push(packet);
client.pubrel({messageId: packet.messageId});
} else {
adapter.log.info(`Client [${client.id}] Received pubrec on ${client.id} for unknown messageId ${packet.messageId}`);
adapter.log.info(`Client [${client.id}] Received pubrec for unknown messageId ${packet.messageId}`);
}
});

Expand All @@ -923,7 +934,7 @@ function MQTTServer(adapter, states) {
}

if (adapter.config.debug) {
adapter.log.debug(`Client [${client.id}] received pubcomp package ${JSON.stringify(packet)}`);
adapter.log.debug(`Client [${client.id}] received pubcomp ${packet.messageId} ${JSON.stringify(packet)}`);
}

if (persistentSessions[client.id]) {
Expand All @@ -950,7 +961,7 @@ function MQTTServer(adapter, states) {
}

if (adapter.config.debug) {
adapter.log.debug(`Client [${client.id}] received pubrel package ${JSON.stringify(packet)}`);
adapter.log.debug(`Client [${client.id}] received pubrel ${packet.messageId} ${JSON.stringify(packet)}`);
}

if (persistentSessions[client.id]) {
Expand All @@ -959,13 +970,12 @@ function MQTTServer(adapter, states) {

// remove this message from queue
let pos = -1;
// remove this message from queue
if (client._messages) {
pos = client._messages.findIndex(e => e.messageId === packet.messageId);
}
if (pos !== -1) {
client.pubcomp({messageId: packet.messageId});
await receivedTopic(client._messages[pos], client);
// await receivedTopic(client._messages[pos], client);
client._messages.splice(pos, 1);
} else {
adapter.log.info(`Client [${client.id}] Received pubrel for unknown message ID: ${packet.messageId}`);
Expand All @@ -979,7 +989,7 @@ function MQTTServer(adapter, states) {
}

if (adapter.config.debug) {
adapter.log.debug(`Client [${client.id}] received puback package ${JSON.stringify(packet)}`);
adapter.log.debug(`Client [${client.id}] received puback ${JSON.stringify(packet)}`);
}

if (persistentSessions[client.id]) {
Expand All @@ -988,12 +998,10 @@ function MQTTServer(adapter, states) {

// remove this message from queue
let pos = -1;
// remove this message from queue
if (client._messages) {
pos = client._messages.findIndex(e => e.messageId === packet.messageId);
}
if (pos !== -1) {
adapter.log.debug(`Client [${client.id}] Received puback for ${client.id} message ID: ${packet.messageId}`);
client._messages.splice(pos, 1);
} else {
adapter.log.info(`Client [${client.id}] Received puback for unknown message ID: ${packet.messageId}`);
Expand Down Expand Up @@ -1198,7 +1206,9 @@ function MQTTServer(adapter, states) {
const message = clients[clientId]._messages[m];
if (now - message.ts >= adapter.config.retransmitInterval) {
if (message.count > adapter.config.retransmitCount) {
adapter.log.warn(`Client [${clientId}] Message ${message.messageId} deleted after ${message.count} retries`);
if (message.cmd !== 'pubrec') {
adapter.log.warn(`Client [${clientId}] ${message.cmd} Id ${message.messageId} deleted after ${message.count} retries`);
}
clients[clientId]._messages.splice(m, 1);
continue;
}
Expand All @@ -1207,14 +1217,15 @@ function MQTTServer(adapter, states) {
message.count++;
message.ts = now;
try {
adapter.log.debug(`Client [${clientId}] Resend for ${message.cmd} message topic: ${message.topic}, payload: ${message.payload}`);
if (message.cmd === 'publish') {
message.dup = true;
clients[clientId].publish(message);
} else if (message.cmd === 'pubrel') {
clients[clientId].pubrec({
messageId: message.messageId
});
adapter.log.info(`Client [${clientId}] Resend #${message.count} ${message.cmd}, message ${message.messageId}, topic: ${message.topic}, payload: ${message.payload}`);
} else if (message.cmd === 'pubrec') {
// adapter.log.debug(`${message.cmd} timeout, #${message.messageId}, topic: ${message.topic}, payload: ${message.payload}`);
} else if (message.cmd === 'pubrel') {
clients[clientId].pubrel({messageId: message.messageId});
adapter.log.info(`Client [${clientId}] Resend #${message.count} ${message.cmd}, message ${message.messageId}, topic: ${message.topic}, payload: ${message.payload}`);
}
} catch (e) {
adapter.log.warn(`Client [${clientId}] Cannot publish message: ${e}`);
Expand Down Expand Up @@ -1273,7 +1284,7 @@ function MQTTServer(adapter, states) {
config.port = 1883;
}
config.retransmitInterval = config.retransmitInterval || 2000;
config.retransmitCount = config.retransmitCount || 10;
config.retransmitCount = config.retransmitCount || 4;
if (config.storeClientsTime === undefined) {
config.storeClientsTime = 1440;
} else {
Expand Down
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@
},
"devDependencies": {
"@alcalzone/release-script": "^3.5.9",
"@alcalzone/release-script-plugin-iobroker": "^3.5.9",
"@alcalzone/release-script-plugin-iobroker": "^3.6.0",
"@alcalzone/release-script-plugin-license": "^3.5.9",
"@iobroker/adapter-dev": "^1.2.0",
"@iobroker/legacy-testing": "^0.1.1",
"eslint": "^8.39.0"
"@iobroker/legacy-testing": "^0.3.6",
"eslint": "^8.41.0"
},
"bugs": {
"url": "https://github.com/ioBroker/ioBroker.mqtt/issues"
Expand Down