Update app.py

app.py

@@ -16,6 +16,9 @@ CORS(app)
 BASE_URL = "https://gabefromsimplebit-simplebit-signer.hf.space"
 
 
+# -------------------------------------------------
+# HOME
+# -------------------------------------------------
 @app.route("/")
 def home():
     return jsonify({
@@ -25,22 +28,19 @@ def home():
 
 
 # -------------------------------------------------
-# Extract main bundle ID
+# GET BUNDLE ID (safe)
 # -------------------------------------------------
 def get_actual_bundle_id(ipa_path):
+
     try:
         with zipfile.ZipFile(ipa_path, "r") as ipa:
 
             for name in ipa.namelist():
 
-                if (
-                    name.startswith("Payload/")
-                    and name.count("/") == 2
-                    and name.endswith(".app/Info.plist")
-                ):
+                if name.endswith("Info.plist") and ".app/" in name:
                     with ipa.open(name) as f:
                         plist_data = plistlib.load(f)
-                    return plist_data.get("CFBundleIdentifier")
+                        return plist_data.get("CFBundleIdentifier")
 
     except Exception as e:
         print("Bundle error:", e)
@@ -49,22 +49,21 @@ def get_actual_bundle_id(ipa_path):
 
 
 # -------------------------------------------------
-# Save / load bundle ID
+# FIND APP BUNDLE ANYWHERE (FIXED)
 # -------------------------------------------------
-def save_bundle_id(job_dir, bundle_id):
-    with open(job_dir / "bundle_id.txt", "w") as f:
-        f.write(bundle_id)
+def find_app_bundle(temp_dir):
 
+    temp_dir = Path(temp_dir)
 
-def load_bundle_id(job_dir):
-    try:
-        return (job_dir / "bundle_id.txt").read_text().strip()
-    except:
-        return "com.simplebit.dynamic"
+    for item in temp_dir.rglob("*.app"):
+        if item.is_dir():
+            return item
+
+    return None
 
 
 # -------------------------------------------------
-# SIGN IPA
+# SIGN ROUTE
 # -------------------------------------------------
 @app.route("/sign", methods=["POST"])
 def sign():
@@ -103,33 +102,27 @@ def sign():
         bundle_id = get_actual_bundle_id(ipa_path) or "com.simplebit.dynamic"
 
         # -------------------------------------------------
-        # Extract IPA manually
+        # Extract IPA
         # -------------------------------------------------
         temp_dir = tempfile.mkdtemp()
 
         with zipfile.ZipFile(ipa_path, "r") as zip_ref:
             zip_ref.extractall(temp_dir)
 
-        payload_path = Path(temp_dir) / "Payload"
-
-        if not payload_path.exists():
-            shutil.rmtree(temp_dir)
-            return jsonify({"error": "Payload missing"}), 500
+        print("EXTRACTED FILES:", list(Path(temp_dir).rglob("*")))
 
-        app_folder = None
-        for item in payload_path.iterdir():
-            if item.suffix == ".app":
-                app_folder = item
-                break
+        app_bundle = find_app_bundle(temp_dir)
 
-        if not app_folder:
+        if not app_bundle:
             shutil.rmtree(temp_dir)
-            return jsonify({"error": ".app not found"}), 500
+            return jsonify({
+                "error": "No .app bundle found in IPA"
+            }), 500
 
-        print("APP:", app_folder)
+        print("FOUND APP:", app_bundle)
 
         # -------------------------------------------------
-        # Sign extracted app
+        # SIGN APP
         # -------------------------------------------------
         command = [
             zsign_path,
@@ -137,7 +130,7 @@ def sign():
             "-k", str(p12_path),
             "-p", password,
             "-m", str(prov_path),
-            str(app_folder)
+            str(app_bundle)
         ]
 
         result = subprocess.run(
@@ -158,7 +151,7 @@ def sign():
             }), 500
 
         # -------------------------------------------------
-        # Rebuild IPA manually
+        # REPACK IPA
         # -------------------------------------------------
         shutil.make_archive(
             str(job_dir / "signed"),
@@ -170,10 +163,10 @@ def sign():
 
         shutil.rmtree(temp_dir)
 
-        save_bundle_id(job_dir, bundle_id)
+        # Save bundle ID
+        (job_dir / "bundle_id.txt").write_text(bundle_id)
 
         plist_url = f"{BASE_URL}/plist/{job_id}"
-
         install_url = f"itms-services://?action=download-manifest&url={plist_url}"
 
         return redirect(install_url)
@@ -190,13 +183,17 @@ def plist(job_id):
 
     job_dir = Path(job_id)
 
-    bundle_id = load_bundle_id(job_dir)
+    bundle_id = "com.simplebit.dynamic"
+
+    if (job_dir / "bundle_id.txt").exists():
+        bundle_id = (job_dir / "bundle_id.txt").read_text().strip()
 
     ipa_url = f"{BASE_URL}/download/{job_id}"
 
     plist_content = f"""<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN"
 "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+
 <plist version="1.0">
 <dict>
 <key>items</key>
@@ -225,17 +222,17 @@ def plist(job_id):
 </dict>
 </array>
 </dict>
-</plist>"""
+</plist>
+"""
 
     plist_path = job_dir / "manifest.plist"
-
     plist_path.write_text(plist_content)
 
     return send_file(plist_path, mimetype="application/xml")
 
 
 # -------------------------------------------------
-# DOWNLOAD IPA (IMPORTANT FOR iOS OTA)
+# DOWNLOAD IPA (iOS SAFE)
 # -------------------------------------------------
 @app.route("/download/<job_id>")
 def download(job_id):
@@ -245,7 +242,11 @@ def download(job_id):
     if not ipa_path.exists():
         return jsonify({"error": "IPA not found"}), 404
 
-    response = send_file(ipa_path, mimetype="application/octet-stream")
+    response = send_file(
+        ipa_path,
+        mimetype="application/octet-stream"
+    )
+
     response.headers["Content-Disposition"] = "inline; filename=signed.ipa"
     return response
 
@@ -261,5 +262,8 @@ def health():
     })
 
 
+# -------------------------------------------------
+# RUN
+# -------------------------------------------------
 if __name__ == "__main__":
     app.run(host="0.0.0.0", port=7860, debug=True)