Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 06b3f476 authored by Simon Chan's avatar Simon Chan
Browse files

fix(usb): fix `getDevices` doesn't match filter with auto generated serial number

parent 4494e1b9

apps/cli/package.json

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 
        "tslib": "^2.6.2"

    },

    "devDependencies": {

        "@types/node": "^20.10.4",

        "@types/node": "^20.10.5",

        "@yume-chan/eslint-config": "workspace:^1.0.0",

        "@yume-chan/tsconfig": "workspace:^1.0.0",

        "eslint": "^8.56.0",

common/config/rush/pnpm-lock.yaml

+101 −87

File changed.

Preview size limit exceeded, changes collapsed.

common/config/rush/repo-state.json

+1 −1
Original line number Diff line number Diff line 
// DO NOT MODIFY THIS FILE MANUALLY BUT DO COMMIT IT. It is generated and used by Rush.

{

  "pnpmShrinkwrapHash": "da9c080b9b164b35e32ebbd511862e2960bc800b",

  "pnpmShrinkwrapHash": "4d086ee4091667e3ff2032d5ea4d4353d66a65c0",

  "preferredVersionsHash": "bf21a9e8fbc5a3846fb05b4fa0859e0917b2202f"

}

libraries/adb-daemon-webusb/src/device.ts

+6 −9
Original line number Diff line number Diff line
@@ -23,7 +23,11 @@ import type { ExactReadable } from "@yume-chan/struct"; 
import { EMPTY_UINT8_ARRAY } from "@yume-chan/struct";



import type { AdbDeviceFilter } from "./utils.js";

import { findUsbAlternateInterface, isErrorName } from "./utils.js";

import {

    findUsbAlternateInterface,

    getSerialNumber,

    isErrorName,

} from "./utils.js";



/**

 * The default filter for ADB devices, as defined by Google.
@@ -310,14 +314,7 @@ export class AdbDaemonWebUsbDevice implements AdbDaemonDevice { 
        usbManager: USB,

    ) {

        this.#raw = device;

        if (device.serialNumber) {

            this.#serial = device.serialNumber;

        } else {

            this.#serial =

                device.vendorId.toString(16).padStart(4, "0") +

                "x" +

                device.productId.toString(16).padStart(4, "0");

        }

        this.#serial = getSerialNumber(device);

        this.#filters = filters;

        this.#usbManager = usbManager;

    }

libraries/adb-daemon-webusb/src/manager.ts

+6 −2
Original line number Diff line number Diff line 
import { ADB_DEFAULT_DEVICE_FILTER, AdbDaemonWebUsbDevice } from "./device.js";

import type { AdbDeviceFilter } from "./utils.js";

import { findUsbAlternateInterface, isErrorName } from "./utils.js";

import {

    findUsbAlternateInterface,

    getSerialNumber,

    isErrorName,

} from "./utils.js";



export namespace AdbDaemonWebUsbDeviceManager {

    export interface RequestDeviceOptions {
@@ -109,7 +113,7 @@ export class AdbDaemonWebUsbDeviceManager { 
                    }

                    if (

                        "serialNumber" in filter &&

                        device.serialNumber !== filter.serialNumber

                        getSerialNumber(device) !== filter.serialNumber

                    ) {

                        continue;

                    }