@onekeyfe/hd-transport-react-native 1.2.0-alpha.168 → 1.2.0-alpha.169
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 +9 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +20 -1
- package/package.json +5 -5
- package/src/__tests__/protocolV2Link.test.ts +18 -0
- package/src/index.ts +35 -3
package/dist/index.d.ts
CHANGED
|
@@ -38,6 +38,14 @@ type BleAcquireInput = {
|
|
|
38
38
|
protocolHint?: ProtocolType;
|
|
39
39
|
};
|
|
40
40
|
|
|
41
|
+
type FirmwareInstallBleAcquireInput = BleAcquireInput & {
|
|
42
|
+
/**
|
|
43
|
+
* Reuse the already-verified protocol after an expected firmware-install
|
|
44
|
+
* disconnect. The install loader accepts status requests but may not answer
|
|
45
|
+
* the generic protocol probe used by a normal acquire.
|
|
46
|
+
*/
|
|
47
|
+
skipProtocolProbe?: boolean;
|
|
48
|
+
};
|
|
41
49
|
type FirmwareUploadWriteRetryType = 'congested';
|
|
42
50
|
type ResolvedBleCharacteristics = {
|
|
43
51
|
writeCharacteristic: Characteristic;
|
|
@@ -155,7 +163,7 @@ declare class ReactNativeBleTransport {
|
|
|
155
163
|
*/
|
|
156
164
|
enumerate(): Promise<IOneKeyDevice[]>;
|
|
157
165
|
private installTransportForAcquire;
|
|
158
|
-
acquire(input:
|
|
166
|
+
acquire(input: FirmwareInstallBleAcquireInput): Promise<{
|
|
159
167
|
uuid: string;
|
|
160
168
|
protocolType: ProtocolType;
|
|
161
169
|
}>;
|
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;AA0BhC,OAAO,YAAY,MAAM,gBAAgB,CAAC;AAI1C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACjF,OAAO,KAAK,YAAY,MAAM,QAAQ,CAAC;AACvC,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -802,7 +802,7 @@ class ReactNativeBleTransport {
|
|
|
802
802
|
acquireUnlocked(input) {
|
|
803
803
|
var _a;
|
|
804
804
|
return __awaiter(this, void 0, void 0, function* () {
|
|
805
|
-
const { uuid, forceCleanRunPromise, expectedProtocol } = input;
|
|
805
|
+
const { uuid, forceCleanRunPromise, expectedProtocol, skipProtocolProbe } = input;
|
|
806
806
|
const cachedTransport = transportCache[uuid];
|
|
807
807
|
if (cachedTransport) {
|
|
808
808
|
const cachedProtocol = this.deviceProtocol.get(uuid);
|
|
@@ -924,6 +924,25 @@ class ReactNativeBleTransport {
|
|
|
924
924
|
notifyCharacteristic,
|
|
925
925
|
});
|
|
926
926
|
try {
|
|
927
|
+
if (skipProtocolProbe) {
|
|
928
|
+
if (!expectedProtocol) {
|
|
929
|
+
throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'skipProtocolProbe requires an expected BLE protocol');
|
|
930
|
+
}
|
|
931
|
+
this.deviceProtocol.set(uuid, expectedProtocol);
|
|
932
|
+
this.sessionProtocols.set(uuid, expectedProtocol);
|
|
933
|
+
this.protocolReprobeFailures.delete(uuid);
|
|
934
|
+
Log === null || Log === void 0 ? void 0 : Log.debug('[ReactNativeBleTransport] protocol selected without probe', {
|
|
935
|
+
deviceId: uuid,
|
|
936
|
+
protocol: expectedProtocol,
|
|
937
|
+
source: 'firmware-install-reconnect',
|
|
938
|
+
});
|
|
939
|
+
const currentTransport = transportCache[uuid];
|
|
940
|
+
if (!currentTransport) {
|
|
941
|
+
throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.TransportNotFound);
|
|
942
|
+
}
|
|
943
|
+
this.attachDisconnectSubscription(currentTransport, currentTransport.device, uuid);
|
|
944
|
+
return { uuid, protocolType: expectedProtocol };
|
|
945
|
+
}
|
|
927
946
|
const protocolType = yield this.detectProtocol(uuid, expectedProtocol, protocolHint, () => __awaiter(this, void 0, void 0, function* () {
|
|
928
947
|
yield this.installTransportForAcquire(uuid, acquiredDevice);
|
|
929
948
|
}));
|
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.169",
|
|
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.169",
|
|
24
|
+
"@onekeyfe/hd-shared": "1.2.0-alpha.169",
|
|
25
|
+
"@onekeyfe/hd-transport": "1.2.0-alpha.169",
|
|
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": "79c2f32cf0d21d9f1ff3d4d8728b8c83bf48c0e9"
|
|
30
30
|
}
|
|
@@ -424,6 +424,24 @@ describe('ReactNativeBleTransport Protocol V2 link lifecycle', () => {
|
|
|
424
424
|
await transport.release(uuid, true);
|
|
425
425
|
});
|
|
426
426
|
|
|
427
|
+
test('reacquires a known Protocol V2 firmware install link without sending Ping', async () => {
|
|
428
|
+
const { transport, uuid, writeCharacteristic } = createHarness();
|
|
429
|
+
const probeProtocolV2 = jest.spyOn(transport as any, 'probeProtocolV2');
|
|
430
|
+
|
|
431
|
+
await expect(
|
|
432
|
+
transport.acquire({ uuid, expectedProtocol: 'V2', skipProtocolProbe: true })
|
|
433
|
+
).resolves.toEqual({
|
|
434
|
+
uuid,
|
|
435
|
+
protocolType: 'V2',
|
|
436
|
+
});
|
|
437
|
+
|
|
438
|
+
expect(probeProtocolV2).not.toHaveBeenCalled();
|
|
439
|
+
expect(writeCharacteristic.writeWithResponse).not.toHaveBeenCalled();
|
|
440
|
+
expect(writeCharacteristic.writeWithoutResponse).not.toHaveBeenCalled();
|
|
441
|
+
expect(transport.getProtocolType(uuid)).toBe('V2');
|
|
442
|
+
await transport.release(uuid, true);
|
|
443
|
+
});
|
|
444
|
+
|
|
427
445
|
test.each(['ios', 'android'] as const)(
|
|
428
446
|
'keeps a first expected Protocol V2 probe miss retryable on %s',
|
|
429
447
|
async platform => {
|
package/src/index.ts
CHANGED
|
@@ -58,6 +58,15 @@ import type { Characteristic, Device, Subscription } from 'react-native-ble-plx'
|
|
|
58
58
|
import type EventEmitter from 'events';
|
|
59
59
|
import type { BleAcquireInput, TransportOptions } from './types';
|
|
60
60
|
|
|
61
|
+
type FirmwareInstallBleAcquireInput = BleAcquireInput & {
|
|
62
|
+
/**
|
|
63
|
+
* Reuse the already-verified protocol after an expected firmware-install
|
|
64
|
+
* disconnect. The install loader accepts status requests but may not answer
|
|
65
|
+
* the generic protocol probe used by a normal acquire.
|
|
66
|
+
*/
|
|
67
|
+
skipProtocolProbe?: boolean;
|
|
68
|
+
};
|
|
69
|
+
|
|
61
70
|
const { check, ProtocolV1, parseConfigure } = transport;
|
|
62
71
|
|
|
63
72
|
const Log = bleLogger;
|
|
@@ -865,7 +874,7 @@ export default class ReactNativeBleTransport {
|
|
|
865
874
|
return transport;
|
|
866
875
|
}
|
|
867
876
|
|
|
868
|
-
async acquire(input:
|
|
877
|
+
async acquire(input: FirmwareInstallBleAcquireInput) {
|
|
869
878
|
const { uuid } = input;
|
|
870
879
|
|
|
871
880
|
if (!uuid) {
|
|
@@ -875,8 +884,8 @@ export default class ReactNativeBleTransport {
|
|
|
875
884
|
return this.runLifecycleOperation(uuid, () => this.acquireUnlocked(input));
|
|
876
885
|
}
|
|
877
886
|
|
|
878
|
-
private async acquireUnlocked(input:
|
|
879
|
-
const { uuid, forceCleanRunPromise, expectedProtocol } = input;
|
|
887
|
+
private async acquireUnlocked(input: FirmwareInstallBleAcquireInput) {
|
|
888
|
+
const { uuid, forceCleanRunPromise, expectedProtocol, skipProtocolProbe } = input;
|
|
880
889
|
|
|
881
890
|
const cachedTransport = transportCache[uuid];
|
|
882
891
|
if (cachedTransport) {
|
|
@@ -1031,6 +1040,29 @@ export default class ReactNativeBleTransport {
|
|
|
1031
1040
|
});
|
|
1032
1041
|
|
|
1033
1042
|
try {
|
|
1043
|
+
if (skipProtocolProbe) {
|
|
1044
|
+
if (!expectedProtocol) {
|
|
1045
|
+
throw ERRORS.TypedError(
|
|
1046
|
+
HardwareErrorCode.RuntimeError,
|
|
1047
|
+
'skipProtocolProbe requires an expected BLE protocol'
|
|
1048
|
+
);
|
|
1049
|
+
}
|
|
1050
|
+
this.deviceProtocol.set(uuid, expectedProtocol);
|
|
1051
|
+
this.sessionProtocols.set(uuid, expectedProtocol);
|
|
1052
|
+
this.protocolReprobeFailures.delete(uuid);
|
|
1053
|
+
Log?.debug('[ReactNativeBleTransport] protocol selected without probe', {
|
|
1054
|
+
deviceId: uuid,
|
|
1055
|
+
protocol: expectedProtocol,
|
|
1056
|
+
source: 'firmware-install-reconnect',
|
|
1057
|
+
});
|
|
1058
|
+
const currentTransport = transportCache[uuid];
|
|
1059
|
+
if (!currentTransport) {
|
|
1060
|
+
throw ERRORS.TypedError(HardwareErrorCode.TransportNotFound);
|
|
1061
|
+
}
|
|
1062
|
+
this.attachDisconnectSubscription(currentTransport, currentTransport.device, uuid);
|
|
1063
|
+
return { uuid, protocolType: expectedProtocol };
|
|
1064
|
+
}
|
|
1065
|
+
|
|
1034
1066
|
const protocolType = await this.detectProtocol(
|
|
1035
1067
|
uuid,
|
|
1036
1068
|
expectedProtocol,
|