tirecheck-device-sdk 0.1.95 → 0.1.97

package/dist/index.cjs

@@ -341,8 +341,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 +379,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;
 }
@@ -520,28 +521,21 @@ const deviceMeta = {
     },
     reconnect: true
     // Do we need it here?
+  },
+  pressureStick: {
+    nameRegex: /Pressure Stick.*/,
+    communication: {
+      serviceId: "4880c12c-fdcb-4077-8920-a450d7f9b907",
+      characteristicId: "fec26ec4-6d71-4442-9f81-55bc21d658d6"
+    },
+    getDeviceInfoFromAdvertising: (device) => {
+      const bleDevice = {
+        ...device,
+        type: "pressureStick"
+      };
+      return bleDevice;
+    }
   }
-  // pressureStick: {
-  //   nameRegex: /Pressure Stick.*/,
-  //   characteristic: {
-  //     serviceId: '4880c12c-fdcb-4077-8920-a450d7f9b907',
-  //     characteristicId: 'fec26ec4-6d71-4442-9f81-55bc21d658d6',
-  //   },
-  //   getDeviceInfoFromAdvertising: () => {},
-  //   capabilities: [
-  //     {
-  //       id: 'pressure',
-  //       // processFn: processPressure,
-  //       regex: /P([0-9.]+)mBar/,
-  //     },
-  //     // only pressure is needed for initial implementation, uncomment tpms functionality when needed
-  //     // {
-  //     //   id: 'tpms',
-  //     //   processFn: processTpms,
-  //     //   regex: /^\*TPMS/,
-  //     // },
-  //   ],
-  // },
 };
 
 const checkUnreachableDevicesTimeouts = {};
