@matterbridge/core 3.11.2 → 3.11.3-dev-20261109-ca46ffb
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/backend.d.ts +4 -2
- package/dist/backend.js +13 -5
- package/dist/backendExpress.d.ts +0 -1
- package/dist/backendExpress.js +19 -9
- package/dist/backendWsServer.d.ts +2 -1
- package/dist/backendWsServer.js +124 -6
- package/dist/behaviors/export.d.ts +3 -0
- package/dist/behaviors/export.js +3 -0
- package/dist/behaviors/timeSynchronizationServer.d.ts +34 -0
- package/dist/behaviors/timeSynchronizationServer.js +202 -0
- package/dist/behaviors/tlsCertificateManagementServer.d.ts +58 -0
- package/dist/behaviors/tlsCertificateManagementServer.js +352 -0
- package/dist/behaviors/tlsClientManagementServer.d.ts +21 -0
- package/dist/behaviors/tlsClientManagementServer.js +110 -0
- package/dist/behaviors/windowCoveringServer.d.ts +63 -0
- package/dist/behaviors/windowCoveringServer.js +3 -0
- package/dist/cli.js +1 -1
- package/dist/deviceManager.d.ts +2 -4
- package/dist/deviceManager.js +7 -24
- package/dist/frontend.d.ts +2 -3
- package/dist/frontend.js +81 -90
- package/dist/matterNode.d.ts +4 -1
- package/dist/matterNode.js +62 -24
- package/dist/matterNodeHelpers.d.ts +104 -2
- package/dist/matterNodeHelpers.js +45 -1
- package/dist/matterbridge.js +15 -19
- package/dist/matterbridgeEndpoint.js +5 -63
- package/dist/matterbridgeEndpointCommandHandler.d.ts +0 -25
- package/dist/matterbridgeEndpointHelpers.d.ts +5 -0
- package/dist/matterbridgeEndpointHelpers.js +82 -3
- package/dist/matterbridgePlatform.js +52 -0
- package/dist/pluginManager.js +24 -1
- package/package.json +6 -6
package/dist/deviceManager.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { Device } from '@matterbridge/types';
|
|
2
2
|
import { LogLevel } from 'node-ansi-logger';
|
|
3
3
|
import type { MatterbridgeEndpoint } from './matterbridgeEndpoint.js';
|
|
4
4
|
export declare class DeviceManager {
|
|
@@ -17,10 +17,8 @@ export declare class DeviceManager {
|
|
|
17
17
|
set(device: MatterbridgeEndpoint): MatterbridgeEndpoint;
|
|
18
18
|
remove(device: MatterbridgeEndpoint): boolean;
|
|
19
19
|
clear(): void;
|
|
20
|
-
private toBaseDevice;
|
|
21
20
|
array(): MatterbridgeEndpoint[];
|
|
22
|
-
baseArray(pluginName?: string):
|
|
23
|
-
apiDeviceArray(pluginName?: string, extended?: boolean): ApiDevice[];
|
|
21
|
+
baseArray(pluginName?: string): Device[];
|
|
24
22
|
[Symbol.iterator](): IterableIterator<MatterbridgeEndpoint>;
|
|
25
23
|
forEach(callback: (device: MatterbridgeEndpoint) => Promise<void>): Promise<void>;
|
|
26
24
|
set logLevel(logLevel: LogLevel);
|
package/dist/deviceManager.js
CHANGED
|
@@ -3,7 +3,7 @@ import { dev } from '@matterbridge/types';
|
|
|
3
3
|
import { hasParameter } from '@matterbridge/utils/cli';
|
|
4
4
|
import { logModuleLoaded } from '@matterbridge/utils/loader';
|
|
5
5
|
import { AnsiLogger, BLUE, CYAN, db, debugStringify, er } from 'node-ansi-logger';
|
|
6
|
-
import {
|
|
6
|
+
import { toDevice } from './matterNodeHelpers.js';
|
|
7
7
|
logModuleLoaded('Device Manager');
|
|
8
8
|
export class DeviceManager {
|
|
9
9
|
_devices = new Map();
|
|
@@ -45,34 +45,31 @@ export class DeviceManager {
|
|
|
45
45
|
case 'devices_get':
|
|
46
46
|
{
|
|
47
47
|
const endpoint = this.get(msg.params.uniqueId);
|
|
48
|
-
this.server.respond({ ...msg, result: { device: endpoint ?
|
|
48
|
+
this.server.respond({ ...msg, result: { device: endpoint ? toDevice(endpoint) : undefined } });
|
|
49
49
|
}
|
|
50
50
|
break;
|
|
51
51
|
case 'devices_set':
|
|
52
52
|
{
|
|
53
53
|
const device = msg.params.device.uniqueId ? this._devices.get(msg.params.device.uniqueId) : undefined;
|
|
54
54
|
if (device) {
|
|
55
|
-
Object.assign(device, Object.fromEntries(Object.entries(
|
|
55
|
+
Object.assign(device, Object.fromEntries(Object.entries(toDevice(msg.params.device)).filter(([, value]) => value !== undefined)));
|
|
56
56
|
this.server.respond({ ...msg, result: { device: device } });
|
|
57
57
|
}
|
|
58
58
|
else {
|
|
59
|
-
this.server.respond({ ...msg, result: { device: this.set(
|
|
59
|
+
this.server.respond({ ...msg, result: { device: this.set(toDevice(msg.params.device)) } });
|
|
60
60
|
}
|
|
61
61
|
}
|
|
62
62
|
break;
|
|
63
63
|
case 'devices_remove':
|
|
64
|
-
this.server.respond({ ...msg, result: { success: this.remove(
|
|
64
|
+
this.server.respond({ ...msg, result: { success: this.remove(toDevice(msg.params.device)) } });
|
|
65
65
|
break;
|
|
66
66
|
case 'devices_clear':
|
|
67
67
|
this.clear();
|
|
68
68
|
this.server.respond({ ...msg, result: { success: true } });
|
|
69
69
|
break;
|
|
70
|
-
case '
|
|
70
|
+
case 'devices_array':
|
|
71
71
|
this.server.respond({ ...msg, result: { devices: this.baseArray(msg.params.pluginName) } });
|
|
72
72
|
break;
|
|
73
|
-
case 'devices_apidevicearray':
|
|
74
|
-
this.server.respond({ ...msg, result: { devices: this.apiDeviceArray(msg.params.pluginName, msg.params.extended) } });
|
|
75
|
-
break;
|
|
76
73
|
default:
|
|
77
74
|
if (this.verbose)
|
|
78
75
|
this.log.debug(`Unknown broadcast message ${CYAN}${msg.type}${db} from ${CYAN}${msg.src}${db}`);
|
|
@@ -109,9 +106,6 @@ export class DeviceManager {
|
|
|
109
106
|
clear() {
|
|
110
107
|
this._devices.clear();
|
|
111
108
|
}
|
|
112
|
-
toBaseDevice(device) {
|
|
113
|
-
return toBaseDevice(device);
|
|
114
|
-
}
|
|
115
109
|
array() {
|
|
116
110
|
return Array.from(this._devices.values());
|
|
117
111
|
}
|
|
@@ -120,18 +114,7 @@ export class DeviceManager {
|
|
|
120
114
|
for (const device of Array.from(this._devices.values())) {
|
|
121
115
|
if (pluginName && pluginName !== device.plugin)
|
|
122
116
|
continue;
|
|
123
|
-
devices.push(
|
|
124
|
-
}
|
|
125
|
-
return devices;
|
|
126
|
-
}
|
|
127
|
-
apiDeviceArray(pluginName, extended) {
|
|
128
|
-
const devices = [];
|
|
129
|
-
for (const device of this._devices.values()) {
|
|
130
|
-
if (pluginName && pluginName !== device.plugin)
|
|
131
|
-
continue;
|
|
132
|
-
const apiDevice = toApiDevice(device, extended);
|
|
133
|
-
if (apiDevice)
|
|
134
|
-
devices.push(apiDevice);
|
|
117
|
+
devices.push(toDevice(device));
|
|
135
118
|
}
|
|
136
119
|
return devices;
|
|
137
120
|
}
|
package/dist/frontend.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import EventEmitter from 'node:events';
|
|
2
|
-
import type { ApiClusters,
|
|
2
|
+
import type { ApiClusters, ApiMatter, ArchiveCommand, BridgeStatus, PluginStatusUpdate, RefreshRequiredChanged, WsMessageBroadcast } from '@matterbridge/types';
|
|
3
3
|
import { LogLevel } from 'node-ansi-logger';
|
|
4
4
|
import type { Matterbridge } from './matterbridge.js';
|
|
5
5
|
interface FrontendEvents {
|
|
@@ -34,7 +34,6 @@ export declare class Frontend extends EventEmitter<FrontendEvents> {
|
|
|
34
34
|
private validateReq;
|
|
35
35
|
start(port?: number): Promise<void>;
|
|
36
36
|
stop(): Promise<void>;
|
|
37
|
-
getApiDevices(pluginName?: string, extended?: boolean): ApiDevice[];
|
|
38
37
|
getApiCluster(pluginName: string, endpointNumber: number, serialNumber: string, uniqueId: string): ApiClusters | undefined;
|
|
39
38
|
generateDiagnostic(): Promise<void>;
|
|
40
39
|
private wsMessageHandler;
|
|
@@ -54,6 +53,6 @@ export declare class Frontend extends EventEmitter<FrontendEvents> {
|
|
|
54
53
|
wssSendAttributeChangedMessage(plugin: string, serialNumber: string, uniqueId: string, number: number, id: string, cluster: string, attribute: string, value: number | string | boolean | null): void;
|
|
55
54
|
wssBroadcastMessage(msg: WsMessageBroadcast): void;
|
|
56
55
|
spawn(command: 'install' | 'uninstall', packageName: string): void;
|
|
57
|
-
zip(command:
|
|
56
|
+
zip(command: ArchiveCommand, archivePath: string, sourcePaths: string[], destinationPath: string, archiveNames?: string[]): void;
|
|
58
57
|
}
|
|
59
58
|
export {};
|
package/dist/frontend.js
CHANGED
|
@@ -18,7 +18,7 @@ import { fireAndForget, withTimeout } from '@matterbridge/utils/wait';
|
|
|
18
18
|
import { AnsiLogger, bgHex, CYAN, db, debugStringify, er, GREEN, nf, nt, rs, UNDERLINE, UNDERLINEOFF, wr, YELLOW } from 'node-ansi-logger';
|
|
19
19
|
import { generateHistoryPage } from './cliHistory.js';
|
|
20
20
|
import { matterToAnsiLogLevel } from './matterLogger.js';
|
|
21
|
-
import { deleteAdvertisingNode,
|
|
21
|
+
import { deleteAdvertisingNode, getServerNodeData, setAdvertisingNode, toApiClusters } from './matterNodeHelpers.js';
|
|
22
22
|
logModuleLoaded('Frontend');
|
|
23
23
|
function sendDownloadError(res, error, message) {
|
|
24
24
|
if (error.code === 'ECONNABORTED' || res.headersSent)
|
|
@@ -541,11 +541,17 @@ export class Frontend extends EventEmitter {
|
|
|
541
541
|
res.status(500).send('Error fetching the plugins.');
|
|
542
542
|
}
|
|
543
543
|
});
|
|
544
|
-
this.expressApp.get('/api/devices', (req, res) => {
|
|
544
|
+
this.expressApp.get('/api/devices', async (req, res) => {
|
|
545
545
|
this.log.debug('The frontend sent /api/devices');
|
|
546
546
|
if (!this.validateReq(req, res))
|
|
547
547
|
return;
|
|
548
|
-
|
|
548
|
+
try {
|
|
549
|
+
res.json((await this.server.fetch({ type: 'devices_array', src: this.server.name, dst: 'devices', params: {} }, this.serverFetchTimeout)).result.devices);
|
|
550
|
+
}
|
|
551
|
+
catch (error) {
|
|
552
|
+
logError(this.log, 'Error in /api/devices fetching the devices from the device manager', error);
|
|
553
|
+
res.status(500).send('Error fetching the devices.');
|
|
554
|
+
}
|
|
549
555
|
});
|
|
550
556
|
this.expressApp.get('/api/view-mblog', async (req, res) => {
|
|
551
557
|
this.log.debug('The frontend sent /api/view-mblog');
|
|
@@ -668,8 +674,8 @@ export class Frontend extends EventEmitter {
|
|
|
668
674
|
}
|
|
669
675
|
});
|
|
670
676
|
});
|
|
671
|
-
this.expressApp.get('/api/
|
|
672
|
-
this.log.debug('The frontend sent /api/
|
|
677
|
+
this.expressApp.get('/api/view-history', async (req, res) => {
|
|
678
|
+
this.log.debug('The frontend sent /api/view-history');
|
|
673
679
|
if (!this.validateReq(req, res))
|
|
674
680
|
return;
|
|
675
681
|
try {
|
|
@@ -679,12 +685,12 @@ export class Frontend extends EventEmitter {
|
|
|
679
685
|
res.send(data);
|
|
680
686
|
}
|
|
681
687
|
catch (error) {
|
|
682
|
-
logError(this.log, `Error in /api/
|
|
688
|
+
logError(this.log, `Error in /api/view-history reading history file ${MATTERBRIDGE_HISTORY_FILE}`, error);
|
|
683
689
|
res.status(500).send('Error reading history file.');
|
|
684
690
|
}
|
|
685
691
|
});
|
|
686
|
-
this.expressApp.get('/api/
|
|
687
|
-
this.log.debug(`The frontend sent /api/
|
|
692
|
+
this.expressApp.get('/api/download-history', async (req, res) => {
|
|
693
|
+
this.log.debug(`The frontend sent /api/download-history`);
|
|
688
694
|
if (!this.validateReq(req, res))
|
|
689
695
|
return;
|
|
690
696
|
try {
|
|
@@ -695,7 +701,7 @@ export class Frontend extends EventEmitter {
|
|
|
695
701
|
res.type('text/html; charset=utf-8');
|
|
696
702
|
res.download(path.join(os.tmpdir(), MATTERBRIDGE_HISTORY_FILE), MATTERBRIDGE_HISTORY_FILE, (error) => {
|
|
697
703
|
if (error) {
|
|
698
|
-
logError(this.log, `Error in /api/
|
|
704
|
+
logError(this.log, `Error in /api/download-history downloading history file ${MATTERBRIDGE_HISTORY_FILE}`, error);
|
|
699
705
|
sendDownloadError(res, error, 'Error downloading history file');
|
|
700
706
|
}
|
|
701
707
|
else {
|
|
@@ -704,7 +710,7 @@ export class Frontend extends EventEmitter {
|
|
|
704
710
|
});
|
|
705
711
|
}
|
|
706
712
|
catch (error) {
|
|
707
|
-
logError(this.log, `Error in /api/
|
|
713
|
+
logError(this.log, `Error in /api/download-history reading history file ${MATTERBRIDGE_HISTORY_FILE}`, error);
|
|
708
714
|
res.status(500).send('Error reading history file.');
|
|
709
715
|
}
|
|
710
716
|
});
|
|
@@ -932,34 +938,6 @@ export class Frontend extends EventEmitter {
|
|
|
932
938
|
}
|
|
933
939
|
this.log.debug('Frontend stopped successfully');
|
|
934
940
|
}
|
|
935
|
-
getApiDevices(pluginName, extended = false) {
|
|
936
|
-
if (this.matterbridge.hasCleanupStarted)
|
|
937
|
-
return [];
|
|
938
|
-
const devices = [];
|
|
939
|
-
for (const device of this.matterbridge.devices.array()) {
|
|
940
|
-
if (pluginName && pluginName !== device.plugin)
|
|
941
|
-
continue;
|
|
942
|
-
if (!device.plugin || !device.deviceType || !device.name || !device.deviceName || !device.serialNumber || !device.uniqueId || !device.lifecycle.isReady)
|
|
943
|
-
continue;
|
|
944
|
-
devices.push({
|
|
945
|
-
plugin: device.plugin,
|
|
946
|
-
type: device.name + ' (0x' + device.deviceType.toString(16).padStart(4, '0') + ')',
|
|
947
|
-
number: device.number,
|
|
948
|
-
id: device.id,
|
|
949
|
-
deviceName: device.deviceName,
|
|
950
|
-
serialNumber: device.serialNumber,
|
|
951
|
-
productUrl: device.productUrl,
|
|
952
|
-
configUrl: device.configUrl,
|
|
953
|
-
uniqueId: device.uniqueId,
|
|
954
|
-
reachable: extended ? getReachability(device) : true,
|
|
955
|
-
powerSource: extended ? getPowerSource(device) : undefined,
|
|
956
|
-
batteryLevel: extended ? getBatteryLevel(device) : undefined,
|
|
957
|
-
matter: extended && device.mode === 'server' && device.serverNode ? getServerNodeData(device.serverNode) : undefined,
|
|
958
|
-
cluster: extended ? getClusterTextFromDevice(device) : '',
|
|
959
|
-
});
|
|
960
|
-
}
|
|
961
|
-
return devices;
|
|
962
|
-
}
|
|
963
941
|
getApiCluster(pluginName, endpointNumber, serialNumber, uniqueId) {
|
|
964
942
|
if (this.matterbridge.hasCleanupStarted)
|
|
965
943
|
return;
|
|
@@ -1119,7 +1097,7 @@ export class Frontend extends EventEmitter {
|
|
|
1119
1097
|
}
|
|
1120
1098
|
this.wssSendSnackbarMessage(`Removing plugin ${data.params.pluginName}...`, 0);
|
|
1121
1099
|
this.log.debug(`Removing plugin ${data.params.pluginName}...`);
|
|
1122
|
-
const devices = (await this.server.fetch({ type: '
|
|
1100
|
+
const devices = (await this.server.fetch({ type: 'devices_array', src: this.server.name, dst: 'devices', params: { pluginName: data.params.pluginName } }, this.serverFetchTimeout)).result.devices;
|
|
1123
1101
|
for (const device of devices.filter((d) => d.mode === 'server')) {
|
|
1124
1102
|
if (device.uniqueId)
|
|
1125
1103
|
await this.server.fetch({ type: 'matterbridge_stop_device_server', src: this.server.name, dst: 'matterbridge', params: { deviceUniqueId: device.uniqueId } }, this.serverFetchTimeout);
|
|
@@ -1145,7 +1123,7 @@ export class Frontend extends EventEmitter {
|
|
|
1145
1123
|
await this.server.fetch({ type: 'plugins_start', src: this.server.name, dst: 'plugins', params: { plugin: data.params.pluginName } }, this.serverFetchTimeout * 10);
|
|
1146
1124
|
await this.server.fetch({ type: 'plugins_configure', src: this.server.name, dst: 'plugins', params: { plugin: data.params.pluginName } }, this.serverFetchTimeout * 10);
|
|
1147
1125
|
await this.server.fetch({ type: 'matterbridge_start_plugin_server', src: this.server.name, dst: 'matterbridge', params: { pluginName: data.params.pluginName } }, this.serverFetchTimeout);
|
|
1148
|
-
const devices = (await this.server.fetch({ type: '
|
|
1126
|
+
const devices = (await this.server.fetch({ type: 'devices_array', src: this.server.name, dst: 'devices', params: { pluginName: data.params.pluginName } }, this.serverFetchTimeout)).result.devices;
|
|
1149
1127
|
for (const device of devices.filter((d) => d.mode === 'server')) {
|
|
1150
1128
|
if (device.uniqueId)
|
|
1151
1129
|
await this.server.fetch({ type: 'matterbridge_start_device_server', src: this.server.name, dst: 'matterbridge', params: { deviceUniqueId: device.uniqueId } }, this.serverFetchTimeout);
|
|
@@ -1160,7 +1138,7 @@ export class Frontend extends EventEmitter {
|
|
|
1160
1138
|
sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, error: 'Wrong parameter pluginName in /api/disableplugin' });
|
|
1161
1139
|
return;
|
|
1162
1140
|
}
|
|
1163
|
-
const devices = (await this.server.fetch({ type: '
|
|
1141
|
+
const devices = (await this.server.fetch({ type: 'devices_array', src: this.server.name, dst: 'devices', params: { pluginName: data.params.pluginName } }, this.serverFetchTimeout)).result.devices;
|
|
1164
1142
|
for (const device of devices.filter((d) => d.mode === 'server')) {
|
|
1165
1143
|
if (device.uniqueId)
|
|
1166
1144
|
await this.server.fetch({ type: 'matterbridge_stop_device_server', src: this.server.name, dst: 'matterbridge', params: { deviceUniqueId: device.uniqueId } }, this.serverFetchTimeout);
|
|
@@ -1214,13 +1192,13 @@ export class Frontend extends EventEmitter {
|
|
|
1214
1192
|
this.wssSendRefreshRequired('devices');
|
|
1215
1193
|
sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, success: true });
|
|
1216
1194
|
}
|
|
1217
|
-
else if (data.method === '/api/
|
|
1195
|
+
else if (data.method === '/api/save-plugin-config') {
|
|
1218
1196
|
if (!isValidString(data.params.pluginName, 10) || !this.matterbridge.plugins.has(data.params.pluginName)) {
|
|
1219
|
-
sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, error: 'Wrong parameter pluginName in /api/
|
|
1197
|
+
sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, error: 'Wrong parameter pluginName in /api/save-plugin-config' });
|
|
1220
1198
|
return;
|
|
1221
1199
|
}
|
|
1222
1200
|
if (!isValidObject(data.params.formData, 5)) {
|
|
1223
|
-
sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, error: 'Wrong parameter formData in /api/
|
|
1201
|
+
sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, error: 'Wrong parameter formData in /api/save-plugin-config' });
|
|
1224
1202
|
return;
|
|
1225
1203
|
}
|
|
1226
1204
|
this.log.info(`Saving config for plugin ${plg}${data.params.pluginName}${nf}...`);
|
|
@@ -1254,7 +1232,9 @@ export class Frontend extends EventEmitter {
|
|
|
1254
1232
|
else if (data.method === '/api/create-backup') {
|
|
1255
1233
|
this.wssSendSnackbarMessage('Creating matterbridge backup...', 0);
|
|
1256
1234
|
this.log.notice(`Creating matterbridge backup...`);
|
|
1257
|
-
|
|
1235
|
+
const backupDirs = [this.matterbridge.matterbridgeDirectory, this.matterbridge.matterbridgePluginDirectory, this.matterbridge.matterbridgeCertDirectory];
|
|
1236
|
+
const backupNames = this.matterbridge.profile ? backupDirs.map((dir) => path.basename(path.dirname(path.dirname(dir)))) : undefined;
|
|
1237
|
+
this.zip('zip', path.join(os.tmpdir(), `matterbridge.backup.zip`), backupDirs, '', backupNames);
|
|
1258
1238
|
sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, success: true });
|
|
1259
1239
|
}
|
|
1260
1240
|
else if (data.method === '/api/create-matterbridge-storage-backup') {
|
|
@@ -1311,11 +1291,11 @@ export class Frontend extends EventEmitter {
|
|
|
1311
1291
|
this.server.request({ type: 'platform_rename_device', src: this.server.name, dst: 'platform', params: { pluginName, serialNumber, uniqueId, label } });
|
|
1312
1292
|
sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, success: true });
|
|
1313
1293
|
}
|
|
1314
|
-
else if (data.method === '/api/
|
|
1294
|
+
else if (data.method === '/api/view-historypage') {
|
|
1315
1295
|
generateHistoryPage({ outputPath: path.join(this.matterbridge.matterbridgeDirectory, MATTERBRIDGE_HISTORY_FILE), pageTitle: `Matterbridge Cpu & Memory History` });
|
|
1316
1296
|
sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, success: true });
|
|
1317
1297
|
}
|
|
1318
|
-
else if (data.method === '/api/
|
|
1298
|
+
else if (data.method === '/api/download-historypage') {
|
|
1319
1299
|
generateHistoryPage({ outputPath: path.join(this.matterbridge.matterbridgeDirectory, MATTERBRIDGE_HISTORY_FILE), pageTitle: `Matterbridge Cpu & Memory History` });
|
|
1320
1300
|
sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, success: true });
|
|
1321
1301
|
}
|
|
@@ -1386,11 +1366,24 @@ export class Frontend extends EventEmitter {
|
|
|
1386
1366
|
}
|
|
1387
1367
|
else if (data.method === '/api/devices') {
|
|
1388
1368
|
const start = performance.now();
|
|
1389
|
-
const
|
|
1369
|
+
const pluginName = isValidString(data.params.pluginName) ? data.params.pluginName : undefined;
|
|
1370
|
+
const devices = (await this.server.fetch({ type: 'devices_array', src: this.server.name, dst: 'devices', params: { pluginName } }, this.serverFetchTimeout)).result.devices;
|
|
1390
1371
|
if (this.diagnostic)
|
|
1391
|
-
writeDiagnostic(`Frontend:${data.sender}`, `
|
|
1372
|
+
writeDiagnostic(`Frontend:${data.sender}`, `devices_array() took ${(performance.now() - start).toFixed(2)} ms`);
|
|
1392
1373
|
sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, success: true, response: devices });
|
|
1393
1374
|
}
|
|
1375
|
+
else if (data.method === '/api/platform-devices') {
|
|
1376
|
+
if (!isValidString(data.params.pluginName, 10)) {
|
|
1377
|
+
sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, error: 'Wrong parameter pluginName in /api/platform-devices' });
|
|
1378
|
+
return;
|
|
1379
|
+
}
|
|
1380
|
+
const start = performance.now();
|
|
1381
|
+
const { pluginName, extended } = data.params;
|
|
1382
|
+
const devices = (await this.server.fetch({ type: 'platform_get_apidevices', src: this.server.name, dst: 'platform', params: { pluginName, extended } }, this.serverFetchTimeout)).result.devices;
|
|
1383
|
+
if (this.diagnostic)
|
|
1384
|
+
writeDiagnostic(`Frontend:${data.sender}`, `platform_get_apidevices(${pluginName}) took ${(performance.now() - start).toFixed(2)} ms`);
|
|
1385
|
+
sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, success: true, pluginName, response: devices });
|
|
1386
|
+
}
|
|
1394
1387
|
else if (data.method === '/api/clusters') {
|
|
1395
1388
|
if (!isValidString(data.params.pluginName, 10)) {
|
|
1396
1389
|
sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, error: 'Wrong parameter pluginName in /api/clusters' });
|
|
@@ -1426,14 +1419,14 @@ export class Frontend extends EventEmitter {
|
|
|
1426
1419
|
sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, error: 'Endpoint not found in /api/clusters' });
|
|
1427
1420
|
}
|
|
1428
1421
|
}
|
|
1429
|
-
else if (data.method === '/api/select
|
|
1422
|
+
else if (data.method === '/api/select-devices') {
|
|
1430
1423
|
if (!isValidString(data.params.plugin, 10)) {
|
|
1431
|
-
sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, error: 'Wrong parameter plugin in /api/select
|
|
1424
|
+
sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, error: 'Wrong parameter plugin in /api/select-devices' });
|
|
1432
1425
|
return;
|
|
1433
1426
|
}
|
|
1434
1427
|
const plugin = this.matterbridge.plugins.get(data.params.plugin);
|
|
1435
1428
|
if (!plugin) {
|
|
1436
|
-
sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, error: 'Plugin not found in /api/select
|
|
1429
|
+
sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, error: 'Plugin not found in /api/select-devices' });
|
|
1437
1430
|
return;
|
|
1438
1431
|
}
|
|
1439
1432
|
const start = performance.now();
|
|
@@ -1442,14 +1435,14 @@ export class Frontend extends EventEmitter {
|
|
|
1442
1435
|
writeDiagnostic(`Frontend:${data.sender}`, `getSelectDevices() took ${(performance.now() - start).toFixed(2)} ms`);
|
|
1443
1436
|
sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, success: true, response: selectDevices });
|
|
1444
1437
|
}
|
|
1445
|
-
else if (data.method === '/api/select
|
|
1438
|
+
else if (data.method === '/api/select-entities') {
|
|
1446
1439
|
if (!isValidString(data.params.plugin, 10)) {
|
|
1447
|
-
sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, error: 'Wrong parameter plugin in /api/select
|
|
1440
|
+
sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, error: 'Wrong parameter plugin in /api/select-entities' });
|
|
1448
1441
|
return;
|
|
1449
1442
|
}
|
|
1450
1443
|
const plugin = this.matterbridge.plugins.get(data.params.plugin);
|
|
1451
1444
|
if (!plugin) {
|
|
1452
|
-
sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, error: 'Plugin not found in /api/select
|
|
1445
|
+
sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, error: 'Plugin not found in /api/select-entities' });
|
|
1453
1446
|
return;
|
|
1454
1447
|
}
|
|
1455
1448
|
const start = performance.now();
|
|
@@ -1716,42 +1709,42 @@ export class Frontend extends EventEmitter {
|
|
|
1716
1709
|
sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, error: `Unknown parameter ${data.params.name} in /api/config` });
|
|
1717
1710
|
}
|
|
1718
1711
|
}
|
|
1719
|
-
else if (data.method === '/api/
|
|
1712
|
+
else if (data.method === '/api/select' || data.method === '/api/unselect') {
|
|
1720
1713
|
const localData = data;
|
|
1721
|
-
if (!isValidString(data.params.
|
|
1722
|
-
sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, error:
|
|
1714
|
+
if (!isValidString(data.params.pluginName, 10) || !isValidString(data.params.serialNumber, 1) || !isValidString(data.params.deviceName, 1)) {
|
|
1715
|
+
sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, error: `Wrong parameters in ${data.method}` });
|
|
1723
1716
|
return;
|
|
1724
1717
|
}
|
|
1725
|
-
if (data.
|
|
1726
|
-
const plugin = this.matterbridge.plugins.get(data.params.
|
|
1718
|
+
if (data.method === '/api/select') {
|
|
1719
|
+
const plugin = this.matterbridge.plugins.get(data.params.pluginName);
|
|
1727
1720
|
if (!plugin) {
|
|
1728
|
-
sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, error:
|
|
1721
|
+
sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, error: `Plugin not found in ${data.method}` });
|
|
1729
1722
|
return;
|
|
1730
1723
|
}
|
|
1731
1724
|
const config = plugin.configJson;
|
|
1732
1725
|
const select = plugin.schemaJson?.properties?.blackList?.selectFrom;
|
|
1733
1726
|
if (select === 'serial')
|
|
1734
|
-
this.log.info(`Selected device serial ${data.params.
|
|
1727
|
+
this.log.info(`Selected device serial ${data.params.serialNumber}`);
|
|
1735
1728
|
if (select === 'name')
|
|
1736
|
-
this.log.info(`Selected device name ${data.params.
|
|
1729
|
+
this.log.info(`Selected device name ${data.params.deviceName}`);
|
|
1737
1730
|
if (config && select && (select === 'serial' || select === 'name')) {
|
|
1738
1731
|
if (config.postfix) {
|
|
1739
|
-
data.params.
|
|
1732
|
+
data.params.serialNumber = data.params.serialNumber.replace('-' + config.postfix, '');
|
|
1740
1733
|
}
|
|
1741
1734
|
if (isValidArray(config.whiteList, 1)) {
|
|
1742
|
-
if (select === 'serial' && !config.whiteList.includes(data.params.
|
|
1743
|
-
config.whiteList.push(data.params.
|
|
1735
|
+
if (select === 'serial' && !config.whiteList.includes(data.params.serialNumber)) {
|
|
1736
|
+
config.whiteList.push(data.params.serialNumber);
|
|
1744
1737
|
}
|
|
1745
|
-
else if (select === 'name' && !config.whiteList.includes(data.params.
|
|
1746
|
-
config.whiteList.push(data.params.
|
|
1738
|
+
else if (select === 'name' && !config.whiteList.includes(data.params.deviceName)) {
|
|
1739
|
+
config.whiteList.push(data.params.deviceName);
|
|
1747
1740
|
}
|
|
1748
1741
|
}
|
|
1749
1742
|
if (isValidArray(config.blackList, 1)) {
|
|
1750
|
-
if (select === 'serial' && config.blackList.includes(data.params.
|
|
1751
|
-
config.blackList = config.blackList.filter((item) => item !== localData.params.
|
|
1743
|
+
if (select === 'serial' && config.blackList.includes(data.params.serialNumber)) {
|
|
1744
|
+
config.blackList = config.blackList.filter((item) => item !== localData.params.serialNumber);
|
|
1752
1745
|
}
|
|
1753
|
-
else if (select === 'name' && config.blackList.includes(data.params.
|
|
1754
|
-
config.blackList = config.blackList.filter((item) => item !== localData.params.
|
|
1746
|
+
else if (select === 'name' && config.blackList.includes(data.params.deviceName)) {
|
|
1747
|
+
config.blackList = config.blackList.filter((item) => item !== localData.params.deviceName);
|
|
1755
1748
|
}
|
|
1756
1749
|
}
|
|
1757
1750
|
if (plugin.platform)
|
|
@@ -1768,39 +1761,36 @@ export class Frontend extends EventEmitter {
|
|
|
1768
1761
|
sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, error: `SelectDevice: select ${select} not supported` });
|
|
1769
1762
|
}
|
|
1770
1763
|
}
|
|
1771
|
-
else
|
|
1772
|
-
|
|
1773
|
-
isValidString(data.params.serial, 1) &&
|
|
1774
|
-
isValidString(data.params.name, 1)) {
|
|
1775
|
-
const plugin = this.matterbridge.plugins.get(data.params.plugin);
|
|
1764
|
+
else {
|
|
1765
|
+
const plugin = this.matterbridge.plugins.get(data.params.pluginName);
|
|
1776
1766
|
if (!plugin) {
|
|
1777
|
-
sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, error:
|
|
1767
|
+
sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, error: `Plugin not found in ${data.method}` });
|
|
1778
1768
|
return;
|
|
1779
1769
|
}
|
|
1780
1770
|
const config = plugin.configJson;
|
|
1781
1771
|
const select = plugin.schemaJson?.properties?.blackList?.selectFrom;
|
|
1782
1772
|
if (select === 'serial')
|
|
1783
|
-
this.log.info(`Unselected device serial ${data.params.
|
|
1773
|
+
this.log.info(`Unselected device serial ${data.params.serialNumber}`);
|
|
1784
1774
|
if (select === 'name')
|
|
1785
|
-
this.log.info(`Unselected device name ${data.params.
|
|
1775
|
+
this.log.info(`Unselected device name ${data.params.deviceName}`);
|
|
1786
1776
|
if (config && select && (select === 'serial' || select === 'name')) {
|
|
1787
1777
|
if (config.postfix) {
|
|
1788
|
-
data.params.
|
|
1778
|
+
data.params.serialNumber = data.params.serialNumber.replace('-' + config.postfix, '');
|
|
1789
1779
|
}
|
|
1790
1780
|
if (isValidArray(config.whiteList, 1)) {
|
|
1791
|
-
if (select === 'serial' && config.whiteList.includes(data.params.
|
|
1792
|
-
config.whiteList = config.whiteList.filter((item) => item !== localData.params.
|
|
1781
|
+
if (select === 'serial' && config.whiteList.includes(data.params.serialNumber)) {
|
|
1782
|
+
config.whiteList = config.whiteList.filter((item) => item !== localData.params.serialNumber);
|
|
1793
1783
|
}
|
|
1794
|
-
else if (select === 'name' && config.whiteList.includes(data.params.
|
|
1795
|
-
config.whiteList = config.whiteList.filter((item) => item !== localData.params.
|
|
1784
|
+
else if (select === 'name' && config.whiteList.includes(data.params.deviceName)) {
|
|
1785
|
+
config.whiteList = config.whiteList.filter((item) => item !== localData.params.deviceName);
|
|
1796
1786
|
}
|
|
1797
1787
|
}
|
|
1798
1788
|
if (isValidArray(config.blackList)) {
|
|
1799
|
-
if (select === 'serial' && !config.blackList.includes(data.params.
|
|
1800
|
-
config.blackList.push(data.params.
|
|
1789
|
+
if (select === 'serial' && !config.blackList.includes(data.params.serialNumber)) {
|
|
1790
|
+
config.blackList.push(data.params.serialNumber);
|
|
1801
1791
|
}
|
|
1802
|
-
else if (select === 'name' && !config.blackList.includes(data.params.
|
|
1803
|
-
config.blackList.push(data.params.
|
|
1792
|
+
else if (select === 'name' && !config.blackList.includes(data.params.deviceName)) {
|
|
1793
|
+
config.blackList.push(data.params.deviceName);
|
|
1804
1794
|
}
|
|
1805
1795
|
}
|
|
1806
1796
|
if (plugin.platform)
|
|
@@ -1954,7 +1944,7 @@ export class Frontend extends EventEmitter {
|
|
|
1954
1944
|
},
|
|
1955
1945
|
});
|
|
1956
1946
|
}
|
|
1957
|
-
zip(command, archivePath, sourcePaths, destinationPath) {
|
|
1947
|
+
zip(command, archivePath, sourcePaths, destinationPath, archiveNames) {
|
|
1958
1948
|
this.server.request({
|
|
1959
1949
|
type: 'manager_run',
|
|
1960
1950
|
src: 'frontend',
|
|
@@ -1967,6 +1957,7 @@ export class Frontend extends EventEmitter {
|
|
|
1967
1957
|
archivePath,
|
|
1968
1958
|
sourcePaths,
|
|
1969
1959
|
destinationPath,
|
|
1960
|
+
archiveNames,
|
|
1970
1961
|
},
|
|
1971
1962
|
},
|
|
1972
1963
|
});
|
package/dist/matterNode.d.ts
CHANGED
|
@@ -5,7 +5,7 @@ import { Endpoint, ServerNode } from '@matter/node';
|
|
|
5
5
|
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
|
-
import type { BridgeStatus, PluginName, PluginStatusUpdate, SharedMatterbridge, WorkerMessage } from '@matterbridge/types';
|
|
8
|
+
import type { BridgeStatus, PlatformConfig, PlatformSchema, PluginName, PluginStatusUpdate, SharedMatterbridge, WorkerMessage } from '@matterbridge/types';
|
|
9
9
|
import type { MatterbridgeEndpoint } from './matterbridgeEndpoint.js';
|
|
10
10
|
import { type Plugin, PluginManager } from './pluginManager.js';
|
|
11
11
|
interface MatterEvents {
|
|
@@ -69,6 +69,9 @@ export declare class MatterNode extends EventEmitter<MatterEvents> {
|
|
|
69
69
|
subscribeAttributeChanged(plugin: Plugin, device: MatterbridgeEndpoint): Promise<void>;
|
|
70
70
|
setServerReachability(reachable: boolean): Promise<void>;
|
|
71
71
|
setAggregatorReachability(aggregatorNode: Endpoint<AggregatorEndpoint>, reachable: boolean): Promise<void>;
|
|
72
|
+
pluginSetConfig(pluginName: string, config: PlatformConfig): void;
|
|
73
|
+
pluginSetSchema(pluginName: string, schema: PlatformSchema): void;
|
|
74
|
+
pluginMatterUpdate(serverNode: ServerNode): void;
|
|
72
75
|
pluginStatusUpdate(pluginName: string, status: PluginStatusUpdate): void;
|
|
73
76
|
matterbridgeStatusUpdate(status: BridgeStatus): void;
|
|
74
77
|
yieldToNode(timeout?: number): Promise<void>;
|