matterbridge 3.4.2-dev-20251202-c41a119 → 3.4.2-dev-20251204-5a2b977
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +15 -0
- package/dist/broadcastServer.js +35 -12
- package/dist/jestutils/jestHelpers.js +11 -1
- package/dist/matterbridge.js +18 -2
- package/dist/matterbridgePlatform.js +1 -0
- package/dist/pluginManager.js +2 -0
- package/npm-shrinkwrap.json +2 -2
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -30,11 +30,25 @@ Advantages:
|
|
|
30
30
|
|
|
31
31
|
## [3.4.2] - 2025-12-??
|
|
32
32
|
|
|
33
|
+
### Race condition
|
|
34
|
+
|
|
35
|
+
We have a race condition when, after a blackout or with docker compose or with other systems that start more then one process, Matterbridge starts before other required system or network components.
|
|
36
|
+
|
|
37
|
+
Race condition can cause missing configuration or missed devices on the controller side. All Matterbridge official plugins already wait for system and network components to be ready so there is no need of delay.
|
|
38
|
+
|
|
39
|
+
To solve the race condition on blackout, use the --delay parameter. There is no delay on normal restart.
|
|
40
|
+
|
|
41
|
+
To solve the race condition on docker compose, use the --fixed_delay parameter. The start will always be delayed.
|
|
42
|
+
|
|
33
43
|
### Added
|
|
34
44
|
|
|
35
45
|
- [frontend]: Added throttle and timeout to autoScroll in the logs.
|
|
36
46
|
- [frontend]: Log filters are now applied to existing messages too.
|
|
37
47
|
- [frontend]: Added close on success to Install dialog.
|
|
48
|
+
- [BroadcastServer]: Added check for port closed.
|
|
49
|
+
- [platform]: Added isShuttingDown property to MatterbridgePlatform.
|
|
50
|
+
- [delay]: Added --delay [seconds]. It will wait to start Matterbridge for the specified delay (default 2 minutes) if the system uptime is less then 5 minutes. It is a safe switch to avoid race conditions on start after a blackout.
|
|
51
|
+
- [fixed_delay]: Added --fixed_delay [seconds]. It will wait to start Matterbridge for the specified delay (default 2 minutes). It is a safe switch to always avoid race conditions on start on docker compose. Use only if really needed cause it will always wait.
|
|
38
52
|
|
|
39
53
|
### Changed
|
|
40
54
|
|
|
@@ -45,6 +59,7 @@ Advantages:
|
|
|
45
59
|
|
|
46
60
|
- [frontend]: Fixed persistance of autoScroll.
|
|
47
61
|
- [frontend]: Fixed parameters info of Log panel in the Home page.
|
|
62
|
+
- [thread]: Bump `BroadcastServer` to v.2.0.1.
|
|
48
63
|
|
|
49
64
|
<a href="https://www.buymeacoffee.com/luligugithub"><img src="https://matterbridge.io/bmc-button.svg" alt="Buy me a coffee" width="80"></a>
|
|
50
65
|
|
package/dist/broadcastServer.js
CHANGED
|
@@ -10,6 +10,7 @@ export class BroadcastServer extends EventEmitter {
|
|
|
10
10
|
log;
|
|
11
11
|
channel;
|
|
12
12
|
broadcastChannel;
|
|
13
|
+
closed = false;
|
|
13
14
|
debug = hasParameter('debug') || hasParameter('verbose');
|
|
14
15
|
verbose = hasParameter('verbose');
|
|
15
16
|
constructor(name, log, channel = 'broadcast-channel') {
|
|
@@ -19,10 +20,29 @@ export class BroadcastServer extends EventEmitter {
|
|
|
19
20
|
this.channel = channel;
|
|
20
21
|
this.broadcastChannel = new BroadcastChannel(this.channel);
|
|
21
22
|
this.broadcastChannel.onmessage = this.broadcastMessageHandler.bind(this);
|
|
23
|
+
this.broadcastChannel.onmessageerror = this.broadcastMessageErrorHandler.bind(this);
|
|
22
24
|
}
|
|
23
25
|
close() {
|
|
24
26
|
this.broadcastChannel.onmessage = null;
|
|
27
|
+
this.broadcastChannel.onmessageerror = null;
|
|
25
28
|
this.broadcastChannel.close();
|
|
29
|
+
this.closed = true;
|
|
30
|
+
}
|
|
31
|
+
broadcastMessageHandler(event) {
|
|
32
|
+
const msg = event.data;
|
|
33
|
+
if (msg.dst === this.name || msg.dst === 'all') {
|
|
34
|
+
if (this.verbose)
|
|
35
|
+
this.log.debug(`Server ${CYAN}${this.name}${db} received broadcast message: ${debugStringify(msg)}`);
|
|
36
|
+
this.emit('broadcast_message', msg);
|
|
37
|
+
}
|
|
38
|
+
else {
|
|
39
|
+
if (this.verbose)
|
|
40
|
+
this.log.debug(`Server ${CYAN}${this.name}${db} received unrelated broadcast message: ${debugStringify(msg)}`);
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
broadcastMessageErrorHandler(event) {
|
|
44
|
+
const msg = event.data;
|
|
45
|
+
this.log.error(`Server ${CYAN}${this.name}${db} received message error: ${debugStringify(msg)}`);
|
|
26
46
|
}
|
|
27
47
|
getUniqueId() {
|
|
28
48
|
return Math.floor(Math.random() * 900000000) + 100000000;
|
|
@@ -55,19 +75,11 @@ export class BroadcastServer extends EventEmitter {
|
|
|
55
75
|
isWorkerResponseOfType(value, type) {
|
|
56
76
|
return this.isWorkerResponse(value) && value.type === type;
|
|
57
77
|
}
|
|
58
|
-
broadcastMessageHandler(event) {
|
|
59
|
-
const msg = event.data;
|
|
60
|
-
if (msg.dst === this.name || msg.dst === 'all') {
|
|
61
|
-
if (this.verbose)
|
|
62
|
-
this.log.debug(`Server ${CYAN}${this.name}${db} received broadcast message: ${debugStringify(msg)}`);
|
|
63
|
-
this.emit('broadcast_message', msg);
|
|
64
|
-
}
|
|
65
|
-
else {
|
|
66
|
-
if (this.verbose)
|
|
67
|
-
this.log.debug(`Server ${CYAN}${this.name}${db} received unrelated broadcast message: ${debugStringify(msg)}`);
|
|
68
|
-
}
|
|
69
|
-
}
|
|
70
78
|
broadcast(message) {
|
|
79
|
+
if (this.closed) {
|
|
80
|
+
this.log.error('Broadcast channel is closed');
|
|
81
|
+
return;
|
|
82
|
+
}
|
|
71
83
|
if (message.id === undefined) {
|
|
72
84
|
message.id = this.getUniqueId();
|
|
73
85
|
}
|
|
@@ -85,6 +97,10 @@ export class BroadcastServer extends EventEmitter {
|
|
|
85
97
|
}
|
|
86
98
|
}
|
|
87
99
|
request(message) {
|
|
100
|
+
if (this.closed) {
|
|
101
|
+
this.log.error('Broadcast channel is closed');
|
|
102
|
+
return;
|
|
103
|
+
}
|
|
88
104
|
if (message.id === undefined) {
|
|
89
105
|
message.id = this.getUniqueId();
|
|
90
106
|
}
|
|
@@ -106,6 +122,10 @@ export class BroadcastServer extends EventEmitter {
|
|
|
106
122
|
}
|
|
107
123
|
}
|
|
108
124
|
respond(message) {
|
|
125
|
+
if (this.closed) {
|
|
126
|
+
this.log.error('Broadcast channel is closed');
|
|
127
|
+
return;
|
|
128
|
+
}
|
|
109
129
|
if (typeof message.timestamp === 'number') {
|
|
110
130
|
message.elapsed = Date.now() - message.timestamp;
|
|
111
131
|
}
|
|
@@ -130,6 +150,9 @@ export class BroadcastServer extends EventEmitter {
|
|
|
130
150
|
}
|
|
131
151
|
}
|
|
132
152
|
async fetch(message, timeout = 250) {
|
|
153
|
+
if (this.closed) {
|
|
154
|
+
return Promise.reject(new Error('Broadcast channel is closed'));
|
|
155
|
+
}
|
|
133
156
|
if (message.id === undefined) {
|
|
134
157
|
message.id = this.getUniqueId();
|
|
135
158
|
}
|
|
@@ -14,6 +14,7 @@ import { bridge } from '../matterbridgeDeviceTypes.js';
|
|
|
14
14
|
import { PluginManager } from '../pluginManager.js';
|
|
15
15
|
import { Frontend } from '../frontend.js';
|
|
16
16
|
import { BroadcastServer } from '../broadcastServer.js';
|
|
17
|
+
import { MatterbridgeEndpoint } from '../matterbridgeEndpoint.js';
|
|
17
18
|
export const originalProcessArgv = Object.freeze([...process.argv]);
|
|
18
19
|
export const originalProcessEnv = Object.freeze({ ...process.env });
|
|
19
20
|
export let loggerLogSpy;
|
|
@@ -32,6 +33,10 @@ export let addBridgedEndpointSpy;
|
|
|
32
33
|
export let removeBridgedEndpointSpy;
|
|
33
34
|
export let removeAllBridgedEndpointsSpy;
|
|
34
35
|
export let addVirtualEndpointSpy;
|
|
36
|
+
export let setAttributeSpy;
|
|
37
|
+
export let updateAttributeSpy;
|
|
38
|
+
export let triggerEventSpy;
|
|
39
|
+
export let triggerSwitchEventSpy;
|
|
35
40
|
export let installPluginSpy;
|
|
36
41
|
export let uninstallPluginSpy;
|
|
37
42
|
export let addPluginSpy;
|
|
@@ -99,6 +104,10 @@ export async function setupTest(name, debug = false) {
|
|
|
99
104
|
removeBridgedEndpointSpy = jest.spyOn(Matterbridge.prototype, 'removeBridgedEndpoint');
|
|
100
105
|
removeAllBridgedEndpointsSpy = jest.spyOn(Matterbridge.prototype, 'removeAllBridgedEndpoints');
|
|
101
106
|
addVirtualEndpointSpy = jest.spyOn(Matterbridge.prototype, 'addVirtualEndpoint');
|
|
107
|
+
setAttributeSpy = jest.spyOn(MatterbridgeEndpoint.prototype, 'setAttribute');
|
|
108
|
+
updateAttributeSpy = jest.spyOn(MatterbridgeEndpoint.prototype, 'updateAttribute');
|
|
109
|
+
triggerEventSpy = jest.spyOn(MatterbridgeEndpoint.prototype, 'triggerEvent');
|
|
110
|
+
triggerSwitchEventSpy = jest.spyOn(MatterbridgeEndpoint.prototype, 'triggerSwitchEvent');
|
|
102
111
|
installPluginSpy = jest.spyOn(PluginManager.prototype, 'install');
|
|
103
112
|
uninstallPluginSpy = jest.spyOn(PluginManager.prototype, 'uninstall');
|
|
104
113
|
addPluginSpy = jest.spyOn(PluginManager.prototype, 'add');
|
|
@@ -243,7 +252,7 @@ export async function createMatterbridgeEnvironment(name) {
|
|
|
243
252
|
matterbridge.matterbridgePluginDirectory = path.join('jest', name, 'Matterbridge');
|
|
244
253
|
matterbridge.matterbridgeCertDirectory = path.join('jest', name, '.mattercert');
|
|
245
254
|
matterbridge.log.logLevel = "debug";
|
|
246
|
-
log = new AnsiLogger({ logName:
|
|
255
|
+
log = new AnsiLogger({ logName: name, logTimestampFormat: 4, logLevel: "debug" });
|
|
247
256
|
frontend = matterbridge.frontend;
|
|
248
257
|
plugins = matterbridge.plugins;
|
|
249
258
|
devices = matterbridge.devices;
|
|
@@ -357,6 +366,7 @@ export function createTestEnvironment(name) {
|
|
|
357
366
|
expect(name).toBeDefined();
|
|
358
367
|
expect(typeof name).toBe('string');
|
|
359
368
|
expect(name.length).toBeGreaterThanOrEqual(4);
|
|
369
|
+
log = new AnsiLogger({ logName: name, logTimestampFormat: 4, logLevel: "debug" });
|
|
360
370
|
rmSync(path.join('jest', name), { recursive: true, force: true });
|
|
361
371
|
environment = Environment.default;
|
|
362
372
|
environment.vars.set('log.level', MatterLogLevel.DEBUG);
|
package/dist/matterbridge.js
CHANGED
|
@@ -19,7 +19,6 @@ import { copyDirectory } from './utils/copyDirectory.js';
|
|
|
19
19
|
import { createDirectory } from './utils/createDirectory.js';
|
|
20
20
|
import { isValidString, parseVersionString, isValidNumber, isValidObject } from './utils/isvalid.js';
|
|
21
21
|
import { formatBytes, formatPercent, formatUptime } from './utils/format.js';
|
|
22
|
-
import { withTimeout, waiter, wait } from './utils/wait.js';
|
|
23
22
|
import { dev, MATTER_LOGGER_FILE, MATTER_STORAGE_NAME, MATTERBRIDGE_LOGGER_FILE, NODE_STORAGE_DIR, plg, typ } from './matterbridgeTypes.js';
|
|
24
23
|
import { PluginManager } from './pluginManager.js';
|
|
25
24
|
import { DeviceManager } from './deviceManager.js';
|
|
@@ -121,7 +120,6 @@ export class Matterbridge extends EventEmitter {
|
|
|
121
120
|
aggregatorUniqueId = getParameter('uniqueId');
|
|
122
121
|
advertisingNodes = new Map();
|
|
123
122
|
server;
|
|
124
|
-
debug = hasParameter('debug') || hasParameter('verbose');
|
|
125
123
|
verbose = hasParameter('verbose');
|
|
126
124
|
constructor() {
|
|
127
125
|
super();
|
|
@@ -653,6 +651,18 @@ export class Matterbridge extends EventEmitter {
|
|
|
653
651
|
this.log.info('Setting default matterbridge start mode to bridge');
|
|
654
652
|
await this.nodeContext?.set('bridgeMode', 'bridge');
|
|
655
653
|
}
|
|
654
|
+
if (hasParameter('delay') && os.uptime() <= 60 * 5) {
|
|
655
|
+
const { wait } = await import('./utils/wait.js');
|
|
656
|
+
const delay = getIntParameter('delay') || 2000;
|
|
657
|
+
this.log.warn('Delay switch found with system uptime less then 5 minutes. Waiting for ' + delay + ' seconds before starting matterbridge...');
|
|
658
|
+
await wait(delay * 1000, 'Race condition delay', true);
|
|
659
|
+
}
|
|
660
|
+
if (hasParameter('fixed_delay')) {
|
|
661
|
+
const { wait } = await import('./utils/wait.js');
|
|
662
|
+
const delay = getIntParameter('fixed_delay') || 2000;
|
|
663
|
+
this.log.warn('Fixed delay switch found. Waiting for ' + delay + ' seconds before starting matterbridge...');
|
|
664
|
+
await wait(delay * 1000, 'Fixed race condition delay', true);
|
|
665
|
+
}
|
|
656
666
|
if (hasParameter('bridge') || (!hasParameter('childbridge') && (await this.nodeContext?.get('bridgeMode', '')) === 'bridge')) {
|
|
657
667
|
this.bridgeMode = 'bridge';
|
|
658
668
|
this.log.debug(`Starting matterbridge in mode ${this.bridgeMode}`);
|
|
@@ -923,6 +933,7 @@ export class Matterbridge extends EventEmitter {
|
|
|
923
933
|
await this.cleanup('updating...', false);
|
|
924
934
|
}
|
|
925
935
|
async unregisterAndShutdownProcess(timeout = 1000) {
|
|
936
|
+
const { wait } = await import('./utils/wait.js');
|
|
926
937
|
this.log.info('Unregistering all devices and shutting down...');
|
|
927
938
|
for (const plugin of this.plugins.array()) {
|
|
928
939
|
if (plugin.error || !plugin.enabled)
|
|
@@ -985,6 +996,7 @@ export class Matterbridge extends EventEmitter {
|
|
|
985
996
|
}
|
|
986
997
|
this.log.notice(`Stopping matter server nodes in ${this.bridgeMode} mode...`);
|
|
987
998
|
if (pause > 0) {
|
|
999
|
+
const { wait } = await import('./utils/wait.js');
|
|
988
1000
|
this.log.debug(`Waiting ${pause}ms for the MessageExchange to finish...`);
|
|
989
1001
|
await wait(pause, `Waiting ${pause}ms for the MessageExchange to finish...`, false);
|
|
990
1002
|
}
|
|
@@ -1201,6 +1213,7 @@ export class Matterbridge extends EventEmitter {
|
|
|
1201
1213
|
async startChildbridge(delay = 1000) {
|
|
1202
1214
|
if (!this.matterStorageManager)
|
|
1203
1215
|
throw new Error('No storage manager initialized');
|
|
1216
|
+
const { wait } = await import('./utils/wait.js');
|
|
1204
1217
|
this.log.debug('Loading all plugins in childbridge mode...');
|
|
1205
1218
|
await this.startPlugins(true, false);
|
|
1206
1219
|
this.log.debug('Creating server nodes for DynamicPlatform plugins and starting all plugins in childbridge mode...');
|
|
@@ -1502,6 +1515,7 @@ export class Matterbridge extends EventEmitter {
|
|
|
1502
1515
|
await matterServerNode.start();
|
|
1503
1516
|
}
|
|
1504
1517
|
async stopServerNode(matterServerNode, timeout = 30000) {
|
|
1518
|
+
const { withTimeout } = await import('./utils/wait.js');
|
|
1505
1519
|
if (!matterServerNode)
|
|
1506
1520
|
return;
|
|
1507
1521
|
this.log.notice(`Closing ${matterServerNode.id} server node`);
|
|
@@ -1553,6 +1567,7 @@ export class Matterbridge extends EventEmitter {
|
|
|
1553
1567
|
}
|
|
1554
1568
|
}
|
|
1555
1569
|
async addBridgedEndpoint(pluginName, device) {
|
|
1570
|
+
const { waiter } = await import('./utils/wait.js');
|
|
1556
1571
|
const plugin = this.plugins.get(pluginName);
|
|
1557
1572
|
if (!plugin) {
|
|
1558
1573
|
this.log.error(`Error adding bridged endpoint ${dev}${device.deviceName}${er} (${zb}${device.id}${er}) plugin ${plg}${pluginName}${er} not found`);
|
|
@@ -1690,6 +1705,7 @@ export class Matterbridge extends EventEmitter {
|
|
|
1690
1705
|
this.devices.remove(device);
|
|
1691
1706
|
}
|
|
1692
1707
|
async removeAllBridgedEndpoints(pluginName, delay = 0) {
|
|
1708
|
+
const { wait } = await import('./utils/wait.js');
|
|
1693
1709
|
this.log.debug(`Removing all bridged endpoints for plugin ${plg}${pluginName}${db}${delay > 0 ? ` with delay ${delay} ms` : ''}`);
|
|
1694
1710
|
for (const device of this.devices.array().filter((device) => device.plugin === pluginName)) {
|
|
1695
1711
|
await this.removeBridgedEndpoint(pluginName, device);
|
package/dist/pluginManager.js
CHANGED
|
@@ -957,11 +957,13 @@ export class PluginManager extends EventEmitter {
|
|
|
957
957
|
}
|
|
958
958
|
this.log.info(`Shutting down plugin ${plg}${plugin.name}${nf}: ${reason}...`);
|
|
959
959
|
try {
|
|
960
|
+
plugin.platform.isShuttingDown = true;
|
|
960
961
|
await plugin.platform.onShutdown(reason);
|
|
961
962
|
plugin.platform.isReady = false;
|
|
962
963
|
plugin.platform.isLoaded = false;
|
|
963
964
|
plugin.platform.isStarted = false;
|
|
964
965
|
plugin.platform.isConfigured = false;
|
|
966
|
+
plugin.platform.isShuttingDown = false;
|
|
965
967
|
plugin.locked = undefined;
|
|
966
968
|
plugin.error = undefined;
|
|
967
969
|
plugin.loaded = undefined;
|
package/npm-shrinkwrap.json
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "matterbridge",
|
|
3
|
-
"version": "3.4.2-dev-
|
|
3
|
+
"version": "3.4.2-dev-20251204-5a2b977",
|
|
4
4
|
"lockfileVersion": 3,
|
|
5
5
|
"requires": true,
|
|
6
6
|
"packages": {
|
|
7
7
|
"": {
|
|
8
8
|
"name": "matterbridge",
|
|
9
|
-
"version": "3.4.2-dev-
|
|
9
|
+
"version": "3.4.2-dev-20251204-5a2b977",
|
|
10
10
|
"license": "Apache-2.0",
|
|
11
11
|
"dependencies": {
|
|
12
12
|
"@matter/main": "0.15.6",
|
package/package.json
CHANGED