appforge-cli 1.6.4__tar.gz → 2.6.6__tar.gz

{appforge_cli-1.6.4 → appforge_cli-2.6.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: appforge-cli
-Version: 1.6.4
+Version: 2.6.6
 Summary: Convert web, Flutter, and native apps into Android/iOS apps automatically using cloud builds.
 Author: AppForge Team
 Author-email: AppForge Team <juniorsir.bot@gmail.com>

{appforge_cli-1.6.4 → appforge_cli-2.6.6}/appforge/ai.py

@@ -35,6 +35,18 @@ def scan_codebase_for_permissions():
         for file in files:
             file_path = os.path.join(root, file)
 
+            if file.endswith(('.xml', '.kt', '.java')):
+                try:
+                    with open(file_path, 'r', encoding='utf-8', errors='ignore') as f:
+                        content = f.read()
+                        for keyword, data in ai_knowledge_base.items():
+                            # Only scan for keywords that aren't 'pubspec' specific
+                            if not keyword.startswith("pubspec:"):
+                                if keyword in content and data["plugin"] not in found_plugins:
+                                    found_plugins[data["plugin"]] = data
+                except Exception:
+                    pass
+
             # --- FLUTTER SCANNER ---
             if file == 'pubspec.yaml' and not pubspec_already_scanned:
                 try:

{appforge_cli-1.6.4 → appforge_cli-2.6.6}/appforge/cli.py

@@ -92,6 +92,21 @@ def init_project():
         
     print_success("Ready to send to the AppForge Cloud Builder.")
 
+def manage_keys():
+    print_info("Key Management System")
+    action = prompt("Action: [1] Create New Keystore [2] Upload Existing", "1")
+    
+    if action == "1":
+        alias = prompt("Enter Key Alias", "upload")
+        # Run keytool locally to generate the JKS file
+        cmd = f"keytool -genkeypair -alias {alias} -keyalg RSA -keysize 2048 -validity 10000 -keystore appforge.jks"
+        run_cmd(cmd)
+        print_success("Keystore created: appforge.jks")
+        # Now prompt to upload this to GitHub Secrets
+    elif action == "2":
+        path = prompt("Path to existing .jks file")
+        # Logic to encode to Base64 and push to GitHub Secrets
+
 def configure_project():
     config = load_local_config()
     print_info("Interactive Configuration")

{appforge_cli-1.6.4 → appforge_cli-2.6.6}/appforge/create.py

@@ -60,6 +60,37 @@ def generate_html_template(project_name):
     with open(os.path.join(project_name, "www", "index.html"), "w") as f:
         f.write(html_content)
 
+# --- Add this new helper function inside create.py ---
+def sanitize_pubspec(project_dir):
+    """Removes monorepo-specific broken links from pubspec.yaml"""
+    pubspec_path = os.path.join(project_dir, "pubspec.yaml")
+    if not os.path.exists(pubspec_path):
+        return
+
+    with open(pubspec_path, "r", encoding='utf-8') as f:
+        lines = f.readlines()
+
+    new_lines = []
+    skip_next = False
+    for line in lines:
+        if skip_next:
+            skip_next = False
+            continue
+        
+        # Remove the 'analysis_defaults' dependency and its 'path:' line
+        if "analysis_defaults:" in line:
+            skip_next = True # Skip this line and the next one (path: ...)
+            continue
+        
+        # Remove the 'resolution: workspace' line if it exists
+        if "resolution: workspace" in line:
+            continue
+            
+        new_lines.append(line)
+
+    with open(pubspec_path, "w", encoding='utf-8') as f:
+        f.writelines(new_lines)
+
 def create_project(framework, project_name):
     if framework not in TEMPLATES:
         print_error(f"Unknown framework: {framework}.")

{appforge_cli-1.6.4 → appforge_cli-2.6.6}/appforge/github.py

@@ -5,6 +5,7 @@ import sys
 import threading
 import shutil
 import time
+from nacl import encoding, public
 import base64
 from .config import get_app_id, load_local_config, add_to_history
 from .utils import print_success, print_info, print_error, run_with_spinner, GRAY, RESET, GREEN, RED, CYAN, YELLOW, BOLD, print_progress_bar
@@ -13,7 +14,7 @@ from .injector import inject_metadata_locally
 GITHUB_API_URL = "https://api.github.com"
 BUILD_REPO_OWNER = "juniorsir" 
 BUILD_REPO_NAME = "appforge-build"
-MASTER_SYSTEM_TOKEN = "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" # <-- PUT YOUR TOKEN HERE
+MASTER_SYSTEM_TOKEN = "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"
 
 def get_headers():
     return {
@@ -22,7 +23,34 @@ def get_headers():
         "X-GitHub-Api-Version": "2022-11-28"
     }
 
-# --- Inside github.py ---
+def upload_secret(name, value):
+    """Encrypted upload to GitHub Secrets."""
+    # 1. Get Repo Public Key
+    pub_key_res = requests.get(f"{GITHUB_API_URL}/repos/{BUILD_REPO_OWNER}/{BUILD_REPO_NAME}/actions/secrets/public-key", headers=get_headers())
+    key_data = pub_key_res.json()
+    
+    # 2. Encrypt value with libsodium
+    public_key = public.PublicKey(base64.b64decode(key_data['key']), encoding.Base64Encoder)
+    sealed_box = public.SealedBox(public_key)
+    encrypted = base64.b64encode(sealed_box.encrypt(value.encode("utf-8"))).decode("utf-8")
+    
+    # 3. Push to GitHub
+    requests.put(
+        f"{GITHUB_API_URL}/repos/{BUILD_REPO_OWNER}/{BUILD_REPO_NAME}/actions/secrets/{name}",
+        headers=get_headers(),
+        json={"encrypted_value": encrypted, "key_id": key_data['key_id']}
+    )
+
+def is_build_in_progress(app_id):
+    """Checks if there is an active run for this App ID."""
+    url = f"{GITHUB_API_URL}/repos/{BUILD_REPO_OWNER}/{BUILD_REPO_NAME}/actions/runs?per_page=5"
+    res = requests.get(url, headers=get_headers())
+    if res.status_code == 200:
+        runs = res.json().get("workflow_runs", [])
+        for run in runs:
+            if f"ID: {app_id}" in run.get("display_title", "") and run["status"] in ["in_progress", "queued"]:
+                return True
+    return False
 
 def zip_project(category, sub_path=".", zip_name="app_source.zip"):
     """Zips the project, ensuring the icon is ready for @capacitor/assets."""
@@ -57,7 +85,6 @@ def zip_project(category, sub_path=".", zip_name="app_source.zip"):
 
         except Exception as e:
             print_error(f"Failed to prepare app assets for upload: {e}")
-    # ------------------------------------
 
     def do_zip():
         original_dir = os.getcwd()
@@ -105,7 +132,8 @@ def push_and_build(config):
     platform = config.get("platform", "android")
     app_id = get_app_id()
     sub_path = config.get("sub_path", ".")
-
+    if is_build_in_progress(app_id):
+        print_error(f"A build is already in progress for App ID: {app_id}. Please wait for it to finish.")
     try:
         inject_metadata_locally(config)
     except Exception as e:
@@ -191,8 +219,8 @@ def push_and_build(config):
                 "project_type": proj_type,
                 "app_version": full_config.get("version", "1.0.0"),
                 "sub_path": sub_path,
-                "app_name": app_name,         # <-- THESE NOW SEND "Vdl"
-                "package_id": package_id,      # <-- AND "com.appforge.vdl"
+                "app_name": app_name,     
+                "package_id": package_id,     
                 "build_type": build_type
             }
         }
