pakstr 0.3.4 → 0.5.0

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

@@ -3,6 +3,7 @@ package com.pakstr.app
 import android.content.Context
 import android.util.Log
 import org.json.JSONObject
+import com.pakstr.app.debug.DebugConfig
 
 object RuntimeConfig {
 
@@ -10,7 +11,6 @@ object RuntimeConfig {
 
     private var config: JSONObject? = null
 
-
     fun load(context: Context): JSONObject {
 
         config?.let {
@@ -21,14 +21,12 @@ object RuntimeConfig {
 
         config = try {
 
-            val input =
-                context.assets.open(
-                    "www/pakstr-runtime.json"
-                )
+            val input = context.assets.open(
+                "www/pakstr-runtime.json"
+            )
 
-            val json =
-                input.bufferedReader()
-                    .use { it.readText() }
+            val json = input.bufferedReader()
+                .use { it.readText() }
 
 
             JSONObject(json)
@@ -36,9 +34,7 @@ object RuntimeConfig {
         } catch (e: Exception) {
 
             Log.e(
-                TAG,
-                "Failed loading runtime config",
-                e
+                TAG, "Failed loading runtime config", e
             )
 
             JSONObject()
@@ -47,15 +43,13 @@ object RuntimeConfig {
 
 
         Log.d(
-            TAG,
-            "FINAL CONFIG: $config"
+            TAG, "FINAL CONFIG: $config"
         )
 
 
         return config!!
     }
 
-
     /**
      * Returns backend API URL.
      *
@@ -67,17 +61,13 @@ object RuntimeConfig {
         context: Context
     ): String? {
 
-        val value =
-            load(context)
-                .optString(
-                    "apiBase",
-                    ""
-                )
+        val value = load(context).optString(
+                "apiBase", ""
+            )
 
 
         Log.d(
-            TAG,
-            "apiBase=$value"
+            TAG, "apiBase=$value"
         )
 
 
@@ -86,7 +76,6 @@ object RuntimeConfig {
         }
     }
 
-
     /**
      * Determines if REST API proxy should be enabled.
      */
@@ -94,20 +83,17 @@ object RuntimeConfig {
         context: Context
     ): Boolean {
 
-        val enabled =
-            !apiBase(context).isNullOrBlank()
+        val enabled = !apiBase(context).isNullOrBlank()
 
 
         Log.d(
-            TAG,
-            "apiEnabled=$enabled"
+            TAG, "apiEnabled=$enabled"
         )
 
 
         return enabled
     }
 
-
     /**
      * Nostr relay URL.
      */
@@ -115,24 +101,59 @@ object RuntimeConfig {
         context: Context
     ): String {
 
-        val relay =
+        val relay = load(context).optString(
+                "relayUrl", ""
+            )
+
+
+        Log.d(
+            TAG, "relayUrl=$relay"
+        )
+
+
+        return relay
+    }
+
+    /**
+
+     * Determines if developer debug tools are enabled.
+
+     */
+
+    fun debugEnabled(
+
+        context: Context
+
+    ): Boolean {
+
+        val enabled =
+
             load(context)
-                .optString(
-                    "relayUrl",
-                    ""
+
+                .optJSONObject("debug")
+
+                ?.optBoolean(
+
+                    "enabled",
+
+                    false
+
                 )
 
+                ?: false
 
         Log.d(
+
             TAG,
-            "relayUrl=$relay"
+
+            "debugEnabled=$enabled"
+
         )
 
+        return enabled
 
-        return relay
     }
 
-
     /**
      * Clears cached config.
      * Useful for testing after changing pakstr-runtime.json.
@@ -142,8 +163,31 @@ object RuntimeConfig {
         config = null
 
         Log.d(
-            TAG,
-            "Config cache cleared"
+            TAG, "Config cache cleared"
+        )
+    }
+
+    fun debugConfig(
+        context: Context
+    ): DebugConfig {
+
+        val debug = load(context).optJSONObject("debug") ?: return DebugConfig()
+
+
+        return DebugConfig(
+
+            enabled = debug.optBoolean(
+                "enabled", false
+            ),
+
+            networkLogs = debug.optBoolean(
+                "networkLogs", false
+            ),
+
+            webViewLogs = debug.optBoolean(
+                "webViewLogs", false
+            ),
+
         )
     }
 }

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

@@ -26,6 +26,12 @@ class ShellRuntime(
 
     fun start() {
 
+        AppDebugLogger.log(
+            context,
+            "RUNTIME",
+            "Starting ShellRuntime"
+        )
+
         controller = WebViewController(
             context,
             webView,
@@ -34,14 +40,28 @@ class ShellRuntime(
             permissionHandler
         )
 
+        AppDebugLogger.log(
+            context,
+            "RUNTIME",
+            "WebViewController created"
+        )
+
+
         CoroutineScope(Dispatchers.IO).launch {
 
+            AppDebugLogger.log(
+                context,
+                "RUNTIME",
+                "Starting background initialization"
+            )
+
             val ok = startServer()
 
 
             if (!ok) {
 
-                AppDebugLogger.log(
+                AppDebugLogger.error(
+                    context,
                     "RUNTIME",
                     "Server failed"
                 )
@@ -51,22 +71,53 @@ class ShellRuntime(
             }
 
 
+            AppDebugLogger.log(
+                context,
+                "RUNTIME",
+                "Server ready, switching to main thread"
+            )
+
+
             withContext(Dispatchers.Main) {
 
+                AppDebugLogger.log(
+                    context,
+                    "WEBVIEW",
+                    "Setting up WebView controller"
+                )
+
                 controller.setup()
 
+                AppDebugLogger.log(
+                    context,
+                    "WEBVIEW",
+                    "WebView controller setup completed"
+                )
+
             }
 
         }
-
+        AppDebugLogger.load(context)
     }
 
-
     private fun startServer(): Boolean {
 
-        if (server != null)
+        if (server != null) {
+
+            AppDebugLogger.log(
+
+                context,
+
+                "SERVER",
+
+                "Already running"
+
+            )
+
             return true
 
+        }
+
         return try {
 
             server = LocalServer(
@@ -80,32 +131,72 @@ class ShellRuntime(
             )
 
             AppDebugLogger.log(
+
+                context,
+
                 "SERVER",
-                "Started OK"
+
+                "Starting NanoHTTPD on port $port"
+
             )
 
             true
 
         } catch (e: Exception) {
 
-            AppDebugLogger.log(
+            AppDebugLogger.error(
+
+                context,
+
                 "SERVER",
-                "Failed to start: ${e.message}"
+
+                "Failed to start",
+
+                e
+
             )
 
             false
         }
     }
 
-
     fun stop() {
 
+        AppDebugLogger.log(
+
+            context,
+
+            "RUNTIME",
+
+            "Stopping ShellRuntime"
+
+        )
+
         server?.stop()
 
+        AppDebugLogger.log(
+
+            context,
+
+            "SERVER",
+
+            "Server stopped"
+
+        )
+
         controller.destroy()
 
-    }
+        AppDebugLogger.log(
+
+            context,
+
+            "WEBVIEW",
 
+            "WebView destroyed"
+
+        )
+
+    }
 
     fun getWebview(): WebView {