diff --git a/packages/connect-examples/electron-example/package.json b/packages/connect-examples/electron-example/package.json index 12d0719b0..8ff898bb8 100644 --- a/packages/connect-examples/electron-example/package.json +++ b/packages/connect-examples/electron-example/package.json @@ -2,7 +2,7 @@ "name": "hardware-example", "productName": "HardwareExample", "executableName": "onekey-hardware-example", - "version": "1.1.12-alpha.0", + "version": "1.1.11-alpha.2", "author": "OneKey", "description": "End-to-end encrypted workspaces for teams", "main": "dist/index.js", @@ -22,7 +22,7 @@ "ts:check": "yarn tsc --noEmit" }, "dependencies": { - "@onekeyfe/hd-transport-electron": "1.1.12-alpha.0", + "@onekeyfe/hd-transport-electron": "1.1.11-alpha.2", "@stoprocent/noble": "2.3.4", "debug": "4.3.4", "electron-is-dev": "^3.0.1", diff --git a/packages/connect-examples/expo-example/package.json b/packages/connect-examples/expo-example/package.json index 05a910205..6c4fcf57d 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.12-alpha.0", + "version": "1.1.11-alpha.2", "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.12-alpha.0", - "@onekeyfe/hd-common-connect-sdk": "1.1.12-alpha.0", - "@onekeyfe/hd-core": "1.1.12-alpha.0", - "@onekeyfe/hd-web-sdk": "1.1.12-alpha.0", + "@onekeyfe/hd-ble-sdk": "1.1.11-alpha.2", + "@onekeyfe/hd-common-connect-sdk": "1.1.11-alpha.2", + "@onekeyfe/hd-core": "1.1.11-alpha.2", + "@onekeyfe/hd-web-sdk": "1.1.11-alpha.2", "@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-playground/package.json b/packages/connect-examples/expo-playground/package.json index e59c138ee..22a128570 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.12-alpha.0", + "version": "1.1.11-alpha.2", "private": true, "sideEffects": [ "app/utils/shim.js", @@ -17,9 +17,9 @@ }, "dependencies": { "@noble/hashes": "^1.8.0", - "@onekeyfe/hd-core": "1.1.12-alpha.0", - "@onekeyfe/hd-shared": "1.1.12-alpha.0", - "@onekeyfe/hd-web-sdk": "1.1.12-alpha.0", + "@onekeyfe/hd-core": "1.1.11-alpha.2", + "@onekeyfe/hd-shared": "1.1.11-alpha.2", + "@onekeyfe/hd-web-sdk": "1.1.11-alpha.2", "@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/connect-examples/shared-constants/package.json b/packages/connect-examples/shared-constants/package.json index 602bc066b..f187964e4 100644 --- a/packages/connect-examples/shared-constants/package.json +++ b/packages/connect-examples/shared-constants/package.json @@ -1,6 +1,6 @@ { "name": "@onekey-internal/shared-constants", - "version": "1.1.12-alpha.0", + "version": "1.1.11-alpha.2", "private": true, "author": "OneKey", "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme", diff --git a/packages/core/package.json b/packages/core/package.json index e28b75bd7..28aab1a5d 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@onekeyfe/hd-core", - "version": "1.1.12-alpha.0", + "version": "1.1.11-alpha.2", "description": "Core processes and APIs for communicating with OneKey hardware devices.", "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.12-alpha.0", - "@onekeyfe/hd-transport": "1.1.12-alpha.0", + "@onekeyfe/hd-shared": "1.1.11-alpha.2", + "@onekeyfe/hd-transport": "1.1.11-alpha.2", "axios": "^0.27.2", "bignumber.js": "^9.0.2", "bytebuffer": "^5.0.1", diff --git a/packages/core/src/core/index.ts b/packages/core/src/core/index.ts index 4a7461d81..4f2a2bc5f 100644 --- a/packages/core/src/core/index.ts +++ b/packages/core/src/core/index.ts @@ -602,7 +602,7 @@ async function connectDeviceForBle(method: BaseMethod, device: Device) { await device.acquire(); await device.initialize(parseInitOptions(method)); } catch (err) { - if (err.errorCode === HardwareErrorCode.BleTimeoutError && bleTimeoutRetry <= 5) { + if (err.errorCode === HardwareErrorCode.BleTimeoutError && bleTimeoutRetry <= 1) { bleTimeoutRetry += 1; Log.debug(`Bletooth connect timeout and will retry, retry count: ${bleTimeoutRetry}`); await wait(3000); diff --git a/packages/hd-ble-sdk/package.json b/packages/hd-ble-sdk/package.json index 7b97387bb..7f1e7f7c5 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.12-alpha.0", + "version": "1.1.11-alpha.2", "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.12-alpha.0", - "@onekeyfe/hd-shared": "1.1.12-alpha.0", - "@onekeyfe/hd-transport-react-native": "1.1.12-alpha.0" + "@onekeyfe/hd-core": "1.1.11-alpha.2", + "@onekeyfe/hd-shared": "1.1.11-alpha.2", + "@onekeyfe/hd-transport-react-native": "1.1.11-alpha.2" } } diff --git a/packages/hd-common-connect-sdk/package.json b/packages/hd-common-connect-sdk/package.json index 8bf5ecf57..8fd35c10e 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.12-alpha.0", + "version": "1.1.11-alpha.2", "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.12-alpha.0", - "@onekeyfe/hd-shared": "1.1.12-alpha.0", - "@onekeyfe/hd-transport-emulator": "1.1.12-alpha.0", - "@onekeyfe/hd-transport-http": "1.1.12-alpha.0", - "@onekeyfe/hd-transport-lowlevel": "1.1.12-alpha.0", - "@onekeyfe/hd-transport-web-device": "1.1.12-alpha.0" + "@onekeyfe/hd-core": "1.1.11-alpha.2", + "@onekeyfe/hd-shared": "1.1.11-alpha.2", + "@onekeyfe/hd-transport-emulator": "1.1.11-alpha.2", + "@onekeyfe/hd-transport-http": "1.1.11-alpha.2", + "@onekeyfe/hd-transport-lowlevel": "1.1.11-alpha.2", + "@onekeyfe/hd-transport-web-device": "1.1.11-alpha.2" } } diff --git a/packages/hd-transport-electron/package.json b/packages/hd-transport-electron/package.json index 7fa2e81d5..669df5bac 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.12-alpha.0", + "version": "1.1.11-alpha.2", "author": "OneKey", "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme", "license": "MIT", @@ -25,9 +25,9 @@ "electron-log": ">=4.0.0" }, "dependencies": { - "@onekeyfe/hd-core": "1.1.12-alpha.0", - "@onekeyfe/hd-shared": "1.1.12-alpha.0", - "@onekeyfe/hd-transport": "1.1.12-alpha.0", + "@onekeyfe/hd-core": "1.1.11-alpha.2", + "@onekeyfe/hd-shared": "1.1.11-alpha.2", + "@onekeyfe/hd-transport": "1.1.11-alpha.2", "@stoprocent/noble": "2.3.4", "p-retry": "^4.6.2" }, diff --git a/packages/hd-transport-emulator/package.json b/packages/hd-transport-emulator/package.json index 3ca88fe68..3f0fb36c6 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.12-alpha.0", + "version": "1.1.11-alpha.2", "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.12-alpha.0", - "@onekeyfe/hd-transport": "1.1.12-alpha.0", + "@onekeyfe/hd-shared": "1.1.11-alpha.2", + "@onekeyfe/hd-transport": "1.1.11-alpha.2", "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 56e145b67..1ce29f0b3 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.12-alpha.0", + "version": "1.1.11-alpha.2", "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.12-alpha.0", - "@onekeyfe/hd-transport": "1.1.12-alpha.0", + "@onekeyfe/hd-shared": "1.1.11-alpha.2", + "@onekeyfe/hd-transport": "1.1.11-alpha.2", "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 ca766adf3..d4d63f814 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.12-alpha.0", + "version": "1.1.11-alpha.2", "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.12-alpha.0", - "@onekeyfe/hd-transport": "1.1.12-alpha.0" + "@onekeyfe/hd-shared": "1.1.11-alpha.2", + "@onekeyfe/hd-transport": "1.1.11-alpha.2" } } diff --git a/packages/hd-transport-react-native/package.json b/packages/hd-transport-react-native/package.json index 68875a52f..657d83a1a 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.12-alpha.0", + "version": "1.1.11-alpha.2", "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme", "license": "MIT", "main": "dist/index.js", @@ -19,9 +19,9 @@ "lint:fix": "eslint . --fix" }, "dependencies": { - "@onekeyfe/hd-shared": "1.1.12-alpha.0", - "@onekeyfe/hd-transport": "1.1.12-alpha.0", - "@onekeyfe/react-native-ble-utils": "^0.1.4", + "@onekeyfe/hd-shared": "1.1.11-alpha.2", + "@onekeyfe/hd-transport": "1.1.11-alpha.2", + "@onekeyfe/react-native-ble-utils": "npm:react-native-ble-utils@^0.1.7", "react-native-ble-plx": "3.5.0" } } diff --git a/packages/hd-transport-react-native/src/index.ts b/packages/hd-transport-react-native/src/index.ts index a20542bea..bf5470862 100644 --- a/packages/hd-transport-react-native/src/index.ts +++ b/packages/hd-transport-react-native/src/index.ts @@ -19,7 +19,12 @@ import { isOnekeyDevice, } from '@onekeyfe/hd-shared'; import type EventEmitter from 'events'; -import { getConnectedDeviceIds, onDeviceBondState, pairDevice } from './BleManager'; +import { + getConnectedDeviceIds, + onDeviceBondState, + pairDevice, + getBondedDevices, +} from './BleManager'; import { subscribeBleOn } from './subscribeBleOn'; import { getBluetoothServiceUuids, @@ -260,9 +265,16 @@ export default class ReactNativeBleTransport { // check device is bonded if (Platform.OS === 'android') { - const bondState = await pairDevice(uuid); - if (bondState.bonding) { - await onDeviceBondState(uuid); + const bondedDevices = await getBondedDevices(); + const existsBondedList = bondedDevices.find( + device => device.id.toLowerCase() === uuid.toLowerCase() + ); + + if (!existsBondedList) { + const bondState = await pairDevice(uuid); + if (bondState.bonding) { + await onDeviceBondState(uuid); + } } } diff --git a/packages/hd-transport-web-device/package.json b/packages/hd-transport-web-device/package.json index 60fbf659a..c2c9f447b 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.12-alpha.0", + "version": "1.1.11-alpha.2", "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.12-alpha.0", - "@onekeyfe/hd-transport": "1.1.12-alpha.0" + "@onekeyfe/hd-shared": "1.1.11-alpha.2", + "@onekeyfe/hd-transport": "1.1.11-alpha.2" }, "devDependencies": { - "@onekeyfe/hd-transport-electron": "1.1.12-alpha.0", + "@onekeyfe/hd-transport-electron": "1.1.11-alpha.2", "@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 8a5878f24..ef2197533 100644 --- a/packages/hd-transport/package.json +++ b/packages/hd-transport/package.json @@ -1,6 +1,6 @@ { "name": "@onekeyfe/hd-transport", - "version": "1.1.12-alpha.0", + "version": "1.1.11-alpha.2", "description": "Transport layer abstractions and utilities for OneKey hardware SDK.", "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 3e03f87c3..27d664d23 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.12-alpha.0", + "version": "1.1.11-alpha.2", "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.12-alpha.0", - "@onekeyfe/hd-shared": "1.1.12-alpha.0", - "@onekeyfe/hd-transport-http": "1.1.12-alpha.0", - "@onekeyfe/hd-transport-web-device": "1.1.12-alpha.0" + "@onekeyfe/hd-core": "1.1.11-alpha.2", + "@onekeyfe/hd-shared": "1.1.11-alpha.2", + "@onekeyfe/hd-transport-http": "1.1.11-alpha.2", + "@onekeyfe/hd-transport-web-device": "1.1.11-alpha.2" }, "devDependencies": { "@babel/plugin-proposal-optional-chaining": "^7.17.12", diff --git a/packages/shared/package.json b/packages/shared/package.json index 50d166590..26980d858 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -1,6 +1,6 @@ { "name": "@onekeyfe/hd-shared", - "version": "1.1.12-alpha.0", + "version": "1.1.11-alpha.2", "description": "Hardware SDK's shared tool library", "keywords": [ "Hardware-SDK", diff --git a/yarn.lock b/yarn.lock index b53c47a1d..ee7f04b45 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4810,10 +4810,10 @@ resolved "https://registry.yarnpkg.com/@onekeyfe/react-native-ble-utils/-/react-native-ble-utils-0.1.3.tgz#5b6b669c53e11b960b77554529d08ef0be2cbf71" integrity sha512-zzLpkjtHZ+GoafJst3gTbvEvPsqeEV3l5FIsmB7Z16MEMSJwkBmH9me/dHvo9qlIcLfttpewAyFQjSfEnrrvOg== -"@onekeyfe/react-native-ble-utils@^0.1.4": - version "0.1.4" - resolved "https://registry.yarnpkg.com/@onekeyfe/react-native-ble-utils/-/react-native-ble-utils-0.1.4.tgz#4a262d30cd226e94f1c697c08a3a85a44310690c" - integrity sha512-DTKjjFKdkGktx/qqdu7STFAjpD6ZI3Rdfcyvv/a1Ho4GBs9F/nOJyxEhqiUNbY4XZoVHSwYy2cxYrdX4zGY6eA== +"@onekeyfe/react-native-ble-utils@npm:react-native-ble-utils@^0.1.7": + version "0.1.7" + resolved "https://registry.yarnpkg.com/react-native-ble-utils/-/react-native-ble-utils-0.1.7.tgz#01c2cfe0edb3f37e86800fa4baa9b347afc8de1b" + integrity sha512-6fttsWSVoYm/r+eHoZOrZbdGIv28d6ugNQVb9KQ01uhfcNthzY23dUluh/AsjZnY9FNCY2bsc9V2vfUYWm2IWA== "@peculiar/asn1-schema@^2.3.8": version "2.3.13"