@@ -209,7 +237,6 @@ def push_and_build(config):
     from datetime import datetime
     project_name = os.path.basename(os.getcwd())
 
-    # Create the history entry
     new_entry = {
         "app_id": app_id,
         "run_id": run_id,
@@ -219,141 +246,92 @@ def push_and_build(config):
         "status": "triggered" # We can update this later
     }
     add_to_history(new_entry)
+
 def check_status():
-    """Streams live build logs from GitHub Actions with step-by-step animations."""
+    """Streams live build progress with clean, animated step tracking."""
     headers = get_headers()
-    url = f"{GITHUB_API_URL}/repos/{BUILD_REPO_OWNER}/{BUILD_REPO_NAME}/actions/runs?per_page=1"
-    res = requests.get(url, headers=headers)
-    
-    if res.status_code != 200:
-        print_error("Could not fetch build status from cloud.")
-        return
-
-    runs = res.json().get("workflow_runs", [])
-    if not runs:
-        print_info("No builds found in the cloud yet.")
-        return
+    app_id = get_app_id()
     
-    latest_run = runs[0]
-    run_id = latest_run["id"]
-    status = latest_run["status"]
+    # 1. Find the Run ID
+    print_info(f"Connecting to cloud build for App: {app_id}...")
+    my_run = None
+    for i in range(5):
+        res = requests.get(f"{GITHUB_API_URL}/repos/{BUILD_REPO_OWNER}/{BUILD_REPO_NAME}/actions/runs?per_page=5", headers=headers)
+        if res.status_code == 200:
+            runs = res.json().get("workflow_runs", [])
+            for run in runs:
+                if f"ID: {app_id}" in run.get("display_title", ""):
+                    my_run = run
+                    break
+        if my_run: break
+        time.sleep(2)
     
-    if status == "completed":
-        conclusion = latest_run.get("conclusion")
-        if conclusion == "success":
-            print_success(f"Build #{run_id} is already completed! Run 'appforge download'")
-        else:
-            print_error(f"Build #{run_id} failed with conclusion: {conclusion}")
+    if not my_run:
+        print_error(f"No active builds found for App ID: {app_id}.")
         return
 
-    print_info(f"Connected to Cloud Build #{run_id}. Streaming live logs...\n")
-    
+    run_id = my_run["id"]
+    workflow_url = f"https://github.com/{BUILD_REPO_OWNER}/{BUILD_REPO_NAME}/actions/runs/{run_id}"
+    print_success(f"Connected to Cloud Build #{run_id}.")
+    print(f"  {GRAY}View detailed logs online:{RESET} {CYAN}{workflow_url}{RESET}")
+    print("\n")
+   
     jobs_url = f"{GITHUB_API_URL}/repos/{BUILD_REPO_OWNER}/{BUILD_REPO_NAME}/actions/runs/{run_id}/jobs"
-    
     completed_steps = set()
-    current_running_step = None
     spinner_chars = "|/-\\"
     spinner_idx = 0
-    
+
     try:
         while True:
-            # Animate the currently running step while we wait for the API ping
-            for _ in range(20): # Loop fast for smooth animation (20 * 0.15s = 3 seconds)
-                if current_running_step:
-                    char = spinner_chars[spinner_idx % len(spinner_chars)]
-                    # Highlight custom steps in Cyan, normal steps in Gray
-                    color = CYAN if "Permission" in current_running_step else GRAY
-                    sys.stdout.write(f"\r{color}{char}{RESET}  [Cloud] {current_running_step}...")
-                    sys.stdout.flush()
-                    spinner_idx += 1
-                time.sleep(0.15)
-
-            # Ping the GitHub API
             jobs_res = requests.get(jobs_url, headers=headers)
             if jobs_res.status_code != 200:
+                time.sleep(3)
                 continue
