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

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

@@ -1,4 +1,4 @@
-import { DeviceType } from '@onekeyfe/hd-transport';
+import protocolTransport, { DeviceType } from '@onekeyfe/hd-transport';
 import { EDeviceType } from '@onekeyfe/hd-shared';
 
 import {
@@ -148,6 +148,41 @@ describe('isolated USB identity probe', () => {
     );
   });
 
+  test.each([
+    { onekey_device_type: 'CLASSIC', major_version: 2, minor_version: 8, patch_version: 0 },
+    { onekey_device_type: 'TOUCH', major_version: 4, minor_version: 4, patch_version: 0 },
+  ])(
+    'preserves GetFeatures identity when the legacy V1 schema has no vendor query (%s)',
+    async firmware => {
+      const transport = createTransport();
+      let messages = protocolTransport.parseConfigure(
+        JSON.stringify(DataManager.getProtobufMessages())
+      );
+      transport.configure.mockImplementation((schema: string) => {
+        messages = protocolTransport.parseConfigure(schema);
+      });
+      transport.call.mockImplementation((_session, name, data) => {
+        protocolTransport.ProtocolV1.encodeMessageChunks(messages, name, data);
+        return Promise.resolve({
+          type: 'Features',
+          message: { ...firmware, device_id: 'LEGACY_WALLET_ID' },
+        });
+      });
+      await expect(
+        probeUsbDeviceIdentitiesWithTransport(transport, 'webusb')
+      ).resolves.toMatchObject([
+        {
+          path: descriptor.path,
+          serialNo: null,
+          deviceId: 'LEGACY_WALLET_ID',
+          connectProtocol: 'V1',
+        },
+      ]);
+      expect(transport.call.mock.calls.map(call => call[1])).toEqual(['GetFeatures']);
+      expect(transport.release).toHaveBeenCalledWith('usb-transport-handle', false);
+    }
+  );
+
   test('does not substitute a USB path for a missing business identity', async () => {
     const transport = createTransport();
     transport.call
@@ -171,6 +206,72 @@ 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 => {
+      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);
+      }
+    }
+  );
+
+  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;AAYF,eAAO,MAAM,qCAAqC,cACrC,yBAAyB,YAC1B,iBAAiB,CAAC,UAAU,CAAC,mCACP,0BAA0B,KAAK,iBAAiB,GAAG,SAAS,kBAC3F,QAAQ,iBAAiB,EAAE,CAgG7B,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;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"}

package/dist/index.js

@@ -47231,6 +47231,7 @@ 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;
     yield transport.init(identityProbeLogger);
@@ -47238,6 +47239,14 @@ const probeUsbDeviceIdentitiesWithTransport = (transport, commType, getOwnedIden
     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;
@@ -47246,6 +47255,17 @@ 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;
@@ -47266,12 +47286,14 @@ const probeUsbDeviceIdentitiesWithTransport = (transport, commType, getOwnedIden
                     return undefined;
                 let features = buildProtocolV1FeaturesPayload(response.message);
                 if (!features.serialNo) {
-                    const { messages } = getSupportProtocolV1MessageSchema(features);
-                    if (messages)
-                        yield transport.configure(JSON.stringify(messages));
-                    const vendor = yield transport.call(session, 'OnekeyGetFeatures', {}, { timeoutMs: 3000 });
-                    if (vendor.type === 'OnekeyFeatures') {
-                        features = buildProtocolV1FeaturesPayload(Object.assign(Object.assign({}, response.message), vendor.message));
+                    const { messages, protocolV1MessageSchema } = getSupportProtocolV1MessageSchema(features);
+                    if (protocolV1MessageSchema === 'v1CurrentSchema') {
+                        if (messages)
+                            yield transport.configure(JSON.stringify(messages));
+                        const vendor = yield transport.call(session, 'OnekeyGetFeatures', {}, { timeoutMs: 3000 });
+                        if (vendor.type === 'OnekeyFeatures') {
+                            features = buildProtocolV1FeaturesPayload(Object.assign(Object.assign({}, response.message), vendor.message));
+                        }
                     }
                 }
                 identified = {
@@ -47298,15 +47320,22 @@ const probeUsbDeviceIdentitiesWithTransport = (transport, commType, getOwnedIden
                 };
             }
         }
-        catch (_d) {
+        catch (_e) {
         }
         finally {
             if (session) {
                 try {
                     yield transport.release(session, false);
                 }
-                catch (_e) {
+                catch (_f) {
                     identified = undefined;
+                    if (commType === 'bridge') {
+                        if (!pendingReleases) {
+                            pendingReleases = new Map();
+                            pendingBridgeProbeReleases.set(transport, pendingReleases);
+                        }
+                        pendingReleases.set(path, session);
+                    }
                 }
             }
         }

package/package.json

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

package/src/api/SearchDevices.ts

@@ -109,6 +109,8 @@ 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,
@@ -122,6 +124,16 @@ 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
@@ -129,6 +141,16 @@ 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;
@@ -149,19 +171,22 @@ export const probeUsbDeviceIdentitiesWithTransport = async (
         if (response.type !== 'Features') return undefined;
         let features = buildProtocolV1FeaturesPayload(response.message as PROTO.Features);
         if (!features.serialNo) {
-          const { messages } = getSupportProtocolV1MessageSchema(features);
-          if (messages) await transport.configure(JSON.stringify(messages));
-          const vendor = await transport.call(
-            session,
-            'OnekeyGetFeatures',
-            {},
-            { timeoutMs: 3000 }
-          );
-          if (vendor.type === 'OnekeyFeatures') {
-            features = buildProtocolV1FeaturesPayload({
-              ...response.message,
-              ...vendor.message,
-            } as PROTO.Features);
+          const { messages, protocolV1MessageSchema } = getSupportProtocolV1MessageSchema(features);
+          // Legacy V1 has no OnekeyGetFeatures; keep the identity confirmed by GetFeatures.
+          if (protocolV1MessageSchema === 'v1CurrentSchema') {
+            if (messages) await transport.configure(JSON.stringify(messages));
+            const vendor = await transport.call(
+              session,
+              'OnekeyGetFeatures',
+              {},
+              { timeoutMs: 3000 }
+            );
+            if (vendor.type === 'OnekeyFeatures') {
+              features = buildProtocolV1FeaturesPayload({
+                ...response.message,
+                ...vendor.message,
+              } as PROTO.Features);
+            }
           }
         }
         identified = {
@@ -200,6 +225,15 @@ 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);
+          }
         }
       }
     }