@onekeyfe/hd-transport-react-native 1.2.0-alpha.27 → 1.2.0-alpha.29
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 +15 -17
- package/package.json +5 -5
- package/src/index.ts +23 -17
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,EAE5B,MAAM,sBAAsB,CAAC;AAE9B,OAAO,SAAS,EAAE,EAEhB,KAAK,oBAAoB,EAIzB,KAAK,YAAY,EAKjB,KAAK,oBAAoB,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -863,7 +863,7 @@ class ReactNativeBleTransport {
|
|
|
863
863
|
this.monitorTokens.set(uuid, monitorToken);
|
|
864
864
|
transport$1.notifySubscription = this._monitorCharacteristic(transport$1.notifyCharacteristic, uuid, monitorToken, notifyTransactionId);
|
|
865
865
|
transportCache[uuid] = transport$1;
|
|
866
|
-
this.protocolV2Assemblers.set(uuid, new transport.ProtocolV2FrameAssembler());
|
|
866
|
+
this.protocolV2Assemblers.set(uuid, new transport.ProtocolV2FrameAssembler(transport.PROTOCOL_V2_BLE_FRAME_MAX_BYTES));
|
|
867
867
|
if (reactNative.Platform.OS === 'ios') {
|
|
868
868
|
yield new Promise(resolve => {
|
|
869
869
|
setTimeout(resolve, IOS_NOTIFY_READY_DELAY_MS);
|
|
@@ -1574,29 +1574,27 @@ class ReactNativeBleTransport {
|
|
|
1574
1574
|
}
|
|
1575
1575
|
});
|
|
1576
1576
|
}
|
|
1577
|
-
writeProtocolV2Frame(transport, frame, context, assertCurrentGeneration) {
|
|
1577
|
+
writeProtocolV2Frame(transport$1, frame, context, assertCurrentGeneration) {
|
|
1578
1578
|
return __awaiter(this, void 0, void 0, function* () {
|
|
1579
1579
|
const tuning = getProtocolV2BleTuning();
|
|
1580
1580
|
const packetCapacity = resolveProtocolV2PacketCapacity({
|
|
1581
1581
|
platform: reactNative.Platform.OS,
|
|
1582
1582
|
iosPacketLength: tuning.iosPacketLength,
|
|
1583
1583
|
androidPacketLength: tuning.androidPacketLength,
|
|
1584
|
-
mtu: reactNative.Platform.OS === 'android' ? transport.mtuSize : undefined,
|
|
1584
|
+
mtu: reactNative.Platform.OS === 'android' ? transport$1.mtuSize : undefined,
|
|
1585
|
+
});
|
|
1586
|
+
yield transport.writeProtocolV2BleFrame({
|
|
1587
|
+
frame,
|
|
1588
|
+
packetCapacity,
|
|
1589
|
+
assertActive: assertCurrentGeneration,
|
|
1590
|
+
signal: context.signal,
|
|
1591
|
+
abortMessage: `Protocol V2 BLE write aborted for ${context.messageName}`,
|
|
1592
|
+
burstSize: FIRMWARE_UPLOAD_WRITE_BURST_SIZE,
|
|
1593
|
+
burstPauseMs: FIRMWARE_UPLOAD_WRITE_PAUSE_MS,
|
|
1594
|
+
flushDelayMs: FIRMWARE_UPLOAD_WRITE_FLUSH_DELAY_MS,
|
|
1595
|
+
wait: delay,
|
|
1596
|
+
writePacket: packet => this.writeProtocolV2Packet(transport$1, buffer.Buffer.from(packet).toString('base64'), context, assertCurrentGeneration),
|
|
1585
1597
|
});
|
|
1586
|
-
let packetsWritten = 0;
|
|
1587
|
-
for (let offset = 0; offset < frame.length; offset += packetCapacity) {
|
|
1588
|
-
const chunk = frame.slice(offset, offset + packetCapacity);
|
|
1589
|
-
const base64 = buffer.Buffer.from(chunk).toString('base64');
|
|
1590
|
-
yield this.writeProtocolV2Packet(transport, base64, context, assertCurrentGeneration);
|
|
1591
|
-
packetsWritten += 1;
|
|
1592
|
-
if (offset + packetCapacity < frame.length &&
|
|
1593
|
-
packetsWritten % FIRMWARE_UPLOAD_WRITE_BURST_SIZE === 0) {
|
|
1594
|
-
yield delay(FIRMWARE_UPLOAD_WRITE_PAUSE_MS);
|
|
1595
|
-
}
|
|
1596
|
-
}
|
|
1597
|
-
if (packetsWritten > FIRMWARE_UPLOAD_WRITE_BURST_SIZE) {
|
|
1598
|
-
yield delay(FIRMWARE_UPLOAD_WRITE_FLUSH_DELAY_MS);
|
|
1599
|
-
}
|
|
1600
1598
|
});
|
|
1601
1599
|
}
|
|
1602
1600
|
callProtocolV2(uuid, name, data, options) {
|
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.29",
|
|
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.29",
|
|
24
|
+
"@onekeyfe/hd-shared": "1.2.0-alpha.29",
|
|
25
|
+
"@onekeyfe/hd-transport": "1.2.0-alpha.29",
|
|
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": "4a4019e439cc472f89fd15ab47e84ef0ed43166a"
|
|
30
30
|
}
|
package/src/index.ts
CHANGED
|
@@ -21,6 +21,7 @@ import transport, {
|
|
|
21
21
|
TRANSPORT_EVENT,
|
|
22
22
|
type TransportCallOptions,
|
|
23
23
|
probeProtocolV2 as probeProtocolV2Helper,
|
|
24
|
+
writeProtocolV2BleFrame,
|
|
24
25
|
} from '@onekeyfe/hd-transport';
|
|
25
26
|
import { ERRORS, HardwareErrorCode, createDeferred, isOnekeyDevice } from '@onekeyfe/hd-shared';
|
|
26
27
|
|
|
@@ -819,7 +820,10 @@ export default class ReactNativeBleTransport {
|
|
|
819
820
|
);
|
|
820
821
|
transportCache[uuid] = transport;
|
|
821
822
|
|
|
822
|
-
this.protocolV2Assemblers.set(
|
|
823
|
+
this.protocolV2Assemblers.set(
|
|
824
|
+
uuid,
|
|
825
|
+
new ProtocolV2FrameAssembler(PROTOCOL_V2_BLE_FRAME_MAX_BYTES)
|
|
826
|
+
);
|
|
823
827
|
|
|
824
828
|
if (Platform.OS === 'ios') {
|
|
825
829
|
await new Promise<void>(resolve => {
|
|
@@ -1682,22 +1686,24 @@ export default class ReactNativeBleTransport {
|
|
|
1682
1686
|
androidPacketLength: tuning.androidPacketLength,
|
|
1683
1687
|
mtu: Platform.OS === 'android' ? transport.mtuSize : undefined,
|
|
1684
1688
|
});
|
|
1685
|
-
|
|
1686
|
-
|
|
1687
|
-
|
|
1688
|
-
|
|
1689
|
-
|
|
1690
|
-
|
|
1691
|
-
|
|
1692
|
-
|
|
1693
|
-
|
|
1694
|
-
|
|
1695
|
-
|
|
1696
|
-
|
|
1697
|
-
|
|
1698
|
-
|
|
1699
|
-
|
|
1700
|
-
|
|
1689
|
+
await writeProtocolV2BleFrame({
|
|
1690
|
+
frame,
|
|
1691
|
+
packetCapacity,
|
|
1692
|
+
assertActive: assertCurrentGeneration,
|
|
1693
|
+
signal: context.signal,
|
|
1694
|
+
abortMessage: `Protocol V2 BLE write aborted for ${context.messageName}`,
|
|
1695
|
+
burstSize: FIRMWARE_UPLOAD_WRITE_BURST_SIZE,
|
|
1696
|
+
burstPauseMs: FIRMWARE_UPLOAD_WRITE_PAUSE_MS,
|
|
1697
|
+
flushDelayMs: FIRMWARE_UPLOAD_WRITE_FLUSH_DELAY_MS,
|
|
1698
|
+
wait: delay,
|
|
1699
|
+
writePacket: packet =>
|
|
1700
|
+
this.writeProtocolV2Packet(
|
|
1701
|
+
transport,
|
|
1702
|
+
Buffer.from(packet).toString('base64'),
|
|
1703
|
+
context,
|
|
1704
|
+
assertCurrentGeneration
|
|
1705
|
+
),
|
|
1706
|
+
});
|
|
1701
1707
|
}
|
|
1702
1708
|
|
|
1703
1709
|
private async callProtocolV2(
|