tirecheck-device-sdk 0.1.6 → 0.1.8

package/README.md

@@ -54,6 +54,11 @@ await tirecheckDeviceSdk.bridge.readVehicleSchema(deviceId)
 
 That should open Vitest's UI. Feel free to add new functionality and tests.
 
+### Publishing your changes
+
+CI is set up in a way that new version of package is published to NPM if change in `package.json`'s `version` field is
+detected. So, if you want to publish your changes, increment version in package.json as part of your merge request.
+
 ### Test-driven development
 
 For this project, we advice to follow TDD for every feature. That means that you first write failing test, and then add

package/dist/index.cjs

@@ -407,6 +407,49 @@ function processIosAdvertising(adv, isKrone) {
   return advertisingData;
 }
 
+const bridgeOtaAdvertisingParser = {
+  getDeviceInfoFromAdvertising: (device) => {
+    const adv = Array.from(new Uint8Array(device.advertising));
+    let deviceId = "";
+    let bridgeId = "";
+    let processedByteCount = 0;
+    if (store.platform === "ios") {
+      if (!device.advertising.kCBAdvDataLeBluetoothDeviceAddress)
+        return console.warn("No mac address in advertising data");
+      const macAddress = Array.from(new Uint8Array(device.advertising.kCBAdvDataLeBluetoothDeviceAddress)).map(
+        (x) => bridgeTools.decimalToHex(x).toUpperCase()
+      );
+      deviceId = macAddress.join(":");
+      bridgeId = macAddress.join("");
+    } else {
+      do {
+        const length = adv[processedByteCount];
+        const identificator = adv[processedByteCount + 1];
+        const packet = adv.slice(processedByteCount, processedByteCount + length + 1);
+        if (!length) {
+          processedByteCount = adv.length;
+        }
+        processedByteCount += length + 1;
+        if (identificator === 27) {
+          const macAddress = packet.slice(-6).reverse().map((x) => bridgeTools.decimalToHex(x).toUpperCase());
+          deviceId = macAddress.join(":");
+          bridgeId = macAddress.join("");
+          processedByteCount = adv.length;
+        }
+      } while (processedByteCount < adv.length);
+    }
+    if (!deviceId) return console.warn("Failed to get device Id");
+    store.deviceIdMapingTable[deviceId] = device.id;
+    const bleDevice = {
+      ...device,
+      id: deviceId,
+      advertisingData: { bridgeId },
+      type: "bridgeOta"
+    };
+    return bleDevice;
+  }
+};
+
 const deviceMeta = {
   bridge: {
     nameRegex: /(030303|030321)/,
@@ -424,13 +467,7 @@ const deviceMeta = {
       serviceId: "4880c12c-fdcb-4077-8920-a450d7f9b907",
       characteristicId: "fec26ec4-6d71-4442-9f81-55bc21d658d7"
     },
-    getDeviceInfoFromAdvertising: (device) => {
-      const bleDevice = {
-        ...device,
-        type: "bridgeOta"
-      };
-      return bleDevice;
-    }
+    getDeviceInfoFromAdvertising: bridgeOtaAdvertisingParser.getDeviceInfoFromAdvertising
   },
   flexiGaugeTpms: {
     nameRegex: /Flexi.*/,
@@ -526,6 +563,7 @@ async function scanDevices(services = [], duration) {
   );
 }
 async function connect(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++) {
@@ -1942,7 +1980,7 @@ const bridgeOtaCommands = {
   }
 };
 
-const mtu = 180;
+const mtu = store.platform === "android" ? 512 : 180;
 const bridgeOtaService = {
   async updateFirmware(deviceId, bootloader, firmware, progressCallback) {
     await delay(2e3);
@@ -1958,7 +1996,7 @@ const bridgeOtaService = {
     await bridgeOtaCommands.endOta(deviceId);
     progressCallback("Upload completed, disconnecting...", 0.81);
     await bridgeOta.disconnect(deviceId);
-    progressCallback("Disconnected...", 0.82);
+    progressCallback("Disconnected...", 1);
   }
 };
 async function uploadOta(deviceId, firmwareBinary, reportStatus) {
@@ -2630,6 +2668,7 @@ function createNewTyre(positionId) {
 
 const bridge = {
   async connect(deviceId, accessLevel) {
+    if (canCommunicateWith(deviceId)) return;
     await promiseQueue$1.clearQueue("Previous pending commands aborted");
     const bridgeMeta = deviceMeta.bridge;
     await bluetooth.connect(deviceId, this.disconnect);

package/dist/index.d.cts

@@ -66,7 +66,7 @@ declare const _default$1: {
             serviceId: string;
             characteristicId: string;
         };
-        getDeviceInfoFromAdvertising: (device: PeripheralData) => BleBridgeOta;
+        getDeviceInfoFromAdvertising: (device: PeripheralData) => void | BleDevice;
     };
     flexiGaugeTpms: {
         nameRegex: RegExp;
@@ -838,6 +838,9 @@ interface BleFlexiGaugeTpms extends BleDeviceBase {
     type: 'flexiGaugeTpms';
 }
 interface BleBridgeOta extends BleDeviceBase {
+    advertisingData: {
+        bridgeId: string;
+    };
     type: 'bridgeOta';
 }
 interface BleBridgeSimulated extends BleBridge {
@@ -877,7 +880,7 @@ declare function createTirecheckDeviceSdk(bleImplementation: BleImplementation,
         onDeviceStateChange(callback: (deviceId: string, state: string | undefined) => void): void;
         scanDevices: (services?: string[], duration?: number) => Promise<void>;
         stopScan(): void;
-        connect: (deviceId: string, disconnectCallback: (deviceId: string) => void) => Promise<PeripheralDataExtended | undefined>;
+        connect: (deviceId: string, disconnectCallback: (deviceId: string) => void) => Promise<void | PeripheralDataExtended>;
         disconnect: (deviceId: string) => Promise<void>;
         write: (deviceId: string, serviceUuid: string, characteristicUuid: string, value: ArrayBuffer) => Promise<void>;
         read: (deviceId: string, serviceUuid: string, characteristicUuid: string) => Promise<number[]>;

package/dist/index.d.mts

@@ -66,7 +66,7 @@ declare const _default$1: {
             serviceId: string;
             characteristicId: string;
         };
-        getDeviceInfoFromAdvertising: (device: PeripheralData) => BleBridgeOta;
+        getDeviceInfoFromAdvertising: (device: PeripheralData) => void | BleDevice;
     };
     flexiGaugeTpms: {
         nameRegex: RegExp;
@@ -838,6 +838,9 @@ interface BleFlexiGaugeTpms extends BleDeviceBase {
     type: 'flexiGaugeTpms';
 }
 interface BleBridgeOta extends BleDeviceBase {
+    advertisingData: {
+        bridgeId: string;
+    };
     type: 'bridgeOta';
 }
 interface BleBridgeSimulated extends BleBridge {
@@ -877,7 +880,7 @@ declare function createTirecheckDeviceSdk(bleImplementation: BleImplementation,
         onDeviceStateChange(callback: (deviceId: string, state: string | undefined) => void): void;
         scanDevices: (services?: string[], duration?: number) => Promise<void>;
         stopScan(): void;
-        connect: (deviceId: string, disconnectCallback: (deviceId: string) => void) => Promise<PeripheralDataExtended | undefined>;
+        connect: (deviceId: string, disconnectCallback: (deviceId: string) => void) => Promise<void | PeripheralDataExtended>;
         disconnect: (deviceId: string) => Promise<void>;
         write: (deviceId: string, serviceUuid: string, characteristicUuid: string, value: ArrayBuffer) => Promise<void>;
         read: (deviceId: string, serviceUuid: string, characteristicUuid: string) => Promise<number[]>;

package/dist/index.d.ts

@@ -66,7 +66,7 @@ declare const _default$1: {
             serviceId: string;
             characteristicId: string;
         };
-        getDeviceInfoFromAdvertising: (device: PeripheralData) => BleBridgeOta;
+        getDeviceInfoFromAdvertising: (device: PeripheralData) => void | BleDevice;
     };
     flexiGaugeTpms: {
         nameRegex: RegExp;
@@ -838,6 +838,9 @@ interface BleFlexiGaugeTpms extends BleDeviceBase {
     type: 'flexiGaugeTpms';
 }
 interface BleBridgeOta extends BleDeviceBase {
+    advertisingData: {
+        bridgeId: string;
+    };
     type: 'bridgeOta';
 }
 interface BleBridgeSimulated extends BleBridge {
@@ -877,7 +880,7 @@ declare function createTirecheckDeviceSdk(bleImplementation: BleImplementation,
         onDeviceStateChange(callback: (deviceId: string, state: string | undefined) => void): void;
         scanDevices: (services?: string[], duration?: number) => Promise<void>;
         stopScan(): void;
-        connect: (deviceId: string, disconnectCallback: (deviceId: string) => void) => Promise<PeripheralDataExtended | undefined>;
+        connect: (deviceId: string, disconnectCallback: (deviceId: string) => void) => Promise<void | PeripheralDataExtended>;
         disconnect: (deviceId: string) => Promise<void>;
         write: (deviceId: string, serviceUuid: string, characteristicUuid: string, value: ArrayBuffer) => Promise<void>;
         read: (deviceId: string, serviceUuid: string, characteristicUuid: string) => Promise<number[]>;

package/dist/index.mjs

@@ -400,6 +400,49 @@ function processIosAdvertising(adv, isKrone) {
   return advertisingData;
 }
 
+const bridgeOtaAdvertisingParser = {
+  getDeviceInfoFromAdvertising: (device) => {
+    const adv = Array.from(new Uint8Array(device.advertising));
+    let deviceId = "";
+    let bridgeId = "";
+    let processedByteCount = 0;
+    if (store.platform === "ios") {
+      if (!device.advertising.kCBAdvDataLeBluetoothDeviceAddress)
+        return console.warn("No mac address in advertising data");
+      const macAddress = Array.from(new Uint8Array(device.advertising.kCBAdvDataLeBluetoothDeviceAddress)).map(
+        (x) => bridgeTools.decimalToHex(x).toUpperCase()
+      );
+      deviceId = macAddress.join(":");
+      bridgeId = macAddress.join("");
+    } else {
+      do {
+        const length = adv[processedByteCount];
+        const identificator = adv[processedByteCount + 1];
+        const packet = adv.slice(processedByteCount, processedByteCount + length + 1);
+        if (!length) {
+          processedByteCount = adv.length;
+        }
+        processedByteCount += length + 1;
+        if (identificator === 27) {
+          const macAddress = packet.slice(-6).reverse().map((x) => bridgeTools.decimalToHex(x).toUpperCase());
+          deviceId = macAddress.join(":");
+          bridgeId = macAddress.join("");
+          processedByteCount = adv.length;
+        }
+      } while (processedByteCount < adv.length);
+    }
+    if (!deviceId) return console.warn("Failed to get device Id");
+    store.deviceIdMapingTable[deviceId] = device.id;
+    const bleDevice = {
+      ...device,
+      id: deviceId,
+      advertisingData: { bridgeId },
+      type: "bridgeOta"
+    };
+    return bleDevice;
+  }
+};
+
 const deviceMeta = {
   bridge: {
     nameRegex: /(030303|030321)/,
@@ -417,13 +460,7 @@ const deviceMeta = {
       serviceId: "4880c12c-fdcb-4077-8920-a450d7f9b907",
       characteristicId: "fec26ec4-6d71-4442-9f81-55bc21d658d7"
     },
-    getDeviceInfoFromAdvertising: (device) => {
-      const bleDevice = {
-        ...device,
-        type: "bridgeOta"
-      };
-      return bleDevice;
-    }
+    getDeviceInfoFromAdvertising: bridgeOtaAdvertisingParser.getDeviceInfoFromAdvertising
   },
   flexiGaugeTpms: {
     nameRegex: /Flexi.*/,
@@ -519,6 +556,7 @@ async function scanDevices(services = [], duration) {
   );
 }
 async function connect(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++) {
@@ -1935,7 +1973,7 @@ const bridgeOtaCommands = {
   }
 };
 
-const mtu = 180;
+const mtu = store.platform === "android" ? 512 : 180;
 const bridgeOtaService = {
   async updateFirmware(deviceId, bootloader, firmware, progressCallback) {
     await delay(2e3);
@@ -1951,7 +1989,7 @@ const bridgeOtaService = {
     await bridgeOtaCommands.endOta(deviceId);
     progressCallback("Upload completed, disconnecting...", 0.81);
     await bridgeOta.disconnect(deviceId);
-    progressCallback("Disconnected...", 0.82);
+    progressCallback("Disconnected...", 1);
   }
 };
 async function uploadOta(deviceId, firmwareBinary, reportStatus) {
@@ -2623,6 +2661,7 @@ function createNewTyre(positionId) {
 
 const bridge = {
   async connect(deviceId, accessLevel) {
+    if (canCommunicateWith(deviceId)) return;
     await promiseQueue$1.clearQueue("Previous pending commands aborted");
     const bridgeMeta = deviceMeta.bridge;
     await bluetooth.connect(deviceId, this.disconnect);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tirecheck-device-sdk",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "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",
@@ -46,9 +46,9 @@
     "typecheck": "pnpm tsc --noEmit",
     "lint": "eslint \"{src,test}/**/*.{vue,ts,js}\"",
     "dev": "pnpm install && vitest --ui",
-    "dev-server-old": "ts-node ./devServer/devServer.ts",
     "dev-server": "npx --yes listhen -w --ws --open ./devServer/devServer.ts",
     "dev-ngrok": "node --loader ts-node/esm ./devServer/ngrok.mts",
+    "npmPublish": "node --loader ts-node/esm ./scripts/npmPublish.mts",
     "build": "unbuild"
   }
 }