@@ -596,12 +590,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) {
@@ -1729,7 +1727,7 @@ const subCommandIds = {
 };
 ___default.invert(commandIds);
 ___default.invert(subCommandIds);
-let keepAliveTimer;
+const keepAliveTimer = {};
 const bridgeCommands = {
   getCommandHeader(device) {
     const accessLevel = store.deviceAccessLevel[device.id];
@@ -2040,11 +2038,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);
@@ -2671,10 +2669,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(
@@ -2733,12 +2731,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);
@@ -2752,11 +2749,13 @@ const simulatorSvc = {
   registerEvent(eventName, callback) {
     callbacks[eventName] = callback;
   },
-  triggerEvent(eventName, deviceId) {
-    const simulatedDevice = store.simulatedDevices[deviceId];
-    if (!simulatedDevice) throw new Error(`Device not found`);
-    const payload = simulatedDevice.simulatorData?.events?.[eventName];
-    if (!payload) throw new Error(`Event not found`);
+  triggerEvent(eventName, deviceId, payload) {
+    if (payload === void 0) {
+      const simulatedDevice = store.simulatedDevices[deviceId];
+      if (!simulatedDevice) throw new Error(`Device not found`);
+      payload = simulatedDevice.simulatorData?.events?.[eventName];
+      if (!payload) throw new Error(`Event not found`);
+    }
     const callback = callbacks[eventName];
     if (!callback) {
       console.warn(`Event ${eventName} not registered`);
@@ -2795,10 +2794,7 @@ async function getBattery(deviceId) {
 }
 
 let sensorReadings = [];
-let treadDepthCallback;
-let buttonCallback;
-let tpmsCallback;
-const capabilities = [
+const capabilities$1 = [
   {
     id: "td",
     processFn: processTreadDepth,
@@ -2835,7 +2831,7 @@ const flexiGaugeTpmsService = {
   processMessage(deviceId, message) {
     const numberArray = Array.from(new Uint8Array(message));
     const stringFromBytes = String.fromCharCode.apply(null, numberArray).replace("\r\n", "");
-    for (const capability of capabilities) {
+    for (const capability of capabilities$1) {
       if (capability.regex.test(stringFromBytes)) {
         return capability.processFn(deviceId, stringFromBytes);
       }
@@ -2845,12 +2841,12 @@ const flexiGaugeTpmsService = {
 function processTreadDepth(deviceId, value) {
   const treadDepth = value.match(/\d+/)?.[0];
   const convertedValue = Number(treadDepth) / 1e3;
-  treadDepthCallback(deviceId, convertedValue);
+  simulatorSvc.triggerEvent("fg:treadDepth", deviceId, convertedValue);
 }
 function processButtonPress(deviceId, value) {
   const buttonName = value.match(/\*(.)/);
   if (!buttonName || !buttonName[1]) throw new Error("Unrecognized button");
-  buttonCallback(deviceId, buttonName[1]);
+  simulatorSvc.triggerEvent("fg:button", deviceId, buttonName[1]);
 }
 function processTpms(deviceId, value) {
   const groupedValue = value.split(" ");
@@ -2870,12 +2866,13 @@ function processTpms(deviceId, value) {
   }
   if (type === "ENDSCANNING") {
     if (!sensorReadings.length) {
-      tpmsCallback(deviceId, void 0);
+      simulatorSvc.triggerEvent("fg:tpms", deviceId, null);
+      return;
     }
     const strongestReading = sensorReadings.reduce((accumulator, currentReading) => {
       return Number(currentReading.Rssi) > Number(accumulator.Rssi) ? currentReading : accumulator;
     }, sensorReadings[0]);
-    tpmsCallback(deviceId, strongestReading);
+    simulatorSvc.triggerEvent("fg:tpms", deviceId, strongestReading);
   }
 }
 
@@ -2904,6 +2901,55 @@ const flexiGaugeTpms = {
   startTpmsScan: flexiGaugeTpmsService.startTpmsScan
 };
 
+const capabilities = [
+  {
+    id: "pressure",
+    processFn: processPressure,
+    regex: /P([0-9.]+)mBar/
+  }
+];
+const pressureStickService = {
+  onPressure(callback) {
+    simulatorSvc.registerEvent("ps:pressure", callback);
+  },
+  processMessage(deviceId, message) {
+    const numberArray = Array.from(new Uint8Array(message));
+    const stringFromBytes = String.fromCharCode.apply(null, numberArray).replace("\r\n", "");
+    for (const capability of capabilities) {
+      if (capability.regex.test(stringFromBytes)) {
+        return capability.processFn(deviceId, stringFromBytes);
+      }
+    }
+  }
+};
+function processPressure(deviceId, msg) {
+  const match = /P([0-9.]+)mBar/i.exec(msg);
+  if (!match) throw new Error("Incorrect pressure message");
+  const pressure = Number(match[1]) / 1e3;
+  simulatorSvc.triggerEvent("ps:pressure", deviceId, pressure);
+}
+
+const pressureStick = {
+  async connect(deviceId) {
+    const psMeta = deviceMeta.pressureStick;
+    await bluetooth.connect(deviceId, this.disconnect);
+    await ble.startNotification(
+      deviceId,
+      psMeta.communication.serviceId,
+      psMeta.communication.characteristicId,
+      (notification) => pressureStickService.processMessage(deviceId, notification),
+      (error) => console.warn("ble.startNotification error", error)
+    );
+    store.setState(deviceId, "paired");
+  },
+  async disconnect(deviceId, reason) {
+    store.setState(deviceId, "disconnecting");
+    await bluetooth.disconnect(deviceId);
+    store.setState(deviceId, void 0, reason ?? "manualDisconnection");
+  },
+  onPressure: pressureStickService.onPressure
+};
+
 const bridgeSimulator = {
   isRebootRequired(deviceId) {
     return store.bridgeRebootRequired[deviceId];
@@ -3277,6 +3323,8 @@ function createTirecheckDeviceSdk(platform, bleImplementation) {
     bridgeOta,
     /** Methods for working with Tirecheck TPMS FlexiGauge */
     flexiGaugeTpms,
+    /** Methods for working with Tirecheck Pressure Stick */
+    pressureStick,
     /** Allows simulating devices without actually using bluetooth */
     simulator
   };

package/dist/index.d.cts

@@ -83,6 +83,14 @@ declare const _default$1: {
         getDeviceInfoFromAdvertising: (device: PeripheralData) => BleFlexiGaugeTpms;
         reconnect: boolean;
     };
+    pressureStick: {
+        nameRegex: RegExp;
+        communication: {
+            serviceId: string;
+            characteristicId: string;
+        };
+        getDeviceInfoFromAdvertising: (device: PeripheralData) => BlePressureStick;
+    };
 };
 
 declare const _default: {
@@ -734,7 +742,7 @@ type BridgeCommandStructurized<T extends BridgeCommandStructureProperties> = {
 };
 type BleDeviceType = keyof typeof _default$1;
 /** distinguish by type, e.g. `if (device.type === 'bridge')`, to access furhter fields */
-type BleDevice = BleBridge | BleBridgeOta | BleFlexiGaugeTpms;
+type BleDevice = BleBridge | BleBridgeOta | BleFlexiGaugeTpms | BlePressureStick;
 type BleDeviceSimulated = BleBridgeSimulated | BleFlexiGaugeTpmsSimulated;
 type BleDeviceStatus = 'connected' | 'connecting' | 'disconnecting' | undefined;
 interface BleDeviceBase {
@@ -764,6 +772,9 @@ interface BleBridgeOta extends BleDeviceBase {
     };
     type: 'bridgeOta';
 }
+interface BlePressureStick extends BleDeviceBase {
+    type: 'pressureStick';
+}
 interface BleBridgeSimulated extends BleBridge {
     isDisabled?: boolean;
     simulatorData: {
@@ -814,6 +825,7 @@ interface EventHandlers {
     'fg:treadDepth'?: (deviceId: string, value: number) => void;
     'fg:button'?: (deviceId: string, value: string) => void;
     'fg:tpms'?: (deviceId: string, value: FgSensorReading | undefined) => void;
+    'ps:pressure'?: (deviceId: string, value: number) => void;
 }
 type EventName = keyof EventHandlers;
 
@@ -864,14 +876,20 @@ declare function createTirecheckDeviceSdk(platform: DevicePlatform, bleImplement
         getBattery: (deviceId: string) => Promise<number>;
         startTpmsScan: (deviceId: string) => void;
     };
+    /** Methods for working with Tirecheck Pressure Stick */
+    pressureStick: {
+        connect(deviceId: string): Promise<void>;
+        disconnect(deviceId: string, reason?: StateReason): Promise<void>;
+        onPressure: (callback: (deviceId: string, value: number) => void) => void;
+    };
     /** Allows simulating devices without actually using bluetooth */
     simulator: {
         putSimulatedDevices(devices: Record<string, DeepPartial<BleDeviceSimulated>>): Record<string, BleDeviceSimulated>;
         putSimulatedDevice(device: DeepPartial<BleDeviceSimulated>): BleBridgeSimulated | BleFlexiGaugeTpmsSimulated;
         deleteSimulatedDevice(deviceId: string): void;
         getSimulatedDevices(): Record<string, BleDeviceSimulated>;
-        triggerEvent: (eventName: EventName, deviceId: string) => void;
+        triggerEvent: (eventName: EventName, deviceId: string, payload?: any) => void;
     };
 };
 
-export { type BleBridge, type BleBridgeAdvertisingData, type BleBridgeOta, type BleBridgeSimulated, type BleDevice, type BleDeviceBase, type BleDeviceSimulated, type BleDeviceStatus, type BleDeviceType, type BleFlexiGaugeTpms, type BleFlexiGaugeTpmsSimulated, 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 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

@@ -83,6 +83,14 @@ declare const _default$1: {
         getDeviceInfoFromAdvertising: (device: PeripheralData) => BleFlexiGaugeTpms;
         reconnect: boolean;
     };
+    pressureStick: {
+        nameRegex: RegExp;
+        communication: {
+            serviceId: string;
+            characteristicId: string;
+        };
+        getDeviceInfoFromAdvertising: (device: PeripheralData) => BlePressureStick;
+    };
 };
 
 declare const _default: {
@@ -734,7 +742,7 @@ type BridgeCommandStructurized<T extends BridgeCommandStructureProperties> = {
 };
 type BleDeviceType = keyof typeof _default$1;
 /** distinguish by type, e.g. `if (device.type === 'bridge')`, to access furhter fields */
-type BleDevice = BleBridge | BleBridgeOta | BleFlexiGaugeTpms;
+type BleDevice = BleBridge | BleBridgeOta | BleFlexiGaugeTpms | BlePressureStick;
 type BleDeviceSimulated = BleBridgeSimulated | BleFlexiGaugeTpmsSimulated;
 type BleDeviceStatus = 'connected' | 'connecting' | 'disconnecting' | undefined;
 interface BleDeviceBase {
@@ -764,6 +772,9 @@ interface BleBridgeOta extends BleDeviceBase {
     };
     type: 'bridgeOta';
 }
+interface BlePressureStick extends BleDeviceBase {
+    type: 'pressureStick';
+}
 interface BleBridgeSimulated extends BleBridge {
     isDisabled?: boolean;
     simulatorData: {
@@ -814,6 +825,7 @@ interface EventHandlers {
     'fg:treadDepth'?: (deviceId: string, value: number) => void;
     'fg:button'?: (deviceId: string, value: string) => void;
     'fg:tpms'?: (deviceId: string, value: FgSensorReading | undefined) => void;
+    'ps:pressure'?: (deviceId: string, value: number) => void;
 }
 type EventName = keyof EventHandlers;
 
@@ -864,14 +876,20 @@ declare function createTirecheckDeviceSdk(platform: DevicePlatform, bleImplement
         getBattery: (deviceId: string) => Promise<number>;
         startTpmsScan: (deviceId: string) => void;
     };
+    /** Methods for working with Tirecheck Pressure Stick */
+    pressureStick: {
+        connect(deviceId: string): Promise<void>;
+        disconnect(deviceId: string, reason?: StateReason): Promise<void>;
+        onPressure: (callback: (deviceId: string, value: number) => void) => void;
+    };
     /** Allows simulating devices without actually using bluetooth */
     simulator: {
         putSimulatedDevices(devices: Record<string, DeepPartial<BleDeviceSimulated>>): Record<string, BleDeviceSimulated>;
         putSimulatedDevice(device: DeepPartial<BleDeviceSimulated>): BleBridgeSimulated | BleFlexiGaugeTpmsSimulated;
         deleteSimulatedDevice(deviceId: string): void;
         getSimulatedDevices(): Record<string, BleDeviceSimulated>;
-        triggerEvent: (eventName: EventName, deviceId: string) => void;
+        triggerEvent: (eventName: EventName, deviceId: string, payload?: any) => void;
     };
 };
 
-export { type BleBridge, type BleBridgeAdvertisingData, type BleBridgeOta, type BleBridgeSimulated, type BleDevice, type BleDeviceBase, type BleDeviceSimulated, type BleDeviceStatus, type BleDeviceType, type BleFlexiGaugeTpms, type BleFlexiGaugeTpmsSimulated, 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 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

@@ -83,6 +83,14 @@ declare const _default$1: {
         getDeviceInfoFromAdvertising: (device: PeripheralData) => BleFlexiGaugeTpms;
         reconnect: boolean;
     };
+    pressureStick: {
+        nameRegex: RegExp;
+        communication: {
+            serviceId: string;
+            characteristicId: string;
+        };
+        getDeviceInfoFromAdvertising: (device: PeripheralData) => BlePressureStick;
+    };
 };
 
 declare const _default: {
@@ -734,7 +742,7 @@ type BridgeCommandStructurized<T extends BridgeCommandStructureProperties> = {
 };
 type BleDeviceType = keyof typeof _default$1;
 /** distinguish by type, e.g. `if (device.type === 'bridge')`, to access furhter fields */
-type BleDevice = BleBridge | BleBridgeOta | BleFlexiGaugeTpms;
+type BleDevice = BleBridge | BleBridgeOta | BleFlexiGaugeTpms | BlePressureStick;
 type BleDeviceSimulated = BleBridgeSimulated | BleFlexiGaugeTpmsSimulated;
 type BleDeviceStatus = 'connected' | 'connecting' | 'disconnecting' | undefined;
 interface BleDeviceBase {
@@ -764,6 +772,9 @@ interface BleBridgeOta extends BleDeviceBase {
     };
     type: 'bridgeOta';
 }
+interface BlePressureStick extends BleDeviceBase {
+    type: 'pressureStick';
+}
 interface BleBridgeSimulated extends BleBridge {
     isDisabled?: boolean;
     simulatorData: {
@@ -814,6 +825,7 @@ interface EventHandlers {
     'fg:treadDepth'?: (deviceId: string, value: number) => void;
     'fg:button'?: (deviceId: string, value: string) => void;
     'fg:tpms'?: (deviceId: string, value: FgSensorReading | undefined) => void;
+    'ps:pressure'?: (deviceId: string, value: number) => void;
 }
 type EventName = keyof EventHandlers;
 
@@ -864,14 +876,20 @@ declare function createTirecheckDeviceSdk(platform: DevicePlatform, bleImplement
         getBattery: (deviceId: string) => Promise<number>;
         startTpmsScan: (deviceId: string) => void;
     };
+    /** Methods for working with Tirecheck Pressure Stick */
+    pressureStick: {
+        connect(deviceId: string): Promise<void>;
+        disconnect(deviceId: string, reason?: StateReason): Promise<void>;
+        onPressure: (callback: (deviceId: string, value: number) => void) => void;
+    };
     /** Allows simulating devices without actually using bluetooth */
     simulator: {
         putSimulatedDevices(devices: Record<string, DeepPartial<BleDeviceSimulated>>): Record<string, BleDeviceSimulated>;
         putSimulatedDevice(device: DeepPartial<BleDeviceSimulated>): BleBridgeSimulated | BleFlexiGaugeTpmsSimulated;
         deleteSimulatedDevice(deviceId: string): void;
         getSimulatedDevices(): Record<string, BleDeviceSimulated>;
-        triggerEvent: (eventName: EventName, deviceId: string) => void;
+        triggerEvent: (eventName: EventName, deviceId: string, payload?: any) => void;
     };
 };
 
-export { type BleBridge, type BleBridgeAdvertisingData, type BleBridgeOta, type BleBridgeSimulated, type BleDevice, type BleDeviceBase, type BleDeviceSimulated, type BleDeviceStatus, type BleDeviceType, type BleFlexiGaugeTpms, type BleFlexiGaugeTpmsSimulated, 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 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

@@ -334,8 +334,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 +372,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;
 }
@@ -513,28 +514,21 @@ const deviceMeta = {
     },
     reconnect: true
     // Do we need it here?
+  },
+  pressureStick: {
+    nameRegex: /Pressure Stick.*/,
+    communication: {
+      serviceId: "4880c12c-fdcb-4077-8920-a450d7f9b907",
+      characteristicId: "fec26ec4-6d71-4442-9f81-55bc21d658d6"
+    },
+    getDeviceInfoFromAdvertising: (device) => {
+      const bleDevice = {
+        ...device,
+        type: "pressureStick"
+      };
+      return bleDevice;
+    }
   }
-  // pressureStick: {
-  //   nameRegex: /Pressure Stick.*/,
-  //   characteristic: {
-  //     serviceId: '4880c12c-fdcb-4077-8920-a450d7f9b907',
-  //     characteristicId: 'fec26ec4-6d71-4442-9f81-55bc21d658d6',
-  //   },
-  //   getDeviceInfoFromAdvertising: () => {},
-  //   capabilities: [
-  //     {
-  //       id: 'pressure',
-  //       // processFn: processPressure,
-  //       regex: /P([0-9.]+)mBar/,
-  //     },
-  //     // only pressure is needed for initial implementation, uncomment tpms functionality when needed
-  //     // {
-  //     //   id: 'tpms',
-  //     //   processFn: processTpms,
-  //     //   regex: /^\*TPMS/,
-  //     // },
-  //   ],
-  // },
 };
 
 const checkUnreachableDevicesTimeouts = {};
@@ -589,12 +583,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) {
@@ -1722,7 +1720,7 @@ const subCommandIds = {
 };
 _.invert(commandIds);
 _.invert(subCommandIds);
-let keepAliveTimer;
+const keepAliveTimer = {};
 const bridgeCommands = {
   getCommandHeader(device) {
     const accessLevel = store.deviceAccessLevel[device.id];
@@ -2033,11 +2031,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);
@@ -2664,10 +2662,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(
@@ -2726,12 +2724,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);
@@ -2745,11 +2742,13 @@ const simulatorSvc = {
   registerEvent(eventName, callback) {
     callbacks[eventName] = callback;
   },
-  triggerEvent(eventName, deviceId) {
-    const simulatedDevice = store.simulatedDevices[deviceId];
-    if (!simulatedDevice) throw new Error(`Device not found`);
-    const payload = simulatedDevice.simulatorData?.events?.[eventName];
-    if (!payload) throw new Error(`Event not found`);
+  triggerEvent(eventName, deviceId, payload) {
+    if (payload === void 0) {
+      const simulatedDevice = store.simulatedDevices[deviceId];
+      if (!simulatedDevice) throw new Error(`Device not found`);
+      payload = simulatedDevice.simulatorData?.events?.[eventName];
+      if (!payload) throw new Error(`Event not found`);
+    }
     const callback = callbacks[eventName];
     if (!callback) {
       console.warn(`Event ${eventName} not registered`);
@@ -2788,10 +2787,7 @@ async function getBattery(deviceId) {
 }
 
 let sensorReadings = [];
-let treadDepthCallback;
-let buttonCallback;
-let tpmsCallback;
-const capabilities = [
+const capabilities$1 = [
   {
     id: "td",
     processFn: processTreadDepth,
@@ -2828,7 +2824,7 @@ const flexiGaugeTpmsService = {
   processMessage(deviceId, message) {
     const numberArray = Array.from(new Uint8Array(message));
     const stringFromBytes = String.fromCharCode.apply(null, numberArray).replace("\r\n", "");
-    for (const capability of capabilities) {
+    for (const capability of capabilities$1) {
       if (capability.regex.test(stringFromBytes)) {
         return capability.processFn(deviceId, stringFromBytes);
       }
@@ -2838,12 +2834,12 @@ const flexiGaugeTpmsService = {
 function processTreadDepth(deviceId, value) {
   const treadDepth = value.match(/\d+/)?.[0];
   const convertedValue = Number(treadDepth) / 1e3;
-  treadDepthCallback(deviceId, convertedValue);
+  simulatorSvc.triggerEvent("fg:treadDepth", deviceId, convertedValue);
 }
 function processButtonPress(deviceId, value) {
   const buttonName = value.match(/\*(.)/);
   if (!buttonName || !buttonName[1]) throw new Error("Unrecognized button");
-  buttonCallback(deviceId, buttonName[1]);
+  simulatorSvc.triggerEvent("fg:button", deviceId, buttonName[1]);
 }
 function processTpms(deviceId, value) {
   const groupedValue = value.split(" ");
@@ -2863,12 +2859,13 @@ function processTpms(deviceId, value) {
   }
   if (type === "ENDSCANNING") {
     if (!sensorReadings.length) {
-      tpmsCallback(deviceId, void 0);
+      simulatorSvc.triggerEvent("fg:tpms", deviceId, null);
+      return;
     }
     const strongestReading = sensorReadings.reduce((accumulator, currentReading) => {
       return Number(currentReading.Rssi) > Number(accumulator.Rssi) ? currentReading : accumulator;
     }, sensorReadings[0]);
-    tpmsCallback(deviceId, strongestReading);
+    simulatorSvc.triggerEvent("fg:tpms", deviceId, strongestReading);
   }
 }
 
@@ -2897,6 +2894,55 @@ const flexiGaugeTpms = {
   startTpmsScan: flexiGaugeTpmsService.startTpmsScan
 };
 
+const capabilities = [
+  {
+    id: "pressure",
+    processFn: processPressure,
+    regex: /P([0-9.]+)mBar/
+  }
+];
+const pressureStickService = {
+  onPressure(callback) {
+    simulatorSvc.registerEvent("ps:pressure", callback);
+  },
+  processMessage(deviceId, message) {
+    const numberArray = Array.from(new Uint8Array(message));
+    const stringFromBytes = String.fromCharCode.apply(null, numberArray).replace("\r\n", "");
+    for (const capability of capabilities) {
+      if (capability.regex.test(stringFromBytes)) {
+        return capability.processFn(deviceId, stringFromBytes);
+      }
+    }
+  }
+};
+function processPressure(deviceId, msg) {
+  const match = /P([0-9.]+)mBar/i.exec(msg);
+  if (!match) throw new Error("Incorrect pressure message");
+  const pressure = Number(match[1]) / 1e3;
+  simulatorSvc.triggerEvent("ps:pressure", deviceId, pressure);
+}
+
+const pressureStick = {
+  async connect(deviceId) {
+    const psMeta = deviceMeta.pressureStick;
+    await bluetooth.connect(deviceId, this.disconnect);
+    await ble.startNotification(
+      deviceId,
+      psMeta.communication.serviceId,
+      psMeta.communication.characteristicId,
+      (notification) => pressureStickService.processMessage(deviceId, notification),
+      (error) => console.warn("ble.startNotification error", error)
+    );
+    store.setState(deviceId, "paired");
+  },
+  async disconnect(deviceId, reason) {
+    store.setState(deviceId, "disconnecting");
+    await bluetooth.disconnect(deviceId);
+    store.setState(deviceId, void 0, reason ?? "manualDisconnection");
+  },
+  onPressure: pressureStickService.onPressure
+};
+
 const bridgeSimulator = {
   isRebootRequired(deviceId) {
     return store.bridgeRebootRequired[deviceId];
@@ -3270,6 +3316,8 @@ function createTirecheckDeviceSdk(platform, bleImplementation) {
     bridgeOta,
     /** Methods for working with Tirecheck TPMS FlexiGauge */
     flexiGaugeTpms,
+    /** Methods for working with Tirecheck Pressure Stick */
+    pressureStick,
     /** Allows simulating devices without actually using bluetooth */
     simulator
   };

package/package.json

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