tirecheck-device-sdk 0.1.92 → 0.1.93

package/dist/index.cjs

@@ -576,8 +576,10 @@ async function connect(deviceId, disconnectCallback) {
   let connectedDevice;
   for (let attempt = 0; attempt < 3; attempt++) {
     try {
-      connectedDevice = await connectInner(deviceId, disconnectCallback);
-      if (connectedDevice) break;
+      connectedDevice = await withTimeout(connectInner(deviceId, disconnectCallback), 2e4);
+      const _deviceId = store.deviceIdMapingTable[deviceId] ?? deviceId;
+      const isConnected = await ble.isConnected(_deviceId);
+      if (connectedDevice && isConnected) break;
     } catch (e) {
       console.warn(`${attempt} connect fail`, e);
       if (attempt === 3) {
@@ -587,12 +589,6 @@ async function connect(deviceId, disconnectCallback) {
     }
   }
   clearTimeout(checkUnreachableDevicesTimeouts[deviceId]);
-  const _deviceId = store.deviceIdMapingTable[deviceId] ?? deviceId;
-  const isConnected = await ble.isConnected(_deviceId);
-  if (!isConnected) {
-    store.setState(deviceId, void 0, "failedConnection");
-    throw new Error("Connect Error");
-  }
   store.setState(deviceId, "connected");
   return connectedDevice;
 }
@@ -688,7 +684,6 @@ function getDeviceNameFromAdvertising(advertising) {
   const length = adv[3];
   const type = adv[4];
   if (type !== 9) {
-    console.warn("Bridge name not found in advertising");
     return "";
   }
   const decoder = new TextDecoder("utf-8");
@@ -1744,7 +1739,9 @@ ___default.invert(subCommandIds);
 let keepAliveTimer;
 const bridgeCommands = {
   getCommandHeader(device) {
-    return [securityLevelIds.tirecheck, messageTypeIds.command];
+    const accessLevel = store.deviceAccessLevel[device.id];
+    const securityLevelId = securityLevelIds[accessLevel] ?? securityLevelIds.driver;
+    return [securityLevelId, messageTypeIds.command];
   },
   async setAxlesPressure(deviceId, data) {
     const deviceData = bridgeTools.getBridgeFromStore(deviceId);
@@ -1772,15 +1769,16 @@ const bridgeCommands = {
     );
     return { ...structurized, isFactory: result.isFactory };
   },
-  async getBridgeConfiguration(deviceId) {
-    const deviceData = bridgeTools.getBridgeFromStore(deviceId);
-    const result = await this.readCommand(deviceData, subCommandIds.bridgeConfiguration);
-    const structurized = bridgeTools.convertBytesToStructure(
-      bridgeCommandStructures.bridgeConfiguration.structure,
-      result.data
-    );
-    return { ...structurized, isFactory: result.isFactory };
-  },
+  // only accessible by tirecheck level, which should not be used in production
+  // async getBridgeConfiguration(deviceId: string) {
+  //   const deviceData = bridgeTools.getBridgeFromStore(deviceId)
+  //   const result = await this.readCommand(deviceData, subCommandIds.bridgeConfiguration)
+  //   const structurized = bridgeTools.convertBytesToStructure(
+  //     bridgeCommandStructures.bridgeConfiguration.structure,
+  //     result.data,
+  //   )
+  //   return { ...structurized, isFactory: result.isFactory }
+  // },
   async getCustomerPressureThresholds(deviceId) {
     const deviceData = bridgeTools.getBridgeFromStore(deviceId);
     const result = await this.readCommand(deviceData, subCommandIds.customerPressureThresholds);
@@ -2038,7 +2036,7 @@ const bridgeCommands = {
     const commandHead = this.getCommandHeader(device);
     const macAddress = [0, 0, 0, 0, 0, 0];
     const timestamp = bridgeTools.decimalToHex(Math.floor(Date.now() / 1e3));
-    const parsedTimestamp = timestamp.match(/.{2}/g)?.map((x) => Number.parseInt(x, 16));
+    const parsedTimestamp = timestamp.match(/.{2}/g)?.map((x) => Number.parseInt(x, 16)).reverse();
     if (parsedTimestamp?.length !== 4) throw new Error("Wrong timestamp format");
     const paddedTimestamp = [...parsedTimestamp, 0, 0, 0, 0];
     const crc = bridgeSecurity.getCrcArray([...macAddress, ...paddedTimestamp, ...payload]);
@@ -2070,7 +2068,8 @@ const bridgeCommands = {
     clearTimeout(keepAliveTimer);
     keepAliveTimer = setTimeout(() => {
       if (store.deviceState[device.id] !== "paired" || store.devices[device.id]?.type !== "bridge") {
-        return;
+        console.warn("keep alive timer cleared");
+        return clearTimeout(keepAliveTimer);
       }
       this.sendKeepAliveCommand(device);
     }, 1e4);
@@ -2221,7 +2220,6 @@ async function setVehicleLayout(deviceId, tcVehicle) {
 async function getConfiguration(deviceId) {
   const customerCANSettings = await bridgeCommands.getCustomerCANSettings(deviceId);
   const workshopCANSettings = await bridgeCommands.getWorkshopCANSettings(deviceId);
-  const bridgeConfiguration = await bridgeCommands.getBridgeConfiguration(deviceId);
   const customerPressureThresholds = await bridgeCommands.getCustomerPressureThresholds(deviceId);
   const customerTemperatureThresholds = await bridgeCommands.getCustomerTemperatureThresholds(deviceId);
   const customerImbalanceThresholds = await bridgeCommands.getCustomerImbalanceThresholds(deviceId);
@@ -2233,7 +2231,6 @@ async function getConfiguration(deviceId) {
   return {
     customerCANSettings,
     workshopCANSettings,
-    bridgeConfiguration,
     customerPressureThresholds,
     customerTemperatureThresholds,
     customerImbalanceThresholds,
@@ -2973,6 +2970,9 @@ const flexiGaugeTpms = {
 };
 
 const bridgeSimulator = {
+  isRebootRequired(deviceId) {
+    return store.bridgeRebootRequired[deviceId];
+  },
   async getVehicle(deviceId) {
     const bridge = getSimulatedBridge(deviceId);
     return { ...bridge.simulatorData.vehicle, tcBridge: { id: deviceId } };

package/dist/index.d.cts

@@ -761,7 +761,6 @@ declare class BridgeTcVehicleAxle {
 interface BridgeConfiguration {
     customerCANSettings: BridgeCommandStructurized<typeof _default.customerCanSettings.structure>;
     workshopCANSettings: BridgeCommandStructurized<typeof _default.workshopCanSettings.structure>;
-    bridgeConfiguration: BridgeCommandStructurized<typeof _default.bridgeConfiguration.structure>;
     customerPressureThresholds: BridgeCommandStructurized<typeof _default.axlePressureThresholds.structure>;
     customerTemperatureThresholds: BridgeCommandStructurized<typeof _default.axleTemperatureThresholds.structure>;
     customerImbalanceThresholds: BridgeCommandStructurized<typeof _default.axleImbalanceThresholds.structure>;

package/dist/index.d.mts

@@ -761,7 +761,6 @@ declare class BridgeTcVehicleAxle {
 interface BridgeConfiguration {
     customerCANSettings: BridgeCommandStructurized<typeof _default.customerCanSettings.structure>;
     workshopCANSettings: BridgeCommandStructurized<typeof _default.workshopCanSettings.structure>;
-    bridgeConfiguration: BridgeCommandStructurized<typeof _default.bridgeConfiguration.structure>;
     customerPressureThresholds: BridgeCommandStructurized<typeof _default.axlePressureThresholds.structure>;
     customerTemperatureThresholds: BridgeCommandStructurized<typeof _default.axleTemperatureThresholds.structure>;
     customerImbalanceThresholds: BridgeCommandStructurized<typeof _default.axleImbalanceThresholds.structure>;

package/dist/index.d.ts

@@ -761,7 +761,6 @@ declare class BridgeTcVehicleAxle {
 interface BridgeConfiguration {
     customerCANSettings: BridgeCommandStructurized<typeof _default.customerCanSettings.structure>;
     workshopCANSettings: BridgeCommandStructurized<typeof _default.workshopCanSettings.structure>;
-    bridgeConfiguration: BridgeCommandStructurized<typeof _default.bridgeConfiguration.structure>;
     customerPressureThresholds: BridgeCommandStructurized<typeof _default.axlePressureThresholds.structure>;
     customerTemperatureThresholds: BridgeCommandStructurized<typeof _default.axleTemperatureThresholds.structure>;
     customerImbalanceThresholds: BridgeCommandStructurized<typeof _default.axleImbalanceThresholds.structure>;

package/dist/index.mjs

@@ -569,8 +569,10 @@ async function connect(deviceId, disconnectCallback) {
   let connectedDevice;
   for (let attempt = 0; attempt < 3; attempt++) {
     try {
-      connectedDevice = await connectInner(deviceId, disconnectCallback);
-      if (connectedDevice) break;
+      connectedDevice = await withTimeout(connectInner(deviceId, disconnectCallback), 2e4);
+      const _deviceId = store.deviceIdMapingTable[deviceId] ?? deviceId;
+      const isConnected = await ble.isConnected(_deviceId);
+      if (connectedDevice && isConnected) break;
     } catch (e) {
       console.warn(`${attempt} connect fail`, e);
       if (attempt === 3) {
@@ -580,12 +582,6 @@ async function connect(deviceId, disconnectCallback) {
     }
   }
   clearTimeout(checkUnreachableDevicesTimeouts[deviceId]);
-  const _deviceId = store.deviceIdMapingTable[deviceId] ?? deviceId;
-  const isConnected = await ble.isConnected(_deviceId);
-  if (!isConnected) {
-    store.setState(deviceId, void 0, "failedConnection");
-    throw new Error("Connect Error");
-  }
   store.setState(deviceId, "connected");
   return connectedDevice;
 }
@@ -681,7 +677,6 @@ function getDeviceNameFromAdvertising(advertising) {
   const length = adv[3];
   const type = adv[4];
   if (type !== 9) {
-    console.warn("Bridge name not found in advertising");
     return "";
   }
   const decoder = new TextDecoder("utf-8");
@@ -1737,7 +1732,9 @@ _.invert(subCommandIds);
 let keepAliveTimer;
 const bridgeCommands = {
   getCommandHeader(device) {
-    return [securityLevelIds.tirecheck, messageTypeIds.command];
+    const accessLevel = store.deviceAccessLevel[device.id];
+    const securityLevelId = securityLevelIds[accessLevel] ?? securityLevelIds.driver;
+    return [securityLevelId, messageTypeIds.command];
   },
   async setAxlesPressure(deviceId, data) {
     const deviceData = bridgeTools.getBridgeFromStore(deviceId);
@@ -1765,15 +1762,16 @@ const bridgeCommands = {
     );
     return { ...structurized, isFactory: result.isFactory };
   },
-  async getBridgeConfiguration(deviceId) {
-    const deviceData = bridgeTools.getBridgeFromStore(deviceId);
-    const result = await this.readCommand(deviceData, subCommandIds.bridgeConfiguration);
-    const structurized = bridgeTools.convertBytesToStructure(
-      bridgeCommandStructures.bridgeConfiguration.structure,
-      result.data
-    );
-    return { ...structurized, isFactory: result.isFactory };
-  },
+  // only accessible by tirecheck level, which should not be used in production
+  // async getBridgeConfiguration(deviceId: string) {
+  //   const deviceData = bridgeTools.getBridgeFromStore(deviceId)
+  //   const result = await this.readCommand(deviceData, subCommandIds.bridgeConfiguration)
+  //   const structurized = bridgeTools.convertBytesToStructure(
+  //     bridgeCommandStructures.bridgeConfiguration.structure,
+  //     result.data,
+  //   )
+  //   return { ...structurized, isFactory: result.isFactory }
+  // },
   async getCustomerPressureThresholds(deviceId) {
     const deviceData = bridgeTools.getBridgeFromStore(deviceId);
     const result = await this.readCommand(deviceData, subCommandIds.customerPressureThresholds);
@@ -2031,7 +2029,7 @@ const bridgeCommands = {
     const commandHead = this.getCommandHeader(device);
     const macAddress = [0, 0, 0, 0, 0, 0];
     const timestamp = bridgeTools.decimalToHex(Math.floor(Date.now() / 1e3));
-    const parsedTimestamp = timestamp.match(/.{2}/g)?.map((x) => Number.parseInt(x, 16));
+    const parsedTimestamp = timestamp.match(/.{2}/g)?.map((x) => Number.parseInt(x, 16)).reverse();
     if (parsedTimestamp?.length !== 4) throw new Error("Wrong timestamp format");
     const paddedTimestamp = [...parsedTimestamp, 0, 0, 0, 0];
     const crc = bridgeSecurity.getCrcArray([...macAddress, ...paddedTimestamp, ...payload]);
@@ -2063,7 +2061,8 @@ const bridgeCommands = {
     clearTimeout(keepAliveTimer);
     keepAliveTimer = setTimeout(() => {
       if (store.deviceState[device.id] !== "paired" || store.devices[device.id]?.type !== "bridge") {
-        return;
+        console.warn("keep alive timer cleared");
+        return clearTimeout(keepAliveTimer);
       }
       this.sendKeepAliveCommand(device);
     }, 1e4);
@@ -2214,7 +2213,6 @@ async function setVehicleLayout(deviceId, tcVehicle) {
 async function getConfiguration(deviceId) {
   const customerCANSettings = await bridgeCommands.getCustomerCANSettings(deviceId);
   const workshopCANSettings = await bridgeCommands.getWorkshopCANSettings(deviceId);
-  const bridgeConfiguration = await bridgeCommands.getBridgeConfiguration(deviceId);
   const customerPressureThresholds = await bridgeCommands.getCustomerPressureThresholds(deviceId);
   const customerTemperatureThresholds = await bridgeCommands.getCustomerTemperatureThresholds(deviceId);
   const customerImbalanceThresholds = await bridgeCommands.getCustomerImbalanceThresholds(deviceId);
@@ -2226,7 +2224,6 @@ async function getConfiguration(deviceId) {
   return {
     customerCANSettings,
     workshopCANSettings,
-    bridgeConfiguration,
     customerPressureThresholds,
     customerTemperatureThresholds,
     customerImbalanceThresholds,
@@ -2966,6 +2963,9 @@ const flexiGaugeTpms = {
 };
 
 const bridgeSimulator = {
+  isRebootRequired(deviceId) {
+    return store.bridgeRebootRequired[deviceId];
+  },
   async getVehicle(deviceId) {
     const bridge = getSimulatedBridge(deviceId);
     return { ...bridge.simulatorData.vehicle, tcBridge: { id: deviceId } };

package/package.json

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