react-native-fpay 0.3.4 → 0.3.6

package/src/core/types/index.ts

@@ -1,16 +1,25 @@
 // FountainPay SDK — Master Types
 
-import type { Device } from "react-native-ble-plx";
+import type { Device } from 'react-native-ble-plx';
 
 export type FPCurrency = 'NGN' | 'USD' | 'GBP' | 'EUR' | string;
-export type FPChannel  = 'transfer' | 'nqr' | 'proximity' | 'bluetooth' | 'nfc';
-export type FPTxStatus = 'pending' | 'processing' | 'successful' | 'failed' | 'reversed';
-export type FPTxType   = 'debit' | 'credit';
+export type FPChannel = 'transfer' | 'nqr' | 'proximity' | 'bluetooth' | 'nfc';
+export type FPTxStatus =
+  | 'pending'
+  | 'processing'
+  | 'successful'
+  | 'failed'
+  | 'reversed';
+export type FPTxType = 'debit' | 'credit';
 
 export interface FPUserInfo {
-  name: string;
+  firstName: string;
+  lastName: string;
   phone: string;
   email: string;
+  bvn?: string;
+  nin?: string;
+  dateOfBirth?: string;
   userId: string;
 }
 
@@ -28,6 +37,13 @@ export interface FPTransferRecipient {
   bankName: string;
 }
 
