homebridge 2.0.0-beta.73 → 2.0.0-beta.75
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/matter/ChildBridgeMatterMessageHandler.d.ts +5 -1
- package/dist/matter/ChildBridgeMatterMessageHandler.d.ts.map +1 -1
- package/dist/matter/ChildBridgeMatterMessageHandler.js +11 -1
- package/dist/matter/ChildBridgeMatterMessageHandler.js.map +1 -1
- package/dist/matter/ipc-types.d.ts +1 -0
- package/dist/matter/ipc-types.d.ts.map +1 -1
- package/dist/matter/server/CommissioningManager.d.ts.map +1 -1
- package/dist/matter/server/CommissioningManager.js +8 -2
- package/dist/matter/server/CommissioningManager.js.map +1 -1
- package/package.json +1 -1
|
@@ -6,15 +6,19 @@ export declare class ChildBridgeMatterMessageHandler {
|
|
|
6
6
|
constructor(matterManager: ChildBridgeMatterManager | undefined, bridgeUsername: string, sendMessage: (type: string, data: unknown) => void);
|
|
7
7
|
handleStartMatterMonitoring(): void;
|
|
8
8
|
handleStopMatterMonitoring(): void;
|
|
9
|
-
handleGetMatterAccessories(
|
|
9
|
+
handleGetMatterAccessories(data?: {
|
|
10
|
+
correlationId?: string;
|
|
11
|
+
}): void;
|
|
10
12
|
handleGetMatterAccessoryInfo(data: {
|
|
11
13
|
uuid: string;
|
|
14
|
+
correlationId?: string;
|
|
12
15
|
}): void;
|
|
13
16
|
handleMatterAccessoryControl(data: {
|
|
14
17
|
uuid: string;
|
|
15
18
|
cluster: string;
|
|
16
19
|
attributes: Record<string, unknown>;
|
|
17
20
|
partId?: string;
|
|
21
|
+
correlationId?: string;
|
|
18
22
|
}): void;
|
|
19
23
|
}
|
|
20
24
|
//# sourceMappingURL=ChildBridgeMatterMessageHandler.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ChildBridgeMatterMessageHandler.d.ts","sourceRoot":"","sources":["../../src/matter/ChildBridgeMatterMessageHandler.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAA;AAW7E,qBAAa,+BAA+B;IAExC,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,WAAW;gBAFX,aAAa,EAAE,wBAAwB,GAAG,SAAS,EACnD,cAAc,EAAE,MAAM,EACtB,WAAW,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,KAAK,IAAI;IAM5D,2BAA2B,IAAI,IAAI;IASnC,0BAA0B,IAAI,IAAI;IASlC,0BAA0B,IAAI,IAAI;
|
|
1
|
+
{"version":3,"file":"ChildBridgeMatterMessageHandler.d.ts","sourceRoot":"","sources":["../../src/matter/ChildBridgeMatterMessageHandler.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAA;AAW7E,qBAAa,+BAA+B;IAExC,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,WAAW;gBAFX,aAAa,EAAE,wBAAwB,GAAG,SAAS,EACnD,cAAc,EAAE,MAAM,EACtB,WAAW,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,KAAK,IAAI;IAM5D,2BAA2B,IAAI,IAAI;IASnC,0BAA0B,IAAI,IAAI;IASlC,0BAA0B,CAAC,IAAI,CAAC,EAAE;QAAE,aAAa,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI;IAiDnE,4BAA4B,CAAC,IAAI,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,aAAa,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI;IAoClF,4BAA4B,CAAC,IAAI,EAAE;QACjC,IAAI,EAAE,MAAM,CAAA;QACZ,OAAO,EAAE,MAAM,CAAA;QACf,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;QACnC,MAAM,CAAC,EAAE,MAAM,CAAA;QACf,aAAa,CAAC,EAAE,MAAM,CAAA;KACvB,GAAG,IAAI;CA6CT"}
|
|
@@ -19,13 +19,15 @@ export class ChildBridgeMatterMessageHandler {
|
|
|
19
19
|
this.matterManager.disableStateMonitoring();
|
|
20
20
|
}
|
|
21
21
|
}
|
|
22
|
-
handleGetMatterAccessories() {
|
|
22
|
+
handleGetMatterAccessories(data) {
|
|
23
23
|
log.debug(`handleGetMatterAccessories called for bridge ${this.bridgeUsername}`);
|
|
24
|
+
const correlationId = data?.correlationId;
|
|
24
25
|
try {
|
|
25
26
|
if (!this.matterManager?.isMatterEnabled()) {
|
|
26
27
|
log.debug('Matter not enabled, returning empty accessories list');
|
|
27
28
|
const event = {
|
|
28
29
|
type: 'accessoriesData',
|
|
30
|
+
correlationId,
|
|
29
31
|
data: {
|
|
30
32
|
bridgeUsername: this.bridgeUsername,
|
|
31
33
|
accessories: [],
|
|
@@ -38,6 +40,7 @@ export class ChildBridgeMatterMessageHandler {
|
|
|
38
40
|
log.debug(`Collected ${accessories.length} accessories from child bridge`);
|
|
39
41
|
const event = {
|
|
40
42
|
type: 'accessoriesData',
|
|
43
|
+
correlationId,
|
|
41
44
|
data: {
|
|
42
45
|
bridgeUsername: this.bridgeUsername,
|
|
43
46
|
accessories,
|
|
@@ -49,6 +52,7 @@ export class ChildBridgeMatterMessageHandler {
|
|
|
49
52
|
log.error('Failed to get Matter accessories:', error);
|
|
50
53
|
const event = {
|
|
51
54
|
type: 'accessoriesData',
|
|
55
|
+
correlationId,
|
|
52
56
|
data: {
|
|
53
57
|
bridgeUsername: this.bridgeUsername,
|
|
54
58
|
error: error instanceof Error ? error.message : 'Unknown error',
|
|
@@ -58,6 +62,7 @@ export class ChildBridgeMatterMessageHandler {
|
|
|
58
62
|
}
|
|
59
63
|
}
|
|
60
64
|
handleGetMatterAccessoryInfo(data) {
|
|
65
|
+
const correlationId = data?.correlationId;
|
|
61
66
|
try {
|
|
62
67
|
if (!this.matterManager?.isMatterEnabled()) {
|
|
63
68
|
return;
|
|
@@ -66,6 +71,7 @@ export class ChildBridgeMatterMessageHandler {
|
|
|
66
71
|
if (accessoryInfo) {
|
|
67
72
|
const event = {
|
|
68
73
|
type: 'accessoryInfoData',
|
|
74
|
+
correlationId,
|
|
69
75
|
data: accessoryInfo,
|
|
70
76
|
};
|
|
71
77
|
this.sendMessage('matterEvent', event);
|
|
@@ -75,6 +81,7 @@ export class ChildBridgeMatterMessageHandler {
|
|
|
75
81
|
log.error('Failed to get Matter accessory info:', error);
|
|
76
82
|
const event = {
|
|
77
83
|
type: 'accessoryInfoData',
|
|
84
|
+
correlationId,
|
|
78
85
|
data: {
|
|
79
86
|
error: error instanceof Error ? error.message : 'Unknown error',
|
|
80
87
|
},
|
|
@@ -83,6 +90,7 @@ export class ChildBridgeMatterMessageHandler {
|
|
|
83
90
|
}
|
|
84
91
|
}
|
|
85
92
|
handleMatterAccessoryControl(data) {
|
|
93
|
+
const correlationId = data?.correlationId;
|
|
86
94
|
if (!this.matterManager?.isMatterEnabled()) {
|
|
87
95
|
log.debug(`Ignoring Matter control for ${data.uuid} - Matter not enabled on child bridge ${this.bridgeUsername}`);
|
|
88
96
|
return;
|
|
@@ -93,6 +101,7 @@ export class ChildBridgeMatterMessageHandler {
|
|
|
93
101
|
log.debug(`Successfully controlled accessory ${data.uuid} on child bridge ${this.bridgeUsername}`);
|
|
94
102
|
const controlResponse = {
|
|
95
103
|
type: 'accessoryControlResponse',
|
|
104
|
+
correlationId,
|
|
96
105
|
data: {
|
|
97
106
|
success: true,
|
|
98
107
|
uuid: data.uuid,
|
|
@@ -108,6 +117,7 @@ export class ChildBridgeMatterMessageHandler {
|
|
|
108
117
|
log.error(`Failed to control ${data.uuid} on child bridge ${this.bridgeUsername}: ${error.message}`);
|
|
109
118
|
const event = {
|
|
110
119
|
type: 'accessoryControlResponse',
|
|
120
|
+
correlationId,
|
|
111
121
|
data: {
|
|
112
122
|
success: false,
|
|
113
123
|
error: error instanceof Error ? error.message : 'Unknown error',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ChildBridgeMatterMessageHandler.js","sourceRoot":"","sources":["../../src/matter/ChildBridgeMatterMessageHandler.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAErC,MAAM,GAAG,GAAG,MAAM,CAAC,UAAU,CAAC,4BAA4B,CAAC,CAAA;AAM3D,MAAM,OAAO,+BAA+B;IAEhC;IACA;IACA;IAHV,YACU,aAAmD,EACnD,cAAsB,EACtB,WAAkD;QAFlD,kBAAa,GAAb,aAAa,CAAsC;QACnD,mBAAc,GAAd,cAAc,CAAQ;QACtB,gBAAW,GAAX,WAAW,CAAuC;IACzD,CAAC;IAKJ,2BAA2B;QACzB,IAAI,IAAI,CAAC,aAAa,EAAE,eAAe,EAAE,EAAE,CAAC;YAC1C,IAAI,CAAC,aAAa,CAAC,qBAAqB,EAAE,CAAA;QAC5C,CAAC;IACH,CAAC;IAKD,0BAA0B;QACxB,IAAI,IAAI,CAAC,aAAa,EAAE,eAAe,EAAE,EAAE,CAAC;YAC1C,IAAI,CAAC,aAAa,CAAC,sBAAsB,EAAE,CAAA;QAC7C,CAAC;IACH,CAAC;IAKD,0BAA0B;
|
|
1
|
+
{"version":3,"file":"ChildBridgeMatterMessageHandler.js","sourceRoot":"","sources":["../../src/matter/ChildBridgeMatterMessageHandler.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAErC,MAAM,GAAG,GAAG,MAAM,CAAC,UAAU,CAAC,4BAA4B,CAAC,CAAA;AAM3D,MAAM,OAAO,+BAA+B;IAEhC;IACA;IACA;IAHV,YACU,aAAmD,EACnD,cAAsB,EACtB,WAAkD;QAFlD,kBAAa,GAAb,aAAa,CAAsC;QACnD,mBAAc,GAAd,cAAc,CAAQ;QACtB,gBAAW,GAAX,WAAW,CAAuC;IACzD,CAAC;IAKJ,2BAA2B;QACzB,IAAI,IAAI,CAAC,aAAa,EAAE,eAAe,EAAE,EAAE,CAAC;YAC1C,IAAI,CAAC,aAAa,CAAC,qBAAqB,EAAE,CAAA;QAC5C,CAAC;IACH,CAAC;IAKD,0BAA0B;QACxB,IAAI,IAAI,CAAC,aAAa,EAAE,eAAe,EAAE,EAAE,CAAC;YAC1C,IAAI,CAAC,aAAa,CAAC,sBAAsB,EAAE,CAAA;QAC7C,CAAC;IACH,CAAC;IAKD,0BAA0B,CAAC,IAAiC;QAC1D,GAAG,CAAC,KAAK,CAAC,gDAAgD,IAAI,CAAC,cAAc,EAAE,CAAC,CAAA;QAChF,MAAM,aAAa,GAAG,IAAI,EAAE,aAAa,CAAA;QACzC,IAAI,CAAC;YAEH,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,eAAe,EAAE,EAAE,CAAC;gBAC3C,GAAG,CAAC,KAAK,CAAC,sDAAsD,CAAC,CAAA;gBAEjE,MAAM,KAAK,GAAgB;oBACzB,IAAI,EAAE,iBAAiB;oBACvB,aAAa;oBACb,IAAI,EAAE;wBACJ,cAAc,EAAE,IAAI,CAAC,cAAc;wBACnC,WAAW,EAAE,EAAE;qBAChB;iBACF,CAAA;gBACD,IAAI,CAAC,WAAW,CAAC,aAAa,EAAE,KAAK,CAAC,CAAA;gBACtC,OAAM;YACR,CAAC;YAED,MAAM,WAAW,GAAG,IAAI,CAAC,aAAa,CAAC,qBAAqB,EAAE,CAAA;YAC9D,GAAG,CAAC,KAAK,CAAC,aAAa,WAAW,CAAC,MAAM,gCAAgC,CAAC,CAAA;YAE1E,MAAM,KAAK,GAAgB;gBACzB,IAAI,EAAE,iBAAiB;gBACvB,aAAa;gBACb,IAAI,EAAE;oBACJ,cAAc,EAAE,IAAI,CAAC,cAAc;oBACnC,WAAW;iBACZ;aACF,CAAA;YACD,IAAI,CAAC,WAAW,CAAC,aAAa,EAAE,KAAK,CAAC,CAAA;QACxC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,GAAG,CAAC,KAAK,CAAC,mCAAmC,EAAE,KAAK,CAAC,CAAA;YACrD,MAAM,KAAK,GAAgB;gBACzB,IAAI,EAAE,iBAAiB;gBACvB,aAAa;gBACb,IAAI,EAAE;oBACJ,cAAc,EAAE,IAAI,CAAC,cAAc;oBACnC,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe;iBAChE;aACF,CAAA;YACD,IAAI,CAAC,WAAW,CAAC,aAAa,EAAE,KAAK,CAAC,CAAA;QACxC,CAAC;IACH,CAAC;IAKD,4BAA4B,CAAC,IAA8C;QACzE,MAAM,aAAa,GAAG,IAAI,EAAE,aAAa,CAAA;QACzC,IAAI,CAAC;YAEH,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,eAAe,EAAE,EAAE,CAAC;gBAE3C,OAAM;YACR,CAAC;YAED,MAAM,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YAEpE,IAAI,aAAa,EAAE,CAAC;gBAClB,MAAM,KAAK,GAAgB;oBACzB,IAAI,EAAE,mBAAmB;oBACzB,aAAa;oBACb,IAAI,EAAE,aAAa;iBACpB,CAAA;gBACD,IAAI,CAAC,WAAW,CAAC,aAAa,EAAE,KAAK,CAAC,CAAA;YACxC,CAAC;QAEH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,GAAG,CAAC,KAAK,CAAC,sCAAsC,EAAE,KAAK,CAAC,CAAA;YACxD,MAAM,KAAK,GAAgB;gBACzB,IAAI,EAAE,mBAAmB;gBACzB,aAAa;gBACb,IAAI,EAAE;oBACJ,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe;iBAChE;aACF,CAAA;YACD,IAAI,CAAC,WAAW,CAAC,aAAa,EAAE,KAAK,CAAC,CAAA;QACxC,CAAC;IACH,CAAC;IAKD,4BAA4B,CAAC,IAM5B;QACC,MAAM,aAAa,GAAG,IAAI,EAAE,aAAa,CAAA;QAEzC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,eAAe,EAAE,EAAE,CAAC;YAE3C,GAAG,CAAC,KAAK,CAAC,+BAA+B,IAAI,CAAC,IAAI,yCAAyC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAA;YACjH,OAAM;QACR,CAAC;QAED,GAAG,CAAC,KAAK,CAAC,2CAA2C,IAAI,CAAC,cAAc,UAAU,IAAI,CAAC,IAAI,aAAa,IAAI,CAAC,OAAO,UAAU,IAAI,CAAC,MAAM,IAAI,MAAM,EAAE,CAAC,CAAA;QAEtJ,IAAI,CAAC,aAAa,CAAC,oBAAoB,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC;aAC3F,IAAI,CAAC,GAAG,EAAE;YACT,GAAG,CAAC,KAAK,CAAC,qCAAqC,IAAI,CAAC,IAAI,oBAAoB,IAAI,CAAC,cAAc,EAAE,CAAC,CAAA;YAGlG,MAAM,eAAe,GAAgB;gBACnC,IAAI,EAAE,0BAA0B;gBAChC,aAAa;gBACb,IAAI,EAAE;oBACJ,OAAO,EAAE,IAAI;oBACb,IAAI,EAAE,IAAI,CAAC,IAAI;iBAChB;aACF,CAAA;YACD,IAAI,CAAC,WAAW,CAAC,aAAa,EAAE,eAAe,CAAC,CAAA;QAClD,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;YAEf,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,0BAA0B,CAAC,EAAE,CAAC;gBACvD,GAAG,CAAC,KAAK,CAAC,aAAa,IAAI,CAAC,IAAI,wBAAwB,IAAI,CAAC,cAAc,YAAY,CAAC,CAAA;gBACxF,OAAM;YACR,CAAC;YACD,GAAG,CAAC,KAAK,CAAC,qBAAqB,IAAI,CAAC,IAAI,oBAAoB,IAAI,CAAC,cAAc,KAAK,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;YACpG,MAAM,KAAK,GAAgB;gBACzB,IAAI,EAAE,0BAA0B;gBAChC,aAAa;gBACb,IAAI,EAAE;oBACJ,OAAO,EAAE,KAAK;oBACd,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe;oBAC/D,IAAI,EAAE,IAAI,CAAC,IAAI;iBAChB;aACF,CAAA;YACD,IAAI,CAAC,WAAW,CAAC,aAAa,EAAE,KAAK,CAAC,CAAA;QACxC,CAAC,CAAC,CAAA;IACN,CAAC;CACF"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
export type MatterEventType = 'monitoringStarted' | 'monitoringStopped' | 'accessoriesData' | 'accessoryInfoData' | 'accessoryControlResponse' | 'accessoryUpdate' | 'accessoryAdded' | 'accessoryRemoved' | 'externalBridgeRegistration';
|
|
2
2
|
export interface MatterEvent<T = unknown> {
|
|
3
3
|
type: MatterEventType;
|
|
4
|
+
correlationId?: string;
|
|
4
5
|
data?: T;
|
|
5
6
|
}
|
|
6
7
|
export interface MatterStatusInfo {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ipc-types.d.ts","sourceRoot":"","sources":["../../src/matter/ipc-types.ts"],"names":[],"mappings":"AAUA,MAAM,MAAM,eAAe,GACrB,mBAAmB,GACnB,mBAAmB,GACnB,iBAAiB,GACjB,mBAAmB,GACnB,0BAA0B,GAC1B,iBAAiB,GACjB,gBAAgB,GAChB,kBAAkB,GAClB,4BAA4B,CAAA;AAKlC,MAAM,WAAW,WAAW,CAAC,CAAC,GAAG,OAAO;IACtC,IAAI,EAAE,eAAe,CAAA;IACrB,IAAI,CAAC,EAAE,CAAC,CAAA;CACT;AAKD,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,OAAO,CAAA;IAChB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,WAAW,CAAC,EAAE,MAAM,CAAA;CACrB;AAKD,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,OAAO,GAAG,IAAI,CAAA;IACtB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAA;IACvB,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,MAAM,CAAA;IAChB,GAAG,EAAE,MAAM,CAAA;IACX,MAAM,EAAE,gBAAgB,CAAA;CACzB"}
|
|
1
|
+
{"version":3,"file":"ipc-types.d.ts","sourceRoot":"","sources":["../../src/matter/ipc-types.ts"],"names":[],"mappings":"AAUA,MAAM,MAAM,eAAe,GACrB,mBAAmB,GACnB,mBAAmB,GACnB,iBAAiB,GACjB,mBAAmB,GACnB,0BAA0B,GAC1B,iBAAiB,GACjB,gBAAgB,GAChB,kBAAkB,GAClB,4BAA4B,CAAA;AAKlC,MAAM,WAAW,WAAW,CAAC,CAAC,GAAG,OAAO;IACtC,IAAI,EAAE,eAAe,CAAA;IACrB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,IAAI,CAAC,EAAE,CAAC,CAAA;CACT;AAKD,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,OAAO,CAAA;IAChB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,WAAW,CAAC,EAAE,MAAM,CAAA;CACrB;AAKD,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,OAAO,GAAG,IAAI,CAAA;IACtB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAA;IACvB,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,MAAM,CAAA;IAChB,GAAG,EAAE,MAAM,CAAA;IACX,MAAM,EAAE,gBAAgB,CAAA;CACzB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CommissioningManager.d.ts","sourceRoot":"","sources":["../../../src/matter/server/CommissioningManager.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAC9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAE/C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAA;AAC3D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAavD,MAAM,WAAW,iBAAiB;IAChC,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB;AAED,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,kBAAkB,CAAA;IAC1B,UAAU,EAAE,UAAU,GAAG,IAAI,CAAA;IAC7B,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,OAAO,EAAE,YAAY,CAAA;IACrB,aAAa,EAAE,aAAa,CAAA;CAC7B;AAED,qBAAa,oBAAoB;IACxB,QAAQ,SAAI;IACZ,aAAa,SAAI;IACxB,SAAgB,QAAQ,EAAE,MAAM,CAAA;IAChC,SAAgB,SAAS,EAAE,MAAM,CAAA;IAC1B,iBAAiB,EAAE,iBAAiB,CAAK;;IAchD,sBAAsB,IAAI,MAAM;
|
|
1
|
+
{"version":3,"file":"CommissioningManager.d.ts","sourceRoot":"","sources":["../../../src/matter/server/CommissioningManager.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAC9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAE/C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAA;AAC3D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAavD,MAAM,WAAW,iBAAiB;IAChC,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB;AAED,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,kBAAkB,CAAA;IAC1B,UAAU,EAAE,UAAU,GAAG,IAAI,CAAA;IAC7B,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,OAAO,EAAE,YAAY,CAAA;IACrB,aAAa,EAAE,aAAa,CAAA;CAC7B;AAED,qBAAa,oBAAoB;IACxB,QAAQ,SAAI;IACZ,aAAa,SAAI;IACxB,SAAgB,QAAQ,EAAE,MAAM,CAAA;IAChC,SAAgB,SAAS,EAAE,MAAM,CAAA;IAC1B,iBAAiB,EAAE,iBAAiB,CAAK;;IAchD,sBAAsB,IAAI,MAAM;IAiDhC,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO;IAoD1C,2BAA2B,IAAI,MAAM;IAgB/B,yBAAyB,CAAC,iBAAiB,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAiCnE,yBAAyB,CAAC,IAAI,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IA4EvE,gCAAgC,CAAC,IAAI,EAAE,iBAAiB,GAAG,IAAI;IA4DzD,uBAAuB,CAAC,IAAI,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;CAwBtE"}
|
|
@@ -34,8 +34,14 @@ export class CommissioningManager {
|
|
|
34
34
|
87654321,
|
|
35
35
|
];
|
|
36
36
|
do {
|
|
37
|
-
const
|
|
38
|
-
|
|
37
|
+
const maxRange = 99999998;
|
|
38
|
+
const maxUint32 = 0xFFFFFFFF;
|
|
39
|
+
const limit = Math.floor(maxUint32 / maxRange) * maxRange;
|
|
40
|
+
let randomValue;
|
|
41
|
+
do {
|
|
42
|
+
randomValue = randomBytes(4).readUInt32BE(0);
|
|
43
|
+
} while (randomValue >= limit);
|
|
44
|
+
passcode = (randomValue % maxRange) + 1;
|
|
39
45
|
attempts++;
|
|
40
46
|
if (attempts > maxAttempts) {
|
|
41
47
|
throw new Error('Failed to generate secure passcode after maximum attempts');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CommissioningManager.js","sourceRoot":"","sources":["../../../src/matter/server/CommissioningManager.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAC5C,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAEhC,OAAO,EAAE,sBAAsB,EAAE,MAAM,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AAEzF,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AACxC,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAA;AAEhG,MAAM,GAAG,GAAG,MAAM,CAAC,UAAU,CAAC,eAAe,CAAC,CAAA;AAiB9C,MAAM,OAAO,oBAAoB;IACxB,QAAQ,GAAG,CAAC,CAAA;IACZ,aAAa,GAAG,CAAC,CAAA;IACR,QAAQ,CAAQ;IAChB,SAAS,CAAQ;IAC1B,iBAAiB,GAAsB,EAAE,CAAA;IAEhD;QACE,IAAI,CAAC,QAAQ,GAAG,iBAAiB,CAAA;QACjC,IAAI,CAAC,SAAS,GAAG,kBAAkB,CAAA;IACrC,CAAC;IASD,sBAAsB;QACpB,IAAI,QAAgB,CAAA;QACpB,MAAM,WAAW,GAAG,qBAAqB,CAAA;QACzC,IAAI,QAAQ,GAAG,CAAC,CAAA;QAEhB,MAAM,gBAAgB,GAAG;YACvB,CAAC;YACD,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;YACR,QAAQ;SACT,CAAA;QAED,GAAG,CAAC;YAEF,MAAM,WAAW,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"CommissioningManager.js","sourceRoot":"","sources":["../../../src/matter/server/CommissioningManager.ts"],"names":[],"mappings":"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"}
|