@yume-chan/adb-daemon-webusb 0.0.24 → 1.1.0

package/esm/observer.d.ts

@@ -0,0 +1,17 @@
+import type { DeviceObserver } from "@yume-chan/adb";
+import { AdbDaemonWebUsbDevice } from "./device.js";
+import type { AdbDaemonWebUsbDeviceManager } from "./manager.js";
+/**
+ * A watcher that listens for new WebUSB devices and notifies the callback when
+ * a new device is connected or disconnected.
+ */
+export declare class AdbDaemonWebUsbDeviceObserver implements DeviceObserver<AdbDaemonWebUsbDevice> {
+    #private;
+    onDeviceAdd: import("@yume-chan/event").AddEventListener<AdbDaemonWebUsbDevice[], unknown>;
+    onDeviceRemove: import("@yume-chan/event").AddEventListener<AdbDaemonWebUsbDevice[], unknown>;
+    onListChange: import("@yume-chan/event").AddEventListener<AdbDaemonWebUsbDevice[], unknown>;
+    current: AdbDaemonWebUsbDevice[];
+    constructor(usb: USB, options?: AdbDaemonWebUsbDeviceManager.RequestDeviceOptions);
+    stop(): void;
+}
+//# sourceMappingURL=observer.d.ts.map

package/esm/observer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"observer.d.ts","sourceRoot":"","sources":["../src/observer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAGrD,OAAO,EACH,qBAAqB,EAExB,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,cAAc,CAAC;AAIjE;;;GAGG;AACH,qBAAa,6BACT,YAAW,cAAc,CAAC,qBAAqB,CAAC;;IAOhD,WAAW,gFAA2B;IAGtC,cAAc,gFAA8B;IAG5C,YAAY,gFAA4B;IAExC,OAAO,EAAE,qBAAqB,EAAE,CAAM;gBAGlC,GAAG,EAAE,GAAG,EACR,OAAO,GAAE,4BAA4B,CAAC,oBAAyB;IA2CnE,IAAI,IAAI,IAAI;CAWf"}

package/esm/observer.js

@@ -0,0 +1,54 @@
+import { EventEmitter } from "@yume-chan/event";
+import { AdbDaemonWebUsbDevice, mergeDefaultAdbInterfaceFilter, } from "./device.js";
+import { matchFilters } from "./utils.js";
+/**
+ * A watcher that listens for new WebUSB devices and notifies the callback when
+ * a new device is connected or disconnected.
+ */
+export class AdbDaemonWebUsbDeviceObserver {
+    #filters;
+    #exclusionFilters;
+    #usbManager;
+    #onDeviceAdd = new EventEmitter();
+    onDeviceAdd = this.#onDeviceAdd.event;
+    #onDeviceRemove = new EventEmitter();
+    onDeviceRemove = this.#onDeviceRemove.event;
+    #onListChange = new EventEmitter();
+    onListChange = this.#onListChange.event;
+    current = [];
+    constructor(usb, options = {}) {
+        this.#filters = mergeDefaultAdbInterfaceFilter(options.filters);
+        this.#exclusionFilters = options.exclusionFilters;
+        this.#usbManager = usb;
+        this.#usbManager.addEventListener("connect", this.#handleConnect);
+        this.#usbManager.addEventListener("disconnect", this.#handleDisconnect);
+    }
+    #handleConnect = (e) => {
+        const interface_ = matchFilters(e.device, this.#filters, this.#exclusionFilters);
+        if (!interface_) {
+            return;
+        }
+        const device = new AdbDaemonWebUsbDevice(e.device, interface_, this.#usbManager);
+        this.#onDeviceAdd.fire([device]);
+        this.current.push(device);
+        this.#onListChange.fire(this.current);
+    };
+    #handleDisconnect = (e) => {
+        const index = this.current.findIndex((device) => device.raw === e.device);
+        if (index !== -1) {
+            const device = this.current[index];
+            this.#onDeviceRemove.fire([device]);
+            this.current[index] = this.current[this.current.length - 1];
+            this.current.length -= 1;
+            this.#onListChange.fire(this.current);
+        }
+    };
+    stop() {
+        this.#usbManager.removeEventListener("connect", this.#handleConnect);
+        this.#usbManager.removeEventListener("disconnect", this.#handleDisconnect);
+        this.#onDeviceAdd.dispose();
+        this.#onDeviceRemove.dispose();
+        this.#onListChange.dispose();
+    }
+}
+//# sourceMappingURL=observer.js.map

