tirecheck-device-sdk 0.1.993 → 0.1.995

package/dist/index.cjs

@@ -37,6 +37,7 @@ function setBleImplementation(bleImplementation) {
 
 const store = {
   platform: "android",
+  securityKeys: {},
   /** Defines access level for each connection, should be 'driver' as default, Supported roles: ['manufacturer', 'driver'] , Example: F4B4553322: 'manufacturer' */
   deviceAccessLevel: {},
   devices: {},
@@ -84,8 +85,9 @@ function waitUntil(callback, timeout = 5e3) {
   });
 }
 function canCommunicateWith(deviceId) {
+  const device = store.devices[deviceId];
   const state = store.deviceState[deviceId];
-  if (!state) return false;
+  if (!device || !state) return false;
   return ["connected", "paired"].includes(state);
 }
 function getPositionId(axlePosition, tyrePosition, axleTyresCount, isSpare) {
@@ -619,7 +621,7 @@ 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 = 1; attempt <= 3; attempt++) {
+  for (let attempt = 1; attempt <= 5; attempt++) {
     try {
       connectedDevice = await withTimeout(connectInner(deviceId, disconnectCallback), 2e4);
       const _deviceId = store.deviceIdMapingTable[deviceId] ?? deviceId;
@@ -631,7 +633,7 @@ async function connect$1(deviceId, disconnectCallback) {
       }
     } catch (e) {
       console.warn(`${attempt} connect fail`, e);
-      if (attempt === 3) {
+      if (attempt === 5) {
         store.setState(deviceId, void 0, "failedConnection");
         throw new Error("Connection unsuccessful");
       }
@@ -656,8 +658,12 @@ async function disconnect$1(deviceId) {
   for (let attempts = 0; attempts < 3; attempts++) {
     const _deviceId = store.deviceIdMapingTable[deviceId] ?? deviceId;
     await withTimeout(ble.disconnect(_deviceId), 1e3, "Disconnect timed out");
-    const isConnected = await ble.isConnected(_deviceId);
-    if (!isConnected) return;
+    try {
+      const isConnected = await withTimeout(ble.isConnected(_deviceId), 1e3, "IsConnected timed out");
+      if (!isConnected) return;
+    } catch (e) {
+      console.warn("IsConnected error: ", e);
+    }
   }
   store.setState(deviceId, void 0, "failedDisconnection");
   throw new Error("Disconnect unsuccessful");
@@ -1405,105 +1411,6 @@ const bridgeCommandStructures = {
   }
 };
 
-const signature_keys = {
-  0: [
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 31],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 47],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 63],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 79],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 95],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 111],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 127],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 143],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 159],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 175],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 191],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 207],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 223],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 239],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 255]
-  ],
-  1: [
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 31],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 47],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 63],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 79],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 95],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 111],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 127],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 143],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 159],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 175],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 191],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 207],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 223],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 239],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 255]
-  ],
-  2: [
-    [121, 114, 34, 71, 3, 133, 92, 108, 162, 173, 161, 168, 164, 148, 34, 139],
-    [136, 120, 146, 44, 228, 28, 205, 63, 205, 120, 170, 120, 251, 245, 227, 154],
-    [37, 22, 60, 132, 154, 66, 59, 185, 36, 142, 163, 103, 39, 121, 227, 209],
-    [15, 30, 54, 173, 21, 127, 65, 158, 168, 84, 192, 17, 51, 3, 90, 173],
-    [136, 165, 72, 127, 72, 38, 200, 5, 4, 187, 203, 29, 6, 82, 130, 39],
-    [106, 95, 111, 82, 191, 213, 104, 194, 106, 30, 199, 250, 69, 223, 79, 250],
-    [150, 63, 177, 61, 50, 182, 227, 53, 157, 168, 245, 96, 90, 212, 17, 132],
-    [233, 159, 182, 205, 3, 216, 203, 73, 193, 142, 183, 16, 22, 208, 38, 143],
-    [7, 45, 239, 102, 47, 8, 237, 115, 77, 232, 2, 167, 47, 65, 164, 251],
-    [7, 159, 18, 71, 3, 132, 84, 47, 60, 167, 134, 251, 114, 207, 254, 190],
-    [203, 129, 34, 153, 32, 169, 153, 45, 215, 172, 76, 214, 5, 21, 210, 65],
-    [29, 194, 255, 4, 195, 144, 178, 174, 255, 66, 15, 19, 26, 212, 61, 251],
-    [42, 13, 136, 252, 143, 234, 120, 242, 164, 36, 21, 135, 252, 145, 101, 124],
-    [24, 24, 207, 236, 159, 24, 180, 141, 80, 119, 86, 239, 192, 32, 51, 34],
-    [187, 89, 217, 2, 16, 125, 121, 46, 159, 66, 85, 169, 9, 155, 2, 178],
-    [212, 230, 71, 216, 35, 20, 241, 0, 204, 163, 80, 198, 132, 210, 166, 173]
-  ],
-  16: [
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 31],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 47],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 63],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 79],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 95],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 111],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 127],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 143],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 159],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 175],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 191],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 207],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 223],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 239],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 255]
-  ],
-  17: [
-    [75, 40, 61, 20, 254, 102, 105, 160, 44, 236, 79, 39, 84, 27, 235, 100],
-    [185, 139, 202, 38, 158, 109, 211, 6, 38, 73, 28, 120, 208, 168, 159, 108],
-    [252, 100, 192, 127, 135, 127, 228, 125, 190, 210, 248, 146, 45, 229, 218, 159],
-    [217, 39, 58, 200, 22, 212, 105, 55, 15, 45, 82, 96, 216, 134, 69, 123],
-    [192, 34, 199, 199, 200, 112, 61, 98, 174, 62, 7, 200, 149, 168, 175, 110],
-    [60, 41, 125, 116, 134, 191, 241, 188, 171, 127, 209, 10, 114, 52, 120, 164],
-    [255, 19, 220, 184, 141, 224, 242, 117, 230, 143, 20, 75, 44, 50, 70, 113],
-    [55, 112, 171, 176, 239, 50, 111, 3, 175, 145, 123, 38, 12, 44, 18, 79],
-    [211, 119, 219, 6, 27, 41, 170, 199, 206, 66, 89, 89, 154, 128, 110, 70],
-    [187, 184, 42, 154, 108, 182, 238, 223, 192, 10, 144, 139, 130, 22, 220, 66],
-    [91, 248, 195, 246, 212, 104, 246, 252, 231, 120, 153, 211, 39, 250, 221, 133],
-    [184, 148, 72, 207, 106, 143, 21, 239, 133, 206, 1, 234, 1, 75, 92, 43],
-    [46, 35, 117, 127, 103, 37, 155, 16, 177, 106, 195, 129, 168, 235, 159, 162],
-    [0, 7, 114, 77, 77, 66, 224, 223, 92, 193, 241, 44, 242, 104, 67, 163],
-    [116, 194, 13, 179, 75, 181, 245, 211, 19, 38, 45, 21, 36, 163, 252, 235],
-    [6, 211, 31, 66, 81, 221, 137, 33, 23, 18, 160, 147, 159, 34, 121, 125]
-  ]
-};
-const pinKeys = {
-  0: "00000000000000010000000000000002",
-  1: "00000000000000010000000000000002",
-  2: "B2D24304FC345F1418EB96835B3B7AE8",
-  16: "00000000000000010000000000000002",
-  17: "CB5A6AA23FD565A141C5CE5ABF209000"
-};
 const bridgeSecurity = {
   getSignedCommand(device, command) {
     const { randomAdvNumber, configVersion } = device?.advertisingData || {};
@@ -1520,7 +1427,8 @@ const bridgeSecurity = {
       const r = command.length % 16;
       paddedCommand = bridgeTools.pkcs(command, r ? ++t * 16 : t * 16);
     }
-    const key = signature_keys[configVersion][keyIndex];
+    if (!store.securityKeys?.bridge?.signatureKeys?.[configVersion]) throw new Error("No signature key found");
+    const key = store.securityKeys.bridge.signatureKeys[configVersion][keyIndex];
     const startArray = key.slice(keyShift);
     const endArray = key.slice(0, keyShift);
     const shiftedKey = startArray.concat(endArray).map((n) => bridgeTools.decimalToHex(n)).join("");
@@ -1557,13 +1465,14 @@ const bridgeSecurity = {
   },
   async getPin(deviceId) {
     const deviceData = store.devices[deviceId];
-    if (deviceData?.type !== "bridge") throw new Error("Device data missing");
+    if (deviceData?.type !== "bridge") throw new Error("Device data missing 1 ");
     const { randomAdvNumber, macAddress, configVersion } = deviceData.advertisingData || {};
     if (!randomAdvNumber || !macAddress || !___default.isNumber(configVersion)) throw new Error("Cannot compute pin");
     const mac = macAddress.map((n) => bridgeTools.decimalToHex(n)).join("");
     const rand = randomAdvNumber.map((n) => bridgeTools.decimalToHex(n)).join("");
     const message = `${mac}0000${rand}`;
-    const key = pinKeys[configVersion];
+    if (!store.securityKeys?.bridge?.pinKeys?.[configVersion]) throw new Error("No pin key found");
+    const key = store.securityKeys?.bridge?.pinKeys[configVersion];
     const res = await this.aesToCrc32(message, key);
     return res;
   },
@@ -1827,6 +1736,7 @@ const bridgeCommands = {
     return this.promisify(deviceData, [...this.getCommandHeader(deviceData), 18, commandIds.pin, 0, ...pin]);
   },
   async setBridgeToRestart(deviceId) {
+    if (store.bridgeRebootRequired[deviceId]) return;
     const deviceData = await bridgeTools.getBridgeFromStore(deviceId);
     const useNewCommand = (deviceData.advertisingData.fwVersion || "") > "0.9.7";
     await this.promisify(deviceData, [
@@ -1845,24 +1755,6 @@ const bridgeCommands = {
     );
     return await this.writeCommand(deviceData, commandIds.writeData, subCommandIds.customerCanSettings, payload);
   },
-  async getCustomerCrcSettings(deviceId) {
-    const result = await this.readCrcCommand(deviceId, subCommandIds.customerCanSettings);
-    let factorySettings = false;
-    if (!result?.length || result.every((n) => n === 0)) factorySettings = true;
-    return factorySettings;
-  },
-  async readCrcCommand(deviceId, subCommandId) {
-    const deviceData = bridgeTools.getBridgeFromStore(deviceId);
-    const commandLength = 2;
-    const result = await this.promisify(deviceData, [
-      ...this.getCommandHeader(deviceData),
-      commandLength,
-      commandIds.readData,
-      subCommandId
-    ]);
-    const crc = result.slice(result.length - 8, result.length - 4);
-    return crc;
-  },
   async setWorkshopCANSettings(deviceId, structurizedPayload) {
     const deviceData = bridgeTools.getBridgeFromStore(deviceId);
     const payload = bridgeTools.convertStructureToBytes(
@@ -2132,7 +2024,7 @@ 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 spareTyresCount = Math.min(spareTyres?.length || 0, 2);
   const result = {
     axle01: "0000",
     axle02: "0000",
@@ -2492,7 +2384,7 @@ async function getAutolearnStatuses(deviceId, tcVehicle) {
   return autolearnedStatuses;
 }
 function getAutolearnStatusName(statusId) {
-  if (["2", "A"].includes(statusId)) {
+  if (["2", "A"].includes(statusId.toUpperCase())) {
     return "error";
   }
   if (statusId === "4") {
@@ -2504,7 +2396,7 @@ function getAutolearnStatusName(statusId) {
   if (statusId === "0") {
     return "default";
   }
-  throw new Error("Unknown autolearn status");
+  throw new Error(`Unknown autolearn status: ${statusId}`);
 }
 async function resetAutolearnStatuses(deviceId, positionIds) {
   if (!bridgeTools.isVersionGreaterThan(deviceId, "0.9.7"))
@@ -3323,10 +3215,13 @@ function ensureSimulatorMethodsAreInjected() {
       advertisingInterval = void 0;
     }
     let previousDevices = store.simulatedDevices;
-    advertisingInterval = toolsSvc.setIntervalImmediate(() => {
+    advertisingInterval = toolsSvc.setIntervalImmediate(async () => {
       for (const key in store.simulatedDevices) {
         const d = store.simulatedDevices[key];
-        if (d.isDisabled) continue;
+        if (d.isDisabled) {
+          if (store.deviceState[key] === "paired") await bridgeSimulator.disconnect(key);
+          continue;
+        }
         unreachableSvc.refresh(d.id, deviceUnreachableCallback);
         deviceAdvertisingCallback?.(store.simulatedDevices[key]);
       }
@@ -3372,9 +3267,10 @@ class BridgeTcVehicleAxle {
   minTargetPressure;
 }
 
-function createTirecheckDeviceSdk(platform, bleImplementation) {
+function createTirecheckDeviceSdk(platform, bleImplementation, securityKeys) {
   store.platform = platform;
   bleImplementation = bleImplementation || emptyBleImplementation;
+  store.securityKeys = securityKeys || {};
   setBleImplementation(bleImplementation);
   return {
     /** Generic methods common for all devices */

package/dist/index.d.cts

@@ -813,6 +813,16 @@ interface BleBridgeAdvertisingData {
     configVersion: number;
     timeFromStart?: number;
 }
+interface BleSecurityKeys {
+    bridge?: {
+        signatureKeys: {
+            [index: number]: number[][];
+        };
+        pinKeys: {
+            [index: number]: string;
+        };
+    };
+}
 type Wrapper<T extends Record<string, (...args: any) => any>> = {
     [K in keyof T]: (...args: [next: (...paramsOverride: any[]) => ReturnType<T[K]>, ...Parameters<T[K]>]) => ReturnType<T[K]>;
 };
@@ -830,7 +840,7 @@ type EventName = keyof EventHandlers;
 /** Creates instance of SDK.
  * For real usage, `bleImplementation` argument must be provided - it's an object that follows method definitions from `cordova-plugin-bluetooth-central`.
  * If `bleImplementation` is not provided, SDK will work only with the simulator. */
-declare function createTirecheckDeviceSdk(platform: DevicePlatform, bleImplementation?: BleImplementation): {
+declare function createTirecheckDeviceSdk(platform: DevicePlatform, bleImplementation?: BleImplementation, securityKeys?: BleSecurityKeys): {
     /** Generic methods common for all devices */
     bluetooth: {
         onDeviceAdvertising(callback: (device: BleDevice) => void): void;
@@ -890,4 +900,4 @@ declare function createTirecheckDeviceSdk(platform: DevicePlatform, bleImplement
     };
 };
 
-export { type BleBridge, type BleBridgeAdvertisingData, type BleBridgeOta, type BleBridgeSimulated, type BleDevice, type BleDeviceBase, type BleDeviceSimulated, type BleDeviceStatus, type BleDeviceType, type BleFlexiGaugeTpms, type BleFlexiGaugeTpmsSimulated, type BlePressureStick, type BridgeAccessLevel, type BridgeAutolearnStatus, type BridgeCommandStructure, type BridgeCommandStructureProperties, type BridgeCommandStructurized, type BridgeConfiguration, type BridgeReading, type BridgeTcIssue, type BridgeTcTyre, type BridgeTcVehicle, BridgeTcVehicleAxle, type DeepPartial, type DevicePlatform, type DeviceState, type EventHandlers, type EventName, type FgSensorReading, type PositionInfo, type ReportStatusFn, type Simulator, type StateReason, type Wrapper, createTirecheckDeviceSdk };
+export { type BleBridge, type BleBridgeAdvertisingData, type BleBridgeOta, type BleBridgeSimulated, type BleDevice, type BleDeviceBase, type BleDeviceSimulated, type BleDeviceStatus, type BleDeviceType, type BleFlexiGaugeTpms, type BleFlexiGaugeTpmsSimulated, type BlePressureStick, type BleSecurityKeys, type BridgeAccessLevel, type BridgeAutolearnStatus, type BridgeCommandStructure, type BridgeCommandStructureProperties, type BridgeCommandStructurized, type BridgeConfiguration, type BridgeReading, type BridgeTcIssue, type BridgeTcTyre, type BridgeTcVehicle, BridgeTcVehicleAxle, type DeepPartial, type DevicePlatform, type DeviceState, type EventHandlers, type EventName, type FgSensorReading, type PositionInfo, type ReportStatusFn, type Simulator, type StateReason, type Wrapper, createTirecheckDeviceSdk };

package/dist/index.d.mts

@@ -813,6 +813,16 @@ interface BleBridgeAdvertisingData {
     configVersion: number;
     timeFromStart?: number;
 }
+interface BleSecurityKeys {
+    bridge?: {
+        signatureKeys: {
+            [index: number]: number[][];
+        };
+        pinKeys: {
+            [index: number]: string;
+        };
+    };
+}
 type Wrapper<T extends Record<string, (...args: any) => any>> = {
     [K in keyof T]: (...args: [next: (...paramsOverride: any[]) => ReturnType<T[K]>, ...Parameters<T[K]>]) => ReturnType<T[K]>;
 };
@@ -830,7 +840,7 @@ type EventName = keyof EventHandlers;
 /** Creates instance of SDK.
  * For real usage, `bleImplementation` argument must be provided - it's an object that follows method definitions from `cordova-plugin-bluetooth-central`.
  * If `bleImplementation` is not provided, SDK will work only with the simulator. */
-declare function createTirecheckDeviceSdk(platform: DevicePlatform, bleImplementation?: BleImplementation): {
+declare function createTirecheckDeviceSdk(platform: DevicePlatform, bleImplementation?: BleImplementation, securityKeys?: BleSecurityKeys): {
     /** Generic methods common for all devices */
     bluetooth: {
         onDeviceAdvertising(callback: (device: BleDevice) => void): void;
@@ -890,4 +900,4 @@ declare function createTirecheckDeviceSdk(platform: DevicePlatform, bleImplement
     };
 };
 
-export { type BleBridge, type BleBridgeAdvertisingData, type BleBridgeOta, type BleBridgeSimulated, type BleDevice, type BleDeviceBase, type BleDeviceSimulated, type BleDeviceStatus, type BleDeviceType, type BleFlexiGaugeTpms, type BleFlexiGaugeTpmsSimulated, type BlePressureStick, type BridgeAccessLevel, type BridgeAutolearnStatus, type BridgeCommandStructure, type BridgeCommandStructureProperties, type BridgeCommandStructurized, type BridgeConfiguration, type BridgeReading, type BridgeTcIssue, type BridgeTcTyre, type BridgeTcVehicle, BridgeTcVehicleAxle, type DeepPartial, type DevicePlatform, type DeviceState, type EventHandlers, type EventName, type FgSensorReading, type PositionInfo, type ReportStatusFn, type Simulator, type StateReason, type Wrapper, createTirecheckDeviceSdk };
+export { type BleBridge, type BleBridgeAdvertisingData, type BleBridgeOta, type BleBridgeSimulated, type BleDevice, type BleDeviceBase, type BleDeviceSimulated, type BleDeviceStatus, type BleDeviceType, type BleFlexiGaugeTpms, type BleFlexiGaugeTpmsSimulated, type BlePressureStick, type BleSecurityKeys, type BridgeAccessLevel, type BridgeAutolearnStatus, type BridgeCommandStructure, type BridgeCommandStructureProperties, type BridgeCommandStructurized, type BridgeConfiguration, type BridgeReading, type BridgeTcIssue, type BridgeTcTyre, type BridgeTcVehicle, BridgeTcVehicleAxle, type DeepPartial, type DevicePlatform, type DeviceState, type EventHandlers, type EventName, type FgSensorReading, type PositionInfo, type ReportStatusFn, type Simulator, type StateReason, type Wrapper, createTirecheckDeviceSdk };

package/dist/index.d.ts

@@ -813,6 +813,16 @@ interface BleBridgeAdvertisingData {
     configVersion: number;
     timeFromStart?: number;
 }
+interface BleSecurityKeys {
+    bridge?: {
+        signatureKeys: {
+            [index: number]: number[][];
+        };
+        pinKeys: {
+            [index: number]: string;
+        };
+    };
+}
 type Wrapper<T extends Record<string, (...args: any) => any>> = {
     [K in keyof T]: (...args: [next: (...paramsOverride: any[]) => ReturnType<T[K]>, ...Parameters<T[K]>]) => ReturnType<T[K]>;
 };
@@ -830,7 +840,7 @@ type EventName = keyof EventHandlers;
 /** Creates instance of SDK.
  * For real usage, `bleImplementation` argument must be provided - it's an object that follows method definitions from `cordova-plugin-bluetooth-central`.
  * If `bleImplementation` is not provided, SDK will work only with the simulator. */
-declare function createTirecheckDeviceSdk(platform: DevicePlatform, bleImplementation?: BleImplementation): {
+declare function createTirecheckDeviceSdk(platform: DevicePlatform, bleImplementation?: BleImplementation, securityKeys?: BleSecurityKeys): {
     /** Generic methods common for all devices */
     bluetooth: {
         onDeviceAdvertising(callback: (device: BleDevice) => void): void;
@@ -890,4 +900,4 @@ declare function createTirecheckDeviceSdk(platform: DevicePlatform, bleImplement
     };
 };
 
-export { type BleBridge, type BleBridgeAdvertisingData, type BleBridgeOta, type BleBridgeSimulated, type BleDevice, type BleDeviceBase, type BleDeviceSimulated, type BleDeviceStatus, type BleDeviceType, type BleFlexiGaugeTpms, type BleFlexiGaugeTpmsSimulated, type BlePressureStick, type BridgeAccessLevel, type BridgeAutolearnStatus, type BridgeCommandStructure, type BridgeCommandStructureProperties, type BridgeCommandStructurized, type BridgeConfiguration, type BridgeReading, type BridgeTcIssue, type BridgeTcTyre, type BridgeTcVehicle, BridgeTcVehicleAxle, type DeepPartial, type DevicePlatform, type DeviceState, type EventHandlers, type EventName, type FgSensorReading, type PositionInfo, type ReportStatusFn, type Simulator, type StateReason, type Wrapper, createTirecheckDeviceSdk };
+export { type BleBridge, type BleBridgeAdvertisingData, type BleBridgeOta, type BleBridgeSimulated, type BleDevice, type BleDeviceBase, type BleDeviceSimulated, type BleDeviceStatus, type BleDeviceType, type BleFlexiGaugeTpms, type BleFlexiGaugeTpmsSimulated, type BlePressureStick, type BleSecurityKeys, type BridgeAccessLevel, type BridgeAutolearnStatus, type BridgeCommandStructure, type BridgeCommandStructureProperties, type BridgeCommandStructurized, type BridgeConfiguration, type BridgeReading, type BridgeTcIssue, type BridgeTcTyre, type BridgeTcVehicle, BridgeTcVehicleAxle, type DeepPartial, type DevicePlatform, type DeviceState, type EventHandlers, type EventName, type FgSensorReading, type PositionInfo, type ReportStatusFn, type Simulator, type StateReason, type Wrapper, createTirecheckDeviceSdk };

package/dist/index.mjs

@@ -30,6 +30,7 @@ function setBleImplementation(bleImplementation) {
 
 const store = {
   platform: "android",
+  securityKeys: {},
   /** Defines access level for each connection, should be 'driver' as default, Supported roles: ['manufacturer', 'driver'] , Example: F4B4553322: 'manufacturer' */
   deviceAccessLevel: {},
   devices: {},
@@ -77,8 +78,9 @@ function waitUntil(callback, timeout = 5e3) {
   });
 }
 function canCommunicateWith(deviceId) {
+  const device = store.devices[deviceId];
   const state = store.deviceState[deviceId];
-  if (!state) return false;
+  if (!device || !state) return false;
   return ["connected", "paired"].includes(state);
 }
 function getPositionId(axlePosition, tyrePosition, axleTyresCount, isSpare) {
@@ -612,7 +614,7 @@ 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 = 1; attempt <= 3; attempt++) {
+  for (let attempt = 1; attempt <= 5; attempt++) {
     try {
       connectedDevice = await withTimeout(connectInner(deviceId, disconnectCallback), 2e4);
       const _deviceId = store.deviceIdMapingTable[deviceId] ?? deviceId;
@@ -624,7 +626,7 @@ async function connect$1(deviceId, disconnectCallback) {
       }
     } catch (e) {
       console.warn(`${attempt} connect fail`, e);
-      if (attempt === 3) {
+      if (attempt === 5) {
         store.setState(deviceId, void 0, "failedConnection");
         throw new Error("Connection unsuccessful");
       }
@@ -649,8 +651,12 @@ async function disconnect$1(deviceId) {
   for (let attempts = 0; attempts < 3; attempts++) {
     const _deviceId = store.deviceIdMapingTable[deviceId] ?? deviceId;
     await withTimeout(ble.disconnect(_deviceId), 1e3, "Disconnect timed out");
-    const isConnected = await ble.isConnected(_deviceId);
-    if (!isConnected) return;
+    try {
+      const isConnected = await withTimeout(ble.isConnected(_deviceId), 1e3, "IsConnected timed out");
+      if (!isConnected) return;
+    } catch (e) {
+      console.warn("IsConnected error: ", e);
+    }
   }
   store.setState(deviceId, void 0, "failedDisconnection");
   throw new Error("Disconnect unsuccessful");
@@ -1398,105 +1404,6 @@ const bridgeCommandStructures = {
   }
 };
 
-const signature_keys = {
-  0: [
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 31],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 47],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 63],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 79],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 95],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 111],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 127],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 143],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 159],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 175],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 191],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 207],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 223],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 239],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 255]
-  ],
-  1: [
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 31],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 47],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 63],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 79],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 95],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 111],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 127],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 143],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 159],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 175],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 191],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 207],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 223],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 239],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 255]
-  ],
-  2: [
-    [121, 114, 34, 71, 3, 133, 92, 108, 162, 173, 161, 168, 164, 148, 34, 139],
-    [136, 120, 146, 44, 228, 28, 205, 63, 205, 120, 170, 120, 251, 245, 227, 154],
-    [37, 22, 60, 132, 154, 66, 59, 185, 36, 142, 163, 103, 39, 121, 227, 209],
-    [15, 30, 54, 173, 21, 127, 65, 158, 168, 84, 192, 17, 51, 3, 90, 173],
-    [136, 165, 72, 127, 72, 38, 200, 5, 4, 187, 203, 29, 6, 82, 130, 39],
-    [106, 95, 111, 82, 191, 213, 104, 194, 106, 30, 199, 250, 69, 223, 79, 250],
-    [150, 63, 177, 61, 50, 182, 227, 53, 157, 168, 245, 96, 90, 212, 17, 132],
-    [233, 159, 182, 205, 3, 216, 203, 73, 193, 142, 183, 16, 22, 208, 38, 143],
-    [7, 45, 239, 102, 47, 8, 237, 115, 77, 232, 2, 167, 47, 65, 164, 251],
-    [7, 159, 18, 71, 3, 132, 84, 47, 60, 167, 134, 251, 114, 207, 254, 190],
-    [203, 129, 34, 153, 32, 169, 153, 45, 215, 172, 76, 214, 5, 21, 210, 65],
-    [29, 194, 255, 4, 195, 144, 178, 174, 255, 66, 15, 19, 26, 212, 61, 251],
-    [42, 13, 136, 252, 143, 234, 120, 242, 164, 36, 21, 135, 252, 145, 101, 124],
-    [24, 24, 207, 236, 159, 24, 180, 141, 80, 119, 86, 239, 192, 32, 51, 34],
-    [187, 89, 217, 2, 16, 125, 121, 46, 159, 66, 85, 169, 9, 155, 2, 178],
-    [212, 230, 71, 216, 35, 20, 241, 0, 204, 163, 80, 198, 132, 210, 166, 173]
-  ],
-  16: [
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 31],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 47],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 63],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 79],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 95],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 111],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 127],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 143],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 159],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 175],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 191],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 207],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 223],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 239],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 255]
-  ],
-  17: [
-    [75, 40, 61, 20, 254, 102, 105, 160, 44, 236, 79, 39, 84, 27, 235, 100],
-    [185, 139, 202, 38, 158, 109, 211, 6, 38, 73, 28, 120, 208, 168, 159, 108],
-    [252, 100, 192, 127, 135, 127, 228, 125, 190, 210, 248, 146, 45, 229, 218, 159],
-    [217, 39, 58, 200, 22, 212, 105, 55, 15, 45, 82, 96, 216, 134, 69, 123],
-    [192, 34, 199, 199, 200, 112, 61, 98, 174, 62, 7, 200, 149, 168, 175, 110],
-    [60, 41, 125, 116, 134, 191, 241, 188, 171, 127, 209, 10, 114, 52, 120, 164],
-    [255, 19, 220, 184, 141, 224, 242, 117, 230, 143, 20, 75, 44, 50, 70, 113],
-    [55, 112, 171, 176, 239, 50, 111, 3, 175, 145, 123, 38, 12, 44, 18, 79],
-    [211, 119, 219, 6, 27, 41, 170, 199, 206, 66, 89, 89, 154, 128, 110, 70],
-    [187, 184, 42, 154, 108, 182, 238, 223, 192, 10, 144, 139, 130, 22, 220, 66],
-    [91, 248, 195, 246, 212, 104, 246, 252, 231, 120, 153, 211, 39, 250, 221, 133],
-    [184, 148, 72, 207, 106, 143, 21, 239, 133, 206, 1, 234, 1, 75, 92, 43],
-    [46, 35, 117, 127, 103, 37, 155, 16, 177, 106, 195, 129, 168, 235, 159, 162],
-    [0, 7, 114, 77, 77, 66, 224, 223, 92, 193, 241, 44, 242, 104, 67, 163],
-    [116, 194, 13, 179, 75, 181, 245, 211, 19, 38, 45, 21, 36, 163, 252, 235],
-    [6, 211, 31, 66, 81, 221, 137, 33, 23, 18, 160, 147, 159, 34, 121, 125]
-  ]
-};
-const pinKeys = {
-  0: "00000000000000010000000000000002",
-  1: "00000000000000010000000000000002",
-  2: "B2D24304FC345F1418EB96835B3B7AE8",
-  16: "00000000000000010000000000000002",
-  17: "CB5A6AA23FD565A141C5CE5ABF209000"
-};
 const bridgeSecurity = {
   getSignedCommand(device, command) {
     const { randomAdvNumber, configVersion } = device?.advertisingData || {};
@@ -1513,7 +1420,8 @@ const bridgeSecurity = {
       const r = command.length % 16;
       paddedCommand = bridgeTools.pkcs(command, r ? ++t * 16 : t * 16);
     }
-    const key = signature_keys[configVersion][keyIndex];
+    if (!store.securityKeys?.bridge?.signatureKeys?.[configVersion]) throw new Error("No signature key found");
+    const key = store.securityKeys.bridge.signatureKeys[configVersion][keyIndex];
     const startArray = key.slice(keyShift);
     const endArray = key.slice(0, keyShift);
     const shiftedKey = startArray.concat(endArray).map((n) => bridgeTools.decimalToHex(n)).join("");
@@ -1550,13 +1458,14 @@ const bridgeSecurity = {
   },
   async getPin(deviceId) {
     const deviceData = store.devices[deviceId];
-    if (deviceData?.type !== "bridge") throw new Error("Device data missing");
+    if (deviceData?.type !== "bridge") throw new Error("Device data missing 1 ");
     const { randomAdvNumber, macAddress, configVersion } = deviceData.advertisingData || {};
     if (!randomAdvNumber || !macAddress || !_.isNumber(configVersion)) throw new Error("Cannot compute pin");
     const mac = macAddress.map((n) => bridgeTools.decimalToHex(n)).join("");
     const rand = randomAdvNumber.map((n) => bridgeTools.decimalToHex(n)).join("");
     const message = `${mac}0000${rand}`;
-    const key = pinKeys[configVersion];
+    if (!store.securityKeys?.bridge?.pinKeys?.[configVersion]) throw new Error("No pin key found");
+    const key = store.securityKeys?.bridge?.pinKeys[configVersion];
     const res = await this.aesToCrc32(message, key);
     return res;
   },
@@ -1820,6 +1729,7 @@ const bridgeCommands = {
     return this.promisify(deviceData, [...this.getCommandHeader(deviceData), 18, commandIds.pin, 0, ...pin]);
   },
   async setBridgeToRestart(deviceId) {
+    if (store.bridgeRebootRequired[deviceId]) return;
     const deviceData = await bridgeTools.getBridgeFromStore(deviceId);
     const useNewCommand = (deviceData.advertisingData.fwVersion || "") > "0.9.7";
     await this.promisify(deviceData, [
@@ -1838,24 +1748,6 @@ const bridgeCommands = {
     );
     return await this.writeCommand(deviceData, commandIds.writeData, subCommandIds.customerCanSettings, payload);
   },
-  async getCustomerCrcSettings(deviceId) {
-    const result = await this.readCrcCommand(deviceId, subCommandIds.customerCanSettings);
-    let factorySettings = false;
-    if (!result?.length || result.every((n) => n === 0)) factorySettings = true;
-    return factorySettings;
-  },
-  async readCrcCommand(deviceId, subCommandId) {
-    const deviceData = bridgeTools.getBridgeFromStore(deviceId);
-    const commandLength = 2;
-    const result = await this.promisify(deviceData, [
-      ...this.getCommandHeader(deviceData),
-      commandLength,
-      commandIds.readData,
-      subCommandId
-    ]);
-    const crc = result.slice(result.length - 8, result.length - 4);
-    return crc;
-  },
   async setWorkshopCANSettings(deviceId, structurizedPayload) {
     const deviceData = bridgeTools.getBridgeFromStore(deviceId);
     const payload = bridgeTools.convertStructureToBytes(
@@ -2125,7 +2017,7 @@ 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 spareTyresCount = Math.min(spareTyres?.length || 0, 2);
   const result = {
     axle01: "0000",
     axle02: "0000",
@@ -2485,7 +2377,7 @@ async function getAutolearnStatuses(deviceId, tcVehicle) {
   return autolearnedStatuses;
 }
 function getAutolearnStatusName(statusId) {
-  if (["2", "A"].includes(statusId)) {
+  if (["2", "A"].includes(statusId.toUpperCase())) {
     return "error";
   }
   if (statusId === "4") {
@@ -2497,7 +2389,7 @@ function getAutolearnStatusName(statusId) {
   if (statusId === "0") {
     return "default";
   }
-  throw new Error("Unknown autolearn status");
+  throw new Error(`Unknown autolearn status: ${statusId}`);
 }
 async function resetAutolearnStatuses(deviceId, positionIds) {
   if (!bridgeTools.isVersionGreaterThan(deviceId, "0.9.7"))
@@ -3316,10 +3208,13 @@ function ensureSimulatorMethodsAreInjected() {
       advertisingInterval = void 0;
     }
     let previousDevices = store.simulatedDevices;
-    advertisingInterval = toolsSvc.setIntervalImmediate(() => {
+    advertisingInterval = toolsSvc.setIntervalImmediate(async () => {
       for (const key in store.simulatedDevices) {
         const d = store.simulatedDevices[key];
-        if (d.isDisabled) continue;
+        if (d.isDisabled) {
+          if (store.deviceState[key] === "paired") await bridgeSimulator.disconnect(key);
+          continue;
+        }
         unreachableSvc.refresh(d.id, deviceUnreachableCallback);
         deviceAdvertisingCallback?.(store.simulatedDevices[key]);
       }
@@ -3365,9 +3260,10 @@ class BridgeTcVehicleAxle {
   minTargetPressure;
 }
 
-function createTirecheckDeviceSdk(platform, bleImplementation) {
+function createTirecheckDeviceSdk(platform, bleImplementation, securityKeys) {
   store.platform = platform;
   bleImplementation = bleImplementation || emptyBleImplementation;
+  store.securityKeys = securityKeys || {};
   setBleImplementation(bleImplementation);
   return {
     /** Generic methods common for all devices */

package/package.json

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