@onekeyfe/hd-transport-web-device 1.1.27-alpha.40 → 1.1.27-alpha.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (10) hide show
  1. package/dist/electron-ble-transport.d.ts +13 -50
  2. package/dist/electron-ble-transport.d.ts.map +1 -1
  3. package/dist/index.d.ts +17 -73
  4. package/dist/index.js +108 -864
  5. package/dist/webusb.d.ts +3 -22
  6. package/dist/webusb.d.ts.map +1 -1
  7. package/package.json +5 -5
  8. package/src/electron-ble-transport.ts +132 -612
  9. package/src/webusb.ts +40 -507
  10. package/__tests__/electron-ble-transport.test.ts +0 -231
package/dist/electron-ble-transport.d.ts CHANGED
@@ -1,8 +1,8 @@
1
1
  /// <reference types="node" />
2
+ import transport from '@onekeyfe/hd-transport';
2
3
  import type { Deferred } from '@onekeyfe/hd-shared';
3
- import type { DesktopAPI } from '@onekeyfe/hd-transport-electron';
4
- import type { OneKeyDeviceInfo, ProtocolType, TransportCallOptions } from '@onekeyfe/hd-transport';
5
4
  import type EventEmitter from 'events';
5
+ import type { DesktopAPI } from '@onekeyfe/hd-transport-electron';
6
6
  declare global {
7
7
  interface Window {
8
8
  desktopApi?: DesktopAPI;
@@ -11,71 +11,34 @@ declare global {
11
11
  export type BleAcquireInput = {
12
12
  uuid: string;
13
13
  forceCleanRunPromise?: boolean;
14
- expectedProtocol?: ProtocolType;
15
14
  };
16
15
  export default class ElectronBleTransport {
17
- private _messages;
18
- private _messagesV2;
16
+ _messages: ReturnType<typeof transport.parseConfigure> | undefined;
19
17
  name: string;
20
18
  configured: boolean;
21
- runPromise: Deferred<Uint8Array | string> | null;
19
+ runPromise: Deferred<any> | null;
22
20
  Log?: any;
23
21
  emitter?: EventEmitter;
24
22
  private connectedDevices;
25
- private deviceProtocol;
26
- private deviceProtocolHints;
27
- private v1Buffers;
28
- private v2Assemblers;
29
- private v2FrameQueues;
30
- private v2FramePromises;
31
- private activeProtocolV2Call;
32
- private nextProtocolV2CallToken;
23
+ private dataBuffers;
33
24
  private notificationCleanups;
34
25
  private disconnectCleanups;
35
- private notificationTokens;
36
- private nextNotificationToken;
37
26
  private handleBluetoothError;
38
27
  private cleanupDeviceState;
39
28
  init(logger: any, emitter?: EventEmitter): void;
40
29
  configure(signedData: any): void;
41
- configureProtocolV2(signedData: any): void;
42
- listen(): Promise<OneKeyDeviceInfo[]>;
43
- enumerate(): Promise<OneKeyDeviceInfo[]>;
30
+ listen(): void;
31
+ enumerate(): Promise<{
32
+ id: string;
33
+ name: string;
34
+ }[]>;
44
35
  acquire(input: BleAcquireInput): Promise<{
45
36
  uuid: string;
46
- commType: import("@onekeyfe/hd-transport").OneKeyDeviceCommType;
47
37
  path: string;
48
- session?: string | null | undefined;
49
- debugSession?: string | null | undefined;
50
- debug: boolean;
51
- id: string;
52
- name: string | null;
53
- protocolType?: ProtocolType | undefined;
54
38
  }>;
55
39
  release(id: string): Promise<void>;
56
- private createProtocolMismatchError;
57
- private createProtocolDetectionError;
58
- private clearProbeProtocol;
59
- private detectProtocol;
60
- private createNotificationSubscription;
61
- private resetProbeStateAfterProtocolProbe;
62
- private probeProtocolV1;
63
- private probeProtocolV2;
64
- private writeWithChunking;
65
- private writeWithRetry;
66
- private handleNotification;
67
- private handleProtocolV2Notification;
68
- private getProtocolV2FrameQueue;
69
- private resolveProtocolV2Frame;
70
- private rejectAllProtocolV2Frames;
71
- private resetProtocolV2Frames;
72
- private isActiveProtocolV2Call;
73
- private readProtocolV2Frame;
74
- private handleProtocolV1Notification;
75
- call(uuid: string, name: string, data: Record<string, unknown>, options?: TransportCallOptions): Promise<import("@onekeyfe/hd-transport").MessageFromOneKey>;
76
- private callProtocolV1;
77
- private callProtocolV2;
78
- private processProtocolV1Notification;
79
- getProtocolType(path: string): ProtocolType | undefined;
40
+ private handleNotificationData;
41
+ call(uuid: string, name: string, data: Record<string, unknown>): Promise<import("@onekeyfe/hd-transport").MessageFromOneKey>;
42
+ private processNotificationPacket;
80
43
  }
81
44
  //# sourceMappingURL=electron-ble-transport.d.ts.map
package/dist/electron-ble-transport.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"electron-ble-transport.d.ts","sourceRoot":"","sources":["../src/electron-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;AAuCF,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,oBAAoB,CAAgD;IAE5E,OAAO,CAAC,uBAAuB,CAAK;IAEpC,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;IAK7B,MAAM;IAIN,SAAS,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAqBxC,OAAO,CAAC,KAAK,EAAE,eAAe;;;;;;;;;;;IAuF9B,OAAO,CAAC,EAAE,EAAE,MAAM;IAexB,OAAO,CAAC,2BAA2B;IAOnC,OAAO,CAAC,4BAA4B;IAOpC,OAAO,CAAC,kBAAkB;YAMZ,cAAc;IAkD5B,OAAO,CAAC,8BAA8B;YAgBxB,iCAAiC;YAoCjC,eAAe;YAgBf,eAAe;YAuBf,iBAAiB;YAsBjB,cAAc;IA4B5B,OAAO,CAAC,kBAAkB;IAuB1B,OAAO,CAAC,4BAA4B;IA6BpC,OAAO,CAAC,uBAAuB;IAS/B,OAAO,CAAC,sBAAsB;IAU9B,OAAO,CAAC,yBAAyB;IAQjC,OAAO,CAAC,qBAAqB;IAK7B,OAAO,CAAC,sBAAsB;YAIhB,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;YA+BlB,cAAc;YAuEd,cAAc;IAmF5B,OAAO,CAAC,6BAA6B;IAsCrC,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS;CAGxD"}
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"}
package/dist/index.d.ts CHANGED
@@ -1,21 +1,15 @@
1
- import * as _onekeyfe_hd_transport from '@onekeyfe/hd-transport';
2
- import _onekeyfe_hd_transport__default, { AcquireInput, TransportCallOptions, ProtocolType, OneKeyDeviceInfoBase, OneKeyDeviceInfo } from '@onekeyfe/hd-transport';
1
+ import * as transport from '@onekeyfe/hd-transport';
2
+ import transport__default, { AcquireInput, OneKeyDeviceInfoBase } from '@onekeyfe/hd-transport';
3
3
  import { Deferred } from '@onekeyfe/hd-shared';
4
- import { DesktopAPI } from '@onekeyfe/hd-transport-electron';
5
4
  import EventEmitter from 'events';
5
+ import { DesktopAPI } from '@onekeyfe/hd-transport-electron';
6
6
 
7
7
  interface DeviceInfo extends OneKeyDeviceInfoBase {
8
8
  path: string;
9
9
  device: USBDevice;
10
- protocolType?: ProtocolType;
11
10
  }
12
11
  declare class WebUsbTransport {
13
- messages: ReturnType<typeof _onekeyfe_hd_transport__default.parseConfigure> | undefined;
14
- messagesV2: ReturnType<typeof _onekeyfe_hd_transport__default.parseConfigure> | undefined;
15
- private deviceProtocol;
16
- private deviceProtocolHints;
17
- private protocolV2Assemblers;
18
- private deviceEndpoints;
12
+ messages: ReturnType<typeof transport__default.parseConfigure> | undefined;
19
13
  name: string;
20
14
  stopped: boolean;
21
15
  configured: boolean;
@@ -27,17 +21,12 @@ declare class WebUsbTransport {
27
21
  interfaceId: number;
28
22
  init(logger: any): void;
29
23
  configure(signedData: any): void;
30
- configureProtocolV2(signedData: any): void;
31
24
  promptDeviceAccess(): Promise<USBDevice | null>;
32
25
  enumerate(): Promise<DeviceInfo[]>;
33
26
  getConnectedDevices(): Promise<DeviceInfo[]>;
34
27
  acquire(input: AcquireInput): Promise<string | undefined>;
35
- private createProtocolMismatchError;
36
- private createProtocolDetectionError;
37
- private detectProtocol;
38
28
  findDevice(path: string): Promise<USBDevice>;
39
29
  connect(path: string, first: boolean): Promise<void>;
40
- private discoverEndpoints;
41
30
  connectToDevice(path: string, first: boolean): Promise<void>;
42
31
  post(session: string, name: string, data: Record<string, unknown>): Promise<void>;
43
32
  private getErrorMessage;
@@ -47,17 +36,9 @@ declare class WebUsbTransport {
47
36
  private toArrayBuffer;
48
37
  private transferOutWithRetry;
49
38
  private transferInWithRetry;
50
- private resetConnectionAfterProbe;
51
- private withProtocolReadTimeout;
52
- private probeProtocolV1;
53
- private probeProtocolV2;
54
- call(path: string, name: string, data: Record<string, unknown>, options?: TransportCallOptions): Promise<_onekeyfe_hd_transport.MessageFromOneKey>;
55
- private callProtocolV1;
56
- private callProtocolV2;
57
- private receiveProtocolV2Frame;
58
- receiveData(path: string, timeoutMs?: number): Promise<string>;
39
+ call(path: string, name: string, data: Record<string, unknown>): Promise<transport.MessageFromOneKey>;
40
+ receiveData(path: string): Promise<string>;
59
41
  release(path: string): Promise<void>;
60
- getProtocolType(path: string): ProtocolType | undefined;
61
42
  }
62
43
 
63
44
  declare global {
@@ -68,72 +49,35 @@ declare global {
68
49
  type BleAcquireInput = {
69
50
  uuid: string;
70
51
  forceCleanRunPromise?: boolean;
71
- expectedProtocol?: ProtocolType;
72
52
  };
73
53
  declare class ElectronBleTransport {
74
- private _messages;
75
- private _messagesV2;
54
+ _messages: ReturnType<typeof transport__default.parseConfigure> | undefined;
76
55
  name: string;
77
56
  configured: boolean;
78
- runPromise: Deferred<Uint8Array | string> | null;
57
+ runPromise: Deferred<any> | null;
79
58
  Log?: any;
80
59
  emitter?: EventEmitter;
81
60
  private connectedDevices;
82
- private deviceProtocol;
83
- private deviceProtocolHints;
84
- private v1Buffers;
85
- private v2Assemblers;
86
- private v2FrameQueues;
87
- private v2FramePromises;
88
- private activeProtocolV2Call;
89
- private nextProtocolV2CallToken;
61
+ private dataBuffers;
90
62
  private notificationCleanups;
91
63
  private disconnectCleanups;
92
- private notificationTokens;
93
- private nextNotificationToken;
94
64
  private handleBluetoothError;
95
65
  private cleanupDeviceState;
96
66
  init(logger: any, emitter?: EventEmitter): void;
97
67
  configure(signedData: any): void;
98
- configureProtocolV2(signedData: any): void;
99
- listen(): Promise<OneKeyDeviceInfo[]>;
100
- enumerate(): Promise<OneKeyDeviceInfo[]>;
68
+ listen(): void;
69
+ enumerate(): Promise<{
70
+ id: string;
71
+ name: string;
72
+ }[]>;
101
73
  acquire(input: BleAcquireInput): Promise<{
102
74
  uuid: string;
103
- commType: _onekeyfe_hd_transport.OneKeyDeviceCommType;
104
75
  path: string;
105
- session?: string | null | undefined;
106
- debugSession?: string | null | undefined;
107
- debug: boolean;
108
- id: string;
109
- name: string | null;
110
- protocolType?: ProtocolType | undefined;
111
76
  }>;
112
77
  release(id: string): Promise<void>;
113
- private createProtocolMismatchError;
114
- private createProtocolDetectionError;
115
- private clearProbeProtocol;
116
- private detectProtocol;
117
- private createNotificationSubscription;
118
- private resetProbeStateAfterProtocolProbe;
119
- private probeProtocolV1;
120
- private probeProtocolV2;
121
- private writeWithChunking;
122
- private writeWithRetry;
123
- private handleNotification;
124
- private handleProtocolV2Notification;
125
- private getProtocolV2FrameQueue;
126
- private resolveProtocolV2Frame;
127
- private rejectAllProtocolV2Frames;
128
- private resetProtocolV2Frames;
129
- private isActiveProtocolV2Call;
130
- private readProtocolV2Frame;
131
- private handleProtocolV1Notification;
132
- call(uuid: string, name: string, data: Record<string, unknown>, options?: TransportCallOptions): Promise<_onekeyfe_hd_transport.MessageFromOneKey>;
133
- private callProtocolV1;
134
- private callProtocolV2;
135
- private processProtocolV1Notification;
136
- getProtocolType(path: string): ProtocolType | undefined;
78
+ private handleNotificationData;
79
+ call(uuid: string, name: string, data: Record<string, unknown>): Promise<transport.MessageFromOneKey>;
80
+ private processNotificationPacket;
137
81
  }
138
82
 
139
83
  export { ElectronBleTransport, WebUsbTransport };