package/esm/observer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"observer.js","sourceRoot":"","sources":["../src/observer.ts"],"names":[],"mappings":"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"}

package/esm/utils.d.ts

@@ -1,14 +1,31 @@
-/// <reference types="w3c-web-usb" />
-export declare function isErrorName(e: unknown, name: string): boolean;
+export declare function isErrorName(e: unknown, name: string): e is Error;
+export type PickNonNullable<T, K extends keyof T> = {
+    [P in K]-?: NonNullable<T[P]>;
+};
 /**
  * `classCode`, `subclassCode` and `protocolCode` are required
  * for selecting correct USB configuration and interface.
  */
-export type AdbDeviceFilter = USBDeviceFilter & Required<Pick<USBDeviceFilter, "classCode" | "subclassCode" | "protocolCode">>;
-export declare function findUsbAlternateInterface(device: USBDevice, filters: AdbDeviceFilter[]): {
+export type UsbInterfaceFilter = PickNonNullable<USBDeviceFilter, "classCode" | "subclassCode" | "protocolCode">;
+export declare function isUsbInterfaceFilter(filter: USBDeviceFilter): filter is UsbInterfaceFilter;
+export interface UsbInterfaceIdentifier {
     configuration: USBConfiguration;
     interface_: USBInterface;
     alternate: USBAlternateInterface;
-};
+}
+export declare function findUsbInterface(device: USBDevice, filter: UsbInterfaceFilter): UsbInterfaceIdentifier | undefined;
 export declare function getSerialNumber(device: USBDevice): string;
+/**
+ * Find the first pair of input and output endpoints from an alternate interface.
+ *
+ * ADB interface only has two endpoints, one for input and one for output.
+ */
+export declare function findUsbEndpoints(endpoints: USBEndpoint[]): {
+    inEndpoint: USBEndpoint;
+    outEndpoint: USBEndpoint;
+};
+export declare function matchFilter(device: USBDevice, filter: USBDeviceFilter & UsbInterfaceFilter): UsbInterfaceIdentifier | false;
+export declare function matchFilter(device: USBDevice, filter: USBDeviceFilter): boolean;
+export declare function matchFilters(device: USBDevice, filters: (USBDeviceFilter & UsbInterfaceFilter)[], exclusionFilters?: USBDeviceFilter[]): UsbInterfaceIdentifier | false;
+export declare function matchFilters(device: USBDevice, filters: USBDeviceFilter[], exclusionFilters?: USBDeviceFilter[]): boolean;
 //# sourceMappingURL=utils.d.ts.map

