@onekeyfe/hd-transport 1.2.8-alpha.117 → 1.2.8-alpha.118

package/__tests__/protocol-v2-file-write-pipeline.test.js

@@ -110,7 +110,7 @@ const createDevice = ({ reply } = {}) => {
     const request = requests[index];
     const { offset, total_size: totalSize, data } = request.message.file;
     // Decoded protobuf bytes are hex strings.
-    const length = Number(typeof data === 'string' ? data.length / 2 : data.length);
+    const length = data.length / 2;
     const confirmation = encode('FilesystemFile', {
       path: PATH,
       offset,
@@ -154,10 +154,9 @@ const createSession = (device, options = {}) =>
     ...options,
   });
 
-const runPipeline = (session, chunks, callOptions = {}) => {
+const runPipeline = (session, chunks, callOptions = {}, onResponse = jest.fn()) => {
   const [first, ...rest] = chunks;
   const next = jest.fn(() => Promise.resolve(rest.shift()));
-  const onResponse = jest.fn();
   return {
     next,
     onResponse,
@@ -168,6 +167,28 @@ const runPipeline = (session, chunks, callOptions = {}) => {
   };
 };
 
+const runManagedPipeline = (device, chunks) => {
+  const adapter = {
+    router: 1,
+    generation: 1,
+    prepareCall: jest.fn(),
+    writeFrame: device.writeFrame,
+    readFrame: device.readFrame,
+    reset: jest.fn(),
+  };
+  const manager = new ProtocolV2LinkManager({
+    getSchemas: () => schemas,
+    classifyError: () => 'link-fatal',
+  });
+  const [first, ...rest] = chunks;
+  return {
+    adapter,
+    result: manager.call('device-a', () => adapter, 'FilesystemFileWrite', first, {
+      fileWritePipeline: { next: () => Promise.resolve(rest.shift()), onResponse: jest.fn() },
+    }),
+  };
+};
+
 describe('Protocol V2 file write pipeline', () => {
   test('keeps two ordered chunks in flight and confirms each one', async () => {
     const device = createDevice();
@@ -232,25 +253,9 @@ describe('Protocol V2 file write pipeline', () => {
     const device = createDevice({
       reply: ({ encode }) => [encode('Failure', { code: 9, message: 'Write offset mismatch' })],
     });
-    const adapter = {
-      router: 1,
-      generation: 1,
-      prepareCall: jest.fn(),
-      writeFrame: device.writeFrame,
-      readFrame: device.readFrame,
-      reset: jest.fn(),
-    };
-    const manager = new ProtocolV2LinkManager({
-      getSchemas: () => schemas,
-      classifyError: () => 'link-fatal',
-    });
-    const [first, ...rest] = chunksOf(6, 2);
+    const { adapter, result } = runManagedPipeline(device, chunksOf(6, 2));
 
-    await expect(
-      manager.call('device-a', () => adapter, 'FilesystemFileWrite', first, {
-        fileWritePipeline: { next: () => Promise.resolve(rest.shift()), onResponse: jest.fn() },
-      })
-    ).resolves.toMatchObject({ type: 'Failure' });
+    await expect(result).resolves.toMatchObject({ type: 'Failure' });
     expect(adapter.reset).not.toHaveBeenCalled();
     expect(adapter.prepareCall).toHaveBeenCalledTimes(1);
   });
@@ -262,25 +267,11 @@ describe('Protocol V2 file write pipeline', () => {
           ? [encode('FilesystemFile', { path: PATH, offset: 4, total_size: 6, processed_byte: 6 })]
           : [confirmation],
     });
-    const adapter = {
-      router: 1,
-      generation: 1,
-      prepareCall: jest.fn(),
-      writeFrame: device.writeFrame,
-      readFrame: device.readFrame,
-      reset: jest.fn(() => Promise.resolve()),
-    };
-    const manager = new ProtocolV2LinkManager({
-      getSchemas: () => schemas,
-      classifyError: () => 'link-fatal',
-    });
-    const [first, ...rest] = chunksOf(6, 2);
+    const { adapter, result } = runManagedPipeline(device, chunksOf(6, 2));
 
-    await expect(
-      manager.call('device-a', () => adapter, 'FilesystemFileWrite', first, {
-        fileWritePipeline: { next: () => Promise.resolve(rest.shift()), onResponse: jest.fn() },
-      })
-    ).rejects.toEqual(expect.objectContaining({ name: 'ProtocolV2LinkError', code: 'frame' }));
+    await expect(result).rejects.toEqual(
+      expect.objectContaining({ name: 'ProtocolV2LinkError', code: 'frame' })
+    );
     expect(adapter.reset).toHaveBeenCalled();
   });
 
@@ -302,9 +293,79 @@ describe('Protocol V2 file write pipeline', () => {
     const { result } = runPipeline(session, [chunk(0, 2, 8), chunk(4, 2, 8)]);
 
     await expect(result).rejects.toThrow('chunk out of order: expected offset 2, got 4');
+    await expect(result).rejects.toEqual(
+      expect.objectContaining({ name: 'ProtocolV2LinkError', code: 'frame' })
+    );
     expect(device.requests).toHaveLength(1);
   });
 
+  test.each([
+    ['path', { path: 'vol0:/application_p2.bin' }],
+    ['total size', { total_size: 9 }],
+  ])('rejects a source chunk with another %s before writing it', async (_field, file) => {
+    const device = createDevice();
+    const session = createSession(device);
+    const second = chunk(2, 2, 8);
+    const { result } = runPipeline(session, [
+      chunk(0, 2, 8),
+      { ...second, file: { ...second.file, ...file } },
+    ]);
+
+    await expect(result).rejects.toThrow('chunk belongs to a different file');
+    await expect(result).rejects.toEqual(
+      expect.objectContaining({ name: 'ProtocolV2LinkError', code: 'frame' })
+    );
+    expect(device.requests).toHaveLength(1);
+  });
+
+  test.each([
+    ['path', { path: 'vol0:/application_p2.bin' }],
+    ['total size', { total_size: 8 }],
+  ])('invalidates the link when a confirmation echoes another %s', async (_field, echo) => {
+    const device = createDevice({
+      reply: ({ index, confirmation, encode }) =>
+        index === 0
+          ? [
+              encode('FilesystemFile', {
+                path: PATH,
+                offset: 0,
+                total_size: 6,
+                processed_byte: 2,
+                ...echo,
+              }),
+            ]
+          : [confirmation],
+    });
+    const { adapter, result } = runManagedPipeline(device, chunksOf(6, 2));
+
+    await expect(result).rejects.toEqual(
+      expect.objectContaining({ name: 'ProtocolV2LinkError', code: 'frame' })
+    );
+    expect(adapter.reset).toHaveBeenCalled();
+  });
+
+  test.each(['readFrame', 'writeFrame'])(
+    'passes a %s transport error through unchanged with chunks in flight',
+    async method => {
+      const device = createDevice();
+      const linkLost = new Error('BLE device disconnected');
+      const original = device[method].getMockImplementation();
+      let calls = 0;
+      device[method].mockImplementation((...args) => {
+        calls += 1;
+        // The second write, or the first read, happens with chunk 0 still in flight.
+        return calls === (method === 'writeFrame' ? 2 : 1)
+          ? Promise.reject(linkLost)
+          : original(...args);
+      });
+      const session = createSession(device);
+      const { result } = runPipeline(session, chunksOf(6, 2));
+
+      await expect(result).rejects.toBe(linkLost);
+      expect(device.requests.length).toBeGreaterThan(0);
+    }
+  );
+
   test('drains the in-flight chunk and returns the last confirmation when the source stops', async () => {
     const device = createDevice();
     const session = createSession(device);
@@ -317,7 +378,7 @@ describe('Protocol V2 file write pipeline', () => {
     expect(onResponse).toHaveBeenCalledTimes(2);
   });
 
-  test('detects a chunk lost before a bootloader that appends at its own cursor', async () => {
+  test('detects a lost chunk when the bootloader appends at its own cursor', async () => {
     let cursor = 0;
     const device = createDevice({
       reply: ({ index, request, encode }) => {
@@ -366,6 +427,9 @@ describe('Protocol V2 file write pipeline', () => {
     const { result } = runPipeline(session, [chunk(0, 128, 128)]);
 
     await expect(result).rejects.toThrow('Protocol V2 frame too large for transport');
+    await expect(result).rejects.not.toEqual(
+      expect.objectContaining({ name: 'ProtocolV2LinkError' })
+    );
     expect(device.requests).toHaveLength(0);
   });
 
@@ -401,17 +465,14 @@ describe('Protocol V2 file write pipeline', () => {
   test('stops when the caller rejects a confirmed chunk', async () => {
     const device = createDevice();
     const session = createSession(device);
-    const [first, ...rest] = chunksOf(10, 2);
-    const result = session.call('FilesystemFileWrite', first, {
-      fileWritePipeline: {
-        next: () => Promise.resolve(rest.shift()),
-        onResponse: () => {
-          throw new Error('cancelled');
-        },
-      },
+    const { result } = runPipeline(session, chunksOf(10, 2), {}, () => {
+      throw new Error('cancelled');
     });
 
     await expect(result).rejects.toThrow('cancelled');
+    await expect(result).rejects.toEqual(
+      expect.objectContaining({ name: 'ProtocolV2LinkError', code: 'frame' })
+    );
     expect(device.requests).toHaveLength(2);
   });
 });

package/dist/index.d.ts

@@ -323,6 +323,12 @@ type OneKeyDeviceInfoWithSession = OneKeyUsbDeviceInfo & {
 type OneKeyMobileDeviceInfo = {
     id: string;
     name: string | null;
+    /**
+     * Color letter of the serial number ('A'-'Z') from the Pro2 / Neo BLE advertisement,
+     * possibly seen in an earlier scan. Set by the React Native and Electron BLE
+     * transports; absent when unknown.
+     */
+    bleColorCode?: string;
 };
 type OneKeyDeviceInfoBase = {
     commType: OneKeyDeviceCommType;
@@ -6869,7 +6875,10 @@ declare class ProtocolV2Session {
     call(name: string, data: Record<string, unknown>, callOptions?: ProtocolV2CallOptions): Promise<MessageFromOneKey>;
     sendFlowControl(name: string, data: Record<string, unknown>): Promise<MessageFromOneKey>;
     private serializeWrite;
+    private reportWriteCompleted;
+    private createCallTimeoutError;
     private executeCall;
+    private encodeRequestFrame;
     /**
      * Validates one received frame for this session. Returns undefined for an ACK of one of
      * `ackSequences`, otherwise the decoded response.
@@ -6881,9 +6890,7 @@ declare class ProtocolV2Session {
      * answers every chunk in order, so responses are matched to chunks by position. Upstream
      * bootloaders append at their own cursor without checking the request offset, so the echoed
      * offset is what exposes a lost chunk. A device Failure, or `next` returning undefined, stops
-     * sending; the remaining in-flight responses are drained so the link stays usable. The call
-     * then returns the Failure like a serial call, or the last confirmation, which the caller
-     * checks for completeness.
+     * sending; the remaining in-flight responses are drained so the link stays usable.
      */
     private executeFileWritePipeline;
 }

package/dist/index.js

@@ -1108,7 +1108,8 @@ function withProtocolTimeout(promise, timeoutMs, createTimeoutError, onTimeout,
         }
     });
 }
-function readFileWriteChunk(request) {
+const resolveProtocolV2CallTimeoutMs = (timeoutMs) => timeoutMs && timeoutMs > 0 ? timeoutMs : PROTOCOL_V2_DEFAULT_RESPONSE_TIMEOUT_MS;
+function parseFileWriteChunk(request) {
     var _a;
     const file = request.file;
     const offset = Number(file === null || file === void 0 ? void 0 : file.offset);
@@ -1167,46 +1168,47 @@ class ProtocolV2Session {
         this.pendingWrite = result.catch(() => undefined);
         return result;
     }
+    reportWriteCompleted(callOptions, writeStartedAt, frameBytes) {
+        var _a, _b;
+        try {
+            (_a = callOptions.onWriteCompleted) === null || _a === void 0 ? void 0 : _a.call(callOptions, {
+                elapsedMs: Math.max(Date.now() - writeStartedAt, 0),
+                frameBytes,
+            });
+        }
+        catch (error) {
+            const { logger, logPrefix = 'ProtocolV2' } = this.options;
+            (_b = logger === null || logger === void 0 ? void 0 : logger.error) === null || _b === void 0 ? void 0 : _b.call(logger, `${logPrefix} write metrics callback failed: ${String(error)}`);
+        }
+    }
+    createCallTimeoutError(name, timeoutMs) {
+        const { createTimeoutError } = this.options;
+        return createTimeoutError
+            ? createTimeoutError(name, timeoutMs)
+            : new Error(`Protocol V2 response timeout after ${timeoutMs}ms for ${name}`);
+    }
     executeCall(name, data, callOptions) {
         if (callOptions.fileWritePipeline) {
             return this.executeFileWritePipeline(name, data, callOptions, callOptions.fileWritePipeline);
         }
-        const { schemas, router, packetSrc = PROTOCOL_V2_PACKET_SRC_COMMAND, maxFrameBytes, prepareCall, writeFrame, readFrame, logger, logPrefix = 'ProtocolV2', createTimeoutError, generation = 0, } = this.options;
-        const timeoutMs = callOptions.timeoutMs && callOptions.timeoutMs > 0
-            ? callOptions.timeoutMs
-            : PROTOCOL_V2_DEFAULT_RESPONSE_TIMEOUT_MS;
+        const { prepareCall, writeFrame, readFrame, logger, logPrefix = 'ProtocolV2', generation = 0, } = this.options;
+        const timeoutMs = resolveProtocolV2CallTimeoutMs(callOptions.timeoutMs);
         const abortController = new AbortController();
         const shouldReduceDebug = shouldReduceProtocolV2Debug(name);
         const baseCallContext = Object.assign(Object.assign({ messageName: name, timeoutMs, highThroughput: isProtocolV2HighThroughputCall(name) }, (callOptions.writeWithResponse === undefined
             ? {}
             : { writeWithResponse: callOptions.writeWithResponse })), { generation, signal: abortController.signal });
         const runCall = () => __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+            var _a, _b, _c, _d, _e, _f, _g;
             if (!this.pendingResponseAfterWrite) {
                 yield (prepareCall === null || prepareCall === void 0 ? void 0 : prepareCall(baseCallContext));
             }
-            const protoSeq = this.sequenceCursor.next();
-            const frame = ProtocolV2.encodeFrame(schemas, name, data, {
-                packetSrc,
-                router,
-                seq: protoSeq,
-            });
-            if (maxFrameBytes !== undefined && frame.length > maxFrameBytes) {
-                throw new Error(`Protocol V2 frame too large for transport: ${frame.length} > ${maxFrameBytes}`);
-            }
+            const { seq: protoSeq, frame } = this.encodeRequestFrame(name, data);
             const writeStartedAt = Date.now();
             yield this.serializeWrite(() => writeFrame(frame, baseCallContext));
-            try {
-                (_a = callOptions.onWriteCompleted) === null || _a === void 0 ? void 0 : _a.call(callOptions, {
-                    elapsedMs: Math.max(Date.now() - writeStartedAt, 0),
-                    frameBytes: frame.byteLength,
-                });
-            }
-            catch (error) {
-                (_b = logger === null || logger === void 0 ? void 0 : logger.error) === null || _b === void 0 ? void 0 : _b.call(logger, `${logPrefix} write metrics callback failed: ${String(error)}`);
-            }
+            this.reportWriteCompleted(callOptions, writeStartedAt, frame.byteLength);
             if (callOptions.returnAfterWrite) {
-                if ((_c = callOptions.expectedTypes) === null || _c === void 0 ? void 0 : _c.length) {
+                if ((_a = callOptions.expectedTypes) === null || _a === void 0 ? void 0 : _a.length) {
                     this.pendingResponseAfterWrite = {
                         expectedTypes: new Set(callOptions.expectedTypes),
                         onResponse: callOptions.onResponseAfterWrite,
@@ -1228,34 +1230,41 @@ class ProtocolV2Session {
                             this.pendingResponseAfterWrite = undefined;
                             if (belongsToWriteOnlyCall) {
                                 try {
-                                    (_d = pendingResponseAfterWrite.onResponse) === null || _d === void 0 ? void 0 : _d.call(pendingResponseAfterWrite, response);
+                                    (_b = pendingResponseAfterWrite.onResponse) === null || _b === void 0 ? void 0 : _b.call(pendingResponseAfterWrite, response);
                                 }
                                 catch (error) {
-                                    (_e = logger === null || logger === void 0 ? void 0 : logger.error) === null || _e === void 0 ? void 0 : _e.call(logger, `${logPrefix} delayed response callback failed: ${String(error)}`);
+                                    (_c = logger === null || logger === void 0 ? void 0 : logger.error) === null || _c === void 0 ? void 0 : _c.call(logger, `${logPrefix} delayed response callback failed: ${String(error)}`);
                                 }
                             }
                         }
                     }
                     if (belongsToWriteOnlyCall) ;
-                    else if ((_f = callOptions.intermediateTypes) === null || _f === void 0 ? void 0 : _f.includes(response.type)) {
-                        (_g = callOptions.onIntermediateResponse) === null || _g === void 0 ? void 0 : _g.call(callOptions, response);
+                    else if ((_d = callOptions.intermediateTypes) === null || _d === void 0 ? void 0 : _d.includes(response.type)) {
+                        (_e = callOptions.onIntermediateResponse) === null || _e === void 0 ? void 0 : _e.call(callOptions, response);
                     }
                     else if (isExpectedTerminalResponse(response, callOptions.expectedTypes)) {
                         return response;
                     }
                     else if (!shouldReduceDebug) {
-                        (_h = logger === null || logger === void 0 ? void 0 : logger.debug) === null || _h === void 0 ? void 0 : _h.call(logger, `[${logPrefix}] skip unexpected response for ${name}: expected=${(_j = callOptions.expectedTypes) === null || _j === void 0 ? void 0 : _j.join('|')} got=${response.type}`);
+                        (_f = logger === null || logger === void 0 ? void 0 : logger.debug) === null || _f === void 0 ? void 0 : _f.call(logger, `[${logPrefix}] skip unexpected response for ${name}: expected=${(_g = callOptions.expectedTypes) === null || _g === void 0 ? void 0 : _g.join('|')} got=${response.type}`);
                     }
                 }
             }
             throw new Error(`Protocol V2 read loop cancelled after timeout for ${name}`);
         });
-        return withProtocolTimeout(runCall(), timeoutMs, () => createTimeoutError
-            ? createTimeoutError(name, timeoutMs)
-            : new Error(`Protocol V2 response timeout after ${timeoutMs}ms for ${name}`), () => {
+        return withProtocolTimeout(runCall(), timeoutMs, () => this.createCallTimeoutError(name, timeoutMs), () => {
             abortController.abort();
         });
     }
+    encodeRequestFrame(name, data) {
+        const { schemas, router, packetSrc = PROTOCOL_V2_PACKET_SRC_COMMAND, maxFrameBytes, } = this.options;
+        const seq = this.sequenceCursor.next();
+        const frame = ProtocolV2.encodeFrame(schemas, name, data, { packetSrc, router, seq });
+        if (maxFrameBytes !== undefined && frame.length > maxFrameBytes) {
+            throw new Error(`Protocol V2 frame too large for transport: ${frame.length} > ${maxFrameBytes}`);
+        }
+        return { seq, frame };
+    }
     parseResponseFrame(rxFrame, ackSequences) {
         const { schemas, router, packetSrc = PROTOCOL_V2_PACKET_SRC_COMMAND } = this.options;
         let header;
@@ -1298,7 +1307,6 @@ class ProtocolV2Session {
         return call(decoded);
     }
     executeFileWritePipeline(name, data, callOptions, pipeline) {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             if (name !== 'FilesystemFileWrite') {
                 throw new Error(`Protocol V2 file write pipeline does not support ${name}`);
@@ -1306,110 +1314,102 @@ class ProtocolV2Session {
             if (this.pendingResponseAfterWrite) {
                 throw new Error('Protocol V2 file write pipeline cannot start while a response is pending');
             }
-            const { schemas, router, packetSrc = PROTOCOL_V2_PACKET_SRC_COMMAND, maxFrameBytes, prepareCall, writeFrame, readFrame, logger, logPrefix = 'ProtocolV2', createTimeoutError, generation = 0, } = this.options;
-            const timeoutMs = callOptions.timeoutMs && callOptions.timeoutMs > 0
-                ? callOptions.timeoutMs
-                : PROTOCOL_V2_DEFAULT_RESPONSE_TIMEOUT_MS;
+            const { prepareCall, writeFrame, readFrame, generation = 0 } = this.options;
+            const timeoutMs = resolveProtocolV2CallTimeoutMs(callOptions.timeoutMs);
             const abortController = new AbortController();
             const context = Object.assign(Object.assign({ messageName: name, timeoutMs, highThroughput: true }, (callOptions.writeWithResponse === undefined
                 ? {}
                 : { writeWithResponse: callOptions.writeWithResponse })), { generation, signal: abortController.signal });
-            const withStepTimeout = (promise, stepTimeoutMs = timeoutMs) => withProtocolTimeout(promise, stepTimeoutMs, () => createTimeoutError
-                ? createTimeoutError(name, timeoutMs)
-                : new Error(`Protocol V2 response timeout after ${timeoutMs}ms for ${name}`), () => {
+            let transportFailure;
+            const withStepTimeout = (promise, stepTimeoutMs = timeoutMs) => withProtocolTimeout(promise, stepTimeoutMs, () => this.createCallTimeoutError(name, timeoutMs), () => {
                 abortController.abort();
+            }).catch((error) => {
+                transportFailure = error;
+                throw error;
             });
             let progressDeadline = 0;
             const markProgress = () => {
                 progressDeadline = Date.now() + timeoutMs;
             };
             const inFlight = [];
-            let firstRequest = data;
             let path;
             let totalSize;
             let nextOffset;
             let sourceDone = false;
             let failure;
             let lastConfirmed;
-            const sendNextChunk = () => __awaiter(this, void 0, void 0, function* () {
-                var _b, _c;
-                const request = firstRequest !== null && firstRequest !== void 0 ? firstRequest : (yield pipeline.next());
-                firstRequest = undefined;
-                if (!request) {
-                    sourceDone = true;
-                    return;
+            const sendChunk = (request) => __awaiter(this, void 0, void 0, function* () {
+                const chunk = parseFileWriteChunk(request);
+                if (path !== undefined && (chunk.path !== path || chunk.totalSize !== totalSize)) {
+                    throw new Error('Protocol V2 file write pipeline chunk belongs to a different file');
                 }
-                const chunk = readFileWriteChunk(request);
-                if ((path !== undefined && chunk.path !== path) ||
-                    (totalSize !== undefined && chunk.totalSize !== totalSize) ||
-                    (nextOffset !== undefined && chunk.offset !== nextOffset)) {
-                    throw new Error(`Protocol V2 file write pipeline chunk out of order: expected offset ${String(nextOffset)}, got ${chunk.offset}`);
+                if (nextOffset !== undefined && chunk.offset !== nextOffset) {
+                    throw new Error(`Protocol V2 file write pipeline chunk out of order: expected offset ${nextOffset}, got ${chunk.offset}`);
                 }
                 path = chunk.path;
                 totalSize = chunk.totalSize;
                 nextOffset = chunk.end;
-                const seq = this.sequenceCursor.next();
-                const frame = ProtocolV2.encodeFrame(schemas, name, request, {
-                    packetSrc,
-                    router,
-                    seq,
-                });
-                if (maxFrameBytes !== undefined && frame.length > maxFrameBytes) {
-                    throw new Error(`Protocol V2 frame too large for transport: ${frame.length} > ${maxFrameBytes}`);
-                }
+                const { seq, frame } = this.encodeRequestFrame(name, request);
                 const writeStartedAt = Date.now();
                 yield withStepTimeout(this.serializeWrite(() => writeFrame(frame, context)));
-                inFlight.push({ seq, path: chunk.path, offset: chunk.offset, end: chunk.end });
+                inFlight.push({ seq, offset: chunk.offset, end: chunk.end });
                 markProgress();
-                try {
-                    (_b = callOptions.onWriteCompleted) === null || _b === void 0 ? void 0 : _b.call(callOptions, {
-                        elapsedMs: Math.max(Date.now() - writeStartedAt, 0),
-                        frameBytes: frame.byteLength,
-                    });
-                }
-                catch (error) {
-                    (_c = logger === null || logger === void 0 ? void 0 : logger.error) === null || _c === void 0 ? void 0 : _c.call(logger, `${logPrefix} write metrics callback failed: ${String(error)}`);
+                this.reportWriteCompleted(callOptions, writeStartedAt, frame.byteLength);
+            });
+            const sendNextChunk = () => __awaiter(this, void 0, void 0, function* () {
+                const request = yield pipeline.next();
+                if (!request) {
+                    sourceDone = true;
+                    return;
                 }
+                yield sendChunk(request);
             });
             yield withStepTimeout(Promise.resolve().then(() => prepareCall === null || prepareCall === void 0 ? void 0 : prepareCall(context)));
-            while (!sourceDone && inFlight.length < PROTOCOL_V2_FILE_WRITE_PIPELINE_WINDOW) {
-                yield sendNextChunk();
-            }
-            while (inFlight.length > 0) {
-                const rxFrame = yield withStepTimeout(readFrame(context), Math.max(progressDeadline - Date.now(), 1));
-                const response = this.parseResponseFrame(rxFrame, inFlight.map(item => item.seq));
-                if (!response) ;
-                else if (response.type === 'FilesystemFile') {
-                    const [expected] = inFlight;
-                    const { message } = response;
-                    if (Number(message.processed_byte) !== expected.end ||
-                        message.path !== expected.path ||
-                        Number(message.offset) !== expected.offset ||
-                        Number(message.total_size) !== totalSize) {
-                        throw new ProtocolV2LinkError('frame', `Protocol V2 file write response does not match chunk ${expected.offset}-${expected.end}: got offset ${String(message.offset)} processed_byte ${String(message.processed_byte)}`);
+            try {
+                yield sendChunk(data);
+                while (!sourceDone && inFlight.length < PROTOCOL_V2_FILE_WRITE_PIPELINE_WINDOW) {
+                    yield sendNextChunk();
+                }
+                while (inFlight.length > 0) {
+                    const rxFrame = yield withStepTimeout(readFrame(context), Math.max(progressDeadline - Date.now(), 1));
+                    const response = this.parseResponseFrame(rxFrame, inFlight.map(item => item.seq));
+                    if (!response) {
                     }
-                    inFlight.shift();
-                    markProgress();
-                    if (!failure) {
-                        lastConfirmed = response;
-                        pipeline.onResponse(response);
-                        if (!sourceDone) {
-                            yield sendNextChunk();
+                    else if (response.type === 'FilesystemFile') {
+                        const [expected] = inFlight;
+                        const { message } = response;
+                        if (Number(message.processed_byte) !== expected.end ||
+                            message.path !== path ||
+                            Number(message.offset) !== expected.offset ||
+                            Number(message.total_size) !== totalSize) {
+                            throw new ProtocolV2LinkError('frame', `Protocol V2 file write response does not match chunk ${expected.offset}-${expected.end}: got offset ${String(message.offset)} processed_byte ${String(message.processed_byte)}`);
+                        }
+                        inFlight.shift();
+                        markProgress();
+                        if (!failure) {
+                            lastConfirmed = response;
+                            pipeline.onResponse(response);
+                            if (!sourceDone) {
+                                yield sendNextChunk();
+                            }
                         }
                     }
+                    else if (response.type === 'Failure') {
+                        inFlight.shift();
+                        markProgress();
+                        failure = failure !== null && failure !== void 0 ? failure : response;
+                        sourceDone = true;
+                    }
+                    else if (COMMON_TERMINAL_RESPONSE_TYPES.has(response.type)) {
+                        throw new ProtocolV2LinkError('frame', `Protocol V2 file write pipeline received unexpected ${response.type}`);
+                    }
                 }
-                else if (response.type === 'Failure') {
-                    inFlight.shift();
-                    markProgress();
-                    failure = failure !== null && failure !== void 0 ? failure : response;
-                    sourceDone = true;
-                }
-                else if (COMMON_TERMINAL_RESPONSE_TYPES.has(response.type)) {
-                    throw new ProtocolV2LinkError('frame', `Protocol V2 file write pipeline received unexpected ${response.type}`);
-                }
-                else {
-                    (_a = logger === null || logger === void 0 ? void 0 : logger.debug) === null || _a === void 0 ? void 0 : _a.call(logger, `[${logPrefix}] skip unexpected response for ${name}: expected=FilesystemFile got=${response.type}`);
+            }
+            catch (error) {
+                if (inFlight.length === 0 || error === transportFailure || isProtocolV2LinkError(error)) {
+                    throw error;
                 }
+                throw new ProtocolV2LinkError('frame', `Protocol V2 file write pipeline aborted with chunks in flight: ${getErrorMessage(error)}`, error);
             }
             const terminal = failure !== null && failure !== void 0 ? failure : lastConfirmed;
             if (!terminal) {

package/dist/protocols/v2/session.d.ts

@@ -67,7 +67,10 @@ export declare class ProtocolV2Session {
     call(name: string, data: Record<string, unknown>, callOptions?: ProtocolV2CallOptions): Promise<MessageFromOneKey>;
     sendFlowControl(name: string, data: Record<string, unknown>): Promise<MessageFromOneKey>;
     private serializeWrite;
+    private reportWriteCompleted;
+    private createCallTimeoutError;
     private executeCall;
+    private encodeRequestFrame;
     private parseResponseFrame;
     private executeFileWritePipeline;
 }

package/dist/protocols/v2/session.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../src/protocols/v2/session.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../src/protocols/v2/session.ts"],"names":[],"mappings":"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"}

package/dist/types/transport.d.ts

@@ -23,6 +23,7 @@ export type OneKeyDeviceInfoWithSession = OneKeyUsbDeviceInfo & {
 export type OneKeyMobileDeviceInfo = {
     id: string;
     name: string | null;
+    bleColorCode?: string;
 };
 export type OneKeyDeviceInfoBase = {
     commType: OneKeyDeviceCommType;

package/dist/types/transport.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transport.d.ts","sourceRoot":"","sources":["../../src/types/transport.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"transport.d.ts","sourceRoot":"","sources":["../../src/types/transport.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport",
-  "version": "1.2.8-alpha.117",
+  "version": "1.2.8-alpha.118",
   "description": "Transport layer abstractions and utilities for OneKey hardware SDK.",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
@@ -28,5 +28,5 @@
     "long": "^4.0.0",
     "protobufjs": "^6.11.2"
   },
-  "gitHead": "610f1a979c682817acf9b4d195365dc5ed806138"
+  "gitHead": "7b5fe42a7c29ff0aa4c8340c1d5da93026a1b590"
 }

package/src/protocols/v2/session.ts

@@ -10,6 +10,7 @@ import {
   createProtocolV2LinkDisabledError,
   isProtocolV2LinkDisabledError,
   isProtocolV2LinkDisabledFailure,
+  isProtocolV2LinkError,
 } from './errors';
 import { ProtocolV2 } from '..';
 import * as check from '../../utils/highlevel-checks';
@@ -220,7 +221,10 @@ export async function withProtocolTimeout<T>(
   }
 }
 
-function readFileWriteChunk(request: Record<string, unknown>) {
+const resolveProtocolV2CallTimeoutMs = (timeoutMs?: number) =>
+  timeoutMs && timeoutMs > 0 ? timeoutMs : PROTOCOL_V2_DEFAULT_RESPONSE_TIMEOUT_MS;
+
+function parseFileWriteChunk(request: Record<string, unknown>) {
   const file = request.file as
     | { path?: unknown; offset?: unknown; total_size?: unknown; data?: { byteLength?: unknown } }
     | undefined;
@@ -320,6 +324,29 @@ export class ProtocolV2Session {
     return result;
   }
 
+  private reportWriteCompleted(
+    callOptions: ProtocolV2CallOptions,
+    writeStartedAt: number,
+    frameBytes: number
+  ) {
+    try {
+      callOptions.onWriteCompleted?.({
+        elapsedMs: Math.max(Date.now() - writeStartedAt, 0),
+        frameBytes,
+      });
+    } catch (error) {
+      const { logger, logPrefix = 'ProtocolV2' } = this.options;
+      logger?.error?.(`${logPrefix} write metrics callback failed: ${String(error)}`);
+    }
+  }
+
+  private createCallTimeoutError(name: string, timeoutMs: number): Error {
+    const { createTimeoutError } = this.options;
+    return createTimeoutError
+      ? createTimeoutError(name, timeoutMs)
+      : new Error(`Protocol V2 response timeout after ${timeoutMs}ms for ${name}`);
+  }
+
   private executeCall(
     name: string,
     data: Record<string, unknown>,
@@ -329,22 +356,14 @@ export class ProtocolV2Session {
       return this.executeFileWritePipeline(name, data, callOptions, callOptions.fileWritePipeline);
     }
     const {
-      schemas,
-      router,
-      packetSrc = PROTOCOL_V2_PACKET_SRC_COMMAND,
-      maxFrameBytes,
       prepareCall,
       writeFrame,
       readFrame,
       logger,
       logPrefix = 'ProtocolV2',
-      createTimeoutError,
       generation = 0,
     } = this.options;
-    const timeoutMs =
-      callOptions.timeoutMs && callOptions.timeoutMs > 0
-        ? callOptions.timeoutMs
-        : PROTOCOL_V2_DEFAULT_RESPONSE_TIMEOUT_MS;
+    const timeoutMs = resolveProtocolV2CallTimeoutMs(callOptions.timeoutMs);
     const abortController = new AbortController();
 
     const shouldReduceDebug = shouldReduceProtocolV2Debug(name);
@@ -365,29 +384,11 @@ export class ProtocolV2Session {
       if (!this.pendingResponseAfterWrite) {
         await prepareCall?.(baseCallContext);
       }
-      const protoSeq = this.sequenceCursor.next();
-      const frame = ProtocolV2.encodeFrame(schemas, name, data, {
-        packetSrc,
-        router,
-        seq: protoSeq,
-      });
-
-      if (maxFrameBytes !== undefined && frame.length > maxFrameBytes) {
-        throw new Error(
-          `Protocol V2 frame too large for transport: ${frame.length} > ${maxFrameBytes}`
-        );
-      }
+      const { seq: protoSeq, frame } = this.encodeRequestFrame(name, data);
 
       const writeStartedAt = Date.now();
       await this.serializeWrite(() => writeFrame(frame, baseCallContext));
-      try {
-        callOptions.onWriteCompleted?.({
-          elapsedMs: Math.max(Date.now() - writeStartedAt, 0),
-          frameBytes: frame.byteLength,
-        });
-      } catch (error) {
-        logger?.error?.(`${logPrefix} write metrics callback failed: ${String(error)}`);
-      }
+      this.reportWriteCompleted(callOptions, writeStartedAt, frame.byteLength);
 
       if (callOptions.returnAfterWrite) {
         if (callOptions.expectedTypes?.length) {
@@ -447,16 +448,30 @@ export class ProtocolV2Session {
     return withProtocolTimeout(
       runCall(),
       timeoutMs,
-      () =>
-        createTimeoutError
-          ? createTimeoutError(name, timeoutMs)
-          : new Error(`Protocol V2 response timeout after ${timeoutMs}ms for ${name}`),
+      () => this.createCallTimeoutError(name, timeoutMs),
       () => {
         abortController.abort();
       }
     );
   }
 
+  private encodeRequestFrame(name: string, data: Record<string, unknown>) {
+    const {
+      schemas,
+      router,
+      packetSrc = PROTOCOL_V2_PACKET_SRC_COMMAND,
+      maxFrameBytes,
+    } = this.options;
+    const seq = this.sequenceCursor.next();
+    const frame = ProtocolV2.encodeFrame(schemas, name, data, { packetSrc, router, seq });
+    if (maxFrameBytes !== undefined && frame.length > maxFrameBytes) {
+      throw new Error(
+        `Protocol V2 frame too large for transport: ${frame.length} > ${maxFrameBytes}`
+      );
+    }
+    return { seq, frame };
+  }
+
   /**
    * Validates one received frame for this session. Returns undefined for an ACK of one of
    * `ackSequences`, otherwise the decoded response.
@@ -537,9 +552,7 @@ export class ProtocolV2Session {
    * answers every chunk in order, so responses are matched to chunks by position. Upstream
    * bootloaders append at their own cursor without checking the request offset, so the echoed
    * offset is what exposes a lost chunk. A device Failure, or `next` returning undefined, stops
-   * sending; the remaining in-flight responses are drained so the link stays usable. The call
-   * then returns the Failure like a serial call, or the last confirmation, which the caller
-   * checks for completeness.
+   * sending; the remaining in-flight responses are drained so the link stays usable.
    */
   private async executeFileWritePipeline(
     name: string,
@@ -553,23 +566,8 @@ export class ProtocolV2Session {
     if (this.pendingResponseAfterWrite) {
       throw new Error('Protocol V2 file write pipeline cannot start while a response is pending');
     }
-    const {
-      schemas,
-      router,
-      packetSrc = PROTOCOL_V2_PACKET_SRC_COMMAND,
-      maxFrameBytes,
-      prepareCall,
-      writeFrame,
-      readFrame,
-      logger,
-      logPrefix = 'ProtocolV2',
-      createTimeoutError,
-      generation = 0,
-    } = this.options;
-    const timeoutMs =
-      callOptions.timeoutMs && callOptions.timeoutMs > 0
-        ? callOptions.timeoutMs
-        : PROTOCOL_V2_DEFAULT_RESPONSE_TIMEOUT_MS;
+    const { prepareCall, writeFrame, readFrame, generation = 0 } = this.options;
+    const timeoutMs = resolveProtocolV2CallTimeoutMs(callOptions.timeoutMs);
     const abortController = new AbortController();
     const context: ProtocolV2CallContext = {
       messageName: name,
@@ -581,27 +579,28 @@ export class ProtocolV2Session {
       generation,
       signal: abortController.signal,
     };
+    // Transport errors and timeouts propagate unchanged: each transport classifies its own.
+    let transportFailure: unknown;
     // One file can take far longer than one chunk, so the watchdog bounds each step instead.
     const withStepTimeout = <T>(promise: Promise<T>, stepTimeoutMs = timeoutMs) =>
       withProtocolTimeout(
         promise,
         stepTimeoutMs,
-        () =>
-          createTimeoutError
-            ? createTimeoutError(name, timeoutMs)
-            : new Error(`Protocol V2 response timeout after ${timeoutMs}ms for ${name}`),
+        () => this.createCallTimeoutError(name, timeoutMs),
         () => {
           abortController.abort();
         }
-      );
+      ).catch((error: unknown) => {
+        transportFailure = error;
+        throw error;
+      });
     // ACKs and skipped frames must not extend the wait for an in-flight chunk's response.
     let progressDeadline = 0;
     const markProgress = () => {
       progressDeadline = Date.now() + timeoutMs;
     };
 
-    const inFlight: Array<{ seq: number; path: string; offset: number; end: number }> = [];
-    let firstRequest: Record<string, unknown> | undefined = data;
+    const inFlight: Array<{ seq: number; offset: number; end: number }> = [];
     let path: string | undefined;
     let totalSize: number | undefined;
     let nextOffset: number | undefined;
@@ -609,112 +608,106 @@ export class ProtocolV2Session {
     let failure: MessageFromOneKey | undefined;
     let lastConfirmed: MessageFromOneKey | undefined;
 
-    const sendNextChunk = async () => {
-      const request = firstRequest ?? (await pipeline.next());
-      firstRequest = undefined;
-      if (!request) {
-        sourceDone = true;
-        return;
+    const sendChunk = async (request: Record<string, unknown>) => {
+      const chunk = parseFileWriteChunk(request);
+      if (path !== undefined && (chunk.path !== path || chunk.totalSize !== totalSize)) {
+        throw new Error('Protocol V2 file write pipeline chunk belongs to a different file');
       }
-      const chunk = readFileWriteChunk(request);
-      if (
-        (path !== undefined && chunk.path !== path) ||
-        (totalSize !== undefined && chunk.totalSize !== totalSize) ||
-        (nextOffset !== undefined && chunk.offset !== nextOffset)
-      ) {
+      if (nextOffset !== undefined && chunk.offset !== nextOffset) {
         throw new Error(
-          `Protocol V2 file write pipeline chunk out of order: expected offset ${String(
-            nextOffset
-          )}, got ${chunk.offset}`
+          `Protocol V2 file write pipeline chunk out of order: expected offset ${nextOffset}, got ${chunk.offset}`
         );
       }
       path = chunk.path;
       totalSize = chunk.totalSize;
       nextOffset = chunk.end;
 
-      const seq = this.sequenceCursor.next();
-      const frame = ProtocolV2.encodeFrame(schemas, name, request, {
-        packetSrc,
-        router,
-        seq,
-      });
-      if (maxFrameBytes !== undefined && frame.length > maxFrameBytes) {
-        throw new Error(
-          `Protocol V2 frame too large for transport: ${frame.length} > ${maxFrameBytes}`
-        );
-      }
+      const { seq, frame } = this.encodeRequestFrame(name, request);
       const writeStartedAt = Date.now();
       await withStepTimeout(this.serializeWrite(() => writeFrame(frame, context)));
-      inFlight.push({ seq, path: chunk.path, offset: chunk.offset, end: chunk.end });
+      inFlight.push({ seq, offset: chunk.offset, end: chunk.end });
       markProgress();
-      try {
-        callOptions.onWriteCompleted?.({
-          elapsedMs: Math.max(Date.now() - writeStartedAt, 0),
-          frameBytes: frame.byteLength,
-        });
-      } catch (error) {
-        logger?.error?.(`${logPrefix} write metrics callback failed: ${String(error)}`);
+      this.reportWriteCompleted(callOptions, writeStartedAt, frame.byteLength);
+    };
+    const sendNextChunk = async () => {
+      const request = await pipeline.next();
+      if (!request) {
+        sourceDone = true;
+        return;
       }
+      await sendChunk(request);
     };
 
     await withStepTimeout(Promise.resolve().then(() => prepareCall?.(context)));
-    while (!sourceDone && inFlight.length < PROTOCOL_V2_FILE_WRITE_PIPELINE_WINDOW) {
-      await sendNextChunk();
-    }
+    try {
+      await sendChunk(data);
+      while (!sourceDone && inFlight.length < PROTOCOL_V2_FILE_WRITE_PIPELINE_WINDOW) {
+        await sendNextChunk();
+      }
 
-    while (inFlight.length > 0) {
-      const rxFrame = await withStepTimeout(
-        readFrame(context),
-        Math.max(progressDeadline - Date.now(), 1)
-      );
-      const response = this.parseResponseFrame(
-        rxFrame,
-        inFlight.map(item => item.seq)
-      );
-      if (!response) {
-        // ACK of an in-flight chunk; its FilesystemFile response follows.
-      } else if (response.type === 'FilesystemFile') {
-        const [expected] = inFlight;
-        const { message } = response;
-        if (
-          Number(message.processed_byte) !== expected.end ||
-          message.path !== expected.path ||
-          Number(message.offset) !== expected.offset ||
-          Number(message.total_size) !== totalSize
-        ) {
+      while (inFlight.length > 0) {
+        // Floor at 1 ms: withProtocolTimeout treats 0 as "no timeout", so an expired deadline
+        // must still time out.
+        const rxFrame = await withStepTimeout(
+          readFrame(context),
+          Math.max(progressDeadline - Date.now(), 1)
+        );
+        const response = this.parseResponseFrame(
+          rxFrame,
+          inFlight.map(item => item.seq)
+        );
+        if (!response) {
+          // ACK of an in-flight chunk; its FilesystemFile response follows.
+        } else if (response.type === 'FilesystemFile') {
+          const [expected] = inFlight;
+          const { message } = response;
+          if (
+            Number(message.processed_byte) !== expected.end ||
+            message.path !== path ||
+            Number(message.offset) !== expected.offset ||
+            Number(message.total_size) !== totalSize
+          ) {
+            throw new ProtocolV2LinkError(
+              'frame',
+              `Protocol V2 file write response does not match chunk ${expected.offset}-${
+                expected.end
+              }: got offset ${String(message.offset)} processed_byte ${String(
+                message.processed_byte
+              )}`
+            );
+          }
+          inFlight.shift();
+          markProgress();
+          if (!failure) {
+            lastConfirmed = response;
+            pipeline.onResponse(response);
+            if (!sourceDone) {
+              await sendNextChunk();
+            }
+          }
+        } else if (response.type === 'Failure') {
+          inFlight.shift();
+          markProgress();
+          failure = failure ?? response;
+          sourceDone = true;
+        } else if (COMMON_TERMINAL_RESPONSE_TYPES.has(response.type)) {
           throw new ProtocolV2LinkError(
             'frame',
-            `Protocol V2 file write response does not match chunk ${expected.offset}-${
-              expected.end
-            }: got offset ${String(message.offset)} processed_byte ${String(
-              message.processed_byte
-            )}`
+            `Protocol V2 file write pipeline received unexpected ${response.type}`
           );
         }
-        inFlight.shift();
-        markProgress();
-        if (!failure) {
-          lastConfirmed = response;
-          pipeline.onResponse(response);
-          if (!sourceDone) {
-            await sendNextChunk();
-          }
-        }
-      } else if (response.type === 'Failure') {
-        inFlight.shift();
-        markProgress();
-        failure = failure ?? response;
-        sourceDone = true;
-      } else if (COMMON_TERMINAL_RESPONSE_TYPES.has(response.type)) {
-        throw new ProtocolV2LinkError(
-          'frame',
-          `Protocol V2 file write pipeline received unexpected ${response.type}`
-        );
-      } else {
-        logger?.debug?.(
-          `[${logPrefix}] skip unexpected response for ${name}: expected=FilesystemFile got=${response.type}`
-        );
       }
+    } catch (error) {
+      // Unread responses of in-flight chunks would answer the next call on this link, so a
+      // session or caller error raised with chunks in flight must invalidate it.
+      if (inFlight.length === 0 || error === transportFailure || isProtocolV2LinkError(error)) {
+        throw error;
+      }
+      throw new ProtocolV2LinkError(
+        'frame',
+        `Protocol V2 file write pipeline aborted with chunks in flight: ${getErrorMessage(error)}`,
+        error
+      );
     }
 
     const terminal = failure ?? lastConfirmed;

package/src/types/transport.ts

@@ -34,6 +34,12 @@ export type OneKeyDeviceInfoWithSession = OneKeyUsbDeviceInfo & {
 export type OneKeyMobileDeviceInfo = {
   id: string;
   name: string | null;
+  /**
+   * Color letter of the serial number ('A'-'Z') from the Pro2 / Neo BLE advertisement,
+   * possibly seen in an earlier scan. Set by the React Native and Electron BLE
+   * transports; absent when unknown.
+   */
+  bleColorCode?: string;
 };
 
 export type OneKeyDeviceInfoBase = {