@psdk/device-ble-taro - npm Package Compare versions

Comparing version 0.2.58 to 0.2.59

build/connected.js

@@ -31,2 +31,4 @@ "use strict";
     doListen() {
+        if (this.scpair.read == null)
+            return;
         taro_1.default.onBLECharacteristicValueChange((value) => __awaiter(this, void 0, void 0, function* () {
@@ -33,0 +35,0 @@ // this.dataOfRead.push(value)

build/provider.js

@@ -242,3 +242,3 @@ "use strict";
     findSCPair(options) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         return __awaiter(this, void 0, void 0, function* () {
@@ -255,16 +255,25 @@ // fill data
             // use special first
-            if ((_a = this.options) === null || _a === void 0 ? void 0 : _a.allowCharacteristic) {
+            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, (_b = this.options) === null || _b === void 0 ? void 0 : _b.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 (((_c = this.options) === null || _c === void 0 ? void 0 : _c.allowCharacteristic) != characteristic.uuid)
-                            continue;
-                        const properties = characteristic.properties;
+                        if (((_d = this.options) === null || _d === void 0 ? void 0 : _d.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()) {
+                            readCharacteristic = characteristic;
+                        }
+                    }
+                    if (writeCharacteristic != null && readCharacteristic != null) {
                         return {
                             service,
-                            write: characteristic,
-                            read: properties.notify ? characteristic : null,
+                            write: writeCharacteristic,
+                            read: readCharacteristic,
                         };
@@ -276,3 +285,3 @@ }
             for (const service of options.services) {
-                if (!device_bluetooth_traits_1.TBluetoothHelpers.isAllowServices(service.uuid, (_d = this.options) === null || _d === void 0 ? void 0 : _d.allowServices)) {
+                if (!device_bluetooth_traits_1.TBluetoothHelpers.isAllowServices(service.uuid, (_f = this.options) === null || _f === void 0 ? void 0 : _f.allowServices)) {
                     continue;
@@ -296,6 +305,6 @@ }
             }
-            if ((_f = (_e = this.options) === null || _e === void 0 ? void 0 : _e.allowDetectDifferentCharacteristic) !== null && _f !== void 0 ? _f : 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, (_g = this.options) === null || _g === void 0 ? void 0 : _g.allowServices)) {
+                    if (!device_bluetooth_traits_1.TBluetoothHelpers.isAllowServices(service.uuid, (_j = this.options) === null || _j === void 0 ? void 0 : _j.allowServices)) {
                         continue;
@@ -325,3 +334,3 @@ }
                 for (const service of options.services) {
-                    if (!device_bluetooth_traits_1.TBluetoothHelpers.isAllowServices(service.uuid, (_h = this.options) === null || _h === void 0 ? void 0 : _h.allowServices)) {
+                    if (!device_bluetooth_traits_1.TBluetoothHelpers.isAllowServices(service.uuid, (_k = this.options) === null || _k === void 0 ? void 0 : _k.allowServices)) {
                         continue;
@@ -328,0 +337,0 @@ }

package.json

 {
   "name": "@psdk/device-ble-taro",
-  "version": "0.2.58",
+  "version": "0.2.59",
   "description": "psdk",
@@ -49,4 +49,4 @@ "main": "build/index.js",
   "dependencies": {
-    "@psdk/device-bluetooth-traits": "0.2.58",
-    "@psdk/frame-father": "0.2.58",
+    "@psdk/device-bluetooth-traits": "0.2.59",
+    "@psdk/frame-father": "0.2.59",
     "await-timeout": "^1.1.1"
@@ -58,3 +58,3 @@ },
   ],
-  "gitHead": "0af603c67f29dde30d53226ba732565150126a8d"
+  "gitHead": "5f2a48ddd7c5a15ec63854fa5dc086b60617e972"
 }

No alert changes

Improved metrics

Total package byte prevSize

29005

increased by2.58%

Lines of code

572

increased by1.96%

Dependency changes

• + Added@psdk/device-bluetooth-traits@0.2.59(transitive)

• + Added@psdk/frame-father@0.2.59(transitive)

• - Removed@psdk/device-bluetooth-traits@0.2.58(transitive)

• - Removed@psdk/frame-father@0.2.58(transitive)

• Updated@psdk/device-bluetooth-traits@0.2.59

• Updated@psdk/frame-father@0.2.59