react-native-fpay 0.3.4 → 0.3.6

package/src/engine/BLESenderService.ts

@@ -4,7 +4,12 @@
 // same write fallback (writeWithoutResponse → writeWithResponse).
 // Only changes: renamed types to match SDK conventions, removed Alert imports.
 
-import { BleManager, Device, State as BluetoothState, ScanMode } from 'react-native-ble-plx';
+import {
+  BleManager,
+  Device,
+  State as BluetoothState,
+  ScanMode,
+} from 'react-native-ble-plx';
 import { PermissionsAndroid, Platform } from 'react-native';
 import { Buffer } from 'buffer';
 import {
@@ -19,7 +24,6 @@ import type { FintechDevice } from '../core/types';
 
 // A discovered FountainPay-capable BLE device (shown in BluetoothSubScreen list)
 
-
 // The payment request written to the receiver's characteristic
 export interface BLESendPaymentRequest {
   amount: number;
@@ -72,18 +76,26 @@ class BLESenderService {
         PermissionsAndroid.PERMISSIONS.BLUETOOTH_CONNECT,
         PermissionsAndroid.PERMISSIONS.ACCESS_FINE_LOCATION,
       ]);
-      return Object.values(results).every(r => r === PermissionsAndroid.RESULTS.GRANTED);
+      return Object.values(results).every(
+        (r) => r === PermissionsAndroid.RESULTS.GRANTED
+      );
     }
