@onekeyfe/hd-core 1.2.8-alpha.19 → 1.2.8-alpha.20

package/__tests__/usb-identity-probe.test.ts

@@ -206,72 +206,19 @@ describe('isolated USB identity probe', () => {
     expect(transport.release).not.toHaveBeenCalled();
   });
 
-  test('retries its own failed Bridge release before probing again', async () => {
-    const transport = createTransport();
-    let held: string | undefined;
-    transport.enumerate.mockImplementation(() =>
-      Promise.resolve([{ ...descriptor, commType: 'bridge', session: held }])
-    );
-    transport.acquire.mockImplementation(() => {
-      held = 'probe-transport-handle';
-      return Promise.resolve(held);
-    });
-    transport.release
-      .mockRejectedValueOnce(new Error('release request lost'))
-      .mockRejectedValueOnce(new Error('Bridge still unavailable'))
-      .mockImplementation(() => {
-        held = undefined;
-        return Promise.resolve(undefined);
-      });
-
-    await expect(probeUsbDeviceIdentitiesWithTransport(transport, 'bridge')).resolves.toEqual([]);
-    await expect(probeUsbDeviceIdentitiesWithTransport(transport, 'bridge')).resolves.toEqual([]);
-    expect(transport.acquire).toHaveBeenCalledTimes(1);
-    expect(transport.call).toHaveBeenCalledTimes(1);
-    await expect(probeUsbDeviceIdentitiesWithTransport(transport, 'bridge')).resolves.toHaveLength(
-      1
-    );
-    expect(transport.acquire).toHaveBeenCalledTimes(2);
-    expect(transport.release).toHaveBeenCalledTimes(4);
-  });
-
-  test.each([undefined, 'foreign-transport-handle'])(
-    'does not retry a stale Bridge release when ownership changes to %s',
-    async replacement => {
+  test.each([undefined, 'occupied-transport-handle'])(
+    'does not initialize or acquire a Bridge identity probe (session: %s)',
+    async session => {
       const transport = createTransport();
-      transport.enumerate.mockResolvedValue([{ ...descriptor, commType: 'bridge' }]);
-      transport.release.mockRejectedValueOnce(new Error('release response lost'));
-      await probeUsbDeviceIdentitiesWithTransport(transport, 'bridge');
-      transport.enumerate.mockResolvedValue([
-        { ...descriptor, commType: 'bridge', session: replacement },
-      ]);
-      transport.release.mockClear();
-      const result = await probeUsbDeviceIdentitiesWithTransport(transport, 'bridge');
-      expect(result).toHaveLength(replacement ? 0 : 1);
-      expect(transport.release).toHaveBeenCalledTimes(replacement ? 0 : 1);
-      if (replacement) {
-        transport.enumerate.mockResolvedValue([{ ...descriptor, commType: 'bridge' }]);
-        await expect(
-          probeUsbDeviceIdentitiesWithTransport(transport, 'bridge')
-        ).resolves.toHaveLength(1);
-      }
+      transport.enumerate.mockResolvedValue([{ ...descriptor, commType: 'bridge', session }]);
+      await expect(probeUsbDeviceIdentitiesWithTransport(transport, 'bridge')).resolves.toEqual([]);
+      expect(transport.init).not.toHaveBeenCalled();
+      expect(transport.enumerate).not.toHaveBeenCalled();
+      expect(transport.acquire).not.toHaveBeenCalled();
+      expect(transport.release).not.toHaveBeenCalled();
     }
   );
 
-  test('never cleans up a Bridge handle recorded by another transport instance', async () => {
-    const transport = createTransport();
-    transport.enumerate.mockResolvedValue([{ ...descriptor, commType: 'bridge' }]);
-    transport.release.mockRejectedValueOnce(new Error('release request lost'));
-    await probeUsbDeviceIdentitiesWithTransport(transport, 'bridge');
-    const other = createTransport();
-    other.enumerate.mockResolvedValue([
-      { ...descriptor, commType: 'bridge', session: 'usb-transport-handle' },
-    ]);
-    await expect(probeUsbDeviceIdentitiesWithTransport(other, 'bridge')).resolves.toEqual([]);
-    expect(other.release).not.toHaveBeenCalled();
-    expect(other.acquire).not.toHaveBeenCalled();
-  });
-
   test('reuses identity only for the exact active WebUSB handle', () => {
     const handle = {};
     const endpoint = { ...descriptor, device: handle };

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;AAU1C,OAAO,KAAK,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAEvE,OAAO,KAAK,eAAe,MAAM,2BAA2B,CAAC;AAC7D,OAAO,KAAK,EACV,YAAY,EACZ,gBAAgB,IAAI,gBAAgB,EAEpC,SAAS,EACV,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAI/C,KAAK,kBAAkB,GAAG;IACxB,4BAA4B,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,MAAM,EAAE,CAAC;IAC9D,OAAO,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK;QAAE,MAAM,EAAE;YAAE,MAAM,CAAC,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,GAAG,SAAS,CAAC;CAC7E,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG,IAAI,CAAC,gBAAgB,EAAE,MAAM,GAAG,UAAU,CAAC,GAClF,OAAO,CAAC,IAAI,CAAC,gBAAgB,EAAE,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC;AA4CpD,eAAO,MAAM,yBAAyB,eACxB,0BAA0B,gBACxB,kBAAkB,KAC/B,iBAAiB,GAAG,SAYtB,CAAC;AAEF,MAAM,MAAM,yBAAyB,GAAG,IAAI,CAC1C,SAAS,EACT,SAAS,GAAG,MAAM,GAAG,iBAAiB,GAAG,qBAAqB,CAC/D,GAAG;IACF,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC;IAClC,SAAS,EAAE,MAAM,OAAO,CAAC,0BAA0B,EAAE,CAAC,CAAC;IACvD,OAAO,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAC9D,SAAS,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACzD,CAAC;AAcF,eAAO,MAAM,qCAAqC,cACrC,yBAAyB,YAC1B,iBAAiB,CAAC,UAAU,CAAC,mCACP,0BAA0B,KAAK,iBAAiB,GAAG,SAAS,kBAC3F,QAAQ,iBAAiB,EAAE,CAgI7B,CAAC;AAsBF,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,UAAU;IACnD,SAAS,CAAC,EAAE,eAAe,CAAa;IAExC,IAAI;IAME,GAAG,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;CAuFrC"}
+{"version":3,"file":"SearchDevices.d.ts","sourceRoot":"","sources":["../../src/api/SearchDevices.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAU1C,OAAO,KAAK,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAEvE,OAAO,KAAK,eAAe,MAAM,2BAA2B,CAAC;AAC7D,OAAO,KAAK,EACV,YAAY,EACZ,gBAAgB,IAAI,gBAAgB,EAEpC,SAAS,EACV,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAI/C,KAAK,kBAAkB,GAAG;IACxB,4BAA4B,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,MAAM,EAAE,CAAC;IAC9D,OAAO,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK;QAAE,MAAM,EAAE;YAAE,MAAM,CAAC,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,GAAG,SAAS,CAAC;CAC7E,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG,IAAI,CAAC,gBAAgB,EAAE,MAAM,GAAG,UAAU,CAAC,GAClF,OAAO,CAAC,IAAI,CAAC,gBAAgB,EAAE,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC;AA4CpD,eAAO,MAAM,yBAAyB,eACxB,0BAA0B,gBACxB,kBAAkB,KAC/B,iBAAiB,GAAG,SAYtB,CAAC;AAEF,MAAM,MAAM,yBAAyB,GAAG,IAAI,CAC1C,SAAS,EACT,SAAS,GAAG,MAAM,GAAG,iBAAiB,GAAG,qBAAqB,CAC/D,GAAG;IACF,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC;IAClC,SAAS,EAAE,MAAM,OAAO,CAAC,0BAA0B,EAAE,CAAC,CAAC;IACvD,OAAO,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAC9D,SAAS,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACzD,CAAC;AAYF,eAAO,MAAM,qCAAqC,cACrC,yBAAyB,YAC1B,iBAAiB,CAAC,UAAU,CAAC,mCACP,0BAA0B,KAAK,iBAAiB,GAAG,SAAS,kBAC3F,QAAQ,iBAAiB,EAAE,CAoG7B,CAAC;AAsBF,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,UAAU;IACnD,SAAS,CAAC,EAAE,eAAe,CAAa;IAExC,IAAI;IAME,GAAG,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;CAuFrC"}

package/dist/core/index.d.ts

@@ -38,5 +38,5 @@ export declare const switchTransport: ({ env, Transport, plugin, }: {
     env: ConnectSettings['env'];
     Transport: any;
     plugin?: LowlevelTransportSharedPlugin | undefined;
-}) => void;
+}) => Promise<void>;
 //# sourceMappingURL=index.d.ts.map

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,EAAE,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AACjE,OAAO,YAAY,MAAM,QAAQ,CAAC;AAClC,OAAO,EAEL,KAAK,6BAA6B,EAElC,KAAK,YAAY,EAIlB,MAAM,wBAAwB,CAAC;AAgChC,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,6BAA6B,CAAC,KAAK,EAAE,OAAO,WAI3D;AAiKD,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,UAAU,GAAG,YAAY,GAAG,SAAS,CAMtF;AA4MD,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,yBAAyB,CAAC,UAAU,EAAE,UAAU,CAAC,OAAO,yBAAyB,CAAC,CAAC,CAAC,CAAC;IAIrF,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,EAAE,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AACjE,OAAO,YAAY,MAAM,QAAQ,CAAC;AAClC,OAAO,EAEL,KAAK,6BAA6B,EAElC,KAAK,YAAY,EAIlB,MAAM,wBAAwB,CAAC;AAgChC,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,6BAA6B,CAAC,KAAK,EAAE,OAAO,WAI3D;AAiKD,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,UAAU,GAAG,YAAY,GAAG,SAAS,CAMtF;AA4MD,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,yBAAyB,CAAC,UAAU,EAAE,UAAU,CAAC,OAAO,yBAAyB,CAAC,CAAC,CAAC,CAAC;IAIrF,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;AAIF,eAAO,MAAM,eAAe;SAKrB,eAAe,CAAC,KAAK,CAAC;eAChB,GAAG;;mBAkBf,CAAC"}

package/dist/index.d.ts

@@ -1154,7 +1154,7 @@ declare const switchTransport: ({ env, Transport, plugin, }: {
     env: ConnectSettings['env'];
     Transport: any;
     plugin?: LowlevelTransportSharedPlugin | undefined;
-}) => void;
+}) => Promise<void>;
 
 type UploadPortfolioParams = {
     packageBase64: string;

package/dist/index.js

@@ -47231,22 +47231,15 @@ const identityProbeLogger = {
     warn: () => undefined,
     error: () => undefined,
 };
-const pendingBridgeProbeReleases = new WeakMap();
 const probeUsbDeviceIdentitiesWithTransport = (transport, commType, getOwnedIdentity) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
+    if (commType !== 'webusb')
+        return [];
     yield transport.init(identityProbeLogger);
     const defaultMessages = JSON.stringify(DataManager.getProtobufMessages());
     yield transport.configure(defaultMessages);
     yield ((_a = transport.configureProtocolV2) === null || _a === void 0 ? void 0 : _a.call(transport, JSON.stringify(DataManager.getProtobufMessages('v2Schema'))));
     const descriptors = yield transport.enumerate();
-    let pendingReleases = pendingBridgeProbeReleases.get(transport);
-    if (commType === 'bridge' && pendingReleases) {
-        for (const [path, session] of pendingReleases) {
-            if (!descriptors.some(descriptor => descriptor.path === path && descriptor.session === session)) {
-                pendingReleases.delete(path);
-            }
-        }
-    }
     const identities = [];
     const readIdentity = (descriptor) => __awaiter(void 0, void 0, void 0, function* () {
         var _b, _c;
@@ -47255,17 +47248,6 @@ const probeUsbDeviceIdentitiesWithTransport = (transport, commType, getOwnedIden
             return undefined;
         if (descriptors.filter(candidate => candidate.path === path).length !== 1)
             return undefined;
-        const pendingSession = commType === 'bridge' ? pendingReleases === null || pendingReleases === void 0 ? void 0 : pendingReleases.get(path) : undefined;
-        if (pendingSession && descriptor.session === pendingSession) {
-            try {
-                yield transport.release(pendingSession, false);
-                pendingReleases === null || pendingReleases === void 0 ? void 0 : pendingReleases.delete(path);
-                descriptor = Object.assign(Object.assign({}, descriptor), { session: undefined });
-            }
-            catch (_d) {
-                return undefined;
-            }
-        }
         const owner = getOwnedIdentity === null || getOwnedIdentity === void 0 ? void 0 : getOwnedIdentity(descriptor);
         if (owner) {
             return owner;
@@ -47320,22 +47302,15 @@ const probeUsbDeviceIdentitiesWithTransport = (transport, commType, getOwnedIden
                 };
             }
         }
-        catch (_e) {
+        catch (_d) {
         }
         finally {
             if (session) {
                 try {
                     yield transport.release(session, false);
                 }
-                catch (_f) {
+                catch (_e) {
                     identified = undefined;
-                    if (commType === 'bridge') {
-                        if (!pendingReleases) {
-                            pendingReleases = new Map();
-                            pendingBridgeProbeReleases.set(transport, pendingReleases);
-                        }
-                        pendingReleases.set(path, session);
-                    }
                 }
             }
         }
@@ -67654,13 +67629,23 @@ const init = (settings, Transport, plugin) => __awaiter(void 0, void 0, void 0,
         throw error;
     }
 });
+let pendingTransportSwitch = Promise.resolve();
 const switchTransport = ({ env, Transport, plugin, }) => {
-    DataManager.updateEnv(env);
-    TransportManager.setTransport(Transport, plugin);
-    _deviceList = undefined;
-    DevicePool.resetState();
-    _connector = undefined;
-    initConnector();
+    const switching = pendingTransportSwitch
+        .catch(() => undefined)
+        .then(() => __awaiter(void 0, void 0, void 0, function* () {
+        var _a, _b;
+        _connector === null || _connector === void 0 ? void 0 : _connector.stop();
+        yield ((_b = (_a = TransportManager.getTransport()) === null || _a === void 0 ? void 0 : _a.stop) === null || _b === void 0 ? void 0 : _b.call(_a));
+        DataManager.updateEnv(env);
+        TransportManager.setTransport(Transport, plugin);
+        _deviceList = undefined;
+        DevicePool.resetState();
+        _connector = undefined;
+        initConnector();
+    }));
+    pendingTransportSwitch = switching;
+    return switching;
 };
 
 const HardwareSdk = ({ init, call, dispose, eventEmitter, uiResponse, cancel, updateSettings, switchTransport, }) => inject({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "1.2.8-alpha.19",
+  "version": "1.2.8-alpha.20",
   "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.8-alpha.19",
-    "@onekeyfe/hd-transport": "1.2.8-alpha.19",
+    "@onekeyfe/hd-shared": "1.2.8-alpha.20",
+    "@onekeyfe/hd-transport": "1.2.8-alpha.20",
     "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": "822e744bceb68a0928ad89d445b985897432edcf"
+  "gitHead": "973f059fe93a58fdcf098ddb32ba63f621a2c78e"
 }

package/src/api/SearchDevices.ts

@@ -109,14 +109,13 @@ const identityProbeLogger = {
   error: () => undefined,
 };
 
-const pendingBridgeProbeReleases = new WeakMap<UsbIdentityProbeTransport, Map<string, string>>();
-
 /** Runs on a separate transport; never initializes or switches the current Core. */
 export const probeUsbDeviceIdentitiesWithTransport = async (
   transport: UsbIdentityProbeTransport,
   commType: UsbDeviceIdentity['commType'],
   getOwnedIdentity?: (descriptor: UsbIdentityProbeDescriptor) => UsbDeviceIdentity | undefined
 ): Promise<UsbDeviceIdentity[]> => {
+  if (commType !== 'webusb') return [];
   await transport.init(identityProbeLogger);
   const defaultMessages = JSON.stringify(DataManager.getProtobufMessages());
   await transport.configure(defaultMessages);
@@ -124,16 +123,6 @@ export const probeUsbDeviceIdentitiesWithTransport = async (
     JSON.stringify(DataManager.getProtobufMessages('v2Schema'))
   );
   const descriptors = await transport.enumerate();
-  let pendingReleases = pendingBridgeProbeReleases.get(transport);
-  if (commType === 'bridge' && pendingReleases) {
-    for (const [path, session] of pendingReleases) {
-      if (
-        !descriptors.some(descriptor => descriptor.path === path && descriptor.session === session)
-      ) {
-        pendingReleases.delete(path);
-      }
-    }
-  }
   const identities: UsbDeviceIdentity[] = [];
   const readIdentity = async (
     descriptor: UsbIdentityProbeDescriptor
@@ -141,16 +130,6 @@ export const probeUsbDeviceIdentitiesWithTransport = async (
     const { path } = descriptor;
     if (!path || descriptor.commType !== commType) return undefined;
     if (descriptors.filter(candidate => candidate.path === path).length !== 1) return undefined;
-    const pendingSession = commType === 'bridge' ? pendingReleases?.get(path) : undefined;
-    if (pendingSession && descriptor.session === pendingSession) {
-      try {
-        await transport.release(pendingSession, false);
-        pendingReleases?.delete(path);
-        descriptor = { ...descriptor, session: undefined };
-      } catch {
-        return undefined;
-      }
-    }
     const owner = getOwnedIdentity?.(descriptor);
     if (owner) {
       return owner;
@@ -225,15 +204,6 @@ export const probeUsbDeviceIdentitiesWithTransport = async (
           await transport.release(session, false);
         } catch {
           identified = undefined;
-          // Retain only our own Bridge handle; enumeration must confirm ownership
-          // before a later probe retries a release whose HTTP request may be lost.
-          if (commType === 'bridge') {
-            if (!pendingReleases) {
-              pendingReleases = new Map();
-              pendingBridgeProbeReleases.set(transport, pendingReleases);
-            }
-            pendingReleases.set(path, session);
-          }
         }
       }
     }

package/src/core/index.ts

@@ -2043,6 +2043,8 @@ export const init = async (
   }
 };
 
+let pendingTransportSwitch: Promise<void> = Promise.resolve();
+
 export const switchTransport = ({
   env,
   Transport,
@@ -2052,10 +2054,19 @@ export const switchTransport = ({
   Transport: any;
   plugin?: LowlevelTransportSharedPlugin;
 }) => {
-  DataManager.updateEnv(env);
-  TransportManager.setTransport(Transport, plugin);
-  _deviceList = undefined;
-  DevicePool.resetState();
-  _connector = undefined;
-  initConnector();
+  // Preserve request order while native transport cleanup is pending.
+  const switching = pendingTransportSwitch
+    .catch(() => undefined)
+    .then(async () => {
+      _connector?.stop();
+      await TransportManager.getTransport()?.stop?.();
+      DataManager.updateEnv(env);
+      TransportManager.setTransport(Transport, plugin);
+      _deviceList = undefined;
+      DevicePool.resetState();
+      _connector = undefined;
+      initConnector();
+    });
+  pendingTransportSwitch = switching;
+  return switching;
 };