@psdk/device-ble-taro 0.7.14 → 0.7.16

package/build/connected.d.ts

@@ -1,17 +1,26 @@
 import { ConnectedDevice, ConnectionState, ReadOptions } from "@psdk/frame-father";
 import Taro from "@tarojs/taro";
+import { BleFlowControlOptions } from "@psdk/device-bluetooth-traits";
 export declare class TaroBleConnectedDevice implements ConnectedDevice {
     private device;
     private scpair;
+    private flowControlWriter?;
     private _connectionState;
     private dataOfRead;
     private notifyCallback?;
+    private notifyReady;
     constructor(options: {
         device: Taro.onBluetoothDeviceFound.CallbackResultBlueToothDevice;
         scpair: ServiceCharacteristicPair;
+        flowControl?: BleFlowControlOptions;
     });
     notify(callback: (value: Uint8Array) => Promise<void>): void;
     private doListen;
+    private enableNotify;
+    private createFlowControlWriter;
+    private notifyFlowControl;
+    private isSameCharacteristicUuid;
+    private writeChunk;
     private realRead;
     origin(): Taro.onBluetoothDeviceFound.CallbackResultBlueToothDevice;
     connectionState(): ConnectionState;
@@ -26,5 +35,6 @@ export interface ServiceCharacteristicPair {
     service: Taro.getBLEDeviceServices.BLEService;
     write: Taro.getBLEDeviceCharacteristics.BLECharacteristic;
     read?: Taro.getBLEDeviceCharacteristics.BLECharacteristic;
+    flowControl?: Taro.getBLEDeviceCharacteristics.BLECharacteristic;
 }
 //# sourceMappingURL=connected.d.ts.map

package/build/connected.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"connected.d.ts","sourceRoot":"","sources":["../src/connected.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAE,eAAe,EAAE,WAAW,EAAC,MAAM,oBAAoB,CAAC;AAEjF,OAAO,IAAI,MAAM,cAAc,CAAC;AAEhC,qBAAa,sBAAuB,YAAW,eAAe;IAC5D,OAAO,CAAC,MAAM,CAA4D;IAC1E,OAAO,CAAC,MAAM,CAA4B;IAE1C,OAAO,CAAC,gBAAgB,CAAkB;IAC1C,OAAO,CAAC,UAAU,CAAoB;IACtC,OAAO,CAAC,cAAc,CAAC,CAAuC;gBAE3C,OAAO,EAAE;QAC1B,MAAM,EAAE,IAAI,CAAC,sBAAsB,CAAC,6BAA6B,CAAC;QAClE,MAAM,EAAE,yBAAyB,CAAC;KACnC;IAQD,MAAM,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,UAAU,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI;IAI5D,OAAO,CAAC,QAAQ;YAuBF,QAAQ;IAuBtB,MAAM,IAAI,IAAI,CAAC,sBAAsB,CAAC,6BAA6B;IAInE,eAAe,IAAI,eAAe;IAIlC,UAAU,IAAI,MAAM;IAId,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAgBjC,OAAO,IAAI,OAAO;IAIZ,IAAI,CAAC,OAAO,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC;IAqBhD,KAAK,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAqB5C,KAAK,IAAI,IAAI;CAId;AAED,MAAM,WAAW,yBAAyB;IACxC,OAAO,EAAE,IAAI,CAAC,oBAAoB,CAAC,UAAU,CAAC;IAC9C,KAAK,EAAE,IAAI,CAAC,2BAA2B,CAAC,iBAAiB,CAAC;IAC1D,IAAI,CAAC,EAAE,IAAI,CAAC,2BAA2B,CAAC,iBAAiB,CAAC;CAC3D"}
+{"version":3,"file":"connected.d.ts","sourceRoot":"","sources":["../src/connected.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAE,eAAe,EAAE,WAAW,EAAC,MAAM,oBAAoB,CAAC;AAEjF,OAAO,IAAI,MAAM,cAAc,CAAC;AAChC,OAAO,EACL,qBAAqB,EAGtB,MAAM,+BAA+B,CAAC;AAEvC,qBAAa,sBAAuB,YAAW,eAAe;IAC5D,OAAO,CAAC,MAAM,CAA4D;IAC1E,OAAO,CAAC,MAAM,CAA4B;IAC1C,OAAO,CAAC,iBAAiB,CAAC,CAAuB;IAEjD,OAAO,CAAC,gBAAgB,CAAkB;IAC1C,OAAO,CAAC,UAAU,CAAoB;IACtC,OAAO,CAAC,cAAc,CAAC,CAAuC;IAC9D,OAAO,CAAC,WAAW,CAAgB;gBAEhB,OAAO,EAAE;QAC1B,MAAM,EAAE,IAAI,CAAC,sBAAsB,CAAC,6BAA6B,CAAC;QAClE,MAAM,EAAE,yBAAyB,CAAC;QAClC,WAAW,CAAC,EAAE,qBAAqB,CAAC;KACrC;IASD,MAAM,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,UAAU,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI;YAI9C,QAAQ;YAqCR,YAAY;IAiB1B,OAAO,CAAC,uBAAuB;IAU/B,OAAO,CAAC,iBAAiB;IAIzB,OAAO,CAAC,wBAAwB;YAIlB,UAAU;YAqBV,QAAQ;IAuBtB,MAAM,IAAI,IAAI,CAAC,sBAAsB,CAAC,6BAA6B;IAInE,eAAe,IAAI,eAAe;IAIlC,UAAU,IAAI,MAAM;IAId,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAgBjC,OAAO,IAAI,OAAO;IAIZ,IAAI,CAAC,OAAO,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC;IAqBhD,KAAK,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ5C,KAAK,IAAI,IAAI;CAId;AAED,MAAM,WAAW,yBAAyB;IACxC,OAAO,EAAE,IAAI,CAAC,oBAAoB,CAAC,UAAU,CAAC;IAC9C,KAAK,EAAE,IAAI,CAAC,2BAA2B,CAAC,iBAAiB,CAAC;IAC1D,IAAI,CAAC,EAAE,IAAI,CAAC,2BAA2B,CAAC,iBAAiB,CAAC;IAC1D,WAAW,CAAC,EAAE,IAAI,CAAC,2BAA2B,CAAC,iBAAiB,CAAC;CAClE"}

package/build/connected.js

@@ -7,27 +7,43 @@ 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"));
+const device_bluetooth_traits_1 = require("@psdk/device-bluetooth-traits");
 class TaroBleConnectedDevice {
     device;
     scpair;
+    flowControlWriter;
     _connectionState;
     dataOfRead;
     notifyCallback;
+    notifyReady;
     constructor(options) {
         this.device = options.device;
         this.scpair = options.scpair;
         this._connectionState = frame_father_1.ConnectionState.CONNECTED;
         this.dataOfRead = [];
-        this.doListen();
+        this.flowControlWriter = this.createFlowControlWriter(options.flowControl);
+        this.notifyReady = this.doListen();
     }
     notify(callback) {
         this.notifyCallback = callback;
     }
-    doListen() {
-        if (this.scpair.read == null)
-            return;
+    async doListen() {
         taro_1.default.onBLECharacteristicValueChange(async (value) => {
             let data = new Uint8Array(value.value);
+            if (this.flowControlWriter &&
+                this.scpair.flowControl &&
+                value.characteristicId &&
+                this.isSameCharacteristicUuid(value.characteristicId, this.scpair.flowControl.uuid)) {
+                this.notifyFlowControl(data);
+                return;
+            }
+            if (!this.scpair.read) {
+                return;
+            }
+            if (value.characteristicId &&
+                !this.isSameCharacteristicUuid(value.characteristicId, this.scpair.read.uuid)) {
+                return;
+            }
             if (this.notifyCallback) {
                 await this.notifyCallback(data);
             }
@@ -36,14 +52,62 @@ class TaroBleConnectedDevice {
         taro_1.default.onBLEConnectionStateChange(value => {
             this._connectionState = value.connected ? frame_father_1.ConnectionState.CONNECTED : frame_father_1.ConnectionState.DISCONNECTED;
         });
-        taro_1.default.notifyBLECharacteristicValueChange({
-            deviceId: this.device.deviceId,
-            serviceId: this.scpair.service.uuid,
-            characteristicId: this.scpair.read.uuid,
-            state: true,
-            success: result => console.log(result),
-            // @ts-ignore
-            fail: (e) => console.error(e),
+        if (this.scpair.read != null) {
+            await this.enableNotify(this.scpair.read.uuid);
+        }
+        if (this.scpair.flowControl != null) {
+            await this.enableNotify(this.scpair.flowControl.uuid);
+        }
+    }
+    async enableNotify(characteristicId) {
+        return new Promise((resolve, reject) => {
+            taro_1.default.notifyBLECharacteristicValueChange({
+                deviceId: this.device.deviceId,
+                serviceId: this.scpair.service.uuid,
+                characteristicId,
+                state: true,
+                success: result => {
+                    console.log(result);
+                    resolve();
+                },
+                // @ts-ignore
+                fail: (e) => reject(e),
+            });
+        });
+    }
+    createFlowControlWriter(options) {
+        if (!this.scpair.flowControl || !(options?.enabled ?? false)) {
+            return undefined;
+        }
+        return new device_bluetooth_traits_1.BleFlowControlWriter({
+            ...device_bluetooth_traits_1.DEFAULT_BLE_FLOW_CONTROL_OPTIONS,
+            ...options,
+        });
+    }
+    notifyFlowControl(data) {
+        this.flowControlWriter.onNotify(data);
+    }
+    isSameCharacteristicUuid(left, right) {
+        return left.replace(/-/g, '').toLowerCase() == right.replace(/-/g, '').toLowerCase();
+    }
+    async writeChunk(data) {
+        return new Promise((resolve, reject) => {
+            taro_1.default.writeBLECharacteristicValue({
+                deviceId: this.device.deviceId,
+                serviceId: this.scpair.service.uuid,
+                characteristicId: this.scpair.write.uuid,
+                // @ts-ignore
+                value: data.buffer,
+                success: result => {
+                    if (result.errMsg.indexOf('ok') == -1) {
+                        reject(result.errMsg);
+                        return;
+                    }
+                    resolve();
+                },
+                // @ts-ignore
+                fail: (e) => reject(e)
+            });
         });
     }
     async realRead() {
@@ -116,24 +180,11 @@ class TaroBleConnectedDevice {
         }
     }
     async write(data) {
-        return new Promise((resolve, reject) => {
-            taro_1.default.writeBLECharacteristicValue({
-                deviceId: this.device.deviceId,
-                serviceId: this.scpair.service.uuid,
-                characteristicId: this.scpair.write.uuid,
-                // @ts-ignore
-                value: data.buffer,
-                success: result => {
-                    if (result.errMsg.indexOf('ok') == -1) {
-                        reject(result.errMsg);
-                        return;
-                    }
-                    resolve();
-                },
-                // @ts-ignore
-                fail: (e) => reject(e)
-            });
-        });
+        if (this.flowControlWriter) {
+            await this.notifyReady;
+            return this.flowControlWriter.write(data, { writeChunk: chunk => this.writeChunk(chunk) });
+        }
+        return this.writeChunk(data);
     }
     flush() {
         this.dataOfRead.splice(0, this.dataOfRead.length);

package/build/provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"provider.d.ts","sourceRoot":"","sources":["../src/provider.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,qBAAqB,EACrB,cAAc,EACd,SAAS,EACT,eAAe,EACf,eAAe,EAEhB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAC,eAAe,EAAkB,MAAM,oBAAoB,CAAC;AAGpE,OAAO,IAAI,MAAM,cAAc,CAAC;AAEhC,qBAAa,gBAAiB,SAAQ,SAAS,CAAC,IAAI,CAAC,sBAAsB,CAAC,6BAA6B,CAAC;IAExG,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAkB;IAG3C,OAAO,CAAC,kBAAkB,CAAC,CAAgH;IAC3I,OAAO,CAAC,eAAe,CAAC,CAAyB;gBAErC,OAAO,CAAC,EAAE,eAAe;IAMrC,WAAW,IAAI,OAAO;IAMhB,qBAAqB,IAAI,OAAO,CAAC,qBAAqB,CAAC;IAUvD,OAAO,CACX,MAAM,EAAE,eAAe,CAAC,IAAI,CAAC,sBAAsB,CAAC,6BAA6B,CAAC,EAClF,OAAO,CAAC,EAAE,cAAc,GACvB,OAAO,CAAC,eAAe,CAAC;IA2B3B,UAAU,CACR,QAAQ,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC,eAAe,CAAC,IAAI,CAAC,sBAAsB,CAAC,6BAA6B,CAAC,CAAC,KAChG,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI;IAIrB,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IA0B/B,aAAa,IAAI,OAAO,CAAC,YAAY,CAAC;YAY9B,oBAAoB;YAgBpB,qBAAqB;IAgBnC,OAAO,CAAC,sBAAsB;IAqC9B,OAAO,CAAC,0BAA0B;IAclC,OAAO,CAAC,gBAAgB;YAQV,mBAAmB;YAYnB,oBAAoB;YAkBpB,2BAA2B;YAmB3B,eAAe;YAgBf,UAAU;CAkHzB"}
+{"version":3,"file":"provider.d.ts","sourceRoot":"","sources":["../src/provider.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,qBAAqB,EACrB,cAAc,EAEd,SAAS,EACT,eAAe,EACf,eAAe,EAEhB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAC,eAAe,EAAkB,MAAM,oBAAoB,CAAC;AAGpE,OAAO,IAAI,MAAM,cAAc,CAAC;AAEhC,qBAAa,gBAAiB,SAAQ,SAAS,CAAC,IAAI,CAAC,sBAAsB,CAAC,6BAA6B,CAAC;IAExG,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAkB;IAG3C,OAAO,CAAC,kBAAkB,CAAC,CAAgH;IAC3I,OAAO,CAAC,eAAe,CAAC,CAAyB;gBAErC,OAAO,CAAC,EAAE,eAAe;IAMrC,WAAW,IAAI,OAAO;IAMhB,qBAAqB,IAAI,OAAO,CAAC,qBAAqB,CAAC;IAUvD,OAAO,CACX,MAAM,EAAE,eAAe,CAAC,IAAI,CAAC,sBAAsB,CAAC,6BAA6B,CAAC,EAClF,OAAO,CAAC,EAAE,cAAc,GACvB,OAAO,CAAC,eAAe,CAAC;IA4B3B,UAAU,CACR,QAAQ,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC,eAAe,CAAC,IAAI,CAAC,sBAAsB,CAAC,6BAA6B,CAAC,CAAC,KAChG,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI;IAIrB,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IA0B/B,aAAa,IAAI,OAAO,CAAC,YAAY,CAAC;YAY9B,oBAAoB;YAgBpB,qBAAqB;IAgBnC,OAAO,CAAC,sBAAsB;IAqC9B,OAAO,CAAC,0BAA0B;IAalC,OAAO,CAAC,gBAAgB;YAQV,mBAAmB;YAYnB,oBAAoB;YAkBpB,2BAA2B;YAmB3B,eAAe;YAgBf,UAAU;CA6HzB"}

package/build/provider.js

@@ -53,6 +53,7 @@ class TaroBleBluetooth extends device_bluetooth_traits_1.Jluetooth {
         this.connectedDevice = new connected_1.TaroBleConnectedDevice({
             device: origin,
             scpair,
+            flowControl: this.options?.flowControl,
         });
         await this.stopDiscovery();
         return Promise.resolve(this.connectedDevice);
@@ -161,11 +162,10 @@ class TaroBleBluetooth extends device_bluetooth_traits_1.Jluetooth {
         });
     }
     extractMacFromAdvertisData(advertisData) {
-        if (!advertisData || advertisData.byteLength < 6)
+        if (!advertisData || advertisData.byteLength < 8)
             return null;
         const bytes = new Uint8Array(advertisData);
-        // BLE广播数据前6字节是MAC地址（小端序，需要反转）
-        const macBytes = Array.from(bytes.slice(0, 6)).reverse();
+        const macBytes = Array.from(bytes.slice(2, 8));
         return macBytes
             .map(b => b.toString(16).padStart(2, '0'))
             .join(':')
@@ -248,6 +248,16 @@ class TaroBleBluetooth extends device_bluetooth_traits_1.Jluetooth {
             });
             _characteristicsMap.set(service.uuid, characteristics);
         }
+        if (this.options?.flowControl?.enabled) {
+            return (0, device_bluetooth_traits_1.findBleFlowControlCharacteristics)({
+                services: options.services,
+                flowControlOptions: this.options.flowControl,
+                isServiceAllowed: service => device_bluetooth_traits_1.TBluetoothHelpers.isAllowServices(service.uuid, this.options?.allowServices),
+                getServiceUuid: service => service.uuid,
+                getCharacteristics: service => _characteristicsMap.get(service.uuid),
+                getCharacteristicUuid: characteristic => characteristic.uuid,
+            });
+        }
         // use special first
         if (this.options?.allowedWriteCharacteristic && this.options?.allowedReadCharacteristic) {
             for (const service of options.services) {