catalyst-core 0.0.3-canary.6 → 0.0.3-canary.8

package/changelog.md

@@ -1,34 +1,58 @@
 # Changelog
 
+## [0.0.3-canary.8] - 2025-01-06
 
-## [0.0.3-canary.6] - 12-06-2025
+-   **App icon configuration**
+-   **Splash screen integration**
+-   **Url Whitelisting**
 
+## [0.0.3-canary.7] - 2025-01-06
 
-This update specifically targets production deployment workflows with:
+### 🚀 Features
 
-•  Automated IP Resolution: No more manual IP configuration for development
-•  Streamlined Build Process: One-command builds for both Android and iOS
-•  Better Error Handling: More informative error messages and recovery options
-•  CLI-First Approach: Enhanced command-line interface for CI/CD integration
+-   **Native API Integration**: Enhanced native module integration for better performance
+-   **Automated IP Resolution**: Intelligent network detection eliminates manual IP configuration
+-   **Universal Build System**: Streamlined one-command builds for both Android and iOS platforms
+-   **Enhanced CLI Interface**: Improved command-line tools for better developer experience
 
-🧪 Testing & Validation
+### 🐛 Bug Fixes
 
-•  ✅ Android Build: Verified APK generation and installation
-•  ✅ IP Detection: Tested automatic IP address resolution on macOS
-•  ✅ Configuration: Validated dynamic config updates
-•  ✅ CLI Operations: Tested enhanced command-line workflows
+-   Fixed IP address detection issues on development environments
+-   Resolved build configuration conflicts between platforms
+-   Improved error handling and recovery mechanisms
 
-🔄 Breaking Changes
-•  None: All changes are backward compatible
-•  Enhanced: Existing functionality improved without breaking existing workflows
+### 🔧 Improvements
 
-📝 Commit History
-•  cc4584e: feat: finishing cli and updating ip address updation
-•  0076d8c: feat: adding cli option and upgrading gradle
+-   **Performance**: Optimized native module loading and execution
+-   **Developer Experience**: Enhanced CLI with better error messages and debugging info
+-   **Configuration**: Dynamic config updates without requiring restarts
+-   **Build Process**: Faster and more reliable build pipeline
+
+### 🧪 Testing & Validation
+
+-   ✅ **Android Build**: Verified APK generation, installation, and runtime behavior
+-   ✅ **iOS Build**: Tested build process and device compatibility
+-   ✅ **IP Detection**: Validated automatic network resolution across platforms
+-   ✅ **Native Modules**: Confirmed API integration and performance benchmarks
+-   ✅ **CLI Operations**: Tested enhanced command-line workflows and error handling
+
+### 🔄 Breaking Changes
+
+**None** - All changes maintain backward compatibility while enhancing existing functionality
+
+### 📝 Technical Details
+
+-   Improved native API bridge for better cross-platform communication
+-   Enhanced error reporting with detailed stack traces and suggestions
+-   Optimized build configuration for faster development cycles
+-   Added comprehensive logging for debugging and monitoring
+
+### 🔗 Migration Notes
+
+-   No migration steps required
+-   Existing projects will automatically benefit from improvements
+-   Optional: Update CLI usage to leverage new enhanced features
 
-🔗 Related
-•  Base Branch: universal_main
-•  Target: Production deployment automation
-•  Platform: Universal (Android + iOS)
 ## Version
-- Target version: 0.0.3-canary.6
+
+-   Target version: 0.0.3-canary.7

package/dist/native/androidProject/.idea/deploymentTargetSelector.xml

@@ -4,14 +4,6 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2025-02-18T04:28:14.358379Z">
-          <Target type="DEFAULT_BOOT">
-            <handle>
-              <DeviceId pluginId="PhysicalDevice" identifier="serial=9fbee4f0" />
-            </handle>
-          </Target>
-        </DropdownSelection>
-        <DialogSelection />
       </SelectionState>
     </selectionStates>
   </component>

package/dist/native/androidProject/.idea/gradle.xml

@@ -13,7 +13,6 @@
             <option value="$PROJECT_DIR$/app" />
           </set>
         </option>
-        <option name="resolveExternalAnnotations" value="false" />
       </GradleProjectSettings>
     </option>
   </component>

