@matter/protocol 0.17.5 → 0.17.6-alpha.0-20260715-312da87ed
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/cjs/common/BleScanner.d.ts.map +1 -1
- package/dist/cjs/common/BleScanner.js +10 -5
- package/dist/cjs/common/BleScanner.js.map +1 -1
- package/dist/esm/common/BleScanner.d.ts.map +1 -1
- package/dist/esm/common/BleScanner.js +10 -5
- package/dist/esm/common/BleScanner.js.map +1 -1
- package/package.json +5 -5
- package/src/common/BleScanner.ts +12 -5
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BleScanner.d.ts","sourceRoot":"","sources":["../../../src/common/BleScanner.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACH,KAAK,EACL,WAAW,EAGX,QAAQ,EAER,YAAY,EAMf,MAAM,iBAAiB,CAAC;AAIzB,OAAO,EAAE,oBAAoB,EAAE,+BAA+B,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAI9F,MAAM,WAAW,aAAa;IAC1B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC5B;AAED,MAAM,WAAW,gBAAgB;IAC7B,oBAAoB,CAAC,QAAQ,EAAE,CAAC,UAAU,EAAE,aAAa,EAAE,IAAI,EAAE,KAAK,KAAK,IAAI,GAAG,IAAI,CAAC;IACvF,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/B,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACjC;AAED,MAAM,MAAM,wBAAwB,GAAG,oBAAoB,GAAG;IAC1D,EAAE,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAC9B,UAAU,EAAE,wBAAwB,CAAC;IACrC,UAAU,EAAE,aAAa,CAAC;IAC1B,8BAA8B,EAAE,OAAO,CAAC;CAC3C,CAAC;AAUF,qBAAa,UAAW,YAAW,OAAO;;IACtC,QAAQ,CAAC,IAAI,mBAAmB;
|
|
1
|
+
{"version":3,"file":"BleScanner.d.ts","sourceRoot":"","sources":["../../../src/common/BleScanner.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACH,KAAK,EACL,WAAW,EAGX,QAAQ,EAER,YAAY,EAMf,MAAM,iBAAiB,CAAC;AAIzB,OAAO,EAAE,oBAAoB,EAAE,+BAA+B,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAI9F,MAAM,WAAW,aAAa;IAC1B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC5B;AAED,MAAM,WAAW,gBAAgB;IAC7B,oBAAoB,CAAC,QAAQ,EAAE,CAAC,UAAU,EAAE,aAAa,EAAE,IAAI,EAAE,KAAK,KAAK,IAAI,GAAG,IAAI,CAAC;IACvF,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/B,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACjC;AAED,MAAM,MAAM,wBAAwB,GAAG,oBAAoB,GAAG;IAC1D,EAAE,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAC9B,UAAU,EAAE,wBAAwB,CAAC;IACrC,UAAU,EAAE,aAAa,CAAC;IAC1B,8BAA8B,EAAE,OAAO,CAAC;CAC3C,CAAC;AAUF,qBAAa,UAAW,YAAW,OAAO;;IACtC,QAAQ,CAAC,IAAI,mBAAmB;IAehC,YAAY,MAAM,EAAE,gBAAgB,EAKnC;IAEM,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,mBAAmB,CAM/D;IA8CD,mCAAmC,CAAC,UAAU,EAAE,+BAA+B,EAAE,cAAc,UAAO,QAOrG;IAuKK,yBAAyB,CAC3B,UAAU,EAAE,+BAA+B,EAC3C,OAAO,WAAc,EACrB,qBAAqB,UAAQ,GAC9B,OAAO,CAAC,oBAAoB,EAAE,CAAC,CAsBjC;IAEK,qCAAqC,CACvC,UAAU,EAAE,+BAA+B,EAC3C,QAAQ,EAAE,CAAC,MAAM,EAAE,oBAAoB,KAAK,IAAI,EAChD,OAAO,CAAC,EAAE,QAAQ,EAClB,YAAY,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,GAC7B,OAAO,CAAC,oBAAoB,EAAE,CAAC,CAkDjC;IAED,kCAAkC,CAAC,UAAU,EAAE,+BAA+B,GAAG,oBAAoB,EAAE,CAEtG;IAED,SAAS,CAAC,WAAW,IAAI,YAAY,CAAC,IAAI,CAAC,CAE1C;IAEK,KAAK,kBAWV;CACJ"}
|
|
@@ -37,6 +37,7 @@ class BleScanner {
|
|
|
37
37
|
#client;
|
|
38
38
|
#recordWaiters = /* @__PURE__ */ new Map();
|
|
39
39
|
#discoveredMatterDevices = /* @__PURE__ */ new Map();
|
|
40
|
+
#closed = false;
|
|
40
41
|
constructor(client) {
|
|
41
42
|
this.#client = client;
|
|
42
43
|
this.#client.setDiscoveryCallback(
|
|
@@ -274,7 +275,7 @@ class BleScanner {
|
|
|
274
275
|
logger.warn("Unexpected error canceling commissioning", cause);
|
|
275
276
|
}
|
|
276
277
|
);
|
|
277
|
-
while (!canceled) {
|
|
278
|
+
while (!canceled && !this.#closed) {
|
|
278
279
|
this.#getCommissionableDevices(identifier).forEach(({ deviceData }) => {
|
|
279
280
|
const { deviceIdentifier } = deviceData;
|
|
280
281
|
if (!discoveredDevices.has(deviceIdentifier)) {
|
|
@@ -301,10 +302,14 @@ class BleScanner {
|
|
|
301
302
|
return this.#client.stopScanning();
|
|
302
303
|
}
|
|
303
304
|
async close() {
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
|
|
305
|
+
this.#closed = true;
|
|
306
|
+
try {
|
|
307
|
+
await this.closeClient();
|
|
308
|
+
} finally {
|
|
309
|
+
for (const queryId of [...this.#recordWaiters.keys()]) {
|
|
310
|
+
this.#finishWaiter(queryId, true);
|
|
311
|
+
}
|
|
312
|
+
}
|
|
308
313
|
}
|
|
309
314
|
}
|
|
310
315
|
//# sourceMappingURL=BleScanner.js.map
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/common/BleScanner.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,qBAaO;AACP,mBAAyB;AACzB,iBAAyB;AACzB,sBAAyB;AAtBzB;AAAA;AAAA;AAAA;AAAA;AAyBA,MAAM,SAAS,sBAAO,IAAI,YAAY;AA4BtC,MAAM,sBAAkB,wBAAQ,EAAE;AAE3B,MAAM,WAA8B;AAAA,EAC9B,OAAO,2BAAY;AAAA,EAEnB;AAAA,EACA,iBAAiB,oBAAI,IAQ5B;AAAA,EACO,2BAA2B,oBAAI,IAAuC;AAAA,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BleScanner.d.ts","sourceRoot":"","sources":["../../../src/common/BleScanner.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACH,KAAK,EACL,WAAW,EAGX,QAAQ,EAER,YAAY,EAMf,MAAM,iBAAiB,CAAC;AAIzB,OAAO,EAAE,oBAAoB,EAAE,+BAA+B,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAI9F,MAAM,WAAW,aAAa;IAC1B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC5B;AAED,MAAM,WAAW,gBAAgB;IAC7B,oBAAoB,CAAC,QAAQ,EAAE,CAAC,UAAU,EAAE,aAAa,EAAE,IAAI,EAAE,KAAK,KAAK,IAAI,GAAG,IAAI,CAAC;IACvF,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/B,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACjC;AAED,MAAM,MAAM,wBAAwB,GAAG,oBAAoB,GAAG;IAC1D,EAAE,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAC9B,UAAU,EAAE,wBAAwB,CAAC;IACrC,UAAU,EAAE,aAAa,CAAC;IAC1B,8BAA8B,EAAE,OAAO,CAAC;CAC3C,CAAC;AAUF,qBAAa,UAAW,YAAW,OAAO;;IACtC,QAAQ,CAAC,IAAI,mBAAmB;
|
|
1
|
+
{"version":3,"file":"BleScanner.d.ts","sourceRoot":"","sources":["../../../src/common/BleScanner.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACH,KAAK,EACL,WAAW,EAGX,QAAQ,EAER,YAAY,EAMf,MAAM,iBAAiB,CAAC;AAIzB,OAAO,EAAE,oBAAoB,EAAE,+BAA+B,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAI9F,MAAM,WAAW,aAAa;IAC1B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC5B;AAED,MAAM,WAAW,gBAAgB;IAC7B,oBAAoB,CAAC,QAAQ,EAAE,CAAC,UAAU,EAAE,aAAa,EAAE,IAAI,EAAE,KAAK,KAAK,IAAI,GAAG,IAAI,CAAC;IACvF,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/B,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACjC;AAED,MAAM,MAAM,wBAAwB,GAAG,oBAAoB,GAAG;IAC1D,EAAE,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAC9B,UAAU,EAAE,wBAAwB,CAAC;IACrC,UAAU,EAAE,aAAa,CAAC;IAC1B,8BAA8B,EAAE,OAAO,CAAC;CAC3C,CAAC;AAUF,qBAAa,UAAW,YAAW,OAAO;;IACtC,QAAQ,CAAC,IAAI,mBAAmB;IAehC,YAAY,MAAM,EAAE,gBAAgB,EAKnC;IAEM,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,mBAAmB,CAM/D;IA8CD,mCAAmC,CAAC,UAAU,EAAE,+BAA+B,EAAE,cAAc,UAAO,QAOrG;IAuKK,yBAAyB,CAC3B,UAAU,EAAE,+BAA+B,EAC3C,OAAO,WAAc,EACrB,qBAAqB,UAAQ,GAC9B,OAAO,CAAC,oBAAoB,EAAE,CAAC,CAsBjC;IAEK,qCAAqC,CACvC,UAAU,EAAE,+BAA+B,EAC3C,QAAQ,EAAE,CAAC,MAAM,EAAE,oBAAoB,KAAK,IAAI,EAChD,OAAO,CAAC,EAAE,QAAQ,EAClB,YAAY,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,GAC7B,OAAO,CAAC,oBAAoB,EAAE,CAAC,CAkDjC;IAED,kCAAkC,CAAC,UAAU,EAAE,+BAA+B,GAAG,oBAAoB,EAAE,CAEtG;IAED,SAAS,CAAC,WAAW,IAAI,YAAY,CAAC,IAAI,CAAC,CAE1C;IAEK,KAAK,kBAWV;CACJ"}
|
|
@@ -25,6 +25,7 @@ class BleScanner {
|
|
|
25
25
|
#client;
|
|
26
26
|
#recordWaiters = /* @__PURE__ */ new Map();
|
|
27
27
|
#discoveredMatterDevices = /* @__PURE__ */ new Map();
|
|
28
|
+
#closed = false;
|
|
28
29
|
constructor(client) {
|
|
29
30
|
this.#client = client;
|
|
30
31
|
this.#client.setDiscoveryCallback(
|
|
@@ -262,7 +263,7 @@ class BleScanner {
|
|
|
262
263
|
logger.warn("Unexpected error canceling commissioning", cause);
|
|
263
264
|
}
|
|
264
265
|
);
|
|
265
|
-
while (!canceled) {
|
|
266
|
+
while (!canceled && !this.#closed) {
|
|
266
267
|
this.#getCommissionableDevices(identifier).forEach(({ deviceData }) => {
|
|
267
268
|
const { deviceIdentifier } = deviceData;
|
|
268
269
|
if (!discoveredDevices.has(deviceIdentifier)) {
|
|
@@ -289,10 +290,14 @@ class BleScanner {
|
|
|
289
290
|
return this.#client.stopScanning();
|
|
290
291
|
}
|
|
291
292
|
async close() {
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
293
|
+
this.#closed = true;
|
|
294
|
+
try {
|
|
295
|
+
await this.closeClient();
|
|
296
|
+
} finally {
|
|
297
|
+
for (const queryId of [...this.#recordWaiters.keys()]) {
|
|
298
|
+
this.#finishWaiter(queryId, true);
|
|
299
|
+
}
|
|
300
|
+
}
|
|
296
301
|
}
|
|
297
302
|
}
|
|
298
303
|
export {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/common/BleScanner.ts"],
|
|
4
|
-
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA;AAAA,EACI;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EAEA;AAAA,EACA;AAAA,EACA;AAAA,EAEA;AAAA,OACG;AACP,SAAS,gBAAgB;AACzB,SAAS,gBAAgB;AACzB,SAAS,gBAAgB;AAGzB,MAAM,SAAS,OAAO,IAAI,YAAY;AA4BtC,MAAM,kBAAkB,QAAQ,EAAE;AAE3B,MAAM,WAA8B;AAAA,EAC9B,OAAO,YAAY;AAAA,EAEnB;AAAA,EACA,iBAAiB,oBAAI,IAQ5B;AAAA,EACO,2BAA2B,oBAAI,IAAuC;AAAA,
|
|
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/protocol",
|
|
3
|
-
"version": "0.17.
|
|
3
|
+
"version": "0.17.6-alpha.0-20260715-312da87ed",
|
|
4
4
|
"description": "Low-level APIs for Matter interaction",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"iot",
|
|
@@ -35,12 +35,12 @@
|
|
|
35
35
|
"#*": "./src/*"
|
|
36
36
|
},
|
|
37
37
|
"dependencies": {
|
|
38
|
-
"@matter/general": "0.17.
|
|
39
|
-
"@matter/model": "0.17.
|
|
40
|
-
"@matter/types": "0.17.
|
|
38
|
+
"@matter/general": "0.17.6-alpha.0-20260715-312da87ed",
|
|
39
|
+
"@matter/model": "0.17.6-alpha.0-20260715-312da87ed",
|
|
40
|
+
"@matter/types": "0.17.6-alpha.0-20260715-312da87ed"
|
|
41
41
|
},
|
|
42
42
|
"devDependencies": {
|
|
43
|
-
"@matter/testing": "0.17.
|
|
43
|
+
"@matter/testing": "0.17.6-alpha.0-20260715-312da87ed"
|
|
44
44
|
},
|
|
45
45
|
"files": [
|
|
46
46
|
"dist/**/*",
|
package/src/common/BleScanner.ts
CHANGED
|
@@ -67,6 +67,7 @@ export class BleScanner implements Scanner {
|
|
|
67
67
|
}
|
|
68
68
|
>();
|
|
69
69
|
readonly #discoveredMatterDevices = new Map<string, StoredDiscoveredBleDevice>();
|
|
70
|
+
#closed = false;
|
|
70
71
|
|
|
71
72
|
constructor(client: BleScannerClient) {
|
|
72
73
|
this.#client = client;
|
|
@@ -363,7 +364,7 @@ export class BleScanner implements Scanner {
|
|
|
363
364
|
},
|
|
364
365
|
);
|
|
365
366
|
|
|
366
|
-
while (!canceled) {
|
|
367
|
+
while (!canceled && !this.#closed) {
|
|
367
368
|
this.#getCommissionableDevices(identifier).forEach(({ deviceData }) => {
|
|
368
369
|
const { deviceIdentifier } = deviceData;
|
|
369
370
|
if (!discoveredDevices.has(deviceIdentifier)) {
|
|
@@ -395,9 +396,15 @@ export class BleScanner implements Scanner {
|
|
|
395
396
|
}
|
|
396
397
|
|
|
397
398
|
async close() {
|
|
398
|
-
|
|
399
|
-
|
|
400
|
-
|
|
401
|
-
|
|
399
|
+
// A continuous-discovery loop is driven by an external cancelSignal, so it has no cancelResolver we can
|
|
400
|
+
// trigger here; #closed makes the loop exit instead of re-registering after we resolve its awaiter.
|
|
401
|
+
this.#closed = true;
|
|
402
|
+
try {
|
|
403
|
+
await this.closeClient();
|
|
404
|
+
} finally {
|
|
405
|
+
for (const queryId of [...this.#recordWaiters.keys()]) {
|
|
406
|
+
this.#finishWaiter(queryId, true);
|
|
407
|
+
}
|
|
408
|
+
}
|
|
402
409
|
}
|
|
403
410
|
}
|