+export interface FPWalletTransferRecipient {
+  accountNumber: string;
+  type: 'USER' | 'AGENT';
+  accountName: string;
+  agentId?: string;
+  userId?: string;
+}
 
 export interface FPNfcRecipient {
   accountNumber: string;
@@ -51,23 +67,45 @@ export interface FPParty {
 
 export interface FPSendPaymentRequest {
   sender?: FPUserInfo;
-  amount: number; 
-  narration?: string; 
-  reference?: string 
-  channel: 'transfer' | 'proximity' | 'bluetooth' | 'nfc' | 'nqr'; 
-  currency?: string 
-  recipient: FPTransferRecipient | FPNfcRecipient | FPNqrRecipient
+  amount: number;
+  narration?: string;
+  reference?: string;
+  isBank?: boolean;
+  channel: 'transfer' | 'proximity' | 'bluetooth' | 'nfc' | 'nqr';
+  currency?: string;
+  recipient:
+    | FPTransferRecipient
+    | FPNfcRecipient
+    | FPNqrRecipient
+    | FPWalletTransferRecipient;
+}
+
+export interface FPSendWalletPaymentRequest {
+  sender_id: string;
+  sender_type: 'USER';
+  recipient: FPWalletTransferRecipient;
+  amount: string;
+  reference: string;
+  narration: string;
+  currency?: string;
+  isBank?: false;
+  channel: 'transfer' | 'proximity' | 'bluetooth';
 }
 
-
 export interface FPNfcTransfer {
-  amount: number; 
-  narration?: string; 
-  reference?: string 
-  currency?: string
+  amount: number;
+  narration?: string;
+  reference?: string;
+  currency?: string;
   channel: 'nfc';
 }
 
+export interface FPTransactionResponse {
+  status: string;
+  message: string;
+  payload: FPTransaction;
+}
+
 export interface FPTransaction {
   id: string;
   reference: string;
@@ -83,31 +121,6 @@ export interface FPTransaction {
   createdAt: string;
 }
 
-export interface FPGenerateAccountRequest {
-  accountName: string;
-  email?: string;
-  phone?: string;
-  reference?: string;
-  amount?: number;
-  currency?: FPCurrency;
-  expiresInMinutes?: number;
-  metadata?: Record<string, unknown>;
-}
-
-export interface FPVirtualAccount {
-  accountNumber: string;
-  accountName: string;
-  bankName: string;
-  bankCode: string;
-  currency: FPCurrency;
-  balance: number;
-  reference: string;
-  walletId: string;
-  qrCode?: string;
-  expiresAt?: string;
-  createdAt: string;
-}
-
 export interface FPBluetoothPaymentRequest {
   requestId: string;
   sender: FPUserInfo & { deviceId: string; deviceName?: string };
@@ -142,12 +155,27 @@ export interface FPBankItem {
   logo?: string;
 }
 
+export interface FPAccount {
+  id: string; // PSSP-assigned — stored internally, host app never needs this
+  accountNumber: string;
+  accountName: string;
+  firstName: string;
+  lastName?: string;
+  phone: string;
+  bankName?: string;
+  bankCode?: string;
+  balance?: number;
+  currency?: string;
+}
+
 export interface FPCallbacks {
   onPaymentRequest?: (request: FPBluetoothPaymentRequest) => void;
   onPaymentReceived?: (transaction: FPTransaction) => void;
   onPaymentDeclined?: (request: FPBluetoothPaymentRequest) => void;
   onPaymentSent?: (transaction: FPTransaction) => void;
   onError?: (error: FPError) => void;
+  onAccountReady?: (account: FPAccount) => void;
+  onAccountError?: (error: FPError, user: FPUserInfo) => void;
 }
 
 export interface FPError {
@@ -160,14 +188,18 @@ export interface FPInstance {
   initializeSDK: (user: FPUserInfo, callbacks?: FPCallbacks) => Promise<void>;
   send: (amount: number, currency: FPCurrency) => void;
   receive: (amount?: number, currency?: FPCurrency) => void;
-  generateAccountNumber: (request: FPGenerateAccountRequest) => Promise<FPVirtualAccount>;
+  generateAccountNumber: (user: FPUserInfo) => Promise<FPAccount>;
+  refreshBalance: () => Promise<void>;
   listen: () => void;
   destroy: () => void;
   isReady: boolean;
   currentUser: FPUserInfo | null;
+  isAuthenticated: boolean;
+  authError: string | null;
+  account: FPAccount | null;
+  balance: number | null;
 }
 
-
 export interface FintechDevice {
   id: string;
   name: string;
@@ -178,16 +210,17 @@ export interface FintechDevice {
   waiting?: boolean;
 }
 
-
 export interface Props {
-  amount: number; 
+  psspId?: string;
+  amount: number;
   currency: FPCurrency;
   onClose: () => void;
-  onProcessTransaction?: (tx: FPSendPaymentRequest) => void; 
+  onProcessTransaction?: (
+    tx: FPSendPaymentRequest | FPSendWalletPaymentRequest | null
+  ) => void;
   onError?: (err: FPError) => void;
 }
 
-
 export interface ReceiveTransferScreenProps {
   amount?: number;
   description?: string;
@@ -195,4 +228,4 @@ export interface ReceiveTransferScreenProps {
   recipient: FPTransferRecipient;
   onClose?: () => void;
   onPaymentReceived?: (data: any) => void;
-}
+}

package/src/engine/BLEReceiverService.ts

@@ -4,12 +4,15 @@
 // Only changes: removed useBoundStore dependency, appName is 'FountainPay'.
 
 import { PermissionsAndroid, Platform } from 'react-native';
-import Peripheral, { Permission, Property } from 'react-native-multi-ble-peripheral';
+import Peripheral, {
+  Permission,
+  Property,
+} from 'react-native-multi-ble-peripheral';
 import { Buffer } from 'buffer';
 
 // ── UUIDs — shared with BLESenderService ─────────────────────
-export const FP_SERVICE_UUID       = 'E8E66D12-C217-425A-AB36-DDBA22F22A5D';
-export const FP_REQUEST_CHAR_UUID  = 'E1CC0349-343A-4E12-A4EF-CF69A681EE86';
+export const FP_SERVICE_UUID = 'E8E66D12-C217-425A-AB36-DDBA22F22A5D';
+export const FP_REQUEST_CHAR_UUID = 'E1CC0349-343A-4E12-A4EF-CF69A681EE86';
 export const FP_RESPONSE_CHAR_UUID = 'DA9318CA-C740-4951-9C7C-5747FE002EF9';
 export const FP_USERINFO_CHAR_UUID = '933CA5AE-4D53-4CF4-864A-2FF51AFA05E9';
 
@@ -36,13 +39,18 @@ export interface BLEPaymentResponse {
     accountNumber: string;
     bankName: string;
     bankCode: string;
+    userId?: string;
+    type: 'USER' | 'AGENT';
   };
   // Echo of the original request timestamp — used by sender's polling
   // to confirm this response belongs to their specific request
   requestTimestamp?: number;
 }
 
-export type PaymentRequestCallback = (request: BLEPaymentRequest, deviceId: string) => void;
+export type PaymentRequestCallback = (
+  request: BLEPaymentRequest,
+  deviceId: string
+) => void;
 
 // ── Class ─────────────────────────────────────────────────────
 
@@ -54,7 +62,11 @@ class BLEReceiverService {
 
   // ── Init ───────────────────────────────────────────────────
 
-  async initializeWithUserInfo(userId: string, userName: string, appName = 'FountainPay'): Promise<void> {
+  async initializeWithUserInfo(
+    userId: string,
+    userName: string,
+    appName = 'FountainPay'
+  ): Promise<void> {
     this.userInfo = { userId, userName, appName };
     await this._requestPermissions();
   }
@@ -67,9 +79,13 @@ class BLEReceiverService {
         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;
   }
 
@@ -101,30 +117,37 @@ class BLEReceiverService {
           console.log('[FPay BLE Receiver] Peripheral ready');
 
           await Peripheral.setDeviceName(this.userInfo.userName);
-          console.log('[FPay BLE Receiver] Device name set:', this.userInfo.userName);
+          console.log(
+            '[FPay BLE Receiver] Device name set:',
+            this.userInfo.userName
+          );
 
           await this.peripheral.addService(FP_SERVICE_UUID, true);
 
           // User info characteristic — READ only.
           // Sender reads this to get display name and userId.
           const userInfoPayload = JSON.stringify({
-            appName:  this.userInfo.appName,
+            appName: this.userInfo.appName,
             userName: this.userInfo.userName,
-            userId:   this.userInfo.userId,
+            userId: this.userInfo.userId,
           });
           await this.peripheral.addCharacteristic(
-            FP_SERVICE_UUID, FP_USERINFO_CHAR_UUID,
-            Property.READ, Permission.READABLE
+            FP_SERVICE_UUID,
+            FP_USERINFO_CHAR_UUID,
+            Property.READ,
+            Permission.READABLE
           );
           await this.peripheral.updateValue(
-            FP_SERVICE_UUID, FP_USERINFO_CHAR_UUID,
+            FP_SERVICE_UUID,
+            FP_USERINFO_CHAR_UUID,
             Buffer.from(userInfoPayload)
           );
 
           // Payment request characteristic — WRITE / WRITE_NO_RESPONSE.
           // Sender writes the payment request JSON here.
           await this.peripheral.addCharacteristic(
-            FP_SERVICE_UUID, FP_REQUEST_CHAR_UUID,
+            FP_SERVICE_UUID,
+            FP_REQUEST_CHAR_UUID,
             Property.WRITE | Property.WRITE_NO_RESPONSE,
             Permission.WRITEABLE
           );
@@ -132,14 +155,16 @@ class BLEReceiverService {
           // Payment response characteristic — READ + NOTIFY.
           // Receiver writes accept/decline here; sender polls or subscribes.
           await this.peripheral.addCharacteristic(
-            FP_SERVICE_UUID, FP_RESPONSE_CHAR_UUID,
+            FP_SERVICE_UUID,
+            FP_RESPONSE_CHAR_UUID,
             Property.READ | Property.NOTIFY,
             Permission.READABLE
           );
           // Seed a default value so the characteristic is always readable
           // (prevents "characteristic not found" errors on first poll)
           await this.peripheral.updateValue(
-            FP_SERVICE_UUID, FP_RESPONSE_CHAR_UUID,
+            FP_SERVICE_UUID,
+            FP_RESPONSE_CHAR_UUID,
             Buffer.from(JSON.stringify({ accepted: false, timestamp: 0 }))
           );
 
@@ -149,7 +174,11 @@ class BLEReceiverService {
           });
 
           this.isAdvertising = true;
-          console.log('[FPay BLE Receiver] Advertising as "' + this.userInfo.userName + '"');
+          console.log(
+            '[FPay BLE Receiver] Advertising as "' +
+              this.userInfo.userName +
+              '"'
+          );
           resolve();
         } catch (err) {
           clearTimeout(timeout);
@@ -174,9 +203,15 @@ class BLEReceiverService {
       }
     });
 
-    this.peripheral.on('read',        () => console.log('[FPay BLE Receiver] Read event'));
-    this.peripheral.on('subscribe',   () => console.log('[FPay BLE Receiver] Central subscribed'));
-    this.peripheral.on('unsubscribe', () => console.log('[FPay BLE Receiver] Central unsubscribed'));
+    this.peripheral.on('read', () =>
+      console.log('[FPay BLE Receiver] Read event')
+    );
+    this.peripheral.on('subscribe', () =>
+      console.log('[FPay BLE Receiver] Central subscribed')
+    );
+    this.peripheral.on('unsubscribe', () =>
+      console.log('[FPay BLE Receiver] Central unsubscribed')
+    );
   }
 
   private _handlePaymentRequest(data: { value: any }): void {
@@ -191,22 +226,34 @@ class BLEReceiverService {
       } else if (Array.isArray(data.value)) {
         decoded = Buffer.from(data.value).toString('utf8');
       } else {
-        console.warn('[FPay BLE Receiver] Unknown value format:', typeof data.value);
+        console.warn(
+          '[FPay BLE Receiver] Unknown value format:',
+          typeof data.value
+        );
         return;
       }
 
       const request: BLEPaymentRequest = JSON.parse(decoded);
       const deviceId = request.senderId?.toString() ?? 'unknown';
 
-      console.log('[FPay BLE Receiver] Payment request parsed:', request.senderName, request.currency + request.amount);
+      console.log(
+        '[FPay BLE Receiver] Payment request parsed:',
+        request.senderName,
+        request.currency + request.amount
+      );
 
       if (this.onRequestCallback) {
         this.onRequestCallback(request, deviceId);
       } else {
-        console.warn('[FPay BLE Receiver] No callback registered — request dropped');
+        console.warn(
+          '[FPay BLE Receiver] No callback registered — request dropped'
+        );
       }
     } catch (err) {
-      console.error('[FPay BLE Receiver] Failed to parse payment request:', err);
+      console.error(
+        '[FPay BLE Receiver] Failed to parse payment request:',
+        err
+      );
     }
   }
 
@@ -219,11 +266,20 @@ class BLEReceiverService {
 
   async sendPaymentResponse(response: BLEPaymentResponse): Promise<void> {
     if (!this.peripheral || !this.isAdvertising) {
-      throw new Error('[FPay BLE Receiver] Cannot send response — not advertising');
+      throw new Error(
+        '[FPay BLE Receiver] Cannot send response — not advertising'
+      );
     }
     const buffer = Buffer.from(JSON.stringify(response));
-    await this.peripheral.updateValue(FP_SERVICE_UUID, FP_RESPONSE_CHAR_UUID, buffer);
-    console.log('[FPay BLE Receiver] Response sent:', response.accepted ? 'ACCEPTED' : 'DECLINED');
+    await this.peripheral.updateValue(
+      FP_SERVICE_UUID,
+      FP_RESPONSE_CHAR_UUID,
+      buffer
+    );
+    console.log(
+      '[FPay BLE Receiver] Response sent:',
+      response.accepted ? 'ACCEPTED' : 'DECLINED'
+    );
   }
 
   async stopAdvertising(): Promise<void> {
@@ -234,7 +290,9 @@ class BLEReceiverService {
     }
   }
 
-  getIsAdvertising(): boolean { return this.isAdvertising; }
+  getIsAdvertising(): boolean {
+    return this.isAdvertising;
+  }
 
   destroy(): void {
     this.stopAdvertising();