homebridge 2.0.0-beta.6 → 2.0.0-beta.61
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 +16 -17
- package/bin/homebridge.js +22 -0
- package/config-sample.json +3 -3
- package/dist/api.d.ts +136 -0
- package/dist/api.d.ts.map +1 -0
- package/dist/api.js +151 -0
- package/dist/api.js.map +1 -0
- package/{lib → dist}/bridgeService.d.ts +16 -32
- package/dist/bridgeService.d.ts.map +1 -0
- package/dist/bridgeService.js +341 -0
- package/dist/bridgeService.js.map +1 -0
- package/dist/childBridgeFork.d.ts +40 -0
- package/dist/childBridgeFork.d.ts.map +1 -0
- package/dist/childBridgeFork.js +361 -0
- package/dist/childBridgeFork.js.map +1 -0
- package/dist/childBridgeService.d.ts +146 -0
- package/dist/childBridgeService.d.ts.map +1 -0
- package/dist/childBridgeService.js +416 -0
- package/dist/childBridgeService.js.map +1 -0
- package/dist/cli.d.ts +3 -0
- package/dist/cli.d.ts.map +1 -0
- package/dist/cli.js +88 -0
- package/dist/cli.js.map +1 -0
- package/dist/externalPortService.d.ts +26 -0
- package/dist/externalPortService.d.ts.map +1 -0
- package/dist/externalPortService.js +77 -0
- package/dist/externalPortService.js.map +1 -0
- package/dist/index.d.ts +29 -0
- package/dist/index.d.ts.map +1 -0
- package/dist/index.js +9 -0
- package/dist/index.js.map +1 -0
- package/dist/ipcService.d.ts +58 -0
- package/dist/ipcService.d.ts.map +1 -0
- package/dist/ipcService.js +43 -0
- package/dist/ipcService.js.map +1 -0
- package/dist/logger.d.ts +38 -0
- package/dist/logger.d.ts.map +1 -0
- package/dist/logger.js +102 -0
- package/dist/logger.js.map +1 -0
- package/dist/matter/BaseMatterManager.d.ts +21 -0
- package/dist/matter/BaseMatterManager.d.ts.map +1 -0
- package/dist/matter/BaseMatterManager.js +197 -0
- package/dist/matter/BaseMatterManager.js.map +1 -0
- package/dist/matter/ChildBridgeMatterManager.d.ts +35 -0
- package/dist/matter/ChildBridgeMatterManager.d.ts.map +1 -0
- package/dist/matter/ChildBridgeMatterManager.js +222 -0
- package/dist/matter/ChildBridgeMatterManager.js.map +1 -0
- package/dist/matter/ClusterCommandMapper.d.ts +5 -0
- package/dist/matter/ClusterCommandMapper.d.ts.map +1 -0
- package/dist/matter/ClusterCommandMapper.js +222 -0
- package/dist/matter/ClusterCommandMapper.js.map +1 -0
- package/dist/matter/ExternalMatterAccessoryPublisher.d.ts +22 -0
- package/dist/matter/ExternalMatterAccessoryPublisher.d.ts.map +1 -0
- package/dist/matter/ExternalMatterAccessoryPublisher.js +49 -0
- package/dist/matter/ExternalMatterAccessoryPublisher.js.map +1 -0
- package/dist/matter/MatterAPIImpl.d.ts +473 -0
- package/dist/matter/MatterAPIImpl.d.ts.map +1 -0
- package/dist/matter/MatterAPIImpl.js +210 -0
- package/dist/matter/MatterAPIImpl.js.map +1 -0
- package/dist/matter/MatterBridgeManager.d.ts +39 -0
- package/dist/matter/MatterBridgeManager.d.ts.map +1 -0
- package/dist/matter/MatterBridgeManager.js +323 -0
- package/dist/matter/MatterBridgeManager.js.map +1 -0
- package/dist/matter/accessoryCache.d.ts +57 -0
- package/dist/matter/accessoryCache.d.ts.map +1 -0
- package/dist/matter/accessoryCache.js +155 -0
- package/dist/matter/accessoryCache.js.map +1 -0
- package/dist/matter/behaviors/AirQualityBehavior.d.ts +8 -0
- package/dist/matter/behaviors/AirQualityBehavior.d.ts.map +1 -0
- package/dist/matter/behaviors/AirQualityBehavior.js +11 -0
- package/dist/matter/behaviors/AirQualityBehavior.js.map +1 -0
- package/dist/matter/behaviors/BehaviorRegistry.d.ts +27 -0
- package/dist/matter/behaviors/BehaviorRegistry.d.ts.map +1 -0
- package/dist/matter/behaviors/BehaviorRegistry.js +110 -0
- package/dist/matter/behaviors/BehaviorRegistry.js.map +1 -0
- package/dist/matter/behaviors/ColorControlBehavior.d.ts +12 -0
- package/dist/matter/behaviors/ColorControlBehavior.d.ts.map +1 -0
- package/dist/matter/behaviors/ColorControlBehavior.js +139 -0
- package/dist/matter/behaviors/ColorControlBehavior.js.map +1 -0
- package/dist/matter/behaviors/ConcentrationMeasurementBehavior.d.ts +32 -0
- package/dist/matter/behaviors/ConcentrationMeasurementBehavior.d.ts.map +1 -0
- package/dist/matter/behaviors/ConcentrationMeasurementBehavior.js +51 -0
- package/dist/matter/behaviors/ConcentrationMeasurementBehavior.js.map +1 -0
- package/dist/matter/behaviors/DoorLockBehavior.d.ts +7 -0
- package/dist/matter/behaviors/DoorLockBehavior.d.ts.map +1 -0
- package/dist/matter/behaviors/DoorLockBehavior.js +48 -0
- package/dist/matter/behaviors/DoorLockBehavior.js.map +1 -0
- package/dist/matter/behaviors/FanControlBehavior.d.ts +7 -0
- package/dist/matter/behaviors/FanControlBehavior.d.ts.map +1 -0
- package/dist/matter/behaviors/FanControlBehavior.js +57 -0
- package/dist/matter/behaviors/FanControlBehavior.js.map +1 -0
- package/dist/matter/behaviors/IdentifyBehavior.d.ts +7 -0
- package/dist/matter/behaviors/IdentifyBehavior.d.ts.map +1 -0
- package/dist/matter/behaviors/IdentifyBehavior.js +25 -0
- package/dist/matter/behaviors/IdentifyBehavior.js.map +1 -0
- package/dist/matter/behaviors/LevelControlBehavior.d.ts +11 -0
- package/dist/matter/behaviors/LevelControlBehavior.d.ts.map +1 -0
- package/dist/matter/behaviors/LevelControlBehavior.js +100 -0
- package/dist/matter/behaviors/LevelControlBehavior.js.map +1 -0
- package/dist/matter/behaviors/OnOffBehavior.d.ts +8 -0
- package/dist/matter/behaviors/OnOffBehavior.d.ts.map +1 -0
- package/dist/matter/behaviors/OnOffBehavior.js +60 -0
- package/dist/matter/behaviors/OnOffBehavior.js.map +1 -0
- package/dist/matter/behaviors/RegistryManager.d.ts +15 -0
- package/dist/matter/behaviors/RegistryManager.d.ts.map +1 -0
- package/dist/matter/behaviors/RegistryManager.js +31 -0
- package/dist/matter/behaviors/RegistryManager.js.map +1 -0
- package/dist/matter/behaviors/RvcCleanModeBehavior.d.ts +14 -0
- package/dist/matter/behaviors/RvcCleanModeBehavior.d.ts.map +1 -0
- package/dist/matter/behaviors/RvcCleanModeBehavior.js +29 -0
- package/dist/matter/behaviors/RvcCleanModeBehavior.js.map +1 -0
- package/dist/matter/behaviors/RvcOperationalStateBehavior.d.ts +10 -0
- package/dist/matter/behaviors/RvcOperationalStateBehavior.d.ts.map +1 -0
- package/dist/matter/behaviors/RvcOperationalStateBehavior.js +81 -0
- package/dist/matter/behaviors/RvcOperationalStateBehavior.js.map +1 -0
- package/dist/matter/behaviors/RvcRunModeBehavior.d.ts +14 -0
- package/dist/matter/behaviors/RvcRunModeBehavior.d.ts.map +1 -0
- package/dist/matter/behaviors/RvcRunModeBehavior.js +29 -0
- package/dist/matter/behaviors/RvcRunModeBehavior.js.map +1 -0
- package/dist/matter/behaviors/ServiceAreaBehavior.d.ts +9 -0
- package/dist/matter/behaviors/ServiceAreaBehavior.d.ts.map +1 -0
- package/dist/matter/behaviors/ServiceAreaBehavior.js +62 -0
- package/dist/matter/behaviors/ServiceAreaBehavior.js.map +1 -0
- package/dist/matter/behaviors/ThermostatBehavior.d.ts +9 -0
- package/dist/matter/behaviors/ThermostatBehavior.d.ts.map +1 -0
- package/dist/matter/behaviors/ThermostatBehavior.js +92 -0
- package/dist/matter/behaviors/ThermostatBehavior.js.map +1 -0
- package/dist/matter/behaviors/WindowCoveringBehavior.d.ts +12 -0
- package/dist/matter/behaviors/WindowCoveringBehavior.d.ts.map +1 -0
- package/dist/matter/behaviors/WindowCoveringBehavior.js +108 -0
- package/dist/matter/behaviors/WindowCoveringBehavior.js.map +1 -0
- package/dist/matter/behaviors/index.d.ts +18 -0
- package/dist/matter/behaviors/index.d.ts.map +1 -0
- package/dist/matter/behaviors/index.js +17 -0
- package/dist/matter/behaviors/index.js.map +1 -0
- package/dist/matter/clusterTypes.d.ts +182 -0
- package/dist/matter/clusterTypes.d.ts.map +1 -0
- package/dist/matter/clusterTypes.js +2 -0
- package/dist/matter/clusterTypes.js.map +1 -0
- package/dist/matter/config.d.ts +9 -0
- package/dist/matter/config.d.ts.map +1 -0
- package/dist/matter/config.js +84 -0
- package/dist/matter/config.js.map +1 -0
- package/dist/matter/configValidator.d.ts +26 -0
- package/dist/matter/configValidator.d.ts.map +1 -0
- package/dist/matter/configValidator.js +173 -0
- package/dist/matter/configValidator.js.map +1 -0
- package/dist/matter/errorHandler.d.ts +11 -0
- package/dist/matter/errorHandler.d.ts.map +1 -0
- package/dist/matter/errorHandler.js +81 -0
- package/dist/matter/errorHandler.js.map +1 -0
- package/dist/matter/errors.d.ts +46 -0
- package/dist/matter/errors.d.ts.map +1 -0
- package/dist/matter/errors.js +68 -0
- package/dist/matter/errors.js.map +1 -0
- package/dist/matter/index.d.ts +97 -0
- package/dist/matter/index.d.ts.map +1 -0
- package/dist/matter/index.js +10 -0
- package/dist/matter/index.js.map +1 -0
- package/dist/matter/logFormatter.d.ts +2 -0
- package/dist/matter/logFormatter.d.ts.map +1 -0
- package/dist/matter/logFormatter.js +100 -0
- package/dist/matter/logFormatter.js.map +1 -0
- package/dist/matter/managerTypes.d.ts +57 -0
- package/dist/matter/managerTypes.d.ts.map +1 -0
- package/dist/matter/managerTypes.js +2 -0
- package/dist/matter/managerTypes.js.map +1 -0
- package/dist/matter/server.d.ts +112 -0
- package/dist/matter/server.d.ts.map +1 -0
- package/dist/matter/server.js +1508 -0
- package/dist/matter/server.js.map +1 -0
- package/dist/matter/serverHelpers.d.ts +31 -0
- package/dist/matter/serverHelpers.d.ts.map +1 -0
- package/dist/matter/serverHelpers.js +273 -0
- package/dist/matter/serverHelpers.js.map +1 -0
- package/dist/matter/sharedTypes.d.ts +93 -0
- package/dist/matter/sharedTypes.d.ts.map +1 -0
- package/dist/matter/sharedTypes.js +20 -0
- package/dist/matter/sharedTypes.js.map +1 -0
- package/dist/matter/storage.d.ts +45 -0
- package/dist/matter/storage.d.ts.map +1 -0
- package/dist/matter/storage.js +325 -0
- package/dist/matter/storage.js.map +1 -0
- package/dist/matter/typeHelpers.d.ts +15 -0
- package/dist/matter/typeHelpers.d.ts.map +1 -0
- package/dist/matter/typeHelpers.js +33 -0
- package/dist/matter/typeHelpers.js.map +1 -0
- package/dist/matter/types.d.ts +642 -0
- package/dist/matter/types.d.ts.map +1 -0
- package/dist/matter/types.js +208 -0
- package/dist/matter/types.js.map +1 -0
- package/dist/matter/utils.d.ts +13 -0
- package/dist/matter/utils.d.ts.map +1 -0
- package/dist/matter/utils.js +21 -0
- package/dist/matter/utils.js.map +1 -0
- package/{lib → dist}/platformAccessory.d.ts +8 -21
- package/dist/platformAccessory.d.ts.map +1 -0
- package/dist/platformAccessory.js +79 -0
- package/dist/platformAccessory.js.map +1 -0
- package/{lib → dist}/plugin.d.ts +2 -6
- package/dist/plugin.d.ts.map +1 -0
- package/dist/plugin.js +159 -0
- package/dist/plugin.js.map +1 -0
- package/{lib → dist}/pluginManager.d.ts +3 -25
- package/dist/pluginManager.d.ts.map +1 -0
- package/{lib → dist}/pluginManager.js +87 -115
- package/dist/pluginManager.js.map +1 -0
- package/{lib → dist}/server.d.ts +15 -20
- package/dist/server.d.ts.map +1 -0
- package/dist/server.js +727 -0
- package/dist/server.js.map +1 -0
- package/{lib → dist}/storageService.d.ts.map +1 -1
- package/dist/storageService.js +41 -0
- package/dist/storageService.js.map +1 -0
- package/{lib → dist}/user.d.ts +1 -3
- package/dist/user.d.ts.map +1 -0
- package/dist/user.js +29 -0
- package/dist/user.js.map +1 -0
- package/{lib → dist}/util/mac.d.ts +1 -0
- package/dist/util/mac.d.ts.map +1 -0
- package/dist/util/mac.js +13 -0
- package/dist/util/mac.js.map +1 -0
- package/dist/version.d.ts.map +1 -0
- package/dist/version.js +16 -0
- package/dist/version.js.map +1 -0
- package/package.json +49 -50
- package/bin/homebridge +0 -17
- package/lib/api.d.ts +0 -210
- package/lib/api.d.ts.map +0 -1
- package/lib/api.js +0 -155
- package/lib/api.js.map +0 -1
- package/lib/bridgeService.d.ts.map +0 -1
- package/lib/bridgeService.js +0 -426
- package/lib/bridgeService.js.map +0 -1
- package/lib/childBridgeFork.d.ts +0 -37
- package/lib/childBridgeFork.d.ts.map +0 -1
- package/lib/childBridgeFork.js +0 -244
- package/lib/childBridgeFork.js.map +0 -1
- package/lib/childBridgeService.d.ts +0 -199
- package/lib/childBridgeService.d.ts.map +0 -1
- package/lib/childBridgeService.js +0 -428
- package/lib/childBridgeService.js.map +0 -1
- package/lib/cli.d.ts +0 -4
- package/lib/cli.d.ts.map +0 -1
- package/lib/cli.js +0 -111
- package/lib/cli.js.map +0 -1
- package/lib/externalPortService.d.ts +0 -33
- package/lib/externalPortService.d.ts.map +0 -1
- package/lib/externalPortService.js +0 -64
- package/lib/externalPortService.js.map +0 -1
- package/lib/index.d.ts +0 -76
- package/lib/index.d.ts.map +0 -1
- package/lib/index.js +0 -72
- package/lib/index.js.map +0 -1
- package/lib/ipcService.d.ts +0 -33
- package/lib/ipcService.d.ts.map +0 -1
- package/lib/ipcService.js +0 -49
- package/lib/ipcService.js.map +0 -1
- package/lib/logger.d.ts +0 -78
- package/lib/logger.d.ts.map +0 -1
- package/lib/logger.js +0 -147
- package/lib/logger.js.map +0 -1
- package/lib/platformAccessory.d.ts.map +0 -1
- package/lib/platformAccessory.js +0 -102
- package/lib/platformAccessory.js.map +0 -1
- package/lib/plugin.d.ts.map +0 -1
- package/lib/plugin.js +0 -194
- package/lib/plugin.js.map +0 -1
- package/lib/pluginManager.d.ts.map +0 -1
- package/lib/pluginManager.js.map +0 -1
- package/lib/server.d.ts.map +0 -1
- package/lib/server.js +0 -457
- package/lib/server.js.map +0 -1
- package/lib/storageService.js +0 -70
- package/lib/storageService.js.map +0 -1
- package/lib/user.d.ts.map +0 -1
- package/lib/user.js +0 -36
- package/lib/user.js.map +0 -1
- package/lib/util/mac.d.ts.map +0 -1
- package/lib/util/mac.js +0 -20
- package/lib/util/mac.js.map +0 -1
- package/lib/version.d.ts.map +0 -1
- package/lib/version.js +0 -21
- package/lib/version.js.map +0 -1
- /package/{lib → dist}/storageService.d.ts +0 -0
- /package/{lib → dist}/version.d.ts +0 -0
|
@@ -0,0 +1,222 @@
|
|
|
1
|
+
import process from 'node:process';
|
|
2
|
+
import { Logger } from '../logger.js';
|
|
3
|
+
import { User } from '../user.js';
|
|
4
|
+
import { BaseMatterManager } from './BaseMatterManager.js';
|
|
5
|
+
import { publishExternalMatterAccessory } from './ExternalMatterAccessoryPublisher.js';
|
|
6
|
+
import { MatterServer } from './server.js';
|
|
7
|
+
import { appendUsernameSuffix, normalizeBindConfig } from './utils.js';
|
|
8
|
+
const log = Logger.withPrefix('Matter/ChildManager');
|
|
9
|
+
export class ChildBridgeMatterManager extends BaseMatterManager {
|
|
10
|
+
bridgeConfig;
|
|
11
|
+
bridgeOptions;
|
|
12
|
+
api;
|
|
13
|
+
externalPortService;
|
|
14
|
+
matterConfig;
|
|
15
|
+
matterSerialNumber;
|
|
16
|
+
constructor(bridgeConfig, bridgeOptions, api, externalPortService, pluginManager) {
|
|
17
|
+
super(pluginManager);
|
|
18
|
+
this.bridgeConfig = bridgeConfig;
|
|
19
|
+
this.bridgeOptions = bridgeOptions;
|
|
20
|
+
this.api = api;
|
|
21
|
+
this.externalPortService = externalPortService;
|
|
22
|
+
this.matterConfig = bridgeConfig.matter;
|
|
23
|
+
}
|
|
24
|
+
async initialize(onCommissioningChanged) {
|
|
25
|
+
if (!this.matterConfig) {
|
|
26
|
+
return;
|
|
27
|
+
}
|
|
28
|
+
log.debug(`Child bridge ${this.bridgeConfig.username} has Matter config (Combined HAP+Matter), starting Matter server`);
|
|
29
|
+
if (!this.matterConfig.port) {
|
|
30
|
+
const matterUsername = appendUsernameSuffix(this.bridgeConfig.username, 'MATTER');
|
|
31
|
+
const matterPort = await this.externalPortService.requestPort(matterUsername);
|
|
32
|
+
if (!matterPort) {
|
|
33
|
+
throw new Error('Failed to allocate Matter port for child bridge. '
|
|
34
|
+
+ 'Please specify a port manually in the _bridge.matter configuration, or free up ports in the configured range.');
|
|
35
|
+
}
|
|
36
|
+
this.matterConfig.port = matterPort;
|
|
37
|
+
log.debug(`Allocated Matter port: ${this.matterConfig.port} (HAP port: ${this.bridgeConfig.port})`);
|
|
38
|
+
}
|
|
39
|
+
await this.startMatterServer(this.matterConfig);
|
|
40
|
+
if (onCommissioningChanged && this.matterServer) {
|
|
41
|
+
this.matterServer.on('commissioning-status-changed', (commissioned, fabricCount) => {
|
|
42
|
+
log.info(`Matter commissioning status changed for child bridge ${this.bridgeConfig.username}: commissioned=${commissioned}, fabricCount=${fabricCount}`);
|
|
43
|
+
onCommissioningChanged();
|
|
44
|
+
});
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
async startMatterServer(matterConfig) {
|
|
48
|
+
log.info(`Starting Matter server for child bridge ${this.bridgeConfig.username}`);
|
|
49
|
+
const serialNumber = this.bridgeConfig.username.replace(/:/g, '');
|
|
50
|
+
const networkInterfaces = normalizeBindConfig(this.bridgeConfig.bind);
|
|
51
|
+
this.matterServer = new MatterServer({
|
|
52
|
+
port: matterConfig.port || 5540,
|
|
53
|
+
uniqueId: serialNumber,
|
|
54
|
+
storagePath: User.matterPath(),
|
|
55
|
+
debugModeEnabled: this.bridgeOptions.debugModeEnabled,
|
|
56
|
+
manufacturer: this.bridgeConfig.manufacturer,
|
|
57
|
+
model: this.bridgeConfig.model,
|
|
58
|
+
firmwareRevision: this.bridgeConfig.firmwareRevision,
|
|
59
|
+
serialNumber,
|
|
60
|
+
networkInterfaces,
|
|
61
|
+
});
|
|
62
|
+
await this.matterServer.start();
|
|
63
|
+
this.api._setMatterEnabled(true);
|
|
64
|
+
this.api._setMatterServer(this.matterServer);
|
|
65
|
+
const commissioningInfo = this.matterServer.getCommissioningInfo();
|
|
66
|
+
log.info(`Matter server started for child bridge ${this.bridgeConfig.username} with commissioning info:`, commissioningInfo);
|
|
67
|
+
this.matterSerialNumber = commissioningInfo.serialNumber;
|
|
68
|
+
this.setupEventListeners();
|
|
69
|
+
}
|
|
70
|
+
setupEventListeners() {
|
|
71
|
+
this.api.on("publishExternalMatterAccessories", (accessories, registrationId) => {
|
|
72
|
+
this.handlePublishExternalAccessories(accessories, registrationId).catch((error) => {
|
|
73
|
+
log.error('Failed to publish external Matter accessories:', error);
|
|
74
|
+
this.api._resolveExternalRegistration(registrationId);
|
|
75
|
+
});
|
|
76
|
+
});
|
|
77
|
+
this.api.on("registerMatterPlatformAccessories", (pluginIdentifier, platformName, accessories) => {
|
|
78
|
+
this.handleRegisterPlatformAccessories(pluginIdentifier, platformName, accessories).catch((error) => {
|
|
79
|
+
log.error(`Failed to register Matter accessories for ${pluginIdentifier}:`, error);
|
|
80
|
+
});
|
|
81
|
+
});
|
|
82
|
+
this.api.on("updateMatterPlatformAccessories", (accessories) => {
|
|
83
|
+
this.handleUpdatePlatformAccessories(accessories).catch((error) => {
|
|
84
|
+
log.error('Failed to update Matter platform accessories:', error);
|
|
85
|
+
});
|
|
86
|
+
});
|
|
87
|
+
this.api.on("unregisterMatterPlatformAccessories", (pluginIdentifier, platformName, accessories) => {
|
|
88
|
+
this.handleUnregisterPlatformAccessories(pluginIdentifier, platformName, accessories).catch((error) => {
|
|
89
|
+
log.error(`Failed to unregister Matter accessories for ${pluginIdentifier}:`, error);
|
|
90
|
+
});
|
|
91
|
+
});
|
|
92
|
+
this.api.on("unregisterExternalMatterAccessories", (accessories) => {
|
|
93
|
+
this.handleUnregisterExternalAccessories(accessories).catch((error) => {
|
|
94
|
+
log.error('Failed to unregister external Matter accessories:', error);
|
|
95
|
+
});
|
|
96
|
+
});
|
|
97
|
+
this.api.on("updateMatterAccessoryState", (uuid, cluster, attributes, partId) => {
|
|
98
|
+
this.handleUpdateAccessoryState(uuid, cluster, attributes, partId).catch((error) => {
|
|
99
|
+
log.error(`Failed to update Matter accessory state for ${uuid}:`, error);
|
|
100
|
+
});
|
|
101
|
+
});
|
|
102
|
+
}
|
|
103
|
+
async handlePublishExternalAccessories(accessories, registrationId) {
|
|
104
|
+
log.info(`Publishing ${accessories.length} external Matter accessor${accessories.length === 1 ? 'y' : 'ies'} from child bridge ${this.bridgeConfig.username}`);
|
|
105
|
+
try {
|
|
106
|
+
const networkInterfaces = normalizeBindConfig(this.bridgeConfig.bind);
|
|
107
|
+
for (const accessory of accessories) {
|
|
108
|
+
try {
|
|
109
|
+
if (this.externalMatterServers.has(accessory.UUID)) {
|
|
110
|
+
log.warn(`External Matter accessory ${accessory.displayName} (${accessory.UUID}) is already published`);
|
|
111
|
+
continue;
|
|
112
|
+
}
|
|
113
|
+
const result = await publishExternalMatterAccessory(accessory, {
|
|
114
|
+
portService: this.externalPortService,
|
|
115
|
+
networkInterfaces,
|
|
116
|
+
debugModeEnabled: this.bridgeOptions.debugModeEnabled,
|
|
117
|
+
});
|
|
118
|
+
if (!result) {
|
|
119
|
+
continue;
|
|
120
|
+
}
|
|
121
|
+
this.externalMatterServers.set(accessory.UUID, result.server);
|
|
122
|
+
if (process.send) {
|
|
123
|
+
process.send({
|
|
124
|
+
id: 'matterEvent',
|
|
125
|
+
data: {
|
|
126
|
+
type: 'externalBridgeRegistration',
|
|
127
|
+
data: {
|
|
128
|
+
externalBridgeUsername: result.username,
|
|
129
|
+
childBridgeUsername: this.bridgeConfig.username,
|
|
130
|
+
},
|
|
131
|
+
},
|
|
132
|
+
});
|
|
133
|
+
}
|
|
134
|
+
if (result.commissioningInfo.qrCode && result.commissioningInfo.manualPairingCode) {
|
|
135
|
+
log.info(`📱 Commissioning codes for ${accessory.displayName}:`);
|
|
136
|
+
log.info(` QR Code: ${result.commissioningInfo.qrCode}`);
|
|
137
|
+
log.info(` Manual Code: ${result.commissioningInfo.manualPairingCode}`);
|
|
138
|
+
}
|
|
139
|
+
}
|
|
140
|
+
catch (error) {
|
|
141
|
+
log.error(`Failed to publish external Matter accessory ${accessory.displayName}:`, error);
|
|
142
|
+
}
|
|
143
|
+
}
|
|
144
|
+
}
|
|
145
|
+
finally {
|
|
146
|
+
this.api._resolveExternalRegistration(registrationId);
|
|
147
|
+
}
|
|
148
|
+
}
|
|
149
|
+
getMatterStatusInfo() {
|
|
150
|
+
if (!this.matterConfig || !this.matterServer) {
|
|
151
|
+
return undefined;
|
|
152
|
+
}
|
|
153
|
+
const commissioningInfo = this.matterServer.getCommissioningInfo();
|
|
154
|
+
return {
|
|
155
|
+
qrCode: commissioningInfo.qrCode,
|
|
156
|
+
manualPairingCode: commissioningInfo.manualPairingCode,
|
|
157
|
+
serialNumber: this.matterSerialNumber || commissioningInfo.serialNumber,
|
|
158
|
+
commissioned: commissioningInfo.commissioned || false,
|
|
159
|
+
deviceCount: this.matterServer.getAccessories().length,
|
|
160
|
+
};
|
|
161
|
+
}
|
|
162
|
+
isMatterEnabled() {
|
|
163
|
+
return this.matterServer !== undefined;
|
|
164
|
+
}
|
|
165
|
+
enableStateMonitoring() {
|
|
166
|
+
log.debug(`Enabling Matter state monitoring for child bridge ${this.bridgeConfig.username}`);
|
|
167
|
+
super.enableStateMonitoring();
|
|
168
|
+
}
|
|
169
|
+
disableStateMonitoring() {
|
|
170
|
+
log.debug(`Disabling Matter state monitoring for child bridge ${this.bridgeConfig.username}`);
|
|
171
|
+
super.disableStateMonitoring();
|
|
172
|
+
}
|
|
173
|
+
collectAllAccessories() {
|
|
174
|
+
const accessories = [];
|
|
175
|
+
if (this.matterServer) {
|
|
176
|
+
const serverAccessories = this.matterServer.collectAccessories(this.bridgeConfig.username, 'child', this.bridgeConfig.name || 'Child Bridge');
|
|
177
|
+
accessories.push(...serverAccessories);
|
|
178
|
+
}
|
|
179
|
+
for (const server of this.externalMatterServers.values()) {
|
|
180
|
+
const externalAccessories = server.collectAccessories(server.username, 'external', server.bridgeName);
|
|
181
|
+
accessories.push(...externalAccessories);
|
|
182
|
+
}
|
|
183
|
+
return accessories;
|
|
184
|
+
}
|
|
185
|
+
getAccessoryInfo(uuid) {
|
|
186
|
+
if (this.matterServer) {
|
|
187
|
+
const info = this.matterServer.getAccessoryInfo(uuid);
|
|
188
|
+
if (info) {
|
|
189
|
+
return info;
|
|
190
|
+
}
|
|
191
|
+
}
|
|
192
|
+
for (const server of this.externalMatterServers.values()) {
|
|
193
|
+
const info = server.getAccessoryInfo(uuid);
|
|
194
|
+
if (info) {
|
|
195
|
+
return info;
|
|
196
|
+
}
|
|
197
|
+
}
|
|
198
|
+
return undefined;
|
|
199
|
+
}
|
|
200
|
+
async teardown() {
|
|
201
|
+
if (this.matterServer) {
|
|
202
|
+
log.debug(`Stopping Matter server for child bridge ${this.bridgeConfig.username}`);
|
|
203
|
+
try {
|
|
204
|
+
await this.matterServer.stop();
|
|
205
|
+
}
|
|
206
|
+
catch (error) {
|
|
207
|
+
log.error('Error stopping Matter server:', error);
|
|
208
|
+
}
|
|
209
|
+
}
|
|
210
|
+
for (const [uuid, matterServer] of this.externalMatterServers) {
|
|
211
|
+
log.debug(`Stopping external Matter server for ${uuid}`);
|
|
212
|
+
try {
|
|
213
|
+
await matterServer.stop();
|
|
214
|
+
}
|
|
215
|
+
catch (error) {
|
|
216
|
+
log.error(`Error stopping external Matter server for ${uuid}:`, error);
|
|
217
|
+
}
|
|
218
|
+
}
|
|
219
|
+
this.externalMatterServers.clear();
|
|
220
|
+
}
|
|
221
|
+
}
|
|
222
|
+
//# sourceMappingURL=ChildBridgeMatterManager.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ChildBridgeMatterManager.js","sourceRoot":"","sources":["../../src/matter/ChildBridgeMatterManager.ts"],"names":[],"mappings":"AAaA,OAAO,OAAO,MAAM,cAAc,CAAA;AAGlC,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAErC,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AACjC,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAC1D,OAAO,EAAE,8BAA8B,EAAE,MAAM,uCAAuC,CAAA;AACtF,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAC1C,OAAO,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAA;AAEtE,MAAM,GAAG,GAAG,MAAM,CAAC,UAAU,CAAC,qBAAqB,CAAC,CAAA;AAgBpD,MAAM,OAAO,wBAAyB,SAAQ,iBAAiB;IAQ1C;IACA;IACA;IACA;IATF,YAAY,CAAe;IAGpC,kBAAkB,CAAS;IAEnC,YACmB,YAAiC,EACjC,aAA4B,EAC5B,GAAkB,EAClB,mBAAmD,EACpE,aAA4B;QAE5B,KAAK,CAAC,aAAa,CAAC,CAAA;QANH,iBAAY,GAAZ,YAAY,CAAqB;QACjC,kBAAa,GAAb,aAAa,CAAe;QAC5B,QAAG,GAAH,GAAG,CAAe;QAClB,wBAAmB,GAAnB,mBAAmB,CAAgC;QAIpE,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC,MAAM,CAAA;IACzC,CAAC;IAMD,KAAK,CAAC,UAAU,CAAC,sBAAmC;QAElD,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;YACvB,OAAM;QACR,CAAC;QAED,GAAG,CAAC,KAAK,CAAC,gBAAgB,IAAI,CAAC,YAAY,CAAC,QAAQ,kEAAkE,CAAC,CAAA;QAGvH,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC;YAE5B,MAAM,cAAc,GAAG,oBAAoB,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAA;YACjF,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,WAAW,CAAC,cAAc,CAAC,CAAA;YAE7E,IAAI,CAAC,UAAU,EAAE,CAAC;gBAChB,MAAM,IAAI,KAAK,CACb,mDAAmD;sBACjD,+GAA+G,CAClH,CAAA;YACH,CAAC;YAED,IAAI,CAAC,YAAY,CAAC,IAAI,GAAG,UAAU,CAAA;YACnC,GAAG,CAAC,KAAK,CAAC,0BAA0B,IAAI,CAAC,YAAY,CAAC,IAAI,eAAe,IAAI,CAAC,YAAY,CAAC,IAAI,GAAG,CAAC,CAAA;QACrG,CAAC;QAGD,MAAM,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;QAG/C,IAAI,sBAAsB,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YAChD,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,8BAA8B,EAAE,CAAC,YAAY,EAAE,WAAW,EAAE,EAAE;gBACjF,GAAG,CAAC,IAAI,CAAC,wDAAwD,IAAI,CAAC,YAAY,CAAC,QAAQ,kBAAkB,YAAY,iBAAiB,WAAW,EAAE,CAAC,CAAA;gBACxJ,sBAAsB,EAAE,CAAA;YAC1B,CAAC,CAAC,CAAA;QACJ,CAAC;IACH,CAAC;IAKO,KAAK,CAAC,iBAAiB,CAAC,YAA0B;QACxD,GAAG,CAAC,IAAI,CAAC,2CAA2C,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC,CAAA;QAGjF,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;QAGjE,MAAM,iBAAiB,GAAG,mBAAmB,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAA;QAErE,IAAI,CAAC,YAAY,GAAG,IAAI,YAAY,CAAC;YACnC,IAAI,EAAE,YAAY,CAAC,IAAI,IAAI,IAAI;YAC/B,QAAQ,EAAE,YAAY;YACtB,WAAW,EAAE,IAAI,CAAC,UAAU,EAAE;YAC9B,gBAAgB,EAAE,IAAI,CAAC,aAAa,CAAC,gBAAgB;YACrD,YAAY,EAAE,IAAI,CAAC,YAAY,CAAC,YAAY;YAC5C,KAAK,EAAE,IAAI,CAAC,YAAY,CAAC,KAAK;YAC9B,gBAAgB,EAAE,IAAI,CAAC,YAAY,CAAC,gBAAgB;YACpD,YAAY;YACZ,iBAAiB;SAClB,CAAC,CAAA;QAEF,MAAM,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,CAAA;QAG/B,IAAI,CAAC,GAAG,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAA;QAGhC,IAAI,CAAC,GAAG,CAAC,gBAAgB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;QAE5C,MAAM,iBAAiB,GAAG,IAAI,CAAC,YAAY,CAAC,oBAAoB,EAAE,CAAA;QAClE,GAAG,CAAC,IAAI,CAAC,0CAA0C,IAAI,CAAC,YAAY,CAAC,QAAQ,2BAA2B,EAAE,iBAAiB,CAAC,CAAA;QAG5H,IAAI,CAAC,kBAAkB,GAAG,iBAAiB,CAAC,YAAY,CAAA;QAGxD,IAAI,CAAC,mBAAmB,EAAE,CAAA;IAC5B,CAAC;IAKO,mBAAmB;QACzB,IAAI,CAAC,GAAG,CAAC,EAAE,qCAAuD,CAAC,WAA8B,EAAE,cAAsB,EAAE,EAAE;YAC3H,IAAI,CAAC,gCAAgC,CAAC,WAAwC,EAAE,cAAc,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;gBAC9G,GAAG,CAAC,KAAK,CAAC,gDAAgD,EAAE,KAAK,CAAC,CAAA;gBAElE,IAAI,CAAC,GAAG,CAAC,4BAA4B,CAAC,cAAc,CAAC,CAAA;YACvD,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;QAEF,IAAI,CAAC,GAAG,CAAC,EAAE,sCAAwD,CAAC,gBAAwB,EAAE,YAAoB,EAAE,WAA8B,EAAE,EAAE;YACpJ,IAAI,CAAC,iCAAiC,CAAC,gBAAgB,EAAE,YAAY,EAAE,WAAwC,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;gBAC/H,GAAG,CAAC,KAAK,CAAC,6CAA6C,gBAAgB,GAAG,EAAE,KAAK,CAAC,CAAA;YACpF,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;QAEF,IAAI,CAAC,GAAG,CAAC,EAAE,oCAAsD,CAAC,WAA8B,EAAE,EAAE;YAClG,IAAI,CAAC,+BAA+B,CAAC,WAAwC,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;gBAC7F,GAAG,CAAC,KAAK,CAAC,+CAA+C,EAAE,KAAK,CAAC,CAAA;YACnE,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;QAEF,IAAI,CAAC,GAAG,CAAC,EAAE,wCAA0D,CAAC,gBAAwB,EAAE,YAAoB,EAAE,WAA8B,EAAE,EAAE;YACtJ,IAAI,CAAC,mCAAmC,CAAC,gBAAgB,EAAE,YAAY,EAAE,WAAwC,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;gBACjI,GAAG,CAAC,KAAK,CAAC,+CAA+C,gBAAgB,GAAG,EAAE,KAAK,CAAC,CAAA;YACtF,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;QAEF,IAAI,CAAC,GAAG,CAAC,EAAE,wCAA0D,CAAC,WAA8B,EAAE,EAAE;YACtG,IAAI,CAAC,mCAAmC,CAAC,WAAwC,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;gBACjG,GAAG,CAAC,KAAK,CAAC,mDAAmD,EAAE,KAAK,CAAC,CAAA;YACvE,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;QAEF,IAAI,CAAC,GAAG,CAAC,EAAE,+BAAiD,CAAC,IAAY,EAAE,OAAe,EAAE,UAAmC,EAAE,MAAe,EAAE,EAAE;YAClJ,IAAI,CAAC,0BAA0B,CAAC,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;gBACjF,GAAG,CAAC,KAAK,CAAC,+CAA+C,IAAI,GAAG,EAAE,KAAK,CAAC,CAAA;YAC1E,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;IACJ,CAAC;IAOD,KAAK,CAAC,gCAAgC,CAAC,WAAsC,EAAE,cAAsB;QACnG,GAAG,CAAC,IAAI,CAAC,cAAc,WAAW,CAAC,MAAM,4BAA4B,WAAW,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,sBAAsB,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC,CAAA;QAE9J,IAAI,CAAC;YAEH,MAAM,iBAAiB,GAAG,mBAAmB,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAA;YAErE,KAAK,MAAM,SAAS,IAAI,WAAW,EAAE,CAAC;gBACpC,IAAI,CAAC;oBAEH,IAAI,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC;wBACnD,GAAG,CAAC,IAAI,CAAC,6BAA6B,SAAS,CAAC,WAAW,KAAK,SAAS,CAAC,IAAI,wBAAwB,CAAC,CAAA;wBACvG,SAAQ;oBACV,CAAC;oBAGD,MAAM,MAAM,GAAG,MAAM,8BAA8B,CAAC,SAAS,EAAE;wBAC7D,WAAW,EAAE,IAAI,CAAC,mBAAmB;wBACrC,iBAAiB;wBACjB,gBAAgB,EAAE,IAAI,CAAC,aAAa,CAAC,gBAAgB;qBACtD,CAAC,CAAA;oBAEF,IAAI,CAAC,MAAM,EAAE,CAAC;wBAEZ,SAAQ;oBACV,CAAC;oBAGD,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,CAAA;oBAI7D,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;wBACjB,OAAO,CAAC,IAAI,CAAC;4BACX,EAAE,EAAE,aAAa;4BACjB,IAAI,EAAE;gCACJ,IAAI,EAAE,4BAA4B;gCAClC,IAAI,EAAE;oCACJ,sBAAsB,EAAE,MAAM,CAAC,QAAQ;oCACvC,mBAAmB,EAAE,IAAI,CAAC,YAAY,CAAC,QAAQ;iCAChD;6BACF;yBACF,CAAC,CAAA;oBACJ,CAAC;oBAGD,IAAI,MAAM,CAAC,iBAAiB,CAAC,MAAM,IAAI,MAAM,CAAC,iBAAiB,CAAC,iBAAiB,EAAE,CAAC;wBAClF,GAAG,CAAC,IAAI,CAAC,8BAA8B,SAAS,CAAC,WAAW,GAAG,CAAC,CAAA;wBAChE,GAAG,CAAC,IAAI,CAAC,eAAe,MAAM,CAAC,iBAAiB,CAAC,MAAM,EAAE,CAAC,CAAA;wBAC1D,GAAG,CAAC,IAAI,CAAC,mBAAmB,MAAM,CAAC,iBAAiB,CAAC,iBAAiB,EAAE,CAAC,CAAA;oBAC3E,CAAC;gBACH,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,GAAG,CAAC,KAAK,CAAC,+CAA+C,SAAS,CAAC,WAAW,GAAG,EAAE,KAAK,CAAC,CAAA;gBAC3F,CAAC;YACH,CAAC;QACH,CAAC;gBAAS,CAAC;YAET,IAAI,CAAC,GAAG,CAAC,4BAA4B,CAAC,cAAc,CAAC,CAAA;QACvD,CAAC;IACH,CAAC;IAMD,mBAAmB;QACjB,IAAI,CAAC,IAAI,CAAC,YAAY,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;YAC7C,OAAO,SAAS,CAAA;QAClB,CAAC;QAED,MAAM,iBAAiB,GAAG,IAAI,CAAC,YAAY,CAAC,oBAAoB,EAAE,CAAA;QAClE,OAAO;YACL,MAAM,EAAE,iBAAiB,CAAC,MAAM;YAChC,iBAAiB,EAAE,iBAAiB,CAAC,iBAAiB;YACtD,YAAY,EAAE,IAAI,CAAC,kBAAkB,IAAI,iBAAiB,CAAC,YAAY;YACvE,YAAY,EAAE,iBAAiB,CAAC,YAAY,IAAI,KAAK;YACrD,WAAW,EAAE,IAAI,CAAC,YAAY,CAAC,cAAc,EAAE,CAAC,MAAM;SACvD,CAAA;IACH,CAAC;IAKD,eAAe;QACb,OAAO,IAAI,CAAC,YAAY,KAAK,SAAS,CAAA;IACxC,CAAC;IAMQ,qBAAqB;QAC5B,GAAG,CAAC,KAAK,CAAC,qDAAqD,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC,CAAA;QAC5F,KAAK,CAAC,qBAAqB,EAAE,CAAA;IAC/B,CAAC;IAMQ,sBAAsB;QAC7B,GAAG,CAAC,KAAK,CAAC,sDAAsD,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC,CAAA;QAC7F,KAAK,CAAC,sBAAsB,EAAE,CAAA;IAChC,CAAC;IAKD,qBAAqB;QACnB,MAAM,WAAW,GAAoB,EAAE,CAAA;QAEvC,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACtB,MAAM,iBAAiB,GAAG,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAC5D,IAAI,CAAC,YAAY,CAAC,QAAQ,EAC1B,OAAO,EACP,IAAI,CAAC,YAAY,CAAC,IAAI,IAAI,cAAc,CACzC,CAAA;YACD,WAAW,CAAC,IAAI,CAAC,GAAG,iBAAiB,CAAC,CAAA;QACxC,CAAC;QAGD,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,qBAAqB,CAAC,MAAM,EAAE,EAAE,CAAC;YACzD,MAAM,mBAAmB,GAAG,MAAM,CAAC,kBAAkB,CACnD,MAAM,CAAC,QAAQ,EACf,UAAU,EACV,MAAM,CAAC,UAAU,CAClB,CAAA;YACD,WAAW,CAAC,IAAI,CAAC,GAAG,mBAAmB,CAAC,CAAA;QAC1C,CAAC;QAED,OAAO,WAAW,CAAA;IACpB,CAAC;IAQD,gBAAgB,CAAC,IAAY;QAE3B,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACtB,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAA;YACrD,IAAI,IAAI,EAAE,CAAC;gBACT,OAAO,IAAI,CAAA;YACb,CAAC;QACH,CAAC;QAGD,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,qBAAqB,CAAC,MAAM,EAAE,EAAE,CAAC;YACzD,MAAM,IAAI,GAAG,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAA;YAC1C,IAAI,IAAI,EAAE,CAAC;gBACT,OAAO,IAAI,CAAA;YACb,CAAC;QACH,CAAC;QAED,OAAO,SAAS,CAAA;IAClB,CAAC;IAKD,KAAK,CAAC,QAAQ;QAEZ,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACtB,GAAG,CAAC,KAAK,CAAC,2CAA2C,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC,CAAA;YAClF,IAAI,CAAC;gBACH,MAAM,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,CAAA;YAChC,CAAC;YAAC,OAAO,KAAc,EAAE,CAAC;gBACxB,GAAG,CAAC,KAAK,CAAC,+BAA+B,EAAE,KAAK,CAAC,CAAA;YACnD,CAAC;QACH,CAAC;QAGD,KAAK,MAAM,CAAC,IAAI,EAAE,YAAY,CAAC,IAAI,IAAI,CAAC,qBAAqB,EAAE,CAAC;YAC9D,GAAG,CAAC,KAAK,CAAC,uCAAuC,IAAI,EAAE,CAAC,CAAA;YACxD,IAAI,CAAC;gBACH,MAAM,YAAY,CAAC,IAAI,EAAE,CAAA;YAC3B,CAAC;YAAC,OAAO,KAAc,EAAE,CAAC;gBACxB,GAAG,CAAC,KAAK,CAAC,6CAA6C,IAAI,GAAG,EAAE,KAAK,CAAC,CAAA;YACxE,CAAC;QACH,CAAC;QACD,IAAI,CAAC,qBAAqB,CAAC,KAAK,EAAE,CAAA;IACpC,CAAC;CACF"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ClusterCommandMapper.d.ts","sourceRoot":"","sources":["../../src/matter/ClusterCommandMapper.ts"],"names":[],"mappings":"AAwVA,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAClC;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,GAAG,IAAI,CAiB5D"}
|
|
@@ -0,0 +1,222 @@
|
|
|
1
|
+
const CLUSTER_COMMAND_MAPPINGS = {
|
|
2
|
+
onOff: {
|
|
3
|
+
map: (attributes) => {
|
|
4
|
+
if ('onOff' in attributes) {
|
|
5
|
+
return {
|
|
6
|
+
command: attributes.onOff ? 'on' : 'off',
|
|
7
|
+
};
|
|
8
|
+
}
|
|
9
|
+
return null;
|
|
10
|
+
},
|
|
11
|
+
},
|
|
12
|
+
levelControl: {
|
|
13
|
+
map: (attributes) => {
|
|
14
|
+
if ('currentLevel' in attributes) {
|
|
15
|
+
return {
|
|
16
|
+
command: 'moveToLevelWithOnOff',
|
|
17
|
+
args: { level: attributes.currentLevel },
|
|
18
|
+
};
|
|
19
|
+
}
|
|
20
|
+
return null;
|
|
21
|
+
},
|
|
22
|
+
},
|
|
23
|
+
colorControl: {
|
|
24
|
+
map: (attributes) => {
|
|
25
|
+
if ('colorTemperatureMireds' in attributes) {
|
|
26
|
+
return {
|
|
27
|
+
command: 'moveToColorTemperature',
|
|
28
|
+
args: {
|
|
29
|
+
colorTemperatureMireds: attributes.colorTemperatureMireds,
|
|
30
|
+
transitionTime: attributes.transitionTime ?? 0,
|
|
31
|
+
optionsMask: 1,
|
|
32
|
+
optionsOverride: 1,
|
|
33
|
+
},
|
|
34
|
+
};
|
|
35
|
+
}
|
|
36
|
+
if ('colorX' in attributes && 'colorY' in attributes) {
|
|
37
|
+
return {
|
|
38
|
+
command: 'moveToColor',
|
|
39
|
+
args: {
|
|
40
|
+
colorX: attributes.colorX,
|
|
41
|
+
colorY: attributes.colorY,
|
|
42
|
+
transitionTime: attributes.transitionTime ?? 0,
|
|
43
|
+
optionsMask: 1,
|
|
44
|
+
optionsOverride: 1,
|
|
45
|
+
},
|
|
46
|
+
};
|
|
47
|
+
}
|
|
48
|
+
if ('currentHue' in attributes || 'currentSaturation' in attributes) {
|
|
49
|
+
return {
|
|
50
|
+
command: 'moveToHueAndSaturation',
|
|
51
|
+
args: {
|
|
52
|
+
hue: attributes.currentHue ?? 0,
|
|
53
|
+
saturation: attributes.currentSaturation ?? 0,
|
|
54
|
+
transitionTime: attributes.transitionTime ?? 0,
|
|
55
|
+
optionsMask: 1,
|
|
56
|
+
optionsOverride: 1,
|
|
57
|
+
},
|
|
58
|
+
};
|
|
59
|
+
}
|
|
60
|
+
return null;
|
|
61
|
+
},
|
|
62
|
+
},
|
|
63
|
+
fanControl: {
|
|
64
|
+
map: (attributes) => {
|
|
65
|
+
if ('_command' in attributes && attributes._command === 'step') {
|
|
66
|
+
return {
|
|
67
|
+
command: 'step',
|
|
68
|
+
args: {
|
|
69
|
+
direction: attributes.direction ?? 0,
|
|
70
|
+
wrap: attributes.wrap ?? false,
|
|
71
|
+
lowestOff: attributes.lowestOff ?? true,
|
|
72
|
+
},
|
|
73
|
+
};
|
|
74
|
+
}
|
|
75
|
+
if ('fanMode' in attributes) {
|
|
76
|
+
return null;
|
|
77
|
+
}
|
|
78
|
+
if ('percentSetting' in attributes) {
|
|
79
|
+
return null;
|
|
80
|
+
}
|
|
81
|
+
return null;
|
|
82
|
+
},
|
|
83
|
+
},
|
|
84
|
+
windowCovering: {
|
|
85
|
+
map: (attributes) => {
|
|
86
|
+
if ('_command' in attributes) {
|
|
87
|
+
const cmd = attributes._command;
|
|
88
|
+
if (cmd === 'upOrOpen' || cmd === 'downOrClose' || cmd === 'stopMotion') {
|
|
89
|
+
return { command: cmd };
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
if ('targetPositionLiftPercent100ths' in attributes) {
|
|
93
|
+
return {
|
|
94
|
+
command: 'goToLiftPercentage',
|
|
95
|
+
args: {
|
|
96
|
+
liftPercent100thsValue: attributes.targetPositionLiftPercent100ths,
|
|
97
|
+
},
|
|
98
|
+
};
|
|
99
|
+
}
|
|
100
|
+
if ('targetPositionTiltPercent100ths' in attributes) {
|
|
101
|
+
return {
|
|
102
|
+
command: 'goToTiltPercentage',
|
|
103
|
+
args: {
|
|
104
|
+
tiltPercent100thsValue: attributes.targetPositionTiltPercent100ths,
|
|
105
|
+
},
|
|
106
|
+
};
|
|
107
|
+
}
|
|
108
|
+
return null;
|
|
109
|
+
},
|
|
110
|
+
},
|
|
111
|
+
doorLock: {
|
|
112
|
+
map: (attributes) => {
|
|
113
|
+
if ('_command' in attributes) {
|
|
114
|
+
const cmd = attributes._command;
|
|
115
|
+
if (cmd === 'lockDoor' || cmd === 'unlockDoor') {
|
|
116
|
+
return { command: cmd };
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
if ('lockState' in attributes) {
|
|
120
|
+
return {
|
|
121
|
+
command: attributes.lockState === 1 ? 'lockDoor' : 'unlockDoor',
|
|
122
|
+
};
|
|
123
|
+
}
|
|
124
|
+
return null;
|
|
125
|
+
},
|
|
126
|
+
},
|
|
127
|
+
thermostat: {
|
|
128
|
+
map: (attributes) => {
|
|
129
|
+
if ('_command' in attributes && attributes._command === 'setpointRaiseLower') {
|
|
130
|
+
return {
|
|
131
|
+
command: 'setpointRaiseLower',
|
|
132
|
+
args: {
|
|
133
|
+
mode: attributes.mode ?? 0,
|
|
134
|
+
amount: attributes.amount ?? 10,
|
|
135
|
+
},
|
|
136
|
+
};
|
|
137
|
+
}
|
|
138
|
+
if ('systemMode' in attributes) {
|
|
139
|
+
return null;
|
|
140
|
+
}
|
|
141
|
+
if ('occupiedHeatingSetpoint' in attributes) {
|
|
142
|
+
return null;
|
|
143
|
+
}
|
|
144
|
+
if ('occupiedCoolingSetpoint' in attributes) {
|
|
145
|
+
return null;
|
|
146
|
+
}
|
|
147
|
+
return null;
|
|
148
|
+
},
|
|
149
|
+
},
|
|
150
|
+
rvcOperationalState: {
|
|
151
|
+
map: (attributes) => {
|
|
152
|
+
if ('_command' in attributes) {
|
|
153
|
+
return { command: attributes._command };
|
|
154
|
+
}
|
|
155
|
+
if ('operationalState' in attributes) {
|
|
156
|
+
const state = attributes.operationalState;
|
|
157
|
+
switch (state) {
|
|
158
|
+
case 0:
|
|
159
|
+
return { command: 'stop' };
|
|
160
|
+
case 1:
|
|
161
|
+
return { command: 'resume' };
|
|
162
|
+
case 2:
|
|
163
|
+
return { command: 'pause' };
|
|
164
|
+
default:
|
|
165
|
+
return null;
|
|
166
|
+
}
|
|
167
|
+
}
|
|
168
|
+
return null;
|
|
169
|
+
},
|
|
170
|
+
},
|
|
171
|
+
rvcRunMode: {
|
|
172
|
+
map: (attributes) => {
|
|
173
|
+
if ('currentMode' in attributes) {
|
|
174
|
+
return {
|
|
175
|
+
command: 'changeToMode',
|
|
176
|
+
args: { newMode: attributes.currentMode },
|
|
177
|
+
};
|
|
178
|
+
}
|
|
179
|
+
return null;
|
|
180
|
+
},
|
|
181
|
+
},
|
|
182
|
+
rvcCleanMode: {
|
|
183
|
+
map: (attributes) => {
|
|
184
|
+
if ('currentMode' in attributes) {
|
|
185
|
+
return {
|
|
186
|
+
command: 'changeToMode',
|
|
187
|
+
args: { newMode: attributes.currentMode },
|
|
188
|
+
};
|
|
189
|
+
}
|
|
190
|
+
return null;
|
|
191
|
+
},
|
|
192
|
+
},
|
|
193
|
+
serviceArea: {
|
|
194
|
+
map: (attributes) => {
|
|
195
|
+
if ('selectedAreas' in attributes && Array.isArray(attributes.selectedAreas)) {
|
|
196
|
+
return {
|
|
197
|
+
command: 'selectAreas',
|
|
198
|
+
args: { newAreas: attributes.selectedAreas },
|
|
199
|
+
};
|
|
200
|
+
}
|
|
201
|
+
if ('skipArea' in attributes) {
|
|
202
|
+
return {
|
|
203
|
+
command: 'skipArea',
|
|
204
|
+
args: { skippedArea: attributes.skipArea },
|
|
205
|
+
};
|
|
206
|
+
}
|
|
207
|
+
return null;
|
|
208
|
+
},
|
|
209
|
+
},
|
|
210
|
+
};
|
|
211
|
+
export function mapAttributesToCommand(cluster, attributes) {
|
|
212
|
+
const mapping = CLUSTER_COMMAND_MAPPINGS[cluster];
|
|
213
|
+
if (!mapping) {
|
|
214
|
+
throw new Error(`Command mapping not implemented for cluster: ${cluster}`);
|
|
215
|
+
}
|
|
216
|
+
const result = mapping.map(attributes);
|
|
217
|
+
if (result === null) {
|
|
218
|
+
return null;
|
|
219
|
+
}
|
|
220
|
+
return result;
|
|
221
|
+
}
|
|
222
|
+
//# sourceMappingURL=ClusterCommandMapper.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ClusterCommandMapper.js","sourceRoot":"","sources":["../../src/matter/ClusterCommandMapper.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
import type { InternalMatterAccessory } from './types.js';
|
|
2
|
+
import { MatterServer } from './server.js';
|
|
3
|
+
export interface ExternalAccessoryPublishContext {
|
|
4
|
+
portService: {
|
|
5
|
+
requestMatterPort: (uniqueId: string) => Promise<number | null | undefined>;
|
|
6
|
+
};
|
|
7
|
+
networkInterfaces?: string[];
|
|
8
|
+
debugModeEnabled?: boolean;
|
|
9
|
+
}
|
|
10
|
+
export interface PublishedExternalAccessory {
|
|
11
|
+
server: MatterServer;
|
|
12
|
+
port: number;
|
|
13
|
+
username: string;
|
|
14
|
+
commissioningInfo: {
|
|
15
|
+
qrCode?: string;
|
|
16
|
+
manualPairingCode?: string;
|
|
17
|
+
serialNumber?: string;
|
|
18
|
+
commissioned: boolean;
|
|
19
|
+
};
|
|
20
|
+
}
|
|
21
|
+
export declare function publishExternalMatterAccessory(accessory: InternalMatterAccessory, context: ExternalAccessoryPublishContext): Promise<PublishedExternalAccessory | null>;
|
|
22
|
+
//# sourceMappingURL=ExternalMatterAccessoryPublisher.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ExternalMatterAccessoryPublisher.d.ts","sourceRoot":"","sources":["../../src/matter/ExternalMatterAccessoryPublisher.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,YAAY,CAAA;AAKzD,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAO1C,MAAM,WAAW,+BAA+B;IAE9C,WAAW,EAAE;QACX,iBAAiB,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC,CAAA;KAC5E,CAAA;IAED,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAA;IAE5B,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAC3B;AAKD,MAAM,WAAW,0BAA0B;IAEzC,MAAM,EAAE,YAAY,CAAA;IAEpB,IAAI,EAAE,MAAM,CAAA;IAEZ,QAAQ,EAAE,MAAM,CAAA;IAEhB,iBAAiB,EAAE;QACjB,MAAM,CAAC,EAAE,MAAM,CAAA;QACf,iBAAiB,CAAC,EAAE,MAAM,CAAA;QAC1B,YAAY,CAAC,EAAE,MAAM,CAAA;QACrB,YAAY,EAAE,OAAO,CAAA;KACtB,CAAA;CACF;AAWD,wBAAsB,8BAA8B,CAClD,SAAS,EAAE,uBAAuB,EAClC,OAAO,EAAE,+BAA+B,GACvC,OAAO,CAAC,0BAA0B,GAAG,IAAI,CAAC,CAiE5C"}
|
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
import { Logger } from '../logger.js';
|
|
2
|
+
import { User } from '../user.js';
|
|
3
|
+
import { generate } from '../util/mac.js';
|
|
4
|
+
import { MatterServer } from './server.js';
|
|
5
|
+
const log = Logger.withPrefix('Matter/External');
|
|
6
|
+
export async function publishExternalMatterAccessory(accessory, context) {
|
|
7
|
+
if (!accessory.UUID) {
|
|
8
|
+
log.error('External Matter accessory missing UUID - skipping');
|
|
9
|
+
return null;
|
|
10
|
+
}
|
|
11
|
+
if (!accessory.displayName) {
|
|
12
|
+
log.error(`External Matter accessory ${accessory.UUID} missing displayName - skipping`);
|
|
13
|
+
return null;
|
|
14
|
+
}
|
|
15
|
+
const advertiseAddress = generate(accessory.UUID);
|
|
16
|
+
const uniqueId = advertiseAddress.replace(/:/g, '');
|
|
17
|
+
const port = await context.portService.requestMatterPort(uniqueId);
|
|
18
|
+
if (!port) {
|
|
19
|
+
log.error(`Failed to allocate Matter port for external Matter accessory ${accessory.displayName}`);
|
|
20
|
+
log.error('Please configure matterPorts in config.json or free up ports in the default range (5530-5541)');
|
|
21
|
+
return null;
|
|
22
|
+
}
|
|
23
|
+
log.info(`Allocated port ${port} for external Matter accessory: ${accessory.displayName}`);
|
|
24
|
+
const matterServer = new MatterServer({
|
|
25
|
+
port,
|
|
26
|
+
uniqueId,
|
|
27
|
+
storagePath: User.matterPath(),
|
|
28
|
+
manufacturer: accessory.manufacturer,
|
|
29
|
+
model: accessory.model,
|
|
30
|
+
firmwareRevision: accessory.firmwareRevision,
|
|
31
|
+
serialNumber: accessory.serialNumber || uniqueId,
|
|
32
|
+
debugModeEnabled: context.debugModeEnabled,
|
|
33
|
+
externalAccessory: true,
|
|
34
|
+
networkInterfaces: context.networkInterfaces,
|
|
35
|
+
});
|
|
36
|
+
await matterServer.start();
|
|
37
|
+
const pluginIdentifier = accessory._associatedPlugin || 'unknown';
|
|
38
|
+
await matterServer.registerPlatformAccessories(pluginIdentifier, 'ExternalMatter', [accessory]);
|
|
39
|
+
await matterServer.runServer();
|
|
40
|
+
log.info(`✓ External Matter accessory published: ${accessory.displayName} on port ${port} (bridge ${advertiseAddress})`);
|
|
41
|
+
const commissioningInfo = matterServer.getCommissioningInfo();
|
|
42
|
+
return {
|
|
43
|
+
server: matterServer,
|
|
44
|
+
port,
|
|
45
|
+
username: advertiseAddress,
|
|
46
|
+
commissioningInfo,
|
|
47
|
+
};
|
|
48
|
+
}
|
|
49
|
+
//# sourceMappingURL=ExternalMatterAccessoryPublisher.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ExternalMatterAccessoryPublisher.js","sourceRoot":"","sources":["../../src/matter/ExternalMatterAccessoryPublisher.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AACrC,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AACjC,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAE1C,MAAM,GAAG,GAAG,MAAM,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAA;AA4ChD,MAAM,CAAC,KAAK,UAAU,8BAA8B,CAClD,SAAkC,EAClC,OAAwC;IAGxC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;QACpB,GAAG,CAAC,KAAK,CAAC,mDAAmD,CAAC,CAAA;QAC9D,OAAO,IAAI,CAAA;IACb,CAAC;IAED,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC;QAC3B,GAAG,CAAC,KAAK,CAAC,6BAA6B,SAAS,CAAC,IAAI,iCAAiC,CAAC,CAAA;QACvF,OAAO,IAAI,CAAA;IACb,CAAC;IAGD,MAAM,gBAAgB,GAAG,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;IAGjD,MAAM,QAAQ,GAAG,gBAAgB,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;IAGnD,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAA;IAClE,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,GAAG,CAAC,KAAK,CAAC,gEAAgE,SAAS,CAAC,WAAW,EAAE,CAAC,CAAA;QAClG,GAAG,CAAC,KAAK,CAAC,+FAA+F,CAAC,CAAA;QAC1G,OAAO,IAAI,CAAA;IACb,CAAC;IAED,GAAG,CAAC,IAAI,CAAC,kBAAkB,IAAI,mCAAmC,SAAS,CAAC,WAAW,EAAE,CAAC,CAAA;IAG1F,MAAM,YAAY,GAAG,IAAI,YAAY,CAAC;QACpC,IAAI;QACJ,QAAQ;QACR,WAAW,EAAE,IAAI,CAAC,UAAU,EAAE;QAC9B,YAAY,EAAE,SAAS,CAAC,YAAY;QACpC,KAAK,EAAE,SAAS,CAAC,KAAK;QACtB,gBAAgB,EAAE,SAAS,CAAC,gBAAgB;QAC5C,YAAY,EAAE,SAAS,CAAC,YAAY,IAAI,QAAQ;QAChD,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;QAC1C,iBAAiB,EAAE,IAAI;QACvB,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;KAC7C,CAAC,CAAA;IAGF,MAAM,YAAY,CAAC,KAAK,EAAE,CAAA;IAG1B,MAAM,gBAAgB,GAAG,SAAS,CAAC,iBAAiB,IAAI,SAAS,CAAA;IAGjE,MAAM,YAAY,CAAC,2BAA2B,CAAC,gBAAgB,EAAE,gBAAgB,EAAE,CAAC,SAAS,CAAC,CAAC,CAAA;IAG/F,MAAM,YAAY,CAAC,SAAS,EAAE,CAAA;IAE9B,GAAG,CAAC,IAAI,CAAC,0CAA0C,SAAS,CAAC,WAAW,YAAY,IAAI,YAAY,gBAAgB,GAAG,CAAC,CAAA;IAGxH,MAAM,iBAAiB,GAAG,YAAY,CAAC,oBAAoB,EAAE,CAAA;IAE7D,OAAO;QACL,MAAM,EAAE,YAAY;QACpB,IAAI;QACJ,QAAQ,EAAE,gBAAgB;QAC1B,iBAAiB;KAClB,CAAA;AACH,CAAC"}
|