@onekeyfe/hd-transport 1.2.2-alpha.1 → 1.2.2-alpha.100

package/messages-protocol-v2.json

@@ -446,9 +446,6 @@
         "MessageType_DeviceCertificateSignature": 60423,
         "MessageType_DeviceCertificateSign": 60424,
         "MessageType_DeviceMiscUsbMscControl": 60440,
-        "MessageType_DeviceFindMyTokenState": 60450,
-        "MessageType_DeviceFindMyTokenUpdate": 60451,
-        "MessageType_DeviceFindMyTokenStateGet": 60452,
         "MessageType_DeviceInfoGet": 60600,
         "MessageType_DeviceInfo": 60601,
         "MessageType_DeviceStatusGet": 60602,
@@ -5407,10 +5404,6 @@
         "request_id": {
           "type": "bytes",
           "id": 5
-        },
-        "source_fingerprint": {
-          "type": "uint32",
-          "id": 6
         }
       }
     },
@@ -5546,14 +5539,6 @@
         "tx_type": {
           "type": "uint32",
           "id": 10
-        },
-        "expected_address": {
-          "type": "bytes",
-          "id": 12
-        },
-        "source_fingerprint": {
-          "type": "uint32",
-          "id": 13
         }
       }
     },
@@ -5634,14 +5619,6 @@
           "rule": "repeated",
           "type": "EthereumAccessListOneKey",
           "id": 11
-        },
-        "expected_address": {
-          "type": "bytes",
-          "id": 12
-        },
-        "source_fingerprint": {
-          "type": "uint32",
-          "id": 13
         }
       }
     },
@@ -5818,10 +5795,6 @@
         "chain_id": {
           "type": "uint64",
           "id": 3
-        },
-        "source_fingerprint": {
-          "type": "uint32",
-          "id": 4
         }
       }
     },
@@ -9501,10 +9474,6 @@
           "rule": "required",
           "type": "bytes",
           "id": 2
-        },
-        "source_fingerprint": {
-          "type": "uint32",
-          "id": 3
         }
       }
     },
@@ -9549,10 +9518,6 @@
         "application_domain": {
           "type": "bytes",
           "id": 5
-        },
-        "source_fingerprint": {
-          "type": "uint32",
-          "id": 6
         }
       }
     },
@@ -9570,10 +9535,6 @@
           "rule": "required",
           "type": "bytes",
           "id": 2
-        },
-        "source_fingerprint": {
-          "type": "uint32",
-          "id": 3
         }
       }
     },
@@ -11803,27 +11764,6 @@
         }
       }
     },
-    "DeviceFindMyTokenUpdate": {
-      "fields": {
-        "token": {
-          "rule": "required",
-          "type": "bytes",
-          "id": 1
-        }
-      }
-    },
-    "DeviceFindMyTokenStateGet": {
-      "fields": {}
-    },
-    "DeviceFindMyTokenState": {
-      "fields": {
-        "burned": {
-          "rule": "required",
-          "type": "bool",
-          "id": 1
-        }
-      }
-    },
     "DeviceFactoryAck": {
       "values": {
         "FACTORY_ACK_SUCCESS": 0,
@@ -11953,13 +11893,6 @@
         "FW_MGMT_UPDATER_TASK_STATUS_FAILED_ENTRY_OUT_OF_BOUNDS": 10
       }
     },
