tirecheck-device-sdk 0.1.94 → 0.1.96

package/dist/index.cjs

@@ -502,7 +502,7 @@ const deviceMeta = {
     getDeviceInfoFromAdvertising: bridgeOtaAdvertisingParser.getDeviceInfoFromAdvertising
   },
   flexiGaugeTpms: {
-    nameRegex: /Flexi.*/,
+    nameRegex: /^Flexi.*/,
     communication: {
       serviceId: "4880c12c-fdcb-4077-8920-a450d7f9b907",
       characteristicId: "fec26ec4-6d71-4442-9f81-55bc21d658d6"
@@ -520,28 +520,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 = {};
@@ -565,7 +558,7 @@ const bluetooth = {
   stopScan() {
     ble.stopScan();
   },
-  connect,
+  connect: connect$1,
   disconnect: disconnect$1,
   write,
   read
@@ -592,7 +585,7 @@ async function scanDevices(services = [], duration) {
     (e) => console.error("ble.startScanWithOptions error:", e)
   );
 }
-async function connect(deviceId, disconnectCallback) {
+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;
@@ -713,6 +706,78 @@ function getDeviceNameFromAdvertising(advertising) {
   return deviceName;
 }
 
+const otaServiceUuid = "1d14d6ee-fd63-4fa1-bfa4-8f47b42119f0";
+const otaControlCharacteristicUuid = "f7bf3564-fb6d-4e53-88a4-5e37e0326063";
+const otaDataCharacteristicUuid = "984227f3-34fc-4045-a5d0-2c581f81a153";
+const bridgeOtaCommands = {
+  async beginOta(deviceId) {
+    await bluetooth.write(deviceId, otaServiceUuid, otaControlCharacteristicUuid, new Uint8Array([0]).buffer, true);
+  },
+  async uploadOtaChunk(deviceId, data) {
+    await bluetooth.write(deviceId, otaServiceUuid, otaDataCharacteristicUuid, data, true);
+  },
+  async endOta(deviceId) {
+    await bluetooth.write(deviceId, otaServiceUuid, otaControlCharacteristicUuid, new Uint8Array([3]).buffer, true);
+  }
+};
+
+const bridgeOtaService = {
+  async updateFirmware(deviceId, bootloader, firmware, progressCallback) {
+    await delay(2e3);
+    progressCallback("Connecting to the bridge...", 0.1);
+    await bridgeOta.connect(deviceId);
+    progressCallback("Uploading bootloader...", 0.12);
+    await bridgeOtaCommands.beginOta(deviceId);
+    await uploadOta(deviceId, bootloader, (str, percents) => progressCallback(str, 0.12 + percents * 0.2));
+    await bridgeOtaCommands.endOta(deviceId);
+    progressCallback("Uploading application...", 0.32);
+    await bridgeOtaCommands.beginOta(deviceId);
+    await uploadOta(deviceId, firmware, (str, percents) => progressCallback(str, 0.32 + percents * 0.5));
+    await bridgeOtaCommands.endOta(deviceId);
+    progressCallback("Upload completed, disconnecting...", 0.81);
+    await bridgeOta.disconnect(deviceId);
+    progressCallback("Disconnected...", 1);
+  }
+};
+async function uploadOta(deviceId, firmwareBinary, reportStatus) {
+  let uploadedBytes = 0;
+  let chunkIndex = 0;
+  const mtu = store.platform === "android" ? 512 : deviceMeta.bridgeOta.mtu;
+  while (uploadedBytes < firmwareBinary.byteLength) {
+    if (chunkIndex % 100 === 0)
+      reportStatus(
+        `Uploading new firmware... (${___default.round(uploadedBytes / 1e3)} / ${___default.round(
+          firmwareBinary.byteLength / 1e3
+        )} KB)`,
+        uploadedBytes / firmwareBinary.byteLength
+      );
+    const chunkSize = Math.min(mtu - 3, firmwareBinary.byteLength - uploadedBytes);
+    const chunk = firmwareBinary.slice(uploadedBytes, uploadedBytes + chunkSize);
+    await bridgeOtaCommands.uploadOtaChunk(deviceId, chunk);
+    uploadedBytes += chunkSize;
+    chunkIndex++;
+  }
+}
+
+const bridgeOta = {
+  async connect(deviceId) {
+    await bluetooth.connect(deviceId, this.disconnect);
+    const _deviceId = store.deviceIdMapingTable[deviceId] ?? deviceId;
+    if (store.platform !== "ios") {
+      await ble.requestMtu(_deviceId, 512);
+    }
+    store.setState(deviceId, "paired");
+  },
+  async disconnect(deviceId, reason) {
+    store.setState(deviceId, "disconnecting");
+    await bluetooth.disconnect(deviceId);
+    store.setState(deviceId, void 0, reason ?? "manualDisconnection");
+  },
+  async updateFirmware(deviceId, bootloader, firmware, progressCallback) {
+    return bridgeOtaService.updateFirmware(deviceId, bootloader, firmware, progressCallback);
+  }
+};
+
 const bridgeCommandStructures = {
   workshopCanSettings: {
     id: [98, 96],
@@ -1530,25 +1595,26 @@ const bridgeSecurity = {
 };
 
 const bridgeMeta = deviceMeta.bridge;
-let promiseQueue = Promise.resolve();
-let currentResolve = (_v) => {
-};
-let currentReject = (_v) => {
-};
-let responseIdentifier;
-const promiseQueue$1 = {
-  clearQueue(message) {
-    currentReject(new Error(message ?? "Stopped sending commands"));
-    promiseQueue = Promise.resolve();
-    responseIdentifier = [];
+const devicePromiseQueue = {};
+const deviceCurrentResolve = {};
+const deviceCurrentReject = {};
+const deviceResponseIdentifier = {};
+const promiseQueue = {
+  clearQueue(deviceId, message) {
+    if (deviceCurrentReject[deviceId]) {
+      deviceCurrentReject[deviceId](new Error(message ?? "Stopped sending commands"));
+    }
+    devicePromiseQueue[deviceId] = Promise.resolve();
+    deviceResponseIdentifier[deviceId] = [];
   },
   async enqueue(device, payload) {
-    promiseQueue = promiseQueue.then(() => {
+    if (devicePromiseQueue[device.id] === void 0) devicePromiseQueue[device.id] = Promise.resolve();
+    devicePromiseQueue[device.id] = devicePromiseQueue[device.id].then(() => {
       const promise = new Promise((resolve, reject) => {
-        currentResolve = resolve;
-        currentReject = reject;
+        deviceCurrentResolve[device.id] = resolve;
+        deviceCurrentReject[device.id] = reject;
         const isKeepAlive = payload[3] === commandIds.keepAlive;
-        responseIdentifier = [isKeepAlive ? 126 : 0, payload[4]];
+        deviceResponseIdentifier[device.id] = [isKeepAlive ? 126 : 0, payload[4]];
         const signedData = bridgeSecurity.getSignedCommand(device, payload);
         if (!toolsSvc.canCommunicateWith(device.id)) return reject(new Error("Bridge not connected"));
         if (signedData.length > 110) {
@@ -1574,21 +1640,21 @@ const promiseQueue$1 = {
           );
         }
       });
-      return withTimeout(promise, 5e3, `Command timed out ${responseIdentifier}`);
+      return withTimeout(promise, 5e3, `Command timed out ${deviceResponseIdentifier[device.id]}, ${device.id}`);
     });
-    return promiseQueue;
+    return devicePromiseQueue[device.id];
   },
   async processMessage(deviceId, payload) {
     const numberArray = Array.from(new Uint8Array(payload));
     if (numberArray[3] === 127) {
       console.error(numberArray);
-      return currentReject(new Error(`Command not succesful: ${numberArray[4]}`));
+      return deviceCurrentReject[deviceId](new Error(`Command not succesful: ${numberArray[4]}`));
     }
     if ([226, 81].includes(numberArray[3]) && numberArray[4] && toolsSvc.canCommunicateWith(deviceId)) {
       store.bridgeRebootRequired[deviceId] = true;
     }
-    if ((!responseIdentifier[0] || numberArray[3] === responseIdentifier[0]) && (!responseIdentifier[1] || numberArray[4] === responseIdentifier[1])) {
-      return currentResolve(numberArray);
+    if ((!deviceResponseIdentifier[deviceId][0] || numberArray[3] === deviceResponseIdentifier[deviceId][0]) && (!deviceResponseIdentifier[deviceId][1] || numberArray[4] === deviceResponseIdentifier[deviceId][1])) {
+      return deviceCurrentResolve[deviceId](numberArray);
     }
     console.warn("message from the device not belonging to the pending promise: ", numberArray);
   }
@@ -1975,79 +2041,7 @@ const bridgeCommands = {
       }
       this.sendKeepAliveCommand(device);
     }, 1e4);
-    return promiseQueue$1.enqueue(device, writeCommand);
-  }
-};
-
-const otaServiceUuid = "1d14d6ee-fd63-4fa1-bfa4-8f47b42119f0";
-const otaControlCharacteristicUuid = "f7bf3564-fb6d-4e53-88a4-5e37e0326063";
-const otaDataCharacteristicUuid = "984227f3-34fc-4045-a5d0-2c581f81a153";
-const bridgeOtaCommands = {
-  async beginOta(deviceId) {
-    await bluetooth.write(deviceId, otaServiceUuid, otaControlCharacteristicUuid, new Uint8Array([0]).buffer, true);
-  },
-  async uploadOtaChunk(deviceId, data) {
-    await bluetooth.write(deviceId, otaServiceUuid, otaDataCharacteristicUuid, data, true);
-  },
-  async endOta(deviceId) {
-    await bluetooth.write(deviceId, otaServiceUuid, otaControlCharacteristicUuid, new Uint8Array([3]).buffer, true);
-  }
-};
-
-const bridgeOtaService = {
-  async updateFirmware(deviceId, bootloader, firmware, progressCallback) {
-    await delay(2e3);
-    progressCallback("Connecting to the bridge...", 0.1);
-    await bridgeOta.connect(deviceId);
-    progressCallback("Uploading bootloader...", 0.12);
-    await bridgeOtaCommands.beginOta(deviceId);
-    await uploadOta(deviceId, bootloader, (str, percents) => progressCallback(str, 0.12 + percents * 0.2));
-    await bridgeOtaCommands.endOta(deviceId);
-    progressCallback("Uploading application...", 0.32);
-    await bridgeOtaCommands.beginOta(deviceId);
-    await uploadOta(deviceId, firmware, (str, percents) => progressCallback(str, 0.32 + percents * 0.5));
-    await bridgeOtaCommands.endOta(deviceId);
-    progressCallback("Upload completed, disconnecting...", 0.81);
-    await bridgeOta.disconnect(deviceId);
-    progressCallback("Disconnected...", 1);
-  }
-};
-async function uploadOta(deviceId, firmwareBinary, reportStatus) {
-  let uploadedBytes = 0;
-  let chunkIndex = 0;
-  const mtu = store.platform === "android" ? 512 : deviceMeta.bridgeOta.mtu;
-  while (uploadedBytes < firmwareBinary.byteLength) {
-    if (chunkIndex % 100 === 0)
-      reportStatus(
-        `Uploading new firmware... (${___default.round(uploadedBytes / 1e3)} / ${___default.round(
-          firmwareBinary.byteLength / 1e3
-        )} KB)`,
-        uploadedBytes / firmwareBinary.byteLength
-      );
-    const chunkSize = Math.min(mtu - 3, firmwareBinary.byteLength - uploadedBytes);
-    const chunk = firmwareBinary.slice(uploadedBytes, uploadedBytes + chunkSize);
-    await bridgeOtaCommands.uploadOtaChunk(deviceId, chunk);
-    uploadedBytes += chunkSize;
-    chunkIndex++;
-  }
-}
-
-const bridgeOta = {
-  async connect(deviceId) {
-    await bluetooth.connect(deviceId, this.disconnect);
-    const _deviceId = store.deviceIdMapingTable[deviceId] ?? deviceId;
-    if (store.platform !== "ios") {
-      await ble.requestMtu(_deviceId, 512);
-    }
-    store.setState(deviceId, "paired");
-  },
-  async disconnect(deviceId, reason) {
-    store.setState(deviceId, "disconnecting");
-    await bluetooth.disconnect(deviceId);
-    store.setState(deviceId, void 0, reason ?? "manualDisconnection");
-  },
-  async updateFirmware(deviceId, bootloader, firmware, progressCallback) {
-    return bridgeOtaService.updateFirmware(deviceId, bootloader, firmware, progressCallback);
+    return promiseQueue.enqueue(device, writeCommand);
   }
 };
 
@@ -2069,8 +2063,13 @@ const bridgeService = {
   getVehicleReadings,
   resetAutolearnStatuses,
   getAutolearnStatuses,
-  isRebootRequired
+  isRebootRequired,
+  sendPinCommand
 };
+async function sendPinCommand(deviceId) {
+  if (!canCommunicateWith(deviceId)) throw new Error("Bridge not connected");
+  await bridgeCommands.sendPinCommand(deviceId);
+}
 async function updateFirmware(deviceId, bootloader, firmware, reportStatus) {
   reportStatus("Sending OTA Request...", 0.02);
   await bridgeCommands.sendOtaRequest(deviceId);
@@ -2392,7 +2391,7 @@ async function getVehicleReadings(deviceId, tcVehicle) {
   try {
     for (const vehicleTyre of tcVehicle.tcTyres) {
       if (vehicleTyre.tcTpmsSensor && vehicleTyre.mountedOn?.positionId) {
-        if (!canCommunicateWith(deviceId)) throw new Error("getVehicleReadings: no connected bridge");
+        if (!canCommunicateWith(deviceId)) break;
         const reading = await getSensorReading(deviceId, vehicleTyre.mountedOn.positionId);
         readings.push(reading);
       }
@@ -2690,12 +2689,28 @@ function isRebootRequired(deviceId) {
 
 const bridge = {
   disconnect,
-  async connect(deviceId, accessLevel) {
-    if (canCommunicateWith(deviceId)) return;
-    await promiseQueue$1.clearQueue("Previous pending commands aborted");
-    const bridgeMeta = deviceMeta.bridge;
-    await bluetooth.connect(deviceId, disconnect);
-    const _deviceId = store.deviceIdMapingTable[deviceId] ?? deviceId;
+  connect,
+  getVehicle: bridgeService.getVehicle,
+  setVehicle: bridgeService.setVehicle,
+  getConfiguration: bridgeService.getConfiguration,
+  setConfiguration: bridgeService.setConfiguration,
+  getSensorReading: bridgeService.getSensorReading,
+  getVehicleReadings: bridgeService.getVehicleReadings,
+  getAutolearnStatuses: bridgeService.getAutolearnStatuses,
+  resetAutolearnStatuses: bridgeService.resetAutolearnStatuses,
+  updateFirmware: bridgeService.updateFirmware,
+  isRebootRequired: bridgeService.isRebootRequired
+};
+async function connect(deviceId, accessLevel) {
+  if (canCommunicateWith(deviceId)) return;
+  await promiseQueue.clearQueue(deviceId, "Previous pending commands aborted");
+  const bridgeMeta = deviceMeta.bridge;
+  await bluetooth.connect(deviceId, disconnect);
+  if (store.deviceState[deviceId] === "paired") {
+    return console.warn("Connect Warn: Already connected");
+  }
+  const _deviceId = store.deviceIdMapingTable[deviceId] ?? deviceId;
+  try {
     if (store.platform !== "ios") {
       await ble.requestMtu(_deviceId, deviceMeta.bridge.mtu);
     }
@@ -2703,28 +2718,22 @@ const bridge = {
       _deviceId,
       bridgeMeta.communication.serviceId,
       bridgeMeta.communication.characteristicId,
-      (notification) => promiseQueue$1.processMessage(deviceId, notification),
+      (notification) => promiseQueue.processMessage(deviceId, notification),
       (error) => console.error("startNotification Error", error)
     );
     store.deviceAccessLevel[deviceId] = accessLevel ?? "driver";
     store.bridgeRebootRequired[deviceId] = false;
-    await bridgeCommands.sendPinCommand(deviceId);
+    await bridgeService.sendPinCommand(deviceId);
     store.setState(deviceId, "paired");
-  },
-  getVehicle: bridgeService.getVehicle,
-  setVehicle: bridgeService.setVehicle,
-  getConfiguration: bridgeService.getConfiguration,
-  setConfiguration: bridgeService.setConfiguration,
-  getSensorReading: bridgeService.getSensorReading,
-  getVehicleReadings: bridgeService.getVehicleReadings,
-  getAutolearnStatuses: bridgeService.getAutolearnStatuses,
-  resetAutolearnStatuses: bridgeService.resetAutolearnStatuses,
-  updateFirmware: bridgeService.updateFirmware,
-  isRebootRequired: bridgeService.isRebootRequired
-};
+  } catch (e) {
+    disconnect(deviceId);
+    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$1.clearQueue("Previous pending commands aborted");
+  promiseQueue.clearQueue(deviceId, "Previous pending commands aborted");
   await bluetooth.disconnect(deviceId);
   delete store.devices[deviceId];
   deviceUnreachableCallback?.(deviceId);
@@ -2736,11 +2745,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`);
@@ -2779,10 +2790,7 @@ async function getBattery(deviceId) {
 }
 
 let sensorReadings = [];
-let treadDepthCallback;
-let buttonCallback;
-let tpmsCallback;
-const capabilities = [
+const capabilities$1 = [
   {
     id: "td",
     processFn: processTreadDepth,
@@ -2819,7 +2827,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);
       }
@@ -2829,12 +2837,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(" ");
@@ -2854,12 +2862,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);
   }
 }
 
@@ -2888,6 +2897,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];
@@ -3261,6 +3319,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: {
@@ -809,11 +820,12 @@ type Wrapper<T extends Record<string, (...args: any) => any>> = {
 };
 type ReportStatusFn = (status: string, completionPercentage: number) => void;
 type DeviceState = 'connected' | 'connecting' | 'disconnecting' | 'paired' | undefined;
-type StateReason = 'lostConnection' | 'manualDisconnection' | 'failedConnection' | 'failedDisconnection' | 'firmwareUpdate';
+type StateReason = 'lostConnection' | 'manualDisconnection' | 'failedConnection' | 'failedDisconnection' | 'firmwareUpdate' | string;
 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;
 
@@ -836,7 +848,7 @@ declare function createTirecheckDeviceSdk(platform: DevicePlatform, bleImplement
     /** Methods for working with Tirecheck CAN Bridge */
     bridge: {
         disconnect: (deviceId: string, reason?: StateReason) => Promise<void>;
-        connect(deviceId: string, accessLevel: BridgeAccessLevel): Promise<void>;
+        connect: (deviceId: string, accessLevel: BridgeAccessLevel) => Promise<void>;
         getVehicle: (deviceId: string) => Promise<BridgeTcVehicle>;
         setVehicle: (deviceId: string, tcVehicle: BridgeTcVehicle) => Promise<void>;
         getConfiguration: (deviceId: string) => Promise<BridgeConfiguration>;
@@ -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: {
@@ -809,11 +820,12 @@ type Wrapper<T extends Record<string, (...args: any) => any>> = {
 };
 type ReportStatusFn = (status: string, completionPercentage: number) => void;
 type DeviceState = 'connected' | 'connecting' | 'disconnecting' | 'paired' | undefined;
-type StateReason = 'lostConnection' | 'manualDisconnection' | 'failedConnection' | 'failedDisconnection' | 'firmwareUpdate';
+type StateReason = 'lostConnection' | 'manualDisconnection' | 'failedConnection' | 'failedDisconnection' | 'firmwareUpdate' | string;
 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;
 
@@ -836,7 +848,7 @@ declare function createTirecheckDeviceSdk(platform: DevicePlatform, bleImplement
     /** Methods for working with Tirecheck CAN Bridge */
     bridge: {
         disconnect: (deviceId: string, reason?: StateReason) => Promise<void>;
-        connect(deviceId: string, accessLevel: BridgeAccessLevel): Promise<void>;
+        connect: (deviceId: string, accessLevel: BridgeAccessLevel) => Promise<void>;
         getVehicle: (deviceId: string) => Promise<BridgeTcVehicle>;
         setVehicle: (deviceId: string, tcVehicle: BridgeTcVehicle) => Promise<void>;
         getConfiguration: (deviceId: string) => Promise<BridgeConfiguration>;
@@ -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: {
@@ -809,11 +820,12 @@ type Wrapper<T extends Record<string, (...args: any) => any>> = {
 };
 type ReportStatusFn = (status: string, completionPercentage: number) => void;
 type DeviceState = 'connected' | 'connecting' | 'disconnecting' | 'paired' | undefined;
-type StateReason = 'lostConnection' | 'manualDisconnection' | 'failedConnection' | 'failedDisconnection' | 'firmwareUpdate';
+type StateReason = 'lostConnection' | 'manualDisconnection' | 'failedConnection' | 'failedDisconnection' | 'firmwareUpdate' | string;
 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;
 
@@ -836,7 +848,7 @@ declare function createTirecheckDeviceSdk(platform: DevicePlatform, bleImplement
     /** Methods for working with Tirecheck CAN Bridge */
     bridge: {
         disconnect: (deviceId: string, reason?: StateReason) => Promise<void>;
-        connect(deviceId: string, accessLevel: BridgeAccessLevel): Promise<void>;
+        connect: (deviceId: string, accessLevel: BridgeAccessLevel) => Promise<void>;
         getVehicle: (deviceId: string) => Promise<BridgeTcVehicle>;
         setVehicle: (deviceId: string, tcVehicle: BridgeTcVehicle) => Promise<void>;
         getConfiguration: (deviceId: string) => Promise<BridgeConfiguration>;
@@ -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

@@ -495,7 +495,7 @@ const deviceMeta = {
     getDeviceInfoFromAdvertising: bridgeOtaAdvertisingParser.getDeviceInfoFromAdvertising
   },
   flexiGaugeTpms: {
-    nameRegex: /Flexi.*/,
+    nameRegex: /^Flexi.*/,
     communication: {
       serviceId: "4880c12c-fdcb-4077-8920-a450d7f9b907",
       characteristicId: "fec26ec4-6d71-4442-9f81-55bc21d658d6"
@@ -513,28 +513,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 = {};
@@ -558,7 +551,7 @@ const bluetooth = {
   stopScan() {
     ble.stopScan();
   },
-  connect,
+  connect: connect$1,
   disconnect: disconnect$1,
   write,
   read
@@ -585,7 +578,7 @@ async function scanDevices(services = [], duration) {
     (e) => console.error("ble.startScanWithOptions error:", e)
   );
 }
-async function connect(deviceId, disconnectCallback) {
+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;
@@ -706,6 +699,78 @@ function getDeviceNameFromAdvertising(advertising) {
   return deviceName;
 }
 
+const otaServiceUuid = "1d14d6ee-fd63-4fa1-bfa4-8f47b42119f0";
+const otaControlCharacteristicUuid = "f7bf3564-fb6d-4e53-88a4-5e37e0326063";
+const otaDataCharacteristicUuid = "984227f3-34fc-4045-a5d0-2c581f81a153";
+const bridgeOtaCommands = {
+  async beginOta(deviceId) {
+    await bluetooth.write(deviceId, otaServiceUuid, otaControlCharacteristicUuid, new Uint8Array([0]).buffer, true);
+  },
+  async uploadOtaChunk(deviceId, data) {
+    await bluetooth.write(deviceId, otaServiceUuid, otaDataCharacteristicUuid, data, true);
+  },
+  async endOta(deviceId) {
+    await bluetooth.write(deviceId, otaServiceUuid, otaControlCharacteristicUuid, new Uint8Array([3]).buffer, true);
+  }
+};
+
+const bridgeOtaService = {
+  async updateFirmware(deviceId, bootloader, firmware, progressCallback) {
+    await delay(2e3);
+    progressCallback("Connecting to the bridge...", 0.1);
+    await bridgeOta.connect(deviceId);
+    progressCallback("Uploading bootloader...", 0.12);
+    await bridgeOtaCommands.beginOta(deviceId);
+    await uploadOta(deviceId, bootloader, (str, percents) => progressCallback(str, 0.12 + percents * 0.2));
+    await bridgeOtaCommands.endOta(deviceId);
+    progressCallback("Uploading application...", 0.32);
+    await bridgeOtaCommands.beginOta(deviceId);
+    await uploadOta(deviceId, firmware, (str, percents) => progressCallback(str, 0.32 + percents * 0.5));
+    await bridgeOtaCommands.endOta(deviceId);
+    progressCallback("Upload completed, disconnecting...", 0.81);
+    await bridgeOta.disconnect(deviceId);
+    progressCallback("Disconnected...", 1);
+  }
+};
+async function uploadOta(deviceId, firmwareBinary, reportStatus) {
+  let uploadedBytes = 0;
+  let chunkIndex = 0;
+  const mtu = store.platform === "android" ? 512 : deviceMeta.bridgeOta.mtu;
+  while (uploadedBytes < firmwareBinary.byteLength) {
+    if (chunkIndex % 100 === 0)
+      reportStatus(
+        `Uploading new firmware... (${_.round(uploadedBytes / 1e3)} / ${_.round(
+          firmwareBinary.byteLength / 1e3
+        )} KB)`,
+        uploadedBytes / firmwareBinary.byteLength
+      );
+    const chunkSize = Math.min(mtu - 3, firmwareBinary.byteLength - uploadedBytes);
+    const chunk = firmwareBinary.slice(uploadedBytes, uploadedBytes + chunkSize);
+    await bridgeOtaCommands.uploadOtaChunk(deviceId, chunk);
+    uploadedBytes += chunkSize;
+    chunkIndex++;
+  }
+}
+
+const bridgeOta = {
+  async connect(deviceId) {
+    await bluetooth.connect(deviceId, this.disconnect);
+    const _deviceId = store.deviceIdMapingTable[deviceId] ?? deviceId;
+    if (store.platform !== "ios") {
+      await ble.requestMtu(_deviceId, 512);
+    }
+    store.setState(deviceId, "paired");
+  },
+  async disconnect(deviceId, reason) {
+    store.setState(deviceId, "disconnecting");
+    await bluetooth.disconnect(deviceId);
+    store.setState(deviceId, void 0, reason ?? "manualDisconnection");
+  },
+  async updateFirmware(deviceId, bootloader, firmware, progressCallback) {
+    return bridgeOtaService.updateFirmware(deviceId, bootloader, firmware, progressCallback);
+  }
+};
+
 const bridgeCommandStructures = {
   workshopCanSettings: {
     id: [98, 96],
@@ -1523,25 +1588,26 @@ const bridgeSecurity = {
 };
 
 const bridgeMeta = deviceMeta.bridge;
-let promiseQueue = Promise.resolve();
-let currentResolve = (_v) => {
-};
-let currentReject = (_v) => {
-};
-let responseIdentifier;
-const promiseQueue$1 = {
-  clearQueue(message) {
-    currentReject(new Error(message ?? "Stopped sending commands"));
-    promiseQueue = Promise.resolve();
-    responseIdentifier = [];
+const devicePromiseQueue = {};
+const deviceCurrentResolve = {};
+const deviceCurrentReject = {};
+const deviceResponseIdentifier = {};
+const promiseQueue = {
+  clearQueue(deviceId, message) {
+    if (deviceCurrentReject[deviceId]) {
+      deviceCurrentReject[deviceId](new Error(message ?? "Stopped sending commands"));
+    }
+    devicePromiseQueue[deviceId] = Promise.resolve();
+    deviceResponseIdentifier[deviceId] = [];
   },
   async enqueue(device, payload) {
-    promiseQueue = promiseQueue.then(() => {
+    if (devicePromiseQueue[device.id] === void 0) devicePromiseQueue[device.id] = Promise.resolve();
+    devicePromiseQueue[device.id] = devicePromiseQueue[device.id].then(() => {
       const promise = new Promise((resolve, reject) => {
-        currentResolve = resolve;
-        currentReject = reject;
+        deviceCurrentResolve[device.id] = resolve;
+        deviceCurrentReject[device.id] = reject;
         const isKeepAlive = payload[3] === commandIds.keepAlive;
-        responseIdentifier = [isKeepAlive ? 126 : 0, payload[4]];
+        deviceResponseIdentifier[device.id] = [isKeepAlive ? 126 : 0, payload[4]];
         const signedData = bridgeSecurity.getSignedCommand(device, payload);
         if (!toolsSvc.canCommunicateWith(device.id)) return reject(new Error("Bridge not connected"));
         if (signedData.length > 110) {
@@ -1567,21 +1633,21 @@ const promiseQueue$1 = {
           );
         }
       });
-      return withTimeout(promise, 5e3, `Command timed out ${responseIdentifier}`);
+      return withTimeout(promise, 5e3, `Command timed out ${deviceResponseIdentifier[device.id]}, ${device.id}`);
     });
-    return promiseQueue;
+    return devicePromiseQueue[device.id];
   },
   async processMessage(deviceId, payload) {
     const numberArray = Array.from(new Uint8Array(payload));
     if (numberArray[3] === 127) {
       console.error(numberArray);
-      return currentReject(new Error(`Command not succesful: ${numberArray[4]}`));
+      return deviceCurrentReject[deviceId](new Error(`Command not succesful: ${numberArray[4]}`));
     }
     if ([226, 81].includes(numberArray[3]) && numberArray[4] && toolsSvc.canCommunicateWith(deviceId)) {
       store.bridgeRebootRequired[deviceId] = true;
     }
-    if ((!responseIdentifier[0] || numberArray[3] === responseIdentifier[0]) && (!responseIdentifier[1] || numberArray[4] === responseIdentifier[1])) {
-      return currentResolve(numberArray);
+    if ((!deviceResponseIdentifier[deviceId][0] || numberArray[3] === deviceResponseIdentifier[deviceId][0]) && (!deviceResponseIdentifier[deviceId][1] || numberArray[4] === deviceResponseIdentifier[deviceId][1])) {
+      return deviceCurrentResolve[deviceId](numberArray);
     }
     console.warn("message from the device not belonging to the pending promise: ", numberArray);
   }
@@ -1968,79 +2034,7 @@ const bridgeCommands = {
       }
       this.sendKeepAliveCommand(device);
     }, 1e4);
-    return promiseQueue$1.enqueue(device, writeCommand);
-  }
-};
-
-const otaServiceUuid = "1d14d6ee-fd63-4fa1-bfa4-8f47b42119f0";
-const otaControlCharacteristicUuid = "f7bf3564-fb6d-4e53-88a4-5e37e0326063";
-const otaDataCharacteristicUuid = "984227f3-34fc-4045-a5d0-2c581f81a153";
-const bridgeOtaCommands = {
-  async beginOta(deviceId) {
-    await bluetooth.write(deviceId, otaServiceUuid, otaControlCharacteristicUuid, new Uint8Array([0]).buffer, true);
-  },
-  async uploadOtaChunk(deviceId, data) {
-    await bluetooth.write(deviceId, otaServiceUuid, otaDataCharacteristicUuid, data, true);
-  },
-  async endOta(deviceId) {
-    await bluetooth.write(deviceId, otaServiceUuid, otaControlCharacteristicUuid, new Uint8Array([3]).buffer, true);
-  }
-};
-
-const bridgeOtaService = {
-  async updateFirmware(deviceId, bootloader, firmware, progressCallback) {
-    await delay(2e3);
-    progressCallback("Connecting to the bridge...", 0.1);
-    await bridgeOta.connect(deviceId);
-    progressCallback("Uploading bootloader...", 0.12);
-    await bridgeOtaCommands.beginOta(deviceId);
-    await uploadOta(deviceId, bootloader, (str, percents) => progressCallback(str, 0.12 + percents * 0.2));
-    await bridgeOtaCommands.endOta(deviceId);
-    progressCallback("Uploading application...", 0.32);
-    await bridgeOtaCommands.beginOta(deviceId);
-    await uploadOta(deviceId, firmware, (str, percents) => progressCallback(str, 0.32 + percents * 0.5));
-    await bridgeOtaCommands.endOta(deviceId);
-    progressCallback("Upload completed, disconnecting...", 0.81);
-    await bridgeOta.disconnect(deviceId);
-    progressCallback("Disconnected...", 1);
-  }
-};
-async function uploadOta(deviceId, firmwareBinary, reportStatus) {
-  let uploadedBytes = 0;
-  let chunkIndex = 0;
-  const mtu = store.platform === "android" ? 512 : deviceMeta.bridgeOta.mtu;
-  while (uploadedBytes < firmwareBinary.byteLength) {
-    if (chunkIndex % 100 === 0)
-      reportStatus(
-        `Uploading new firmware... (${_.round(uploadedBytes / 1e3)} / ${_.round(
-          firmwareBinary.byteLength / 1e3
-        )} KB)`,
-        uploadedBytes / firmwareBinary.byteLength
-      );
-    const chunkSize = Math.min(mtu - 3, firmwareBinary.byteLength - uploadedBytes);
-    const chunk = firmwareBinary.slice(uploadedBytes, uploadedBytes + chunkSize);
-    await bridgeOtaCommands.uploadOtaChunk(deviceId, chunk);
-    uploadedBytes += chunkSize;
-    chunkIndex++;
-  }
-}
-
-const bridgeOta = {
-  async connect(deviceId) {
-    await bluetooth.connect(deviceId, this.disconnect);
-    const _deviceId = store.deviceIdMapingTable[deviceId] ?? deviceId;
-    if (store.platform !== "ios") {
-      await ble.requestMtu(_deviceId, 512);
-    }
-    store.setState(deviceId, "paired");
-  },
-  async disconnect(deviceId, reason) {
-    store.setState(deviceId, "disconnecting");
-    await bluetooth.disconnect(deviceId);
-    store.setState(deviceId, void 0, reason ?? "manualDisconnection");
-  },
-  async updateFirmware(deviceId, bootloader, firmware, progressCallback) {
-    return bridgeOtaService.updateFirmware(deviceId, bootloader, firmware, progressCallback);
+    return promiseQueue.enqueue(device, writeCommand);
   }
 };
 
@@ -2062,8 +2056,13 @@ const bridgeService = {
   getVehicleReadings,
   resetAutolearnStatuses,
   getAutolearnStatuses,
-  isRebootRequired
+  isRebootRequired,
+  sendPinCommand
 };
+async function sendPinCommand(deviceId) {
+  if (!canCommunicateWith(deviceId)) throw new Error("Bridge not connected");
+  await bridgeCommands.sendPinCommand(deviceId);
+}
 async function updateFirmware(deviceId, bootloader, firmware, reportStatus) {
   reportStatus("Sending OTA Request...", 0.02);
   await bridgeCommands.sendOtaRequest(deviceId);
@@ -2385,7 +2384,7 @@ async function getVehicleReadings(deviceId, tcVehicle) {
   try {
     for (const vehicleTyre of tcVehicle.tcTyres) {
       if (vehicleTyre.tcTpmsSensor && vehicleTyre.mountedOn?.positionId) {
-        if (!canCommunicateWith(deviceId)) throw new Error("getVehicleReadings: no connected bridge");
+        if (!canCommunicateWith(deviceId)) break;
         const reading = await getSensorReading(deviceId, vehicleTyre.mountedOn.positionId);
         readings.push(reading);
       }
@@ -2683,12 +2682,28 @@ function isRebootRequired(deviceId) {
 
 const bridge = {
   disconnect,
-  async connect(deviceId, accessLevel) {
-    if (canCommunicateWith(deviceId)) return;
-    await promiseQueue$1.clearQueue("Previous pending commands aborted");
-    const bridgeMeta = deviceMeta.bridge;
-    await bluetooth.connect(deviceId, disconnect);
-    const _deviceId = store.deviceIdMapingTable[deviceId] ?? deviceId;
+  connect,
+  getVehicle: bridgeService.getVehicle,
+  setVehicle: bridgeService.setVehicle,
+  getConfiguration: bridgeService.getConfiguration,
+  setConfiguration: bridgeService.setConfiguration,
+  getSensorReading: bridgeService.getSensorReading,
+  getVehicleReadings: bridgeService.getVehicleReadings,
+  getAutolearnStatuses: bridgeService.getAutolearnStatuses,
+  resetAutolearnStatuses: bridgeService.resetAutolearnStatuses,
+  updateFirmware: bridgeService.updateFirmware,
+  isRebootRequired: bridgeService.isRebootRequired
+};
+async function connect(deviceId, accessLevel) {
+  if (canCommunicateWith(deviceId)) return;
+  await promiseQueue.clearQueue(deviceId, "Previous pending commands aborted");
+  const bridgeMeta = deviceMeta.bridge;
+  await bluetooth.connect(deviceId, disconnect);
+  if (store.deviceState[deviceId] === "paired") {
+    return console.warn("Connect Warn: Already connected");
+  }
+  const _deviceId = store.deviceIdMapingTable[deviceId] ?? deviceId;
+  try {
     if (store.platform !== "ios") {
       await ble.requestMtu(_deviceId, deviceMeta.bridge.mtu);
     }
@@ -2696,28 +2711,22 @@ const bridge = {
       _deviceId,
       bridgeMeta.communication.serviceId,
       bridgeMeta.communication.characteristicId,
-      (notification) => promiseQueue$1.processMessage(deviceId, notification),
+      (notification) => promiseQueue.processMessage(deviceId, notification),
       (error) => console.error("startNotification Error", error)
     );
     store.deviceAccessLevel[deviceId] = accessLevel ?? "driver";
     store.bridgeRebootRequired[deviceId] = false;
-    await bridgeCommands.sendPinCommand(deviceId);
+    await bridgeService.sendPinCommand(deviceId);
     store.setState(deviceId, "paired");
-  },
-  getVehicle: bridgeService.getVehicle,
-  setVehicle: bridgeService.setVehicle,
-  getConfiguration: bridgeService.getConfiguration,
-  setConfiguration: bridgeService.setConfiguration,
-  getSensorReading: bridgeService.getSensorReading,
-  getVehicleReadings: bridgeService.getVehicleReadings,
-  getAutolearnStatuses: bridgeService.getAutolearnStatuses,
-  resetAutolearnStatuses: bridgeService.resetAutolearnStatuses,
-  updateFirmware: bridgeService.updateFirmware,
-  isRebootRequired: bridgeService.isRebootRequired
-};
+  } catch (e) {
+    disconnect(deviceId);
+    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$1.clearQueue("Previous pending commands aborted");
+  promiseQueue.clearQueue(deviceId, "Previous pending commands aborted");
   await bluetooth.disconnect(deviceId);
   delete store.devices[deviceId];
   deviceUnreachableCallback?.(deviceId);
@@ -2729,11 +2738,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`);
@@ -2772,10 +2783,7 @@ async function getBattery(deviceId) {
 }
 
 let sensorReadings = [];
-let treadDepthCallback;
-let buttonCallback;
-let tpmsCallback;
-const capabilities = [
+const capabilities$1 = [
   {
     id: "td",
     processFn: processTreadDepth,
@@ -2812,7 +2820,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);
       }
@@ -2822,12 +2830,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(" ");
@@ -2847,12 +2855,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);
   }
 }
 
@@ -2881,6 +2890,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];
@@ -3254,6 +3312,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.94",
+  "version": "0.1.96",
   "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",