catalyst-core 0.0.3-canary.4 → 0.0.3-canary.5

package/README.md

@@ -9,7 +9,7 @@
 
 -   Overview
 -   Installation
-  
+
 ## Overview
 
 Catalyst offers a comprehensive suite of features designed for modern web development. It includes isomorphic rendering for optimal performance, an extendable server with full-stack capabilities, and configurable state management. The framework employs smart prefetching of data and chunks, allows easy configuration of global styles and layouts, and provides SEO optimization at both global and page levels.
@@ -38,7 +38,7 @@ You will see some prompts to configure your application.
 cd <name-of-your-project> && npm run start
 ```
 
-The development server will start at ```http://localhost:3005```
+The development server will start at `http://localhost:3005`
 
 ## Documentation
 

package/changelog.md

@@ -1,29 +1,20 @@
 # Changelog
 
-## Build Optimizations
+
+## [0.0.3-canary.5] - 12-06-2025
 
 ### Features
-- Integrated hardware acceleration and thread management for Android
-- Added build optimizations with static build option
-- Implemented custom caching mechanism for both Android and iOS platforms
-- Added buffer size optimization for universal app
+- Production project creation functionality implemented
+- Android App Bundle (.aab) file generation capability
+- Project name replacement functionality
 
 ### Fixed
-- Fixed null check issue in core functionality
-- Resolved catalyst-core issues 
-- Fixed buffer size problems
-- Addressed cache patterns and overwrite issues
-- Fixed compatibility issues with older Android OS versions
-- Resolved disk memory persistence problems
-- Fixed infinite loading issues
-- Addressed issues with iOS WebView caching
-
-### Other Changes
-- Updated build and project configuration files
-- Improved developer experience for Android and iOS setup
-- Added debugging flags and tools
-- Updated documentation and configuration generators
-- Cleaned up code and removed redundant elements
+- Production deployment issues resolved
+- Merge conflicts fixed
+- Branch integration improvements
 
+### Changes
+- Enhanced production deployment workflow for Android
+- Improved build process for production releases
 ## Version
-- Target version: 0.0.3-canary.4
+- Target version: 0.0.3-canary.5

package/dist/native/androidProject/app/build.gradle.kts

@@ -3,6 +3,9 @@ import java.io.File
 import java.util.Properties
 
 val configPath: String? by project.properties
