@onekeyfe/hd-transport-web-device 1.1.26 → 1.1.27-alpha.30

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

@@ -0,0 +1,70 @@
+/// <reference types="node" />
+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';
+declare global {
+    interface Window {
+        desktopApi?: DesktopAPI;
+    }
+}
+export type BleAcquireInput = {
+    uuid: string;
+    forceCleanRunPromise?: boolean;
+    expectedProtocol?: ProtocolType;
+};
+export default class ElectronAutoBleTransport {
+    private _messages;
+    private _messagesV2;
+    name: string;
+    configured: boolean;
+    runPromise: Deferred<Uint8Array | string> | null;
+    Log?: any;
+    emitter?: EventEmitter;
+    private connectedDevices;
+    private deviceProtocol;
+    private v1Buffers;
+    private v2Assemblers;
+    private v2FrameQueue;
+    private v2FramePromise;
+    private notificationCleanups;
+    private disconnectCleanups;
+    private handleBluetoothError;
+    private cleanupDeviceState;
+    init(logger: any, emitter?: EventEmitter): void;
+    configure(signedData: any): void;
+    configureProtocolV2(signedData: any): void;
+    listen(): Promise<OneKeyDeviceInfo[]>;
+    enumerate(): Promise<OneKeyDeviceInfo[]>;
+    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 detectProtocol;
+    private probeProtocolV1;
+    private probeProtocolV2;
+    private writeWithChunking;
+    private writeWithRetry;
+    private handleNotification;
+    private handleProtocolV2Notification;
+    private resolveProtocolV2Frame;
+    private rejectProtocolV2Frame;
+    private resetProtocolV2Frames;
+    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 processProtocolV1Notification;
+    getProtocolType(path: string): ProtocolType;
+}
+//# sourceMappingURL=electron-auto-ble-transport.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"electron-auto-ble-transport.d.ts","sourceRoot":"","sources":["../src/electron-auto-ble-transport.ts"],"names":[],"mappings":";AAmBA,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;AAWvC,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;AAyCF,MAAM,CAAC,OAAO,OAAO,wBAAwB;IAC3C,OAAO,CAAC,SAAS,CAA0D;IAE3E,OAAO,CAAC,WAAW,CAA0D;IAE7E,IAAI,SAA8B;IAElC,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,SAAS,CAAsE;IAEvF,OAAO,CAAC,YAAY,CAAoD;IAExE,OAAO,CAAC,YAAY,CAAoB;IAExC,OAAO,CAAC,cAAc,CAAqC;IAE3D,OAAO,CAAC,oBAAoB,CAAsC;IAElE,OAAO,CAAC,kBAAkB,CAAsC;IAEhE,OAAO,CAAC,oBAAoB;IA+B5B,OAAO,CAAC,kBAAkB;IAmB1B,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,YAAY;IAcxC,SAAS,CAAC,UAAU,EAAE,GAAG;IAKzB,mBAAmB,CAAC,UAAU,EAAE,GAAG;IAK7B,MAAM;IAIN,SAAS,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAiBxC,OAAO,CAAC,KAAK,EAAE,eAAe;;;;;;;;;;;IAqF9B,OAAO,CAAC,EAAE,EAAE,MAAM;IAexB,OAAO,CAAC,2BAA2B;YAOrB,cAAc;YAqCd,eAAe;YAef,eAAe;YAmBf,iBAAiB;YAsBjB,cAAc;IA4B5B,OAAO,CAAC,kBAAkB;IAmB1B,OAAO,CAAC,4BAA4B;IA6BpC,OAAO,CAAC,sBAAsB;IAS9B,OAAO,CAAC,qBAAqB;IAQ7B,OAAO,CAAC,qBAAqB;YAKf,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;YAyBlB,cAAc;YAuEd,cAAc;IA2E5B,OAAO,CAAC,6BAA6B;IAgDrC,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY;CAG5C"}

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

