@matterbridge/core 3.9.1-dev-20260614-18d1a2e → 3.9.1-dev-20260617-8de71e5
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/README.md +5 -3
- package/dist/backend.js +17 -6
- package/dist/backendExpress.d.ts +1 -1
- package/dist/backendExpress.js +12 -12
- package/dist/backendWsServer.d.ts +1 -1
- package/dist/backendWsServer.js +3 -3
- package/dist/behaviors/activatedCarbonFilterMonitoringServer.d.ts +1 -1
- package/dist/behaviors/bindingServer.d.ts +4 -4
- package/dist/behaviors/bindingServer.js +2 -2
- package/dist/behaviors/booleanStateConfigurationServer.js +2 -1
- package/dist/behaviors/doorLockServer.d.ts +1 -1
- package/dist/behaviors/doorLockServer.js +2 -2
- package/dist/behaviors/hepaFilterMonitoringServer.d.ts +1 -1
- package/dist/behaviors/identifyServer.d.ts +1 -1
- package/dist/behaviors/levelControlServer.d.ts +1 -1
- package/dist/behaviors/matterbridgeServer.d.ts +2 -2
- package/dist/behaviors/modeSelectServer.d.ts +1 -1
- package/dist/behaviors/operationalStateServer.d.ts +1 -1
- package/dist/behaviors/serviceAreaServer.d.ts +1 -1
- package/dist/behaviors/windowCoveringServer.d.ts +2 -2
- package/dist/behaviors/windowCoveringServer.js +3 -3
- package/dist/cli.js +9 -9
- package/dist/cliEmitter.js +2 -2
- package/dist/cliHistory.js +2 -2
- package/dist/clusters/export.d.ts +1 -1
- package/dist/clusters/export.js +1 -1
- package/dist/deviceManager.d.ts +1 -1
- package/dist/deviceManager.js +3 -4
- package/dist/devices/batteryStorage.js +2 -1
- package/dist/devices/cooktop.d.ts +1 -1
- package/dist/devices/cooktop.js +2 -1
- package/dist/devices/dishwasher.d.ts +1 -1
- package/dist/devices/evse.d.ts +1 -1
- package/dist/devices/evse.js +4 -2
- package/dist/devices/extractorHood.js +2 -1
- package/dist/devices/heatPump.js +7 -8
- package/dist/devices/irrigationSystem.d.ts +1 -1
- package/dist/devices/laundryDryer.d.ts +1 -1
- package/dist/devices/laundryWasher.d.ts +1 -1
- package/dist/devices/oven.d.ts +2 -2
- package/dist/devices/oven.js +4 -3
- package/dist/devices/refrigerator.d.ts +2 -2
- package/dist/devices/refrigerator.js +2 -1
- package/dist/devices/solarPower.d.ts +1 -1
- package/dist/devices/solarPower.js +2 -1
- package/dist/devices/temperatureControl.d.ts +1 -1
- package/dist/devices/waterHeater.js +2 -1
- package/dist/export.js +2 -2
- package/dist/frontend.js +39 -39
- package/dist/helpers.d.ts +1 -1
- package/dist/helpers.js +6 -4
- package/dist/jestutils/jestMatterTest.js +1 -1
- package/dist/jestutils/jestMatterbridgeTest.d.ts +2 -2
- package/dist/jestutils/jestMatterbridgeTest.js +1 -1
- package/dist/jestutils/jestSetupTest.js +13 -12
- package/dist/jestutils/matterRequest.d.ts +1 -1
- package/dist/matterNode.js +8 -6
- package/dist/matterbridge.js +11 -21
- package/dist/matterbridgeAccessoryPlatform.d.ts +1 -1
- package/dist/matterbridgeAccessoryPlatform.js +2 -2
- package/dist/matterbridgeDeviceTypes.js +2 -2
- package/dist/matterbridgeDynamicPlatform.d.ts +1 -1
- package/dist/matterbridgeDynamicPlatform.js +2 -2
- package/dist/matterbridgeEndpoint.d.ts +9 -9
- package/dist/matterbridgeEndpoint.js +9 -8
- package/dist/matterbridgeEndpointCommandHandler.d.ts +40 -40
- package/dist/matterbridgeEndpointCommandHandler.js +2 -2
- package/dist/matterbridgeEndpointHelpers.d.ts +2 -2
- package/dist/matterbridgeEndpointHelpers.js +2 -2
- package/dist/matterbridgeEndpointTypes.js +2 -3
- package/dist/matterbridgeFactory.d.ts +1 -1
- package/dist/matterbridgeFactory.js +2 -2
- package/dist/matterbridgePlatform.d.ts +1 -1
- package/dist/matterbridgePlatform.js +2 -2
- package/dist/mb_coap.js +3 -1
- package/dist/mb_health.js +3 -1
- package/dist/mb_mdns.js +10 -7
- package/dist/pluginManager.d.ts +1 -1
- package/dist/pluginManager.js +11 -6
- package/package.json +9 -9
|
@@ -1,10 +1,9 @@
|
|
|
1
|
-
if (process.argv.includes('--loader'))
|
|
2
|
-
console.log('\u001B[32m[' + new Date().toLocaleTimeString('en-US', { hour12: false, hour: '2-digit', minute: '2-digit', second: '2-digit', fractionalSecondDigits: 3 }) + '] MatterbridgePlatform loaded.\u001B[40;0m');
|
|
3
1
|
import path from 'node:path';
|
|
4
2
|
import { BridgedDeviceBasicInformation } from '@matter/types/clusters/bridged-device-basic-information';
|
|
5
3
|
import { Descriptor } from '@matter/types/clusters/descriptor';
|
|
6
4
|
import { BroadcastServer } from '@matterbridge/thread/server';
|
|
7
5
|
import { hasParameter } from '@matterbridge/utils/cli';
|
|
6
|
+
import { logModuleLoaded } from '@matterbridge/utils/loader';
|
|
8
7
|
import { isValidArray, isValidObject, isValidString } from '@matterbridge/utils/validate';
|
|
9
8
|
import { fireAndForget } from '@matterbridge/utils/wait';
|
|
10
9
|
import { CYAN, db, er, nf, wr } from 'node-ansi-logger';
|
|
@@ -12,6 +11,7 @@ import { NodeStorageManager } from 'node-persist-manager';
|
|
|
12
11
|
import { bridgedNode } from './matterbridgeDeviceTypes.js';
|
|
13
12
|
import { assertMatterbridgeEndpoint } from './matterbridgeEndpoint.js';
|
|
14
13
|
import { checkNotLatinCharacters } from './matterbridgeEndpointHelpers.js';
|
|
14
|
+
logModuleLoaded('MatterbridgePlatform');
|
|
15
15
|
const MATTERBRIDGE_PLATFORM_BRAND = Symbol('MatterbridgePlatform.brand');
|
|
16
16
|
export function isMatterbridgePlatform(value) {
|
|
17
17
|
if (!value || typeof value !== 'object')
|
package/dist/mb_coap.js
CHANGED
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import { Coap, COAP_MULTICAST_IPV4_ADDRESS, COAP_MULTICAST_IPV6_ADDRESS, COAP_MULTICAST_PORT, COAP_OPTION_URI_PATH } from '@matterbridge/dgram';
|
|
2
2
|
import { getIntParameter, getParameter, hasParameter } from '@matterbridge/utils/cli';
|
|
3
|
+
import { logModuleLoaded } from '@matterbridge/utils/loader';
|
|
4
|
+
logModuleLoaded('mb-coap');
|
|
3
5
|
export const MB_COAP_DEFAULT_REQUEST_INTERVAL_MS = 10000;
|
|
4
6
|
export const MB_COAP_DEFAULT_TIMEOUT_MS = 600000;
|
|
5
7
|
function defaultConsoleLog(message) {
|
|
@@ -147,7 +149,7 @@ export function mbCoapMain(exitFn = process.exit, log = defaultConsoleLog) {
|
|
|
147
149
|
if (options.showHelp) {
|
|
148
150
|
printMbCoapHelp(log);
|
|
149
151
|
exitFn(0);
|
|
150
|
-
return;
|
|
152
|
+
return undefined;
|
|
151
153
|
}
|
|
152
154
|
return startMbCoap(options, exitFn);
|
|
153
155
|
}
|
package/dist/mb_health.js
CHANGED
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import http from 'node:http';
|
|
2
2
|
import https from 'node:https';
|
|
3
|
+
import { logModuleLoaded } from '@matterbridge/utils/loader';
|
|
4
|
+
logModuleLoaded('mb-health');
|
|
3
5
|
const DEFAULT_MB_HEALTH_URL = 'http://localhost:8283/health';
|
|
4
6
|
export async function checkHealth(url, timeoutMs) {
|
|
5
7
|
try {
|
|
@@ -10,7 +12,7 @@ export async function checkHealth(url, timeoutMs) {
|
|
|
10
12
|
return false;
|
|
11
13
|
}
|
|
12
14
|
}
|
|
13
|
-
export function fetchHealth(url, timeoutMs) {
|
|
15
|
+
export async function fetchHealth(url, timeoutMs) {
|
|
14
16
|
return new Promise((resolve) => {
|
|
15
17
|
const parsedUrl = new URL(url);
|
|
16
18
|
const requestImpl = parsedUrl.protocol === 'https:' ? https : http;
|
package/dist/mb_mdns.js
CHANGED
|
@@ -1,8 +1,11 @@
|
|
|
1
1
|
import os from 'node:os';
|
|
2
2
|
import { DnsClass, DnsClassFlag, DnsRecordType, Mdns, MDNS_MULTICAST_IPV4_ADDRESS, MDNS_MULTICAST_IPV6_ADDRESS, MDNS_MULTICAST_PORT } from '@matterbridge/dgram';
|
|
3
3
|
import { getIntParameter, getParameter, getStringArrayParameter, hasParameter } from '@matterbridge/utils/cli';
|
|
4
|
+
import { getErrorMessage } from '@matterbridge/utils/error';
|
|
5
|
+
import { logModuleLoaded } from '@matterbridge/utils/loader';
|
|
4
6
|
import { excludedInterfaceNamePattern } from '@matterbridge/utils/network';
|
|
5
7
|
import pkg from '../package.json' with { type: 'json' };
|
|
8
|
+
logModuleLoaded('mb-mdns');
|
|
6
9
|
export const MB_MDNS_DEFAULT_INTERVAL_MS = 10000;
|
|
7
10
|
export const MB_MDNS_DEFAULT_TIMEOUT_MS = 600000;
|
|
8
11
|
export const MB_MDNS_CLEANUP_DELAY_MS = 250;
|
|
@@ -112,7 +115,7 @@ export function sendMdnsQuery(mdns, unicast = false) {
|
|
|
112
115
|
]);
|
|
113
116
|
}
|
|
114
117
|
catch (error) {
|
|
115
|
-
mdns.log.error(`Error sending mDNS query: ${error
|
|
118
|
+
mdns.log.error(`Error sending mDNS query: ${getErrorMessage(error)}`);
|
|
116
119
|
}
|
|
117
120
|
}
|
|
118
121
|
export function advertiseMatterbridgeService(mdns, ttl = 120) {
|
|
@@ -164,7 +167,7 @@ export function advertiseMatterbridgeService(mdns, ttl = 120) {
|
|
|
164
167
|
mdns.sendResponse(answers);
|
|
165
168
|
}
|
|
166
169
|
catch (error) {
|
|
167
|
-
mdns.log.error(`Error sending mDNS advertisement: ${error
|
|
170
|
+
mdns.log.error(`Error sending mDNS advertisement: ${getErrorMessage(error)}`);
|
|
168
171
|
}
|
|
169
172
|
}
|
|
170
173
|
export function startMbMdns(options, registerSignalHandlers = true) {
|
|
@@ -210,11 +213,11 @@ export function startMbMdns(options, registerSignalHandlers = true) {
|
|
|
210
213
|
mdnsIpv4?.log.info('Multicast loopback disabled for mdnsIpv4');
|
|
211
214
|
}
|
|
212
215
|
mdnsIpv4?.log.info(`mdnsIpv4 server ready on ${address.family} ${address.address}:${address.port}`);
|
|
213
|
-
if (options.advertiseIntervalMs !== undefined) {
|
|
216
|
+
if (options.advertiseIntervalMs !== undefined && mdnsIpv4) {
|
|
214
217
|
advertiseMatterbridgeService(mdnsIpv4);
|
|
215
218
|
mdnsIpv4AdvertiseInterval = setInterval(() => advertiseMatterbridgeService(mdnsIpv4), options.advertiseIntervalMs).unref();
|
|
216
219
|
}
|
|
217
|
-
if (options.queryIntervalMs !== undefined) {
|
|
220
|
+
if (options.queryIntervalMs !== undefined && mdnsIpv4) {
|
|
218
221
|
sendMdnsQuery(mdnsIpv4, options.unicast);
|
|
219
222
|
mdnsIpv4QueryInterval = setInterval(() => sendMdnsQuery(mdnsIpv4, options.unicast), options.queryIntervalMs).unref();
|
|
220
223
|
}
|
|
@@ -238,11 +241,11 @@ export function startMbMdns(options, registerSignalHandlers = true) {
|
|
|
238
241
|
mdnsIpv6?.log.info('Multicast loopback disabled for mdnsIpv6');
|
|
239
242
|
}
|
|
240
243
|
mdnsIpv6?.log.info(`mdnsIpv6 server ready on ${address.family} ${address.address}:${address.port}`);
|
|
241
|
-
if (options.advertiseIntervalMs !== undefined) {
|
|
244
|
+
if (options.advertiseIntervalMs !== undefined && mdnsIpv6) {
|
|
242
245
|
advertiseMatterbridgeService(mdnsIpv6);
|
|
243
246
|
mdnsIpv6AdvertiseInterval = setInterval(() => advertiseMatterbridgeService(mdnsIpv6), options.advertiseIntervalMs).unref();
|
|
244
247
|
}
|
|
245
|
-
if (options.queryIntervalMs !== undefined) {
|
|
248
|
+
if (options.queryIntervalMs !== undefined && mdnsIpv6) {
|
|
246
249
|
sendMdnsQuery(mdnsIpv6, options.unicast);
|
|
247
250
|
mdnsIpv6QueryInterval = setInterval(() => sendMdnsQuery(mdnsIpv6, options.unicast), options.queryIntervalMs).unref();
|
|
248
251
|
}
|
|
@@ -272,7 +275,7 @@ export function mbMdnsMain(exitFn = process.exit, log = defaultConsoleLog) {
|
|
|
272
275
|
if (options.showHelp) {
|
|
273
276
|
printMbMdnsHelp(log);
|
|
274
277
|
exitFn(0);
|
|
275
|
-
return;
|
|
278
|
+
return undefined;
|
|
276
279
|
}
|
|
277
280
|
return startMbMdns(options);
|
|
278
281
|
}
|
package/dist/pluginManager.d.ts
CHANGED
|
@@ -65,7 +65,7 @@ export declare class PluginManager extends EventEmitter<PluginManagerEvents> {
|
|
|
65
65
|
array(): Plugin[];
|
|
66
66
|
storagePluginArray(): StoragePlugin[];
|
|
67
67
|
apiPluginArray(): ApiPlugin[];
|
|
68
|
-
[Symbol.iterator]():
|
|
68
|
+
[Symbol.iterator](): IterableIterator<Plugin>;
|
|
69
69
|
forEach(callback: (plugin: Plugin) => Promise<void>): Promise<void>;
|
|
70
70
|
set logLevel(logLevel: LogLevel);
|
|
71
71
|
loadFromStorage(): Promise<StoragePlugin[]>;
|
package/dist/pluginManager.js
CHANGED
|
@@ -1,16 +1,16 @@
|
|
|
1
|
-
if (process.argv.includes('--loader'))
|
|
2
|
-
console.log('\u001B[32m[' + new Date().toLocaleTimeString('en-US', { hour12: false, hour: '2-digit', minute: '2-digit', second: '2-digit', fractionalSecondDigits: 3 }) + '] Plugin Manager loaded.\u001B[40;0m');
|
|
3
1
|
import EventEmitter from 'node:events';
|
|
4
2
|
import path from 'node:path';
|
|
5
3
|
import { BroadcastServer } from '@matterbridge/thread/server';
|
|
6
4
|
import { plg, typ } from '@matterbridge/types';
|
|
7
5
|
import { hasParameter } from '@matterbridge/utils/cli';
|
|
8
|
-
import { inspectError, logError } from '@matterbridge/utils/error';
|
|
6
|
+
import { getErrorMessage, inspectError, logError } from '@matterbridge/utils/error';
|
|
7
|
+
import { logModuleLoaded } from '@matterbridge/utils/loader';
|
|
9
8
|
import { fireAndForget } from '@matterbridge/utils/wait';
|
|
10
9
|
import { AnsiLogger, BLUE, CYAN, db, debugStringify, er, nf, nt, rs, UNDERLINE, UNDERLINEOFF, wr } from 'node-ansi-logger';
|
|
11
10
|
import { isMatterbridgeAccessoryPlatform } from './matterbridgeAccessoryPlatform.js';
|
|
12
11
|
import { isMatterbridgeDynamicPlatform } from './matterbridgeDynamicPlatform.js';
|
|
13
12
|
import { assertMatterbridgePlatform } from './matterbridgePlatform.js';
|
|
13
|
+
logModuleLoaded('Plugin Manager');
|
|
14
14
|
export class PluginManager extends EventEmitter {
|
|
15
15
|
matterbridge;
|
|
16
16
|
_plugins = new Map();
|
|
@@ -29,7 +29,6 @@ export class PluginManager extends EventEmitter {
|
|
|
29
29
|
this.log.debug('Matterbridge plugin manager started');
|
|
30
30
|
}
|
|
31
31
|
destroy() {
|
|
32
|
-
this.server.off('broadcast_message', this.msgHandler.bind(this));
|
|
33
32
|
this.server.close();
|
|
34
33
|
}
|
|
35
34
|
getDependencyNames(dependencies) {
|
|
@@ -572,6 +571,7 @@ export class PluginManager extends EventEmitter {
|
|
|
572
571
|
packageJson.repository.url.includes('http')) {
|
|
573
572
|
return packageJson.repository.url.replace('git+', '').replace('.git', '');
|
|
574
573
|
}
|
|
574
|
+
return undefined;
|
|
575
575
|
}
|
|
576
576
|
getHelp(packageJson) {
|
|
577
577
|
if (packageJson.help && typeof packageJson.help === 'string' && packageJson.help.startsWith('http')) {
|
|
@@ -587,6 +587,7 @@ export class PluginManager extends EventEmitter {
|
|
|
587
587
|
else if (packageJson.homepage && typeof packageJson.homepage === 'string' && packageJson.homepage.includes('http')) {
|
|
588
588
|
return packageJson.homepage.replace('git+', '').replace('.git', '');
|
|
589
589
|
}
|
|
590
|
+
return undefined;
|
|
590
591
|
}
|
|
591
592
|
getChangelog(packageJson) {
|
|
592
593
|
if (packageJson.changelog && typeof packageJson.changelog === 'string' && packageJson.changelog.startsWith('http')) {
|
|
@@ -602,13 +603,14 @@ export class PluginManager extends EventEmitter {
|
|
|
602
603
|
else if (packageJson.homepage && typeof packageJson.homepage === 'string' && packageJson.homepage.includes('http')) {
|
|
603
604
|
return packageJson.homepage.replace('git+', '').replace('.git', '');
|
|
604
605
|
}
|
|
606
|
+
return undefined;
|
|
605
607
|
}
|
|
606
608
|
getFunding(packageJson) {
|
|
607
609
|
const funding = packageJson.funding;
|
|
608
610
|
if (!funding)
|
|
609
611
|
return undefined;
|
|
610
612
|
if (typeof funding === 'string' && !funding.startsWith('http'))
|
|
611
|
-
return;
|
|
613
|
+
return undefined;
|
|
612
614
|
if (typeof funding === 'string' && funding.startsWith('http'))
|
|
613
615
|
return funding;
|
|
614
616
|
const fundingEntries = Array.isArray(funding) ? funding : [funding];
|
|
@@ -620,6 +622,7 @@ export class PluginManager extends EventEmitter {
|
|
|
620
622
|
return entry.url;
|
|
621
623
|
}
|
|
622
624
|
}
|
|
625
|
+
return undefined;
|
|
623
626
|
}
|
|
624
627
|
async parse(plugin) {
|
|
625
628
|
const { promises } = await import('node:fs');
|
|
@@ -1134,7 +1137,9 @@ export class PluginManager extends EventEmitter {
|
|
|
1134
1137
|
plugin.restartRequired = true;
|
|
1135
1138
|
if (plugin.platform) {
|
|
1136
1139
|
plugin.platform.config = config;
|
|
1137
|
-
plugin.platform
|
|
1140
|
+
plugin.platform
|
|
1141
|
+
.onConfigChanged(config)
|
|
1142
|
+
.catch((err) => this.log.error(`Error calling onConfigChanged for plugin ${plg}${plugin.name}${er}: ${getErrorMessage(err)}`));
|
|
1138
1143
|
}
|
|
1139
1144
|
this.log.debug(`Saved config file ${configFile} for plugin ${plg}${plugin.name}${db}`);
|
|
1140
1145
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@matterbridge/core",
|
|
3
|
-
"version": "3.9.1-dev-
|
|
3
|
+
"version": "3.9.1-dev-20260617-8de71e5",
|
|
4
4
|
"description": "Matterbridge core library",
|
|
5
5
|
"author": "https://github.com/Luligu",
|
|
6
6
|
"homepage": "https://matterbridge.io/",
|
|
@@ -129,17 +129,17 @@
|
|
|
129
129
|
"CHANGELOG.md"
|
|
130
130
|
],
|
|
131
131
|
"dependencies": {
|
|
132
|
-
"@matter/main": "0.17.
|
|
133
|
-
"@matterbridge/dgram": "3.9.1-dev-
|
|
134
|
-
"@matterbridge/thread": "3.9.1-dev-
|
|
135
|
-
"@matterbridge/types": "3.9.1-dev-
|
|
136
|
-
"@matterbridge/utils": "3.9.1-dev-
|
|
132
|
+
"@matter/main": "0.17.3",
|
|
133
|
+
"@matterbridge/dgram": "3.9.1-dev-20260617-8de71e5",
|
|
134
|
+
"@matterbridge/thread": "3.9.1-dev-20260617-8de71e5",
|
|
135
|
+
"@matterbridge/types": "3.9.1-dev-20260617-8de71e5",
|
|
136
|
+
"@matterbridge/utils": "3.9.1-dev-20260617-8de71e5",
|
|
137
137
|
"escape-html": "1.0.3",
|
|
138
138
|
"express": "5.2.1",
|
|
139
139
|
"express-rate-limit": "8.5.2",
|
|
140
|
-
"multer": "2.
|
|
141
|
-
"node-ansi-logger": "3.3.0-dev-
|
|
142
|
-
"node-persist-manager": "2.1.0-dev-
|
|
140
|
+
"multer": "2.2.0",
|
|
141
|
+
"node-ansi-logger": "3.3.0-dev-20260617-6ebcff7",
|
|
142
|
+
"node-persist-manager": "2.1.0-dev-20260617-3224082",
|
|
143
143
|
"ws": "8.21.0"
|
|
144
144
|
}
|
|
145
145
|
}
|