homebridge-config-ui-x 5.10.0 → 5.10.1-beta.0
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/TODO-MATTER.md +15 -0
- package/dist/core/auth/auth.controller.d.ts +4 -0
- package/dist/core/config/config.interfaces.d.ts +14 -0
- package/dist/core/config/config.service.d.ts +6 -0
- package/dist/core/config/config.service.js +8 -0
- package/dist/core/config/config.service.js.map +1 -1
- package/dist/core/config/config.startup.js +48 -17
- package/dist/core/config/config.startup.js.map +1 -1
- package/dist/core/feature-flags/feature-flags.registry.js +5 -0
- package/dist/core/feature-flags/feature-flags.registry.js.map +1 -1
- package/dist/core/homebridge-ipc/homebridge-ipc.service.js +1 -0
- package/dist/core/homebridge-ipc/homebridge-ipc.service.js.map +1 -1
- package/dist/core/spa/spa-html.service.d.ts +5 -0
- package/dist/core/spa/spa-html.service.js +32 -0
- package/dist/core/spa/spa-html.service.js.map +1 -0
- package/dist/core/spa/spa.filter.d.ts +3 -0
- package/dist/core/spa/spa.filter.js +22 -2
- package/dist/core/spa/spa.filter.js.map +1 -1
- package/dist/core/ssl/ssl-cert-generator.service.d.ts +15 -0
- package/dist/core/ssl/ssl-cert-generator.service.js +125 -0
- package/dist/core/ssl/ssl-cert-generator.service.js.map +1 -0
- package/dist/globalDefaults.js +3 -0
- package/dist/globalDefaults.js.map +1 -1
- package/dist/main.js +18 -4
- package/dist/main.js.map +1 -1
- package/dist/modules/accessories/accessories.controller.d.ts +1 -1
- package/dist/modules/accessories/accessories.interfaces.d.ts +94 -0
- package/dist/modules/accessories/accessories.interfaces.js +2 -0
- package/dist/modules/accessories/accessories.interfaces.js.map +1 -0
- package/dist/modules/accessories/accessories.module.js +2 -0
- package/dist/modules/accessories/accessories.module.js.map +1 -1
- package/dist/modules/accessories/accessories.service.d.ts +21 -3
- package/dist/modules/accessories/accessories.service.js +280 -17
- package/dist/modules/accessories/accessories.service.js.map +1 -1
- package/dist/modules/child-bridges/child-bridges.interfaces.d.ts +9 -0
- package/dist/modules/config-editor/config-editor.controller.d.ts +4 -0
- package/dist/modules/config-editor/config-editor.controller.js +64 -0
- package/dist/modules/config-editor/config-editor.controller.js.map +1 -1
- package/dist/modules/config-editor/config-editor.service.d.ts +6 -1
- package/dist/modules/config-editor/config-editor.service.js +45 -1
- package/dist/modules/config-editor/config-editor.service.js.map +1 -1
- package/dist/modules/custom-plugins/plugins-settings-ui/plugins-settings-ui.service.js +1 -1
- package/dist/modules/custom-plugins/plugins-settings-ui/plugins-settings-ui.service.js.map +1 -1
- package/dist/modules/plugins/plugins.service.js +15 -0
- package/dist/modules/plugins/plugins.service.js.map +1 -1
- package/dist/modules/server/server.controller.d.ts +50 -0
- package/dist/modules/server/server.controller.js +201 -2
- package/dist/modules/server/server.controller.js.map +1 -1
- package/dist/modules/server/server.service.d.ts +48 -0
- package/dist/modules/server/server.service.js +502 -14
- package/dist/modules/server/server.service.js.map +1 -1
- package/dist/modules/status/status.gateway.d.ts +2 -0
- package/dist/modules/status/status.interfaces.d.ts +11 -0
- package/dist/modules/status/status.service.d.ts +4 -1
- package/dist/modules/status/status.service.js +21 -2
- package/dist/modules/status/status.service.js.map +1 -1
- package/docs/ssl-upload-pr.md +103 -0
- package/package.json +3 -1
- package/public/3rdpartylicenses.txt +52 -52
- package/public/assets/matter.svg +8 -0
- package/public/chunk-2G3RYG7T.js +4 -0
- package/public/{chunk-INEQMM2I.js → chunk-2OV2S53D.js} +1 -1
- package/public/{chunk-WZOQNFMH.js → chunk-2PQS43HJ.js} +1 -1
- package/public/chunk-3MP4NIEN.js +1 -0
- package/public/chunk-3NF5LSRS.js +1 -0
- package/public/{chunk-ABJURGQA.js → chunk-3OCGL4VG.js} +1 -1
- package/public/chunk-3OS2E7NT.js +1 -0
- package/public/chunk-3U4TTBN3.js +1 -0
- package/public/{chunk-QDT36PQN.js → chunk-4C4OAXTJ.js} +1 -1
- package/public/{chunk-QH66HEIY.js → chunk-4EQFXSOO.js} +1 -1
- package/public/{chunk-GOWJQFU3.js → chunk-4Y574DAY.js} +1 -1
- package/public/{chunk-PBN5VTOU.js → chunk-5FFAA6YO.js} +1 -1
- package/public/{chunk-SAWH3ANN.js → chunk-6AGYELAU.js} +1 -1
- package/public/{chunk-G4HQSJ23.js → chunk-6VUYO4JJ.js} +1 -1
- package/public/chunk-6Y44WRYZ.js +5 -0
- package/public/{chunk-IJB6PBR5.js → chunk-7RBF5X4H.js} +1 -1
- package/public/chunk-AEA5MWJV.js +1 -0
- package/public/chunk-AQ7KVNYY.js +1 -0
- package/public/chunk-BRVBWBXQ.js +1 -0
- package/public/{chunk-5DT3N4NO.js → chunk-BZZVKG3V.js} +1 -1
- package/public/{chunk-WGI4RZDV.js → chunk-CYZAN4CD.js} +1 -1
- package/public/{chunk-2ATI5RL3.js → chunk-DSA6B4PW.js} +1 -1
- package/public/chunk-DT7PMMCU.js +1 -0
- package/public/{chunk-TDRGDK3T.js → chunk-EXSN7ASU.js} +1 -1
- package/public/chunk-F5RNPJMD.js +16 -0
- package/public/{chunk-3TGMHJM3.js → chunk-FFBQ244V.js} +1 -1
- package/public/{chunk-E3OCSFY5.js → chunk-G4KDX4LF.js} +5 -5
- package/public/{chunk-XS5676NQ.js → chunk-GBXDLKOS.js} +1 -1
- package/public/{chunk-DN72EAQ5.js → chunk-HUESZB2Q.js} +1 -1
- package/public/{chunk-STKYISTF.js → chunk-HXBITOYP.js} +1 -1
- package/public/{chunk-OKTWUEQP.js → chunk-IC3ZXYWP.js} +1 -1
- package/public/{chunk-ERT4USI6.js → chunk-ICS7ZICH.js} +1 -1
- package/public/chunk-ILKO7HAU.js +68 -0
- package/public/chunk-JL6T3BSX.js +1 -0
- package/public/{chunk-4TYE7FOW.js → chunk-JXLJRPJS.js} +1 -1
- package/public/chunk-K3NHKO4E.js +1 -0
- package/public/{chunk-UD5DX3PK.js → chunk-K3PIHMRS.js} +1 -1
- package/public/chunk-KKHQOHXA.js +1 -0
- package/public/chunk-LGUE3JKA.js +1 -0
- package/public/chunk-LNBMZDII.js +1 -0
- package/public/{chunk-FKIJIVEG.js → chunk-LXMBIF6W.js} +1 -1
- package/public/chunk-M3CXG4MR.js +1 -0
- package/public/{chunk-LFWS6OUH.js → chunk-MA74SXNP.js} +1 -1
- package/public/chunk-N3WEHNOH.js +1 -0
- package/public/{chunk-726EPARV.js → chunk-NP2OU6PT.js} +1 -1
- package/public/chunk-NRCW2EPZ.js +50 -0
- package/public/{chunk-MGSFT332.js → chunk-OJ37C3YB.js} +1 -1
- package/public/{chunk-AY5APEAK.js → chunk-P2DQFTI7.js} +1 -1
- package/public/{chunk-B57RMJ4J.js → chunk-PYAOOAFS.js} +1 -1
- package/public/chunk-QRB4TY6A.js +1 -0
- package/public/chunk-QTWA67OK.js +2 -0
- package/public/{chunk-Z6SZHO36.js → chunk-RAWL26R7.js} +1 -1
- package/public/{chunk-5FAEMT7K.js → chunk-RFNZZH35.js} +1 -1
- package/public/{chunk-OQU6YMM6.js → chunk-RHJH4NAL.js} +1 -1
- package/public/{chunk-RWL56OKC.js → chunk-UASZBKBZ.js} +1 -1
- package/public/{chunk-N7EXU2NV.js → chunk-UCNN3X7L.js} +1 -1
- package/public/{chunk-UX77G732.js → chunk-UYFTDKBB.js} +1 -1
- package/public/{chunk-UD7BEYXY.js → chunk-VXWLFCOQ.js} +1 -1
- package/public/chunk-W7GOVRP4.js +1 -0
- package/public/{chunk-H5WFRSS4.js → chunk-WDFYORD4.js} +1 -1
- package/public/chunk-WL5GK7PI.js +19 -0
- package/public/{chunk-TNZDCJJB.js → chunk-WTSUWA7S.js} +1 -1
- package/public/{chunk-QONMKSXQ.js → chunk-XCJH7PUD.js} +1 -1
- package/public/{chunk-RFQQSATI.js → chunk-XKXSOWIU.js} +1 -1
- package/public/{chunk-DMDEAXJH.js → chunk-YCRH56FY.js} +1 -1
- package/public/{chunk-SQWHIT2O.js → chunk-ZMTA7EPT.js} +1 -1
- package/public/chunk-ZTJZA6OC.js +1 -0
- package/public/chunk-ZUM4REDQ.js +1 -0
- package/public/{chunk-RUWA3EFR.js → chunk-ZUYIWQNV.js} +1 -1
- package/public/index.html +2 -2
- package/public/main-ZIKN743D.js +1 -0
- package/public/media/matter-P563JGDL.svg +8 -0
- package/public/{styles-7EFV5QBG.css → styles-WNHDEKE4.css} +1 -1
- package/scripts/extract-plugin-alias.js +53 -2
- package/public/chunk-6FMRO7HY.js +0 -19
- package/public/chunk-6WCXE37R.js +0 -4
- package/public/chunk-ALWUQZSW.js +0 -1
- package/public/chunk-ASYRF2UP.js +0 -1
- package/public/chunk-BDFSTR4R.js +0 -1
- package/public/chunk-CKGQSHVZ.js +0 -1
- package/public/chunk-EZCJGSOY.js +0 -5
- package/public/chunk-HPLLPVW3.js +0 -1
- package/public/chunk-IHZHS7ZW.js +0 -40
- package/public/chunk-IR2HMKD2.js +0 -1
- package/public/chunk-J3RGEHLW.js +0 -1
- package/public/chunk-JEESCTKG.js +0 -16
- package/public/chunk-LKJ4JJLK.js +0 -1
- package/public/chunk-MJHLBHHD.js +0 -1
- package/public/chunk-MK4QUOAX.js +0 -1
- package/public/chunk-RV34PNIK.js +0 -1
- package/public/chunk-S2OEXAQE.js +0 -1
- package/public/chunk-SBHNM2QO.js +0 -1
- package/public/chunk-SDSUBQRV.js +0 -2
- package/public/chunk-TTFY54LY.js +0 -1
- package/public/chunk-TXPIYSRT.js +0 -50
- package/public/chunk-VLO3EC7G.js +0 -1
- package/public/chunk-X4UYQV4U.js +0 -1
- package/public/chunk-XDYNVDC3.js +0 -1
- package/public/chunk-YHWOJFWU.js +0 -1
- package/public/main-BIEDFTMT.js +0 -1
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ssl-cert-generator.service.js","sourceRoot":"","sources":["../../../src/core/ssl/ssl-cert-generator.service.ts"],"names":[],"mappings":"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"}
|
package/dist/globalDefaults.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"globalDefaults.js","sourceRoot":"","sources":["../src/globalDefaults.ts"],"names":[],"mappings":"AACA,UAAU,CAAC,MAAM,GAAG;IAElB,aAAa,EAAE,EAAE,GAAG,IAAI,GAAG,IAAI;IAC/B,iBAAiB,EAAE,MAAM;IAGzB,iBAAiB,EAAE,EAAE,GAAG,IAAI,GAAG,IAAI;IACnC,qBAAqB,EAAE,MAAM;CAC9B,CAAA;AAED,UAAU,CAAC,QAAQ,GAAG;IAEpB,UAAU,EAAE,KAAK;CAClB,CAAA"}
|
|
1
|
+
{"version":3,"file":"globalDefaults.js","sourceRoot":"","sources":["../src/globalDefaults.ts"],"names":[],"mappings":"AACA,UAAU,CAAC,MAAM,GAAG;IAElB,aAAa,EAAE,EAAE,GAAG,IAAI,GAAG,IAAI;IAC/B,iBAAiB,EAAE,MAAM;IAGzB,iBAAiB,EAAE,EAAE,GAAG,IAAI,GAAG,IAAI;IACnC,qBAAqB,EAAE,MAAM;CAC9B,CAAA;AAED,UAAU,CAAC,QAAQ,GAAG;IAEpB,UAAU,EAAE,KAAK;CAClB,CAAA;AAED,UAAU,CAAC,OAAO,GAAG;IAEnB,SAAS,EAAE,QAAQ;CACpB,CAAA"}
|
package/dist/main.js
CHANGED
|
@@ -12,6 +12,7 @@ import { AppModule } from './app.module.js';
|
|
|
12
12
|
import { ConfigService } from './core/config/config.service.js';
|
|
13
13
|
import { getStartupConfig } from './core/config/config.startup.js';
|
|
14
14
|
import { Logger } from './core/logger/logger.service.js';
|
|
15
|
+
import { SpaHtmlService } from './core/spa/spa-html.service.js';
|
|
15
16
|
import { SpaFilter } from './core/spa/spa.filter.js';
|
|
16
17
|
import './env-setup.js';
|
|
17
18
|
import 'reflect-metadata';
|
|
@@ -66,7 +67,19 @@ async function bootstrap() {
|
|
|
66
67
|
});
|
|
67
68
|
const configService = app.get(ConfigService);
|
|
68
69
|
const logger = app.get(Logger);
|
|
69
|
-
|
|
70
|
+
let realWebroot = startupConfig.webroot || '';
|
|
71
|
+
try {
|
|
72
|
+
await SpaHtmlService.updateIndexHtml(startupConfig.webroot);
|
|
73
|
+
process.env.UIX_ORIGINAL_WEBROOT = startupConfig.webroot;
|
|
74
|
+
configService.setOriginalWebroot(startupConfig.webroot);
|
|
75
|
+
}
|
|
76
|
+
catch (error) {
|
|
77
|
+
logger.warn(`Could not update index.html with webroot ${startupConfig.webroot}: ${error.message}`);
|
|
78
|
+
realWebroot = '';
|
|
79
|
+
process.env.UIX_ORIGINAL_WEBROOT = globalThis.webroot.errorCode;
|
|
80
|
+
configService.setOriginalWebroot(globalThis.webroot.errorCode);
|
|
81
|
+
}
|
|
82
|
+
app.getHttpAdapter().get(realWebroot || '/', async (req, res) => {
|
|
70
83
|
res.type('text/html');
|
|
71
84
|
res.header('Cache-Control', 'no-cache, no-store, must-revalidate');
|
|
72
85
|
res.header('Pragma', 'no-cache');
|
|
@@ -78,8 +91,9 @@ async function bootstrap() {
|
|
|
78
91
|
setHeaders(res) {
|
|
79
92
|
res.setHeader('Cache-Control', 'public,max-age=31536000,immutable');
|
|
80
93
|
},
|
|
94
|
+
...realWebroot ? { prefix: realWebroot } : {},
|
|
81
95
|
});
|
|
82
|
-
app.setGlobalPrefix('/api
|
|
96
|
+
app.setGlobalPrefix(`${realWebroot || ''}/api`);
|
|
83
97
|
app.enableCors({
|
|
84
98
|
origin: ['http://localhost:8080', 'http://localhost:4200'],
|
|
85
99
|
methods: ['GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'OPTIONS'],
|
|
@@ -102,7 +116,7 @@ async function bootstrap() {
|
|
|
102
116
|
})
|
|
103
117
|
.build();
|
|
104
118
|
const document = SwaggerModule.createDocument(app, options);
|
|
105
|
-
SwaggerModule.setup(
|
|
119
|
+
SwaggerModule.setup(`${realWebroot}/swagger`.replace(/^\//, ''), app, document);
|
|
106
120
|
app.useGlobalFilters(new SpaFilter());
|
|
107
121
|
logger.warn(`Homebridge UI v${configService.package.version} is listening on ${startupConfig.host} port ${configService.ui.port}.`);
|
|
108
122
|
await app.listen(configService.ui.port, startupConfig.host);
|
|
@@ -119,7 +133,7 @@ async function bootstrap() {
|
|
|
119
133
|
port: configService.ui.port,
|
|
120
134
|
host: startupConfig.host === '0.0.0.0' || startupConfig.host === '::' ? undefined : startupConfig.host,
|
|
121
135
|
txt: {
|
|
122
|
-
path: '/',
|
|
136
|
+
path: realWebroot || '/',
|
|
123
137
|
version: configService.package.version,
|
|
124
138
|
https: startupConfig.httpsOptions ? 'true' : 'false',
|
|
125
139
|
},
|
package/dist/main.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,6 @@ export declare class AccessoriesController {
|
|
|
5
5
|
constructor(accessoriesService: AccessoriesService);
|
|
6
6
|
getAccessories(): Promise<import("@homebridge/hap-client").ServiceType[]>;
|
|
7
7
|
getAccessoryLayout(req: any): Promise<any>;
|
|
8
|
-
getAccessory(uniqueId: string): Promise<import("@homebridge/hap-client").ServiceType>;
|
|
8
|
+
getAccessory(uniqueId: string): Promise<import("@homebridge/hap-client").ServiceType | import("./accessories.interfaces.js").MatterService>;
|
|
9
9
|
setAccessoryCharacteristic(uniqueId: any, body: AccessorySetCharacteristicDto): Promise<import("@homebridge/hap-client").ServiceType>;
|
|
10
10
|
}
|
|
@@ -0,0 +1,94 @@
|
|
|
1
|
+
export interface MatterEvent {
|
|
2
|
+
type: 'accessoriesData' | 'accessoryUpdate' | 'accessoryAdded' | 'accessoryRemoved' | 'accessoryControlResponse';
|
|
3
|
+
data?: MatterAccessoriesResponse | MatterAccessoryInfo | MatterStateUpdate | MatterControlResponse;
|
|
4
|
+
}
|
|
5
|
+
export interface MatterAccessoriesResponse {
|
|
6
|
+
accessories: MatterAccessory[];
|
|
7
|
+
error?: string;
|
|
8
|
+
}
|
|
9
|
+
export interface MatterAccessory {
|
|
10
|
+
uuid: string;
|
|
11
|
+
displayName: string;
|
|
12
|
+
deviceType: string;
|
|
13
|
+
clusters: Record<string, Record<string, unknown>>;
|
|
14
|
+
manufacturer?: string;
|
|
15
|
+
model?: string;
|
|
16
|
+
serialNumber?: string;
|
|
17
|
+
firmwareRevision?: string;
|
|
18
|
+
bridge?: {
|
|
19
|
+
name?: string;
|
|
20
|
+
username?: string;
|
|
21
|
+
};
|
|
22
|
+
plugin?: string;
|
|
23
|
+
platform?: string;
|
|
24
|
+
commissioned?: boolean;
|
|
25
|
+
fabricCount?: number;
|
|
26
|
+
fabrics?: unknown[];
|
|
27
|
+
parts?: MatterAccessoryPart[];
|
|
28
|
+
}
|
|
29
|
+
export interface MatterAccessoryPart {
|
|
30
|
+
id: string;
|
|
31
|
+
displayName: string;
|
|
32
|
+
deviceType: string;
|
|
33
|
+
clusters: Record<string, Record<string, unknown>>;
|
|
34
|
+
}
|
|
35
|
+
export interface MatterAccessoryInfo extends MatterAccessory {
|
|
36
|
+
error?: string;
|
|
37
|
+
}
|
|
38
|
+
export interface MatterService {
|
|
39
|
+
uniqueId: string;
|
|
40
|
+
uuid: string;
|
|
41
|
+
serviceName: string;
|
|
42
|
+
displayName: string;
|
|
43
|
+
deviceType: string;
|
|
44
|
+
clusters: Record<string, Record<string, unknown>>;
|
|
45
|
+
partId?: string;
|
|
46
|
+
protocol: 'matter';
|
|
47
|
+
instance: {
|
|
48
|
+
name: string;
|
|
49
|
+
username: string;
|
|
50
|
+
};
|
|
51
|
+
accessoryInformation: {
|
|
52
|
+
'Name': string;
|
|
53
|
+
'Manufacturer': string;
|
|
54
|
+
'Model': string;
|
|
55
|
+
'Serial Number': string;
|
|
56
|
+
'Firmware Revision': string;
|
|
57
|
+
};
|
|
58
|
+
bridge?: {
|
|
59
|
+
name?: string;
|
|
60
|
+
username?: string;
|
|
61
|
+
};
|
|
62
|
+
plugin?: string;
|
|
63
|
+
platform?: string;
|
|
64
|
+
commissioned?: boolean;
|
|
65
|
+
fabricCount?: number;
|
|
66
|
+
fabrics?: unknown[];
|
|
67
|
+
aid: 0;
|
|
68
|
+
iid: 0;
|
|
69
|
+
}
|
|
70
|
+
export interface MatterStateUpdate {
|
|
71
|
+
uuid: string;
|
|
72
|
+
cluster: string;
|
|
73
|
+
state: Record<string, unknown>;
|
|
74
|
+
partId?: string;
|
|
75
|
+
}
|
|
76
|
+
export interface MatterControlResponse {
|
|
77
|
+
success: boolean;
|
|
78
|
+
error?: string;
|
|
79
|
+
}
|
|
80
|
+
export interface MatterControlRequest {
|
|
81
|
+
uniqueId: string;
|
|
82
|
+
cluster: string;
|
|
83
|
+
attributes: Record<string, unknown>;
|
|
84
|
+
}
|
|
85
|
+
export interface AccessoryControlMessage {
|
|
86
|
+
set?: {
|
|
87
|
+
uniqueId: string;
|
|
88
|
+
iid?: number;
|
|
89
|
+
value?: string | number | boolean;
|
|
90
|
+
cluster?: string;
|
|
91
|
+
attributes?: Record<string, unknown>;
|
|
92
|
+
};
|
|
93
|
+
refresh?: boolean;
|
|
94
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"accessories.interfaces.js","sourceRoot":"","sources":["../../../src/modules/accessories/accessories.interfaces.ts"],"names":[],"mappings":""}
|
|
@@ -7,6 +7,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
7
7
|
import { Module } from '@nestjs/common';
|
|
8
8
|
import { PassportModule } from '@nestjs/passport';
|
|
9
9
|
import { ConfigModule } from '../../core/config/config.module.js';
|
|
10
|
+
import { HomebridgeIpcModule } from '../../core/homebridge-ipc/homebridge-ipc.module.js';
|
|
10
11
|
import { LoggerModule } from '../../core/logger/logger.module.js';
|
|
11
12
|
import { AccessoriesController } from './accessories.controller.js';
|
|
12
13
|
import { AccessoriesGateway } from './accessories.gateway.js';
|
|
@@ -19,6 +20,7 @@ AccessoriesModule = __decorate([
|
|
|
19
20
|
PassportModule.register({ defaultStrategy: 'jwt' }),
|
|
20
21
|
ConfigModule,
|
|
21
22
|
LoggerModule,
|
|
23
|
+
HomebridgeIpcModule,
|
|
22
24
|
],
|
|
23
25
|
providers: [
|
|
24
26
|
AccessoriesService,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"accessories.module.js","sourceRoot":"","sources":["../../../src/modules/accessories/accessories.module.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AACvC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAEjD,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAA;AACjE,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAA;AACjE,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAA;AACnE,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAA;AAC7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAA;
|
|
1
|
+
{"version":3,"file":"accessories.module.js","sourceRoot":"","sources":["../../../src/modules/accessories/accessories.module.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AACvC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAEjD,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAA;AACjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,oDAAoD,CAAA;AACxF,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAA;AACjE,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAA;AACnE,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAA;AAC7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAA;AAoBtD,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;CAAG,CAAA;AAApB,iBAAiB;IAlB7B,MAAM,CAAC;QACN,OAAO,EAAE;YACP,cAAc,CAAC,QAAQ,CAAC,EAAE,eAAe,EAAE,KAAK,EAAE,CAAC;YACnD,YAAY;YACZ,YAAY;YACZ,mBAAmB;SACpB;QACD,SAAS,EAAE;YACT,kBAAkB;YAClB,kBAAkB;SACnB;QACD,OAAO,EAAE;YACP,kBAAkB;SACnB;QACD,WAAW,EAAE;YACX,qBAAqB;SACtB;KACF,CAAC;GACW,iBAAiB,CAAG"}
|
|
@@ -1,20 +1,38 @@
|
|
|
1
1
|
import type { ServiceType } from '@homebridge/hap-client';
|
|
2
|
+
import type { Socket } from 'socket.io';
|
|
3
|
+
import type { MatterService } from './accessories.interfaces.js';
|
|
2
4
|
import { HapClient } from '@homebridge/hap-client';
|
|
3
5
|
import NodeCache from 'node-cache';
|
|
4
6
|
import { ConfigService } from '../../core/config/config.service.js';
|
|
7
|
+
import { HomebridgeIpcService } from '../../core/homebridge-ipc/homebridge-ipc.service.js';
|
|
5
8
|
import { Logger } from '../../core/logger/logger.service.js';
|
|
6
9
|
export declare class AccessoriesService {
|
|
7
10
|
private readonly configService;
|
|
8
11
|
private readonly logger;
|
|
12
|
+
private readonly homebridgeIpcService;
|
|
9
13
|
hapClient: HapClient;
|
|
10
14
|
accessoriesCache: NodeCache;
|
|
11
|
-
|
|
12
|
-
|
|
15
|
+
private matterMonitoringActive;
|
|
16
|
+
private matterUpdateListener;
|
|
17
|
+
private activeClients;
|
|
18
|
+
private matterAccessories;
|
|
19
|
+
constructor(configService: ConfigService, logger: Logger, homebridgeIpcService: HomebridgeIpcService);
|
|
20
|
+
connect(client: Socket): Promise<void>;
|
|
13
21
|
private refreshCharacteristics;
|
|
14
22
|
loadAccessories(): Promise<ServiceType[]>;
|
|
15
|
-
getAccessory(uniqueId: string): Promise<ServiceType>;
|
|
23
|
+
getAccessory(uniqueId: string): Promise<ServiceType | MatterService>;
|
|
24
|
+
private getMatterAccessory;
|
|
16
25
|
setAccessoryCharacteristic(uniqueId: string, characteristicType: string, value: number | boolean | string): Promise<ServiceType>;
|
|
17
26
|
getAccessoryLayout(username: string): Promise<any>;
|
|
18
27
|
saveAccessoryLayout(user: string, layout: Record<string, unknown>): Promise<Record<string, unknown>>;
|
|
19
28
|
resetInstancePool(): void;
|
|
29
|
+
private parseMatterUniqueId;
|
|
30
|
+
private buildMatterUniqueId;
|
|
31
|
+
private waitForMatterEvent;
|
|
32
|
+
private startMatterMonitoring;
|
|
33
|
+
private stopMatterMonitoring;
|
|
34
|
+
private loadMatterAccessories;
|
|
35
|
+
private transformMatterAccessory;
|
|
36
|
+
private handleMatterStateUpdate;
|
|
37
|
+
private handleMatterControl;
|
|
20
38
|
}
|
|
@@ -16,15 +16,22 @@ import { BadRequestException, Inject, Injectable } from '@nestjs/common';
|
|
|
16
16
|
import { mkdirp, pathExists, readJson, writeJsonSync } from 'fs-extra/esm';
|
|
17
17
|
import NodeCache from 'node-cache';
|
|
18
18
|
import { ConfigService } from '../../core/config/config.service.js';
|
|
19
|
+
import { HomebridgeIpcService } from '../../core/homebridge-ipc/homebridge-ipc.service.js';
|
|
19
20
|
import { Logger } from '../../core/logger/logger.service.js';
|
|
20
21
|
let AccessoriesService = class AccessoriesService {
|
|
21
22
|
configService;
|
|
22
23
|
logger;
|
|
24
|
+
homebridgeIpcService;
|
|
23
25
|
hapClient;
|
|
24
26
|
accessoriesCache = new NodeCache({ stdTTL: 0 });
|
|
25
|
-
|
|
27
|
+
matterMonitoringActive = false;
|
|
28
|
+
matterUpdateListener = null;
|
|
29
|
+
activeClients = new Set();
|
|
30
|
+
matterAccessories = [];
|
|
31
|
+
constructor(configService, logger, homebridgeIpcService) {
|
|
26
32
|
this.configService = configService;
|
|
27
33
|
this.logger = logger;
|
|
34
|
+
this.homebridgeIpcService = homebridgeIpcService;
|
|
28
35
|
if (this.configService.homebridgeInsecureMode) {
|
|
29
36
|
this.hapClient = new HapClient({
|
|
30
37
|
pin: this.configService.homebridgeConfig.bridge.pin,
|
|
@@ -38,6 +45,10 @@ let AccessoriesService = class AccessoriesService {
|
|
|
38
45
|
this.logger.error('Homebridge must be running in insecure mode to control accessories.');
|
|
39
46
|
return;
|
|
40
47
|
}
|
|
48
|
+
this.activeClients.add(client);
|
|
49
|
+
if (this.activeClients.size === 1) {
|
|
50
|
+
await this.startMatterMonitoring();
|
|
51
|
+
}
|
|
41
52
|
let services;
|
|
42
53
|
const loadAllAccessories = async (refresh) => {
|
|
43
54
|
if (!refresh) {
|
|
@@ -46,26 +57,48 @@ let AccessoriesService = class AccessoriesService {
|
|
|
46
57
|
client.emit('accessories-data', cached);
|
|
47
58
|
}
|
|
48
59
|
}
|
|
49
|
-
|
|
50
|
-
this.refreshCharacteristics(
|
|
60
|
+
const hapServices = await this.loadAccessories();
|
|
61
|
+
this.refreshCharacteristics(hapServices);
|
|
62
|
+
client.emit('hap-accessories-ready-for-control');
|
|
63
|
+
client.emit('accessories-data', hapServices);
|
|
64
|
+
const matterServices = await this.loadMatterAccessories();
|
|
65
|
+
client.emit('matter-accessories-ready-for-control');
|
|
66
|
+
if (matterServices.length > 0) {
|
|
67
|
+
client.emit('accessories-data', matterServices);
|
|
68
|
+
}
|
|
69
|
+
services = [...hapServices, ...matterServices];
|
|
51
70
|
client.emit('accessories-ready-for-control');
|
|
52
|
-
client.emit('accessories-data', services);
|
|
53
71
|
this.accessoriesCache.set('services', services);
|
|
54
72
|
};
|
|
55
73
|
await loadAllAccessories(false);
|
|
56
74
|
const requestHandler = async (msg) => {
|
|
57
|
-
if (msg.
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
75
|
+
if (msg.refresh) {
|
|
76
|
+
await loadAllAccessories(true);
|
|
77
|
+
}
|
|
78
|
+
else if (msg.set) {
|
|
79
|
+
if (msg.set.uniqueId && msg.set.uniqueId.startsWith('matter:')) {
|
|
80
|
+
if (msg.set.cluster && msg.set.attributes) {
|
|
81
|
+
await this.handleMatterControl(client, {
|
|
82
|
+
uniqueId: msg.set.uniqueId,
|
|
83
|
+
cluster: msg.set.cluster,
|
|
84
|
+
attributes: msg.set.attributes,
|
|
85
|
+
});
|
|
66
86
|
}
|
|
67
|
-
|
|
68
|
-
|
|
87
|
+
}
|
|
88
|
+
else {
|
|
89
|
+
const service = services.find(x => x.uniqueId === msg.set.uniqueId);
|
|
90
|
+
if (service && 'serviceCharacteristics' in service) {
|
|
91
|
+
try {
|
|
92
|
+
await service.setCharacteristic(msg.set.iid, msg.set.value);
|
|
93
|
+
const hapServices = await this.loadAccessories();
|
|
94
|
+
setTimeout(() => {
|
|
95
|
+
this.refreshCharacteristics(hapServices);
|
|
96
|
+
}, 1500);
|
|
97
|
+
services = [...hapServices, ...this.matterAccessories];
|
|
98
|
+
}
|
|
99
|
+
catch (e) {
|
|
100
|
+
client.emit('accessory-control-failure', e.message);
|
|
101
|
+
}
|
|
69
102
|
}
|
|
70
103
|
}
|
|
71
104
|
}
|
|
@@ -76,7 +109,7 @@ let AccessoriesService = class AccessoriesService {
|
|
|
76
109
|
client.emit('accessories-data', data);
|
|
77
110
|
};
|
|
78
111
|
monitor.on('service-update', updateHandler);
|
|
79
|
-
const instanceUpdateHandler = async (
|
|
112
|
+
const instanceUpdateHandler = async () => {
|
|
80
113
|
client.emit('accessories-reload-required', services);
|
|
81
114
|
};
|
|
82
115
|
this.hapClient.on('instance-discovered', instanceUpdateHandler);
|
|
@@ -91,6 +124,10 @@ let AccessoriesService = class AccessoriesService {
|
|
|
91
124
|
monitor.removeAllListeners('service-update');
|
|
92
125
|
monitor.finish();
|
|
93
126
|
this.hapClient.removeListener('instance-discovered', instanceUpdateHandler);
|
|
127
|
+
this.activeClients.delete(client);
|
|
128
|
+
if (this.activeClients.size === 0) {
|
|
129
|
+
this.stopMatterMonitoring();
|
|
130
|
+
}
|
|
94
131
|
};
|
|
95
132
|
client.on('disconnect', onEnd.bind(this));
|
|
96
133
|
client.on('end', onEnd.bind(this));
|
|
@@ -121,6 +158,9 @@ let AccessoriesService = class AccessoriesService {
|
|
|
121
158
|
}
|
|
122
159
|
}
|
|
123
160
|
async getAccessory(uniqueId) {
|
|
161
|
+
if (uniqueId.startsWith('matter:')) {
|
|
162
|
+
return this.getMatterAccessory(uniqueId);
|
|
163
|
+
}
|
|
124
164
|
const services = await this.loadAccessories();
|
|
125
165
|
const service = services.find(x => x.uniqueId === uniqueId);
|
|
126
166
|
if (!service) {
|
|
@@ -134,6 +174,29 @@ let AccessoriesService = class AccessoriesService {
|
|
|
134
174
|
throw new BadRequestException(e.message);
|
|
135
175
|
}
|
|
136
176
|
}
|
|
177
|
+
async getMatterAccessory(uniqueId) {
|
|
178
|
+
try {
|
|
179
|
+
const { uuid, partId } = this.parseMatterUniqueId(uniqueId);
|
|
180
|
+
const response = await this.waitForMatterEvent('accessoryInfo', () => {
|
|
181
|
+
this.homebridgeIpcService.sendMessage('getMatterAccessoryInfo', { uuid });
|
|
182
|
+
});
|
|
183
|
+
if (response.error) {
|
|
184
|
+
throw new BadRequestException(response.error);
|
|
185
|
+
}
|
|
186
|
+
if (partId) {
|
|
187
|
+
const part = response.parts?.find((p) => p.id === partId);
|
|
188
|
+
if (part) {
|
|
189
|
+
return this.transformMatterAccessory(response, part);
|
|
190
|
+
}
|
|
191
|
+
throw new BadRequestException(`Part '${partId}' not found in accessory`);
|
|
192
|
+
}
|
|
193
|
+
return this.transformMatterAccessory(response);
|
|
194
|
+
}
|
|
195
|
+
catch (error) {
|
|
196
|
+
this.logger.error(`Failed to get Matter accessory info for ${uniqueId}:`, error);
|
|
197
|
+
throw new BadRequestException(error.message || 'Failed to get Matter accessory info');
|
|
198
|
+
}
|
|
199
|
+
}
|
|
137
200
|
async setAccessoryCharacteristic(uniqueId, characteristicType, value) {
|
|
138
201
|
const services = await this.loadAccessories();
|
|
139
202
|
const service = services.find(x => x.uniqueId === uniqueId);
|
|
@@ -228,13 +291,213 @@ let AccessoriesService = class AccessoriesService {
|
|
|
228
291
|
this.hapClient.resetInstancePool();
|
|
229
292
|
}
|
|
230
293
|
}
|
|
294
|
+
parseMatterUniqueId(uniqueId) {
|
|
295
|
+
const parts = uniqueId.replace('matter:', '').split(':');
|
|
296
|
+
return {
|
|
297
|
+
uuid: parts[0],
|
|
298
|
+
partId: parts[1],
|
|
299
|
+
};
|
|
300
|
+
}
|
|
301
|
+
buildMatterUniqueId(uuid, partId) {
|
|
302
|
+
return partId ? `matter:${uuid}:${partId}` : `matter:${uuid}`;
|
|
303
|
+
}
|
|
304
|
+
async waitForMatterEvent(eventType, sendRequest) {
|
|
305
|
+
return new Promise((resolve, reject) => {
|
|
306
|
+
const actionTimeout = setTimeout(() => {
|
|
307
|
+
this.homebridgeIpcService.removeListener('matterEvent', listener);
|
|
308
|
+
reject(new Error('The Homebridge service did not respond'));
|
|
309
|
+
}, 3000);
|
|
310
|
+
const listener = (event) => {
|
|
311
|
+
if (event.type === eventType) {
|
|
312
|
+
clearTimeout(actionTimeout);
|
|
313
|
+
this.homebridgeIpcService.removeListener('matterEvent', listener);
|
|
314
|
+
resolve(event.data);
|
|
315
|
+
}
|
|
316
|
+
};
|
|
317
|
+
this.homebridgeIpcService.on('matterEvent', listener);
|
|
318
|
+
sendRequest();
|
|
319
|
+
});
|
|
320
|
+
}
|
|
321
|
+
async startMatterMonitoring() {
|
|
322
|
+
if (this.matterMonitoringActive) {
|
|
323
|
+
return;
|
|
324
|
+
}
|
|
325
|
+
try {
|
|
326
|
+
this.logger.debug('Starting Matter accessory monitoring');
|
|
327
|
+
this.homebridgeIpcService.sendMessage('startMatterMonitoring');
|
|
328
|
+
this.matterMonitoringActive = true;
|
|
329
|
+
this.matterUpdateListener = (event) => {
|
|
330
|
+
switch (event.type) {
|
|
331
|
+
case 'accessoryUpdate':
|
|
332
|
+
if (event.data && 'uuid' in event.data && 'cluster' in event.data) {
|
|
333
|
+
this.handleMatterStateUpdate(event.data);
|
|
334
|
+
}
|
|
335
|
+
break;
|
|
336
|
+
case 'accessoryAdded':
|
|
337
|
+
case 'accessoryRemoved':
|
|
338
|
+
if (event.data && 'uuid' in event.data) {
|
|
339
|
+
this.logger.debug(`Matter accessory ${event.type}: ${event.data.uuid} - triggering reload`);
|
|
340
|
+
}
|
|
341
|
+
for (const client of this.activeClients) {
|
|
342
|
+
client.emit('matter-accessories-reload-required');
|
|
343
|
+
}
|
|
344
|
+
break;
|
|
345
|
+
}
|
|
346
|
+
};
|
|
347
|
+
this.homebridgeIpcService.on('matterEvent', this.matterUpdateListener);
|
|
348
|
+
this.logger.debug('Matter monitoring started successfully');
|
|
349
|
+
}
|
|
350
|
+
catch (error) {
|
|
351
|
+
this.logger.error('Failed to start Matter monitoring:', error);
|
|
352
|
+
}
|
|
353
|
+
}
|
|
354
|
+
async stopMatterMonitoring() {
|
|
355
|
+
if (!this.matterMonitoringActive) {
|
|
356
|
+
return;
|
|
357
|
+
}
|
|
358
|
+
try {
|
|
359
|
+
this.logger.debug('Stopping Matter accessory monitoring');
|
|
360
|
+
if (this.matterUpdateListener) {
|
|
361
|
+
this.homebridgeIpcService.removeListener('matterEvent', this.matterUpdateListener);
|
|
362
|
+
this.matterUpdateListener = null;
|
|
363
|
+
}
|
|
364
|
+
this.homebridgeIpcService.sendMessage('stopMatterMonitoring');
|
|
365
|
+
this.matterMonitoringActive = false;
|
|
366
|
+
this.matterAccessories = [];
|
|
367
|
+
this.logger.debug('Matter monitoring stopped');
|
|
368
|
+
}
|
|
369
|
+
catch (error) {
|
|
370
|
+
this.logger.error('Failed to stop Matter monitoring:', error);
|
|
371
|
+
}
|
|
372
|
+
}
|
|
373
|
+
async loadMatterAccessories() {
|
|
374
|
+
if (!this.matterMonitoringActive) {
|
|
375
|
+
this.logger.warn('Matter monitoring not active, skipping accessory load');
|
|
376
|
+
return [];
|
|
377
|
+
}
|
|
378
|
+
try {
|
|
379
|
+
const response = await this.waitForMatterEvent('accessoriesData', () => {
|
|
380
|
+
this.homebridgeIpcService.sendMessage('getMatterAccessories', {});
|
|
381
|
+
});
|
|
382
|
+
if (response.error) {
|
|
383
|
+
throw new Error(response.error);
|
|
384
|
+
}
|
|
385
|
+
const accessories = response.accessories || [];
|
|
386
|
+
this.logger.debug(`Loaded ${accessories.length} Matter accessories from IPC`);
|
|
387
|
+
const matterServices = accessories.flatMap((accessory) => {
|
|
388
|
+
const services = [];
|
|
389
|
+
services.push({
|
|
390
|
+
...this.transformMatterAccessory(accessory),
|
|
391
|
+
protocol: 'matter',
|
|
392
|
+
});
|
|
393
|
+
if (accessory.parts) {
|
|
394
|
+
for (const part of accessory.parts) {
|
|
395
|
+
services.push({
|
|
396
|
+
...this.transformMatterAccessory(accessory, part),
|
|
397
|
+
protocol: 'matter',
|
|
398
|
+
});
|
|
399
|
+
}
|
|
400
|
+
}
|
|
401
|
+
return services;
|
|
402
|
+
});
|
|
403
|
+
this.logger.debug(`Transformed ${matterServices.length} Matter services (including parts)`);
|
|
404
|
+
this.matterAccessories = matterServices;
|
|
405
|
+
return matterServices;
|
|
406
|
+
}
|
|
407
|
+
catch (error) {
|
|
408
|
+
this.logger.error('Failed to load Matter accessories:', error);
|
|
409
|
+
return [];
|
|
410
|
+
}
|
|
411
|
+
}
|
|
412
|
+
transformMatterAccessory(accessory, part) {
|
|
413
|
+
const targetClusters = part?.clusters || accessory.clusters;
|
|
414
|
+
const displayName = part
|
|
415
|
+
? `${accessory.displayName} - ${part.displayName}`
|
|
416
|
+
: accessory.displayName;
|
|
417
|
+
const uniqueId = part
|
|
418
|
+
? `matter:${accessory.uuid}:${part.id}`
|
|
419
|
+
: `matter:${accessory.uuid}`;
|
|
420
|
+
const deviceType = part?.deviceType || accessory.deviceType;
|
|
421
|
+
const bridgeUsername = accessory.bridge?.username || 'unknown';
|
|
422
|
+
if (bridgeUsername === 'unknown') {
|
|
423
|
+
this.logger.warn(`Matter accessory '${displayName}' (${uniqueId}) has no bridge.username - layout may not persist correctly`);
|
|
424
|
+
}
|
|
425
|
+
return {
|
|
426
|
+
uniqueId,
|
|
427
|
+
uuid: accessory.uuid,
|
|
428
|
+
serviceName: displayName,
|
|
429
|
+
displayName,
|
|
430
|
+
deviceType,
|
|
431
|
+
clusters: targetClusters,
|
|
432
|
+
partId: part?.id,
|
|
433
|
+
protocol: 'matter',
|
|
434
|
+
instance: {
|
|
435
|
+
name: accessory.bridge?.name || 'Matter Bridge',
|
|
436
|
+
username: bridgeUsername,
|
|
437
|
+
},
|
|
438
|
+
accessoryInformation: {
|
|
439
|
+
'Name': displayName,
|
|
440
|
+
'Manufacturer': accessory.manufacturer || 'Unknown',
|
|
441
|
+
'Model': accessory.model || deviceType,
|
|
442
|
+
'Serial Number': accessory.serialNumber || accessory.uuid,
|
|
443
|
+
'Firmware Revision': accessory.firmwareRevision || '1.0.0',
|
|
444
|
+
},
|
|
445
|
+
bridge: accessory.bridge,
|
|
446
|
+
plugin: accessory.plugin,
|
|
447
|
+
platform: accessory.platform,
|
|
448
|
+
commissioned: accessory.commissioned,
|
|
449
|
+
fabricCount: accessory.fabricCount,
|
|
450
|
+
fabrics: accessory.fabrics,
|
|
451
|
+
aid: 0,
|
|
452
|
+
iid: 0,
|
|
453
|
+
};
|
|
454
|
+
}
|
|
455
|
+
handleMatterStateUpdate(data) {
|
|
456
|
+
const uniqueId = this.buildMatterUniqueId(data.uuid, data.partId);
|
|
457
|
+
const service = this.matterAccessories.find(s => s.uniqueId === uniqueId);
|
|
458
|
+
if (!service) {
|
|
459
|
+
return;
|
|
460
|
+
}
|
|
461
|
+
service.clusters[data.cluster] = {
|
|
462
|
+
...service.clusters[data.cluster],
|
|
463
|
+
...data.state,
|
|
464
|
+
};
|
|
465
|
+
for (const client of this.activeClients) {
|
|
466
|
+
client.emit('accessories-data', [service]);
|
|
467
|
+
}
|
|
468
|
+
}
|
|
469
|
+
async handleMatterControl(client, control) {
|
|
470
|
+
try {
|
|
471
|
+
const { uuid, partId } = this.parseMatterUniqueId(control.uniqueId);
|
|
472
|
+
const accessory = this.matterAccessories.find(acc => acc.uuid === uuid);
|
|
473
|
+
const bridgeUsername = accessory?.bridge?.username;
|
|
474
|
+
const response = await this.waitForMatterEvent('accessoryControlResponse', () => {
|
|
475
|
+
this.homebridgeIpcService.sendMessage('matterAccessoryControl', {
|
|
476
|
+
uuid,
|
|
477
|
+
cluster: control.cluster,
|
|
478
|
+
attributes: control.attributes,
|
|
479
|
+
bridgeUsername,
|
|
480
|
+
partId,
|
|
481
|
+
});
|
|
482
|
+
});
|
|
483
|
+
if (!response.success) {
|
|
484
|
+
client.emit('accessory-control-failure', response.error || 'Matter control failed');
|
|
485
|
+
}
|
|
486
|
+
}
|
|
487
|
+
catch (error) {
|
|
488
|
+
this.logger.error('Matter control failed:', error);
|
|
489
|
+
client.emit('accessory-control-failure', error.message || 'Matter control failed');
|
|
490
|
+
}
|
|
491
|
+
}
|
|
231
492
|
};
|
|
232
493
|
AccessoriesService = __decorate([
|
|
233
494
|
Injectable(),
|
|
234
495
|
__param(0, Inject(ConfigService)),
|
|
235
496
|
__param(1, Inject(Logger)),
|
|
497
|
+
__param(2, Inject(HomebridgeIpcService)),
|
|
236
498
|
__metadata("design:paramtypes", [ConfigService,
|
|
237
|
-
Logger
|
|
499
|
+
Logger,
|
|
500
|
+
HomebridgeIpcService])
|
|
238
501
|
], AccessoriesService);
|
|
239
502
|
export { AccessoriesService };
|
|
240
503
|
//# sourceMappingURL=accessories.service.js.map
|