package/esm/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";AAAA,wBAAgB,WAAW,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAO7D;AAED;;;GAGG;AACH,MAAM,MAAM,eAAe,GAAG,eAAe,GACzC,QAAQ,CACJ,IAAI,CAAC,eAAe,EAAE,WAAW,GAAG,cAAc,GAAG,cAAc,CAAC,CACvE,CAAC;AAcN,wBAAgB,yBAAyB,CACrC,MAAM,EAAE,SAAS,EACjB,OAAO,EAAE,eAAe,EAAE;;;;EAa7B;AAMD,wBAAgB,eAAe,CAAC,MAAM,EAAE,SAAS,UAMhD"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,wBAAgB,WAAW,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,GAAG,CAAC,IAAI,KAAK,CAOhE;AAED,MAAM,MAAM,eAAe,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,CAAC,IAAI;KAC/C,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CAChC,CAAC;AAEF;;;GAGG;AACH,MAAM,MAAM,kBAAkB,GAAG,eAAe,CAC5C,eAAe,EACf,WAAW,GAAG,cAAc,GAAG,cAAc,CAChD,CAAC;AAEF,wBAAgB,oBAAoB,CAChC,MAAM,EAAE,eAAe,GACxB,MAAM,IAAI,kBAAkB,CAM9B;AAaD,MAAM,WAAW,sBAAsB;IACnC,aAAa,EAAE,gBAAgB,CAAC;IAChC,UAAU,EAAE,YAAY,CAAC;IACzB,SAAS,EAAE,qBAAqB,CAAC;CACpC;AAED,wBAAgB,gBAAgB,CAC5B,MAAM,EAAE,SAAS,EACjB,MAAM,EAAE,kBAAkB,GAC3B,sBAAsB,GAAG,SAAS,CAWpC;AAMD,wBAAgB,eAAe,CAAC,MAAM,EAAE,SAAS,UAMhD;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,WAAW,EAAE;;;EAgCxD;AAED,wBAAgB,WAAW,CACvB,MAAM,EAAE,SAAS,EACjB,MAAM,EAAE,eAAe,GAAG,kBAAkB,GAC7C,sBAAsB,GAAG,KAAK,CAAC;AAClC,wBAAgB,WAAW,CACvB,MAAM,EAAE,SAAS,EACjB,MAAM,EAAE,eAAe,GACxB,OAAO,CAAC;AA8BX,wBAAgB,YAAY,CACxB,MAAM,EAAE,SAAS,EACjB,OAAO,EAAE,CAAC,eAAe,GAAG,kBAAkB,CAAC,EAAE,EACjD,gBAAgB,CAAC,EAAE,eAAe,EAAE,GACrC,sBAAsB,GAAG,KAAK,CAAC;AAClC,wBAAgB,YAAY,CACxB,MAAM,EAAE,SAAS,EACjB,OAAO,EAAE,eAAe,EAAE,EAC1B,gBAAgB,CAAC,EAAE,eAAe,EAAE,GACrC,OAAO,CAAC"}

package/esm/utils.js

@@ -4,22 +4,27 @@ export function isErrorName(e, name) {
     // https://github.com/node-usb/node-usb/issues/573
     return (typeof e === "object" && e !== null && "name" in e && e.name === name);
 }
