tirecheck-device-sdk 0.1.96 → 0.1.98

package/dist/index.cjs

@@ -123,15 +123,23 @@ const bridgeTools = {
     if (deviceData.type !== "bridge") throw new Error("Device is not bridge");
     return deviceData;
   },
-  convertBytesToStructure(objStructure, payload) {
-    const numArray = ___default.clone(payload);
-    const keys = Object.keys(objStructure);
+  convertBytesToStructure(objStructure, payload, fwVersion) {
+    let numArray = ___default.clone(payload);
+    const keys = Object.keys(objStructure).filter(
+      (key) => !objStructure[key].version || !fwVersion || fwVersion >= objStructure[key].version
+    );
     let sumWithInitial = 0;
     for (const key of keys) {
       sumWithInitial += objStructure[key].size;
     }
+    if (numArray.length < sumWithInitial) {
+      console.warn("missing bytes filled with empty values");
+      numArray = numArray.concat(Array.from({ length: sumWithInitial - numArray.length }, () => 0));
+    }
     if (numArray.length !== sumWithInitial) {
-      throw new Error("Cannot convert bytes to object");
+      throw new Error(
+        `Cannot convert bytes to object: bytes received ${numArray.length}, expected ${sumWithInitial}, fw version ${fwVersion}`
+      );
     }
     const result = {};
     for (const key of keys) {
@@ -140,10 +148,13 @@ const bridgeTools = {
     }
     return result;
   },
-  convertStructureToBytes(objStructure, structurizedObj) {
-    const keys = Object.keys(objStructure);
+  convertStructureToBytes(objStructure, structurizedObj, fwVersion) {
+    const keys = Object.keys(objStructure).filter(
+      (key) => !objStructure[key].version || !fwVersion || fwVersion >= objStructure[key].version
+    );
     const result = [];
     for (const key of keys) {
+      if (!structurizedObj[key]) throw new Error(`Missing key ${key} in the structure`);
       const encoded = this.encodeData(structurizedObj[key], objStructure[key].display);
       if (encoded.length < objStructure[key].size) {
         const _padArray = Array.from({ length: objStructure[key].size - encoded.length }, () => 0);
@@ -180,7 +191,7 @@ const bridgeTools = {
   encodeData(data, displayUnits) {
     const _data = ___default.clone(data);
     if (displayUnits === "ascii") {
-      return _data.split("").map((v, i) => _data.charCodeAt(i));
+      return this.asciiToDecimalArray(_data);
     }
     if (displayUnits === "decimal") {
       return this.hexToDecimalArray(this.decimalToHex(_data)).reverse();
@@ -192,16 +203,6 @@ const bridgeTools = {
     }
     return this.hexToDecimalArray(_data).reverse();
   },
-  //   getBridgeId(device: BluetoothDeviceBridge) {
-  //     // [244,177, 0, 34,123, 155] => F4B100227B9B
-  //     return (
-  //       device.advertisingData.macAddress
-  //         ?.map(n => this.decimalToHex(n))
-  //         .reverse()
-  //         .join('')
-  //         .toUpperCase() || ''
-  //     )
-  //   },
   pkcs(array, length) {
     const pkcsValue = length - array.length;
     if (pkcsValue > 0) {
@@ -213,6 +214,9 @@ const bridgeTools = {
     const hex = decimal.toString(16);
     return hex.padStart(2, "0");
   },
+  asciiToDecimalArray(ascii) {
+    return ascii.split("").map((x) => x.charCodeAt(0));
+  },
   hexToDecimalArray(hex) {
     return hex.match(/.{1,2}/g)?.map((byte) => Number.parseInt(byte, 16)) || [];
   },
@@ -341,8 +345,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 +383,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 +594,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) {
@@ -1374,12 +1383,7 @@ const bridgeCommandStructures = {
         size: 1,
         description: "VIN extension",
         display: "ascii",
-        optional: true
-      },
-      test: {
-        size: 3,
-        description: "Test",
-        optional: true
+        version: "1.0.3"
       }
     }
   }
@@ -1722,7 +1726,7 @@ const subCommandIds = {
 };
 ___default.invert(commandIds);
 ___default.invert(subCommandIds);
-let keepAliveTimer;
+const keepAliveTimer = {};
 const bridgeCommands = {
   getCommandHeader(device) {
     const accessLevel = store.deviceAccessLevel[device.id];
@@ -1733,16 +1737,22 @@ const bridgeCommands = {
     const deviceData = bridgeTools.getBridgeFromStore(deviceId);
     await this.writeCommand(deviceData, commandIds.writeData, subCommandIds.pressurePerAxle, data);
   },
-  async setVehicleLayout(deviceId, data) {
+  async setVehicleLayout(deviceId, structurizedPayload) {
     const deviceData = bridgeTools.getBridgeFromStore(deviceId);
-    await this.writeCommand(deviceData, commandIds.writeData, subCommandIds.vehicleLayout, data);
+    const payload = bridgeTools.convertStructureToBytes(
+      bridgeCommandStructures.vehicleLayout.structure,
+      structurizedPayload,
+      deviceData.advertisingData.fwVersion
+    );
+    await this.writeCommand(deviceData, commandIds.writeData, subCommandIds.vehicleLayout, payload);
   },
   async getCustomerCANSettings(deviceId) {
     const deviceData = bridgeTools.getBridgeFromStore(deviceId);
     const result = await this.readCommand(deviceData, subCommandIds.customerCanSettings);
     const structurized = bridgeTools.convertBytesToStructure(
       bridgeCommandStructures.customerCanSettings.structure,
-      result.data
+      result.data,
+      deviceData.advertisingData.fwVersion
     );
     return { ...structurized, isFactory: result.isFactory };
   },
@@ -1751,7 +1761,8 @@ const bridgeCommands = {
     const result = await this.readCommand(deviceData, subCommandIds.workshopCanSettings);
     const structurized = bridgeTools.convertBytesToStructure(
       bridgeCommandStructures.workshopCanSettings.structure,
-      result.data
+      result.data,
+      deviceData.advertisingData.fwVersion
     );
     return { ...structurized, isFactory: result.isFactory };
   },
@@ -1760,7 +1771,8 @@ const bridgeCommands = {
     const result = await this.readCommand(deviceData, subCommandIds.customerPressureThresholds);
     const structurized = bridgeTools.convertBytesToStructure(
       bridgeCommandStructures.axlePressureThresholds.structure,
-      result.data
+      result.data,
+      deviceData.advertisingData.fwVersion
     );
     return { ...structurized, isFactory: result.isFactory };
   },
@@ -1769,7 +1781,8 @@ const bridgeCommands = {
     const result = await this.readCommand(deviceData, subCommandIds.customerTemperatureThresholds);
     const structurized = bridgeTools.convertBytesToStructure(
       bridgeCommandStructures.axleTemperatureThresholds.structure,
-      result.data
+      result.data,
+      deviceData.advertisingData.fwVersion
     );
     return { ...structurized, isFactory: result.isFactory };
   },
@@ -1778,7 +1791,8 @@ const bridgeCommands = {
     const result = await this.readCommand(deviceData, subCommandIds.customerImbalanceThresholds);
     const structurized = bridgeTools.convertBytesToStructure(
       bridgeCommandStructures.axleImbalanceThresholds.structure,
-      result.data
+      result.data,
+      deviceData.advertisingData.fwVersion
     );
     return { ...structurized, isFactory: result.isFactory };
   },
@@ -1810,7 +1824,8 @@ const bridgeCommands = {
     const deviceData = bridgeTools.getBridgeFromStore(deviceId);
     const payload = bridgeTools.convertStructureToBytes(
       bridgeCommandStructures.customerCanSettings.structure,
-      structurizedPayload
+      structurizedPayload,
+      deviceData.advertisingData.fwVersion
     );
     return await this.writeCommand(deviceData, commandIds.writeData, subCommandIds.customerCanSettings, payload);
   },
@@ -1836,7 +1851,8 @@ const bridgeCommands = {
     const deviceData = bridgeTools.getBridgeFromStore(deviceId);
     const payload = bridgeTools.convertStructureToBytes(
       bridgeCommandStructures.workshopCanSettings.structure,
-      structurizedPayload
+      structurizedPayload,
+      deviceData.advertisingData.fwVersion
     );
     return await this.writeCommand(deviceData, commandIds.writeData, subCommandIds.workshopCanSettings, payload);
   },
@@ -1844,7 +1860,8 @@ const bridgeCommands = {
     const deviceData = bridgeTools.getBridgeFromStore(deviceId);
     const payload = bridgeTools.convertStructureToBytes(
       bridgeCommandStructures.axlePressureThresholds.structure,
-      structurizedPayload
+      structurizedPayload,
+      deviceData.advertisingData.fwVersion
     );
     return await this.writeCommand(deviceData, commandIds.writeData, subCommandIds.customerPressureThresholds, payload);
   },
@@ -1852,7 +1869,8 @@ const bridgeCommands = {
     const deviceData = bridgeTools.getBridgeFromStore(deviceId);
     const payload = bridgeTools.convertStructureToBytes(
       bridgeCommandStructures.axleTemperatureThresholds.structure,
-      structurizedPayload
+      structurizedPayload,
+      deviceData.advertisingData.fwVersion
     );
     return await this.writeCommand(
       deviceData,
@@ -1865,7 +1883,8 @@ const bridgeCommands = {
     const deviceData = bridgeTools.getBridgeFromStore(deviceId);
     const payload = bridgeTools.convertStructureToBytes(
       bridgeCommandStructures.axleImbalanceThresholds.structure,
-      structurizedPayload
+      structurizedPayload,
+      deviceData.advertisingData.fwVersion
     );
     return await this.writeCommand(deviceData, commandIds.writeData, subCommandIds.customerImbalanceThresholds, payload);
   },
@@ -1874,7 +1893,8 @@ const bridgeCommands = {
     const result = await this.readCommand(deviceData, subCommandIds.autolearnSettings);
     const structurized = bridgeTools.convertBytesToStructure(
       bridgeCommandStructures.autolearnSettings.structure,
-      result.data
+      result.data,
+      deviceData.advertisingData.fwVersion
     );
     return { ...structurized, isFactory: result.isFactory };
   },
@@ -1883,7 +1903,8 @@ const bridgeCommands = {
     const result = await this.readCommand(deviceData, subCommandIds.autolearnIdStatus);
     const structurized = bridgeTools.convertBytesToStructure(
       bridgeCommandStructures.autolearnIdStatus.structure,
-      result.data
+      result.data,
+      deviceData.advertisingData.fwVersion
     );
     return { ...structurized, isFactory: result.isFactory };
   },
@@ -1891,7 +1912,8 @@ const bridgeCommands = {
     const deviceData = bridgeTools.getBridgeFromStore(deviceId);
     const payload = bridgeTools.convertStructureToBytes(
       bridgeCommandStructures.autolearnSettings.structure,
-      structurizedPayload
+      structurizedPayload,
+      deviceData.advertisingData.fwVersion
     );
     return await this.writeCommand(deviceData, commandIds.writeData, subCommandIds.autolearnSettings, payload);
   },
@@ -1899,7 +1921,8 @@ const bridgeCommands = {
     const deviceData = bridgeTools.getBridgeFromStore(deviceId);
     const payload = bridgeTools.convertStructureToBytes(
       bridgeCommandStructures.autolearnIdStatus.structure,
-      structurizedPayload
+      structurizedPayload,
+      deviceData.advertisingData.fwVersion
     );
     return await this.writeCommand(deviceData, commandIds.writeData, subCommandIds.autolearnIdStatus, payload);
   },
@@ -1907,7 +1930,8 @@ const bridgeCommands = {
     const result = await this.readCommand(device, subCommandIds.autolearnUnknownSensors);
     const structurized = bridgeTools.convertBytesToStructure(
       bridgeCommandStructures.autolearnUnknownSensors.structure,
-      result.data
+      result.data,
+      device.advertisingData.fwVersion
     );
     return { ...structurized, isFactory: result.isFactory };
   },
@@ -1933,7 +1957,8 @@ const bridgeCommands = {
     const result = await this.readCommand(deviceData, subCommandIds.pressurePerAxle);
     const structurizedData = bridgeTools.convertBytesToStructure(
       bridgeCommandStructures.pressuresPerAxle.structure,
-      result.data
+      result.data,
+      deviceData.advertisingData.fwVersion
     );
     return structurizedData;
   },
@@ -1941,7 +1966,8 @@ const bridgeCommands = {
     const deviceData = bridgeTools.getBridgeFromStore(deviceId);
     const payload = bridgeTools.convertStructureToBytes(
       bridgeCommandStructures.pressuresPerAxle.structure,
-      structurizedPayload
+      structurizedPayload,
+      deviceData.advertisingData.fwVersion
     );
     return await this.writeCommand(deviceData, commandIds.writeData, subCommandIds.pressurePerAxle, payload);
   },
@@ -1969,7 +1995,12 @@ const bridgeCommands = {
   async getVehicleLayout(deviceId) {
     const deviceData = bridgeTools.getBridgeFromStore(deviceId);
     const result = await this.readCommand(deviceData, subCommandIds.vehicleLayout);
-    return result.data;
+    const structurizedData = bridgeTools.convertBytesToStructure(
+      bridgeCommandStructures.vehicleLayout.structure,
+      result.data,
+      deviceData.advertisingData.fwVersion
+    );
+    return structurizedData;
   },
   async getSensorMeasurement(deviceId, positionId) {
     const deviceData = bridgeTools.getBridgeFromStore(deviceId);
@@ -2033,11 +2064,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);
@@ -2046,12 +2077,12 @@ const bridgeCommands = {
 };
 
 const vehicleLayoutAxleTypes = {
-  noAxle: [0, 0],
-  twoTyresAxle: [128, 2],
-  twoTyresAxleSpare: [128, 3],
-  fourTyresAxle: [192, 6],
-  fourTyresAxleSpare: [192, 7],
-  spareTyreAxle: [1, 0]
+  noAxle: "0000",
+  twoTyresAxle: "0280",
+  twoTyresAxleSpare: "0380",
+  fourTyresAxle: "06C0",
+  fourTyresAxleSpare: "07C0",
+  spareTyreAxle: "0001"
 };
 const bridgeService = {
   updateFirmware,
@@ -2086,37 +2117,49 @@ async function updateFirmware(deviceId, bootloader, firmware, reportStatus) {
 async function setVehicleLayout(deviceId, tcVehicle) {
   const spareTyres = tcVehicle.tcTyres?.filter((tyre) => String(tyre.mountedOn?.positionId).endsWith("0"));
   let spareTyresCount = Math.min(spareTyres.length || 0, 2);
-  let layout = [];
+  const result = {
+    axle01: "0000",
+    axle02: "0000",
+    axle03: "0000",
+    axle04: "0000",
+    axle05: "0000",
+    axle06: "0000",
+    axle07: "0000",
+    axle08: "0000",
+    axle09: "0000",
+    axle10: "0000",
+    axle11: "0000",
+    axle12: "0000",
+    axle13: "0000",
+    axle14: "0000",
+    axle15: "0000",
+    vin: tcVehicle.vin ?? "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0",
+    vinExtension: tcVehicle.vinExtension ?? "\0"
+  };
   for (let index = 0; index < 15; index++) {
-    const tyresCount = tcVehicle.axles && tcVehicle.axles[index]?.tyresCount;
-    if (tyresCount === 2) {
-      let value = vehicleLayoutAxleTypes.twoTyresAxle;
+    const resultKey = Object.keys(result)[index];
+    const tyreCount = tcVehicle.axles[index]?.tyresCount;
+    if (tyreCount === 2) {
       if (spareTyresCount) {
-        value = vehicleLayoutAxleTypes.twoTyresAxleSpare;
+        result[resultKey] = vehicleLayoutAxleTypes.twoTyresAxleSpare;
         spareTyresCount -= 1;
+      } else {
+        result[resultKey] = vehicleLayoutAxleTypes.twoTyresAxle;
       }
-      layout = [...layout, ...value];
       continue;
     }
-    if (tyresCount === 4) {
-      let value = vehicleLayoutAxleTypes.fourTyresAxle;
+    if (tyreCount === 4) {
       if (spareTyresCount) {
-        value = vehicleLayoutAxleTypes.fourTyresAxleSpare;
+        result[resultKey] = vehicleLayoutAxleTypes.fourTyresAxleSpare;
         spareTyresCount -= 1;
+      } else {
+        result[resultKey] = vehicleLayoutAxleTypes.fourTyresAxle;
       }
-      layout = [...layout, ...value];
       continue;
     }
-    layout = [...layout, ...vehicleLayoutAxleTypes.noAxle];
-  }
-  let vin = tcVehicle.vin ? tcVehicle.vin.split("").map((x) => x.charCodeAt(0)) : [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
-  if (vin.length !== 17) {
-    throw new Error(`Incorrect VIN length: ${vin}`);
-  }
-  if (bridgeTools.isVersionGreaterThan(deviceId, "1.0.2")) {
-    vin = [...vin, 0];
+    result[resultKey] = vehicleLayoutAxleTypes.noAxle;
   }
-  await bridgeCommands.setVehicleLayout(deviceId, [...layout, ...vin]);
+  await bridgeCommands.setVehicleLayout(deviceId, result);
 }
 async function getConfiguration(deviceId) {
   const customerCANSettings = await bridgeCommands.getCustomerCANSettings(deviceId);
@@ -2588,9 +2631,8 @@ async function getVehicle(deviceId) {
 }
 async function assignAxles(deviceId, tcVehicle) {
   const result = await bridgeCommands.getVehicleLayout(deviceId);
-  const data = result.map((x) => bridgeTools.decimalToHex(x));
-  const joinedData = Array.from({ length: data.length / 2 }, (_2, index) => data[2 * index + 1] + data[2 * index]);
-  const activeAxles = joinedData.slice(0, 15).filter((x) => Number(`0x${x}`));
+  tcVehicle.vinExtension = result.vinExtension;
+  const activeAxles = Object.values(result).slice(0, 15).filter((a) => Number.parseInt(a, 16));
   const axlesPressureData = (await bridgeCommands.getAxlesPressure(deviceId)).data;
   let axleTypesBytes;
   if (bridgeTools.isVersionGreaterThan(deviceId, "0.9.7")) {
@@ -2664,10 +2706,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 +2768,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.d.cts

@@ -609,12 +609,7 @@ declare const _default: {
                 size: number;
                 description: string;
                 display: "ascii";
-                optional: true;
-            };
-            test: {
-                size: number;
-                description: string;
-                optional: true;
+                version: string;
             };
         };
     };
@@ -626,6 +621,7 @@ type DeepPartial<T> = T extends object ? {
 interface BridgeTcVehicle {
     registrationNumber?: string;
     vin?: string;
+    vinExtension?: string;
     axles: BridgeTcVehicleAxle[];
     tcTyres: BridgeTcTyre[];
     /** Ignored in set, returned in get */
@@ -734,7 +730,8 @@ interface BridgeCommandStructureProperties {
         size: number;
         display?: 'decimal' | 'ascii' | 'reverseHex';
         description: string;
-        optional?: boolean;
+        /** From which bridge version is this property available */
+        version?: string;
     };
 }
 type BridgeCommandStructurized<T extends BridgeCommandStructureProperties> = {

package/dist/index.d.mts

@@ -609,12 +609,7 @@ declare const _default: {
                 size: number;
                 description: string;
                 display: "ascii";
-                optional: true;
-            };
-            test: {
-                size: number;
-                description: string;
-                optional: true;
+                version: string;
             };
         };
     };
@@ -626,6 +621,7 @@ type DeepPartial<T> = T extends object ? {
 interface BridgeTcVehicle {
     registrationNumber?: string;
     vin?: string;
+    vinExtension?: string;
     axles: BridgeTcVehicleAxle[];
     tcTyres: BridgeTcTyre[];
     /** Ignored in set, returned in get */
@@ -734,7 +730,8 @@ interface BridgeCommandStructureProperties {
         size: number;
         display?: 'decimal' | 'ascii' | 'reverseHex';
         description: string;
-        optional?: boolean;
+        /** From which bridge version is this property available */
+        version?: string;
     };
 }
 type BridgeCommandStructurized<T extends BridgeCommandStructureProperties> = {

package/dist/index.d.ts

@@ -609,12 +609,7 @@ declare const _default: {
                 size: number;
                 description: string;
                 display: "ascii";
-                optional: true;
-            };
-            test: {
-                size: number;
-                description: string;
-                optional: true;
+                version: string;
             };
         };
     };
@@ -626,6 +621,7 @@ type DeepPartial<T> = T extends object ? {
 interface BridgeTcVehicle {
     registrationNumber?: string;
     vin?: string;
+    vinExtension?: string;
     axles: BridgeTcVehicleAxle[];
     tcTyres: BridgeTcTyre[];
     /** Ignored in set, returned in get */
@@ -734,7 +730,8 @@ interface BridgeCommandStructureProperties {
         size: number;
         display?: 'decimal' | 'ascii' | 'reverseHex';
         description: string;
-        optional?: boolean;
+        /** From which bridge version is this property available */
+        version?: string;
     };
 }
 type BridgeCommandStructurized<T extends BridgeCommandStructureProperties> = {

package/dist/index.mjs

@@ -116,15 +116,23 @@ const bridgeTools = {
     if (deviceData.type !== "bridge") throw new Error("Device is not bridge");
     return deviceData;
   },
-  convertBytesToStructure(objStructure, payload) {
-    const numArray = _.clone(payload);
-    const keys = Object.keys(objStructure);
+  convertBytesToStructure(objStructure, payload, fwVersion) {
+    let numArray = _.clone(payload);
+    const keys = Object.keys(objStructure).filter(
+      (key) => !objStructure[key].version || !fwVersion || fwVersion >= objStructure[key].version
+    );
     let sumWithInitial = 0;
     for (const key of keys) {
       sumWithInitial += objStructure[key].size;
     }
+    if (numArray.length < sumWithInitial) {
+      console.warn("missing bytes filled with empty values");
+      numArray = numArray.concat(Array.from({ length: sumWithInitial - numArray.length }, () => 0));
+    }
     if (numArray.length !== sumWithInitial) {
-      throw new Error("Cannot convert bytes to object");
+      throw new Error(
+        `Cannot convert bytes to object: bytes received ${numArray.length}, expected ${sumWithInitial}, fw version ${fwVersion}`
+      );
     }
     const result = {};
     for (const key of keys) {
@@ -133,10 +141,13 @@ const bridgeTools = {
     }
     return result;
   },
-  convertStructureToBytes(objStructure, structurizedObj) {
-    const keys = Object.keys(objStructure);
+  convertStructureToBytes(objStructure, structurizedObj, fwVersion) {
+    const keys = Object.keys(objStructure).filter(
+      (key) => !objStructure[key].version || !fwVersion || fwVersion >= objStructure[key].version
+    );
     const result = [];
     for (const key of keys) {
+      if (!structurizedObj[key]) throw new Error(`Missing key ${key} in the structure`);
       const encoded = this.encodeData(structurizedObj[key], objStructure[key].display);
       if (encoded.length < objStructure[key].size) {
         const _padArray = Array.from({ length: objStructure[key].size - encoded.length }, () => 0);
@@ -173,7 +184,7 @@ const bridgeTools = {
   encodeData(data, displayUnits) {
     const _data = _.clone(data);
     if (displayUnits === "ascii") {
-      return _data.split("").map((v, i) => _data.charCodeAt(i));
+      return this.asciiToDecimalArray(_data);
     }
     if (displayUnits === "decimal") {
       return this.hexToDecimalArray(this.decimalToHex(_data)).reverse();
@@ -185,16 +196,6 @@ const bridgeTools = {
     }
     return this.hexToDecimalArray(_data).reverse();
   },
-  //   getBridgeId(device: BluetoothDeviceBridge) {
-  //     // [244,177, 0, 34,123, 155] => F4B100227B9B
-  //     return (
-  //       device.advertisingData.macAddress
-  //         ?.map(n => this.decimalToHex(n))
-  //         .reverse()
-  //         .join('')
-  //         .toUpperCase() || ''
-  //     )
-  //   },
   pkcs(array, length) {
     const pkcsValue = length - array.length;
     if (pkcsValue > 0) {
@@ -206,6 +207,9 @@ const bridgeTools = {
     const hex = decimal.toString(16);
     return hex.padStart(2, "0");
   },
+  asciiToDecimalArray(ascii) {
+    return ascii.split("").map((x) => x.charCodeAt(0));
+  },
   hexToDecimalArray(hex) {
     return hex.match(/.{1,2}/g)?.map((byte) => Number.parseInt(byte, 16)) || [];
   },
@@ -334,8 +338,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 +376,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 +587,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) {
@@ -1367,12 +1376,7 @@ const bridgeCommandStructures = {
         size: 1,
         description: "VIN extension",
         display: "ascii",
-        optional: true
-      },
-      test: {
-        size: 3,
-        description: "Test",
-        optional: true
+        version: "1.0.3"
       }
     }
   }
@@ -1715,7 +1719,7 @@ const subCommandIds = {
 };
 _.invert(commandIds);
 _.invert(subCommandIds);
-let keepAliveTimer;
+const keepAliveTimer = {};
 const bridgeCommands = {
   getCommandHeader(device) {
     const accessLevel = store.deviceAccessLevel[device.id];
@@ -1726,16 +1730,22 @@ const bridgeCommands = {
     const deviceData = bridgeTools.getBridgeFromStore(deviceId);
     await this.writeCommand(deviceData, commandIds.writeData, subCommandIds.pressurePerAxle, data);
   },
-  async setVehicleLayout(deviceId, data) {
+  async setVehicleLayout(deviceId, structurizedPayload) {
     const deviceData = bridgeTools.getBridgeFromStore(deviceId);
-    await this.writeCommand(deviceData, commandIds.writeData, subCommandIds.vehicleLayout, data);
+    const payload = bridgeTools.convertStructureToBytes(
+      bridgeCommandStructures.vehicleLayout.structure,
+      structurizedPayload,
+      deviceData.advertisingData.fwVersion
+    );
+    await this.writeCommand(deviceData, commandIds.writeData, subCommandIds.vehicleLayout, payload);
   },
   async getCustomerCANSettings(deviceId) {
     const deviceData = bridgeTools.getBridgeFromStore(deviceId);
     const result = await this.readCommand(deviceData, subCommandIds.customerCanSettings);
     const structurized = bridgeTools.convertBytesToStructure(
       bridgeCommandStructures.customerCanSettings.structure,
-      result.data
+      result.data,
+      deviceData.advertisingData.fwVersion
     );
     return { ...structurized, isFactory: result.isFactory };
   },
@@ -1744,7 +1754,8 @@ const bridgeCommands = {
     const result = await this.readCommand(deviceData, subCommandIds.workshopCanSettings);
     const structurized = bridgeTools.convertBytesToStructure(
       bridgeCommandStructures.workshopCanSettings.structure,
-      result.data
+      result.data,
+      deviceData.advertisingData.fwVersion
     );
     return { ...structurized, isFactory: result.isFactory };
   },
@@ -1753,7 +1764,8 @@ const bridgeCommands = {
     const result = await this.readCommand(deviceData, subCommandIds.customerPressureThresholds);
     const structurized = bridgeTools.convertBytesToStructure(
       bridgeCommandStructures.axlePressureThresholds.structure,
-      result.data
+      result.data,
+      deviceData.advertisingData.fwVersion
     );
     return { ...structurized, isFactory: result.isFactory };
   },
@@ -1762,7 +1774,8 @@ const bridgeCommands = {
     const result = await this.readCommand(deviceData, subCommandIds.customerTemperatureThresholds);
     const structurized = bridgeTools.convertBytesToStructure(
       bridgeCommandStructures.axleTemperatureThresholds.structure,
-      result.data
+      result.data,
+      deviceData.advertisingData.fwVersion
     );
     return { ...structurized, isFactory: result.isFactory };
   },
@@ -1771,7 +1784,8 @@ const bridgeCommands = {
     const result = await this.readCommand(deviceData, subCommandIds.customerImbalanceThresholds);
     const structurized = bridgeTools.convertBytesToStructure(
       bridgeCommandStructures.axleImbalanceThresholds.structure,
-      result.data
+      result.data,
+      deviceData.advertisingData.fwVersion
     );
     return { ...structurized, isFactory: result.isFactory };
   },
@@ -1803,7 +1817,8 @@ const bridgeCommands = {
     const deviceData = bridgeTools.getBridgeFromStore(deviceId);
     const payload = bridgeTools.convertStructureToBytes(
       bridgeCommandStructures.customerCanSettings.structure,
-      structurizedPayload
+      structurizedPayload,
+      deviceData.advertisingData.fwVersion
     );
     return await this.writeCommand(deviceData, commandIds.writeData, subCommandIds.customerCanSettings, payload);
   },
@@ -1829,7 +1844,8 @@ const bridgeCommands = {
     const deviceData = bridgeTools.getBridgeFromStore(deviceId);
     const payload = bridgeTools.convertStructureToBytes(
       bridgeCommandStructures.workshopCanSettings.structure,
-      structurizedPayload
+      structurizedPayload,
+      deviceData.advertisingData.fwVersion
     );
     return await this.writeCommand(deviceData, commandIds.writeData, subCommandIds.workshopCanSettings, payload);
   },
@@ -1837,7 +1853,8 @@ const bridgeCommands = {
     const deviceData = bridgeTools.getBridgeFromStore(deviceId);
     const payload = bridgeTools.convertStructureToBytes(
       bridgeCommandStructures.axlePressureThresholds.structure,
-      structurizedPayload
+      structurizedPayload,
+      deviceData.advertisingData.fwVersion
     );
     return await this.writeCommand(deviceData, commandIds.writeData, subCommandIds.customerPressureThresholds, payload);
   },
@@ -1845,7 +1862,8 @@ const bridgeCommands = {
     const deviceData = bridgeTools.getBridgeFromStore(deviceId);
     const payload = bridgeTools.convertStructureToBytes(
       bridgeCommandStructures.axleTemperatureThresholds.structure,
-      structurizedPayload
+      structurizedPayload,
+      deviceData.advertisingData.fwVersion
     );
     return await this.writeCommand(
       deviceData,
@@ -1858,7 +1876,8 @@ const bridgeCommands = {
     const deviceData = bridgeTools.getBridgeFromStore(deviceId);
     const payload = bridgeTools.convertStructureToBytes(
       bridgeCommandStructures.axleImbalanceThresholds.structure,
-      structurizedPayload
+      structurizedPayload,
+      deviceData.advertisingData.fwVersion
     );
     return await this.writeCommand(deviceData, commandIds.writeData, subCommandIds.customerImbalanceThresholds, payload);
   },
@@ -1867,7 +1886,8 @@ const bridgeCommands = {
     const result = await this.readCommand(deviceData, subCommandIds.autolearnSettings);
     const structurized = bridgeTools.convertBytesToStructure(
       bridgeCommandStructures.autolearnSettings.structure,
-      result.data
+      result.data,
+      deviceData.advertisingData.fwVersion
     );
     return { ...structurized, isFactory: result.isFactory };
   },
@@ -1876,7 +1896,8 @@ const bridgeCommands = {
     const result = await this.readCommand(deviceData, subCommandIds.autolearnIdStatus);
     const structurized = bridgeTools.convertBytesToStructure(
       bridgeCommandStructures.autolearnIdStatus.structure,
-      result.data
+      result.data,
+      deviceData.advertisingData.fwVersion
     );
     return { ...structurized, isFactory: result.isFactory };
   },
@@ -1884,7 +1905,8 @@ const bridgeCommands = {
     const deviceData = bridgeTools.getBridgeFromStore(deviceId);
     const payload = bridgeTools.convertStructureToBytes(
       bridgeCommandStructures.autolearnSettings.structure,
-      structurizedPayload
+      structurizedPayload,
+      deviceData.advertisingData.fwVersion
     );
     return await this.writeCommand(deviceData, commandIds.writeData, subCommandIds.autolearnSettings, payload);
   },
@@ -1892,7 +1914,8 @@ const bridgeCommands = {
     const deviceData = bridgeTools.getBridgeFromStore(deviceId);
     const payload = bridgeTools.convertStructureToBytes(
       bridgeCommandStructures.autolearnIdStatus.structure,
-      structurizedPayload
+      structurizedPayload,
+      deviceData.advertisingData.fwVersion
     );
     return await this.writeCommand(deviceData, commandIds.writeData, subCommandIds.autolearnIdStatus, payload);
   },
@@ -1900,7 +1923,8 @@ const bridgeCommands = {
     const result = await this.readCommand(device, subCommandIds.autolearnUnknownSensors);
     const structurized = bridgeTools.convertBytesToStructure(
       bridgeCommandStructures.autolearnUnknownSensors.structure,
-      result.data
+      result.data,
+      device.advertisingData.fwVersion
     );
     return { ...structurized, isFactory: result.isFactory };
   },
@@ -1926,7 +1950,8 @@ const bridgeCommands = {
     const result = await this.readCommand(deviceData, subCommandIds.pressurePerAxle);
     const structurizedData = bridgeTools.convertBytesToStructure(
       bridgeCommandStructures.pressuresPerAxle.structure,
-      result.data
+      result.data,
+      deviceData.advertisingData.fwVersion
     );
     return structurizedData;
   },
@@ -1934,7 +1959,8 @@ const bridgeCommands = {
     const deviceData = bridgeTools.getBridgeFromStore(deviceId);
     const payload = bridgeTools.convertStructureToBytes(
       bridgeCommandStructures.pressuresPerAxle.structure,
-      structurizedPayload
+      structurizedPayload,
+      deviceData.advertisingData.fwVersion
     );
     return await this.writeCommand(deviceData, commandIds.writeData, subCommandIds.pressurePerAxle, payload);
   },
@@ -1962,7 +1988,12 @@ const bridgeCommands = {
   async getVehicleLayout(deviceId) {
     const deviceData = bridgeTools.getBridgeFromStore(deviceId);
     const result = await this.readCommand(deviceData, subCommandIds.vehicleLayout);
-    return result.data;
+    const structurizedData = bridgeTools.convertBytesToStructure(
+      bridgeCommandStructures.vehicleLayout.structure,
+      result.data,
+      deviceData.advertisingData.fwVersion
+    );
+    return structurizedData;
   },
   async getSensorMeasurement(deviceId, positionId) {
     const deviceData = bridgeTools.getBridgeFromStore(deviceId);
@@ -2026,11 +2057,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);
@@ -2039,12 +2070,12 @@ const bridgeCommands = {
 };
 
 const vehicleLayoutAxleTypes = {
-  noAxle: [0, 0],
-  twoTyresAxle: [128, 2],
-  twoTyresAxleSpare: [128, 3],
-  fourTyresAxle: [192, 6],
-  fourTyresAxleSpare: [192, 7],
-  spareTyreAxle: [1, 0]
+  noAxle: "0000",
+  twoTyresAxle: "0280",
+  twoTyresAxleSpare: "0380",
+  fourTyresAxle: "06C0",
+  fourTyresAxleSpare: "07C0",
+  spareTyreAxle: "0001"
 };
 const bridgeService = {
   updateFirmware,
@@ -2079,37 +2110,49 @@ async function updateFirmware(deviceId, bootloader, firmware, reportStatus) {
 async function setVehicleLayout(deviceId, tcVehicle) {
   const spareTyres = tcVehicle.tcTyres?.filter((tyre) => String(tyre.mountedOn?.positionId).endsWith("0"));
   let spareTyresCount = Math.min(spareTyres.length || 0, 2);
-  let layout = [];
+  const result = {
+    axle01: "0000",
+    axle02: "0000",
+    axle03: "0000",
+    axle04: "0000",
+    axle05: "0000",
+    axle06: "0000",
+    axle07: "0000",
+    axle08: "0000",
+    axle09: "0000",
+    axle10: "0000",
+    axle11: "0000",
+    axle12: "0000",
+    axle13: "0000",
+    axle14: "0000",
+    axle15: "0000",
+    vin: tcVehicle.vin ?? "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0",
+    vinExtension: tcVehicle.vinExtension ?? "\0"
+  };
   for (let index = 0; index < 15; index++) {
-    const tyresCount = tcVehicle.axles && tcVehicle.axles[index]?.tyresCount;
-    if (tyresCount === 2) {
-      let value = vehicleLayoutAxleTypes.twoTyresAxle;
+    const resultKey = Object.keys(result)[index];
+    const tyreCount = tcVehicle.axles[index]?.tyresCount;
+    if (tyreCount === 2) {
       if (spareTyresCount) {
-        value = vehicleLayoutAxleTypes.twoTyresAxleSpare;
+        result[resultKey] = vehicleLayoutAxleTypes.twoTyresAxleSpare;
         spareTyresCount -= 1;
+      } else {
+        result[resultKey] = vehicleLayoutAxleTypes.twoTyresAxle;
       }
-      layout = [...layout, ...value];
       continue;
     }
-    if (tyresCount === 4) {
-      let value = vehicleLayoutAxleTypes.fourTyresAxle;
+    if (tyreCount === 4) {
       if (spareTyresCount) {
-        value = vehicleLayoutAxleTypes.fourTyresAxleSpare;
+        result[resultKey] = vehicleLayoutAxleTypes.fourTyresAxleSpare;
         spareTyresCount -= 1;
+      } else {
+        result[resultKey] = vehicleLayoutAxleTypes.fourTyresAxle;
       }
-      layout = [...layout, ...value];
       continue;
     }
-    layout = [...layout, ...vehicleLayoutAxleTypes.noAxle];
-  }
-  let vin = tcVehicle.vin ? tcVehicle.vin.split("").map((x) => x.charCodeAt(0)) : [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
-  if (vin.length !== 17) {
-    throw new Error(`Incorrect VIN length: ${vin}`);
-  }
-  if (bridgeTools.isVersionGreaterThan(deviceId, "1.0.2")) {
-    vin = [...vin, 0];
+    result[resultKey] = vehicleLayoutAxleTypes.noAxle;
   }
-  await bridgeCommands.setVehicleLayout(deviceId, [...layout, ...vin]);
+  await bridgeCommands.setVehicleLayout(deviceId, result);
 }
 async function getConfiguration(deviceId) {
   const customerCANSettings = await bridgeCommands.getCustomerCANSettings(deviceId);
@@ -2581,9 +2624,8 @@ async function getVehicle(deviceId) {
 }
 async function assignAxles(deviceId, tcVehicle) {
   const result = await bridgeCommands.getVehicleLayout(deviceId);
-  const data = result.map((x) => bridgeTools.decimalToHex(x));
-  const joinedData = Array.from({ length: data.length / 2 }, (_2, index) => data[2 * index + 1] + data[2 * index]);
-  const activeAxles = joinedData.slice(0, 15).filter((x) => Number(`0x${x}`));
+  tcVehicle.vinExtension = result.vinExtension;
+  const activeAxles = Object.values(result).slice(0, 15).filter((a) => Number.parseInt(a, 16));
   const axlesPressureData = (await bridgeCommands.getAxlesPressure(deviceId)).data;
   let axleTypesBytes;
   if (bridgeTools.isVersionGreaterThan(deviceId, "0.9.7")) {
@@ -2657,10 +2699,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 +2761,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.98",
   "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",