Update app.py

app.py

@@ -1,4 +1,4 @@
-from flask import Flask, request, send_file, redirect, jsonify
+from flask import Flask, request, send_file, jsonify, redirect
 from flask_cors import CORS
 
 import subprocess
@@ -6,14 +6,13 @@ import plistlib
 import zipfile
 import shutil
 import uuid
-import os
 
 from pathlib import Path
 
 app = Flask(__name__)
 CORS(app)
 
-# CHANGE THIS TO YOUR REAL SPACE URL
+# CHANGE THIS TO YOUR REAL HF SPACE URL
 BASE_URL = "https://gabefromsimplebit-simplebit-signer.hf.space"
 
 
@@ -25,55 +24,86 @@ def home():
     })
 
 
+# ---------------------------------------------------------
+# Extract REAL main app bundle identifier
+# ---------------------------------------------------------
 def get_actual_bundle_id(ipa_path):
-    """
-    Safely extract CFBundleIdentifier from IPA
-    """
+
     try:
         with zipfile.ZipFile(ipa_path, "r") as ipa:
-            plist_name = None
+
+            app_plist = None
 
             for name in ipa.namelist():
-                if name.startswith("Payload/") and name.endswith("Info.plist"):
-                    plist_name = name
+
+                # ONLY match:
+                # Payload/App.app/Info.plist
+                if (
+                    name.startswith("Payload/")
+                    and name.count("/") == 2
+                    and name.endswith(".app/Info.plist")
+                ):
+                    app_plist = name
                     break
 
-            if not plist_name:
+            if not app_plist:
+                print("Main app Info.plist not found")
                 return None
 
-            with ipa.open(plist_name) as plist_file:
+            print("MAIN APP PLIST:", app_plist)
+
+            with ipa.open(app_plist) as plist_file:
                 plist_data = plistlib.load(plist_file)
 
-            return plist_data.get("CFBundleIdentifier")
+            bundle_id = plist_data.get("CFBundleIdentifier")
+
+            print("REAL BUNDLE ID:", bundle_id)
+
+            return bundle_id
 
     except Exception as e:
-        print("Bundle ID extraction failed:", str(e))
+        print("Bundle extraction error:", str(e))
 
     return None
 
 
+# ---------------------------------------------------------
+# Save bundle ID
+# ---------------------------------------------------------
 def save_bundle_id(job_dir, bundle_id):
+
     try:
         with open(job_dir / "bundle_id.txt", "w") as f:
             f.write(bundle_id)
+
     except Exception as e:
-        print("Failed to save bundle ID:", str(e))
+        print("Save bundle ID error:", str(e))
 
 
+# ---------------------------------------------------------
+# Load bundle ID
+# ---------------------------------------------------------
 def load_bundle_id(job_dir):
+
     try:
         with open(job_dir / "bundle_id.txt", "r") as f:
             return f.read().strip()
+
     except:
         return "com.simplebit.dynamic"
 
 
+# ---------------------------------------------------------
+# SIGN IPA
+# ---------------------------------------------------------
 @app.route("/sign", methods=["POST"])
 def sign():
+
     try:
-        # ---------------------------------------------------
+
+        # -------------------------------------------------
         # Validate uploads
-        # ---------------------------------------------------
+        # -------------------------------------------------
 
         if "ipa" not in request.files:
             return jsonify({
@@ -82,7 +112,7 @@ def sign():
 
         if "p12" not in request.files:
             return jsonify({
-                "error": "Missing P12 certificate"
+                "error": "Missing P12 file"
             }), 400
 
         if "provision" not in request.files:
@@ -90,9 +120,9 @@ def sign():
                 "error": "Missing provisioning profile"
             }), 400
 
-        # ---------------------------------------------------
+        # -------------------------------------------------
         # Check zsign installation
-        # ---------------------------------------------------
+        # -------------------------------------------------
 
         zsign_path = shutil.which("zsign")
 
@@ -103,62 +133,63 @@ def sign():
                 "error": "zsign is not installed"
             }), 500
 
-        # ---------------------------------------------------
-        # Create job directory
-        # ---------------------------------------------------
+        # -------------------------------------------------
+        # Create unique job folder
+        # -------------------------------------------------
 
         job_id = str(uuid.uuid4())[:8]
 
         job_dir = Path(job_id)
         job_dir.mkdir(exist_ok=True)
 
-        # ---------------------------------------------------
-        # Uploaded files
-        # ---------------------------------------------------
-
-        ipa = request.files["ipa"]
-        p12 = request.files["p12"]
-        provision = request.files["provision"]
-
-        password = request.form.get("password", "")
+        # -------------------------------------------------
+        # Paths
+        # -------------------------------------------------
 
         ipa_path = job_dir / "app.ipa"
         p12_path = job_dir / "cert.p12"
         prov_path = job_dir / "profile.mobileprovision"
-        out_path = job_dir / "signed.ipa"
+        signed_path = job_dir / "signed.ipa"
+
+        # -------------------------------------------------
+        # Save uploaded files
+        # -------------------------------------------------
 
-        ipa.save(ipa_path)
-        p12.save(p12_path)
-        provision.save(prov_path)
+        request.files["ipa"].save(ipa_path)
+        request.files["p12"].save(p12_path)
+        request.files["provision"].save(prov_path)
 
-        # ---------------------------------------------------
+        password = request.form.get("password", "")
+
+        # -------------------------------------------------
         # Extract bundle ID
