@onekeyfe/hd-core 1.0.39-alpha.2 → 1.0.39-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 (14) hide show
  1. package/dist/data-manager/DataManager.d.ts.map +1 -1
  2. package/dist/data-manager/TransportManager.d.ts.map +1 -1
  3. package/dist/index.d.ts +2 -1
  4. package/dist/index.js +11 -1
  5. package/dist/types/settings.d.ts +1 -1
  6. package/dist/types/settings.d.ts.map +1 -1
  7. package/dist/utils/logger.d.ts +2 -0
  8. package/dist/utils/logger.d.ts.map +1 -1
  9. package/package.json +4 -4
  10. package/src/data/messages/messages.json +4 -0
  11. package/src/data-manager/DataManager.ts +1 -1
  12. package/src/data-manager/TransportManager.ts +3 -0
  13. package/src/types/settings.ts +3 -2
  14. package/src/utils/logger.ts +2 -0
package/dist/data-manager/DataManager.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"DataManager.d.ts","sourceRoot":"","sources":["../../src/data-manager/DataManager.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EACV,SAAS,EACT,eAAe,EACf,aAAa,EACb,QAAQ,EACR,wBAAwB,EACxB,qBAAqB,EACrB,gBAAgB,EAChB,aAAa,EAEd,MAAM,UAAU,CAAC;AAIlB,MAAM,MAAM,cAAc,GAAG,UAAU,GAAG,aAAa,GAAG,aAAa,CAAC;AAExE,MAAM,MAAM,cAAc,GAAG,QAAQ,GAAG,IAAI,CAAC;AAE7C,MAAM,CAAC,OAAO,OAAO,WAAW;IAC9B,MAAM,CAAC,SAAS,EAAE,aAAa,CAyB7B;IAEF,MAAM,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,CAAQ;IAEvC,MAAM,CAAC,QAAQ,EAAE,eAAe,CAAC;IAEjC,MAAM,CAAC,QAAQ,EAAE;SAAG,OAAO,IAAI,cAAc,GAAG,IAAI;KAAE,CAGpD;IAEF,MAAM,CAAC,kBAAkB,SAAK;IAE9B,MAAM,CAAC,iBAAiB,aAAc,QAAQ,KAAG,qBAAqB,CAiBpE;IAMF,MAAM,CAAC,4BAA4B,aAAc,QAAQ,oBAAoB,OAAO,wBAmBlF;IAMF,MAAM,CAAC,kBAAkB,aAAc,QAAQ,wBAc7C;IAEF,MAAM,CAAC,qBAAqB,aAAc,QAAQ,wBAkBhD;IAEF,MAAM,CAAC,0BAA0B,aAAc,QAAQ,KAAG,aAAa,GAAG,SAAS,CAYjF;IAEF,MAAM,CAAC,mCAAmC,aAAc,QAAQ,KAAG,aAAa,GAAG,SAAS,CAe1F;IAEF,MAAM,CAAC,oBAAoB,aAAc,QAAQ;;;QAsB/C;IAEF,MAAM,CAAC,wBAAwB,aAAc,QAAQ,yDAqBnD;IAEF,MAAM,CAAC,oBAAoB,aAAc,QAAQ,KAAG,wBAAwB,CAc1E;IAEF,MAAM,CAAC,uBAAuB,aAAc,QAAQ;;;QAalD;IAEF,MAAM,CAAC,2BAA2B,aAAc,QAAQ,4DAMtD;IAEF,MAAM,CAAC,kBAAkB,iBAAkB,MAAM,KAAG,gBAAgB,CAKlE;IAEF,MAAM,CAAC,kBAAkB;;;kBAAuC;WAEnD,IAAI,CAAC,QAAQ,EAAE,eAAe;IAiC3C,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,eAAe,CAAC,KAAK,CAAC;WAalC,kBAAkB;IAQ/B,MAAM,CAAC,mBAAmB,CAAC,cAAc,GAAE,cAAyB,GAAG,IAAI;IAI3E,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,SAAS,GAAG,eAAe;IAEpD,MAAM,CAAC,WAAW,CAAC,CAAC,SAAS,MAAM,eAAe,EAAE,GAAG,EAAE,CAAC,GAAG,eAAe,CAAC,CAAC,CAAC;IAU/E,MAAM,CAAC,YAAY,QAAS,eAAe,CAAC,KAAK,CAAC,aACH;IAE/C,MAAM,CAAC,eAAe,QAAS,eAAe,CAAC,KAAK,CAAC,aAAsB;CAC5E"}
1
+ {"version":3,"file":"DataManager.d.ts","sourceRoot":"","sources":["../../src/data-manager/DataManager.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EACV,SAAS,EACT,eAAe,EACf,aAAa,EACb,QAAQ,EACR,wBAAwB,EACxB,qBAAqB,EACrB,gBAAgB,EAChB,aAAa,EAEd,MAAM,UAAU,CAAC;AAIlB,MAAM,MAAM,cAAc,GAAG,UAAU,GAAG,aAAa,GAAG,aAAa,CAAC;AAExE,MAAM,MAAM,cAAc,GAAG,QAAQ,GAAG,IAAI,CAAC;AAE7C,MAAM,CAAC,OAAO,OAAO,WAAW;IAC9B,MAAM,CAAC,SAAS,EAAE,aAAa,CAyB7B;IAEF,MAAM,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,CAAQ;IAEvC,MAAM,CAAC,QAAQ,EAAE,eAAe,CAAC;IAEjC,MAAM,CAAC,QAAQ,EAAE;SAAG,OAAO,IAAI,cAAc,GAAG,IAAI;KAAE,CAGpD;IAEF,MAAM,CAAC,kBAAkB,SAAK;IAE9B,MAAM,CAAC,iBAAiB,aAAc,QAAQ,KAAG,qBAAqB,CAiBpE;IAMF,MAAM,CAAC,4BAA4B,aAAc,QAAQ,oBAAoB,OAAO,wBAmBlF;IAMF,MAAM,CAAC,kBAAkB,aAAc,QAAQ,wBAc7C;IAEF,MAAM,CAAC,qBAAqB,aAAc,QAAQ,wBAkBhD;IAEF,MAAM,CAAC,0BAA0B,aAAc,QAAQ,KAAG,aAAa,GAAG,SAAS,CAYjF;IAEF,MAAM,CAAC,mCAAmC,aAAc,QAAQ,KAAG,aAAa,GAAG,SAAS,CAe1F;IAEF,MAAM,CAAC,oBAAoB,aAAc,QAAQ;;;QAsB/C;IAEF,MAAM,CAAC,wBAAwB,aAAc,QAAQ,yDAqBnD;IAEF,MAAM,CAAC,oBAAoB,aAAc,QAAQ,KAAG,wBAAwB,CAc1E;IAEF,MAAM,CAAC,uBAAuB,aAAc,QAAQ;;;QAalD;IAEF,MAAM,CAAC,2BAA2B,aAAc,QAAQ,4DAMtD;IAEF,MAAM,CAAC,kBAAkB,iBAAkB,MAAM,KAAG,gBAAgB,CAKlE;IAEF,MAAM,CAAC,kBAAkB;;;kBAAuC;WAEnD,IAAI,CAAC,QAAQ,EAAE,eAAe;IAiC3C,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,eAAe,CAAC,KAAK,CAAC;WAalC,kBAAkB;IAQ/B,MAAM,CAAC,mBAAmB,CAAC,cAAc,GAAE,cAAyB,GAAG,IAAI;IAI3E,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,SAAS,GAAG,eAAe;IAEpD,MAAM,CAAC,WAAW,CAAC,CAAC,SAAS,MAAM,eAAe,EAAE,GAAG,EAAE,CAAC,GAAG,eAAe,CAAC,CAAC,CAAC;IAU/E,MAAM,CAAC,YAAY,QAAS,eAAe,CAAC,KAAK,CAAC,aAC0B;IAE5E,MAAM,CAAC,eAAe,QAAS,eAAe,CAAC,KAAK,CAAC,aAAsB;CAC5E"}
package/dist/data-manager/TransportManager.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"TransportManager.d.ts","sourceRoot":"","sources":["../../src/data-manager/TransportManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,6BAA6B,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAElF,OAAoB,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAK5D,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAYpC,MAAM,CAAC,OAAO,OAAO,gBAAgB;IACnC,MAAM,CAAC,SAAS,EAAE,SAAS,CAAC;IAE5B,MAAM,CAAC,eAAe,EAAE,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAEnD,MAAM,CAAC,eAAe,EAAE,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAEnD,MAAM,CAAC,eAAe,UAAS;IAE/B,MAAM,CAAC,cAAc,EAAE,cAAc,CAAY;IAEjD,MAAM,CAAC,MAAM,EAAE,6BAA6B,GAAG,IAAI,CAAQ;IAE3D,MAAM,CAAC,IAAI;WAOE,SAAS;WAiCT,WAAW,CAAC,QAAQ,CAAC,EAAE,QAAQ,GAAG,SAAS;IAsBxD,MAAM,CAAC,YAAY,CAAC,oBAAoB,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE,6BAA6B;IAqBrF,MAAM,CAAC,YAAY;IAInB,MAAM,CAAC,kBAAkB;IAIzB,MAAM,CAAC,kBAAkB;IAIzB,MAAM,CAAC,iBAAiB;CAGzB"}
1
+ {"version":3,"file":"TransportManager.d.ts","sourceRoot":"","sources":["../../src/data-manager/TransportManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,6BAA6B,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAElF,OAAoB,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAK5D,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAapC,MAAM,CAAC,OAAO,OAAO,gBAAgB;IACnC,MAAM,CAAC,SAAS,EAAE,SAAS,CAAC;IAE5B,MAAM,CAAC,eAAe,EAAE,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAEnD,MAAM,CAAC,eAAe,EAAE,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAEnD,MAAM,CAAC,eAAe,UAAS;IAE/B,MAAM,CAAC,cAAc,EAAE,cAAc,CAAY;IAEjD,MAAM,CAAC,MAAM,EAAE,6BAA6B,GAAG,IAAI,CAAQ;IAE3D,MAAM,CAAC,IAAI;WAOE,SAAS;WAmCT,WAAW,CAAC,QAAQ,CAAC,EAAE,QAAQ,GAAG,SAAS;IAsBxD,MAAM,CAAC,YAAY,CAAC,oBAAoB,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE,6BAA6B;IAqBrF,MAAM,CAAC,YAAY;IAInB,MAAM,CAAC,kBAAkB;IAIzB,MAAM,CAAC,kBAAkB;IAIzB,MAAM,CAAC,iBAAiB;CAGzB"}
package/dist/index.d.ts CHANGED
@@ -171,7 +171,7 @@ type ConnectSettings = {
171
171
  priority: number;
172
172
  trustedHost: boolean;
173
173
  supportedBrowser?: boolean;
174
- env: 'node' | 'web' | 'webextension' | 'electron' | 'react-native' | 'webusb' | 'lowlevel' | 'emulator';
174
+ env: 'node' | 'web' | 'webextension' | 'electron' | 'react-native' | 'webusb' | 'emulator' | 'desktop-web-ble' | 'lowlevel';
175
175
  timestamp: number;
176
176
  isFrame?: boolean;
177
177
  preRelease?: boolean;
@@ -3053,6 +3053,7 @@ declare enum LoggerNames {
3053
3053
  HdTransportHttp = "@onekey/hd-transport-http",
3054
3054
  HdTransportLowLevel = "@onekey/hd-transport-lowlevel",
3055
3055
  HdBleTransport = "@onekey/hd-ble-transport",
3056
+ HdWebBleTransport = "@onekey/hd-web-ble-transport",
3056
3057
  Connect = "@onekey/connect",
3057
3058
  Iframe = "IFrame",
3058
3059
  SendMessage = "[SendMessage]",
package/dist/index.js CHANGED
@@ -877,6 +877,7 @@ exports.LoggerNames = void 0;
877
877
  LoggerNames["HdTransportHttp"] = "@onekey/hd-transport-http";
878
878
  LoggerNames["HdTransportLowLevel"] = "@onekey/hd-transport-lowlevel";
879
879
  LoggerNames["HdBleTransport"] = "@onekey/hd-ble-transport";
880
+ LoggerNames["HdWebBleTransport"] = "@onekey/hd-web-ble-transport";
880
881
  LoggerNames["Connect"] = "@onekey/connect";
881
882
  LoggerNames["Iframe"] = "IFrame";
882
883
  LoggerNames["SendMessage"] = "[SendMessage]";
@@ -893,6 +894,7 @@ const LoggerMap = {
893
894
  [exports.LoggerNames.HdBleSdk]: initLog(exports.LoggerNames.HdBleSdk),
894
895
  [exports.LoggerNames.HdTransportHttp]: initLog(exports.LoggerNames.HdTransportHttp),
895
896
  [exports.LoggerNames.HdBleTransport]: initLog(exports.LoggerNames.HdBleTransport),
897
+ [exports.LoggerNames.HdWebBleTransport]: initLog(exports.LoggerNames.HdWebBleTransport),
896
898
  [exports.LoggerNames.HdTransportLowLevel]: initLog(exports.LoggerNames.HdTransportLowLevel),
897
899
  [exports.LoggerNames.Connect]: initLog(exports.LoggerNames.Connect),
898
900
  [exports.LoggerNames.Iframe]: initLog(exports.LoggerNames.Iframe),
@@ -7380,6 +7382,10 @@ var nested$1 = {
7380
7382
  passphrase_state: {
7381
7383
  type: "string",
7382
7384
  id: 8000
7385
+ },
7386
+ is_contains_attach: {
7387
+ type: "bool",
7388
+ id: 8001
7383
7389
  }
7384
7390
  }
7385
7391
  },
@@ -24963,7 +24969,7 @@ DataManager.getTransportStatus = (localVersion) => {
24963
24969
  return isLatest ? 'valid' : 'outdated';
24964
24970
  };
24965
24971
  DataManager.getBridgeChangelog = () => { var _b; return (_b = _a$1.assets) === null || _b === void 0 ? void 0 : _b.bridge.changelog; };
24966
- DataManager.isBleConnect = (env) => env === 'react-native' || env === 'lowlevel';
24972
+ DataManager.isBleConnect = (env) => env === 'react-native' || env === 'lowlevel' || env === 'desktop-web-ble';
24967
24973
  DataManager.isWebUsbConnect = (env) => env === 'webusb';
24968
24974
 
24969
24975
  const PROTOBUF_MESSAGE_CONFIG = {
@@ -26052,6 +26058,7 @@ const Log$c = getLogger(exports.LoggerNames.Transport);
26052
26058
  const BleLogger = getLogger(exports.LoggerNames.HdBleTransport);
26053
26059
  const HttpLogger = getLogger(exports.LoggerNames.HdTransportHttp);
26054
26060
  const LowLevelLogger = getLogger(exports.LoggerNames.HdTransportLowLevel);
26061
+ const WebBleLogger = getLogger(exports.LoggerNames.HdWebBleTransport);
26055
26062
  class TransportManager {
26056
26063
  static load() {
26057
26064
  Log$c.debug('transport manager load');
@@ -26079,6 +26086,9 @@ class TransportManager {
26079
26086
  }
26080
26087
  yield this.transport.init(LowLevelLogger, DevicePool.emitter, this.plugin);
26081
26088
  }
26089
+ else if (env === 'desktop-web-ble') {
26090
+ yield this.transport.init(WebBleLogger);
26091
+ }
26082
26092
  else {
26083
26093
  yield this.transport.init(HttpLogger);
26084
26094
  }
package/dist/types/settings.d.ts CHANGED
@@ -12,7 +12,7 @@ export type ConnectSettings = {
12
12
  priority: number;
13
13
  trustedHost: boolean;
14
14
  supportedBrowser?: boolean;
15
- env: 'node' | 'web' | 'webextension' | 'electron' | 'react-native' | 'webusb' | 'lowlevel' | 'emulator';
15
+ env: 'node' | 'web' | 'webextension' | 'electron' | 'react-native' | 'webusb' | 'emulator' | 'desktop-web-ble' | 'lowlevel';
16
16
  timestamp: number;
17
17
  isFrame?: boolean;
18
18
  preRelease?: boolean;
package/dist/types/settings.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"settings.d.ts","sourceRoot":"","sources":["../../src/types/settings.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"settings.d.ts","sourceRoot":"","sources":["../../src/types/settings.ts"],"names":[],"mappings":"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"}
package/dist/utils/logger.d.ts CHANGED
@@ -34,6 +34,7 @@ export declare enum LoggerNames {
34
34
  HdTransportHttp = "@onekey/hd-transport-http",
35
35
  HdTransportLowLevel = "@onekey/hd-transport-lowlevel",
36
36
  HdBleTransport = "@onekey/hd-ble-transport",
37
+ HdWebBleTransport = "@onekey/hd-web-ble-transport",
37
38
  Connect = "@onekey/connect",
38
39
  Iframe = "IFrame",
39
40
  SendMessage = "[SendMessage]",
@@ -50,6 +51,7 @@ export declare const LoggerMap: {
50
51
  "@onekey/hd-ble-sdk": Log;
51
52
  "@onekey/hd-transport-http": Log;
52
53
  "@onekey/hd-ble-transport": Log;
54
+ "@onekey/hd-web-ble-transport": Log;
53
55
  "@onekey/hd-transport-lowlevel": Log;
54
56
  "@onekey/connect": Log;
55
57
  IFrame: Log;
package/dist/utils/logger.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/utils/logger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAGxC,KAAK,UAAU,GAAG;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,GAAG,EAAE,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAMF,cAAM,GAAG;IACP,MAAM,EAAE,MAAM,CAAC;IAEf,OAAO,EAAE,OAAO,CAAC;IAEjB,QAAQ,EAAE,UAAU,EAAE,CAAC;gBAEX,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO;IAM5C,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE;IAYxD,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;IASlB,KAAK,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;IASpB,IAAI,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;IASnB,KAAK,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;CAQrB;AAID,eAAO,MAAM,OAAO,WAAY,MAAM,YAAY,OAAO,QAIxD,CAAC;AAEF,eAAO,MAAM,SAAS,aAAc,OAAO,SAI1C,CAAC;AAEF,eAAO,MAAM,iBAAiB,WAAY,MAAM,WAAW,OAAO,SAIjE,CAAC;AAEF,eAAO,MAAM,MAAM,oBAOlB,CAAC;AAEF,eAAO,MAAM,oBAAoB,4BAA6B,WAAW,KAAK,IAAI,SAEjF,CAAC;AAuCF,oBAAY,WAAW;IACrB,IAAI,oBAAoB;IACxB,SAAS,cAAc;IACvB,MAAM,WAAW;IACjB,cAAc,mBAAmB;IACjC,eAAe,oBAAoB;IACnC,UAAU,eAAe;IACzB,UAAU,eAAe;IACzB,kBAAkB,+BAA+B;IACjD,QAAQ,uBAAuB;IAC/B,eAAe,8BAA8B;IAC7C,mBAAmB,kCAAkC;IACrD,cAAc,6BAA6B;IAC3C,OAAO,oBAAoB;IAC3B,MAAM,WAAW;IACjB,WAAW,kBAAkB;IAC7B,MAAM,aAAa;CACpB;AAED,eAAO,MAAM,SAAS;;;;;;;;;;;;;;;;;CAiBrB,CAAC;AAEF,eAAO,MAAM,SAAS,QAAS,WAAW,QAAmB,CAAC"}
1
+ {"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/utils/logger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAGxC,KAAK,UAAU,GAAG;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,GAAG,EAAE,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAMF,cAAM,GAAG;IACP,MAAM,EAAE,MAAM,CAAC;IAEf,OAAO,EAAE,OAAO,CAAC;IAEjB,QAAQ,EAAE,UAAU,EAAE,CAAC;gBAEX,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO;IAM5C,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE;IAYxD,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;IASlB,KAAK,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;IASpB,IAAI,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;IASnB,KAAK,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;CAQrB;AAID,eAAO,MAAM,OAAO,WAAY,MAAM,YAAY,OAAO,QAIxD,CAAC;AAEF,eAAO,MAAM,SAAS,aAAc,OAAO,SAI1C,CAAC;AAEF,eAAO,MAAM,iBAAiB,WAAY,MAAM,WAAW,OAAO,SAIjE,CAAC;AAEF,eAAO,MAAM,MAAM,oBAOlB,CAAC;AAEF,eAAO,MAAM,oBAAoB,4BAA6B,WAAW,KAAK,IAAI,SAEjF,CAAC;AAuCF,oBAAY,WAAW;IACrB,IAAI,oBAAoB;IACxB,SAAS,cAAc;IACvB,MAAM,WAAW;IACjB,cAAc,mBAAmB;IACjC,eAAe,oBAAoB;IACnC,UAAU,eAAe;IACzB,UAAU,eAAe;IACzB,kBAAkB,+BAA+B;IACjD,QAAQ,uBAAuB;IAC/B,eAAe,8BAA8B;IAC7C,mBAAmB,kCAAkC;IACrD,cAAc,6BAA6B;IAC3C,iBAAiB,iCAAiC;IAClD,OAAO,oBAAoB;IAC3B,MAAM,WAAW;IACjB,WAAW,kBAAkB;IAC7B,MAAM,aAAa;CACpB;AAED,eAAO,MAAM,SAAS;;;;;;;;;;;;;;;;;;CAkBrB,CAAC;AAEF,eAAO,MAAM,SAAS,QAAS,WAAW,QAAmB,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@onekeyfe/hd-core",
3
- "version": "1.0.39-alpha.2",
3
+ "version": "1.0.39-alpha.5",
4
4
  "description": "> TODO: description",
5
5
  "author": "OneKey",
6
6
  "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
@@ -25,8 +25,8 @@
25
25
  "url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
26
26
  },
27
27
  "dependencies": {
28
- "@onekeyfe/hd-shared": "^1.0.39-alpha.2",
29
- "@onekeyfe/hd-transport": "^1.0.39-alpha.2",
28
+ "@onekeyfe/hd-shared": "^1.0.39-alpha.5",
29
+ "@onekeyfe/hd-transport": "^1.0.39-alpha.5",
30
30
  "axios": "^0.27.2",
31
31
  "bignumber.js": "^9.0.2",
32
32
  "bytebuffer": "^5.0.1",
@@ -46,5 +46,5 @@
46
46
  "@types/web-bluetooth": "^0.0.21",
47
47
  "ripple-keypairs": "^1.1.4"
48
48
  },
49
- "gitHead": "d821f1adbd5a8539cc08a87afdc58f11d031cf8c"
49
+ "gitHead": "6c62185f4a620a760ee67a648003c7c1ee828d19"
50
50
  }
package/src/data/messages/messages.json CHANGED
@@ -6064,6 +6064,10 @@
6064
6064
  "passphrase_state": {
6065
6065
  "type": "string",
6066
6066
  "id": 8000
6067
+ },
6068
+ "is_contains_attach": {
6069
+ "type": "bool",
6070
+ "id": 8001
6067
6071
  }
6068
6072
  }
6069
6073
  },
package/src/data-manager/DataManager.ts CHANGED
@@ -349,7 +349,7 @@ export default class DataManager {
349
349
  }
350
350
 
351
351
  static isBleConnect = (env: ConnectSettings['env']) =>
352
- env === 'react-native' || env === 'lowlevel';
352
+ env === 'react-native' || env === 'lowlevel' || env === 'desktop-web-ble';
353
353
 
354
354
  static isWebUsbConnect = (env: ConnectSettings['env']) => env === 'webusb';
355
355
  }
package/src/data-manager/TransportManager.ts CHANGED
@@ -11,6 +11,7 @@ const Log = getLogger(LoggerNames.Transport);
11
11
  const BleLogger = getLogger(LoggerNames.HdBleTransport);
12
12
  const HttpLogger = getLogger(LoggerNames.HdTransportHttp);
13
13
  const LowLevelLogger = getLogger(LoggerNames.HdTransportLowLevel);
14
+ const WebBleLogger = getLogger(LoggerNames.HdWebBleTransport);
14
15
 
15
16
  /**
16
17
  * transport 在同一个环境中只会存在一个
@@ -56,6 +57,8 @@ export default class TransportManager {
56
57
  );
57
58
  }
58
59
  await this.transport.init(LowLevelLogger, DevicePool.emitter, this.plugin);
60
+ } else if (env === 'desktop-web-ble') {
61
+ await this.transport.init(WebBleLogger);
59
62
  } else {
60
63
  await this.transport.init(HttpLogger);
61
64
  }
package/src/types/settings.ts CHANGED
@@ -21,8 +21,9 @@ export type ConnectSettings = {
21
21
  | 'electron'
22
22
  | 'react-native'
23
23
  | 'webusb'
24
- | 'lowlevel'
25
- | 'emulator';
24
+ | 'emulator'
25
+ | 'desktop-web-ble'
26
+ | 'lowlevel';
26
27
  timestamp: number;
27
28
  isFrame?: boolean;
28
29
  preRelease?: boolean;
package/src/utils/logger.ts CHANGED
@@ -157,6 +157,7 @@ export enum LoggerNames {
157
157
  HdTransportHttp = '@onekey/hd-transport-http',
158
158
  HdTransportLowLevel = '@onekey/hd-transport-lowlevel',
159
159
  HdBleTransport = '@onekey/hd-ble-transport',
160
+ HdWebBleTransport = '@onekey/hd-web-ble-transport',
160
161
  Connect = '@onekey/connect',
161
162
  Iframe = 'IFrame',
162
163
  SendMessage = '[SendMessage]',
@@ -174,6 +175,7 @@ export const LoggerMap = {
174
175
  [LoggerNames.HdBleSdk]: initLog(LoggerNames.HdBleSdk),
175
176
  [LoggerNames.HdTransportHttp]: initLog(LoggerNames.HdTransportHttp),
176
177
  [LoggerNames.HdBleTransport]: initLog(LoggerNames.HdBleTransport),
178
+ [LoggerNames.HdWebBleTransport]: initLog(LoggerNames.HdWebBleTransport),
177
179
  [LoggerNames.HdTransportLowLevel]: initLog(LoggerNames.HdTransportLowLevel),
178
180
  [LoggerNames.Connect]: initLog(LoggerNames.Connect),
179
181
  [LoggerNames.Iframe]: initLog(LoggerNames.Iframe),