-                
+            
             jobs = jobs_res.json().get("jobs", [])
             if not jobs:
+                time.sleep(3)
                 continue
                 
             active_job = jobs[0]
-            steps = active_job.get("steps", [])
+            current_step = None
             
-            new_running_step = None
-            for step in steps:
-                step_name = step["name"]
-                step_status = step["status"]
+            # Identify current step
+            for step in active_job.get("steps", []):
+                if step["status"] == "in_progress":
+                    current_step = step["name"]
                 
-                if step_status == "completed" and step_name not in completed_steps:
-                    completed_steps.add(step_name)
+                if step["status"] == "completed" and step["name"] not in completed_steps:
+                    completed_steps.add(step["name"])
+                    sys.stdout.write("\r" + " " * 60 + "\r")
+                    print(f"{GREEN}✔{RESET}  [Cloud] {step['name']}... {GREEN}done!{RESET}")
                     
-                    sys.stdout.write(f"\r{GREEN}✔{RESET}  [Cloud] {step_name}... {GREEN}done!{RESET}       \n")
-                    sys.stdout.flush()
-
                     if step.get("conclusion") == "failure":
-                        print_error(f"\n❌ Cloud Build Failed at step: {step_name}")
-                        
-                        try:
-                            log_url = f"{GITHUB_API_URL}/repos/{BUILD_REPO_OWNER}/{BUILD_REPO_NAME}/actions/jobs/{active_job['id']}/logs"
-                            log_res = requests.get(log_url, headers=headers)
-                            if log_res.status_code == 200:
-                                friendly_msg = get_friendly_error(log_res.text)
-                                print(f"\n{YELLOW}💡 AppForge Diagnosis:{RESET}\n{friendly_msg}\n")
-                        except:
-                            pass
+                        print_error(f"Cloud Build Failed at: {step['name']}")
                         return
-                    if step.get("conclusion") == "failure":
-                        print_error(f"\n❌ Cloud Build Failed at step: {step_name}")
-                        return
-                        
-                if step_status == "in_progress":
-                    new_running_step = step_name
-            
-            # Update the current step for the animation loop
-            current_running_step = new_running_step
 
-            # Check if the entire cloud job is done
+            # Display animated spinner for the current active step
+            if current_step:
+                char = spinner_chars[spinner_idx % len(spinner_chars)]
+                sys.stdout.write(f"\r{CYAN}{char}{RESET}  [Cloud] {current_step}...")
+                sys.stdout.flush()
+                spinner_idx += 1
+            
+            # Check for completion
             if active_job["status"] == "completed":
-                print("-" * 40)
-                
+                sys.stdout.write("\r" + " " * 60 + "\r")
                 if active_job["conclusion"] == "success":
-                    # 1. JOB SUCCESSFUL? Check if the APK actually exists!
-                    artifacts_url = f"{GITHUB_API_URL}/repos/{BUILD_REPO_OWNER}/{BUILD_REPO_NAME}/actions/runs/{run_id}/artifacts"
-                    art_res = requests.get(artifacts_url, headers=headers)
-                    
-                    if art_res.status_code == 200 and art_res.json().get("total_count", 0) > 0:
-                        # EVERYTHING IS PERFECT
-                        print_success(f"{BOLD}✨ Cloud Build Finished Successfully!{RESET}")
-                        print_info("Run 'appforge download' to get your app.")
-                    else:
-                        # SOFT FAILURE: Success but no file!
-                        print_warning(f"\n⚠ Build finished, but NO ARTIFACT (APK) was produced.")
-                        # Fetch logs to find out why
-                        try:
-                            log_url = f"{GITHUB_API_URL}/repos/{BUILD_REPO_OWNER}/{BUILD_REPO_NAME}/actions/jobs/{active_job['id']}/logs"
-                            log_res = requests.get(log_url, headers=headers)
-                            friendly_msg = get_friendly_error(log_res.text)
-                            print(f"\n{YELLOW}💡 AppForge Diagnosis:{RESET}\n{friendly_msg}\n")
-                        except:
-                            print_error("Could not retrieve cloud logs for diagnosis.")
+                    print_success(f"{BOLD}✨ Cloud Build Finished Successfully!{RESET}")
+                    print_info("Run 'appforge download' to get your app.")
                 else:
-                    # HARD FAILURE: Job crashed
-                    print_error("\n❌ Cloud Build Crashed.")
-                    # Fetch logs for hard failure
-                    try:
-                        log_url = f"{GITHUB_API_URL}/repos/{BUILD_REPO_OWNER}/{BUILD_REPO_NAME}/actions/jobs/{active_job['id']}/logs"
-                        log_res = requests.get(log_url, headers=headers)
-                        friendly_msg = get_friendly_error(log_res.text)
-                        print(f"\n{YELLOW}💡 AppForge Diagnosis:{RESET}\n{friendly_msg}\n")
-                    except: pass
+                    print_error("Cloud Build Crashed.")
                 break
                 
+            time.sleep(1.5)
+            
     except KeyboardInterrupt:
-        # Clear the spinner line if user hits Ctrl+C
-        sys.stdout.write("\r                                                    \r") 
-        print(f"\n{YELLOW}⚠ Stopped watching logs. The build is still running in the cloud.{RESET}")
-        print_info("You can run 'appforge status' again later to reconnect.")
+        sys.stdout.write("\r                                                    \r")
+        print_warning("Stopped watching. Build continues in the cloud.")
 
 def get_build_status_by_id(run_id):
     headers = get_headers()
@@ -372,7 +350,7 @@ def get_build_status_by_id(run_id):
 
 def download_apk(run_id=None):
     """
-    Finds and downloads ALL artifacts (Android, iOS, Windows, Linux) for a build.
+    Finds and downloads ALL artifacts for a build.
     """
     headers = get_headers()
     app_id = get_app_id()