-        # ---------------------------------------------------
+        # -------------------------------------------------
 
         bundle_id = get_actual_bundle_id(ipa_path)
 
-        print("BUNDLE ID:", bundle_id)
+        if not bundle_id:
+            bundle_id = "com.simplebit.dynamic"
 
-        # ---------------------------------------------------
+        # -------------------------------------------------
         # zsign command
-        # ---------------------------------------------------
+        # -------------------------------------------------
 
         command = [
             zsign_path,
             "-k", str(p12_path),
             "-p", password,
             "-m", str(prov_path),
-            "-o", str(out_path),
+            "-o", str(signed_path),
             "-z", "0",
             str(ipa_path)
         ]
 
-        print("RUNNING COMMAND:")
+        print("RUNNING:")
         print(" ".join(command))
 
-        # ---------------------------------------------------
-        # Run signing
-        # ---------------------------------------------------
+        # -------------------------------------------------
+        # Execute zsign
+        # -------------------------------------------------
 
         result = subprocess.run(
             command,
@@ -167,16 +198,19 @@ def sign():
         )
 
         print("RETURN CODE:", result.returncode)
+
         print("STDOUT:")
         print(result.stdout)
+
         print("STDERR:")
         print(result.stderr)
 
-        # ---------------------------------------------------
-        # Handle failure
-        # ---------------------------------------------------
+        # -------------------------------------------------
+        # Signing failed
+        # -------------------------------------------------
 
         if result.returncode != 0:
+
             return jsonify({
                 "error": "Signing failed",
                 "returncode": result.returncode,
@@ -184,60 +218,66 @@ def sign():
                 "stderr": result.stderr
             }), 500
 
-        # ---------------------------------------------------
-        # Verify signed IPA exists
-        # ---------------------------------------------------
+        # -------------------------------------------------
+        # Ensure IPA exists
+        # -------------------------------------------------
+
+        if not signed_path.exists():
 
-        if not out_path.exists():
             return jsonify({
-                "error": "Signed IPA missing after signing"
+                "error": "Signed IPA missing"
             }), 500
 
-        # ---------------------------------------------------
-        # Fallback bundle ID
-        # ---------------------------------------------------
-
-        if not bundle_id:
-            bundle_id = "com.simplebit.dynamic"
+        # -------------------------------------------------
+        # Save bundle ID
+        # -------------------------------------------------
 
         save_bundle_id(job_dir, bundle_id)
 
-        # ---------------------------------------------------
-        # OTA Install URL
-        # ---------------------------------------------------
+        # -------------------------------------------------
+        # Generate install link
+        # -------------------------------------------------
 
         plist_url = f"{BASE_URL}/plist/{job_id}"
 
-        ota_url = (
+        install_url = (
             "itms-services://?action=download-manifest"
             f"&url={plist_url}"
         )
 
-        return jsonify({
-            "success": True,
-            "job_id": job_id,
-            "bundle_id": bundle_id,
-            "install_url": ota_url,
-            "plist_url": plist_url,
-            "download_url": f"{BASE_URL}/download/{job_id}"
-        })
+        print("INSTALL URL:")
+        print(install_url)
+
+        # -------------------------------------------------
+        # AUTO REDIRECT TO INSTALL
+        # -------------------------------------------------
+
+        return redirect(install_url)
 
     except Exception as e:
-        print("FATAL ERROR:", str(e))
+
+        print("FATAL ERROR:")
+        print(str(e))
 
         return jsonify({
             "error": str(e)
         }), 500
 
 
+# ---------------------------------------------------------
+# OTA plist
+# ---------------------------------------------------------
 @app.route("/plist/<job_id>")
 def serve_plist(job_id):
+
     try:
+
         job_dir = Path(job_id)
 
         signed_ipa = job_dir / "signed.ipa"
 
         if not signed_ipa.exists():
+
             return jsonify({
                 "error": "Signed IPA not found"
             }), 404
@@ -259,6 +299,7 @@ def serve_plist(job_id):
 
             <key>assets</key>
             <array>
+
                 <dict>
                     <key>kind</key>
                     <string>software-package</string>
@@ -266,6 +307,7 @@ def serve_plist(job_id):
                     <key>url</key>
                     <string>{ipa_url}</string>
                 </dict>
+
             </array>
 
             <key>metadata</key>
@@ -303,17 +345,24 @@ def serve_plist(job_id):
         )
 
     except Exception as e:
+
         return jsonify({
             "error": str(e)
         }), 500
 
 
+# ---------------------------------------------------------
+# Download signed IPA
+# ---------------------------------------------------------
 @app.route("/download/<job_id>")
 def download_ipa(job_id):
+
     try:
+
         ipa_path = Path(job_id) / "signed.ipa"
 
         if not ipa_path.exists():
+
             return jsonify({
                 "error": "IPA not found"
             }), 404
@@ -325,20 +374,29 @@ def download_ipa(job_id):
         )
 
     except Exception as e:
+
         return jsonify({
             "error": str(e)
         }), 500
 
 
+# ---------------------------------------------------------
+# Health endpoint
+# ---------------------------------------------------------
 @app.route("/health")
 def health():
+
     return jsonify({
         "status": "healthy",
         "zsign_installed": shutil.which("zsign") is not None
     })
 
 
+# ---------------------------------------------------------
+# Run Flask
+# ---------------------------------------------------------
 if __name__ == "__main__":
+
     app.run(
         host="0.0.0.0",
         port=7860,