@robdobsn/raftjs 1.3.1 → 1.5.0
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/react-native/RaftAttributeHandler.d.ts +1 -1
- package/dist/react-native/RaftAttributeHandler.js +12 -9
- package/dist/react-native/RaftAttributeHandler.js.map +1 -1
- package/dist/react-native/RaftChannelBLE.native.d.ts +9 -13
- package/dist/react-native/RaftChannelBLE.native.js +33 -43
- package/dist/react-native/RaftChannelBLE.native.js.map +1 -1
- package/dist/react-native/RaftChannelBLE.web.d.ts +3 -3
- package/dist/react-native/RaftChannelBLE.web.js +23 -7
- package/dist/react-native/RaftChannelBLE.web.js.map +1 -1
- package/dist/react-native/RaftChannelBLEScanner.native.d.ts +6 -6
- package/dist/react-native/RaftChannelBLEScanner.native.js +38 -39
- package/dist/react-native/RaftChannelBLEScanner.native.js.map +1 -1
- package/dist/react-native/RaftConnector.d.ts +3 -3
- package/dist/react-native/RaftConnector.js +3 -3
- package/dist/react-native/RaftConnector.js.map +1 -1
- package/dist/react-native/RaftCustomAttrHandler.d.ts +1 -1
- package/dist/react-native/RaftCustomAttrHandler.js +4 -4
- package/dist/react-native/RaftCustomAttrHandler.js.map +1 -1
- package/dist/react-native/RaftDeviceManager.d.ts +3 -3
- package/dist/react-native/RaftDeviceManager.js +12 -9
- package/dist/react-native/RaftDeviceManager.js.map +1 -1
- package/dist/react-native/RaftDeviceMgrIF.d.ts +2 -3
- package/dist/react-native/RaftDeviceStates.js +1 -1
- package/dist/react-native/RaftDeviceStates.js.map +1 -1
- package/dist/react-native/RaftMsgHandler.js +1 -2
- package/dist/react-native/RaftMsgHandler.js.map +1 -1
- package/dist/react-native/RaftStruct.d.ts +3 -0
- package/dist/react-native/RaftStruct.js +207 -0
- package/dist/react-native/RaftStruct.js.map +1 -0
- package/dist/react-native/RaftSysTypeManager.d.ts +14 -0
- package/dist/react-native/RaftSysTypeManager.js +53 -0
- package/dist/react-native/RaftSysTypeManager.js.map +1 -0
- package/dist/react-native/RaftSystemType.d.ts +4 -0
- package/dist/react-native/RaftTypes.d.ts +2 -2
- package/dist/react-native/RaftTypes.js +3 -3
- package/dist/react-native/RaftTypes.js.map +1 -1
- package/dist/react-native/RaftUpdateManager.js +6 -3
- package/dist/react-native/RaftUpdateManager.js.map +1 -1
- package/dist/react-native/RaftUtils.d.ts +1 -0
- package/dist/react-native/RaftUtils.js +17 -4
- package/dist/react-native/RaftUtils.js.map +1 -1
- package/dist/react-native/main.d.ts +1 -0
- package/dist/react-native/main.js +3 -1
- package/dist/react-native/main.js.map +1 -1
- package/dist/web/RaftAttributeHandler.d.ts +1 -1
- package/dist/web/RaftAttributeHandler.js +12 -9
- package/dist/web/RaftAttributeHandler.js.map +1 -1
- package/dist/web/RaftChannelBLE.web.d.ts +3 -3
- package/dist/web/RaftChannelBLE.web.js +23 -7
- package/dist/web/RaftChannelBLE.web.js.map +1 -1
- package/dist/web/RaftConnector.d.ts +3 -3
- package/dist/web/RaftConnector.js +3 -3
- package/dist/web/RaftConnector.js.map +1 -1
- package/dist/web/RaftCustomAttrHandler.d.ts +1 -1
- package/dist/web/RaftCustomAttrHandler.js +4 -4
- package/dist/web/RaftCustomAttrHandler.js.map +1 -1
- package/dist/web/RaftDeviceManager.d.ts +3 -3
- package/dist/web/RaftDeviceManager.js +12 -9
- package/dist/web/RaftDeviceManager.js.map +1 -1
- package/dist/web/RaftDeviceMgrIF.d.ts +2 -3
- package/dist/web/RaftDeviceStates.js +1 -1
- package/dist/web/RaftDeviceStates.js.map +1 -1
- package/dist/web/RaftMsgHandler.js +1 -2
- package/dist/web/RaftMsgHandler.js.map +1 -1
- package/dist/web/RaftStruct.d.ts +3 -0
- package/dist/web/RaftStruct.js +207 -0
- package/dist/web/RaftStruct.js.map +1 -0
- package/dist/web/RaftSysTypeManager.d.ts +14 -0
- package/dist/web/RaftSysTypeManager.js +53 -0
- package/dist/web/RaftSysTypeManager.js.map +1 -0
- package/dist/web/RaftSystemType.d.ts +4 -0
- package/dist/web/RaftTypes.d.ts +2 -2
- package/dist/web/RaftTypes.js +3 -3
- package/dist/web/RaftTypes.js.map +1 -1
- package/dist/web/RaftUpdateManager.js +6 -3
- package/dist/web/RaftUpdateManager.js.map +1 -1
- package/dist/web/RaftUtils.d.ts +1 -0
- package/dist/web/RaftUtils.js +17 -4
- package/dist/web/RaftUtils.js.map +1 -1
- package/dist/web/main.d.ts +1 -0
- package/dist/web/main.js +3 -1
- package/dist/web/main.js.map +1 -1
- package/examples/dashboard/package.json +2 -12
- package/examples/dashboard/src/ConnManager.ts +13 -21
- package/examples/dashboard/src/Main.tsx +15 -7
- package/examples/dashboard/src/SystemTypeCog/CogStateInfo.ts +5 -10
- package/examples/dashboard/src/SystemTypeCog/SystemTypeCog.ts +3 -0
- package/examples/dashboard/src/SystemTypeGeneric/StateInfoGeneric.ts +24 -0
- package/examples/dashboard/src/SystemTypeGeneric/SystemTypeGeneric.ts +87 -0
- package/examples/dashboard/src/SystemTypeMarty/SystemTypeMarty.ts +3 -0
- package/examples/dashboard/src/index.tsx +0 -2
- package/examples/dashboard/src/styles.css +13 -2
- package/package.json +2 -11
- package/src/RaftAttributeHandler.ts +16 -13
- package/src/RaftChannelBLE.native.ts +43 -54
- package/src/RaftChannelBLE.web.ts +45 -28
- package/src/RaftChannelBLEScanner.native.ts +37 -39
- package/src/RaftConnector.ts +3 -3
- package/src/RaftCustomAttrHandler.ts +5 -5
- package/src/RaftDeviceManager.ts +16 -14
- package/src/RaftDeviceMgrIF.ts +2 -3
- package/src/RaftDeviceStates.ts +1 -1
- package/src/RaftMsgHandler.ts +1 -2
- package/src/RaftStruct.ts +208 -0
- package/src/RaftSysTypeManager.ts +60 -0
- package/src/RaftSystemType.ts +4 -0
- package/src/RaftTypes.ts +2 -2
- package/src/RaftUpdateManager.ts +6 -3
- package/src/RaftUtils.ts +14 -4
- package/src/main.ts +1 -1
|
@@ -5,7 +5,7 @@ export default class AttributeHandler {
|
|
|
5
5
|
private POLL_RESULT_TIMESTAMP_SIZE;
|
|
6
6
|
private POLL_RESULT_WRAP_VALUE;
|
|
7
7
|
private POLL_RESULT_RESOLUTION_US;
|
|
8
|
-
processMsgAttrGroup(msgBuffer:
|
|
8
|
+
processMsgAttrGroup(msgBuffer: Uint8Array, msgBufIdx: number, deviceTimeline: DeviceTimeline, pollRespMetadata: DeviceTypePollRespMetadata, devAttrsState: DeviceAttributesState, maxDataPoints: number): number;
|
|
9
9
|
private processMsgAttribute;
|
|
10
10
|
private signExtend;
|
|
11
11
|
private extractTimestampAndAdvanceIdx;
|
|
@@ -11,7 +11,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
11
11
|
const tslib_1 = require("tslib");
|
|
12
12
|
const RaftCustomAttrHandler_1 = tslib_1.__importDefault(require("./RaftCustomAttrHandler"));
|
|
13
13
|
const RaftDeviceInfo_1 = require("./RaftDeviceInfo");
|
|
14
|
-
const
|
|
14
|
+
const RaftStruct_1 = require("./RaftStruct");
|
|
15
15
|
class AttributeHandler {
|
|
16
16
|
constructor() {
|
|
17
17
|
// Custom attribute handler
|
|
@@ -24,7 +24,7 @@ class AttributeHandler {
|
|
|
24
24
|
processMsgAttrGroup(msgBuffer, msgBufIdx, deviceTimeline, pollRespMetadata, devAttrsState, maxDataPoints) {
|
|
25
25
|
// console.log(`processMsgAttrGroup msg ${msgHexStr} timestamp ${timestamp} origTimestamp ${origTimestamp} msgBufIdx ${msgBufIdx}`)
|
|
26
26
|
// Extract msg timestamp
|
|
27
|
-
|
|
27
|
+
const { newBufIdx, timestampUs } = this.extractTimestampAndAdvanceIdx(msgBuffer, msgBufIdx, deviceTimeline);
|
|
28
28
|
if (newBufIdx < 0)
|
|
29
29
|
return -1;
|
|
30
30
|
msgBufIdx = newBufIdx;
|
|
@@ -57,14 +57,17 @@ class AttributeHandler {
|
|
|
57
57
|
}
|
|
58
58
|
}
|
|
59
59
|
// Number of bytes in group
|
|
60
|
-
|
|
60
|
+
let pollRespSizeBytes = msgBufIdx - msgDataStartIdx;
|
|
61
|
+
if (pollRespSizeBytes < pollRespMetadata.b) {
|
|
62
|
+
pollRespSizeBytes = pollRespMetadata.b;
|
|
63
|
+
}
|
|
61
64
|
// Check if any attributes were added (in addition to timestamp)
|
|
62
65
|
if (newAttrValues.length === 0) {
|
|
63
66
|
console.warn(`DeviceManager msg attrGroup ${JSON.stringify(pollRespMetadata)} newAttrValues ${newAttrValues} is empty`);
|
|
64
67
|
return msgDataStartIdx + pollRespSizeBytes;
|
|
65
68
|
}
|
|
66
69
|
// All attributes must have the same number of new values
|
|
67
|
-
|
|
70
|
+
const numNewDataPoints = newAttrValues[0].length;
|
|
68
71
|
for (let i = 1; i < newAttrValues.length; i++) {
|
|
69
72
|
if (newAttrValues[i].length !== numNewDataPoints) {
|
|
70
73
|
console.warn(`DeviceManager msg attrGroup ${pollRespMetadata} attrName ${pollRespMetadata.a[i].n} newAttrValues ${newAttrValues} do not have the same length`);
|
|
@@ -104,7 +107,7 @@ class AttributeHandler {
|
|
|
104
107
|
}
|
|
105
108
|
// Handle the timestamps with increments if specified
|
|
106
109
|
const timeIncUs = pollRespMetadata.us ? pollRespMetadata.us : 1000;
|
|
107
|
-
|
|
110
|
+
const timestampsUs = Array(numNewDataPoints).fill(0);
|
|
108
111
|
for (let i = 0; i < numNewDataPoints; i++) {
|
|
109
112
|
timestampsUs[i] = timestampUs + i * timeIncUs;
|
|
110
113
|
}
|
|
@@ -139,10 +142,10 @@ class AttributeHandler {
|
|
|
139
142
|
// Check if a mask is used and the value is signed
|
|
140
143
|
const maskOnSignedValue = "m" in attrDef && (0, RaftDeviceInfo_1.isAttrTypeSigned)(attrTypesOnly);
|
|
141
144
|
// Extract the value using python-struct
|
|
142
|
-
|
|
145
|
+
const unpackValues = (0, RaftStruct_1.structUnpack)(maskOnSignedValue ? attrTypesOnly.toUpperCase() : attrTypesOnly, attrBuf);
|
|
143
146
|
let attrValues = unpackValues;
|
|
144
147
|
// Get number of bytes consumed
|
|
145
|
-
const numBytesConsumed =
|
|
148
|
+
const numBytesConsumed = (0, RaftStruct_1.structSizeOf)(attrTypesOnly);
|
|
146
149
|
// // Check if sign extendable mask specified on signed value
|
|
147
150
|
// if (mmSpecifiedOnSignedValue) {
|
|
148
151
|
// const signBitMask = 1 << (signExtendableMaskSignPos - 1);
|
|
@@ -219,10 +222,10 @@ class AttributeHandler {
|
|
|
219
222
|
const tsBuffer = msgBuffer.slice(msgBufIdx, msgBufIdx + this.POLL_RESULT_TIMESTAMP_SIZE);
|
|
220
223
|
let timestampUs;
|
|
221
224
|
if (this.POLL_RESULT_TIMESTAMP_SIZE === 2) {
|
|
222
|
-
timestampUs =
|
|
225
|
+
timestampUs = (0, RaftStruct_1.structUnpack)(">H", tsBuffer)[0] * this.POLL_RESULT_RESOLUTION_US;
|
|
223
226
|
}
|
|
224
227
|
else {
|
|
225
|
-
timestampUs =
|
|
228
|
+
timestampUs = (0, RaftStruct_1.structUnpack)(">I", tsBuffer)[0] * this.POLL_RESULT_RESOLUTION_US;
|
|
226
229
|
}
|
|
227
230
|
// Check if time is before lastReportTimeMs - in which case a wrap around occurred to add on the max value
|
|
228
231
|
if (timestampUs < timestampWrapHandler.lastReportTimestampUs) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RaftAttributeHandler.js","sourceRoot":"","sources":["../../src/RaftAttributeHandler.ts"],"names":[],"mappings":";AAAA,iHAAiH;AACjH,EAAE;AACF,uBAAuB;AACvB,qCAAqC;AACrC,EAAE;AACF,sBAAsB;AACtB,EAAE;AACF,iHAAiH;;;AAEjH,4FAAwD;AACxD,qDAA8H;AAE9H,
|
|
1
|
+
{"version":3,"file":"RaftAttributeHandler.js","sourceRoot":"","sources":["../../src/RaftAttributeHandler.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,30 +2,26 @@ import { BleError, BleManager, Characteristic, Device, State, Subscription } fro
|
|
|
2
2
|
import RaftChannel from "./RaftChannel";
|
|
3
3
|
import { RaftConnEvent, RaftConnEventFn } from "./RaftConnEvents";
|
|
4
4
|
import RaftMsgHandler from "./RaftMsgHandler";
|
|
5
|
-
import
|
|
6
|
-
import {
|
|
5
|
+
import RaftChannelBLEScanner from "./RaftChannelBLEScanner.native";
|
|
6
|
+
import { DiscoveredDevice } from "./RaftTypes";
|
|
7
7
|
export default class RaftChannelPhoneBLE implements RaftChannel {
|
|
8
|
-
static ServiceUUID: string;
|
|
9
|
-
static CmdUUID: string;
|
|
10
|
-
static RespUUID: string;
|
|
11
8
|
private _onConnEvent;
|
|
12
|
-
|
|
13
|
-
|
|
9
|
+
_cmdUUID: string;
|
|
10
|
+
_respUUID: string;
|
|
11
|
+
_serviceUUIDs: string[];
|
|
12
|
+
_bleScanner: RaftChannelBLEScanner;
|
|
13
|
+
_deviceToConnectTo: DiscoveredDevice | null;
|
|
14
14
|
_retryConnectionIfLost: boolean;
|
|
15
15
|
RECONNECT_ATTEMPTS_AFTER_CONN_LOST: number;
|
|
16
16
|
_bleSubscrOnRx: Subscription | null;
|
|
17
17
|
_bleSubscrOnDisconnect: Subscription | null;
|
|
18
18
|
_bleSubscrOnStateChange: Subscription | null;
|
|
19
19
|
_bleDevice: Device | null;
|
|
20
|
-
_RICServiceUUID: string;
|
|
21
|
-
_RICCmdUUID: string;
|
|
22
|
-
_RICRespUUID: string;
|
|
23
20
|
MTU_SIZE_TO_REQUEST: number;
|
|
24
21
|
_raftMsgHandler: RaftMsgHandler | null;
|
|
25
22
|
private _msgTxTimeLast;
|
|
26
23
|
private _msgTxMinTimeBetweenMs;
|
|
27
24
|
private readonly maxRetries;
|
|
28
|
-
private _isConnected;
|
|
29
25
|
private _requestedBatchAckSize;
|
|
30
26
|
private _requestedFileBlockSize;
|
|
31
27
|
constructor();
|
|
@@ -39,7 +35,7 @@ export default class RaftChannelPhoneBLE implements RaftChannel {
|
|
|
39
35
|
isEnabled(): boolean;
|
|
40
36
|
setMsgHandler(raftMsgHandler: RaftMsgHandler): void;
|
|
41
37
|
setRetryConnectionIfLost(retry: boolean): void;
|
|
42
|
-
discoveryStart(): Promise<boolean>;
|
|
38
|
+
discoveryStart(uuids: string[]): Promise<boolean>;
|
|
43
39
|
discoveryCancel(): void;
|
|
44
40
|
_onBLEStateChange(state: State): void;
|
|
45
41
|
getConnectedLocator(): string | Device;
|
|
@@ -63,7 +59,7 @@ export default class RaftChannelPhoneBLE implements RaftChannel {
|
|
|
63
59
|
* @returns boolean (true if connected)
|
|
64
60
|
*
|
|
65
61
|
*/
|
|
66
|
-
connect(
|
|
62
|
+
connect(discoveredDevice: DiscoveredDevice): Promise<boolean>;
|
|
67
63
|
/**
|
|
68
64
|
* Disconnect from RIC
|
|
69
65
|
*
|
|
@@ -18,11 +18,14 @@ const RaftChannelBLEScanner_native_1 = tslib_1.__importDefault(require("./RaftCh
|
|
|
18
18
|
const _bleManager = new react_native_ble_plx_1.BleManager();
|
|
19
19
|
class RaftChannelPhoneBLE {
|
|
20
20
|
constructor() {
|
|
21
|
-
// BleManager
|
|
22
21
|
// Conn event fn
|
|
23
22
|
this._onConnEvent = null;
|
|
24
|
-
//
|
|
25
|
-
this.
|
|
23
|
+
// Default command and response UUIDs
|
|
24
|
+
this._cmdUUID = 'aa76677e-9cfd-4626-a510-0d305be57c8e';
|
|
25
|
+
this._respUUID = 'aa76677e-9cfd-4626-a510-0d305be57c8f';
|
|
26
|
+
this._serviceUUIDs = ['aa76677e-9cfd-4626-a510-0d305be57c8d', 'da903f65-d5c2-4f4d-a065-d1aade7af874'];
|
|
27
|
+
// Device to connect to using BLE
|
|
28
|
+
this._deviceToConnectTo = null;
|
|
26
29
|
// Handle BLE disconnection through retry
|
|
27
30
|
// May be set after connection checking (e.g. using LEDs)
|
|
28
31
|
this._retryConnectionIfLost = false;
|
|
@@ -32,10 +35,6 @@ class RaftChannelPhoneBLE {
|
|
|
32
35
|
this._bleSubscrOnDisconnect = null;
|
|
33
36
|
this._bleSubscrOnStateChange = null;
|
|
34
37
|
this._bleDevice = null;
|
|
35
|
-
// BLE UUIDS
|
|
36
|
-
this._RICServiceUUID = 'aa76677e-9cfd-4626-a510-0d305be57c8d';
|
|
37
|
-
this._RICCmdUUID = 'aa76677e-9cfd-4626-a510-0d305be57c8e';
|
|
38
|
-
this._RICRespUUID = 'aa76677e-9cfd-4626-a510-0d305be57c8f';
|
|
39
38
|
// MTU (Maximum Transmission Unit) size to request
|
|
40
39
|
this.MTU_SIZE_TO_REQUEST = 512;
|
|
41
40
|
// Message handler
|
|
@@ -44,16 +43,13 @@ class RaftChannelPhoneBLE {
|
|
|
44
43
|
this._msgTxTimeLast = Date.now();
|
|
45
44
|
this._msgTxMinTimeBetweenMs = 1;
|
|
46
45
|
this.maxRetries = 1;
|
|
47
|
-
// Connected flag and retries
|
|
48
|
-
this._isConnected = false;
|
|
49
|
-
// private readonly _maxConnRetries = 3;
|
|
50
46
|
// File Handler parameters
|
|
51
47
|
this._requestedBatchAckSize = 10;
|
|
52
48
|
this._requestedFileBlockSize = 500;
|
|
53
49
|
RaftLog_1.default.debug('BLEChannel constructor');
|
|
54
50
|
// _bleManager.setLogLevel(LogLevel.Verbose);
|
|
55
51
|
// Scanner
|
|
56
|
-
this._bleScanner = new RaftChannelBLEScanner_native_1.default(_bleManager,
|
|
52
|
+
this._bleScanner = new RaftChannelBLEScanner_native_1.default(_bleManager, this._serviceUUIDs, this.scanningEvent.bind(this));
|
|
57
53
|
// Listen for BLE state changes
|
|
58
54
|
this._bleSubscrOnStateChange = _bleManager.onStateChange(state => {
|
|
59
55
|
this._onBLEStateChange(state);
|
|
@@ -67,7 +63,7 @@ class RaftChannelPhoneBLE {
|
|
|
67
63
|
pauseConnection(pause) { RaftLog_1.default.verbose(`pauseConnection ${pause} - no effect for this channel type`); return; }
|
|
68
64
|
// isConnected
|
|
69
65
|
isConnected() {
|
|
70
|
-
return this._bleDevice !== null
|
|
66
|
+
return this._bleDevice !== null;
|
|
71
67
|
}
|
|
72
68
|
setOnConnEvent(connEventFn) {
|
|
73
69
|
this._onConnEvent = connEventFn;
|
|
@@ -86,11 +82,11 @@ class RaftChannelPhoneBLE {
|
|
|
86
82
|
RaftLog_1.default.debug(`BLEChannel setRetryConnectionIfLost ${retry}`);
|
|
87
83
|
this._retryConnectionIfLost = retry;
|
|
88
84
|
}
|
|
89
|
-
async discoveryStart() {
|
|
85
|
+
async discoveryStart(uuids) {
|
|
90
86
|
// Disconnect any existing connection
|
|
91
87
|
// await this.disconnect();
|
|
92
88
|
// Start scanning
|
|
93
|
-
await this._bleScanner.scanningStart();
|
|
89
|
+
await this._bleScanner.scanningStart(uuids);
|
|
94
90
|
// Event
|
|
95
91
|
RaftLog_1.default.debug(`BLEChannel discoveryStart emitting BLE_SCANNING_STARTED`);
|
|
96
92
|
this.emit(RaftConnEvents_1.RaftConnEvent.BLE_SCANNING_STARTED);
|
|
@@ -156,14 +152,14 @@ class RaftChannelPhoneBLE {
|
|
|
156
152
|
* @returns boolean (true if connected)
|
|
157
153
|
*
|
|
158
154
|
*/
|
|
159
|
-
async connect(
|
|
155
|
+
async connect(discoveredDevice) {
|
|
160
156
|
RaftLog_1.default.debug('BLEChannel requested connection');
|
|
161
157
|
this._retryConnectionIfLost = false;
|
|
162
158
|
this._bleScanner.scanningStop();
|
|
163
159
|
// Now connecting
|
|
164
|
-
this.emit(RaftConnEvents_1.RaftConnEvent.CONN_CONNECTING, { deviceId:
|
|
160
|
+
this.emit(RaftConnEvents_1.RaftConnEvent.CONN_CONNECTING, { deviceId: discoveredDevice.id });
|
|
165
161
|
// Connect
|
|
166
|
-
this.
|
|
162
|
+
this._deviceToConnectTo = discoveredDevice;
|
|
167
163
|
const connOk = await this._configDeviceConnection();
|
|
168
164
|
// Check if ok
|
|
169
165
|
if (!connOk) {
|
|
@@ -173,8 +169,8 @@ class RaftChannelPhoneBLE {
|
|
|
173
169
|
}
|
|
174
170
|
// Emit success
|
|
175
171
|
this.emit(RaftConnEvents_1.RaftConnEvent.CONN_CONNECTED, {
|
|
176
|
-
deviceId: this.
|
|
177
|
-
name: this.
|
|
172
|
+
deviceId: this._deviceToConnectTo.id,
|
|
173
|
+
name: this._deviceToConnectTo.name,
|
|
178
174
|
});
|
|
179
175
|
return true;
|
|
180
176
|
}
|
|
@@ -187,9 +183,9 @@ class RaftChannelPhoneBLE {
|
|
|
187
183
|
async disconnect() {
|
|
188
184
|
RaftLog_1.default.debug('BLEChannel disconnect requested');
|
|
189
185
|
this._retryConnectionIfLost = false;
|
|
190
|
-
RaftLog_1.default.debug(`this._ricToConnectTo ${this.
|
|
191
|
-
const connectedRIC = this.
|
|
192
|
-
this.
|
|
186
|
+
RaftLog_1.default.debug(`this._ricToConnectTo ${this._deviceToConnectTo}`);
|
|
187
|
+
const connectedRIC = this._deviceToConnectTo;
|
|
188
|
+
this._deviceToConnectTo = null;
|
|
193
189
|
// this._invalidateConnectionInfo(); // //
|
|
194
190
|
// Remove disconnect subscription so it doesn't try to reconnect
|
|
195
191
|
if (this._bleSubscrOnDisconnect) {
|
|
@@ -197,9 +193,7 @@ class RaftChannelPhoneBLE {
|
|
|
197
193
|
this._bleSubscrOnDisconnect = null;
|
|
198
194
|
}
|
|
199
195
|
// Disconnect from the connected device
|
|
200
|
-
const connMarties = await _bleManager.connectedDevices(
|
|
201
|
-
this._RICServiceUUID,
|
|
202
|
-
]);
|
|
196
|
+
const connMarties = await _bleManager.connectedDevices(this._serviceUUIDs);
|
|
203
197
|
if (connMarties.length == 0) {
|
|
204
198
|
RaftLog_1.default.debug('BLEChannel disconnect - no devices connected');
|
|
205
199
|
}
|
|
@@ -225,13 +219,13 @@ class RaftChannelPhoneBLE {
|
|
|
225
219
|
*/
|
|
226
220
|
async _configDeviceConnection() {
|
|
227
221
|
// Check there is a RIC to connect to
|
|
228
|
-
if (this.
|
|
222
|
+
if (this._deviceToConnectTo === null) {
|
|
229
223
|
return false;
|
|
230
224
|
}
|
|
231
225
|
let deviceConnected = null;
|
|
232
226
|
for (let connRetry = 0; connRetry < 5; connRetry++) {
|
|
233
227
|
try {
|
|
234
|
-
deviceConnected = await _bleManager.connectToDevice(this.
|
|
228
|
+
deviceConnected = await _bleManager.connectToDevice(this._deviceToConnectTo.id, {
|
|
235
229
|
timeout: 3000,
|
|
236
230
|
});
|
|
237
231
|
// this.handleLostDevice(); // //
|
|
@@ -258,7 +252,7 @@ class RaftChannelPhoneBLE {
|
|
|
258
252
|
}
|
|
259
253
|
// Request high-priority connection
|
|
260
254
|
try {
|
|
261
|
-
await _bleManager.requestConnectionPriorityForDevice(this.
|
|
255
|
+
await _bleManager.requestConnectionPriorityForDevice(this._deviceToConnectTo.id, react_native_ble_plx_1.ConnectionPriority.High);
|
|
262
256
|
RaftLog_1.default.debug(`BLEChannel configDeviceConnection request ConnPriority.High`);
|
|
263
257
|
}
|
|
264
258
|
catch (error) {
|
|
@@ -278,8 +272,8 @@ class RaftChannelPhoneBLE {
|
|
|
278
272
|
}
|
|
279
273
|
// Monitor the inbound characteristic
|
|
280
274
|
try {
|
|
281
|
-
if (this._bleDevice) {
|
|
282
|
-
this._bleSubscrOnRx = this._bleDevice.monitorCharacteristicForService(this.
|
|
275
|
+
if (this._bleDevice && this._bleDevice.serviceUUIDs) {
|
|
276
|
+
this._bleSubscrOnRx = this._bleDevice.monitorCharacteristicForService(this._bleDevice.serviceUUIDs[0], this._respUUID, (error, characteristic) => {
|
|
283
277
|
this._onMsgRx(error, characteristic);
|
|
284
278
|
});
|
|
285
279
|
}
|
|
@@ -333,11 +327,11 @@ class RaftChannelPhoneBLE {
|
|
|
333
327
|
for (let reconnAttempt = 0; reconnAttempt < this.RECONNECT_ATTEMPTS_AFTER_CONN_LOST; reconnAttempt++) {
|
|
334
328
|
// Check if scan in progress - and stop reconn attempts if so
|
|
335
329
|
const scanInProgress = this._bleScanner.isScanInProgress();
|
|
336
|
-
RaftLog_1.default.debug(`onDeviceDisconnected considering reconnection RICToConnectTo ${(_a = this.
|
|
330
|
+
RaftLog_1.default.debug(`onDeviceDisconnected considering reconnection RICToConnectTo ${(_a = this._deviceToConnectTo) === null || _a === void 0 ? void 0 : _a.name} scanInProgress ${scanInProgress} retryConnectionIfLost ${this._retryConnectionIfLost}`);
|
|
337
331
|
if (!this._retryConnectionIfLost ||
|
|
338
332
|
scanInProgress ||
|
|
339
|
-
!this.
|
|
340
|
-
RaftLog_1.default.debug(`onDeviceDisconnected DISCONNECTED_RIC RICToConnectTo ${(_b = this.
|
|
333
|
+
!this._deviceToConnectTo) {
|
|
334
|
+
RaftLog_1.default.debug(`onDeviceDisconnected DISCONNECTED_RIC RICToConnectTo ${(_b = this._deviceToConnectTo) === null || _b === void 0 ? void 0 : _b.name} scanInProgress ${scanInProgress} retryConnectionIfLost ${this._retryConnectionIfLost}`);
|
|
341
335
|
if (this._retryConnectionIfLost) {
|
|
342
336
|
// this.emit(RaftConnEvent.BLE_DISCONNECTED_RIC);
|
|
343
337
|
}
|
|
@@ -347,13 +341,13 @@ class RaftChannelPhoneBLE {
|
|
|
347
341
|
break;
|
|
348
342
|
}
|
|
349
343
|
if (await this._configDeviceConnection()) {
|
|
350
|
-
RaftLog_1.default.debug(`onDeviceDisconnected successful reconn RICToConnectTo ${(_c = this.
|
|
344
|
+
RaftLog_1.default.debug(`onDeviceDisconnected successful reconn RICToConnectTo ${(_c = this._deviceToConnectTo) === null || _c === void 0 ? void 0 : _c.name}`);
|
|
351
345
|
// Indicate connection issue resolved
|
|
352
346
|
// this.emit(RaftConnEvent.BLE_CONNECTION_ISSUE_RESOLVED);
|
|
353
347
|
// await this.ricConnector.retrieveMartySystemInfo();
|
|
354
348
|
return;
|
|
355
349
|
}
|
|
356
|
-
RaftLog_1.default.debug(`onDeviceDisconnected retrying reconn RICToConnectTo ${(_d = this.
|
|
350
|
+
RaftLog_1.default.debug(`onDeviceDisconnected retrying reconn RICToConnectTo ${(_d = this._deviceToConnectTo) === null || _d === void 0 ? void 0 : _d.name}`);
|
|
357
351
|
}
|
|
358
352
|
});
|
|
359
353
|
}
|
|
@@ -401,10 +395,10 @@ class RaftChannelPhoneBLE {
|
|
|
401
395
|
// Convert to Base64
|
|
402
396
|
const msgFrameBase64 = RaftUtils_1.default.btoa(msg);
|
|
403
397
|
try {
|
|
404
|
-
await this._bleDevice.writeCharacteristicWithoutResponseForService(this.
|
|
398
|
+
await this._bleDevice.writeCharacteristicWithoutResponseForService(this._bleDevice.serviceUUIDs ? this._bleDevice.serviceUUIDs[0] : this._serviceUUIDs[0], this._cmdUUID, msgFrameBase64);
|
|
405
399
|
return true;
|
|
406
400
|
}
|
|
407
|
-
catch (
|
|
401
|
+
catch (_a) {
|
|
408
402
|
if (retryIdx === this.maxRetries - 1) {
|
|
409
403
|
RaftLog_1.default.debug(`sendTxMsg failed after ${this.maxRetries} attempts`);
|
|
410
404
|
return false;
|
|
@@ -429,10 +423,10 @@ class RaftChannelPhoneBLE {
|
|
|
429
423
|
// Convert to Base64
|
|
430
424
|
const msgFrameBase64 = RaftUtils_1.default.btoa(msg);
|
|
431
425
|
try {
|
|
432
|
-
this._bleDevice.writeCharacteristicWithoutResponseForService(this.
|
|
426
|
+
this._bleDevice.writeCharacteristicWithoutResponseForService(this._bleDevice.serviceUUIDs ? this._bleDevice.serviceUUIDs[0] : this._serviceUUIDs[0], this._cmdUUID, msgFrameBase64);
|
|
433
427
|
return true;
|
|
434
428
|
}
|
|
435
|
-
catch (
|
|
429
|
+
catch (_a) {
|
|
436
430
|
if (retryIdx === this.maxRetries - 1) {
|
|
437
431
|
RaftLog_1.default.debug(`sendTxMsgNoAwait failed after ${this.maxRetries} attempts`);
|
|
438
432
|
return false;
|
|
@@ -450,9 +444,5 @@ class RaftChannelPhoneBLE {
|
|
|
450
444
|
return null;
|
|
451
445
|
}
|
|
452
446
|
}
|
|
453
|
-
// BLE UUIDS
|
|
454
|
-
RaftChannelPhoneBLE.ServiceUUID = "aa76677e-9cfd-4626-a510-0d305be57c8d";
|
|
455
|
-
RaftChannelPhoneBLE.CmdUUID = "aa76677e-9cfd-4626-a510-0d305be57c8e";
|
|
456
|
-
RaftChannelPhoneBLE.RespUUID = "aa76677e-9cfd-4626-a510-0d305be57c8f";
|
|
457
447
|
exports.default = RaftChannelPhoneBLE;
|
|
458
448
|
//# sourceMappingURL=RaftChannelBLE.native.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RaftChannelBLE.native.js","sourceRoot":"","sources":["../../src/RaftChannelBLE.native.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"RaftChannelBLE.native.js","sourceRoot":"","sources":["../../src/RaftChannelBLE.native.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,9 +3,9 @@ import { RaftConnEventFn } from "./RaftConnEvents";
|
|
|
3
3
|
import RaftMsgHandler from "./RaftMsgHandler";
|
|
4
4
|
import { ConnectorOptions } from "./RaftSystemType";
|
|
5
5
|
export default class RaftChannelBLE implements RaftChannel {
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
6
|
+
_cmdUUID: string;
|
|
7
|
+
_respUUID: string;
|
|
8
|
+
_serviceUUIDs: string[];
|
|
9
9
|
private _bleDevice;
|
|
10
10
|
private _characteristicTx;
|
|
11
11
|
private _characteristicRx;
|
|
@@ -15,6 +15,10 @@ const RaftLog_1 = tslib_1.__importDefault(require("./RaftLog"));
|
|
|
15
15
|
const RaftUtils_1 = tslib_1.__importDefault(require("./RaftUtils"));
|
|
16
16
|
class RaftChannelBLE {
|
|
17
17
|
constructor() {
|
|
18
|
+
// Default command and response UUIDs
|
|
19
|
+
this._cmdUUID = 'aa76677e-9cfd-4626-a510-0d305be57c8e';
|
|
20
|
+
this._respUUID = 'aa76677e-9cfd-4626-a510-0d305be57c8f';
|
|
21
|
+
this._serviceUUIDs = ['aa76677e-9cfd-4626-a510-0d305be57c8d', 'da903f65-d5c2-4f4d-a065-d1aade7af874'];
|
|
18
22
|
// Device and characteristics
|
|
19
23
|
this._bleDevice = null;
|
|
20
24
|
this._characteristicTx = null;
|
|
@@ -109,13 +113,29 @@ class RaftChannelBLE {
|
|
|
109
113
|
await new Promise(resolve => setTimeout(resolve, 100));
|
|
110
114
|
// Get service
|
|
111
115
|
try {
|
|
112
|
-
|
|
116
|
+
let service = null;
|
|
117
|
+
// iterate over known services
|
|
118
|
+
for (const serviceUUID of this._serviceUUIDs) {
|
|
119
|
+
try {
|
|
120
|
+
service = await this._bleDevice.gatt.getPrimaryService(serviceUUID);
|
|
121
|
+
if (service) {
|
|
122
|
+
break;
|
|
123
|
+
}
|
|
124
|
+
}
|
|
125
|
+
catch (error) {
|
|
126
|
+
RaftLog_1.default.warn(`RaftChannelBLE.connect - cannot get primary service ${error}`);
|
|
127
|
+
}
|
|
128
|
+
}
|
|
129
|
+
if (!service) {
|
|
130
|
+
RaftLog_1.default.error(`RaftChannelBLE.connect - cannot get primary service - giving up`);
|
|
131
|
+
return false;
|
|
132
|
+
}
|
|
113
133
|
RaftLog_1.default.debug(`RaftChannelBLE.connect - found service: ${service.uuid}`);
|
|
114
134
|
try {
|
|
115
135
|
// Get Tx and Rx characteristics
|
|
116
|
-
this._characteristicTx = await service.getCharacteristic(
|
|
136
|
+
this._characteristicTx = await service.getCharacteristic(this._cmdUUID);
|
|
117
137
|
RaftLog_1.default.debug(`RaftChannelBLE.connect - found char ${this._characteristicTx.uuid}`);
|
|
118
|
-
this._characteristicRx = await service.getCharacteristic(
|
|
138
|
+
this._characteristicRx = await service.getCharacteristic(this._respUUID);
|
|
119
139
|
RaftLog_1.default.debug(`RaftChannelBLE.connect - found char ${this._characteristicRx.uuid}`);
|
|
120
140
|
// Notifications of received messages
|
|
121
141
|
try {
|
|
@@ -269,9 +289,5 @@ class RaftChannelBLE {
|
|
|
269
289
|
return false;
|
|
270
290
|
}
|
|
271
291
|
}
|
|
272
|
-
// BLE UUIDS
|
|
273
|
-
RaftChannelBLE.ServiceUUID = "aa76677e-9cfd-4626-a510-0d305be57c8d";
|
|
274
|
-
RaftChannelBLE.CmdUUID = "aa76677e-9cfd-4626-a510-0d305be57c8e";
|
|
275
|
-
RaftChannelBLE.RespUUID = "aa76677e-9cfd-4626-a510-0d305be57c8f";
|
|
276
292
|
exports.default = RaftChannelBLE;
|
|
277
293
|
//# sourceMappingURL=RaftChannelBLE.web.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RaftChannelBLE.web.js","sourceRoot":"","sources":["../../src/RaftChannelBLE.web.ts"],"names":[],"mappings":";AAAA,iHAAiH;AACjH,EAAE;AACF,iBAAiB;AACjB,iBAAiB;AACjB,EAAE;AACF,wCAAwC;AACxC,oCAAoC;AACpC,EAAE;AACF,iHAAiH;;;AAGjH,qDAAkE;AAClE,gEAAgC;AAGhC,oEAAoC;AAEpC,MAAqB,cAAc;IAAnC;
|
|
1
|
+
{"version":3,"file":"RaftChannelBLE.web.js","sourceRoot":"","sources":["../../src/RaftChannelBLE.web.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,17 +1,17 @@
|
|
|
1
1
|
import { BleManager, Device, BleError } from 'react-native-ble-plx';
|
|
2
|
-
import {
|
|
2
|
+
import { DiscoveredDevice } from './RaftTypes';
|
|
3
3
|
import { RaftConnEventFn } from './RaftConnEvents';
|
|
4
|
-
export default class
|
|
4
|
+
export default class RaftChannelBLEScanner {
|
|
5
5
|
_bleManager: BleManager;
|
|
6
|
-
|
|
7
|
-
|
|
6
|
+
_defaultUUIDsOfServicesToScanFor: Array<string>;
|
|
7
|
+
_discoveredDevices: DiscoveredDevice[];
|
|
8
8
|
static _scanInProgress: boolean;
|
|
9
9
|
_discoveryTimeMs: number;
|
|
10
10
|
_eventCallback: RaftConnEventFn;
|
|
11
11
|
constructor(bleManager: BleManager, uuidsOfServicesToScanFor: Array<string>, eventCallback: RaftConnEventFn);
|
|
12
|
-
|
|
12
|
+
getDiscoveredDevices(): DiscoveredDevice[];
|
|
13
13
|
isScanInProgress(): boolean;
|
|
14
|
-
scanningStart(): Promise<boolean>;
|
|
14
|
+
scanningStart(uuids: string[]): Promise<boolean>;
|
|
15
15
|
scanningStop(): void;
|
|
16
16
|
_discoveryFoundCB(error: BleError | null, scannedDevice: Device | null): void;
|
|
17
17
|
_discoverySetTimeLimit(timeLimitMs: number): void;
|