diff --git a/packages/connect-examples/expo-example/package.json b/packages/connect-examples/expo-example/package.json index 69f3a37d4..8d2d469fd 100644 --- a/packages/connect-examples/expo-example/package.json +++ b/packages/connect-examples/expo-example/package.json @@ -1,6 +1,6 @@ { "name": "expo-example", - "version": "1.1.7", + "version": "1.1.8", "scripts": { "start": "cross-env CONNECT_SRC=https://localhost:8087/ yarn expo start --dev-client", "android": "yarn expo run:android", @@ -19,10 +19,10 @@ "@noble/ed25519": "^2.1.0", "@noble/hashes": "^1.3.3", "@noble/secp256k1": "^1.7.1", - "@onekeyfe/hd-ble-sdk": "1.1.7", - "@onekeyfe/hd-common-connect-sdk": "1.1.7", - "@onekeyfe/hd-core": "1.1.7", - "@onekeyfe/hd-web-sdk": "1.1.7", + "@onekeyfe/hd-ble-sdk": "1.1.8", + "@onekeyfe/hd-common-connect-sdk": "1.1.8", + "@onekeyfe/hd-core": "1.1.8", + "@onekeyfe/hd-web-sdk": "1.1.8", "@onekeyfe/react-native-ble-utils": "^0.1.3", "@polkadot/util-crypto": "13.1.1", "@react-native-async-storage/async-storage": "1.21.0", diff --git a/packages/connect-examples/expo-example/src/components/PlaygroundExecutor.tsx b/packages/connect-examples/expo-example/src/components/PlaygroundExecutor.tsx index a12b22c7c..179716f3b 100644 --- a/packages/connect-examples/expo-example/src/components/PlaygroundExecutor.tsx +++ b/packages/connect-examples/expo-example/src/components/PlaygroundExecutor.tsx @@ -50,12 +50,12 @@ const PlaygroundExecutor: React.FC = ({ if (method === 'allNetworkGetAddressByLoop') { // @ts-expect-error - requestParams.onLoopItemResponse = (data: any, error: any) => { - onExecute(JSON.stringify({ data, error }, null, 2)); + requestParams.onLoopItemResponse = (data: any) => { + onExecute(JSON.stringify({ data }, null, 2)); }; // @ts-expect-error - requestParams.onAllItemsResponse = (data: any) => { - onExecute(JSON.stringify(data, null, 2)); + requestParams.onAllItemsResponse = (data: any, error: any) => { + onExecute(JSON.stringify({ data, error }, null, 2)); }; } } catch (error) { diff --git a/packages/connect-examples/expo-playground/package.json b/packages/connect-examples/expo-playground/package.json index eb9a5e82e..8c2276ae0 100644 --- a/packages/connect-examples/expo-playground/package.json +++ b/packages/connect-examples/expo-playground/package.json @@ -1,6 +1,6 @@ { "name": "onekey-hardware-playground", - "version": "1.1.7", + "version": "1.1.8", "private": true, "sideEffects": [ "app/utils/shim.js", @@ -17,9 +17,9 @@ }, "dependencies": { "@noble/hashes": "^1.8.0", - "@onekeyfe/hd-core": "1.1.7", - "@onekeyfe/hd-shared": "1.1.7", - "@onekeyfe/hd-web-sdk": "1.1.7", + "@onekeyfe/hd-core": "1.1.8", + "@onekeyfe/hd-shared": "1.1.8", + "@onekeyfe/hd-web-sdk": "1.1.8", "@radix-ui/react-checkbox": "^1.3.2", "@radix-ui/react-dialog": "^1.1.14", "@radix-ui/react-dropdown-menu": "^2.1.15", diff --git a/packages/core/package.json b/packages/core/package.json index ab95b01fb..d10af061e 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@onekeyfe/hd-core", - "version": "1.1.7", + "version": "1.1.8", "description": "> TODO: description", "author": "OneKey", "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme", @@ -25,8 +25,8 @@ "url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues" }, "dependencies": { - "@onekeyfe/hd-shared": "1.1.7", - "@onekeyfe/hd-transport": "1.1.7", + "@onekeyfe/hd-shared": "1.1.8", + "@onekeyfe/hd-transport": "1.1.8", "axios": "^0.27.2", "bignumber.js": "^9.0.2", "bytebuffer": "^5.0.1", diff --git a/packages/core/src/inject.ts b/packages/core/src/inject.ts index 19917a95b..c223885b3 100644 --- a/packages/core/src/inject.ts +++ b/packages/core/src/inject.ts @@ -2,8 +2,9 @@ import { EventEmitter } from 'events'; import { CallMethod } from './events'; import { CoreApi } from './types/api'; import type { AllNetworkAddress } from './types/api/allNetworkGetAddress'; +import { Unsuccessful } from './types'; -type CallbackFunction = (data?: any, error?: { message: string; code?: number }) => void; +type CallbackFunction = (data?: any, error?: Unsuccessful) => void; const callbackManager = new Map(); @@ -179,8 +180,8 @@ export const createCoreApi = ( registerCallback(callbackId, onLoopItemResponse); const callbackIdFinish = generateCallbackId(); - registerCallback(callbackIdFinish, (data?: AllNetworkAddress[]) => { - onAllItemsResponse?.(data); + registerCallback(callbackIdFinish, (data?: AllNetworkAddress[], error?: Unsuccessful) => { + onAllItemsResponse?.(data, error); cleanupCallback(callbackIdFinish); cleanupCallback(callbackId); }); diff --git a/packages/hd-ble-sdk/package.json b/packages/hd-ble-sdk/package.json index c9e595a2b..4f9427f75 100644 --- a/packages/hd-ble-sdk/package.json +++ b/packages/hd-ble-sdk/package.json @@ -1,6 +1,6 @@ { "name": "@onekeyfe/hd-ble-sdk", - "version": "1.1.7", + "version": "1.1.8", "author": "OneKey", "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme", "license": "ISC", @@ -20,8 +20,8 @@ "lint:fix": "eslint . --fix" }, "dependencies": { - "@onekeyfe/hd-core": "1.1.7", - "@onekeyfe/hd-shared": "1.1.7", - "@onekeyfe/hd-transport-react-native": "1.1.7" + "@onekeyfe/hd-core": "1.1.8", + "@onekeyfe/hd-shared": "1.1.8", + "@onekeyfe/hd-transport-react-native": "1.1.8" } } diff --git a/packages/hd-common-connect-sdk/package.json b/packages/hd-common-connect-sdk/package.json index de1d59d49..52dc967c7 100644 --- a/packages/hd-common-connect-sdk/package.json +++ b/packages/hd-common-connect-sdk/package.json @@ -1,6 +1,6 @@ { "name": "@onekeyfe/hd-common-connect-sdk", - "version": "1.1.7", + "version": "1.1.8", "author": "OneKey", "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme", "license": "ISC", @@ -20,11 +20,11 @@ "lint:fix": "eslint . --fix" }, "dependencies": { - "@onekeyfe/hd-core": "1.1.7", - "@onekeyfe/hd-shared": "1.1.7", - "@onekeyfe/hd-transport-emulator": "1.1.7", - "@onekeyfe/hd-transport-http": "1.1.7", - "@onekeyfe/hd-transport-lowlevel": "1.1.7", - "@onekeyfe/hd-transport-web-device": "1.1.7" + "@onekeyfe/hd-core": "1.1.8", + "@onekeyfe/hd-shared": "1.1.8", + "@onekeyfe/hd-transport-emulator": "1.1.8", + "@onekeyfe/hd-transport-http": "1.1.8", + "@onekeyfe/hd-transport-lowlevel": "1.1.8", + "@onekeyfe/hd-transport-web-device": "1.1.8" } } diff --git a/packages/hd-transport-electron/package.json b/packages/hd-transport-electron/package.json index 0779a5135..91a9f47b7 100644 --- a/packages/hd-transport-electron/package.json +++ b/packages/hd-transport-electron/package.json @@ -1,6 +1,6 @@ { "name": "@onekeyfe/hd-transport-electron", - "version": "1.1.7", + "version": "1.1.8", "author": "OneKey", "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme", "license": "MIT", @@ -25,7 +25,7 @@ "electron-log": ">=4.0.0" }, "dependencies": { - "@onekeyfe/hd-shared": "1.1.7" + "@onekeyfe/hd-shared": "1.1.8" }, "devDependencies": { "@types/web-bluetooth": "^0.0.17", diff --git a/packages/hd-transport-emulator/package.json b/packages/hd-transport-emulator/package.json index 9fe13306e..54cbf7634 100644 --- a/packages/hd-transport-emulator/package.json +++ b/packages/hd-transport-emulator/package.json @@ -1,6 +1,6 @@ { "name": "@onekeyfe/hd-transport-emulator", - "version": "1.1.7", + "version": "1.1.8", "description": "hardware emulator transport", "author": "OneKey", "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme", @@ -24,8 +24,8 @@ "url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues" }, "dependencies": { - "@onekeyfe/hd-shared": "1.1.7", - "@onekeyfe/hd-transport": "1.1.7", + "@onekeyfe/hd-shared": "1.1.8", + "@onekeyfe/hd-transport": "1.1.8", "axios": "^0.27.2", "secure-json-parse": "^4.0.0" } diff --git a/packages/hd-transport-http/package.json b/packages/hd-transport-http/package.json index 616906f55..79a13fb80 100644 --- a/packages/hd-transport-http/package.json +++ b/packages/hd-transport-http/package.json @@ -1,6 +1,6 @@ { "name": "@onekeyfe/hd-transport-http", - "version": "1.1.7", + "version": "1.1.8", "description": "hardware http transport", "author": "OneKey", "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme", @@ -24,8 +24,8 @@ "url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues" }, "dependencies": { - "@onekeyfe/hd-shared": "1.1.7", - "@onekeyfe/hd-transport": "1.1.7", + "@onekeyfe/hd-shared": "1.1.8", + "@onekeyfe/hd-transport": "1.1.8", "axios": "^0.27.2", "secure-json-parse": "^4.0.0" } diff --git a/packages/hd-transport-lowlevel/package.json b/packages/hd-transport-lowlevel/package.json index 2a923327e..7473fef38 100644 --- a/packages/hd-transport-lowlevel/package.json +++ b/packages/hd-transport-lowlevel/package.json @@ -1,6 +1,6 @@ { "name": "@onekeyfe/hd-transport-lowlevel", - "version": "1.1.7", + "version": "1.1.8", "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme", "license": "MIT", "main": "dist/index.js", @@ -19,7 +19,7 @@ "lint:fix": "eslint . --fix" }, "dependencies": { - "@onekeyfe/hd-shared": "1.1.7", - "@onekeyfe/hd-transport": "1.1.7" + "@onekeyfe/hd-shared": "1.1.8", + "@onekeyfe/hd-transport": "1.1.8" } } diff --git a/packages/hd-transport-react-native/package.json b/packages/hd-transport-react-native/package.json index 89b815816..b452fc0b9 100644 --- a/packages/hd-transport-react-native/package.json +++ b/packages/hd-transport-react-native/package.json @@ -1,6 +1,6 @@ { "name": "@onekeyfe/hd-transport-react-native", - "version": "1.1.7", + "version": "1.1.8", "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme", "license": "MIT", "main": "dist/index.js", @@ -19,8 +19,8 @@ "lint:fix": "eslint . --fix" }, "dependencies": { - "@onekeyfe/hd-shared": "1.1.7", - "@onekeyfe/hd-transport": "1.1.7", + "@onekeyfe/hd-shared": "1.1.8", + "@onekeyfe/hd-transport": "1.1.8", "@onekeyfe/react-native-ble-utils": "^0.1.4", "react-native-ble-plx": "3.5.0" } diff --git a/packages/hd-transport-web-device/package.json b/packages/hd-transport-web-device/package.json index b758db283..a22b201a3 100644 --- a/packages/hd-transport-web-device/package.json +++ b/packages/hd-transport-web-device/package.json @@ -1,6 +1,6 @@ { "name": "@onekeyfe/hd-transport-web-device", - "version": "1.1.7", + "version": "1.1.8", "author": "OneKey", "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme", "license": "MIT", @@ -20,11 +20,11 @@ "lint:fix": "eslint . --fix" }, "dependencies": { - "@onekeyfe/hd-shared": "1.1.7", - "@onekeyfe/hd-transport": "1.1.7" + "@onekeyfe/hd-shared": "1.1.8", + "@onekeyfe/hd-transport": "1.1.8" }, "devDependencies": { - "@onekeyfe/hd-transport-electron": "1.1.7", + "@onekeyfe/hd-transport-electron": "1.1.8", "@types/w3c-web-usb": "^1.0.6", "@types/web-bluetooth": "^0.0.17" } diff --git a/packages/hd-transport/package.json b/packages/hd-transport/package.json index 29bb14276..f680ebb2f 100644 --- a/packages/hd-transport/package.json +++ b/packages/hd-transport/package.json @@ -1,6 +1,6 @@ { "name": "@onekeyfe/hd-transport", - "version": "1.1.7", + "version": "1.1.8", "description": "> TODO: description", "author": "OneKey", "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme", diff --git a/packages/hd-web-sdk/package.json b/packages/hd-web-sdk/package.json index 68767dc90..db1a35151 100644 --- a/packages/hd-web-sdk/package.json +++ b/packages/hd-web-sdk/package.json @@ -1,6 +1,6 @@ { "name": "@onekeyfe/hd-web-sdk", - "version": "1.1.7", + "version": "1.1.8", "author": "OneKey", "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme", "license": "ISC", @@ -21,10 +21,10 @@ }, "dependencies": { "@onekeyfe/cross-inpage-provider-core": "^0.0.17", - "@onekeyfe/hd-core": "1.1.7", - "@onekeyfe/hd-shared": "1.1.7", - "@onekeyfe/hd-transport-http": "1.1.7", - "@onekeyfe/hd-transport-web-device": "1.1.7" + "@onekeyfe/hd-core": "1.1.8", + "@onekeyfe/hd-shared": "1.1.8", + "@onekeyfe/hd-transport-http": "1.1.8", + "@onekeyfe/hd-transport-web-device": "1.1.8" }, "devDependencies": { "@babel/plugin-proposal-optional-chaining": "^7.17.12", diff --git a/packages/shared/package.json b/packages/shared/package.json index fef8386e9..ad4eaf206 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -1,6 +1,6 @@ { "name": "@onekeyfe/hd-shared", - "version": "1.1.7", + "version": "1.1.8", "description": "Hardware SDK's shared tool library", "keywords": [ "Hardware-SDK",