@@ -387,55 +365,49 @@ def download_apk(run_id=None):
 
     if res.status_code == 200:
         artifacts = res.json().get("artifacts", [])
-        if not artifacts:
-            print_error("No artifacts found. The build may have failed or is still in progress.")
-            return
-
-        # --- NEW: FIND ALL MATCHING ARTIFACTS ---
-        # Filter artifacts that belong to this specific App ID
-        target_artifacts = [a for a in artifacts if app_id in a.get("name", "")]
+        
+        # 1. Filter artifacts that belong to this specific App ID
+        my_artifacts = [a for a in artifacts if app_id in a.get("name", "")]
 
-        if not target_artifacts:
+        if not my_artifacts:
             print_error(f"Could not find any recent artifacts for App ID: {app_id}")
             return
 
-        print_info(f"Found {len(target_artifacts)} artifact(s) for this build. Starting downloads...\n")
+        # 2. SORT BY CREATED DATE (Newest first)
+        my_artifacts.sort(key=lambda x: x['created_at'], reverse=True)
+        
+        # 3. Download the newest one
+        target_artifact = my_artifacts[0]
+        artifact_name = target_artifact['name']
+        
+        print_info(f"Downloading latest build: {CYAN}{artifact_name}{RESET} (Created: {target_artifact['created_at']})")
+        
+        secure_api_url = target_artifact.get('archive_download_url')
+        redirect_res = requests.get(secure_api_url, headers=headers, allow_redirects=False)
 
-        # --- MULTI-DOWNLOAD LOOP ---
-        for target_artifact in target_artifacts:
-            artifact_name = target_artifact['name']
-            print_info(f"Preparing download for: {CYAN}{artifact_name}{RESET}")
+        if redirect_res.status_code == 302:
+            public_download_url = redirect_res.headers['Location']
+            filename = f"{artifact_name}.zip"
             
-            secure_api_url = target_artifact.get('archive_download_url')
-            redirect_res = requests.get(secure_api_url, headers=headers, allow_redirects=False)
-
-            if redirect_res.status_code == 302:
-                public_download_url = redirect_res.headers['Location']
-                filename = f"{artifact_name}.zip"
-                
-                try:
-                    # Start a streaming download
-                    with requests.get(public_download_url, stream=True) as r:
-                        r.raise_for_status()
-                        total_size = int(r.headers.get('content-length', 0))
-                        downloaded = 0
-
-                        with open(filename, 'wb') as f:
-                            # Download in 8KB chunks
-                            for chunk in r.iter_content(chunk_size=8192):
-                                if chunk: # filter out keep-alive new chunks
-                                    f.write(chunk)
-                                    downloaded += len(chunk)
-                                    percentage = (downloaded / total_size * 100) if total_size > 0 else 0
-                                    print_progress_bar(percentage, f"Downloading {artifact_name}")
-
-                    print_progress_bar(100.0, f"Downloading {artifact_name}")
-                    print_success(f"Saved: {os.path.join(os.getcwd(), filename)}\n")
-
-                except Exception as e:
-                    print_error(f"Download failed for {artifact_name}: {e}")
-            else:
-                print_error(f"Could not generate a temporary download link for {artifact_name}.")
+            try:
+                with requests.get(public_download_url, stream=True) as r:
+                    r.raise_for_status()
+                    total_size = int(r.headers.get('content-length', 0))
+                    downloaded = 0
+                    with open(filename, 'wb') as f:
+                        for chunk in r.iter_content(chunk_size=8192):
+                            if chunk:
+                                f.write(chunk)
+                                downloaded += len(chunk)
+                                percentage = (downloaded / total_size * 100) if total_size > 0 else 0
+                                print_progress_bar(percentage, f"Downloading {artifact_name}")
+
+                print_progress_bar(100.0, f"Downloading {artifact_name}")
+                print_success(f"Saved: {os.path.join(os.getcwd(), filename)}")
+            except Exception as e:
+                print_error(f"Download failed for {artifact_name}: {e}")
+        else:
+            print_error(f"Could not generate a temporary download link. Status: {redirect_res.status_code}")
                 
     else:
          print_error(f"Failed to fetch artifacts. Status Code: {res.status_code}")

appforge_cli-2.6.6/appforge/injector.py

