@matter-server/ble-proxy 0.0.1 → 0.7.2-alpha.0-20260601-e778038

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/LICENSE ADDED
@@ -0,0 +1,201 @@
1
+ Apache License
2
+ Version 2.0, January 2004
3
+ http://www.apache.org/licenses/
4
+
5
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6
+
7
+ 1. Definitions.
8
+
9
+ "License" shall mean the terms and conditions for use, reproduction,
10
+ and distribution as defined by Sections 1 through 9 of this document.
11
+
12
+ "Licensor" shall mean the copyright owner or entity authorized by
13
+ the copyright owner that is granting the License.
14
+
15
+ "Legal Entity" shall mean the union of the acting entity and all
16
+ other entities that control, are controlled by, or are under common
17
+ control with that entity. For the purposes of this definition,
18
+ "control" means (i) the power, direct or indirect, to cause the
19
+ direction or management of such entity, whether by contract or
20
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
21
+ outstanding shares, or (iii) beneficial ownership of such entity.
22
+
23
+ "You" (or "Your") shall mean an individual or Legal Entity
24
+ exercising permissions granted by this License.
25
+
26
+ "Source" form shall mean the preferred form for making modifications,
27
+ including but not limited to software source code, documentation
28
+ source, and configuration files.
29
+
30
+ "Object" form shall mean any form resulting from mechanical
31
+ transformation or translation of a Source form, including but
32
+ not limited to compiled object code, generated documentation,
33
+ and conversions to other media types.
34
+
35
+ "Work" shall mean the work of authorship, whether in Source or
36
+ Object form, made available under the License, as indicated by a
37
+ copyright notice that is included in or attached to the work
38
+ (an example is provided in the Appendix below).
39
+
40
+ "Derivative Works" shall mean any work, whether in Source or Object
41
+ form, that is based on (or derived from) the Work and for which the
42
+ editorial revisions, annotations, elaborations, or other modifications
43
+ represent, as a whole, an original work of authorship. For the purposes
44
+ of this License, Derivative Works shall not include works that remain
45
+ separable from, or merely link (or bind by name) to the interfaces of,
46
+ the Work and Derivative Works thereof.
47
+
48
+ "Contribution" shall mean any work of authorship, including
49
+ the original version of the Work and any modifications or additions
50
+ to that Work or Derivative Works thereof, that is intentionally
51
+ submitted to Licensor for inclusion in the Work by the copyright owner
52
+ or by an individual or Legal Entity authorized to submit on behalf of
53
+ the copyright owner. For the purposes of this definition, "submitted"
54
+ means any form of electronic, verbal, or written communication sent
55
+ to the Licensor or its representatives, including but not limited to
56
+ communication on electronic mailing lists, source code control systems,
57
+ and issue tracking systems that are managed by, or on behalf of, the
58
+ Licensor for the purpose of discussing and improving the Work, but
59
+ excluding communication that is conspicuously marked or otherwise
60
+ designated in writing by the copyright owner as "Not a Contribution."
61
+
62
+ "Contributor" shall mean Licensor and any individual or Legal Entity
63
+ on behalf of whom a Contribution has been received by Licensor and
64
+ subsequently incorporated within the Work.
65
+
66
+ 2. Grant of Copyright License. Subject to the terms and conditions of
67
+ this License, each Contributor hereby grants to You a perpetual,
68
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69
+ copyright license to reproduce, prepare Derivative Works of,
70
+ publicly display, publicly perform, sublicense, and distribute the
71
+ Work and such Derivative Works in Source or Object form.
72
+
73
+ 3. Grant of Patent License. Subject to the terms and conditions of
74
+ this License, each Contributor hereby grants to You a perpetual,
75
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76
+ (except as stated in this section) patent license to make, have made,
77
+ use, offer to sell, sell, import, and otherwise transfer the Work,
78
+ where such license applies only to those patent claims licensable
79
+ by such Contributor that are necessarily infringed by their
80
+ Contribution(s) alone or by combination of their Contribution(s)
81
+ with the Work to which such Contribution(s) was submitted. If You
82
+ institute patent litigation against any entity (including a
83
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
84
+ or a Contribution incorporated within the Work constitutes direct
85
+ or contributory patent infringement, then any patent licenses
86
+ granted to You under this License for that Work shall terminate
87
+ as of the date such litigation is filed.
88
+
89
+ 4. Redistribution. You may reproduce and distribute copies of the
90
+ Work or Derivative Works thereof in any medium, with or without
91
+ modifications, and in Source or Object form, provided that You
92
+ meet the following conditions:
93
+
94
+ (a) You must give any other recipients of the Work or
95
+ Derivative Works a copy of this License; and
96
+
97
+ (b) You must cause any modified files to carry prominent notices
98
+ stating that You changed the files; and
99
+
100
+ (c) You must retain, in the Source form of any Derivative Works
101
+ that You distribute, all copyright, patent, trademark, and
102
+ attribution notices from the Source form of the Work,
103
+ excluding those notices that do not pertain to any part of
104
+ the Derivative Works; and
105
+
106
+ (d) If the Work includes a "NOTICE" text file as part of its
107
+ distribution, then any Derivative Works that You distribute must
108
+ include a readable copy of the attribution notices contained
109
+ within such NOTICE file, excluding those notices that do not
110
+ pertain to any part of the Derivative Works, in at least one
111
+ of the following places: within a NOTICE text file distributed
112
+ as part of the Derivative Works; within the Source form or
113
+ documentation, if provided along with the Derivative Works; or,
114
+ within a display generated by the Derivative Works, if and
115
+ wherever such third-party notices normally appear. The contents
116
+ of the NOTICE file are for informational purposes only and
117
+ do not modify the License. You may add Your own attribution
118
+ notices within Derivative Works that You distribute, alongside
119
+ or as an addendum to the NOTICE text from the Work, provided
120
+ that such additional attribution notices cannot be construed
121
+ as modifying the License.
122
+
123
+ You may add Your own copyright statement to Your modifications and
124
+ may provide additional or different license terms and conditions
125
+ for use, reproduction, or distribution of Your modifications, or
126
+ for any such Derivative Works as a whole, provided Your use,
127
+ reproduction, and distribution of the Work otherwise complies with
128
+ the conditions stated in this License.
129
+
130
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
131
+ any Contribution intentionally submitted for inclusion in the Work
132
+ by You to the Licensor shall be under the terms and conditions of
133
+ this License, without any additional terms or conditions.
134
+ Notwithstanding the above, nothing herein shall supersede or modify
135
+ the terms of any separate license agreement you may have executed
136
+ with Licensor regarding such Contributions.
137
+
138
+ 6. Trademarks. This License does not grant permission to use the trade
139
+ names, trademarks, service marks, or product names of the Licensor,
140
+ except as required for reasonable and customary use in describing the
141
+ origin of the Work and reproducing the content of the NOTICE file.
142
+
143
+ 7. Disclaimer of Warranty. Unless required by applicable law or
144
+ agreed to in writing, Licensor provides the Work (and each
145
+ Contributor provides its Contributions) on an "AS IS" BASIS,
146
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147
+ implied, including, without limitation, any warranties or conditions
148
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149
+ PARTICULAR PURPOSE. You are solely responsible for determining the
150
+ appropriateness of using or redistributing the Work and assume any
151
+ risks associated with Your exercise of permissions under this License.
152
+
153
+ 8. Limitation of Liability. In no event and under no legal theory,
154
+ whether in tort (including negligence), contract, or otherwise,
155
+ unless required by applicable law (such as deliberate and grossly
156
+ negligent acts) or agreed to in writing, shall any Contributor be
157
+ liable to You for damages, including any direct, indirect, special,
158
+ incidental, or consequential damages of any character arising as a
159
+ result of this License or out of the use or inability to use the
160
+ Work (including but not limited to damages for loss of goodwill,
161
+ work stoppage, computer failure or malfunction, or any and all
162
+ other commercial damages or losses), even if such Contributor
163
+ has been advised of the possibility of such damages.
164
+
165
+ 9. Accepting Warranty or Additional Liability. While redistributing
166
+ the Work or Derivative Works thereof, You may choose to offer,
167
+ and charge a fee for, acceptance of support, warranty, indemnity,
168
+ or other liability obligations and/or rights consistent with this
169
+ License. However, in accepting such obligations, You may act only
170
+ on Your own behalf and on Your sole responsibility, not on behalf
171
+ of any other Contributor, and only if You agree to indemnify,
172
+ defend, and hold each Contributor harmless for any liability
173
+ incurred by, or claims asserted against, such Contributor by reason
174
+ of your accepting any such warranty or additional liability.
175
+
176
+ END OF TERMS AND CONDITIONS
177
+
178
+ APPENDIX: How to apply the Apache License to your work.
179
+
180
+ To apply the Apache License to your work, attach the following
181
+ boilerplate notice, with the fields enclosed by brackets "[]"
182
+ replaced with your own identifying information. (Don't include
183
+ the brackets!) The text should be enclosed in the appropriate
184
+ comment syntax for the file format. We also recommend that a
185
+ file or class name and description of purpose be included on the
186
+ same "printed page" as the copyright notice for easier
187
+ identification within third-party archives.
188
+
189
+ Copyright 2025-2026 Open Home Foundation
190
+
191
+ Licensed under the Apache License, Version 2.0 (the "License");
192
+ you may not use this file except in compliance with the License.
193
+ You may obtain a copy of the License at
194
+
195
+ http://www.apache.org/licenses/LICENSE-2.0
196
+
197
+ Unless required by applicable law or agreed to in writing, software
198
+ distributed under the License is distributed on an "AS IS" BASIS,
199
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200
+ See the License for the specific language governing permissions and
201
+ limitations under the License.
@@ -21,6 +21,8 @@ export declare class BleProxyHandler implements WebServerHandler {
21
21
  readonly eventReceived: Observable<[event: BleProxyEventName, data: Record<string, unknown>], void>;
22
22
  /** Emitted when a binary frame is received from the BLE proxy client. */
23
23
  readonly binaryFrameReceived: Observable<[frame: BinaryFrame], void>;
24
+ /** Emitted once a proxy client has completed the handshake and `connected` is true. */
25
+ readonly connectionEstablished: Observable<[], void>;
24
26
  get connected(): boolean;
25
27
  register(server: HttpServer): Promise<void>;
26
28
  unregister(): Promise<void>;
@@ -1 +1 @@
1
- {"version":3,"file":"BleProxyHandler.d.ts","sourceRoot":"","sources":["../../src/BleProxyHandler.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,EAAyB,UAAU,EAAqC,MAAM,cAAc,CAAC;AACpG,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAE9C,OAAO,EAIH,KAAK,WAAW,EAChB,KAAK,kBAAkB,EACvB,KAAK,mBAAmB,EACxB,KAAK,iBAAiB,EAKzB,MAAM,uBAAuB,CAAC;AAE/B,KAAK,UAAU,GAAG,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC;AAclD;;;;;;GAMG;AACH,qBAAa,eAAgB,YAAW,gBAAgB;;IAcpD,uEAAuE;IACvE,QAAQ,CAAC,aAAa,8EAA+E;IAErG,yEAAyE;IACzE,QAAQ,CAAC,mBAAmB,yCAA0C;IAEtE,IAAI,SAAS,IAAI,OAAO,CAEvB;IAEK,QAAQ,CAAC,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAuEhD;IAED,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CAmC1B;IAED;;;;OAIG;IACG,WAAW,CAAC,CAAC,SAAS,mBAAmB,EAC3C,OAAO,EAAE,CAAC,EACV,GAAG,IAAI,EAAE,kBAAkB,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,SAAS,GAAG,EAAE,GAAG,CAAC,IAAI,EAAE,kBAAkB,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,GACtG,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CA0B1C;IAED;;OAEG;IACH,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,GAAG,IAAI,CAMnF;CAwHJ"}
1
+ {"version":3,"file":"BleProxyHandler.d.ts","sourceRoot":"","sources":["../../src/BleProxyHandler.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,EAAyB,UAAU,EAAqC,MAAM,cAAc,CAAC;AACpG,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAE9C,OAAO,EAIH,KAAK,WAAW,EAChB,KAAK,kBAAkB,EACvB,KAAK,mBAAmB,EACxB,KAAK,iBAAiB,EAKzB,MAAM,uBAAuB,CAAC;AAE/B,KAAK,UAAU,GAAG,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC;AAclD;;;;;;GAMG;AACH,qBAAa,eAAgB,YAAW,gBAAgB;;IAcpD,uEAAuE;IACvE,QAAQ,CAAC,aAAa,8EAA+E;IAErG,yEAAyE;IACzE,QAAQ,CAAC,mBAAmB,yCAA0C;IAEtE,uFAAuF;IACvF,QAAQ,CAAC,qBAAqB,uBAAwB;IAEtD,IAAI,SAAS,IAAI,OAAO,CAEvB;IAEK,QAAQ,CAAC,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CA+EhD;IAED,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CAmC1B;IAED;;;;OAIG;IACG,WAAW,CAAC,CAAC,SAAS,mBAAmB,EAC3C,OAAO,EAAE,CAAC,EACV,GAAG,IAAI,EAAE,kBAAkB,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,SAAS,GAAG,EAAE,GAAG,CAAC,IAAI,EAAE,kBAAkB,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,GACtG,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CA0B1C;IAED;;OAEG;IACH,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,GAAG,IAAI,CAMnF;CA+HJ"}
@@ -27,11 +27,14 @@ class BleProxyHandler {
27
27
  eventReceived = new Observable();
28
28
  /** Emitted when a binary frame is received from the BLE proxy client. */
29
29
  binaryFrameReceived = new Observable();
30
+ /** Emitted once a proxy client has completed the handshake and `connected` is true. */
31
+ connectionEstablished = new Observable();
30
32
  get connected() {
31
33
  return this.#handshakeComplete && this.#client?.readyState === WebSocket.OPEN;
32
34
  }
33
35
  async register(server) {
34
- const wss = this.#wss = new WebSocketServer({ noServer: true });
36
+ const isFirstBind = this.#wss === void 0;
37
+ const wss = this.#wss ??= new WebSocketServer({ noServer: true });
35
38
  const upgradeHandler = (req, socket, head) => {
36
39
  logger.debug(`Upgrade request received: ${req.url}`);
37
40
  const path = req.url?.split("?")[0];
@@ -48,6 +51,9 @@ class BleProxyHandler {
48
51
  server.on("upgrade", upgradeHandler);
49
52
  this.#removeUpgradeListeners.push(() => server.removeListener("upgrade", upgradeHandler));
50
53
  logger.info("BLE proxy WebSocket endpoint registered on /ble");
54
+ if (!isFirstBind) {
55
+ return;
56
+ }
51
57
  wss.on("connection", (ws) => {
52
58
  if (this.#closed) {
53
59
  ws.close();
@@ -207,6 +213,7 @@ class BleProxyHandler {
207
213
  })
208
214
  );
209
215
  logger.info(`BLE proxy handshake complete (version ${BLE_PROXY_PROTOCOL_VERSION})`);
216
+ this.connectionEstablished.emit();
210
217
  }
211
218
  #handleResponse(msg) {
212
219
  const pending = this.#pendingCommands.get(msg.id);
@@ -231,6 +238,10 @@ class BleProxyHandler {
231
238
  }
232
239
  try {
233
240
  const frame = decodeBinaryFrame(new Uint8Array(data));
241
+ const head = Array.from(frame.payload.subarray(0, 8)).map((b) => b.toString(16).padStart(2, "0")).join("");
242
+ logger.debug(
243
+ `[FRAME] opcode=${frame.opcode} handle=${frame.connectionHandle} len=${frame.payload.length} head=${head}`
244
+ );
234
245
  this.binaryFrameReceived.emit(frame);
235
246
  } catch (err) {
236
247
  logger.error("Failed to decode binary frame:", err);
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/BleProxyHandler.ts"],
4
- "mappings": "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",
4
+ "mappings": "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",
5
5
  "names": []
6
6
  }
@@ -29,6 +29,7 @@ export declare const BleProxyCommand: {
29
29
  readonly ReadCharacteristic: "read_characteristic";
30
30
  readonly WriteCharacteristic: "write_characteristic";
31
31
  readonly SubscribeCharacteristic: "subscribe_characteristic";
32
+ readonly WriteAndSubscribe: "write_and_subscribe";
32
33
  readonly UnsubscribeCharacteristic: "unsubscribe_characteristic";
33
34
  readonly RequestMtu: "request_mtu";
34
35
  };
@@ -72,6 +73,20 @@ export interface SubscribeCharacteristicArgs {
72
73
  connection_handle: number;
73
74
  characteristic_uuid: string;
74
75
  }
76
+ /**
77
+ * Atomic write-then-subscribe. The client performs the write to `write_uuid`, awaits the
78
+ * GATT Write Response, then enables CCCD on `subscribe_uuid` without any intervening
79
+ * WebSocket round-trip. Used for the Matter BTP handshake on C1/C2 where a peripheral may
80
+ * push the handshake response indication before the client has had time to enable CCCD if
81
+ * the two ops are split across WS commands.
82
+ */
83
+ export interface WriteAndSubscribeArgs {
84
+ connection_handle: number;
85
+ write_uuid: string;
86
+ write_value: string;
87
+ write_response?: boolean;
88
+ subscribe_uuid: string;
89
+ }
75
90
  export interface UnsubscribeCharacteristicArgs {
76
91
  connection_handle: number;
77
92
  characteristic_uuid: string;
@@ -160,6 +175,10 @@ export interface BleProxyCommandMap {
160
175
  args: SubscribeCharacteristicArgs;
161
176
  result: void;
162
177
  };
178
+ [BleProxyCommand.WriteAndSubscribe]: {
179
+ args: WriteAndSubscribeArgs;
180
+ result: void;
181
+ };
163
182
  [BleProxyCommand.UnsubscribeCharacteristic]: {
164
183
  args: UnsubscribeCharacteristicArgs;
165
184
  result: void;
@@ -1 +1 @@
1
- {"version":3,"file":"BleProxyProtocol.d.ts","sourceRoot":"","sources":["../../src/BleProxyProtocol.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"BleProxyProtocol.d.ts","sourceRoot":"","sources":["../../src/BleProxyProtocol.ts"],"names":[],"mappings":"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"}
@@ -14,6 +14,7 @@ const BleProxyCommand = {
14
14
  ReadCharacteristic: "read_characteristic",
15
15
  WriteCharacteristic: "write_characteristic",
16
16
  SubscribeCharacteristic: "subscribe_characteristic",
17
+ WriteAndSubscribe: "write_and_subscribe",
17
18
  UnsubscribeCharacteristic: "unsubscribe_characteristic",
18
19
  RequestMtu: "request_mtu"
19
20
  };
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/BleProxyProtocol.ts"],
4
- "mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAaO,MAAM,6BAA6B;AAoBnC,MAAM,kBAAkB;AAAA,EAC3B,WAAW;AAAA,EACX,UAAU;AAAA,EACV,SAAS;AAAA,EACT,YAAY;AAAA,EACZ,kBAAkB;AAAA,EAClB,yBAAyB;AAAA,EACzB,oBAAoB;AAAA,EACpB,qBAAqB;AAAA,EACrB,yBAAyB;AAAA,EACzB,2BAA2B;AAAA,EAC3B,YAAY;AAChB;AAMO,MAAM,gBAAgB;AAAA,EACzB,kBAAkB;AAAA,EAClB,cAAc;AAAA,EACd,aAAa;AAAA,EACb,4BAA4B;AAChC;AA+JO,MAAM,oBAAoB;AAAA,EAC7B,sBAAsB;AAAA,EACtB,iBAAiB;AAAA,EACjB,aAAa;AAAA,EACb,gBAAgB;AAAA,EAChB,kBAAkB;AAAA,EAClB,kBAAkB;AAAA,EAClB,cAAc;AAAA,EACd,SAAS;AAAA,EACT,iBAAiB;AAAA,EACjB,wBAAwB;AAAA,EACxB,YAAY;AAAA,EACZ,aAAa;AAAA,EACb,iBAAiB;AAAA,EACjB,eAAe;AAAA,EACf,oBAAoB;AAAA,EACpB,kBAAkB;AAAA,EAClB,iBAAiB;AAAA,EACjB,eAAe;AACnB;AAMO,MAAM,oBAAoB;AAAA;AAAA,EAE7B,WAAW;AAAA;AAAA,EAEX,cAAc;AAAA;AAAA,EAEd,cAAc;AAClB;AAaA,MAAM,2BAA2B;AAQ1B,SAAS,kBAAkB,QAAgB,kBAA0B,SAAiC;AACzG,QAAM,QAAQ,IAAI,WAAW,2BAA2B,QAAQ,MAAM;AACtE,QAAM,CAAC,IAAI,SAAS;AACpB,QAAM,CAAC,IAAK,oBAAoB,IAAK;AACrC,QAAM,CAAC,IAAI,mBAAmB;AAC9B,QAAM,IAAI,SAAS,wBAAwB;AAC3C,SAAO;AACX;AAEO,SAAS,kBAAkB,MAA+B;AAC7D,MAAI,KAAK,SAAS,0BAA0B;AACxC,UAAM,IAAI,MAAM,2BAA2B,KAAK,MAAM,mBAAmB,wBAAwB,EAAE;AAAA,EACvG;AACA,SAAO;AAAA,IACH,QAAQ,KAAK,CAAC;AAAA,IACd,kBAAmB,KAAK,CAAC,KAAK,IAAK,KAAK,CAAC;AAAA,IACzC,SAAS,KAAK,SAAS,wBAAwB;AAAA,EACnD;AACJ;",
4
+ "mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAaO,MAAM,6BAA6B;AAoBnC,MAAM,kBAAkB;AAAA,EAC3B,WAAW;AAAA,EACX,UAAU;AAAA,EACV,SAAS;AAAA,EACT,YAAY;AAAA,EACZ,kBAAkB;AAAA,EAClB,yBAAyB;AAAA,EACzB,oBAAoB;AAAA,EACpB,qBAAqB;AAAA,EACrB,yBAAyB;AAAA,EACzB,mBAAmB;AAAA,EACnB,2BAA2B;AAAA,EAC3B,YAAY;AAChB;AAMO,MAAM,gBAAgB;AAAA,EACzB,kBAAkB;AAAA,EAClB,cAAc;AAAA,EACd,aAAa;AAAA,EACb,4BAA4B;AAChC;AA+KO,MAAM,oBAAoB;AAAA,EAC7B,sBAAsB;AAAA,EACtB,iBAAiB;AAAA,EACjB,aAAa;AAAA,EACb,gBAAgB;AAAA,EAChB,kBAAkB;AAAA,EAClB,kBAAkB;AAAA,EAClB,cAAc;AAAA,EACd,SAAS;AAAA,EACT,iBAAiB;AAAA,EACjB,wBAAwB;AAAA,EACxB,YAAY;AAAA,EACZ,aAAa;AAAA,EACb,iBAAiB;AAAA,EACjB,eAAe;AAAA,EACf,oBAAoB;AAAA,EACpB,kBAAkB;AAAA,EAClB,iBAAiB;AAAA,EACjB,eAAe;AACnB;AAMO,MAAM,oBAAoB;AAAA;AAAA,EAE7B,WAAW;AAAA;AAAA,EAEX,cAAc;AAAA;AAAA,EAEd,cAAc;AAClB;AAaA,MAAM,2BAA2B;AAQ1B,SAAS,kBAAkB,QAAgB,kBAA0B,SAAiC;AACzG,QAAM,QAAQ,IAAI,WAAW,2BAA2B,QAAQ,MAAM;AACtE,QAAM,CAAC,IAAI,SAAS;AACpB,QAAM,CAAC,IAAK,oBAAoB,IAAK;AACrC,QAAM,CAAC,IAAI,mBAAmB;AAC9B,QAAM,IAAI,SAAS,wBAAwB;AAC3C,SAAO;AACX;AAEO,SAAS,kBAAkB,MAA+B;AAC7D,MAAI,KAAK,SAAS,0BAA0B;AACxC,UAAM,IAAI,MAAM,2BAA2B,KAAK,MAAM,mBAAmB,wBAAwB,EAAE;AAAA,EACvG;AACA,SAAO;AAAA,IACH,QAAQ,KAAK,CAAC;AAAA,IACd,kBAAmB,KAAK,CAAC,KAAK,IAAK,KAAK,CAAC;AAAA,IACzC,SAAS,KAAK,SAAS,wBAAwB;AAAA,EACnD;AACJ;",
5
5
  "names": []
6
6
  }
@@ -1 +1 @@
1
- {"version":3,"file":"ProxyBleChannel.d.ts","sourceRoot":"","sources":["../../src/ProxyBleChannel.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACH,KAAK,KAAK,EACV,KAAK,OAAO,EACZ,WAAW,EAKX,aAAa,EAEb,KAAK,SAAS,EACjB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,UAAU,EAAoC,iBAAiB,EAAa,MAAM,uBAAuB,CAAC;AACnH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAE5D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAgC5D;;;GAGG;AACH,qBAAa,wBAAyB,YAAW,SAAS;;IAMtD,YAAY,UAAU,EAAE,eAAe,EAAE,OAAO,EAAE,eAAe,EAGhE;IAEK,WAAW,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CA2NjE;IAED,MAAM,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,KAAK,KAAK,IAAI,GAAG,SAAS,CAAC,QAAQ,CAKlF;IAEK,KAAK,kBAEV;IAED,QAAQ,CAAC,IAAI,EAAE,WAAW,EAAE,QAAQ,CAAC,EAAE,MAAM,2BAE5C;CACJ;AAED;;;GAGG;AACH,qBAAa,eAAgB,SAAQ,UAAU,CAAC,KAAK,CAAC;;IAWlD,YAAY,iBAAiB,EAAE,MAAM,EAAE,UAAU,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,IAAI,EAOjG;IAED,IAAI,SAAS,YAEZ;IAED,gBAAgB,SAEf;IAED,WAAW,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI,CAQ7B;IAED,OAAO,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,SAAS,CAAC,QAAQ,CAOhD;IAED,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,aAAa,CAAC,KAAK,CAAC,CAc7C;IAUK,IAAI,CAAC,IAAI,EAAE,KAAK,iBASrB;IAED,IAAI,IAAI,WAEP;IAEK,KAAK,kBAUV;CACJ"}
1
+ {"version":3,"file":"ProxyBleChannel.d.ts","sourceRoot":"","sources":["../../src/ProxyBleChannel.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACH,KAAK,KAAK,EACV,KAAK,OAAO,EACZ,WAAW,EAKX,aAAa,EAEb,KAAK,SAAS,EACjB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,UAAU,EAAoC,iBAAiB,EAAa,MAAM,uBAAuB,CAAC;AACnH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAE5D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAgC5D;;;GAGG;AACH,qBAAa,wBAAyB,YAAW,SAAS;;IAMtD,YAAY,UAAU,EAAE,eAAe,EAAE,OAAO,EAAE,eAAe,EAGhE;IAEK,WAAW,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAuNjE;IAED,MAAM,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,KAAK,KAAK,IAAI,GAAG,SAAS,CAAC,QAAQ,CAKlF;IAEK,KAAK,kBAEV;IAED,QAAQ,CAAC,IAAI,EAAE,WAAW,EAAE,QAAQ,CAAC,EAAE,MAAM,2BAE5C;CACJ;AAED;;;GAGG;AACH,qBAAa,eAAgB,SAAQ,UAAU,CAAC,KAAK,CAAC;;IAWlD,YAAY,iBAAiB,EAAE,MAAM,EAAE,UAAU,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,IAAI,EAOjG;IAED,IAAI,SAAS,YAEZ;IAED,gBAAgB,SAEf;IAED,WAAW,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI,CAQ7B;IAED,OAAO,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,SAAS,CAAC,QAAQ,CAOhD;IAED,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,aAAa,CAAC,KAAK,CAAC,CAc7C;IAUK,IAAI,CAAC,IAAI,EAAE,KAAK,iBASrB;IAED,IAAI,IAAI,WAEP;IAEK,KAAK,kBAUV;CACJ"}
@@ -104,16 +104,13 @@ class ProxyBleCentralInterface {
104
104
  attMtu: mtu,
105
105
  clientWindowSize: MatterBle.BTP_MAXIMUM_WINDOW_SIZE
106
106
  });
107
- logger.debug(`Sending BTP handshake request on C1`);
108
- await this.#handler.sendCommand(BleProxyCommand.WriteCharacteristic, {
107
+ logger.debug(`Sending BTP handshake request on C1 and subscribing C2 atomically`);
108
+ await this.#handler.sendCommand(BleProxyCommand.WriteAndSubscribe, {
109
109
  connection_handle,
110
- characteristic_uuid: c1Uuid,
111
- value: Buffer.from(btpHandshakeRequest).toString("base64"),
112
- response: true
113
- });
114
- await this.#handler.sendCommand(BleProxyCommand.SubscribeCharacteristic, {
115
- connection_handle,
116
- characteristic_uuid: c2Uuid
110
+ write_uuid: c1Uuid,
111
+ write_value: Buffer.from(btpHandshakeRequest).toString("base64"),
112
+ write_response: true,
113
+ subscribe_uuid: c2Uuid
117
114
  });
118
115
  const {
119
116
  promise: handshakePromise,
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/ProxyBleChannel.ts"],
4
- "mappings": "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",
4
+ "mappings": "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",
5
5
  "names": []
6
6
  }
@@ -1 +1 @@
1
- {"version":3,"file":"ProxyBleClient.d.ts","sourceRoot":"","sources":["../../src/ProxyBleClient.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAK5D;;;GAGG;AACH,MAAM,WAAW,eAAe;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,OAAO,CAAC;IACrB,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IACrC,GAAG,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;;;GAIG;AACH,qBAAa,cAAc;;IAevB,YAAY,OAAO,EAAE,eAAe,EAGnC;IAED,oBAAoB,CAAC,QAAQ,EAAE,CAAC,UAAU,EAAE,eAAe,EAAE,iBAAiB,EAAE,UAAU,KAAK,IAAI,GAAG,IAAI,CAKzG;IAEK,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC,CAgBnC;IAEK,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC,CAalC;IAED,KAAK,IAAI,IAAI,CAGZ;CAyCJ"}
1
+ {"version":3,"file":"ProxyBleClient.d.ts","sourceRoot":"","sources":["../../src/ProxyBleClient.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAa5D;;;GAGG;AACH,MAAM,WAAW,eAAe;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,OAAO,CAAC;IACrB,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IACrC,GAAG,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;;;GAIG;AACH,qBAAa,cAAc;;IAevB,YAAY,OAAO,EAAE,eAAe,EAGnC;IAED,oBAAoB,CAAC,QAAQ,EAAE,CAAC,UAAU,EAAE,eAAe,EAAE,iBAAiB,EAAE,UAAU,KAAK,IAAI,GAAG,IAAI,CAKzG;IAEK,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC,CA6BnC;IAEK,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC,CAalC;IAED,KAAK,IAAI,IAAI,CAGZ;CAyCJ"}
@@ -3,10 +3,11 @@
3
3
  * Copyright 2025-2026 Open Home Foundation
4
4
  * SPDX-License-Identifier: Apache-2.0
5
5
  */
6
- import { Logger } from "@matter/main";
7
- import { MatterBle } from "@matter/main/protocol";
6
+ import { createPromise, Logger, Seconds, withTimeout } from "@matter/main";
7
+ import { BleError, MatterBle } from "@matter/main/protocol";
8
8
  import { BleProxyCommand, BleProxyEvent } from "./BleProxyProtocol.js";
9
9
  const logger = Logger.get("ProxyBleClient");
10
+ const SCAN_CONNECT_WAIT = Seconds(30);
10
11
  class ProxyBleClient {
11
12
  #handler;
12
13
  #discoveredPeripherals = /* @__PURE__ */ new Map();
@@ -35,13 +36,24 @@ class ProxyBleClient {
35
36
  return;
36
37
  }
37
38
  if (!this.#handler.connected) {
38
- logger.info("BLE proxy not connected, deferring scan start");
39
- return;
39
+ logger.info(`BLE proxy not connected, waiting up to ${SCAN_CONNECT_WAIT}ms for client`);
40
+ const { promise, resolver } = createPromise();
41
+ const onConnect = () => resolver();
42
+ this.#handler.connectionEstablished.on(onConnect);
43
+ try {
44
+ await withTimeout(SCAN_CONNECT_WAIT, promise);
45
+ } catch {
46
+ throw new BleError(
47
+ `BLE proxy client did not connect within ${SCAN_CONNECT_WAIT}ms \u2014 cannot start scan`
48
+ );
49
+ } finally {
50
+ this.#handler.connectionEstablished.off(onConnect);
51
+ }
40
52
  }
41
53
  logger.debug("Start BLE scanning via proxy ...");
42
54
  await this.#handler.sendCommand(BleProxyCommand.StartScan, {
43
55
  service_uuids: ["fff6"],
44
- allow_duplicates: true
56
+ allow_duplicates: false
45
57
  });
46
58
  this.#isScanning = true;
47
59
  }
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/ProxyBleClient.ts"],
4
- "mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,cAAc;AACvB,SAAS,iBAAiB;AAE1B,SAAS,iBAAiB,qBAAgD;AAE1E,MAAM,SAAS,OAAO,IAAI,gBAAgB;AAoBnC,MAAM,eAAe;AAAA,EACf;AAAA,EACA,yBAAyB,oBAAI,IAA4E;AAAA,EAClH;AAAA,EACA,cAAc;AAAA,EAEL,iBAAiB,CAAC,OAAe,SAAkC;AACxE,QAAI,UAAU,cAAc,kBAAkB;AAC1C,WAAK,wBAAwB,IAAuC;AAAA,IACxE,WAAW,UAAU,cAAc,aAAa;AAC5C,aAAO,KAAK,iCAAkC,KAA6B,UAAU,SAAS,EAAE;AAChG,WAAK,cAAc;AAAA,IACvB;AAAA,EACJ;AAAA,EAEA,YAAY,SAA0B;AAClC,SAAK,WAAW;AAChB,SAAK,SAAS,cAAc,GAAG,KAAK,cAAc;AAAA,EACtD;AAAA,EAEA,qBAAqB,UAAsF;AACvG,SAAK,4BAA4B;AACjC,eAAW,EAAE,YAAY,kBAAkB,KAAK,KAAK,uBAAuB,OAAO,GAAG;AAClF,WAAK,0BAA0B,YAAY,iBAAiB;AAAA,IAChE;AAAA,EACJ;AAAA,EAEA,MAAM,gBAA+B;AACjC,QAAI,KAAK,aAAa;AAClB;AAAA,IACJ;AAEA,QAAI,CAAC,KAAK,SAAS,WAAW;AAC1B,aAAO,KAAK,+CAA+C;AAC3D;AAAA,IACJ;AAEA,WAAO,MAAM,kCAAkC;AAC/C,UAAM,KAAK,SAAS,YAAY,gBAAgB,WAAW;AAAA,MACvD,eAAe,CAAC,MAAM;AAAA,MACtB,kBAAkB;AAAA,IACtB,CAAC;AACD,SAAK,cAAc;AAAA,EACvB;AAAA,EAEA,MAAM,eAA8B;AAChC,QAAI,CAAC,KAAK,aAAa;AACnB;AAAA,IACJ;AAEA,QAAI,CAAC,KAAK,SAAS,WAAW;AAC1B,WAAK,cAAc;AACnB;AAAA,IACJ;AAEA,WAAO,MAAM,iCAAiC;AAC9C,UAAM,KAAK,SAAS,YAAY,gBAAgB,QAAQ;AACxD,SAAK,cAAc;AAAA,EACvB;AAAA,EAEA,QAAc;AACV,SAAK,cAAc;AACnB,SAAK,SAAS,cAAc,IAAI,KAAK,cAAc;AAAA,EACvD;AAAA,EAEA,wBAAwB,MAAkC;AACtD,UAAM,EAAE,SAAS,MAAM,MAAM,aAAa,aAAa,IAAI;AAI3D,UAAM,cAAc,oBAAI,IAAwB;AAChD,QAAI;AACJ,QAAI,cAAc;AACd,iBAAW,CAAC,MAAM,WAAW,KAAK,OAAO,QAAQ,YAAY,GAAG;AAC5D,cAAM,QAAQ,OAAO,KAAK,aAAa,QAAQ;AAC/C,oBAAY,IAAI,MAAM,KAAK;AAC3B,YAAI,UAAU,cAAc,IAAI,GAAG;AAC/B,8BAAoB;AAAA,QACxB;AAAA,MACJ;AAAA,IACJ;AAEA,UAAM,aAA8B;AAAA,MAChC;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IACJ;AAEA,QAAI,CAAC,aAAa;AACd,aAAO,MAAM,cAAc,OAAO,+BAA+B;AACjE;AAAA,IACJ;AAEA,QAAI,sBAAsB,UAAa,kBAAkB,WAAW,GAAG;AACnE,aAAO,MAAM,cAAc,OAAO,yDAAyD;AAC3F;AAAA,IACJ;AAEA,WAAO,MAAM,qBAAqB,OAAO,KAAK,QAAQ,SAAS,aAAa;AAC5E,SAAK,uBAAuB,IAAI,SAAS,EAAE,YAAY,kBAAkB,CAAC;AAC1E,SAAK,4BAA4B,YAAY,iBAAiB;AAAA,EAClE;AACJ;",
4
+ "mappings": "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",
5
5
  "names": []
6
6
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@matter-server/ble-proxy",
3
- "version": "0.0.1",
3
+ "version": "0.7.2-alpha.0-20260601-e778038",
4
4
  "type": "module",
5
5
  "description": "BLE proxy implementation for matter.js - proxies BLE operations over WebSocket",
6
6
  "bugs": {
@@ -23,12 +23,12 @@
23
23
  "node": ">=20.19.0 <22.0.0 || >=22.13.0"
24
24
  },
25
25
  "dependencies": {
26
- "@matter/main": "0.17.0-alpha.0-20260520-0ab980a16",
27
- "@matter-server/ws-controller": "*",
28
- "ws": "^8.20.1"
26
+ "@matter/main": "0.17.0",
27
+ "@matter-server/ws-controller": "0.7.2-alpha.0-20260601-e778038",
28
+ "ws": "^8.21.0"
29
29
  },
30
30
  "optionalDependencies": {
31
- "@matter/nodejs-ble": "0.17.0-alpha.0-20260520-0ab980a16"
31
+ "@matter/nodejs-ble": "0.17.0"
32
32
  },
33
33
  "devDependencies": {
34
34
  "@types/node": "^25.9.1",
@@ -43,4 +43,4 @@
43
43
  "publishConfig": {
44
44
  "access": "public"
45
45
  }
46
- }
46
+ }
@@ -63,6 +63,9 @@ export class BleProxyHandler implements WebServerHandler {
63
63
  /** Emitted when a binary frame is received from the BLE proxy client. */
64
64
  readonly binaryFrameReceived = new Observable<[frame: BinaryFrame]>();
65
65
 
66
+ /** Emitted once a proxy client has completed the handshake and `connected` is true. */
67
+ readonly connectionEstablished = new Observable<[]>();
68
+
66
69
  get connected(): boolean {
67
70
  return this.#handshakeComplete && this.#client?.readyState === WebSocket.OPEN;
68
71
  }
@@ -72,7 +75,11 @@ export class BleProxyHandler implements WebServerHandler {
72
75
  // ws 8.x calls handleUpgrade unconditionally from its own upgrade listener, which
73
76
  // sends HTTP 400 for non-matching paths and destroys the socket — breaking other
74
77
  // WebSocket endpoints on the same server.
75
- const wss = (this.#wss = new WebSocketServer({ noServer: true }));
78
+ //
79
+ // Reuse a single WSS across all bound HTTP servers (multi-listen-address): create
80
+ // it once, then attach a per-server upgrade listener that forwards into it.
81
+ const isFirstBind = this.#wss === undefined;
82
+ const wss = (this.#wss ??= new WebSocketServer({ noServer: true }));
76
83
  const upgradeHandler = (
77
84
  req: { url?: string; _matterHandledUpgrade?: boolean },
78
85
  socket: unknown,
@@ -94,6 +101,10 @@ export class BleProxyHandler implements WebServerHandler {
94
101
  this.#removeUpgradeListeners.push(() => server.removeListener("upgrade", upgradeHandler));
95
102
  logger.info("BLE proxy WebSocket endpoint registered on /ble");
96
103
 
104
+ if (!isFirstBind) {
105
+ return;
106
+ }
107
+
97
108
  wss.on("connection", ws => {
98
109
  if (this.#closed) {
99
110
  ws.close();
@@ -292,6 +303,7 @@ export class BleProxyHandler implements WebServerHandler {
292
303
  }),
293
304
  );
294
305
  logger.info(`BLE proxy handshake complete (version ${BLE_PROXY_PROTOCOL_VERSION})`);
306
+ this.connectionEstablished.emit();
295
307
  }
296
308
 
297
309
  #handleResponse(msg: ResponseMessage): void {
@@ -321,6 +333,12 @@ export class BleProxyHandler implements WebServerHandler {
321
333
 
322
334
  try {
323
335
  const frame = decodeBinaryFrame(new Uint8Array(data));
336
+ const head = Array.from(frame.payload.subarray(0, 8))
337
+ .map(b => b.toString(16).padStart(2, "0"))
338
+ .join("");
339
+ logger.debug(
340
+ `[FRAME] opcode=${frame.opcode} handle=${frame.connectionHandle} len=${frame.payload.length} head=${head}`,
341
+ );
324
342
  this.binaryFrameReceived.emit(frame);
325
343
  } catch (err) {
326
344
  logger.error("Failed to decode binary frame:", err);
@@ -41,6 +41,7 @@ export const BleProxyCommand = {
41
41
  ReadCharacteristic: "read_characteristic",
42
42
  WriteCharacteristic: "write_characteristic",
43
43
  SubscribeCharacteristic: "subscribe_characteristic",
44
+ WriteAndSubscribe: "write_and_subscribe",
44
45
  UnsubscribeCharacteristic: "unsubscribe_characteristic",
45
46
  RequestMtu: "request_mtu",
46
47
  } as const;
@@ -100,6 +101,21 @@ export interface SubscribeCharacteristicArgs {
100
101
  characteristic_uuid: string;
101
102
  }
102
103
 
104
+ /**
105
+ * Atomic write-then-subscribe. The client performs the write to `write_uuid`, awaits the
106
+ * GATT Write Response, then enables CCCD on `subscribe_uuid` without any intervening
107
+ * WebSocket round-trip. Used for the Matter BTP handshake on C1/C2 where a peripheral may
108
+ * push the handshake response indication before the client has had time to enable CCCD if
109
+ * the two ops are split across WS commands.
110
+ */
111
+ export interface WriteAndSubscribeArgs {
112
+ connection_handle: number;
113
+ write_uuid: string;
114
+ write_value: string; // base64
115
+ write_response?: boolean;
116
+ subscribe_uuid: string;
117
+ }
118
+
103
119
  export interface UnsubscribeCharacteristicArgs {
104
120
  connection_handle: number;
105
121
  characteristic_uuid: string;
@@ -179,6 +195,7 @@ export interface BleProxyCommandMap {
179
195
  [BleProxyCommand.ReadCharacteristic]: { args: ReadCharacteristicArgs; result: ReadCharacteristicResult };
180
196
  [BleProxyCommand.WriteCharacteristic]: { args: WriteCharacteristicArgs; result: void };
181
197
  [BleProxyCommand.SubscribeCharacteristic]: { args: SubscribeCharacteristicArgs; result: void };
198
+ [BleProxyCommand.WriteAndSubscribe]: { args: WriteAndSubscribeArgs; result: void };
182
199
  [BleProxyCommand.UnsubscribeCharacteristic]: { args: UnsubscribeCharacteristicArgs; result: void };
183
200
  [BleProxyCommand.RequestMtu]: { args: RequestMtuArgs; result: RequestMtuResult };
184
201
  }
@@ -144,30 +144,26 @@ export class ProxyBleCentralInterface implements Transport {
144
144
  // it's handled by matter.js commissioning flow internally
145
145
  }
146
146
 
147
- // 5. Send BTP handshake request on C1.
148
- // Matter BTP spec: writes to C1 use ATT Write Request (with response). C1 typically
149
- // does not advertise writeWithoutResponse, so a writeWithoutResponse is silently
150
- // dropped or rejected by the peripheral and the BTP handshake response never comes.
147
+ // 5. Send BTP handshake request on C1 and atomically subscribe to C2 for the
148
+ // response indication. The combo eliminates the WebSocket round-trip between
149
+ // Write Response and CCCD enable — without it, a peripheral that pushes the
150
+ // handshake indication immediately after Write Response can fire before the
151
+ // proxy client has enabled notifications, and the indication is lost.
151
152
  const btpHandshakeRequest = BtpCodec.encodeBtpHandshakeRequest({
152
153
  versions: MatterBle.BTP_SUPPORTED_VERSIONS,
153
154
  attMtu: mtu,
154
155
  clientWindowSize: MatterBle.BTP_MAXIMUM_WINDOW_SIZE,
155
156
  });
156
- logger.debug(`Sending BTP handshake request on C1`);
157
- await this.#handler.sendCommand(BleProxyCommand.WriteCharacteristic, {
157
+ logger.debug(`Sending BTP handshake request on C1 and subscribing C2 atomically`);
158
+ await this.#handler.sendCommand(BleProxyCommand.WriteAndSubscribe, {
158
159
  connection_handle,
159
- characteristic_uuid: c1Uuid,
160
- value: Buffer.from(btpHandshakeRequest as ArrayBuffer).toString("base64"),
161
- response: true,
160
+ write_uuid: c1Uuid,
161
+ write_value: Buffer.from(btpHandshakeRequest as ArrayBuffer).toString("base64"),
162
+ write_response: true,
163
+ subscribe_uuid: c2Uuid,
162
164
  });
163
165
 
164
- // 6. Subscribe to C2 for notifications
165
- await this.#handler.sendCommand(BleProxyCommand.SubscribeCharacteristic, {
166
- connection_handle,
167
- characteristic_uuid: c2Uuid,
168
- });
169
-
170
- // 7. Wait for BTP handshake response via binary frame
166
+ // 6. Wait for BTP handshake response via binary frame
171
167
  const {
172
168
  promise: handshakePromise,
173
169
  resolver: handshakeResolver,
@@ -205,7 +201,7 @@ export class ProxyBleCentralInterface implements Transport {
205
201
  btpHandshakeTimeout.stop();
206
202
  }
207
203
 
208
- // 8. Create BTP session
204
+ // 7. Create BTP session
209
205
  // Use a ref object so closures can access the channel after it's created
210
206
  const onMatterMessageListener = this.#onMatterMessageListener;
211
207
  const channelRef: { channel?: ProxyBleChannel } = {};
@@ -239,7 +235,7 @@ export class ProxyBleCentralInterface implements Transport {
239
235
  },
240
236
  );
241
237
 
242
- // 9. Wire up binary frame notifications to BTP session
238
+ // 8. Wire up binary frame notifications to BTP session
243
239
  const binaryObserver = (frame: { connectionHandle: number; opcode: number; payload: Uint8Array }) => {
244
240
  if (frame.connectionHandle === connection_handle && frame.opcode === BinaryFrameOpcode.Notification) {
245
241
  btpSession
@@ -251,7 +247,7 @@ export class ProxyBleCentralInterface implements Transport {
251
247
  };
252
248
  this.#handler.binaryFrameReceived.on(binaryObserver);
253
249
 
254
- // 10. Handle unexpected disconnects from proxy client
250
+ // 9. Handle unexpected disconnects from proxy client
255
251
  const eventObserver = (event: string, data: Record<string, unknown>) => {
256
252
  if (
257
253
  event === BleProxyEvent.Disconnected &&
@@ -4,13 +4,21 @@
4
4
  * SPDX-License-Identifier: Apache-2.0
5
5
  */
6
6
 
7
- import { Logger } from "@matter/main";
8
- import { MatterBle } from "@matter/main/protocol";
7
+ import { createPromise, Logger, Seconds, withTimeout } from "@matter/main";
8
+ import { BleError, MatterBle } from "@matter/main/protocol";
9
9
  import type { BleProxyHandler } from "./BleProxyHandler.js";
10
10
  import { BleProxyCommand, BleProxyEvent, type DeviceDiscoveredData } from "./BleProxyProtocol.js";
11
11
 
12
12
  const logger = Logger.get("ProxyBleClient");
13
13
 
14
+ /**
15
+ * Bounded wait for a proxy client to attach before starting a scan. Long enough
16
+ * that "start matter-server, then connect proxy" works, short enough that a
17
+ * misconfigured deployment surfaces a clear error instead of an opaque
18
+ * scan-never-returns hang on the caller side.
19
+ */
20
+ const SCAN_CONNECT_WAIT = Seconds(30);
21
+
14
22
  /**
15
23
  * Represents a BLE peripheral discovered through the proxy.
16
24
  * Replaces Noble's Peripheral type - stores the data received from the proxy client.
@@ -62,14 +70,27 @@ export class ProxyBleClient {
62
70
  }
63
71
 
64
72
  if (!this.#handler.connected) {
65
- logger.info("BLE proxy not connected, deferring scan start");
66
- return;
73
+ logger.info(`BLE proxy not connected, waiting up to ${SCAN_CONNECT_WAIT}ms for client`);
74
+ const { promise, resolver } = createPromise<void>();
75
+ const onConnect = () => resolver();
76
+ this.#handler.connectionEstablished.on(onConnect);
77
+ try {
78
+ await withTimeout(SCAN_CONNECT_WAIT, promise);
79
+ } catch {
80
+ throw new BleError(
81
+ `BLE proxy client did not connect within ${SCAN_CONNECT_WAIT}ms — cannot start scan`,
82
+ );
83
+ } finally {
84
+ this.#handler.connectionEstablished.off(onConnect);
85
+ }
67
86
  }
68
87
 
69
88
  logger.debug("Start BLE scanning via proxy ...");
89
+ // Matter discovery only needs one event per state change; opt out of the spec's
90
+ // default true so a 10 Hz peripheral advertise doesn't flood the WebSocket.
70
91
  await this.#handler.sendCommand(BleProxyCommand.StartScan, {
71
92
  service_uuids: ["fff6"],
72
- allow_duplicates: true,
93
+ allow_duplicates: false,
73
94
  });
74
95
  this.#isScanning = true;
75
96
  }
@@ -1 +0,0 @@
1
- {"version":"7.0.0-dev.20260505.1","errors":true,"root":["./bleproxyhandler.ts","./bleproxyprotocol.ts","./proxyble.ts","./proxyblechannel.ts","./proxybleclient.ts","./proxyblescanner.ts","./index.ts","./example/noblebleproxyclient.ts","./example/noble-ble-proxy.ts"]}