@onekeyfe/hd-transport 1.1.27 → 1.2.0-alpha.0

package/src/types/transport.ts

@@ -1,5 +1,7 @@
 import type EventEmitter from 'events';
 
+export type ProtocolType = 'V1' | 'V2';
+
 export type OneKeyDeviceCommType =
   | 'usb'
   | 'webusb'
@@ -31,17 +33,27 @@ export type OneKeyDeviceInfoBase = {
 // TODO: sorting type by communication type
 export type OneKeyDeviceInfo = OneKeyDeviceInfoBase &
   OneKeyDeviceInfoWithSession &
-  OneKeyMobileDeviceInfo;
+  OneKeyMobileDeviceInfo & {
+    protocolType?: ProtocolType;
+  };
 
 export type AcquireInput = {
   path?: string;
   previous?: string | null;
   uuid?: string;
   forceCleanRunPromise?: boolean;
+  expectedProtocol?: ProtocolType;
 };
 
 export type MessageFromOneKey = { type: string; message: Record<string, any> };
 
+export type TransportCallOptions = {
+  timeoutMs?: number;
+  expectedTypes?: string[];
+  intermediateTypes?: string[];
+  onIntermediateResponse?: (response: MessageFromOneKey) => void;
+};
+
 type ITransportInitFn = (
   logger?: any,
   emitter?: EventEmitter,
@@ -54,7 +66,13 @@ export type Transport = {
   acquire(input: AcquireInput): Promise<string>;
   release(session: string, onclose: boolean): Promise<void>;
   configure(signedData: JSON | string): Promise<void>;
-  call(session: string, name: string, data: Record<string, any>): Promise<MessageFromOneKey>;
+  configureProtocolV2?: (signedData: JSON | string) => Promise<void> | void;
+  call(
+    session: string,
+    name: string,
+    data: Record<string, any>,
+    options?: TransportCallOptions
+  ): Promise<MessageFromOneKey>;
   post(session: string, name: string, data: Record<string, any>): Promise<void>;
   read(session: string): Promise<MessageFromOneKey>;
   cancel(): Promise<void>;
@@ -63,6 +81,12 @@ export type Transport = {
   // used to reset the session of the transport when the session is not valid
   disconnect?: (session: string) => Promise<void>;
 
+  // Returns the protocol type for a given device path.
+  // Single-protocol transports (HTTP, emulator, etc.) return 'V1'.
+  // Protocol V2-capable transports return the probed protocol for each device,
+  // or undefined before protocol detection succeeds.
+  getProtocolType: (path: string) => ProtocolType | undefined;
+
   // web-usb, web-bluetooth request device
   promptDeviceAccess?: () => Promise<USBDevice | BluetoothDevice | null>;
 

package/src/utils/logBlockCommand.ts

@@ -1 +1,9 @@
-export const LogBlockCommand = new Set(['PassphraseAck', 'PinMatrixAck']);
+export const LogBlockCommand = new Set([
+  'PassphraseAck',
+  'PinMatrixAck',
+  'FilesystemFileWrite',
+  'FileWrite',
+  'EmmcFileWrite',
+  'FirmwareUpload',
+  'ResourceAck',
+]);

package/dist/serialization/protocol/decode.d.ts

@@ -1,11 +0,0 @@
-import ByteBuffer from 'bytebuffer';
-export declare const decode: (byteBuffer: ByteBuffer) => {
-    typeId: number;
-    buffer: ByteBuffer;
-};
-export declare const decodeChunked: (bytes: ArrayBuffer) => {
-    length: number;
-    typeId: number;
-    restBuffer: ByteBuffer;
-};
-//# sourceMappingURL=decode.d.ts.map

package/dist/serialization/protocol/decode.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"decode.d.ts","sourceRoot":"","sources":["../../../src/serialization/protocol/decode.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,YAAY,CAAC;AA0BpC,eAAO,MAAM,MAAM,eAAgB,UAAU;;;CAO5C,CAAC;AAIF,eAAO,MAAM,aAAa,UAAW,WAAW;;;;CAW/C,CAAC"}

package/dist/serialization/protocol/encode.d.ts

@@ -1,11 +0,0 @@
-/// <reference types="node" />
-import ByteBuffer from 'bytebuffer';
-type Options<Chunked> = {
-    chunked: Chunked;
-    addTrezorHeaders: boolean;
-    messageType: number;
-};
-declare function encode(data: ByteBuffer, options: Options<true>): Buffer[];
-declare function encode(data: ByteBuffer, options: Options<false>): Buffer;
-export { encode };
-//# sourceMappingURL=encode.d.ts.map

package/dist/serialization/protocol/encode.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"encode.d.ts","sourceRoot":"","sources":["../../../src/serialization/protocol/encode.ts"],"names":[],"mappings":";AAAA,OAAO,UAAU,MAAM,YAAY,CAAC;AAIpC,KAAK,OAAO,CAAC,OAAO,IAAI;IACtB,OAAO,EAAE,OAAO,CAAC;IACjB,gBAAgB,EAAE,OAAO,CAAC;IAC1B,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,iBAAS,MAAM,CAAC,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,MAAM,EAAE,CAAC;AACpE,iBAAS,MAAM,CAAC,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC;AA+CnE,OAAO,EAAE,MAAM,EAAE,CAAC"}

package/dist/serialization/protocol/index.d.ts

@@ -1,3 +0,0 @@
-export * from './decode';
-export * from './encode';
-//# sourceMappingURL=index.d.ts.map

package/dist/serialization/protocol/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/serialization/protocol/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC"}

package/dist/serialization/receive.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"receive.d.ts","sourceRoot":"","sources":["../../src/serialization/receive.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAE7C,wBAAgB,UAAU,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM;;;;;EAUtD"}

package/dist/serialization/send.d.ts

@@ -1,7 +0,0 @@
-/// <reference types="node" />
-import ByteBuffer from 'bytebuffer';
-import type { Root } from 'protobufjs/light';
-export declare function buildOne(messages: Root, name: string, data: Record<string, unknown>): Buffer;
-export declare const buildEncodeBuffers: (messages: Root, name: string, data: Record<string, unknown>) => Buffer[];
-export declare const buildBuffers: (messages: Root, name: string, data: Record<string, unknown>) => ByteBuffer[];
-//# sourceMappingURL=send.d.ts.map

package/dist/serialization/send.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"send.d.ts","sourceRoot":"","sources":["../../src/serialization/send.ts"],"names":[],"mappings":";AAGA,OAAO,UAAU,MAAM,YAAY,CAAC;AAOpC,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAI7C,wBAAgB,QAAQ,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,UASnF;AAED,eAAO,MAAM,kBAAkB,aAAc,IAAI,QAAQ,MAAM,QAAQ,OAAO,MAAM,EAAE,OAAO,CAAC,aAQ7F,CAAC;AAEF,eAAO,MAAM,YAAY,aAAc,IAAI,QAAQ,MAAM,QAAQ,OAAO,MAAM,EAAE,OAAO,CAAC,iBAsBvF,CAAC"}

package/src/serialization/protocol/index.ts

@@ -1,2 +0,0 @@
-export * from './decode';
-export * from './encode';

package/src/serialization/send.ts

@@ -1,58 +0,0 @@
-// Logic of sending data to trezor
-//
-// Logic of "call" is broken to two parts - sending and receiving
-import ByteBuffer from 'bytebuffer';
-
-import { encode as encodeProtobuf } from './protobuf';
-import { encode as encodeProtocol } from './protocol';
-import { createMessageFromName } from './protobuf/messages';
-import { BUFFER_SIZE, MESSAGE_TOP_CHAR } from '../constants';
-
-import type { Root } from 'protobufjs/light';
-
-// Sends message to device.
-// Resolves if everything gets sent
-export function buildOne(messages: Root, name: string, data: Record<string, unknown>) {
-  const { Message, messageType } = createMessageFromName(messages, name);
-
-  const buffer = encodeProtobuf(Message, data);
-  return encodeProtocol(buffer, {
-    addTrezorHeaders: false,
-    chunked: false,
-    messageType,
-  });
-}
-
-export const buildEncodeBuffers = (messages: Root, name: string, data: Record<string, unknown>) => {
-  const { Message, messageType } = createMessageFromName(messages, name);
-  const buffer = encodeProtobuf(Message, data);
-  return encodeProtocol(buffer, {
-    addTrezorHeaders: true,
-    chunked: true,
-    messageType,
-  });
-};
-
-export const buildBuffers = (messages: Root, name: string, data: Record<string, unknown>) => {
-  // const { Message, messageType } = createMessageFromName(messages, name);
-  // const buffer = encodeProtobuf(Message, data);
-  // const encodeBuffers = encodeProtocol(buffer, {
-  //   addTrezorHeaders: true,
-  //   chunked: true,
-  //   messageType,
-  // });
-
-  const encodeBuffers = buildEncodeBuffers(messages, name, data);
-
-  const outBuffers: ByteBuffer[] = [];
-
-  for (const buf of encodeBuffers) {
-    const chunkBuffer = new ByteBuffer(BUFFER_SIZE + 1);
-    chunkBuffer.writeByte(MESSAGE_TOP_CHAR);
-    chunkBuffer.append(buf);
-    chunkBuffer.reset();
-    outBuffers.push(chunkBuffer);
-  }
-
-  return outBuffers;
-};