@@ -0,0 +1,143 @@
+import os
+import shutil
+import re
+from .utils import print_info, print_success, print_warning
+
+def inject_metadata_locally(config):
+    """
+    Universally injects App Name, Package ID, Version, and Icons locally 
+    for Android, iOS, Windows, and Linux before zipping.
+    """
+    
+    app_name = config.get("appName", "AppForge App")
+    package_id = config.get("packageId", "com.appforge.app")
+    app_version = config.get("version", "1.0.0")
+    icon_path = config.get("iconPath")
+    web_dir = config.get("webDir", "dist")
+    
+    # Calculate build number (e.g., 1.0.5 -> 10005)
+    try:
+        parts = app_version.split('.')
+        build_number = int(f"{parts[0]}{parts[1].zfill(2)}{parts[2].zfill(2)}")
+    except:
+        build_number = 1
+
+    # Slug for Binary Names (e.g., "Vault OS" -> "vault_os")
+    binary_slug = re.sub(r'[^a-zA-Z0-9]', '_', app_name).lower()
+
+    print_info("Injecting metadata locally before upload...")
+
+    # --- 1. ANDROID & CAPACITOR INJECTION ---
+    manifest_path = "app/src/main/AndroidManifest.xml" if os.path.exists("app/src/main/AndroidManifest.xml") else "android/app/src/main/AndroidManifest.xml"
+    gradle_groovy = "app/build.gradle" if os.path.exists("app/build.gradle") else "android/app/build.gradle"
+    gradle_kts = gradle_groovy + ".kts"
+
+    if os.path.exists(manifest_path):
+        with open(manifest_path, 'r', encoding='utf-8') as f:
+            manifest = f.read()
+        manifest = re.sub(r'android:label="[^"]+"', f'android:label="{app_name}"', manifest)
+        if 'xmlns:tools=' not in manifest:
+            manifest = manifest.replace('<manifest', '<manifest xmlns:tools="http://schemas.android.com/tools"')
+        if 'tools:replace="android:label"' not in manifest:
+            manifest = manifest.replace('<application', '<application tools:replace="android:label"')
+        if 'package=' in manifest:
+            manifest = re.sub(r'package="[^"]+"', f'package="{package_id}"', manifest)
+        with open(manifest_path, 'w', encoding='utf-8') as f:
+            f.write(manifest)
+        print_success(f"Injected Android Name: {app_name}")
+
+    target_gradle = gradle_kts if os.path.exists(gradle_kts) else (gradle_groovy if os.path.exists(gradle_groovy) else None)
+    if target_gradle:
+        with open(target_gradle, 'r', encoding='utf-8') as f:
+            gradle = f.read()
+        gradle = re.sub(r'applicationId\s*=?\s*["\'][^"\']+["\']', f'applicationId = "{package_id}"', gradle)
+        gradle = re.sub(r'namespace\s*=?\s*["\'][^"\']+["\']', f'namespace = "{package_id}"', gradle)
+        gradle = re.sub(r'versionName\s*=?\s*["\'][^"\']+["\']', f'versionName = "{app_version}"', gradle)
+        gradle = re.sub(r'versionCode\s*=?\s*\d+', f'versionCode = {build_number}', gradle)
+        with open(target_gradle, 'w', encoding='utf-8') as f:
+            f.write(gradle)
+        print_success(f"Injected Android Package ID: {package_id}")
+
+    # --- 2. WINDOWS DESKTOP INJECTION ---
+    win_cmake = "windows/CMakeLists.txt"
+    if os.path.exists(win_cmake):
+        with open(win_cmake, 'r', encoding='utf-8') as f:
+            content = f.read()
+        # Set project name and binary name
+        content = re.sub(r'set\(BINARY_NAME "[^"]+"\)', f'set(BINARY_NAME "{binary_slug}")', content)
+        content = re.sub(r'project\([^)]+\)', f'project({binary_slug} LANGUAGES CXX)', content)
+        with open(win_cmake, 'w', encoding='utf-8') as f:
+            f.write(content)
+        
+        # Update Window Title in main.cpp
+        win_main = "windows/runner/main.cpp"
+        if os.path.exists(win_main):
+            with open(win_main, 'r', encoding='utf-8') as f:
+                cpp = f.read()
+            cpp = re.sub(r'window\.CreateAndShow\(L"[^"]+"', f'window.CreateAndShow(L"{app_name}"', cpp)
+            with open(win_main, 'w', encoding='utf-8') as f:
+                f.write(cpp)
+        print_success(f"Injected Windows Title: {app_name}")
+
+    # --- 3. LINUX DESKTOP INJECTION ---
+    linux_cmake = "linux/CMakeLists.txt"
+    if os.path.exists(linux_cmake):
+        with open(linux_cmake, 'r', encoding='utf-8') as f:
+            content = f.read()
+        content = re.sub(r'set\(BINARY_NAME "[^"]+"\)', f'set(BINARY_NAME "{binary_slug}")', content)
+        with open(linux_cmake, 'w', encoding='utf-8') as f:
+            f.write(content)
+        
+        # Update Window Title in application.cc
+        # Usually found in linux/my_application.cc
+        for file in os.listdir("linux"):
+            if file.endswith(".cc"):
+                cc_path = os.path.join("linux", file)
+                with open(cc_path, 'r', encoding='utf-8') as f:
+                    cc = f.read()
+                cc = re.sub(r'gtk_window_set_title\(GTK_WINDOW\(window\), "[^"]+"\)', f'gtk_window_set_title(GTK_WINDOW(window), "{app_name}")', cc)
+                with open(cc_path, 'w', encoding='utf-8') as f:
+                    f.write(cc)
+        print_success(f"Injected Linux Title: {app_name}")
+
+    # --- 4. FLUTTER PUBSPEC INJECTION ---
+    if os.path.exists("pubspec.yaml"):
+        with open("pubspec.yaml", 'r', encoding='utf-8') as f:
+            pubspec = f.read()
+        pubspec = re.sub(r'^version:\s*.*$', f'version: {app_version}+{build_number}', pubspec, flags=re.MULTILINE)
+        pubspec = re.sub(r'^name:\s*.*$', f'name: {binary_slug}', pubspec, flags=re.MULTILINE)
+        with open("pubspec.yaml", 'w', encoding='utf-8') as f:
+            f.write(pubspec)
+        print_success(f"Updated pubspec.yaml version and name.")
+
+    # --- 5. UNIVERSAL ICON INJECTION ---
+    if icon_path and os.path.exists(icon_path):
+        injected_icons = False
+
+        # Android Mipmaps (Local)
+        if os.path.exists(manifest_path):
+            res_dir = os.path.join(os.path.dirname(manifest_path), 'res')
+            mipmaps = ['mipmap-mdpi', 'mipmap-hdpi', 'mipmap-xhdpi', 'mipmap-xxhdpi', 'mipmap-xxxhdpi']
+            for m in mipmaps:
+                target_dir = os.path.join(res_dir, m)
+                if os.path.exists(target_dir):
+                    shutil.copy2(icon_path, os.path.join(target_dir, 'ic_launcher.png'))
+                    if os.path.exists(os.path.join(target_dir, 'ic_launcher_round.png')):
+                        shutil.copy2(icon_path, os.path.join(target_dir, 'ic_launcher_round.png'))
+                    injected_icons = True
+
+        # Web/Flutter Web (Favicons & PWA)
+        web_targets = ["web", "public", web_dir]
+        for w_dir in web_targets:
+            if os.path.exists(w_dir):
+                shutil.copy2(icon_path, os.path.join(w_dir, 'favicon.png'))
+                icons_dir = os.path.join(w_dir, 'icons')
+                if os.path.exists(icons_dir):
+                    for p_icon in ['Icon-192.png', 'Icon-512.png', 'Icon-maskable-192.png', 'Icon-maskable-512.png']:
+                        shutil.copy2(icon_path, os.path.join(icons_dir, p_icon))
+                injected_icons = True
+        
+        if injected_icons:
+            print_success("Injected App Icons across all detected platforms.")
+
+    print_success("Local Metadata Injection Complete.")

