@matterbridge/core 3.11.3 → 3.11.4-dev-20261115-16a1589
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/dist/behaviors/timeSynchronizationServer.js +1 -1
- package/dist/cli.js +1 -0
- package/dist/frontend.js +6 -0
- package/dist/matterNode.js +2 -2
- package/dist/matterNodeHelpers.d.ts +1 -0
- package/dist/matterNodeHelpers.js +11 -0
- package/dist/matterbridge.d.ts +2 -1
- package/dist/matterbridge.js +7 -3
- package/package.json +10 -10
|
@@ -131,7 +131,7 @@ export class MatterbridgeTimeSynchronizationServer extends MatterbridgeTimeSynch
|
|
|
131
131
|
}
|
|
132
132
|
for (const [index, entry] of dstOffset.entries()) {
|
|
133
133
|
const isLast = index === dstOffset.length - 1;
|
|
134
|
-
const previous =
|
|
134
|
+
const previous = dstOffset[index - 1];
|
|
135
135
|
const validUntilOk = entry.validUntil === null ? isLast : BigInt(entry.validUntil) > BigInt(entry.validStarting);
|
|
136
136
|
const orderOk = previous?.validUntil === null || previous === undefined || BigInt(entry.validStarting) >= BigInt(previous.validUntil);
|
|
137
137
|
if (!validUntilOk || !orderOk) {
|
package/dist/cli.js
CHANGED
|
@@ -195,6 +195,7 @@ function help() {
|
|
|
195
195
|
--bind [address]: bind the frontend to the given address (default all addresses)
|
|
196
196
|
--logger: set the matterbridge logger level: debug | info | notice | warn | error | fatal (default info)
|
|
197
197
|
--filelogger: enable the matterbridge file logger (matterbridge.log)
|
|
198
|
+
--loggerCache [size]: set the number of cached log entries replayed to new frontend WebSocket clients (default 200)
|
|
198
199
|
--matterlogger: set the matter.js logger level: debug | info | notice | warn | error | fatal (default info)
|
|
199
200
|
--matterfilelogger: enable the matter.js file logger (matter.log)
|
|
200
201
|
--sudo: force the use of sudo to install or update packages if the internal logic fails
|
package/dist/frontend.js
CHANGED
|
@@ -234,6 +234,12 @@ export class Frontend extends EventEmitter {
|
|
|
234
234
|
AnsiLogger.setGlobalCallback(this.wssSendLogMessage.bind(this), callbackLogLevel);
|
|
235
235
|
this.log.debug(`WebSocketServer logger global callback set to ${callbackLogLevel}`);
|
|
236
236
|
this.log.info(`WebSocketServer client "${clientIp}" connected to Matterbridge`);
|
|
237
|
+
const cache = AnsiLogger.getGlobalCache();
|
|
238
|
+
if (cache) {
|
|
239
|
+
cache.replay((entry) => {
|
|
240
|
+
this.wssSendLogMessage(entry.level, entry.time, entry.name, entry.message);
|
|
241
|
+
});
|
|
242
|
+
}
|
|
237
243
|
ws.on('message', (message) => {
|
|
238
244
|
fireAndForget(this.wsMessageHandler(ws, message), this.log, `Error handling message from WebSocket client ${clientIp}`);
|
|
239
245
|
});
|
package/dist/matterNode.js
CHANGED
|
@@ -22,7 +22,7 @@ import { NodeStorageManager } from 'node-persist-manager';
|
|
|
22
22
|
import { addVirtualDevice } from './helpers.js';
|
|
23
23
|
import { bridge } from './matterbridgeDeviceTypes.js';
|
|
24
24
|
import { setupLoggers } from './matterLogger.js';
|
|
25
|
-
import { deleteAdvertisingNode, getServerNodeData, rootCameraEndpoint, rootCameraOptions, setAdvertisingNode, toDevice } from './matterNodeHelpers.js';
|
|
25
|
+
import { deleteAdvertisingNode, getServerNodeData, rootCameraEndpoint, rootCameraOptions, setAdvertisingNode, toDevice, truncateUtf8 } from './matterNodeHelpers.js';
|
|
26
26
|
import { startMatterStorage, stopMatterStorage } from './matterStorage.js';
|
|
27
27
|
import { PluginManager } from './pluginManager.js';
|
|
28
28
|
logModuleLoaded('MatterNode');
|
|
@@ -479,7 +479,7 @@ export class MatterNode extends EventEmitter {
|
|
|
479
479
|
discriminator: validDiscriminator,
|
|
480
480
|
},
|
|
481
481
|
productDescription: {
|
|
482
|
-
name: await this.matterStorageContext.get('deviceName'),
|
|
482
|
+
name: truncateUtf8(await this.matterStorageContext.get('deviceName'), 32),
|
|
483
483
|
deviceType: DeviceTypeId(await this.matterStorageContext.get('deviceType')),
|
|
484
484
|
vendorId: VendorId(await this.matterStorageContext.get('vendorId')),
|
|
485
485
|
productId: await this.matterStorageContext.get('productId'),
|
|
@@ -24,6 +24,7 @@ export declare function getServerNodeData(serverNode: ServerNode): ApiMatter;
|
|
|
24
24
|
export declare function sanitizeFabricInformations(fabricInfo: ExposedFabricInformation[]): SanitizedExposedFabricInformation[];
|
|
25
25
|
export declare function sanitizeSessionInformation(sessions: SessionsBehavior.Session[]): SanitizedSession[];
|
|
26
26
|
export declare function getVendorIdName(vendorId: number | undefined): string;
|
|
27
|
+
export declare function truncateUtf8(value: string, maxBytes: number): string;
|
|
27
28
|
export declare function rootCameraEndpoint(): import("@matter/node").MutableEndpoint.With<import("@matter/node").EndpointType.For<{
|
|
28
29
|
readonly name: "RootNode";
|
|
29
30
|
readonly deviceType: 22;
|
|
@@ -489,6 +489,17 @@ export function getVendorIdName(vendorId) {
|
|
|
489
489
|
}
|
|
490
490
|
return vendorName;
|
|
491
491
|
}
|
|
492
|
+
export function truncateUtf8(value, maxBytes) {
|
|
493
|
+
let bytes = 0;
|
|
494
|
+
let result = '';
|
|
495
|
+
for (const character of value) {
|
|
496
|
+
bytes += Buffer.byteLength(character);
|
|
497
|
+
if (bytes > maxBytes)
|
|
498
|
+
break;
|
|
499
|
+
result += character;
|
|
500
|
+
}
|
|
501
|
+
return result;
|
|
502
|
+
}
|
|
492
503
|
export function rootCameraEndpoint() {
|
|
493
504
|
return ServerNode.RootEndpoint.with(PowerSourceServer.with(PowerSource.Feature.Wired), MatterbridgeTimeSynchronizationServer, MatterbridgeTlsCertificateManagementServer, MatterbridgeTlsClientManagementServer);
|
|
494
505
|
}
|
package/dist/matterbridge.d.ts
CHANGED
|
@@ -6,7 +6,7 @@ import { AggregatorEndpoint } from '@matter/node/endpoints/aggregator';
|
|
|
6
6
|
import { type DeviceCertification } from '@matter/protocol';
|
|
7
7
|
import { DeviceTypeId, VendorId } from '@matter/types/datatype';
|
|
8
8
|
import type { ApiSettings, BridgeMode, BridgeStatus, MaybePromise, PlatformMatterbridge, RestartMode, SharedMatterbridge, SystemInformation, VirtualMode } from '@matterbridge/types';
|
|
9
|
-
import { AnsiLogger, LogLevel } from 'node-ansi-logger';
|
|
9
|
+
import { AnsiLogger, AnsiLoggerCache, LogLevel } from 'node-ansi-logger';
|
|
10
10
|
import { type NodeStorage, NodeStorageManager } from 'node-persist-manager';
|
|
11
11
|
import { DeviceManager } from './deviceManager.js';
|
|
12
12
|
import { Frontend } from './frontend.js';
|
|
@@ -64,6 +64,7 @@ export declare class Matterbridge extends EventEmitter<MatterbridgeEvents> {
|
|
|
64
64
|
readonly log: AnsiLogger;
|
|
65
65
|
logLevel: LogLevel;
|
|
66
66
|
fileLogger: boolean;
|
|
67
|
+
loggerCache: AnsiLoggerCache;
|
|
67
68
|
readonly matterLog: AnsiLogger;
|
|
68
69
|
matterLogLevel: LogLevel;
|
|
69
70
|
matterFileLogger: boolean;
|
package/dist/matterbridge.js
CHANGED
|
@@ -24,7 +24,7 @@ import { logModuleLoaded } from '@matterbridge/utils/loader';
|
|
|
24
24
|
import { excludedInterfaceNamePattern } from '@matterbridge/utils/network';
|
|
25
25
|
import { isValidInteger, isValidNumber, isValidObject, isValidString, parseVersionString } from '@matterbridge/utils/validate';
|
|
26
26
|
import { fireAndForget, wait } from '@matterbridge/utils/wait';
|
|
27
|
-
import { AnsiLogger, BLUE, BRIGHT, CYAN, db, debugStringify, er, GREEN, nf, nt, or, RED, RESET, rs, UNDERLINE, UNDERLINEOFF, wr, zb, } from 'node-ansi-logger';
|
|
27
|
+
import { AnsiLogger, AnsiLoggerCache, BLUE, BRIGHT, CYAN, db, debugStringify, er, GREEN, nf, nt, or, RED, RESET, rs, UNDERLINE, UNDERLINEOFF, wr, zb, } from 'node-ansi-logger';
|
|
28
28
|
import { NodeStorageManager } from 'node-persist-manager';
|
|
29
29
|
import { DeviceManager } from './deviceManager.js';
|
|
30
30
|
import { Frontend } from './frontend.js';
|
|
@@ -33,7 +33,7 @@ import { bridge } from './matterbridgeDeviceTypes.js';
|
|
|
33
33
|
import { MatterbridgeEndpoint } from './matterbridgeEndpoint.js';
|
|
34
34
|
import { startController } from './matterController.js';
|
|
35
35
|
import { matterToAnsiLogLevel } from './matterLogger.js';
|
|
36
|
-
import { clearAdvertisingNodes, deleteAdvertisingNode, getServerNodeData, rootCameraEndpoint, rootCameraOptions, setAdvertisingNode } from './matterNodeHelpers.js';
|
|
36
|
+
import { clearAdvertisingNodes, deleteAdvertisingNode, getServerNodeData, rootCameraEndpoint, rootCameraOptions, setAdvertisingNode, truncateUtf8 } from './matterNodeHelpers.js';
|
|
37
37
|
import { PluginManager } from './pluginManager.js';
|
|
38
38
|
logModuleLoaded('Matterbridge');
|
|
39
39
|
export class Matterbridge extends EventEmitter {
|
|
@@ -95,6 +95,7 @@ export class Matterbridge extends EventEmitter {
|
|
|
95
95
|
});
|
|
96
96
|
logLevel = this.log.logLevel;
|
|
97
97
|
fileLogger = false;
|
|
98
|
+
loggerCache = new AnsiLoggerCache(getIntParameter('loggerCache'));
|
|
98
99
|
matterLog = new AnsiLogger({
|
|
99
100
|
logName: 'Matter',
|
|
100
101
|
logNameColor: '\x1b[34m',
|
|
@@ -445,6 +446,7 @@ export class Matterbridge extends EventEmitter {
|
|
|
445
446
|
}
|
|
446
447
|
async initialize() {
|
|
447
448
|
this.emit('initialize_started');
|
|
449
|
+
AnsiLogger.setGlobalCache(this.loggerCache);
|
|
448
450
|
if (hasParameter('service'))
|
|
449
451
|
this.restartMode = 'service';
|
|
450
452
|
if (hasParameter('docker'))
|
|
@@ -2050,8 +2052,10 @@ export class Matterbridge extends EventEmitter {
|
|
|
2050
2052
|
discriminator,
|
|
2051
2053
|
},
|
|
2052
2054
|
productDescription: {
|
|
2053
|
-
name: await storageContext.get('deviceName'),
|
|
2055
|
+
name: truncateUtf8(await storageContext.get('deviceName'), 32),
|
|
2054
2056
|
deviceType: DeviceTypeId(await storageContext.get('deviceType')),
|
|
2057
|
+
vendorId: VendorId(await storageContext.get('vendorId')),
|
|
2058
|
+
productId: await storageContext.get('productId'),
|
|
2055
2059
|
},
|
|
2056
2060
|
basicInformation: {
|
|
2057
2061
|
nodeLabel: await storageContext.get('nodeLabel'),
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@matterbridge/core",
|
|
3
|
-
"version": "3.11.
|
|
3
|
+
"version": "3.11.4-dev-20261115-16a1589",
|
|
4
4
|
"description": "Matterbridge core library",
|
|
5
5
|
"author": "https://github.com/Luligu",
|
|
6
6
|
"homepage": "https://matterbridge.io/",
|
|
@@ -136,17 +136,17 @@
|
|
|
136
136
|
},
|
|
137
137
|
"dependencies": {
|
|
138
138
|
"@matter/main": "0.18.0",
|
|
139
|
-
"@matterbridge/dgram": "3.11.
|
|
140
|
-
"@matterbridge/thread": "3.11.
|
|
141
|
-
"@matterbridge/types": "3.11.
|
|
142
|
-
"@matterbridge/utils": "3.11.
|
|
139
|
+
"@matterbridge/dgram": "3.11.4-dev-20261115-16a1589",
|
|
140
|
+
"@matterbridge/thread": "3.11.4-dev-20261115-16a1589",
|
|
141
|
+
"@matterbridge/types": "3.11.4-dev-20261115-16a1589",
|
|
142
|
+
"@matterbridge/utils": "3.11.4-dev-20261115-16a1589",
|
|
143
143
|
"escape-html": "1.0.3",
|
|
144
144
|
"express": "5.3.0",
|
|
145
|
-
"express-rate-limit": "8.7.
|
|
145
|
+
"express-rate-limit": "8.7.4",
|
|
146
146
|
"multer": "2.5.0",
|
|
147
|
-
"node-ansi-logger": "3.3.
|
|
148
|
-
"node-persist-manager": "2.1.
|
|
149
|
-
"werift": "0.
|
|
150
|
-
"ws": "8.
|
|
147
|
+
"node-ansi-logger": "3.3.2",
|
|
148
|
+
"node-persist-manager": "2.1.2",
|
|
149
|
+
"werift": "0.27.0",
|
|
150
|
+
"ws": "8.23.0"
|
|
151
151
|
}
|
|
152
152
|
}
|