@onekeyfe/hd-transport-lowlevel 1.2.0-alpha.98 → 1.2.0

package/__tests__/protocol-v2.test.js

@@ -68,12 +68,25 @@ const protocolV2Schema = {
         },
       },
     },
+    Failure: {
+      fields: {
+        code: {
+          type: 'uint32',
+          id: 1,
+        },
+        message: {
+          type: 'string',
+          id: 2,
+        },
+      },
+    },
     MessageType: {
       values: {
         MessageType_ProtocolInfoRequest: 60200,
         MessageType_ProtocolInfo: 60201,
         MessageType_Ping: 60206,
         MessageType_Success: 60207,
+        MessageType_Failure: 60208,
       },
     },
   },
@@ -236,7 +249,11 @@ describe('LowlevelTransport protocol framing', () => {
     );
     const plugin = createPlugin({
       devices: [{ id: 'pro2-id', name: 'OneKey Pro 2', commType: 'ble' }],
-      responses: [...splitFrame(probeResponse, 4), ...splitFrame(callResponse, 5)],
+      responses: [
+        new Error('Protocol V1 probe timed out'),
+        ...splitFrame(probeResponse, 4),
+        ...splitFrame(callResponse, 5),
+      ],
     });
     const lowlevel = configureTransport(plugin);
 
@@ -256,9 +273,9 @@ describe('LowlevelTransport protocol framing', () => {
       },
     });
     expect(plugin.send).toHaveBeenCalled();
-    const sentSeqs = plugin.send.mock.calls.map(([, hex]) =>
-      Number.parseInt(hex.slice(12, 14), 16)
-    );
+    const sentSeqs = plugin.send.mock.calls
+      .map(([, hex]) => Number.parseInt(hex.slice(12, 14), 16))
+      .filter(seq => seq > 0);
     expect(sentSeqs).toEqual([1, 2]);
   });
 
@@ -282,7 +299,7 @@ describe('LowlevelTransport protocol framing', () => {
     expect(lowlevel.getProtocolType('unknown-pro2-id')).toBe('V2');
   });
 