-    const granted = await PermissionsAndroid.request(PermissionsAndroid.PERMISSIONS.ACCESS_FINE_LOCATION);
+    const granted = await PermissionsAndroid.request(
+      PermissionsAndroid.PERMISSIONS.ACCESS_FINE_LOCATION
+    );
     return granted === PermissionsAndroid.RESULTS.GRANTED;
   }
 
   private _initializeBLE(): Promise<void> {
     return new Promise((resolve, reject) => {
-      const sub = this.bleManager.onStateChange(state => {
+      const sub = this.bleManager.onStateChange((state) => {
         switch (state) {
           case BluetoothState.Unsupported:
-            reject(new Error('[FPay BLE Sender] Bluetooth not supported on this device'));
+            reject(
+              new Error(
+                '[FPay BLE Sender] Bluetooth not supported on this device'
+              )
+            );
             sub.remove();
             break;
           case BluetoothState.PoweredOff:
@@ -131,12 +143,18 @@ class BLESenderService {
 
           if (device && !seen.has(device.id)) {
             seen.add(device.id);
-            console.log('[FPay BLE Sender] Found device:', device.name ?? device.id);
+            console.log(
+              '[FPay BLE Sender] Found device:',
+              device.name ?? device.id
+            );
             try {
               const fp = await this._readDeviceInfo(device);
               if (fp) onDeviceFound(fp);
             } catch (err) {
-              console.warn('[FPay BLE Sender] Could not read device info:', err);
+              console.warn(
+                '[FPay BLE Sender] Could not read device info:',
+                err
+              );
             }
           }
         }
@@ -144,7 +162,11 @@ class BLESenderService {
 
       setTimeout(() => {
         this.bleManager.stopDeviceScan();
-        console.log('[FPay BLE Sender] Scan complete. Found:', seen.size, 'FPay device(s)');
+        console.log(
+          '[FPay BLE Sender] Scan complete. Found:',
+          seen.size,
+          'FPay device(s)'
+        );
         resolve();
       }, durationMs);
     });
@@ -154,21 +176,28 @@ class BLESenderService {
     try {
       const connected = await this.bleManager.connectToDevice(device.id);
       await connected.discoverAllServicesAndCharacteristics();
-      const char = await connected.readCharacteristicForService(FP_SERVICE_UUID, FP_USERINFO_CHAR_UUID);
+      const char = await connected.readCharacteristicForService(
+        FP_SERVICE_UUID,
+        FP_USERINFO_CHAR_UUID
+      );
       await this.bleManager.cancelDeviceConnection(device.id);
 
       if (!char.value) return null;
-      const info = JSON.parse(Buffer.from(char.value, 'base64').toString('utf8'));
+      const info = JSON.parse(
+        Buffer.from(char.value, 'base64').toString('utf8')
+      );
       return {
-        id:        device.id,
-        name:      device.name ?? 'Unknown Device',
-        appName:   info.appName  ?? 'FountainPay',
-        userName:  info.userName ?? '',
-        rssi:      device.rssi   ?? -100,
+        id: device.id,
+        name: device.name ?? 'Unknown Device',
+        appName: info.appName ?? 'FountainPay',
+        userName: info.userName ?? '',
+        rssi: device.rssi ?? -100,
         rawDevice: device,
       };
     } catch (err) {
-      try { await this.bleManager.cancelDeviceConnection(device.id); } catch {}
+      try {
+        await this.bleManager.cancelDeviceConnection(device.id);
+      } catch {}
       return null;
     }
   }
@@ -177,7 +206,9 @@ class BLESenderService {
 
   async connectToDevice(deviceId: string): Promise<Device> {
     console.log('[FPay BLE Sender] Connecting to', deviceId);
-    const device = await this.bleManager.connectToDevice(deviceId, { timeout: 15000 });
+    const device = await this.bleManager.connectToDevice(deviceId, {
+      timeout: 15000,
+    });
     await device.discoverAllServicesAndCharacteristics();
     this.connectedDevices.set(deviceId, device);
     console.log('[FPay BLE Sender] Connected and services discovered');
@@ -207,57 +238,76 @@ class BLESenderService {
       if (!device) device = await this.connectToDevice(deviceId);
 
       // Start polling BEFORE writing the request, so we don't miss a fast response
-      const responsePromise = new Promise<BLESendPaymentResponse>(async (resolve, reject) => {
-        const startTime = Date.now();
-
-        const poll = async () => {
-          while (!responseReceived) {
-            if (Date.now() - startTime > 60000) {
-              reject(new Error('[FPay BLE Sender] Response timeout — receiver did not respond in 60s'));
-              break;
-            }
-
-            try {
-              await new Promise(r => setTimeout(r, 1000));
-              if (responseReceived) break;
-
-              console.log('[FPay BLE Sender] Polling response characteristic...');
-              const char = await device!.readCharacteristicForService(
-                FP_SERVICE_UUID, FP_RESPONSE_CHAR_UUID
-              );
+      const responsePromise = new Promise<BLESendPaymentResponse>(
+        async (resolve, reject) => {
+          const startTime = Date.now();
+
+          const poll = async () => {
+            while (!responseReceived) {
+              if (Date.now() - startTime > 60000) {
+                reject(
+                  new Error(
+                    '[FPay BLE Sender] Response timeout — receiver did not respond in 60s'
+                  )
+                );
+                break;
+              }
 
-              if (char.value && char.value.length > 0) {
-                const decoded = Buffer.from(char.value, 'base64').toString('utf8');
-                const resp: BLESendPaymentResponse = JSON.parse(decoded);
-
-                // Verify this response matches OUR request via the echoed timestamp
-                if (
-                  resp.timestamp &&
-                  resp.requestTimestamp &&
-                  resp.requestTimestamp === request.timestamp
-                ) {
-                  console.log('[FPay BLE Sender] Response received — accepted:', resp.accepted);
-                  responseReceived = true;
-                  resolve(resp);
+              try {
+                await new Promise((r) => setTimeout(r, 1000));
+                if (responseReceived) break;
+
+                console.log(
+                  '[FPay BLE Sender] Polling response characteristic...'
+                );
+                const char = await device!.readCharacteristicForService(
+                  FP_SERVICE_UUID,
+                  FP_RESPONSE_CHAR_UUID
+                );
+
+                if (char.value && char.value.length > 0) {
+                  const decoded = Buffer.from(char.value, 'base64').toString(
+                    'utf8'
+                  );
+                  const resp: BLESendPaymentResponse = JSON.parse(decoded);
+
+                  // Verify this response matches OUR request via the echoed timestamp
+                  if (
+                    resp.timestamp &&
+                    resp.requestTimestamp &&
+                    resp.requestTimestamp === request.timestamp
+                  ) {
+                    console.log(
+                      '[FPay BLE Sender] Response received — accepted:',
+                      resp.accepted
+                    );
+                    responseReceived = true;
+                    resolve(resp);
+                    break;
+                  } else {
+                    console.log(
+                      '[FPay BLE Sender] Old/unrelated response, still polling...'
+                    );
+                  }
+                }
+              } catch (pollErr: any) {
+                // errorCode 205 = device disconnected — abort immediately
+                if (pollErr.errorCode === 205) {
+                  reject(new Error('[FPay BLE Sender] Device disconnected'));
                   break;
-                } else {
-                  console.log('[FPay BLE Sender] Old/unrelated response, still polling...');
                 }
+                // All other errors: log and keep polling
+                console.warn(
+                  '[FPay BLE Sender] Poll error (non-fatal):',
+                  pollErr.message
+                );
               }
-            } catch (pollErr: any) {
-              // errorCode 205 = device disconnected — abort immediately
-              if (pollErr.errorCode === 205) {
-                reject(new Error('[FPay BLE Sender] Device disconnected'));
-                break;
-              }
-              // All other errors: log and keep polling
-              console.warn('[FPay BLE Sender] Poll error (non-fatal):', pollErr.message);
             }
-          }
-        };
+          };
 
-        poll().catch(reject);
-      });
+          poll().catch(reject);
+        }
+      );
 
       // Write the payment request
       const base64 = Buffer.from(JSON.stringify(request)).toString('base64');
@@ -265,18 +315,24 @@ class BLESenderService {
 
       try {
         await device.writeCharacteristicWithoutResponseForService(
-          FP_SERVICE_UUID, FP_REQUEST_CHAR_UUID, base64
+          FP_SERVICE_UUID,
+          FP_REQUEST_CHAR_UUID,
+          base64
         );
         console.log('[FPay BLE Sender] Written without response (preferred)');
       } catch {
         console.log('[FPay BLE Sender] Retrying with response...');
         await device.writeCharacteristicWithResponseForService(
-          FP_SERVICE_UUID, FP_REQUEST_CHAR_UUID, base64
+          FP_SERVICE_UUID,
+          FP_REQUEST_CHAR_UUID,
+          base64
         );
         console.log('[FPay BLE Sender] Written with response');
       }
 
-      console.log('[FPay BLE Sender] Request sent. Waiting for accept/decline...');
+      console.log(
+        '[FPay BLE Sender] Request sent. Waiting for accept/decline...'
+      );
 
       const response = await responsePromise;
       await this.disconnectDevice(deviceId);
@@ -291,11 +347,15 @@ class BLESenderService {
 
   async disconnectDevice(deviceId: string): Promise<void> {
     if (this.monitorSubscription) {
-      try { this.monitorSubscription.remove(); } catch {}
+      try {
+        this.monitorSubscription.remove();
+      } catch {}
       this.monitorSubscription = null;
     }
     if (this.connectedDevices.has(deviceId)) {
-      try { await this.bleManager.cancelDeviceConnection(deviceId); } catch {}
+      try {
+        await this.bleManager.cancelDeviceConnection(deviceId);
+      } catch {}
       this.connectedDevices.delete(deviceId);
       console.log('[FPay BLE Sender] Disconnected from', deviceId);
     }
@@ -306,7 +366,11 @@ class BLESenderService {
   destroy(): void {
     this.bleManager.stopDeviceScan();
     this.connectedDevices.clear();
-    if (this.monitorSubscription) { try { this.monitorSubscription.remove(); } catch {} }
+    if (this.monitorSubscription) {
+      try {
+        this.monitorSubscription.remove();
+      } catch {}
+    }
     this.bleManager.destroy();
   }
 }