@matter-server/ble-proxy 1.3.0 → 1.3.2-alpha.0-20260724-6944771
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.
|
@@ -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,
|
|
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,CA2PjE;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"}
|
|
@@ -132,14 +132,14 @@ class ProxyBleCentralInterface {
|
|
|
132
132
|
logger.debug(`Sending BTP handshake request on C1 and subscribing C2 atomically`);
|
|
133
133
|
let handshakeResponse;
|
|
134
134
|
try {
|
|
135
|
-
|
|
135
|
+
const writeAndSubscribe = connection.sendCommand(BleProxyCommand.WriteAndSubscribe, {
|
|
136
136
|
connection_handle,
|
|
137
137
|
write_uuid: c1Uuid,
|
|
138
138
|
write_value: Buffer.from(btpHandshakeRequest).toString("base64"),
|
|
139
139
|
write_response: true,
|
|
140
140
|
subscribe_uuid: c2Uuid
|
|
141
141
|
});
|
|
142
|
-
handshakeResponse = await handshakePromise;
|
|
142
|
+
[, handshakeResponse] = await Promise.all([writeAndSubscribe, handshakePromise]);
|
|
143
143
|
} finally {
|
|
144
144
|
connection.binaryFrameReceived.off(handshakeObserver);
|
|
145
145
|
btpHandshakeTimeout.stop();
|
|
@@ -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
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@matter-server/ble-proxy",
|
|
3
|
-
"version": "1.3.0",
|
|
3
|
+
"version": "1.3.2-alpha.0-20260724-6944771",
|
|
4
4
|
"description": "BLE proxy implementation for matter.js - proxies BLE operations over WebSocket",
|
|
5
5
|
"homepage": "https://github.com/matter-js/matterjs-server",
|
|
6
6
|
"bugs": {
|
|
@@ -29,8 +29,8 @@
|
|
|
29
29
|
"noble-ble-proxy": "nacho-run src/example/noble-ble-proxy.ts"
|
|
30
30
|
},
|
|
31
31
|
"dependencies": {
|
|
32
|
-
"@matter-server/ws-controller": "1.3.0",
|
|
33
|
-
"@matter/main": "0.17.7-alpha.0-
|
|
32
|
+
"@matter-server/ws-controller": "1.3.2-alpha.0-20260724-6944771",
|
|
33
|
+
"@matter/main": "0.17.7-alpha.0-20260723-8a6b27aed",
|
|
34
34
|
"ws": "^8.21.1"
|
|
35
35
|
},
|
|
36
36
|
"devDependencies": {
|
|
@@ -38,7 +38,7 @@
|
|
|
38
38
|
"@types/ws": "^8.18.1"
|
|
39
39
|
},
|
|
40
40
|
"optionalDependencies": {
|
|
41
|
-
"@matter/nodejs-ble": "0.17.7-alpha.0-
|
|
41
|
+
"@matter/nodejs-ble": "0.17.7-alpha.0-20260723-8a6b27aed",
|
|
42
42
|
"dbus-next": "npm:@jellybrick/dbus-next@^0.10.3"
|
|
43
43
|
},
|
|
44
44
|
"engines": {
|
package/src/ProxyBleChannel.ts
CHANGED
|
@@ -192,14 +192,17 @@ export class ProxyBleCentralInterface implements Transport {
|
|
|
192
192
|
|
|
193
193
|
let handshakeResponse: Uint8Array;
|
|
194
194
|
try {
|
|
195
|
-
|
|
195
|
+
// Await both together, not sequentially: the handshake timer can reject handshakePromise
|
|
196
|
+
// while the write is still pending, and Promise.all keeps a handler on it from the start so
|
|
197
|
+
// that rejection surfaces here instead of escaping as an unhandled rejection.
|
|
198
|
+
const writeAndSubscribe = connection.sendCommand(BleProxyCommand.WriteAndSubscribe, {
|
|
196
199
|
connection_handle,
|
|
197
200
|
write_uuid: c1Uuid,
|
|
198
201
|
write_value: Buffer.from(btpHandshakeRequest as ArrayBuffer).toString("base64"),
|
|
199
202
|
write_response: true,
|
|
200
203
|
subscribe_uuid: c2Uuid,
|
|
201
204
|
});
|
|
202
|
-
handshakeResponse = await handshakePromise;
|
|
205
|
+
[, handshakeResponse] = await Promise.all([writeAndSubscribe, handshakePromise]);
|
|
203
206
|
} finally {
|
|
204
207
|
connection.binaryFrameReceived.off(handshakeObserver);
|
|
205
208
|
btpHandshakeTimeout.stop();
|