Upload folder using huggingface_hub

app.py

@@ -13,33 +13,49 @@ BASE_URL = "https://gabefromsimplebit-simplebit-signer.hf.space"
 
 @app.route('/')
 def home():
-    return "SimpleBit Engine is Online!"
+    return "SimpleBit Signer is Online!"
+
+def get_actual_bundle_id(ipa_path):
+    """ Extracts the actual Bundle ID from the IPA's Info.plist """
+    try:
+        # Use unzip to peek at the Info.plist and grep for the ID
+        # This is more reliable than parsing zsign logs
+        cmd = f"unzip -p {ipa_path} Payload/*.app/Info.plist | grep -A1 'CFBundleIdentifier' | grep 'string' | sed 's/<[^>]*>//g' | str.strip()"
+        # Using a more robust subprocess call for the same logic:
+        result = subprocess.run(
+            f"unzip -p {ipa_path} Payload/*.app/Info.plist | grep -A1 'CFBundleIdentifier'", 
+            shell=True, capture_output=True, text=True
+        )
+        match = re.search(r"<string>(.*)</string>", result.stdout)
+        if match:
+            return match.group(1).strip()
+    except Exception:
+        pass
+    return None
 
 @app.route('/sign', methods=['POST'])
 def sign():
-    # 1. Create a unique folder for this signing job
     job_id = str(uuid.uuid4())[:8]
     os.makedirs(job_id, exist_ok=True)
     
-    # 2. Get files from the form
     ipa = request.files['ipa']
     p12 = request.files['p12']
     prov = request.files['provision']
     password = request.form.get('password', '1234')
 
-    # 3. Define paths
     ipa_path = os.path.join(job_id, "app.ipa")
     p12_path = os.path.join(job_id, "cert.p12")
     prov_path = os.path.join(job_id, "prov.mobileprovision")
     out_path = os.path.join(job_id, "signed.ipa")
 
-    # 4. Save uploaded files
     ipa.save(ipa_path)
     p12.save(p12_path)
     prov.save(prov_path)
 
-    # 5. Run zsign command
-    # -z 0: No compression for instant speed on MacBook Air/HF
+    # STEP 1: Get the REAL Bundle ID first
+    bundle_id = get_actual_bundle_id(ipa_path)
+    
+    # STEP 2: Sign the app
     command = [
         "zsign",
         "-k", p12_path,
@@ -51,47 +67,34 @@ def sign():
     ]
     
     try:
-        # We capture both stdout and stderr because zsign logs vary
         result = subprocess.run(command, capture_output=True, text=True, check=True)
-        combined_output = result.stdout + result.stderr
-        
-        # 6. Improved Regex to prevent the "com.simplebit.dynamic" mismatch in image.png
-        match = re.search(r"Bundle\s?Id:\s+([a-zA-Z0-9\.-]+)", combined_output, re.IGNORECASE)
         
-        if match:
-            bundle_id = match.group(1).strip()
-        else:
-            # Fallback search for any string matching a standard reverse-DNS bundle ID
-            fallback_match = re.search(r"([a-zA-Z]{2,}\.[a-zA-Z0-9-]+\.[a-zA-Z0-9.-]+)", combined_output)
-            bundle_id = fallback_match.group(1) if fallback_match else "com.simplebit.dynamic"
+        # If extraction failed earlier, try one last time from zsign logs
+        if not bundle_id:
+            combined_output = result.stdout + result.stderr
+            match = re.search(r"Bundle\s?Id:\s+([a-zA-Z0-9\.-]+)", combined_output, re.IGNORECASE)
+            bundle_id = match.group(1).strip() if match else "com.simplebit.dynamic"
 
-        # Save the confirmed ID to ensure the /plist route uses the right one
+        # Save the confirmed ID for the /plist route
         with open(os.path.join(job_id, "bundle_id.txt"), "w") as f:
             f.write(bundle_id)
 
-        # 7. Redirect to the itms-services protocol for iOS installation
         plist_url = f"{BASE_URL}/plist/{job_id}"
         return redirect(f"itms-services://?action=download-manifest&url={plist_url}")
         
     except subprocess.CalledProcessError as e:
-        # Captures specific zsign errors (like wrong password) for debugging
-        error_logs = e.stderr if e.stderr else e.stdout
-        return f"Signing failed. Zsign output: {error_logs}", 500
-    except Exception as e:
-        return f"System Error: {str(e)}", 500
+        return f"Signing failed: {e.stderr}", 500
 
 @app.route('/plist/<job_id>')
 def serve_plist(job_id):
-    # Retrieve the dynamic bundle ID extracted during the sign phase
     try:
         with open(os.path.join(job_id, "bundle_id.txt"), "r") as f:
             bundle_id = f.read().strip()
     except:
-        bundle_id = "com.simplebit.fallback"
+        bundle_id = "com.simplebit.dynamic"
 
     ipa_direct_url = f"{BASE_URL}/download/{job_id}"
     
-    # Manifest required by iOS to install apps over-the-air
     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">
@@ -132,12 +135,7 @@ def serve_plist(job_id):
 
 @app.route('/download/<job_id>')
 def download_ipa(job_id):
-    # Sends the final binary to the iPhone
-    return send_file(
-        os.path.join(job_id, "signed.ipa"), 
-        mimetype='application/octet-stream',
-        as_attachment=True
-    )
+    return send_file(os.path.join(job_id, "signed.ipa"), as_attachment=True)
 
 if __name__ == "__main__":
     app.run(host="0.0.0.0", port=7860)