@onekeyfe/hd-web-sdk 0.1.13 → 0.1.17
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/build/iframe.html +1 -1
- package/build/js/iframe.bc96e38a35b7448d677b.js +3 -0
- package/build/js/{iframe.b96245cb401eda8e8824.js.LICENSE.txt → iframe.bc96e38a35b7448d677b.js.LICENSE.txt} +0 -0
- package/build/js/iframe.bc96e38a35b7448d677b.js.map +1 -0
- package/build/onekey-js-sdk.js +634 -507
- package/build/onekey-js-sdk.js.map +1 -1
- package/build/onekey-js-sdk.min.js +1 -1
- package/build/onekey-js-sdk.min.js.map +1 -1
- package/dist/iframe/index.d.ts.map +1 -1
- package/dist/iframe/index.js +1 -1
- package/dist/iframe/index.js.map +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +16 -4
- package/dist/index.js.map +1 -1
- package/dist/utils/bridgeUtils.d.ts.map +1 -1
- package/dist/utils/bridgeUtils.js +9 -4
- package/dist/utils/bridgeUtils.js.map +1 -1
- package/package.json +5 -5
- package/src/iframe/index.ts +3 -2
- package/src/index.ts +21 -6
- package/src/utils/bridgeUtils.ts +10 -5
- package/build/js/iframe.b96245cb401eda8e8824.js +0 -3
- package/build/js/iframe.b96245cb401eda8e8824.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/iframe/index.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/iframe/index.ts"],"names":[],"mappings":"AACA,OAAO,EAML,UAAU,EAQX,MAAM,mBAAmB,CAAC;AAmB3B,wBAAsB,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,SAAS,CAAC,iEAqCxD"}
|
package/dist/iframe/index.js
CHANGED
|
@@ -16,7 +16,7 @@ const urlUtils_1 = require("../utils/urlUtils");
|
|
|
16
16
|
const bridgeUtils_1 = require("../utils/bridgeUtils");
|
|
17
17
|
const bridge_config_1 = require("./bridge-config");
|
|
18
18
|
let _core;
|
|
19
|
-
const Log = (0, hd_core_1.
|
|
19
|
+
const Log = (0, hd_core_1.getLogger)(hd_core_1.LoggerNames.Iframe);
|
|
20
20
|
const handleMessage = (event) => {
|
|
21
21
|
var _a;
|
|
22
22
|
if (event.source === window || !event.data)
|
package/dist/iframe/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/iframe/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mEAAwD;AACxD,+
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/iframe/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mEAAwD;AACxD,+CAc2B;AAC3B,gDAA8C;AAC9C,sDAAmE;AAEnE,mDAA6C;AAE7C,IAAI,KAAuB,CAAC;AAC5B,MAAM,GAAG,GAAG,IAAA,mBAAS,EAAC,qBAAW,CAAC,MAAM,CAAC,CAAC;AAE1C,MAAM,aAAa,GAAG,CAAC,KAAuB,EAAE,EAAE;;IAChD,IAAI,KAAK,CAAC,MAAM,KAAK,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI;QAAE,OAAO;IAEnD,MAAM,OAAO,GAAG,IAAA,sBAAY,EAAC,KAAK,CAAC,CAAC;IAEpC,IAAI,OAAO,CAAC,IAAI,KAAK,gBAAM,CAAC,IAAI,EAAE;QAChC,IAAI,CAAC,MAAA,OAAO,CAAC,OAAO,mCAAI,EAAE,CAAC,CAAC;KAC7B;AACH,CAAC,CAAC;AAEF,SAAsB,IAAI,CAAC,OAA8B;;;QACvD,IAAI,qBAAW,CAAC,WAAW,CAAC,QAAQ,CAAC;YAAE,OAAO;QAE9C,MAAM,QAAQ,GAAG,IAAA,8BAAoB,kCAChC,CAAC,MAAA,OAAO,CAAC,QAAQ,mCAAI,EAAE,CAAC,KAC3B,OAAO,EAAE,IAAI,IACb,CAAC;QAEH,QAAQ,CAAC,MAAM,GAAG,CAAC,MAAM,IAAI,MAAM,KAAK,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC;QAElF,GAAG,CAAC,OAAO,GAAG,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC;QAE/B,IAAI;YACF,KAAK,GAAG,MAAM,IAAA,kBAAQ,EAAC,QAAQ,EAAE,2BAAa,CAAC,CAAC;YAChD,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,EAAE,CAAC,oBAAU,EAAE,QAAQ,CAAC,EAAE,CAAC,IAAA,yBAAW,EAAC,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC;SACjE;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,IAAA,4BAAkB,EAAC,KAAK,CAAC,CAAC;SAClC;QAED,IAAA,4BAAc,EAAC;YACb,MAAM,EAAE,KAAK;YACb,WAAW,EAAE,MAAM,CAAC,MAAM;YAC1B,eAAe,EAAE,uBAAc,CAAC,QAAQ;YACxC,aAAa,EAAE,uBAAc,CAAC,UAAU;YACxC,OAAO,EAAE,uBAAc,CAAC,OAAO;YAC/B,YAAY,EAAE,IAAA,oBAAS,EAAC,QAAQ,CAAC,YAAsB,CAAC;YACxD,cAAc,EAAE,CAAM,YAAY,EAAC,EAAE;gBACnC,MAAM,OAAO,GAAG,IAAA,sBAAY,EAAC,YAAY,CAAC,CAAC;gBAC3C,GAAG,CAAC,KAAK,CAAC,gCAAgC,EAAE,OAAO,CAAC,CAAC;gBAErD,MAAM,QAAQ,GAAG,MAAM,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,aAAa,CAAC,OAAO,CAAC,CAAA,CAAC;gBACrD,GAAG,CAAC,KAAK,CAAC,8BAA8B,EAAE,QAAQ,CAAC,CAAC;gBACpD,OAAO,QAAQ,CAAC;YAClB,CAAC,CAAA;SACF,CAAC,CAAC;QAEH,MAAM,IAAA,yBAAW,EAAC,IAAA,6BAAmB,EAAC,gBAAM,CAAC,WAAW,EAAE,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;;CACvE;AArCD,oBAqCC;AAED,MAAM,CAAC,gBAAgB,CAAC,SAAS,EAAE,aAAa,EAAE,KAAK,CAAC,CAAC"}
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAwJA,QAAA,MAAM,cAAc,qCAOlB,CAAC;AAEH,eAAe,cAAc,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -16,7 +16,7 @@ const iframe = require("./iframe/builder");
|
|
|
16
16
|
const bridge_config_1 = require("./iframe/bridge-config");
|
|
17
17
|
const bridgeUtils_1 = require("./utils/bridgeUtils");
|
|
18
18
|
const eventEmitter = new events_1.default();
|
|
19
|
-
const Log = (0, hd_core_1.
|
|
19
|
+
const Log = (0, hd_core_1.getLogger)(hd_core_1.LoggerNames.Connect);
|
|
20
20
|
let _settings = (0, hd_core_1.parseConnectSettings)();
|
|
21
21
|
const handleMessage = (message) => __awaiter(void 0, void 0, void 0, function* () {
|
|
22
22
|
switch (message.event) {
|
|
@@ -28,6 +28,9 @@ const handleMessage = (message) => __awaiter(void 0, void 0, void 0, function* (
|
|
|
28
28
|
eventEmitter.emit(message.event, message);
|
|
29
29
|
eventEmitter.emit(message.type, message.payload);
|
|
30
30
|
break;
|
|
31
|
+
case hd_core_1.LOG_EVENT:
|
|
32
|
+
eventEmitter.emit(message.event, message);
|
|
33
|
+
break;
|
|
31
34
|
default:
|
|
32
35
|
Log.log('No need to be captured message', message.event);
|
|
33
36
|
}
|
|
@@ -63,9 +66,13 @@ const createJSBridge = (messageEvent) => {
|
|
|
63
66
|
targetOrigin: iframe.origin,
|
|
64
67
|
receiveHandler: (messageEvent) => __awaiter(void 0, void 0, void 0, function* () {
|
|
65
68
|
const message = (0, hd_core_1.parseMessage)(messageEvent);
|
|
66
|
-
|
|
69
|
+
if (message.event !== 'LOG_EVENT') {
|
|
70
|
+
Log.debug('Host Bridge Receive message: ', message);
|
|
71
|
+
}
|
|
67
72
|
const response = yield handleMessage(message);
|
|
68
|
-
|
|
73
|
+
if (message.event !== 'LOG_EVENT') {
|
|
74
|
+
Log.debug('Host Bridge response: ', response);
|
|
75
|
+
}
|
|
69
76
|
return response;
|
|
70
77
|
}),
|
|
71
78
|
});
|
|
@@ -77,6 +84,7 @@ const init = (settings) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
77
84
|
}
|
|
78
85
|
_settings = (0, hd_core_1.parseConnectSettings)(Object.assign(Object.assign({}, _settings), settings));
|
|
79
86
|
(0, hd_core_1.enableLog)(!!settings.debug);
|
|
87
|
+
(0, hd_core_1.setLoggerPostMessage)(handleMessage);
|
|
80
88
|
Log.debug('init');
|
|
81
89
|
window.addEventListener('message', createJSBridge);
|
|
82
90
|
window.addEventListener('unload', dispose);
|
|
@@ -112,7 +120,11 @@ const call = (params) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
112
120
|
}
|
|
113
121
|
catch (error) {
|
|
114
122
|
Log.error('__call error: ', error);
|
|
115
|
-
|
|
123
|
+
let err = error;
|
|
124
|
+
if (!(err instanceof hd_shared_1.HardwareError)) {
|
|
125
|
+
err = hd_shared_1.ERRORS.CreateErrorByMessage(error.message);
|
|
126
|
+
}
|
|
127
|
+
return (0, hd_core_1.createErrorMessage)(err);
|
|
116
128
|
}
|
|
117
129
|
});
|
|
118
130
|
const HardwareWebSdk = (0, hd_core_1.default)({
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,mCAAkC;AAClC,+
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bridgeUtils.d.ts","sourceRoot":"","sources":["../../src/utils/bridgeUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AAC7F,OAAO,EAAE,WAAW,
|
|
1
|
+
{"version":3,"file":"bridgeUtils.d.ts","sourceRoot":"","sources":["../../src/utils/bridgeUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AAC7F,OAAO,EAAE,WAAW,EAA0B,MAAM,mBAAmB,CAAC;AAKxE,QAAA,IAAI,WAAW,EAAE,cAAc,CAAC;AAEhC,QAAA,IAAI,UAAU,EAAE,cAAc,CAAC;AAI/B,eAAO,MAAM,cAAc,WAAY,qBAAqB,GAAG;IAAE,MAAM,EAAE,OAAO,CAAA;CAAE,SAOjF,CAAC;AAEF,eAAO,MAAM,WAAW,aAAoB,WAAW,uBAAkB,QAAQ,GAAG,CAmBnF,CAAC;AAEF,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,CAAC"}
|
|
@@ -12,12 +12,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
12
12
|
exports.hostBridge = exports.frameBridge = exports.sendMessage = exports.createJsBridge = void 0;
|
|
13
13
|
const cross_inpage_provider_core_1 = require("@onekeyfe/cross-inpage-provider-core");
|
|
14
14
|
const hd_core_1 = require("@onekeyfe/hd-core");
|
|
15
|
+
const hd_shared_1 = require("@onekeyfe/hd-shared");
|
|
15
16
|
const bridge_config_1 = require("../iframe/bridge-config");
|
|
16
17
|
let frameBridge;
|
|
17
18
|
exports.frameBridge = frameBridge;
|
|
18
19
|
let hostBridge;
|
|
19
20
|
exports.hostBridge = hostBridge;
|
|
20
|
-
const Log = (0, hd_core_1.
|
|
21
|
+
const Log = (0, hd_core_1.getLogger)(hd_core_1.LoggerNames.SendMessage);
|
|
21
22
|
const createJsBridge = (params) => {
|
|
22
23
|
const bridge = new cross_inpage_provider_core_1.JsBridgeIframe(params);
|
|
23
24
|
if (params.isHost) {
|
|
@@ -31,17 +32,21 @@ exports.createJsBridge = createJsBridge;
|
|
|
31
32
|
const sendMessage = (messages, isHost = true) => __awaiter(void 0, void 0, void 0, function* () {
|
|
32
33
|
const bridge = isHost ? hostBridge : frameBridge;
|
|
33
34
|
try {
|
|
34
|
-
|
|
35
|
+
if (messages.event !== 'LOG_EVENT') {
|
|
36
|
+
Log.debug('request: ', messages);
|
|
37
|
+
}
|
|
35
38
|
const result = yield (bridge === null || bridge === void 0 ? void 0 : bridge.request({
|
|
36
39
|
scope: bridge_config_1.default.scope,
|
|
37
40
|
data: Object.assign({}, messages),
|
|
38
41
|
}));
|
|
39
|
-
|
|
42
|
+
if (messages.event !== 'LOG_EVENT') {
|
|
43
|
+
Log.debug('response: ', result);
|
|
44
|
+
}
|
|
40
45
|
return result;
|
|
41
46
|
}
|
|
42
47
|
catch (error) {
|
|
43
48
|
Log.error(error);
|
|
44
|
-
throw error;
|
|
49
|
+
throw hd_shared_1.ERRORS.CreateErrorByMessage(error.message);
|
|
45
50
|
}
|
|
46
51
|
});
|
|
47
52
|
exports.sendMessage = sendMessage;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bridgeUtils.js","sourceRoot":"","sources":["../../src/utils/bridgeUtils.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qFAA6F;AAC7F,+
|
|
1
|
+
{"version":3,"file":"bridgeUtils.js","sourceRoot":"","sources":["../../src/utils/bridgeUtils.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qFAA6F;AAC7F,+CAAwE;AACxE,mDAA6C;AAC7C,2DAAqD;AAGrD,IAAI,WAA2B,CAAC;AAoCvB,kCAAW;AAlCpB,IAAI,UAA0B,CAAC;AAkCT,gCAAU;AAhChC,MAAM,GAAG,GAAG,IAAA,mBAAS,EAAC,qBAAW,CAAC,WAAW,CAAC,CAAC;AAExC,MAAM,cAAc,GAAG,CAAC,MAAmD,EAAE,EAAE;IACpF,MAAM,MAAM,GAAG,IAAI,2CAAc,CAAC,MAAM,CAAC,CAAC;IAC1C,IAAI,MAAM,CAAC,MAAM,EAAE;QACjB,qBAAA,UAAU,GAAG,MAAM,CAAC;KACrB;SAAM;QACL,sBAAA,WAAW,GAAG,MAAM,CAAC;KACtB;AACH,CAAC,CAAC;AAPW,QAAA,cAAc,kBAOzB;AAEK,MAAM,WAAW,GAAG,CAAO,QAAqB,EAAE,MAAM,GAAG,IAAI,EAAgB,EAAE;IACtF,MAAM,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,WAAW,CAAC;IAEjD,IAAI;QACF,IAAI,QAAQ,CAAC,KAAK,KAAK,WAAW,EAAE;YAClC,GAAG,CAAC,KAAK,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;SAClC;QACD,MAAM,MAAM,GAAG,MAAM,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,CAAC;YACnC,KAAK,EAAE,uBAAc,CAAC,KAAK;YAC3B,IAAI,oBAAO,QAAQ,CAAE;SACtB,CAAC,CAAA,CAAC;QACH,IAAI,QAAQ,CAAC,KAAK,KAAK,WAAW,EAAE;YAClC,GAAG,CAAC,KAAK,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;SACjC;QACD,OAAO,MAAM,CAAC;KACf;IAAC,OAAO,KAAK,EAAE;QACd,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACjB,MAAM,kBAAM,CAAC,oBAAoB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;KAClD;AACH,CAAC,CAAA,CAAC;AAnBW,QAAA,WAAW,eAmBtB"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@onekeyfe/hd-web-sdk",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.17",
|
|
4
4
|
"author": "OneKey",
|
|
5
5
|
"homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
|
|
6
6
|
"license": "ISC",
|
|
@@ -22,9 +22,9 @@
|
|
|
22
22
|
},
|
|
23
23
|
"dependencies": {
|
|
24
24
|
"@onekeyfe/cross-inpage-provider-core": "^0.0.14",
|
|
25
|
-
"@onekeyfe/hd-core": "^0.1.
|
|
26
|
-
"@onekeyfe/hd-shared": "^0.1.
|
|
27
|
-
"@onekeyfe/hd-transport-http": "^0.1.
|
|
25
|
+
"@onekeyfe/hd-core": "^0.1.17",
|
|
26
|
+
"@onekeyfe/hd-shared": "^0.1.17",
|
|
27
|
+
"@onekeyfe/hd-transport-http": "^0.1.17"
|
|
28
28
|
},
|
|
29
29
|
"devDependencies": {
|
|
30
30
|
"@babel/plugin-proposal-optional-chaining": "^7.17.12",
|
|
@@ -45,5 +45,5 @@
|
|
|
45
45
|
"webpack-cli": "^4.9.2",
|
|
46
46
|
"webpack-plugin-serve": "^1.6.0"
|
|
47
47
|
},
|
|
48
|
-
"gitHead": "
|
|
48
|
+
"gitHead": "65350a66c7f2b1e80cb1d413ee56da4aef507fa3"
|
|
49
49
|
}
|
package/src/iframe/index.ts
CHANGED
|
@@ -2,7 +2,6 @@ import HttpTransport from '@onekeyfe/hd-transport-http';
|
|
|
2
2
|
import {
|
|
3
3
|
PostMessageEvent,
|
|
4
4
|
IFRAME,
|
|
5
|
-
initLog,
|
|
6
5
|
parseMessage,
|
|
7
6
|
DataManager,
|
|
8
7
|
parseConnectSettings,
|
|
@@ -12,6 +11,8 @@ import {
|
|
|
12
11
|
initCore,
|
|
13
12
|
Core,
|
|
14
13
|
CORE_EVENT,
|
|
14
|
+
getLogger,
|
|
15
|
+
LoggerNames,
|
|
15
16
|
} from '@onekeyfe/hd-core';
|
|
16
17
|
import { getOrigin } from '../utils/urlUtils';
|
|
17
18
|
import { sendMessage, createJsBridge } from '../utils/bridgeUtils';
|
|
@@ -19,7 +20,7 @@ import { sendMessage, createJsBridge } from '../utils/bridgeUtils';
|
|
|
19
20
|
import JSBridgeConfig from './bridge-config';
|
|
20
21
|
|
|
21
22
|
let _core: Core | undefined;
|
|
22
|
-
const Log =
|
|
23
|
+
const Log = getLogger(LoggerNames.Iframe);
|
|
23
24
|
|
|
24
25
|
const handleMessage = (event: PostMessageEvent) => {
|
|
25
26
|
if (event.source === window || !event.data) return;
|
package/src/index.ts
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import EventEmitter from 'events';
|
|
2
2
|
import HardwareSdk, {
|
|
3
3
|
parseConnectSettings,
|
|
4
|
-
initLog,
|
|
5
4
|
enableLog,
|
|
6
5
|
PostMessageEvent,
|
|
7
6
|
IFRAME,
|
|
@@ -11,14 +10,18 @@ import HardwareSdk, {
|
|
|
11
10
|
CoreMessage,
|
|
12
11
|
ConnectSettings,
|
|
13
12
|
UiResponseEvent,
|
|
13
|
+
LOG_EVENT,
|
|
14
|
+
setLoggerPostMessage,
|
|
15
|
+
getLogger,
|
|
16
|
+
LoggerNames,
|
|
14
17
|
} from '@onekeyfe/hd-core';
|
|
15
|
-
import { ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
|
|
18
|
+
import { ERRORS, HardwareError, HardwareErrorCode } from '@onekeyfe/hd-shared';
|
|
16
19
|
import * as iframe from './iframe/builder';
|
|
17
20
|
import JSBridgeConfig from './iframe/bridge-config';
|
|
18
21
|
import { sendMessage, createJsBridge, hostBridge } from './utils/bridgeUtils';
|
|
19
22
|
|
|
20
23
|
const eventEmitter = new EventEmitter();
|
|
21
|
-
const Log =
|
|
24
|
+
const Log = getLogger(LoggerNames.Connect);
|
|
22
25
|
|
|
23
26
|
let _settings = parseConnectSettings();
|
|
24
27
|
|
|
@@ -34,6 +37,9 @@ const handleMessage = async (message: CoreMessage) => {
|
|
|
34
37
|
eventEmitter.emit(message.event, message);
|
|
35
38
|
eventEmitter.emit(message.type, message.payload);
|
|
36
39
|
break;
|
|
40
|
+
case LOG_EVENT:
|
|
41
|
+
eventEmitter.emit(message.event, message);
|
|
42
|
+
break;
|
|
37
43
|
|
|
38
44
|
default:
|
|
39
45
|
Log.log('No need to be captured message', message.event);
|
|
@@ -74,9 +80,13 @@ const createJSBridge = (messageEvent: PostMessageEvent) => {
|
|
|
74
80
|
|
|
75
81
|
receiveHandler: async messageEvent => {
|
|
76
82
|
const message = parseMessage(messageEvent);
|
|
77
|
-
|
|
83
|
+
if (message.event !== 'LOG_EVENT') {
|
|
84
|
+
Log.debug('Host Bridge Receive message: ', message);
|
|
85
|
+
}
|
|
78
86
|
const response = await handleMessage(message);
|
|
79
|
-
|
|
87
|
+
if (message.event !== 'LOG_EVENT') {
|
|
88
|
+
Log.debug('Host Bridge response: ', response);
|
|
89
|
+
}
|
|
80
90
|
return response;
|
|
81
91
|
},
|
|
82
92
|
});
|
|
@@ -91,6 +101,7 @@ const init = async (settings: Partial<ConnectSettings>) => {
|
|
|
91
101
|
_settings = parseConnectSettings({ ..._settings, ...settings });
|
|
92
102
|
|
|
93
103
|
enableLog(!!settings.debug);
|
|
104
|
+
setLoggerPostMessage(handleMessage);
|
|
94
105
|
|
|
95
106
|
Log.debug('init');
|
|
96
107
|
|
|
@@ -131,7 +142,11 @@ const call = async (params: any) => {
|
|
|
131
142
|
return createErrorMessage(ERRORS.TypedError(HardwareErrorCode.CallMethodNotResponse));
|
|
132
143
|
} catch (error) {
|
|
133
144
|
Log.error('__call error: ', error);
|
|
134
|
-
|
|
145
|
+
let err = error;
|
|
146
|
+
if (!(err instanceof HardwareError)) {
|
|
147
|
+
err = ERRORS.CreateErrorByMessage(error.message);
|
|
148
|
+
}
|
|
149
|
+
return createErrorMessage(err);
|
|
135
150
|
}
|
|
136
151
|
};
|
|
137
152
|
|
package/src/utils/bridgeUtils.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { IJsBridgeIframeConfig, JsBridgeIframe } from '@onekeyfe/cross-inpage-provider-core';
|
|
2
|
-
import { CoreMessage,
|
|
2
|
+
import { CoreMessage, getLogger, LoggerNames } from '@onekeyfe/hd-core';
|
|
3
|
+
import { ERRORS } from '@onekeyfe/hd-shared';
|
|
3
4
|
import JSBridgeConfig from '../iframe/bridge-config';
|
|
4
5
|
|
|
5
6
|
// eslint-disable-next-line import/no-mutable-exports
|
|
@@ -7,7 +8,7 @@ let frameBridge: JsBridgeIframe;
|
|
|
7
8
|
// eslint-disable-next-line import/no-mutable-exports
|
|
8
9
|
let hostBridge: JsBridgeIframe;
|
|
9
10
|
|
|
10
|
-
const Log =
|
|
11
|
+
const Log = getLogger(LoggerNames.SendMessage);
|
|
11
12
|
|
|
12
13
|
export const createJsBridge = (params: IJsBridgeIframeConfig & { isHost: boolean }) => {
|
|
13
14
|
const bridge = new JsBridgeIframe(params);
|
|
@@ -22,16 +23,20 @@ export const sendMessage = async (messages: CoreMessage, isHost = true): Promise
|
|
|
22
23
|
const bridge = isHost ? hostBridge : frameBridge;
|
|
23
24
|
|
|
24
25
|
try {
|
|
25
|
-
|
|
26
|
+
if (messages.event !== 'LOG_EVENT') {
|
|
27
|
+
Log.debug('request: ', messages);
|
|
28
|
+
}
|
|
26
29
|
const result = await bridge?.request({
|
|
27
30
|
scope: JSBridgeConfig.scope,
|
|
28
31
|
data: { ...messages },
|
|
29
32
|
});
|
|
30
|
-
|
|
33
|
+
if (messages.event !== 'LOG_EVENT') {
|
|
34
|
+
Log.debug('response: ', result);
|
|
35
|
+
}
|
|
31
36
|
return result;
|
|
32
37
|
} catch (error) {
|
|
33
38
|
Log.error(error);
|
|
34
|
-
throw error;
|
|
39
|
+
throw ERRORS.CreateErrorByMessage(error.message);
|
|
35
40
|
}
|
|
36
41
|
};
|
|
37
42
|
|