@potatosalad775/eqcaps-device-bridge 0.2.4 → 0.3.0

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.
Files changed (58) hide show
  1. package/README.md +51 -3
  2. package/dist/browser/index.d.ts +2 -2
  3. package/dist/browser/index.d.ts.map +1 -1
  4. package/dist/browser/index.js +1 -1
  5. package/dist/browser/index.js.map +1 -1
  6. package/dist/browser/web-apis.d.ts +9 -0
  7. package/dist/browser/web-apis.d.ts.map +1 -1
  8. package/dist/browser/web-apis.js.map +1 -1
  9. package/dist/browser/webbluetooth.d.ts.map +1 -1
  10. package/dist/browser/webbluetooth.js +13 -0
  11. package/dist/browser/webbluetooth.js.map +1 -1
  12. package/dist/browser/webhid.d.ts +45 -5
  13. package/dist/browser/webhid.d.ts.map +1 -1
  14. package/dist/browser/webhid.js +114 -9
  15. package/dist/browser/webhid.js.map +1 -1
  16. package/dist/browser/webserial.d.ts.map +1 -1
  17. package/dist/browser/webserial.js +10 -0
  18. package/dist/browser/webserial.js.map +1 -1
  19. package/dist/bytes.d.ts +4 -1
  20. package/dist/bytes.d.ts.map +1 -1
  21. package/dist/bytes.js +11 -2
  22. package/dist/bytes.js.map +1 -1
  23. package/dist/device.d.ts +34 -2
  24. package/dist/device.d.ts.map +1 -1
  25. package/dist/device.js +86 -2
  26. package/dist/device.js.map +1 -1
  27. package/dist/handler.d.ts +23 -1
  28. package/dist/handler.d.ts.map +1 -1
  29. package/dist/handler.js.map +1 -1
  30. package/dist/handlers/fosi-audio-usb-hid.d.ts +10 -0
  31. package/dist/handlers/fosi-audio-usb-hid.d.ts.map +1 -1
  32. package/dist/handlers/fosi-audio-usb-hid.js +169 -29
  33. package/dist/handlers/fosi-audio-usb-hid.js.map +1 -1
  34. package/dist/handlers/ktmicro-usb-hid.d.ts +8 -0
  35. package/dist/handlers/ktmicro-usb-hid.d.ts.map +1 -1
  36. package/dist/handlers/ktmicro-usb-hid.js +39 -28
  37. package/dist/handlers/ktmicro-usb-hid.js.map +1 -1
  38. package/dist/handlers/walkplay-hid.d.ts +25 -0
  39. package/dist/handlers/walkplay-hid.d.ts.map +1 -1
  40. package/dist/handlers/walkplay-hid.js +182 -38
  41. package/dist/handlers/walkplay-hid.js.map +1 -1
  42. package/dist/index.d.ts +3 -3
  43. package/dist/index.d.ts.map +1 -1
  44. package/dist/index.js +1 -1
  45. package/dist/index.js.map +1 -1
  46. package/dist/io.d.ts +6 -2
  47. package/dist/io.d.ts.map +1 -1
  48. package/dist/io.js +20 -4
  49. package/dist/io.js.map +1 -1
  50. package/dist/protocols.d.ts +5 -1
  51. package/dist/protocols.d.ts.map +1 -1
  52. package/dist/protocols.js +133 -6
  53. package/dist/protocols.js.map +1 -1
  54. package/dist/transport.d.ts +12 -0
  55. package/dist/transport.d.ts.map +1 -1
  56. package/dist/transport.js +2 -1
  57. package/dist/transport.js.map +1 -1
  58. package/package.json +2 -2
package/README.md CHANGED
@@ -64,9 +64,25 @@ Serial ports and BLE devices are chosen first and opened once the protocol is kn
64
64
  `open(protocol)`. A Bluetooth serial port shows only its service class, which several devices
65
65
  share: ask the user which device it is.
66
66
 
67
+ A HID device this site was granted can be opened again without the chooser, by vendor id, product
68
+ id and exact product name: `grantedHidDevice(identity)` if it is connected now, null if not. Pass
69
+ several identities for a device that comes back as any of them (the Fosi DS3 changes its USB ids
70
+ with its USB mode).
71
+ `waitForGrantedHidDevice(identity, { timeoutMs })` waits for it, on `navigator.hid`'s `connect`
72
+ event or a `getDevices()` poll, and gives null after the timeout; it never shows the chooser,
73
+ which needs a click. After a push that returns `reconnect: true` (a `disconnectOnSave` device
74
+ restarting to save), pass `ignoreCurrent: true`: the old handle stays listed for a moment and
75
+ fails once the device goes. Some devices keep their HID interface through the restart and only
76
+ drop the audio one (the Tanchjim FOLA on macOS); `reuseAfterMs` takes the old handle back if it
77
+ is still listed by then. `onEvent` reports the browser's connect and disconnect events for the
78
+ device, and whether an old handle went or was reused, for telling these cases apart.
79
+
67
80
  `device.capabilities` says what the protocol can do (`canRead`, `canWrite`, `readsPreamp`,
68
81
  `readsSlot`, `writesPreamp`, `writesSlot`, `needsBandCount`, the filter `types` it has wire codes for, the
69
- `wire` grid it can carry, preset `slots`, `disconnectOnSave`, `experimental`). A push with a
82
+ `wire` grid it can carry, preset `slots`, `disconnectOnSave`, `experimental`, `readsFirmware`,
83
+ `readsEnabled`, and the device `controls` it drives). Where the EQ switch is separate from the
84
+ preset (`readsEnabled`), `eqEnabled()` reads it, and `currentSlot()` gives the preset whether the
85
+ EQ is on or off. A push with a
70
86
  `preamp` or `slot` the protocol can't write is refused, not sent without it, and so is a pull of
71
87
  a `slot` the protocol can't read. Each handler's `codec`
72
88
  turns a push request into frames and back without a device, for checking what a value becomes on
@@ -84,11 +100,11 @@ why a block can't be driven: an unknown handler (data newer than this bridge) or
84
100
  | Handler | Transports | Options |
85
101
  | --- | --- | --- |
86
102
  | `fiio-usb-hid` | HID | `reportId` (default 7), `saveCommand` (default `0x19`; `0x21` on newer models) |
87
- | `walkplay-hid` | HID | `defaultSlot` (slot of a write that names none, default 101) |
103
+ | `walkplay-hid` | HID | `defaultSlot` (slot of a write that names none, default 101), `enableCommand` (default true; false where `[1,1,0,…]` doesn't turn the EQ off, as on the NICEHCK PureAural), `micGainDone` (default false; true follows a mic gain write with `[1,0x04]`, as NICEHCK's app does) |
88
104
  | `moondrop-usb-hid` | HID | – |
89
105
  | `moondrop-old-fashioned-hid` | HID | – |
90
106
  | `conexant-usb-hid` | HID | – |
91
- | `ktmicro-usb-hid` | HID | `baseRegister` (default `0x26`), `bandRegisters` (`[{ "freq", "q" }]` per band, for models that skip or reorder registers), `customSlot` (default 3) |
107
+ | `ktmicro-usb-hid` | HID | `baseRegister` (default `0x26`), `bandRegisters` (`[{ "freq", "q" }]` per band, for models that skip or reorder registers), `customSlot` (default 3), `freqUnit` (Hz per unit of the frequency field, default 1; 2 where the firmware stores half the frequency), `slotRegister` and `preampRegister` (default true; false leaves the slot register 0x24, which also switches the EQ, or the preamp register 0x66 alone), `frameDelay` (ms between the frames of a push, default 0) |
92
108
  | `fosi-audio-usb-hid` | HID | `reportId` (default 1), `bandwidth` (default 0), `defaultSlot` (default 7) |