{appforge_cli-1.6.4 → appforge_cli-2.6.6}/appforge/knowledge_base.json

@@ -258,5 +258,41 @@
     "plugin": "pedometer",
     "feature": "Pedometer (Step Counter)",
     "desc": "Found Flutter pedometer dependency"
-  }
+  },
+  "android.permission.CAMERA": { "plugin": "CAMERA", "feature": "Camera Access", "desc": "Required for taking photos or videos" },
+  "android.permission.ACCESS_FINE_LOCATION": { "plugin": "LOCATION", "feature": "Precise GPS", "desc": "Required for high-accuracy tracking" },
+  "android.permission.ACCESS_COARSE_LOCATION": { "plugin": "LOCATION", "feature": "Approximate Location", "desc": "Required for city-level positioning" },
+  "android.permission.ACCESS_BACKGROUND_LOCATION": { "plugin": "LOCATION", "feature": "Background Location", "desc": "Required for tracking while app is closed" },
+  "android.permission.RECORD_AUDIO": { "plugin": "MICROPHONE", "feature": "Microphone", "desc": "Required for audio recording" },
+  "android.permission.READ_EXTERNAL_STORAGE": { "plugin": "STORAGE", "feature": "Read Files", "desc": "Required to access user media" },
+  "android.permission.WRITE_EXTERNAL_STORAGE": { "plugin": "STORAGE", "feature": "Write Files", "desc": "Required to save files" },
+  "android.permission.READ_MEDIA_IMAGES": { "plugin": "STORAGE", "feature": "Photo Access", "desc": "Required for Android 13+ Media access" },
+  "android.permission.READ_MEDIA_VIDEO": { "plugin": "STORAGE", "feature": "Video Access", "desc": "Required for Android 13+ Media access" },
+  "android.permission.BLUETOOTH": { "plugin": "BLUETOOTH", "feature": "Classic Bluetooth", "desc": "Legacy Bluetooth support" },
+  "android.permission.BLUETOOTH_SCAN": { "plugin": "BLUETOOTH", "feature": "BLE Scanning", "desc": "Required for finding BLE devices" },
+  "android.permission.BLUETOOTH_CONNECT": { "plugin": "BLUETOOTH", "feature": "BLE Connecting", "desc": "Required to connect to BLE devices" },
+  "android.permission.USE_BIOMETRIC": { "plugin": "BIOMETRIC", "feature": "Face/Fingerprint", "desc": "Required for biometric authentication" },
+  "android.permission.READ_CONTACTS": { "plugin": "CONTACTS", "feature": "Contacts", "desc": "Required to access address book" },
+  "android.permission.CALL_PHONE": { "plugin": "PHONE", "feature": "Phone Calls", "desc": "Required to trigger phone dialer" },
+  "android.permission.SEND_SMS": { "plugin": "SMS", "feature": "Send SMS", "desc": "Required to send messages" },
+  "android.permission.RECEIVE_SMS": { "plugin": "SMS", "feature": "Receive SMS", "desc": "Required to read incoming OTPs" },
+  "android.permission.INTERNET": { "plugin": "NETWORK", "feature": "Internet", "desc": "Standard connectivity" },
+  "android.permission.ACCESS_NETWORK_STATE": { "plugin": "NETWORK", "feature": "Network Status", "desc": "Check connection quality" },
+  "android.permission.WAKE_LOCK": { "plugin": "POWER", "feature": "Wake Lock", "desc": "Prevent screen from dimming" },
+  "android.permission.RECEIVE_BOOT_COMPLETED": { "plugin": "SYSTEM", "feature": "Boot Receiver", "desc": "Required to run services on startup" },
+  "android.permission.VIBRATE": { "plugin": "HAPTICS", "feature": "Vibration", "desc": "Required for haptic feedback" },
+  "android.permission.FOREGROUND_SERVICE": { "plugin": "SERVICES", "feature": "Foreground Service", "desc": "Required for long-running tasks" },
+  "android.permission.POST_NOTIFICATIONS": { "plugin": "NOTIFICATIONS", "feature": "Push Notifications", "desc": "Required for Android 13+ notifications" },
+  "android.permission.USE_BIOMETRIC": { "plugin": "BIOMETRIC", "feature": "Biometric Authentication", "desc": "Required for fingerprint or face unlock" },
+  "android.permission.WRITE_SETTINGS": { "plugin": "SYSTEM_SETTINGS", "feature": "System Settings", "desc": "Required to modify system display or volume settings" },
+  "android.permission.BODY_SENSORS": { "plugin": "SENSORS", "feature": "Health Sensors", "desc": "Required for heart rate or step tracking" },
+  "android.permission.REQUEST_INSTALL_PACKAGES": { "plugin": "SYSTEM_INSTALL", "feature": "Package Installer", "desc": "Required for in-app updates/APK installation" },
+  "android.permission.ACCESS_WIFI_STATE": { "plugin": "NETWORK", "feature": "Wi-Fi State", "desc": "Required to check Wi-Fi connection info" },
+  "android.permission.CHANGE_WIFI_STATE": { "plugin": "NETWORK", "feature": "Wi-Fi Control", "desc": "Required to toggle Wi-Fi on or off" },
+  "android.permission.READ_CALENDAR": { "plugin": "CALENDAR", "feature": "Calendar Read", "desc": "Required to read user events" },
+  "android.permission.WRITE_CALENDAR": { "plugin": "CALENDAR", "feature": "Calendar Write", "desc": "Required to add events to calendar" },
+  "android.permission.MODIFY_AUDIO_SETTINGS": { "plugin": "AUDIO", "feature": "Audio Control", "desc": "Required to change speaker or headphone volume" },
+  "android.permission.SCHEDULE_EXACT_ALARM": { "plugin": "ALARMS", "feature": "Exact Alarms", "desc": "Required for precision-timed app notifications" },
+  "android.permission.SYSTEM_ALERT_WINDOW": { "plugin": "OVERLAY", "feature": "Display Over Other Apps", "desc": "Required to show floating windows above other applications"},
+  "android.permission.CHANGE_WIFI_MULTICAST_STATE": { "plugin": "NETWORK", "feature": "Wi-Fi Multicast Discovery", "desc": "Required for automatic discovery of nearby devices on the local Wi-Fi network" }
 }