+val keystorePassword: String? by project.properties  // Changed from keyStorePassword to keystorePassword
+val keyAlias: String? by project.properties
+val keyPassword: String? by project.properties
 
 fun getLocalIpAddress(): String {
     return NetworkInterface.getNetworkInterfaces().toList()
@@ -18,35 +21,73 @@ plugins {
 }
 
 android {
-    namespace = "com.example.androidProject"
+    namespace = "io.yourname.androidproject"
     compileSdk = 34
 
     defaultConfig {
-        applicationId = "com.example.androidProject"
+        applicationId = "io.yourname.androidproject"
         minSdk = 24
         targetSdk = 34
         versionCode = 1
-        versionName = "1.0"
+        versionName = "1.1"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         buildConfigField("String", "LOCAL_IP", "\"${getLocalIpAddress()}\"")
     }
 
+    // Add signing configuration for app bundle
+    signingConfigs {
+        create("release") {
+            // Make sure the keystore file exists before referencing it
+            val keystoreFile = file("../keystore/release-key.jks")
+            if (keystoreFile.exists()) {
+               storeFile = file("../keystore/release-key.jks")
+                storePassword = "test@123"
+                keyAlias = "release"
+                keyPassword = "test@123"
+            } else {
+                // Log a warning if the keystore doesn't exist yet
+                logger.warn("Keystore file not found at ${keystoreFile.absolutePath}. Run the generateKeystore task first.")
+            }
+        }
+    }
+
     buildTypes {
         debug {
             manifestPlaceholders += mapOf("allowCleartextTraffic" to true)
+            applicationIdSuffix = ".debug"
+            versionNameSuffix = "-debug"
             isMinifyEnabled = false
             buildConfigField("Boolean", "ALLOW_MIXED_CONTENT", "true")
             buildConfigField("String", "LOCAL_IP", "\"${getLocalIpAddress()}\"")
         }
         release {
             manifestPlaceholders += mapOf("allowCleartextTraffic" to false)
-            isMinifyEnabled = false
+            isMinifyEnabled = true
+            isShrinkResources = true
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
             )
             buildConfigField("Boolean", "ALLOW_MIXED_CONTENT", "false")
             buildConfigField("String", "LOCAL_IP", "\"127.0.0.1\"")
+
+            // Only apply signing config if the keystore exists
+            if (file("../keystore/release-key.jks").exists()) {
+                signingConfig = signingConfigs.getByName("release")
+            }
+        }
+    }
+
+    // Configure App Bundle settings
+    bundle {
+        language {
+            enableSplit = true
+        }
+        density {
+            enableSplit = true
+        }
+        abi {
+            enableSplit = true
         }
     }
 
@@ -68,8 +109,16 @@ android {
         resources {
             excludes.add("**/route-manifest.json.gz")
             excludes.add("**/route-manifest.json.br")
+            excludes.add("META-INF/LICENSE")
+            excludes.add("META-INF/NOTICE")
         }
     }
+
+    // Configure lint options
+    lint {
+        checkReleaseBuilds = true
+        abortOnError = true
+    }
 }
 
 dependencies {
@@ -143,7 +192,17 @@ tasks.register("generateWebViewConfig") {
         val webviewConfigContent = webviewConfigMatch?.groupValues?.get(1)
 
         val properties = Properties()
-        properties.setProperty("LOCAL_IP", getLocalIpAddress())
+
+        // Set different IP based on build type
+        if (gradle.startParameter.taskNames.any { it.contains("Release") || it.contains("release") }) {
+            properties.setProperty("LOCAL_IP", "127.0.0.1") // Production
+            properties.setProperty("buildType", "release")
+            properties.setProperty("buildOptimisation", "true")
+        } else {
+            properties.setProperty("LOCAL_IP", getLocalIpAddress()) // Debug
+            properties.setProperty("buildType", "debug")
+            properties.setProperty("buildOptimisation", "false")
+        }
 
         // Parse top-level properties
         val topLevelRegex = """"([^"]+)"\s*:\s*"([^"]+)"""".toRegex()
@@ -170,6 +229,12 @@ tasks.register("generateWebViewConfig") {
             }
         }
 
+        // Set production-specific properties for release builds
+        if (gradle.startParameter.taskNames.any { it.contains("Release") || it.contains("release") }) {
+            properties.setProperty("PRODUCTION_URL", "https://yourwebapp.com") // Replace with your domain
+            properties.setProperty("apiBaseUrl", "https://api.yourdomain.com/") // Replace with your API URL
+        }
+
         // Create the assets directory if it doesn't exist
         val assetsDir = File("${project.projectDir}/src/main/assets")
         if (!assetsDir.exists()) {
@@ -184,4 +249,60 @@ tasks.register("generateWebViewConfig") {
 
         println("WebView config generated at ${assetsDir.absolutePath}/webview_config.properties")
     }
+}
+
+// Task to create key store if it doesn't exist
+// Add this task to your build.gradle.kts
+tasks.register("generateKeystore") {
+    doLast {
+        val keystoreDir = File(project.rootDir, "keystore")
+        if (!keystoreDir.exists()) {
+            keystoreDir.mkdirs()
+        }
+
+        val keystoreFile = File(keystoreDir, "release-key.jks")
+        if (!keystoreFile.exists()) {
+            val storePass = project.properties["keystorePassword"] as? String ?: System.getenv("KEYSTORE_PASSWORD") ?: "android"
+            val keyPass = project.properties["keyPassword"] as? String ?: System.getenv("KEY_PASSWORD") ?: "android"
+            val alias = project.properties["keyAlias"] as? String ?: System.getenv("KEY_ALIAS") ?: "release"
+
+            exec {
+                commandLine = listOf(
+                    "keytool",
+                    "-genkey",
+                    "-v",
+                    "-keystore", keystoreFile.absolutePath,
+                    "-alias", alias,
+                    "-keyalg", "RSA",
+                    "-keysize", "2048",
+                    "-validity", "10000",
+                    "-storepass", storePass,
+                    "-keypass", keyPass,
+                    "-dname", "CN=YourCompany, OU=YourDepartment, O=YourOrganization, L=YourCity, ST=YourState, C=US"
+                )
+            }
+            println("Generated keystore at: ${keystoreFile.absolutePath}")
+        } else {
+            println("Keystore already exists at: ${keystoreFile.absolutePath}")
+        }
+    }
+}
+// Task to build app bundle
+tasks.register("createAppBundle") {
+    dependsOn("generateKeystore", "bundleRelease")
+    doLast {
+        println("""
+            =======================================================
+            App Bundle created successfully!
+            
+            Location: ${project.buildDir}/outputs/bundle/release/app-release.aab
+            
+            Next steps:
+            1. Test your bundle with: 
+               bundletool build-apks --bundle=app/build/outputs/bundle/release/app-release.aab --output=test.apks
+            
+            2. Upload to Play Console: https://play.google.com/console
+            =======================================================
+        """.trimIndent())
+    }
 }

package/dist/native/androidProject/app/src/main/AndroidManifest.xml

@@ -24,7 +24,7 @@
         android:usesCleartextTraffic="${allowCleartextTraffic}"
         tools:targetApi="31">
         <activity
-            android:name=".MainActivity"
+            android:name="io.yourname.androidproject.MainActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -34,7 +34,7 @@
         </activity>
         <provider
             android:name="androidx.core.content.FileProvider"
-            android:authorities="com.example.androidProject.fileprovider"
+            android:authorities="io.yourname.androidproject.release.fileprovider"
             android:exported="false"
             android:grantUriPermissions="true">
             <meta-data

package/dist/native/androidProject/app/src/main/assets/webview_config.properties

@@ -1,6 +1,8 @@
-LOCAL_IP=192.168.0.17
-buildType=Debug
+LOCAL_IP=192.168.3.209
+buildType=Release
 emulatorName=testMediumPhone
 port=3005
 sdkPath=/Users/mayankmahavar/Android
 cachePattern=*.css
+PRODUCTION_URL=https://catalyst.1mg.com/public_docs/
+

package/dist/native/androidProject/app/src/main/java/{com/example/myapplication → io/yourname/androidproject}/CustomWebview.kt

@@ -1,4 +1,4 @@
-package com.example.androidProject
+package io.yourname.androidproject
 
 import android.annotation.SuppressLint
 import android.content.Context
@@ -10,7 +10,7 @@ import android.view.View
 import android.webkit.*
 import android.widget.ProgressBar
 import androidx.webkit.WebViewAssetLoader
-import com.example.myapplication.WebCacheManager
+import io.yourname.androidproject.WebCacheManager
 import kotlinx.coroutines.*
 import java.util.Properties
 
@@ -46,7 +46,6 @@ class CustomWebView(
     }
 
     private fun setupFromProperties() {
-
         buildType = properties.getProperty("buildType", "debug")
         apiBaseUrl = properties.getProperty("apiBaseUrl", "")
         cachePatterns = properties.getProperty("cachePattern", "")
@@ -66,12 +65,15 @@ class CustomWebView(
             isInitialPageLoaded = false // Default value
         }
 
-        Log.d(TAG, "Build type: $buildType")
-        Log.d(TAG, "Cache Pattern: $cachePatterns")
-        Log.d(TAG, "API Base URL: $apiBaseUrl")
-        Log.d(TAG, "Build Optimisation: $buildOptimisation")
-        Log.d(TAG, "Initial API Called: $isInitialApiCalled")
-        Log.d(TAG, "Initial Page Loaded: $isInitialPageLoaded")
+        // Only log detailed info in debug mode
+        if (BuildConfig.DEBUG) {
+            Log.d(TAG, "Build type: $buildType")
+            Log.d(TAG, "Cache Pattern: $cachePatterns")
+            Log.d(TAG, "API Base URL: $apiBaseUrl")
+            Log.d(TAG, "Build Optimisation: $buildOptimisation")
+            Log.d(TAG, "Initial API Called: $isInitialApiCalled")
+            Log.d(TAG, "Initial Page Loaded: $isInitialPageLoaded")
+        }
 
         // Setup WebView Asset Loader for serving local files
         assetLoader = WebViewAssetLoader.Builder()
@@ -97,7 +99,6 @@ class CustomWebView(
         webView.clearHistory()
     }
 
-
     fun canGoBack(): Boolean = webView.canGoBack()
 
     fun goBack() {
@@ -131,7 +132,9 @@ class CustomWebView(
         }
 
         webView.addJavascriptInterface(obj, name)
-        Log.d(TAG, "🔗 Added JavaScript interface: $name")
+        if (BuildConfig.DEBUG) {
+            Log.d(TAG, "🔗 Added JavaScript interface: $name")
+        }
     }
 
     fun destroy() {
@@ -141,13 +144,19 @@ class CustomWebView(
 
     fun cleanupCache() {
         launch(Dispatchers.IO) {
-            Log.d(TAG, "📝 Starting cache cleanup on thread: ${Thread.currentThread().name}")
+            if (BuildConfig.DEBUG) {
+                Log.d(TAG, "📝 Starting cache cleanup on thread: ${Thread.currentThread().name}")
+            }
             val startTime = System.currentTimeMillis()
             disableHardwareAcceleration()
             try {
                 cacheManager.cleanup()
-                val duration = System.currentTimeMillis() - startTime
-                Log.d(TAG, "⏱️ Cache cleanup completed in ${duration}ms on thread: ${Thread.currentThread().name}")
+                if (BuildConfig.DEBUG) {
+                    val duration = System.currentTimeMillis() - startTime
+                    Log.d(TAG, "⏱️ Cache cleanup completed in ${duration}ms on thread: ${Thread.currentThread().name}")
+                }
+            } catch (e: Exception) {
+                Log.e(TAG, "Cache cleanup error: ${e.message}")
             } finally {
                 enableHardwareAcceleration()
             }
@@ -158,7 +167,9 @@ class CustomWebView(
         if (!isHardwareAccelerationEnabled) {
             webView.setLayerType(View.LAYER_TYPE_HARDWARE, null)
             isHardwareAccelerationEnabled = true
-            Log.d(TAG, "🚀 Hardware acceleration enabled - Thread: ${Thread.currentThread().name}")
+            if (BuildConfig.DEBUG) {
+                Log.d(TAG, "🚀 Hardware acceleration enabled - Thread: ${Thread.currentThread().name}")
+            }
         }
     }
 
@@ -166,7 +177,9 @@ class CustomWebView(
         if (isHardwareAccelerationEnabled) {
             webView.setLayerType(View.LAYER_TYPE_NONE, null)
             isHardwareAccelerationEnabled = false
-            Log.d(TAG, "⚫ Hardware acceleration disabled - Thread: ${Thread.currentThread().name}")
+            if (BuildConfig.DEBUG) {
+                Log.d(TAG, "⚫ Hardware acceleration disabled - Thread: ${Thread.currentThread().name}")
+            }
         }
     }
 
@@ -248,7 +261,9 @@ class CustomWebView(
 
     @SuppressLint("SetJavaScriptEnabled")
     private fun setupWebView() {
-        Log.d(TAG, "🌐 Setting up WebView on thread: ${Thread.currentThread().name}")
+        if (BuildConfig.DEBUG) {
+            Log.d(TAG, "🌐 Setting up WebView on thread: ${Thread.currentThread().name}")
+        }
 
         webView.settings.apply {
             javaScriptEnabled = true
@@ -267,15 +282,14 @@ class CustomWebView(
             allowContentAccess = true
             setEnableSmoothTransition(true)
 
-            // Allow access to file URLs and JavaScript interfaces
-            allowFileAccessFromFileURLs = true
-            allowUniversalAccessFromFileURLs = true
+            // Allow access to file URLs and JavaScript interfaces - restrict in production if possible
+            allowFileAccessFromFileURLs = BuildConfig.DEBUG 
+            allowUniversalAccessFromFileURLs = BuildConfig.DEBUG
         }
 
         webView.webViewClient = object : WebViewClient() {
             override fun shouldOverrideUrlLoading(view: WebView?, request: WebResourceRequest?): Boolean {
                 request?.url?.let { url ->
-
                     // Let WebView handle loading non-API HTTP/HTTPS URLs
                     if (url.scheme in listOf("http", "https")) {
                         return false
@@ -289,12 +303,16 @@ class CustomWebView(
                 request: WebResourceRequest
             ): WebResourceResponse? {
                 val url = request.url.toString()
-                Log.d(TAG, "🔄 Intercepting request for: $url on thread: ${Thread.currentThread().name}")
+                if (BuildConfig.DEBUG) {
+                    Log.d(TAG, "🔄 Intercepting request for: $url on thread: ${Thread.currentThread().name}")
+                }
 
                 // Handle the initial route request - intercept first request regardless of host
                 if (!isInitialApiCalled && request.method == "GET") {
                     isInitialApiCalled = true
-                    Log.d(TAG, "📄 Serving initial index.html from assets for route: $url")
+                    if (BuildConfig.DEBUG) {
+                        Log.d(TAG, "📄 Serving initial index.html from assets for route: $url")
+                    }
 
                     try {
                         val indexHtml = context.assets.open("build/public/index.html")
@@ -316,14 +334,20 @@ class CustomWebView(
 
                         try {
                             val mimeType = getMimeType(assetPath)
-                            Log.d(TAG, "📦 Attempting to serve from assets: $assetPath")
+                            if (BuildConfig.DEBUG) {
+                                Log.d(TAG, "📦 Attempting to serve from assets: $assetPath")
+                            }
                             val inputStream = context.assets.open(assetPath)
-                            Log.d(TAG, "✅ Successfully loaded from assets: $assetPath")
+                            if (BuildConfig.DEBUG) {
+                                Log.d(TAG, "✅ Successfully loaded from assets: $assetPath")
+                            }
                             return WebResourceResponse(mimeType, "utf-8", inputStream)
                         } catch (e: Exception) {
                             assetLoadFailures++
-                            Log.e(TAG, "❌ Error loading asset: $assetPath", e)
-                            Log.d(TAG, "⚠️ Falling back to network for: $url")
+                            if (BuildConfig.DEBUG) {
+                                Log.e(TAG, "❌ Error loading asset: $assetPath", e)
+                                Log.d(TAG, "⚠️ Falling back to network for: $url")
+                            }
                             // Return null to let the WebView load from network
                             return null
                         }
@@ -331,16 +355,19 @@ class CustomWebView(
 
                     // Let API calls go through normally
                     if (isApiCall(url)) {
-                        Log.d(TAG, "🌐 API call detected, letting it go through network: $url")
+                        if (BuildConfig.DEBUG) {
+                            Log.d(TAG, "🌐 API call detected, letting it go through network: $url")
+                        }
                         return null
                     }
                 }
 
-
                 // For non-API HTTP requests that match cache patterns, use cache system
                 if (request.method == "GET" && shouldCacheUrl(url)) {
                     return runBlocking {
-                        Log.d(TAG, "⚙️ Processing cacheable request in coroutine on thread: ${Thread.currentThread().name}")
+                        if (BuildConfig.DEBUG) {
+                            Log.d(TAG, "⚙️ Processing cacheable request in coroutine on thread: ${Thread.currentThread().name}")
+                        }
                         val startTime = System.currentTimeMillis()
                         disableHardwareAcceleration()
                         try {
@@ -356,23 +383,31 @@ class CustomWebView(
                             var response = cacheManager.getCachedResponse(url, headers)
 
                             if (response != null) {
-                                val duration = System.currentTimeMillis() - startTime
-                                Log.d(TAG, "✅ Served from cache in ${duration}ms: $url")
+                                if (BuildConfig.DEBUG) {
+                                    val duration = System.currentTimeMillis() - startTime
+                                    Log.d(TAG, "✅ Served from cache in ${duration}ms: $url")
+                                }
                                 response
                             } else {
-                                Log.d(TAG, "❌ Cache miss for: $url")
+                                if (BuildConfig.DEBUG) {
+                                    Log.d(TAG, "❌ Cache miss for: $url")
+                                }
                                 null
                             }
                         } catch (e: Exception) {
-                            Log.e(TAG, "❌ Error processing request for URL: $url", e)
-                            e.printStackTrace()
+                            Log.e(TAG, "Error processing request for URL: $url: ${e.message}")
+                            if (BuildConfig.DEBUG) {
+                                e.printStackTrace()
+                            }
                             null
                         } finally {
                             enableHardwareAcceleration()
                         }
                     }
                 } else {
-                    Log.d(TAG, "⏭️ URL doesn't match cache criteria, skipping cache: $url")
+                    if (BuildConfig.DEBUG) {
+                        Log.d(TAG, "⏭️ URL doesn't match cache criteria, skipping cache: $url")
+                    }
                 }
 
                 return null
@@ -383,7 +418,9 @@ class CustomWebView(
                 progressBar.visibility = View.VISIBLE
                 val startTime = System.currentTimeMillis()
                 view?.tag = startTime // Store start time for performance tracking
-                Log.d(TAG, "⏳ Page load started for: $url - Hardware Acceleration: $isHardwareAccelerationEnabled")
+                if (BuildConfig.DEBUG) {
+                    Log.d(TAG, "⏳ Page load started for: $url - Hardware Acceleration: $isHardwareAccelerationEnabled")
+                }
             }
 
             override fun onPageFinished(view: WebView?, url: String?) {
@@ -391,16 +428,27 @@ class CustomWebView(
                 if(!isInitialPageLoaded){
                     isInitialPageLoaded = true
                 }
-                val startTime = view?.tag as? Long ?: return
-                val loadTime = System.currentTimeMillis() - startTime
-                Log.d(TAG, "✅ Page load finished for: $url - Load time: ${loadTime}ms - Hardware Acceleration: $isHardwareAccelerationEnabled")
-                Log.d(TAG, "📊 Asset loading stats: Attempted: $assetLoadAttempts, Failed: $assetLoadFailures (${String.format("%.1f", assetLoadFailures * 100.0 / assetLoadAttempts.coerceAtLeast(1))}%)")
+                if (BuildConfig.DEBUG) {
+                    val startTime = view?.tag as? Long ?: return
+                    val loadTime = System.currentTimeMillis() - startTime
+                    Log.d(TAG, "✅ Page load finished for: $url - Load time: ${loadTime}ms - Hardware Acceleration: $isHardwareAccelerationEnabled")
+                    Log.d(TAG, "📊 Asset loading stats: Attempted: $assetLoadAttempts, Failed: $assetLoadFailures (${String.format("%.1f", assetLoadFailures * 100.0 / assetLoadAttempts.coerceAtLeast(1))}%)")
+                }
                 super.onPageFinished(view, url)
             }
 
             override fun onReceivedError(view: WebView?, request: WebResourceRequest?, error: WebResourceError?) {
-                error?.let {
-                    Log.e(TAG, "❌ Error loading ${request?.url}: ${it.errorCode} ${it.description}")
+                if (error != null) {
+                    Log.e(TAG, "❌ Error loading ${request?.url}: ${error.errorCode} ${error.description}")
+                    
+                    // Only show a fallback page for main frame errors in production
+                    if (request?.isForMainFrame == true && !BuildConfig.DEBUG) {
+                        try {
+                            view?.loadUrl("file:///android_asset/build/public/error.html")
+                        } catch (e: Exception) {
+                            Log.e(TAG, "Failed to load error page: ${e.message}")
+                        }
+                    }
                 }
                 super.onReceivedError(view, request, error)
             }
@@ -415,11 +463,14 @@ class CustomWebView(
             }
 
             override fun onConsoleMessage(consoleMessage: ConsoleMessage?): Boolean {
-                Log.d(TAG, "Console: ${consoleMessage?.message()} -- From line ${consoleMessage?.lineNumber()} of ${consoleMessage?.sourceId()}")
+                if (BuildConfig.DEBUG) {
+                    Log.d(TAG, "Console: ${consoleMessage?.message()} -- From line ${consoleMessage?.lineNumber()} of ${consoleMessage?.sourceId()}")
+                }
                 return true
             }
         }
 
-        WebView.setWebContentsDebuggingEnabled(true)
+        // Only enable WebView debugging in debug builds
+        WebView.setWebContentsDebuggingEnabled(BuildConfig.DEBUG)
     }
 }