@ovok/native 0.3.13 → 0.3.14
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/lib/commonjs/modules/bt-management/services/bt-manager.js +2 -2
- package/lib/commonjs/modules/bt-management/services/bt-manager.js.map +1 -1
- package/lib/commonjs/modules/bt-management/services/devices/bt-connection-handler.js +4 -4
- package/lib/commonjs/modules/bt-management/services/devices/bt-connection-handler.js.map +1 -1
- package/lib/commonjs/modules/bt-management/services/devices/bt-data-processor.js +10 -4
- package/lib/commonjs/modules/bt-management/services/devices/bt-data-processor.js.map +1 -1
- package/lib/commonjs/modules/bt-management/services/devices/bt-managed-device.js +12 -2
- package/lib/commonjs/modules/bt-management/services/devices/bt-managed-device.js.map +1 -1
- package/lib/commonjs/modules/bt-management/services/devices/f4/f4.device.js +31 -2
- package/lib/commonjs/modules/bt-management/services/devices/f4/f4.device.js.map +1 -1
- package/lib/commonjs/modules/bt-management/services/devices/f4/f4.main-services.js +1 -6
- package/lib/commonjs/modules/bt-management/services/devices/f4/f4.main-services.js.map +1 -1
- package/lib/commonjs/modules/bt-management/types/case-type.js +1 -0
- package/lib/commonjs/modules/bt-management/types/case-type.js.map +1 -1
- package/lib/commonjs/modules/bt-management/types/dependent-result-handler-params.js +6 -0
- package/lib/commonjs/modules/bt-management/types/dependent-result-handler-params.js.map +1 -0
- package/lib/module/modules/bt-management/services/bt-manager.js +2 -2
- package/lib/module/modules/bt-management/services/bt-manager.js.map +1 -1
- package/lib/module/modules/bt-management/services/devices/bt-connection-handler.js +4 -4
- package/lib/module/modules/bt-management/services/devices/bt-connection-handler.js.map +1 -1
- package/lib/module/modules/bt-management/services/devices/bt-data-processor.js +10 -4
- package/lib/module/modules/bt-management/services/devices/bt-data-processor.js.map +1 -1
- package/lib/module/modules/bt-management/services/devices/bt-managed-device.js +12 -2
- package/lib/module/modules/bt-management/services/devices/bt-managed-device.js.map +1 -1
- package/lib/module/modules/bt-management/services/devices/f4/f4.device.js +31 -2
- package/lib/module/modules/bt-management/services/devices/f4/f4.device.js.map +1 -1
- package/lib/module/modules/bt-management/services/devices/f4/f4.main-services.js +1 -6
- package/lib/module/modules/bt-management/services/devices/f4/f4.main-services.js.map +1 -1
- package/lib/module/modules/bt-management/types/case-type.js +1 -0
- package/lib/module/modules/bt-management/types/case-type.js.map +1 -1
- package/lib/module/modules/bt-management/types/dependent-result-handler-params.js +4 -0
- package/lib/module/modules/bt-management/types/dependent-result-handler-params.js.map +1 -0
- package/lib/typescript/commonjs/src/modules/bt-management/services/bt-manager.d.ts.map +1 -1
- package/lib/typescript/commonjs/src/modules/bt-management/services/devices/bt-data-processor.d.ts +8 -7
- package/lib/typescript/commonjs/src/modules/bt-management/services/devices/bt-data-processor.d.ts.map +1 -1
- package/lib/typescript/commonjs/src/modules/bt-management/services/devices/bt-managed-device.d.ts +12 -2
- package/lib/typescript/commonjs/src/modules/bt-management/services/devices/bt-managed-device.d.ts.map +1 -1
- package/lib/typescript/commonjs/src/modules/bt-management/services/devices/f4/f4.device.d.ts +15 -1
- package/lib/typescript/commonjs/src/modules/bt-management/services/devices/f4/f4.device.d.ts.map +1 -1
- package/lib/typescript/commonjs/src/modules/bt-management/services/devices/f4/f4.main-services.d.ts.map +1 -1
- package/lib/typescript/commonjs/src/modules/bt-management/types/case-type.d.ts +1 -0
- package/lib/typescript/commonjs/src/modules/bt-management/types/case-type.d.ts.map +1 -1
- package/lib/typescript/commonjs/src/modules/bt-management/types/dependent-result-handler-params.d.ts +9 -0
- package/lib/typescript/commonjs/src/modules/bt-management/types/dependent-result-handler-params.d.ts.map +1 -0
- package/lib/typescript/module/src/modules/bt-management/services/bt-manager.d.ts.map +1 -1
- package/lib/typescript/module/src/modules/bt-management/services/devices/bt-data-processor.d.ts +8 -7
- package/lib/typescript/module/src/modules/bt-management/services/devices/bt-data-processor.d.ts.map +1 -1
- package/lib/typescript/module/src/modules/bt-management/services/devices/bt-managed-device.d.ts +12 -2
- package/lib/typescript/module/src/modules/bt-management/services/devices/bt-managed-device.d.ts.map +1 -1
- package/lib/typescript/module/src/modules/bt-management/services/devices/f4/f4.device.d.ts +15 -1
- package/lib/typescript/module/src/modules/bt-management/services/devices/f4/f4.device.d.ts.map +1 -1
- package/lib/typescript/module/src/modules/bt-management/services/devices/f4/f4.main-services.d.ts.map +1 -1
- package/lib/typescript/module/src/modules/bt-management/types/case-type.d.ts +1 -0
- package/lib/typescript/module/src/modules/bt-management/types/case-type.d.ts.map +1 -1
- package/lib/typescript/module/src/modules/bt-management/types/dependent-result-handler-params.d.ts +9 -0
- package/lib/typescript/module/src/modules/bt-management/types/dependent-result-handler-params.d.ts.map +1 -0
- package/package.json +1 -1
|
@@ -129,7 +129,7 @@ class BTManager {
|
|
|
129
129
|
error: error
|
|
130
130
|
});
|
|
131
131
|
(0, _sentryLogger.sentryLogger)("error", "BT_MANAGER: Scan result error", {
|
|
132
|
-
error
|
|
132
|
+
error: error instanceof Error ? error.message : error
|
|
133
133
|
});
|
|
134
134
|
(0, _index.slog)(error, "BT_MANAGER: Scan result error", {
|
|
135
135
|
error
|
|
@@ -171,7 +171,7 @@ class BTManager {
|
|
|
171
171
|
this.onDeviceFoundCallback?.(deviceClass, this);
|
|
172
172
|
} catch (error) {
|
|
173
173
|
(0, _sentryLogger.sentryLogger)("error", "BT_MANAGER: Error creating device", {
|
|
174
|
-
error,
|
|
174
|
+
error: error instanceof Error ? error.message : error,
|
|
175
175
|
deviceId: device?.id,
|
|
176
176
|
deviceName: device?.name
|
|
177
177
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_reactNative","require","_reactNativeBlePlx","_index","_sentryLogger","_deviceCreator","BTManager","MAX_DEVICES","devices","Map","eventSubscriptions","lastScanTimestamp","constructor","bleManager","acceptedDevices","deviceCreator","DeviceCreator","destroy","sentryLogger","stopScan","stateChangeListener","remove","undefined","onErrorCallback","onDeviceFoundCallback","onResultCallback","onDeviceStatusChangedCallback","forEach","device","clear","startScan","Date","now","onStateChange","state","State","PoweredOn","index","indexOf","splice","startDeviceScan","scanMode","ScanMode","Balanced","onScanResult","Platform","OS","Linking","sendIntent","enable","push","stopDeviceScan","sub","onDeviceFound","callback","onError","onDeviceStatusChanged","onResult","error","slog","name","has","id","deviceName","getDeviceName","size","deviceId","currentSize","deviceClass","createDevice","bind","onDeviceDisconnected","removeDeviceFromFoundedDevices","set","get","delete","exports"],"sourceRoot":"../../../../../src","sources":["modules/bt-management/services/bt-manager.ts"],"mappings":"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
|
|
1
|
+
{"version":3,"names":["_reactNative","require","_reactNativeBlePlx","_index","_sentryLogger","_deviceCreator","BTManager","MAX_DEVICES","devices","Map","eventSubscriptions","lastScanTimestamp","constructor","bleManager","acceptedDevices","deviceCreator","DeviceCreator","destroy","sentryLogger","stopScan","stateChangeListener","remove","undefined","onErrorCallback","onDeviceFoundCallback","onResultCallback","onDeviceStatusChangedCallback","forEach","device","clear","startScan","Date","now","onStateChange","state","State","PoweredOn","index","indexOf","splice","startDeviceScan","scanMode","ScanMode","Balanced","onScanResult","Platform","OS","Linking","sendIntent","enable","push","stopDeviceScan","sub","onDeviceFound","callback","onError","onDeviceStatusChanged","onResult","error","Error","message","slog","name","has","id","deviceName","getDeviceName","size","deviceId","currentSize","deviceClass","createDevice","bind","onDeviceDisconnected","removeDeviceFromFoundedDevices","set","get","delete","exports"],"sourceRoot":"../../../../../src","sources":["modules/bt-management/services/bt-manager.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -27,7 +27,7 @@ class BTConnectionHandler {
|
|
|
27
27
|
this.subscribeToAllCharacteristics();
|
|
28
28
|
} catch (error) {
|
|
29
29
|
(0, _sentryLogger.sentryLogger)("error", "BT_MANAGER: Error connecting to device", {
|
|
30
|
-
error,
|
|
30
|
+
error: error instanceof Error ? error.message : error,
|
|
31
31
|
deviceName: this.device.name
|
|
32
32
|
});
|
|
33
33
|
this.callbacks.onError?.(error);
|
|
@@ -93,7 +93,7 @@ class BTConnectionHandler {
|
|
|
93
93
|
};
|
|
94
94
|
onDeviceDisconnected = error => {
|
|
95
95
|
(0, _sentryLogger.sentryLogger)("info", "BT_MANAGER: On device disconnected", {
|
|
96
|
-
error,
|
|
96
|
+
error: error instanceof Error ? error.message : error,
|
|
97
97
|
deviceName: this.device.name
|
|
98
98
|
});
|
|
99
99
|
if (error) {
|
|
@@ -125,7 +125,7 @@ class BTConnectionHandler {
|
|
|
125
125
|
await this.sendCommandToDevice();
|
|
126
126
|
} catch (error) {
|
|
127
127
|
(0, _sentryLogger.sentryLogger)("error", "DEVICE: Error subscribing to all characteristics", {
|
|
128
|
-
error,
|
|
128
|
+
error: error instanceof Error ? error.message : error,
|
|
129
129
|
deviceName: this.device.name
|
|
130
130
|
});
|
|
131
131
|
this.callbacks.onError?.(error);
|
|
@@ -148,7 +148,7 @@ class BTConnectionHandler {
|
|
|
148
148
|
} catch (error) {
|
|
149
149
|
this.retryCount++;
|
|
150
150
|
(0, _sentryLogger.sentryLogger)("error", "DEVICE: Error sending command", {
|
|
151
|
-
error,
|
|
151
|
+
error: error instanceof Error ? error.message : error,
|
|
152
152
|
deviceName: this.device.name
|
|
153
153
|
});
|
|
154
154
|
if (this.retryCount === 3) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_index","require","_sentryLogger","_deviceStatus","_base64ToHex","_hexToBase","BTConnectionHandler","characteristicSubscriptions","isSendingCommand","retryCount","constructor","device","mainServices","callbacks","connect","connectWithRetries","onStatusChanged","DeviceStatus","CONNECTED","discoverAllServicesAndCharacteristics","onDisconnectSubscription","onDisconnected","onDeviceDisconnected","subscribeToAllCharacteristics","error","sentryLogger","deviceName","name","onError","DISCONNECTED","destroy","forEach","sub","remove","sendCommandToDevice","mainService","writeUuid","sendCommand","maxRetries","retryDelay","maxDelay","connected","isConnected","deviceId","id","
|
|
1
|
+
{"version":3,"names":["_index","require","_sentryLogger","_deviceStatus","_base64ToHex","_hexToBase","BTConnectionHandler","characteristicSubscriptions","isSendingCommand","retryCount","constructor","device","mainServices","callbacks","connect","connectWithRetries","onStatusChanged","DeviceStatus","CONNECTED","discoverAllServicesAndCharacteristics","onDisconnectSubscription","onDisconnected","onDeviceDisconnected","subscribeToAllCharacteristics","error","sentryLogger","Error","message","deviceName","name","onError","DISCONNECTED","destroy","forEach","sub","remove","sendCommandToDevice","mainService","writeUuid","sendCommand","maxRetries","retryDelay","maxDelay","connected","isConnected","deviceId","id","String","errorCode","willRetry","Promise","resolve","setTimeout","Math","min","pow","monitorUuid","monitorUuids","subscription","monitorCharacteristicForService","uuid","result","value","hexValue","base64ToHex","onDataReceived","push","command","hexToBase64","mainCommandUuid","writeCharacteristicWithResponseForService","slog","exports"],"sourceRoot":"../../../../../../src","sources":["modules/bt-management/services/devices/bt-connection-handler.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -35,9 +35,15 @@ class BTDataProcessor {
|
|
|
35
35
|
return;
|
|
36
36
|
}
|
|
37
37
|
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
38
|
+
/**
|
|
39
|
+
* If the case is dependent, we need to handle the result based on the device logic.
|
|
40
|
+
* If the case is not dependent, we can handle the original result directly.
|
|
41
|
+
*/
|
|
42
|
+
let dependentData = null;
|
|
43
|
+
if (data.parsingCase.caseType === _caseType.CaseType.DEPENDENT) {
|
|
44
|
+
dependentData = this.callbacks.handleDependentResult?.(data);
|
|
45
|
+
}
|
|
46
|
+
this.handleStatusChanges(dependentData || data);
|
|
41
47
|
this.resetDataAndSendCommandToDevice();
|
|
42
48
|
};
|
|
43
49
|
extractData(uuid) {
|
|
@@ -58,7 +64,7 @@ class BTDataProcessor {
|
|
|
58
64
|
return {
|
|
59
65
|
parsingCase,
|
|
60
66
|
measurementTypeKey,
|
|
61
|
-
parsedData
|
|
67
|
+
parsedData: parsedData
|
|
62
68
|
};
|
|
63
69
|
}
|
|
64
70
|
findParsingModel(uuid) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_caseType","require","_deviceStatus","_parseMeasurement","BTDataProcessor","collectedValues","isMeasuring","constructor","device","mainServices","stuckDataTimeoutDuration","callbacks","destroy","clearTimeout","stuckDataTimeout","undefined","processData","uuid","hexValue","push","startStuckTimeout","isValid","validatePackage","data","extractData","resetDataAndSendCommandToDevice","handleStatusChanges","parsingModel","findParsingModel","value","caseValuePosition","map","index","join","
|
|
1
|
+
{"version":3,"names":["_caseType","require","_deviceStatus","_parseMeasurement","BTDataProcessor","collectedValues","isMeasuring","constructor","device","mainServices","stuckDataTimeoutDuration","callbacks","destroy","clearTimeout","stuckDataTimeout","undefined","processData","uuid","hexValue","push","startStuckTimeout","isValid","validatePackage","data","extractData","resetDataAndSendCommandToDevice","dependentData","parsingCase","caseType","CaseType","DEPENDENT","handleDependentResult","handleStatusChanges","parsingModel","findParsingModel","value","caseValuePosition","map","index","join","findParsingCase","parsedData","parseData","measurementTypeKey","mainService","characteristic","monitorUuids","find","e","toLowerCase","caseValue","cases","successResult","parseMeasurement","STREAM","onStreamStart","onStatusChanged","DeviceStatus","MEASURING","OTHER","CONNECTED","skipConnectedChange","onResult","RESULT","onSendCommandToDevice","setTimeout","onError","Error","cause","message","cancelConnection","exports"],"sourceRoot":"../../../../../../src","sources":["modules/bt-management/services/devices/bt-data-processor.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -13,6 +13,15 @@ class BTManagedDevice {
|
|
|
13
13
|
* The timeout in milliseconds for the stuck data.
|
|
14
14
|
*/
|
|
15
15
|
|
|
16
|
+
/**
|
|
17
|
+
* The function to handle the dependent result on dependent case. This is generic and can be overridden by the device to handle the result based on the device logic.
|
|
18
|
+
* If the case is dependent, this function will be called to handle the result and return the new result based on the device logic.
|
|
19
|
+
* If the case is not dependent, this function will not be called.
|
|
20
|
+
*
|
|
21
|
+
* @param data - The data to handle the result.
|
|
22
|
+
* @returns The handled data.
|
|
23
|
+
*/
|
|
24
|
+
|
|
16
25
|
constructor(device, {
|
|
17
26
|
deviceName,
|
|
18
27
|
onError: onErrorCallback,
|
|
@@ -50,7 +59,7 @@ class BTManagedDevice {
|
|
|
50
59
|
};
|
|
51
60
|
this.onError = error => {
|
|
52
61
|
(0, _sentryLogger.sentryLogger)("error", "BT_MANAGER: Calling onError callback", {
|
|
53
|
-
error,
|
|
62
|
+
error: error instanceof Error ? error.message : error,
|
|
54
63
|
deviceData: this.deviceData,
|
|
55
64
|
deviceName: this.deviceData.name
|
|
56
65
|
});
|
|
@@ -117,7 +126,8 @@ class BTManagedDevice {
|
|
|
117
126
|
}
|
|
118
127
|
},
|
|
119
128
|
onSendCommandToDevice: this.connectionHandler?.sendCommandToDevice?.bind(this),
|
|
120
|
-
onError: this.onError?.bind(this)
|
|
129
|
+
onError: this.onError?.bind(this),
|
|
130
|
+
handleDependentResult: this.handleDependentResult?.bind(this)
|
|
121
131
|
});
|
|
122
132
|
await this.connectionHandler.connect();
|
|
123
133
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_sentryLogger","require","_deviceStatus","_btConnectionHandler","_btDataProcessor","BTManagedDevice","constructor","device","deviceName","onError","onErrorCallback","onDeviceStatusChanged","onDeviceStatusChangedCallback","onResult","onResultCallback","onDeviceDisconnected","onDeviceDisconnectedCallback","sentryLogger","deviceId","id","deviceData","name","localName","manufacturerData","sn","measurementTypes","status","measurementTypeKey","error","caseType","_","data","diagramPoints","length","undefined","destroy","connectionHandler","dataProcessor","connect","getSupportedMeasurementTypeKeys","BTConnectionHandler","mainServices","onStatusChanged","bind","DeviceStatus","DISCONNECTED","onDataReceived","uuid","hexValue","processData","BTDataProcessor","stuckDataTimeout","onStreamStart","validatePackage","parsedData","collectedValues","handleSuccessResult","onSendCommandToDevice","sendCommandToDevice","flatMap","service","monitorUuids","parsingModel","cases","map","c","filter","type","uniqueMeasurementTypes","Set","flat","exports"],"sourceRoot":"../../../../../../src","sources":["modules/bt-management/services/devices/bt-managed-device.ts"],"mappings":";;;;;;AAGA,IAAAA,aAAA,GAAAC,OAAA;
|
|
1
|
+
{"version":3,"names":["_sentryLogger","require","_deviceStatus","_btConnectionHandler","_btDataProcessor","BTManagedDevice","constructor","device","deviceName","onError","onErrorCallback","onDeviceStatusChanged","onDeviceStatusChangedCallback","onResult","onResultCallback","onDeviceDisconnected","onDeviceDisconnectedCallback","sentryLogger","deviceId","id","deviceData","name","localName","manufacturerData","sn","measurementTypes","status","measurementTypeKey","error","Error","message","caseType","_","data","diagramPoints","length","undefined","destroy","connectionHandler","dataProcessor","connect","getSupportedMeasurementTypeKeys","BTConnectionHandler","mainServices","onStatusChanged","bind","DeviceStatus","DISCONNECTED","onDataReceived","uuid","hexValue","processData","BTDataProcessor","stuckDataTimeout","onStreamStart","validatePackage","parsedData","collectedValues","handleSuccessResult","onSendCommandToDevice","sendCommandToDevice","handleDependentResult","flatMap","service","monitorUuids","parsingModel","cases","map","c","filter","type","uniqueMeasurementTypes","Set","flat","exports"],"sourceRoot":"../../../../../../src","sources":["modules/bt-management/services/devices/bt-managed-device.ts"],"mappings":";;;;;;AAGA,IAAAA,aAAA,GAAAC,OAAA;AAKA,IAAAC,aAAA,GAAAD,OAAA;AAMA,IAAAE,oBAAA,GAAAF,OAAA;AACA,IAAAG,gBAAA,GAAAH,OAAA;AAEO,MAAeI,eAAe,CAGrC;EASE;AACF;AACA;;EAGE;AACF;AACA;AACA;AACA;AACA;AACA;AACA;;EAuBEC,WAAWA,CACOC,MAAc,EAE9B;IACEC,UAAU;IACVC,OAAO,EAAEC,eAAe;IACxBC,qBAAqB,EAAEC,6BAA6B;IACpDC,QAAQ,EAAEC,gBAAgB;IAC1BC,oBAAoB,EAAEC;EACD,CAAC,EACxB;IAAA,KATgBT,MAAc,GAAdA,MAAc;IAU9B,IAAAU,0BAAY,EAAC,MAAM,EAAE,sCAAsC,EAAE;MAC3DC,QAAQ,EAAEX,MAAM,CAACY,EAAE;MACnBX,UAAU,EAAEA;IACd,CAAC,CAAC;IACF,IAAI,CAACY,UAAU,GAAG;MAChBD,EAAE,EAAEZ,MAAM,CAACY,EAAE;MACbE,IAAI,EAAEb,UAAU;MAChBc,SAAS,EAAEf,MAAM,CAACe,SAAS,IAAI,EAAE;MACjCC,gBAAgB,EAAEhB,MAAM,CAACgB,gBAAgB,IAAI,EAAE;MAC/CC,EAAE,EAAE,EAAE;MAEN;MACAC,gBAAgB,EAAE;IACpB,CAAC;IAED,IAAI,CAACN,EAAE,GAAGZ,MAAM,CAACY,EAAE;IAEnB,IAAI,CAACR,qBAAqB,GAAG,CAC3Be,MAAoB,EACpBC,kBAAuC,KACpC;MACH,IAAAV,0BAAY,EACV,MAAM,EACN,oDAAoD,EACpD;QACES,MAAM;QACNC,kBAAkB;QAClBP,UAAU,EAAE,IAAI,CAACA,UAAU;QAC3BZ,UAAU,EAAE,IAAI,CAACY,UAAU,CAACC;MAC9B,CACF,CAAC;MACDT,6BAA6B,GAAG;QAC9BQ,UAAU,EAAE,IAAI,CAACA,UAAU;QAC3BM,MAAM,EAAEA,MAAM;QACdC;MACF,CAAC,CAAC;IACJ,CAAC;IACD,IAAI,CAAClB,OAAO,GAAImB,KAAgC,IAAK;MACnD,IAAAX,0BAAY,EAAC,OAAO,EAAE,sCAAsC,EAAE;QAC5DW,KAAK,EAAEA,KAAK,YAAYC,KAAK,GAAGD,KAAK,CAACE,OAAO,GAAGF,KAAK;QACrDR,UAAU,EAAE,IAAI,CAACA,UAAU;QAC3BZ,UAAU,EAAE,IAAI,CAACY,UAAU,CAACC;MAC9B,CAAC,CAAC;MACFX,eAAe,GAAG;QAChBU,UAAU,EAAE,IAAI,CAACA,UAAU;QAC3BQ,KAAK,EAAEA;MACT,CAAC,CAAC;IACJ,CAAC;IACD,IAAI,CAACf,QAAQ,GAAG,CAAC;MACfkB,QAAQ,EAAEC,CAAC;MACX,GAAGC;IAC2B,CAAC,KAAK;MACpC,IAAAhB,0BAAY,EAAC,MAAM,EAAE,uCAAuC,EAAE;QAC5DgB,IAAI,EAAE;UACJ,GAAGA,IAAI;UACPC,aAAa,EACX,eAAe,IAAID,IAAI,GAClBA,IAAI,CAACC,aAAa,CAAcC,MAAM,GACvCC;QACR,CAAC;QACDhB,UAAU,EAAE,IAAI,CAACA,UAAU;QAC3BZ,UAAU,EAAE,IAAI,CAACY,UAAU,CAACC;MAC9B,CAAC,CAAC;MACFP,gBAAgB,GAAG;QAAEM,UAAU,EAAE,IAAI,CAACA,UAAU;QAAEa;MAAK,CAAC,CAAC;IAC3D,CAAC;IACD,IAAI,CAAClB,oBAAoB,GAAGC,4BAA4B;EAC1D;EAEOqB,OAAO,GAAGA,CAAA,KAAM;IACrB,IAAApB,0BAAY,EAAC,MAAM,EAAE,+BAA+B,EAAE;MACpDG,UAAU,EAAE,IAAI,CAACA,UAAU;MAC3BZ,UAAU,EAAE,IAAI,CAACY,UAAU,CAACC;IAC9B,CAAC,CAAC;IACF,IAAI,CAACiB,iBAAiB,EAAED,OAAO,CAAC,CAAC;IACjC,IAAI,CAACE,aAAa,EAAEF,OAAO,CAAC,CAAC;IAC7B,IAAI,CAAC5B,OAAO,GAAG2B,SAAS;IACxB,IAAI,CAACzB,qBAAqB,GAAGyB,SAAS;IACtC,IAAI,CAACvB,QAAQ,GAAGuB,SAAS;EAC3B,CAAC;EAEMI,OAAO,GAAG,MAAAA,CAAA,KAAY;IAC3B;IACA,IAAI,CAACpB,UAAU,CAACK,gBAAgB,GAAG,IAAI,CAACgB,+BAA+B,CAAC,CAAC;IAEzE,IAAI,CAACH,iBAAiB,GAAG,IAAII,wCAAmB,CAC9C,IAAI,CAACnC,MAAM,EACX,IAAI,CAACoC,YAAY,EACjB;MACEC,eAAe,EAAGlB,MAAM,IAAK;QAC3B,IAAI,CAACf,qBAAqB,EAAEkC,IAAI,CAAC,IAAI,CAAC,CAACnB,MAAM,CAAC;QAC9C,IAAIA,MAAM,KAAKoB,0BAAY,CAACC,YAAY,EAAE;UACxC,IAAI,CAAChC,oBAAoB,GAAG,CAAC;UAC7B,IAAI,CAACsB,OAAO,CAAC,CAAC;QAChB;MACF,CAAC;MACD5B,OAAO,EAAGmB,KAAK,IAAK,IAAI,CAACnB,OAAO,EAAEoC,IAAI,CAAC,IAAI,CAAC,CAACjB,KAAK,CAAC;MACnDoB,cAAc,EAAEA,CAACC,IAAI,EAAEC,QAAQ,KAAK;QAClC,IAAI,CAACX,aAAa,EAAEY,WAAW,CAACF,IAAI,EAAEC,QAAQ,CAAC;MACjD;IACF,CACF,CAAC;IAED,IAAI,CAACX,aAAa,GAAG,IAAIa,gCAAe,CACtC,IAAI,CAAC7C,MAAM,EACX,IAAI,CAACoC,YAAY,EACjB,IAAI,CAACU,gBAAgB,EACrB;MACET,eAAe,EAAE,IAAI,CAACjC,qBAAqB,EAAEkC,IAAI,CAAC,IAAI,CAAC;MACvDS,aAAa,EAAE,IAAI,CAACA,aAAa,EAAET,IAAI,CAAC,IAAI,CAAC;MAC7CU,eAAe,EAAE,IAAI,CAACA,eAAe,CAACV,IAAI,CAAC,IAAI,CAAC;MAChDhC,QAAQ,EAAEA,CAAC2C,UAAU,EAAEC,eAAe,KAAK;QACzC,IAAI;UACF,OAAO,IAAI,CAACC,mBAAmB,CAACb,IAAI,CAAC,IAAI,CAAC,CACxCW,UAAU,EACVC,eACF,CAAC;QACH,CAAC,CAAC,OAAO7B,KAAK,EAAE;UACd,IAAI,CAACnB,OAAO,EAAEoC,IAAI,CAAC,IAAI,CAAC,CAACjB,KAAyB,CAAC;QACrD;MACF,CAAC;MACD+B,qBAAqB,EACnB,IAAI,CAACrB,iBAAiB,EAAEsB,mBAAmB,EAAEf,IAAI,CAAC,IAAI,CAAC;MACzDpC,OAAO,EAAE,IAAI,CAACA,OAAO,EAAEoC,IAAI,CAAC,IAAI,CAAC;MACjCgB,qBAAqB,EAAE,IAAI,CAACA,qBAAqB,EAAEhB,IAAI,CAAC,IAAI;IAC9D,CACF,CAAC;IAED,MAAM,IAAI,CAACP,iBAAiB,CAACE,OAAO,CAAC,CAAC;EACxC,CAAC;EAEOC,+BAA+B,GAAGA,CAAA,KAA4B;IACpE,MAAMhB,gBAAgB,GAAG,IAAI,CAACkB,YAAY,CACvCmB,OAAO,CAAEC,OAAO,IAAK;MACpB,OAAOA,OAAO,CAACC,YAAY,CAACF,OAAO,CAChCb,IAAI,IACHA,IAAI,CAACgB,YAAY,CAACC,KAAK,CAACC,GAAG,CAAEC,CAAC,IAAKA,CAAC,CAACzC,kBAAkB,CAAC,IAAI,EAChE,CAAC;IACH,CAAC,CAAC,CACD0C,MAAM,CAAEC,IAAI,IAAKA,IAAI,KAAKlC,SAAS,CAAC;IAEvC,MAAMmC,sBAAsB,GAAG,CAAC,GAAG,IAAIC,GAAG,CAAC/C,gBAAgB,CAACgD,IAAI,CAAC,CAAC,CAAC,CAAC;IAEpE,OAAOF,sBAAsB;EAC/B,CAAC;AACH;AAACG,OAAA,CAAArE,eAAA,GAAAA,eAAA","ignoreList":[]}
|
|
@@ -8,13 +8,42 @@ var _caseType = require("../../../types/case-type.js");
|
|
|
8
8
|
var _btManagedDevice = require("../bt-managed-device.js");
|
|
9
9
|
var _f4MainServices = require("./f4.main-services.js");
|
|
10
10
|
class F4Device extends _btManagedDevice.BTManagedDevice {
|
|
11
|
-
stuckDataTimeout = 30_000;
|
|
12
11
|
mainServices = _f4MainServices.f4MainServices;
|
|
13
12
|
validatePackage = () => {
|
|
14
13
|
return true;
|
|
15
14
|
};
|
|
15
|
+
|
|
16
|
+
/**Add a comment on line R19Add diff commentMarkdown input: edit mode selected.WritePreviewAdd a suggestionHeadingBoldItalicQuoteCodeLinkUnordered listNumbered listTask listMentionReferenceSaved repliesAdd FilesPaste, drop, or click to add filesCancelCommentStart a reviewReturn to code
|
|
17
|
+
* The function to handle the dependent result on dependent case. This is specific to the F4 device and can be overridden by the device to handle the result based on the device logic.
|
|
18
|
+
* if the body weight is 0, we need to return the other case type. That means there is no one on the scale
|
|
19
|
+
* if the body weight is not 0, we need to return the stream case type.
|
|
20
|
+
*
|
|
21
|
+
* @param data - The data to handle the result.
|
|
22
|
+
* @returns The handled data.
|
|
23
|
+
*/
|
|
24
|
+
handleDependentResult = ({
|
|
25
|
+
parsingCase,
|
|
26
|
+
measurementTypeKey,
|
|
27
|
+
parsedData
|
|
28
|
+
}) => {
|
|
29
|
+
const caseType = parsedData.bodyWeight === 0 ? _caseType.CaseType.OTHER : _caseType.CaseType.STREAM;
|
|
30
|
+
return {
|
|
31
|
+
parsingCase: {
|
|
32
|
+
...parsingCase,
|
|
33
|
+
caseType
|
|
34
|
+
},
|
|
35
|
+
measurementTypeKey,
|
|
36
|
+
parsedData
|
|
37
|
+
};
|
|
38
|
+
};
|
|
39
|
+
|
|
40
|
+
/**
|
|
41
|
+
* This is too long on purpose to avoid the stuck data error.
|
|
42
|
+
* This is because the F4 device can stop sending data when its sleeping but still connected to the device.
|
|
43
|
+
*/
|
|
44
|
+
stuckDataTimeout = 60_00_000;
|
|
16
45
|
handleSuccessResult(successResult) {
|
|
17
|
-
if (successResult.caseType
|
|
46
|
+
if (successResult.caseType !== _caseType.CaseType.RESULT) {
|
|
18
47
|
return;
|
|
19
48
|
}
|
|
20
49
|
if (!successResult.measurementTypeKey) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_caseType","require","_btManagedDevice","_f4MainServices","F4Device","BTManagedDevice","
|
|
1
|
+
{"version":3,"names":["_caseType","require","_btManagedDevice","_f4MainServices","F4Device","BTManagedDevice","mainServices","f4MainServices","validatePackage","handleDependentResult","parsingCase","measurementTypeKey","parsedData","caseType","bodyWeight","CaseType","OTHER","STREAM","stuckDataTimeout","handleSuccessResult","successResult","RESULT","onError","Error","handleBodyWeightResult","error","checkIfHasError","onResult","undefined","exports"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/f4/f4.device.ts"],"mappings":";;;;;;AAEA,IAAAA,SAAA,GAAAC,OAAA;AAMA,IAAAC,gBAAA,GAAAD,OAAA;AAEA,IAAAE,eAAA,GAAAF,OAAA;AAEO,MAAMG,QAAQ,SAASC,gCAAe,CAAuB;EACxDC,YAAY,GAAeC,8BAAc;EAGzCC,eAAe,GAA6CA,CAAA,KAAM;IAC1E,OAAO,IAAI;EACb,CAAC;;EAED;AACF;AACA;AACA;AACA;AACA;AACA;AACA;EACYC,qBAAqB,GAM3BA,CAAC;IAAEC,WAAW;IAAEC,kBAAkB;IAAEC;EAAW,CAAC,KAAK;IACvD,MAAMC,QAAQ,GACZD,UAAU,CAACE,UAAU,KAAK,CAAC,GAAGC,kBAAQ,CAACC,KAAK,GAAGD,kBAAQ,CAACE,MAAM;IAEhE,OAAO;MACLP,WAAW,EAAE;QACX,GAAGA,WAAW;QACdG;MACF,CAAC;MACDF,kBAAkB;MAClBC;IACF,CAAC;EACH,CAAC;;EAED;AACF;AACA;AACA;EACYM,gBAAgB,GAAW,SAAS;EAEpCC,mBAAmBA,CAC3BC,aAEC,EACe;IAChB,IAAIA,aAAa,CAACP,QAAQ,KAAKE,kBAAQ,CAACM,MAAM,EAAE;MAC9C;IACF;IAEA,IAAI,CAACD,aAAa,CAACT,kBAAkB,EAAE;MACrC,IAAI,CAACW,OAAO,GACV,IAAIC,KAAK,CACP,0CAA0CH,aAAa,CAACP,QAAQ,EAClE,CACF,CAAC;MAED;IACF;IAEA,IAAI,CAACW,sBAAsB,CAACJ,aAAa,CAAC;EAC5C;EAEQI,sBAAsBA,CAC5BJ,aAA6D,EACvD;IACN,MAAMK,KAAK,GAAG,IAAI,CAACC,eAAe,CAACN,aAAa,CAAC;IAEjD,IAAIK,KAAK,EAAE;MACT,IAAI,CAACH,OAAO,GAAGG,KAAK,CAAC;MAErB;IACF;IAEA,IAAI,CAACE,QAAQ,GAAGP,aAAa,CAAC;EAChC;EAEQM,eAAeA,CACrBN,aAA6D,EACzC;IACpB,IAAIA,aAAa,CAACN,UAAU,KAAK,CAAC,EAAE;MAClC,OAAO,kDAAkD;IAC3D;IAEA,IAAIM,aAAa,CAACN,UAAU,KAAKc,SAAS,EAAE;MAC1C,OAAO,4CAA4C;IACrD;IAEA,IAAIR,aAAa,CAACN,UAAU,GAAG,GAAG,EAAE;MAClC,OAAO,4CAA4C;IACrD;IAEA,OAAOc,SAAS;EAClB;AACF;AAACC,OAAA,CAAAzB,QAAA,GAAAA,QAAA","ignoreList":[]}
|
|
@@ -15,7 +15,7 @@ const f4MainServices = exports.f4MainServices = [{
|
|
|
15
15
|
cases: [{
|
|
16
16
|
measurementTypeKey: _core.MeasurementTypeKey.bodyWeight,
|
|
17
17
|
caseValue: "01",
|
|
18
|
-
caseType: _caseType.CaseType.
|
|
18
|
+
caseType: _caseType.CaseType.DEPENDENT,
|
|
19
19
|
parseDefinitions: [{
|
|
20
20
|
name: "bodyWeight",
|
|
21
21
|
byteIndexes: [5, 6, 7, 8],
|
|
@@ -52,11 +52,6 @@ const f4MainServices = exports.f4MainServices = [{
|
|
|
52
52
|
parseReference: 16,
|
|
53
53
|
customParserDefinition: a => parseInt(a, 16) / 1000
|
|
54
54
|
}]
|
|
55
|
-
}, {
|
|
56
|
-
caseValue: "a1",
|
|
57
|
-
caseType: _caseType.CaseType.STREAM,
|
|
58
|
-
parseDefinitions: [],
|
|
59
|
-
description: "When scales started measurement, but notifications comes earlier then this case"
|
|
60
55
|
}]
|
|
61
56
|
}
|
|
62
57
|
}]
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_core","require","_caseType","f4MainServices","exports","uuid","monitorUuids","parsingModel","caseValuePosition","cases","measurementTypeKey","MeasurementTypeKey","bodyWeight","caseValue","caseType","CaseType","
|
|
1
|
+
{"version":3,"names":["_core","require","_caseType","f4MainServices","exports","uuid","monitorUuids","parsingModel","caseValuePosition","cases","measurementTypeKey","MeasurementTypeKey","bodyWeight","caseValue","caseType","CaseType","DEPENDENT","parseDefinitions","name","byteIndexes","parseType","parseReference","customParserDefinition","a","parseInt","STREAM","RESULT"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/f4/f4.main-services.ts"],"mappings":";;;;;;AAAA,IAAAA,KAAA,GAAAC,OAAA;AAEA,IAAAC,SAAA,GAAAD,OAAA;AAGO,MAAME,cAA0B,GAAAC,OAAA,CAAAD,cAAA,GAAG,CACxC;EACEE,IAAI,EAAE,sCAAsC;EAC5CC,YAAY,EAAE,CACZ;IACED,IAAI,EAAE,sCAAsC;IAC5CE,YAAY,EAAE;MACZC,iBAAiB,EAAE,CAAC,CAAC,CAAC;MACtBC,KAAK,EAAE,CACL;QACEC,kBAAkB,EAAEC,wBAAkB,CAACC,UAAU;QACjDC,SAAS,EAAE,IAAI;QACfC,QAAQ,EAAEC,kBAAQ,CAACC,SAAS;QAC5BC,gBAAgB,EAAE,CAChB;UACEC,IAAI,EAAE,YAAY;UAClBC,WAAW,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;UACzBC,SAAS,EAAE,QAAQ;UACnBC,cAAc,EAAE,EAAE;UAClBC,sBAAsB,EAAGC,CAAS,IAChCC,QAAQ,CAACD,CAAC,EAAE,EAAE,CAAC,GAAG;QACtB,CAAC;MAEL,CAAC,EACD;QACEV,SAAS,EAAE,IAAI;QACfC,QAAQ,EAAEC,kBAAQ,CAACU,MAAM;QACzBR,gBAAgB,EAAE;MACpB,CAAC,EACD;QACEJ,SAAS,EAAE,IAAI;QACfC,QAAQ,EAAEC,kBAAQ,CAACU,MAAM;QACzBR,gBAAgB,EAAE;MACpB,CAAC,EACD;QACEJ,SAAS,EAAE,IAAI;QACfC,QAAQ,EAAEC,kBAAQ,CAACU,MAAM;QACzBR,gBAAgB,EAAE;MACpB,CAAC;IAEL;EACF,CAAC,EACD;IACEZ,IAAI,EAAE,sCAAsC;IAC5CE,YAAY,EAAE;MACZC,iBAAiB,EAAE,CAAC,CAAC,CAAC;MACtBC,KAAK,EAAE,CACL;QACEC,kBAAkB,EAAEC,wBAAkB,CAACC,UAAU;QACjDC,SAAS,EAAE,IAAI;QACfC,QAAQ,EAAEC,kBAAQ,CAACW,MAAM;QACzBT,gBAAgB,EAAE,CAChB;UACEC,IAAI,EAAE,YAAY;UAClBC,WAAW,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;UACtBC,SAAS,EAAE,QAAQ;UACnBC,cAAc,EAAE,EAAE;UAClBC,sBAAsB,EAAGC,CAAS,IAChCC,QAAQ,CAACD,CAAC,EAAE,EAAE,CAAC,GAAG;QACtB,CAAC;MAEL,CAAC;IAEL;EACF,CAAC;AAEL,CAAC,CACF","ignoreList":[]}
|
|
@@ -8,6 +8,7 @@ let CaseType = exports.CaseType = /*#__PURE__*/function (CaseType) {
|
|
|
8
8
|
CaseType["RESULT"] = "result";
|
|
9
9
|
CaseType["STREAM"] = "stream";
|
|
10
10
|
CaseType["OTHER"] = "other";
|
|
11
|
+
CaseType["DEPENDENT"] = "dependent";
|
|
11
12
|
CaseType["SN"] = "sn";
|
|
12
13
|
CaseType["ERROR"] = "error";
|
|
13
14
|
return CaseType;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["CaseType","exports"],"sourceRoot":"../../../../../src","sources":["modules/bt-management/types/case-type.ts"],"mappings":";;;;;;IAAYA,QAAQ,GAAAC,OAAA,CAAAD,QAAA,0BAARA,QAAQ;EAARA,QAAQ;EAARA,QAAQ;EAARA,QAAQ;EAARA,QAAQ;EAARA,QAAQ;EAAA,OAARA,QAAQ;AAAA","ignoreList":[]}
|
|
1
|
+
{"version":3,"names":["CaseType","exports"],"sourceRoot":"../../../../../src","sources":["modules/bt-management/types/case-type.ts"],"mappings":";;;;;;IAAYA,QAAQ,GAAAC,OAAA,CAAAD,QAAA,0BAARA,QAAQ;EAARA,QAAQ;EAARA,QAAQ;EAARA,QAAQ;EAARA,QAAQ;EAARA,QAAQ;EAARA,QAAQ;EAAA,OAARA,QAAQ;AAAA","ignoreList":[]}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"names":[],"sourceRoot":"../../../../../src","sources":["modules/bt-management/types/dependent-result-handler-params.ts"],"mappings":"","ignoreList":[]}
|
|
@@ -124,7 +124,7 @@ export class BTManager {
|
|
|
124
124
|
error: error
|
|
125
125
|
});
|
|
126
126
|
sentryLogger("error", "BT_MANAGER: Scan result error", {
|
|
127
|
-
error
|
|
127
|
+
error: error instanceof Error ? error.message : error
|
|
128
128
|
});
|
|
129
129
|
slog(error, "BT_MANAGER: Scan result error", {
|
|
130
130
|
error
|
|
@@ -166,7 +166,7 @@ export class BTManager {
|
|
|
166
166
|
this.onDeviceFoundCallback?.(deviceClass, this);
|
|
167
167
|
} catch (error) {
|
|
168
168
|
sentryLogger("error", "BT_MANAGER: Error creating device", {
|
|
169
|
-
error,
|
|
169
|
+
error: error instanceof Error ? error.message : error,
|
|
170
170
|
deviceId: device?.id,
|
|
171
171
|
deviceName: device?.name
|
|
172
172
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["Linking","Platform","ScanMode","State","slog","sentryLogger","DeviceCreator","BTManager","MAX_DEVICES","devices","Map","eventSubscriptions","lastScanTimestamp","constructor","bleManager","acceptedDevices","deviceCreator","destroy","stopScan","stateChangeListener","remove","undefined","onErrorCallback","onDeviceFoundCallback","onResultCallback","onDeviceStatusChangedCallback","forEach","device","clear","startScan","Date","now","onStateChange","state","PoweredOn","index","indexOf","splice","startDeviceScan","scanMode","Balanced","onScanResult","OS","sendIntent","enable","push","stopDeviceScan","sub","onDeviceFound","callback","onError","onDeviceStatusChanged","onResult","error","name","has","id","deviceName","getDeviceName","size","deviceId","currentSize","deviceClass","createDevice","bind","onDeviceDisconnected","removeDeviceFromFoundedDevices","set","get","delete"],"sourceRoot":"../../../../../src","sources":["modules/bt-management/services/bt-manager.ts"],"mappings":"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
|
|
1
|
+
{"version":3,"names":["Linking","Platform","ScanMode","State","slog","sentryLogger","DeviceCreator","BTManager","MAX_DEVICES","devices","Map","eventSubscriptions","lastScanTimestamp","constructor","bleManager","acceptedDevices","deviceCreator","destroy","stopScan","stateChangeListener","remove","undefined","onErrorCallback","onDeviceFoundCallback","onResultCallback","onDeviceStatusChangedCallback","forEach","device","clear","startScan","Date","now","onStateChange","state","PoweredOn","index","indexOf","splice","startDeviceScan","scanMode","Balanced","onScanResult","OS","sendIntent","enable","push","stopDeviceScan","sub","onDeviceFound","callback","onError","onDeviceStatusChanged","onResult","error","Error","message","name","has","id","deviceName","getDeviceName","size","deviceId","currentSize","deviceClass","createDevice","bind","onDeviceDisconnected","removeDeviceFromFoundedDevices","set","get","delete"],"sourceRoot":"../../../../../src","sources":["modules/bt-management/services/bt-manager.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -23,7 +23,7 @@ export class BTConnectionHandler {
|
|
|
23
23
|
this.subscribeToAllCharacteristics();
|
|
24
24
|
} catch (error) {
|
|
25
25
|
sentryLogger("error", "BT_MANAGER: Error connecting to device", {
|
|
26
|
-
error,
|
|
26
|
+
error: error instanceof Error ? error.message : error,
|
|
27
27
|
deviceName: this.device.name
|
|
28
28
|
});
|
|
29
29
|
this.callbacks.onError?.(error);
|
|
@@ -89,7 +89,7 @@ export class BTConnectionHandler {
|
|
|
89
89
|
};
|
|
90
90
|
onDeviceDisconnected = error => {
|
|
91
91
|
sentryLogger("info", "BT_MANAGER: On device disconnected", {
|
|
92
|
-
error,
|
|
92
|
+
error: error instanceof Error ? error.message : error,
|
|
93
93
|
deviceName: this.device.name
|
|
94
94
|
});
|
|
95
95
|
if (error) {
|
|
@@ -121,7 +121,7 @@ export class BTConnectionHandler {
|
|
|
121
121
|
await this.sendCommandToDevice();
|
|
122
122
|
} catch (error) {
|
|
123
123
|
sentryLogger("error", "DEVICE: Error subscribing to all characteristics", {
|
|
124
|
-
error,
|
|
124
|
+
error: error instanceof Error ? error.message : error,
|
|
125
125
|
deviceName: this.device.name
|
|
126
126
|
});
|
|
127
127
|
this.callbacks.onError?.(error);
|
|
@@ -144,7 +144,7 @@ export class BTConnectionHandler {
|
|
|
144
144
|
} catch (error) {
|
|
145
145
|
this.retryCount++;
|
|
146
146
|
sentryLogger("error", "DEVICE: Error sending command", {
|
|
147
|
-
error,
|
|
147
|
+
error: error instanceof Error ? error.message : error,
|
|
148
148
|
deviceName: this.device.name
|
|
149
149
|
});
|
|
150
150
|
if (this.retryCount === 3) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["slog","sentryLogger","DeviceStatus","base64ToHex","hexToBase64","BTConnectionHandler","characteristicSubscriptions","isSendingCommand","retryCount","constructor","device","mainServices","callbacks","connect","connectWithRetries","onStatusChanged","CONNECTED","discoverAllServicesAndCharacteristics","onDisconnectSubscription","onDisconnected","onDeviceDisconnected","subscribeToAllCharacteristics","error","deviceName","name","onError","DISCONNECTED","destroy","forEach","sub","remove","sendCommandToDevice","mainService","writeUuid","sendCommand","maxRetries","retryDelay","maxDelay","connected","isConnected","deviceId","id","
|
|
1
|
+
{"version":3,"names":["slog","sentryLogger","DeviceStatus","base64ToHex","hexToBase64","BTConnectionHandler","characteristicSubscriptions","isSendingCommand","retryCount","constructor","device","mainServices","callbacks","connect","connectWithRetries","onStatusChanged","CONNECTED","discoverAllServicesAndCharacteristics","onDisconnectSubscription","onDisconnected","onDeviceDisconnected","subscribeToAllCharacteristics","error","Error","message","deviceName","name","onError","DISCONNECTED","destroy","forEach","sub","remove","sendCommandToDevice","mainService","writeUuid","sendCommand","maxRetries","retryDelay","maxDelay","connected","isConnected","deviceId","id","String","errorCode","willRetry","Promise","resolve","setTimeout","Math","min","pow","monitorUuid","monitorUuids","subscription","monitorCharacteristicForService","uuid","result","value","hexValue","onDataReceived","push","command","mainCommandUuid","writeCharacteristicWithResponseForService"],"sourceRoot":"../../../../../../src","sources":["modules/bt-management/services/devices/bt-connection-handler.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -31,9 +31,15 @@ export class BTDataProcessor {
|
|
|
31
31
|
return;
|
|
32
32
|
}
|
|
33
33
|
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
34
|
+
/**
|
|
35
|
+
* If the case is dependent, we need to handle the result based on the device logic.
|
|
36
|
+
* If the case is not dependent, we can handle the original result directly.
|
|
37
|
+
*/
|
|
38
|
+
let dependentData = null;
|
|
39
|
+
if (data.parsingCase.caseType === CaseType.DEPENDENT) {
|
|
40
|
+
dependentData = this.callbacks.handleDependentResult?.(data);
|
|
41
|
+
}
|
|
42
|
+
this.handleStatusChanges(dependentData || data);
|
|
37
43
|
this.resetDataAndSendCommandToDevice();
|
|
38
44
|
};
|
|
39
45
|
extractData(uuid) {
|
|
@@ -54,7 +60,7 @@ export class BTDataProcessor {
|
|
|
54
60
|
return {
|
|
55
61
|
parsingCase,
|
|
56
62
|
measurementTypeKey,
|
|
57
|
-
parsedData
|
|
63
|
+
parsedData: parsedData
|
|
58
64
|
};
|
|
59
65
|
}
|
|
60
66
|
findParsingModel(uuid) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["CaseType","DeviceStatus","parseMeasurement","BTDataProcessor","collectedValues","isMeasuring","constructor","device","mainServices","stuckDataTimeoutDuration","callbacks","destroy","clearTimeout","stuckDataTimeout","undefined","processData","uuid","hexValue","push","startStuckTimeout","isValid","validatePackage","data","extractData","resetDataAndSendCommandToDevice","handleStatusChanges","parsingModel","findParsingModel","value","caseValuePosition","map","index","join","
|
|
1
|
+
{"version":3,"names":["CaseType","DeviceStatus","parseMeasurement","BTDataProcessor","collectedValues","isMeasuring","constructor","device","mainServices","stuckDataTimeoutDuration","callbacks","destroy","clearTimeout","stuckDataTimeout","undefined","processData","uuid","hexValue","push","startStuckTimeout","isValid","validatePackage","data","extractData","resetDataAndSendCommandToDevice","dependentData","parsingCase","caseType","DEPENDENT","handleDependentResult","handleStatusChanges","parsingModel","findParsingModel","value","caseValuePosition","map","index","join","findParsingCase","parsedData","parseData","measurementTypeKey","mainService","characteristic","monitorUuids","find","e","toLowerCase","caseValue","cases","successResult","STREAM","onStreamStart","onStatusChanged","MEASURING","OTHER","CONNECTED","skipConnectedChange","onResult","RESULT","onSendCommandToDevice","setTimeout","onError","Error","cause","message","cancelConnection"],"sourceRoot":"../../../../../../src","sources":["modules/bt-management/services/devices/bt-data-processor.ts"],"mappings":"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","ignoreList":[]}
|