@robotical/raftjs 1.3.5 → 1.4.1
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 +18 -10
- package/dist/react-native/RaftAttributeHandler.js.map +1 -1
- package/dist/react-native/RaftChannelBLE.native.d.ts +11 -11
- package/dist/react-native/RaftChannelBLE.native.js +61 -41
- package/dist/react-native/RaftChannelBLE.native.js.map +1 -1
- package/dist/react-native/RaftChannelBLE.web.d.ts +3 -4
- package/dist/react-native/RaftChannelBLE.web.js +7 -8
- 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 -46
- 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 +4 -4
- 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/RaftDeviceInfo.d.ts +3 -0
- package/dist/react-native/RaftDeviceManager.d.ts +16 -11
- package/dist/react-native/RaftDeviceManager.js +196 -50
- package/dist/react-native/RaftDeviceManager.js.map +1 -1
- package/dist/react-native/RaftDeviceMgrIF.d.ts +9 -6
- package/dist/react-native/RaftDeviceStates.d.ts +5 -1
- package/dist/react-native/RaftDeviceStates.js +3 -3
- package/dist/react-native/RaftDeviceStates.js.map +1 -1
- package/dist/react-native/RaftMsgHandler.d.ts +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 +208 -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 +3 -0
- package/dist/react-native/RaftTypes.d.ts +14 -15
- package/dist/react-native/RaftTypes.js +13 -50
- 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 +2 -1
- package/dist/react-native/main.js +4 -4
- package/dist/react-native/main.js.map +1 -1
- package/dist/web/RaftAttributeHandler.d.ts +1 -1
- package/dist/web/RaftAttributeHandler.js +18 -10
- package/dist/web/RaftAttributeHandler.js.map +1 -1
- package/dist/web/RaftChannelBLE.web.d.ts +3 -4
- package/dist/web/RaftChannelBLE.web.js +7 -8
- package/dist/web/RaftChannelBLE.web.js.map +1 -1
- package/dist/web/RaftConnector.d.ts +3 -3
- package/dist/web/RaftConnector.js +4 -4
- 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/RaftDeviceInfo.d.ts +3 -0
- package/dist/web/RaftDeviceManager.d.ts +16 -11
- package/dist/web/RaftDeviceManager.js +196 -50
- package/dist/web/RaftDeviceManager.js.map +1 -1
- package/dist/web/RaftDeviceMgrIF.d.ts +9 -6
- package/dist/web/RaftDeviceStates.d.ts +5 -1
- package/dist/web/RaftDeviceStates.js +3 -3
- package/dist/web/RaftDeviceStates.js.map +1 -1
- package/dist/web/RaftMsgHandler.d.ts +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 +208 -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 +3 -0
- package/dist/web/RaftTypes.d.ts +14 -15
- package/dist/web/RaftTypes.js +13 -50
- 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 +2 -1
- package/dist/web/main.js +4 -4
- package/dist/web/main.js.map +1 -1
- package/examples/dashboard/package.json +8 -15
- package/examples/dashboard/src/ConnManager.ts +18 -14
- package/examples/dashboard/src/DeviceActionsForm.tsx +49 -49
- package/examples/dashboard/src/DeviceLineChart.tsx +44 -20
- package/examples/dashboard/src/DevicePanel.tsx +33 -2
- package/examples/dashboard/src/DevicesPanel.tsx +5 -4
- package/examples/dashboard/src/LatencyTest.ts +130 -0
- package/examples/dashboard/src/LatencyTestPanel.tsx +92 -0
- package/examples/dashboard/src/Main.tsx +191 -73
- package/examples/dashboard/src/SettingsManager.ts +67 -0
- package/examples/dashboard/src/SettingsScreen.tsx +174 -0
- package/examples/dashboard/src/SystemTypeCog/CogStateInfo.ts +14 -8
- package/examples/dashboard/src/SystemTypeCog/SystemTypeCog.ts +12 -5
- package/examples/dashboard/src/SystemTypeGeneric/StateInfoGeneric.ts +30 -0
- package/examples/dashboard/src/SystemTypeGeneric/SystemTypeGeneric.ts +91 -0
- package/examples/dashboard/src/SystemTypeMarty/RICStateInfo.ts +23 -4
- package/examples/dashboard/src/SystemTypeMarty/RICSystemUtils.ts +1 -1
- package/examples/dashboard/src/SystemTypeMarty/SystemTypeMarty.ts +5 -2
- package/examples/dashboard/src/index.html +2 -2
- package/examples/dashboard/src/index.tsx +0 -2
- package/examples/dashboard/src/styles.css +14 -0
- package/package.json +7 -15
- package/src/RaftAttributeHandler.ts +23 -14
- package/src/RaftChannelBLE.native.ts +77 -53
- package/src/RaftChannelBLE.web.ts +8 -8
- package/src/RaftChannelBLEScanner.native.ts +38 -44
- package/src/RaftConnector.ts +5 -5
- package/src/RaftCustomAttrHandler.ts +5 -5
- package/src/RaftDeviceInfo.ts +3 -0
- package/src/RaftDeviceManager.ts +236 -65
- package/src/RaftDeviceMgrIF.ts +11 -6
- package/src/RaftDeviceStates.ts +7 -3
- package/src/RaftMsgHandler.ts +1 -2
- package/src/RaftStruct.ts +209 -0
- package/src/RaftSysTypeManager.ts +60 -0
- package/src/RaftSystemType.ts +3 -0
- package/src/RaftTypes.ts +30 -33
- package/src/RaftUpdateManager.ts +6 -3
- package/src/RaftUtils.ts +14 -4
- package/src/main.ts +2 -2
|
@@ -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`);
|
|
@@ -84,7 +87,8 @@ class AttributeHandler {
|
|
|
84
87
|
devAttrsState[attrDef.n] = {
|
|
85
88
|
name: attrDef.n,
|
|
86
89
|
newAttribute: true,
|
|
87
|
-
newData:
|
|
90
|
+
newData: false,
|
|
91
|
+
numNewValues: 0,
|
|
88
92
|
values: [],
|
|
89
93
|
units: (0, RaftDeviceInfo_1.decodeAttrUnitsEncoding)(attrDef.u || ""),
|
|
90
94
|
range: attrDef.r || [0, 0],
|
|
@@ -101,10 +105,11 @@ class AttributeHandler {
|
|
|
101
105
|
// Add the new values
|
|
102
106
|
devAttrsState[attrDef.n].values.push(...newAttrValues[attrIdx]);
|
|
103
107
|
devAttrsState[attrDef.n].newData = newAttrValues[attrIdx].length > 0;
|
|
108
|
+
devAttrsState[attrDef.n].numNewValues = newAttrValues[attrIdx].length;
|
|
104
109
|
}
|
|
105
110
|
// Handle the timestamps with increments if specified
|
|
106
111
|
const timeIncUs = pollRespMetadata.us ? pollRespMetadata.us : 1000;
|
|
107
|
-
|
|
112
|
+
const timestampsUs = Array(numNewDataPoints).fill(0);
|
|
108
113
|
for (let i = 0; i < numNewDataPoints; i++) {
|
|
109
114
|
timestampsUs[i] = timestampUs + i * timeIncUs;
|
|
110
115
|
}
|
|
@@ -139,10 +144,10 @@ class AttributeHandler {
|
|
|
139
144
|
// Check if a mask is used and the value is signed
|
|
140
145
|
const maskOnSignedValue = "m" in attrDef && (0, RaftDeviceInfo_1.isAttrTypeSigned)(attrTypesOnly);
|
|
141
146
|
// Extract the value using python-struct
|
|
142
|
-
|
|
147
|
+
const unpackValues = (0, RaftStruct_1.structUnpack)(maskOnSignedValue ? attrTypesOnly.toUpperCase() : attrTypesOnly, attrBuf);
|
|
143
148
|
let attrValues = unpackValues;
|
|
144
149
|
// Get number of bytes consumed
|
|
145
|
-
const numBytesConsumed =
|
|
150
|
+
const numBytesConsumed = (0, RaftStruct_1.structSizeOf)(attrTypesOnly);
|
|
146
151
|
// // Check if sign extendable mask specified on signed value
|
|
147
152
|
// if (mmSpecifiedOnSignedValue) {
|
|
148
153
|
// const signBitMask = 1 << (signExtendableMaskSignPos - 1);
|
|
@@ -198,6 +203,9 @@ class AttributeHandler {
|
|
|
198
203
|
// console.log(`DeviceManager msg attrGroup ${attrGroup} devkey ${deviceKey} valueHexChars ${valueHexChars} msgHexStr ${msgHexStr} ts ${timestamp} attrName ${attrDef.n} type ${attrDef.t} value ${value} signExtendableMaskSignPos ${signExtendableMaskSignPos} attrTypeDefForStruct ${attrTypeDefForStruct} attrDef ${attrDef}`);
|
|
199
204
|
// Move buffer position if using relative positioning
|
|
200
205
|
msgBufIdx += attrUsesAbsPos ? 0 : numBytesConsumed;
|
|
206
|
+
// if (attrDef.n === "amb0") {
|
|
207
|
+
// console.log(`${new Date().toISOString()} ${attrDef.n} ${attrValues}`);
|
|
208
|
+
// }
|
|
201
209
|
// Return the value
|
|
202
210
|
return { values: attrValues, newMsgBufIdx: msgBufIdx };
|
|
203
211
|
}
|
|
@@ -219,10 +227,10 @@ class AttributeHandler {
|
|
|
219
227
|
const tsBuffer = msgBuffer.slice(msgBufIdx, msgBufIdx + this.POLL_RESULT_TIMESTAMP_SIZE);
|
|
220
228
|
let timestampUs;
|
|
221
229
|
if (this.POLL_RESULT_TIMESTAMP_SIZE === 2) {
|
|
222
|
-
timestampUs =
|
|
230
|
+
timestampUs = (0, RaftStruct_1.structUnpack)(">H", tsBuffer)[0] * this.POLL_RESULT_RESOLUTION_US;
|
|
223
231
|
}
|
|
224
232
|
else {
|
|
225
|
-
timestampUs =
|
|
233
|
+
timestampUs = (0, RaftStruct_1.structUnpack)(">I", tsBuffer)[0] * this.POLL_RESULT_RESOLUTION_US;
|
|
226
234
|
}
|
|
227
235
|
// Check if time is before lastReportTimeMs - in which case a wrap around occurred to add on the max value
|
|
228
236
|
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,16 +2,15 @@ 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 CogServiceUUID: string;
|
|
10
|
-
static CmdUUID: string;
|
|
11
|
-
static RespUUID: string;
|
|
12
8
|
private _onConnEvent;
|
|
13
|
-
|
|
14
|
-
|
|
9
|
+
_cmdUUID: string;
|
|
10
|
+
_respUUID: string;
|
|
11
|
+
_serviceUUIDs: string[];
|
|
12
|
+
_bleScanner: RaftChannelBLEScanner;
|
|
13
|
+
_deviceToConnectTo: DiscoveredDevice | null;
|
|
15
14
|
_retryConnectionIfLost: boolean;
|
|
16
15
|
RECONNECT_ATTEMPTS_AFTER_CONN_LOST: number;
|
|
17
16
|
_bleSubscrOnRx: Subscription | null;
|
|
@@ -23,10 +22,11 @@ export default class RaftChannelPhoneBLE implements RaftChannel {
|
|
|
23
22
|
private _msgTxTimeLast;
|
|
24
23
|
private _msgTxMinTimeBetweenMs;
|
|
25
24
|
private readonly maxRetries;
|
|
26
|
-
private _isConnected;
|
|
27
25
|
private _requestedBatchAckSize;
|
|
28
26
|
private _requestedFileBlockSize;
|
|
27
|
+
private _connectedDeviceServiceUUID?;
|
|
29
28
|
constructor();
|
|
29
|
+
setConnectedDeviceUUID(serviceUUID: string): void;
|
|
30
30
|
getBleManager(): BleManager;
|
|
31
31
|
fhBatchAckSize(): number;
|
|
32
32
|
fhFileBlockSize(): number;
|
|
@@ -37,7 +37,7 @@ export default class RaftChannelPhoneBLE implements RaftChannel {
|
|
|
37
37
|
isEnabled(): boolean;
|
|
38
38
|
setMsgHandler(raftMsgHandler: RaftMsgHandler): void;
|
|
39
39
|
setRetryConnectionIfLost(retry: boolean): void;
|
|
40
|
-
discoveryStart(
|
|
40
|
+
discoveryStart(uuids: string[], tries?: number): Promise<boolean>;
|
|
41
41
|
discoveryCancel(): void;
|
|
42
42
|
_onBLEStateChange(state: State): void;
|
|
43
43
|
getConnectedLocator(): string | Device;
|
|
@@ -61,7 +61,7 @@ export default class RaftChannelPhoneBLE implements RaftChannel {
|
|
|
61
61
|
* @returns boolean (true if connected)
|
|
62
62
|
*
|
|
63
63
|
*/
|
|
64
|
-
connect(
|
|
64
|
+
connect(discoveredDevice: DiscoveredDevice): Promise<boolean>;
|
|
65
65
|
/**
|
|
66
66
|
* Disconnect from RIC
|
|
67
67
|
*
|
|
@@ -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;
|
|
@@ -40,21 +43,21 @@ class RaftChannelPhoneBLE {
|
|
|
40
43
|
this._msgTxTimeLast = Date.now();
|
|
41
44
|
this._msgTxMinTimeBetweenMs = 1;
|
|
42
45
|
this.maxRetries = 1;
|
|
43
|
-
// Connected flag and retries
|
|
44
|
-
this._isConnected = false;
|
|
45
|
-
// private readonly _maxConnRetries = 3;
|
|
46
46
|
// File Handler parameters
|
|
47
47
|
this._requestedBatchAckSize = 10;
|
|
48
48
|
this._requestedFileBlockSize = 500;
|
|
49
49
|
RaftLog_1.default.debug('BLEChannel constructor');
|
|
50
50
|
// _bleManager.setLogLevel(LogLevel.Verbose);
|
|
51
51
|
// Scanner
|
|
52
|
-
this._bleScanner = new RaftChannelBLEScanner_native_1.default(_bleManager,
|
|
52
|
+
this._bleScanner = new RaftChannelBLEScanner_native_1.default(_bleManager, this._serviceUUIDs, this.scanningEvent.bind(this));
|
|
53
53
|
// Listen for BLE state changes
|
|
54
54
|
this._bleSubscrOnStateChange = _bleManager.onStateChange(state => {
|
|
55
55
|
this._onBLEStateChange(state);
|
|
56
56
|
}, true);
|
|
57
57
|
}
|
|
58
|
+
setConnectedDeviceUUID(serviceUUID) {
|
|
59
|
+
this._connectedDeviceServiceUUID = serviceUUID;
|
|
60
|
+
}
|
|
58
61
|
getBleManager() {
|
|
59
62
|
return _bleManager;
|
|
60
63
|
}
|
|
@@ -63,7 +66,7 @@ class RaftChannelPhoneBLE {
|
|
|
63
66
|
pauseConnection(pause) { RaftLog_1.default.verbose(`pauseConnection ${pause} - no effect for this channel type`); return; }
|
|
64
67
|
// isConnected
|
|
65
68
|
isConnected() {
|
|
66
|
-
return this._bleDevice !== null
|
|
69
|
+
return this._bleDevice !== null;
|
|
67
70
|
}
|
|
68
71
|
setOnConnEvent(connEventFn) {
|
|
69
72
|
this._onConnEvent = connEventFn;
|
|
@@ -82,11 +85,22 @@ class RaftChannelPhoneBLE {
|
|
|
82
85
|
RaftLog_1.default.debug(`BLEChannel setRetryConnectionIfLost ${retry}`);
|
|
83
86
|
this._retryConnectionIfLost = retry;
|
|
84
87
|
}
|
|
85
|
-
async discoveryStart(
|
|
88
|
+
async discoveryStart(uuids, tries = 10) {
|
|
89
|
+
if (tries <= 0) {
|
|
90
|
+
RaftLog_1.default.debug(`BLEChannel discoveryStart failed after 5 tries`);
|
|
91
|
+
return false;
|
|
92
|
+
}
|
|
86
93
|
// Disconnect any existing connection
|
|
87
94
|
// await this.disconnect();
|
|
95
|
+
// wait until the bt is powered on
|
|
96
|
+
const state = await _bleManager.state();
|
|
97
|
+
if (state !== react_native_ble_plx_1.State.PoweredOn) {
|
|
98
|
+
RaftLog_1.default.debug(`BLEChannel discoveryStart waiting for BLE powered on`);
|
|
99
|
+
await new Promise(resolve => setTimeout(resolve, 500));
|
|
100
|
+
return this.discoveryStart(uuids, tries - 1);
|
|
101
|
+
}
|
|
88
102
|
// Start scanning
|
|
89
|
-
await this._bleScanner.scanningStart(
|
|
103
|
+
await this._bleScanner.scanningStart(uuids);
|
|
90
104
|
// Event
|
|
91
105
|
RaftLog_1.default.debug(`BLEChannel discoveryStart emitting BLE_SCANNING_STARTED`);
|
|
92
106
|
this.emit(RaftConnEvents_1.RaftConnEvent.BLE_SCANNING_STARTED);
|
|
@@ -152,14 +166,15 @@ class RaftChannelPhoneBLE {
|
|
|
152
166
|
* @returns boolean (true if connected)
|
|
153
167
|
*
|
|
154
168
|
*/
|
|
155
|
-
async connect(
|
|
156
|
-
RaftLog_1.default.debug('BLEChannel requested connection');
|
|
169
|
+
async connect(discoveredDevice) {
|
|
170
|
+
RaftLog_1.default.debug('BLEChannel requested connection ' + JSON.stringify(discoveredDevice));
|
|
171
|
+
this._connectedDeviceServiceUUID = discoveredDevice.serviceUUIDs ? discoveredDevice.serviceUUIDs[0] : undefined;
|
|
157
172
|
this._retryConnectionIfLost = false;
|
|
158
173
|
this._bleScanner.scanningStop();
|
|
159
174
|
// Now connecting
|
|
160
|
-
this.emit(RaftConnEvents_1.RaftConnEvent.CONN_CONNECTING, { deviceId:
|
|
175
|
+
this.emit(RaftConnEvents_1.RaftConnEvent.CONN_CONNECTING, { deviceId: discoveredDevice.id });
|
|
161
176
|
// Connect
|
|
162
|
-
this.
|
|
177
|
+
this._deviceToConnectTo = discoveredDevice;
|
|
163
178
|
const connOk = await this._configDeviceConnection();
|
|
164
179
|
// Check if ok
|
|
165
180
|
if (!connOk) {
|
|
@@ -169,8 +184,8 @@ class RaftChannelPhoneBLE {
|
|
|
169
184
|
}
|
|
170
185
|
// Emit success
|
|
171
186
|
this.emit(RaftConnEvents_1.RaftConnEvent.CONN_CONNECTED, {
|
|
172
|
-
deviceId: this.
|
|
173
|
-
name: this.
|
|
187
|
+
deviceId: this._deviceToConnectTo.id,
|
|
188
|
+
name: this._deviceToConnectTo.name,
|
|
174
189
|
});
|
|
175
190
|
return true;
|
|
176
191
|
}
|
|
@@ -183,9 +198,9 @@ class RaftChannelPhoneBLE {
|
|
|
183
198
|
async disconnect() {
|
|
184
199
|
RaftLog_1.default.debug('BLEChannel disconnect requested');
|
|
185
200
|
this._retryConnectionIfLost = false;
|
|
186
|
-
RaftLog_1.default.debug(`this._ricToConnectTo ${this.
|
|
187
|
-
const connectedRIC = this.
|
|
188
|
-
this.
|
|
201
|
+
RaftLog_1.default.debug(`this._ricToConnectTo ${this._deviceToConnectTo}`);
|
|
202
|
+
const connectedRIC = this._deviceToConnectTo;
|
|
203
|
+
this._deviceToConnectTo = null;
|
|
189
204
|
// this._invalidateConnectionInfo(); // //
|
|
190
205
|
// Remove disconnect subscription so it doesn't try to reconnect
|
|
191
206
|
if (this._bleSubscrOnDisconnect) {
|
|
@@ -193,9 +208,7 @@ class RaftChannelPhoneBLE {
|
|
|
193
208
|
this._bleSubscrOnDisconnect = null;
|
|
194
209
|
}
|
|
195
210
|
// Disconnect from the connected device
|
|
196
|
-
const connMarties = await _bleManager.connectedDevices(
|
|
197
|
-
RaftChannelPhoneBLE.ServiceUUID,
|
|
198
|
-
]);
|
|
211
|
+
const connMarties = await _bleManager.connectedDevices(this._serviceUUIDs);
|
|
199
212
|
if (connMarties.length == 0) {
|
|
200
213
|
RaftLog_1.default.debug('BLEChannel disconnect - no devices connected');
|
|
201
214
|
}
|
|
@@ -221,13 +234,13 @@ class RaftChannelPhoneBLE {
|
|
|
221
234
|
*/
|
|
222
235
|
async _configDeviceConnection() {
|
|
223
236
|
// Check there is a RIC to connect to
|
|
224
|
-
if (this.
|
|
237
|
+
if (this._deviceToConnectTo === null) {
|
|
225
238
|
return false;
|
|
226
239
|
}
|
|
227
240
|
let deviceConnected = null;
|
|
228
241
|
for (let connRetry = 0; connRetry < 5; connRetry++) {
|
|
229
242
|
try {
|
|
230
|
-
deviceConnected = await _bleManager.connectToDevice(this.
|
|
243
|
+
deviceConnected = await _bleManager.connectToDevice(this._deviceToConnectTo.id, {
|
|
231
244
|
timeout: 3000,
|
|
232
245
|
});
|
|
233
246
|
// this.handleLostDevice(); // //
|
|
@@ -254,7 +267,7 @@ class RaftChannelPhoneBLE {
|
|
|
254
267
|
}
|
|
255
268
|
// Request high-priority connection
|
|
256
269
|
try {
|
|
257
|
-
await _bleManager.requestConnectionPriorityForDevice(this.
|
|
270
|
+
await _bleManager.requestConnectionPriorityForDevice(this._deviceToConnectTo.id, react_native_ble_plx_1.ConnectionPriority.High);
|
|
258
271
|
RaftLog_1.default.debug(`BLEChannel configDeviceConnection request ConnPriority.High`);
|
|
259
272
|
}
|
|
260
273
|
catch (error) {
|
|
@@ -275,7 +288,11 @@ class RaftChannelPhoneBLE {
|
|
|
275
288
|
// Monitor the inbound characteristic
|
|
276
289
|
try {
|
|
277
290
|
if (this._bleDevice) {
|
|
278
|
-
|
|
291
|
+
if (!this._connectedDeviceServiceUUID) {
|
|
292
|
+
RaftLog_1.default.error('BLEChannel _configDeviceConnection - no connected device service UUID');
|
|
293
|
+
return false;
|
|
294
|
+
}
|
|
295
|
+
this._bleSubscrOnRx = this._bleDevice.monitorCharacteristicForService(this._connectedDeviceServiceUUID, this._respUUID, (error, characteristic) => {
|
|
279
296
|
this._onMsgRx(error, characteristic);
|
|
280
297
|
});
|
|
281
298
|
}
|
|
@@ -329,11 +346,11 @@ class RaftChannelPhoneBLE {
|
|
|
329
346
|
for (let reconnAttempt = 0; reconnAttempt < this.RECONNECT_ATTEMPTS_AFTER_CONN_LOST; reconnAttempt++) {
|
|
330
347
|
// Check if scan in progress - and stop reconn attempts if so
|
|
331
348
|
const scanInProgress = this._bleScanner.isScanInProgress();
|
|
332
|
-
RaftLog_1.default.debug(`onDeviceDisconnected considering reconnection RICToConnectTo ${(_a = this.
|
|
349
|
+
RaftLog_1.default.debug(`onDeviceDisconnected considering reconnection RICToConnectTo ${(_a = this._deviceToConnectTo) === null || _a === void 0 ? void 0 : _a.name} scanInProgress ${scanInProgress} retryConnectionIfLost ${this._retryConnectionIfLost}`);
|
|
333
350
|
if (!this._retryConnectionIfLost ||
|
|
334
351
|
scanInProgress ||
|
|
335
|
-
!this.
|
|
336
|
-
RaftLog_1.default.debug(`onDeviceDisconnected DISCONNECTED_RIC RICToConnectTo ${(_b = this.
|
|
352
|
+
!this._deviceToConnectTo) {
|
|
353
|
+
RaftLog_1.default.debug(`onDeviceDisconnected DISCONNECTED_RIC RICToConnectTo ${(_b = this._deviceToConnectTo) === null || _b === void 0 ? void 0 : _b.name} scanInProgress ${scanInProgress} retryConnectionIfLost ${this._retryConnectionIfLost}`);
|
|
337
354
|
if (this._retryConnectionIfLost) {
|
|
338
355
|
// this.emit(RaftConnEvent.BLE_DISCONNECTED_RIC);
|
|
339
356
|
}
|
|
@@ -343,13 +360,13 @@ class RaftChannelPhoneBLE {
|
|
|
343
360
|
break;
|
|
344
361
|
}
|
|
345
362
|
if (await this._configDeviceConnection()) {
|
|
346
|
-
RaftLog_1.default.debug(`onDeviceDisconnected successful reconn RICToConnectTo ${(_c = this.
|
|
363
|
+
RaftLog_1.default.debug(`onDeviceDisconnected successful reconn RICToConnectTo ${(_c = this._deviceToConnectTo) === null || _c === void 0 ? void 0 : _c.name}`);
|
|
347
364
|
// Indicate connection issue resolved
|
|
348
365
|
// this.emit(RaftConnEvent.BLE_CONNECTION_ISSUE_RESOLVED);
|
|
349
366
|
// await this.ricConnector.retrieveMartySystemInfo();
|
|
350
367
|
return;
|
|
351
368
|
}
|
|
352
|
-
RaftLog_1.default.debug(`onDeviceDisconnected retrying reconn RICToConnectTo ${(_d = this.
|
|
369
|
+
RaftLog_1.default.debug(`onDeviceDisconnected retrying reconn RICToConnectTo ${(_d = this._deviceToConnectTo) === null || _d === void 0 ? void 0 : _d.name}`);
|
|
353
370
|
}
|
|
354
371
|
});
|
|
355
372
|
}
|
|
@@ -372,7 +389,7 @@ class RaftChannelPhoneBLE {
|
|
|
372
389
|
const msgFrameBase64 = characteristic.value;
|
|
373
390
|
const rxFrame = RaftUtils_1.default.atob(msgFrameBase64);
|
|
374
391
|
// Debug
|
|
375
|
-
// RaftLog.debug('_onMsgRx from BLE ' +
|
|
392
|
+
// RaftLog.debug('_onMsgRx from BLE ' + RaftUtils.bufferToHex(rxFrame));
|
|
376
393
|
// Send
|
|
377
394
|
if (rxFrame !== null && this._raftMsgHandler) {
|
|
378
395
|
this._raftMsgHandler.handleNewRxMsg(rxFrame);
|
|
@@ -397,10 +414,14 @@ class RaftChannelPhoneBLE {
|
|
|
397
414
|
// Convert to Base64
|
|
398
415
|
const msgFrameBase64 = RaftUtils_1.default.btoa(msg);
|
|
399
416
|
try {
|
|
400
|
-
|
|
417
|
+
if (!this._connectedDeviceServiceUUID) {
|
|
418
|
+
RaftLog_1.default.error('BLEChannel sendTxMsg - no connected device service UUID');
|
|
419
|
+
return false;
|
|
420
|
+
}
|
|
421
|
+
await this._bleDevice.writeCharacteristicWithoutResponseForService(this._connectedDeviceServiceUUID, this._cmdUUID, msgFrameBase64);
|
|
401
422
|
return true;
|
|
402
423
|
}
|
|
403
|
-
catch (
|
|
424
|
+
catch (_a) {
|
|
404
425
|
if (retryIdx === this.maxRetries - 1) {
|
|
405
426
|
RaftLog_1.default.debug(`sendTxMsg failed after ${this.maxRetries} attempts`);
|
|
406
427
|
return false;
|
|
@@ -425,10 +446,14 @@ class RaftChannelPhoneBLE {
|
|
|
425
446
|
// Convert to Base64
|
|
426
447
|
const msgFrameBase64 = RaftUtils_1.default.btoa(msg);
|
|
427
448
|
try {
|
|
428
|
-
this.
|
|
449
|
+
if (!this._connectedDeviceServiceUUID) {
|
|
450
|
+
RaftLog_1.default.error('BLEChannel sendTxMsgNoAwait - no connected device service UUID');
|
|
451
|
+
return false;
|
|
452
|
+
}
|
|
453
|
+
this._bleDevice.writeCharacteristicWithoutResponseForService(this._connectedDeviceServiceUUID, this._cmdUUID, msgFrameBase64);
|
|
429
454
|
return true;
|
|
430
455
|
}
|
|
431
|
-
catch (
|
|
456
|
+
catch (_a) {
|
|
432
457
|
if (retryIdx === this.maxRetries - 1) {
|
|
433
458
|
RaftLog_1.default.debug(`sendTxMsgNoAwait failed after ${this.maxRetries} attempts`);
|
|
434
459
|
return false;
|
|
@@ -446,10 +471,5 @@ class RaftChannelPhoneBLE {
|
|
|
446
471
|
return null;
|
|
447
472
|
}
|
|
448
473
|
}
|
|
449
|
-
// BLE UUIDS
|
|
450
|
-
RaftChannelPhoneBLE.ServiceUUID = "aa76677e-9cfd-4626-a510-0d305be57c8d";
|
|
451
|
-
RaftChannelPhoneBLE.CogServiceUUID = "da903f65-d5c2-4f4d-a065-d1aade7af874";
|
|
452
|
-
RaftChannelPhoneBLE.CmdUUID = "aa76677e-9cfd-4626-a510-0d305be57c8e";
|
|
453
|
-
RaftChannelPhoneBLE.RespUUID = "aa76677e-9cfd-4626-a510-0d305be57c8f";
|
|
454
474
|
exports.default = RaftChannelPhoneBLE;
|
|
455
475
|
//# 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,10 +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
|
-
|
|
9
|
-
static RespUUID: string;
|
|
6
|
+
_cmdUUID: string;
|
|
7
|
+
_respUUID: string;
|
|
8
|
+
_serviceUUIDs: string[];
|
|
10
9
|
private _bleDevice;
|
|
11
10
|
private _characteristicTx;
|
|
12
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;
|
|
@@ -111,7 +115,7 @@ class RaftChannelBLE {
|
|
|
111
115
|
try {
|
|
112
116
|
let service = null;
|
|
113
117
|
// iterate over known services
|
|
114
|
-
for (const serviceUUID of
|
|
118
|
+
for (const serviceUUID of this._serviceUUIDs) {
|
|
115
119
|
try {
|
|
116
120
|
service = await this._bleDevice.gatt.getPrimaryService(serviceUUID);
|
|
117
121
|
if (service) {
|
|
@@ -129,9 +133,9 @@ class RaftChannelBLE {
|
|
|
129
133
|
RaftLog_1.default.debug(`RaftChannelBLE.connect - found service: ${service.uuid}`);
|
|
130
134
|
try {
|
|
131
135
|
// Get Tx and Rx characteristics
|
|
132
|
-
this._characteristicTx = await service.getCharacteristic(
|
|
136
|
+
this._characteristicTx = await service.getCharacteristic(this._cmdUUID);
|
|
133
137
|
RaftLog_1.default.debug(`RaftChannelBLE.connect - found char ${this._characteristicTx.uuid}`);
|
|
134
|
-
this._characteristicRx = await service.getCharacteristic(
|
|
138
|
+
this._characteristicRx = await service.getCharacteristic(this._respUUID);
|
|
135
139
|
RaftLog_1.default.debug(`RaftChannelBLE.connect - found char ${this._characteristicRx.uuid}`);
|
|
136
140
|
// Notifications of received messages
|
|
137
141
|
try {
|
|
@@ -285,10 +289,5 @@ class RaftChannelBLE {
|
|
|
285
289
|
return false;
|
|
286
290
|
}
|
|
287
291
|
}
|
|
288
|
-
// BLE UUIDS
|
|
289
|
-
RaftChannelBLE.RICServiceUUID = "aa76677e-9cfd-4626-a510-0d305be57c8d";
|
|
290
|
-
RaftChannelBLE.CogServiceUUID = "da903f65-d5c2-4f4d-a065-d1aade7af874";
|
|
291
|
-
RaftChannelBLE.CmdUUID = "aa76677e-9cfd-4626-a510-0d305be57c8e";
|
|
292
|
-
RaftChannelBLE.RespUUID = "aa76677e-9cfd-4626-a510-0d305be57c8f";
|
|
293
292
|
exports.default = RaftChannelBLE;
|
|
294
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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"}
|