93
109
  | `qudelix-usb-hid` | HID | – (the report comes from the descriptor) |
94
110
  | `jds-labs-usb-serial` | serial | – |
@@ -109,6 +125,38 @@ refuse a `bypass` preset. Presets marked `"writable": true` (format 1.1) are the
109
125
  write may target; once any preset is marked, the unmarked ones are built-in curves (SPEC §9). The
110
126
  bridge passes the mark on in `capabilities.slots` and doesn't enforce it. A new option goes in `src/protocols.ts` (`OPTIONS`) and this table.
111
127
 
128
+ ## Device controls
129
+
130
+ A profile's `protocol.controls` (format 1.2, SPEC §9.1) lists the device's settings besides the EQ:
131
+ volume, gain, DAC filter, upsampling, USB mode, sound modes, lights. They are opt-in: `pull`,
132
+ `push` and `setEnabled` never touch them.
133
+
134
+ ```ts
135
+ const firmware = await device.firmware(); // "1.5.8", or null; read once
136
+ const values = await device.readControls(); // { uacMode: 0, upsample: 0, gameMode: null, … }
137
+ const off = eqDisabledBy(device.capabilities.controls, values); // from eqcaps-core
138
+ await device.writeControl('volume', 24); // only when the user changed it
139
+ ```
140
+
141
+ `capabilities.controls` holds the profile's controls this bridge drives. `readControls()` gives
142
+ null for a control the device doesn't have now: its `firmware` range doesn't hold (unknown firmware
143
+ counts as outside it), or the control its `when` names holds another value. `writeControl` refuses
144
+ a value the control doesn't take (`invalid-request`) and a control the device doesn't have now
145
+ (`unsupported`), then reads the value back (`rejected` if it didn't take). For a control marked
146
+ `reconnect` it skips the read-back and returns `{ reconnect: true }`: the device may drop the
147
+ connection or come back as another USB device, so match it again. `firmware()` also lets an app
148
+ pick between profiles that only the firmware tells apart: match without it, open the device with
149
+ the protocol they share, read the firmware, and match again.
150
+
151
+ Control ids are each handler's vocabulary. `protocolProblem` refuses a control the handler doesn't
152
+ drive, or a kind or role this bridge doesn't know; `protocolOf` leaves such a control out (or just
153
+ its role), so data newer than the bridge still drives the rest.
154
+
155
+ | Handler | Controls |
156
+ | --- | --- |
157
+ | `fosi-audio-usb-hid` | `volume`, `gainMode`, `filterMode`, `gameMode`, `upsample`, `uacMode`, `led` (one byte each, the device's own values) |
158
+ | `walkplay-hid` | `dacFilter`, `gainLevel`, `workMode`, `volume` (one byte each); `micGain`, `leftGain`, `rightGain` (dB, on a 1/256 grid). From NICEHCK's and Walkplay's web apps; `firmware()` too |
159
+
112
160
  Errors are `BridgeError`s with a `code`: `unsupported-type`, `unrepresentable`, `unsupported`,
113
161
  `timeout`, `bad-response`, `rejected`, `transport` or `invalid-request`.
114
162
 
@@ -1,5 +1,5 @@
1
- export { grantedHidDevice, hidCollections, hidTransport, requestHidDevice } from './webhid.ts';
2
- export type { RequestHidOptions } from './webhid.ts';
1
+ export { grantedHidDevice, hidCollections, hidTransport, requestHidDevice, waitForGrantedHidDevice } from './webhid.ts';
2
+ export type { HidIdentity, RequestHidOptions, WaitForHidOptions } from './webhid.ts';
3
3
  export { baudRateFor, requestSerialPort, serialTransport } from './webserial.ts';
4
4
  export type { RequestSerialOptions, SerialPortChoice } from './webserial.ts';
5
5
  export { bleTransport, requestBleDevice } from './webbluetooth.ts';
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/browser/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/F,YAAY,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjF,YAAY,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAC7E,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACnE,YAAY,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACtE,YAAY,EACX,mBAAmB,EACnB,aAAa,EACb,aAAa,EACb,OAAO,EACP,UAAU,EACV,cAAc,EACd,MAAM,eAAe,CAAC;AAIvB,6CAA6C;AAC7C,wBAAgB,UAAU,IAAI;IAAE,GAAG,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,OAAO,CAAC;IAAC,SAAS,EAAE,OAAO,CAAA;CAAE,CAGlF"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/browser/index.ts"],"names":[],"mappings":"AAGA,OAAO,EACN,gBAAgB,EAChB,cAAc,EACd,YAAY,EACZ,gBAAgB,EAChB,uBAAuB,EACvB,MAAM,aAAa,CAAC;AACrB,YAAY,EAAE,WAAW,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACrF,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjF,YAAY,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAC7E,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACnE,YAAY,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACtE,YAAY,EACX,mBAAmB,EACnB,aAAa,EACb,aAAa,EACb,OAAO,EACP,UAAU,EACV,cAAc,EACd,MAAM,eAAe,CAAC;AAIvB,6CAA6C;AAC7C,wBAAgB,UAAU,IAAI;IAAE,GAAG,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,OAAO,CAAC;IAAC,SAAS,EAAE,OAAO,CAAA;CAAE,CAGlF"}
@@ -1,6 +1,6 @@
1
1
  // Browser transports for @potatosalad775/eqcaps-device-bridge: WebHID, Web Serial and Web
2
2
  // Bluetooth. Device APIs need Chromium over HTTPS; check `deviceApis()` before offering them.
3
- export { grantedHidDevice, hidCollections, hidTransport, requestHidDevice } from "./webhid.js";
3
+ export { grantedHidDevice, hidCollections, hidTransport, requestHidDevice, waitForGrantedHidDevice } from "./webhid.js";
4
4
  export { baudRateFor, requestSerialPort, serialTransport } from "./webserial.js";
5
5
  export { bleTransport, requestBleDevice } from "./webbluetooth.js";
6
6
  import { browserApis } from "./web-apis.js";
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/browser/index.ts"],"names":[],"mappings":"AAAA,0FAA0F;AAC1F,8FAA8F;AAE9F,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAE/F,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEjF,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAWnE,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,6CAA6C;AAC7C,MAAM,UAAU,UAAU;IACzB,MAAM,IAAI,GAAG,WAAW,EAAE,CAAC;IAC3B,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;AAChF,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/browser/index.ts"],"names":[],"mappings":"AAAA,0FAA0F;AAC1F,8FAA8F;AAE9F,OAAO,EACN,gBAAgB,EAChB,cAAc,EACd,YAAY,EACZ,gBAAgB,EAChB,uBAAuB,EACvB,MAAM,aAAa,CAAC;AAErB,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEjF,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAWnE,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,6CAA6C;AAC7C,MAAM,UAAU,UAAU;IACzB,MAAM,IAAI,GAAG,WAAW,EAAE,CAAC;IAC3B,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;AAChF,CAAC"}
@@ -46,6 +46,11 @@ export interface HidLike {
46
46
  }[];
47
47
  }): Promise<HidDeviceLike[]>;
