@onekeyfe/hd-transport-web-device 1.1.27-patch.1 → 1.2.0-alpha.0

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/__tests__/electron-ble-transport.test.ts +231 -0
  2. package/dist/electron-ble-transport.d.ts +50 -13
  3. package/dist/electron-ble-transport.d.ts.map +1 -1
  4. package/dist/index.d.ts +80 -17
  5. package/dist/index.js +927 -115
  6. package/dist/webusb.d.ts +29 -3
  7. package/dist/webusb.d.ts.map +1 -1
  8. package/package.json +5 -5
  9. package/src/electron-ble-transport.ts +612 -133
  10. package/src/webusb.ts +595 -47
package/dist/webusb.d.ts CHANGED
@@ -1,12 +1,22 @@
1
1
  /// <reference types="w3c-web-usb" />
2
2
  import transport from '@onekeyfe/hd-transport';
3
- import type { AcquireInput, OneKeyDeviceInfoBase } from '@onekeyfe/hd-transport';
3
+ import type { AcquireInput, OneKeyDeviceInfoBase, ProtocolType, TransportCallOptions } from '@onekeyfe/hd-transport';
4
4
  export interface DeviceInfo extends OneKeyDeviceInfoBase {
5
5
  path: string;
6
6
  device: USBDevice;
7
+ protocolType?: ProtocolType;
7
8
  }
