@fire-spark/payments-clisitef-pinpad-rn 0.8.2 → 0.8.3

package/dist/index.d.ts

@@ -17,6 +17,8 @@ type ClisitefPinPadOptions = {
   timeZone?: string;
   now?: () => Date;
   confirmationTimeoutMs?: number;
+  /** Wait for the `stage 1` of a released leftover routine; defaults to 15 s. */
+  releaseTimeoutMs?: number;
   /**
    * Payment deadline (`policy.timeout_ms`); defaults to 180 s. A
    * `runtime.timeout_ms` in the payment or method config overrides it.
@@ -66,13 +68,11 @@ declare const CLISITEF_COMMAND: {
 /** `continueTransaction` answers to `CONFIRM` (20). */
 declare const CLISITEF_YES = "0";
 declare const CLISITEF_NO = "1";
-/** `continueTransaction` answer to `CHECK_ABORT` (23): interrupt. */
-declare const CLISITEF_INTERRUPT = "1";
 /**
- * Commands answered after `abortTransaction(-1)` without `stage 1`; then the
- * adapter stops answering and leaves the record open (legacy criterion).
+ * Wait for the `stage 1` of a routine a previous charge left open, after
+ * answering it with `abortTransaction(-1)`; then the charge starts anyway.
  */
-declare const CLISITEF_DRAIN_LIMIT = 10;
+declare const CLISITEF_RELEASE_TIMEOUT_MS = 15000;
 /** `TipoCampo` ids stored with `STORE_FIELD` (Fiserv "Tabela TipoCampo"). */
 declare const CLISITEF_FIELD: {
   readonly TRANSACTION_DATE: 105;
@@ -350,4 +350,4 @@ type ClisitefTransactionInput = {
  */
 declare const runClisitefTransaction: (input: ClisitefTransactionInput) => Promise<ClisitefOutcome>;
 //#endregion
-export { CLISITEF_CANCEL_CODES, CLISITEF_CAPTURE_FIELDS, CLISITEF_COMMAND, CLISITEF_CONFIRMATION_TIMEOUT_MS, CLISITEF_DEFAULT_OPERATOR, CLISITEF_DRAIN_LIMIT, CLISITEF_FIELD, CLISITEF_INCONCLUSIVE_CODES, CLISITEF_INTERRUPT, CLISITEF_MODALITIES, CLISITEF_NO, CLISITEF_PAYMENT_TIMEOUT_MS, CLISITEF_PINPAD_TYPES, CLISITEF_REFUNDS_KEY, CLISITEF_REFUND_STORAGE_KEY, CLISITEF_REVERSALS_KEY, CLISITEF_STORAGE_KEY, CLISITEF_VOID_FIELD, CLISITEF_YES, ClisitefFields, ClisitefMenuDecision, ClisitefMenuPurpose, ClisitefModality, ClisitefOutcome, ClisitefOutcomeStatus, ClisitefPendingReversal, ClisitefPinPadOptions, ClisitefPinPadSettings, ClisitefProviderMetadata, ClisitefTransactionInput, ClisitefTransactionRecord, ClisitefTransactionState, ClisitefVoidContext, ClisitefVoidDeps, clisitefDetails, clisitefLast4, clisitefMetadata, clisitefModalityOf, clisitefPinPadCapabilities, clisitefPinPadDeviceFields, clisitefPinPadErrors, clisitefPinPadPayments, clisitefVoidMetadata, dropReversal, isClisitefModality, isOpen, queueReversal, readClisitefPinPadSettings, readPendingReversals, readRefund, readTransaction, redactSecrets, resolveClisitefMenu, runClisitefTransaction, runClisitefVoid, writeRefund, writeTransaction };
+export { CLISITEF_CANCEL_CODES, CLISITEF_CAPTURE_FIELDS, CLISITEF_COMMAND, CLISITEF_CONFIRMATION_TIMEOUT_MS, CLISITEF_DEFAULT_OPERATOR, CLISITEF_FIELD, CLISITEF_INCONCLUSIVE_CODES, CLISITEF_MODALITIES, CLISITEF_NO, CLISITEF_PAYMENT_TIMEOUT_MS, CLISITEF_PINPAD_TYPES, CLISITEF_REFUNDS_KEY, CLISITEF_REFUND_STORAGE_KEY, CLISITEF_RELEASE_TIMEOUT_MS, CLISITEF_REVERSALS_KEY, CLISITEF_STORAGE_KEY, CLISITEF_VOID_FIELD, CLISITEF_YES, ClisitefFields, ClisitefMenuDecision, ClisitefMenuPurpose, ClisitefModality, ClisitefOutcome, ClisitefOutcomeStatus, ClisitefPendingReversal, ClisitefPinPadOptions, ClisitefPinPadSettings, ClisitefProviderMetadata, ClisitefTransactionInput, ClisitefTransactionRecord, ClisitefTransactionState, ClisitefVoidContext, ClisitefVoidDeps, clisitefDetails, clisitefLast4, clisitefMetadata, clisitefModalityOf, clisitefPinPadCapabilities, clisitefPinPadDeviceFields, clisitefPinPadErrors, clisitefPinPadPayments, clisitefVoidMetadata, dropReversal, isClisitefModality, isOpen, queueReversal, readClisitefPinPadSettings, readPendingReversals, readRefund, readTransaction, redactSecrets, resolveClisitefMenu, runClisitefTransaction, runClisitefVoid, writeRefund, writeTransaction };

package/dist/index.js

@@ -34,13 +34,11 @@ const CLISITEF_COMMAND = {
 /** `continueTransaction` answers to `CONFIRM` (20). */
 const CLISITEF_YES = "0";
 const CLISITEF_NO = "1";
-/** `continueTransaction` answer to `CHECK_ABORT` (23): interrupt. */
-const CLISITEF_INTERRUPT = "1";
 /**
-* Commands answered after `abortTransaction(-1)` without `stage 1`; then the
-* adapter stops answering and leaves the record open (legacy criterion).
+* Wait for the `stage 1` of a routine a previous charge left open, after
+* answering it with `abortTransaction(-1)`; then the charge starts anyway.
 */
-const CLISITEF_DRAIN_LIMIT = 10;
+const CLISITEF_RELEASE_TIMEOUT_MS = 15e3;
 /** `TipoCampo` ids stored with `STORE_FIELD` (Fiserv "Tabela TipoCampo"). */
 const CLISITEF_FIELD = {
 	TRANSACTION_DATE: 105,
@@ -468,7 +466,6 @@ const runClisitefTransaction = (input) => {
 	let aborted = false;
 	/** Why the adapter asked to interrupt; `stage 1` has not arrived yet. */
 	let givingUp = null;
-	let drained = 0;
 	let watchdog;
 	let queue = Promise.resolve();
 	let resolve = () => void 0;
@@ -517,20 +514,22 @@ const runClisitefTransaction = (input) => {
 			});
 		}
 	};
-	/** Stops answering and leaves the record open: `stage 1` never came. */
+	/**
+	* Stops waiting: `stage 1` never came. The routine may still be open in
+	* CliSiTef; the next charge releases it (`open` outcome).
+	*/
 	const abandon = () => {
-		log("abandon", {
-			drained,
-			skipped: closing
-		});
+		log("abandon", { skipped: closing });
 		if (closing || !givingUp) return;
 		closing = true;
 		settle("open", givingUp);
 	};
 	/**
-	* Asks CliSiTef to interrupt (`Continua = -1`) and keeps the loop running
-	* until `stage 1`: dropping it earlier leaves the routine open (`-12`). An
-	* approval already confirmed with `finishTransaction(1)` is undone instead.
+	* Marks the transaction to interrupt. CliSiTef only takes `Continua = -1`
+	* as the answer to an `onData` (Interface Simplificada §5.3), so nothing is
+	* sent here: the pending or next event is answered with
+	* `abortTransaction(-1)` until `stage 1`. An approval already confirmed
+	* with `finishTransaction(1)` is undone instead.
 	*/
 	const giveUp = (reason) => {
 		log("give up", reason);
@@ -542,7 +541,6 @@ const runClisitefTransaction = (input) => {
 		}
 		givingUp = reason;
 		watchdog = setTimeout(abandon, input.confirmationTimeoutMs);
-		client.abortTransaction(CLISITEF_ABORT_FLAG).catch(() => 0);
 	};
 	function onAbort() {
 		log("signal aborted (payment deadline)");
@@ -573,19 +571,21 @@ const runClisitefTransaction = (input) => {
 			expiresAt: null
 		});
 	};
-	/** Answers without the UI while CliSiTef winds down after the abort. */
+	/**
+	* Answers every event after giving up with `Continua = -1`, without the UI
+	* and without a count: a `continueTransaction` here would tell CliSiTef to
+	* keep going (PIX keeps polling the server for minutes).
+	*/
 	const drain = async (event) => {
-		drained += 1;
 		log("drain", {
 			command: event.command,
-			drained
+			skipped: closing
 		});
-		if (drained > 10) return abandon();
 		const { command } = event;
 		if (command === CLISITEF_COMMAND.STORE_FIELD) store(event);
 		if (command === CLISITEF_COMMAND.QR_HIDE) clearQr();
-		const interrupt = command === CLISITEF_COMMAND.CHECK_ABORT;
-		return reply(interrupt ? "1" : "");
+		if (closing) return;
+		await client.abortTransaction(CLISITEF_ABORT_FLAG);
 	};
 	/** A UI answer that arrives after giving up is not sent. */
 	const respond = (event, data) => {
@@ -1378,7 +1378,10 @@ const clisitefPinPadPayments = (options = {}) => {
 	const now = options.now ?? (() => /* @__PURE__ */ new Date());
 	const confirmationMs = options.confirmationTimeoutMs ?? 6e4;
 	const timeoutMs = options.timeoutMs ?? 18e4;
+	const releaseMs = options.releaseTimeoutMs ?? 15e3;
 	const lock = createLock();
+	/** A charge of this process gave up without `stage 1` (`open`). */
+	let leftOpen = false;
 	const storageOf = (ctx) => {
 		return options.storage ?? ctx.storage;
 	};
@@ -1455,12 +1458,38 @@ const clisitefPinPadPayments = (options = {}) => {
 		return error?.provider_code === "-12";
 	};
 	/**
-	* Interrupts a leftover native session so `configure` can run again. No
-	* `submitPendingMessages` or `closePinPad` here: right after an abort they
-	* left the native thread hung in production.
+	* Ends an iterative routine left open in this process (`-12`). CliSiTef
+	* takes `Continua = -1` only as the answer to an `onData`, so the pending
+	* event and every new one get `abortTransaction(-1)` until the routine's
+	* `stage 1`, which is dropped. No `submitPendingMessages` or `closePinPad`
+	* here: right after an abort they left the native thread hung in production.
 	*/
-	const releaseNative = async () => {
-		await client.abortTransaction(CLISITEF_ABORT_FLAG).catch(() => 0);
+	const releaseRoutine = () => {
+		clisitefDebug("pinpad.adapter.release", "routine", { releaseMs });
+		leftOpen = false;
+		const subscriptions = [];
+		let timer;
+		const abort = () => {
+			client.abortTransaction(CLISITEF_ABORT_FLAG).catch(() => 0);
+		};
+		return new Promise((resolve) => {
+			const done = () => {
+				clearTimeout(timer);
+				for (const subscription of subscriptions) subscription.remove();
+				client.invalidate();
+				resolve();
+			};
+			subscriptions.push(client.onData(abort));
+			subscriptions.push(client.onTransactionResult((event) => {
+				if (event.stage === 1) done();
+			}));
+			timer = setTimeout(done, releaseMs);
+			abort();
+		});
+	};
+	/** `startTransaction` refused: a previous routine is still open. */
+	const isStartBusy = (outcome) => {
+		return outcome.status === "declined" && outcome.code === -12 && !outcome.aborted && outcome.fields.size === 0;
 	};
 	/** Open, or flagged for review with the coupon maybe still pending. */
 	const recoverable = (record) => {
@@ -1469,10 +1498,11 @@ const clisitefPinPadPayments = (options = {}) => {
 	/** Configures and resolves the open records of the device, if any. */
 	const prepare = async (ctx) => {
 		const settings = readClisitefPinPadSettings(ctx.config, ctx.deviceSettings);
+		if (leftOpen) await releaseRoutine();
 		let error = await configure(settings);
 		if (isConfigureBusy(error)) {
 			clisitefDebug("pinpad.adapter.release", "busy", {});
-			await releaseNative();
+			await releaseRoutine();
 			error = await configure(settings);
 		}
 		const storage = storageOf(ctx);
@@ -1598,11 +1628,17 @@ const clisitefPinPadPayments = (options = {}) => {
 			modality: chosen,
 			purpose: "charge"
 		};
-		const outcome = await runClisitefTransaction({
+		const run = () => runClisitefTransaction({
 			...t1,
 			...t2,
 			...t3
 		});
+		let outcome = await run();
+		if (isStartBusy(outcome)) {
+			await releaseRoutine();
+			if (!await configure(settings)) outcome = await run();
+		}
+		if (outcome.status === "open") leftOpen = true;
 		const fields = Object.fromEntries(outcome.fields);
 		clisitefDebug("pinpad.adapter.charge", "outcome", {
 			...outcome,
@@ -1822,4 +1858,4 @@ const clisitefPinPadPayments = (options = {}) => {
 	};
 };
 //#endregion
-export { CLISITEF_CANCEL_CODES, CLISITEF_CAPTURE_FIELDS, CLISITEF_COMMAND, CLISITEF_CONFIRMATION_TIMEOUT_MS, CLISITEF_DEFAULT_OPERATOR, CLISITEF_DRAIN_LIMIT, CLISITEF_FIELD, CLISITEF_INCONCLUSIVE_CODES, CLISITEF_INTERRUPT, CLISITEF_MODALITIES, CLISITEF_NO, CLISITEF_PAYMENT_TIMEOUT_MS, CLISITEF_PINPAD_TYPES, CLISITEF_REFUNDS_KEY, CLISITEF_REFUND_STORAGE_KEY, CLISITEF_REVERSALS_KEY, CLISITEF_STORAGE_KEY, CLISITEF_VOID_FIELD, CLISITEF_YES, clisitefDetails, clisitefLast4, clisitefMetadata, clisitefModalityOf, clisitefPinPadCapabilities, clisitefPinPadDeviceFields, clisitefPinPadErrors, clisitefPinPadPayments, clisitefVoidMetadata, dropReversal, isClisitefModality, isOpen, queueReversal, readClisitefPinPadSettings, readPendingReversals, readRefund, readTransaction, redactSecrets, resolveClisitefMenu, runClisitefTransaction, runClisitefVoid, writeRefund, writeTransaction };
+export { CLISITEF_CANCEL_CODES, CLISITEF_CAPTURE_FIELDS, CLISITEF_COMMAND, CLISITEF_CONFIRMATION_TIMEOUT_MS, CLISITEF_DEFAULT_OPERATOR, CLISITEF_FIELD, CLISITEF_INCONCLUSIVE_CODES, CLISITEF_MODALITIES, CLISITEF_NO, CLISITEF_PAYMENT_TIMEOUT_MS, CLISITEF_PINPAD_TYPES, CLISITEF_REFUNDS_KEY, CLISITEF_REFUND_STORAGE_KEY, CLISITEF_RELEASE_TIMEOUT_MS, CLISITEF_REVERSALS_KEY, CLISITEF_STORAGE_KEY, CLISITEF_VOID_FIELD, CLISITEF_YES, clisitefDetails, clisitefLast4, clisitefMetadata, clisitefModalityOf, clisitefPinPadCapabilities, clisitefPinPadDeviceFields, clisitefPinPadErrors, clisitefPinPadPayments, clisitefVoidMetadata, dropReversal, isClisitefModality, isOpen, queueReversal, readClisitefPinPadSettings, readPendingReversals, readRefund, readTransaction, redactSecrets, resolveClisitefMenu, runClisitefTransaction, runClisitefVoid, writeRefund, writeTransaction };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fire-spark/payments-clisitef-pinpad-rn",
-  "version": "0.8.2",
+  "version": "0.8.3",
   "description": "Fire Spark CliSiTef (Software Express) pinpad adapter for Brazil: debit, credit, voucher and Pix with automatic voids on Android kiosks",
   "type": "module",
   "sideEffects": false,
@@ -17,9 +17,9 @@
     }
   },
   "dependencies": {
-    "@fire-spark/payments": "^0.8.2",
-    "@fire-spark/payments-clisitef-client": "^0.8.2",
-    "@fire-spark/types": "^0.8.2"
+    "@fire-spark/payments": "^0.8.3",
+    "@fire-spark/payments-clisitef-client": "^0.8.3",
+    "@fire-spark/types": "^0.8.3"
   },
   "devDependencies": {
     "tsdown": "^0.22.14",