quivio-transaction-processor 1.22.2-beta → 1.22.4-beta

package/dist/emvPaymentProvider/EMVPaymentProvider.js

@@ -39,6 +39,8 @@ var types_1 = require("./types");
 var useUSBDevice_1 = require("../usb/useUSBDevice");
 var EMVPaymentContext = (0, react_1.createContext)(undefined);
 exports.EMVPaymentContext = EMVPaymentContext;
+var DsiEMVManagerBridge = react_native_1.NativeModules.DsiEMVManagerBridge;
+var emvEmitter = new react_native_1.NativeEventEmitter(DsiEMVManagerBridge);
 var EMVPaymentProvider = function (_a) {
     var children = _a.children;
     var TRANSACTION_RESPONSE_EVENTS = [
@@ -49,9 +51,6 @@ var EMVPaymentProvider = function (_a) {
         'onReplaceCardCompleted',
         'onTransactionCancelled',
     ];
-    var DsiEMVManagerBridge = react_native_1.NativeModules.DsiEMVManagerBridge;
-    var eventEmitterRef = (0, react_1.useRef)(null);
-    var listenersRef = (0, react_1.useRef)({}); // Now it's an array of listeners for each event
     // Device Connected State
     var isDeviceConnected = (0, useUSBDevice_1.useUSBDevice)().isDeviceConnected;
     // Show Display Message Cache
@@ -66,6 +65,8 @@ var EMVPaymentProvider = function (_a) {
     var _f = (0, react_1.useState)(false), isConfigurationInProgress = _f[0], setConfigurationInProgress = _f[1];
     // Logs DataStructure
     var _g = (0, react_1.useState)([]), logs = _g[0], setLogs = _g[1];
+    // Ref to maintain subscription
+    var subscriptionsRef = (0, react_1.useRef)(new Map());
     // Ref to maintain timeout during configuration
     // Because after a successfull EMVParamDownload
     // Device reboots which leads to USB disconnection
@@ -109,50 +110,37 @@ var EMVPaymentProvider = function (_a) {
     };
     // Native to Provider EMV event listening
     (0, react_1.useEffect)(function () {
-        if (!DsiEMVManagerBridge) {
-            console.error('Native module DsiEMVManagerBridge not found');
-            return;
-        }
-        var emitter = eventEmitterRef.current ||
-            new react_native_1.NativeEventEmitter(react_native_1.Platform.OS === 'android' ? DsiEMVManagerBridge : undefined);
-        eventEmitterRef.current = emitter;
-        types_1.EVENT_NAMES.forEach(function (event) {
-            var listener = emitter.addListener(event, function (payload) {
-                console.log("React Native received event: ".concat(event), payload);
-                pushLog(event, payload);
-                if (event === 'onShowDisplayMessage') {
+        var nativeSubs = types_1.EVENT_NAMES.map(function (eventName) {
+            return emvEmitter.addListener(eventName, function (payload) {
+                pushLog(eventName, payload);
+                if (eventName === 'onShowDisplayMessage') {
                     setDisplayMessage(payload);
                 }
-                if (event === 'onConfigCompleted') {
+                if (eventName === 'onConfigCompleted') {
                     setConfigurationInProgress(false);
                     setCancellationRunning(false);
                     setIsConfigured(true);
                 }
-                if (event === 'onConfigError') {
+                if (eventName === 'onConfigError') {
                     setConfigurationInProgress(false);
                     setCancellationRunning(false);
                     setIsConfigured(false);
                 }
-                if (event === 'onProcessAlreadyRunning') {
+                if (eventName === 'onProcessAlreadyRunning') {
                     setCancellationRunning(false);
                     setTransactionCurrentlyRunning(true);
                 }
-                if (TRANSACTION_RESPONSE_EVENTS.includes(event)) {
+                if (TRANSACTION_RESPONSE_EVENTS.includes(eventName)) {
                     setTransactionCurrentlyRunning(false);
                     setCancellationRunning(false);
                 }
-                // Store the listener in the ref
-                if (!listenersRef.current[event]) {
-                    listenersRef.current[event] = [];
-                }
-                listenersRef.current[event].push(listener);
+                var callbacks = subscriptionsRef.current.get(eventName);
+                callbacks === null || callbacks === void 0 ? void 0 : callbacks.forEach(function (cb) { return cb(payload); });
             });
         });
         return function () {
-            Object.values(listenersRef.current).forEach(function (eventListeners) {
-                eventListeners.forEach(function (listener) { return listener.remove(); });
-            });
-            listenersRef.current = {};
+            nativeSubs.forEach(function (s) { return s.remove(); });
+            subscriptionsRef.current.clear();
         };
     }, []);
     // Exposed method to run EMV configuration
@@ -220,32 +208,21 @@ var EMVPaymentProvider = function (_a) {
     };
     // Exposed method to remove all attached listener
     var removeAllListeners = function () {
+        subscriptionsRef.current.clear();
         DsiEMVManagerBridge.clearTransactionListener();
-        listenersRef.current = {};
     };
-    // Event subscription functions
-    var subscribeToEvent = (0, react_1.useCallback)(function (eventName, callback) {
-        if (eventEmitterRef.current) {
-            var listener = eventEmitterRef.current.addListener(eventName, callback);
-            // Store listener in the ref object
-            if (!listenersRef.current[eventName]) {
-                listenersRef.current[eventName] = [];
-            }
-            listenersRef.current[eventName].push(listener);
-            return listener; // Return listener for potential removal later
+    // Exposed method to subscribe to an event
+    var subscribeToEvent = function (eventName, callback) {
+        if (!subscriptionsRef.current.has(eventName)) {
+            subscriptionsRef.current.set(eventName, new Set());
         }
-    }, []);
-    var unsubscribeFromEvent = (0, react_1.useCallback)(function (eventName, callback) {
-        var listeners = listenersRef.current[eventName];
-        if (listeners) {
-            var listener_1 = listeners.find(function (listener) { return listener.listener === callback; });
-            if (listener_1) {
-                listener_1.remove();
-                // Remove the listener from the stored list
-                listenersRef.current[eventName] = listeners.filter(function (l) { return l !== listener_1; });
-            }
-        }
-    }, []);
+        subscriptionsRef.current.get(eventName).add(callback);
+    };
+    // Exposed method to unsubscribe Event
+    var unsubscribeFromEvent = function (eventName, callback) {
+        var _a;
+        (_a = subscriptionsRef.current.get(eventName)) === null || _a === void 0 ? void 0 : _a.delete(callback);
+    };
     // EVENTS Memoization
     var EVENTS = (0, react_1.useMemo)(function () {
         return types_1.EVENT_NAMES.reduce(function (acc, e) {

package/dist/emvPaymentProvider/EMVPaymentProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"EMVPaymentProvider.js","sourceRoot":"","sources":["../../src/emvPaymentProvider/EMVPaymentProvider.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"EMVPaymentProvider.js","sourceRoot":"","sources":["../../src/emvPaymentProvider/EMVPaymentProvider.tsx"],"names":[],"mappings":"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"}

package/dist/index.d.ts

@@ -4,4 +4,3 @@ import { USBDeviceProvider } from './usb/USBDeviceContext';
 import { useUSBDevice } from './usb/useUSBDevice';
 export type { EMVEventName, CallbackLog, EMVPaymentHook, EMVConfig } from './emvPaymentProvider/types';
 export { EMVPaymentProvider, useEMVPayment, USBDeviceProvider, useUSBDevice };
-export default EMVPaymentProvider;

package/dist/index.js

@@ -9,5 +9,4 @@ var USBDeviceContext_1 = require("./usb/USBDeviceContext");
 Object.defineProperty(exports, "USBDeviceProvider", { enumerable: true, get: function () { return USBDeviceContext_1.USBDeviceProvider; } });
 var useUSBDevice_1 = require("./usb/useUSBDevice");
 Object.defineProperty(exports, "useUSBDevice", { enumerable: true, get: function () { return useUSBDevice_1.useUSBDevice; } });
-exports.default = EMVPaymentProvider_1.EMVPaymentProvider;
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,8EAA6E;AASzE,mGATK,uCAAkB,OASL;AARtB,oEAAmE;AAS/D,8FATK,6BAAa,OASL;AAPjB,2DAA2D;AAQvD,kGARK,oCAAiB,OAQL;AAPrB,mDAAkD;AAQ9C,6FARK,2BAAY,OAQL;AAGhB,kBAAe,uCAAkB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,8EAA6E;AASzE,mGATK,uCAAkB,OASL;AARtB,oEAAmE;AAS/D,8FATK,6BAAa,OASL;AAPjB,2DAA2D;AAQvD,kGARK,oCAAiB,OAQL;AAPrB,mDAAkD;AAQ9C,6FARK,2BAAY,OAQL"}

package/libs/emvCardReaderLib/src/main/AndroidManifest.xml

@@ -3,7 +3,7 @@
           xmlns:tools="http://schemas.android.com/tools">
 
   <!-- optional: advertise USB host feature but don't force Play Store filtering -->
-  <uses-feature android:name="android.hardware.usb.host" android:required="false" />
+  <uses-feature android:name="android.hardware.usb.host"/>
 
   <!-- any permissions your receiver/native code needs -->
   <uses-permission android:name="android.permission.INTERNET" />
@@ -13,13 +13,16 @@
   <application>
     <!-- BroadcastReceiver that listens for USB attach/detach -->
     <receiver
-      android:name=".usb.UsbDeviceReceiver"
+      android:name="com.rohan.emvcardreaderlib.usb.UsbDeviceReceiver"
       android:exported="true"
       android:enabled="true">
       <intent-filter>
         <action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" />
         <action android:name="android.hardware.usb.action.USB_DEVICE_DETACHED" />
       </intent-filter>
+      <meta-data
+          android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED"
+          android:resource="@xml/device_filter" />
     </receiver>
   </application>
 </manifest>

package/libs/emvCardReaderLib/src/main/java/com/rohan/emvcardreaderlib/PosTransResponse.kt

@@ -40,15 +40,13 @@ enum class ErrorCode(val code: String) {
 data class SaleTransactionResponse(
     // CmdResponse section
     val responseOrigin: String,
-
-    val expiryMonth: String,
-
-    val expiryYear: String,
     val dsixReturnCode: String,
     val cmdStatus: String,
     val textResponse: String,
 
     // TranResponse section
+    val expiryMonth: String,
+    val expiryYear: String,
     val merchantID: String,
     val payAPIId: String,
     val acctNo: String,

package/libs/emvCardReaderLib/src/main/java/com/rohan/emvcardreaderlib/builder/DsiEMVRequestBuilder.kt

@@ -129,9 +129,9 @@ class DsiEMVRequestBuilder(val config: ConfigFactory) {
             <TranCode>${TransType.EMVZeroAuth.name}</TranCode>
             <ProcessorToken>TokenRequested</ProcessorToken>
             <SecureDevice>${secureDevice}</SecureDevice>
+            <ReturnClearExpDate>Allow</ReturnClearExpDate>
             <InvoiceNo>${createUniqueInvoiceNo()}</InvoiceNo>
             <RefNo>${createUniqueInvoiceNo()}</RefNo>
-            <ReturnClearExpDate>Allow</ReturnClearExpDate>
             <Amount>
                 <Purchase>0.00</Purchase>
             </Amount>

package/libs/emvCardReaderLib/src/main/java/com/rohan/emvcardreaderlib/usb/UsbDeviceReceiver.kt

@@ -5,10 +5,13 @@ import android.content.Context
 import android.content.Intent
 import android.hardware.usb.UsbDevice
 import android.hardware.usb.UsbManager
+import android.util.Log
+import com.rohan.emvcardreaderlib.PRINT_TAG
 
 class UsbDeviceReceiver : BroadcastReceiver() {
 
     override fun onReceive(context: Context, intent: Intent) {
+        Log.d(PRINT_TAG, "Receiver triggered: ${intent.action}")
         val device: UsbDevice? =
             intent.getParcelableExtra(UsbManager.EXTRA_DEVICE)
 

package/libs/emvCardReaderLib/src/main/res/xml/device_filter.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+    <usb-device vendor-id="2765" product-id="18000" />
+</resources>

package/libs/emvNative/src/main/java/com/quivio_transaction_processor/EMVPaymentManagerModule.kt

@@ -298,7 +298,7 @@ class EMVPaymentManagerModule(private val reactContext: ReactApplicationContext)
             putString("date", zeroAuthData.date)
             putString("time", zeroAuthData.time)
             putString("applicationLabel", zeroAuthData.applicationLabel)
-
+            
             // EMV specific fields
             putString("aid", zeroAuthData.aid)
             putString("tvr", zeroAuthData.tvr)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quivio-transaction-processor",
-  "version": "1.22.2-beta",
+  "version": "1.22.4-beta",
   "description": "React Native hook for Card payment integration with DataCap",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/emvPaymentProvider/EMVPaymentProvider.tsx

@@ -1,12 +1,11 @@
 import React, {
   createContext,
-  useCallback,
   useEffect,
   useMemo,
   useRef,
   useState,
 } from 'react';
-import { NativeEventEmitter, NativeModules, Platform } from 'react-native';
+import { NativeEventEmitter, NativeModules } from 'react-native';
 import {
   EMVPaymentContextType,
   EMVEventName,
@@ -20,6 +19,9 @@ const EMVPaymentContext = createContext<EMVPaymentContextType | undefined>(
   undefined,
 );
 
+const { DsiEMVManagerBridge } = NativeModules;
+const emvEmitter = new NativeEventEmitter(DsiEMVManagerBridge);
+
 const EMVPaymentProvider: React.FC<{ children: React.ReactNode }> = ({
   children,
 }) => {
@@ -31,9 +33,6 @@ const EMVPaymentProvider: React.FC<{ children: React.ReactNode }> = ({
     'onReplaceCardCompleted',
     'onTransactionCancelled',
   ];
-  const { DsiEMVManagerBridge } = NativeModules;
-  const eventEmitterRef = useRef<NativeEventEmitter | null>(null);
-  const listenersRef = useRef<{ [event: string]: any[] }>({}); // Now it's an array of listeners for each event
 
   // Device Connected State
   const { isDeviceConnected } = useUSBDevice();
@@ -58,6 +57,10 @@ const EMVPaymentProvider: React.FC<{ children: React.ReactNode }> = ({
   // Logs DataStructure
   const [logs, setLogs] = useState<CallbackLog[]>([]);
 
+  // Ref to maintain subscription
+  const subscriptionsRef = useRef<
+    Map<EMVEventName, Set<(payload: any) => void>>
+  >(new Map());
 
   // Ref to maintain timeout during configuration
   // Because after a successfull EMVParamDownload
@@ -111,63 +114,44 @@ const EMVPaymentProvider: React.FC<{ children: React.ReactNode }> = ({
 
   // Native to Provider EMV event listening
   useEffect(() => {
-    if (!DsiEMVManagerBridge) {
-      console.error('Native module DsiEMVManagerBridge not found');
-      return;
-    }
-
-    const emitter =
-      eventEmitterRef.current ||
-      new NativeEventEmitter(
-        Platform.OS === 'android' ? DsiEMVManagerBridge : undefined,
-      );
-    eventEmitterRef.current = emitter;
-
-    EVENT_NAMES.forEach(event => {
-      const listener = emitter.addListener(event, (payload: any) => {
-        console.log(`React Native received event: ${event}`, payload);
+    const nativeSubs = EVENT_NAMES.map(eventName =>
+      emvEmitter.addListener(eventName, payload => {
+        pushLog(eventName, payload);
 
-        pushLog(event, payload);
-
-        if (event === 'onShowDisplayMessage') {
+        if (eventName === 'onShowDisplayMessage') {
           setDisplayMessage(payload);
         }
 
-        if (event === 'onConfigCompleted') {
+        if (eventName === 'onConfigCompleted') {
           setConfigurationInProgress(false);
           setCancellationRunning(false);
           setIsConfigured(true);
         }
 
-        if (event === 'onConfigError') {
+        if (eventName === 'onConfigError') {
           setConfigurationInProgress(false);
           setCancellationRunning(false);
           setIsConfigured(false);
         }
 
-        if (event === 'onProcessAlreadyRunning') {
+        if (eventName === 'onProcessAlreadyRunning') {
           setCancellationRunning(false);
           setTransactionCurrentlyRunning(true);
         }
 
-        if (TRANSACTION_RESPONSE_EVENTS.includes(event)) {
+        if (TRANSACTION_RESPONSE_EVENTS.includes(eventName)) {
           setTransactionCurrentlyRunning(false);
           setCancellationRunning(false);
         }
 
-        // Store the listener in the ref
-        if (!listenersRef.current[event]) {
-          listenersRef.current[event] = [];
-        }
-        listenersRef.current[event].push(listener);
-      });
-    });
+        const callbacks = subscriptionsRef.current.get(eventName);
+        callbacks?.forEach(cb => cb(payload));
+      }),
+    );
 
     return () => {
-      Object.values(listenersRef.current).forEach(eventListeners => {
-        eventListeners.forEach(listener => listener.remove());
-      });
-      listenersRef.current = {};
+      nativeSubs.forEach(s => s.remove());
+      subscriptionsRef.current.clear();
     };
   }, []);
 
@@ -249,50 +233,28 @@ const EMVPaymentProvider: React.FC<{ children: React.ReactNode }> = ({
 
   // Exposed method to remove all attached listener
   const removeAllListeners = () => {
+    subscriptionsRef.current.clear();
     DsiEMVManagerBridge.clearTransactionListener();
-    listenersRef.current = {};
   };
 
-  // Event subscription functions
-  const subscribeToEvent = useCallback(
-    (eventName: string, callback: (payload: any) => void) => {
-      if (eventEmitterRef.current) {
-        const listener = eventEmitterRef.current.addListener(
-          eventName,
-          callback,
-        );
-
-        // Store listener in the ref object
-        if (!listenersRef.current[eventName]) {
-          listenersRef.current[eventName] = [];
-        }
-        listenersRef.current[eventName].push(listener);
-
-        return listener; // Return listener for potential removal later
-      }
-    },
-    [],
-  );
+  // Exposed method to subscribe to an event
+  const subscribeToEvent = (
+    eventName: EMVEventName,
+    callback: (payload: any) => void,
+  ) => {
+    if (!subscriptionsRef.current.has(eventName)) {
+      subscriptionsRef.current.set(eventName, new Set());
+    }
+    subscriptionsRef.current.get(eventName)!.add(callback);
+  };
 
-  const unsubscribeFromEvent = useCallback(
-    (eventName: string, callback: (payload: any) => void) => {
-      const listeners = listenersRef.current[eventName];
-      if (listeners) {
-        const listener = listeners.find(
-          listener => listener.listener === callback,
-        );
-        if (listener) {
-          listener.remove();
-
-          // Remove the listener from the stored list
-          listenersRef.current[eventName] = listeners.filter(
-            l => l !== listener,
-          );
-        }
-      }
-    },
-    [],
-  );
+  // Exposed method to unsubscribe Event
+  const unsubscribeFromEvent = (
+    eventName: EMVEventName,
+    callback: (payload: any) => void,
+  ) => {
+    subscriptionsRef.current.get(eventName)?.delete(callback);
+  };
 
   // EVENTS Memoization
   const EVENTS = useMemo(

package/src/index.ts

@@ -12,5 +12,3 @@ export {
     USBDeviceProvider,
     useUSBDevice
 };
-
-export default EMVPaymentProvider;