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

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,75 @@ 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' },
+        } 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 : 1);
+      } 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

@@ -17,15 +17,16 @@ 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 devicePoolMock: {
+  DevicePool: { getDevices: jest.Mock; getDeviceByPath: jest.Mock };
+} = jest.requireMock('../src/device/DevicePool');
 const dataManagerMock: {
   DataManager: {
     getSettings: jest.Mock;
@@ -40,8 +41,43 @@ 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}` }),
+      }));
+      devicePoolMock.DevicePool.getDeviceByPath.mockImplementation(
+        (path: string) => devices[['usb-V1', 'usb-V2'].indexOf(path)]
+      );
+      const method = new SearchDevices({
+        id: 1,
+        payload: { method: 'searchDevices' },
+      } as never);
+      method.init();
+      method.context = {
+        requestQueue: { getRequestTasksId: () => [2] },
+      } as never;
+      method.connector = {
+        enumerate: jest.fn().mockResolvedValue({
+          descriptors: [{ path: 'usb-V1' }, { path: 'usb-V2' }, { path: 'not-initialized' }],
+        }),
+      } as never;
+
+      await expect(method.run()).resolves.toEqual([
+        { connectId: 'serial-V1' },
+        { connectId: 'serial-V2' },
+      ]);
+      expect(mockGetDevices).not.toHaveBeenCalled();
+      expect(mockConfigureTransport).not.toHaveBeenCalled();
+    }
+  );
+
   test('搜索忽略调用方协议并主动探测，单个无响应设备不阻断后续结果', async () => {
     const unresponsiveDescriptor = {
       path: 'stale-usb-device',

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,MAAM,2BAA2B,CAAC;AAI7D,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,UAAU;IACnD,SAAS,CAAC,EAAE,eAAe,CAAC;IAE5B,IAAI;IAME,GAAG;;;;;;;;;;;;;;;CA0EV"}

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;AAyFF,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAY3F;AA8mBD,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;AAwMD,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/index.js

@@ -47270,26 +47270,35 @@ 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 useCachedWebUsbDevices = (env === 'webusb' || env === 'desktop-webusb') &&
+                ((_b = (_a = this.context) === null || _a === void 0 ? void 0 : _a.requestQueue.getRequestTasksId().length) !== null && _b !== void 0 ? _b : 0) > 0;
+            if (!useCachedWebUsbDevices)
+                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) }));
                     }
                 }
                 return devices;
             }
+            if (useCachedWebUsbDevices) {
+                return devicesDescriptor.flatMap(descriptor => {
+                    const device = DevicePool.getDeviceByPath(descriptor.path);
+                    return (device === null || device === void 0 ? void 0 : device.features) ? [device.toMessageObject()] : [];
+                });
+            }
             const deviceList = [];
             for (const descriptor of devicesDescriptor) {
                 try {
@@ -65850,7 +65859,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 +65939,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 +65957,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 +66032,25 @@ const waitForPendingPromise = (connectId, getPrePendingCallPromise, removePrePen
     if (pendingPromise) {
         Log.debug('pre pending call promise before call method, wait for it');
         let timer;
+        let timedOut = 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);
         }
         finally {
             if (timer)
                 clearTimeout(timer);
+            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 +66098,12 @@ 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);
+        device =
+            DataManager.isBrowserWebUsb(env) || DataManager.isDesktopWebUsb(env)
+                ? yield requestQueue.waitForTask(task, () => context.methodSynchronize(connect, 'webusb-discovery'))
+                : yield connect();
         if ((_e = method.abortSignal) === null || _e === void 0 ? void 0 : _e.aborted) {
             throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.CallQueueActionCancelled);
         }
@@ -66667,6 +66691,15 @@ const ensureConnected = (_context, method, connectId, pollingId, abortSignal) =>
                 if (error.errorCode === hdShared.HardwareErrorCode.TransportNotConfigured) {
                     yield TransportManager.configure();
                 }
+                else {
+                    const env = DataManager.getSettings('env');
+                    if (DataManager.isBrowserWebUsb(env) || DataManager.isDesktopWebUsb(env)) {
+                        if (timer)
+                            clearTimeout(timer);
+                        reject(error);
+                        return;
+                    }
+                }
             }
             if (abort()) {
                 return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "1.2.2-alpha.112",
+  "version": "1.2.2-alpha.113",
   "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.113",
+    "@onekeyfe/hd-transport": "1.2.2-alpha.113",
     "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": "32601b82b280b9ec97161cb4206a15cf9cd72881"
 }

package/src/api/SearchDevices.ts

@@ -20,12 +20,16 @@ export default class SearchDevices extends BaseMethod {
   }
 
   async run() {
-    await TransportManager.configure();
+    const env = DataManager.getSettings('env');
+    const useCachedWebUsbDevices =
+      (env === 'webusb' || env === 'desktop-webusb') &&
+      (this.context?.requestQueue.getRequestTasksId().length ?? 0) > 0;
+    // Core serializes WebUSB discovery with connection setup. A registered
+    // business request owns the connection, including its initialization phase.
+    if (!useCachedWebUsbDevices) 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
@@ -56,6 +60,13 @@ export default class SearchDevices extends BaseMethod {
       return devices;
     }
 
+    if (useCachedWebUsbDevices) {
+      return devicesDescriptor.flatMap(descriptor => {
+        const device = DevicePool.getDeviceByPath(descriptor.path);
+        return device?.features ? [device.toMessageObject()] : [];
+      });
+    }
+
     const deviceList = [];
     for (const descriptor of devicesDescriptor) {
       try {

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,25 @@ 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;
     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);
     } finally {
       if (timer) clearTimeout(timer);
+      // Match the legacy behavior: a stuck cleanup must not permanently poison
+      // this connectId. The next request will reacquire the device if needed.
+      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 +417,17 @@ 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.
+    device =
+      DataManager.isBrowserWebUsb(env) || DataManager.isDesktopWebUsb(env)
+        ? await requestQueue.waitForTask(task, () =>
+            context.methodSynchronize(connect, 'webusb-discovery')
+          )
+        : await connect();
     if (method.abortSignal?.aborted) {
       throw ERRORS.TypedError(HardwareErrorCode.CallQueueActionCancelled);
     }
@@ -1255,6 +1271,15 @@ const ensureConnected = async (
         }
         if (error.errorCode === HardwareErrorCode.TransportNotConfigured) {
           await TransportManager.configure();
+        } else {
+          const env = DataManager.getSettings('env');
+          if (DataManager.isBrowserWebUsb(env) || DataManager.isDesktopWebUsb(env)) {
+            // Enumeration succeeded far enough to attempt initialization. Do not
+            // replace its failure with a lookup against the now-empty DeviceList.
+            if (timer) clearTimeout(timer);
+            reject(error);
+            return;
+          }
         }
       }