@onekeyfe/hd-core 1.2.2-alpha.112 → 1.2.2-alpha.114

package/__tests__/core-error-output.test.ts

@@ -4,6 +4,8 @@ import { initConnector, initCore } from '../src/core';
 import { DataManager } from '../src/data-manager';
 import TransportManager from '../src/data-manager/TransportManager';
 import { IFRAME } from '../src/events';
+import SearchDevices from '../src/api/SearchDevices';
+import { DeviceList } from '../src/device/DeviceList';
 
 jest.mock('../src/data/config', () => ({
   getSDKVersion: jest.fn(() => '1.0.0-test'),
@@ -24,6 +26,81 @@ describe('Core 错误输出边界', () => {
     jest.restoreAllMocks();
   });
 
+  test.each([
+    ['webusb', false],
+    ['desktop-webusb', false],
+    ['desktop-webusb', true],
+  ] as const)(
+    '%s waits for discovery without masking initialization or cancellation (cancel=%s)',
+    async (env, shouldCancel) => {
+      jest.spyOn(DataManager, 'getSettings').mockReturnValue(env as never);
+      const error = ERRORS.TypedError(HardwareErrorCode.DeviceInitializeFailed, 'probe failed');
+      let finishSearch!: () => void;
+      let searchStarted!: () => void;
+      const started = new Promise<void>(resolve => {
+        searchStarted = resolve;
+      });
+      const search = jest.spyOn(SearchDevices.prototype, 'run').mockImplementation(async () => {
+        searchStarted();
+        await new Promise<void>(resolve => {
+          finishSearch = resolve;
+        });
+        return [];
+      });
+      const initialize = jest
+        .spyOn(DeviceList.prototype, 'getDeviceLists')
+        .mockRejectedValue(error);
+      const core = initCore();
+      initConnector();
+      try {
+        const discovery = core.handleMessage({
+          id: 10,
+          type: IFRAME.CALL,
+          payload: { method: 'searchDevices' },
+        } as never);
+        await started;
+        const request = core.handleMessage({
+          id: 11,
+          type: IFRAME.CALL,
+          payload: {
+            method: 'getDeviceState',
+            connectId: 'serial-V2',
+            retryCount: 1,
+            pollIntervalTime: 1,
+            timeout: 1000,
+          },
+        } as never);
+        await new Promise(resolve => {
+          setTimeout(resolve, 0);
+        });
+        expect(initialize).not.toHaveBeenCalled();
+        if (shouldCancel) {
+          await core.handleMessage({
+            type: IFRAME.CANCEL,
+            payload: { connectId: 'serial-V2' },
+          } as never);
+        }
+        finishSearch();
+        await expect(discovery).resolves.toMatchObject({ success: true });
+        const expectedError = shouldCancel
+          ? ERRORS.TypedError(HardwareErrorCode.CallQueueActionCancelled)
+          : error;
+        await expect(request).resolves.toMatchObject({
+          success: false,
+          payload: { code: expectedError.errorCode, error: expectedError.message },
+        });
+        await new Promise(resolve => {
+          setTimeout(resolve, 0);
+        });
+        expect(search).toHaveBeenCalledTimes(1);
+        expect(initialize).toHaveBeenCalledTimes(shouldCancel ? 0 : 2);
+      } finally {
+        finishSearch?.();
+        await core.dispose();
+      }
+    }
+  );
+
   test.each([
     HardwareErrorCode.BleDeviceNotBonded,
     HardwareErrorCode.BleDeviceBondedCanceled,

package/__tests__/device-lifecycle-events.test.ts

@@ -362,12 +362,12 @@ describe('public device lifecycle events', () => {
     }
   );
 
-  test('keeps the cleanup barrier when its deadline expires', async () => {
+  test('clears the cleanup barrier when its deadline expires', async () => {
     const realSetTimeout = setTimeout;
     jest
       .spyOn(global, 'setTimeout')
       .mockImplementation((callback, delay, ...args) =>
-        realSetTimeout(callback, delay === 15_000 ? 0 : delay, ...args)
+        realSetTimeout(callback, delay === 5_000 ? 0 : delay, ...args)
       );
     {
       jest.spyOn(DataManager, 'getSettings').mockReturnValue('react-native' as never);
@@ -382,13 +382,13 @@ describe('public device lifecycle events', () => {
         type: IFRAME.CALL,
         payload: { method: 'getDeviceState', connectId: 'draining-device', connectProtocol: 'V2' },
       } as CoreMessage);
-      await expect(result).resolves.toMatchObject({
-        success: false,
-        payload: { code: HardwareErrorCode.DeviceBusy },
-      });
-      expect(acquire).not.toHaveBeenCalled();
-      expect(context.getPrePendingCallPromise('draining-device')).toBe(gate.promise);
+      setImmediate(() => cancel(context, 'draining-device'));
+      await expect(result).resolves.toBeDefined();
       gate.resolve();
+      await new Promise(resolve => {
+        setImmediate(resolve);
+      });
+      expect(context.getPrePendingCallPromise('draining-device')).toBeUndefined();
     }
   });
 

package/__tests__/search-devices.test.ts

@@ -4,6 +4,7 @@ jest.mock('../src/data-manager/TransportManager', () => ({
   __esModule: true,
   default: {
     configure: jest.fn(),
+    ensureInitialized: jest.fn(),
   },
 }));
 
@@ -17,29 +18,151 @@ jest.mock('../src/data-manager', () => ({
 jest.mock('../src/device/DevicePool', () => ({
   DevicePool: {
     getDevices: jest.fn(),
+    getDeviceByPath: jest.fn(),
   },
 }));
 
-const transportManagerMock: { default: { configure: jest.Mock } } = jest.requireMock(
-  '../src/data-manager/TransportManager'
-);
-const devicePoolMock: { DevicePool: { getDevices: jest.Mock } } = jest.requireMock(
-  '../src/device/DevicePool'
-);
+const transportManagerMock: {
+  default: { configure: jest.Mock; ensureInitialized: jest.Mock };
+} = jest.requireMock('../src/data-manager/TransportManager');
+const devicePoolMock: {
+  DevicePool: { getDevices: jest.Mock; getDeviceByPath: jest.Mock };
+} = jest.requireMock('../src/device/DevicePool');
 const dataManagerMock: {
   DataManager: {
     getSettings: jest.Mock;
     isBleConnect: jest.Mock;
   };
 } = jest.requireMock('../src/data-manager');
-const { configure: mockConfigureTransport } = transportManagerMock.default;
-const { getDevices: mockGetDevices } = devicePoolMock.DevicePool;
+const { configure: mockConfigureTransport, ensureInitialized: mockEnsureInitialized } =
+  transportManagerMock.default;
+const { getDevices: mockGetDevices, getDeviceByPath: mockGetDeviceByPath } =
+  devicePoolMock.DevicePool;
 const { isBleConnect: mockIsBleConnect } = dataManagerMock.DataManager;
 
 describe('SearchDevices', () => {
   beforeEach(() => {
     jest.clearAllMocks();
     mockIsBleConnect.mockReturnValue(false);
+    dataManagerMock.DataManager.getSettings.mockReturnValue('webusb');
+  });
+
+  test.each(['webusb', 'desktop-webusb'])(
+    '%s discovery leaves active V1/V2 requests and their schemas untouched',
+    async env => {
+      dataManagerMock.DataManager.getSettings.mockReturnValue(env);
+      const devices = ['V1', 'V2'].map(protocol => ({
+        features: { protocol },
+        toMessageObject: () => ({ connectId: `serial-${protocol}` }),
+      }));
+      mockGetDeviceByPath.mockImplementation(
+        (path: string) => devices[['usb-V1', 'usb-V2'].indexOf(path)]
+      );
+      const extraDevice = {
+        toMessageObject: () => ({ connectId: 'not-initialized' }),
+      };
+      mockGetDevices.mockResolvedValue({
+        devices: { 'not-initialized': extraDevice },
+        deviceList: [extraDevice],
+      });
+      const method = new SearchDevices({
+        id: 1,
+        payload: { method: 'searchDevices' },
+      } as never);
+      method.init();
+      method.context = {
+        requestQueue: {
+          getRequestTasksId: () => [2],
+          getRequestTasksIdByConnectId: (connectId: string) =>
+            connectId === 'usb-V1' || connectId === 'usb-V2' ? [2] : [],
+        },
+      } as never;
+      method.connector = {
+        enumerate: jest.fn().mockResolvedValue({
+          descriptors: [
+            { path: 'usb-V1', commType: 'webusb' },
+            { path: 'usb-V2', commType: 'webusb' },
+            { path: 'not-initialized', commType: 'webusb' },
+          ],
+        }),
+      } as never;
+
+      await expect(method.run()).resolves.toEqual([
+        { connectId: 'serial-V1' },
+        { connectId: 'serial-V2' },
+        { connectId: 'not-initialized' },
+      ]);
+      expect(mockGetDevices).toHaveBeenCalledTimes(1);
+      expect(mockGetDevices).toHaveBeenCalledWith(
+        [{ path: 'not-initialized', commType: 'webusb' }],
+        'not-initialized',
+        {
+          connectProtocol: undefined,
+          forceProtocolDetection: true,
+          refreshRuntimeState: true,
+        }
+      );
+      expect(mockConfigureTransport).not.toHaveBeenCalled();
+    }
+  );
+
+  test('owned WebUSB cache miss still reports a SearchDevice without probing', async () => {
+    mockGetDeviceByPath.mockReturnValue(undefined);
+    const usbDevice = { vendorId: 0x1209, productId: 0x4f4c };
+    const method = new SearchDevices({
+      id: 1,
+      payload: { method: 'searchDevices' },
+    } as never);
+    method.init();
+    method.context = {
+      requestQueue: {
+        getRequestTasksId: () => [2],
+        getRequestTasksIdByConnectId: (connectId: string) => (connectId === 'serial-V2' ? [2] : []),
+      },
+    } as never;
+    method.connector = {
+      enumerate: jest.fn().mockResolvedValue({
+        descriptors: [
+          {
+            path: 'serial-V2',
+            device: usbDevice,
+            commType: 'webusb',
+          },
+        ],
+      }),
+    } as never;
+
+    await expect(method.run()).resolves.toEqual([
+      {
+        connectId: 'serial-V2',
+        uuid: 'serial-V2',
+        serialNo: 'serial-V2',
+        deviceId: null,
+        deviceType: 'unknown',
+        name: 'serial-V2',
+        commType: 'webusb',
+      },
+    ]);
+    expect(mockGetDevices).not.toHaveBeenCalled();
+    expect(mockConfigureTransport).not.toHaveBeenCalled();
+  });
+
+  test('searchDevices resolves empty when WebUSB bring-up is unavailable', async () => {
+    mockEnsureInitialized.mockRejectedValueOnce(
+      new Error('WebUSB is not supported by current browsers')
+    );
+    const method = new SearchDevices({
+      id: 1,
+      payload: { method: 'searchDevices' },
+    } as never);
+    method.init();
+    method.connector = {
+      enumerate: jest.fn().mockResolvedValue({ descriptors: [] }),
+    } as never;
+
+    await expect(method.run()).resolves.toEqual([]);
+    expect(mockEnsureInitialized).toHaveBeenCalled();
+    expect(mockConfigureTransport).toHaveBeenCalledTimes(1);
   });
 
   test('搜索忽略调用方协议并主动探测，单个无响应设备不阻断后续结果', async () => {

package/dist/api/SearchDevices.d.ts

@@ -1,22 +1,9 @@
 import { BaseMethod } from './BaseMethod';
+import type { SearchDevice } from '../types/device';
 import type DeviceConnector from '../device/DeviceConnector';
 export default class SearchDevices extends BaseMethod {
     connector?: DeviceConnector;
     init(): void;
-    run(): Promise<(import("..").KnownDevice | null)[] | {
-        connectId: string;
-        serialNo: null;
-        uuid: string;
-        deviceId: null;
-        name: string | null;
-        deviceType: import("..").IDeviceType;
-        commType: import("packages/hd-transport/dist").OneKeyDeviceCommType;
-        path: string;
-        session?: string | null | undefined;
-        debugSession?: string | null | undefined;
-        debug: boolean;
-        id: string;
-        protocolType?: import("packages/hd-transport/dist").ProtocolType | undefined;
-    }[]>;
+    run(): Promise<SearchDevice[]>;
 }
 //# sourceMappingURL=SearchDevices.d.ts.map

package/dist/api/SearchDevices.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SearchDevices.d.ts","sourceRoot":"","sources":["../../src/api/SearchDevices.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAM1C,OAAO,KAAK,eAAe,MAAM,2BAA2B,CAAC;AAI7D,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,UAAU;IACnD,SAAS,CAAC,EAAE,eAAe,CAAC;IAE5B,IAAI;IAME,GAAG;;;;;;;;;;;;;;;CA+DV"}
+{"version":3,"file":"SearchDevices.d.ts","sourceRoot":"","sources":["../../src/api/SearchDevices.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAM1C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,KAAK,eAAe,MAAM,2BAA2B,CAAC;AAuC7D,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,UAAU;IACnD,SAAS,CAAC,EAAE,eAAe,CAAC;IAE5B,IAAI;IAME,GAAG,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;CAsFrC"}

package/dist/core/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":";AACA,OAAO,YAAY,MAAM,QAAQ,CAAC;AAClC,OAAO,EAEL,KAAK,6BAA6B,EAElC,KAAK,YAAY,EAIlB,MAAM,wBAAwB,CAAC;AAiChC,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAsB1C,OAAO,eAAe,MAAM,2BAA2B,CAAC;AAYxD,OAAO,KAAK,EAAE,eAAe,EAAyB,MAAM,UAAU,CAAC;AACvE,OAAO,KAAK,EAAE,WAAW,EAAmD,MAAM,WAAW,CAAC;AAI9F,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAYpD,MAAM,MAAM,WAAW,GAAG,UAAU,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC;AA0E7D,eAAO,MAAM,OAAO,YAAmB,WAAW,WAAW,WAAW,iBAoFvE,CAAC;AAyFF,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAY3F;AAomBD,wBAAgB,kCAAkC,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,WAWpF;AAED,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,WAoB/E;AAED,wBAAgB,gCAAgC,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,WAQlF;AAED,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,OAAO,WAEzD;AAED,wBAAgB,6BAA6B,CAAC,KAAK,EAAE,OAAO,WAI3D;AAiKD,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,UAAU,GAAG,YAAY,GAAG,SAAS,CAMtF;AA+LD,eAAO,MAAM,MAAM,YAAa,WAAW,cAAc,MAAM,SA4G9D,CAAC;AA8GF,eAAO,MAAM,qBAAqB,gFAejC,CAAC;AAiLF,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,YAAY;IAC5C,OAAO,CAAC,cAAc,CAAoB;IAE1C,SAAgB,aAAa,EAAE,MAAM,CAAC;IAEtC,OAAO,CAAC,YAAY,CAAsB;IAE1C,OAAO,CAAC,cAAc,CAAC,CAAgB;IAGvC,OAAO,CAAC,sBAAsB,CAAoC;IAElE,OAAO,CAAC,iBAAiB,CAAoB;;IAS7C,OAAO,CAAC,cAAc;IAuChB,aAAa,CAAC,OAAO,EAAE,WAAW;IAuExC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;YAOV,gBAAgB;CAiC/B;AAED,eAAO,MAAM,QAAQ,YAIpB,CAAC;AAEF,eAAO,MAAM,aAAa,uBAYzB,CAAC;AAMF,eAAO,MAAM,IAAI,aACL,eAAe,aACd,GAAG,WACL,6BAA6B,8BAiBvC,CAAC;AAEF,eAAO,MAAM,eAAe;SAKrB,eAAe,CAAC,KAAK,CAAC;eAChB,GAAG;;UASf,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":";AACA,OAAO,YAAY,MAAM,QAAQ,CAAC;AAClC,OAAO,EAEL,KAAK,6BAA6B,EAElC,KAAK,YAAY,EAIlB,MAAM,wBAAwB,CAAC;AAiChC,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAsB1C,OAAO,eAAe,MAAM,2BAA2B,CAAC;AAYxD,OAAO,KAAK,EAAE,eAAe,EAAyB,MAAM,UAAU,CAAC;AACvE,OAAO,KAAK,EAAE,WAAW,EAAmD,MAAM,WAAW,CAAC;AAI9F,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAYpD,MAAM,MAAM,WAAW,GAAG,UAAU,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC;AA0E7D,eAAO,MAAM,OAAO,YAAmB,WAAW,WAAW,WAAW,iBA0FvE,CAAC;AA2FF,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAY3F;AAunBD,wBAAgB,kCAAkC,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,WAWpF;AAED,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,WAoB/E;AAED,wBAAgB,gCAAgC,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,WAQlF;AAED,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,OAAO,WAEzD;AAED,wBAAgB,6BAA6B,CAAC,KAAK,EAAE,OAAO,WAI3D;AAiKD,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,UAAU,GAAG,YAAY,GAAG,SAAS,CAMtF;AA2MD,eAAO,MAAM,MAAM,YAAa,WAAW,cAAc,MAAM,SA4G9D,CAAC;AA8GF,eAAO,MAAM,qBAAqB,gFAejC,CAAC;AAiLF,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,YAAY;IAC5C,OAAO,CAAC,cAAc,CAAoB;IAE1C,SAAgB,aAAa,EAAE,MAAM,CAAC;IAEtC,OAAO,CAAC,YAAY,CAAsB;IAE1C,OAAO,CAAC,cAAc,CAAC,CAAgB;IAGvC,OAAO,CAAC,sBAAsB,CAAoC;IAElE,OAAO,CAAC,iBAAiB,CAAoB;;IAS7C,OAAO,CAAC,cAAc;IAuChB,aAAa,CAAC,OAAO,EAAE,WAAW;IAuExC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;YAOV,gBAAgB;CAiC/B;AAED,eAAO,MAAM,QAAQ,YAIpB,CAAC;AAEF,eAAO,MAAM,aAAa,uBAYzB,CAAC;AAMF,eAAO,MAAM,IAAI,aACL,eAAe,aACd,GAAG,WACL,6BAA6B,8BAiBvC,CAAC;AAEF,eAAO,MAAM,eAAe;SAKrB,eAAe,CAAC,KAAK,CAAC;eAChB,GAAG;;UASf,CAAC"}

package/dist/data-manager/TransportManager.d.ts

@@ -6,9 +6,11 @@ export default class TransportManager {
     static defaultMessages: JSON | Record<string, any>;
     static currentMessages: JSON | Record<string, any>;
     static reactNativeInit: boolean;
+    static webUsbInit: boolean;
     static protocolV1MessageSchema: ProtocolV1MessageSchema;
     static plugin: LowlevelTransportSharedPlugin | null;
     static load(): void;
+    static ensureInitialized(): Promise<void>;
     static configure(): Promise<void>;
     static reconfigure(features?: Features): Promise<void>;
     static setTransport(TransportConstructor: any, plugin?: LowlevelTransportSharedPlugin): void;

package/dist/data-manager/TransportManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TransportManager.d.ts","sourceRoot":"","sources":["../../src/data-manager/TransportManager.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAC;AAC7D,OAAO,KAAK,EAAE,6BAA6B,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACvF,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAgBzC,MAAM,CAAC,OAAO,OAAO,gBAAgB;IACnC,MAAM,CAAC,SAAS,EAAE,SAAS,CAAC;IAE5B,MAAM,CAAC,eAAe,EAAE,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAEnD,MAAM,CAAC,eAAe,EAAE,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAEnD,MAAM,CAAC,eAAe,UAAS;IAE/B,MAAM,CAAC,uBAAuB,EAAE,uBAAuB,CAAqB;IAE5E,MAAM,CAAC,MAAM,EAAE,6BAA6B,GAAG,IAAI,CAAQ;IAE3D,MAAM,CAAC,IAAI;WAOE,SAAS;WAqDT,WAAW,CAAC,QAAQ,CAAC,EAAE,QAAQ;IAyB5C,MAAM,CAAC,YAAY,CAAC,oBAAoB,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE,6BAA6B;IA6BrF,MAAM,CAAC,YAAY;mBAIE,2BAA2B;IAShD,MAAM,CAAC,kBAAkB;IAIzB,MAAM,CAAC,kBAAkB;IAIzB,MAAM,CAAC,0BAA0B;CAGlC"}
+{"version":3,"file":"TransportManager.d.ts","sourceRoot":"","sources":["../../src/data-manager/TransportManager.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAC;AAC7D,OAAO,KAAK,EAAE,6BAA6B,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACvF,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAgBzC,MAAM,CAAC,OAAO,OAAO,gBAAgB;IACnC,MAAM,CAAC,SAAS,EAAE,SAAS,CAAC;IAE5B,MAAM,CAAC,eAAe,EAAE,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAEnD,MAAM,CAAC,eAAe,EAAE,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAEnD,MAAM,CAAC,eAAe,UAAS;IAE/B,MAAM,CAAC,UAAU,UAAS;IAE1B,MAAM,CAAC,uBAAuB,EAAE,uBAAuB,CAAqB;IAE5E,MAAM,CAAC,MAAM,EAAE,6BAA6B,GAAG,IAAI,CAAQ;IAE3D,MAAM,CAAC,IAAI;WAQE,iBAAiB;WAUjB,SAAS;WAmDT,WAAW,CAAC,QAAQ,CAAC,EAAE,QAAQ;IAyB5C,MAAM,CAAC,YAAY,CAAC,oBAAoB,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE,6BAA6B;IA6BrF,MAAM,CAAC,YAAY;mBAIE,2BAA2B;IAShD,MAAM,CAAC,kBAAkB;IAIzB,MAAM,CAAC,kBAAkB;IAIzB,MAAM,CAAC,0BAA0B;CAGlC"}

package/dist/index.js

@@ -43705,6 +43705,18 @@ class TransportManager {
         this.defaultMessages = DataManager.getProtobufMessages();
         this.currentMessages = this.defaultMessages;
         this.protocolV1MessageSchema = 'v1CurrentSchema';
+        this.webUsbInit = false;
+    }
+    static ensureInitialized() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const env = DataManager.getSettings('env');
+            if (env !== 'webusb' && env !== 'desktop-webusb')
+                return;
+            if (this.webUsbInit)
+                return;
+            yield this.transport.init(WebUsbLogger, DevicePool.emitter);
+            this.webUsbInit = true;
+        });
     }
     static configure() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -43733,7 +43745,7 @@ class TransportManager {
                     yield this.transport.init(WebBleLogger, DevicePool.emitter);
                 }
                 else if (env === 'webusb' || env === 'desktop-webusb') {
-                    yield this.transport.init(WebUsbLogger, DevicePool.emitter);
+                    yield this.ensureInitialized();
                 }
                 else {
                     yield this.transport.init(HttpLogger);
@@ -43816,6 +43828,7 @@ class TransportManager {
     }
 }
 TransportManager.reactNativeInit = false;
+TransportManager.webUsbInit = false;
 TransportManager.protocolV1MessageSchema = 'v1CurrentSchema';
 TransportManager.plugin = null;
 
@@ -47263,6 +47276,28 @@ class PreInitialize extends BaseMethod {
 }
 
 const Log$e = getLogger(exports.LoggerNames.DevicePool);
+const isOwnedByActiveWebUsbRequest = (descriptor, requestQueue) => {
+    if (!requestQueue)
+        return false;
+    const keys = [descriptor.path, descriptor.id].filter((key) => typeof key === 'string' && key.length > 0);
+    return keys.some(key => requestQueue.getRequestTasksIdByConnectId(key).length > 0);
+};
+const toSearchDeviceFromDescriptor = (descriptor) => {
+    const connectId = descriptor.path || descriptor.id || null;
+    return {
+        connectId,
+        uuid: connectId !== null && connectId !== void 0 ? connectId : '',
+        serialNo: connectId,
+        deviceId: null,
+        deviceType: hdShared.EDeviceType.Unknown,
+        name: descriptor.name || connectId || '',
+        commType: descriptor.commType,
+    };
+};
+const toSearchDevice = (device) => {
+    const message = device.toMessageObject();
+    return message ? message : null;
+};
 class SearchDevices extends BaseMethod {
     init() {
         this.useDevice = false;
@@ -47270,20 +47305,32 @@ class SearchDevices extends BaseMethod {
         this.skipForceUpdateCheck = true;
     }
     run() {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f, _g;
         return __awaiter(this, void 0, void 0, function* () {
-            yield TransportManager.configure();
-            const deviceDiff = yield ((_a = this.connector) === null || _a === void 0 ? void 0 : _a.enumerate());
-            const devicesDescriptor = (_b = deviceDiff === null || deviceDiff === void 0 ? void 0 : deviceDiff.descriptors) !== null && _b !== void 0 ? _b : [];
             const env = DataManager.getSettings('env');
+            const isWebUsb = env === 'webusb' || env === 'desktop-webusb';
+            const requestQueue = (_a = this.context) === null || _a === void 0 ? void 0 : _a.requestQueue;
+            const hasActiveWebUsbRequest = isWebUsb && ((_b = requestQueue === null || requestQueue === void 0 ? void 0 : requestQueue.getRequestTasksId().length) !== null && _b !== void 0 ? _b : 0) > 0;
+            if (isWebUsb) {
+                try {
+                    yield TransportManager.ensureInitialized();
+                }
+                catch (error) {
+                    Log$e.debug('WebUSB bring-up unavailable', error);
+                }
+            }
+            if (!hasActiveWebUsbRequest)
+                yield TransportManager.configure();
+            const deviceDiff = yield ((_c = this.connector) === null || _c === void 0 ? void 0 : _c.enumerate());
+            const devicesDescriptor = (_d = deviceDiff === null || deviceDiff === void 0 ? void 0 : deviceDiff.descriptors) !== null && _d !== void 0 ? _d : [];
             if (DataManager.isBleConnect(env)) {
                 const devices = [];
                 const seenIds = new Set();
                 for (const device of devicesDescriptor) {
-                    const lowerId = (_c = device.id) === null || _c === void 0 ? void 0 : _c.toLowerCase();
+                    const lowerId = (_e = device.id) === null || _e === void 0 ? void 0 : _e.toLowerCase();
                     if (!seenIds.has(lowerId)) {
                         seenIds.add(lowerId);
-                        const rawBleName = (_e = (_d = device.name) !== null && _d !== void 0 ? _d : device.localName) !== null && _e !== void 0 ? _e : '';
+                        const rawBleName = (_g = (_f = device.name) !== null && _f !== void 0 ? _f : device.localName) !== null && _g !== void 0 ? _g : '';
                         const bleName = hdShared.canonicalizePro2BleAdvertisementName(rawBleName);
                         devices.push(Object.assign(Object.assign({}, device), { connectId: device.id, serialNo: null, uuid: '', deviceId: null, name: bleName || device.name, deviceType: getDeviceTypeByBleName(bleName) }));
                     }
@@ -47292,22 +47339,33 @@ class SearchDevices extends BaseMethod {
             }
             const deviceList = [];
             for (const descriptor of devicesDescriptor) {
-                try {
-                    const result = yield DevicePool.getDevices([descriptor], descriptor.path, {
-                        connectProtocol: undefined,
-                        forceProtocolDetection: true,
-                        refreshRuntimeState: true,
-                    });
-                    deviceList.push(...result.deviceList);
+                if (hasActiveWebUsbRequest && isOwnedByActiveWebUsbRequest(descriptor, requestQueue)) {
+                    const cached = DevicePool.getDeviceByPath(descriptor.path);
+                    const message = (cached === null || cached === void 0 ? void 0 : cached.features) ? toSearchDevice(cached) : null;
+                    deviceList.push(message !== null && message !== void 0 ? message : toSearchDeviceFromDescriptor(descriptor));
                 }
-                catch (error) {
-                    const errorCode = error && typeof error === 'object' && 'errorCode' in error
-                        ? error.errorCode
-                        : undefined;
-                    Log$e.debug('Skip unavailable device during search', Object.assign({ path: descriptor.path }, (errorCode !== undefined ? { errorCode } : {})));
+                else {
+                    try {
+                        const result = yield DevicePool.getDevices([descriptor], descriptor.path, {
+                            connectProtocol: undefined,
+                            forceProtocolDetection: true,
+                            refreshRuntimeState: true,
+                        });
+                        for (const device of result.deviceList) {
+                            const message = toSearchDevice(device);
+                            if (message)
+                                deviceList.push(message);
+                        }
+                    }
+                    catch (error) {
+                        const errorCode = error && typeof error === 'object' && 'errorCode' in error
+                            ? error.errorCode
+                            : undefined;
+                        Log$e.debug('Skip unavailable device during search', Object.assign({ path: descriptor.path }, (errorCode !== undefined ? { errorCode } : {})));
+                    }
                 }
             }
-            return deviceList.map(device => device.toMessageObject());
+            return deviceList;
         });
     }
 }
@@ -65850,7 +65908,7 @@ const createUiProgressMessageFilter = (intervalMs = DEFAULT_UI_PROGRESS_INTERVAL
 
 const Log = getLogger(exports.LoggerNames.Core);
 const PRE_INITIALIZE_TTL_MS = 60 * 1000;
-const PRE_PENDING_CALL_TIMEOUT_MS = 15 * 1000;
+const PRE_PENDING_CALL_TIMEOUT_MS = 5 * 1000;
 const PRO2_USB_SIGNING_COOLDOWN_MS = 1000;
 const preWarmInflight = new Map();
 const preWarmDoneAt = new Map();
@@ -65930,6 +65988,7 @@ const callAPI = (context, message) => __awaiter(void 0, void 0, void 0, function
             }
         };
         (_a = method.setContext) === null || _a === void 0 ? void 0 : _a.call(method, context);
+        method.context = context;
         method.requestContext = createRequestContext(method.responseID, method.name, {
             sdkInstanceId: context.sdkInstanceId,
             connectId: method.connectId,
@@ -65947,7 +66006,11 @@ const callAPI = (context, message) => __awaiter(void 0, void 0, void 0, function
     if (!method.useDevice) {
         updateMethodRequestContext(method, { status: 'running' });
         try {
-            const response = yield method.run();
+            const env = DataManager.getSettings('env');
+            const response = method.name === 'searchDevices' &&
+                (DataManager.isBrowserWebUsb(env) || DataManager.isDesktopWebUsb(env))
+                ? yield context.methodSynchronize(() => method.run(), 'webusb-discovery')
+                : yield method.run();
             completeMethodRequestContext(method);
             return createResponseMessage(method.responseID, true, response);
         }
@@ -66018,20 +66081,28 @@ const waitForPendingPromise = (connectId, getPrePendingCallPromise, removePrePen
     if (pendingPromise) {
         Log.debug('pre pending call promise before call method, wait for it');
         let timer;
+        let timedOut = false;
+        let completed = false;
         try {
             yield Promise.race([
                 pendingPromise,
-                new Promise((_, reject) => {
+                new Promise(resolve => {
                     timer = setTimeout(() => {
-                        reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceBusy, 'Previous device cancellation is still draining'));
+                        timedOut = true;
+                        resolve();
                     }, PRE_PENDING_CALL_TIMEOUT_MS);
                 }),
             ]);
-            removePrePendingCallPromise === null || removePrePendingCallPromise === void 0 ? void 0 : removePrePendingCallPromise(connectId, pendingPromise);
+            completed = !timedOut;
         }
         finally {
             if (timer)
                 clearTimeout(timer);
+            if (timedOut || completed)
+                removePrePendingCallPromise === null || removePrePendingCallPromise === void 0 ? void 0 : removePrePendingCallPromise(connectId, pendingPromise);
+        }
+        if (timedOut) {
+            Log.warn('pre pending call promise timed out before call method', { connectId });
         }
         Log.debug('pre pending call promise before call method done');
     }
@@ -66079,7 +66150,22 @@ const onCallDevice = (context, message, method) => __awaiter(void 0, void 0, voi
             context.registerCallbackTask(method.connectId, preWarmCallbackTask);
         }
         const pollingId = pollingManager.start(connectId);
-        device = yield ensureConnected(context, method, connectId, pollingId, method.abortSignal);
+        const env = DataManager.getSettings('env');
+        const connect = () => ensureConnected(context, method, connectId, pollingId, method.abortSignal);
+        if (DataManager.isBrowserWebUsb(env) || DataManager.isDesktopWebUsb(env)) {
+            const connectPromise = context.methodSynchronize(() => __awaiter(void 0, void 0, void 0, function* () {
+                var _k;
+                if ((_k = method.abortSignal) === null || _k === void 0 ? void 0 : _k.aborted) {
+                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.CallQueueActionCancelled);
+                }
+                return connect();
+            }), 'webusb-discovery');
+            connectPromise.catch(() => undefined);
+            device = yield requestQueue.waitForTask(task, () => connectPromise);
+        }
+        else {
+            device = yield connect();
+        }
         if ((_e = method.abortSignal) === null || _e === void 0 ? void 0 : _e.aborted) {
             throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.CallQueueActionCancelled);
         }
@@ -66144,12 +66230,12 @@ const onCallDevice = (context, message, method) => __awaiter(void 0, void 0, voi
             return waitForPendingPromise((_a = method.connectId) !== null && _a !== void 0 ? _a : '', getPrePendingCallPromise, removePrePendingCallPromise);
         });
         const inner = () => __awaiter(void 0, void 0, void 0, function* () {
-            var _k, _l;
+            var _l, _m;
             method.assertProtocolSupported(device.getProtocol(), device.getCurrentFirmwareType());
             protocolV2Operation = device.isProtocolV2();
             const versionRange = device.getCurrentMethodVersionRange(type => method.getVersionRange()[type]);
-            const currentFirmwareVersion = (_k = device.getCurrentFirmwareVersionString()) !== null && _k !== void 0 ? _k : '0.0.0';
-            const currentBleVersion = (_l = device.getCurrentBLEFirmwareVersionString()) !== null && _l !== void 0 ? _l : '0.0.0';
+            const currentFirmwareVersion = (_l = device.getCurrentFirmwareVersionString()) !== null && _l !== void 0 ? _l : '0.0.0';
+            const currentBleVersion = (_m = device.getCurrentBLEFirmwareVersionString()) !== null && _m !== void 0 ? _m : '0.0.0';
             const deviceFirmwareType = device.getCurrentFirmwareType();
             let newVersionStatus;
             if (device.features && !device.isProtocolV2()) {
@@ -66227,7 +66313,7 @@ const onCallDevice = (context, message, method) => __awaiter(void 0, void 0, voi
                         }
                     },
                     prepare: () => __awaiter(void 0, void 0, void 0, function* () {
-                        var _m, _o, _p, _q, _r, _s;
+                        var _o, _p, _q, _r, _s, _t;
                         if (method.deviceId && method.checkDeviceId && !deviceIdCheckedDuringUnlockPreflight) {
                             const isSameDeviceID = yield checkLiveDeviceId(device, method.deviceId);
                             if (!isSameDeviceID) {
@@ -66247,7 +66333,7 @@ const onCallDevice = (context, message, method) => __awaiter(void 0, void 0, voi
                                     require: support.require,
                                 });
                             }
-                            const passphraseStateSafety = yield device.checkPassphraseStateSafety((_m = method.payload) === null || _m === void 0 ? void 0 : _m.passphraseState, (_o = method.payload) === null || _o === void 0 ? void 0 : _o.useEmptyPassphrase, (_p = method.payload) === null || _p === void 0 ? void 0 : _p.skipPassphraseCheck, resolveDeriveCardano(method), (_q = method.protocolV2UnlockContext) === null || _q === void 0 ? void 0 : _q.preflightMainPinSelected);
+                            const passphraseStateSafety = yield device.checkPassphraseStateSafety((_o = method.payload) === null || _o === void 0 ? void 0 : _o.passphraseState, (_p = method.payload) === null || _p === void 0 ? void 0 : _p.useEmptyPassphrase, (_q = method.payload) === null || _q === void 0 ? void 0 : _q.skipPassphraseCheck, resolveDeriveCardano(method), (_r = method.protocolV2UnlockContext) === null || _r === void 0 ? void 0 : _r.preflightMainPinSelected);
                             checkPassphraseEnableState(method, device.features);
                             if (!passphraseStateSafety) {
                                 DevicePool.clearDeviceCache(method.payload.connectId);
@@ -66265,7 +66351,7 @@ const onCallDevice = (context, message, method) => __awaiter(void 0, void 0, voi
                                 ? e
                                 : hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'open safety check failed.');
                         }
-                        (_s = (_r = method.device) === null || _r === void 0 ? void 0 : _r.commands) === null || _s === void 0 ? void 0 : _s.checkDisposed();
+                        (_t = (_s = method.device) === null || _s === void 0 ? void 0 : _s.commands) === null || _t === void 0 ? void 0 : _t.checkDisposed();
                     }),
                 });
                 messageResponse = createResponseMessage(method.responseID, true, response);
@@ -66620,10 +66706,11 @@ const ensureConnected = (_context, method, connectId, pollingId, abortSignal) =>
     const POLL_INTERVAL_TIME = (method.payload && method.payload.pollIntervalTime) || 1000;
     const TIME_OUT = (method.payload && method.payload.timeout) || 10000;
     let timer = null;
+    let lastInitializeError;
     Log.debug(`EnsureConnected function start, MAX_RETRY_COUNT=${MAX_RETRY_COUNT}, POLL_INTERVAL_TIME=${POLL_INTERVAL_TIME}  `);
     const poll = (time = POLL_INTERVAL_TIME) => __awaiter(void 0, void 0, void 0, function* () {
         return new Promise((resolve, reject) => __awaiter(void 0, void 0, void 0, function* () {
-            var _t;
+            var _u;
             const abort = () => {
                 if (abortSignal && abortSignal.aborted) {
                     if (timer) {
@@ -66652,8 +66739,10 @@ const ensureConnected = (_context, method, connectId, pollingId, abortSignal) =>
             Log.debug('EnsureConnected function try count: ', tryCount, ' poll interval time: ', time);
             try {
                 yield initDeviceList(method);
+                lastInitializeError = undefined;
             }
             catch (error) {
+                lastInitializeError = error;
                 Log.debug('device list error: ', error);
                 if ([
                     hdShared.HardwareErrorCode.BridgeNotInstalled,
@@ -66666,6 +66755,7 @@ const ensureConnected = (_context, method, connectId, pollingId, abortSignal) =>
                 }
                 if (error.errorCode === hdShared.HardwareErrorCode.TransportNotConfigured) {
                     yield TransportManager.configure();
+                    lastInitializeError = undefined;
                 }
             }
             if (abort()) {
@@ -66748,13 +66838,16 @@ const ensureConnected = (_context, method, connectId, pollingId, abortSignal) =>
                     clearTimeout(timer);
                 }
                 Log.debug('EnsureConnected get to max try count, will return: ', tryCount);
-                if (DataManager.isBrowserWebUsb(env) && !((_t = method.payload) === null || _t === void 0 ? void 0 : _t.skipWebDevicePrompt)) {
+                const preserveWebUsbInitError = DataManager.isBrowserWebUsb(env) || DataManager.isDesktopWebUsb(env);
+                const needsPermissionPrompt = DataManager.isBrowserWebUsb(env) && !((_u = method.payload) === null || _u === void 0 ? void 0 : _u.skipWebDevicePrompt);
+                const fallbackError = needsPermissionPrompt
+                    ? hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.WebDeviceNotFoundOrNeedsPermission)
+                    : hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceNotFound);
+                const errorToReject = preserveWebUsbInitError && lastInitializeError ? lastInitializeError : fallbackError;
+                if (needsPermissionPrompt && errorToReject === fallbackError) {
                     postMessage(createUiMessage(UI_REQUEST.WEB_DEVICE_PROMPT_ACCESS_PERMISSION));
-                    reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.WebDeviceNotFoundOrNeedsPermission));
-                }
-                else {
-                    reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceNotFound));
                 }
+                reject(errorToReject);
                 return;
             }
             if (abort()) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "1.2.2-alpha.112",
+  "version": "1.2.2-alpha.114",
   "description": "Core processes and APIs for communicating with OneKey hardware devices.",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
@@ -25,8 +25,8 @@
     "url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
   },
   "dependencies": {
-    "@onekeyfe/hd-shared": "1.2.2-alpha.112",
-    "@onekeyfe/hd-transport": "1.2.2-alpha.112",
+    "@onekeyfe/hd-shared": "1.2.2-alpha.114",
+    "@onekeyfe/hd-transport": "1.2.2-alpha.114",
     "axios": "1.15.2",
     "bignumber.js": "^9.0.2",
     "buffer": "^6.0.3",
@@ -46,5 +46,5 @@
     "@types/w3c-web-usb": "^1.0.10",
     "@types/web-bluetooth": "^0.0.21"
   },
-  "gitHead": "3b31cf365ea4042a5fb2e78dd7ede9a2d9d96e04"
+  "gitHead": "6490382eeeb6bda264b71c7e9bf96143840ee1cb"
 }

package/src/api/SearchDevices.ts

@@ -1,4 +1,4 @@
-import { canonicalizePro2BleAdvertisementName } from '@onekeyfe/hd-shared';
+import { EDeviceType, canonicalizePro2BleAdvertisementName } from '@onekeyfe/hd-shared';
 
 import { BaseMethod } from './BaseMethod';
 import TransportManager from '../data-manager/TransportManager';
@@ -6,10 +6,46 @@ import { DataManager } from '../data-manager';
 import { LoggerNames, getDeviceTypeByBleName, getLogger } from '../utils';
 import { DevicePool } from '../device/DevicePool';
 
+import type { SearchDevice } from '../types/device';
 import type DeviceConnector from '../device/DeviceConnector';
+import type { OneKeyDeviceInfo as DeviceDescriptor } from '@onekeyfe/hd-transport';
+import type { Device } from '../device/Device';
 
 const Log = getLogger(LoggerNames.DevicePool);
 
+type RequestQueueLookup = {
+  getRequestTasksIdByConnectId: (connectId: string) => number[];
+};
+
+const isOwnedByActiveWebUsbRequest = (
+  descriptor: DeviceDescriptor,
+  requestQueue?: RequestQueueLookup
+) => {
+  if (!requestQueue) return false;
+  const keys = [descriptor.path, descriptor.id].filter(
+    (key): key is string => typeof key === 'string' && key.length > 0
+  );
+  return keys.some(key => requestQueue.getRequestTasksIdByConnectId(key).length > 0);
+};
+
+const toSearchDeviceFromDescriptor = (descriptor: DeviceDescriptor): SearchDevice => {
+  const connectId = descriptor.path || descriptor.id || null;
+  return {
+    connectId,
+    uuid: connectId ?? '',
+    serialNo: connectId,
+    deviceId: null,
+    deviceType: EDeviceType.Unknown,
+    name: descriptor.name || connectId || '',
+    commType: descriptor.commType,
+  };
+};
+
+const toSearchDevice = (device: Device): SearchDevice | null => {
+  const message = device.toMessageObject();
+  return message ? (message as SearchDevice) : null;
+};
+
 export default class SearchDevices extends BaseMethod {
   connector?: DeviceConnector;
 
@@ -19,19 +55,31 @@ export default class SearchDevices extends BaseMethod {
     this.skipForceUpdateCheck = true;
   }
 
-  async run() {
-    await TransportManager.configure();
+  async run(): Promise<SearchDevice[]> {
+    const env = DataManager.getSettings('env');
+    const isWebUsb = env === 'webusb' || env === 'desktop-webusb';
+    const requestQueue = this.context?.requestQueue;
+    const hasActiveWebUsbRequest = isWebUsb && (requestQueue?.getRequestTasksId().length ?? 0) > 0;
+    // Bring up WebUSB even when schema configuration is deferred while a
+    // business request owns the discovery lock. Failures here used to be
+    // swallowed by configure(); keep searchDevices resolving empty.
+    if (isWebUsb) {
+      try {
+        await TransportManager.ensureInitialized();
+      } catch (error) {
+        Log.debug('WebUSB bring-up unavailable', error);
+      }
+    }
+    if (!hasActiveWebUsbRequest) await TransportManager.configure();
     const deviceDiff = await this.connector?.enumerate();
     const devicesDescriptor = deviceDiff?.descriptors ?? [];
 
-    const env = DataManager.getSettings('env');
-
     /**
      * No need to call features during Bluetooth scaning
      * to avoid device pairing
      */
     if (DataManager.isBleConnect(env)) {
-      const devices = [];
+      const devices: SearchDevice[] = [];
       const seenIds = new Set<string>();
 
       for (const device of devicesDescriptor) {
@@ -56,30 +104,41 @@ export default class SearchDevices extends BaseMethod {
       return devices;
     }
 
-    const deviceList = [];
+    const deviceList: SearchDevice[] = [];
     for (const descriptor of devicesDescriptor) {
-      try {
-        // Discovery is best effort. Browsers may retain WebUSB grants for devices that
-        // are offline, busy, or not ready, so one descriptor must not abort the scan.
-        const result = await DevicePool.getDevices([descriptor], descriptor.path, {
-          // Discovery must actively identify the protocol instead of trusting a caller hint.
-          connectProtocol: undefined,
-          forceProtocolDetection: true,
-          refreshRuntimeState: true,
-        });
-        deviceList.push(...result.deviceList);
-      } catch (error) {
-        const errorCode =
-          error && typeof error === 'object' && 'errorCode' in error
-            ? (error as { errorCode?: unknown }).errorCode
-            : undefined;
-        Log.debug('Skip unavailable device during search', {
-          path: descriptor.path,
-          ...(errorCode !== undefined ? { errorCode } : {}),
-        });
+      if (hasActiveWebUsbRequest && isOwnedByActiveWebUsbRequest(descriptor, requestQueue)) {
+        const cached = DevicePool.getDeviceByPath(descriptor.path);
+        const message = cached?.features ? toSearchDevice(cached) : null;
+        // Do not probe a path an in-flight request already owns. A cache miss
+        // (passphrase switch / initSession) is still a connected device.
+        deviceList.push(message ?? toSearchDeviceFromDescriptor(descriptor));
+      } else {
+        try {
+          // Discovery is best effort. Browsers may retain WebUSB grants for devices that
+          // are offline, busy, or not ready, so one descriptor must not abort the scan.
+          const result = await DevicePool.getDevices([descriptor], descriptor.path, {
+            // Discovery must actively identify the protocol instead of trusting a caller hint.
+            connectProtocol: undefined,
+            forceProtocolDetection: true,
+            refreshRuntimeState: true,
+          });
+          for (const device of result.deviceList) {
+            const message = toSearchDevice(device);
+            if (message) deviceList.push(message);
+          }
+        } catch (error) {
+          const errorCode =
+            error && typeof error === 'object' && 'errorCode' in error
+              ? (error as { errorCode?: unknown }).errorCode
+              : undefined;
+          Log.debug('Skip unavailable device during search', {
+            path: descriptor.path,
+            ...(errorCode !== undefined ? { errorCode } : {}),
+          });
+        }
       }
     }
 
-    return deviceList.map(device => device.toMessageObject());
+    return deviceList;
   }
 }

package/src/core/index.ts

@@ -84,7 +84,7 @@ import type { BaseMethod } from '../api/BaseMethod';
 
 const Log = getLogger(LoggerNames.Core);
 const PRE_INITIALIZE_TTL_MS = 60 * 1000;
-const PRE_PENDING_CALL_TIMEOUT_MS = 15 * 1000;
+const PRE_PENDING_CALL_TIMEOUT_MS = 5 * 1000;
 const PRO2_USB_SIGNING_COOLDOWN_MS = 1000;
 
 // Dedup/coalesce state for "pre-warm signal" methods (isPreWarmSignal),
@@ -183,6 +183,7 @@ export const callAPI = async (context: CoreContext, message: CoreMessage) => {
       }
     };
     method.setContext?.(context);
+    method.context = context;
 
     method.requestContext = createRequestContext(method.responseID, method.name, {
       sdkInstanceId: context.sdkInstanceId,
@@ -203,7 +204,12 @@ export const callAPI = async (context: CoreContext, message: CoreMessage) => {
   if (!method.useDevice) {
     updateMethodRequestContext(method, { status: 'running' });
     try {
-      const response = await method.run();
+      const env = DataManager.getSettings('env');
+      const response =
+        method.name === 'searchDevices' &&
+        (DataManager.isBrowserWebUsb(env) || DataManager.isDesktopWebUsb(env))
+          ? await context.methodSynchronize(() => method.run(), 'webusb-discovery')
+          : await method.run();
       completeMethodRequestContext(method);
       return createResponseMessage(method.responseID, true, response);
     } catch (error) {
@@ -315,25 +321,27 @@ const waitForPendingPromise = async (
   if (pendingPromise) {
     Log.debug('pre pending call promise before call method, wait for it');
     let timer: ReturnType<typeof setTimeout> | undefined;
+    let timedOut = false;
+    let completed = false;
     try {
       await Promise.race([
         pendingPromise,
-        new Promise<void>((_, reject) => {
+        new Promise<void>(resolve => {
           timer = setTimeout(() => {
-            reject(
-              ERRORS.TypedError(
-                HardwareErrorCode.DeviceBusy,
-                'Previous device cancellation is still draining'
-              )
-            );
+            timedOut = true;
+            resolve();
           }, PRE_PENDING_CALL_TIMEOUT_MS);
         }),
       ]);
-      // A deadline is not evidence that old I/O is safe to reuse. Keep the
-      // barrier on failure; a later call may proceed only after cleanup settles.
-      removePrePendingCallPromise?.(connectId, pendingPromise);
+      completed = !timedOut;
     } finally {
       if (timer) clearTimeout(timer);
+      // Keep a rejected cleanup barrier for the next caller's safety check;
+      // only a completed cleanup or a timeout may clear it.
+      if (timedOut || completed) removePrePendingCallPromise?.(connectId, pendingPromise);
+    }
+    if (timedOut) {
+      Log.warn('pre pending call promise timed out before call method', { connectId });
     }
     Log.debug('pre pending call promise before call method done');
   }
@@ -411,7 +419,26 @@ const onCallDevice = async (
      * Polling to ensure successful connection
      */
     const pollingId = pollingManager.start(connectId);
-    device = await ensureConnected(context, method, connectId, pollingId, method.abortSignal);
+    const env = DataManager.getSettings('env');
+    const connect = () =>
+      ensureConnected(context, method, connectId, pollingId, method.abortSignal);
+    // Discovery may acquire USB endpoints. Finish it before initializing a public
+    // request; once registered, that request makes discovery use cached state only.
+    if (DataManager.isBrowserWebUsb(env) || DataManager.isDesktopWebUsb(env)) {
+      // Synchronization can keep the connect action queued after the caller is
+      // cancelled. Observe that promise so a late device-not-found error does
+      // not become an unhandled rejection.
+      const connectPromise = context.methodSynchronize(async () => {
+        if (method.abortSignal?.aborted) {
+          throw ERRORS.TypedError(HardwareErrorCode.CallQueueActionCancelled);
+        }
+        return connect();
+      }, 'webusb-discovery');
+      connectPromise.catch(() => undefined);
+      device = await requestQueue.waitForTask(task, () => connectPromise);
+    } else {
+      device = await connect();
+    }
     if (method.abortSignal?.aborted) {
       throw ERRORS.TypedError(HardwareErrorCode.CallQueueActionCancelled);
     }
@@ -1200,6 +1227,7 @@ const ensureConnected = async (
   const POLL_INTERVAL_TIME = (method.payload && method.payload.pollIntervalTime) || 1000;
   const TIME_OUT = (method.payload && method.payload.timeout) || 10000;
   let timer: ReturnType<typeof setTimeout> | null = null;
+  let lastInitializeError: any;
   Log.debug(
     `EnsureConnected function start, MAX_RETRY_COUNT=${MAX_RETRY_COUNT}, POLL_INTERVAL_TIME=${POLL_INTERVAL_TIME}  `
   );
@@ -1240,7 +1268,9 @@ const ensureConnected = async (
       Log.debug('EnsureConnected function try count: ', tryCount, ' poll interval time: ', time);
       try {
         await initDeviceList(method);
+        lastInitializeError = undefined;
       } catch (error) {
+        lastInitializeError = error;
         Log.debug('device list error: ', error);
         if (
           [
@@ -1255,6 +1285,7 @@ const ensureConnected = async (
         }
         if (error.errorCode === HardwareErrorCode.TransportNotConfigured) {
           await TransportManager.configure();
+          lastInitializeError = undefined;
         }
       }
 
@@ -1352,14 +1383,22 @@ const ensureConnected = async (
           clearTimeout(timer);
         }
         Log.debug('EnsureConnected get to max try count, will return: ', tryCount);
-        // Browser WebUSB needs permission prompt, desktop WebUSB doesn't
-        // skipWebDevicePrompt can override this behavior for special cases
-        if (DataManager.isBrowserWebUsb(env) && !method.payload?.skipWebDevicePrompt) {
+        const preserveWebUsbInitError =
+          DataManager.isBrowserWebUsb(env) || DataManager.isDesktopWebUsb(env);
+        const needsPermissionPrompt =
+          DataManager.isBrowserWebUsb(env) && !method.payload?.skipWebDevicePrompt;
+        const fallbackError = needsPermissionPrompt
+          ? ERRORS.TypedError(HardwareErrorCode.WebDeviceNotFoundOrNeedsPermission)
+          : ERRORS.TypedError(HardwareErrorCode.DeviceNotFound);
+        const errorToReject =
+          preserveWebUsbInitError && lastInitializeError ? lastInitializeError : fallbackError;
+        // Only ask the host for a WebUSB grant when the failure is actually
+        // "not found / needs permission". A preserved initialize error must
+        // not fire that prompt with a different public code.
+        if (needsPermissionPrompt && errorToReject === fallbackError) {
           postMessage(createUiMessage(UI_REQUEST.WEB_DEVICE_PROMPT_ACCESS_PERMISSION));
-          reject(ERRORS.TypedError(HardwareErrorCode.WebDeviceNotFoundOrNeedsPermission));
-        } else {
-          reject(ERRORS.TypedError(HardwareErrorCode.DeviceNotFound));
         }
+        reject(errorToReject);
         return;
       }
 

package/src/data-manager/TransportManager.ts

@@ -33,6 +33,8 @@ export default class TransportManager {
 
   static reactNativeInit = false;
 
+  static webUsbInit = false;
+
   static protocolV1MessageSchema: ProtocolV1MessageSchema = 'v1CurrentSchema';
 
   static plugin: LowlevelTransportSharedPlugin | null = null;
@@ -42,6 +44,17 @@ export default class TransportManager {
     this.defaultMessages = DataManager.getProtobufMessages();
     this.currentMessages = this.defaultMessages;
     this.protocolV1MessageSchema = 'v1CurrentSchema';
+    this.webUsbInit = false;
+  }
+
+  static async ensureInitialized() {
+    const env = DataManager.getSettings('env');
+    if (env !== 'webusb' && env !== 'desktop-webusb') return;
+    if (this.webUsbInit) return;
+    // The emitter registers USB disconnect events; this must happen even when
+    // schema configuration is intentionally deferred during discovery.
+    await this.transport.init(WebUsbLogger, DevicePool.emitter);
+    this.webUsbInit = true;
   }
 
   static async configure() {
@@ -69,9 +82,7 @@ export default class TransportManager {
       } else if (env === 'desktop-web-ble') {
         await this.transport.init(WebBleLogger, DevicePool.emitter);
       } else if (env === 'webusb' || env === 'desktop-webusb') {
-        // The emitter is what turns a navigator.usb 'disconnect' into a
-        // DEVICE.DISCONNECT; without it WebUSB never reports device removal.
-        await this.transport.init(WebUsbLogger, DevicePool.emitter);
+        await this.ensureInitialized();
       } else {
         await this.transport.init(HttpLogger);
       }