{appforge_cli-1.6.4 → appforge_cli-2.6.6}/appforge/utils.py

@@ -14,8 +14,8 @@ RED = "\033[31m"
 GRAY = "\033[90m"
 BLUE = "\033[34m"
 
-CLI_VERSION = "1.6.4"
-
+CLI_VERSION = "4.6.0"
+printed_log_lines = set()
 def check_for_cli_updates():
     try:
         res = requests.get("https://pypi.org/pypi/appforge-cli/json", timeout=2)
@@ -35,6 +35,18 @@ def print_header():
         print(f"{YELLOW}⭐ A new version of AppForge is available! (v{latest}){RESET}")
         print(f"{GRAY}Run: pip install --upgrade appforge-cli{RESET}\n")
 
+def print_live_log(log_text):
+    global printed_log_lines
+    lines = log_text.splitlines()
+    
+    # Only look at the last 15 lines of the build
+    for line in lines[-15:]:
+        # Filter for relevant build info
+        if any(x in line for x in [":app:", "Task", "Building", ">"]):
+            if line not in printed_log_lines:
+                print(f"{GRAY}  {line[:80]}{RESET}")
+                printed_log_lines.add(line)
+
 def print_footer():
     print(f"\n{GRAY}AppForge CLI")
     print(f"Built by AppForge Team [Maintainer - JuniorSir]{RESET}\n")

{appforge_cli-1.6.4 → appforge_cli-2.6.6}/appforge_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: appforge-cli
-Version: 1.6.4
+Version: 2.6.6
 Summary: Convert web, Flutter, and native apps into Android/iOS apps automatically using cloud builds.
 Author: AppForge Team
 Author-email: AppForge Team <juniorsir.bot@gmail.com>

{appforge_cli-1.6.4 → appforge_cli-2.6.6}/appforge_cli.egg-info/SOURCES.txt

@@ -1,4 +1,5 @@
 pyproject.toml
+setup.cfg
 setup.py
 appforge/__init__.py
 appforge/ai.py

