@psdk/device-ble-taro 0.5.12 → 0.5.13

package/build/connected.js

@@ -8,11 +8,6 @@ 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;
@@ -94,11 +89,12 @@ 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 = (options?.timeout ?? 5000);
+        const timeout = ((_a = options === null || options === void 0 ? void 0 : options.timeout) !== null && _a !== void 0 ? _a : 5000);
         const startTime = +new Date();
         while (true) {
             const now = +new Date();

package/build/provider.js

@@ -10,9 +10,6 @@ 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;
@@ -33,14 +30,15 @@ class TaroBleBluetooth extends device_bluetooth_traits_1.Jluetooth {
         });
     }
     async connect(device, options) {
+        var _a;
         if (this.isConnected()) {
-            if (!(options?.autoSwitchDevice ?? false)) {
+            if (!((_a = options === null || options === void 0 ? void 0 : options.autoSwitchDevice) !== null && _a !== void 0 ? _a : false)) {
                 return this.connectedDevice;
             }
             await this.connectedDevice.disconnect();
         }
         const origin = device.origin;
-        await this.createBLEConnection({ deviceId: origin.deviceId, timeout: options?.timeout, });
+        await this.createBLEConnection({ deviceId: origin.deviceId, timeout: options === null || options === void 0 ? void 0 : options.timeout, });
         await await_timeout_1.default.set(500);
         const services = await this.getBLEDeviceServices({ deviceId: origin.deviceId });
         const scpair = await this.findSCPair({
@@ -133,10 +131,11 @@ class TaroBleBluetooth extends device_bluetooth_traits_1.Jluetooth {
             }
             const devices = foundDevices
                 .filter(item => {
+                var _a, _b;
                 const name = item.name || item.localName;
                 if (name)
                     return true;
-                return this.options?.allowNoName ?? true;
+                return (_b = (_a = this.options) === null || _a === void 0 ? void 0 : _a.allowNoName) !== null && _b !== void 0 ? _b : true;
             })
                 .map(item => new device_bluetooth_traits_1.JluetoothDevice({
                 origin: item,
@@ -211,6 +210,7 @@ class TaroBleBluetooth extends device_bluetooth_traits_1.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) {
@@ -221,21 +221,21 @@ class TaroBleBluetooth extends device_bluetooth_traits_1.Jluetooth {
             _characteristicsMap.set(service.uuid, characteristics);
         }
         // use special first
-        if (this.options?.allowedWriteCharacteristic && this.options?.allowedReadCharacteristic) {
+        if (((_a = this.options) === null || _a === void 0 ? void 0 : _a.allowedWriteCharacteristic) && ((_b = this.options) === null || _b === void 0 ? void 0 : _b.allowedReadCharacteristic)) {
             for (const service of options.services) {
-                if (!device_bluetooth_traits_1.TBluetoothHelpers.isAllowServices(service.uuid, this.options?.allowServices)) {
+                if (!device_bluetooth_traits_1.TBluetoothHelpers.isAllowServices(service.uuid, (_c = this.options) === null || _c === void 0 ? void 0 : _c.allowServices)) {
                     continue;
                 }
                 const characteristics = _characteristicsMap.get(service.uuid);
                 let writeCharacteristic = null;
                 let readCharacteristic = null;
                 for (const characteristic of characteristics) {
-                    if (this.options?.allowedWriteCharacteristic.toLowerCase() == characteristic.uuid.toLowerCase()) {
+                    if (((_d = this.options) === null || _d === void 0 ? void 0 : _d.allowedWriteCharacteristic.toLowerCase()) == characteristic.uuid.toLowerCase()) {
                         writeCharacteristic = characteristic;
                     }
                 }
                 for (const characteristic of characteristics) {
-                    if (this.options?.allowedReadCharacteristic.toLowerCase() == characteristic.uuid.toLowerCase()) {
+                    if (((_e = this.options) === null || _e === void 0 ? void 0 : _e.allowedReadCharacteristic.toLowerCase()) == characteristic.uuid.toLowerCase()) {
                         readCharacteristic = characteristic;
                     }
                 }
@@ -250,7 +250,7 @@ class TaroBleBluetooth extends device_bluetooth_traits_1.Jluetooth {
         }
         // choose best characteristic
         for (const service of options.services) {
-            if (!device_bluetooth_traits_1.TBluetoothHelpers.isAllowServices(service.uuid, this.options?.allowServices)) {
+            if (!device_bluetooth_traits_1.TBluetoothHelpers.isAllowServices(service.uuid, (_f = this.options) === null || _f === void 0 ? void 0 : _f.allowServices)) {
                 continue;
             }
             const characteristics = _characteristicsMap.get(service.uuid);
@@ -269,10 +269,10 @@ class TaroBleBluetooth extends device_bluetooth_traits_1.Jluetooth {
                 };
             }
         }
-        if (this.options?.allowDetectDifferentCharacteristic ?? true) {
+        if ((_h = (_g = this.options) === null || _g === void 0 ? void 0 : _g.allowDetectDifferentCharacteristic) !== null && _h !== void 0 ? _h : true) {
             // choose different characteristic with write and read properties
             for (const service of options.services) {
-                if (!device_bluetooth_traits_1.TBluetoothHelpers.isAllowServices(service.uuid, this.options?.allowServices)) {
+                if (!device_bluetooth_traits_1.TBluetoothHelpers.isAllowServices(service.uuid, (_j = this.options) === null || _j === void 0 ? void 0 : _j.allowServices)) {
                     continue;
                 }
                 const characteristics = _characteristicsMap.get(service.uuid);
@@ -297,7 +297,7 @@ class TaroBleBluetooth extends device_bluetooth_traits_1.Jluetooth {
         else {
             // only write
             for (const service of options.services) {
-                if (!device_bluetooth_traits_1.TBluetoothHelpers.isAllowServices(service.uuid, this.options?.allowServices)) {
+                if (!device_bluetooth_traits_1.TBluetoothHelpers.isAllowServices(service.uuid, (_k = this.options) === null || _k === void 0 ? void 0 : _k.allowServices)) {
                     continue;
                 }
                 const characteristics = _characteristicsMap.get(service.uuid);