pakstr 0.8.4 → 0.8.6

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

@@ -190,7 +190,6 @@ class MainActivity : AppCompatActivity(), PermissionHandler {
 
             val remainingDuration = SupportUnlock.remainingDuration(this)
             if (!BuildConfig.DEBUG &&
-                !RuntimeConfig.debugEnabled(this) &&
                 remainingDuration > 0L
             ) {
                 diagnosticsHandler.postDelayed(

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

@@ -14,7 +14,7 @@ object RuntimeConfig {
     fun load(context: Context): JSONObject {
 
         config?.let {
-            Log.d(TAG, "Returning cached config: $it")
+            debug("Returning cached config")
             return it
         }
 
@@ -33,8 +33,9 @@ object RuntimeConfig {
 
         } catch (e: Exception) {
 
-            Log.e(
-                TAG, "Failed loading runtime config", e
+            debugError(
+                "Failed loading runtime config",
+                e
             )
 
             JSONObject()
@@ -42,9 +43,7 @@ object RuntimeConfig {
         }
 
 
-        Log.d(
-            TAG, "FINAL CONFIG: $config"
-        )
+        debug("Runtime config loaded")
 
 
         return config!!
@@ -66,9 +65,7 @@ object RuntimeConfig {
             )
 
 
-        Log.d(
-            TAG, "apiBase=$value"
-        )
+        debug("apiBase=$value")
 
 
         return value.takeIf {
@@ -86,9 +83,7 @@ object RuntimeConfig {
         val enabled = !apiBase(context).isNullOrBlank()
 
 
-        Log.d(
-            TAG, "apiEnabled=$enabled"
-        )
+        debug("apiEnabled=$enabled")
 
 
         return enabled
@@ -106,9 +101,7 @@ object RuntimeConfig {
             )
 
 
-        Log.d(
-            TAG, "relayUrl=$relay"
-        )
+        debug("relayUrl=$relay")
 
 
         return relay
@@ -142,13 +135,7 @@ object RuntimeConfig {
 
                 ?: false
 
-        Log.d(
-
-            TAG,
-
-            "debugEnabled=$enabled"
-
-        )
+        debug("debugEnabled=$enabled")
 
         return enabled
 
@@ -162,9 +149,19 @@ object RuntimeConfig {
 
         config = null
 
-        Log.d(
-            TAG, "Config cache cleared"
-        )
+        debug("Config cache cleared")
+    }
+
+    private fun debug(message: String) {
+        if (BuildConfig.DEBUG) {
+            Log.d(TAG, message)
+        }
+    }
+
+    private fun debugError(message: String, throwable: Throwable) {
+        if (BuildConfig.DEBUG) {
+            Log.e(TAG, message, throwable)
+        }
     }
 
     fun debugConfig(

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

@@ -95,7 +95,9 @@ class WebViewController(
                         nip07Injected = injectNip07()
 
                     }
-                    injectDebugLogger()
+                    if (AppDebugLogger.isWebViewLoggingEnabled(context)) {
+                        injectDebugLogger()
+                    }
                 }
 
                 override fun onReceivedHttpError(

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

@@ -33,16 +33,18 @@ object AppDebugLogger {
             return
         }
 
+        val sanitized = sanitize(message)
+
         save(
             context,
             "DEBUG",
             tag,
-            message
+            sanitized
         )
 
         Log.d(
             TAG,
-            "[$tag] $message"
+            "[$tag] $sanitized"
         )
     }
 
@@ -61,20 +63,20 @@ object AppDebugLogger {
             } else {
                 message
             }
+        val sanitized = sanitize(fullMessage)
 
 
         save(
             context,
             "ERROR",
             tag,
-            fullMessage
+            sanitized
         )
 
 
         Log.e(
             TAG,
-            "[$tag] $message",
-            throwable
+            "[$tag] $sanitized"
         )
     }
 
@@ -85,14 +87,11 @@ object AppDebugLogger {
         message: String
     ) {
 
-        val sanitized =
-            sanitize(message)
-
         val entry =
             format(
                 level,
                 tag,
-                sanitized
+                message
             )
 
 
@@ -136,64 +135,62 @@ object AppDebugLogger {
 
     }
 
-    private fun sanitize(
+    internal fun sanitize(
         message: String
     ): String {
 
-        // Debug build može vidjeti sve
         if (BuildConfig.DEBUG) {
             return message
         }
 
-        // Release build uvijek sanitizira
         return message
             .replace(
                 Regex(
-                    "\"plaintext\"\\s*:\\s*\".*?\""
-                ),
-                "\"plaintext\":\"***\""
-            )
-            .replace(
-                Regex(
-                    "\"ciphertext\"\\s*:\\s*\".*?\""
-                ),
-                "\"ciphertext\":\"***\""
-            )
+                    "(?i)\"(plaintext|ciphertext|content|sig|signature|event|signing_?payload|private_?key|secret|seed|mnemonic|password|token|jwt|cookie|authorization)\"\\s*:\\s*\"(?:\\\\.|[^\"])*\""
+                )
+            ) { match ->
+                val key = match.groupValues[1]
+                "\"$key\":\"***\""
+            }
             .replace(
                 Regex(
-                    "\"sig\"\\s*:\\s*\".*?\""
-                ),
-                "\"sig\":\"***\""
-            )
+                    "(?i)\"(event|signing_?payload)\"\\s*:\\s*(\\{[^\\r\\n]*}|\\[[^\\r\\n]*])"
+                )
+            ) { match ->
+                val key = match.groupValues[1]
+                "\"$key\":\"***\""
+            }
             .replace(
                 Regex(
-                    "\"event\"\\s*:\\s*\".*?\""
-                ),
-                "\"event\":\"***\""
-            )
+                    "(?i)(authorization|proxy-authorization|cookie|set-cookie)\\s*:\\s*[^\\r\\n]+"
+                )
+            ) { match ->
+                "${match.groupValues[1]}: ***"
+            }
             .replace(
                 Regex(
-                    "(?i)authorization: .*"
+                    "(?i)bearer\\s+[^\\s,;]+"
                 ),
-                "authorization: ***"
+                "Bearer ***"
             )
             .replace(
                 Regex(
-                    "(?i)bearer\\s+[A-Za-z0-9._-]+"
-                ),
-                "Bearer ***"
-            )
+                    "(?i)(token|auth_?token|jwt|password|private_?key|secret|seed|mnemonic|signature|sig|event|signing_?payload|plaintext|ciphertext|cookie)=([^\\s&]+)"
+                )
+            ) { match ->
+                "${match.groupValues[1]}=***"
+            }
             .replace(
                 Regex(
-                    "(?i)token=[^\\s&]+"
+                    "(?i)\\b(nsec1)[023456789acdefghjklmnpqrstuvwxyz]+"
                 ),
-                "token=***"
+                "nsec1***"
             )
             .replace(
                 Regex(
-                    "(?i)password=[^\\s&]+"
+                    "\\beyJ[A-Za-z0-9_-]+\\.[A-Za-z0-9_-]+\\.[A-Za-z0-9_-]+\\b"
                 ),
-                "password=***"
+                "JWT***"
             )
     }
 

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

@@ -106,7 +106,7 @@ object DebugReportExporter {
         ${RuntimeConfig.apiEnabled(context)}
 
         WebView Debug:
-        ${BuildConfig.DEBUG || RuntimeConfig.debugEnabled(context)}
+        ${BuildConfig.DEBUG || SupportUnlock.isActive(context)}
 
         Logs:
         -------------------
@@ -120,30 +120,6 @@ object DebugReportExporter {
         text: String
     ): String {
 
-        return text
-            .replace(
-                Regex("(?i)authorization:\\s*.*"),
-                "authorization: ***"
-            )
-            .replace(
-                Regex("(?i)bearer\\s+[a-zA-Z0-9._-]+"),
-                "Bearer ***"
-            )
-            .replace(
-                Regex("(?i)token=.*"),
-                "token=***"
-            )
-            .replace(
-                Regex("(?i)password=.*"),
-                "password=***"
-            )
-            .replace(
-                Regex("(?i)private.?key=.*"),
-                "privateKey=***"
-            )
-            .replace(
-                Regex("(?i)nsec[a-zA-Z0-9]+"),
-                "nsec***"
-            )
+        return AppDebugLogger.sanitize(text)
     }
 }

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

@@ -2,13 +2,10 @@ package com.pakstr.app.debug
 
 import android.content.Context
 import com.pakstr.app.BuildConfig
-import com.pakstr.app.RuntimeConfig
-
 object DeveloperToolsAccessManager {
 
     fun canOpenDeveloperTools(context: Context): Boolean {
         return BuildConfig.DEBUG ||
-                RuntimeConfig.debugEnabled(context) ||
                 SupportUnlock.isActive(context)
     }
 }

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

@@ -43,6 +43,12 @@ class DeveloperToolsActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         enableEdgeToEdge()
         super.onCreate(savedInstanceState)
+
+        if (!DeveloperToolsAccessManager.canOpenDeveloperTools(this)) {
+            finish()
+            return
+        }
+
         setContentView(R.layout.activity_developer_tools)
 
         setupToolbar()
@@ -123,7 +129,7 @@ class DeveloperToolsActivity : AppCompatActivity() {
     }
 
     private fun isWebViewDebugEnabled(): Boolean {
-        return BuildConfig.DEBUG || RuntimeConfig.debugEnabled(this)
+        return BuildConfig.DEBUG || SupportUnlock.isActive(this)
     }
 
     private fun setupLogActions() {

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

@@ -1,10 +1,8 @@
 package com.pakstr.app.debug
 
-import android.R.attr.enabled
 import android.content.Context
 import android.webkit.WebView
 import com.pakstr.app.BuildConfig
-import com.pakstr.app.RuntimeConfig
 
 object WebViewDebugManager {
 
@@ -13,18 +11,15 @@ object WebViewDebugManager {
         context: Context
     ) {
 
-        WebView.setWebContentsDebuggingEnabled(
-            BuildConfig.DEBUG ||
-                    RuntimeConfig.debugEnabled(context)
-        )
-        AppDebugLogger.log(
+        val enabled = BuildConfig.DEBUG ||
+                SupportUnlock.isActive(context)
 
-            context,
+        WebView.setWebContentsDebuggingEnabled(enabled)
 
+        AppDebugLogger.log(
+            context,
             "WEBVIEW",
-
             "WebView debugging enabled: $enabled"
-
         )
     }
 }

package/android-template/app/src/main/java/com/pakstr/app/debug/logging/PakstrLogger.kt

@@ -1,6 +1,7 @@
 package com.pakstr.app.debug.logging
 
 import android.util.Log
+import com.pakstr.app.BuildConfig
 import com.pakstr.app.debug.logging.PakstrLog
 import java.text.SimpleDateFormat
 import java.util.Date
@@ -18,6 +19,8 @@ object PakstrLogger {
         tag: String,
         message: String
     ) {
+        if (!BuildConfig.DEBUG) return
+
         add(
             PakstrLog.Level.DEBUG,
             tag,
@@ -35,6 +38,8 @@ object PakstrLogger {
         tag: String,
         message: String
     ) {
+        if (!BuildConfig.DEBUG) return
+
         add(
             PakstrLog.Level.INFO,
             tag,
@@ -52,6 +57,8 @@ object PakstrLogger {
         tag: String,
         message: String
     ) {
+        if (!BuildConfig.DEBUG) return
+
         add(
             PakstrLog.Level.WARN,
             tag,
@@ -70,6 +77,7 @@ object PakstrLogger {
         message: String,
         throwable: Throwable? = null
     ) {
+        if (!BuildConfig.DEBUG) return
 
         add(
             PakstrLog.Level.ERROR,

package/dist/android/icon.js

@@ -7,12 +7,13 @@ exports.patchIcon = patchIcon;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const sharp_1 = __importDefault(require("sharp"));
-async function patchIcon(androidRoot, iconPath, backgroundColor = "#FFFFFF") {
+const assetPath_1 = require("../core/assetPath");
+async function patchIcon(androidRoot, iconPath, backgroundColor = "#FFFFFF", manifestDir = process.cwd()) {
     if (!iconPath) {
         console.log("ℹ️ No icon provided");
         return;
     }
-    const absoluteIconPath = path_1.default.resolve(process.cwd(), iconPath);
+    const absoluteIconPath = (0, assetPath_1.resolveAssetPath)(iconPath, manifestDir);
     if (!fs_1.default.existsSync(absoluteIconPath)) {
         throw new Error(`❌ Icon not found: ${absoluteIconPath}`);
     }

package/dist/android/permissions.js

@@ -10,6 +10,7 @@ const permissionMap = {
     internet: "android.permission.INTERNET",
     camera: "android.permission.CAMERA",
     notifications: "android.permission.POST_NOTIFICATIONS",
+    vibrate: "android.permission.VIBRATE",
 };
 function patchPermissions(androidRoot, manifest) {
     if (!manifest.permissions?.length) {
@@ -18,7 +19,7 @@ function patchPermissions(androidRoot, manifest) {
     const file = path_1.default.join(androidRoot, "app/src/main/AndroidManifest.xml");
     let xml = fs_1.default.readFileSync(file, "utf-8");
     for (const perm of manifest.permissions) {
-        const androidPermission = permissionMap[perm];
+        const androidPermission = permissionMap[perm.trim().toLowerCase()];
         if (!androidPermission) {
             console.warn(`⚠️ Unknown permission: ${perm}`);
             continue;

package/dist/android/splash.js

@@ -7,12 +7,13 @@ exports.patchSplash = patchSplash;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const sharp_1 = __importDefault(require("sharp"));
-async function patchSplash(androidRoot, splashPath, backgroundColor) {
+const assetPath_1 = require("../core/assetPath");
+async function patchSplash(androidRoot, splashPath, backgroundColor, manifestDir = process.cwd()) {
     if (!splashPath) {
         console.log("ℹ️ No splash provided");
         return;
     }
-    const absolutePath = path_1.default.resolve(splashPath);
+    const absolutePath = (0, assetPath_1.resolveAssetPath)(splashPath, manifestDir);
     if (!fs_1.default.existsSync(absolutePath)) {
         throw new Error(`❌ Splash not found: ${absolutePath}`);
     }

package/dist/commands/build.js

@@ -51,7 +51,7 @@ async function buildCommand(args) {
             ? (workspace = (0, releaseWorkspace_1.createReleaseWorkspace)(templateRoot)).androidRoot
             : templateRoot;
         console.log("📱 Android:", androidRoot);
-        await prepareAndroidProject(androidRoot, ctx.dist, manifest, appName);
+        await prepareAndroidProject(androidRoot, ctx.dist, manifest, appName, ctx.manifestDir);
         if (signingInput) {
             signing = (0, releaseSigning_1.createReleaseSigningContext)(signingInput);
             signingInput.keystoreBase64 = "";
@@ -110,7 +110,7 @@ async function buildCommand(args) {
     console.log("📦 Output:", finalPath);
     openFolder(finalPath);
 }
-async function prepareAndroidProject(androidRoot, distPath, manifest, appName) {
+async function prepareAndroidProject(androidRoot, distPath, manifest, appName, manifestDir) {
     const assetsTarget = path_1.default.join(androidRoot, "app/src/main/assets/www");
     if (!fs_1.default.existsSync(distPath)) {
         throw new Error("Web assets not found");
@@ -122,10 +122,10 @@ async function prepareAndroidProject(androidRoot, distPath, manifest, appName) {
     (0, gradle_1.patchGradle)(androidRoot, manifest);
     (0, branding_1.patchAppName)(androidRoot, appName);
     if (manifest.ui?.icon) {
-        await (0, icon_1.patchIcon)(androidRoot, manifest.ui.icon, manifest.backgroundColor ?? "#FFFFFF");
+        await (0, icon_1.patchIcon)(androidRoot, manifest.ui.icon, manifest.backgroundColor ?? "#FFFFFF", manifestDir);
     }
     if (manifest.ui?.splash) {
-        await (0, splash_1.patchSplash)(androidRoot, manifest.ui.splash.image, manifest.ui.splash.background ?? "#FFFFFF");
+        await (0, splash_1.patchSplash)(androidRoot, manifest.ui.splash.image, manifest.ui.splash.background ?? "#FFFFFF", manifestDir);
     }
     (0, permissions_1.patchPermissions)(androidRoot, manifest);
     (0, generatedProjectVerification_1.verifyGeneratedAndroidProject)(androidRoot, {

package/dist/core/assetPath.js

@@ -0,0 +1,22 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveAssetPath = resolveAssetPath;
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+function resolveAssetPath(assetPath, manifestDir) {
+    if (path_1.default.isAbsolute(assetPath)) {
+        return assetPath;
+    }
+    const manifestRelativePath = path_1.default.resolve(manifestDir, assetPath);
+    if (fs_1.default.existsSync(manifestRelativePath)) {
+        return manifestRelativePath;
+    }
+    const cwdRelativePath = path_1.default.resolve(process.cwd(), assetPath);
+    if (fs_1.default.existsSync(cwdRelativePath)) {
+        return cwdRelativePath;
+    }
+    return manifestRelativePath;
+}

package/dist/core/buildContext.js

@@ -92,6 +92,8 @@ function createBuildContext(args) {
     const androidRoot = path_1.default.resolve(process.cwd(), "android-template");
     return {
         manifest,
+        manifestPath,
+        manifestDir: path_1.default.dirname(manifestPath),
         dist: path_1.default.resolve(web),
         out,
         androidRoot,

package/package.json

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