tirecheck-device-sdk 0.1.994 → 0.1.995

package/dist/index.cjs

@@ -85,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) {
@@ -657,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");
@@ -1422,8 +1427,8 @@ const bridgeSecurity = {
       const r = command.length % 16;
       paddedCommand = bridgeTools.pkcs(command, r ? ++t * 16 : t * 16);
     }
-    if (!store.securityKeys?.signatureKeys?.[configVersion]) throw new Error("No signature key found");
-    const key = store.securityKeys.signatureKeys[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("");
@@ -1466,8 +1471,8 @@ const bridgeSecurity = {
     const mac = macAddress.map((n) => bridgeTools.decimalToHex(n)).join("");
     const rand = randomAdvNumber.map((n) => bridgeTools.decimalToHex(n)).join("");
     const message = `${mac}0000${rand}`;
-    if (!store.securityKeys?.pinKeys?.[configVersion]) throw new Error("No pin key found");
-    const key = store.securityKeys.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;
   },
@@ -1731,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, [
@@ -1749,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(
@@ -3279,10 +3267,10 @@ class BridgeTcVehicleAxle {
   minTargetPressure;
 }
 
-function createTirecheckDeviceSdk(platform, securityKeys, bleImplementation) {
-  store.securityKeys = securityKeys;
+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

@@ -814,11 +814,13 @@ interface BleBridgeAdvertisingData {
     timeFromStart?: number;
 }
 interface BleSecurityKeys {
-    signatureKeys: {
-        [index: number]: number[][];
-    };
-    pinKeys: {
-        [index: number]: string;
+    bridge?: {
+        signatureKeys: {
+            [index: number]: number[][];
+        };
+        pinKeys: {
+            [index: number]: string;
+        };
     };
 }
 type Wrapper<T extends Record<string, (...args: any) => any>> = {
@@ -838,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, securityKeys: BleSecurityKeys, bleImplementation?: BleImplementation): {
+declare function createTirecheckDeviceSdk(platform: DevicePlatform, bleImplementation?: BleImplementation, securityKeys?: BleSecurityKeys): {
     /** Generic methods common for all devices */
     bluetooth: {
         onDeviceAdvertising(callback: (device: BleDevice) => void): void;

package/dist/index.d.mts

@@ -814,11 +814,13 @@ interface BleBridgeAdvertisingData {
     timeFromStart?: number;
 }
 interface BleSecurityKeys {
-    signatureKeys: {
-        [index: number]: number[][];
-    };
-    pinKeys: {
-        [index: number]: string;
+    bridge?: {
+        signatureKeys: {
+            [index: number]: number[][];
+        };
+        pinKeys: {
+            [index: number]: string;
+        };
     };
 }
 type Wrapper<T extends Record<string, (...args: any) => any>> = {
@@ -838,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, securityKeys: BleSecurityKeys, bleImplementation?: BleImplementation): {
+declare function createTirecheckDeviceSdk(platform: DevicePlatform, bleImplementation?: BleImplementation, securityKeys?: BleSecurityKeys): {
     /** Generic methods common for all devices */
     bluetooth: {
         onDeviceAdvertising(callback: (device: BleDevice) => void): void;

package/dist/index.d.ts

@@ -814,11 +814,13 @@ interface BleBridgeAdvertisingData {
     timeFromStart?: number;
 }
 interface BleSecurityKeys {
-    signatureKeys: {
-        [index: number]: number[][];
-    };
-    pinKeys: {
-        [index: number]: string;
+    bridge?: {
+        signatureKeys: {
+            [index: number]: number[][];
+        };
+        pinKeys: {
+            [index: number]: string;
+        };
     };
 }
 type Wrapper<T extends Record<string, (...args: any) => any>> = {
@@ -838,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, securityKeys: BleSecurityKeys, bleImplementation?: BleImplementation): {
+declare function createTirecheckDeviceSdk(platform: DevicePlatform, bleImplementation?: BleImplementation, securityKeys?: BleSecurityKeys): {
     /** Generic methods common for all devices */
     bluetooth: {
         onDeviceAdvertising(callback: (device: BleDevice) => void): void;

package/dist/index.mjs

@@ -78,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) {
@@ -650,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");
@@ -1415,8 +1420,8 @@ const bridgeSecurity = {
       const r = command.length % 16;
       paddedCommand = bridgeTools.pkcs(command, r ? ++t * 16 : t * 16);
     }
-    if (!store.securityKeys?.signatureKeys?.[configVersion]) throw new Error("No signature key found");
-    const key = store.securityKeys.signatureKeys[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("");
@@ -1459,8 +1464,8 @@ const bridgeSecurity = {
     const mac = macAddress.map((n) => bridgeTools.decimalToHex(n)).join("");
     const rand = randomAdvNumber.map((n) => bridgeTools.decimalToHex(n)).join("");
     const message = `${mac}0000${rand}`;
-    if (!store.securityKeys?.pinKeys?.[configVersion]) throw new Error("No pin key found");
-    const key = store.securityKeys.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;
   },
@@ -1724,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, [
@@ -1742,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(
@@ -3272,10 +3260,10 @@ class BridgeTcVehicleAxle {
   minTargetPressure;
 }
 
-function createTirecheckDeviceSdk(platform, securityKeys, bleImplementation) {
-  store.securityKeys = securityKeys;
+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.994",
+  "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",