48
48
  getDevices(): Promise<HidDeviceLike[]>;
49
+ addEventListener?(type: 'connect' | 'disconnect', listener: (event: HidConnectionEventLike) => void): void;
50
+ removeEventListener?(type: 'connect' | 'disconnect', listener: (event: HidConnectionEventLike) => void): void;
51
+ }
52
+ export interface HidConnectionEventLike {
53
+ readonly device: HidDeviceLike;
49
54
  }
50
55
  export interface ReadableStreamReaderLike {
51
56
  read(): Promise<{
@@ -75,6 +80,8 @@ export interface SerialPortLike {
75
80
  readonly writable: {
76
81
  getWriter(): WritableStreamWriterLike;
77
82
  } | null;
83
+ addEventListener?(type: 'disconnect', listener: () => void): void;
84
+ removeEventListener?(type: 'disconnect', listener: () => void): void;
78
85
  }
79
86
  export interface SerialLike {
80
87
  requestPort(options?: {
@@ -110,6 +117,8 @@ export interface BluetoothDeviceLike {
110
117
  }>;
111
118
  disconnect(): void;
112
119
  };
120
+ addEventListener?(type: 'gattserverdisconnected', listener: () => void): void;
121
+ removeEventListener?(type: 'gattserverdisconnected', listener: () => void): void;
113
122
  }
114
123
  export interface BluetoothLike {
115
124
  requestDevice(options: {
@@ -1 +1 @@
1
- {"version":3,"file":"web-apis.d.ts","sourceRoot":"","sources":["../../src/browser/web-apis.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"web-apis.d.ts","sourceRoot":"","sources":["../../src/browser/web-apis.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,iBAAiB;IACjC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,iBAAiB;IACjC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,SAAS,iBAAiB,EAAE,CAAC;CACrC;AAED,MAAM,WAAW,qBAAqB;IACrC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,SAAS,iBAAiB,EAAE,CAAC;IAC5C,aAAa,CAAC,EAAE,SAAS,iBAAiB,EAAE,CAAC;IAC7C,cAAc,CAAC,EAAE,SAAS,iBAAiB,EAAE,CAAC;IAC9C,QAAQ,CAAC,EAAE,SAAS,qBAAqB,EAAE,CAAC;CAC5C;AAED,MAAM,WAAW,uBAAuB;IACvC,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,YAAY,CAAC;CACnB;AAED,MAAM,WAAW,YAAY;IAC5B,QAAQ,CAAC,MAAM,EAAE,eAAe,CAAC;IACjC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC5B;AAED,MAAM,WAAW,aAAa;IAC7B,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,WAAW,EAAE,SAAS,qBAAqB,EAAE,CAAC;IACvD,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACtB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9D,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACrE,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;IAC9D,gBAAgB,CAAC,IAAI,EAAE,aAAa,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,uBAAuB,KAAK,IAAI,GAAG,IAAI,CAAC;IAChG,mBAAmB,CAClB,IAAI,EAAE,aAAa,EACnB,QAAQ,EAAE,CAAC,KAAK,EAAE,uBAAuB,KAAK,IAAI,GAChD,IAAI,CAAC;CACR;AAED,MAAM,WAAW,OAAO;IACvB,aAAa,CAAC,OAAO,EAAE;QACtB,OAAO,EAAE;YAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;YAAC,SAAS,CAAC,EAAE,MAAM,CAAC;YAAC,SAAS,CAAC,EAAE,MAAM,CAAA;SAAE,EAAE,CAAC;KACzE,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC,CAAC;IAC7B,UAAU,IAAI,OAAO,CAAC,aAAa,EAAE,CAAC,CAAC;IAEvC,gBAAgB,CAAC,CAChB,IAAI,EAAE,SAAS,GAAG,YAAY,EAC9B,QAAQ,EAAE,CAAC,KAAK,EAAE,sBAAsB,KAAK,IAAI,GAC/C,IAAI,CAAC;IACR,mBAAmB,CAAC,CACnB,IAAI,EAAE,SAAS,GAAG,YAAY,EAC9B,QAAQ,EAAE,CAAC,KAAK,EAAE,sBAAsB,KAAK,IAAI,GAC/C,IAAI,CAAC;CACR;AAED,MAAM,WAAW,sBAAsB;IACtC,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAC;CAC/B;AAED,MAAM,WAAW,wBAAwB;IACxC,IAAI,IAAI,OAAO,CAAC;QAAE,KAAK,CAAC,EAAE,UAAU,CAAC;QAAC,IAAI,EAAE,OAAO,CAAA;KAAE,CAAC,CAAC;IACvD,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACxB,WAAW,IAAI,IAAI,CAAC;CACpB;AAED,MAAM,WAAW,wBAAwB;IACxC,KAAK,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACvC,WAAW,IAAI,IAAI,CAAC;CACpB;AAED,MAAM,WAAW,cAAc;IAC9B,OAAO,IAAI;QAAE,WAAW,CAAC,EAAE,MAAM,CAAC;QAAC,YAAY,CAAC,EAAE,MAAM,CAAC;QAAC,uBAAuB,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAC7F,IAAI,CAAC,OAAO,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACnD,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,QAAQ,CAAC,QAAQ,EAAE;QAAE,SAAS,IAAI,wBAAwB,CAAA;KAAE,GAAG,IAAI,CAAC;IACpE,QAAQ,CAAC,QAAQ,EAAE;QAAE,SAAS,IAAI,wBAAwB,CAAA;KAAE,GAAG,IAAI,CAAC;IAEpE,gBAAgB,CAAC,CAAC,IAAI,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,IAAI,GAAG,IAAI,CAAC;IAClE,mBAAmB,CAAC,CAAC,IAAI,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,IAAI,GAAG,IAAI,CAAC;CACrE;AAED,MAAM,WAAW,UAAU;IAC1B,WAAW,CAAC,OAAO,CAAC,EAAE;QACrB,OAAO,CAAC,EAAE;YAAE,WAAW,CAAC,EAAE,MAAM,CAAC;YAAC,uBAAuB,CAAC,EAAE,MAAM,CAAA;SAAE,EAAE,CAAC;QACvE,+BAA+B,CAAC,EAAE,MAAM,EAAE,CAAC;KAC3C,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;CAC5B;AAED,MAAM,WAAW,sBAAsB;IACtC,QAAQ,CAAC,UAAU,EAAE;QAAE,KAAK,CAAC,EAAE,OAAO,CAAC;QAAC,oBAAoB,CAAC,EAAE,OAAO,CAAA;KAAE,CAAC;IACzE,QAAQ,CAAC,KAAK,CAAC,EAAE,YAAY,GAAG,IAAI,CAAC;IACrC,sBAAsB,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACxD,yBAAyB,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3D,kBAAkB,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IACvC,iBAAiB,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IACvC,gBAAgB,CACf,IAAI,EAAE,4BAA4B,EAClC,QAAQ,EAAE,CAAC,KAAK,EAAE;QAAE,MAAM,EAAE,OAAO,CAAA;KAAE,KAAK,IAAI,GAC5C,IAAI,CAAC;CACR;AAED,MAAM,WAAW,mBAAmB;IACnC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,IAAI,CAAC,EAAE;QACf,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;QAC5B,OAAO,IAAI,OAAO,CAAC;YAClB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;gBACxC,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAAC;aACjE,CAAC,CAAC;SACH,CAAC,CAAC;QACH,UAAU,IAAI,IAAI,CAAC;KACnB,CAAC;IACF,gBAAgB,CAAC,CAAC,IAAI,EAAE,wBAAwB,EAAE,QAAQ,EAAE,MAAM,IAAI,GAAG,IAAI,CAAC;IAC9E,mBAAmB,CAAC,CAAC,IAAI,EAAE,wBAAwB,EAAE,QAAQ,EAAE,MAAM,IAAI,GAAG,IAAI,CAAC;CACjF;AAED,MAAM,WAAW,aAAa;IAC7B,aAAa,CAAC,OAAO,EAAE;QACtB,OAAO,CAAC,EAAE;YAAE,IAAI,CAAC,EAAE,MAAM,CAAC;YAAC,UAAU,CAAC,EAAE,MAAM,CAAC;YAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;SAAE,EAAE,CAAC;QACxE,gBAAgB,CAAC,EAAE,OAAO,CAAC;QAC3B,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;KAC5B,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;CACjC;AAED,UAAU,SAAS;IAClB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,MAAM,CAAC,EAAE,UAAU,CAAC;IACpB,SAAS,CAAC,EAAE,aAAa,CAAC;CAC1B;AAED,gDAAgD;AAChD,wBAAgB,WAAW,IAAI,SAAS,CAEvC;AAED,eAAO,MAAM,OAAO,GAAI,MAAM,YAAY,4BAC4B,CAAC;AAEvE,mGAAmG;AACnG,eAAO,MAAM,QAAQ,GAAI,OAAO,OAAO,YAGe,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"web-apis.js","sourceRoot":"","sources":["../../src/browser/web-apis.ts"],"names":[],"mappings":"AAAA,yFAAyF;AACzF,iGAAiG;AACjG,2CAA2C;AA2H3C,gDAAgD;AAChD,MAAM,UAAU,WAAW;IAC1B,OAAO,CAAE,UAAwC,CAAC,SAAS,IAAI,EAAE,CAAc,CAAC;AACjF,CAAC;AAED,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,IAAkB,EAAE,EAAE,CAC7C,IAAI,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,KAAK,EAAE,CAAC;AAEvE,mGAAmG;AACnG,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,KAAc,EAAE,EAAE,CAC1C,OAAO,KAAK,KAAK,QAAQ;IACzB,KAAK,KAAK,IAAI;IACb,KAA2B,CAAC,IAAI,KAAK,eAAe,CAAC"}
1
+ {"version":3,"file":"web-apis.js","sourceRoot":"","sources":["../../src/browser/web-apis.ts"],"names":[],"mappings":"AAAA,yFAAyF;AACzF,iGAAiG;AACjG,2CAA2C;AA6I3C,gDAAgD;AAChD,MAAM,UAAU,WAAW;IAC1B,OAAO,CAAE,UAAwC,CAAC,SAAS,IAAI,EAAE,CAAc,CAAC;AACjF,CAAC;AAED,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,IAAkB,EAAE,EAAE,CAC7C,IAAI,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,KAAK,EAAE,CAAC;AAEvE,mGAAmG;AACnG,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,KAAc,EAAE,EAAE,CAC1C,OAAO,KAAK,KAAK,QAAQ;IACzB,KAAK,KAAK,IAAI;IACb,KAA2B,CAAC,IAAI,KAAK,eAAe,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"webbluetooth.d.ts","sourceRoot":"","sources":["../../src/browser/webbluetooth.ts"],"names":[],"mappings":"AACA,OAAO,EAAkB,KAAK,YAAY,EAAE,MAAM,eAAe,CAAC;AAGlE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAEvD,OAAO,EAIN,KAAK,mBAAmB,EACxB,KAAK,aAAa,EAGlB,MAAM,eAAe,CAAC;AAEvB;;;GAGG;AACH,wBAAsB,YAAY,CACjC,MAAM,EAAE,mBAAmB,EAC3B,IAAI,EAAE;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAA;CAAE,GAC/C,OAAO,CAAC,eAAe,CAAC,CAqC1B;AAED,MAAM,WAAW,iBAAiB;IACjC,iGAAiG;IACjG,OAAO,CAAC,EAAE,QAAQ,CAAC,YAAY,CAAC,CAAC;IACjC,sCAAsC;IACtC,SAAS,CAAC,EAAE,aAAa,CAAC;CAC1B;AAED,uFAAuF;AACvF,MAAM,WAAW,SAAS;IACzB,2DAA2D;IAC3D,QAAQ,EAAE,cAAc,CAAC;IACzB,6DAA6D;IAC7D,IAAI,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;CACnD;AAED,yEAAyE;AACzE,wBAAsB,gBAAgB,CAAC,OAAO,GAAE,iBAAsB,GAAG,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CA2BjG"}
1
+ {"version":3,"file":"webbluetooth.d.ts","sourceRoot":"","sources":["../../src/browser/webbluetooth.ts"],"names":[],"mappings":"AACA,OAAO,EAAkB,KAAK,YAAY,EAAE,MAAM,eAAe,CAAC;AAGlE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAEvD,OAAO,EAIN,KAAK,mBAAmB,EACxB,KAAK,aAAa,EAGlB,MAAM,eAAe,CAAC;AAEvB;;;GAGG;AACH,wBAAsB,YAAY,CACjC,MAAM,EAAE,mBAAmB,EAC3B,IAAI,EAAE;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAA;CAAE,GAC/C,OAAO,CAAC,eAAe,CAAC,CAiD1B;AAED,MAAM,WAAW,iBAAiB;IACjC,iGAAiG;IACjG,OAAO,CAAC,EAAE,QAAQ,CAAC,YAAY,CAAC,CAAC;IACjC,sCAAsC;IACtC,SAAS,CAAC,EAAE,aAAa,CAAC;CAC1B;AAED,uFAAuF;AACvF,MAAM,WAAW,SAAS;IACzB,2DAA2D;IAC3D,QAAQ,EAAE,cAAc,CAAC;IACzB,6DAA6D;IAC7D,IAAI,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;CACnD;AAED,yEAAyE;AACzE,wBAAsB,gBAAgB,CAAC,OAAO,GAAE,iBAAsB,GAAG,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CA2BjG"}
@@ -29,6 +29,8 @@ export async function bleTransport(device, gatt) {
29
29
  queue.push(bytesOf(value));
30
30
  });
31
31
  const withResponse = !!tx.properties.write && !tx.properties.writeWithoutResponse;
32
+ // `close()` disconnects GATT itself, which fires `gattserverdisconnected` too.
33
+ let closing = false;
32
34
  const transport = {
33
35
  kind: 'ble',
34
36
  async write(data) {
@@ -40,7 +42,18 @@ export async function bleTransport(device, gatt) {
40
42
  }
41
43
  },
42
44
  read: (timeoutMs) => queue.read(timeoutMs),
45
+ onDisconnect(listener) {
46
+ const handler = () => {
47
+ off();
48
+ if (!closing)
49
+ listener();
50
+ };
51
+ const off = () => device.removeEventListener?.('gattserverdisconnected', handler);
52
+ device.addEventListener?.('gattserverdisconnected', handler);
53
+ return off;
54
+ },
43
55
  async close() {
56
+ closing = true;
44
57
  queue.fail(new Error('closed'));
45
58
  device.gatt?.disconnect();
46
59
  }
@@ -1 +1 @@
1
- {"version":3,"file":"webbluetooth.js","sourceRoot":"","sources":["../../src/browser/webbluetooth.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"webbluetooth.js","sourceRoot":"","sources":["../../src/browser/webbluetooth.ts"],"names":[],"mappings":"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"}
@@ -3,8 +3,11 @@ import type { HidCollectionInfo, HidTransport } from '../transport.ts';
3
3
  import { type HidCollectionInfoLike, type HidDeviceLike, type HidLike } from './web-apis.ts';
4
4
  /** The descriptor's collections in the bridge's shape (also the T1 descriptor dump). */
5
5
  export declare function hidCollections(collections: readonly HidCollectionInfoLike[]): HidCollectionInfo[];
6
- /** Wraps a WebHID device (opened if it isn't) as a bridge transport. */
7
- export declare function hidTransport(device: HidDeviceLike): Promise<HidTransport>;
6
+ /**
7
+ * Wraps a WebHID device (opened if it isn't) as a bridge transport. `hid` reports it going: the
8
+ * browser fires `disconnect` there, with the same device object, not on the device.
9
+ */
10
+ export declare function hidTransport(device: HidDeviceLike, hid?: HidLike | undefined): Promise<HidTransport>;
8
11
  export interface RequestHidOptions {
9
12
  /** Database entries whose devices to offer, on top of the vendors `guessProtocol` knows. */
10
13
  entries?: Iterable<ChooserEntry>;
@@ -23,11 +26,48 @@ export declare function requestHidDevice(options?: RequestHidOptions): Promise<H
23
26
  /**
24
27
  * A device this site was already granted, found again without the chooser: after it was unplugged
25
28
  * and plugged back in, say, or moved to a phone and back. Matches vendor id, product id and the
26
- * exact product name, preferring the vendor-defined interface; null if it isn't connected.
29
+ * exact product name, preferring the vendor-defined interface; null if it isn't connected. Several
30
+ * identities are for a device that can come back as any of them (the Fosi DS3 has one per USB
31
+ * mode); a device granted under one of them is found.
27
32
  */
28
- export declare function grantedHidDevice(identity: {
33
+ export declare function grantedHidDevice(identity: HidIdentity | readonly HidIdentity[], hid?: HidLike | undefined): Promise<HidTransport | null>;
34
+ /** What a granted device is found again by. */
35
+ export interface HidIdentity {
29
36
  vendorId: number;
30
37
  productId: number;
31
38
  productName: string;
32
- }, hid?: HidLike | undefined): Promise<HidTransport | null>;
39
+ }
40
+ export interface WaitForHidOptions {
41
+ /** How long to wait before giving up with null, ms. */
42
+ timeoutMs: number;
43
+ /** How often `getDevices()` is asked meanwhile, ms (default 250). */
44
+ pollMs?: number;
45
+ /**
46
+ * Skip the matching devices granted at the call: for a device about to re-enumerate (one that
47
+ * restarts to save), whose old handle stays listed for a moment and fails once it goes.
48
+ */
49
+ ignoreCurrent?: boolean;
50
+ /**
51
+ * With `ignoreCurrent`: a skipped handle still listed this long after the call, never having
52
+ * gone, is taken after all. Some devices keep their HID interface through the restart and only
53
+ * drop the audio one (the Tanchjim FOLA on macOS): their old handle is the device back.
54
+ */
55
+ reuseAfterMs?: number;
56
+ /**
57
+ * Called on `navigator.hid`'s connect and disconnect events for a matching device, with `gone`
58
+ * when a poll first misses a skipped one, and with `reused` when a skipped handle that never went
59
+ * is taken (`reuseAfterMs`). For diagnostics: whether the browser reports the device leaving and
60
+ * coming back, and when.
61
+ */
62
+ onEvent?: (event: 'connect' | 'disconnect' | 'gone' | 'reused') => void;
63
+ /** Default: `navigator.hid`. */
64
+ hid?: HidLike;
65
+ }
66
+ /**
67
+ * Waits for a device this site was granted to be connected, as `grantedHidDevice` finds it: on
68
+ * the browser's `connect` event or a `getDevices()` poll, whichever comes first. Null after
69
+ * `timeoutMs`, which is also what a device whose grant the browser dropped comes to: this never
70
+ * shows the chooser (that needs a click).
71
+ */
72
+ export declare function waitForGrantedHidDevice(identity: HidIdentity | readonly HidIdentity[], options: WaitForHidOptions): Promise<HidTransport | null>;
33
73
  //# sourceMappingURL=webhid.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"webhid.d.ts","sourceRoot":"","sources":["../../src/browser/webhid.ts"],"names":[],"mappings":"AACA,OAAO,EAAkB,KAAK,YAAY,EAAE,MAAM,eAAe,CAAC;AAClE,OAAO,KAAK,EAAE,iBAAiB,EAAiB,YAAY,EAAE,MAAM,iBAAiB,CAAC;AACtF,OAAO,EAGN,KAAK,qBAAqB,EAC1B,KAAK,aAAa,EAElB,KAAK,OAAO,EAEZ,MAAM,eAAe,CAAC;AAYvB,wFAAwF;AACxF,wBAAgB,cAAc,CAAC,WAAW,EAAE,SAAS,qBAAqB,EAAE,GAAG,iBAAiB,EAAE,CASjG;AAMD,wEAAwE;AACxE,wBAAsB,YAAY,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,YAAY,CAAC,CAoB/E;AAKD,MAAM,WAAW,iBAAiB;IACjC,4FAA4F;IAC5F,OAAO,CAAC,EAAE,QAAQ,CAAC,YAAY,CAAC,CAAC;IACjC,8EAA8E;IAC9E,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,gCAAgC;IAChC,GAAG,CAAC,EAAE,OAAO,CAAC;CACd;AAED;;;;;GAKG;AACH,wBAAsB,gBAAgB,CACrC,OAAO,GAAE,iBAAsB,GAC7B,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,CAqB9B;AAED;;;;GAIG;AACH,wBAAsB,gBAAgB,CACrC,QAAQ,EAAE;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,EACtE,GAAG,GAAE,OAAO,GAAG,SAA6B,GAC1C,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,CAW9B"}
1
+ {"version":3,"file":"webhid.d.ts","sourceRoot":"","sources":["../../src/browser/webhid.ts"],"names":[],"mappings":"AACA,OAAO,EAAkB,KAAK,YAAY,EAAE,MAAM,eAAe,CAAC;AAElE,OAAO,KAAK,EAAE,iBAAiB,EAAiB,YAAY,EAAE,MAAM,iBAAiB,CAAC;AACtF,OAAO,EAGN,KAAK,qBAAqB,EAE1B,KAAK,aAAa,EAElB,KAAK,OAAO,EAEZ,MAAM,eAAe,CAAC;AAYvB,wFAAwF;AACxF,wBAAgB,cAAc,CAAC,WAAW,EAAE,SAAS,qBAAqB,EAAE,GAAG,iBAAiB,EAAE,CASjG;AAMD;;;GAGG;AACH,wBAAsB,YAAY,CACjC,MAAM,EAAE,aAAa,EACrB,GAAG,GAAE,OAAO,GAAG,SAA6B,GAC1C,OAAO,CAAC,YAAY,CAAC,CA8BvB;AAKD,MAAM,WAAW,iBAAiB;IACjC,4FAA4F;IAC5F,OAAO,CAAC,EAAE,QAAQ,CAAC,YAAY,CAAC,CAAC;IACjC,8EAA8E;IAC9E,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,gCAAgC;IAChC,GAAG,CAAC,EAAE,OAAO,CAAC;CACd;AAED;;;;;GAKG;AACH,wBAAsB,gBAAgB,CACrC,OAAO,GAAE,iBAAsB,GAC7B,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,CAqB9B;AAED;;;;;;GAMG;AACH,wBAAsB,gBAAgB,CACrC,QAAQ,EAAE,WAAW,GAAG,SAAS,WAAW,EAAE,EAC9C,GAAG,GAAE,OAAO,GAAG,SAA6B,GAC1C,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,CAK9B;AAED,+CAA+C;AAC/C,MAAM,WAAW,WAAW;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;CACpB;AAgBD,MAAM,WAAW,iBAAiB;IACjC,uDAAuD;IACvD,SAAS,EAAE,MAAM,CAAC;IAClB,qEAAqE;IACrE,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;OAGG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB;;;;OAIG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;;;;OAKG;IACH,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,SAAS,GAAG,YAAY,GAAG,MAAM,GAAG,QAAQ,KAAK,IAAI,CAAC;IACxE,gCAAgC;IAChC,GAAG,CAAC,EAAE,OAAO,CAAC;CACd;AAED;;;;;GAKG;AACH,wBAAsB,uBAAuB,CAC5C,QAAQ,EAAE,WAAW,GAAG,SAAS,WAAW,EAAE,EAC9C,OAAO,EAAE,iBAAiB,GACxB,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,CAyE9B"}
@@ -1,5 +1,6 @@
1
1
  import { BridgeError } from "../errors.js";
2
2
  import { chooserFilters } from "../chooser.js";
3
+ import { after } from "../platform.js";
3
4
  import { browserApis, bytesOf } from "./web-apis.js";
4
5
  function reportInfo(r) {
5
6
  const bits = (r.items ?? []).reduce((sum, item) => sum + (item.reportSize ?? 0) * (item.reportCount ?? 0), 0);
@@ -22,8 +23,11 @@ export function hidCollections(collections) {
22
23
  const transportError = (what) => (cause) => {
23
24
  throw new BridgeError('transport', `WebHID: ${what} failed`, { cause });
24
25
  };
25
- /** Wraps a WebHID device (opened if it isn't) as a bridge transport. */
26
- export async function hidTransport(device) {
26
+ /**
27
+ * Wraps a WebHID device (opened if it isn't) as a bridge transport. `hid` reports it going: the
28
+ * browser fires `disconnect` there, with the same device object, not on the device.
29
+ */
30
+ export async function hidTransport(device, hid = browserApis().hid) {
27
31
  if (!device.opened)
28
32
  await device.open().catch(transportError('open'));
29
33
  return {
@@ -40,6 +44,17 @@ export async function hidTransport(device) {
40
44
  device.addEventListener('inputreport', handler);
41
45
  return () => device.removeEventListener('inputreport', handler);
42
46
  },
47
+ onDisconnect(listener) {
48
+ const handler = ({ device: d }) => {
49
+ if (d !== device)
50
+ return;
51
+ off();
52
+ listener();
53
+ };
54
+ const off = () => hid?.removeEventListener?.('disconnect', handler);
55
+ hid?.addEventListener?.('disconnect', handler);
56
+ return off;
57
+ },
43
58
  close: () => device.close().catch(transportError('close'))
44
59
  };
45
60
  }
@@ -70,21 +85,111 @@ export async function requestHidDevice(options = {}) {
70
85
  if (sibling)
71
86
  device = sibling;
72
87
  }
73
- return hidTransport(device);
88
+ return hidTransport(device, hid);
74
89
  }
75
90
  /**
76
91
  * A device this site was already granted, found again without the chooser: after it was unplugged
77
92
  * and plugged back in, say, or moved to a phone and back. Matches vendor id, product id and the
78
- * exact product name, preferring the vendor-defined interface; null if it isn't connected.
93
+ * exact product name, preferring the vendor-defined interface; null if it isn't connected. Several
94
+ * identities are for a device that can come back as any of them (the Fosi DS3 has one per USB
95
+ * mode); a device granted under one of them is found.
79
96
  */
80
97
  export async function grantedHidDevice(identity, hid = browserApis().hid) {
81
98
  if (!hid)
82
99
  throw new BridgeError('unsupported', 'WebHID is not available in this browser');
83
100
  const granted = await hid.getDevices().catch(transportError('getDevices'));
84
- const same = granted.filter((d) => d.vendorId === identity.vendorId &&
85
- d.productId === identity.productId &&
86
- d.productName === identity.productName);
87
- const device = same.find(hasVendorCollection) ?? same[0];
88
- return device ? hidTransport(device) : null;
101
+ const device = pickGranted(granted, identity);
102
+ return device ? hidTransport(device, hid) : null;
103
+ }
104
+ const isSame = (d, identity) => (Array.isArray(identity) ? identity : [identity]).some((i) => d.vendorId === i.vendorId && d.productId === i.productId && d.productName === i.productName);
105
+ function pickGranted(granted, identity) {
106
+ const same = granted.filter((d) => isSame(d, identity));
107
+ return same.find(hasVendorCollection) ?? same[0];
108
+ }
109
+ /**
110
+ * Waits for a device this site was granted to be connected, as `grantedHidDevice` finds it: on
111
+ * the browser's `connect` event or a `getDevices()` poll, whichever comes first. Null after
112
+ * `timeoutMs`, which is also what a device whose grant the browser dropped comes to: this never
113
+ * shows the chooser (that needs a click).
114
+ */
115
+ export async function waitForGrantedHidDevice(identity, options) {
116
+ const hid = options.hid ?? browserApis().hid;
117
+ if (!hid)
118
+ throw new BridgeError('unsupported', 'WebHID is not available in this browser');
119
+ const stale = new Set(options.ignoreCurrent
120
+ ? (await hid.getDevices().catch(() => [])).filter((d) => isSame(d, identity))
121
+ : []);
122
+ const device = await new Promise((resolve) => {
123
+ let settled = false;
124
+ let checking = false;
125
+ let gone = stale.size === 0;
126
+ let reuse = false;
127
+ let cancelPoll = () => { };
128
+ const finish = (d) => {
129
+ if (settled)
130
+ return;
131
+ settled = true;
132
+ cancelTimeout();
133
+ cancelReuse();
134
+ cancelPoll();
135
+ hid.removeEventListener?.('connect', onConnect);
136
+ hid.removeEventListener?.('disconnect', onDisconnect);
137
+ resolve(d);
138
+ };
139
+ const check = async () => {
140
+ if (settled || checking)
141
+ return;
142
+ checking = true;
143
+ try {
144
+ const granted = await hid.getDevices().catch(() => []);
145
+ if (!gone && !granted.some((d) => stale.has(d))) {
146
+ gone = true;
147
+ options.onEvent?.('gone');
148
+ }
149
+ // Once the old handles have gone, one coming back is the device back.
150
+ const usable = gone || reuse ? granted : granted.filter((d) => !stale.has(d));
151
+ const found = pickGranted(usable, identity);
152
+ if (!found)
153
+ return;
154
+ if (!gone && stale.has(found))
155
+ options.onEvent?.('reused');
156
+ finish(found);
157
+ }
158
+ finally {
159
+ checking = false;
160
+ }
161
+ };
162
+ const onConnect = ({ device: d }) => {
163
+ if (!isSame(d, identity))
164
+ return;
165
+ options.onEvent?.('connect');
166
+ if (stale.has(d))
167
+ gone = true;
168
+ // Through `getDevices()`, so a device with several interfaces still gets the vendor one.
169
+ void check();
170
+ };
171
+ const onDisconnect = ({ device: d }) => {
172
+ if (isSame(d, identity))
173
+ options.onEvent?.('disconnect');
174
+ };
175
+ hid.addEventListener?.('connect', onConnect);
176
+ hid.addEventListener?.('disconnect', onDisconnect);
177
+ const cancelTimeout = after(options.timeoutMs, () => finish(null));
178
+ const cancelReuse = options.reuseAfterMs !== undefined && stale.size > 0
179
+ ? after(options.reuseAfterMs, () => {
180
+ reuse = true;
181
+ void check();
182
+ })
183
+ : () => { };
184
+ const poll = () => {
185
+ cancelPoll = after(options.pollMs ?? 250, () => {
186
+ void check();
187
+ poll();
188
+ });
189
+ };
190
+ poll();
191
+ void check();
192
+ });
193
+ return device ? hidTransport(device, hid) : null;
89
194
  }
90
195
  //# sourceMappingURL=webhid.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"webhid.js","sourceRoot":"","sources":["../../src/browser/webhid.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"webhid.js","sourceRoot":"","sources":["../../src/browser/webhid.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"webserial.d.ts","sourceRoot":"","sources":["../../src/browser/webserial.ts"],"names":[],"mappings":"AACA,OAAO,EAAkB,KAAK,YAAY,EAAE,MAAM,eAAe,CAAC;AAClE,OAAO,EAAc,KAAK,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACjE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,KAAK,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAE3E,OAAO,EAAyB,KAAK,UAAU,EAAE,KAAK,cAAc,EAAE,MAAM,eAAe,CAAC;AAE5F;;;GAGG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,cAAc,GAAG,eAAe,CAgErE;AAED,8EAA8E;AAC9E,wBAAgB,WAAW,CAAC,QAAQ,EAAE,kBAAkB,EAAE,QAAQ,CAAC,EAAE,QAAQ,GAAG,MAAM,CAErF;AAED,yFAAyF;AACzF,MAAM,WAAW,gBAAgB;IAChC;;;OAGG;IACH,QAAQ,EAAE,cAAc,CAAC;IACzB,IAAI,EAAE,kBAAkB,CAAC;IACzB,2EAA2E;IAC3E,IAAI,CAAC,QAAQ,CAAC,EAAE,QAAQ,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;CACvE;AAED,MAAM,WAAW,oBAAoB;IACpC,8FAA8F;IAC9F,OAAO,CAAC,EAAE,QAAQ,CAAC,YAAY,CAAC,CAAC;IACjC,+BAA+B;IAC/B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,mCAAmC;IACnC,MAAM,CAAC,EAAE,UAAU,CAAC;CACpB;AAED,2EAA2E;AAC3E,wBAAsB,iBAAiB,CACtC,OAAO,GAAE,oBAAyB,GAChC,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC,CAuClC"}
1
+ {"version":3,"file":"webserial.d.ts","sourceRoot":"","sources":["../../src/browser/webserial.ts"],"names":[],"mappings":"AACA,OAAO,EAAkB,KAAK,YAAY,EAAE,MAAM,eAAe,CAAC;AAClE,OAAO,EAAc,KAAK,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACjE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,KAAK,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAE3E,OAAO,EAAyB,KAAK,UAAU,EAAE,KAAK,cAAc,EAAE,MAAM,eAAe,CAAC;AAE5F;;;GAGG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,cAAc,GAAG,eAAe,CAyErE;AAED,8EAA8E;AAC9E,wBAAgB,WAAW,CAAC,QAAQ,EAAE,kBAAkB,EAAE,QAAQ,CAAC,EAAE,QAAQ,GAAG,MAAM,CAErF;AAED,yFAAyF;AACzF,MAAM,WAAW,gBAAgB;IAChC;;;OAGG;IACH,QAAQ,EAAE,cAAc,CAAC;IACzB,IAAI,EAAE,kBAAkB,CAAC;IACzB,2EAA2E;IAC3E,IAAI,CAAC,QAAQ,CAAC,EAAE,QAAQ,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;CACvE;AAED,MAAM,WAAW,oBAAoB;IACpC,8FAA8F;IAC9F,OAAO,CAAC,EAAE,QAAQ,CAAC,YAAY,CAAC,CAAC;IACjC,+BAA+B;IAC/B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,mCAAmC;IACnC,MAAM,CAAC,EAAE,UAAU,CAAC;CACpB;AAED,2EAA2E;AAC3E,wBAAsB,iBAAiB,CACtC,OAAO,GAAE,oBAAyB,GAChC,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC,CAuClC"}
@@ -68,6 +68,16 @@ export function serialTransport(port) {
68
68
  }
69
69
  },
70
70
  read: (timeoutMs) => queue.read(timeoutMs),
71
+ onDisconnect(listener) {
72
+ const handler = () => {
73
+ off();
74
+ if (!closing)
75
+ listener();
76
+ };
77
+ const off = () => port.removeEventListener?.('disconnect', handler);
78
+ port.addEventListener?.('disconnect', handler);
79
+ return off;
80
+ },
71
81
  async close() {
72
82
  closing = true;
73
83
  await reader?.cancel().catch(() => { });
@@ -1 +1 @@
1
- {"version":3,"file":"webserial.js","sourceRoot":"","sources":["../../src/browser/webserial.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"webserial.js","sourceRoot":"","sources":["../../src/browser/webserial.ts"],"names":[],"mappings":"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"}
package/dist/bytes.d.ts CHANGED
@@ -24,7 +24,10 @@ export declare const readI8: (b: ArrayLike<number>, i: number) => number;
24
24
  export declare function f32le(value: number, what?: string): [number, number, number, number];
25
25
  export declare function readF32le(b: ArrayLike<number>, i: number): number;
26
26
  export declare function hex(bytes: ArrayLike<number>): string;
27
- /** Float32 values decoded from the wire, rounded to what a float32 field can mean. */
27
+ /**
28
+ * Float32 values decoded from the wire, as the shortest decimal that encodes to the same float32
29
+ * (0.71, not 0.7099999785). Up to 9 digits: 7 lose values such as 11094.7578125.
30
+ */
28
31
  export declare function tidyF32(v: number): number;
29
32
  /** The wire field `round(value · scale)` in `range`, as canonical min, max and step. */
30
33
  export declare function grid(scale: number, range: readonly [number, number]): {
@@ -1 +1 @@
1
- {"version":3,"file":"bytes.d.ts","sourceRoot":"","sources":["../src/bytes.ts"],"names":[],"mappings":"AAKA,gFAAgF;AAChF,wBAAgB,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,UAU3F;AAED,eAAO,MAAM,EAAE,mBAAqB,CAAC;AACrC,eAAO,MAAM,EAAE,sBAAyB,CAAC;AACzC,eAAO,MAAM,GAAG,qBAAuB,CAAC;AACxC,eAAO,MAAM,GAAG,0BAA6B,CAAC;AAC9C,eAAO,MAAM,GAAG,0BAA2B,CAAC;AAC5C,eAAO,MAAM,GAAG,oCAAqC,CAAC;AAEtD,2EAA2E;AAC3E,wBAAgB,KAAK,CACpB,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,EAChC,IAAI,EAAE,MAAM,UAGZ;AAED,eAAO,MAAM,IAAI,GAAI,GAAG,MAAM,KAAG,CAAC,MAAM,EAAE,MAAM,CAAgC,CAAC;AACjF,eAAO,MAAM,IAAI,GAAI,GAAG,MAAM,KAAG,CAAC,MAAM,EAAE,MAAM,CAAgC,CAAC;AACjF,eAAO,MAAM,IAAI,GAAI,GAAG,MAAM,KAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAK/D,CAAC;AACF,eAAO,MAAM,IAAI,GAAI,GAAG,MAAM,KAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAK/D,CAAC;AAIF,eAAO,MAAM,SAAS,GAAI,GAAG,SAAS,CAAC,MAAM,CAAC,EAAE,GAAG,MAAM,WAAmC,CAAC;AAC7F,eAAO,MAAM,SAAS,GAAI,GAAG,SAAS,CAAC,MAAM,CAAC,EAAE,GAAG,MAAM,WAAmC,CAAC;AAC7F,eAAO,MAAM,SAAS,GAAI,GAAG,SAAS,CAAC,MAAM,CAAC,EAAE,GAAG,MAAM,WAAkC,CAAC;AAC5F,eAAO,MAAM,SAAS,GAAI,GAAG,SAAS,CAAC,MAAM,CAAC,EAAE,GAAG,MAAM,WAAkC,CAAC;AAC5F,eAAO,MAAM,SAAS,GAAI,GAAG,SAAS,CAAC,MAAM,CAAC,EAAE,GAAG,MAAM,WAC4B,CAAC;AACtF,eAAO,MAAM,SAAS,GAAI,GAAG,SAAS,CAAC,MAAM,CAAC,EAAE,GAAG,MAAM,WAAwB,CAAC;AAClF,eAAO,MAAM,SAAS,GAAI,GAAG,SAAS,CAAC,MAAM,CAAC,EAAE,GAAG,MAAM,WAC4B,CAAC;AACtF,eAAO,MAAM,MAAM,GAAI,GAAG,SAAS,CAAC,MAAM,CAAC,EAAE,GAAG,MAAM,WAA2B,CAAC;AAElF,2FAA2F;AAC3F,wBAAgB,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,SAAU,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAOrF;AAED,wBAAgB,SAAS,CAAC,CAAC,EAAE,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAIjE;AAED,wBAAgB,GAAG,CAAC,KAAK,EAAE,SAAS,CAAC,MAAM,CAAC,GAAG,MAAM,CAEpD;AAED,sFAAsF;AACtF,wBAAgB,OAAO,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAEzC;AAED,wFAAwF;AACxF,wBAAgB,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;;;;EAEnE;AAED,oDAAoD;AACpD,eAAO,MAAM,SAAS;;;CAA8D,CAAC"}
1
+ {"version":3,"file":"bytes.d.ts","sourceRoot":"","sources":["../src/bytes.ts"],"names":[],"mappings":"AAKA,gFAAgF;AAChF,wBAAgB,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,UAU3F;AAED,eAAO,MAAM,EAAE,mBAAqB,CAAC;AACrC,eAAO,MAAM,EAAE,sBAAyB,CAAC;AACzC,eAAO,MAAM,GAAG,qBAAuB,CAAC;AACxC,eAAO,MAAM,GAAG,0BAA6B,CAAC;AAC9C,eAAO,MAAM,GAAG,0BAA2B,CAAC;AAC5C,eAAO,MAAM,GAAG,oCAAqC,CAAC;AAEtD,2EAA2E;AAC3E,wBAAgB,KAAK,CACpB,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,EAChC,IAAI,EAAE,MAAM,UAGZ;AAED,eAAO,MAAM,IAAI,GAAI,GAAG,MAAM,KAAG,CAAC,MAAM,EAAE,MAAM,CAAgC,CAAC;AACjF,eAAO,MAAM,IAAI,GAAI,GAAG,MAAM,KAAG,CAAC,MAAM,EAAE,MAAM,CAAgC,CAAC;AACjF,eAAO,MAAM,IAAI,GAAI,GAAG,MAAM,KAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAK/D,CAAC;AACF,eAAO,MAAM,IAAI,GAAI,GAAG,MAAM,KAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAK/D,CAAC;AAIF,eAAO,MAAM,SAAS,GAAI,GAAG,SAAS,CAAC,MAAM,CAAC,EAAE,GAAG,MAAM,WAAmC,CAAC;AAC7F,eAAO,MAAM,SAAS,GAAI,GAAG,SAAS,CAAC,MAAM,CAAC,EAAE,GAAG,MAAM,WAAmC,CAAC;AAC7F,eAAO,MAAM,SAAS,GAAI,GAAG,SAAS,CAAC,MAAM,CAAC,EAAE,GAAG,MAAM,WAAkC,CAAC;AAC5F,eAAO,MAAM,SAAS,GAAI,GAAG,SAAS,CAAC,MAAM,CAAC,EAAE,GAAG,MAAM,WAAkC,CAAC;AAC5F,eAAO,MAAM,SAAS,GAAI,GAAG,SAAS,CAAC,MAAM,CAAC,EAAE,GAAG,MAAM,WAC4B,CAAC;AACtF,eAAO,MAAM,SAAS,GAAI,GAAG,SAAS,CAAC,MAAM,CAAC,EAAE,GAAG,MAAM,WAAwB,CAAC;AAClF,eAAO,MAAM,SAAS,GAAI,GAAG,SAAS,CAAC,MAAM,CAAC,EAAE,GAAG,MAAM,WAC4B,CAAC;AACtF,eAAO,MAAM,MAAM,GAAI,GAAG,SAAS,CAAC,MAAM,CAAC,EAAE,GAAG,MAAM,WAA2B,CAAC;AAElF,2FAA2F;AAC3F,wBAAgB,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,SAAU,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAOrF;AAED,wBAAgB,SAAS,CAAC,CAAC,EAAE,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAIjE;AAED,wBAAgB,GAAG,CAAC,KAAK,EAAE,SAAS,CAAC,MAAM,CAAC,GAAG,MAAM,CAEpD;AAED;;;GAGG;AACH,wBAAgB,OAAO,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAOzC;AAED,wFAAwF;AACxF,wBAAgB,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;;;;EAEnE;AAED,oDAAoD;AACpD,eAAO,MAAM,SAAS;;;CAA8D,CAAC"}
package/dist/bytes.js CHANGED
@@ -61,9 +61,18 @@ export function readF32le(b, i) {
61
61
  export function hex(bytes) {
62
62
  return Array.from(bytes, (b) => b.toString(16).padStart(2, '0')).join(' ');
63
63
  }
64
- /** Float32 values decoded from the wire, rounded to what a float32 field can mean. */
64
+ /**
65
+ * Float32 values decoded from the wire, as the shortest decimal that encodes to the same float32
66
+ * (0.71, not 0.7099999785). Up to 9 digits: 7 lose values such as 11094.7578125.
67
+ */
65
68
  export function tidyF32(v) {
66
- return Number(v.toPrecision(7));
69
+ const f = Math.fround(v);
70
+ for (let digits = 1; digits < 9; digits++) {
71
+ const tidy = Number(f.toPrecision(digits));
72
+ if (Math.fround(tidy) === f)
73
+ return tidy;
74
+ }
75
+ return Number(f.toPrecision(9));
67
76
  }
68
77
  /** The wire field `round(value · scale)` in `range`, as canonical min, max and step. */
69
78
  export function grid(scale, range) {