@onekeyfe/hd-transport-react-native 1.2.11-alpha.2 → 1.2.11-alpha.3
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/bleIosBond.d.ts +3 -0
- package/dist/bleIosBond.d.ts.map +1 -0
- package/dist/index.d.ts +53 -3
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +461 -272
- package/package.json +5 -5
- package/src/__tests__/bleIosBond.test.ts +35 -0
- package/src/__tests__/iosPresentDeviceConnect.test.ts +228 -0
- package/src/__tests__/nativeFrameWrite.test.ts +1 -0
- package/src/__tests__/protocolV2Link.test.ts +486 -3
- package/src/__tests__/releaseBondConcurrency.test.ts +284 -0
- package/src/bleIosBond.ts +39 -0
- package/src/index.ts +622 -336
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"bleIosBond.d.ts","sourceRoot":"","sources":["../src/bleIosBond.ts"],"names":[],"mappings":"AAgBA,eAAO,MAAM,kCAAkC,UAAW,OAAO,KAAG,OAKnE,CAAC;AAEF,eAAO,MAAM,mBAAmB,UAAW,OAAO,gDAejD,CAAC"}
|
package/dist/index.d.ts
CHANGED
|
@@ -105,6 +105,18 @@ declare const ANDROID_LINK_DROP_QUIET_MS = 5000;
|
|
|
105
105
|
* inside the native budget, so this only fires when the native timeout did not.
|
|
106
106
|
*/
|
|
107
107
|
declare const BLE_CONNECT_TIMEOUT_MS: number;
|
|
108
|
+
/**
|
|
109
|
+
* iOS names a bond the device no longer holds only by failing the connect, and
|
|
110
|
+
* on some phones that takes a little longer than the native budget: the
|
|
111
|
+
* attempt is cancelled first, the answer is lost, and two such timeouts reset
|
|
112
|
+
* the BLE manager and end as a connect timeout. A device that was just seen
|
|
113
|
+
* advertising is present, so its connect gets the time iOS needs. Without that
|
|
114
|
+
* sighting the budget stays short, because an absent device never answers.
|
|
115
|
+
*/
|
|
116
|
+
declare const IOS_PRESENT_DEVICE_CONNECT_TIMEOUT_MS = 8000;
|
|
117
|
+
/** How recent a sighting must be to show that the device is present. */
|
|
118
|
+
declare const IOS_PRESENT_DEVICE_WINDOW_MS = 15000;
|
|
119
|
+
declare const IOS_PRESENT_DEVICE_CONNECT_BACKSTOP_MS: number;
|
|
108
120
|
/**
|
|
109
121
|
* Service discovery and characteristic resolution run after connect() succeeds, but
|
|
110
122
|
* CoreBluetooth schedules them on the same serial queue. If that queue is wedged by a
|
|
@@ -132,7 +144,9 @@ declare class ReactNativeBleTransport {
|
|
|
132
144
|
name: string;
|
|
133
145
|
configured: boolean;
|
|
134
146
|
stopped: boolean;
|
|
135
|
-
private readonly
|
|
147
|
+
private readonly activeBondControllers;
|
|
148
|
+
/** When a scan last saw each device on iOS; a fresh sighting earns one longer connect. */
|
|
149
|
+
private iosLastAdvertisedAt;
|
|
136
150
|
scanTimeout: number;
|
|
137
151
|
runPromise: Deferred<any> | null;
|
|
138
152
|
private runPromiseDeviceId;
|
|
@@ -162,6 +176,13 @@ declare class ReactNativeBleTransport {
|
|
|
162
176
|
private silentDetections;
|
|
163
177
|
/** Android endpoints whose cached GATT table is suspect; the next connect refreshes it. */
|
|
164
178
|
private androidGattCacheRefreshes;
|
|
179
|
+
/**
|
|
180
|
+
* Android MACs this transport has observed bonded (from the bonded list, a
|
|
181
|
+
* successful pairDevice, or a completed onDeviceBondState). Used to distinguish
|
|
182
|
+
* "previously paired but the host no longer holds a bond" (re-pair) from
|
|
183
|
+
* "never paired" (plain not-bonded) when createBond() cannot be restarted.
|
|
184
|
+
*/
|
|
185
|
+
private knownBondedDevices;
|
|
165
186
|
private protocolV2Assemblers;
|
|
166
187
|
private protocolV2FrameQueues;
|
|
167
188
|
private protocolV2FramePromises;
|
|
@@ -202,6 +223,29 @@ declare class ReactNativeBleTransport {
|
|
|
202
223
|
uuid: string;
|
|
203
224
|
protocolType: ProtocolType;
|
|
204
225
|
}>;
|
|
226
|
+
private createBondAbortController;
|
|
227
|
+
private releaseBondAbortController;
|
|
228
|
+
private abortActiveBonding;
|
|
229
|
+
/**
|
|
230
|
+
* stop(), cancel(), or disconnect() aborts bonding. Match other acquire
|
|
231
|
+
* paths: report BleDeviceDisconnected so callers do not treat this as a
|
|
232
|
+
* pairing failure that should pop another system dialog.
|
|
233
|
+
*/
|
|
234
|
+
private throwIfBondingStopped;
|
|
235
|
+
/** Retry delay that rejects as soon as stop() or cancel() aborts bonding. */
|
|
236
|
+
private delayUnlessBondingStopped;
|
|
237
|
+
/**
|
|
238
|
+
* Android must bond before GATT so the peripheral cannot trigger its own
|
|
239
|
+
* pairing mid-session. Three cases:
|
|
240
|
+
* - The authoritative bonded list already has the device (OK-66336): skip
|
|
241
|
+
* createBond entirely. BluetoothDevice#bondState can be stale (BOND_NONE)
|
|
242
|
+
* and a blind createBond() then pops a redundant system dialog.
|
|
243
|
+
* - createBond() returns { bonded: false, bonding: false } (OK-64703): retry a
|
|
244
|
+
* bounded number of times with a short settle delay.
|
|
245
|
+
* - Retries exhausted: report a re-pairing error for a device this transport
|
|
246
|
+
* previously observed bonded, otherwise keep the "never paired" error.
|
|
247
|
+
*/
|
|
248
|
+
private ensureAndroidBond;
|
|
205
249
|
private acquireUnlocked;
|
|
206
250
|
_monitorCharacteristic(characteristic: Characteristic, uuid: string, monitorToken: number, notifyTransactionId: string): Subscription;
|
|
207
251
|
release(uuid: string, onclose?: boolean, keepSession?: boolean): Promise<boolean>;
|
|
@@ -216,7 +260,7 @@ declare class ReactNativeBleTransport {
|
|
|
216
260
|
private runNativeTeardown;
|
|
217
261
|
private runBestEffortNativeOperation;
|
|
218
262
|
private runLifecycleOperation;
|
|
219
|
-
cancel(): Promise<void>;
|
|
263
|
+
cancel(uuid?: string): Promise<void>;
|
|
220
264
|
/**
|
|
221
265
|
* Android: request the MTU with nothing queued ahead and never close the client while it is
|
|
222
266
|
* outstanding; a link that times out or stays at MTU 23 is dropped.
|
|
@@ -224,6 +268,12 @@ declare class ReactNativeBleTransport {
|
|
|
224
268
|
private negotiateAndroidMtu;
|
|
225
269
|
/** Close the client and wait out the link idle timer so the next connect gets a fresh link. */
|
|
226
270
|
private dropAndroidLink;
|
|
271
|
+
/**
|
|
272
|
+
* Whether this acquire may spend the longer iOS connect budget. The sighting is used up: the
|
|
273
|
+
* retry that follows a timeout gets no new scan, and the device may have left by then. A
|
|
274
|
+
* firmware-install reconnect keeps its short polling cadence.
|
|
275
|
+
*/
|
|
276
|
+
private takeIosPresentDeviceSighting;
|
|
227
277
|
/** Run a native connect under the JS backstop budget. */
|
|
228
278
|
private connectWithTimeout;
|
|
229
279
|
/** Resolve the complete GATT shape under a budget so acquire() always settles. */
|
|
@@ -305,4 +355,4 @@ declare class ReactNativeBleTransport {
|
|
|
305
355
|
getProtocolType(path: string): ProtocolType | undefined;
|
|
306
356
|
}
|
|
307
357
|
|
|
308
|
-
export { ANDROID_LINK_DROP_QUIET_MS, ANDROID_MTU_EXCHANGE_TIMEOUT_MS, BLE_CONNECT_TIMEOUT_MANAGER_RESET_THRESHOLD, BLE_CONNECT_TIMEOUT_MS, BLE_GATT_SETUP_TIMEOUT_MS, BLE_NATIVE_TEARDOWN_TIMEOUT_MS, BLE_SETUP_WEDGED_MESSAGE, BLE_WRITE_PACKET_TIMEOUT_MS, BLE_WRITE_TIMEOUT_MANAGER_RESET_THRESHOLD, IOneKeyDevice, PROTOCOL_REPROBE_FALLBACK_ATTEMPTS, ProtocolV2BleTuning, configureProtocolV2BleTuning, ReactNativeBleTransport as default, getFirmwareUploadWriteRetryType, getProtocolV2BleTuning, resetProtocolV2BleTuning };
|
|
358
|
+
export { ANDROID_LINK_DROP_QUIET_MS, ANDROID_MTU_EXCHANGE_TIMEOUT_MS, BLE_CONNECT_TIMEOUT_MANAGER_RESET_THRESHOLD, BLE_CONNECT_TIMEOUT_MS, BLE_GATT_SETUP_TIMEOUT_MS, BLE_NATIVE_TEARDOWN_TIMEOUT_MS, BLE_SETUP_WEDGED_MESSAGE, BLE_WRITE_PACKET_TIMEOUT_MS, BLE_WRITE_TIMEOUT_MANAGER_RESET_THRESHOLD, IOS_PRESENT_DEVICE_CONNECT_BACKSTOP_MS, IOS_PRESENT_DEVICE_CONNECT_TIMEOUT_MS, IOS_PRESENT_DEVICE_WINDOW_MS, IOneKeyDevice, PROTOCOL_REPROBE_FALLBACK_ATTEMPTS, ProtocolV2BleTuning, configureProtocolV2BleTuning, ReactNativeBleTransport as default, getFirmwareUploadWriteRetryType, getProtocolV2BleTuning, resetProtocolV2BleTuning };
|
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,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|