@onekeyfe/hd-transport-web-device 1.1.34-alpha.3 → 1.1.34-alpha.4

package/dist/electron-ble-transport.d.ts

@@ -1,8 +1,8 @@
 /// <reference types="node" />
+import transport from '@onekeyfe/hd-transport';
 import type { Deferred } from '@onekeyfe/hd-shared';
-import type { DesktopAPI } from '@onekeyfe/hd-transport-electron';
-import type { OneKeyDeviceInfo, ProtocolType, TransportCallOptions } from '@onekeyfe/hd-transport';
 import type EventEmitter from 'events';
+import type { DesktopAPI } from '@onekeyfe/hd-transport-electron';
 declare global {
     interface Window {
         desktopApi?: DesktopAPI;
@@ -11,71 +11,34 @@ declare global {
 export type BleAcquireInput = {
     uuid: string;
     forceCleanRunPromise?: boolean;
-    expectedProtocol?: ProtocolType;
 };
 export default class ElectronBleTransport {
-    private _messages;
-    private _messagesV2;
+    _messages: ReturnType<typeof transport.parseConfigure> | undefined;
     name: string;
     configured: boolean;
-    runPromise: Deferred<Uint8Array | string> | null;
+    runPromise: Deferred<any> | null;
     Log?: any;
     emitter?: EventEmitter;
     private connectedDevices;
-    private deviceProtocol;
-    private deviceProtocolHints;
-    private v1Buffers;
-    private v2Assemblers;
-    private v2FrameQueues;
-    private v2FramePromises;
-    private protocolV2Links;
+    private dataBuffers;
     private notificationCleanups;
     private disconnectCleanups;
-    private notificationTokens;
-    private nextNotificationToken;
     private handleBluetoothError;
     private cleanupDeviceState;
     init(logger: any, emitter?: EventEmitter): void;
     configure(signedData: any): void;
-    configureProtocolV2(signedData: any): void;
-    listen(): Promise<OneKeyDeviceInfo[]>;
-    enumerate(): Promise<OneKeyDeviceInfo[]>;
+    listen(): void;
+    enumerate(): Promise<{
+        id: string;
+        name: string;
+    }[]>;
     acquire(input: BleAcquireInput): Promise<{
         uuid: string;
-        commType: import("@onekeyfe/hd-transport").OneKeyDeviceCommType;
         path: string;
-        session?: string | null | undefined;
-        debugSession?: string | null | undefined;
-        debug: boolean;
-        id: string;
-        name: string | null;
-        protocolType?: ProtocolType | undefined;
     }>;
     release(id: string): Promise<void>;
-    private createProtocolMismatchError;
-    private createProtocolDetectionError;
-    private clearProbeProtocol;
-    private detectProtocol;
-    private createNotificationSubscription;
-    private resetProbeStateAfterProtocolProbe;
-    private probeProtocolV1;
-    private probeProtocolV2;
-    private writeWithChunking;
-    private writeOnce;
-    private handleNotification;
-    private handleProtocolV2Notification;
-    private getProtocolV2FrameQueue;
-    private resolveProtocolV2Frame;
-    private rejectAllProtocolV2Frames;
-    private resetProtocolV2Frames;
-    private rejectProtocolV2Frames;
-    private readProtocolV2Frame;
-    private handleProtocolV1Notification;
-    call(uuid: string, name: string, data: Record<string, unknown>, options?: TransportCallOptions): Promise<import("@onekeyfe/hd-transport").MessageFromOneKey>;
-    private callProtocolV1;
-    private callProtocolV2;
-    private createProtocolV2Adapter;
-    private processProtocolV1Notification;
-    getProtocolType(path: string): ProtocolType | undefined;
+    private handleNotificationData;
+    call(uuid: string, name: string, data: Record<string, unknown>): Promise<import("@onekeyfe/hd-transport").MessageFromOneKey>;
+    private processNotificationPacket;
 }
 //# sourceMappingURL=electron-ble-transport.d.ts.map

package/dist/electron-ble-transport.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"electron-ble-transport.d.ts","sourceRoot":"","sources":["../src/electron-ble-transport.ts"],"names":[],"mappings":";AAoBA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,KAAK,EAAE,gBAAgB,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AACnG,OAAO,KAAK,YAAY,MAAM,QAAQ,CAAC;AAIvC,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,MAAM;QACd,UAAU,CAAC,EAAE,UAAU,CAAC;KACzB;CACF;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,gBAAgB,CAAC,EAAE,YAAY,CAAC;CACjC,CAAC;AAoCF,MAAM,CAAC,OAAO,OAAO,oBAAoB;IACvC,OAAO,CAAC,SAAS,CAA0D;IAE3E,OAAO,CAAC,WAAW,CAA0D;IAE7E,IAAI,SAA0B;IAE9B,UAAU,UAAS;IAEnB,UAAU,EAAE,QAAQ,CAAC,UAAU,GAAG,MAAM,CAAC,GAAG,IAAI,CAAQ;IAExD,GAAG,CAAC,EAAE,GAAG,CAAC;IAEV,OAAO,CAAC,EAAE,YAAY,CAAC;IAEvB,OAAO,CAAC,gBAAgB,CAA0B;IAElD,OAAO,CAAC,cAAc,CAAwC;IAE9D,OAAO,CAAC,mBAAmB,CAAwC;IAEnE,OAAO,CAAC,SAAS,CAAsE;IAEvF,OAAO,CAAC,YAAY,CAAoD;IAExE,OAAO,CAAC,aAAa,CAAwC;IAE7D,OAAO,CAAC,eAAe,CAAgD;IAEvE,OAAO,CAAC,eAAe,CAmBpB;IAEH,OAAO,CAAC,oBAAoB,CAAsC;IAElE,OAAO,CAAC,kBAAkB,CAAsC;IAEhE,OAAO,CAAC,kBAAkB,CAAkC;IAE5D,OAAO,CAAC,qBAAqB,CAAK;IAElC,OAAO,CAAC,oBAAoB;IA+B5B,OAAO,CAAC,kBAAkB;IA0B1B,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,YAAY;IAcxC,SAAS,CAAC,UAAU,EAAE,GAAG;IAKzB,mBAAmB,CAAC,UAAU,EAAE,GAAG;IAO7B,MAAM;IAIN,SAAS,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAqBxC,OAAO,CAAC,KAAK,EAAE,eAAe;;;;;;;;;;;IA0F9B,OAAO,CAAC,EAAE,EAAE,MAAM;IAgBxB,OAAO,CAAC,2BAA2B;IAOnC,OAAO,CAAC,4BAA4B;IAOpC,OAAO,CAAC,kBAAkB;YAMZ,cAAc;IA8C5B,OAAO,CAAC,8BAA8B;YAgBxB,iCAAiC;YAqCjC,eAAe;YAgBf,eAAe;YAuBf,iBAAiB;YAsBjB,SAAS;IASvB,OAAO,CAAC,kBAAkB;IAwB1B,OAAO,CAAC,4BAA4B;IAkBpC,OAAO,CAAC,uBAAuB;IAS/B,OAAO,CAAC,sBAAsB;IAU9B,OAAO,CAAC,yBAAyB;IAQjC,OAAO,CAAC,qBAAqB;IAK7B,OAAO,CAAC,sBAAsB;YAShB,mBAAmB;IAiBjC,OAAO,CAAC,4BAA4B;IAgB9B,IAAI,CACR,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,OAAO,CAAC,EAAE,oBAAoB;YA2BlB,cAAc;YAuEd,cAAc;IAiC5B,OAAO,CAAC,uBAAuB;IA0C/B,OAAO,CAAC,6BAA6B;IAsCrC,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS;CAGxD"}
+{"version":3,"file":"electron-ble-transport.d.ts","sourceRoot":"","sources":["../src/electron-ble-transport.ts"],"names":[],"mappings":";AAAA,OAAO,SAAkD,MAAM,wBAAwB,CAAC;AASxF,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,KAAK,YAAY,MAAM,QAAQ,CAAC;AAEvC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAKlE,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,MAAM;QACd,UAAU,CAAC,EAAE,UAAU,CAAC;KACzB;CACF;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC,CAAC;AASF,MAAM,CAAC,OAAO,OAAO,oBAAoB;IACvC,SAAS,EAAE,UAAU,CAAC,OAAO,SAAS,CAAC,cAAc,CAAC,GAAG,SAAS,CAAC;IAEnE,IAAI,SAA0B;IAE9B,UAAU,UAAS;IAEnB,UAAU,EAAE,QAAQ,CAAC,GAAG,CAAC,GAAG,IAAI,CAAQ;IAExC,GAAG,CAAC,EAAE,GAAG,CAAC;IAEV,OAAO,CAAC,EAAE,YAAY,CAAC;IAGvB,OAAO,CAAC,gBAAgB,CAA0B;IAGlD,OAAO,CAAC,WAAW,CAAsE;IAGzF,OAAO,CAAC,oBAAoB,CAAsC;IAGlE,OAAO,CAAC,kBAAkB,CAAsC;IAGhE,OAAO,CAAC,oBAAoB;IAmC5B,OAAO,CAAC,kBAAkB;IAmB1B,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,YAAY;IAexC,SAAS,CAAC,UAAU,EAAE,GAAG;IAMzB,MAAM;IAEA,SAAS,IAAI,OAAO,CAAC;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAcpD,OAAO,CAAC,KAAK,EAAE,eAAe;;;;IA8E9B,OAAO,CAAC,EAAE,EAAE,MAAM;IAwBxB,OAAO,CAAC,sBAAsB;IA2BxB,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IA2EpE,OAAO,CAAC,yBAAyB;CAyDlC"}

package/dist/index.d.ts

@@ -1,118 +1,33 @@
-import * as _onekeyfe_hd_transport from '@onekeyfe/hd-transport';
-import _onekeyfe_hd_transport__default, { AcquireInput, TransportCallOptions, ProtocolType, OneKeyDeviceInfoBase, OneKeyDeviceInfo } from '@onekeyfe/hd-transport';
+import * as transport from '@onekeyfe/hd-transport';
+import transport__default, { AcquireInput, OneKeyDeviceInfoBase } from '@onekeyfe/hd-transport';
 import { Deferred } from '@onekeyfe/hd-shared';
-import { DesktopAPI } from '@onekeyfe/hd-transport-electron';
 import EventEmitter from 'events';
+import { DesktopAPI } from '@onekeyfe/hd-transport-electron';
 
-/**
- * Device information with path and WebUSB device instance
- */
 interface DeviceInfo extends OneKeyDeviceInfoBase {
     path: string;
     device: USBDevice;
-    protocolType?: ProtocolType;
 }
 declare class WebUsbTransport {
-    messages: ReturnType<typeof _onekeyfe_hd_transport__default.parseConfigure> | undefined;
-    /** Protobuf schema for Protocol V2 transports. */
-    messagesV2: ReturnType<typeof _onekeyfe_hd_transport__default.parseConfigure> | undefined;
-    /** Per-path protocol type detected by active wire-level probe. */
-    private deviceProtocol;
-    private deviceProtocolHints;
-    /** Per-device Protocol V2 assembler that retains extra frames from one read. */
-    private protocolV2Assemblers;
-    /** Per-device Protocol V2 session that keeps sequence numbers monotonic. */
-    private protocolV2Sessions;
-    /** Sequence cursors survive ordinary reconnects and cached session rebuilds. */
-    private protocolV2Sequences;
-    /** Read timeout for the current Protocol V2 call, consumed by cached readFrame. */
-    private protocolV2ReadTimeouts;
-    private protocolV2WriteTimeoutMs;
-    /** Per-path USB endpoint / interface numbers (discovered from USB descriptors) */
-    private deviceEndpoints;
-    /**
-     * Early Pro2 boards have no USB serial number. Assign a session-stable mock path per
-     * USBDevice instance so discovery retains them; reconnecting creates a new instance/path.
-     */
-    private mockSerialPaths;
-    private mockSerialCounter;
+    messages: ReturnType<typeof transport__default.parseConfigure> | undefined;
     name: string;
     stopped: boolean;
     configured: boolean;
     Log?: any;
     usb?: USB;
-    /**
-     * Cached list of connected devices
-     * This is essential for maintaining device references between operations
-     */
     deviceList: Array<DeviceInfo>;
     configurationId: number;
     endpointId: number;
     interfaceId: number;
-    /**
-     * Initialize WebUSB transport
-     */
     init(logger: any): void;
-    /**
-     * Configure Protocol V1 protobuf schema (legacy chunked 0x3F framing).
-     */
     configure(signedData: any): void;
-    /**
-     * Cache the Protocol V2 protobuf schema.
-     */
-    configureProtocolV2(signedData: any): void;
-    /**
-     * Request user to select a device
-     * This method must be called in response to a user action
-     * to comply with WebUSB security requirements
-     */
     promptDeviceAccess(): Promise<USBDevice | null>;
-    /**
-     * Enumerate already connected devices
-     * This method only returns devices that are already authorized by the browser
-     * It does NOT prompt the user to select a device
-     */
     enumerate(): Promise<DeviceInfo[]>;
-    /**
-     * Use the USB serial as the device path, falling back to a session-stable mock path.
-     */
-    private getDevicePath;
-    /**
-     * Get list of connected devices
-     */
     getConnectedDevices(): Promise<DeviceInfo[]>;
-    /**
-     * Acquire device control
-     */
     acquire(input: AcquireInput): Promise<string | undefined>;
-    /**
-     * Determine protocol type after connect.
-     * Probe Protocol V1 first with Initialize. If it does not answer in time,
-     * fall back to a Protocol V2 Ping probe.
-     */
-    private createProtocolMismatchError;
-    private createProtocolDetectionError;
-    private detectProtocol;
-    /**
-     * Find device by path
-     */
     findDevice(path: string): Promise<USBDevice>;
-    /**
-     * Connect to device with retry mechanism
-     */
     connect(path: string, first: boolean): Promise<void>;
-    /**
-     * Discover vendor-class (0xFF) interface and its IN/OUT endpoint numbers from USB descriptors.
-     * Falls back to legacy hardcoded values if no vendor interface is found.
-     */
-    private discoverEndpoints;
-    /**
-     * Connect to specific device.
-     * Discovers interface/endpoint numbers from USB descriptors on first connection.
-     */
     connectToDevice(path: string, first: boolean): Promise<void>;
-    private closeOpenDevice;
-    private clearEndpointHalt;
     post(session: string, name: string, data: Record<string, unknown>): Promise<void>;
     private getErrorMessage;
     private isRetryablePacketIoError;
@@ -120,38 +35,10 @@ declare class WebUsbTransport {
     private getTransferInData;
     private toArrayBuffer;
     private transferOutWithRetry;
-    private transferOutOnce;
     private transferInWithRetry;
-    private resetConnectionAfterProbe;
-    private withProtocolReadTimeout;
-    private probeProtocolV1;
-    private probeProtocolV2;
-    /**
-     * Call device method — branches to Protocol V1 or Protocol V2 based on active probe.
-     */
-    call(path: string, name: string, data: Record<string, unknown>, options?: TransportCallOptions): Promise<_onekeyfe_hd_transport.MessageFromOneKey>;
-    private callProtocolV1;
-    /**
-     * Send/receive a single call over Protocol V2 (0x5A framing).
-     *
-     * Encoding:  protobuf message → 2-byte LE messageTypeId + pb bytes → Protocol V2 frame
-     * Decoding:  Protocol V2 frame → messageTypeId + pb bytes → protobuf message
-     */
-    private callProtocolV2;
-    private receiveProtocolV2Frame;
-    /**
-     * Receive data from device
-     */
-    receiveData(path: string, timeoutMs?: number): Promise<string>;
-    /**
-     * Release device
-     */
+    call(path: string, name: string, data: Record<string, unknown>): Promise<transport.MessageFromOneKey>;
+    receiveData(path: string): Promise<string>;
     release(path: string): Promise<void>;
-    /**
-     * Expose the detected protocol type for a given device path.
-     * Used by upper layers (e.g. TransportManager) to select the correct schema.
-     */
-    getProtocolType(path: string): ProtocolType | undefined;
 }
 
 declare global {
@@ -162,78 +49,35 @@ declare global {
 type BleAcquireInput = {
     uuid: string;
     forceCleanRunPromise?: boolean;
-    expectedProtocol?: ProtocolType;
 };
-/**
- * Desktop Electron BLE transport with automatic Protocol V1/V2 detection.
- *
- * Protocol V1 devices continue using chunked packets. Protocol V2 is detected
- * after a Protocol V1 Initialize timeout by probing Protocol V2 Ping.
- */
 declare class ElectronBleTransport {
-    private _messages;
-    private _messagesV2;
+    _messages: ReturnType<typeof transport__default.parseConfigure> | undefined;
     name: string;
     configured: boolean;
-    runPromise: Deferred<Uint8Array | string> | null;
+    runPromise: Deferred<any> | null;
     Log?: any;
     emitter?: EventEmitter;
     private connectedDevices;
-    private deviceProtocol;
-    private deviceProtocolHints;
-    private v1Buffers;
-    private v2Assemblers;
-    private v2FrameQueues;
-    private v2FramePromises;
-    private protocolV2Links;
+    private dataBuffers;
     private notificationCleanups;
     private disconnectCleanups;
-    private notificationTokens;
-    private nextNotificationToken;
     private handleBluetoothError;
     private cleanupDeviceState;
     init(logger: any, emitter?: EventEmitter): void;
     configure(signedData: any): void;
-    configureProtocolV2(signedData: any): void;
-    listen(): Promise<OneKeyDeviceInfo[]>;
-    enumerate(): Promise<OneKeyDeviceInfo[]>;
+    listen(): void;
+    enumerate(): Promise<{
+        id: string;
+        name: string;
+    }[]>;
     acquire(input: BleAcquireInput): Promise<{
         uuid: string;
-        commType: _onekeyfe_hd_transport.OneKeyDeviceCommType;
         path: string;
-        session?: string | null | undefined;
-        debugSession?: string | null | undefined;
-        debug: boolean;
-        id: string;
-        name: string | null;
-        protocolType?: ProtocolType | undefined;
     }>;
     release(id: string): Promise<void>;
-    private createProtocolMismatchError;
-    private createProtocolDetectionError;
-    private clearProbeProtocol;
-    private detectProtocol;
-    private createNotificationSubscription;
-    private resetProbeStateAfterProtocolProbe;
-    private probeProtocolV1;
-    private probeProtocolV2;
-    private writeWithChunking;
-    private writeOnce;
-    private handleNotification;
-    private handleProtocolV2Notification;
-    private getProtocolV2FrameQueue;
-    private resolveProtocolV2Frame;
-    private rejectAllProtocolV2Frames;
-    private resetProtocolV2Frames;
-    private rejectProtocolV2Frames;
-    private readProtocolV2Frame;
-    private handleProtocolV1Notification;
-    call(uuid: string, name: string, data: Record<string, unknown>, options?: TransportCallOptions): Promise<_onekeyfe_hd_transport.MessageFromOneKey>;
-    private callProtocolV1;
-    private callProtocolV2;
-    private createProtocolV2Adapter;
-    private processProtocolV1Notification;
-    getProtocolType(path: string): ProtocolType | undefined;
+    private handleNotificationData;
+    call(uuid: string, name: string, data: Record<string, unknown>): Promise<transport.MessageFromOneKey>;
+    private processNotificationPacket;
 }
 
 export { ElectronBleTransport, WebUsbTransport };