tirecheck-device-sdk 0.2.51 → 0.2.53

package/dist/index.cjs

@@ -251,10 +251,12 @@ const bridgeTools = {
     return ___default.round((value + 1) * 100 / 5.0625);
   },
   convertSensorIdForBridge(sensorId) {
-    if (sensorId.startsWith("2") && sensorId.length === 10) {
-      return Number.parseInt(sensorId).toString(16);
+    let bridgeSensorId = sensorId;
+    if (/\d{10}/.test(sensorId)) {
+      bridgeSensorId = Number.parseInt(sensorId).toString(16);
     }
-    return sensorId;
+    if (bridgeSensorId.length !== 8) throw new Error("Sensor ID has to be 8 characters long");
+    return bridgeSensorId;
   },
   kpaByteToBar(value, decrementValue = 1) {
     if (!___default.isNumber(value)) {
@@ -274,9 +276,8 @@ const bridgeTools = {
     return false;
   },
   convertSensorIdFromBridge(sensorId) {
-    const sensorIdDecimal = Number.parseInt(sensorId, 16).toString();
-    if (sensorId.startsWith("B") && sensorIdDecimal.startsWith("2") && sensorIdDecimal.length === 10) {
-      return sensorIdDecimal;
+    if (sensorId.startsWith("B")) {
+      return Number.parseInt(sensorId, 16).toString();
     }
     return sensorId;
   },
@@ -530,7 +531,7 @@ const deviceMeta = {
     getDeviceInfoFromAdvertising: bridgeAdvertisingParser.getDeviceInfoFromAdvertising
   },
   bridgeOta: {
-    nameRegex: /(CAN BLE BRDG OTA.*|0303.{2}_B)/,
+    nameRegex: /(CAN BLE BRDG OTA.*|0303.{2}_B|030632_B)/,
     mtu: 180,
     characteristic: {
       serviceId: "4880c12c-fdcb-4077-8920-a450d7f9b907",
@@ -2300,9 +2301,9 @@ async function setAxleInfo(deviceId, tcVehicle) {
     if (!axleTyres.length && !spareTyre && axleIndex >= tcVehicle.axles.length) continue;
     for (const tyre of axleTyres) {
       const bridgeIndex = bridgeTools.getBridgeIndexFromPositionId(tyre.positionId, 7);
-      tyres[bridgeIndex] = tyre.tcTpmsSensor.id;
+      tyres[bridgeIndex] = bridgeTools.convertSensorIdForBridge(tyre.tcTpmsSensor.id);
     }
-    if (spareTyre && spareTyre.tcTpmsSensor) tyres[7] = spareTyre.tcTpmsSensor.id;
+    if (spareTyre && spareTyre.tcTpmsSensor) tyres[7] = bridgeTools.convertSensorIdForBridge(spareTyre.tcTpmsSensor.id);
     const numberArray = tyres.map((x) => x.match(/.{2}/g)?.reverse()).flat().map((n) => n ? Number.parseInt(n, 16) : 0);
     await bridgeCommands.setAxleInfo(deviceId, axleIndex, numberArray);
   }

package/dist/index.mjs

@@ -244,10 +244,12 @@ const bridgeTools = {
     return _.round((value + 1) * 100 / 5.0625);
   },
   convertSensorIdForBridge(sensorId) {
-    if (sensorId.startsWith("2") && sensorId.length === 10) {
-      return Number.parseInt(sensorId).toString(16);
+    let bridgeSensorId = sensorId;
+    if (/\d{10}/.test(sensorId)) {
+      bridgeSensorId = Number.parseInt(sensorId).toString(16);
     }
-    return sensorId;
+    if (bridgeSensorId.length !== 8) throw new Error("Sensor ID has to be 8 characters long");
+    return bridgeSensorId;
   },
   kpaByteToBar(value, decrementValue = 1) {
     if (!_.isNumber(value)) {
@@ -267,9 +269,8 @@ const bridgeTools = {
     return false;
   },
   convertSensorIdFromBridge(sensorId) {
-    const sensorIdDecimal = Number.parseInt(sensorId, 16).toString();
-    if (sensorId.startsWith("B") && sensorIdDecimal.startsWith("2") && sensorIdDecimal.length === 10) {
-      return sensorIdDecimal;
+    if (sensorId.startsWith("B")) {
+      return Number.parseInt(sensorId, 16).toString();
     }
     return sensorId;
   },
@@ -523,7 +524,7 @@ const deviceMeta = {
     getDeviceInfoFromAdvertising: bridgeAdvertisingParser.getDeviceInfoFromAdvertising
   },
   bridgeOta: {
-    nameRegex: /(CAN BLE BRDG OTA.*|0303.{2}_B)/,
+    nameRegex: /(CAN BLE BRDG OTA.*|0303.{2}_B|030632_B)/,
     mtu: 180,
     characteristic: {
       serviceId: "4880c12c-fdcb-4077-8920-a450d7f9b907",
@@ -2293,9 +2294,9 @@ async function setAxleInfo(deviceId, tcVehicle) {
     if (!axleTyres.length && !spareTyre && axleIndex >= tcVehicle.axles.length) continue;
     for (const tyre of axleTyres) {
       const bridgeIndex = bridgeTools.getBridgeIndexFromPositionId(tyre.positionId, 7);
-      tyres[bridgeIndex] = tyre.tcTpmsSensor.id;
+      tyres[bridgeIndex] = bridgeTools.convertSensorIdForBridge(tyre.tcTpmsSensor.id);
     }
-    if (spareTyre && spareTyre.tcTpmsSensor) tyres[7] = spareTyre.tcTpmsSensor.id;
+    if (spareTyre && spareTyre.tcTpmsSensor) tyres[7] = bridgeTools.convertSensorIdForBridge(spareTyre.tcTpmsSensor.id);
     const numberArray = tyres.map((x) => x.match(/.{2}/g)?.reverse()).flat().map((n) => n ? Number.parseInt(n, 16) : 0);
     await bridgeCommands.setAxleInfo(deviceId, axleIndex, numberArray);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tirecheck-device-sdk",
-  "version": "0.2.51",
+  "version": "0.2.53",
   "description": "SDK for working with various devices produced by Tirecheck via Bluetooth (CAN Bridge, Routers, Sensors, FlexiGauge, PressureStick, etc)",
   "author": "Leonid Buneev <leonid.buneev@tirecheck.com>",
   "license": "ISC",