-  test('retains the Protocol V2 hint and sequence cursor across release and reacquire', async () => {
+  test('detects Protocol V2 again after release without a name-derived hint', async () => {
     const probeResponse = ProtocolV2.encodeFrame(
       schemas,
       'Success',
@@ -291,7 +308,12 @@ describe('LowlevelTransport protocol framing', () => {
     );
     const plugin = createPlugin({
       devices: [{ id: 'reconnect-pro2-id', name: 'OneKey Pro 2', commType: 'ble' }],
-      responses: [bytesToHex(probeResponse), bytesToHex(probeResponse)],
+      responses: [
+        new Error('Protocol V1 probe timed out'),
+        bytesToHex(probeResponse),
+        new Error('Protocol V1 probe timed out'),
+        bytesToHex(probeResponse),
+      ],
     });
     const lowlevel = configureTransport(plugin);
 
@@ -306,9 +328,9 @@ describe('LowlevelTransport protocol framing', () => {
       protocolType: 'V2',
     });
 
-    const sentSeqs = plugin.send.mock.calls.map(([, hex]) =>
-      Number.parseInt(hex.slice(12, 14), 16)
-    );
+    const sentSeqs = plugin.send.mock.calls
+      .map(([, hex]) => Number.parseInt(hex.slice(12, 14), 16))
+      .filter(seq => seq > 0);
     expect(sentSeqs).toEqual([1, 2]);
   });
 
@@ -373,6 +395,33 @@ describe('LowlevelTransport protocol framing', () => {
     expect(plugin.receive).toHaveBeenCalledTimes(1);
   });
 
+  test('disconnects and clears a lowlevel connection when Protocol V2 reports link disabled', async () => {
+    const failureResponse = ProtocolV2.encodeFrame(
+      schemas,
+      'Failure',
+      { code: 5, message: 'link disabled' },
+      { router: PROTOCOL_V2_CHANNEL_BLE_UART }
+    );
+    const plugin = createPlugin({
+      devices: [{ id: 'usb-owned-id', name: 'OneKey Pro 2', commType: 'ble' }],
+      responses: [bytesToHex(failureResponse)],
+    });
+    const lowlevel = configureTransport(plugin);
+
+    await expect(
+      lowlevel.acquire({ uuid: 'usb-owned-id', expectedProtocol: 'V2' })
+    ).rejects.toMatchObject({
+      name: 'ProtocolV2LinkDisabledError',
+      failureCode: 5,
+      firmwareMessage: 'link disabled',
+    });
+
+    expect(plugin.disconnect).toHaveBeenCalledWith('usb-owned-id');
+    expect(lowlevel.connectedDevices.has('usb-owned-id')).toBe(false);
+    expect(lowlevel.getProtocolType('usb-owned-id')).toBeUndefined();
+    expect(lowlevel.protocolV2Assemblers.has('usb-owned-id')).toBe(false);
+  });
+
   test('resets the lowlevel connection before probing Protocol V2 after a V1 timeout', async () => {
     const probeResponse = ProtocolV2.encodeFrame(
       schemas,

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import * as transport from '@onekeyfe/hd-transport';
-import transport__default, { ProtocolType, LowlevelTransportSharedPlugin, LowLevelDevice, TransportCallOptions } from '@onekeyfe/hd-transport';
+import transport__default, { ProtocolType, LowlevelTransportSharedPlugin, TransportCallOptions } from '@onekeyfe/hd-transport';
 import EventEmitter from 'events';
 
 type LowLevelAcquireInput = {
@@ -36,13 +36,14 @@ declare class LowlevelTransport {
     configure(signedData: any): void;
     configureProtocolV2(signedData: any): void;
     listen(): void;
-    enumerate(): Promise<LowLevelDevice[]>;
+    enumerate(): Promise<transport.LowLevelDevice[]>;
     acquire(input: LowLevelAcquireInput): Promise<{
         uuid: string;
         protocolType: ProtocolType;
     }>;
     release(uuid: string): Promise<boolean>;
     call(uuid: string, name: string, data: Record<string, unknown>, options?: TransportCallOptions): Promise<transport.MessageFromOneKey>;
+    post(uuid: string, name: string, data: Record<string, unknown>): Promise<void>;
     private callProtocolV1;
     private createProtocolTimeoutError;
     private createProtocolMismatchError;

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AACA,OAAO,SAYN,MAAM,wBAAwB,CAAC;AAEhC,OAAO,KAAK,YAAY,MAAM,QAAQ,CAAC;AACvC,OAAO,KAAK,EACV,cAAc,EACd,6BAA6B,EAC7B,YAAY,EAEZ,oBAAoB,EACrB,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC;AAUpD,wBAAgB,+BAA+B,CAAC,EAC9C,OAAO,EACP,iBAAiB,EACjB,GAAG,EACH,YAAY,GACb,EAAE;IACD,OAAO,EAAE,MAAM,CAAC;IAChB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,EAAE,MAAM,CAAC;CACtB,WAMA;AAED,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,MAAM;;cAEpD;AAcD,MAAM,CAAC,OAAO,OAAO,iBAAiB;IACpC,SAAS,EAAE,UAAU,CAAC,OAAO,SAAS,CAAC,cAAc,CAAC,GAAG,SAAS,CAAC;IAEnE,WAAW,EAAE,UAAU,CAAC,OAAO,SAAS,CAAC,cAAc,CAAC,GAAG,SAAS,CAAC;IAErE,UAAU,UAAS;IAEnB,GAAG,CAAC,EAAE,GAAG,CAAC;IAEV,OAAO,CAAC,EAAE,YAAY,CAAC;IAEvB,MAAM,EAAE,6BAA6B,CAAuC;IAE5E,OAAO,CAAC,cAAc,CAAwC;IAE9D,OAAO,CAAC,mBAAmB,CAAwC;IAEnE,OAAO,CAAC,oBAAoB,CAAoD;IAEhF,OAAO,CAAC,qBAAqB,CAAkC;IAE/D,OAAO,CAAC,gBAAgB,CAA0B;IAElD,OAAO,CAAC,eAAe,CA6BpB;IAEH,OAAO,CAAC,6BAA6B,CAAqB;IAE1D,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS;IAIvD,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,6BAA6B;IAO9E,SAAS,CAAC,UAAU,EAAE,GAAG;IAMzB,mBAAmB,CAAC,UAAU,EAAE,GAAG;IAiBnC,MAAM;IAIA,SAAS;IAWT,OAAO,CAAC,KAAK,EAAE,oBAAoB;;;;IAgCnC,OAAO,CAAC,IAAI,EAAE,MAAM;IAgBpB,IAAI,CACR,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,OAAO,CAAC,EAAE,oBAAoB;YAsBlB,cAAc;IA6E5B,OAAO,CAAC,0BAA0B;IAOlC,OAAO,CAAC,2BAA2B;IAOnC,OAAO,CAAC,4BAA4B;IAOpC,OAAO,CAAC,kBAAkB;YAMZ,cAAc;YA2Cd,yBAAyB;YAiCzB,eAAe;YAgBf,eAAe;YA6Bf,UAAU;YAUV,qBAAqB;YAmBrB,mBAAmB;YAqBnB,oBAAoB;YAgBpB,cAAc;IAwB5B,OAAO,CAAC,uBAAuB;IAgC/B,OAAO,CAAC,2BAA2B;IAMnC,MAAM;CAGP"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AACA,OAAO,SAYN,MAAM,wBAAwB,CAAC;AAEhC,OAAO,KAAK,YAAY,MAAM,QAAQ,CAAC;AACvC,OAAO,KAAK,EACV,6BAA6B,EAC7B,YAAY,EAEZ,oBAAoB,EACrB,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC;AAUpD,wBAAgB,+BAA+B,CAAC,EAC9C,OAAO,EACP,iBAAiB,EACjB,GAAG,EACH,YAAY,GACb,EAAE;IACD,OAAO,EAAE,MAAM,CAAC;IAChB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,EAAE,MAAM,CAAC;CACtB,WAMA;AAED,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,MAAM;;cAEpD;AAUD,MAAM,CAAC,OAAO,OAAO,iBAAiB;IACpC,SAAS,EAAE,UAAU,CAAC,OAAO,SAAS,CAAC,cAAc,CAAC,GAAG,SAAS,CAAC;IAEnE,WAAW,EAAE,UAAU,CAAC,OAAO,SAAS,CAAC,cAAc,CAAC,GAAG,SAAS,CAAC;IAErE,UAAU,UAAS;IAEnB,GAAG,CAAC,EAAE,GAAG,CAAC;IAEV,OAAO,CAAC,EAAE,YAAY,CAAC;IAEvB,MAAM,EAAE,6BAA6B,CAAuC;IAE5E,OAAO,CAAC,cAAc,CAAwC;IAE9D,OAAO,CAAC,mBAAmB,CAAwC;IAEnE,OAAO,CAAC,oBAAoB,CAAoD;IAEhF,OAAO,CAAC,qBAAqB,CAAkC;IAE/D,OAAO,CAAC,gBAAgB,CAA0B;IAElD,OAAO,CAAC,eAAe,CA6BpB;IAEH,OAAO,CAAC,6BAA6B,CAAqB;IAE1D,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS;IAIvD,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,6BAA6B;IAO9E,SAAS,CAAC,UAAU,EAAE,GAAG;IAMzB,mBAAmB,CAAC,UAAU,EAAE,GAAG;IAiBnC,MAAM;IAIA,SAAS;IAKT,OAAO,CAAC,KAAK,EAAE,oBAAoB;;;;IAmDnC,OAAO,CAAC,IAAI,EAAE,MAAM;IAepB,IAAI,CACR,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,OAAO,CAAC,EAAE,oBAAoB;IAoB1B,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;YAatD,cAAc;IA6E5B,OAAO,CAAC,0BAA0B;IAOlC,OAAO,CAAC,2BAA2B;IAOnC,OAAO,CAAC,4BAA4B;IAOpC,OAAO,CAAC,kBAAkB;YAMZ,cAAc;YA2Cd,yBAAyB;YAiCzB,eAAe;YAgBf,eAAe;YA6Bf,UAAU;YAUV,qBAAqB;YAmBrB,mBAAmB;YAqBnB,oBAAoB;YAgBpB,cAAc;IAwB5B,OAAO,CAAC,uBAAuB;IAgC/B,OAAO,CAAC,2BAA2B;IAMnC,MAAM;CAGP"}

package/dist/index.js

@@ -53,9 +53,6 @@ function shouldLogFirmwareUploadProgress({ percent, lastLoggedPercent, now, last
 function getProtocolV1SendOptions(name) {
     return name === 'FirmwareUpload' ? { withoutResponse: false } : undefined;
 }
-function inferProtocolHintFromDeviceName(name) {
-    return /\bpro\s*2\b/i.test(name !== null && name !== void 0 ? name : '') ? 'V2' : undefined;
-}
 function isProtocolV1TransportChunk(data) {
     return data.length >= 9 && data[0] === 0x3f && data[1] === 0x23 && data[2] === 0x23;
 }
@@ -135,17 +132,11 @@ class LowlevelTransport {
     enumerate() {
         return __awaiter(this, void 0, void 0, function* () {
             const devices = yield this.plugin.enumerate();
-            return devices.map((device) => {
-                const protocolHint = inferProtocolHintFromDeviceName(device.name);
-                if (protocolHint) {
-                    this.deviceProtocolHints.set(device.id, protocolHint);
-                }
-                return device;
-            });
+            return devices;
         });
     }
     acquire(input) {
-        var _a, _b;
+        var _a, _b, _c, _d;
         return __awaiter(this, void 0, void 0, function* () {
             const alreadyConnected = this.connectedDevices.has(input.uuid);
             try {
@@ -164,8 +155,31 @@ class LowlevelTransport {
             const protocolHint = input.expectedProtocol
                 ? undefined
                 : (_b = input.protocolHint) !== null && _b !== void 0 ? _b : this.deviceProtocolHints.get(input.uuid);
-            const protocolType = yield this.detectProtocol(input.uuid, input.expectedProtocol, protocolHint);
-            return { uuid: input.uuid, protocolType };
+            try {
+                const protocolType = yield this.detectProtocol(input.uuid, input.expectedProtocol, protocolHint);
+                return { uuid: input.uuid, protocolType };
+            }
+            catch (error) {
+                try {
+                    yield this.protocolV2Links.invalidateLink(input.uuid, 'Lowlevel transport acquire failed');
+                }
+                catch (cleanupError) {
+                    (_c = this.Log) === null || _c === void 0 ? void 0 : _c.debug('[LowlevelTransport] acquire link cleanup failed:', cleanupError);
+                }
+                try {
+                    yield this.plugin.disconnect(input.uuid);
+                }
+                catch (cleanupError) {
+                    (_d = this.Log) === null || _d === void 0 ? void 0 : _d.debug('[LowlevelTransport] acquire disconnect failed:', cleanupError);
+                }
+                finally {
+                    this.connectedDevices.delete(input.uuid);
+                    this.deviceProtocol.delete(input.uuid);
+                    this.protocolV2Assemblers.delete(input.uuid);
+                    this.advanceProtocolV2Generation(input.uuid);
+                }
+                throw error;
+            }
         });
     }
     release(uuid) {
@@ -193,13 +207,21 @@ class LowlevelTransport {
             if (!protocol) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `Device protocol has not been detected for ${uuid}`);
             }
-            this.Log.debug('transport call', { name, protocol });
             if (protocol === 'V2') {
                 return this.callProtocolV2(uuid, name, data, options);
             }
             return this.callProtocolV1(uuid, name, data, options);
         });
     }
+    post(uuid, name, data) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.getProtocolType(uuid) === 'V2') {
+                yield this.protocolV2Links.sendFlowControl(uuid, () => this.createProtocolV2Adapter(uuid), name, data);
+                return;
+            }
+            yield this.callProtocolV1(uuid, name, data);
+        });
+    }
     callProtocolV1(uuid, name, data, options) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport-lowlevel",
-  "version": "1.2.0-alpha.98",
+  "version": "1.2.0",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
   "license": "MIT",
   "main": "dist/index.js",
@@ -20,8 +20,8 @@
     "lint:fix": "eslint . --fix"
   },
   "dependencies": {
-    "@onekeyfe/hd-shared": "1.2.0-alpha.98",
-    "@onekeyfe/hd-transport": "1.2.0-alpha.98"
+    "@onekeyfe/hd-shared": "1.2.0",
+    "@onekeyfe/hd-transport": "1.2.0"
   },
-  "gitHead": "10f2dcaecec17a629216c2402cc9ab8801987297"
+  "gitHead": "cc51df0a415bead21304ad1d8bc92b5312c91344"
 }

package/src/index.ts

@@ -15,7 +15,6 @@ import transport, {
 
 import type EventEmitter from 'events';
 import type {
-  LowLevelDevice,
   LowlevelTransportSharedPlugin,
   ProtocolType,
   ProtocolV2CallContext,
@@ -53,10 +52,6 @@ export function getProtocolV1SendOptions(name: string) {
   return name === 'FirmwareUpload' ? { withoutResponse: false } : undefined;
 }
 
-function inferProtocolHintFromDeviceName(name?: string | null): ProtocolType | undefined {
-  return /\bpro\s*2\b/i.test(name ?? '') ? 'V2' : undefined;
-}
-
 function isProtocolV1TransportChunk(data: Uint8Array) {
   return data.length >= 9 && data[0] === 0x3f && data[1] === 0x23 && data[2] === 0x23;
 }
@@ -161,13 +156,7 @@ export default class LowlevelTransport {
 
   async enumerate() {
     const devices = await this.plugin.enumerate();
-    return devices.map((device: LowLevelDevice) => {
-      const protocolHint = inferProtocolHintFromDeviceName(device.name);
-      if (protocolHint) {
-        this.deviceProtocolHints.set(device.id, protocolHint);
-      }
-      return device;
-    });
+    return devices;
   }
 
   async acquire(input: LowLevelAcquireInput) {
@@ -194,12 +183,31 @@ export default class LowlevelTransport {
     const protocolHint = input.expectedProtocol
       ? undefined
       : input.protocolHint ?? this.deviceProtocolHints.get(input.uuid);
-    const protocolType = await this.detectProtocol(
-      input.uuid,
-      input.expectedProtocol,
-      protocolHint
-    );
-    return { uuid: input.uuid, protocolType };
+    try {
+      const protocolType = await this.detectProtocol(
+        input.uuid,
+        input.expectedProtocol,
+        protocolHint
+      );
+      return { uuid: input.uuid, protocolType };
+    } catch (error) {
+      try {
+        await this.protocolV2Links.invalidateLink(input.uuid, 'Lowlevel transport acquire failed');
+      } catch (cleanupError) {
+        this.Log?.debug('[LowlevelTransport] acquire link cleanup failed:', cleanupError);
+      }
+      try {
+        await this.plugin.disconnect(input.uuid);
+      } catch (cleanupError) {
+        this.Log?.debug('[LowlevelTransport] acquire disconnect failed:', cleanupError);
+      } finally {
+        this.connectedDevices.delete(input.uuid);
+        this.deviceProtocol.delete(input.uuid);
+        this.protocolV2Assemblers.delete(input.uuid);
+        this.advanceProtocolV2Generation(input.uuid);
+      }
+      throw error;
+    }
   }
 
   async release(uuid: string) {
@@ -208,8 +216,7 @@ export default class LowlevelTransport {
       await this.plugin.disconnect(uuid);
       this.connectedDevices.delete(uuid);
       this.deviceProtocol.delete(uuid);
-      // A name-derived protocol hint survives disconnect and lets fast reconnect probe
-      // Protocol V2 first without sending a redundant V1 Initialize.
+      // Confirmed protocol stays on the device endpoint; BLE names are not a probe hint.
       this.protocolV2Assemblers.delete(uuid);
       return true;
     } catch (error) {
@@ -235,8 +242,6 @@ export default class LowlevelTransport {
         `Device protocol has not been detected for ${uuid}`
       );
     }
-    this.Log.debug('transport call', { name, protocol });
-
     if (protocol === 'V2') {
       return this.callProtocolV2(uuid, name, data, options);
     }
@@ -244,6 +249,19 @@ export default class LowlevelTransport {
     return this.callProtocolV1(uuid, name, data, options);
   }
 
+  async post(uuid: string, name: string, data: Record<string, unknown>) {
+    if (this.getProtocolType(uuid) === 'V2') {
+      await this.protocolV2Links.sendFlowControl(
+        uuid,
+        () => this.createProtocolV2Adapter(uuid),
+        name,
+        data
+      );
+      return;
+    }
+    await this.callProtocolV1(uuid, name, data);
+  }
+
   private async callProtocolV1(
     uuid: string,
     name: string,