catalyst-core 0.0.3-canary.8 → 0.1.0-canary.1

package/README.md

@@ -16,7 +16,6 @@ Catalyst offers a comprehensive suite of features designed for modern web develo
 
 This version adds support for Universal app for both Android and iOS. Please checkout [Universal App Documentaion](https://catalyst.1mg.com/public_docs/content/Universal%20App/RunUniversalApp)
 
-
 ## Installation
 
 **System Requirements**

package/bin/catalyst.js

@@ -8,9 +8,17 @@ const args = process.argv.slice(2)
 
 // Array of valid commands
 const validCommands = [
-    "build", "start", "serve", "devBuild", "devServe",
-    "buildApp", "buildApp:ios", "buildApp:android",
-    "setupEmulator", "setupEmulator:ios", "setupEmulator:android"
+    "build",
+    "start",
+    "serve",
+    "devBuild",
+    "devServe",
+    "buildApp",
+    "buildApp:ios",
+    "buildApp:android",
+    "setupEmulator",
+    "setupEmulator:ios",
+    "setupEmulator:android",
 ]
 
 // Map of platform-specific commands to their script paths
@@ -18,17 +26,16 @@ const platformScripts = {
     "setupEmulator:ios": "../dist/native/setupEmulatorIos.js",
     "setupEmulator:android": "../dist/native/androidSetup.js",
     "buildApp:ios": "../dist/native/buildAppIos.js",
-    "buildApp:android": "../dist/native/buildAppAndroid.js"
+    "buildApp:android": "../dist/native/buildAppAndroid.js",
 }
 
 // Helper to check if arg is a platform command
 const isPlatformCommand = (arg, prefix) => {
     if (!arg.startsWith(`${prefix}:`)) return false
-    const platform = arg.split(':')[1]
-    return ['ios', 'android'].includes(platform) || platform === undefined
+    const platform = arg.split(":")[1]
+    return ["ios", "android"].includes(platform) || platform === undefined
 }
 
-
 // Helper function to run a platform command
 const runPlatformCommand = (baseCommand, platform) => {
     const command = `${baseCommand}:${platform}`
@@ -42,7 +49,7 @@ const runPlatformCommand = (baseCommand, platform) => {
 
 // Helper function to run commands for all platforms
 const runAllPlatforms = (baseCommand) => {
-    const platforms = ['ios', 'android']
+    const platforms = ["ios", "android"]
     for (const platform of platforms) {
         const result = runPlatformCommand(baseCommand, platform)
         if (result.status !== 0) {
@@ -54,8 +61,14 @@ const runAllPlatforms = (baseCommand) => {
 }
 
 const scriptIndex = args.findIndex(
-    (x) => x === "build" || x === "start" || x === "serve" || x === "devBuild" || x === "devServe" || 
-    isPlatformCommand(x, 'buildApp') || isPlatformCommand(x, 'setupEmulator')
+    (x) =>
+        x === "build" ||
+        x === "start" ||
+        x === "serve" ||
+        x === "devBuild" ||
+        x === "devServe" ||
+        isPlatformCommand(x, "buildApp") ||
+        isPlatformCommand(x, "setupEmulator")
 )
 const script = scriptIndex === -1 ? args[0] : args[scriptIndex]
 const nodeArgs = scriptIndex > 0 ? args.slice(0, scriptIndex) : []
@@ -92,17 +105,17 @@ function handleProcessResult(result) {
         if (result.signal === "SIGKILL") {
             console.log(
                 "The build failed because the process exited too early. " +
-                "This probably means the system ran out of memory or someone called " +
-                "`kill -9` on the process."
+                    "This probably means the system ran out of memory or someone called " +
+                    "`kill -9` on the process."
             )
         } else if (result.signal === "SIGTERM") {
             console.log(
                 "The build failed because the process exited too early. " +
-                "Someone might have called `kill` or `killall`, or the system could " +
-                "be shutting down."
+                    "Someone might have called `kill` or `killall`, or the system could " +
+                    "be shutting down."
             )
         }
         process.exit(1)
     }
     process.exit(result.status)
-}
+}

package/changelog.md

@@ -1,40 +1,115 @@
 # Changelog
 
+## [0.1.0-canary.1] - 2026-01-12
+
+- Universal Merge
+
+## [0.0.3-canary.20] - 2025-12-12
+
+- Patch: Allow localhost traffic to be served from http
+
+## [0.0.3-canary.19] - 2025-12-09
+
+- Offline fallback support: packages `public/offline.html` into Android/iOS bundles and shows it automatically when connectivity drops (with retry handling)
+- Notification refactor: streamlined config toggle for local vs push, centralized permission/asset handling, and simpler routing into the web app
+- Access control: combined access control config for ios
+
+## [0.0.3-canary.18] - 2025-11-19
+
+- Configuration Files
+- Android Native WebView - MainActivity.kt
+- Android Native WebView - CustomWebview.kt
+
+## [0.0.3-canary.17] - 2025-11-19
+
+- ✨ Added complete notification system (local & push)
+- 🔔 New useNotification() React hook
+- 📱 Firebase Cloud Messaging conditional build support
+- 🤖 Android notification handling in MainActivity
+- 🔧 5 new notification commands + 5 callbacks in NativeBridge
+- 📦 Auto-processing of notification icons & sounds
+- ⚙️ Conditional dependencies based on notification config
+- 🧹 Updated .gitignore & .npmignore
+- 📋 Enhanced build process with automatic permission injection
+- 🔗 Deep link integration with notifications
+
+## [0.0.3-canary.16] - 2025-11-19
+
+- FeaturesGallery Support for File Picker: Enhanced file picker to open native gallery for selecting images and videos
+- HTTPS Framework Server: Enabled HTTPS support for the framework server with self-signed SSL certificate
+- MIME Type Handling: Fixed and improved MIME type detection and handling in the file picker
+
+## [0.0.3-canary.15] - 2025-11-19
+
+- Adding Android release support and appInfo key
+
+## [0.0.3-canary.14] - 2025-09-29
+
+- Android custom splashscreen
+
+## [0.0.3-canary.13] - 2025-09-28
+
+- Multi file support in useFilePicker hook
+- Android multiple app icon support
+- Android whitelisting toggle support
+
+## [0.0.3-canary.12] - 2025-09-26
+
+- Universal App Context: Added comprehensive context support for building universal mobile applications
+- OpenTelemetry SDK Integration: Built-in support for observability and performance monitoring with Otel SDK
+
+## [0.0.3-canary.11] - 2025-09-26
+
+- Build organization: Store APKs and iOS builds organized by generation date and time for better tracking and management
+- Enhanced Android native support: Add support for native keyboard and webview resizing in Android
+- Device info API web support: Web support in device info API
+
+## [0.0.3-canary.10] - 2025-09-11
+
+- **Sentry import bug fix**
+- **Open telemetry SDK**
+
+## [0.0.3-canary.9] - 2025-09-11
+
+- **App name configuration**
+- **Device Info API**
+- **Access control configuration**
+
 ## [0.0.3-canary.8] - 2025-01-06
 
--   **App icon configuration**
--   **Splash screen integration**
--   **Url Whitelisting**
+- **App icon configuration**
+- **Splash screen integration**
+- **Url Whitelisting**
 
 ## [0.0.3-canary.7] - 2025-01-06
 
 ### 🚀 Features
 
--   **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
+- **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
 
 ### 🐛 Bug Fixes
 
--   Fixed IP address detection issues on development environments
--   Resolved build configuration conflicts between platforms
--   Improved error handling and recovery mechanisms
+- Fixed IP address detection issues on development environments
+- Resolved build configuration conflicts between platforms
+- Improved error handling and recovery mechanisms
 
 ### 🔧 Improvements
 
--   **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
+- **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
+- ✅ **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
 
@@ -42,17 +117,17 @@
 
 ### 📝 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
+- 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
+- No migration steps required
+- Existing projects will automatically benefit from improvements
+- Optional: Update CLI usage to leverage new enhanced features
 
 ## Version
 
--   Target version: 0.0.3-canary.7
+- Target version: 0.0.3-canary.7

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

@@ -15,6 +15,22 @@ val keystorePassword: String? by project.properties  // Changed from keyStorePas
 val keyAlias: String? by project.properties
 val keyPassword: String? by project.properties
 
+fun isNotificationsEnabled(): Boolean {
+    return try {
+        if (configPath == null) return false
+        val configFile = File(configPath!!)
+        if (!configFile.exists()) return false
+
+        val json = JSONObject(configFile.readText())
+        if (!json.has("WEBVIEW_CONFIG")) return false
+
+        val webviewConfig = json.getJSONObject("WEBVIEW_CONFIG")
+        webviewConfig.optJSONObject("notifications")?.optBoolean("enabled", false) ?: false
+    } catch (e: Exception) {
+        false
+    }
+}
+
 fun getLocalIpAddress(): String {
     return NetworkInterface.getNetworkInterfaces().toList()
         .flatMap { it.inetAddresses.toList() }
@@ -61,7 +77,6 @@ android {
 
     buildTypes {
         debug {
-            manifestPlaceholders += mapOf("allowCleartextTraffic" to true)
             applicationIdSuffix = ".debug"
             versionNameSuffix = "-debug"
             isMinifyEnabled = false
@@ -69,7 +84,6 @@ android {
             buildConfigField("String", "LOCAL_IP", "\"${getLocalIpAddress()}\"")
         }
         release {
-            manifestPlaceholders += mapOf("allowCleartextTraffic" to false)
             isMinifyEnabled = true
             isShrinkResources = true
             proguardFiles(
@@ -129,6 +143,19 @@ android {
         checkReleaseBuilds = true
         abortOnError = true
     }
+
+    // Conditional source sets based on notifications config
+    sourceSets {
+        getByName("main") {
+            if (isNotificationsEnabled()) {
+                logger.info("SourceSet selected: withFcm (notifications enabled)")
+                java.srcDirs("src/withFcm/java")
+            } else {
+                logger.info("SourceSet selected: noFcm (notifications disabled)")
+                java.srcDirs("src/noFcm/java")
+            }
+        }
+    }
 }
 
 dependencies {
@@ -139,18 +166,24 @@ dependencies {
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)
-    implementation("androidx.webkit:webkit:1.12.1")
+    implementation(libs.androidx.webkit)
     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("io.ktor:ktor-server-core:3.0.3")
+    implementation("io.ktor:ktor-server-netty:3.0.3")
+    implementation("io.ktor:ktor-server-content-negotiation:3.0.3")
     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")
+
+    // Notification dependencies - conditional based on config
+    if (isNotificationsEnabled()) {
+        implementation("androidx.localbroadcastmanager:localbroadcastmanager:1.1.0")
+        implementation("com.google.firebase:firebase-messaging:23.4.0")
+        implementation("com.google.firebase:firebase-analytics:21.5.0")
+    }
 }
 
 // Task to verify local IP
@@ -258,6 +291,49 @@ tasks.register("generateWebViewConfig") {
 
         extractProperties(webviewConfig)
 
+        // Extract splash screen configuration with defaults
+        if (webviewConfig.has("splashScreen")) {
+            val splashConfig = webviewConfig.getJSONObject("splashScreen")
+            properties.setProperty("splashScreen.enabled", "true")
+            
+            // Duration in milliseconds
+            if (splashConfig.has("duration")) {
+                properties.setProperty("splashScreen.duration", splashConfig.get("duration").toString())
+            } else {
+                properties.setProperty("splashScreen.duration", "1000")
+            }
+            
+            // Background color
+            if (splashConfig.has("backgroundColor")) {
+                properties.setProperty("splashScreen.backgroundColor", splashConfig.getString("backgroundColor"))
+            } else {
+                properties.setProperty("splashScreen.backgroundColor", "#ffffff")
+            }
+            
+            // Image dimensions
+            if (splashConfig.has("imageWidth")) {
+                properties.setProperty("splashScreen.imageWidth", splashConfig.get("imageWidth").toString())
+            } else {
+                properties.setProperty("splashScreen.imageWidth", "120")
+            }
+            
+            if (splashConfig.has("imageHeight")) {
+                properties.setProperty("splashScreen.imageHeight", splashConfig.get("imageHeight").toString())
+            } else {
+                properties.setProperty("splashScreen.imageHeight", "120")
+            }
+            
+            // Corner radius
+            if (splashConfig.has("cornerRadius")) {
+                properties.setProperty("splashScreen.cornerRadius", splashConfig.get("cornerRadius").toString())
+            } else {
+                properties.setProperty("splashScreen.cornerRadius", "20")
+            }
+        } else {
+            // No splash screen configuration, disable it
+            properties.setProperty("splashScreen.enabled", "false")
+        }
+
         // 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
@@ -277,6 +353,10 @@ tasks.register("generateWebViewConfig") {
     }
 }
 
+if (isNotificationsEnabled()) {
+    apply(plugin = "com.google.gms.google-services")
+}
+
 // Task to create key store if it doesn't exist
 // Add this task to your build.gradle.kts
 tasks.register("generateKeystore") {
@@ -292,7 +372,7 @@ tasks.register("generateKeystore") {
             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 {
+            project.exec {
                 commandLine = listOf(
                     "keytool",
                     "-genkey",
@@ -321,7 +401,7 @@ tasks.register("createAppBundle") {
             =======================================================
             App Bundle created successfully!
             
-            Location: ${project.buildDir}/outputs/bundle/release/app-release.aab
+            Location: ${layout.buildDirectory.get().asFile}/outputs/bundle/release/app-release.aab
             
             Next steps:
             1. Test your bundle with: 
@@ -331,4 +411,4 @@ tasks.register("createAppBundle") {
             =======================================================
         """.trimIndent())
     }
-}
+}

package/dist/native/androidProject/app/proguard-rules.pro

@@ -5,17 +5,63 @@
 # For more details, see
 #   http://developer.android.com/guide/developing/tools/proguard.html
 
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
+# Keep line numbers for debugging
+-keepattributes SourceFile,LineNumberTable
+-renamesourcefileattribute SourceFile
+
+# Keep JavaScript interface for WebView
+-keepclassmembers class * {
+    @android.webkit.JavascriptInterface <methods>;
+}
+
+# Keep NativeBridge class (JavaScript interface)
+-keep class io.yourname.androidproject.NativeBridge {
+    public *;
+}
+
+# Keep Kotlin coroutines
+-keepnames class kotlinx.coroutines.internal.MainDispatcherFactory {}
+-keepnames class kotlinx.coroutines.CoroutineExceptionHandler {}
+-dontwarn kotlinx.coroutines.**
+
+# Keep Ktor
+-keep class io.ktor.** { *; }
+-keepclassmembers class io.ktor.** { volatile <fields>; }
+-dontwarn io.ktor.**
+
+# Keep Netty (used by Ktor server)
+-keep class io.netty.** { *; }
+-keepclassmembers class io.netty.** { *; }
+-dontwarn io.netty.**
+
+# Suppress warnings for optional Netty dependencies (not needed on Android)
+-dontwarn io.netty.internal.tcnative.**
+-dontwarn org.conscrypt.**
+-dontwarn org.bouncycastle.**
+-dontwarn org.eclipse.jetty.npn.**
+-dontwarn reactor.blockhound.integration.**
+-dontwarn org.apache.log4j.**
+-dontwarn org.apache.logging.log4j.**
+
+# Keep WebViewClient overrides
+-keepclassmembers class * extends android.webkit.WebViewClient {
+    public void *(android.webkit.WebView, java.lang.String);
+    public void *(android.webkit.WebView, java.lang.String, android.graphics.Bitmap);
+    public boolean *(android.webkit.WebView, java.lang.String);
+}
+
+# Keep WebChromeClient overrides
+-keepclassmembers class * extends android.webkit.WebChromeClient {
+    public void *(android.webkit.WebView, java.lang.String);
+}
+
+# Keep data classes used for caching
+-keep class io.yourname.androidproject.WebCacheManager$CacheEntry { *; }
+-keep class io.yourname.androidproject.WebCacheManager$CacheMetadata { *; }
+
+# Remove debug logging in release builds
+-assumenosideeffects class android.util.Log {
+    public static *** d(...);
+    public static *** v(...);
+    public static *** i(...);
+}

package/dist/native/androidProject/app/src/debug/res/xml/network_security_config.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <base-config cleartextTrafficPermitted="true">
+        <trust-anchors>
+            <certificates src="system" />
+        </trust-anchors>
+    </base-config>
+</network-security-config>

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

@@ -21,11 +21,13 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.AndroidProject"
-        android:usesCleartextTraffic="${allowCleartextTraffic}"
+        android:usesCleartextTraffic="true"
+        android:networkSecurityConfig="@xml/network_security_config"
         tools:targetApi="31">
         <activity
-            android:name="io.yourname.androidproject.MainActivity"
+            android:name="io.yourname.androidproject.SplashActivity"
             android:exported="true"
+            android:theme="@style/Theme.AndroidProject.Splash"
             android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -33,6 +35,11 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity
+            android:name="io.yourname.androidproject.MainActivity"
+            android:exported="false"
+            android:screenOrientation="portrait">
+        </activity>
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="io.yourname.androidproject.fileprovider"