@ovok/native 1.17.0-dev.2225 → 1.17.0-dev.2229
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/lib/commonjs/modules/next/bluetooth/adapters/web-bluetooth-central.js +27 -19
- package/lib/commonjs/modules/next/bluetooth/adapters/web-bluetooth-central.js.map +1 -1
- package/lib/commonjs/modules/next/bluetooth/core/bluetooth.js +5 -2
- package/lib/commonjs/modules/next/bluetooth/core/bluetooth.js.map +1 -1
- package/lib/commonjs/modules/next/bluetooth/core/device.js +1 -1
- package/lib/commonjs/modules/next/bluetooth/core/scan-filter.js +23 -7
- package/lib/commonjs/modules/next/bluetooth/core/scan-filter.js.map +1 -1
- package/lib/commonjs/modules/next/bluetooth/core/stream-recorder.js +12 -3
- package/lib/commonjs/modules/next/bluetooth/core/stream-recorder.js.map +1 -1
- package/lib/commonjs/modules/next/bluetooth/react/use-discovery.js +12 -5
- package/lib/commonjs/modules/next/bluetooth/react/use-discovery.js.map +1 -1
- package/lib/module/modules/next/bluetooth/adapters/web-bluetooth-central.js +27 -19
- package/lib/module/modules/next/bluetooth/adapters/web-bluetooth-central.js.map +1 -1
- package/lib/module/modules/next/bluetooth/core/bluetooth.js +6 -3
- package/lib/module/modules/next/bluetooth/core/bluetooth.js.map +1 -1
- package/lib/module/modules/next/bluetooth/core/device.js +1 -1
- package/lib/module/modules/next/bluetooth/core/scan-filter.js +22 -7
- package/lib/module/modules/next/bluetooth/core/scan-filter.js.map +1 -1
- package/lib/module/modules/next/bluetooth/core/stream-recorder.js +12 -3
- package/lib/module/modules/next/bluetooth/core/stream-recorder.js.map +1 -1
- package/lib/module/modules/next/bluetooth/react/use-discovery.js +12 -5
- package/lib/module/modules/next/bluetooth/react/use-discovery.js.map +1 -1
- package/lib/typescript/commonjs/src/modules/next/bluetooth/adapters/web-bluetooth-central.d.ts +4 -1
- package/lib/typescript/commonjs/src/modules/next/bluetooth/adapters/web-bluetooth-central.d.ts.map +1 -1
- package/lib/typescript/commonjs/src/modules/next/bluetooth/core/bluetooth-options.d.ts +6 -1
- package/lib/typescript/commonjs/src/modules/next/bluetooth/core/bluetooth-options.d.ts.map +1 -1
- package/lib/typescript/commonjs/src/modules/next/bluetooth/core/bluetooth.d.ts +3 -3
- package/lib/typescript/commonjs/src/modules/next/bluetooth/core/bluetooth.d.ts.map +1 -1
- package/lib/typescript/commonjs/src/modules/next/bluetooth/core/device-snapshot.d.ts +1 -1
- package/lib/typescript/commonjs/src/modules/next/bluetooth/core/device-snapshot.d.ts.map +1 -1
- package/lib/typescript/commonjs/src/modules/next/bluetooth/core/device.d.ts +1 -1
- package/lib/typescript/commonjs/src/modules/next/bluetooth/core/device.d.ts.map +1 -1
- package/lib/typescript/commonjs/src/modules/next/bluetooth/core/ports.d.ts +1 -1
- package/lib/typescript/commonjs/src/modules/next/bluetooth/core/ports.d.ts.map +1 -1
- package/lib/typescript/commonjs/src/modules/next/bluetooth/core/scan-filter.d.ts +3 -1
- package/lib/typescript/commonjs/src/modules/next/bluetooth/core/scan-filter.d.ts.map +1 -1
- package/lib/typescript/commonjs/src/modules/next/bluetooth/core/stream-recorder.d.ts +4 -2
- package/lib/typescript/commonjs/src/modules/next/bluetooth/core/stream-recorder.d.ts.map +1 -1
- package/lib/typescript/commonjs/src/modules/next/bluetooth/react/use-discovery.d.ts +2 -1
- package/lib/typescript/commonjs/src/modules/next/bluetooth/react/use-discovery.d.ts.map +1 -1
- package/lib/typescript/commonjs/src/modules/next/bluetooth/shared.d.ts +1 -1
- package/lib/typescript/commonjs/src/modules/next/bluetooth/shared.d.ts.map +1 -1
- package/lib/typescript/module/src/modules/next/bluetooth/adapters/web-bluetooth-central.d.ts +4 -1
- package/lib/typescript/module/src/modules/next/bluetooth/adapters/web-bluetooth-central.d.ts.map +1 -1
- package/lib/typescript/module/src/modules/next/bluetooth/core/bluetooth-options.d.ts +6 -1
- package/lib/typescript/module/src/modules/next/bluetooth/core/bluetooth-options.d.ts.map +1 -1
- package/lib/typescript/module/src/modules/next/bluetooth/core/bluetooth.d.ts +3 -3
- package/lib/typescript/module/src/modules/next/bluetooth/core/bluetooth.d.ts.map +1 -1
- package/lib/typescript/module/src/modules/next/bluetooth/core/device-snapshot.d.ts +1 -1
- package/lib/typescript/module/src/modules/next/bluetooth/core/device-snapshot.d.ts.map +1 -1
- package/lib/typescript/module/src/modules/next/bluetooth/core/device.d.ts +1 -1
- package/lib/typescript/module/src/modules/next/bluetooth/core/device.d.ts.map +1 -1
- package/lib/typescript/module/src/modules/next/bluetooth/core/ports.d.ts +1 -1
- package/lib/typescript/module/src/modules/next/bluetooth/core/ports.d.ts.map +1 -1
- package/lib/typescript/module/src/modules/next/bluetooth/core/scan-filter.d.ts +3 -1
- package/lib/typescript/module/src/modules/next/bluetooth/core/scan-filter.d.ts.map +1 -1
- package/lib/typescript/module/src/modules/next/bluetooth/core/stream-recorder.d.ts +4 -2
- package/lib/typescript/module/src/modules/next/bluetooth/core/stream-recorder.d.ts.map +1 -1
- package/lib/typescript/module/src/modules/next/bluetooth/react/use-discovery.d.ts +2 -1
- package/lib/typescript/module/src/modules/next/bluetooth/react/use-discovery.d.ts.map +1 -1
- package/lib/typescript/module/src/modules/next/bluetooth/shared.d.ts +1 -1
- package/lib/typescript/module/src/modules/next/bluetooth/shared.d.ts.map +1 -1
- package/package.json +1 -1
|
@@ -12,21 +12,21 @@ var _errors = require("../core/errors.js");
|
|
|
12
12
|
|
|
13
13
|
const lower = uuid => uuid.toLowerCase();
|
|
14
14
|
const bytesOf = view => new Uint8Array(view.buffer.slice(view.byteOffset, view.byteOffset + view.byteLength));
|
|
15
|
-
const requestOptions = ({
|
|
16
|
-
chooser
|
|
17
|
-
|
|
18
|
-
}) => ({
|
|
19
|
-
...(chooser ? {
|
|
20
|
-
filters: chooser.map(entry => "namePrefix" in entry ? entry : {
|
|
21
|
-
services: entry.services.map(lower)
|
|
22
|
-
})
|
|
23
|
-
} : {
|
|
24
|
-
acceptAllDevices: true
|
|
15
|
+
const requestOptions = (chooser, optionalServices) => ({
|
|
16
|
+
filters: chooser.map(entry => "namePrefix" in entry ? entry : {
|
|
17
|
+
services: entry.services.map(lower)
|
|
25
18
|
}),
|
|
26
19
|
optionalServices: optionalServices.map(lower)
|
|
27
20
|
});
|
|
28
21
|
|
|
29
|
-
/**
|
|
22
|
+
/** Closing the chooser without a pick ends the scan; any other failure fails it. */
|
|
23
|
+
const unlessClosed = error => {
|
|
24
|
+
if (error.name !== "NotFoundError") {
|
|
25
|
+
throw error;
|
|
26
|
+
}
|
|
27
|
+
};
|
|
28
|
+
|
|
29
|
+
/** A granted device has a name and an id, nothing more, until it connects. */
|
|
30
30
|
const advertisementOf = device => ({
|
|
31
31
|
transport: "ble",
|
|
32
32
|
address: device.id,
|
|
@@ -68,12 +68,15 @@ const gattLinkOf = (device, server) => {
|
|
|
68
68
|
};
|
|
69
69
|
};
|
|
70
70
|
|
|
71
|
-
/**
|
|
71
|
+
/**
|
|
72
|
+
* Bluetooth LE in a browser: a scan reports the devices the site may already use, then the device the user picks in
|
|
73
|
+
* the browser's chooser, which shows only the filter's models and opens only when the filter has entries.
|
|
74
|
+
*/
|
|
72
75
|
const webBluetoothCentral = bluetooth => {
|
|
73
|
-
const
|
|
76
|
+
const granted = new Map();
|
|
74
77
|
|
|
75
78
|
/** Keyed as the core spells addresses: a chooser id is case-sensitive, and the core upper-cases what it is given. */
|
|
76
|
-
const deviceFor = async address =>
|
|
79
|
+
const deviceFor = async address => granted.get(address) ?? (await bluetooth?.getDevices?.())?.find(({
|
|
77
80
|
id
|
|
78
81
|
}) => (0, _advertisement.addressKey)(id) === address);
|
|
79
82
|
return {
|
|
@@ -89,16 +92,21 @@ const webBluetoothCentral = bluetooth => {
|
|
|
89
92
|
bluetooth.addEventListener("availabilitychanged", onChange);
|
|
90
93
|
return () => bluetooth.removeEventListener("availabilitychanged", onChange);
|
|
91
94
|
},
|
|
92
|
-
scan: (
|
|
95
|
+
scan: ({
|
|
96
|
+
chooser,
|
|
97
|
+
optionalServices
|
|
98
|
+
}, {
|
|
93
99
|
onAdvertisement,
|
|
94
100
|
onError,
|
|
95
101
|
onEnd
|
|
96
102
|
}) => {
|
|
97
|
-
|
|
98
|
-
|
|
103
|
+
const report = device => {
|
|
104
|
+
granted.set((0, _advertisement.addressKey)(device.id), device);
|
|
99
105
|
onAdvertisement(advertisementOf(device));
|
|
100
|
-
|
|
101
|
-
|
|
106
|
+
};
|
|
107
|
+
const remembered = bluetooth?.getDevices?.().then(devices => devices.forEach(report));
|
|
108
|
+
const picked = chooser && bluetooth?.requestDevice(requestOptions(chooser, optionalServices)).then(report, unlessClosed);
|
|
109
|
+
Promise.all([remembered, picked]).then(onEnd, error => onError((0, _errors.asDeviceError)(error, "permission")));
|
|
102
110
|
return () => undefined;
|
|
103
111
|
},
|
|
104
112
|
connect: async address => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_advertisement","require","_errors","lower","uuid","toLowerCase","bytesOf","view","Uint8Array","buffer","slice","byteOffset","byteLength","requestOptions","chooser","optionalServices","filters","map","entry","services","
|
|
1
|
+
{"version":3,"names":["_advertisement","require","_errors","lower","uuid","toLowerCase","bytesOf","view","Uint8Array","buffer","slice","byteOffset","byteLength","requestOptions","chooser","optionalServices","filters","map","entry","services","unlessClosed","error","name","advertisementOf","device","transport","address","id","manufacturerData","Map","serviceData","rssi","takesOnlyWritesWithoutResponse","properties","write","writeWithoutResponse","gattLinkOf","server","characteristic","service","getPrimaryService","getCharacteristic","read","readValue","bytes","target","writeValueWithoutResponse","writeValueWithResponse","subscribe","onValue","listener","value","addEventListener","startNotifications","removeEventListener","stopNotifications","catch","undefined","onDisconnect","close","disconnect","webBluetoothCentral","bluetooth","granted","deviceFor","get","getDevices","find","addressKey","watchState","onChange","getAvailability","then","available","scan","onAdvertisement","onError","onEnd","report","set","remembered","devices","forEach","picked","requestDevice","Promise","all","asDeviceError","connect","gatt","DeviceError","exports"],"sourceRoot":"../../../../../../src","sources":["modules/next/bluetooth/adapters/web-bluetooth-central.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -83,15 +83,18 @@ class Bluetooth {
|
|
|
83
83
|
runnable = model => this.protocols.has(model.protocol) && model.links.some(link => link.data === "ble");
|
|
84
84
|
|
|
85
85
|
/** Scans for the devices the selector names; identifies against the whole catalog, then filters. */
|
|
86
|
-
discover = (selector = {}
|
|
86
|
+
discover = (selector = {}, {
|
|
87
|
+
chooser = true
|
|
88
|
+
} = {}) => {
|
|
87
89
|
const context = {
|
|
88
90
|
catalog: this.catalog,
|
|
89
91
|
paired: address => this.registry.get(address)?.stored(),
|
|
90
92
|
runnable: this.runnable
|
|
91
93
|
};
|
|
94
|
+
const wanted = this.scanFilter(this.catalog.models(selector).filter(this.runnable));
|
|
92
95
|
const discovery = new _discovery.Discovery({
|
|
93
96
|
central: this.options.central,
|
|
94
|
-
filter:
|
|
97
|
+
filter: chooser ? wanted : (0, _scanFilter.withoutChooser)(wanted),
|
|
95
98
|
identify: ad => {
|
|
96
99
|
const identification = (0, _identify.identify)(ad, context);
|
|
97
100
|
return identification && (0, _identify.narrow)(identification, selector, this.catalog);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_advertisement","require","_autoSync","_catalog","_device","_discovery","_errors","_identify","_idleLinks","_keepAliveHolder","_listeners","_pairedDevice","_pairedRegistry","_ports","_readingLog","_recentAdvertisements","_scanFilter","DEFAULT_LOST_AFTER_MS","Bluetooth","adapterSnap","state","permission","adapterChanges","Listeners","idleLinks","IdleLinks","scans","Set","advertisements","RecentAdvertisements","constructor","options","now","Date","logger","silentLogger","keepAlive","KeepAliveHolder","noKeepAlive","catalog","Catalog","models","protocols","Map","map","protocol","id","log","ReadingLog","sink","outbox","registry","PairedRegistry","record","createDevice","store","autoSync","undefined","createAutoSync","stopFollowing","subscribe","update","list","snapshots","ready","load","stopWatching","central","watchState","patchAdapter","stopLifecycle","lifecycle","alwaysForeground","watch","visibility","changeVisibility","permissions","check","then","adapter","subscribeAdapter","listener","add","requestPermission","request","openSettings","runnable","model","has","links","some","link","data","discover","selector","context","paired","address","get","stored","discovery","Discovery","filter","scanFilter","identify","ad","identification","narrow","onSeen","sighted","onEnd","scanEnded","lostAfterMs","start","snapshot","scanning","pair","found","choice","match","kind","device","Promise","reject","DeviceError","variants","find","newPairedDevice","addressKey","name","of","info","devices","pairedSnapshots","subscribeDevices","forget","remove","readings","entries","subscribeReadings","destroy","stop","all","disconnect","release","advertisement","modelId","deps","Device","AutoSync","filterFor","flatMap","mayScan","size","broadcasts","broadcast","scanFilterFor","services","remember","seen","delete","enterBackground","enterForeground","change","emit","exports"],"sourceRoot":"../../../../../../src","sources":["modules/next/bluetooth/core/bluetooth.ts"],"mappings":";;;;;;AAAA,IAAAA,cAAA,GAAAC,OAAA;AACA,IAAAC,SAAA,GAAAD,OAAA;AAEA,IAAAE,QAAA,GAAAF,OAAA;AACA,IAAAG,OAAA,GAAAH,OAAA;AAEA,IAAAI,UAAA,GAAAJ,OAAA;AACA,IAAAK,OAAA,GAAAL,OAAA;AACA,IAAAM,SAAA,GAAAN,OAAA;AACA,IAAAO,UAAA,GAAAP,OAAA;AACA,IAAAQ,gBAAA,GAAAR,OAAA;AACA,IAAAS,UAAA,GAAAT,OAAA;AACA,IAAAU,aAAA,GAAAV,OAAA;AACA,IAAAW,eAAA,GAAAX,OAAA;AACA,IAAAY,MAAA,GAAAZ,OAAA;AAEA,IAAAa,WAAA,GAAAb,OAAA;AACA,IAAAc,qBAAA,GAAAd,OAAA;AACA,IAAAe,WAAA,GAAAf,OAAA;AAEA,MAAMgB,qBAAqB,GAAG,MAAM;;AAEpC;AACA,MAAMC,SAAS,CAAC;EACd;;EAGA;;EAMQC,WAAW,GAAoB;IAAEC,KAAK,EAAE,SAAS;IAAEC,UAAU,EAAE;EAAU,CAAC;EACjEC,cAAc,GAAG,IAAIC,oBAAS,CAAkB,CAAC;EAMjDC,SAAS,GAAG,IAAIC,oBAAS,CAAC,CAAC;EAE3BC,KAAK,GAAG,IAAIC,GAAG,CAAY,CAAC;EAC5BC,cAAc,GAAG,IAAIC,0CAAoB,CAAC,CAAC;EAErDC,WAAWA,CAAkBC,OAAyB,EAAE;IAAA,KAA3BA,OAAyB,GAAzBA,OAAyB;IAC3D,IAAI,CAACC,GAAG,GAAGD,OAAO,CAACC,GAAG,KAAK,MAAM,IAAIC,IAAI,CAAC,CAAC,CAAC;IAC5C,IAAI,CAACC,MAAM,GAAGH,OAAO,CAACG,MAAM,IAAIC,mBAAY;IAC5C,IAAI,CAACC,SAAS,GAAG,IAAIC,gCAAe,CAACN,OAAO,CAACK,SAAS,IAAIE,kBAAW,EAAE,IAAI,CAACJ,MAAM,CAAC;IACnF,IAAI,CAACK,OAAO,GAAG,IAAIC,gBAAO,CAACT,OAAO,CAACU,MAAM,CAAC;IAC1C,IAAI,CAACC,SAAS,GAAG,IAAIC,GAAG,CAACZ,OAAO,CAACW,SAAS,CAACE,GAAG,CAAEC,QAAQ,IAAK,CAACA,QAAQ,CAACC,EAAE,EAAED,QAAQ,CAAC,CAAC,CAAC;IACtF,IAAI,CAACE,GAAG,GAAG,IAAIC,sBAAU,CAACjB,OAAO,CAACkB,IAAI,EAAE,IAAI,CAACf,MAAM,EAAE,IAAI,CAACF,GAAG,EAAED,OAAO,CAACmB,MAAM,CAAC;IAC9E,IAAI,CAACC,QAAQ,GAAG,IAAIC,8BAAc,CAAEC,MAAM,IAAK,IAAI,CAACC,YAAY,CAACD,MAAM,CAAC,EAAEtB,OAAO,CAACwB,KAAK,EAAE,IAAI,CAACR,GAAG,EAAE,IAAI,CAACb,MAAM,CAAC;IAC/G,IAAI,CAACsB,QAAQ,GAAGzB,OAAO,CAACyB,QAAQ,KAAK,KAAK,GAAGC,SAAS,GAAG,IAAI,CAACC,cAAc,CAAC,CAAC;IAC9E,IAAI,CAACC,aAAa,GAAG,IAAI,CAACR,QAAQ,CAACS,SAAS,CAAC,MAAM;MACjD,IAAI,CAACpC,SAAS,CAACqC,MAAM,CAAC,IAAI,CAACV,QAAQ,CAACW,IAAI,CAAC,CAAC,CAAC;MAC3C,IAAI,CAAC1B,SAAS,CAACyB,MAAM,CAAC,IAAI,CAACV,QAAQ,CAACY,SAAS,CAAC,CAAC,CAAC;MAChD,IAAI,CAACP,QAAQ,EAAEK,MAAM,CAAC,CAAC;IACzB,CAAC,CAAC;IACF,IAAI,CAACG,KAAK,GAAG,IAAI,CAACb,QAAQ,CAACc,IAAI,CAAC,CAAC;IACjC,IAAI,CAACC,YAAY,GAAGnC,OAAO,CAACoC,OAAO,CAACC,UAAU,CAAEhD,KAAK,IAAK,IAAI,CAACiD,YAAY,CAAC;MAAEjD;IAAM,CAAC,CAAC,CAAC;IACvF,IAAI,CAACkD,aAAa,GAAG,CAACvC,OAAO,CAACwC,SAAS,IAAIC,uBAAgB,EAAEC,KAAK,CAAEC,UAAU,IAAK,IAAI,CAACC,gBAAgB,CAACD,UAAU,CAAC,CAAC;IACrH,KAAK3C,OAAO,CAAC6C,WAAW,CAACC,KAAK,CAAC,CAAC,CAACC,IAAI,CAAEzD,UAAU,IAAK,IAAI,CAACgD,YAAY,CAAC;MAAEhD;IAAW,CAAC,CAAC,CAAC;EAC1F;;EAEA;EACO0D,OAAO,GAAGA,CAAA,KAAuB,IAAI,CAAC5D,WAAW;;EAExD;EACO6D,gBAAgB,GAAIC,QAAoB,IAAmB,IAAI,CAAC3D,cAAc,CAAC4D,GAAG,CAACD,QAAQ,CAAC;;EAEnG;EACOE,iBAAiB,GAAG,MAAAA,CAAA,KAA0C;IACnE,MAAM9D,UAAU,GAAG,MAAM,IAAI,CAACU,OAAO,CAAC6C,WAAW,CAACQ,OAAO,CAAC,CAAC;IAE3D,IAAI,CAACf,YAAY,CAAC;MAAEhD;IAAW,CAAC,CAAC;IAEjC,OAAOA,UAAU;EACnB,CAAC;;EAED;EACOgE,YAAY,GAAGA,CAAA,KAAqB,IAAI,CAACtD,OAAO,CAAC6C,WAAW,CAACS,YAAY,CAAC,CAAC;;EAElF;EACOC,QAAQ,GAAIC,KAAkB,IACnC,IAAI,CAAC7C,SAAS,CAAC8C,GAAG,CAACD,KAAK,CAAC1C,QAAQ,CAAC,IAAI0C,KAAK,CAACE,KAAK,CAACC,IAAI,CAAEC,IAAI,IAAKA,IAAI,CAACC,IAAI,KAAK,KAAK,CAAC;;EAEvF;EACOC,QAAQ,GAAGA,CAACC,QAAwB,GAAG,CAAC,CAAC,KAAgB;IAC9D,MAAMC,OAAwB,GAAG;MAC/BxD,OAAO,EAAE,IAAI,CAACA,OAAO;MACrByD,MAAM,EAAGC,OAAO,IAAK,IAAI,CAAC9C,QAAQ,CAAC+C,GAAG,CAACD,OAAO,CAAC,EAAEE,MAAM,CAAC,CAAC;MACzDb,QAAQ,EAAE,IAAI,CAACA;IACjB,CAAC;IAED,MAAMc,SAAoB,GAAG,IAAIC,oBAAS,CAAC;MACzClC,OAAO,EAAE,IAAI,CAACpC,OAAO,CAACoC,OAAO;MAC7BmC,MAAM,EAAE,IAAI,CAACC,UAAU,CAAC,IAAI,CAAChE,OAAO,CAACE,MAAM,CAACqD,QAAQ,CAAC,CAACQ,MAAM,CAAC,IAAI,CAAChB,QAAQ,CAAC,CAAC;MAC5EkB,QAAQ,EAAGC,EAAE,IAAK;QAChB,MAAMC,cAAc,GAAG,IAAAF,kBAAQ,EAACC,EAAE,EAAEV,OAAO,CAAC;QAE5C,OAAOW,cAAc,IAAI,IAAAC,gBAAM,EAACD,cAAc,EAAEZ,QAAQ,EAAE,IAAI,CAACvD,OAAO,CAAC;MACzE,CAAC;MACDqE,MAAM,EAAE,IAAI,CAACC,OAAO;MACpBC,KAAK,EAAEA,CAAA,KAAM,IAAI,CAACC,SAAS,CAACX,SAAS,CAAC;MACtCpE,GAAG,EAAE,IAAI,CAACA,GAAG;MACbgF,WAAW,EAAE,IAAI,CAACjF,OAAO,CAACiF,WAAW,IAAI/F;IAC3C,CAAC,CAAC;IAEF,IAAI,CAACS,KAAK,CAACwD,GAAG,CAACkB,SAAS,CAAC;IACzB,IAAI,CAAC5C,QAAQ,EAAEK,MAAM,CAAC,CAAC;IACvBuC,SAAS,CAACa,KAAK,CAAC,CAAC;IACjB,IAAIb,SAAS,CAACc,QAAQ,CAAC,CAAC,CAACC,QAAQ,KAAK,KAAK,EAAE;MAC3C,IAAI,CAACJ,SAAS,CAACX,SAAS,CAAC;IAC3B;IAEA,OAAOA,SAAS;EAClB,CAAC;;EAED;EACOgB,IAAI,GAAG,MAAAA,CAAOC,KAAY,EAAEC,MAA0B,GAAG,CAAC,CAAC,KAAsB;IACtF,MAAM;MAAEC;IAAM,CAAC,GAAGF,KAAK;IAEvB,IAAIE,KAAK,CAACC,IAAI,KAAK,QAAQ,EAAE;MAC3B,OAAO,IAAI,CAACC,MAAM,CAACJ,KAAK,CAACpB,OAAO,CAAC,IAAIyB,OAAO,CAACC,MAAM,CAAC,IAAIC,mBAAW,CAAC,aAAa,EAAE,gCAAgC,CAAC,CAAC;IACvH;IAEA,MAAMrC,KAAK,GAAGgC,KAAK,CAACC,IAAI,KAAK,WAAW,KAAKF,MAAM,CAAC/B,KAAK,GAAGgC,KAAK,CAACM,QAAQ,CAACC,IAAI,CAAC,CAAC;MAAEhF;IAAG,CAAC,KAAKA,EAAE,KAAKwE,MAAM,CAAC/B,KAAK,CAAC,GAAGgC,KAAK,CAACM,QAAQ,CAAC,CAAC,CAAC,CAAC;IACrI,MAAMxE,MAAM,GAAGkC,KAAK,IAAI,IAAAwC,6BAAe,EAAC,IAAAC,yBAAU,EAACX,KAAK,CAACpB,OAAO,CAAC,EAAEV,KAAK,CAACzC,EAAE,EAAEuE,KAAK,CAACY,IAAI,EAAE,IAAI,CAACjG,GAAG,CAAC,CAAC,CAAC;IACpG,MAAMyF,MAAM,GAAGpE,MAAM,IAAI,IAAI,CAACC,YAAY,CAACD,MAAM,EAAE,IAAI,CAACzB,cAAc,CAACsG,EAAE,CAAC7E,MAAM,CAAC4C,OAAO,CAAC,CAAC;IAE1F,IAAI,CAACwB,MAAM,EAAE;MACX,MAAM,IAAIG,mBAAW,CAAC,aAAa,EAAE,mCAAmC,CAAC;IAC3E;IAEA,MAAMH,MAAM,CAACL,IAAI,CAAC,CAAC;IACnB,IAAI,CAACjE,QAAQ,CAAC+B,GAAG,CAACuC,MAAM,CAAC;IACzB,IAAI,CAACvF,MAAM,CAACiG,IAAI,CAAC,yBAAyB,EAAE;MAAE5C,KAAK,EAAEkC,MAAM,CAACP,QAAQ,CAAC,CAAC,CAAC3B,KAAK,CAACzC;IAAG,CAAC,CAAC;IAElF,OAAO2E,MAAM;EACf,CAAC;;EAED;EACOW,OAAO,GAAGA,CAAA,KAAyB,IAAI,CAACjF,QAAQ,CAACW,IAAI,CAAC,CAAC;;EAE9D;EACO2D,MAAM,GAAIxB,OAAe,IAAyB,IAAI,CAAC9C,QAAQ,CAAC+C,GAAG,CAAC,IAAA8B,yBAAU,EAAC/B,OAAO,CAAC,CAAC;;EAE/F;EACOoC,eAAe,GAAGA,CAAA,KAAiC,IAAI,CAAClF,QAAQ,CAACY,SAAS,CAAC,CAAC;;EAEnF;EACOuE,gBAAgB,GAAIrD,QAAoB,IAAmB,IAAI,CAAC9B,QAAQ,CAACS,SAAS,CAACqB,QAAQ,CAAC;;EAEnG;EACOsD,MAAM,GAAItC,OAAe,IAAoB,IAAI,CAAC9C,QAAQ,CAACqF,MAAM,CAAC,IAAAR,yBAAU,EAAC/B,OAAO,CAAC,CAAC;;EAE7F;EACOwC,QAAQ,GAAGA,CAAA,KAAkC,IAAI,CAAC1F,GAAG,CAAC2F,OAAO,CAAC,CAAC;;EAEtE;EACOC,iBAAiB,GAAI1D,QAAoB,IAAmB,IAAI,CAAClC,GAAG,CAACa,SAAS,CAACqB,QAAQ,CAAC;;EAE/F;EACO2D,OAAO,GAAG,MAAAA,CAAA,KAA2B;IAC1C,IAAI,CAACjF,aAAa,CAAC,CAAC;IACpB,IAAI,CAACO,YAAY,CAAC,CAAC;IACnB,IAAI,CAACI,aAAa,CAAC,CAAC;IACpB,IAAI,CAACd,QAAQ,EAAEqF,IAAI,CAAC,CAAC;IACrB,IAAI,CAACrH,SAAS,CAACqH,IAAI,CAAC,CAAC;IACrB,MAAMnB,OAAO,CAACoB,GAAG,CAAC,IAAI,CAAC3F,QAAQ,CAACW,IAAI,CAAC,CAAC,CAAClB,GAAG,CAAE6E,MAAM,IAAKA,MAAM,CAACsB,UAAU,CAAC,CAAC,CAAC,CAAC;IAC5E,MAAM,IAAI,CAAC3G,SAAS,CAAC4G,OAAO,CAAC,CAAC;EAChC,CAAC;EAEO1F,YAAYA,CAACD,MAAoB,EAAE4F,aAA6B,EAAsB;IAC5F,MAAM1D,KAAK,GAAG,IAAI,CAAChD,OAAO,CAACgD,KAAK,CAAClC,MAAM,CAAC6F,OAAO,CAAC;IAChD,MAAMrG,QAAQ,GAAG0C,KAAK,IAAI,IAAI,CAAC7C,SAAS,CAACwD,GAAG,CAACX,KAAK,CAAC1C,QAAQ,CAAC;IAC5D,MAAM;MAAEsB,OAAO;MAAEZ,KAAK;MAAEN;IAAK,CAAC,GAAG,IAAI,CAAClB,OAAO;IAC7C,MAAMoH,IAAI,GAAG5D,KAAK,IAAI1C,QAAQ,IAAI;MAAE0C,KAAK;MAAE1C,QAAQ;MAAEsB,OAAO;MAAEZ,KAAK;MAAEN,IAAI;MAAEjB,GAAG,EAAE,IAAI,CAACA,GAAG;MAAEE,MAAM,EAAE,IAAI,CAACA;IAAO,CAAC;IAE/G,OAAOiH,IAAI,GAAG,IAAIC,cAAM,CAAC/F,MAAM,EAAE8F,IAAI,EAAEF,aAAa,CAAC,GAAGxF,SAAS;EACnE;EAEQC,cAAcA,CAAA,EAAa;IACjC,OAAO,IAAI2F,kBAAQ,CAAC;MAClBlF,OAAO,EAAE,IAAI,CAACpC,OAAO,CAACoC,OAAO;MAC7BiE,OAAO,EAAEA,CAAA,KAAM,IAAI,CAACjF,QAAQ,CAACW,IAAI,CAAC,CAAC;MACnCwF,SAAS,EAAGlB,OAAO,IAAK,IAAI,CAAC7B,UAAU,CAAC6B,OAAO,CAACmB,OAAO,CAAE9B,MAAM,IAAK,IAAI,CAAClF,OAAO,CAACgD,KAAK,CAACkC,MAAM,CAACtB,MAAM,CAAC,CAAC,CAAC+C,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;MACvHM,OAAO,EAAEA,CAAA,KAAM,IAAI,CAACrI,WAAW,CAACC,KAAK,KAAK,IAAI,IAAI,IAAI,CAACM,KAAK,CAAC+H,IAAI,KAAK,CAAC;MACvE5C,OAAO,EAAE,IAAI,CAACA,OAAO;MACrB6C,UAAU,EAAE,IAAI,CAACA,UAAU;MAC3B1H,GAAG,EAAE,IAAI,CAACA,GAAG;MACbE,MAAM,EAAE,IAAI,CAACA;IACf,CAAC,CAAC;EACJ;EAEQwH,UAAU,GAAIjC,MAAc,IAAc;IAChD,MAAMlC,KAAK,GAAG,IAAI,CAAChD,OAAO,CAACgD,KAAK,CAACkC,MAAM,CAACtB,MAAM,CAAC,CAAC,CAAC+C,OAAO,CAAC;IAEzD,OAAO3D,KAAK,KAAK9B,SAAS,IAAI,IAAI,CAACf,SAAS,CAACwD,GAAG,CAACX,KAAK,CAAC1C,QAAQ,CAAC,EAAE8G,SAAS,KAAKlG,SAAS;EAC3F,CAAC;EAEO8C,UAAUA,CAAC9D,MAA8B,EAAqB;IACpE,OAAO,IAAAmH,yBAAa,EAACnH,MAAM,EAAEA,MAAM,CAAC8G,OAAO,CAAEhE,KAAK,IAAK,IAAI,CAAC7C,SAAS,CAACwD,GAAG,CAACX,KAAK,CAAC1C,QAAQ,CAAC,EAAEgH,QAAQ,IAAI,EAAE,CAAC,CAAC;EAC7G;;EAEA;EACQhD,OAAO,GAAIJ,EAAiB,IAAW;IAC7C,MAAMgB,MAAM,GAAG,IAAI,CAACtE,QAAQ,CAAC+C,GAAG,CAAC,IAAA8B,yBAAU,EAACvB,EAAE,CAACR,OAAO,CAAC,CAAC;IAExD,IAAI,CAACrE,cAAc,CAACkI,QAAQ,CAACrD,EAAE,CAAC;IAChC,IAAIgB,MAAM,EAAE;MACVA,MAAM,CAACsC,IAAI,CAACtD,EAAE,CAAC;MACf,IAAI,CAACjD,QAAQ,EAAEuG,IAAI,CAACtC,MAAM,CAAC;IAC7B;EACF,CAAC;EAEOV,SAASA,CAACX,SAAoB,EAAQ;IAC5C,IAAI,CAAC1E,KAAK,CAACsI,MAAM,CAAC5D,SAAS,CAAC;IAC5B,IAAI,CAAC5C,QAAQ,EAAEK,MAAM,CAAC,CAAC;EACzB;EAEQc,gBAAgBA,CAACD,UAAyB,EAAQ;IACxD,IAAI,CAAClD,SAAS,CAACmD,gBAAgB,CAACD,UAAU,EAAE,IAAI,CAACvB,QAAQ,CAACW,IAAI,CAAC,CAAC,CAAC;IACjE,IAAIY,UAAU,KAAK,YAAY,EAAE;MAC/B,IAAI,CAAClB,QAAQ,EAAEyG,eAAe,CAAC,CAAC;IAClC,CAAC,MAAM;MACL,IAAI,CAACzG,QAAQ,EAAE0G,eAAe,CAAC,CAAC;IAClC;EACF;EAEQ7F,YAAYA,CAAC8F,MAAgC,EAAQ;IAC3D,IAAI,CAAChJ,WAAW,GAAG;MAAE,GAAG,IAAI,CAACA,WAAW;MAAE,GAAGgJ;IAAO,CAAC;IACrD,IAAI,CAAC7I,cAAc,CAAC8I,IAAI,CAAC,IAAI,CAACjJ,WAAW,CAAC;IAC1C,IAAI,CAACqC,QAAQ,EAAEK,MAAM,CAAC,CAAC;EACzB;AACF;AAACwG,OAAA,CAAAnJ,SAAA,GAAAA,SAAA","ignoreList":[]}
|
|
1
|
+
{"version":3,"names":["_advertisement","require","_autoSync","_catalog","_device","_discovery","_errors","_identify","_idleLinks","_keepAliveHolder","_listeners","_pairedDevice","_pairedRegistry","_ports","_readingLog","_recentAdvertisements","_scanFilter","DEFAULT_LOST_AFTER_MS","Bluetooth","adapterSnap","state","permission","adapterChanges","Listeners","idleLinks","IdleLinks","scans","Set","advertisements","RecentAdvertisements","constructor","options","now","Date","logger","silentLogger","keepAlive","KeepAliveHolder","noKeepAlive","catalog","Catalog","models","protocols","Map","map","protocol","id","log","ReadingLog","sink","outbox","registry","PairedRegistry","record","createDevice","store","autoSync","undefined","createAutoSync","stopFollowing","subscribe","update","list","snapshots","ready","load","stopWatching","central","watchState","patchAdapter","stopLifecycle","lifecycle","alwaysForeground","watch","visibility","changeVisibility","permissions","check","then","adapter","subscribeAdapter","listener","add","requestPermission","request","openSettings","runnable","model","has","links","some","link","data","discover","selector","chooser","context","paired","address","get","stored","wanted","scanFilter","filter","discovery","Discovery","withoutChooser","identify","ad","identification","narrow","onSeen","sighted","onEnd","scanEnded","lostAfterMs","start","snapshot","scanning","pair","found","choice","match","kind","device","Promise","reject","DeviceError","variants","find","newPairedDevice","addressKey","name","of","info","devices","pairedSnapshots","subscribeDevices","forget","remove","readings","entries","subscribeReadings","destroy","stop","all","disconnect","release","advertisement","modelId","deps","Device","AutoSync","filterFor","flatMap","mayScan","size","broadcasts","broadcast","scanFilterFor","services","remember","seen","delete","enterBackground","enterForeground","change","emit","exports"],"sourceRoot":"../../../../../../src","sources":["modules/next/bluetooth/core/bluetooth.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -77,7 +77,7 @@ class Device {
|
|
|
77
77
|
/** Sets the device's clock to now. */
|
|
78
78
|
setClock = () => this.run("setClock", connection => this.deps.protocol.setClock?.(connection, this.deps.now()) ?? Promise.reject(unsupported("clock")));
|
|
79
79
|
|
|
80
|
-
/** Starts `live` and `waveform` events, which the device also records and saves while
|
|
80
|
+
/** Starts `live` and `waveform` events, which the device also records and saves while it measures with `record` on. */
|
|
81
81
|
startLive = () => this.run("live", async connection => this.live.start((onFrame, signal) => this.deps.protocol.live?.(connection, onFrame, signal) ?? Promise.resolve()));
|
|
82
82
|
|
|
83
83
|
/** Stops the stream and waits until the device has stopped sending. */
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
-
exports.scanFilterFor = void 0;
|
|
6
|
+
exports.withoutChooser = exports.scanFilterFor = void 0;
|
|
7
7
|
var _advertisement = require("./advertisement.js");
|
|
8
8
|
var _glob = require("./glob.js");
|
|
9
9
|
const unique = values => [...new Set(values)];
|
|
@@ -18,31 +18,47 @@ const namePrefixes = ({
|
|
|
18
18
|
const prefixes = (match.names ?? []).map(_glob.literalPrefix);
|
|
19
19
|
return prefixes.length > 0 && prefixes.every(prefix => prefix !== "") ? prefixes : null;
|
|
20
20
|
};
|
|
21
|
+
|
|
22
|
+
/** Each name glob's literal text after a leading `*`, for a chooser that filters names only by how they start. */
|
|
23
|
+
const nameStems = ({
|
|
24
|
+
match
|
|
25
|
+
}) => (match.names ?? []).map(name => (0, _glob.literalPrefix)(name.replace(/^\*+/, ""))).filter(stem => stem !== "");
|
|
26
|
+
const byName = prefixes => prefixes.map(namePrefix => ({
|
|
27
|
+
namePrefix
|
|
28
|
+
}));
|
|
21
29
|
const chooserFor = model => {
|
|
22
30
|
const prefixes = namePrefixes(model);
|
|
23
31
|
const services = advertisedServices(model);
|
|
24
32
|
if (prefixes) {
|
|
25
|
-
return prefixes
|
|
26
|
-
namePrefix
|
|
27
|
-
}));
|
|
33
|
+
return byName(prefixes);
|
|
28
34
|
}
|
|
29
35
|
return services.length > 0 ? [{
|
|
30
36
|
services
|
|
31
|
-
}] :
|
|
37
|
+
}] : byName(nameStems(model));
|
|
32
38
|
};
|
|
33
39
|
|
|
40
|
+
/** Many models of one family share a prefix; the chooser needs each entry once. */
|
|
41
|
+
const uniqueEntries = entries => [...new Map(entries.map(entry => [JSON.stringify(entry), entry])).values()];
|
|
42
|
+
|
|
34
43
|
/** What to scan for to find these models; `null` when there is nothing to scan for. */
|
|
35
44
|
const scanFilterFor = (models, optionalServices) => {
|
|
36
45
|
if (models.length === 0) {
|
|
37
46
|
return null;
|
|
38
47
|
}
|
|
39
48
|
const services = models.map(advertisedServices);
|
|
40
|
-
const
|
|
49
|
+
const chooser = uniqueEntries(models.flatMap(chooserFor));
|
|
41
50
|
return {
|
|
42
51
|
services: services.every(list => list.length > 0) ? unique(services.flat()) : null,
|
|
43
|
-
chooser:
|
|
52
|
+
chooser: chooser.length > 0 ? chooser : null,
|
|
44
53
|
optionalServices: unique(optionalServices.map(_advertisement.fullUuid))
|
|
45
54
|
};
|
|
46
55
|
};
|
|
56
|
+
|
|
57
|
+
/** The same scan without the browser's chooser. */
|
|
47
58
|
exports.scanFilterFor = scanFilterFor;
|
|
59
|
+
const withoutChooser = filter => filter && {
|
|
60
|
+
...filter,
|
|
61
|
+
chooser: null
|
|
62
|
+
};
|
|
63
|
+
exports.withoutChooser = withoutChooser;
|
|
48
64
|
//# sourceMappingURL=scan-filter.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_advertisement","require","_glob","unique","values","Set","advertisedServices","match","services","requires","flatMap","test","kind","uuid","map","fullUuid","namePrefixes","prefixes","names","literalPrefix","length","every","prefix","chooserFor","model","
|
|
1
|
+
{"version":3,"names":["_advertisement","require","_glob","unique","values","Set","advertisedServices","match","services","requires","flatMap","test","kind","uuid","map","fullUuid","namePrefixes","prefixes","names","literalPrefix","length","every","prefix","nameStems","name","replace","filter","stem","byName","namePrefix","chooserFor","model","uniqueEntries","entries","Map","entry","JSON","stringify","scanFilterFor","models","optionalServices","chooser","list","flat","exports","withoutChooser"],"sourceRoot":"../../../../../../src","sources":["modules/next/bluetooth/core/scan-filter.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -42,13 +42,13 @@ class StreamRecorder {
|
|
|
42
42
|
events.add(event => this.observe(event));
|
|
43
43
|
}
|
|
44
44
|
|
|
45
|
-
/** Takes one device event: numbers and samples while recording
|
|
45
|
+
/** Takes one device event: numbers and samples while it measures with recording on, and the end of the stream. */
|
|
46
46
|
observe(event) {
|
|
47
47
|
if (event.kind === "state") {
|
|
48
48
|
this.followStream(event.snapshot.live);
|
|
49
|
-
} else if (event.kind === "live" && this.
|
|
49
|
+
} else if (event.kind === "live" && this.recording()) {
|
|
50
50
|
this.recordNumbers(event.values);
|
|
51
|
-
} else if (event.kind === "waveform" && this.
|
|
51
|
+
} else if (event.kind === "waveform" && this.recording()) {
|
|
52
52
|
this.recordWaveform(event.waveform);
|
|
53
53
|
}
|
|
54
54
|
}
|
|
@@ -80,6 +80,15 @@ class StreamRecorder {
|
|
|
80
80
|
this.segments.clear();
|
|
81
81
|
return this.saving;
|
|
82
82
|
}
|
|
83
|
+
|
|
84
|
+
/** A result the device keeps showing after it measured is shown, not recorded again. */
|
|
85
|
+
recording() {
|
|
86
|
+
const {
|
|
87
|
+
record,
|
|
88
|
+
measuringSince
|
|
89
|
+
} = this.device.snapshot();
|
|
90
|
+
return record && measuringSince !== null;
|
|
91
|
+
}
|
|
83
92
|
followStream(streaming) {
|
|
84
93
|
if (this.streaming && !streaming) {
|
|
85
94
|
void this.close();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_errors","require","_liveLedger","_seriesSlots","_waveformSegments","MS_PER_SECOND","SAVE_OPEN_EVERY_MS","StreamRecorder","open","Map","segments","ledger","LiveLedger","replacing","unsupported","Set","saving","Promise","resolve","streaming","constructor","device","sink","deps","origin","modelId","model","id","protocolId","protocol","address","recordId","follow","events","add","event","observe","kind","followStream","snapshot","live","
|
|
1
|
+
{"version":3,"names":["_errors","require","_liveLedger","_seriesSlots","_waveformSegments","MS_PER_SECOND","SAVE_OPEN_EVERY_MS","StreamRecorder","open","Map","segments","ledger","LiveLedger","replacing","unsupported","Set","saving","Promise","resolve","streaming","constructor","device","sink","deps","origin","modelId","model","id","protocolId","protocol","address","recordId","follow","events","add","event","observe","kind","followStream","snapshot","live","recording","recordNumbers","values","recordWaveform","waveform","supersede","record","spans","inside","length","set","supersedes","acknowledged","remove","get","delete","close","stopTimer","keys","forEach","metric","finish","segment","flush","reading","saveSettled","clear","measuringSince","at","Object","entries","quantity","type","RECORDED_METRICS","Number","isFinite","value","has","takenAt","getTime","seriesFor","unit","put","current","takes","series","SlotSeries","timer","setInterval","saveOpenSeries","sampleRateHz","arrivedAt","now","channels","channel","index","samples","firstAt","firstSampleAt","segmentFor","scale","key","join","ChannelSegment","isQuiet","unsaved","enqueue","undefined","markSaved","size","onSaved","then","save","error","failed","DeviceError","code","logger","warn","clearInterval","exports"],"sourceRoot":"../../../../../../src","sources":["modules/next/bluetooth/core/stream-recorder.ts"],"mappings":";;;;;;AAEA,IAAAA,OAAA,GAAAC,OAAA;AAEA,IAAAC,WAAA,GAAAD,OAAA;AAIA,IAAAE,YAAA,GAAAF,OAAA;AACA,IAAAG,iBAAA,GAAAH,OAAA;AAEA,MAAMI,aAAa,GAAG,KAAK;AAC3B,MAAMC,kBAAkB,GAAG,MAAM;;AAEjC;;AAYA;AACA;AACA;AACA;AACA,MAAMC,cAAc,CAAC;EACFC,IAAI,GAAG,IAAIC,GAAG,CAAyB,CAAC;EACxCC,QAAQ,GAAG,IAAID,GAAG,CAAyB,CAAC;EAC5CE,MAAM,GAAG,IAAIC,sBAAU,CAAC,CAAC;EACzBC,SAAS,GAAG,IAAIJ,GAAG,CAA8B,CAAC;EAClDK,WAAW,GAAG,IAAIC,GAAG,CAAqB,CAAC;EACpDC,MAAM,GAAkBC,OAAO,CAACC,OAAO,CAAC,CAAC;EAEzCC,SAAS,GAAG,KAAK;EAGlBC,WAAWA,CACCC,MAAsB,EACtBC,IAAiB,EACjBC,IAAkB,EACnC;IAAA,KAHiBF,MAAsB,GAAtBA,MAAsB;IAAA,KACtBC,IAAiB,GAAjBA,IAAiB;IAAA,KACjBC,IAAkB,GAAlBA,IAAkB;IAEnC,IAAI,CAACC,MAAM,GAAG;MAAEC,OAAO,EAAEF,IAAI,CAACG,KAAK,CAACC,EAAE;MAAEC,UAAU,EAAEL,IAAI,CAACM,QAAQ,CAACF,EAAE;MAAEG,OAAO,EAAET,MAAM,CAACS,OAAO;MAAEC,QAAQ,EAAE;IAAK,CAAC;EACjH;;EAEA;EACOC,MAAMA,CAACC,MAA8B,EAAQ;IAClDA,MAAM,CAACC,GAAG,CAAEC,KAAK,IAAK,IAAI,CAACC,OAAO,CAACD,KAAK,CAAC,CAAC;EAC5C;;EAEA;EACOC,OAAOA,CAACD,KAAkB,EAAQ;IACvC,IAAIA,KAAK,CAACE,IAAI,KAAK,OAAO,EAAE;MAC1B,IAAI,CAACC,YAAY,CAACH,KAAK,CAACI,QAAQ,CAACC,IAAI,CAAC;IACxC,CAAC,MAAM,IAAIL,KAAK,CAACE,IAAI,KAAK,MAAM,IAAI,IAAI,CAACI,SAAS,CAAC,CAAC,EAAE;MACpD,IAAI,CAACC,aAAa,CAACP,KAAK,CAACQ,MAAM,CAAC;IAClC,CAAC,MAAM,IAAIR,KAAK,CAACE,IAAI,KAAK,UAAU,IAAI,IAAI,CAACI,SAAS,CAAC,CAAC,EAAE;MACxD,IAAI,CAACG,cAAc,CAACT,KAAK,CAACU,QAAQ,CAAC;IACrC;EACF;;EAEA;EACOC,SAASA,CAACf,QAAgB,EAAEgB,MAAsB,EAAkB;IACzE,MAAMC,KAAK,GAAG,IAAI,CAACrC,MAAM,CAACsC,MAAM,CAACF,MAAM,CAAC;IAExC,IAAIC,KAAK,CAACE,MAAM,KAAK,CAAC,EAAE;MACtB,OAAOH,MAAM;IACf;IAEA,IAAI,CAAClC,SAAS,CAACsC,GAAG,CAACpB,QAAQ,EAAEiB,KAAK,CAAC;IAEnC,OAAO;MAAE,GAAGD,MAAM;MAAEK,UAAU,EAAEJ;IAAM,CAAC;EACzC;;EAEA;EACOK,YAAYA,CAACtB,QAAgB,EAAQ;IAC1C,IAAI,CAACpB,MAAM,CAAC2C,MAAM,CAAC,IAAI,CAACzC,SAAS,CAAC0C,GAAG,CAACxB,QAAQ,CAAC,IAAI,EAAE,CAAC;IACtD,IAAI,CAAClB,SAAS,CAAC2C,MAAM,CAACzB,QAAQ,CAAC;EACjC;;EAEA;EACO0B,KAAKA,CAAA,EAAkB;IAC5B,IAAI,CAACC,SAAS,CAAC,CAAC;IAChB,CAAC,GAAG,IAAI,CAAClD,IAAI,CAACmD,IAAI,CAAC,CAAC,CAAC,CAACC,OAAO,CAAEC,MAAM,IAAK,IAAI,CAACC,MAAM,CAACD,MAAM,CAAC,CAAC;IAC9D,IAAI,CAACnD,QAAQ,CAACkD,OAAO,CAAEG,OAAO,IAAKA,OAAO,CAACC,KAAK,CAAC,CAAC,CAACJ,OAAO,CAAEK,OAAO,IAAK,IAAI,CAACC,WAAW,CAACD,OAAO,CAAC,CAAC,CAAC;IACnG,IAAI,CAACvD,QAAQ,CAACyD,KAAK,CAAC,CAAC;IAErB,OAAO,IAAI,CAACnD,MAAM;EACpB;;EAEA;EACQyB,SAASA,CAAA,EAAY;IAC3B,MAAM;MAAEM,MAAM;MAAEqB;IAAe,CAAC,GAAG,IAAI,CAAC/C,MAAM,CAACkB,QAAQ,CAAC,CAAC;IAEzD,OAAOQ,MAAM,IAAIqB,cAAc,KAAK,IAAI;EAC1C;EAEQ9B,YAAYA,CAACnB,SAAkB,EAAQ;IAC7C,IAAI,IAAI,CAACA,SAAS,IAAI,CAACA,SAAS,EAAE;MAChC,KAAK,IAAI,CAACsC,KAAK,CAAC,CAAC;IACnB;IAEA,IAAI,CAACtC,SAAS,GAAGA,SAAS;EAC5B;EAEQuB,aAAaA,CAAC;IAAEC,MAAM;IAAE0B;EAAe,CAAC,EAAQ;IACrDC,MAAM,CAACC,OAAO,CAAC5B,MAAM,CAAC,CAA0CiB,OAAO,CAAC,CAAC,CAACC,MAAM,EAAEW,QAAQ,CAAC,KAAK;MAC/F,MAAMC,IAAI,GAAGC,6BAAgB,CAACb,MAAM,CAAC;MAErC,IAAIW,QAAQ,IAAIC,IAAI,IAAIE,MAAM,CAACC,QAAQ,CAACJ,QAAQ,CAACK,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC/D,WAAW,CAACgE,GAAG,CAACjB,MAAM,CAAC,EAAE;QACxF,MAAMkB,OAAO,GAAGV,EAAE,CAACW,OAAO,CAAC,CAAC;QAE5B,IAAI,CAACC,SAAS,CAAC;UAAEpB,MAAM;UAAEY,IAAI;UAAES,IAAI,EAAEV,QAAQ,CAACU;QAAK,CAAC,EAAEH,OAAO,CAAC,CAACI,GAAG,CAACX,QAAQ,CAACK,KAAK,EAAEE,OAAO,CAAC;MAC7F;IACF,CAAC,CAAC;EACJ;EAEQE,SAASA,CAAC5C,IAAgB,EAAEgC,EAAU,EAAc;IAC1D,MAAMe,OAAO,GAAG,IAAI,CAAC5E,IAAI,CAAC+C,GAAG,CAAClB,IAAI,CAACwB,MAAM,CAAC;IAE1C,IAAIuB,OAAO,EAAEC,KAAK,CAAChD,IAAI,CAAC6C,IAAI,EAAEb,EAAE,CAAC,EAAE;MACjC,OAAOe,OAAO;IAChB;IAEA,IAAIA,OAAO,EAAE;MACX,IAAI,CAACtB,MAAM,CAACzB,IAAI,CAACwB,MAAM,CAAC;IAC1B;IAEA,MAAMyB,MAAM,GAAG,IAAIC,uBAAU,CAAClD,IAAI,EAAEgC,EAAE,CAAC;IAEvC,IAAI,CAAC7D,IAAI,CAAC2C,GAAG,CAACd,IAAI,CAACwB,MAAM,EAAEyB,MAAM,CAAC;IAClC,IAAI,CAACE,KAAK,KAAKC,WAAW,CAAC,MAAM,IAAI,CAACC,cAAc,CAAC,CAAC,EAAEpF,kBAAkB,CAAC;IAE3E,OAAOgF,MAAM;EACf;EAEQ1C,cAAcA,CAACC,QAAkB,EAAQ;IAC/C,IAAI,IAAI,CAAC/B,WAAW,CAACgE,GAAG,CAACjC,QAAQ,CAACgB,MAAM,CAAC,IAAI,EAAEhB,QAAQ,CAAC8C,YAAY,GAAG,CAAC,CAAC,EAAE;MACzE;IACF;IAEA,MAAMC,SAAS,GAAG,IAAI,CAACrE,IAAI,CAACsE,GAAG,CAAC,CAAC,CAACb,OAAO,CAAC,CAAC;IAE3CnC,QAAQ,CAACiD,QAAQ,CAAClC,OAAO,CAAC,CAACmC,OAAO,EAAEC,KAAK,KAAK;MAC5C,MAAMC,OAAO,GAAGpD,QAAQ,CAACoD,OAAO,CAACD,KAAK,CAAC;MACvC,MAAME,OAAO,GAAGrD,QAAQ,CAACsD,aAAa,EAAEnB,OAAO,CAAC,CAAC,IAAIY,SAAS,GAAG,CAACK,OAAO,EAAE/C,MAAM,IAAI,CAAC,IAAIL,QAAQ,CAAC8C,YAAY,GAAGtF,aAAa;MAE/H,IAAI4F,OAAO,EAAE/C,MAAM,EAAE;QACnB,IAAI,CAACkD,UAAU,CAACvD,QAAQ,EAAEkD,OAAO,CAAC,CAC/B7D,GAAG,CAAC+D,OAAO,EAAEC,OAAO,CAAC,CACrBtC,OAAO,CAAEK,OAAO,IAAK,IAAI,CAACC,WAAW,CAACD,OAAO,CAAC,CAAC;MACpD;IACF,CAAC,CAAC;EACJ;EAEQmC,UAAUA,CAACvD,QAAkB,EAAEkD,OAAe,EAAkB;IACtE,MAAM;MAAElC,MAAM;MAAE8B,YAAY;MAAET,IAAI;MAAEmB;IAAM,CAAC,GAAGxD,QAAQ;IACtD,MAAMyD,GAAG,GAAG,CAACzC,MAAM,EAAEkC,OAAO,EAAEJ,YAAY,EAAET,IAAI,EAAEmB,KAAK,CAAC,CAACE,IAAI,CAAC,GAAG,CAAC;IAClE,MAAMxC,OAAO,GAAG,IAAI,CAACrD,QAAQ,CAAC6C,GAAG,CAAC+C,GAAG,CAAC,IAAI,IAAIE,gCAAc,CAAC;MAAE3C,MAAM;MAAEkC,OAAO;MAAEJ,YAAY;MAAET,IAAI;MAAEmB;IAAM,CAAC,EAAE,IAAI,CAAC7E,MAAM,CAAC;IAEzH,IAAI,CAACd,QAAQ,CAACyC,GAAG,CAACmD,GAAG,EAAEvC,OAAO,CAAC;IAE/B,OAAOA,OAAO;EAChB;;EAEA;EACQ2B,cAAcA,CAAA,EAAS;IAC7B,MAAMG,GAAG,GAAG,IAAI,CAACtE,IAAI,CAACsE,GAAG,CAAC,CAAC,CAACb,OAAO,CAAC,CAAC;IAErC,CAAC,GAAG,IAAI,CAACxE,IAAI,CAAC+D,OAAO,CAAC,CAAC,CAAC,CAACX,OAAO,CAAC,CAAC,CAACC,MAAM,EAAEyB,MAAM,CAAC,KAAK;MACrD,IAAIA,MAAM,CAACmB,OAAO,CAACZ,GAAG,CAAC,EAAE;QACvB,IAAI,CAAC/B,MAAM,CAACD,MAAM,CAAC;MACrB,CAAC,MAAM,IAAIyB,MAAM,CAACoB,OAAO,EAAE;QACzB,IAAI,CAACC,OAAO,CAACrB,MAAM,CAACrB,OAAO,CAAC,IAAI,CAACzC,MAAM,CAAC,EAAE,MAAMoF,SAAS,CAAC;QAC1DtB,MAAM,CAACuB,SAAS,CAAC,CAAC;MACpB;IACF,CAAC,CAAC;IAEF,IAAI,IAAI,CAACrG,IAAI,CAACsG,IAAI,KAAK,CAAC,EAAE;MACxB,IAAI,CAACpD,SAAS,CAAC,CAAC;IAClB;EACF;EAEQI,MAAMA,CAACD,MAAkB,EAAQ;IACvC,MAAMyB,MAAM,GAAG,IAAI,CAAC9E,IAAI,CAAC+C,GAAG,CAACM,MAAM,CAAC;IAEpC,IAAI,CAACrD,IAAI,CAACgD,MAAM,CAACK,MAAM,CAAC;IACxB,IAAIyB,MAAM,EAAE;MACV,IAAI,CAACpB,WAAW,CAACoB,MAAM,CAACrB,OAAO,CAAC,IAAI,CAACzC,MAAM,CAAC,CAAC;IAC/C;EACF;EAEQ0C,WAAWA,CAACD,OAAgB,EAAQ;IAC1C,IAAI,CAAC0C,OAAO,CAAC1C,OAAO,EAAE,CAAC;MAAEzB;IAAK,CAAC,KAAK;MAClC,IAAIA,IAAI,EAAE;QACR,IAAI,CAAC7B,MAAM,CAACuB,GAAG,CAACM,IAAI,CAAC;MACvB;IACF,CAAC,CAAC;EACJ;;EAEA;EACQmE,OAAOA,CAAC1C,OAAgB,EAAE8C,OAAmC,EAAQ;IAC3E,IAAI,CAAC/F,MAAM,GAAG,IAAI,CAACA,MAAM,CAACgG,IAAI,CAAC,YAAY;MACzC,IAAI/C,OAAO,CAACzB,IAAI,IAAI,IAAI,CAAC1B,WAAW,CAACgE,GAAG,CAACb,OAAO,CAACzB,IAAI,CAACqB,MAAM,CAAC,EAAE;QAC7D;MACF;MAEA,IAAI;QACF,MAAM,IAAI,CAACvC,IAAI,CAAC2F,IAAI,CAAChD,OAAO,EAAE,IAAI,CAAC5C,MAAM,CAACkB,QAAQ,CAAC,CAAC,CAAC;QACrDwE,OAAO,CAAC9C,OAAO,CAAC;MAClB,CAAC,CAAC,OAAOiD,KAAK,EAAE;QACd,IAAI,CAACC,MAAM,CAAClD,OAAO,EAAEiD,KAAK,CAAC;MAC7B;IACF,CAAC,CAAC;EACJ;EAEQC,MAAMA,CAAClD,OAAgB,EAAEiD,KAAc,EAAQ;IACrD,MAAMrD,MAAM,GAAGI,OAAO,CAACzB,IAAI,EAAEqB,MAAM,IAAI,IAAI;IAC3C,MAAMhC,QAAQ,GAAG,IAAI,CAACL,MAAM,CAACI,UAAU;IAEvC,IAAIsF,KAAK,YAAYE,mBAAW,IAAIF,KAAK,CAACG,IAAI,KAAK,aAAa,IAAIpD,OAAO,CAACzB,IAAI,EAAE;MAChF,IAAI,CAAC1B,WAAW,CAACoB,GAAG,CAAC+B,OAAO,CAACzB,IAAI,CAACqB,MAAM,CAAC;MACzC,IAAI,CAACtC,IAAI,CAAC+F,MAAM,CAACC,IAAI,CAAC,8BAA8B,EAAE;QAAE1F,QAAQ;QAAEgC;MAAO,CAAC,CAAC;IAC7E,CAAC,MAAM;MACL,IAAI,CAACtC,IAAI,CAAC+F,MAAM,CAACJ,KAAK,CAAC,8BAA8B,EAAE;QAAErF,QAAQ;QAAEgC,MAAM;QAAEwD,IAAI,EAAEH,KAAK,YAAYE,mBAAW,GAAGF,KAAK,CAACG,IAAI,GAAG;MAAK,CAAC,CAAC;IACtI;EACF;EAEQ3D,SAASA,CAAA,EAAS;IACxB8D,aAAa,CAAC,IAAI,CAAChC,KAAK,CAAC;IACzB,IAAI,CAACA,KAAK,GAAGoB,SAAS;EACxB;AACF;AAACa,OAAA,CAAAlH,cAAA,GAAAA,cAAA","ignoreList":[]}
|
|
@@ -12,9 +12,15 @@ const IDLE = {
|
|
|
12
12
|
error: null
|
|
13
13
|
};
|
|
14
14
|
const noUpdates = () => () => undefined;
|
|
15
|
+
|
|
16
|
+
/** A start without a click; a browser opens its chooser only from one. */
|
|
17
|
+
const AUTOMATIC = {
|
|
18
|
+
chooser: false
|
|
19
|
+
};
|
|
15
20
|
/**
|
|
16
21
|
* Scans for the devices the selector names while mounted, unless `auto` is false.
|
|
17
|
-
* In a browser
|
|
22
|
+
* In a browser that scan lists only the devices the site may already use; `start` from a click handler also opens
|
|
23
|
+
* the browser's chooser.
|
|
18
24
|
*/
|
|
19
25
|
const useDiscovery = (selector = {}, {
|
|
20
26
|
auto = true
|
|
@@ -23,18 +29,19 @@ const useDiscovery = (selector = {}, {
|
|
|
23
29
|
const key = JSON.stringify(selector);
|
|
24
30
|
const current = (0, _react.useRef)(null);
|
|
25
31
|
const [discovery, setDiscovery] = (0, _react.useState)(null);
|
|
26
|
-
const
|
|
32
|
+
const discover = (0, _react.useCallback)(options => {
|
|
27
33
|
current.current?.stop();
|
|
28
|
-
current.current = bluetooth.discover(JSON.parse(key));
|
|
34
|
+
current.current = bluetooth.discover(JSON.parse(key), options);
|
|
29
35
|
setDiscovery(current.current);
|
|
30
36
|
}, [bluetooth, key]);
|
|
37
|
+
const start = (0, _react.useCallback)(() => discover(), [discover]);
|
|
31
38
|
const stop = (0, _react.useCallback)(() => current.current?.stop(), []);
|
|
32
39
|
(0, _react.useEffect)(() => {
|
|
33
40
|
if (auto) {
|
|
34
|
-
|
|
41
|
+
discover(AUTOMATIC);
|
|
35
42
|
}
|
|
36
43
|
return () => current.current?.stop();
|
|
37
|
-
}, [auto,
|
|
44
|
+
}, [auto, discover]);
|
|
38
45
|
const snapshot = (0, _react.useSyncExternalStore)(discovery?.subscribe ?? noUpdates, () => discovery?.snapshot() ?? IDLE);
|
|
39
46
|
return {
|
|
40
47
|
...snapshot,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_react","require","_context","IDLE","scanning","found","error","noUpdates","undefined","useDiscovery","selector","auto","bluetooth","useBluetooth","key","JSON","stringify","current","useRef","discovery","setDiscovery","useState","
|
|
1
|
+
{"version":3,"names":["_react","require","_context","IDLE","scanning","found","error","noUpdates","undefined","AUTOMATIC","chooser","useDiscovery","selector","auto","bluetooth","useBluetooth","key","JSON","stringify","current","useRef","discovery","setDiscovery","useState","discover","useCallback","options","stop","parse","start","useEffect","snapshot","useSyncExternalStore","subscribe","exports"],"sourceRoot":"../../../../../../src","sources":["modules/next/bluetooth/react/use-discovery.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AAMA,IAAAC,QAAA,GAAAD,OAAA;AAEA,MAAME,IAAuB,GAAG;EAAEC,QAAQ,EAAE,KAAK;EAAEC,KAAK,EAAE,EAAE;EAAEC,KAAK,EAAE;AAAK,CAAC;AAE3E,MAAMC,SAAS,GAAGA,CAAA,KAAM,MAAMC,SAAS;;AAEvC;AACA,MAAMC,SAA0B,GAAG;EAAEC,OAAO,EAAE;AAAM,CAAC;AAIrD;AACA;AACA;AACA;AACA;AACA,MAAMC,YAAY,GAAGA,CAACC,QAAwB,GAAG,CAAC,CAAC,EAAE;EAAEC,IAAI,GAAG;AAAyB,CAAC,GAAG,CAAC,CAAC,KAAqB;EAChH,MAAMC,SAAS,GAAG,IAAAC,qBAAY,EAAC,CAAC;EAChC,MAAMC,GAAG,GAAGC,IAAI,CAACC,SAAS,CAACN,QAAQ,CAAC;EACpC,MAAMO,OAAO,GAAG,IAAAC,aAAM,EAAmB,IAAI,CAAC;EAC9C,MAAM,CAACC,SAAS,EAAEC,YAAY,CAAC,GAAG,IAAAC,eAAQ,EAAmB,IAAI,CAAC;EAElE,MAAMC,QAAQ,GAAG,IAAAC,kBAAW,EAAEC,OAAyB,IAAK;IAC1DP,OAAO,CAACA,OAAO,EAAEQ,IAAI,CAAC,CAAC;IACvBR,OAAO,CAACA,OAAO,GAAGL,SAAS,CAACU,QAAQ,CAACP,IAAI,CAACW,KAAK,CAACZ,GAAG,CAAC,EAAoBU,OAAO,CAAC;IAChFJ,YAAY,CAACH,OAAO,CAACA,OAAO,CAAC;EAC/B,CAAC,EAAE,CAACL,SAAS,EAAEE,GAAG,CAAC,CAAC;EAEpB,MAAMa,KAAK,GAAG,IAAAJ,kBAAW,EAAC,MAAMD,QAAQ,CAAC,CAAC,EAAE,CAACA,QAAQ,CAAC,CAAC;EAEvD,MAAMG,IAAI,GAAG,IAAAF,kBAAW,EAAC,MAAMN,OAAO,CAACA,OAAO,EAAEQ,IAAI,CAAC,CAAC,EAAE,EAAE,CAAC;EAE3D,IAAAG,gBAAS,EAAC,MAAM;IACd,IAAIjB,IAAI,EAAE;MACRW,QAAQ,CAACf,SAAS,CAAC;IACrB;IAEA,OAAO,MAAMU,OAAO,CAACA,OAAO,EAAEQ,IAAI,CAAC,CAAC;EACtC,CAAC,EAAE,CAACd,IAAI,EAAEW,QAAQ,CAAC,CAAC;EAEpB,MAAMO,QAAQ,GAAG,IAAAC,2BAAoB,EACnCX,SAAS,EAAEY,SAAS,IAAI1B,SAAS,EACjC,MAAMc,SAAS,EAAEU,QAAQ,CAAC,CAAC,IAAI5B,IACjC,CAAC;EAED,OAAO;IAAE,GAAG4B,QAAQ;IAAEF,KAAK;IAAEF;EAAK,CAAC;AACrC,CAAC;AAACO,OAAA,CAAAvB,YAAA,GAAAA,YAAA","ignoreList":[]}
|
|
@@ -9,21 +9,21 @@ import { asDeviceError, DeviceError } from "../core/errors.js";
|
|
|
9
9
|
|
|
10
10
|
const lower = uuid => uuid.toLowerCase();
|
|
11
11
|
const bytesOf = view => new Uint8Array(view.buffer.slice(view.byteOffset, view.byteOffset + view.byteLength));
|
|
12
|
-
const requestOptions = ({
|
|
13
|
-
chooser
|
|
14
|
-
|
|
15
|
-
}) => ({
|
|
16
|
-
...(chooser ? {
|
|
17
|
-
filters: chooser.map(entry => "namePrefix" in entry ? entry : {
|
|
18
|
-
services: entry.services.map(lower)
|
|
19
|
-
})
|
|
20
|
-
} : {
|
|
21
|
-
acceptAllDevices: true
|
|
12
|
+
const requestOptions = (chooser, optionalServices) => ({
|
|
13
|
+
filters: chooser.map(entry => "namePrefix" in entry ? entry : {
|
|
14
|
+
services: entry.services.map(lower)
|
|
22
15
|
}),
|
|
23
16
|
optionalServices: optionalServices.map(lower)
|
|
24
17
|
});
|
|
25
18
|
|
|
26
|
-
/**
|
|
19
|
+
/** Closing the chooser without a pick ends the scan; any other failure fails it. */
|
|
20
|
+
const unlessClosed = error => {
|
|
21
|
+
if (error.name !== "NotFoundError") {
|
|
22
|
+
throw error;
|
|
23
|
+
}
|
|
24
|
+
};
|
|
25
|
+
|
|
26
|
+
/** A granted device has a name and an id, nothing more, until it connects. */
|
|
27
27
|
const advertisementOf = device => ({
|
|
28
28
|
transport: "ble",
|
|
29
29
|
address: device.id,
|
|
@@ -65,12 +65,15 @@ const gattLinkOf = (device, server) => {
|
|
|
65
65
|
};
|
|
66
66
|
};
|
|
67
67
|
|
|
68
|
-
/**
|
|
68
|
+
/**
|
|
69
|
+
* Bluetooth LE in a browser: a scan reports the devices the site may already use, then the device the user picks in
|
|
70
|
+
* the browser's chooser, which shows only the filter's models and opens only when the filter has entries.
|
|
71
|
+
*/
|
|
69
72
|
const webBluetoothCentral = bluetooth => {
|
|
70
|
-
const
|
|
73
|
+
const granted = new Map();
|
|
71
74
|
|
|
72
75
|
/** Keyed as the core spells addresses: a chooser id is case-sensitive, and the core upper-cases what it is given. */
|
|
73
|
-
const deviceFor = async address =>
|
|
76
|
+
const deviceFor = async address => granted.get(address) ?? (await bluetooth?.getDevices?.())?.find(({
|
|
74
77
|
id
|
|
75
78
|
}) => addressKey(id) === address);
|
|
76
79
|
return {
|
|
@@ -86,16 +89,21 @@ const webBluetoothCentral = bluetooth => {
|
|
|
86
89
|
bluetooth.addEventListener("availabilitychanged", onChange);
|
|
87
90
|
return () => bluetooth.removeEventListener("availabilitychanged", onChange);
|
|
88
91
|
},
|
|
89
|
-
scan: (
|
|
92
|
+
scan: ({
|
|
93
|
+
chooser,
|
|
94
|
+
optionalServices
|
|
95
|
+
}, {
|
|
90
96
|
onAdvertisement,
|
|
91
97
|
onError,
|
|
92
98
|
onEnd
|
|
93
99
|
}) => {
|
|
94
|
-
|
|
95
|
-
|
|
100
|
+
const report = device => {
|
|
101
|
+
granted.set(addressKey(device.id), device);
|
|
96
102
|
onAdvertisement(advertisementOf(device));
|
|
97
|
-
|
|
98
|
-
|
|
103
|
+
};
|
|
104
|
+
const remembered = bluetooth?.getDevices?.().then(devices => devices.forEach(report));
|
|
105
|
+
const picked = chooser && bluetooth?.requestDevice(requestOptions(chooser, optionalServices)).then(report, unlessClosed);
|
|
106
|
+
Promise.all([remembered, picked]).then(onEnd, error => onError(asDeviceError(error, "permission")));
|
|
99
107
|
return () => undefined;
|
|
100
108
|
},
|
|
101
109
|
connect: async address => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["addressKey","asDeviceError","DeviceError","lower","uuid","toLowerCase","bytesOf","view","Uint8Array","buffer","slice","byteOffset","byteLength","requestOptions","chooser","optionalServices","filters","map","entry","services","
|
|
1
|
+
{"version":3,"names":["addressKey","asDeviceError","DeviceError","lower","uuid","toLowerCase","bytesOf","view","Uint8Array","buffer","slice","byteOffset","byteLength","requestOptions","chooser","optionalServices","filters","map","entry","services","unlessClosed","error","name","advertisementOf","device","transport","address","id","manufacturerData","Map","serviceData","rssi","takesOnlyWritesWithoutResponse","properties","write","writeWithoutResponse","gattLinkOf","server","characteristic","service","getPrimaryService","getCharacteristic","read","readValue","bytes","target","writeValueWithoutResponse","writeValueWithResponse","subscribe","onValue","listener","value","addEventListener","startNotifications","removeEventListener","stopNotifications","catch","undefined","onDisconnect","close","disconnect","webBluetoothCentral","bluetooth","granted","deviceFor","get","getDevices","find","watchState","onChange","getAvailability","then","available","scan","onAdvertisement","onError","onEnd","report","set","remembered","devices","forEach","picked","requestDevice","Promise","all","connect","gatt"],"sourceRoot":"../../../../../../src","sources":["modules/next/bluetooth/adapters/web-bluetooth-central.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -15,7 +15,7 @@ import { PairedRegistry } from "./paired-registry.js";
|
|
|
15
15
|
import { alwaysForeground, noKeepAlive, silentLogger } from "./ports.js";
|
|
16
16
|
import { ReadingLog } from "./reading-log.js";
|
|
17
17
|
import { RecentAdvertisements } from "./recent-advertisements.js";
|
|
18
|
-
import { scanFilterFor } from "./scan-filter.js";
|
|
18
|
+
import { scanFilterFor, withoutChooser } from "./scan-filter.js";
|
|
19
19
|
const DEFAULT_LOST_AFTER_MS = 10_000;
|
|
20
20
|
|
|
21
21
|
/** The one entry point: the catalog, discovery, pairing, and a handle per paired device. */
|
|
@@ -79,15 +79,18 @@ class Bluetooth {
|
|
|
79
79
|
runnable = model => this.protocols.has(model.protocol) && model.links.some(link => link.data === "ble");
|
|
80
80
|
|
|
81
81
|
/** Scans for the devices the selector names; identifies against the whole catalog, then filters. */
|
|
82
|
-
discover = (selector = {}
|
|
82
|
+
discover = (selector = {}, {
|
|
83
|
+
chooser = true
|
|
84
|
+
} = {}) => {
|
|
83
85
|
const context = {
|
|
84
86
|
catalog: this.catalog,
|
|
85
87
|
paired: address => this.registry.get(address)?.stored(),
|
|
86
88
|
runnable: this.runnable
|
|
87
89
|
};
|
|
90
|
+
const wanted = this.scanFilter(this.catalog.models(selector).filter(this.runnable));
|
|
88
91
|
const discovery = new Discovery({
|
|
89
92
|
central: this.options.central,
|
|
90
|
-
filter:
|
|
93
|
+
filter: chooser ? wanted : withoutChooser(wanted),
|
|
91
94
|
identify: ad => {
|
|
92
95
|
const identification = identify(ad, context);
|
|
93
96
|
return identification && narrow(identification, selector, this.catalog);
|