@onekeyfe/hd-transport-lowlevel 1.2.0-alpha.2 → 1.2.0-alpha.20

package/__tests__/firmware-upload-progress.test.js

@@ -0,0 +1,42 @@
+/* eslint-disable @typescript-eslint/no-var-requires */
+const { getProtocolV1SendOptions, shouldLogFirmwareUploadProgress } = require('../src');
+
+describe('firmware upload progress logging', () => {
+  test('按 5% 进度限流打印', () => {
+    expect(
+      shouldLogFirmwareUploadProgress({
+        percent: 9,
+        lastLoggedPercent: 5,
+        now: 5_000,
+        lastLoggedAt: 0,
+      })
+    ).toBe(false);
+
+    expect(
+      shouldLogFirmwareUploadProgress({
+        percent: 10,
+        lastLoggedPercent: 5,
+        now: 5_000,
+        lastLoggedAt: 0,
+      })
+    ).toBe(true);
+  });
+
+  test('进度不足 5% 时最长每 10 秒打印一次心跳', () => {
+    expect(
+      shouldLogFirmwareUploadProgress({
+        percent: 7,
+        lastLoggedPercent: 5,
+        now: 10_000,
+        lastLoggedAt: 0,
+      })
+    ).toBe(true);
+  });
+});
+
+describe('firmware upload write mode', () => {
+  test('固件上传使用带响应写入，普通命令保持默认模式', () => {
+    expect(getProtocolV1SendOptions('FirmwareUpload')).toEqual({ withoutResponse: false });
+    expect(getProtocolV1SendOptions('Initialize')).toBeUndefined();
+  });
+});

package/__tests__/protocol-v2.test.js

