Fix/android ble #557
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| { | ||
| "name": "@onekeyfe/hd-transport-emulator", | ||
| "version": "1.1.11-alpha.2", | ||
|
There was a problem hiding this comment. 🧹 Nitpick (assertive) Use alpha dist-tag on publish. Same prerelease safeguard here. "publishConfig": {
- "access": "public"
+ "access": "public",
+ "tag": "alpha"
},Also applies to: 27-28 🤖 Prompt for AI Agents |
||
| "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.11-alpha.2", | ||
| "@onekeyfe/hd-transport": "1.1.11-alpha.2", | ||
| "axios": "^0.27.2", | ||
| "secure-json-parse": "^4.0.0" | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| @@ -1,6 +1,6 @@ | ||||||||||||||||||||
| { | ||||||||||||||||||||
| "name": "@onekeyfe/hd-transport-http", | ||||||||||||||||||||
| "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.11-alpha.2", | ||||||||||||||||||||
| "@onekeyfe/hd-transport": "1.1.11-alpha.2", | ||||||||||||||||||||
| "axios": "^0.27.2", | ||||||||||||||||||||
| "secure-json-parse": "^4.0.0" | ||||||||||||||||||||
| } | ||||||||||||||||||||
|
Comment on lines
+27
to
31
There was a problem hiding this comment. 🧹 Nitpick (assertive) Plan axios upgrade to ^1.x in a follow-up. ^0.27.2 is dated; upgrade separately and run tests. Also add an alpha dist-tag: "publishConfig": {
- "access": "public"
+ "access": "public",
+ "tag": "alpha"
},📝 Committable suggestion
Suggested change
🤖 Prompt for AI Agents |
||||||||||||||||||||
|
|
||||||||||||||||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| { | ||
| "name": "@onekeyfe/hd-transport-lowlevel", | ||
| "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.11-alpha.2", | ||
| "@onekeyfe/hd-transport": "1.1.11-alpha.2" | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| @@ -1,6 +1,6 @@ | ||||||||||||||||||||||||||||||||||||||||
| { | ||||||||||||||||||||||||||||||||||||||||
| "name": "@onekeyfe/hd-transport-react-native", | ||||||||||||||||||||||||||||||||||||||||
| "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.11-alpha.2", | ||||||||||||||||||||||||||||||||||||||||
| "@onekeyfe/hd-transport": "1.1.11-alpha.2", | ||||||||||||||||||||||||||||||||||||||||
| "@onekeyfe/react-native-ble-utils": "npm:react-native-ble-utils@^0.1.7", | ||||||||||||||||||||||||||||||||||||||||
|
Comment on lines
+22
to
+24
There was a problem hiding this comment. 💡 Verification agent 🧩 Analysis chainPin internal deps consistently across the monorepo. All internal @onekeyfe deps here use 1.1.11-alpha.2. Make sure every package matches to prevent install 404s. Run: 🏁 Script executed: #!/bin/bash
set -euo pipefail
echo "Internal versions:"
jq -r 'select(.name|startswith("@onekeyfe/")) | "\(.name)@\(.version)"' packages/**/package.json | sort
echo
echo "Cross-dep pins not matching their package version:"
python - <<'PY'
import json,glob,os,sys
issues=[]
for path in glob.glob("packages/**/package.json", recursive=True):
data=json.load(open(path))
name=data.get("name","")
version=data.get("version","")
for sec in ("dependencies","devDependencies","peerDependencies"):
for k,v in (data.get(sec) or {}).items():
if k.startswith("@onekeyfe/") and v==version: continue
# naive check: ensure internal deps are pinned to some 1.1.11-alpha.2
for sec in ("dependencies","devDependencies"):
deps=(data.get(sec) or {})
for k,v in deps.items():
if k.startswith("@onekeyfe/") and "1.1.11-alpha.2" not in v:
issues.append((path,k,v))
for p,k,v in issues: print(f"{p}: {k} -> {v}")
PYLength of output: 1550 Pin internal @onekeyfe deps to 1.1.11-alpha.2 across the repo Detected mismatches:
Update these to 1.1.11-alpha.2 to prevent install errors. 🤖 Prompt for AI Agents |
||||||||||||||||||||||||||||||||||||||||
| "react-native-ble-plx": "3.5.0" | ||||||||||||||||||||||||||||||||||||||||
|
Comment on lines
+22
to
25
There was a problem hiding this comment. 💡 Verification agent 🧩 Analysis chainVerify npm alias for @onekeyfe/react-native-ble-utils. You map the scoped name to external Proposed options: - "@onekeyfe/react-native-ble-utils": "npm:react-native-ble-utils@^0.1.7",
+ "react-native-ble-utils": "^0.1.7",or - "@onekeyfe/react-native-ble-utils": "npm:react-native-ble-utils@^0.1.7",
+ "@onekeyfe/react-native-ble-utils": "1.1.11-alpha.2",Also add an alpha dist-tag to avoid publishing under latest: "publishConfig": {
- "access": "public"
+ "access": "public",
+ "tag": "alpha"
},🏁 Script executed: #!/bin/bash
# Locate internal @onekeyfe/react-native-ble-utils package.json
internal_file=$(rg -l '"name": "@onekeyfe/react-native-ble-utils"' -n .)
echo "Internal file: ${internal_file:-not found}"
if [ -n "$internal_file" ]; then
grep -n '"version"' "$internal_file"
fi
# Check publishConfig in hd-transport-react-native
pkg="packages/hd-transport-react-native/package.json"
echo ""
echo "publishConfig snippet from $pkg:"
grep -n '"publishConfig"' -C3 "$pkg" || echo "publishConfig not found"Length of output: 616 Use direct packages/hd-transport-react-native/package.json
@@ Lines 22-25
- "@onekeyfe/react-native-ble-utils": "npm:react-native-ble-utils@^0.1.7",
+ "react-native-ble-utils": "^0.1.7",
@@ publishConfig
- "access": "public"
+ "access": "public",
+ "tag": "alpha"📝 Committable suggestion
Suggested change
🤖 Prompt for AI Agents |
||||||||||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||||||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -19,7 +19,12 @@ import { | |
| isOnekeyDevice, | ||
| } from '@onekeyfe/hd-shared'; | ||
| import type EventEmitter from 'events'; | ||
| 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 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); | ||
| } | ||
ByteZhang1024 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
| } | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| { | ||
| "name": "@onekeyfe/hd-transport-web-device", | ||
| "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.11-alpha.2", | ||
| "@onekeyfe/hd-transport": "1.1.11-alpha.2" | ||
| }, | ||
| "devDependencies": { | ||
| "@onekeyfe/hd-transport-electron": "1.1.11-alpha.2", | ||
| "@types/w3c-web-usb": "^1.0.6", | ||
| "@types/web-bluetooth": "^0.0.17" | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| { | ||
| "name": "@onekeyfe/hd-transport", | ||
| "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", | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| { | ||
| "name": "@onekeyfe/hd-web-sdk", | ||
| "version": "1.1.11-alpha.2", | ||
|
There was a problem hiding this comment. 💡 Verification agent 🧩 Analysis chainVerify workspace-wide prerelease tagging and version sync. Confirm all packages on 1.1.11-alpha.2 have publishConfig.tag set to alpha and no stragglers remain. Also applies to: 24-27 🏁 Script executed: #!/bin/bash
set -euo pipefail
# Find package.json files under packages/
fd -a package.json packages | while read -r f; do
python - <<'PY' "$f"
import json,sys,os
p=sys.argv[1]
with open(p) as fh:
j=json.load(fh)
name=j.get("name", os.path.dirname(p))
ver=j.get("version","")
pc=j.get("publishConfig",{})
tag=(pc or {}).get("tag")
if "-" in ver and not (isinstance(pc,dict) and tag=="alpha"):
print(f"MISSING alpha tag: {p} name={name} version={ver} publishConfig={pc}")
PY
done
echo
echo "Check internal dep pins:"
rg -nP '"@onekeyfe/[^"]+":\s*"1\.1\.11-alpha\.2"' packages | wc -lLength of output: 4256 Add missing alpha publish tags
🤖 Prompt for AI Agents |
||
| "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.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", | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| @@ -1,6 +1,6 @@ | ||||||||||||
| { | ||||||||||||
| "name": "@onekeyfe/hd-shared", | ||||||||||||
| "version": "1.1.11-alpha.2", | ||||||||||||
|
There was a problem hiding this comment. 🧹 Nitpick (assertive) Version bump looks good. Add a pre-release publish tag. To avoid publishing this alpha as "latest" on npm, set a publish tag. Apply: - "publishConfig": {
- "access": "public"
- },
+ "publishConfig": {
+ "access": "public",
+ "tag": "next"
+ },📝 Committable suggestion
Suggested change
🤖 Prompt for AI Agents |
||||||||||||
| "description": "Hardware SDK's shared tool library", | ||||||||||||
| "keywords": [ | ||||||||||||
| "Hardware-SDK", | ||||||||||||
|
|
||||||||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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@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" | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🛠️ Refactor suggestion
Mark example app as private to avoid accidental publish.
Add
"private": true. It’s an example; don’t risk publishing it."executableName": "onekey-hardware-example", "version": "1.1.11-alpha.2", + "private": true, "author": "OneKey",📝 Committable suggestion
🤖 Prompt for AI Agents