-    "DeviceFirmwareUpdatePhase": {
-      "values": {
-        "FW_MGMT_UPDATER_PHASE_PREPARE": 0,
-        "FW_MGMT_UPDATER_PHASE_INSTALL": 1,
-        "FW_MGMT_UPDATER_PHASE_VERIFY": 2
-      }
-    },
     "DeviceFirmwareTarget": {
       "fields": {
         "target_id": {
@@ -11984,26 +11917,7 @@
       }
     },
     "DeviceFirmwareUpdateRequest": {
-      "fields": {
-        "reboot_after_update": {
-          "type": "bool",
-          "id": 1
-        }
-      }
-    },
-    "DeviceFirmwareUpdatePhaseInfo": {
-      "fields": {
-        "phase": {
-          "rule": "required",
-          "type": "DeviceFirmwareUpdatePhase",
-          "id": 1
-        },
-        "progress_percent": {
-          "rule": "required",
-          "type": "uint32",
-          "id": 2
-        }
-      }
+      "fields": {}
     },
     "DeviceFirmwareUpdateRecord": {
       "fields": {
@@ -12016,14 +11930,6 @@
           "type": "DeviceFirmwareUpdateTaskStatus",
           "id": 10
         },
-        "progress_percent": {
-          "type": "uint32",
-          "id": 11
-        },
-        "phase_info": {
-          "type": "DeviceFirmwareUpdatePhaseInfo",
-          "id": 12
-        },
         "payload_version": {
           "type": "uint32",
           "id": 20
@@ -12040,14 +11946,6 @@
           "type": "bool",
           "id": 10
         },
-        "progress_percent": {
-          "type": "bool",
-          "id": 11
-        },
-        "phase_info": {
-          "type": "bool",
-          "id": 12
-        },
         "payload_version": {
           "type": "bool",
           "id": 20
@@ -12815,10 +12713,6 @@
         "text_id": {
           "type": "uint32",
           "id": 3
-        },
-        "text_arg": {
-          "type": "string",
-          "id": 4
         }
       }
     },
@@ -12886,10 +12780,6 @@
         "title_id": {
           "type": "uint32",
           "id": 8
-        },
-        "title_arg": {
-          "type": "string",
-          "id": 9
         }
       }
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport",
-  "version": "1.2.2-alpha.1",
+  "version": "1.2.2-alpha.100",
   "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": "66f45610d36e06a46ac82cd49a4b0e1a128f19d4"
+  "gitHead": "c40dad085297b0e3cc2020bd218c146dff6ed3e1"
 }

package/src/protocols/v2/link-manager.ts

@@ -1,7 +1,6 @@
 import { ProtocolV2SequenceCursor } from './sequence-cursor';
 import { ProtocolV2LinkError } from './errors';
 import { ProtocolV2Session, getErrorMessage } from './session';
-import { PROTOCOL_V2_DEFAULT_RESPONSE_TIMEOUT_MS } from '../../constants';
 
 import type { MessageFromOneKey, TransportCallOptions } from '../../types';
 import type { ProtocolV2CallContext, ProtocolV2Schemas, ProtocolV2SessionOptions } from './session';
