tirecheck-device-sdk 0.1.98 → 0.1.99

package/dist/index.cjs

@@ -406,7 +406,8 @@ function processAndroidAdvertising(adv, isKrone) {
     }
     if (messageType === 3 && identificator === 255) {
       advertisingData.macAddress = packet.slice(5, 11);
-      advertisingData.vinNum = packet.slice(-17);
+      advertisingData.vinNum = packet.slice(11, 28);
+      advertisingData.vinExtension = packet[28];
     }
     if (messageType === 1 && identificator === 255) {
       advertisingData.randomAdvNumber = packet.slice(-8);
@@ -443,6 +444,15 @@ function processIosAdvertising(adv, isKrone) {
     advertisingData.macAddress = adv.slice(17, 23);
     advertisingData.vinNum = adv.slice(23, 40);
   }
+  if (adv.length === 43) {
+    advertisingData.randomAdvNumber = adv.slice(3, 11);
+    advertisingData.fwVersion = bridgeTools.getFwVersion(adv.slice(11, 14));
+    advertisingData.configVersion = adv[14];
+    advertisingData.timeFromStart = adv[15];
+    advertisingData.macAddress = adv.slice(17, 23);
+    advertisingData.vinNum = adv.slice(23, 40);
+    advertisingData.vinExtension = adv[40];
+  }
   return advertisingData;
 }
 
@@ -542,7 +552,22 @@ const deviceMeta = {
   }
 };
 
-const checkUnreachableDevicesTimeouts = {};
+const timeouts = {};
+const unreachableSvc = {
+  clear,
+  refresh
+};
+function clear(deviceId) {
+  if (timeouts[deviceId]) clearTimeout(timeouts[deviceId]);
+}
+function refresh(deviceId, deviceUnreachableCallback) {
+  clear(deviceId);
+  timeouts[deviceId] = setTimeout(() => {
+    delete store.devices[deviceId];
+    deviceUnreachableCallback?.(deviceId);
+  }, 6e4);
+}
+
 let deviceAdvertisingCallback;
 let deviceUnreachableCallback;
 let deviceStateChangeCallback;
@@ -612,7 +637,7 @@ async function connect$1(deviceId, disconnectCallback) {
       }
     }
   }
-  clearTimeout(checkUnreachableDevicesTimeouts[deviceId]);
+  unreachableSvc.clear(deviceId);
   store.setState(deviceId, "connected");
   return connectedDevice;
 }
@@ -674,7 +699,7 @@ function processDevice(device) {
     console.warn("Error processing advertising", e);
     return;
   }
-  refreshUnreachableTimeouts(processedDevice.id);
+  unreachableSvc.refresh(processedDevice.id, deviceUnreachableCallback);
   return processedDevice;
 }
 function getDeviceTypeFromName(name) {
@@ -687,15 +712,6 @@ function getDeviceTypeFromName(name) {
   }
   return deviceType;
 }