-function alternateMatchesFilter(alternate, filters) {
-    return filters.some((filter) => alternate.interfaceClass === filter.classCode &&
+export function isUsbInterfaceFilter(filter) {
+    return (filter.classCode !== undefined &&
+        filter.subclassCode !== undefined &&
+        filter.protocolCode !== undefined);
+}
+function matchUsbInterfaceFilter(alternate, filter) {
+    return (alternate.interfaceClass === filter.classCode &&
         alternate.interfaceSubclass === filter.subclassCode &&
         alternate.interfaceProtocol === filter.protocolCode);
 }
-export function findUsbAlternateInterface(device, filters) {
+export function findUsbInterface(device, filter) {
     for (const configuration of device.configurations) {
         for (const interface_ of configuration.interfaces) {
             for (const alternate of interface_.alternates) {
-                if (alternateMatchesFilter(alternate, filters)) {
+                if (matchUsbInterfaceFilter(alternate, filter)) {
                     return { configuration, interface_, alternate };
                 }
             }
         }
     }
-    throw new TypeError("No matched alternate interface found");
+    return undefined;
 }
 function padNumber(value) {
     return value.toString(16).padStart(4, "0");
@@ -30,4 +35,70 @@ export function getSerialNumber(device) {
     }
     return padNumber(device.vendorId) + "x" + padNumber(device.productId);
 }
+/**
+ * Find the first pair of input and output endpoints from an alternate interface.
+ *
+ * ADB interface only has two endpoints, one for input and one for output.
+ */
+export function findUsbEndpoints(endpoints) {
+    if (endpoints.length === 0) {
+        throw new TypeError("No endpoints given");
+    }
+    let inEndpoint;
+    let outEndpoint;
+    for (const endpoint of endpoints) {
+        switch (endpoint.direction) {
+            case "in":
+                inEndpoint = endpoint;
+                if (outEndpoint) {
+                    return { inEndpoint, outEndpoint };
+                }
+                break;
+            case "out":
+                outEndpoint = endpoint;
+                if (inEndpoint) {
+                    return { inEndpoint, outEndpoint };
+                }
+                break;
+        }
+    }
+    if (!inEndpoint) {
+        throw new TypeError("No input endpoint found.");
+    }
+    if (!outEndpoint) {
+        throw new TypeError("No output endpoint found.");
+    }
+    throw new Error("unreachable");
+}
+export function matchFilter(device, filter) {
+    if (filter.vendorId !== undefined && device.vendorId !== filter.vendorId) {
+        return false;
+    }
+    if (filter.productId !== undefined &&
+        device.productId !== filter.productId) {
+        return false;
+    }
+    if (filter.serialNumber !== undefined &&
+        getSerialNumber(device) !== filter.serialNumber) {
+        return false;
+    }
+    if (isUsbInterfaceFilter(filter)) {
+        return findUsbInterface(device, filter) || false;
+    }
+    return true;
+}
+export function matchFilters(device, filters, exclusionFilters) {
+    if (exclusionFilters && exclusionFilters.length > 0) {
+        if (matchFilters(device, exclusionFilters)) {
+            return false;
+        }
+    }
+    for (const filter of filters) {
+        const result = matchFilter(device, filter);
+        if (result) {
+            return result;
+        }
+    }
+    return false;
+}
 //# sourceMappingURL=utils.js.map

package/esm/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,WAAW,CAAC,CAAU,EAAE,IAAY;IAChD,+CAA+C;IAC/C,wBAAwB;IACxB,kDAAkD;IAClD,OAAO,CACH,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,KAAK,IAAI,IAAI,MAAM,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,KAAK,IAAI,CACxE,CAAC;AACN,CAAC;AAWD,SAAS,sBAAsB,CAC3B,SAAgC,EAChC,OAA0B;IAE1B,OAAO,OAAO,CAAC,IAAI,CACf,CAAC,MAAM,EAAE,EAAE,CACP,SAAS,CAAC,cAAc,KAAK,MAAM,CAAC,SAAS;QAC7C,SAAS,CAAC,iBAAiB,KAAK,MAAM,CAAC,YAAY;QACnD,SAAS,CAAC,iBAAiB,KAAK,MAAM,CAAC,YAAY,CAC1D,CAAC;AACN,CAAC;AAED,MAAM,UAAU,yBAAyB,CACrC,MAAiB,EACjB,OAA0B;IAE1B,KAAK,MAAM,aAAa,IAAI,MAAM,CAAC,cAAc,EAAE,CAAC;QAChD,KAAK,MAAM,UAAU,IAAI,aAAa,CAAC,UAAU,EAAE,CAAC;YAChD,KAAK,MAAM,SAAS,IAAI,UAAU,CAAC,UAAU,EAAE,CAAC;gBAC5C,IAAI,sBAAsB,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE,CAAC;oBAC7C,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC;gBACpD,CAAC;YACL,CAAC;QACL,CAAC;IACL,CAAC;IAED,MAAM,IAAI,SAAS,CAAC,sCAAsC,CAAC,CAAC;AAChE,CAAC;AAED,SAAS,SAAS,CAAC,KAAa;IAC5B,OAAO,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;AAC/C,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,MAAiB;IAC7C,IAAI,MAAM,CAAC,YAAY,EAAE,CAAC;QACtB,OAAO,MAAM,CAAC,YAAY,CAAC;IAC/B,CAAC;IAED,OAAO,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,GAAG,GAAG,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;AAC1E,CAAC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yume-chan/adb-daemon-webusb",
-  "version": "0.0.24",
+  "version": "1.1.0",
   "description": "Adb daemon transport connection for `@yume-chan/adb` using WebUSB API.",
   "keywords": [
     "webusb",
@@ -24,21 +24,25 @@
   "type": "module",
   "main": "esm/index.js",
   "types": "esm/index.d.ts",
+  "sideEffects": false,
   "dependencies": {
     "@types/w3c-web-usb": "^1.0.10",
-    "@yume-chan/adb": "^0.0.24",
-    "@yume-chan/stream-extra": "^0.0.24",
-    "@yume-chan/struct": "^0.0.24"
+    "@yume-chan/adb": "^1.1.0",
+    "@yume-chan/event": "^1.0.0",
+    "@yume-chan/stream-extra": "^1.0.0",
+    "@yume-chan/struct": "^1.0.0"
   },
   "devDependencies": {
+    "@types/node": "^22.10.2",
+    "prettier": "^3.4.2",
+    "typescript": "^5.7.2",
     "@yume-chan/eslint-config": "^1.0.0",
-    "@yume-chan/tsconfig": "^1.0.0",
-    "prettier": "^3.3.2",
-    "typescript": "^5.4.5"
+    "@yume-chan/test-runner": "^1.0.0",
+    "@yume-chan/tsconfig": "^1.0.0"
   },
   "scripts": {
     "build": "tsc -b tsconfig.build.json",
-    "build:watch": "tsc -b tsconfig.build.json",
-    "lint": "run-eslint && prettier src/**/*.ts --write --tab-width 4"
+    "lint": "run-eslint && prettier src/**/*.ts --write --tab-width 4",
+    "test": "run-test"
   }
 }

package/src/device.ts

@@ -20,61 +20,35 @@ import {
     pipeFrom,
 } from "@yume-chan/stream-extra";
 import type { ExactReadable } from "@yume-chan/struct";
-import { EMPTY_UINT8_ARRAY } from "@yume-chan/struct";
+import { EmptyUint8Array } from "@yume-chan/struct";
 
-import type { AdbDeviceFilter } from "./utils.js";
-import {
-    findUsbAlternateInterface,
-    getSerialNumber,
-    isErrorName,
-} from "./utils.js";
+import type { UsbInterfaceFilter, UsbInterfaceIdentifier } from "./utils.js";
+import { findUsbEndpoints, getSerialNumber, isErrorName } from "./utils.js";
 
 /**
  * The default filter for ADB devices, as defined by Google.
  */
-export const ADB_DEFAULT_DEVICE_FILTER = {
+export const AdbDefaultInterfaceFilter = {
     classCode: 0xff,
     subclassCode: 0x42,
     protocolCode: 1,
-} as const satisfies AdbDeviceFilter;
-
-/**
- * Find the first pair of input and output endpoints from an alternate interface.
- *
- * ADB interface only has two endpoints, one for input and one for output.
- */
-function findUsbEndpoints(endpoints: USBEndpoint[]) {
-    if (endpoints.length === 0) {
-        throw new TypeError("No endpoints given");
-    }
-
-    let inEndpoint: USBEndpoint | undefined;
-    let outEndpoint: USBEndpoint | undefined;
-
-    for (const endpoint of endpoints) {
-        switch (endpoint.direction) {
-            case "in":
-                inEndpoint = endpoint;
-                if (outEndpoint) {
-                    return { inEndpoint, outEndpoint };
-                }
-                break;
-            case "out":
-                outEndpoint = endpoint;
-                if (inEndpoint) {
-                    return { inEndpoint, outEndpoint };
-                }
-                break;
-        }
-    }
-
-    if (!inEndpoint) {
-        throw new TypeError("No input endpoint found.");
-    }
-    if (!outEndpoint) {
-        throw new TypeError("No output endpoint found.");
+} as const satisfies UsbInterfaceFilter;
+
+export function mergeDefaultAdbInterfaceFilter(
+    filters: USBDeviceFilter[] | undefined,
+): (USBDeviceFilter & UsbInterfaceFilter)[] {
+    if (!filters || filters.length === 0) {
+        return [AdbDefaultInterfaceFilter];
+    } else {
+        return filters.map((filter) => ({
+            ...filter,
+            classCode: filter.classCode ?? AdbDefaultInterfaceFilter.classCode,
+            subclassCode:
+                filter.subclassCode ?? AdbDefaultInterfaceFilter.subclassCode,
+            protocolCode:
+                filter.protocolCode ?? AdbDefaultInterfaceFilter.protocolCode,
+        }));
     }
-    throw new Error("unreachable");
 }
 
 class Uint8ArrayExactReadable implements ExactReadable {
@@ -203,7 +177,7 @@ export class AdbDaemonWebUsbConnection
                             if (zeroMask && (chunk.length & zeroMask) === 0) {
                                 await device.raw.transferOut(
                                     outEndpoint.endpointNumber,
-                                    EMPTY_UINT8_ARRAY,
+                                    EmptyUint8Array,
                                 );
                             }
                         } catch (e) {
@@ -252,7 +226,7 @@ export class AdbDaemonWebUsbConnection
                     );
                     packet.payload = new Uint8Array(result.data!.buffer);
                 } else {
-                    packet.payload = EMPTY_UINT8_ARRAY;
+                    packet.payload = EmptyUint8Array;
                 }
 
                 return packet;
@@ -260,7 +234,7 @@ export class AdbDaemonWebUsbConnection
         } catch (e) {
             // On Windows, disconnecting the device will cause `NetworkError` to be thrown,
             // even before the `disconnect` event is fired.
-            // We need to wait a little bit and check if the device is still connected.
+            // Wait a little while and check if the device is still connected.
             // https://github.com/WICG/webusb/issues/219
             if (isErrorName(e, "NetworkError")) {
                 await new Promise<void>((resolve) => {
@@ -271,8 +245,6 @@ export class AdbDaemonWebUsbConnection
 
                 if (closed) {
                     return undefined;
-                } else {
-                    throw e;
                 }
             }
 
@@ -282,7 +254,7 @@ export class AdbDaemonWebUsbConnection
 }
 
 export class AdbDaemonWebUsbDevice implements AdbDaemonDevice {
-    #filters: AdbDeviceFilter[];
+    #interface: UsbInterfaceIdentifier;
     #usbManager: USB;
 
     #raw: USBDevice;
@@ -307,22 +279,24 @@ export class AdbDaemonWebUsbDevice implements AdbDaemonDevice {
      */
     constructor(
         device: USBDevice,
-        filters: AdbDeviceFilter[] = [ADB_DEFAULT_DEVICE_FILTER],
+        interface_: UsbInterfaceIdentifier,
         usbManager: USB,
     ) {
         this.#raw = device;
         this.#serial = getSerialNumber(device);
-        this.#filters = filters;
+        this.#interface = interface_;
         this.#usbManager = usbManager;
     }
 
-    async #claimInterface(): Promise<[USBEndpoint, USBEndpoint]> {
+    async #claimInterface(): Promise<{
+        inEndpoint: USBEndpoint;
+        outEndpoint: USBEndpoint;
+    }> {
         if (!this.#raw.opened) {
             await this.#raw.open();
         }
 
-        const { configuration, interface_, alternate } =
-            findUsbAlternateInterface(this.#raw, this.#filters);
+        const { configuration, interface_, alternate } = this.#interface;
 
         if (
             this.#raw.configuration?.configurationValue !==
@@ -336,7 +310,15 @@ export class AdbDaemonWebUsbDevice implements AdbDaemonDevice {
         }
 
         if (!interface_.claimed) {
-            await this.#raw.claimInterface(interface_.interfaceNumber);
+            try {
+                await this.#raw.claimInterface(interface_.interfaceNumber);
+            } catch (e) {
+                if (isErrorName(e, "NetworkError")) {
+                    throw new AdbDaemonWebUsbDevice.DeviceBusyError(e);
+                }
+
+                throw e;
+            }
         }
 
         if (
@@ -348,18 +330,14 @@ export class AdbDaemonWebUsbDevice implements AdbDaemonDevice {
             );
         }
 
-        const { inEndpoint, outEndpoint } = findUsbEndpoints(
-            alternate.endpoints,
-        );
-        return [inEndpoint, outEndpoint];
+        return findUsbEndpoints(alternate.endpoints);
     }
 
     /**
-     * Claim the device and create a pair of `AdbPacket` streams to the ADB interface.
-     * @returns The pair of `AdbPacket` streams.
+     * Open the device and create a new connection to the ADB Daemon.
      */
     async connect(): Promise<AdbDaemonWebUsbConnection> {
-        const [inEndpoint, outEndpoint] = await this.#claimInterface();
+        const { inEndpoint, outEndpoint } = await this.#claimInterface();
         return new AdbDaemonWebUsbConnection(
             this,
             inEndpoint,
@@ -368,3 +346,13 @@ export class AdbDaemonWebUsbDevice implements AdbDaemonDevice {
         );
     }
 }
+
+export namespace AdbDaemonWebUsbDevice {
+    export class DeviceBusyError extends Error {
+        constructor(cause?: Error) {
+            super("The device is already in used by another program", {
+                cause,
+            });
+        }
+    }
+}

package/src/index.ts

@@ -1,4 +1,4 @@
 export * from "./device.js";
 export * from "./manager.js";
 export * from "./utils.js";
-export * from "./watcher.js";
+export * from "./observer.js";