npm - @psdk/device-ble-taro - Versions diffs - 0.3.4 → 0.5.0 - Mend

@psdk/device-ble-taro 0.3.4 → 0.5.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

package/build/connected.js CHANGED Viewed

@@ -1,11 +1,22 @@
-import { ConnectionState } from "@psdk/frame-father";
-import Timeout from 'await-timeout';
-import Taro from "@tarojs/taro";
-export class TaroBleConnectedDevice {
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TaroBleConnectedDevice = void 0;
+const frame_father_1 = require("@psdk/frame-father");
+const await_timeout_1 = __importDefault(require("await-timeout"));
+const taro_1 = __importDefault(require("@tarojs/taro"));
+class TaroBleConnectedDevice {
+    device;
+    scpair;
+    _connectionState;
+    dataOfRead;
+    notifyCallback;
     constructor(options) {
         this.device = options.device;
         this.scpair = options.scpair;
-        this._connectionState = ConnectionState.CONNECTED;
+        this._connectionState = frame_father_1.ConnectionState.CONNECTED;
         this.dataOfRead = [];
         this.doListen();
     }
@@ -15,16 +26,16 @@ export class TaroBleConnectedDevice {
     doListen() {
         if (this.scpair.read == null)
             return;
-        Taro.onBLECharacteristicValueChange(async (value) => {
+        taro_1.default.onBLECharacteristicValueChange(async (value) => {
             // this.dataOfRead.push(value)
             if (this.notifyCallback) {
                 await this.notifyCallback(value);
             }
         });
-        Taro.onBLEConnectionStateChange(value => {
-            this._connectionState = value.connected ? ConnectionState.CONNECTED : ConnectionState.DISCONNECTED;
+        taro_1.default.onBLEConnectionStateChange(value => {
+            this._connectionState = value.connected ? frame_father_1.ConnectionState.CONNECTED : frame_father_1.ConnectionState.DISCONNECTED;
         });
-        Taro.notifyBLECharacteristicValueChange({
+        taro_1.default.notifyBLECharacteristicValueChange({
             deviceId: this.device.deviceId,
             serviceId: this.scpair.service.uuid,
             characteristicId: this.scpair.read.uuid,
@@ -40,7 +51,7 @@ export class TaroBleConnectedDevice {
                 reject(`the connect device not support read operation: service id: [${this.scpair.service.uuid}]`);
                 return;
             }
-            Taro.readBLECharacteristicValue({
+            taro_1.default.readBLECharacteristicValue({
                 deviceId: this.device.deviceId,
                 serviceId: this.scpair.service.uuid,
                 characteristicId: this.scpair.read.uuid,
@@ -67,7 +78,7 @@ export class TaroBleConnectedDevice {
     }
     async disconnect() {
         return new Promise((resolve, reject) => {
-            Taro.closeBLEConnection({
+            taro_1.default.closeBLEConnection({
                 deviceId: this.device.deviceId,
                 success: () => {
                     this.device = null;
@@ -83,12 +94,11 @@ export class TaroBleConnectedDevice {
         return this.scpair.read != null;
     }
     async read(options) {
-        var _a;
         if (this.dataOfRead.length > 0) {
             this.dataOfRead.splice(0, this.dataOfRead.length);
         }
         await this.realRead();
-        const timeout = ((_a = options === null || options === void 0 ? void 0 : options.timeout) !== null && _a !== void 0 ? _a : 5000);
+        const timeout = (options?.timeout ?? 5000);
         const startTime = +new Date();
         while (true) {
             const now = +new Date();
@@ -96,7 +106,7 @@ export class TaroBleConnectedDevice {
                 return new Uint8Array([]);
             }
             if (this.dataOfRead.length == 0) {
-                await Timeout.set(100);
+                await await_timeout_1.default.set(100);
                 continue;
             }
             const data = this.dataOfRead.pop();
@@ -106,7 +116,7 @@ export class TaroBleConnectedDevice {
     }
     async write(data) {
         return new Promise((resolve, reject) => {
-            Taro.writeBLECharacteristicValue({
+            taro_1.default.writeBLECharacteristicValue({
                 deviceId: this.device.deviceId,
                 serviceId: this.scpair.service.uuid,
                 characteristicId: this.scpair.write.uuid,
@@ -128,3 +138,4 @@ export class TaroBleConnectedDevice {
         this.dataOfRead.splice(0, this.dataOfRead.length);
     }
 }
+exports.TaroBleConnectedDevice = TaroBleConnectedDevice;

package/build/index.js CHANGED Viewed

@@ -1,2 +1,18 @@
-export * from './connected';
-export * from './provider';
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./connected"), exports);
+__exportStar(require("./provider"), exports);

package/build/provider.js CHANGED Viewed

@@ -1,9 +1,18 @@
-import { Jluetooth, JluetoothDevice, TBluetoothHelpers, } from "@psdk/device-bluetooth-traits";
-import { ConnectionState } from "@psdk/frame-father";
-import Timeout from 'await-timeout';
-import { TaroBleConnectedDevice } from "./connected";
-import Taro from "@tarojs/taro";
-export class TaroBleBluetooth extends Jluetooth {
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TaroBleBluetooth = void 0;
+const device_bluetooth_traits_1 = require("@psdk/device-bluetooth-traits");
+const frame_father_1 = require("@psdk/frame-father");
+const await_timeout_1 = __importDefault(require("await-timeout"));
+const connected_1 = require("./connected");
+const taro_1 = __importDefault(require("@tarojs/taro"));
+class TaroBleBluetooth extends device_bluetooth_traits_1.Jluetooth {
+    options;
+    discoveredCallback;
+    connectedDevice;
     constructor(options) {
         super();
         this.options = options;
@@ -12,11 +21,11 @@ export class TaroBleBluetooth extends Jluetooth {
     isConnected() {
         if (!this.connectedDevice)
             return false;
-        return this.connectedDevice.connectionState() === ConnectionState.CONNECTED;
+        return this.connectedDevice.connectionState() === frame_father_1.ConnectionState.CONNECTED;
     }
     async bluetoothAdapterState() {
         return new Promise((resolve, reject) => {
-            Taro.getBluetoothAdapterState({
+            taro_1.default.getBluetoothAdapterState({
                 success: (r) => resolve(r),
                 // @ts-ignore
                 fail: (e) => reject(e)
@@ -24,16 +33,15 @@ export class TaroBleBluetooth extends Jluetooth {
         });
     }
     async connect(device, options) {
-        var _a;
         if (this.isConnected()) {
-            if (!((_a = options === null || options === void 0 ? void 0 : options.autoSwitchDevice) !== null && _a !== void 0 ? _a : false)) {
+            if (!(options?.autoSwitchDevice ?? false)) {
                 return this.connectedDevice;
             }
             await this.connectedDevice.disconnect();
         }
         const origin = device.origin;
-        await this.createBLEConnection({ deviceId: origin.deviceId, timeout: options === null || options === void 0 ? void 0 : options.timeout, });
-        await Timeout.set(500);
+        await this.createBLEConnection({ deviceId: origin.deviceId, timeout: options?.timeout, });
+        await await_timeout_1.default.set(500);
         const services = await this.getBLEDeviceServices({ deviceId: origin.deviceId });
         const scpair = await this.findSCPair({
             deviceId: origin.deviceId,
@@ -42,7 +50,7 @@ export class TaroBleBluetooth extends Jluetooth {
         if (!scpair) {
             return Promise.reject(`Can not get write characteristic by device: ${device.name}`);
         }
-        this.connectedDevice = new TaroBleConnectedDevice({
+        this.connectedDevice = new connected_1.TaroBleConnectedDevice({
             device: origin,
             scpair,
         });
@@ -55,18 +63,18 @@ export class TaroBleBluetooth extends Jluetooth {
     async startDiscovery() {
         await this.requestLocation();
         await this.closeBluetoothAdapter();
-        await Timeout.set(300);
+        await await_timeout_1.default.set(300);
         await this.openBluetoothAdapter();
         const state = await this.bluetoothAdapterState();
         if (!state.available) {
-            await Timeout.set(500);
+            await await_timeout_1.default.set(500);
         }
         if (state.discovering) {
             await this.stopDiscovery();
-            await Timeout.set(500);
+            await await_timeout_1.default.set(500);
         }
         return new Promise((resolve, reject) => {
-            Taro.startBluetoothDevicesDiscovery({
+            taro_1.default.startBluetoothDevicesDiscovery({
                 // services: this.allowServices,
                 allowDuplicatesKey: false,
                 interval: 0,
@@ -79,7 +87,7 @@ export class TaroBleBluetooth extends Jluetooth {
     }
     async stopDiscovery() {
         return new Promise((resolve, reject) => {
-            Taro.stopBluetoothDevicesDiscovery({
+            taro_1.default.stopBluetoothDevicesDiscovery({
                 success: (result) => resolve(result),
                 // @ts-ignore
                 fail: (e) => reject(e),
@@ -89,7 +97,7 @@ export class TaroBleBluetooth extends Jluetooth {
     // ### inner function
     async openBluetoothAdapter() {
         return new Promise((resolve, reject) => {
-            Taro.openBluetoothAdapter({
+            taro_1.default.openBluetoothAdapter({
                 success: (ret) => {
                     if (ret.errMsg && ret.errMsg.indexOf('ok') == -1) {
                         reject(ret);
@@ -104,7 +112,7 @@ export class TaroBleBluetooth extends Jluetooth {
     }
     async closeBluetoothAdapter() {
         return new Promise((resolve, reject) => {
-            Taro.closeBluetoothAdapter({
+            taro_1.default.closeBluetoothAdapter({
                 success: (ret) => {
                     if (ret.errMsg && ret.errMsg.indexOf('ok') == -1) {
                         reject(ret);
@@ -118,20 +126,19 @@ export class TaroBleBluetooth extends Jluetooth {
         });
     }
     onBluetoothDeviceFound() {
-        Taro.onBluetoothDeviceFound(async (result) => {
+        taro_1.default.onBluetoothDeviceFound(async (result) => {
             const foundDevices = result.devices;
             if (!foundDevices.length) {
                 return;
             }
             const devices = foundDevices
                 .filter(item => {
-                var _a, _b;
                 const name = item.name || item.localName;
                 if (name)
                     return true;
-                return (_b = (_a = this.options) === null || _a === void 0 ? void 0 : _a.allowNoName) !== null && _b !== void 0 ? _b : true;
+                return this.options?.allowNoName ?? true;
             })
-                .map(item => new JluetoothDevice({
+                .map(item => new device_bluetooth_traits_1.JluetoothDevice({
                 origin: item,
                 name: item.name || item.localName,
                 deviceId: item.deviceId,
@@ -146,7 +153,7 @@ export class TaroBleBluetooth extends Jluetooth {
     }
     async createBLEConnection(options) {
         return new Promise((resolve, reject) => {
-            Taro.createBLEConnection({
+            taro_1.default.createBLEConnection({
                 deviceId: options.deviceId,
                 timeout: options.timeout,
                 success: () => resolve(),
@@ -157,7 +164,7 @@ export class TaroBleBluetooth extends Jluetooth {
     }
     async getBLEDeviceServices(options) {
         return new Promise((resolve, reject) => {
-            Taro.getBLEDeviceServices({
+            taro_1.default.getBLEDeviceServices({
                 deviceId: options.deviceId,
                 success: (result) => {
                     if (result.errMsg.indexOf('ok') == -1) {
@@ -173,7 +180,7 @@ export class TaroBleBluetooth extends Jluetooth {
     }
     async getBLEDeviceCharacteristics(options) {
         return new Promise((resolve, reject) => {
-            Taro.getBLEDeviceCharacteristics({
+            taro_1.default.getBLEDeviceCharacteristics({
                 deviceId: options.deviceId,
                 serviceId: options.serviceId,
                 success: (result) => {
@@ -196,7 +203,7 @@ export class TaroBleBluetooth extends Jluetooth {
             //   // @ts-ignore
             //   fail: (e) => reject(e),
             // });
-            Taro.getLocation({
+            taro_1.default.getLocation({
                 success: () => resolve(),
                 // @ts-ignore
                 fail: (e) => reject(e),
@@ -204,7 +211,6 @@ export class TaroBleBluetooth extends Jluetooth {
         });
     }
     async findSCPair(options) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         // fill data
         const _characteristicsMap = new Map();
         for (const service of options.services) {
@@ -215,21 +221,21 @@ export class TaroBleBluetooth extends Jluetooth {
             _characteristicsMap.set(service.uuid, characteristics);
         }
         // use special first
-        if (((_a = this.options) === null || _a === void 0 ? void 0 : _a.allowedWriteCharacteristic) && ((_b = this.options) === null || _b === void 0 ? void 0 : _b.allowedReadCharacteristic)) {
+        if (this.options?.allowedWriteCharacteristic && this.options?.allowedReadCharacteristic) {
             for (const service of options.services) {
-                if (!TBluetoothHelpers.isAllowServices(service.uuid, (_c = this.options) === null || _c === void 0 ? void 0 : _c.allowServices)) {
+                if (!device_bluetooth_traits_1.TBluetoothHelpers.isAllowServices(service.uuid, this.options?.allowServices)) {
                     continue;
                 }
                 const characteristics = _characteristicsMap.get(service.uuid);
                 let writeCharacteristic = null;
                 let readCharacteristic = null;
                 for (const characteristic of characteristics) {
-                    if (((_d = this.options) === null || _d === void 0 ? void 0 : _d.allowedWriteCharacteristic.toLowerCase()) == characteristic.uuid.toLowerCase()) {
+                    if (this.options?.allowedWriteCharacteristic.toLowerCase() == characteristic.uuid.toLowerCase()) {
                         writeCharacteristic = characteristic;
                     }
                 }
                 for (const characteristic of characteristics) {
-                    if (((_e = this.options) === null || _e === void 0 ? void 0 : _e.allowedReadCharacteristic.toLowerCase()) == characteristic.uuid.toLowerCase()) {
+                    if (this.options?.allowedReadCharacteristic.toLowerCase() == characteristic.uuid.toLowerCase()) {
                         readCharacteristic = characteristic;
                     }
                 }
@@ -244,7 +250,7 @@ export class TaroBleBluetooth extends Jluetooth {
         }
         // choose best characteristic
         for (const service of options.services) {
-            if (!TBluetoothHelpers.isAllowServices(service.uuid, (_f = this.options) === null || _f === void 0 ? void 0 : _f.allowServices)) {
+            if (!device_bluetooth_traits_1.TBluetoothHelpers.isAllowServices(service.uuid, this.options?.allowServices)) {
                 continue;
             }
             const characteristics = _characteristicsMap.get(service.uuid);
@@ -263,10 +269,10 @@ export class TaroBleBluetooth extends Jluetooth {
                 };
             }
         }
-        if ((_h = (_g = this.options) === null || _g === void 0 ? void 0 : _g.allowDetectDifferentCharacteristic) !== null && _h !== void 0 ? _h : true) {
+        if (this.options?.allowDetectDifferentCharacteristic ?? true) {
             // choose different characteristic with write and read properties
             for (const service of options.services) {
-                if (!TBluetoothHelpers.isAllowServices(service.uuid, (_j = this.options) === null || _j === void 0 ? void 0 : _j.allowServices)) {
+                if (!device_bluetooth_traits_1.TBluetoothHelpers.isAllowServices(service.uuid, this.options?.allowServices)) {
                     continue;
                 }
                 const characteristics = _characteristicsMap.get(service.uuid);
@@ -291,7 +297,7 @@ export class TaroBleBluetooth extends Jluetooth {
         else {
             // only write
             for (const service of options.services) {
-                if (!TBluetoothHelpers.isAllowServices(service.uuid, (_k = this.options) === null || _k === void 0 ? void 0 : _k.allowServices)) {
+                if (!device_bluetooth_traits_1.TBluetoothHelpers.isAllowServices(service.uuid, this.options?.allowServices)) {
                     continue;
                 }
                 const characteristics = _characteristicsMap.get(service.uuid);
@@ -310,3 +316,4 @@ export class TaroBleBluetooth extends Jluetooth {
         }
     }
 }
+exports.TaroBleBluetooth = TaroBleBluetooth;

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@psdk/device-ble-taro",
-  "version": "0.3.4",
+  "version": "0.5.0",
   "description": "psdk",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -15,25 +15,23 @@
   },
   "author": "",
   "devDependencies": {
-    "@babel/core": "^7.24.5",
-    "@babel/preset-env": "^7.24.5",
-    "@babel/preset-typescript": "^7.24.1",
-    "@tarojs/taro": "^3.6.29",
+    "@tarojs/taro": "^3.6.34",
     "@types/jest": "^29.5.12",
     "@vercel/ncc": "^0.38.1",
-    "babel-jest": "^29.7.0",
     "jest": "^29.7.0",
-    "typedoc": "^0.25.13",
-    "typescript": "^5.4.5"
+    "ts-jest": "^29.1.5",
+    "ts-node": "^10.9.2",
+    "typedoc": "^0.26.4",
+    "typescript": "^5.5.3"
   },
   "dependencies": {
-    "@psdk/device-bluetooth-traits": "0.3.4",
-    "@psdk/frame-father": "0.3.4",
+    "@psdk/device-bluetooth-traits": "0.5.0",
+    "@psdk/frame-father": "0.5.0",
     "await-timeout": "^1.1.1"
   },
   "files": [
     "build",
     "!build/browser/psdk*"
   ],
-  "gitHead": "b8c2fdcb52f1bd3e9d75d004d37d717bd465b4c9"
+  "gitHead": "0de75b4e37274d7a68a04aa34501fa3297769185"
 }