package/dist/native/androidProject/.idea/misc.xml

@@ -1,9 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/build/classes" />
-  </component>
-  <component name="ProjectType">
-    <option name="id" value="Android" />
-  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK" />
 </project>

package/dist/native/androidProject/.idea/vcs.xml

@@ -2,7 +2,5 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$/../../.." vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
-    <mapping directory="$USER_HOME$/catalyst-webview-apps" vcs="Git" />
   </component>
 </project>

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

@@ -1,6 +1,14 @@
 import java.net.NetworkInterface
 import java.io.File
 import java.util.Properties
+import org.json.JSONObject
+import org.json.JSONArray
+
+buildscript {
+    dependencies {
+        classpath("org.json:json:20231013")
+    }
+}
 
 val configPath: String? by project.properties
 val keystorePassword: String? by project.properties  // Changed from keyStorePassword to keystorePassword
@@ -111,6 +119,8 @@ android {
             excludes.add("**/route-manifest.json.br")
             excludes.add("META-INF/LICENSE")
             excludes.add("META-INF/NOTICE")
+            excludes.add("META-INF/INDEX.LIST")
+            excludes.add("META-INF/io.netty.versions.properties")
         }
     }
 
@@ -131,6 +141,16 @@ dependencies {
     androidTestImplementation(libs.androidx.espresso.core)
     implementation("androidx.webkit:webkit:1.12.1")
     implementation("org.json:json:20231013")
+    implementation("androidx.core:core-splashscreen:1.0.1")
+    
+    // Ktor Server dependencies for FrameworkServer (~200KB total)
+    implementation("io.ktor:ktor-server-core:2.3.7")
+    implementation("io.ktor:ktor-server-netty:2.3.7")
+    implementation("io.ktor:ktor-server-content-negotiation:2.3.7")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3")
+    
+    // SLF4J simple logger for Ktor (optional, can be excluded if needed)
+    implementation("org.slf4j:slf4j-simple:2.0.9")
 }
 
 // Task to verify local IP
@@ -185,12 +205,15 @@ tasks.register("generateWebViewConfig") {
         }
 
         val configContent = configJsonFile.readText()
-
-        // Extract WEBVIEW_CONFIG section
-        val webviewConfigRegex = """"WEBVIEW_CONFIG"\s*:\s*\{([^}]*)\}""".toRegex()
-        val webviewConfigMatch = webviewConfigRegex.find(configContent)
-        val webviewConfigContent = webviewConfigMatch?.groupValues?.get(1)
-
+        
+        val jsonObject = JSONObject(configContent)
+        
+        if (!jsonObject.has("WEBVIEW_CONFIG")) {
+            throw GradleException("WEBVIEW_CONFIG not found in config file")
+        }
+        
+        val webviewConfig = jsonObject.getJSONObject("WEBVIEW_CONFIG")
+        
         val properties = Properties()
 
         // Set different IP based on build type
@@ -204,30 +227,36 @@ tasks.register("generateWebViewConfig") {
             properties.setProperty("buildOptimisation", "false")
         }
 
