@onekeyfe/hd-core 0.1.12 → 0.1.16
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.
- package/dist/api/CheckBridgeStatus.d.ts.map +1 -1
- package/dist/api/GetLogs.d.ts +11 -0
- package/dist/api/GetLogs.d.ts.map +1 -0
- package/dist/api/index.d.ts +1 -0
- package/dist/api/index.d.ts.map +1 -1
- package/dist/core/index.d.ts.map +1 -1
- package/dist/data/config.d.ts +2 -0
- package/dist/data/config.d.ts.map +1 -0
- package/dist/data-manager/TransportManager.d.ts.map +1 -1
- package/dist/device/Device.d.ts.map +1 -1
- package/dist/device/DeviceCommands.d.ts.map +1 -1
- package/dist/events/core.d.ts +2 -1
- package/dist/events/core.d.ts.map +1 -1
- package/dist/events/index.d.ts +1 -0
- package/dist/events/index.d.ts.map +1 -1
- package/dist/events/log.d.ts +15 -0
- package/dist/events/log.d.ts.map +1 -0
- package/dist/index.d.ts +56 -23
- package/dist/index.js +500 -382
- package/dist/inject.d.ts.map +1 -1
- package/dist/types/api/getLogs.d.ts +3 -0
- package/dist/types/api/getLogs.d.ts.map +1 -0
- package/dist/types/api/index.d.ts +2 -0
- package/dist/types/api/index.d.ts.map +1 -1
- package/dist/utils/deviceFeaturesUtils.d.ts.map +1 -1
- package/dist/utils/index.d.ts +1 -2
- package/dist/utils/index.d.ts.map +1 -1
- package/dist/utils/logger.d.ts +33 -1
- package/dist/utils/logger.d.ts.map +1 -1
- package/package.json +4 -4
- package/src/api/CheckBridgeStatus.ts +10 -2
- package/src/api/FirmwareUpdate.ts +1 -1
- package/src/api/GetLogs.ts +13 -0
- package/src/api/device/DeviceVerify.ts +1 -1
- package/src/api/index.ts +2 -0
- package/src/core/index.ts +10 -8
- package/src/data/config.ts +1 -0
- package/src/data-manager/TransportManager.ts +11 -6
- package/src/data-manager/connectSettings.ts +2 -2
- package/src/device/Device.ts +2 -2
- package/src/device/DeviceCommands.ts +23 -9
- package/src/device/DeviceConnector.ts +3 -3
- package/src/device/DeviceList.ts +3 -3
- package/src/events/core.ts +2 -0
- package/src/events/index.ts +1 -0
- package/src/events/log.ts +23 -0
- package/src/inject.ts +2 -0
- package/src/types/api/getLogs.ts +3 -0
- package/src/types/api/index.ts +2 -0
- package/src/utils/deviceFeaturesUtils.ts +2 -10
- package/src/utils/index.ts +1 -3
- package/src/utils/logger.ts +96 -30
- package/dist/data/version.d.ts +0 -3
- package/dist/data/version.d.ts.map +0 -1
- package/src/data/version.ts +0 -3
package/dist/inject.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inject.d.ts","sourceRoot":"","sources":["../src/inject.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEtC,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,UAAU,CAAC;IACjB,YAAY,EAAE,YAAY,CAAC;IAC3B,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IACtB,OAAO,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;IAC5B,UAAU,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;IAClC,MAAM,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;CAC3B;AAED,eAAO,MAAM,MAAM,+DAOhB,SAAS,KAAG,
|
|
1
|
+
{"version":3,"file":"inject.d.ts","sourceRoot":"","sources":["../src/inject.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEtC,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,UAAU,CAAC;IACjB,YAAY,EAAE,YAAY,CAAC;IAC3B,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IACtB,OAAO,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;IAC5B,UAAU,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;IAClC,MAAM,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;CAC3B;AAED,eAAO,MAAM,MAAM,+DAOhB,SAAS,KAAG,OAsHd,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"getLogs.d.ts","sourceRoot":"","sources":["../../../src/types/api/getLogs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAE1C,MAAM,CAAC,OAAO,UAAU,OAAO,IAAI,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC"}
|
|
@@ -42,6 +42,7 @@ import { stellarGetAddress } from './stellarGetAddress';
|
|
|
42
42
|
import { stellarSignTransaction } from './stellarSignTransaction';
|
|
43
43
|
import { cipherKeyValue } from './cipherKeyValue';
|
|
44
44
|
import { firmwareUpdate } from './firmwareUpdate';
|
|
45
|
+
import { getLogs } from './getLogs';
|
|
45
46
|
export * from './export';
|
|
46
47
|
export declare type CoreApi = {
|
|
47
48
|
init: typeof init;
|
|
@@ -52,6 +53,7 @@ export declare type CoreApi = {
|
|
|
52
53
|
call: (params: any) => Promise<any>;
|
|
53
54
|
uiResponse: typeof uiResponse;
|
|
54
55
|
cancel: (connectId?: string) => void;
|
|
56
|
+
getLogs: typeof getLogs;
|
|
55
57
|
searchDevices: typeof searchDevices;
|
|
56
58
|
getFeatures: typeof getFeatures;
|
|
57
59
|
checkFirmwareRelease: typeof checkFirmwareRelease;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/types/api/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,GAAG,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/types/api/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,GAAG,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,cAAc,UAAU,CAAC;AAEzB,oBAAY,OAAO,GAAG;IAIpB,IAAI,EAAE,OAAO,IAAI,CAAC;IAClB,EAAE,EAAE,OAAO,EAAE,CAAC;IACd,GAAG,EAAE,OAAO,GAAG,CAAC;IAChB,kBAAkB,EAAE,OAAO,kBAAkB,CAAC;IAC9C,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,IAAI,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IACpC,UAAU,EAAE,OAAO,UAAU,CAAC;IAC9B,MAAM,EAAE,CAAC,SAAS,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IACrC,OAAO,EAAE,OAAO,OAAO,CAAC;IAKxB,aAAa,EAAE,OAAO,aAAa,CAAC;IAEpC,WAAW,EAAE,OAAO,WAAW,CAAC;IAEhC,oBAAoB,EAAE,OAAO,oBAAoB,CAAC;IAElD,uBAAuB,EAAE,OAAO,uBAAuB,CAAC;IAExD,qBAAqB,EAAE,OAAO,qBAAqB,CAAC;IAEpD,iBAAiB,EAAE,OAAO,iBAAiB,CAAC;IAE5C,cAAc,EAAE,OAAO,cAAc,CAAC;IAEtC,YAAY,EAAE,OAAO,YAAY,CAAC;IAClC,eAAe,EAAE,OAAO,eAAe,CAAC;IACxC,WAAW,EAAE,OAAO,WAAW,CAAC;IAChC,wBAAwB,EAAE,OAAO,wBAAwB,CAAC;IAC1D,cAAc,EAAE,OAAO,cAAc,CAAC;IACtC,WAAW,EAAE,OAAO,WAAW,CAAC;IAChC,cAAc,EAAE,OAAO,cAAc,CAAC;IACtC,kBAAkB,EAAE,OAAO,kBAAkB,CAAC;IAC9C,YAAY,EAAE,OAAO,YAAY,CAAC;IAClC,UAAU,EAAE,OAAO,UAAU,CAAC;IAE9B,aAAa,EAAE,OAAO,aAAa,CAAC;IACpC,eAAe,EAAE,OAAO,eAAe,CAAC;IACxC,cAAc,EAAE,OAAO,cAAc,CAAC;IACtC,oBAAoB,EAAE,OAAO,oBAAoB,CAAC;IAClD,kBAAkB,EAAE,OAAO,kBAAkB,CAAC;IAC9C,gBAAgB,EAAE,OAAO,gBAAgB,CAAC;IAC1C,gBAAgB,EAAE,OAAO,gBAAgB,CAAC;IAE1C,aAAa,EAAE,OAAO,aAAa,CAAC;IACpC,eAAe,EAAE,OAAO,eAAe,CAAC;IACxC,cAAc,EAAE,OAAO,cAAc,CAAC;IACtC,kBAAkB,EAAE,OAAO,kBAAkB,CAAC;IAC9C,gBAAgB,EAAE,OAAO,gBAAgB,CAAC;IAE1C,kBAAkB,EAAE,OAAO,kBAAkB,CAAC;IAC9C,oBAAoB,EAAE,OAAO,oBAAoB,CAAC;IAClD,mBAAmB,EAAE,OAAO,mBAAmB,CAAC;IAChD,uBAAuB,EAAE,OAAO,uBAAuB,CAAC;IACxD,qBAAqB,EAAE,OAAO,qBAAqB,CAAC;IAEpD,aAAa,EAAE,OAAO,aAAa,CAAC;IACpC,kBAAkB,EAAE,OAAO,kBAAkB,CAAC;IAE9C,aAAa,EAAE,OAAO,aAAa,CAAC;IACpC,kBAAkB,EAAE,OAAO,kBAAkB,CAAC;IAE9C,iBAAiB,EAAE,OAAO,iBAAiB,CAAC;IAC5C,sBAAsB,EAAE,OAAO,sBAAsB,CAAC;IAEtD,cAAc,EAAE,OAAO,cAAc,CAAC;CACvC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deviceFeaturesUtils.d.ts","sourceRoot":"","sources":["../../src/utils/deviceFeaturesUtils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,aAAa,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAEnF,eAAO,MAAM,cAAc,4EAA0B,YAUpD,CAAC;AAEF,eAAO,MAAM,aAAa,4EAA0B,WAUnD,CAAC;AAEF,eAAO,MAAM,yBAAyB,4EAA0B,
|
|
1
|
+
{"version":3,"file":"deviceFeaturesUtils.d.ts","sourceRoot":"","sources":["../../src/utils/deviceFeaturesUtils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,aAAa,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAEnF,eAAO,MAAM,cAAc,4EAA0B,YAUpD,CAAC;AAEF,eAAO,MAAM,aAAa,4EAA0B,WAUnD,CAAC;AAEF,eAAO,MAAM,yBAAyB,4EAA0B,WACvC,CAAC;AAE1B,eAAO,MAAM,sBAAsB,iCAAoB,WAAW,GAAG,IAKpE,CAAC;AAEF,eAAO,MAAM,uBAAuB,qCAAwB,WAQ3D,CAAC;AAEF,eAAO,MAAM,aAAa,aAAc,QAAQ,WAM/C,CAAC;AAEF,eAAO,MAAM,cAAc,aAAc,QAAQ,WAOhD,CAAC;AAKF,eAAO,MAAM,wBAAwB,aAAc,QAAQ,GAAG,SAAS,kBAOtE,CAAC;AAKF,eAAO,MAAM,2BAA2B,aAAc,QAAQ,KAAG,aAAa,GAAG,IAKhF,CAAC"}
|
package/dist/utils/index.d.ts
CHANGED
|
@@ -1,8 +1,7 @@
|
|
|
1
|
-
import { initLog, enableLog } from './logger';
|
|
2
1
|
export * from './assets';
|
|
3
2
|
export * from './versionUtils';
|
|
4
3
|
export * from './patch';
|
|
5
4
|
export { getDeviceType, getDeviceTypeByBleName, getDeviceTypeByDeviceId, getDeviceUUID, getDeviceLabel, } from './deviceFeaturesUtils';
|
|
6
5
|
export { getHDPath, getScriptType } from '../api/helpers/pathUtils';
|
|
7
|
-
export {
|
|
6
|
+
export { getLogger, enableLog, LoggerNames, getLog, setLoggerPostMessage } from './logger';
|
|
8
7
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAC;AACzB,cAAc,gBAAgB,CAAC;AAC/B,cAAc,SAAS,CAAC;AACxB,OAAO,EACL,aAAa,EACb,sBAAsB,EACtB,uBAAuB,EACvB,aAAa,EACb,cAAc,GACf,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAEpE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC"}
|
package/dist/utils/logger.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { CoreMessage } from '../events';
|
|
1
2
|
declare type LogMessage = {
|
|
2
3
|
level: string;
|
|
3
4
|
prefix: string;
|
|
@@ -7,7 +8,6 @@ declare type LogMessage = {
|
|
|
7
8
|
declare class Log {
|
|
8
9
|
prefix: string;
|
|
9
10
|
enabled: boolean;
|
|
10
|
-
css: string;
|
|
11
11
|
messages: LogMessage[];
|
|
12
12
|
constructor(prefix: string, enabled: boolean);
|
|
13
13
|
addMessage(level: string, prefix: string, ...args: any[]): void;
|
|
@@ -20,5 +20,37 @@ export declare const initLog: (prefix: string, enabled?: boolean | undefined) =>
|
|
|
20
20
|
export declare const enableLog: (enabled?: boolean | undefined) => void;
|
|
21
21
|
export declare const enableLogByPrefix: (prefix: string, enabled: boolean) => void;
|
|
22
22
|
export declare const getLog: () => LogMessage[];
|
|
23
|
+
export declare const setLoggerPostMessage: (postMessageFn: (message: CoreMessage) => void) => void;
|
|
24
|
+
export declare enum LoggerNames {
|
|
25
|
+
Core = "Core",
|
|
26
|
+
Transport = "Transport",
|
|
27
|
+
Device = "Device",
|
|
28
|
+
DeviceCommands = "DeviceCommands",
|
|
29
|
+
DeviceConnector = "DeviceConnector",
|
|
30
|
+
DeviceList = "DeviceList",
|
|
31
|
+
HdBleSdk = "@onekey/hd-ble-sdk",
|
|
32
|
+
HdTransportHttp = "@onekey/hd-transport-http",
|
|
33
|
+
HdBleTransport = "@onekey/hd-ble-transport",
|
|
34
|
+
Connect = "@onekey/connect",
|
|
35
|
+
Iframe = "IFrame",
|
|
36
|
+
SendMessage = "[SendMessage]",
|
|
37
|
+
Method = "[Method]"
|
|
38
|
+
}
|
|
39
|
+
export declare const LoggerMap: {
|
|
40
|
+
Core: Log;
|
|
41
|
+
Transport: Log;
|
|
42
|
+
Device: Log;
|
|
43
|
+
DeviceCommands: Log;
|
|
44
|
+
DeviceConnector: Log;
|
|
45
|
+
DeviceList: Log;
|
|
46
|
+
"@onekey/hd-ble-sdk": Log;
|
|
47
|
+
"@onekey/hd-transport-http": Log;
|
|
48
|
+
"@onekey/hd-ble-transport": Log;
|
|
49
|
+
"@onekey/connect": Log;
|
|
50
|
+
IFrame: Log;
|
|
51
|
+
"[SendMessage]": Log;
|
|
52
|
+
"[Method]": Log;
|
|
53
|
+
};
|
|
54
|
+
export declare const getLogger: (key: LoggerNames) => Log;
|
|
23
55
|
export {};
|
|
24
56
|
//# sourceMappingURL=logger.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/utils/logger.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/utils/logger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAGxC,aAAK,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,uCAIrC,CAAC;AAEF,eAAO,MAAM,SAAS,yCAIrB,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,SAAS;IACb,SAAS,cAAc;IACvB,MAAM,WAAW;IACjB,cAAc,mBAAmB;IACjC,eAAe,oBAAoB;IACnC,UAAU,eAAe;IACzB,QAAQ,uBAAuB;IAC/B,eAAe,8BAA8B;IAC7C,cAAc,6BAA6B;IAC3C,OAAO,oBAAoB;IAC3B,MAAM,WAAW;IACjB,WAAW,kBAAkB;IAC7B,MAAM,aAAa;CACpB;AAED,eAAO,MAAM,SAAS;;;;;;;;;;;;;;CAcrB,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": "0.1.
|
|
3
|
+
"version": "0.1.16",
|
|
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": "^0.1.
|
|
29
|
-
"@onekeyfe/hd-transport": "^0.1.
|
|
28
|
+
"@onekeyfe/hd-shared": "^0.1.16",
|
|
29
|
+
"@onekeyfe/hd-transport": "^0.1.16",
|
|
30
30
|
"axios": "^0.27.2",
|
|
31
31
|
"bignumber.js": "^9.0.2",
|
|
32
32
|
"js-sha256": "^0.9.0",
|
|
@@ -37,5 +37,5 @@
|
|
|
37
37
|
"@types/parse-uri": "^1.0.0",
|
|
38
38
|
"@types/semver": "^7.3.9"
|
|
39
39
|
},
|
|
40
|
-
"gitHead": "
|
|
40
|
+
"gitHead": "e87fdbab30d6daa4f32e28259bd221d75b5d6aad"
|
|
41
41
|
}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import axios from 'axios';
|
|
2
|
+
import { ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
|
|
2
3
|
import { BaseMethod } from './BaseMethod';
|
|
3
4
|
|
|
4
5
|
export default class CheckBridgeStatus extends BaseMethod {
|
|
@@ -7,15 +8,22 @@ export default class CheckBridgeStatus extends BaseMethod {
|
|
|
7
8
|
}
|
|
8
9
|
|
|
9
10
|
async run() {
|
|
10
|
-
return new Promise<boolean>(resolve => {
|
|
11
|
+
return new Promise<boolean>((resolve, reject) => {
|
|
11
12
|
axios
|
|
12
13
|
.request({
|
|
13
14
|
url: 'http://localhost:21320',
|
|
14
15
|
method: 'POST',
|
|
15
16
|
withCredentials: false,
|
|
17
|
+
timeout: 3000,
|
|
16
18
|
})
|
|
17
19
|
.then(() => resolve(true))
|
|
18
|
-
.catch(
|
|
20
|
+
.catch(e => {
|
|
21
|
+
if (e.code === 'ECONNABORTED') {
|
|
22
|
+
reject(ERRORS.TypedError(HardwareErrorCode.BridgeTimeoutError));
|
|
23
|
+
} else {
|
|
24
|
+
resolve(false);
|
|
25
|
+
}
|
|
26
|
+
});
|
|
19
27
|
});
|
|
20
28
|
}
|
|
21
29
|
}
|
|
@@ -70,7 +70,7 @@ export default class FirmwareUpdate extends BaseMethod<Params> {
|
|
|
70
70
|
binary = firmware.binary;
|
|
71
71
|
}
|
|
72
72
|
} catch (err) {
|
|
73
|
-
throw ERRORS.TypedError(HardwareErrorCode.FirmwareUpdateDownloadFailed, err);
|
|
73
|
+
throw ERRORS.TypedError(HardwareErrorCode.FirmwareUpdateDownloadFailed, err.message ?? err);
|
|
74
74
|
}
|
|
75
75
|
|
|
76
76
|
return uploadFirmware(
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import { BaseMethod } from './BaseMethod';
|
|
2
|
+
import { getLog } from '../utils';
|
|
3
|
+
|
|
4
|
+
export default class CheckBridgeStatus extends BaseMethod {
|
|
5
|
+
init() {
|
|
6
|
+
this.useDevice = false;
|
|
7
|
+
}
|
|
8
|
+
|
|
9
|
+
async run() {
|
|
10
|
+
const logs = getLog();
|
|
11
|
+
return Promise.resolve(logs);
|
|
12
|
+
}
|
|
13
|
+
}
|
|
@@ -33,7 +33,7 @@ export default class DeviceVerify extends BaseMethod<BixinVerifyDeviceRequest> {
|
|
|
33
33
|
}
|
|
34
34
|
);
|
|
35
35
|
response = res.message;
|
|
36
|
-
} else
|
|
36
|
+
} else {
|
|
37
37
|
const signatureRes = await this.device.commands.typedCall(
|
|
38
38
|
'SESignMessage',
|
|
39
39
|
'SEMessageSignature',
|
package/src/api/index.ts
CHANGED
|
@@ -43,3 +43,5 @@ export { default as stellarGetAddress } from './stellar/StellarGetAddress';
|
|
|
43
43
|
export { default as stellarSignTransaction } from './stellar/StellarSignTransaction';
|
|
44
44
|
|
|
45
45
|
export { default as firmwareUpdate } from './FirmwareUpdate';
|
|
46
|
+
|
|
47
|
+
export { default as getLogs } from './GetLogs';
|
package/src/core/index.ts
CHANGED
|
@@ -6,8 +6,7 @@ import { Device, DeviceEvents } from '../device/Device';
|
|
|
6
6
|
import { DeviceList } from '../device/DeviceList';
|
|
7
7
|
import { findMethod } from '../api/utils';
|
|
8
8
|
import { DataManager } from '../data-manager';
|
|
9
|
-
import { enableLog } from '../utils
|
|
10
|
-
import { initLog } from '../utils';
|
|
9
|
+
import { enableLog, getLogger, LoggerNames, setLoggerPostMessage } from '../utils';
|
|
11
10
|
import {
|
|
12
11
|
CoreMessage,
|
|
13
12
|
createResponseMessage,
|
|
@@ -32,7 +31,7 @@ import {
|
|
|
32
31
|
getDeviceType,
|
|
33
32
|
} from '../utils/deviceFeaturesUtils';
|
|
34
33
|
|
|
35
|
-
const Log =
|
|
34
|
+
const Log = getLogger(LoggerNames.Core);
|
|
36
35
|
|
|
37
36
|
let _core: Core;
|
|
38
37
|
let _deviceList: DeviceList | undefined;
|
|
@@ -91,7 +90,7 @@ export const callAPI = async (message: CoreMessage) => {
|
|
|
91
90
|
return Promise.reject(error);
|
|
92
91
|
}
|
|
93
92
|
|
|
94
|
-
Log.debug('Call API - setDevice: ', device);
|
|
93
|
+
Log.debug('Call API - setDevice: ', device.mainId);
|
|
95
94
|
method.setDevice?.(device);
|
|
96
95
|
|
|
97
96
|
device.on(DEVICE.PIN, onDevicePinHandler);
|
|
@@ -162,7 +161,7 @@ export const callAPI = async (message: CoreMessage) => {
|
|
|
162
161
|
|
|
163
162
|
try {
|
|
164
163
|
const response: object = await method.run();
|
|
165
|
-
Log.debug('Call API - Inner Method Run: '
|
|
164
|
+
Log.debug('Call API - Inner Method Run: ');
|
|
166
165
|
messageResponse = createResponseMessage(method.responseID, true, response);
|
|
167
166
|
_callPromise?.resolve(messageResponse);
|
|
168
167
|
} catch (error) {
|
|
@@ -171,14 +170,14 @@ export const callAPI = async (message: CoreMessage) => {
|
|
|
171
170
|
_callPromise?.resolve(messageResponse);
|
|
172
171
|
}
|
|
173
172
|
};
|
|
174
|
-
Log.debug('Call API - Device Run: ', device);
|
|
173
|
+
Log.debug('Call API - Device Run: ', device.mainId);
|
|
175
174
|
const deviceRun = () => device.run(inner);
|
|
176
175
|
_callPromise = createDeferred(deviceRun);
|
|
177
176
|
|
|
178
177
|
try {
|
|
179
178
|
return await _callPromise.promise;
|
|
180
179
|
} catch (e) {
|
|
181
|
-
|
|
180
|
+
Log.debug('Device Run Error: ', e);
|
|
182
181
|
return createResponseMessage(method.responseID, false, { error: e });
|
|
183
182
|
}
|
|
184
183
|
} catch (error) {
|
|
@@ -290,7 +289,7 @@ const closePopup = () => {
|
|
|
290
289
|
};
|
|
291
290
|
|
|
292
291
|
const onDevicePinHandler = async (...[device, type, callback]: DeviceEvents['pin']) => {
|
|
293
|
-
|
|
292
|
+
Log.debug('onDevicePinHandler');
|
|
294
293
|
// create ui promise
|
|
295
294
|
const uiPromise = createUiPromise(UI_RESPONSE.RECEIVE_PIN, device);
|
|
296
295
|
// request pin view
|
|
@@ -406,6 +405,9 @@ export const init = async (settings: ConnectSettings, Transport: any) => {
|
|
|
406
405
|
Log.error('DataManager.load error');
|
|
407
406
|
}
|
|
408
407
|
enableLog(DataManager.getSettings('debug'));
|
|
408
|
+
if (DataManager.getSettings('env') !== 'react-native') {
|
|
409
|
+
setLoggerPostMessage(postMessage);
|
|
410
|
+
}
|
|
409
411
|
initCore();
|
|
410
412
|
initConnector();
|
|
411
413
|
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export const DEFAULT_DOMAIN = `https://jssdk.onekey.so/`;
|
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
import { Transport } from '@onekeyfe/hd-transport';
|
|
2
2
|
import { ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
|
|
3
|
-
import { initLog } from '../utils';
|
|
4
3
|
import DataManager from './DataManager';
|
|
4
|
+
import { getLogger, LoggerNames } from '../utils';
|
|
5
5
|
|
|
6
|
-
const Log =
|
|
6
|
+
const Log = getLogger(LoggerNames.Transport);
|
|
7
|
+
const BleLogger = getLogger(LoggerNames.HdBleTransport);
|
|
8
|
+
const HttpLogger = getLogger(LoggerNames.HdTransportHttp);
|
|
7
9
|
/**
|
|
8
10
|
* transport 在同一个环境中只会存在一个
|
|
9
11
|
* 这里设计成单例获取
|
|
@@ -19,7 +21,7 @@ export default class TransportManager {
|
|
|
19
21
|
static reactNativeInit = false;
|
|
20
22
|
|
|
21
23
|
static load() {
|
|
22
|
-
|
|
24
|
+
Log.debug('transport manager load');
|
|
23
25
|
this.defaultMessages = DataManager.getProtobufMessages();
|
|
24
26
|
this.currentMessages = this.defaultMessages;
|
|
25
27
|
}
|
|
@@ -30,19 +32,22 @@ export default class TransportManager {
|
|
|
30
32
|
Log.debug('Initializing transports');
|
|
31
33
|
if (env === 'react-native') {
|
|
32
34
|
if (!this.reactNativeInit) {
|
|
33
|
-
await this.transport.init();
|
|
35
|
+
await this.transport.init(BleLogger);
|
|
34
36
|
this.reactNativeInit = true;
|
|
35
37
|
} else {
|
|
36
38
|
Log.debug('React Native Do Not Initializing transports');
|
|
37
39
|
}
|
|
38
40
|
} else {
|
|
39
|
-
await this.transport.init();
|
|
41
|
+
await this.transport.init(HttpLogger);
|
|
40
42
|
}
|
|
41
43
|
Log.debug('Configuring transports');
|
|
42
44
|
await this.transport.configure(JSON.stringify(this.defaultMessages));
|
|
43
45
|
Log.debug('Configuring transports done');
|
|
44
46
|
} catch (error) {
|
|
45
47
|
Log.debug('Initializing transports error: ', error);
|
|
48
|
+
if (error.code === 'ECONNABORTED') {
|
|
49
|
+
throw ERRORS.TypedError(HardwareErrorCode.BridgeTimeoutError);
|
|
50
|
+
}
|
|
46
51
|
}
|
|
47
52
|
}
|
|
48
53
|
|
|
@@ -73,7 +78,7 @@ export default class TransportManager {
|
|
|
73
78
|
/** Actually initializes the HttpTransport */
|
|
74
79
|
this.transport = new TransportConstructor() as unknown as Transport;
|
|
75
80
|
}
|
|
76
|
-
|
|
81
|
+
Log.debug('set transport: ', this.transport);
|
|
77
82
|
}
|
|
78
83
|
|
|
79
84
|
static getTransport() {
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/* eslint-disable vars-on-top */
|
|
2
2
|
|
|
3
3
|
import type { ConnectSettings } from '../types';
|
|
4
|
-
import {
|
|
4
|
+
import { DEFAULT_DOMAIN } from '../data/config';
|
|
5
5
|
|
|
6
6
|
export const DEFAULT_PRIORITY = 2;
|
|
7
7
|
|
|
@@ -13,7 +13,7 @@ declare global {
|
|
|
13
13
|
|
|
14
14
|
const initialSettings: ConnectSettings = {
|
|
15
15
|
configSrc: './data/config.json', // constant
|
|
16
|
-
version:
|
|
16
|
+
version: '', // constant
|
|
17
17
|
debug: false,
|
|
18
18
|
priority: DEFAULT_PRIORITY,
|
|
19
19
|
trustedHost: false,
|
package/src/device/Device.ts
CHANGED
|
@@ -5,7 +5,6 @@ import { createDeferred, Deferred, HardwareErrorCode, ERRORS } from '@onekeyfe/h
|
|
|
5
5
|
import DeviceConnector from './DeviceConnector';
|
|
6
6
|
import { DeviceCommands } from './DeviceCommands';
|
|
7
7
|
|
|
8
|
-
import { initLog } from '../utils';
|
|
9
8
|
import {
|
|
10
9
|
getDeviceFirmwareVersion,
|
|
11
10
|
getDeviceLabel,
|
|
@@ -18,6 +17,7 @@ import type { Features, Device as DeviceTyped, UnavailableCapabilities } from '.
|
|
|
18
17
|
import { DEVICE, DeviceButtonRequestPayload } from '../events';
|
|
19
18
|
import { UI_REQUEST } from '../constants/ui-request';
|
|
20
19
|
import { PROTO } from '../constants';
|
|
20
|
+
import { getLogger, LoggerNames } from '../utils';
|
|
21
21
|
import { DataManager } from '../data-manager';
|
|
22
22
|
|
|
23
23
|
type RunOptions = {
|
|
@@ -29,7 +29,7 @@ const parseRunOptions = (options?: RunOptions): RunOptions => {
|
|
|
29
29
|
return options;
|
|
30
30
|
};
|
|
31
31
|
|
|
32
|
-
const Log =
|
|
32
|
+
const Log = getLogger(LoggerNames.Device);
|
|
33
33
|
|
|
34
34
|
export interface DeviceEvents {
|
|
35
35
|
[DEVICE.PIN]: [Device, PROTO.PinMatrixRequestType | undefined, (err: any, pin: string) => void];
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { Transport, Messages } from '@onekeyfe/hd-transport';
|
|
2
2
|
import { ERRORS, HardwareError, HardwareErrorCode } from '@onekeyfe/hd-shared';
|
|
3
3
|
import TransportManager from '../data-manager/TransportManager';
|
|
4
|
-
import {
|
|
4
|
+
import { patchFeatures, getLogger, LoggerNames } from '../utils';
|
|
5
5
|
import type { Device } from './Device';
|
|
6
6
|
import { DEVICE } from '../events';
|
|
7
7
|
|
|
@@ -26,13 +26,13 @@ const assertType = (res: DefaultMessageResponse, resType: string | string[]) =>
|
|
|
26
26
|
const splitResTypes = Array.isArray(resType) ? resType : resType.split('|');
|
|
27
27
|
if (!splitResTypes.includes(res.type)) {
|
|
28
28
|
throw ERRORS.TypedError(
|
|
29
|
-
HardwareErrorCode.
|
|
29
|
+
HardwareErrorCode.ResponseUnexpectTypeError,
|
|
30
30
|
`assertType: Response of unexpected type: ${res.type}. Should be ${resType as string}`
|
|
31
31
|
);
|
|
32
32
|
}
|
|
33
33
|
};
|
|
34
34
|
|
|
35
|
-
const Log =
|
|
35
|
+
const Log = getLogger(LoggerNames.DeviceCommands);
|
|
36
36
|
|
|
37
37
|
export class DeviceCommands {
|
|
38
38
|
device: Device;
|
|
@@ -68,7 +68,7 @@ export class DeviceCommands {
|
|
|
68
68
|
type: MessageKey,
|
|
69
69
|
msg: DefaultMessageResponse['message'] = {}
|
|
70
70
|
): Promise<DefaultMessageResponse> {
|
|
71
|
-
|
|
71
|
+
Log.debug('[DeviceCommands] [call] Sending', type);
|
|
72
72
|
|
|
73
73
|
try {
|
|
74
74
|
const promise = this.transport.call(this.mainId, type, msg) as any;
|
|
@@ -78,6 +78,9 @@ export class DeviceCommands {
|
|
|
78
78
|
return res;
|
|
79
79
|
} catch (error) {
|
|
80
80
|
Log.debug('[DeviceCommands] [call] Received error', error);
|
|
81
|
+
if (error?.response?.data?.error === 'device disconnected during action') {
|
|
82
|
+
return { type: 'BridgeNetworkError', message: {} } as any;
|
|
83
|
+
}
|
|
81
84
|
throw error;
|
|
82
85
|
}
|
|
83
86
|
}
|
|
@@ -112,10 +115,21 @@ export class DeviceCommands {
|
|
|
112
115
|
} catch (error) {
|
|
113
116
|
// handle possible race condition
|
|
114
117
|
// Bridge may have some unread message in buffer, read it
|
|
115
|
-
// await this.transport.read(this.mainId);
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
118
|
+
// await this.transport.read?.(this.mainId);
|
|
119
|
+
|
|
120
|
+
Log.debug('DeviceCommands typedcall error: ', error);
|
|
121
|
+
|
|
122
|
+
// throw bridge network error
|
|
123
|
+
if (error instanceof HardwareError) {
|
|
124
|
+
if (error.errorCode === HardwareErrorCode.ResponseUnexpectTypeError) {
|
|
125
|
+
if (error.message.indexOf('BridgeNetworkError') > -1) {
|
|
126
|
+
throw ERRORS.TypedError(HardwareErrorCode.BridgeNetworkError);
|
|
127
|
+
}
|
|
128
|
+
}
|
|
129
|
+
} else {
|
|
130
|
+
// throw error anyway, next call should be resolved properly// throw error anyway, next call should be resolved properly
|
|
131
|
+
throw error;
|
|
132
|
+
}
|
|
119
133
|
}
|
|
120
134
|
return response;
|
|
121
135
|
}
|
|
@@ -126,7 +140,7 @@ export class DeviceCommands {
|
|
|
126
140
|
}
|
|
127
141
|
|
|
128
142
|
_filterCommonTypes(res: DefaultMessageResponse): Promise<DefaultMessageResponse> {
|
|
129
|
-
|
|
143
|
+
Log.debug('_filterCommonTypes: ', res);
|
|
130
144
|
if (res.type === 'Failure') {
|
|
131
145
|
const { code } = res.message;
|
|
132
146
|
const { message } = res.message;
|
|
@@ -2,8 +2,8 @@ import { Transport, OneKeyDeviceInfo as DeviceDescriptor } from '@onekeyfe/hd-tr
|
|
|
2
2
|
import { safeThrowError } from '../constants';
|
|
3
3
|
import { DataManager } from '../data-manager';
|
|
4
4
|
import TransportManager from '../data-manager/TransportManager';
|
|
5
|
-
import { initLog } from '../utils';
|
|
6
5
|
import { resolveAfter } from '../utils/promiseUtils';
|
|
6
|
+
import { getLogger, LoggerNames } from '../utils';
|
|
7
7
|
|
|
8
8
|
export type DeviceDescriptorDiff = {
|
|
9
9
|
didUpdate: boolean;
|
|
@@ -18,7 +18,7 @@ export type DeviceDescriptorDiff = {
|
|
|
18
18
|
descriptors: DeviceDescriptor[];
|
|
19
19
|
};
|
|
20
20
|
|
|
21
|
-
const Log =
|
|
21
|
+
const Log = getLogger(LoggerNames.DeviceConnector);
|
|
22
22
|
|
|
23
23
|
const getDiff = (
|
|
24
24
|
current: DeviceDescriptor[],
|
|
@@ -141,7 +141,7 @@ export default class DeviceConnector {
|
|
|
141
141
|
}
|
|
142
142
|
|
|
143
143
|
async acquire(path: string, session?: string | null) {
|
|
144
|
-
|
|
144
|
+
Log.debug('acquire', path, session);
|
|
145
145
|
const env = DataManager.getSettings('env');
|
|
146
146
|
try {
|
|
147
147
|
let res;
|
package/src/device/DeviceList.ts
CHANGED
|
@@ -2,11 +2,11 @@ import EventEmitter from 'events';
|
|
|
2
2
|
import DeviceConnector from './DeviceConnector';
|
|
3
3
|
import { Device } from './Device';
|
|
4
4
|
import { getDeviceUUID } from '../utils/deviceFeaturesUtils';
|
|
5
|
-
import {
|
|
5
|
+
import { getLogger, LoggerNames } from '../utils';
|
|
6
6
|
|
|
7
7
|
const cacheDeviceMap = new Map<string, Device>();
|
|
8
8
|
|
|
9
|
-
const Log =
|
|
9
|
+
const Log = getLogger(LoggerNames.DeviceList);
|
|
10
10
|
|
|
11
11
|
export class DeviceList extends EventEmitter {
|
|
12
12
|
devices: Record<string, Device> = {};
|
|
@@ -23,7 +23,7 @@ export class DeviceList extends EventEmitter {
|
|
|
23
23
|
|
|
24
24
|
this.devices = {};
|
|
25
25
|
const deviceList = [];
|
|
26
|
-
|
|
26
|
+
Log.debug('get device list');
|
|
27
27
|
for await (const descriptor of descriptorList) {
|
|
28
28
|
let device = Device.fromDescriptor(descriptor);
|
|
29
29
|
device.deviceConnector = this.connector;
|
package/src/events/core.ts
CHANGED
|
@@ -5,6 +5,7 @@ import { DeviceEventMessage } from './device';
|
|
|
5
5
|
import { IFrameEventMessage } from './iframe';
|
|
6
6
|
import { UiEventMessage } from './ui-request';
|
|
7
7
|
import { UiResponseMessage } from './ui-response';
|
|
8
|
+
import { LogEventMessage } from './log';
|
|
8
9
|
|
|
9
10
|
export const CORE_EVENT = 'CORE_EVENT';
|
|
10
11
|
|
|
@@ -18,6 +19,7 @@ export type CoreMessage = {
|
|
|
18
19
|
| UiResponseMessage
|
|
19
20
|
| UiEventMessage
|
|
20
21
|
| DeviceEventMessage
|
|
22
|
+
| LogEventMessage
|
|
21
23
|
);
|
|
22
24
|
|
|
23
25
|
export type PostMessageEvent = MessageEvent<any>;
|
package/src/events/index.ts
CHANGED
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
import type { MessageFactoryFn } from './utils';
|
|
2
|
+
|
|
3
|
+
export const LOG_EVENT = 'LOG_EVENT';
|
|
4
|
+
|
|
5
|
+
export const LOG = {
|
|
6
|
+
OUTPUT: 'log-output',
|
|
7
|
+
} as const;
|
|
8
|
+
|
|
9
|
+
export interface LogOutput {
|
|
10
|
+
type: typeof LOG.OUTPUT;
|
|
11
|
+
payload: any;
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
export type LogEvent = LogOutput;
|
|
15
|
+
|
|
16
|
+
export type LogEventMessage = LogEvent & { event: typeof LOG_EVENT };
|
|
17
|
+
|
|
18
|
+
export const createLogMessage: MessageFactoryFn<typeof LOG_EVENT, LogEvent> = (type, payload) =>
|
|
19
|
+
({
|
|
20
|
+
event: LOG_EVENT,
|
|
21
|
+
type,
|
|
22
|
+
payload,
|
|
23
|
+
} as any);
|
package/src/inject.ts
CHANGED
package/src/types/api/index.ts
CHANGED
|
@@ -42,6 +42,7 @@ import { stellarGetAddress } from './stellarGetAddress';
|
|
|
42
42
|
import { stellarSignTransaction } from './stellarSignTransaction';
|
|
43
43
|
import { cipherKeyValue } from './cipherKeyValue';
|
|
44
44
|
import { firmwareUpdate } from './firmwareUpdate';
|
|
45
|
+
import { getLogs } from './getLogs';
|
|
45
46
|
|
|
46
47
|
export * from './export';
|
|
47
48
|
|
|
@@ -57,6 +58,7 @@ export type CoreApi = {
|
|
|
57
58
|
call: (params: any) => Promise<any>;
|
|
58
59
|
uiResponse: typeof uiResponse;
|
|
59
60
|
cancel: (connectId?: string) => void;
|
|
61
|
+
getLogs: typeof getLogs;
|
|
60
62
|
|
|
61
63
|
/**
|
|
62
64
|
* Core function
|
|
@@ -24,16 +24,8 @@ export const getDeviceType = (features?: Features): IDeviceType => {
|
|
|
24
24
|
return 'classic';
|
|
25
25
|
};
|
|
26
26
|
|
|
27
|
-
export const getDeviceTypeOnBootloader = (features?: Features): IDeviceType =>
|
|
28
|
-
|
|
29
|
-
return 'classic';
|
|
30
|
-
}
|
|
31
|
-
if (features.model === 'T') {
|
|
32
|
-
return 'touch';
|
|
33
|
-
}
|
|
34
|
-
|
|
35
|
-
return getDeviceType(features);
|
|
36
|
-
};
|
|
27
|
+
export const getDeviceTypeOnBootloader = (features?: Features): IDeviceType =>
|
|
28
|
+
getDeviceType(features);
|
|
37
29
|
|
|
38
30
|
export const getDeviceTypeByBleName = (name?: string): IDeviceType | null => {
|
|
39
31
|
if (!name) return 'classic';
|
package/src/utils/index.ts
CHANGED
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
import { initLog, enableLog } from './logger';
|
|
2
|
-
|
|
3
1
|
export * from './assets';
|
|
4
2
|
export * from './versionUtils';
|
|
5
3
|
export * from './patch';
|
|
@@ -12,4 +10,4 @@ export {
|
|
|
12
10
|
} from './deviceFeaturesUtils';
|
|
13
11
|
export { getHDPath, getScriptType } from '../api/helpers/pathUtils';
|
|
14
12
|
|
|
15
|
-
export {
|
|
13
|
+
export { getLogger, enableLog, LoggerNames, getLog, setLoggerPostMessage } from './logger';
|