@fire-spark/payments-clisitef-client 0.11.0 → 0.12.0

package/android/src/main/java/dev/firespark/payments/clisitef/BoundedRunner.kt

@@ -48,7 +48,7 @@ internal class BoundedRunner {
       Lane.RECOVERY -> recovery
     }
     // TODO(debug-clisitef): remove.
-    Log.d(DEBUG_TAG, "runner.$operation › queued lane=$lane timeoutMs=$timeoutMs")
+    CliSiTefDebug.log("runner.$operation › queued lane=$lane timeoutMs=$timeoutMs")
     val timer = if (timeoutMs > 0) {
       watchdog.schedule({
         if (settled.compareAndSet(false, true)) {
@@ -65,7 +65,9 @@ internal class BoundedRunner {
     try {
       target.execute {
         // TODO(debug-clisitef): remove.
-        Log.d(DEBUG_TAG, "runner.$operation › running thread=${Thread.currentThread().name} waited=${System.currentTimeMillis() - startedAt}ms")
+        val thread = Thread.currentThread().name
+        val waited = System.currentTimeMillis() - startedAt
+        CliSiTefDebug.log("runner.$operation › running thread=$thread waited=${waited}ms")
         val outcome = runCatching(block)
         timer?.cancel(false)
         if (!settled.compareAndSet(false, true)) {
@@ -75,7 +77,10 @@ internal class BoundedRunner {
         lastCallOperation = operation
         lastCallDurationMs = System.currentTimeMillis() - startedAt
         // TODO(debug-clisitef): remove.
-        Log.d(DEBUG_TAG, "runner.$operation › settled ok=${outcome.isSuccess} value=${outcome.getOrNull()} error=${outcome.exceptionOrNull()?.message} ms=$lastCallDurationMs")
+        val ok = outcome.isSuccess
+        val value = outcome.getOrNull()
+        val error = outcome.exceptionOrNull()?.message
+        CliSiTefDebug.log("runner.$operation › settled ok=$ok value=$value error=$error ms=$lastCallDurationMs")
         outcome
           .onSuccess {
             consecutiveTimeouts.set(0)
@@ -128,8 +133,6 @@ internal class BoundedRunner {
 
   private companion object {
     const val TAG = "CliSiTef"
-    // TODO(debug-clisitef): remove.
-    const val DEBUG_TAG = "CLISITEF_DEBUG"
 
     fun daemon(name: String): ThreadFactory {
       val sequence = AtomicInteger(0)

package/android/src/main/java/dev/firespark/payments/clisitef/CliSiTefBridge.kt

@@ -31,7 +31,8 @@ internal class CliSiTefBridge(
 
   // TODO(debug-clisitef): remove with every `traced` / `debug` call.
   private fun debug(scope: String, message: String) {
-    Log.d(DEBUG_TAG, "$scope › $message [thread=${Thread.currentThread().name}]")
+    val thread = Thread.currentThread().name
+    CliSiTefDebug.log("$scope › $message [thread=$thread]")
   }
 
   // TODO(debug-clisitef): remove; call `block()` directly.
@@ -118,8 +119,6 @@ internal class CliSiTefBridge(
 
   companion object {
     private const val TAG = "CliSiTef"
-    // TODO(debug-clisitef): remove.
-    private const val DEBUG_TAG = "CLISITEF_DEBUG"
     private const val CLSIT = "CLSIT"
     private val APP_DIR = Regex("DiretorioApp=[^;\\]]*")
 
@@ -144,7 +143,10 @@ internal class CliSiTefBridge(
       try {
         val shipped = context.assets.open(CLSIT).use { it.readBytes() }
         // TODO(debug-clisitef): remove.
-        Log.d(DEBUG_TAG, "syncClsit › shipped=${shipped.size}B target=${target.absolutePath} exists=${target.isFile}")
+        val shippedBytes = shipped.size
+        val targetPath = target.absolutePath
+        val exists = target.isFile
+        CliSiTefDebug.log("syncClsit › shipped=${shippedBytes}B target=$targetPath exists=$exists")
         if (shipped.isEmpty()) return
         if (target.isFile && target.readBytes().contentEquals(shipped)) return
         temp.outputStream().use { out ->

package/android/src/main/java/dev/firespark/payments/clisitef/CliSiTefDebug.kt

@@ -0,0 +1,16 @@
+package dev.firespark.payments.clisitef
+
+import android.util.Log
+
+/** Process-wide gate for `CLISITEF_DEBUG` logcat lines. Off until `setLogs`. */
+internal object CliSiTefDebug {
+  const val TAG = "CLISITEF_DEBUG"
+
+  @Volatile
+  var enabled: Boolean = false
+
+  fun log(message: String) {
+    if (!enabled) return
+    Log.d(TAG, message)
+  }
+}

package/android/src/main/java/dev/firespark/payments/clisitef/CliSiTefModule.kt

@@ -13,7 +13,8 @@ class CliSiTefModule : Module() {
     bridge?.let { return it }
     val context = appContext.reactContext?.applicationContext ?: throw Exceptions.ReactContextLost()
     // TODO(debug-clisitef): remove.
-    android.util.Log.d("CLISITEF_DEBUG", "module › creating bridge dataDir=${context.applicationInfo.dataDir}")
+    val dataDir = context.applicationInfo.dataDir
+    CliSiTefDebug.log("module › creating bridge dataDir=$dataDir")
     CliSiTefBridge(
       context,
       onData = { event -> sendEvent("onData", event.toMap()) },
@@ -66,6 +67,10 @@ class CliSiTefModule : Module() {
       runner.run("disconnectSitef", 10_000, promise, Lane.RECOVERY) { bridge().disconnectSitef() }
     }
 
+    Function("setLogs") { enabled: Boolean ->
+      CliSiTefDebug.enabled = enabled
+    }
+
     Function("getHealth") { runner.health(bridge?.appDirectory) }
 
     OnDestroy { runner.shutdown() }

package/dist/index.d.mts

@@ -68,6 +68,8 @@ type ClisitefNativeModule = {
   closePinPad: () => Promise<number>;
   disconnectSitef: () => Promise<number>;
   getHealth: () => ClisitefHealth;
+  /** Enables or disables `CLISITEF_DEBUG` logcat lines. Off until set. */
+  setLogs: (enabled: boolean) => void;
   addListener: <E extends keyof ClisitefEvents>(event: E, listener: ClisitefEvents[E]) => ClisitefSubscription;
 };
 //#endregion
@@ -145,6 +147,8 @@ declare const CLISITEF_DEFAULT_TIME_ZONE = "America/Sao_Paulo";
 declare const CLISITEF_DEFAULT_PINPAD = "ANDROID_USB";
 //#endregion
 //#region src/debug.d.ts
+/** Turns console and Android logcat traces on or off. Default is off. */
+declare const setClisitefLogs: (value: boolean) => void;
 /** Logs one step: `[CLISITEF_DEBUG] scope › event { data }`. */
 declare const clisitefDebug: (scope: string, event: string, data?: unknown) => void;
 /** Logs the input, the output or the error, and the duration of a call. */
@@ -203,4 +207,4 @@ declare const parseClisitefMenu: (input: string) => ClisitefMenuOption[];
 /** Shared client bound to the device's native module; one per app. */
 declare const clisitef: ClisitefClient;
 //#endregion
-export { CLISITEF_ABORT_FLAG, CLISITEF_CONFIRM, CLISITEF_DEFAULT_PINPAD, CLISITEF_DEFAULT_TIME_ZONE, CLISITEF_JS_GRACE_MS, CLISITEF_MODALITY, CLISITEF_RESULT, CLISITEF_TIMEOUT_CODE, CLISITEF_TIMEOUT_MS, CLISITEF_VOID_FUNCTION, ClisitefAdditionalParamsInput, ClisitefClient, ClisitefClientOptions, ClisitefConfigureParams, ClisitefDataEvent, ClisitefEvents, ClisitefFinishParams, ClisitefFiscalDateTime, ClisitefHealth, ClisitefMenuOption, ClisitefNativeModule, ClisitefOperation, ClisitefResultEvent, ClisitefStartParams, ClisitefSubscription, ClisitefTimeoutError, ClisitefTimeoutInfo, ClisitefUnavailableError, clisitef, clisitefAdditionalParams, clisitefConfigSignature, clisitefDebug, clisitefDebugCall, clisitefFiscalDateTime, createClisitefClient, formatClisitefAmount, parseClisitefMenu, toClisitefTimeout };
+export { CLISITEF_ABORT_FLAG, CLISITEF_CONFIRM, CLISITEF_DEFAULT_PINPAD, CLISITEF_DEFAULT_TIME_ZONE, CLISITEF_JS_GRACE_MS, CLISITEF_MODALITY, CLISITEF_RESULT, CLISITEF_TIMEOUT_CODE, CLISITEF_TIMEOUT_MS, CLISITEF_VOID_FUNCTION, ClisitefAdditionalParamsInput, ClisitefClient, ClisitefClientOptions, ClisitefConfigureParams, ClisitefDataEvent, ClisitefEvents, ClisitefFinishParams, ClisitefFiscalDateTime, ClisitefHealth, ClisitefMenuOption, ClisitefNativeModule, ClisitefOperation, ClisitefResultEvent, ClisitefStartParams, ClisitefSubscription, ClisitefTimeoutError, ClisitefTimeoutInfo, ClisitefUnavailableError, clisitef, clisitefAdditionalParams, clisitefConfigSignature, clisitefDebug, clisitefDebugCall, clisitefFiscalDateTime, createClisitefClient, formatClisitefAmount, parseClisitefMenu, setClisitefLogs, toClisitefTimeout };

package/dist/index.mjs

@@ -43,8 +43,13 @@ const CLISITEF_JS_GRACE_MS = 5e3;
 const CLISITEF_DEFAULT_TIME_ZONE = "America/Sao_Paulo";
 const CLISITEF_DEFAULT_PINPAD = "ANDROID_USB";
 //#endregion
+//#region src/native.ts
+/** `null` on iOS, web, or an Android build without the CliSiTef plugin. */
+const clisitefNative = requireOptionalNativeModule("CliSiTef");
+//#endregion
 //#region src/debug.ts
 const TAG = "[CLISITEF_DEBUG]";
+let enabled = false;
 const elapsed = (startedAt) => Date.now() - startedAt;
 const safe = (value) => {
 	if (value instanceof Map) return Object.fromEntries(value);
@@ -58,8 +63,14 @@ const safe = (value) => {
 	}
 	return value;
 };
+/** Turns console and Android logcat traces on or off. Default is off. */
+const setClisitefLogs = (value) => {
+	enabled = value;
+	clisitefNative?.setLogs(value);
+};
 /** Logs one step: `[CLISITEF_DEBUG] scope › event { data }`. */
 const clisitefDebug = (scope, event, data) => {
+	if (!enabled) return;
 	const time = (/* @__PURE__ */ new Date()).toISOString();
 	if (data === void 0) return console.log(TAG, time, `${scope} › ${event}`);
 	console.log(TAG, time, `${scope} › ${event}`, safe(data));
@@ -314,6 +325,6 @@ const createClisitefClient = (native, options = {}) => {
 //#endregion
 //#region src/index.ts
 /** Shared client bound to the device's native module; one per app. */
-const clisitef = createClisitefClient(requireOptionalNativeModule("CliSiTef"));
+const clisitef = createClisitefClient(clisitefNative);
 //#endregion
-export { CLISITEF_ABORT_FLAG, CLISITEF_CONFIRM, CLISITEF_DEFAULT_PINPAD, CLISITEF_DEFAULT_TIME_ZONE, CLISITEF_JS_GRACE_MS, CLISITEF_MODALITY, CLISITEF_RESULT, CLISITEF_TIMEOUT_CODE, CLISITEF_TIMEOUT_MS, CLISITEF_VOID_FUNCTION, ClisitefTimeoutError, ClisitefUnavailableError, clisitef, clisitefAdditionalParams, clisitefConfigSignature, clisitefDebug, clisitefDebugCall, clisitefFiscalDateTime, createClisitefClient, formatClisitefAmount, parseClisitefMenu, toClisitefTimeout };
+export { CLISITEF_ABORT_FLAG, CLISITEF_CONFIRM, CLISITEF_DEFAULT_PINPAD, CLISITEF_DEFAULT_TIME_ZONE, CLISITEF_JS_GRACE_MS, CLISITEF_MODALITY, CLISITEF_RESULT, CLISITEF_TIMEOUT_CODE, CLISITEF_TIMEOUT_MS, CLISITEF_VOID_FUNCTION, ClisitefTimeoutError, ClisitefUnavailableError, clisitef, clisitefAdditionalParams, clisitefConfigSignature, clisitefDebug, clisitefDebugCall, clisitefFiscalDateTime, createClisitefClient, formatClisitefAmount, parseClisitefMenu, setClisitefLogs, toClisitefTimeout };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fire-spark/payments-clisitef-client",
-  "version": "0.11.0",
+  "version": "0.12.0",
   "description": "Fire Spark native client for CliSiTef (Software Express) on Android: SiTef server and pinpad bridge shared by the CliSiTef adapters",
   "sideEffects": false,
   "files": [