Upload folder using huggingface_hub

build-android.sh

@@ -0,0 +1,58 @@
+#!/bin/bash
+
+# Android Build Script for Capacitor App
+# Usage: ./build-android.sh [environment] [build-type]
+#
+# Environments: bundled-cf (default), bundled-hf, cloudflare, hf, local
+# Build types: debug (default), release
+
+set -e
+
+ENV="${1:-bundled-cf}"
+BUILD_TYPE="${2:-debug}"
+
+echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+echo "  Building Android APK"
+echo "  Environment: $ENV"
+echo "  Build Type:  $BUILD_TYPE"
+echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+
+# Step 1: Build web assets
+echo ""
+echo "→ Building web assets..."
+export CAPACITOR_SERVER_IP_ENV="$ENV"
+npm run build
+
+# Step 2: Sync to Android
+echo ""
+echo "→ Syncing to Android..."
+npx cap sync android
+
+# Step 3: Build APK
+echo ""
+echo "→ Building APK..."
+cd android
+chmod +x gradlew
+
+if [ "$BUILD_TYPE" = "release" ]; then
+    ./gradlew assembleRelease
+    APK_PATH="app/build/outputs/apk/release/app-release-unsigned.apk"
+else
+    ./gradlew assembleDebug
+    APK_PATH="app/build/outputs/apk/debug/app-debug.apk"
+fi
+
+cd ..
+
+# Done
+echo ""
+echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+echo "  ✓ Build Complete!"
+echo "  APK: android/$APK_PATH"
+echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+
+# Optional: Copy to easy location
+if [ -f "android/$APK_PATH" ]; then
+    cp "android/$APK_PATH" "./app-$ENV-$BUILD_TYPE.apk"
+    echo "  Copied to: ./app-$ENV-$BUILD_TYPE.apk"
+fi

public/scripts/ColorRmApp.js

@@ -137,7 +137,7 @@ export class ColorRmApp {
         // 5. Sync Base File (only for collaborative mode)
         if (this.config.collaborative) {
             try {
-                const res = await fetch(`/api/color_rm/base_file/${projectId}`, { method: 'GET' });
+                const res = await fetch(window.Config?.apiUrl(`/api/color_rm/base_file/${projectId}`) || `/api/color_rm/base_file/${projectId}`, { method: 'GET' });
                 if (res.ok) {
                     if (this.state.images.length === 0) {
                         console.log("Liveblocks: Downloading base file from server...");
@@ -1669,7 +1669,7 @@ export class ColorRmApp {
         if (this.isFetchingBase) return;
         this.isFetchingBase = true;
         try {
-            const res = await fetch(`/api/color_rm/base_file/${this.state.sessionId}`);
+            const res = await fetch(window.Config?.apiUrl(`/api/color_rm/base_file/${this.state.sessionId}`) || `/api/color_rm/base_file/${this.state.sessionId}`);
             if (res.ok) {
                 const blob = await res.blob();
                 await this.importBaseFile(blob);
@@ -2657,7 +2657,7 @@ export class ColorRmApp {
             console.log('ColorRM Sync: Uploading base file to server for ID:', this.state.sessionId);
             this.ui.toggleLoader(true, "Uploading to server...");
             try {
-                const uploadRes = await fetch(`/api/color_rm/upload/${this.state.sessionId}`, {
+                const uploadRes = await fetch(window.Config?.apiUrl(`/api/color_rm/upload/${this.state.sessionId}`) || `/api/color_rm/upload/${this.state.sessionId}`, {
                     method: 'POST',
                     body: files[0],
                     headers: {
@@ -2852,7 +2852,7 @@ export class ColorRmApp {
         if (this.state.images.length > 0 && this.state.images[0].blob) {
             this.ui.showToast("Re-uploading base...");
             try {
-                await fetch(`/api/color_rm/upload/${this.state.sessionId}`, {
+                await fetch(window.Config?.apiUrl(`/api/color_rm/upload/${this.state.sessionId}`) || `/api/color_rm/upload/${this.state.sessionId}`, {
                     method: 'POST',
                     body: this.state.images[0].blob,
                     headers: { 'Content-Type': this.state.images[0].blob.type }

public/scripts/config.js

@@ -22,6 +22,18 @@ export const Config = {
         if (window.location.protocol === 'file:' &&
             window.location.href.includes('capacitor')) return true;
 
+        // Check for http:// on localhost with empty or file-like path (Android WebView bundled)
+        if (window.location.protocol === 'http:' &&
+            window.location.host === 'localhost' &&
+            window.location.pathname.startsWith('/')) {
+            // This could be bundled Capacitor or local dev - check for Capacitor later
+            return false;
+        }
+
+        // Check for https:// on localhost (Android secure WebView)
+        if (window.location.protocol === 'https:' &&
+            window.location.host.includes('localhost')) return true;
+
         return false;
     },
 
@@ -29,11 +41,24 @@ export const Config = {
     isRemoteMode() {
         if (typeof window === 'undefined') return false;
         const host = window.location.host || '';
+
+        // If host is empty or file-based, not remote mode
+        if (!host || host === '') return false;
+
         return host.includes('hf.space') ||
                host.includes('workers.dev') ||
                host.includes('duckdns.org') ||
-               host.includes('localhost') ||
                host.includes('192.168.');
+        // Note: removed 'localhost' - it should trigger bundled mode detection
+    },
+
+    // Force bundled mode check - called after Capacitor is definitely loaded
+    isBundledMode() {
+        // If Capacitor is present and we're not pointing to a remote server, we're bundled
+        if (window.Capacitor && !this.isRemoteMode()) {
+            return true;
+        }
+        return false;
     },
 
     // Get the API base URL
@@ -45,16 +70,16 @@ export const Config = {
             return '';
         }
 
-        // Web browser (not Capacitor): relative URLs work
-        if (!this.isCapacitor()) {
-            return '';
+        // Bundled Capacitor mode: need absolute URL to backend
+        if (this.isBundledMode() || this.isCapacitor()) {
+            const preferredBackend = localStorage.getItem('color_rm_backend') || 'cloudflare';
+            const base = this.BACKENDS[preferredBackend] || this.BACKENDS.cloudflare;
+            console.log('[Config] Bundled mode - using backend:', base);
+            return base;
         }
 
-        // Bundled Capacitor mode: need absolute URL to backend
-        const preferredBackend = localStorage.getItem('color_rm_backend') || 'cloudflare';
-        const base = this.BACKENDS[preferredBackend] || this.BACKENDS.cloudflare;
-        console.log('[Config] Using backend:', base);
-        return base;
+        // Web browser: relative URLs work
+        return '';
     },
 
     // Helper to make API URL
@@ -79,9 +104,11 @@ export const Config = {
     getDebugInfo() {
         return {
             isCapacitor: this.isCapacitor(),
+            isBundledMode: this.isBundledMode(),
             isRemoteMode: this.isRemoteMode(),
             protocol: window.location.protocol,
             host: window.location.host,
+            href: window.location.href,
             apiBase: this.getApiBase(),
             preferredBackend: localStorage.getItem('color_rm_backend') || 'cloudflare'
         };