tirecheck-device-sdk 0.2.58 → 0.2.60

package/dist/index.cjs

@@ -136,12 +136,7 @@ function normalizeError(error) {
 
 const tyreLabels = getDefaultTyreLabels();
 const bridgeTools = {
-  getBridgeFromStore(deviceId) {
-    const deviceData = store.devices[deviceId];
-    if (!deviceData) throw new Error(`No device data found: ${deviceId}`);
-    if (deviceData.type !== "bridge") throw new Error("Device is not bridge");
-    return deviceData;
-  },
+  getBridgeFromStore,
   convertBytesToStructure(objStructure, payload, fwVersion) {
     let numArray = ___default.clone(payload);
     const keys = Object.keys(objStructure).filter(
@@ -251,7 +246,7 @@ const bridgeTools = {
   },
   convertBarToKpaByte(deviceId, value) {
     if (!value) return 0;
-    const deviceData = this.getBridgeFromStore(deviceId);
+    const deviceData = getBridgeFromStore(deviceId);
     if (!deviceData) throw new Error(`Cannot convert bar to kpa byte, no device data found: ${deviceId}`);
     const bitValue = deviceData.name.includes("030717") ? 6.7 : 5.0625;
     return ___default.round((value + 1) * 100 / bitValue);
@@ -276,7 +271,7 @@ const bridgeTools = {
     if (!___default.isNumber(value)) {
       throw new TypeError("Value has to be a number");
     }
-    const deviceData = this.getBridgeFromStore(deviceId);
+    const deviceData = getBridgeFromStore(deviceId);
     if (!deviceData) throw new Error(`Cannot convert kpa byte to bar, no device data found: ${deviceId}`);
     const bitValue = deviceData.name.includes("030717") ? 6.7 : 5.0625;
     const rawBar = value * bitValue / 100;
@@ -286,7 +281,7 @@ const bridgeTools = {
     if (version.length !== 5) {
       throw new Error("Invalid version format");
     }
-    const deviceData = this.getBridgeFromStore(deviceId);
+    const deviceData = getBridgeFromStore(deviceId);
     if (deviceData?.advertisingData?.fwVersion) {
       return deviceData.advertisingData.fwVersion > version;
     }
@@ -366,6 +361,12 @@ const bridgeTools = {
     return bitIndex;
   }
 };
+function getBridgeFromStore(deviceId) {
+  const deviceData = store.devices[deviceId];
+  if (!deviceData) throw new Error(`No device data found: ${deviceId}`);
+  if (deviceData.type !== "bridge") throw new Error("Device is not bridge");
+  return deviceData;
+}
 function getDefaultTyreLabels() {
   const tyreLabelsStr = "_L;_R;_LO;_LI;_RI;_RO;_";
   const tyreLabelsStrLoc = tyreLabelsStr;
@@ -2475,15 +2476,23 @@ async function setVehicle(deviceId, tcVehicle) {
 }
 async function getSensorReading(deviceId, positionId) {
   const value = await bridgeCommands.getSensorMeasurement(deviceId, positionId);
+  const messageLength = value[2];
+  const payloadStartIndex = 9;
+  const payloadLength = messageLength - 6;
+  const payload = value.slice(payloadStartIndex, payloadStartIndex + payloadLength);
+  if (payload.length < 6) {
+    throw new Error(`Invalid sensor measurement payload length: ${payload.length}`);
+  }
   const sensorId = value.slice(5, 9).reverse().map((s) => decimalToHex(s).toUpperCase()).join("");
   const correctedSensorId = bridgeTools.convertSensorIdFromBridge(sensorId);
   return {
-    date: Date.now() - value[14] * 2e3,
+    date: Date.now() - payload[5] * 2e3,
     sensorId: correctedSensorId,
-    sensorStatus: value[12],
-    eceStatus: value[13],
-    pressureIssue: getPressureIssue$1(deviceId, value[13]),
-    ...getPressureAndTemperatureReadingObjects(value[9], value[10]),
+    sensorType: payload[6],
+    sensorStatus: payload[3],
+    eceStatus: payload[4],
+    pressureIssue: getPressureIssue$1(deviceId, payload[4]),
+    ...getPressureAndTemperatureReadingObjects(payload[0], payload[1]),
     byteReading: value
   };
 }

package/dist/index.d.cts

@@ -736,6 +736,7 @@ interface BridgeConfiguration {
 interface BridgeReading {
     date: number;
     sensorId: string;
+    sensorType?: number;
     sensorStatus: number;
     eceStatus: number;
     pressureIssue?: BridgeTcIssue;

package/dist/index.d.mts

@@ -736,6 +736,7 @@ interface BridgeConfiguration {
 interface BridgeReading {
     date: number;
     sensorId: string;
+    sensorType?: number;
     sensorStatus: number;
     eceStatus: number;
     pressureIssue?: BridgeTcIssue;

package/dist/index.d.ts

@@ -736,6 +736,7 @@ interface BridgeConfiguration {
 interface BridgeReading {
     date: number;
     sensorId: string;
+    sensorType?: number;
     sensorStatus: number;
     eceStatus: number;
     pressureIssue?: BridgeTcIssue;

package/dist/index.mjs

@@ -129,12 +129,7 @@ function normalizeError(error) {
 
 const tyreLabels = getDefaultTyreLabels();
 const bridgeTools = {
-  getBridgeFromStore(deviceId) {
-    const deviceData = store.devices[deviceId];
-    if (!deviceData) throw new Error(`No device data found: ${deviceId}`);
-    if (deviceData.type !== "bridge") throw new Error("Device is not bridge");
-    return deviceData;
-  },
+  getBridgeFromStore,
   convertBytesToStructure(objStructure, payload, fwVersion) {
     let numArray = _.clone(payload);
     const keys = Object.keys(objStructure).filter(
@@ -244,7 +239,7 @@ const bridgeTools = {
   },
   convertBarToKpaByte(deviceId, value) {
     if (!value) return 0;
-    const deviceData = this.getBridgeFromStore(deviceId);
+    const deviceData = getBridgeFromStore(deviceId);
     if (!deviceData) throw new Error(`Cannot convert bar to kpa byte, no device data found: ${deviceId}`);
     const bitValue = deviceData.name.includes("030717") ? 6.7 : 5.0625;
     return _.round((value + 1) * 100 / bitValue);
@@ -269,7 +264,7 @@ const bridgeTools = {
     if (!_.isNumber(value)) {
       throw new TypeError("Value has to be a number");
     }
-    const deviceData = this.getBridgeFromStore(deviceId);
+    const deviceData = getBridgeFromStore(deviceId);
     if (!deviceData) throw new Error(`Cannot convert kpa byte to bar, no device data found: ${deviceId}`);
     const bitValue = deviceData.name.includes("030717") ? 6.7 : 5.0625;
     const rawBar = value * bitValue / 100;
@@ -279,7 +274,7 @@ const bridgeTools = {
     if (version.length !== 5) {
       throw new Error("Invalid version format");
     }
-    const deviceData = this.getBridgeFromStore(deviceId);
+    const deviceData = getBridgeFromStore(deviceId);
     if (deviceData?.advertisingData?.fwVersion) {
       return deviceData.advertisingData.fwVersion > version;
     }
@@ -359,6 +354,12 @@ const bridgeTools = {
     return bitIndex;
   }
 };
+function getBridgeFromStore(deviceId) {
+  const deviceData = store.devices[deviceId];
+  if (!deviceData) throw new Error(`No device data found: ${deviceId}`);
+  if (deviceData.type !== "bridge") throw new Error("Device is not bridge");
+  return deviceData;
+}
 function getDefaultTyreLabels() {
   const tyreLabelsStr = "_L;_R;_LO;_LI;_RI;_RO;_";
   const tyreLabelsStrLoc = tyreLabelsStr;
@@ -2468,15 +2469,23 @@ async function setVehicle(deviceId, tcVehicle) {
 }
 async function getSensorReading(deviceId, positionId) {
   const value = await bridgeCommands.getSensorMeasurement(deviceId, positionId);
+  const messageLength = value[2];
+  const payloadStartIndex = 9;
+  const payloadLength = messageLength - 6;
+  const payload = value.slice(payloadStartIndex, payloadStartIndex + payloadLength);
+  if (payload.length < 6) {
+    throw new Error(`Invalid sensor measurement payload length: ${payload.length}`);
+  }
   const sensorId = value.slice(5, 9).reverse().map((s) => decimalToHex(s).toUpperCase()).join("");
   const correctedSensorId = bridgeTools.convertSensorIdFromBridge(sensorId);
   return {
-    date: Date.now() - value[14] * 2e3,
+    date: Date.now() - payload[5] * 2e3,
     sensorId: correctedSensorId,
-    sensorStatus: value[12],
-    eceStatus: value[13],
-    pressureIssue: getPressureIssue$1(deviceId, value[13]),
-    ...getPressureAndTemperatureReadingObjects(value[9], value[10]),
+    sensorType: payload[6],
+    sensorStatus: payload[3],
+    eceStatus: payload[4],
+    pressureIssue: getPressureIssue$1(deviceId, payload[4]),
+    ...getPressureAndTemperatureReadingObjects(payload[0], payload[1]),
     byteReading: value
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tirecheck-device-sdk",
-  "version": "0.2.58",
+  "version": "0.2.60",
   "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",