pakstr 0.3.4 → 0.4.0

package/android-template/app/src/main/java/com/pakstr/app/signer/NostrBridge.kt

@@ -30,7 +30,15 @@ class NostrBridge(
         callbackId: String,
         payload: String?
     ) {
+        AppDebugLogger.log(
+
+            webView.context,
+
+            "SIGNER",
+
+            "Request: $method"
 
+        )
         when (method) {
 
             "getPublicKey" -> {
@@ -47,6 +55,17 @@ class NostrBridge(
                             pk
                         )
                     } catch (e: SignerUnavailableException) {
+                        AppDebugLogger.error(
+
+                            webView.context,
+
+                            "SIGNER",
+
+                            "getPublicKey failed",
+
+                            e
+
+                        )
                         resolve(
                             callbackId,
                             errorResponse(
@@ -56,6 +75,17 @@ class NostrBridge(
                         )
 
                     } catch (e: Exception) {
+                        AppDebugLogger.error(
+
+                            webView.context,
+
+                            "SIGNER",
+
+                            "getPublicKey failed",
+
+                            e
+
+                        )
                         resolve(
                             callbackId,
                             errorResponse(
@@ -68,11 +98,6 @@ class NostrBridge(
             }
 
             "signEvent" -> {
-                AppDebugLogger.log(
-                    "NOSTR_SIGN",
-                    "Signing event request"
-                )
-
                 scope.launch {
 
                     try {
@@ -87,13 +112,22 @@ class NostrBridge(
                                     payload
                                 )
 
+                        AppDebugLogger.log(
+
+                            webView.context,
+
+                            "SIGNER",
+
+                            "signEvent success"
+
+                        )
+
                         resolve(
                             callbackId,
                             result
                         )
 
                     } catch (e: SignerUnavailableException) {
-
                         resolve(
                             callbackId,
                             errorResponse(
@@ -103,6 +137,17 @@ class NostrBridge(
                         )
 
                     } catch (e: Exception) {
+                        AppDebugLogger.error(
+
+                            webView.context,
+
+                            "SIGNER",
+
+                            "signEvent failed",
+
+                            e
+
+                        )
                         resolve(
                             callbackId,
                             errorResponse(
@@ -141,7 +186,15 @@ class NostrBridge(
                                     plaintext
                                 )
 
+                        AppDebugLogger.log(
+
+                            webView.context,
+
+                            "SIGNER",
 
+                            "nip04_encrypt success"
+
+                        )
                         resolve(
                             callbackId,
                             result
@@ -158,7 +211,17 @@ class NostrBridge(
                         )
 
                     } catch (e: Exception) {
+                        AppDebugLogger.error(
+
+                            webView.context,
 
+                            "SIGNER",
+
+                            "nip04_encrypt failed",
+
+                            e
+
+                        )
                         resolve(
                             callbackId,
                             errorResponse(
@@ -197,7 +260,15 @@ class NostrBridge(
                                     ciphertext
                                 )
 
+                        AppDebugLogger.log(
+
+                            webView.context,
+
+                            "SIGNER",
 
+                            "nip04_decrypt success"
+
+                        )
                         resolve(
                             callbackId,
                             result
@@ -214,7 +285,17 @@ class NostrBridge(
                         )
 
                     } catch (e: Exception) {
+                        AppDebugLogger.error(
+
+                            webView.context,
+
+                            "SIGNER",
+
+                            "nip04_decrypt failed",
+
+                            e
 
+                        )
                         resolve(
                             callbackId,
                             errorResponse(
@@ -242,14 +323,32 @@ class NostrBridge(
                                     json.getString("pubkey"),
                                     json.getString("plaintext")
                                 )
+                        AppDebugLogger.log(
+
+                            webView.context,
+
+                            "SIGNER",
+
+                            "nip44_encrypt success"
 
+                        )
                         resolve(
                             callbackId,
                             result
                         )
 
                     } catch (e: Exception) {
+                        AppDebugLogger.error(
+
+                            webView.context,
+
+                            "SIGNER",
 
+                            "nip44_encrypt failed",
+
+                            e
+
+                        )
                         resolve(
                             callbackId,
                             errorResponse(
@@ -277,14 +376,32 @@ class NostrBridge(
                                     json.getString("pubkey"),
                                     json.getString("ciphertext")
                                 )
+                        AppDebugLogger.log(
+
+                            webView.context,
+
+                            "SIGNER",
+
+                            "nip44_decrypt success"
 
+                        )
                         resolve(
                             callbackId,
                             result
                         )
 
                     } catch (e: Exception) {
+                        AppDebugLogger.error(
+
+                            webView.context,
+
+                            "SIGNER",
 
+                            "nip44_decrypt failed",
+
+                            e
+
+                        )
                         resolve(
                             callbackId,
                             errorResponse(
@@ -306,16 +423,51 @@ class NostrBridge(
         }
     }
 
+    @JavascriptInterface
+    fun debugLog(
+        level: String,
+        message: String
+    ) {
+
+        when (level.uppercase()) {
+
+            "ERROR" -> {
+
+                AppDebugLogger.error(
+                    webView.context,
+                    "WEB",
+                    message
+                )
+
+            }
+
+            "WARN" -> {
+
+                AppDebugLogger.log(
+                    webView.context,
+                    "WEB-WARN",
+                    message
+                )
+
+            }
+
+            else -> {
+
+                AppDebugLogger.log(
+                    webView.context,
+                    "WEB",
+                    message
+                )
+
+            }
+        }
+    }
+
     private fun resolve(
         callbackId: String,
         result: String
     ) {
 
-        AppDebugLogger.log(
-            "NOSTR_BRIDGE",
-            "Bridge response received"
-        )
-
         mainHandler.post {
 
             val js =

package/android-template/app/src/main/java/com/pakstr/app/signer/SignerManager.kt

@@ -6,6 +6,7 @@ import androidx.activity.result.ActivityResult
 import androidx.activity.result.ActivityResultLauncher
 import com.pakstr.app.signer.interfaces.NostrSigner
 import androidx.core.content.edit
+import com.pakstr.app.debug.AppDebugLogger
 import com.pakstr.app.signer.exceptions.SignerUnavailableException
 
 /**
@@ -46,6 +47,20 @@ class SignerManager(
 
     private var currentUserPubkey: String? = null
 
+    init {
+
+        AppDebugLogger.log(
+
+            context,
+
+            "SIGNER",
+
+            "SignerManager initialized. Active type: ${getActiveType()}"
+
+        )
+
+    }
+
     fun getActiveType(): SignerType? {
 
         val value =
@@ -78,6 +93,16 @@ class SignerManager(
 
         currentUserPubkey = pk
 
+        AppDebugLogger.log(
+
+            context,
+
+            "SIGNER",
+
+            "Public key received: ${pk.take(12)}..."
+
+        )
+
         return pk
 
     }
@@ -85,7 +110,15 @@ class SignerManager(
     fun setActiveType(
         type: SignerType
     ) {
+        AppDebugLogger.log(
 
+            context,
+
+            "SIGNER",
+
+            "Changing active signer to: ${type.name}"
+
+        )
         prefs.edit {
             putString(
                 "type",
@@ -108,12 +141,41 @@ class SignerManager(
             return it
         }
 
+        val activeType = getActiveType()
+
+        AppDebugLogger.log(
+
+            context,
+
+            "SIGNER",
+
+            "Creating signer instance: $activeType"
+
+        )
+
         val signer =
             when (getActiveType()) {
 
                 SignerType.AMBER -> {
+                    AppDebugLogger.log(
+
+                        context,
+
+                        "AMBER",
 
+                        "Creating Amber signer"
+
+                    )
                     if (!isAmberInstalled()) {
+                        AppDebugLogger.error(
+
+                            context,
+
+                            "AMBER",
+
+                            "Amber signer app is not installed"
+
+                        )
                         throw SignerUnavailableException(
                             "Amber signer application is not installed"
                         )
@@ -172,6 +234,15 @@ class SignerManager(
      * Activity Result API.
      */
     fun handleAmberResult(result: ActivityResult) {
+        AppDebugLogger.log(
+
+            context,
+
+            "AMBER",
+
+            "Activity result received: ${result.resultCode}"
+
+        )
         (activeSigner as? AmberSigner)
             ?.onResult(result)
     }

package/android-template/app/src/main/res/xml/file_paths.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<paths xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <cache-path
+        name="cache"
+        path="." />
+
+</paths>

package/dist/runners/LocalGradleRunner.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.LocalGradleRunner = void 0;
 const child_process_1 = require("child_process");
 const path_1 = __importDefault(require("path"));
+const fs_1 = __importDefault(require("fs"));
 class LocalGradleRunner {
     async build(androidRoot, mode) {
         const gradleTask = mode === "release" ? "assembleRelease" : "assembleDebug";
@@ -31,8 +32,17 @@ class LocalGradleRunner {
 }
 exports.LocalGradleRunner = LocalGradleRunner;
 function findApk(androidRoot, mode) {
-    const apkPath = path_1.default.join(androidRoot, "app", "build", "outputs", "apk", mode, mode === "debug" ? "app-debug.apk" : "app-release.apk");
-    return fsExists(apkPath) ? apkPath : null;
+    const apkDir = path_1.default.join(androidRoot, "app", "build", "outputs", "apk", mode);
+    if (!fs_1.default.existsSync(apkDir)) {
+        return null;
+    }
+    const files = fs_1.default.readdirSync(apkDir);
+    const apk = files.find(file => file.endsWith(".apk") &&
+        !file.includes("metadata"));
+    if (!apk) {
+        return null;
+    }
+    return path_1.default.join(apkDir, apk);
 }
 function fsExists(file) {
     const fs = require("fs");

package/dist/runtime/runtimeConfig.js

@@ -7,7 +7,12 @@ exports.generateRuntimeConfig = generateRuntimeConfig;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 function generateRuntimeConfig(webRoot, manifest) {
-    const runtime = manifest.runtime ?? {};
+    const runtime = {
+        ...(manifest.runtime ?? {}),
+        ...(manifest.debug
+            ? { debug: manifest.debug }
+            : {})
+    };
     const jsContent = `
 window.PAKSTR_CONFIG = ${JSON.stringify(runtime, null, 2)};
 `;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pakstr",
-  "version": "0.3.4",
+  "version": "0.4.0",
   "description": "CLI for packaging Nostr web apps into Android APKs",
   "type": "commonjs",
   "main": "dist/index.js",