-        // Parse top-level properties
-        val topLevelRegex = """"([^"]+)"\s*:\s*"([^"]+)"""".toRegex()
-        webviewConfigContent?.let {
-            topLevelRegex.findAll(it).forEach { matchResult ->
-                val (key, value) = matchResult.destructured
-                if (key != "android") {
-                    properties.setProperty(key, value)
+        fun extractProperties(jsonObj: org.json.JSONObject, prefix: String = "") {
+            try {
+                val keys = jsonObj.keys()
+        
+                while (keys.hasNext()) {
+                    val key = keys.next()
+                    val value = jsonObj.opt(key)
+                    val fullKey = if (prefix.isEmpty()) key else "$prefix.$key"
+                    
+                    when (value) {
+                        is org.json.JSONObject -> {
+                            extractProperties(value, fullKey)
+                        }
+                        is org.json.JSONArray -> {
+                            val arrayValues = (0 until value.length()).map { i ->
+                                value.opt(i).toString()
+                            }.joinToString(",")
+                            properties.setProperty(fullKey, arrayValues)
+                        }
+                        else -> {
+                            properties.setProperty(fullKey, value.toString())
+                        }
+                    }
                 }
+            } catch (e: Exception) {
+                throw RuntimeException("Failed to extract properties from JSON at prefix: $prefix", e)
             }
         }
 
-        // Parse android object specifically
-        val androidRegex = """"android"\s*:\s*\{([^}]*)\}""".toRegex()
-        val androidMatch = androidRegex.find(webviewConfigContent ?: "")
-        val androidContent = androidMatch?.groupValues?.get(1)
-
-        // Parse android object properties
-        val androidPropsRegex = """"([^"]+)"\s*:\s*"([^"]+)"""".toRegex()
-        androidContent?.let {
-            androidPropsRegex.findAll(it).forEach { matchResult ->
-                val (key, value) = matchResult.destructured
-                properties.setProperty("android.$key", value)
-            }
-        }
+        extractProperties(webviewConfig)
 
         // Set production-specific properties for release builds
         if (gradle.startParameter.taskNames.any { it.contains("Release") || it.contains("release") }) {

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

@@ -25,7 +25,8 @@
         tools:targetApi="31">
         <activity
             android:name="io.yourname.androidproject.MainActivity"
-            android:exported="true">
+            android:exported="true"
+            android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -34,7 +35,7 @@
         </activity>
         <provider
             android:name="androidx.core.content.FileProvider"
-            android:authorities="io.yourname.androidproject.release.fileprovider"
+            android:authorities="io.yourname.androidproject.fileprovider"
             android:exported="false"
             android:grantUriPermissions="true">
             <meta-data

package/dist/native/androidProject/app/src/main/java/io/yourname/androidproject/CustomWebview.kt

@@ -2,6 +2,7 @@ package io.yourname.androidproject
 
 import android.annotation.SuppressLint
 import android.content.Context
+import android.content.Intent
 import android.graphics.Bitmap
 import android.net.Uri
 import android.os.Bundle
@@ -11,6 +12,8 @@ import android.webkit.*
 import android.widget.ProgressBar
 import androidx.webkit.WebViewAssetLoader
 import io.yourname.androidproject.WebCacheManager
+import io.yourname.androidproject.isUrlAllowed
+import io.yourname.androidproject.isExternalDomain
 import kotlinx.coroutines.*
 import java.util.Properties
 
@@ -34,6 +37,7 @@ class CustomWebView(
     private var isInitialPageLoaded: Boolean = false
     private var buildOptimisation: Boolean = false // Added property for build optimization
     private lateinit var assetLoader: WebViewAssetLoader
+    private var allowedUrls: List<String> = emptyList()
 
     // Counters for asset loading statistics
     private var assetLoadAttempts = 0
@@ -56,6 +60,12 @@ class CustomWebView(
         // Parse buildOptimisation property
         buildOptimisation = properties.getProperty("buildOptimisation", "false").toBoolean()
 
+        // Load allowed URLs from properties
+        allowedUrls = properties.getProperty("accessControl.allowedUrls", "")
+            .split(",")
+            .map { it.trim() }
+            .filter { it.isNotEmpty() }
+
         // Set initial flags based on buildOptimisation
         if (buildOptimisation) {
             isInitialApiCalled = false
@@ -71,6 +81,7 @@ class CustomWebView(
             Log.d(TAG, "Cache Pattern: $cachePatterns")
             Log.d(TAG, "API Base URL: $apiBaseUrl")
             Log.d(TAG, "Build Optimisation: $buildOptimisation")
+            Log.d(TAG, "Allowed URLs: $allowedUrls")
             Log.d(TAG, "Initial API Called: $isInitialApiCalled")
             Log.d(TAG, "Initial Page Loaded: $isInitialPageLoaded")
         }
@@ -198,6 +209,22 @@ class CustomWebView(
         }
     }
 
+
+
+    private fun openInInAppBrowser(url: String) {
+        try {
+            val intent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+            context.startActivity(intent)
+            if (BuildConfig.DEBUG) {
+                Log.d(TAG, "🌐 Opening external URL in in-app browser: $url")
+            }
+        } catch (e: Exception) {
+            Log.e(TAG, "❌ Failed to open URL in in-app browser: $url", e)
+        }
+    }
+    
+
     private fun isApiCall(url: String): Boolean {
         // Check if URL is an API call based on your API base URL
         return apiBaseUrl.isNotEmpty() && url.startsWith(apiBaseUrl)
@@ -290,6 +317,25 @@ class CustomWebView(
         webView.webViewClient = object : WebViewClient() {
             override fun shouldOverrideUrlLoading(view: WebView?, request: WebResourceRequest?): Boolean {
                 request?.url?.let { url ->
+                    val urlString = url.toString()
+                    
+                    // Check if URL is an external domain
+                    if (url.scheme in listOf("http", "https") && isExternalDomain(urlString, allowedUrls)) {
+                        if (BuildConfig.DEBUG) {
+                            Log.d(TAG, "🌍 External domain detected, opening in in-app browser: $urlString")
+                        }
+                        openInInAppBrowser(urlString)
+                        return true
+                    }
+                    
+                    // Check if URL is allowed for internal navigation
+                    if (!isUrlAllowed(urlString, allowedUrls)) {
+                        if (BuildConfig.DEBUG) {
+                            Log.w(TAG, "🚫 URL blocked by access control: $urlString")
+                        }
+                        return true
+                    }
+                    
                     // Let WebView handle loading non-API HTTP/HTTPS URLs
                     if (url.scheme in listOf("http", "https")) {
                         return false
@@ -307,6 +353,14 @@ class CustomWebView(
                     Log.d(TAG, "🔄 Intercepting request for: $url on thread: ${Thread.currentThread().name}")
                 }
 
+                if (!isUrlAllowed(url, allowedUrls)) {
+                    if (BuildConfig.DEBUG) {
+                        Log.w(TAG, "🚫 Network request blocked by access control: $url")
+                    }
+                    // Return an empty response to block the request
+                    return WebResourceResponse("text/plain", "utf-8", null)
+                }
+
                 // Handle the initial route request - intercept first request regardless of host
                 if (!isInitialApiCalled && request.method == "GET") {
                     isInitialApiCalled = true

package/dist/native/androidProject/app/src/main/java/io/yourname/androidproject/MainActivity.kt

@@ -10,6 +10,7 @@ import io.yourname.androidproject.NativeBridge
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.cancelChildren
+import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 
 class MainActivity : AppCompatActivity(), CoroutineScope by MainScope() {
 
@@ -20,6 +21,7 @@ class MainActivity : AppCompatActivity(), CoroutineScope by MainScope() {
     private lateinit var properties: Properties
     private var isHardwareAccelerationEnabled = false
     private var currentUrl: String = ""
+    private var splashStartTime: Long = 0
 
     private fun enableHardwareAcceleration() {
         if (!isHardwareAccelerationEnabled) {
@@ -45,6 +47,7 @@ class MainActivity : AppCompatActivity(), CoroutineScope by MainScope() {
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        val splashScreen = installSplashScreen()
         super.onCreate(savedInstanceState)
         if (BuildConfig.DEBUG) {
             Log.d(TAG, "📱 onCreate started on thread: ${Thread.currentThread().name}")
@@ -63,6 +66,10 @@ class MainActivity : AppCompatActivity(), CoroutineScope by MainScope() {
             properties.setProperty("buildOptimisation", (!BuildConfig.DEBUG).toString())
         }
 
+        // Configure splash screen
+        splashStartTime = System.currentTimeMillis()
+        configureSplashScreen(splashScreen)
+
         // Setup UI
         binding = ActivityMainBinding.inflate(layoutInflater)
         supportActionBar?.hide()
@@ -159,4 +166,21 @@ class MainActivity : AppCompatActivity(), CoroutineScope by MainScope() {
         customWebView.destroy()
         super.onDestroy()
     }
+
+    private fun configureSplashScreen(splashScreen: androidx.core.splashscreen.SplashScreen) {
+        val durationProperty = properties.getProperty("splashScreen.duration")
+        
+        splashScreen.setKeepOnScreenCondition {
+            val webViewLoaded = ::customWebView.isInitialized && 
+                               customWebView.getWebView().progress >= 100
+            
+            if (durationProperty != null) {
+                val duration = durationProperty.toLong()
+                val timeElapsed = System.currentTimeMillis() - splashStartTime >= duration
+                !timeElapsed
+            } else {
+                !webViewLoaded
+            }
+        }
+    }
 }