@@ -2,6 +2,7 @@
 import transport from '@onekeyfe/hd-transport';
 import type { Deferred } from '@onekeyfe/hd-shared';
 import type EventEmitter from 'events';
+import type { ProtocolType } from '@onekeyfe/hd-transport';
 import type { DesktopAPI } from '@onekeyfe/hd-transport-electron';
 declare global {
     interface Window {
@@ -23,6 +24,7 @@ export default class ElectronBleTransport {
     private dataBuffers;
     private notificationCleanups;
     private disconnectCleanups;
+    getProtocolType(_path: string): ProtocolType;
     private handleBluetoothError;
     private cleanupDeviceState;
     init(logger: any, emitter?: EventEmitter): void;

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":";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"}
+{"version":3,"file":"electron-ble-transport.d.ts","sourceRoot":"","sources":["../src/electron-ble-transport.ts"],"names":[],"mappings":";AAAA,OAAO,SAGN,MAAM,wBAAwB,CAAC;AAShC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,KAAK,YAAY,MAAM,QAAQ,CAAC;AACvC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAE3D,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,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,YAAY;IAK5C,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,5 +1,5 @@
-import * as transport from '@onekeyfe/hd-transport';
-import transport__default, { AcquireInput, OneKeyDeviceInfoBase } from '@onekeyfe/hd-transport';
+import * as _onekeyfe_hd_transport from '@onekeyfe/hd-transport';
+import _onekeyfe_hd_transport__default, { AcquireInput, TransportCallOptions, ProtocolType, OneKeyDeviceInfoBase, OneKeyDeviceInfo } from '@onekeyfe/hd-transport';
 import { Deferred } from '@onekeyfe/hd-shared';
 import EventEmitter from 'events';
 import { DesktopAPI } from '@onekeyfe/hd-transport-electron';
@@ -7,9 +7,14 @@ import { DesktopAPI } from '@onekeyfe/hd-transport-electron';
 interface DeviceInfo extends OneKeyDeviceInfoBase {
     path: string;
     device: USBDevice;
+    protocolType?: ProtocolType;
 }
 declare class WebUsbTransport {
-    messages: ReturnType<typeof transport__default.parseConfigure> | undefined;
+    messages: ReturnType<typeof _onekeyfe_hd_transport__default.parseConfigure> | undefined;
+    messagesV2: ReturnType<typeof _onekeyfe_hd_transport__default.parseConfigure> | undefined;
+    private deviceProtocol;
+    private protocolV2Assemblers;
+    private deviceEndpoints;
     name: string;
     stopped: boolean;
     configured: boolean;
@@ -21,12 +26,16 @@ declare class WebUsbTransport {
     interfaceId: number;
     init(logger: any): void;
     configure(signedData: any): void;
+    configureProtocolV2(signedData: any): void;
     promptDeviceAccess(): Promise<USBDevice | null>;
     enumerate(): Promise<DeviceInfo[]>;
     getConnectedDevices(): Promise<DeviceInfo[]>;
     acquire(input: AcquireInput): Promise<string | undefined>;
+    private createProtocolMismatchError;
+    private detectProtocol;
     findDevice(path: string): Promise<USBDevice>;
     connect(path: string, first: boolean): Promise<void>;
+    private discoverEndpoints;
     connectToDevice(path: string, first: boolean): Promise<void>;
     post(session: string, name: string, data: Record<string, unknown>): Promise<void>;
     private getErrorMessage;
@@ -36,9 +45,17 @@ declare class WebUsbTransport {
     private toArrayBuffer;
     private transferOutWithRetry;
     private transferInWithRetry;
-    call(path: string, name: string, data: Record<string, unknown>): Promise<transport.MessageFromOneKey>;
-    receiveData(path: string): Promise<string>;
+    private resetConnectionAfterProbe;
+    private withProtocolReadTimeout;
+    private probeProtocolV1;
+    private probeProtocolV2;
+    call(path: string, name: string, data: Record<string, unknown>, options?: TransportCallOptions): Promise<_onekeyfe_hd_transport.MessageFromOneKey>;
+    private callProtocolV1;
+    private callProtocolV2;
+    private receiveProtocolV2Frame;
+    receiveData(path: string, timeoutMs?: number): Promise<string>;
     release(path: string): Promise<void>;
+    getProtocolType(path: string): ProtocolType;
 }
 
 declare global {
@@ -46,12 +63,12 @@ declare global {
         desktopApi?: DesktopAPI;
     }
 }
-type BleAcquireInput = {
+type BleAcquireInput$1 = {
     uuid: string;
     forceCleanRunPromise?: boolean;
 };
 declare class ElectronBleTransport {
-    _messages: ReturnType<typeof transport__default.parseConfigure> | undefined;
+    _messages: ReturnType<typeof _onekeyfe_hd_transport__default.parseConfigure> | undefined;
     name: string;
     configured: boolean;
     runPromise: Deferred<any> | null;
@@ -61,6 +78,7 @@ declare class ElectronBleTransport {
     private dataBuffers;
     private notificationCleanups;
     private disconnectCleanups;
+    getProtocolType(_path: string): ProtocolType;
     private handleBluetoothError;
     private cleanupDeviceState;
     init(logger: any, emitter?: EventEmitter): void;
@@ -70,14 +88,79 @@ declare class ElectronBleTransport {
         id: string;
         name: string;
     }[]>;
-    acquire(input: BleAcquireInput): Promise<{
+    acquire(input: BleAcquireInput$1): Promise<{
         uuid: string;
         path: string;
     }>;
     release(id: string): Promise<void>;
     private handleNotificationData;
-    call(uuid: string, name: string, data: Record<string, unknown>): Promise<transport.MessageFromOneKey>;
+    call(uuid: string, name: string, data: Record<string, unknown>): Promise<_onekeyfe_hd_transport.MessageFromOneKey>;
     private processNotificationPacket;
 }
 
-export { ElectronBleTransport, WebUsbTransport };
+declare global {
+    interface Window {
+        desktopApi?: DesktopAPI;
+    }
+}
+type BleAcquireInput = {
+    uuid: string;
+    forceCleanRunPromise?: boolean;
+    expectedProtocol?: ProtocolType;
+};
+declare class ElectronAutoBleTransport {
+    private _messages;
+    private _messagesV2;
+    name: string;
+    configured: boolean;
+    runPromise: Deferred<Uint8Array | string> | null;
+    Log?: any;
+    emitter?: EventEmitter;
+    private connectedDevices;
+    private deviceProtocol;
+    private v1Buffers;
+    private v2Assemblers;
+    private v2FrameQueue;
+    private v2FramePromise;
+    private notificationCleanups;
+    private disconnectCleanups;
+    private handleBluetoothError;
+    private cleanupDeviceState;
+    init(logger: any, emitter?: EventEmitter): void;
+    configure(signedData: any): void;
+    configureProtocolV2(signedData: any): void;
+    listen(): Promise<OneKeyDeviceInfo[]>;
+    enumerate(): Promise<OneKeyDeviceInfo[]>;
+    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 detectProtocol;
+    private probeProtocolV1;
+    private probeProtocolV2;
+    private writeWithChunking;
+    private writeWithRetry;
+    private handleNotification;
+    private handleProtocolV2Notification;
+    private resolveProtocolV2Frame;
+    private rejectProtocolV2Frame;
+    private resetProtocolV2Frames;
+    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 processProtocolV1Notification;
+    getProtocolType(path: string): ProtocolType;
+}
+
+export { ElectronAutoBleTransport, ElectronBleTransport, WebUsbTransport };

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,MAAM,UAAU,CAAC;AACvC,OAAO,oBAAoB,MAAM,0BAA0B,CAAC;AAE5D,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,MAAM,UAAU,CAAC;AACvC,OAAO,oBAAoB,MAAM,0BAA0B,CAAC;AAC5D,OAAO,wBAAwB,MAAM,+BAA+B,CAAC;AAErE,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAE,wBAAwB,EAAE,CAAC"}