@@ -29,21 +29,25 @@ const protocolV1Schema = {
 
 const protocolV2Schema = {
   nested: {
-    GetProtoVersion: {
+    ProtocolInfoRequest: {
       fields: {},
     },
-    ProtoVersion: {
+    ProtocolInfo: {
       fields: {
-        major_version: {
+        version: {
           type: 'uint32',
           id: 1,
         },
-        minor_version: {
+        supported_messages: {
+          rule: 'repeated',
           type: 'uint32',
           id: 2,
+          options: {
+            packed: false,
+          },
         },
-        patch_version: {
-          type: 'uint32',
+        protobuf_definition: {
+          type: 'string',
           id: 3,
         },
       },
@@ -66,8 +70,8 @@ const protocolV2Schema = {
     },
     MessageType: {
       values: {
-        MessageType_GetProtoVersion: 60200,
-        MessageType_ProtoVersion: 60201,
+        MessageType_ProtocolInfoRequest: 60200,
+        MessageType_ProtocolInfo: 60201,
         MessageType_Ping: 60206,
         MessageType_Success: 60207,
       },
@@ -162,11 +166,11 @@ describe('LowlevelTransport protocol framing', () => {
     );
     const callResponse = ProtocolV2.encodeFrame(
       schemas,
-      'ProtoVersion',
+      'ProtocolInfo',
       {
-        major_version: 2,
-        minor_version: 1,
-        patch_version: 3,
+        version: 1,
+        supported_messages: [60200, 60201, 60206, 60207],
+        protobuf_definition: 'onekey-protocol-v2',
       },
       { router: PROTOCOL_V2_CHANNEL_BLE_UART }
     );
@@ -183,15 +187,19 @@ describe('LowlevelTransport protocol framing', () => {
       uuid: 'pro2-id',
       protocolType: 'V2',
     });
-    await expect(lowlevel.call('pro2-id', 'GetProtoVersion', {})).resolves.toEqual({
-      type: 'ProtoVersion',
+    await expect(lowlevel.call('pro2-id', 'ProtocolInfoRequest', {})).resolves.toEqual({
+      type: 'ProtocolInfo',
       message: {
-        major_version: 2,
-        minor_version: 1,
-        patch_version: 3,
+        version: 1,
+        supported_messages: [60200, 60201, 60206, 60207],
+        protobuf_definition: 'onekey-protocol-v2',
       },
     });
     expect(plugin.send).toHaveBeenCalled();
+    const sentSeqs = plugin.send.mock.calls.map(([, hex]) =>
+      Number.parseInt(hex.slice(12, 14), 16)
+    );
+    expect(sentSeqs).toEqual([1, 2]);
   });
 
   test('falls back to Protocol V2 probe for unnamed Protocol V2 devices', async () => {
@@ -214,6 +222,87 @@ 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 () => {
+    const probeResponse = ProtocolV2.encodeFrame(
+      schemas,
+      'Success',
+      { message: 'ok' },
+      { router: PROTOCOL_V2_CHANNEL_BLE_UART }
+    );
+    const plugin = createPlugin({
+      devices: [{ id: 'reconnect-pro2-id', name: 'OneKey Pro 2', commType: 'ble' }],
+      responses: [bytesToHex(probeResponse), bytesToHex(probeResponse)],
+    });
+    const lowlevel = configureTransport(plugin);
+
+    await lowlevel.enumerate();
+    await expect(lowlevel.acquire({ uuid: 'reconnect-pro2-id' })).resolves.toEqual({
+      uuid: 'reconnect-pro2-id',
+      protocolType: 'V2',
+    });
+    await lowlevel.release('reconnect-pro2-id');
+    await expect(lowlevel.acquire({ uuid: 'reconnect-pro2-id' })).resolves.toEqual({
+      uuid: 'reconnect-pro2-id',
+      protocolType: 'V2',
+    });
+
+    const sentSeqs = plugin.send.mock.calls.map(([, hex]) =>
+      Number.parseInt(hex.slice(12, 14), 16)
+    );
+    expect(sentSeqs).toEqual([1, 2]);
+  });
+
+  test('reuses the active generation when Core acquires the same BLE connection again', async () => {
+    const probeResponse = ProtocolV2.encodeFrame(
+      schemas,
+      'Success',
+      { message: 'ok' },
+      { router: PROTOCOL_V2_CHANNEL_BLE_UART }
+    );
+    const plugin = createPlugin({
+      devices: [{ id: 'repeated-acquire-id', name: 'OneKey Pro 2', commType: 'ble' }],
+      responses: [bytesToHex(probeResponse), bytesToHex(probeResponse)],
+    });
+    const lowlevel = configureTransport(plugin);
+
+    await expect(
+      lowlevel.acquire({ uuid: 'repeated-acquire-id', expectedProtocol: 'V2' })
+    ).resolves.toEqual({
+      uuid: 'repeated-acquire-id',
+      protocolType: 'V2',
+    });
+    await lowlevel.call('repeated-acquire-id', 'Ping', { message: 'first-acquire' });
+    await expect(
+      lowlevel.acquire({ uuid: 'repeated-acquire-id', expectedProtocol: 'V2' })
+    ).resolves.toEqual({
+      uuid: 'repeated-acquire-id',
+      protocolType: 'V2',
+    });
+    await lowlevel.call('repeated-acquire-id', 'Ping', { message: 'second-acquire' });
+
+    const sentSeqs = plugin.send.mock.calls.map(([, hex]) =>
+      Number.parseInt(hex.slice(12, 14), 16)
+    );
+    expect(sentSeqs).toEqual([1, 2]);
+  });
+
+  test('trusts explicit Protocol V2 during bootloader reconnect without probing Ping', async () => {
+    const plugin = createPlugin({
+      devices: [{ id: 'bootloader-v2-id', name: 'OneKey Pro 2', commType: 'ble' }],
+      responses: [],
+    });
+    const lowlevel = configureTransport(plugin);
+
+    await expect(
+      lowlevel.acquire({ uuid: 'bootloader-v2-id', expectedProtocol: 'V2' })
+    ).resolves.toEqual({
+      uuid: 'bootloader-v2-id',
+      protocolType: 'V2',
+    });
+    expect(plugin.send).not.toHaveBeenCalled();
+    expect(plugin.receive).not.toHaveBeenCalled();
+  });
+
   test('resets the lowlevel connection before probing Protocol V2 after a V1 timeout', async () => {
     const probeResponse = ProtocolV2.encodeFrame(
       schemas,
@@ -252,6 +341,45 @@ describe('LowlevelTransport protocol framing', () => {
     expect(plugin.connect).toHaveBeenCalledTimes(2);
   });
 
+  test('disconnects a tainted Protocol V2 link after a response timeout', async () => {
+    const plugin = createPlugin({
+      devices: [{ id: 'timeout-v2-id', name: 'OneKey Pro 2', commType: 'ble' }],
+      responses: [],
+    });
+    plugin.receive.mockImplementation(() => new Promise(() => {}));
+    const lowlevel = configureTransport(plugin);
+
+    await lowlevel.acquire({ uuid: 'timeout-v2-id', expectedProtocol: 'V2' });
+    plugin.disconnect.mockClear();
+    await expect(
+      lowlevel.call('timeout-v2-id', 'Ping', { message: 'timeout' }, { timeoutMs: 10 })
+    ).rejects.toThrow('Lowlevel response timeout after 10ms for Ping');
+
+    expect(plugin.disconnect).toHaveBeenCalledWith('timeout-v2-id');
+  });
+
+  test('preserves an undefined business timeout outside explicit probes', async () => {
+    const plugin = createPlugin({
+      devices: [{ id: 'v2-id', name: 'OneKey Pro 2', commType: 'ble' }],
+      responses: [],
+    });
+    const lowlevel = configureTransport(plugin);
+    lowlevel.deviceProtocol.set('v2-id', 'V2');
+    const linkCall = jest
+      .spyOn(lowlevel.protocolV2Links, 'call')
+      .mockResolvedValue({ type: 'Success', message: {} });
+
+    await lowlevel.call('v2-id', 'Ping', { message: 'no-business-timeout' });
+
+    expect(linkCall).toHaveBeenCalledWith(
+      'v2-id',
+      expect.any(Function),
+      'Ping',
+      { message: 'no-business-timeout' },
+      undefined
+    );
+  });
+
   test('verifies expected Protocol V1 instead of trusting the requested protocol', async () => {
     const plugin = createPlugin({
       devices: [{ id: 'v2-id', name: 'Unknown BLE Device', commType: 'ble' }],

package/dist/index.d.ts

@@ -7,6 +7,15 @@ type LowLevelAcquireInput = {
     expectedProtocol?: ProtocolType;
 };
 
+declare function shouldLogFirmwareUploadProgress({ percent, lastLoggedPercent, now, lastLoggedAt, }: {
+    percent: number;
+    lastLoggedPercent: number;
+    now: number;
+    lastLoggedAt: number;
+}): boolean;
+declare function getProtocolV1SendOptions(name: string): {
+    withoutResponse: boolean;
+} | undefined;
 declare class LowlevelTransport {
     _messages: ReturnType<typeof transport__default.parseConfigure> | undefined;
     _messagesV2: ReturnType<typeof transport__default.parseConfigure> | undefined;
@@ -17,6 +26,9 @@ declare class LowlevelTransport {
     private deviceProtocol;
     private deviceProtocolHints;
     private protocolV2Assemblers;
+    private protocolV2Generations;
+    private connectedDevices;
+    private protocolV2Links;
     getProtocolType(path: string): ProtocolType | undefined;
     init(logger: any, emitter: EventEmitter, plugin: LowlevelTransportSharedPlugin): void;
     configure(signedData: any): void;
@@ -43,7 +55,9 @@ declare class LowlevelTransport {
     private readProtocolV2Frame;
     private writeProtocolV2Frame;
     private callProtocolV2;
+    private createProtocolV2Adapter;
+    private advanceProtocolV2Generation;
     cancel(): void;
 }
 
-export { LowlevelTransport as default };
+export { LowlevelTransport as default, getProtocolV1SendOptions, shouldLogFirmwareUploadProgress };

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AACA,OAAO,SAWN,MAAM,wBAAwB,CAAC;AAEhC,OAAO,KAAK,YAAY,MAAM,QAAQ,CAAC;AACvC,OAAO,KAAK,EACV,cAAc,EACd,6BAA6B,EAC7B,YAAY,EACZ,oBAAoB,EACrB,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC;AAqBpD,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,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;IAInC,MAAM;IAIA,SAAS;IAWT,OAAO,CAAC,KAAK,EAAE,oBAAoB;;;;IAuBnC,OAAO,CAAC,IAAI,EAAE,MAAM;IAapB,IAAI,CACR,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,OAAO,CAAC,EAAE,oBAAoB;YAmClB,cAAc;IAuC5B,OAAO,CAAC,0BAA0B;IAOlC,OAAO,CAAC,2BAA2B;IAOnC,OAAO,CAAC,4BAA4B;IAOpC,OAAO,CAAC,kBAAkB;YAMZ,cAAc;YAsDd,yBAAyB;YA0BzB,eAAe;YAgBf,eAAe;YA6Bf,UAAU;YAUV,qBAAqB;YAmBrB,mBAAmB;YAqBnB,oBAAoB;YAOpB,cAAc;IAsC5B,MAAM;CAGP"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AACA,OAAO,SAWN,MAAM,wBAAwB,CAAC;AAEhC,OAAO,KAAK,YAAY,MAAM,QAAQ,CAAC;AACvC,OAAO,KAAK,EACV,cAAc,EACd,6BAA6B,EAC7B,YAAY,EACZ,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,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;IAOnC,MAAM;IAIA,SAAS;IAWT,OAAO,CAAC,KAAK,EAAE,oBAAoB;;;;IA6BnC,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;IAmE5B,OAAO,CAAC,0BAA0B;IAOlC,OAAO,CAAC,2BAA2B;IAOnC,OAAO,CAAC,4BAA4B;IAOpC,OAAO,CAAC,kBAAkB;YAMZ,cAAc;YAsDd,yBAAyB;YAiCzB,eAAe;YAgBf,eAAe;YA6Bf,UAAU;YAUV,qBAAqB;YAmBrB,mBAAmB;YAqBnB,oBAAoB;YAOpB,cAAc;IAwB5B,OAAO,CAAC,uBAAuB;IAkC/B,OAAO,CAAC,2BAA2B;IAMnC,MAAM;CAGP"}

package/dist/index.js

@@ -1,5 +1,7 @@
 'use strict';
 
+Object.defineProperty(exports, '__esModule', { value: true });
+
 var hdShared = require('@onekeyfe/hd-shared');
 var transport = require('@onekeyfe/hd-transport');
 
@@ -40,8 +42,17 @@ typeof SuppressedError === "function" ? SuppressedError : function (error, suppr
 const { check, ProtocolV1, parseConfigure } = transport__default["default"];
 const PROTOCOL_PROBE_TIMEOUT_MS = 1000;
 const PROTOCOL_V2_PROBE_TIMEOUT_MS = 5000;
-const LOWLEVEL_PROTOCOL_TIMEOUT_MS = 30000;
 const LOWLEVEL_PROTOCOL_V2_PACKET_LENGTH = 64;
+const FIRMWARE_UPLOAD_LOG_PERCENT_STEP = 5;
+const FIRMWARE_UPLOAD_LOG_INTERVAL_MS = 10000;
+function shouldLogFirmwareUploadProgress({ percent, lastLoggedPercent, now, lastLoggedAt, }) {
+    return (percent === 100 ||
+        percent - lastLoggedPercent >= FIRMWARE_UPLOAD_LOG_PERCENT_STEP ||
+        now - lastLoggedAt >= FIRMWARE_UPLOAD_LOG_INTERVAL_MS);
+}
+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;
 }
@@ -58,6 +69,38 @@ class LowlevelTransport {
         this.deviceProtocol = new Map();
         this.deviceProtocolHints = new Map();
         this.protocolV2Assemblers = new Map();
+        this.protocolV2Generations = new Map();
+        this.connectedDevices = new Set();
+        this.protocolV2Links = new transport.ProtocolV2LinkManager({
+            getSchemas: () => {
+                if (!this._messages || !this._messagesV2) {
+                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.TransportNotConfigured);
+                }
+                return {
+                    protocolV1: this._messages,
+                    protocolV2: this._messagesV2,
+                };
+            },
+            classifyError: () => 'link-fatal',
+            onLinkInvalidated: (uuid, reason) => __awaiter(this, void 0, void 0, function* () {
+                var _a, _b, _c;
+                (_a = this.protocolV2Assemblers.get(uuid)) === null || _a === void 0 ? void 0 : _a.reset();
+                (_b = this.Log) === null || _b === void 0 ? void 0 : _b.debug(`[LowlevelTransport] Protocol V2 link invalidated: ${uuid}`, reason);
+                if (reason.startsWith('Protocol V2 link-fatal error:')) {
+                    this.deviceProtocol.delete(uuid);
+                    this.advanceProtocolV2Generation(uuid);
+                    try {
+                        yield this.plugin.disconnect(uuid);
+                    }
+                    catch (error) {
+                        (_c = this.Log) === null || _c === void 0 ? void 0 : _c.debug(`[LowlevelTransport] disconnect tainted Protocol V2 link failed: ${uuid}`, error);
+                    }
+                    finally {
+                        this.connectedDevices.delete(uuid);
+                    }
+                }
+            }),
+        });
     }
     getProtocolType(path) {
         return this.deviceProtocol.get(path);
@@ -75,6 +118,9 @@ class LowlevelTransport {
     }
     configureProtocolV2(signedData) {
         this._messagesV2 = parseConfigure(signedData);
+        this.protocolV2Links
+            .invalidateAllLinks('Protocol V2 schema reconfigured')
+            .catch(error => { var _a; return (_a = this.Log) === null || _a === void 0 ? void 0 : _a.debug('Protocol V2 schema link cleanup failed:', error); });
     }
     listen() {
     }
@@ -93,10 +139,16 @@ class LowlevelTransport {
     acquire(input) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
+            const alreadyConnected = this.connectedDevices.has(input.uuid);
             try {
                 yield this.plugin.connect(input.uuid);
+                if (!alreadyConnected) {
+                    this.connectedDevices.add(input.uuid);
+                    this.advanceProtocolV2Generation(input.uuid);
+                }
             }
             catch (error) {
+                this.connectedDevices.delete(input.uuid);
                 this.Log.debug('lowlelvel transport connect error: ', error);
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.LowlevelTrasnportConnectError, (_a = error.message) !== null && _a !== void 0 ? _a : error);
             }
@@ -111,9 +163,10 @@ class LowlevelTransport {
     release(uuid) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
+                yield this.protocolV2Links.invalidateLink(uuid, 'Lowlevel transport released');
                 yield this.plugin.disconnect(uuid);
+                this.connectedDevices.delete(uuid);
                 this.deviceProtocol.delete(uuid);
-                this.deviceProtocolHints.delete(uuid);
                 this.protocolV2Assemblers.delete(uuid);
                 return true;
             }
@@ -132,12 +185,7 @@ class LowlevelTransport {
             if (!protocol) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `Device protocol has not been detected for ${uuid}`);
             }
-            if (transport.LogBlockCommand.has(name)) {
-                this.Log.debug('lowlevel-transport', 'call-', ' name: ', name, ' protocol: ', protocol);
-            }
-            else {
-                this.Log.debug('lowlevel-transport', 'call-', ' name: ', name, ' data: ', data, ' protocol: ', protocol);
-            }
+            this.Log.debug('transport call', { name, protocol });
             if (protocol === 'V2') {
                 return this.callProtocolV2(uuid, name, data, options);
             }
@@ -145,17 +193,42 @@ class LowlevelTransport {
         });
     }
     callProtocolV1(uuid, name, data, options) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             if (!this._messages) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.TransportNotConfigured);
             }
             const messages = this._messages;
             const buffers = ProtocolV1.encodeTransportPackets(messages, name, data);
-            for (const o of buffers) {
+            const isFirmwareUpload = name === 'FirmwareUpload';
+            const uploadStartedAt = Date.now();
+            const totalBytes = buffers.reduce((sum, buffer) => sum + buffer.limit, 0);
+            let sentBytes = 0;
+            let lastLoggedPercent = 0;
+            let lastLoggedAt = uploadStartedAt;
+            for (const [index, o] of buffers.entries()) {
                 const outData = o.toString('hex');
-                this.Log.debug('send hex strting: ', outData);
                 try {
-                    yield this.plugin.send(uuid, outData);
+                    yield this.plugin.send(uuid, outData, getProtocolV1SendOptions(name));
+                    sentBytes += o.limit;
+                    if (isFirmwareUpload) {
+                        const now = Date.now();
+                        const percent = Math.floor(((index + 1) / buffers.length) * 100);
+                        if (shouldLogFirmwareUploadProgress({
+                            percent,
+                            lastLoggedPercent,
+                            now,
+                            lastLoggedAt,
+                        })) {
+                            const elapsedSeconds = Math.max((now - uploadStartedAt) / 1000, 0.001);
+                            const kibPerSecond = sentBytes / 1024 / elapsedSeconds;
+                            (_a = this.Log) === null || _a === void 0 ? void 0 : _a.debug(`[LowlevelTransport] FirmwareUpload progress: ${percent}% ` +
+                                `(${index + 1}/${buffers.length} packets, ${sentBytes}/${totalBytes} bytes, ` +
+                                `${elapsedSeconds.toFixed(1)}s, ${kibPerSecond.toFixed(1)} KiB/s)`);
+                            lastLoggedPercent = percent;
+                            lastLoggedAt = now;
+                        }
+                    }
                 }
                 catch (e) {
                     this.Log.debug('lowlevel transport send error: ', e);
@@ -163,8 +236,7 @@ class LowlevelTransport {
                 }
             }
             try {
-                const response = yield this.readProtocolV1Message(options === null || options === void 0 ? void 0 : options.timeoutMs);
-                this.Log.debug('receive data: ', response);
+                const response = yield this.readProtocolV1Message(uuid, options === null || options === void 0 ? void 0 : options.timeoutMs);
                 const jsonData = ProtocolV1.decodeMessage(messages, response);
                 return check.call(jsonData);
             }
@@ -197,12 +269,9 @@ class LowlevelTransport {
         var _a, _b, _c, _d, _e, _f;
         return __awaiter(this, void 0, void 0, function* () {
             if (expectedProtocol === 'V2') {
-                if (yield this.probeProtocolV2(uuid)) {
-                    this.deviceProtocol.set(uuid, 'V2');
-                    (_a = this.Log) === null || _a === void 0 ? void 0 : _a.debug(`[LowlevelTransport] detectProtocol: uuid=${uuid} -> V2 (expected)`);
-                    return 'V2';
-                }
-                throw this.createProtocolMismatchError(expectedProtocol);
+                this.deviceProtocol.set(uuid, 'V2');
+                (_a = this.Log) === null || _a === void 0 ? void 0 : _a.debug(`[LowlevelTransport] detectProtocol: uuid=${uuid} -> V2 (expected)`);
+                return 'V2';
             }
             if (expectedProtocol === 'V1') {
                 if (yield this.probeProtocolV1(uuid)) {
@@ -242,8 +311,10 @@ class LowlevelTransport {
     resetConnectionAfterProbe(uuid, protocol) {
         var _a, _b, _c, _d;
         return __awaiter(this, void 0, void 0, function* () {
+            yield this.protocolV2Links.invalidateLink(uuid, `Reset connection after Protocol ${protocol} probe`);
             (_a = this.protocolV2Assemblers.get(uuid)) === null || _a === void 0 ? void 0 : _a.reset();
             try {
+                this.connectedDevices.delete(uuid);
                 yield this.plugin.disconnect(uuid);
             }
             catch (error) {
@@ -251,6 +322,8 @@ class LowlevelTransport {
             }
             try {
                 yield this.plugin.connect(uuid);
+                this.connectedDevices.add(uuid);
+                this.advanceProtocolV2Generation(uuid);
             }
             catch (error) {
                 (_c = this.Log) === null || _c === void 0 ? void 0 : _c.debug(`[LowlevelTransport] reconnect after Protocol ${protocol} probe failed:`, error);
@@ -307,18 +380,18 @@ class LowlevelTransport {
             }
         });
     }
-    receiveHex(timeoutMs, commandName) {
+    receiveHex(uuid, timeoutMs, commandName) {
         return __awaiter(this, void 0, void 0, function* () {
-            const response = yield transport.withProtocolTimeout(this.plugin.receive(), timeoutMs, () => this.createProtocolTimeoutError(commandName, timeoutMs !== null && timeoutMs !== void 0 ? timeoutMs : 0));
+            const response = yield transport.withProtocolTimeout(this.plugin.receive(uuid), timeoutMs, () => this.createProtocolTimeoutError(commandName, timeoutMs !== null && timeoutMs !== void 0 ? timeoutMs : 0));
             if (typeof response !== 'string') {
                 throw new Error('Returning data is not string');
             }
             return response;
         });
     }
-    readProtocolV1Message(timeoutMs) {
+    readProtocolV1Message(uuid, timeoutMs) {
         return __awaiter(this, void 0, void 0, function* () {
-            const first = yield this.receiveHex(timeoutMs, 'ProtocolV1');
+            const first = yield this.receiveHex(uuid, timeoutMs, 'ProtocolV1');
             const firstData = transport.hexToBytes(first);
             if (!isProtocolV1TransportChunk(firstData)) {
                 return first;
@@ -327,13 +400,13 @@ class LowlevelTransport {
             let buffer = firstData.slice(3);
             const expectedLength = transport.PROTOCOL_V1_MESSAGE_HEADER_SIZE + payloadLength;
             while (buffer.length < expectedLength) {
-                const next = yield this.receiveHex(timeoutMs, 'ProtocolV1');
+                const next = yield this.receiveHex(uuid, timeoutMs, 'ProtocolV1');
                 buffer = transport.concatUint8Arrays([buffer, transport.hexToBytes(next)]);
             }
             return transport.bytesToHex(buffer.slice(0, expectedLength));
         });
     }
-    readProtocolV2Frame(uuid, timeoutMs) {
+    readProtocolV2Frame(uuid, timeoutMs, commandName = 'ProtocolV2') {
         return __awaiter(this, void 0, void 0, function* () {
             let assembler = this.protocolV2Assemblers.get(uuid);
             if (!assembler) {
@@ -345,7 +418,7 @@ class LowlevelTransport {
                 return queuedFrame;
             let frame;
             while (!frame) {
-                const response = yield this.receiveHex(timeoutMs, 'ProtocolV2');
+                const response = yield this.receiveHex(uuid, timeoutMs, commandName);
                 const chunk = transport.hexToBytes(response);
                 if (chunk.length > 0) {
                     frame = assembler.push(chunk);
@@ -363,38 +436,64 @@ class LowlevelTransport {
         });
     }
     callProtocolV2(uuid, name, data, options) {
-        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
             if (!this._messages || !this._messagesV2) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.TransportNotConfigured);
             }
-            const timeoutMs = (_a = options === null || options === void 0 ? void 0 : options.timeoutMs) !== null && _a !== void 0 ? _a : LOWLEVEL_PROTOCOL_TIMEOUT_MS;
-            (_b = this.protocolV2Assemblers.get(uuid)) === null || _b === void 0 ? void 0 : _b.reset();
-            const session = new transport.ProtocolV2Session({
-                schemas: {
-                    protocolV1: this._messages,
-                    protocolV2: this._messagesV2,
-                },
-                router: transport.PROTOCOL_V2_CHANNEL_BLE_UART,
-                writeFrame: (frame) => this.writeProtocolV2Frame(uuid, frame),
-                readFrame: () => this.readProtocolV2Frame(uuid, timeoutMs),
-                logger: this.Log,
-                logPrefix: 'ProtocolV2 Lowlevel-BLE',
-                createTimeoutError: (_messageName, timeout) => this.createProtocolTimeoutError(name, timeout),
-            });
             try {
-                return yield session.call(name, data, Object.assign(Object.assign({}, options), { timeoutMs }));
+                return yield this.protocolV2Links.call(uuid, () => this.createProtocolV2Adapter(uuid), name, data, options);
             }
             catch (e) {
-                (_c = this.protocolV2Assemblers.get(uuid)) === null || _c === void 0 ? void 0 : _c.reset();
                 this.Log.error('lowlevel Protocol V2 call error: ', e);
                 throw e;
             }
         });
     }
+    createProtocolV2Adapter(uuid) {
+        var _a;
+        const generation = (_a = this.protocolV2Generations.get(uuid)) !== null && _a !== void 0 ? _a : 0;
+        const assertCurrentGeneration = () => {
+            if (this.protocolV2Generations.get(uuid) !== generation) {
+                throw new Error(`Protocol V2 connection generation changed for ${uuid}`);
+            }
+        };
+        return {
+            router: transport.PROTOCOL_V2_CHANNEL_BLE_UART,
+            maxFrameBytes: transport.PROTOCOL_V2_BLE_FRAME_MAX_BYTES,
+            generation,
+            prepareCall: () => {
+                var _a;
+                assertCurrentGeneration();
+                (_a = this.protocolV2Assemblers.get(uuid)) === null || _a === void 0 ? void 0 : _a.reset();
+            },
+            writeFrame: (frame) => {
+                assertCurrentGeneration();
+                return this.writeProtocolV2Frame(uuid, frame);
+            },
+            readFrame: (context) => {
+                assertCurrentGeneration();
+                return this.readProtocolV2Frame(uuid, context.timeoutMs, context.messageName);
+            },
+            reset: () => {
+                var _a;
+                (_a = this.protocolV2Assemblers.get(uuid)) === null || _a === void 0 ? void 0 : _a.reset();
+            },
+            logger: this.Log,
+            logPrefix: 'ProtocolV2 Lowlevel-BLE',
+            createTimeoutError: (messageName, timeout) => this.createProtocolTimeoutError(messageName, timeout),
+        };
+    }
+    advanceProtocolV2Generation(uuid) {
+        var _a;
+        const nextGeneration = ((_a = this.protocolV2Generations.get(uuid)) !== null && _a !== void 0 ? _a : 0) + 1;
+        this.protocolV2Generations.set(uuid, nextGeneration);
+        return nextGeneration;
+    }
     cancel() {
         this.Log.debug('lowlevel-transport', 'cancel');
     }
 }
 
-module.exports = LowlevelTransport;
+exports["default"] = LowlevelTransport;
+exports.getProtocolV1SendOptions = getProtocolV1SendOptions;
+exports.shouldLogFirmwareUploadProgress = shouldLogFirmwareUploadProgress;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport-lowlevel",
-  "version": "1.2.0-alpha.2",
+  "version": "1.2.0-alpha.20",
   "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.2",
-    "@onekeyfe/hd-transport": "1.2.0-alpha.2"
+    "@onekeyfe/hd-shared": "1.2.0-alpha.20",
+    "@onekeyfe/hd-transport": "1.2.0-alpha.20"
   },
-  "gitHead": "6c183b7f7027f4b4d3db4f427f6360351a6c6680"
+  "gitHead": "5fbc1ada90fd3cfda7e5ef08be368cb452018733"
 }

package/src/index.ts

@@ -1,10 +1,10 @@
 import { ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
 import transport, {
-  LogBlockCommand,
   PROTOCOL_V1_MESSAGE_HEADER_SIZE,
+  PROTOCOL_V2_BLE_FRAME_MAX_BYTES,
   PROTOCOL_V2_CHANNEL_BLE_UART,
   ProtocolV2FrameAssembler,
-  ProtocolV2Session,
+  ProtocolV2LinkManager,
   bytesToHex,
   concatUint8Arrays,
   hexToBytes,
@@ -25,8 +25,31 @@ const { check, ProtocolV1, parseConfigure } = transport;
 
 const PROTOCOL_PROBE_TIMEOUT_MS = 1000;
 const PROTOCOL_V2_PROBE_TIMEOUT_MS = 5000;
-const LOWLEVEL_PROTOCOL_TIMEOUT_MS = 30_000;
 const LOWLEVEL_PROTOCOL_V2_PACKET_LENGTH = 64;
+const FIRMWARE_UPLOAD_LOG_PERCENT_STEP = 5;
+const FIRMWARE_UPLOAD_LOG_INTERVAL_MS = 10_000;
+
+export function shouldLogFirmwareUploadProgress({
+  percent,
+  lastLoggedPercent,
+  now,
+  lastLoggedAt,
+}: {
+  percent: number;
+  lastLoggedPercent: number;
+  now: number;
+  lastLoggedAt: number;
+}) {
+  return (
+    percent === 100 ||
+    percent - lastLoggedPercent >= FIRMWARE_UPLOAD_LOG_PERCENT_STEP ||
+    now - lastLoggedAt >= FIRMWARE_UPLOAD_LOG_INTERVAL_MS
+  );
+}
+
+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;
@@ -59,6 +82,41 @@ export default class LowlevelTransport {
 
   private protocolV2Assemblers: Map<string, ProtocolV2FrameAssembler> = new Map();
 
+  private protocolV2Generations: Map<string, number> = new Map();
+
+  private connectedDevices: Set<string> = new Set();
+
+  private protocolV2Links = new ProtocolV2LinkManager<string>({
+    getSchemas: () => {
+      if (!this._messages || !this._messagesV2) {
+        throw ERRORS.TypedError(HardwareErrorCode.TransportNotConfigured);
+      }
+      return {
+        protocolV1: this._messages,
+        protocolV2: this._messagesV2,
+      };
+    },
+    classifyError: () => 'link-fatal',
+    onLinkInvalidated: async (uuid, reason) => {
+      this.protocolV2Assemblers.get(uuid)?.reset();
+      this.Log?.debug(`[LowlevelTransport] Protocol V2 link invalidated: ${uuid}`, reason);
+      if (reason.startsWith('Protocol V2 link-fatal error:')) {
+        this.deviceProtocol.delete(uuid);
+        this.advanceProtocolV2Generation(uuid);
+        try {
+          await this.plugin.disconnect(uuid);
+        } catch (error) {
+          this.Log?.debug(
+            `[LowlevelTransport] disconnect tainted Protocol V2 link failed: ${uuid}`,
+            error
+          );
+        } finally {
+          this.connectedDevices.delete(uuid);
+        }
+      }
+    },
+  });
+
   getProtocolType(path: string): ProtocolType | undefined {
     return this.deviceProtocol.get(path);
   }
@@ -78,6 +136,9 @@ export default class LowlevelTransport {
 
   configureProtocolV2(signedData: any) {
     this._messagesV2 = parseConfigure(signedData);
+    this.protocolV2Links
+      .invalidateAllLinks('Protocol V2 schema reconfigured')
+      .catch(error => this.Log?.debug('Protocol V2 schema link cleanup failed:', error));
   }
 
   listen() {
@@ -96,9 +157,15 @@ export default class LowlevelTransport {
   }
 
   async acquire(input: LowLevelAcquireInput) {
+    const alreadyConnected = this.connectedDevices.has(input.uuid);
     try {
       await this.plugin.connect(input.uuid);
+      if (!alreadyConnected) {
+        this.connectedDevices.add(input.uuid);
+        this.advanceProtocolV2Generation(input.uuid);
+      }
     } catch (error) {
+      this.connectedDevices.delete(input.uuid);
       this.Log.debug('lowlelvel transport connect error: ', error);
       throw ERRORS.TypedError(
         HardwareErrorCode.LowlevelTrasnportConnectError,
@@ -120,9 +187,12 @@ export default class LowlevelTransport {
 
   async release(uuid: string) {
     try {
+      await this.protocolV2Links.invalidateLink(uuid, 'Lowlevel transport released');
       await this.plugin.disconnect(uuid);
+      this.connectedDevices.delete(uuid);
       this.deviceProtocol.delete(uuid);
-      this.deviceProtocolHints.delete(uuid);
+      // A name-derived protocol hint survives disconnect and lets fast reconnect probe
+      // Protocol V2 first without sending a redundant V1 Initialize.
       this.protocolV2Assemblers.delete(uuid);
       return true;
     } catch (error) {
@@ -148,20 +218,7 @@ export default class LowlevelTransport {
         `Device protocol has not been detected for ${uuid}`
       );
     }
-    if (LogBlockCommand.has(name)) {
-      this.Log.debug('lowlevel-transport', 'call-', ' name: ', name, ' protocol: ', protocol);
-    } else {
-      this.Log.debug(
-        'lowlevel-transport',
-        'call-',
-        ' name: ',
-        name,
-        ' data: ',
-        data,
-        ' protocol: ',
-        protocol
-      );
-    }
+    this.Log.debug('transport call', { name, protocol });
 
     if (protocol === 'V2') {
       return this.callProtocolV2(uuid, name, data, options);
@@ -182,12 +239,41 @@ export default class LowlevelTransport {
 
     const messages = this._messages;
     const buffers = ProtocolV1.encodeTransportPackets(messages, name, data);
-    for (const o of buffers) {
+    const isFirmwareUpload = name === 'FirmwareUpload';
+    const uploadStartedAt = Date.now();
+    const totalBytes = buffers.reduce((sum, buffer) => sum + buffer.limit, 0);
+    let sentBytes = 0;
+    let lastLoggedPercent = 0;
+    let lastLoggedAt = uploadStartedAt;
+
+    for (const [index, o] of buffers.entries()) {
       const outData = o.toString('hex');
-      // Upload resources on low-end phones may OOM
-      this.Log.debug('send hex strting: ', outData);
       try {
-        await this.plugin.send(uuid, outData);
+        await this.plugin.send(uuid, outData, getProtocolV1SendOptions(name));
+        sentBytes += o.limit;
+
+        if (isFirmwareUpload) {
+          const now = Date.now();
+          const percent = Math.floor(((index + 1) / buffers.length) * 100);
+          if (
+            shouldLogFirmwareUploadProgress({
+              percent,
+              lastLoggedPercent,
+              now,
+              lastLoggedAt,
+            })
+          ) {
+            const elapsedSeconds = Math.max((now - uploadStartedAt) / 1000, 0.001);
+            const kibPerSecond = sentBytes / 1024 / elapsedSeconds;
+            this.Log?.debug(
+              `[LowlevelTransport] FirmwareUpload progress: ${percent}% ` +
+                `(${index + 1}/${buffers.length} packets, ${sentBytes}/${totalBytes} bytes, ` +
+                `${elapsedSeconds.toFixed(1)}s, ${kibPerSecond.toFixed(1)} KiB/s)`
+            );
+            lastLoggedPercent = percent;
+            lastLoggedAt = now;
+          }
+        }
       } catch (e) {
         this.Log.debug('lowlevel transport send error: ', e);
         throw ERRORS.TypedError(HardwareErrorCode.BleWriteCharacteristicError, e.reason);
@@ -195,8 +281,7 @@ export default class LowlevelTransport {
     }
 
     try {
-      const response = await this.readProtocolV1Message(options?.timeoutMs);
-      this.Log.debug('receive data: ', response);
+      const response = await this.readProtocolV1Message(uuid, options?.timeoutMs);
       const jsonData = ProtocolV1.decodeMessage(messages, response);
       return check.call(jsonData);
     } catch (e) {
@@ -242,12 +327,12 @@ export default class LowlevelTransport {
     protocolHint?: ProtocolType
   ): Promise<ProtocolType> {
     if (expectedProtocol === 'V2') {
-      if (await this.probeProtocolV2(uuid)) {
-        this.deviceProtocol.set(uuid, 'V2');
-        this.Log?.debug(`[LowlevelTransport] detectProtocol: uuid=${uuid} -> V2 (expected)`);
-        return 'V2';
-      }
-      throw this.createProtocolMismatchError(expectedProtocol);
+      // Bootloader may not answer Ping after an update reboot. An explicit V2 hint means
+      // the protocol was already confirmed, so establish the link and let the first
+      // business command validate it, matching RN and Electron BLE.
+      this.deviceProtocol.set(uuid, 'V2');
+      this.Log?.debug(`[LowlevelTransport] detectProtocol: uuid=${uuid} -> V2 (expected)`);
+      return 'V2';
     }
 
     if (expectedProtocol === 'V1') {
@@ -291,9 +376,14 @@ export default class LowlevelTransport {
   }
 
   private async resetConnectionAfterProbe(uuid: string, protocol: ProtocolType) {
+    await this.protocolV2Links.invalidateLink(
+      uuid,
+      `Reset connection after Protocol ${protocol} probe`
+    );
     this.protocolV2Assemblers.get(uuid)?.reset();
 
     try {
+      this.connectedDevices.delete(uuid);
       await this.plugin.disconnect(uuid);
     } catch (error) {
       this.Log?.debug(
@@ -304,6 +394,8 @@ export default class LowlevelTransport {
 
     try {
       await this.plugin.connect(uuid);
+      this.connectedDevices.add(uuid);
+      this.advanceProtocolV2Generation(uuid);
     } catch (error) {
       this.Log?.debug(
         `[LowlevelTransport] reconnect after Protocol ${protocol} probe failed:`,
@@ -361,8 +453,8 @@ export default class LowlevelTransport {
     }
   }
 
-  private async receiveHex(timeoutMs: number | undefined, commandName: string) {
-    const response = await withProtocolTimeout(this.plugin.receive(), timeoutMs, () =>
+  private async receiveHex(uuid: string, timeoutMs: number | undefined, commandName: string) {
+    const response = await withProtocolTimeout(this.plugin.receive(uuid), timeoutMs, () =>
       this.createProtocolTimeoutError(commandName, timeoutMs ?? 0)
     );
     if (typeof response !== 'string') {
@@ -371,8 +463,8 @@ export default class LowlevelTransport {
     return response;
   }
 
-  private async readProtocolV1Message(timeoutMs?: number) {
-    const first = await this.receiveHex(timeoutMs, 'ProtocolV1');
+  private async readProtocolV1Message(uuid: string, timeoutMs?: number) {
+    const first = await this.receiveHex(uuid, timeoutMs, 'ProtocolV1');
     const firstData = hexToBytes(first);
     if (!isProtocolV1TransportChunk(firstData)) {
       return first;
@@ -383,14 +475,14 @@ export default class LowlevelTransport {
     const expectedLength = PROTOCOL_V1_MESSAGE_HEADER_SIZE + payloadLength;
 
     while (buffer.length < expectedLength) {
-      const next = await this.receiveHex(timeoutMs, 'ProtocolV1');
+      const next = await this.receiveHex(uuid, timeoutMs, 'ProtocolV1');
       buffer = concatUint8Arrays([buffer, hexToBytes(next)]);
     }
 
     return bytesToHex(buffer.slice(0, expectedLength));
   }
 
-  private async readProtocolV2Frame(uuid: string, timeoutMs?: number) {
+  private async readProtocolV2Frame(uuid: string, timeoutMs?: number, commandName = 'ProtocolV2') {
     let assembler = this.protocolV2Assemblers.get(uuid);
     if (!assembler) {
       assembler = new ProtocolV2FrameAssembler();
@@ -402,7 +494,7 @@ export default class LowlevelTransport {
 
     let frame: Uint8Array | undefined;
     while (!frame) {
-      const response = await this.receiveHex(timeoutMs, 'ProtocolV2');
+      const response = await this.receiveHex(uuid, timeoutMs, commandName);
       const chunk = hexToBytes(response);
       if (chunk.length > 0) {
         frame = assembler.push(chunk);
@@ -428,34 +520,60 @@ export default class LowlevelTransport {
       throw ERRORS.TypedError(HardwareErrorCode.TransportNotConfigured);
     }
 
-    const timeoutMs = options?.timeoutMs ?? LOWLEVEL_PROTOCOL_TIMEOUT_MS;
-    this.protocolV2Assemblers.get(uuid)?.reset();
-    const session = new ProtocolV2Session({
-      schemas: {
-        protocolV1: this._messages,
-        protocolV2: this._messagesV2,
-      },
-      router: PROTOCOL_V2_CHANNEL_BLE_UART,
-      writeFrame: (frame: Uint8Array) => this.writeProtocolV2Frame(uuid, frame),
-      readFrame: () => this.readProtocolV2Frame(uuid, timeoutMs),
-      logger: this.Log,
-      logPrefix: 'ProtocolV2 Lowlevel-BLE',
-      createTimeoutError: (_messageName: string, timeout: number) =>
-        this.createProtocolTimeoutError(name, timeout),
-    });
-
     try {
-      return await session.call(name, data, {
-        ...options,
-        timeoutMs,
-      });
+      return await this.protocolV2Links.call(
+        uuid,
+        () => this.createProtocolV2Adapter(uuid),
+        name,
+        data,
+        options
+      );
     } catch (e) {
-      this.protocolV2Assemblers.get(uuid)?.reset();
       this.Log.error('lowlevel Protocol V2 call error: ', e);
       throw e;
     }
   }
 
+  private createProtocolV2Adapter(uuid: string) {
+    const generation = this.protocolV2Generations.get(uuid) ?? 0;
+    const assertCurrentGeneration = () => {
+      if (this.protocolV2Generations.get(uuid) !== generation) {
+        throw new Error(`Protocol V2 connection generation changed for ${uuid}`);
+      }
+    };
+
+    return {
+      router: PROTOCOL_V2_CHANNEL_BLE_UART,
+      maxFrameBytes: PROTOCOL_V2_BLE_FRAME_MAX_BYTES,
+      generation,
+      prepareCall: () => {
+        assertCurrentGeneration();
+        this.protocolV2Assemblers.get(uuid)?.reset();
+      },
+      writeFrame: (frame: Uint8Array) => {
+        assertCurrentGeneration();
+        return this.writeProtocolV2Frame(uuid, frame);
+      },
+      readFrame: (context: { messageName: string; timeoutMs?: number }) => {
+        assertCurrentGeneration();
+        return this.readProtocolV2Frame(uuid, context.timeoutMs, context.messageName);
+      },
+      reset: () => {
+        this.protocolV2Assemblers.get(uuid)?.reset();
+      },
+      logger: this.Log,
+      logPrefix: 'ProtocolV2 Lowlevel-BLE',
+      createTimeoutError: (messageName: string, timeout: number) =>
+        this.createProtocolTimeoutError(messageName, timeout),
+    };
+  }
+
+  private advanceProtocolV2Generation(uuid: string) {
+    const nextGeneration = (this.protocolV2Generations.get(uuid) ?? 0) + 1;
+    this.protocolV2Generations.set(uuid, nextGeneration);
+    return nextGeneration;
+  }
+
   cancel() {
     this.Log.debug('lowlevel-transport', 'cancel');
   }