tirecheck-device-sdk 0.1.96 → 0.1.97

package/dist/index.cjs

@@ -341,8 +341,9 @@ function getDefaultTyreLabels() {
 const bridgeAdvertisingParser = {
   getDeviceInfoFromAdvertising(device) {
     const adversitingType = getAdvertisingType(device);
-    if (adversitingType !== "connectable") return void 0;
+    if (adversitingType !== "connectable") return;
     const advertisingData = getAdvertisingData({ advertising: device.advertising, deviceName: device.name });
+    if (!advertisingData) return;
     const macArray = advertisingData?.macAddress?.map((n) => bridgeTools.decimalToHex(n).toUpperCase()).reverse() || [];
     const bridgeId = macArray.join("");
     const vin = String.fromCharCode(...advertisingData?.vinNum || []).split("\0").join("");
@@ -378,7 +379,7 @@ function getAdvertisingData({ advertising, deviceName }) {
   const adv = Array.from(uint8);
   const advertisingData = advertising.kCBAdvDataIsConnectable ? processIosAdvertising(adv, isKrone) : processAndroidAdvertising(adv, isKrone);
   if (!advertisingData || !advertisingData.macAddress.length || !advertisingData.randomAdvNumber.length || !advertisingData.vinNum.length) {
-    throw new Error("Device not recognized");
+    return;
   }
   return advertisingData;
 }
@@ -589,12 +590,16 @@ async function connect$1(deviceId, disconnectCallback) {
   if (toolsSvc.canCommunicateWith(deviceId)) return console.warn("Connect Warn: Already connected to device");
   store.setState(deviceId, "connecting");
   let connectedDevice;
-  for (let attempt = 0; attempt < 3; attempt++) {
+  for (let attempt = 1; attempt <= 3; attempt++) {
     try {
       connectedDevice = await withTimeout(connectInner(deviceId, disconnectCallback), 2e4);
       const _deviceId = store.deviceIdMapingTable[deviceId] ?? deviceId;
       const isConnected = await ble.isConnected(_deviceId);
-      if (connectedDevice && isConnected) break;
+      if (connectedDevice || isConnected) {
+        break;
+      } else {
+        throw new Error("Connection incomplete");
+      }
     } catch (e) {
       console.warn(`${attempt} connect fail`, e);
       if (attempt === 3) {
@@ -1722,7 +1727,7 @@ const subCommandIds = {
 };
 ___default.invert(commandIds);
 ___default.invert(subCommandIds);
-let keepAliveTimer;
+const keepAliveTimer = {};
 const bridgeCommands = {
   getCommandHeader(device) {
     const accessLevel = store.deviceAccessLevel[device.id];
@@ -2033,11 +2038,11 @@ const bridgeCommands = {
       throw new Error("Invalid command");
     }
     if (!canCommunicateWith(device.id)) throw new Error("Bridge not connected");
-    clearTimeout(keepAliveTimer);
-    keepAliveTimer = setTimeout(() => {
+    clearTimeout(keepAliveTimer[device.id]);
+    keepAliveTimer[device.id] = setTimeout(() => {
       if (store.deviceState[device.id] !== "paired" || store.devices[device.id]?.type !== "bridge") {
         console.warn("keep alive timer cleared");
-        return clearTimeout(keepAliveTimer);
+        return clearTimeout(keepAliveTimer[device.id]);
       }
       this.sendKeepAliveCommand(device);
     }, 1e4);
@@ -2664,10 +2669,10 @@ async function assignTyres(deviceId, tcVehicle) {
 async function assignAxlePressureLimits(deviceId, tcVehicle, tcVehicleAxle, axleIndex, bridgeAxlesPressureData) {
   const axlesPressureData = bridgeAxlesPressureData ?? (await bridgeCommands.getAxlesPressure(deviceId)).data;
   if (axlesPressureData[axleIndex * 3]) {
-    tcVehicleAxle.maxTargetPressure = ___default.round(bridgeTools.kpaByteToBar(axlesPressureData[axleIndex * 3]), 1);
+    tcVehicleAxle.maxTargetPressure = ___default.floor(bridgeTools.kpaByteToBar(axlesPressureData[axleIndex * 3]), 1);
   }
   if (axlesPressureData[axleIndex * 3 + 1]) {
-    tcVehicleAxle.minTargetPressure = ___default.round(bridgeTools.kpaByteToBar(axlesPressureData[axleIndex * 3 + 1]), 1);
+    tcVehicleAxle.minTargetPressure = ___default.ceil(bridgeTools.kpaByteToBar(axlesPressureData[axleIndex * 3 + 1]), 1);
   }
   if (axlesPressureData[axleIndex * 3 + 2]) {
     tcVehicleAxle.targetPressure = ___default.round(
@@ -2726,12 +2731,11 @@ async function connect(deviceId, accessLevel) {
     await bridgeService.sendPinCommand(deviceId);
     store.setState(deviceId, "paired");
   } catch (e) {
-    disconnect(deviceId);
+    disconnect(deviceId, "failedConnection");
     throw new Error(`Pairing unsuccessful ${e}`);
   }
 }
 async function disconnect(deviceId, reason) {
-  await waitUntil(() => store.deviceState[deviceId] === "paired" || store.deviceState[deviceId] === void 0);
   store.setState(deviceId, "disconnecting");
   promiseQueue.clearQueue(deviceId, "Previous pending commands aborted");
   await bluetooth.disconnect(deviceId);

package/dist/index.mjs

@@ -334,8 +334,9 @@ function getDefaultTyreLabels() {
 const bridgeAdvertisingParser = {
   getDeviceInfoFromAdvertising(device) {
     const adversitingType = getAdvertisingType(device);
-    if (adversitingType !== "connectable") return void 0;
+    if (adversitingType !== "connectable") return;
     const advertisingData = getAdvertisingData({ advertising: device.advertising, deviceName: device.name });
+    if (!advertisingData) return;
     const macArray = advertisingData?.macAddress?.map((n) => bridgeTools.decimalToHex(n).toUpperCase()).reverse() || [];
     const bridgeId = macArray.join("");
     const vin = String.fromCharCode(...advertisingData?.vinNum || []).split("\0").join("");
@@ -371,7 +372,7 @@ function getAdvertisingData({ advertising, deviceName }) {
   const adv = Array.from(uint8);
   const advertisingData = advertising.kCBAdvDataIsConnectable ? processIosAdvertising(adv, isKrone) : processAndroidAdvertising(adv, isKrone);
   if (!advertisingData || !advertisingData.macAddress.length || !advertisingData.randomAdvNumber.length || !advertisingData.vinNum.length) {
-    throw new Error("Device not recognized");
+    return;
   }
   return advertisingData;
 }
@@ -582,12 +583,16 @@ async function connect$1(deviceId, disconnectCallback) {
   if (toolsSvc.canCommunicateWith(deviceId)) return console.warn("Connect Warn: Already connected to device");
   store.setState(deviceId, "connecting");
   let connectedDevice;
-  for (let attempt = 0; attempt < 3; attempt++) {
+  for (let attempt = 1; attempt <= 3; attempt++) {
     try {
       connectedDevice = await withTimeout(connectInner(deviceId, disconnectCallback), 2e4);
       const _deviceId = store.deviceIdMapingTable[deviceId] ?? deviceId;
       const isConnected = await ble.isConnected(_deviceId);
-      if (connectedDevice && isConnected) break;
+      if (connectedDevice || isConnected) {
+        break;
+      } else {
+        throw new Error("Connection incomplete");
+      }
     } catch (e) {
       console.warn(`${attempt} connect fail`, e);
       if (attempt === 3) {
@@ -1715,7 +1720,7 @@ const subCommandIds = {
 };
 _.invert(commandIds);
 _.invert(subCommandIds);
-let keepAliveTimer;
+const keepAliveTimer = {};
 const bridgeCommands = {
   getCommandHeader(device) {
     const accessLevel = store.deviceAccessLevel[device.id];
@@ -2026,11 +2031,11 @@ const bridgeCommands = {
       throw new Error("Invalid command");
     }
     if (!canCommunicateWith(device.id)) throw new Error("Bridge not connected");
-    clearTimeout(keepAliveTimer);
-    keepAliveTimer = setTimeout(() => {
+    clearTimeout(keepAliveTimer[device.id]);
+    keepAliveTimer[device.id] = setTimeout(() => {
       if (store.deviceState[device.id] !== "paired" || store.devices[device.id]?.type !== "bridge") {
         console.warn("keep alive timer cleared");
-        return clearTimeout(keepAliveTimer);
+        return clearTimeout(keepAliveTimer[device.id]);
       }
       this.sendKeepAliveCommand(device);
     }, 1e4);
@@ -2657,10 +2662,10 @@ async function assignTyres(deviceId, tcVehicle) {
 async function assignAxlePressureLimits(deviceId, tcVehicle, tcVehicleAxle, axleIndex, bridgeAxlesPressureData) {
   const axlesPressureData = bridgeAxlesPressureData ?? (await bridgeCommands.getAxlesPressure(deviceId)).data;
   if (axlesPressureData[axleIndex * 3]) {
-    tcVehicleAxle.maxTargetPressure = _.round(bridgeTools.kpaByteToBar(axlesPressureData[axleIndex * 3]), 1);
+    tcVehicleAxle.maxTargetPressure = _.floor(bridgeTools.kpaByteToBar(axlesPressureData[axleIndex * 3]), 1);
   }
   if (axlesPressureData[axleIndex * 3 + 1]) {
-    tcVehicleAxle.minTargetPressure = _.round(bridgeTools.kpaByteToBar(axlesPressureData[axleIndex * 3 + 1]), 1);
+    tcVehicleAxle.minTargetPressure = _.ceil(bridgeTools.kpaByteToBar(axlesPressureData[axleIndex * 3 + 1]), 1);
   }
   if (axlesPressureData[axleIndex * 3 + 2]) {
     tcVehicleAxle.targetPressure = _.round(
@@ -2719,12 +2724,11 @@ async function connect(deviceId, accessLevel) {
     await bridgeService.sendPinCommand(deviceId);
     store.setState(deviceId, "paired");
   } catch (e) {
-    disconnect(deviceId);
+    disconnect(deviceId, "failedConnection");
     throw new Error(`Pairing unsuccessful ${e}`);
   }
 }
 async function disconnect(deviceId, reason) {
-  await waitUntil(() => store.deviceState[deviceId] === "paired" || store.deviceState[deviceId] === void 0);
   store.setState(deviceId, "disconnecting");
   promiseQueue.clearQueue(deviceId, "Previous pending commands aborted");
   await bluetooth.disconnect(deviceId);

package/package.json

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