-function refreshUnreachableTimeouts(deviceId) {
-  if (checkUnreachableDevicesTimeouts[deviceId]) {
-    clearTimeout(checkUnreachableDevicesTimeouts[deviceId]);
-  }
-  checkUnreachableDevicesTimeouts[deviceId] = setTimeout(() => {
-    delete store.devices[deviceId];
-    deviceUnreachableCallback?.(deviceId);
-  }, 6e4);
-}
 function getDeviceName(device) {
   const isBridge = deviceMeta.bridge.nameRegex.test(device.name) || deviceMeta.bridgeOta.nameRegex.test(device.name);
   if (isBridge && !device.advertising.kCBAdvDataLocalName) {
@@ -2184,7 +2200,7 @@ async function getConfiguration(deviceId) {
 }
 function bridgeVehiclesDifference(original, change) {
   const differences = [];
-  if (original.vin !== change.vin) differences.push("vin");
+  if (original.vin !== change.vin || original.vinExtension !== change.vinExtension) differences.push("vin");
   const originalTyres = original.tcTyres.map((t) => {
     return { positionId: t.mountedOn?.positionId, sensorId: t.tcTpmsSensor?.id || null };
   });
@@ -3037,6 +3053,7 @@ const bridgeSimulator = {
     bridge.advertisingData.fwVersion = "1.9.9";
   },
   async connect(deviceId) {
+    if (store.simulatedDevices[deviceId].isDisabled) throw new Error(`Simulated bridge is disabled: ${deviceId}`);
     store.setState(deviceId, "connecting");
     await toolsSvc.delay(100);
     store.setState(deviceId, "connected");
@@ -3304,12 +3321,19 @@ function ensureSimulatorMethodsAreInjected() {
       clearInterval(advertisingInterval);
       advertisingInterval = void 0;
     }
+    let previousDevices = store.simulatedDevices;
     advertisingInterval = toolsSvc.setIntervalImmediate(() => {
       for (const key in store.simulatedDevices) {
         const d = store.simulatedDevices[key];
         if (d.isDisabled) continue;
+        unreachableSvc.refresh(d.id, deviceUnreachableCallback);
         deviceAdvertisingCallback?.(store.simulatedDevices[key]);
       }
+      const missingDevices = ___default.omit(previousDevices, Object.keys(store.simulatedDevices));
+      for (const key in missingDevices) {
+        deviceUnreachableCallback?.(key);
+      }
+      previousDevices = ___default.cloneDeep(store.simulatedDevices);
     }, 2e3);
   };
   for (const [svc, sim] of deviceServicesAndSimulators) {

package/dist/index.d.cts

@@ -800,6 +800,7 @@ type Simulator<Service extends Record<string, any>, SimulatedDeviceType extends
 interface BleBridgeAdvertisingData {
     randomAdvNumber: number[];
     vinNum: number[];
+    vinExtension?: number;
     macAddress: number[];
     fwVersion?: string;
     /**

package/dist/index.d.mts

@@ -800,6 +800,7 @@ type Simulator<Service extends Record<string, any>, SimulatedDeviceType extends
 interface BleBridgeAdvertisingData {
     randomAdvNumber: number[];
     vinNum: number[];
+    vinExtension?: number;
     macAddress: number[];
     fwVersion?: string;
     /**

package/dist/index.d.ts

@@ -800,6 +800,7 @@ type Simulator<Service extends Record<string, any>, SimulatedDeviceType extends
 interface BleBridgeAdvertisingData {
     randomAdvNumber: number[];
     vinNum: number[];
+    vinExtension?: number;
     macAddress: number[];
     fwVersion?: string;
     /**

package/dist/index.mjs

@@ -399,7 +399,8 @@ function processAndroidAdvertising(adv, isKrone) {
     }
     if (messageType === 3 && identificator === 255) {
       advertisingData.macAddress = packet.slice(5, 11);
-      advertisingData.vinNum = packet.slice(-17);
+      advertisingData.vinNum = packet.slice(11, 28);
+      advertisingData.vinExtension = packet[28];
     }
     if (messageType === 1 && identificator === 255) {
       advertisingData.randomAdvNumber = packet.slice(-8);
@@ -436,6 +437,15 @@ function processIosAdvertising(adv, isKrone) {
     advertisingData.macAddress = adv.slice(17, 23);
     advertisingData.vinNum = adv.slice(23, 40);
   }
+  if (adv.length === 43) {
+    advertisingData.randomAdvNumber = adv.slice(3, 11);
+    advertisingData.fwVersion = bridgeTools.getFwVersion(adv.slice(11, 14));
+    advertisingData.configVersion = adv[14];
+    advertisingData.timeFromStart = adv[15];
+    advertisingData.macAddress = adv.slice(17, 23);
+    advertisingData.vinNum = adv.slice(23, 40);
+    advertisingData.vinExtension = adv[40];
+  }
   return advertisingData;
 }
 
@@ -535,7 +545,22 @@ const deviceMeta = {
   }
 };
 
-const checkUnreachableDevicesTimeouts = {};
+const timeouts = {};
+const unreachableSvc = {
+  clear,
+  refresh
+};
+function clear(deviceId) {
+  if (timeouts[deviceId]) clearTimeout(timeouts[deviceId]);
+}
+function refresh(deviceId, deviceUnreachableCallback) {
+  clear(deviceId);
+  timeouts[deviceId] = setTimeout(() => {
+    delete store.devices[deviceId];
+    deviceUnreachableCallback?.(deviceId);
+  }, 6e4);
+}
+
 let deviceAdvertisingCallback;
 let deviceUnreachableCallback;
 let deviceStateChangeCallback;
@@ -605,7 +630,7 @@ async function connect$1(deviceId, disconnectCallback) {
       }
     }
   }
-  clearTimeout(checkUnreachableDevicesTimeouts[deviceId]);
+  unreachableSvc.clear(deviceId);
   store.setState(deviceId, "connected");
   return connectedDevice;
 }
@@ -667,7 +692,7 @@ function processDevice(device) {
     console.warn("Error processing advertising", e);
     return;
   }
-  refreshUnreachableTimeouts(processedDevice.id);
+  unreachableSvc.refresh(processedDevice.id, deviceUnreachableCallback);
   return processedDevice;
 }
 function getDeviceTypeFromName(name) {
@@ -680,15 +705,6 @@ function getDeviceTypeFromName(name) {
   }
   return deviceType;
 }
-function refreshUnreachableTimeouts(deviceId) {
-  if (checkUnreachableDevicesTimeouts[deviceId]) {
-    clearTimeout(checkUnreachableDevicesTimeouts[deviceId]);
-  }
-  checkUnreachableDevicesTimeouts[deviceId] = setTimeout(() => {
-    delete store.devices[deviceId];
-    deviceUnreachableCallback?.(deviceId);
-  }, 6e4);
-}
 function getDeviceName(device) {
   const isBridge = deviceMeta.bridge.nameRegex.test(device.name) || deviceMeta.bridgeOta.nameRegex.test(device.name);
   if (isBridge && !device.advertising.kCBAdvDataLocalName) {
@@ -2177,7 +2193,7 @@ async function getConfiguration(deviceId) {
 }
 function bridgeVehiclesDifference(original, change) {
   const differences = [];
-  if (original.vin !== change.vin) differences.push("vin");
+  if (original.vin !== change.vin || original.vinExtension !== change.vinExtension) differences.push("vin");
   const originalTyres = original.tcTyres.map((t) => {
     return { positionId: t.mountedOn?.positionId, sensorId: t.tcTpmsSensor?.id || null };
   });
@@ -3030,6 +3046,7 @@ const bridgeSimulator = {
     bridge.advertisingData.fwVersion = "1.9.9";
   },
   async connect(deviceId) {
+    if (store.simulatedDevices[deviceId].isDisabled) throw new Error(`Simulated bridge is disabled: ${deviceId}`);
     store.setState(deviceId, "connecting");
     await toolsSvc.delay(100);
     store.setState(deviceId, "connected");
@@ -3297,12 +3314,19 @@ function ensureSimulatorMethodsAreInjected() {
       clearInterval(advertisingInterval);
       advertisingInterval = void 0;
     }
+    let previousDevices = store.simulatedDevices;
     advertisingInterval = toolsSvc.setIntervalImmediate(() => {
       for (const key in store.simulatedDevices) {
         const d = store.simulatedDevices[key];
         if (d.isDisabled) continue;
+        unreachableSvc.refresh(d.id, deviceUnreachableCallback);
         deviceAdvertisingCallback?.(store.simulatedDevices[key]);
       }
+      const missingDevices = _.omit(previousDevices, Object.keys(store.simulatedDevices));
+      for (const key in missingDevices) {
+        deviceUnreachableCallback?.(key);
+      }
+      previousDevices = _.cloneDeep(store.simulatedDevices);
     }, 2e3);
   };
   for (const [svc, sim] of deviceServicesAndSimulators) {

package/package.json

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