@@ -62,45 +61,15 @@ export class ProtocolV2LinkManager<Key> {
     options?: TransportCallOptions
   ): Promise<MessageFromOneKey> {
     const generation = this.generations.get(key) ?? 0;
-    const previousQueue = this.callQueues.get(key);
-    const timeoutMs =
-      options?.timeoutMs && options.timeoutMs > 0
-        ? options.timeoutMs
-        : PROTOCOL_V2_DEFAULT_RESPONSE_TIMEOUT_MS;
-    const queuedAt = Date.now();
-    let queueTimeout: ReturnType<typeof setTimeout> | undefined;
-    let queueTimeoutError: Error | undefined;
-    const timeoutWhileQueued = new Promise<never>((_, reject) => {
-      queueTimeout = setTimeout(() => {
-        queueTimeout = undefined;
-        queueTimeoutError = this.createQueuedCallTimeoutError(key, name, timeoutMs);
-        reject(queueTimeoutError);
-      }, timeoutMs);
-    });
     const run = () => {
-      if (queueTimeout) {
-        clearTimeout(queueTimeout);
-        queueTimeout = undefined;
-      }
-      if (queueTimeoutError) {
-        throw queueTimeoutError;
-      }
       this.assertCallGeneration(key, generation);
-      const remainingTimeoutMs = previousQueue ? timeoutMs - (Date.now() - queuedAt) : timeoutMs;
-      if (remainingTimeoutMs <= 0) {
-        throw this.createQueuedCallTimeoutError(key, name, timeoutMs);
-      }
-      return this.executeCall(key, createAdapter, name, data, {
-        ...options,
-        timeoutMs: remainingTimeoutMs,
-      });
+      return this.executeCall(key, createAdapter, name, data, options);
     };
-    const previous = previousQueue ?? Promise.resolve();
-    const execution = previous.then(run, run);
-    const result = Promise.race([execution, timeoutWhileQueued]);
-    const queue = execution.catch(() => undefined);
+    const previous = this.callQueues.get(key) ?? Promise.resolve();
+    const result = previous.then(run, run);
+    const queue = result.catch(() => undefined);
     this.callQueues.set(key, queue);
-    execution
+    result
       .then(
         () => this.clearSettledCallQueue(key, queue),
         () => this.clearSettledCallQueue(key, queue)
@@ -237,16 +206,6 @@ export class ProtocolV2LinkManager<Key> {
     }
   }
 
-  private createQueuedCallTimeoutError(key: Key, name: string, timeoutMs: number): Error {
-    const adapterTimeoutError = this.links.get(key)?.adapter.createTimeoutError;
-    return adapterTimeoutError
-      ? adapterTimeoutError(name, timeoutMs)
-      : new ProtocolV2LinkError(
-          'response-timeout',
-          `Protocol V2 call timeout after ${timeoutMs}ms while queued for ${name}`
-        );
-  }
-
   private assertCallGeneration(key: Key, generation: number) {
     const currentGeneration = this.generations.get(key) ?? 0;
     if (currentGeneration === generation) return;

package/src/protocols/v2/session.ts

@@ -60,7 +60,6 @@ export type ProtocolV2CallOptions = {
   onIntermediateResponse?: (response: MessageFromOneKey) => void;
   onWriteCompleted?: (metrics: TransportWriteMetrics) => void;
   returnAfterWrite?: boolean;
-  onResponseAfterWrite?: (response: MessageFromOneKey) => void;
   writeWithResponse?: boolean;
 };
 
@@ -82,33 +81,6 @@ export function hexToBytes(hex: string): Uint8Array {
   return bytes;
 }
 
-export function detectProtocolV2LinkDisabledError({
-  schemas,
-  assembler,
-  bytes,
-}: {
-  schemas: ProtocolV2Schemas;
-  assembler: ProtocolV2FrameAssembler;
-  bytes: Uint8Array;
-}) {
-  try {
-    for (const frame of assembler.drain(bytes)) {
-      const response = check.call(ProtocolV2.decodeFrame(schemas, frame));
-      if (response.type === 'Failure') {
-        const failureCode = response.message?.code;
-        const firmwareMessage = response.message?.message;
-        if (isProtocolV2LinkDisabledFailure(failureCode, firmwareMessage)) {
-          return createProtocolV2LinkDisabledError(failureCode, firmwareMessage);
-        }
-      }
-    }
-  } catch {
-    // Cross-protocol detection may receive a normal Protocol V1 notification.
-    assembler.reset();
-  }
-  return undefined;
-}
-
 export function bytesToHex(bytes: Uint8Array): string {
   return Array.from(bytes)
     .map(b => b.toString(16).padStart(2, '0'))
@@ -227,11 +199,6 @@ export class ProtocolV2Session {
   // response, but their frames must never interleave with the active request write.
   private pendingWrite: Promise<unknown> = Promise.resolve();
 
-  private pendingResponseAfterWrite?: {
-    expectedTypes: Set<string>;
-    onResponse?: (response: MessageFromOneKey) => void;
-  };
-
   private lastResponseSequence?: number;
 
   constructor(options: ProtocolV2SessionOptions) {
@@ -330,11 +297,7 @@ export class ProtocolV2Session {
     };
 
     const runCall = async (): Promise<MessageFromOneKey> => {
-      // A write-only call may still have a terminal response in flight. Preserve
-      // the continuous receive queue until the next call consumes that response.
-      if (!this.pendingResponseAfterWrite) {
-        await prepareCall?.(baseCallContext);
-      }
+      await prepareCall?.(baseCallContext);
       const protoSeq = this.sequenceCursor.next();
       const frame = ProtocolV2.encodeFrame(schemas, name, data, {
         packetSrc,
@@ -360,12 +323,6 @@ export class ProtocolV2Session {
       }
 
       if (callOptions.returnAfterWrite) {
-        if (callOptions.expectedTypes?.length) {
-          this.pendingResponseAfterWrite = {
-            expectedTypes: new Set(callOptions.expectedTypes),
-            onResponse: callOptions.onResponseAfterWrite,
-          };
-        }
         return { type: 'WriteCompleted', message: {} };
       }
 
@@ -438,26 +395,7 @@ export class ProtocolV2Session {
           this.lastResponseSequence = decoded.seq;
 
           const response = check.call(decoded);
-          const { pendingResponseAfterWrite } = this;
-          let belongsToWriteOnlyCall = false;
-          if (pendingResponseAfterWrite) {
-            belongsToWriteOnlyCall = pendingResponseAfterWrite.expectedTypes.has(response.type);
-            if (belongsToWriteOnlyCall || COMMON_TERMINAL_RESPONSE_TYPES.has(response.type)) {
-              this.pendingResponseAfterWrite = undefined;
-              if (belongsToWriteOnlyCall) {
-                try {
-                  pendingResponseAfterWrite.onResponse?.(response);
-                } catch (error) {
-                  logger?.error?.(
-                    `${logPrefix} delayed response callback failed: ${String(error)}`
-                  );
-                }
-              }
-            }
-          }
-          if (belongsToWriteOnlyCall) {
-            // The delayed response belongs to the preceding write-only call.
-          } else if (callOptions.intermediateTypes?.includes(response.type)) {
+          if (callOptions.intermediateTypes?.includes(response.type)) {
             callOptions.onIntermediateResponse?.(response);
           } else if (isExpectedTerminalResponse(response, callOptions.expectedTypes)) {
             return response;
@@ -495,7 +433,6 @@ export async function probeProtocolV2({
   logPrefix = 'ProtocolV2',
   onBeforeProbe,
   onProbeFailed,
-  shouldRethrow,
 }: {
   call: (
     name: string,
@@ -507,7 +444,6 @@ export async function probeProtocolV2({
   logPrefix?: string;
   onBeforeProbe?: () => Promise<void> | void;
   onProbeFailed?: (error: unknown) => Promise<void> | void;
-  shouldRethrow?: (error: unknown) => boolean;
 }) {
   let probeError: unknown;
   try {
@@ -532,7 +468,7 @@ export async function probeProtocolV2({
     }
     probeError = new Error(`unexpected response type ${response.type}`);
   } catch (error) {
-    if (isProtocolV2LinkDisabledError(error) || shouldRethrow?.(error)) {
+    if (isProtocolV2LinkDisabledError(error)) {
       throw error;
     }
     probeError = error;

package/src/types/messages.ts

@@ -1950,8 +1950,6 @@ export type EthereumSignTxOneKey = {
   data_length?: number;
   chain_id: number;
   tx_type?: number;
-  expected_address?: string;
-  source_fingerprint?: number;
 };
 
 // EthereumAccessListOneKey
@@ -1973,8 +1971,6 @@ export type EthereumSignTxEIP1559OneKey = {
   data_length: number;
   chain_id: number;
   access_list: EthereumAccessListOneKey[];
-  expected_address?: string;
-  source_fingerprint?: number;
 };
 
 // EthereumAuthorizationSignature
@@ -2027,7 +2023,6 @@ export type EthereumSignMessageOneKey = {
   address_n: number[];
   message: string;
   chain_id?: number;
-  source_fingerprint?: number;
 };
 
 // EthereumMessageSignatureOneKey
@@ -3820,7 +3815,6 @@ export type SolanaSignTx = {
   address_n: number[];
   raw_tx: string;
   extra_info?: SolanaTxExtraInfo;
-  source_fingerprint?: number;
 };
 
 // SolanaSignedTx
@@ -3844,14 +3838,12 @@ export type SolanaSignOffChainMessage = {
   message_version?: SolanaOffChainMessageVersion;
   message_format?: SolanaOffChainMessageFormat;
   application_domain?: string;
-  source_fingerprint?: number;
 };
 
 // SolanaSignUnsafeMessage
 export type SolanaSignUnsafeMessage = {
   address_n: number[];
   message: string;
-  source_fingerprint?: number;
 };
 
 // SolanaMessageSignature
@@ -4602,7 +4594,6 @@ export type EthereumSignTypedDataQR = {
   chain_id?: number;
   metamask_v4_compat?: boolean;
   request_id?: string;
-  source_fingerprint?: number;
 };
 
 // SetBusy
@@ -4775,19 +4766,6 @@ export type DeviceMiscUsbMscControl = {
   enable: boolean;
 };
 
-// DeviceFindMyTokenUpdate
-export type DeviceFindMyTokenUpdate = {
-  token: string;
-};
-
-// DeviceFindMyTokenStateGet
-export type DeviceFindMyTokenStateGet = {};
-
-// DeviceFindMyTokenState
-export type DeviceFindMyTokenState = {
-  burned: boolean;
-};
-
 export enum DeviceFactoryAck {
   FACTORY_ACK_SUCCESS = 0,
   FACTORY_ACK_FAIL = 1,
@@ -4859,12 +4837,6 @@ export enum DeviceFirmwareUpdateTaskStatus {
   FW_MGMT_UPDATER_TASK_STATUS_FAILED_ENTRY_OUT_OF_BOUNDS = 10,
 }
 
-export enum DeviceFirmwareUpdatePhase {
-  FW_MGMT_UPDATER_PHASE_PREPARE = 0,
-  FW_MGMT_UPDATER_PHASE_INSTALL = 1,
-  FW_MGMT_UPDATER_PHASE_VERIFY = 2,
-}
-
 // DeviceFirmwareTarget
 export type DeviceFirmwareTarget = {
   target_id: DeviceFirmwareTargetType;
@@ -4877,22 +4849,12 @@ export type DeviceFirmwareUpdateStage = {
 };
 
 // DeviceFirmwareUpdateRequest
-export type DeviceFirmwareUpdateRequest = {
-  reboot_after_update?: boolean;
-};
-
-// DeviceFirmwareUpdatePhaseInfo
-export type DeviceFirmwareUpdatePhaseInfo = {
-  phase: DeviceFirmwareUpdatePhase;
-  progress_percent: number;
-};
+export type DeviceFirmwareUpdateRequest = {};
 
 // DeviceFirmwareUpdateRecord
 export type DeviceFirmwareUpdateRecord = {
   target_id: DeviceFirmwareTargetType;
   status?: DeviceFirmwareUpdateTaskStatus;
-  progress_percent?: number;
-  phase_info?: DeviceFirmwareUpdatePhaseInfo;
   payload_version?: number;
   path?: string;
 };
@@ -4900,8 +4862,6 @@ export type DeviceFirmwareUpdateRecord = {
 // DeviceFirmwareUpdateRecordFields
 export type DeviceFirmwareUpdateRecordFields = {
   status?: boolean;
-  progress_percent?: boolean;
-  phase_info?: boolean;
   payload_version?: boolean;
   path?: boolean;
 };
@@ -5260,7 +5220,6 @@ export type ViewTip = {
   type: ViewTipType;
   text?: string;
   text_id?: number;
-  text_arg?: string;
 };
 
 // ViewRawData
@@ -5288,7 +5247,6 @@ export type ViewSignPage = {
   slide_to_confirm?: boolean;
   layout?: ViewSignLayout;
   title_id?: number;
-  title_arg?: string;
 };
 
 // ViewVerifyPage
@@ -5930,9 +5888,6 @@ export type MessageType = {
   DeviceCertificateSignature: DeviceCertificateSignature;
   DeviceCertificateSign: DeviceCertificateSign;
   DeviceMiscUsbMscControl: DeviceMiscUsbMscControl;
-  DeviceFindMyTokenUpdate: DeviceFindMyTokenUpdate;
-  DeviceFindMyTokenStateGet: DeviceFindMyTokenStateGet;
-  DeviceFindMyTokenState: DeviceFindMyTokenState;
   DeviceFactoryInfoManufactureTime: DeviceFactoryInfoManufactureTime;
   DeviceFactoryInfo: DeviceFactoryInfo;
   DeviceFactoryInfoSet: DeviceFactoryInfoSet;
@@ -5942,7 +5897,6 @@ export type MessageType = {
   DeviceFirmwareTarget: DeviceFirmwareTarget;
   DeviceFirmwareUpdateStage: DeviceFirmwareUpdateStage;
   DeviceFirmwareUpdateRequest: DeviceFirmwareUpdateRequest;
-  DeviceFirmwareUpdatePhaseInfo: DeviceFirmwareUpdatePhaseInfo;
   DeviceFirmwareUpdateRecord: DeviceFirmwareUpdateRecord;
   DeviceFirmwareUpdateRecordFields: DeviceFirmwareUpdateRecordFields;
   DeviceFirmwareUpdateStatusGet: DeviceFirmwareUpdateStatusGet;

package/src/types/transport.ts

@@ -59,8 +59,6 @@ export type AcquireInput = {
    * transport must probe the protocol on the wire, bypassing any cached result.
    */
   forceProtocolDetection?: boolean;
-  /** Reuse expectedProtocol only when this transport previously confirmed it for the same endpoint. */
-  skipProtocolProbe?: boolean;
 };
 
 export type MessageFromOneKey = { type: string; message: Record<string, any> };
@@ -79,8 +77,6 @@ export type TransportCallOptions = {
   onWriteCompleted?: (metrics: TransportWriteMetrics) => void;
   /** Resolve after the complete request frame is written without waiting for a response. */
   returnAfterWrite?: boolean;
-  /** Observe the delayed terminal response of a write-only call while a later call is active. */
-  onResponseAfterWrite?: (response: MessageFromOneKey) => void;
   /** Prefer acknowledged BLE characteristic writes for this call when supported. */
   writeWithResponse?: boolean;
 };