{appforge_cli-1.6.4 → appforge_cli-2.6.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "appforge-cli"
-version = "1.6.4"
+version = "2.6.6"
 authors = [
   { name="AppForge Team", email="juniorsir.bot@gmail.com" },
 ]

{appforge_cli-1.6.4 → appforge_cli-2.6.6}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup
 
 setup(
     name="appforge",
-    version="1.6.4",
+    version="4.6.0",
     description="Convert web apps into Android apps automatically using Capacitor and GitHub cloud builds.",
     author="AppForge Team",
     packages=["appforge"],
@@ -12,7 +12,8 @@ setup(
     include_package_data=True,
     install_requires=[
         "requests",
-        "packaging"
+        "packaging",
+        "nacl"
     ],
     entry_points={
         "console_scripts": [

appforge_cli-1.6.4/appforge/injector.py

@@ -1,125 +0,0 @@
-import os
-import shutil
-import re
-from .utils import print_info, print_success, print_warning
-
-def inject_metadata_locally(config):
-    """Injects App Name, Package ID, Version, and Icons locally before zipping."""
-    
-    app_name = config.get("appName", "AppForge App")
-    package_id = config.get("packageId", "com.appforge.app")
-    app_version = config.get("version", "1.0.0")
-    icon_path = config.get("iconPath")
-    web_dir = config.get("webDir", "dist")
-    project_category = config.get("category", "web")
-    
-    try:
-        parts = app_version.split('.')
-        build_number = int(f"{parts[0]}{parts[1].zfill(2)}{parts[2].zfill(2)}")
-    except:
-        build_number = 1
-
-    print_info("Injecting metadata locally before upload...")
-
-    # --- PATH DETECTION ---
-    manifest_path = "app/src/main/AndroidManifest.xml" if os.path.exists("app/src/main/AndroidManifest.xml") else "android/app/src/main/AndroidManifest.xml"
-    gradle_groovy = "app/build.gradle" if os.path.exists("app/build.gradle") else "android/app/build.gradle"
-    gradle_kts = gradle_groovy + ".kts"
-
-    # --- 1. INJECT APP NAME (AndroidManifest.xml) ---
-    if os.path.exists(manifest_path):
-        with open(manifest_path, 'r', encoding='utf-8') as f:
-            manifest = f.read()
-        
-        manifest = re.sub(r'android:label="[^"]+"', f'android:label="{app_name}"', manifest)
-        if 'xmlns:tools=' not in manifest:
-            manifest = manifest.replace('<manifest', '<manifest xmlns:tools="http://schemas.android.com/tools"')
-        if 'tools:replace="android:label"' not in manifest:
-            manifest = manifest.replace('<application', '<application tools:replace="android:label"')
-        if 'package=' in manifest:
-            manifest = re.sub(r'package="[^"]+"', f'package="{package_id}"', manifest)
-
-        with open(manifest_path, 'w', encoding='utf-8') as f:
-            f.write(manifest)
-        print_success(f"Injected App Name: {app_name}")
-
-    # --- 2. INJECT PACKAGE ID & VERSION (build.gradle) ---
-    target_gradle = gradle_kts if os.path.exists(gradle_kts) else (gradle_groovy if os.path.exists(gradle_groovy) else None)
-    
-    if target_gradle:
-        with open(target_gradle, 'r', encoding='utf-8') as f:
-            gradle = f.read()
-
-        gradle = re.sub(r'applicationId\s*=?\s*["\'][^"\']+["\']', f'applicationId = "{package_id}"', gradle)
-        gradle = re.sub(r'applicationId\s+["\'][^"\']+["\']', f'applicationId "{package_id}"', gradle)
-        gradle = re.sub(r'namespace\s*=?\s*["\'][^"\']+["\']', f'namespace = "{package_id}"', gradle)
-        gradle = re.sub(r'namespace\s+["\'][^"\']+["\']', f'namespace "{package_id}"', gradle)
-        gradle = re.sub(r'versionName\s*=?\s*["\'][^"\']+["\']', f'versionName = "{app_version}"', gradle)
-        gradle = re.sub(r'versionName\s+["\'][^"\']+["\']', f'versionName "{app_version}"', gradle)
-        gradle = re.sub(r'versionCode\s*=?\s*\d+', f'versionCode = {build_number}', gradle)
-        gradle = re.sub(r'versionCode\s+\d+', f'versionCode {build_number}', gradle)
-
-        with open(target_gradle, 'w', encoding='utf-8') as f:
-            f.write(gradle)
-        print_success(f"Injected Package ID: {package_id} & Version: {app_version}")
-
-    # --- 3. INJECT PUBSPEC.YAML (Flutter Specifics) ---
-    if os.path.exists("pubspec.yaml"):
-        with open("pubspec.yaml", 'r', encoding='utf-8') as f:
-            pubspec = f.read()
-        
-        # 3a. Update Version
-        if re.search(r'^version:\s*.*$', pubspec, re.MULTILINE):
-            pubspec = re.sub(r'^version:\s*.*$', f'version: {app_version}+{build_number}', pubspec, flags=re.MULTILINE)
-        
-        # 3b. Update Project Name (Must be snake_case for Dart!)
-        # e.g. "Vault Downloader" -> "vault_downloader"
-        snake_case_name = re.sub(r'[^a-zA-Z0-9]', '_', app_name).lower()
-        if re.search(r'^name:\s*.*$', pubspec, re.MULTILINE):
-            pubspec = re.sub(r'^name:\s*.*$', f'name: {snake_case_name}', pubspec, flags=re.MULTILINE)
-
-        with open("pubspec.yaml", 'w', encoding='utf-8') as f:
-            f.write(pubspec)
-        print_success(f"Updated pubspec.yaml (name: {snake_case_name}, version: {app_version})")
-
-    # --- 4. INJECT APP ICONS (Universal) ---
-    if icon_path and os.path.exists(icon_path):
-        injected_icons = False
-
-        # 4a. Android Mipmaps
-        if os.path.exists(manifest_path):
-            res_dir = os.path.join(os.path.dirname(manifest_path), 'res')
-            mipmaps = ['mipmap-mdpi', 'mipmap-hdpi', 'mipmap-xhdpi', 'mipmap-xxhdpi', 'mipmap-xxxhdpi']
-            for m in mipmaps:
-                target_dir = os.path.join(res_dir, m)
-                if os.path.exists(target_dir):
-                    shutil.copyfile(icon_path, os.path.join(target_dir, 'ic_launcher.png'))
-                    round_icon = os.path.join(target_dir, 'ic_launcher_round.png')
-                    if os.path.exists(round_icon):
-                        shutil.copyfile(icon_path, round_icon)
-                    injected_icons = True
-
-        # 4b. Web / Flutter Web Icons (PWA Support)
-        # Check standard web directories
-        web_targets = ["web", "public", web_dir]
-        for w_dir in web_targets:
-            if os.path.exists(w_dir):
-                # Replace Favicon
-                shutil.copyfile(icon_path, os.path.join(w_dir, 'favicon.png'))
-                if os.path.exists(os.path.join(w_dir, 'favicon.ico')):
-                    shutil.copyfile(icon_path, os.path.join(w_dir, 'favicon.ico'))
-                
-                # Replace PWA Icons
-                icons_dir = os.path.join(w_dir, 'icons')
-                if os.path.exists(icons_dir):
-                    pwa_icons = ['Icon-192.png', 'Icon-512.png', 'Icon-maskable-192.png', 'Icon-maskable-512.png']
-                    for p_icon in pwa_icons:
-                        shutil.copyfile(icon_path, os.path.join(icons_dir, p_icon))
-                injected_icons = True
-                
-        if injected_icons:
-            print_success("Injected custom App Icons across Native and Web directories.")
-        else:
-            print_warning("Icon path found, but no valid target directories (res/mipmap or web/icons) exist yet.")
-
-    print_success("Local Metadata Injection Complete. Project is ready for upload.")