8
9
  export default class WebUsbTransport {
9
10
  messages: ReturnType<typeof transport.parseConfigure> | undefined;
11
+ messagesV2: ReturnType<typeof transport.parseConfigure> | undefined;
12
+ private deviceProtocol;
13
+ private deviceProtocolHints;
14
+ private protocolV2Assemblers;
15
+ private protocolV2Sessions;
16
+ private protocolV2ReadTimeouts;
17
+ private deviceEndpoints;
18
+ private mockSerialPaths;
19
+ private mockSerialCounter;
10
20
  name: string;
11
21
  stopped: boolean;
12
22
  configured: boolean;
@@ -18,13 +28,21 @@ export default class WebUsbTransport {
18
28
  interfaceId: number;
19
29
  init(logger: any): void;
20
30
  configure(signedData: any): void;
31
+ configureProtocolV2(signedData: any): void;
21
32
  promptDeviceAccess(): Promise<USBDevice | null>;
22
33
  enumerate(): Promise<DeviceInfo[]>;
34
+ private getDevicePath;
23
35
  getConnectedDevices(): Promise<DeviceInfo[]>;
24
36
  acquire(input: AcquireInput): Promise<string | undefined>;
37
+ private createProtocolMismatchError;
38
+ private createProtocolDetectionError;
39
+ private detectProtocol;
25
40
  findDevice(path: string): Promise<USBDevice>;
26
41
  connect(path: string, first: boolean): Promise<void>;
42
+ private discoverEndpoints;
27
43
  connectToDevice(path: string, first: boolean): Promise<void>;
44
+ private closeOpenDevice;
45
+ private clearEndpointHalt;
28
46
  post(session: string, name: string, data: Record<string, unknown>): Promise<void>;
29
47
  private getErrorMessage;
30
48
  private isRetryablePacketIoError;
@@ -33,8 +51,16 @@ export default class WebUsbTransport {
33
51
  private toArrayBuffer;
34
52
  private transferOutWithRetry;
35
53
  private transferInWithRetry;
36
- call(path: string, name: string, data: Record<string, unknown>): Promise<import("@onekeyfe/hd-transport").MessageFromOneKey>;
37
- receiveData(path: string): Promise<string>;
54
+ private resetConnectionAfterProbe;
55
+ private withProtocolReadTimeout;
56
+ private probeProtocolV1;
57
+ private probeProtocolV2;
58
+ call(path: string, name: string, data: Record<string, unknown>, options?: TransportCallOptions): Promise<import("@onekeyfe/hd-transport").MessageFromOneKey>;
59
+ private callProtocolV1;
60
+ private callProtocolV2;
61
+ private receiveProtocolV2Frame;
62
+ receiveData(path: string, timeoutMs?: number): Promise<string>;
38
63
  release(path: string): Promise<void>;
64
+ getProtocolType(path: string): ProtocolType | undefined;
39
65
  }
40
66
  //# sourceMappingURL=webusb.d.ts.map
package/dist/webusb.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"webusb.d.ts","sourceRoot":"","sources":["../src/webusb.ts"],"names":[],"mappings":";AACA,OAAO,SAA8B,MAAM,wBAAwB,CAAC;AAIpE,OAAO,KAAK,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAejF,MAAM,WAAW,UAAW,SAAQ,oBAAoB;IACtD,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,SAAS,CAAC;CACnB;AAED,MAAM,CAAC,OAAO,OAAO,eAAe;IAClC,QAAQ,EAAE,UAAU,CAAC,OAAO,SAAS,CAAC,cAAc,CAAC,GAAG,SAAS,CAAC;IAElE,IAAI,SAAqB;IAEzB,OAAO,UAAS;IAEhB,UAAU,UAAS;IAEnB,GAAG,CAAC,EAAE,GAAG,CAAC;IAEV,GAAG,CAAC,EAAE,GAAG,CAAC;IAMV,UAAU,EAAE,KAAK,CAAC,UAAU,CAAC,CAAM;IAEnC,eAAe,SAAoB;IAEnC,UAAU,SAAe;IAEzB,WAAW,SAAgB;IAK3B,IAAI,CAAC,MAAM,EAAE,GAAG;IAgBhB,SAAS,CAAC,UAAU,EAAE,GAAG;IAWnB,kBAAkB;IAmBlB,SAAS;IAQT,mBAAmB;IAwBnB,OAAO,CAAC,KAAK,EAAE,YAAY;IAc3B,UAAU,CAAC,IAAI,EAAE,MAAM;IAwBvB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO;IAiBpC,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO;IAgB5C,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAIvE,OAAO,CAAC,eAAe;IAUvB,OAAO,CAAC,wBAAwB;YAalB,yBAAyB;IA+BvC,OAAO,CAAC,iBAAiB;IAUzB,OAAO,CAAC,aAAa;YASP,oBAAoB;YAkCpB,mBAAmB;IAkC3B,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAqC9D,WAAW,CAAC,IAAI,EAAE,MAAM;IA+BxB,OAAO,CAAC,IAAI,EAAE,MAAM;CAK3B"}
1
+ {"version":3,"file":"webusb.d.ts","sourceRoot":"","sources":["../src/webusb.ts"],"names":[],"mappings":";AACA,OAAO,SAWN,MAAM,wBAAwB,CAAC;AAIhC,OAAO,KAAK,EACV,YAAY,EACZ,oBAAoB,EACpB,YAAY,EACZ,oBAAoB,EACrB,MAAM,wBAAwB,CAAC;AAqChC,MAAM,WAAW,UAAW,SAAQ,oBAAoB;IACtD,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,SAAS,CAAC;IAClB,YAAY,CAAC,EAAE,YAAY,CAAC;CAC7B;AAaD,MAAM,CAAC,OAAO,OAAO,eAAe;IAClC,QAAQ,EAAE,UAAU,CAAC,OAAO,SAAS,CAAC,cAAc,CAAC,GAAG,SAAS,CAAC;IAGlE,UAAU,EAAE,UAAU,CAAC,OAAO,SAAS,CAAC,cAAc,CAAC,GAAG,SAAS,CAAC;IAGpE,OAAO,CAAC,cAAc,CAAwC;IAE9D,OAAO,CAAC,mBAAmB,CAAwC;IAGnE,OAAO,CAAC,oBAAoB,CAAoD;IAGhF,OAAO,CAAC,kBAAkB,CAA6C;IAGvE,OAAO,CAAC,sBAAsB,CAA8C;IAG5E,OAAO,CAAC,eAAe,CAA2C;IAOlE,OAAO,CAAC,eAAe,CAA6C;IAEpE,OAAO,CAAC,iBAAiB,CAAK;IAE9B,IAAI,SAAqB;IAEzB,OAAO,UAAS;IAEhB,UAAU,UAAS;IAEnB,GAAG,CAAC,EAAE,GAAG,CAAC;IAEV,GAAG,CAAC,EAAE,GAAG,CAAC;IAMV,UAAU,EAAE,KAAK,CAAC,UAAU,CAAC,CAAM;IAEnC,eAAe,SAAoB;IAEnC,UAAU,SAAe;IAEzB,WAAW,SAAgB;IAK3B,IAAI,CAAC,MAAM,EAAE,GAAG;IAgBhB,SAAS,CAAC,UAAU,EAAE,GAAG;IASzB,mBAAmB,CAAC,UAAU,EAAE,GAAG;IAY7B,kBAAkB;IAmBlB,SAAS;IASf,OAAO,CAAC,aAAa;IAmBf,mBAAmB;IAsCnB,OAAO,CAAC,KAAK,EAAE,YAAY;IA0BjC,OAAO,CAAC,2BAA2B;IAOnC,OAAO,CAAC,4BAA4B;YAOtB,cAAc;IA6CtB,UAAU,CAAC,IAAI,EAAE,MAAM;IAwBvB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO;IAkB1C,OAAO,CAAC,iBAAiB;IAiCnB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO;YA0CpC,eAAe;YAmBf,iBAAiB;IAezB,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAIvE,OAAO,CAAC,eAAe;IAUvB,OAAO,CAAC,wBAAwB;YAalB,yBAAyB;IAiCvC,OAAO,CAAC,iBAAiB;IAUzB,OAAO,CAAC,aAAa;YASP,oBAAoB;YAoCpB,mBAAmB;YA2CnB,yBAAyB;YAyBzB,uBAAuB;YAoCvB,eAAe;YAcf,eAAe;IAiBvB,IAAI,CACR,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,OAAO,CAAC,EAAE,oBAAoB;YAkClB,cAAc;YAkCd,cAAc;YA4Cd,sBAAsB;IA4C9B,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM;IAgD5C,OAAO,CAAC,IAAI,EAAE,MAAM;IAiB1B,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS;CAGxD"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@onekeyfe/hd-transport-web-device",
3
- "version": "1.1.27-patch.1",
3
+ "version": "1.2.0-alpha.0",
4
4
  "author": "OneKey",
5
5
  "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
6
6
  "license": "MIT",
@@ -20,13 +20,13 @@
20
20
  "lint:fix": "eslint . --fix"
21
21
  },
22
22
  "dependencies": {
23
- "@onekeyfe/hd-shared": "1.1.27-patch.1",
24
- "@onekeyfe/hd-transport": "1.1.27-patch.1"
23
+ "@onekeyfe/hd-shared": "1.2.0-alpha.0",
24
+ "@onekeyfe/hd-transport": "1.2.0-alpha.0"
25
25
  },
26
26
  "devDependencies": {
27
- "@onekeyfe/hd-transport-electron": "1.1.27-patch.1",
27
+ "@onekeyfe/hd-transport-electron": "1.2.0-alpha.0",
28
28
  "@types/w3c-web-usb": "^1.0.6",
29
29
  "@types/web-bluetooth": "^0.0.17"
30
30
  },
31
- "gitHead": "c7e514c9914c8faf5c0e74e1f7be4d87a015af8c"
31
+ "gitHead": "de9efe20b83666b641ab9e8d945e6350f6450904"
32
32
  }