@onekeyfe/hd-transport-react-native 1.2.0-alpha.123 → 1.2.0-alpha.124
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/index.d.ts.map +1 -1
- package/dist/index.js +6 -12
- package/package.json +5 -5
- package/src/__tests__/enumerate.test.ts +6 -12
- package/src/index.ts +0 -10
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAEA,OAAO,EAIL,UAAU,IAAI,aAAa,EAG5B,MAAM,sBAAsB,CAAC;AAE9B,OAAO,SAAS,EAAE,EAChB,KAAK,oBAAoB,EAIzB,KAAK,YAAY,EAKjB,KAAK,oBAAoB,EAI1B,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -680,10 +680,7 @@ class ReactNativeBleTransport {
|
|
|
680
680
|
}
|
|
681
681
|
const displayName = getDeviceDisplayName(device);
|
|
682
682
|
const isUnnamedIOSPeripheral = reactNative.Platform.OS === 'ios' && !(displayName === null || displayName === void 0 ? void 0 : displayName.trim());
|
|
683
|
-
const isFindMyPeripheral = hdShared.isPro2FindMyAdvertisementName(device === null || device === void 0 ? void 0 : device.name) ||
|
|
684
|
-
hdShared.isPro2FindMyAdvertisementName(device === null || device === void 0 ? void 0 : device.localName);
|
|
685
683
|
const isOneKey = !isUnnamedIOSPeripheral &&
|
|
686
|
-
!isFindMyPeripheral &&
|
|
687
684
|
hdShared.isOnekeyBluetoothDevice({
|
|
688
685
|
id: device === null || device === void 0 ? void 0 : device.id,
|
|
689
686
|
name: device === null || device === void 0 ? void 0 : device.name,
|
|
@@ -707,15 +704,12 @@ class ReactNativeBleTransport {
|
|
|
707
704
|
const localName = 'localName' in device && typeof device.localName === 'string'
|
|
708
705
|
? device.localName
|
|
709
706
|
: null;
|
|
710
|
-
|
|
711
|
-
|
|
712
|
-
|
|
713
|
-
|
|
714
|
-
|
|
715
|
-
|
|
716
|
-
localName,
|
|
717
|
-
serviceUuids: device.serviceUUIDs,
|
|
718
|
-
})) {
|
|
707
|
+
if (hdShared.isOnekeyBluetoothDevice({
|
|
708
|
+
id: device.id,
|
|
709
|
+
name: device.name,
|
|
710
|
+
localName,
|
|
711
|
+
serviceUuids: device.serviceUUIDs,
|
|
712
|
+
})) {
|
|
719
713
|
Log === null || Log === void 0 ? void 0 : Log.debug('search connected peripheral: ', device.id);
|
|
720
714
|
addDevice(device);
|
|
721
715
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@onekeyfe/hd-transport-react-native",
|
|
3
|
-
"version": "1.2.0-alpha.
|
|
3
|
+
"version": "1.2.0-alpha.124",
|
|
4
4
|
"homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -20,11 +20,11 @@
|
|
|
20
20
|
"lint:fix": "eslint . --fix"
|
|
21
21
|
},
|
|
22
22
|
"dependencies": {
|
|
23
|
-
"@onekeyfe/hd-core": "1.2.0-alpha.
|
|
24
|
-
"@onekeyfe/hd-shared": "1.2.0-alpha.
|
|
25
|
-
"@onekeyfe/hd-transport": "1.2.0-alpha.
|
|
23
|
+
"@onekeyfe/hd-core": "1.2.0-alpha.124",
|
|
24
|
+
"@onekeyfe/hd-shared": "1.2.0-alpha.124",
|
|
25
|
+
"@onekeyfe/hd-transport": "1.2.0-alpha.124",
|
|
26
26
|
"@onekeyfe/react-native-ble-utils": "^0.1.6",
|
|
27
27
|
"react-native-ble-plx": "3.5.1"
|
|
28
28
|
},
|
|
29
|
-
"gitHead": "
|
|
29
|
+
"gitHead": "939229b4fe0dd7939b6fa3b2f6801f4e6b055c3b"
|
|
30
30
|
}
|
|
@@ -32,20 +32,14 @@ jest.mock('../subscribeBleOn', () => ({
|
|
|
32
32
|
const ONEKEY_SERVICE_UUID = '00000001-0000-1000-8000-00805f9b34fb';
|
|
33
33
|
|
|
34
34
|
describe('ReactNativeBleTransport iOS discovery', () => {
|
|
35
|
-
test('
|
|
35
|
+
test('keeps a bonded Pro2 communication peripheral after Find My changes its name', async () => {
|
|
36
36
|
jest.mocked(getConnectedDeviceIds).mockResolvedValueOnce([
|
|
37
37
|
{
|
|
38
|
-
id: '
|
|
38
|
+
id: 'wallet-peripheral',
|
|
39
39
|
name: 'Pro2 6E9E - Find My',
|
|
40
40
|
localName: null,
|
|
41
41
|
serviceUUIDs: [ONEKEY_SERVICE_UUID],
|
|
42
42
|
},
|
|
43
|
-
{
|
|
44
|
-
id: 'wallet-peripheral',
|
|
45
|
-
name: 'Pro2 6E9E',
|
|
46
|
-
localName: 'Pro2 6E9E',
|
|
47
|
-
serviceUUIDs: [ONEKEY_SERVICE_UUID],
|
|
48
|
-
},
|
|
49
43
|
] as never);
|
|
50
44
|
const blePlxManager = {
|
|
51
45
|
startDeviceScan: jest.fn(),
|
|
@@ -60,7 +54,7 @@ describe('ReactNativeBleTransport iOS discovery', () => {
|
|
|
60
54
|
expect(devices.map(device => device.id)).toEqual(['wallet-peripheral']);
|
|
61
55
|
});
|
|
62
56
|
|
|
63
|
-
test('
|
|
57
|
+
test('uses services to distinguish a Pro2 communication peripheral from Find My', async () => {
|
|
64
58
|
jest.mocked(getConnectedDeviceIds).mockResolvedValueOnce([]);
|
|
65
59
|
const blePlxManager = {
|
|
66
60
|
startDeviceScan: jest.fn((_serviceUUIDs, _options, listener) => {
|
|
@@ -69,12 +63,12 @@ describe('ReactNativeBleTransport iOS discovery', () => {
|
|
|
69
63
|
id: 'find-my-peripheral',
|
|
70
64
|
name: 'Pro2 6E9E - Find My',
|
|
71
65
|
localName: null,
|
|
72
|
-
serviceUUIDs: [
|
|
66
|
+
serviceUUIDs: ['0000fffd-0000-1000-8000-00805f9b34fb'],
|
|
73
67
|
});
|
|
74
68
|
listener(null, {
|
|
75
69
|
id: 'wallet-peripheral',
|
|
76
|
-
name: 'Pro2 6E9E',
|
|
77
|
-
localName:
|
|
70
|
+
name: 'Pro2 6E9E - Find My',
|
|
71
|
+
localName: null,
|
|
78
72
|
serviceUUIDs: [ONEKEY_SERVICE_UUID],
|
|
79
73
|
});
|
|
80
74
|
});
|
package/src/index.ts
CHANGED
|
@@ -29,7 +29,6 @@ import {
|
|
|
29
29
|
HardwareErrorCode,
|
|
30
30
|
createDeferred,
|
|
31
31
|
isOnekeyBluetoothDevice,
|
|
32
|
-
isPro2FindMyAdvertisementName,
|
|
33
32
|
} from '@onekeyfe/hd-shared';
|
|
34
33
|
|
|
35
34
|
import { getConnectedDeviceIds, onDeviceBondState, pairDevice } from './BleManager';
|
|
@@ -714,12 +713,8 @@ export default class ReactNativeBleTransport {
|
|
|
714
713
|
// iOS may report a service-only advertisement before the named scan response.
|
|
715
714
|
// Do not cache that incomplete advertisement as an unknown device.
|
|
716
715
|
const isUnnamedIOSPeripheral = Platform.OS === 'ios' && !displayName?.trim();
|
|
717
|
-
const isFindMyPeripheral =
|
|
718
|
-
isPro2FindMyAdvertisementName(device?.name) ||
|
|
719
|
-
isPro2FindMyAdvertisementName(device?.localName);
|
|
720
716
|
const isOneKey =
|
|
721
717
|
!isUnnamedIOSPeripheral &&
|
|
722
|
-
!isFindMyPeripheral &&
|
|
723
718
|
isOnekeyBluetoothDevice({
|
|
724
719
|
id: device?.id,
|
|
725
720
|
name: device?.name,
|
|
@@ -746,12 +741,7 @@ export default class ReactNativeBleTransport {
|
|
|
746
741
|
'localName' in device && typeof device.localName === 'string'
|
|
747
742
|
? device.localName
|
|
748
743
|
: null;
|
|
749
|
-
const isFindMyPeripheral =
|
|
750
|
-
isPro2FindMyAdvertisementName(device.name) ||
|
|
751
|
-
isPro2FindMyAdvertisementName(localName);
|
|
752
|
-
|
|
753
744
|
if (
|
|
754
|
-
!isFindMyPeripheral &&
|
|
755
745
|
isOnekeyBluetoothDevice({
|
|
756
746
|
id: device.id,
|
|
757
747
|
name: device.name,
|