homebridge 2.0.0-alpha.43 → 2.0.0-alpha.45
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/api.d.ts +37 -7
- package/dist/api.d.ts.map +1 -1
- package/dist/api.js +30 -4
- package/dist/api.js.map +1 -1
- package/dist/bridgeService.d.ts +5 -16
- package/dist/bridgeService.d.ts.map +1 -1
- package/dist/bridgeService.js +8 -24
- package/dist/bridgeService.js.map +1 -1
- package/dist/childBridgeFork.d.ts +3 -15
- package/dist/childBridgeFork.d.ts.map +1 -1
- package/dist/childBridgeFork.js +46 -181
- package/dist/childBridgeFork.js.map +1 -1
- package/dist/childBridgeService.d.ts +20 -43
- package/dist/childBridgeService.d.ts.map +1 -1
- package/dist/childBridgeService.js +23 -66
- package/dist/childBridgeService.js.map +1 -1
- package/dist/cli.d.ts.map +1 -1
- package/dist/cli.js +1 -3
- package/dist/cli.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/ipcService.d.ts +23 -21
- package/dist/ipcService.d.ts.map +1 -1
- package/dist/ipcService.js +0 -15
- package/dist/ipcService.js.map +1 -1
- package/dist/matter/index.d.ts +1 -1
- package/dist/matter/index.d.ts.map +1 -1
- package/dist/matter/index.js.map +1 -1
- package/dist/matter/matterAccessoryCache.d.ts +73 -0
- package/dist/matter/matterAccessoryCache.d.ts.map +1 -0
- package/dist/matter/matterAccessoryCache.js +168 -0
- package/dist/matter/matterAccessoryCache.js.map +1 -0
- package/dist/matter/matterBehaviors.d.ts +123 -0
- package/dist/matter/matterBehaviors.d.ts.map +1 -0
- package/dist/matter/matterBehaviors.js +582 -0
- package/dist/matter/matterBehaviors.js.map +1 -0
- package/dist/matter/matterConfigValidator.d.ts +0 -1
- package/dist/matter/matterConfigValidator.d.ts.map +1 -1
- package/dist/matter/matterConfigValidator.js +15 -45
- package/dist/matter/matterConfigValidator.js.map +1 -1
- package/dist/matter/matterErrorHandler.d.ts +1 -1
- package/dist/matter/matterErrorHandler.d.ts.map +1 -1
- package/dist/matter/matterErrorHandler.js +35 -22
- package/dist/matter/matterErrorHandler.js.map +1 -1
- package/dist/matter/matterNetworkMonitor.d.ts +3 -0
- package/dist/matter/matterNetworkMonitor.d.ts.map +1 -1
- package/dist/matter/matterNetworkMonitor.js +49 -26
- package/dist/matter/matterNetworkMonitor.js.map +1 -1
- package/dist/matter/matterServer.d.ts +79 -9
- package/dist/matter/matterServer.d.ts.map +1 -1
- package/dist/matter/matterServer.js +491 -111
- package/dist/matter/matterServer.js.map +1 -1
- package/dist/matter/matterSharedTypes.d.ts +36 -16
- package/dist/matter/matterSharedTypes.d.ts.map +1 -1
- package/dist/matter/matterSharedTypes.js +0 -3
- package/dist/matter/matterSharedTypes.js.map +1 -1
- package/dist/matter/matterStorage.d.ts +11 -1
- package/dist/matter/matterStorage.d.ts.map +1 -1
- package/dist/matter/matterStorage.js +12 -2
- package/dist/matter/matterStorage.js.map +1 -1
- package/dist/matter/matterTypes.d.ts +69 -20
- package/dist/matter/matterTypes.d.ts.map +1 -1
- package/dist/matter/matterTypes.js.map +1 -1
- package/dist/matter/matterValidation.d.ts +57 -0
- package/dist/matter/matterValidation.d.ts.map +1 -0
- package/dist/matter/matterValidation.js +97 -0
- package/dist/matter/matterValidation.js.map +1 -0
- package/dist/plugin.d.ts.map +1 -1
- package/dist/plugin.js +2 -4
- package/dist/plugin.js.map +1 -1
- package/dist/server.d.ts +0 -12
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +97 -280
- package/dist/server.js.map +1 -1
- package/package.json +3 -3
- package/dist/bridgeTypes.d.ts +0 -54
- package/dist/bridgeTypes.d.ts.map +0 -1
- package/dist/bridgeTypes.js +0 -8
- package/dist/bridgeTypes.js.map +0 -1
- package/dist/matter/matterDiagnostics.d.ts +0 -121
- package/dist/matter/matterDiagnostics.d.ts.map +0 -1
- package/dist/matter/matterDiagnostics.js +0 -323
- package/dist/matter/matterDiagnostics.js.map +0 -1
package/dist/childBridgeFork.js
CHANGED
|
@@ -5,7 +5,6 @@ import { HomebridgeAPI } from './api.js';
|
|
|
5
5
|
import { BridgeService } from './bridgeService.js';
|
|
6
6
|
import { ChildBridgeExternalPortService } from './externalPortService.js';
|
|
7
7
|
import { Logger } from './logger.js';
|
|
8
|
-
import { PlatformAccessory } from './platformAccessory.js';
|
|
9
8
|
import { PluginManager } from './pluginManager.js';
|
|
10
9
|
import { User } from './user.js';
|
|
11
10
|
import 'source-map-support/register.js';
|
|
@@ -27,7 +26,6 @@ export class ChildBridgeFork {
|
|
|
27
26
|
pluginConfig;
|
|
28
27
|
bridgeConfig;
|
|
29
28
|
bridgeOptions;
|
|
30
|
-
homebridgeConfig;
|
|
31
29
|
portRequestCallback = new Map();
|
|
32
30
|
constructor() {
|
|
33
31
|
// tell the parent process we are ready to accept plugin config
|
|
@@ -48,7 +46,6 @@ export class ChildBridgeFork {
|
|
|
48
46
|
this.pluginConfig = data.pluginConfig;
|
|
49
47
|
this.bridgeConfig = data.bridgeConfig;
|
|
50
48
|
this.bridgeOptions = data.bridgeOptions;
|
|
51
|
-
this.homebridgeConfig = data.homebridgeConfig;
|
|
52
49
|
// remove the _bridge key (some plugins do not like unknown config)
|
|
53
50
|
for (const config of this.pluginConfig) {
|
|
54
51
|
delete config._bridge;
|
|
@@ -63,8 +60,10 @@ export class ChildBridgeFork {
|
|
|
63
60
|
if (this.bridgeOptions.forceColourLogging) {
|
|
64
61
|
Logger.forceColor();
|
|
65
62
|
}
|
|
63
|
+
if (this.bridgeOptions.customStoragePath) {
|
|
64
|
+
User.setStoragePath(this.bridgeOptions.customStoragePath);
|
|
65
|
+
}
|
|
66
66
|
// Initialize HAP-NodeJS with a custom persist directory
|
|
67
|
-
// The storage path is already set from the parent process environment
|
|
68
67
|
HAPStorage.setCustomStoragePath(User.persistPath());
|
|
69
68
|
// load api
|
|
70
69
|
this.api = new HomebridgeAPI();
|
|
@@ -81,46 +80,28 @@ export class ChildBridgeFork {
|
|
|
81
80
|
});
|
|
82
81
|
}
|
|
83
82
|
async startBridge() {
|
|
84
|
-
// Check if this is a Matter-only bridge
|
|
85
|
-
const isMatterOnlyBridge = this.bridgeConfig.matterOnly === true;
|
|
86
83
|
// Check if Matter is configured
|
|
87
84
|
this.matterConfig = this.bridgeConfig.matter;
|
|
88
|
-
// Initialize Matter if it's configured
|
|
85
|
+
// Initialize Matter if it's configured
|
|
89
86
|
if (this.matterConfig) {
|
|
90
|
-
Logger.internal.debug(
|
|
87
|
+
Logger.internal.debug('Child bridge has Matter config (Combined HAP+Matter), starting Matter server');
|
|
91
88
|
// If Matter doesn't have a port configured, allocate one
|
|
92
89
|
if (!this.matterConfig.port) {
|
|
93
90
|
// Generate a unique username for Matter port allocation
|
|
94
|
-
const matterUsername =
|
|
95
|
-
? `matter-${this.plugin.getPluginIdentifier()}-${this.identifier}` // Use unique identifier for Matter-only
|
|
96
|
-
: `${this.bridgeConfig.username}:MATTER`;
|
|
91
|
+
const matterUsername = `${this.bridgeConfig.username}:MATTER`;
|
|
97
92
|
const matterPort = await this.externalPortService.requestPort(matterUsername);
|
|
98
|
-
|
|
99
|
-
|
|
93
|
+
if (!matterPort) {
|
|
94
|
+
throw new Error('Failed to allocate Matter port for child bridge. '
|
|
95
|
+
+ 'Please specify a port manually in the _bridge.matter configuration, or free up ports in the configured range.');
|
|
96
|
+
}
|
|
97
|
+
this.matterConfig.port = matterPort;
|
|
98
|
+
Logger.internal.debug(`Allocated Matter port: ${this.matterConfig.port} (HAP port: ${this.bridgeConfig.port})`);
|
|
100
99
|
}
|
|
101
100
|
// Start Matter server
|
|
102
101
|
await this.startMatterServer(this.matterConfig);
|
|
103
|
-
//
|
|
104
|
-
this.sendMatterStatusEvent();
|
|
105
|
-
}
|
|
106
|
-
// Skip HAP bridge initialization for Matter-only bridges
|
|
107
|
-
if (isMatterOnlyBridge) {
|
|
108
|
-
Logger.internal.info('Matter-only bridge - skipping HAP initialization');
|
|
109
|
-
// For Matter-only, we still need to instantiate the platform, just not publish HAP
|
|
110
|
-
await this.loadPlatformForMatterOnly();
|
|
111
|
-
this.api.signalFinished();
|
|
112
|
-
this.sendMessage("online" /* ChildProcessMessageEventType.ONLINE */);
|
|
113
|
-
return;
|
|
114
|
-
}
|
|
115
|
-
this.bridgeService = new BridgeService(this.api, this.pluginManager, this.externalPortService, this.bridgeOptions, this.bridgeConfig, this.homebridgeConfig);
|
|
116
|
-
// Only hook into accessory registration if Matter is configured
|
|
117
|
-
if (this.matterConfig && this.bridgeService.handleRegisterPlatformAccessories) {
|
|
118
|
-
const originalHandler = this.bridgeService.handleRegisterPlatformAccessories.bind(this.bridgeService);
|
|
119
|
-
this.bridgeService.handleRegisterPlatformAccessories = (accessories) => {
|
|
120
|
-
originalHandler(accessories);
|
|
121
|
-
this.handleAccessoryRegistration(accessories);
|
|
122
|
-
};
|
|
102
|
+
// Unified status with both HAP and Matter info will be sent when HAP bridge is advertised
|
|
123
103
|
}
|
|
104
|
+
this.bridgeService = new BridgeService(this.api, this.pluginManager, this.externalPortService, this.bridgeOptions, this.bridgeConfig);
|
|
124
105
|
// watch bridge events to check when server is online
|
|
125
106
|
this.bridgeService.bridge.on("advertised" /* AccessoryEventTypes.ADVERTISED */, () => {
|
|
126
107
|
this.sendPairedStatusEvent();
|
|
@@ -135,15 +116,8 @@ export class ChildBridgeFork {
|
|
|
135
116
|
});
|
|
136
117
|
// load the cached accessories
|
|
137
118
|
await this.bridgeService.loadCachedPlatformAccessoriesFromDisk();
|
|
138
|
-
// For combined HAP+Matter bridges, we should only process the platform once
|
|
139
|
-
// When _bridge.matter is configured alongside HAP, we only need to instantiate the platform once
|
|
140
|
-
let platformInstantiated = false;
|
|
141
119
|
for (const config of this.pluginConfig) {
|
|
142
120
|
if (this.type === "platform" /* PluginType.PLATFORM */) {
|
|
143
|
-
// Skip if we've already instantiated this platform (for combined HAP+Matter)
|
|
144
|
-
if (platformInstantiated) {
|
|
145
|
-
continue;
|
|
146
|
-
}
|
|
147
121
|
const plugin = this.pluginManager.getPluginForPlatform(this.identifier);
|
|
148
122
|
const displayName = config.name || plugin.getPluginIdentifier();
|
|
149
123
|
const logger = Logger.withPrefix(displayName);
|
|
@@ -151,16 +125,13 @@ export class ChildBridgeFork {
|
|
|
151
125
|
const platform = new constructor(logger, config, this.api);
|
|
152
126
|
if (HomebridgeAPI.isDynamicPlatformPlugin(platform)) {
|
|
153
127
|
plugin.assignDynamicPlatform(this.identifier, platform);
|
|
154
|
-
platformInstantiated = true;
|
|
155
128
|
}
|
|
156
129
|
else if (HomebridgeAPI.isStaticPlatformPlugin(platform)) { // Plugin 1.0, load accessories
|
|
157
130
|
await this.bridgeService.loadPlatformAccessories(plugin, platform, this.identifier, logger);
|
|
158
|
-
platformInstantiated = true;
|
|
159
131
|
}
|
|
160
132
|
else {
|
|
161
133
|
// otherwise it's a IndependentPlatformPlugin which doesn't expose any methods at all.
|
|
162
134
|
// We just call the constructor and let it be enabled.
|
|
163
|
-
platformInstantiated = true;
|
|
164
135
|
}
|
|
165
136
|
}
|
|
166
137
|
else if (this.type === "accessory" /* PluginType.ACCESSORY */) {
|
|
@@ -177,23 +148,6 @@ export class ChildBridgeFork {
|
|
|
177
148
|
const accessory = this.bridgeService.createHAPAccessory(plugin, accessoryInstance, displayName, this.identifier, config.uuid_base);
|
|
178
149
|
if (accessory) {
|
|
179
150
|
this.bridgeService.bridge.addBridgedAccessory(accessory);
|
|
180
|
-
// If Matter is configured, also add the accessory to Matter
|
|
181
|
-
if (this.matterConfig && this.matterServer) {
|
|
182
|
-
Logger.internal.debug(`[MATTER-ACCESSORY] Syncing accessory plugin ${displayName} to Matter`);
|
|
183
|
-
// Convert HAP accessory to PlatformAccessory for Matter
|
|
184
|
-
// Generate a valid UUID for the accessory
|
|
185
|
-
const uuid = this.api.hap.uuid.generate(`${plugin.getPluginIdentifier()}.${this.identifier}`);
|
|
186
|
-
const platformAccessory = new PlatformAccessory(displayName, uuid);
|
|
187
|
-
// Copy services from HAP accessory to platform accessory
|
|
188
|
-
accessory.services.forEach((service) => {
|
|
189
|
-
// Skip the AccessoryInformation service as PlatformAccessory already has one
|
|
190
|
-
if (service.UUID !== this.api.hap.Service.AccessoryInformation.UUID) {
|
|
191
|
-
platformAccessory.addService(service);
|
|
192
|
-
}
|
|
193
|
-
});
|
|
194
|
-
// Add to Matter
|
|
195
|
-
this.handleAccessoryRegistration([platformAccessory]);
|
|
196
|
-
}
|
|
197
151
|
}
|
|
198
152
|
else {
|
|
199
153
|
logger('Accessory %s returned empty set of services. Won\'t adding it to the bridge!', this.identifier);
|
|
@@ -202,51 +156,11 @@ export class ChildBridgeFork {
|
|
|
202
156
|
}
|
|
203
157
|
// restore the cached accessories
|
|
204
158
|
this.bridgeService.restoreCachedPlatformAccessories();
|
|
205
|
-
// If Matter is configured, sync all restored accessories to Matter
|
|
206
|
-
if (this.matterConfig && this.matterServer) {
|
|
207
|
-
const restoredAccessories = this.bridgeService.getCachedPlatformAccessories();
|
|
208
|
-
if (restoredAccessories && restoredAccessories.length > 0) {
|
|
209
|
-
Logger.internal.debug(`Syncing ${restoredAccessories.length} restored accessories to Matter`);
|
|
210
|
-
this.handleAccessoryRegistration(restoredAccessories);
|
|
211
|
-
}
|
|
212
|
-
}
|
|
213
159
|
this.bridgeService.publishBridge();
|
|
214
160
|
this.api.signalFinished();
|
|
215
161
|
// tell the parent we are online
|
|
216
162
|
this.sendMessage("online" /* ChildProcessMessageEventType.ONLINE */);
|
|
217
163
|
}
|
|
218
|
-
/**
|
|
219
|
-
* Load platform/accessory for Matter-only bridges (without HAP)
|
|
220
|
-
*/
|
|
221
|
-
async loadPlatformForMatterOnly() {
|
|
222
|
-
for (const config of this.pluginConfig) {
|
|
223
|
-
if (this.type === "platform" /* PluginType.PLATFORM */) {
|
|
224
|
-
const plugin = this.pluginManager.getPluginForPlatform(this.identifier);
|
|
225
|
-
const displayName = config.name || plugin.getPluginIdentifier();
|
|
226
|
-
const logger = Logger.withPrefix(displayName);
|
|
227
|
-
const constructor = plugin.getPlatformConstructor(this.identifier);
|
|
228
|
-
const platform = new constructor(logger, config, this.api);
|
|
229
|
-
if (HomebridgeAPI.isDynamicPlatformPlugin(platform)) {
|
|
230
|
-
plugin.assignDynamicPlatform(this.identifier, platform);
|
|
231
|
-
}
|
|
232
|
-
// For Matter-only, static platforms and independent platforms just get constructed
|
|
233
|
-
}
|
|
234
|
-
else if (this.type === "accessory" /* PluginType.ACCESSORY */) {
|
|
235
|
-
const plugin = this.pluginManager.getPluginForAccessory(this.identifier);
|
|
236
|
-
const displayName = config.name;
|
|
237
|
-
if (!displayName) {
|
|
238
|
-
Logger.internal.warn('Could not load accessory %s as it is missing the required \'name\' property!', this.identifier);
|
|
239
|
-
continue;
|
|
240
|
-
}
|
|
241
|
-
const logger = Logger.withPrefix(displayName);
|
|
242
|
-
const constructor = plugin.getAccessoryConstructor(this.identifier);
|
|
243
|
-
// eslint-disable-next-line unused-imports/no-unused-vars
|
|
244
|
-
const accessoryInstance = new constructor(logger, config, this.api);
|
|
245
|
-
// Accessories for Matter-only bridges are registered via api.matter.registerAccessory()
|
|
246
|
-
// We just instantiate them here to allow plugin initialization
|
|
247
|
-
}
|
|
248
|
-
}
|
|
249
|
-
}
|
|
250
164
|
/**
|
|
251
165
|
* Request the next available external port from the parent process
|
|
252
166
|
* @param username
|
|
@@ -282,43 +196,26 @@ export class ChildBridgeFork {
|
|
|
282
196
|
* Sends the current pairing status of the child bridge to the parent process
|
|
283
197
|
*/
|
|
284
198
|
sendPairedStatusEvent() {
|
|
199
|
+
// Get Matter commissioning info if Matter is configured
|
|
200
|
+
let matterInfo;
|
|
201
|
+
if (this.matterConfig && this.matterServer) {
|
|
202
|
+
const commissioningInfo = this.matterServer.getCommissioningInfo();
|
|
203
|
+
matterInfo = {
|
|
204
|
+
qrCode: commissioningInfo.qrCode,
|
|
205
|
+
manualPairingCode: commissioningInfo.manualPairingCode,
|
|
206
|
+
serialNumber: this.matterSerialNumber || commissioningInfo.serialNumber,
|
|
207
|
+
commissioned: commissioningInfo.commissioned || false,
|
|
208
|
+
deviceCount: this.matterServer.getAccessories().length,
|
|
209
|
+
};
|
|
210
|
+
Logger.internal.debug('Including Matter info in unified status update');
|
|
211
|
+
}
|
|
285
212
|
this.sendMessage("status" /* ChildProcessMessageEventType.STATUS_UPDATE */, {
|
|
286
213
|
paired: this.bridgeService?.bridge?._accessoryInfo?.paired() ?? null,
|
|
287
214
|
setupUri: this.bridgeService?.bridge?.setupURI() ?? null,
|
|
215
|
+
// Include Matter commissioning info in unified message
|
|
216
|
+
...(matterInfo && { matter: matterInfo }),
|
|
288
217
|
});
|
|
289
218
|
}
|
|
290
|
-
/**
|
|
291
|
-
* Sends Matter bridge status when Matter is configured
|
|
292
|
-
*/
|
|
293
|
-
sendMatterStatusEvent() {
|
|
294
|
-
if (!this.matterConfig) {
|
|
295
|
-
return;
|
|
296
|
-
}
|
|
297
|
-
// Generate identifier based on bridge type
|
|
298
|
-
const isMatterOnly = this.bridgeConfig.matterOnly === true;
|
|
299
|
-
const matterBridgeId = isMatterOnly
|
|
300
|
-
? `matter-${this.plugin.getPluginIdentifier()}-${this.identifier}`
|
|
301
|
-
: `${this.bridgeConfig.username}-matter`;
|
|
302
|
-
const commissioningInfo = this.matterServer?.getCommissioningInfo() ?? { commissioned: false };
|
|
303
|
-
const { qrCode, manualPairingCode, commissioned } = commissioningInfo;
|
|
304
|
-
this.sendMessage("matterStatus" /* ChildProcessMessageEventType.MATTER_STATUS_UPDATE */, {
|
|
305
|
-
type: 'matter',
|
|
306
|
-
status: commissioned ? 'ok' : 'pending',
|
|
307
|
-
port: this.matterConfig.port || 5540,
|
|
308
|
-
qrCode,
|
|
309
|
-
manualPairingCode,
|
|
310
|
-
serialNumber: this.matterSerialNumber,
|
|
311
|
-
name: this.matterConfig.name,
|
|
312
|
-
plugin: this.plugin.getPluginIdentifier(),
|
|
313
|
-
identifier: matterBridgeId,
|
|
314
|
-
username: this.bridgeConfig.username, // undefined for Matter-only bridges
|
|
315
|
-
deviceCount: this.matterServer?.getDeviceCount ? this.matterServer.getDeviceCount() : 0,
|
|
316
|
-
manuallyStopped: false,
|
|
317
|
-
pid: process.pid,
|
|
318
|
-
commissioned,
|
|
319
|
-
});
|
|
320
|
-
Logger.internal.debug(`Sent Matter status update for bridge: ${matterBridgeId}`);
|
|
321
|
-
}
|
|
322
219
|
/**
|
|
323
220
|
* Start Matter server for child bridge
|
|
324
221
|
*/
|
|
@@ -326,27 +223,30 @@ export class ChildBridgeFork {
|
|
|
326
223
|
Logger.internal.info('Starting Matter server in child bridge process');
|
|
327
224
|
// Dynamically import the MatterServer to avoid loading it when not needed
|
|
328
225
|
const { MatterServer } = await import('./matter/matterServer.js');
|
|
329
|
-
// Generate unique ID
|
|
330
|
-
const
|
|
331
|
-
const uniqueId = isMatterOnly
|
|
332
|
-
? `matter-${this.plugin.getPluginIdentifier()}-${this.identifier}`
|
|
333
|
-
: `${this.bridgeConfig.username}-matter`;
|
|
226
|
+
// Generate unique ID from username
|
|
227
|
+
const uniqueId = this.bridgeConfig.username;
|
|
334
228
|
// Create Matter server with the provided configuration
|
|
335
229
|
this.matterServer = new MatterServer({
|
|
336
230
|
port: matterConfig.port || 5540,
|
|
337
|
-
name: matterConfig.name || this.bridgeConfig.name || 'Homebridge Matter Bridge',
|
|
338
231
|
uniqueId,
|
|
339
232
|
storagePath: User.matterPath(),
|
|
233
|
+
// Inherit debug mode from bridge options
|
|
234
|
+
debugModeEnabled: this.bridgeOptions.debugModeEnabled,
|
|
235
|
+
// Inherit configuration from bridge config
|
|
236
|
+
manufacturer: this.bridgeConfig.manufacturer,
|
|
237
|
+
model: this.bridgeConfig.model,
|
|
238
|
+
firmwareRevision: this.bridgeConfig.firmwareRevision,
|
|
239
|
+
serialNumber: this.bridgeConfig.serialNumber,
|
|
340
240
|
});
|
|
341
241
|
await this.matterServer.start();
|
|
342
242
|
// Inform the API that Matter is enabled
|
|
343
243
|
this.api._setMatterEnabled(true);
|
|
244
|
+
// Set the Matter server reference for API methods like getAccessoryState
|
|
245
|
+
this.api._setMatterServer(this.matterServer);
|
|
344
246
|
const commissioningInfo = this.matterServer.getCommissioningInfo();
|
|
345
247
|
Logger.internal.info('Matter server started with commissioning info:', commissioningInfo);
|
|
346
248
|
// Store the serial number for status updates
|
|
347
249
|
this.matterSerialNumber = commissioningInfo.serialNumber;
|
|
348
|
-
// Send initial Matter status update
|
|
349
|
-
this.sendMatterStatusEvent();
|
|
350
250
|
// Set up event listeners for Matter API calls
|
|
351
251
|
const { InternalAPIEvent } = await import('./api.js');
|
|
352
252
|
this.api.on("registerMatterAccessory" /* InternalAPIEvent.REGISTER_MATTER_ACCESSORY */, (accessory) => {
|
|
@@ -364,41 +264,14 @@ export class ChildBridgeFork {
|
|
|
364
264
|
this.matterServer.updateAccessoryState(uuid, cluster, attributes);
|
|
365
265
|
}
|
|
366
266
|
});
|
|
367
|
-
// Send updated Matter status with fresh commissioning info to parent
|
|
368
|
-
this.sendMatterStatusEvent();
|
|
369
267
|
}
|
|
370
268
|
/**
|
|
371
|
-
* Handle
|
|
269
|
+
* Handle metadata request from parent process
|
|
270
|
+
* Sends unified HAP+Matter status
|
|
372
271
|
*/
|
|
373
|
-
|
|
374
|
-
|
|
375
|
-
|
|
376
|
-
}
|
|
377
|
-
// Send Matter bridge metadata back to parent
|
|
378
|
-
this.sendMatterStatusEvent();
|
|
379
|
-
}
|
|
380
|
-
/**
|
|
381
|
-
* Hook to handle HAP accessory registration and sync with Matter
|
|
382
|
-
*/
|
|
383
|
-
handleAccessoryRegistration(accessories) {
|
|
384
|
-
if (!this.matterServer) {
|
|
385
|
-
return;
|
|
386
|
-
}
|
|
387
|
-
Logger.internal.debug(`Syncing ${accessories.length} accessories to Matter`);
|
|
388
|
-
for (const accessory of accessories) {
|
|
389
|
-
// Add to Matter server if it has the addAccessory method
|
|
390
|
-
if (typeof this.matterServer.addAccessory === 'function') {
|
|
391
|
-
this.matterServer.addAccessory(accessory).then((matterDevice) => {
|
|
392
|
-
if (matterDevice) {
|
|
393
|
-
Logger.internal.debug(`Successfully added ${accessory.displayName} to Matter server`);
|
|
394
|
-
// Update Matter status to reflect new device count
|
|
395
|
-
this.sendMatterStatusEvent();
|
|
396
|
-
}
|
|
397
|
-
}).catch((error) => {
|
|
398
|
-
Logger.internal.error(`Failed to add accessory ${accessory.displayName} to Matter:`, error);
|
|
399
|
-
});
|
|
400
|
-
}
|
|
401
|
-
}
|
|
272
|
+
handleMetadataRequest() {
|
|
273
|
+
// Send unified status with both HAP and Matter information
|
|
274
|
+
this.sendPairedStatusEvent();
|
|
402
275
|
}
|
|
403
276
|
shutdown() {
|
|
404
277
|
this.bridgeService.teardown();
|
|
@@ -428,21 +301,13 @@ process.on('message', (message) => {
|
|
|
428
301
|
break;
|
|
429
302
|
}
|
|
430
303
|
case "start" /* ChildProcessMessageEventType.START */: {
|
|
431
|
-
childPluginFork.startBridge()
|
|
432
|
-
Logger.internal.error('Failed to start bridge:', error);
|
|
433
|
-
process.exit(1);
|
|
434
|
-
});
|
|
304
|
+
childPluginFork.startBridge();
|
|
435
305
|
break;
|
|
436
306
|
}
|
|
437
307
|
case "portAllocated" /* ChildProcessMessageEventType.PORT_ALLOCATED */: {
|
|
438
308
|
childPluginFork.handleExternalResponse(message.data);
|
|
439
309
|
break;
|
|
440
310
|
}
|
|
441
|
-
case 'MATTER_BRIDGE_METADATA_REQUEST': {
|
|
442
|
-
// Handle request for Matter bridge metadata
|
|
443
|
-
childPluginFork.handleMatterMetadataRequest();
|
|
444
|
-
break;
|
|
445
|
-
}
|
|
446
311
|
}
|
|
447
312
|
});
|
|
448
313
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"childBridgeFork.js","sourceRoot":"","sources":["../src/childBridgeFork.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"childBridgeFork.js","sourceRoot":"","sources":["../src/childBridgeFork.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import type { MacAddress } from 'hap-nodejs';
|
|
2
2
|
import type { HomebridgeAPI } from './api.js';
|
|
3
3
|
import type { AccessoryConfig, BridgeConfiguration, BridgeOptions, HomebridgeConfig, PlatformConfig } from './bridgeService.js';
|
|
4
|
-
import type { BaseBridgeMetadata } from './bridgeTypes.js';
|
|
5
4
|
import type { ExternalPortService } from './externalPortService.js';
|
|
6
5
|
import type { IpcService } from './ipcService.js';
|
|
6
|
+
import type { MatterConfig } from './matter/matterTypes.js';
|
|
7
7
|
import type { Plugin } from './plugin.js';
|
|
8
8
|
import type { HomebridgeOptions } from './server.js';
|
|
9
9
|
import { PluginType } from './api.js';
|
|
@@ -39,11 +39,7 @@ export declare const enum ChildProcessMessageEventType {
|
|
|
39
39
|
/**
|
|
40
40
|
* Sent from the child to update its current status
|
|
41
41
|
*/
|
|
42
|
-
STATUS_UPDATE = "status"
|
|
43
|
-
/**
|
|
44
|
-
* Sent from the child when it has Matter config alongside HAP
|
|
45
|
-
*/
|
|
46
|
-
MATTER_STATUS_UPDATE = "matterStatus"
|
|
42
|
+
STATUS_UPDATE = "status"
|
|
47
43
|
}
|
|
48
44
|
export declare const enum ChildBridgeStatus {
|
|
49
45
|
/**
|
|
@@ -87,34 +83,33 @@ export interface ChildBridgePairedStatusEventData {
|
|
|
87
83
|
setupUri: string | null;
|
|
88
84
|
}
|
|
89
85
|
/**
|
|
90
|
-
*
|
|
86
|
+
* Child bridge metadata
|
|
87
|
+
*
|
|
88
|
+
* Contains all metadata for a child bridge, including HAP properties
|
|
89
|
+
* like paired status, setupUri, and pin.
|
|
91
90
|
*
|
|
92
|
-
*
|
|
93
|
-
*
|
|
94
|
-
* HAP-specific fields like paired, setupUri, and pin.
|
|
91
|
+
* When Matter is enabled (_bridge.matter is configured), this interface
|
|
92
|
+
* also includes Matter commissioning information for unified status reporting.
|
|
95
93
|
*/
|
|
96
|
-
export interface ChildMetadata
|
|
97
|
-
/** Bridge type (always 'hap' for child bridges) */
|
|
98
|
-
type: 'hap';
|
|
99
|
-
/** Current operational status */
|
|
94
|
+
export interface ChildMetadata {
|
|
100
95
|
status: ChildBridgeStatus;
|
|
101
|
-
/** Whether the bridge is paired with a controller */
|
|
102
96
|
paired?: boolean | null;
|
|
103
|
-
/** Setup URI for pairing (HomeKit QR code) */
|
|
104
97
|
setupUri?: string | null;
|
|
105
|
-
/** HAP bridge username (MAC address) */
|
|
106
98
|
username: MacAddress;
|
|
107
|
-
|
|
99
|
+
port?: number;
|
|
108
100
|
pin: string;
|
|
109
|
-
|
|
101
|
+
name: string;
|
|
102
|
+
plugin: string;
|
|
103
|
+
identifier: string;
|
|
110
104
|
manuallyStopped: boolean;
|
|
111
|
-
|
|
112
|
-
matterConfig?:
|
|
113
|
-
port?: number;
|
|
114
|
-
name?: string;
|
|
115
|
-
};
|
|
116
|
-
/** Matter bridge identifier if Matter is enabled */
|
|
105
|
+
pid?: number;
|
|
106
|
+
matterConfig?: MatterConfig;
|
|
117
107
|
matterIdentifier?: string;
|
|
108
|
+
matterSetupUri?: string;
|
|
109
|
+
matterPin?: string;
|
|
110
|
+
matterSerialNumber?: string;
|
|
111
|
+
matterCommissioned?: boolean;
|
|
112
|
+
matterDeviceCount?: number;
|
|
118
113
|
}
|
|
119
114
|
/**
|
|
120
115
|
* Manages the child processes of platforms/accessories being exposed as separate forked bridges.
|
|
@@ -200,7 +195,6 @@ export declare class ChildBridgeService {
|
|
|
200
195
|
private teardown;
|
|
201
196
|
/**
|
|
202
197
|
* Trigger sending child bridge metadata to the process parent via IPC
|
|
203
|
-
* Note: Matter-only bridges don't send HAP status updates
|
|
204
198
|
*/
|
|
205
199
|
private sendStatusUpdate;
|
|
206
200
|
/**
|
|
@@ -221,24 +215,7 @@ export declare class ChildBridgeService {
|
|
|
221
215
|
refreshConfig(): Promise<void>;
|
|
222
216
|
/**
|
|
223
217
|
* Returns metadata about this child bridge
|
|
224
|
-
* Note: This is for HAP child bridges only. Matter-only bridges expose metadata via Matter IPC events.
|
|
225
218
|
*/
|
|
226
219
|
getMetadata(): ChildMetadata;
|
|
227
|
-
/**
|
|
228
|
-
* Get Matter commissioning info if available
|
|
229
|
-
*/
|
|
230
|
-
getCommissioningInfo(): {
|
|
231
|
-
qrCode?: string;
|
|
232
|
-
manualPairingCode?: string;
|
|
233
|
-
serialNumber?: string;
|
|
234
|
-
commissioned: boolean;
|
|
235
|
-
} | undefined;
|
|
236
|
-
/**
|
|
237
|
-
* Get Matter config if available
|
|
238
|
-
*/
|
|
239
|
-
getMatterConfig(): {
|
|
240
|
-
port?: number;
|
|
241
|
-
name?: string;
|
|
242
|
-
} | undefined;
|
|
243
220
|
}
|
|
244
221
|
//# sourceMappingURL=childBridgeService.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"childBridgeService.d.ts","sourceRoot":"","sources":["../src/childBridgeService.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAG5C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAC7C,OAAO,KAAK,EACV,eAAe,EACf,mBAAmB,EACnB,aAAa,EACb,gBAAgB,EAChB,cAAc,EACf,MAAM,oBAAoB,CAAA;AAC3B,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"childBridgeService.d.ts","sourceRoot":"","sources":["../src/childBridgeService.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAG5C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAC7C,OAAO,KAAK,EACV,eAAe,EACf,mBAAmB,EACnB,aAAa,EACb,gBAAgB,EAChB,cAAc,EACf,MAAM,oBAAoB,CAAA;AAC3B,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AACnE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAEjD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAA;AAC3D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACzC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAA;AASpD,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AASrC,0BAAkB,4BAA4B;IAC5C;;OAEG;IACH,KAAK,UAAU;IAEf;;OAEG;IACH,IAAI,SAAS;IAEb;;OAEG;IACH,MAAM,WAAW;IAEjB;;OAEG;IACH,KAAK,UAAU;IAEf;;OAEG;IACH,MAAM,WAAW;IAEjB;;OAEG;IACH,YAAY,gBAAgB;IAE5B;;OAEG;IACH,cAAc,kBAAkB;IAEhC;;OAEG;IACH,aAAa,WAAW;CACzB;AAGD,0BAAkB,iBAAiB;IACjC;;OAEG;IACH,OAAO,YAAY;IAEnB;;OAEG;IACH,EAAE,OAAO;IAET;;OAEG;IACH,IAAI,SAAS;CACd;AAED,MAAM,WAAW,wBAAwB,CAAC,CAAC;IACzC,EAAE,EAAE,4BAA4B,CAAA;IAChC,IAAI,CAAC,EAAE,CAAC,CAAA;CACT;AAED,MAAM,WAAW,yBAAyB;IACxC,IAAI,EAAE,UAAU,CAAA;IAChB,UAAU,EAAE,MAAM,CAAA;IAClB,UAAU,EAAE,MAAM,CAAA;IAClB,YAAY,EAAE,KAAK,CAAC,cAAc,GAAG,eAAe,CAAC,CAAA;IACrD,YAAY,EAAE,mBAAmB,CAAA;IACjC,gBAAgB,EAAE,gBAAgB,CAAA;IAClC,aAAa,EAAE,aAAa,CAAA;CAC7B;AAED,MAAM,WAAW,iCAAiC;IAChD,OAAO,EAAE,MAAM,CAAA;CAChB;AAED,MAAM,WAAW,gCAAgC;IAC/C,QAAQ,EAAE,UAAU,CAAA;CACrB;AAED,MAAM,WAAW,kCAAkC;IACjD,QAAQ,EAAE,UAAU,CAAA;IACpB,IAAI,CAAC,EAAE,MAAM,CAAA;CACd;AAED,MAAM,WAAW,gCAAgC;IAC/C,MAAM,EAAE,OAAO,GAAG,IAAI,CAAA;IACtB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAA;CACxB;AAED;;;;;;;;GAQG;AACH,MAAM,WAAW,aAAa;IAC5B,MAAM,EAAE,iBAAiB,CAAA;IACzB,MAAM,CAAC,EAAE,OAAO,GAAG,IAAI,CAAA;IACvB,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IACxB,QAAQ,EAAE,UAAU,CAAA;IACpB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,GAAG,EAAE,MAAM,CAAA;IACX,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,EAAE,MAAM,CAAA;IAClB,eAAe,EAAE,OAAO,CAAA;IACxB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,YAAY,CAAC,EAAE,YAAY,CAAA;IAC3B,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B,kBAAkB,CAAC,EAAE,OAAO,CAAA;IAC5B,iBAAiB,CAAC,EAAE,MAAM,CAAA;CAC3B;AAED;;;GAGG;AACH,qBAAa,kBAAkB;IAwBpB,IAAI,EAAE,UAAU;IAChB,UAAU,EAAE,MAAM;IACzB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,gBAAgB;IACxB,OAAO,CAAC,iBAAiB;IACzB,OAAO,CAAC,GAAG;IACX,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,mBAAmB;IA/B7B,OAAO,CAAC,KAAK,CAAC,CAAc;IAC5B,OAAO,CAAC,IAAI,CAAe;IAC3B,OAAO,CAAC,UAAU,CAAkB;IACpC,OAAO,CAAC,YAAY,CAAQ;IAC5B,OAAO,CAAC,gBAAgB,CAA+C;IACvE,OAAO,CAAC,YAAY,CAAuB;IAC3C,OAAO,CAAC,eAAe,CAAQ;IAC/B,OAAO,CAAC,QAAQ,CAAsB;IACtC,OAAO,CAAC,uBAAuB,CAAC,CAM/B;IAED,OAAO,CAAC,YAAY,CAA8C;IAClE,OAAO,CAAC,GAAG,CAAS;IACpB,OAAO,CAAC,WAAW,CAAC,CAAQ;IAC5B,OAAO,CAAC,YAAY,CAAI;IACxB,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAI;gBAGvB,IAAI,EAAE,UAAU,EAChB,UAAU,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,mBAAmB,EACjC,gBAAgB,EAAE,gBAAgB,EAClC,iBAAiB,EAAE,iBAAiB,EACpC,GAAG,EAAE,aAAa,EAClB,UAAU,EAAE,UAAU,EACtB,mBAAmB,EAAE,mBAAmB;IAYlD;;OAEG;IACI,KAAK,IAAI,IAAI;IAgBpB;;;;OAIG;IACI,SAAS,CAAC,MAAM,EAAE,cAAc,GAAG,eAAe,GAAG,IAAI;IAIhE,OAAO,KAAK,YAAY,GAEvB;IAED,OAAO,KAAK,YAAY,QAGvB;IAED;;OAEG;IACH,OAAO,CAAC,iBAAiB;IA+EzB;;;;OAIG;IACH,OAAO,CAAC,kBAAkB;IAiC1B;;;;OAIG;IACH,OAAO,CAAC,WAAW;IASnB;;;OAGG;IACH,OAAO,CAAC,eAAe;IA8BvB;;OAEG;IACH,OAAO,CAAC,aAAa;IAWrB;;OAEG;IACH,OAAO,CAAC,UAAU;IAyClB;;OAEG;IACH,OAAO,CAAC,WAAW;IAInB;;OAEG;YACW,iBAAiB;IAQ/B;;OAEG;IACH,OAAO,CAAC,QAAQ;IAOhB;;OAEG;IACH,OAAO,CAAC,gBAAgB;IAIxB;;OAEG;IACI,kBAAkB,IAAI,IAAI;IAWjC;;OAEG;IACI,eAAe,IAAI,IAAI;IAc9B;;OAEG;IACI,gBAAgB,IAAI,IAAI;IAW/B;;OAEG;IACU,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IA0B3C;;OAEG;IACI,WAAW,IAAI,aAAa;CAsBpC"}
|