Update app.py

app.py

@@ -1,24 +1,24 @@
-import os, shutil, subprocess, requests, zipfile, uuid, boto3, glob
+import os
+import shutil
+import subprocess
+import requests
+import zipfile
+import uuid
+import glob
+import datetime
 from fastapi import FastAPI, BackgroundTasks
 from fastapi.responses import FileResponse, JSONResponse
 from pydantic import BaseModel
-from datetime import datetime
 
+# --- KONFIGURASI PATH ---
 os.chdir("/tmp")
 os.environ["HOME"] = "/tmp"
 os.environ["UNITY_PATH"] = "/opt/unity/Editor/Unity"
 BASE_PROJECT_PATH = "/app/UnityProject"
-
-R2_CONFIG = {
-    "account_id": "31f2970a3442da4e6f17f79064897226",
-    "access_key": "44613d17ec50941707a7ddd9b17944bc",
-    "secret_key": "50185c21ff5e4f53e412e2013305b6ab24b7eda16cc0d3dc66593eed64aa99a2",
-    "bucket_name": "zepeto-builds"
-}
+LICENSE_SOURCE = "/app/Unity_lic.ulf"
 
 app = FastAPI()
 
-# Model disesuaikan dengan payload Worker yang kamu kirim tadi
 class ConversionRequest(BaseModel):
     transaction_id: str
     file_url: str
@@ -26,82 +26,146 @@ class ConversionRequest(BaseModel):
     z_id: str
     z_pw: str
 
-def make_structured_zepeto(source_dir, output_file):
-    # Logika zipping asli yang kamu berikan (Berhasil)
-    with zipfile.ZipFile(output_file, 'w', zipfile.ZIP_DEFLATED) as z:
-        for root, _, files in os.walk(source_dir):
-            for file in files:
-                if file.endswith(".manifest"): continue
-                full_path = os.path.join(root, file)
-                rel_path = os.path.relpath(full_path, source_dir)
-                z.write(full_path, rel_path)
+# --- FUNGSI PEMBANTU ---
 
 def setup_license():
-    source_ulf = "/app/Unity_lic.ulf"
+    """Menyiapkan lisensi dan mengecek waktu server untuk debug."""
+    # 1. Cek Waktu Server (Penting untuk mengatasi 'Time validation failed')
+    now = datetime.datetime.now()
+    print(f"⏰ [DEBUG] Waktu Server Sekarang: {now.strftime('%Y-%m-%d %H:%M:%S')}", flush=True)
+
     target_dir = "/tmp/.local/share/unity3d/Unity"
-    if os.path.exists(source_ulf):
-        os.makedirs(target_dir, exist_ok=True)
-        shutil.copy2(source_ulf, os.path.join(target_dir, "Unity_lic.ulf"))
-        print("✅ [LICENSE] Lisensi terpasang.", flush=True)
+    os.makedirs(target_dir, exist_ok=True)
+    
+    if os.path.exists(LICENSE_SOURCE):
+        # Bersihkan lisensi lama di folder internal jika ada
+        internal_license = os.path.join(target_dir, "Unity_lic.ulf")
+        if os.path.exists(internal_license):
+            os.remove(internal_license)
+            
+        shutil.copy2(LICENSE_SOURCE, internal_license)
+        print("✅ [SYSTEM] Lisensi disalin ke folder internal Unity.", flush=True)
+    else:
+        print("⚠️ [WARNING] File Unity_lic.ulf tidak ditemukan di /app/", flush=True)
+
+def run_unity_command(project_path, method, extra_args=None):
+    """Menjalankan Unity dengan flag headless dan anti-stuck."""
+    cmd = [
+        os.environ["UNITY_PATH"],
+        "-batchmode",
+        "-nographics",
+        "-quit",
+        "-no-webservices",        # Matikan pencarian layanan cloud
+        "-no-graphics",           # Proteksi tambahan mode headless
+        "-silent-crashes",        # Jangan munculkan popup error
+        "-manualLicenseFile", LICENSE_SOURCE, # Paksa baca file lisensi fisik
+        "-projectPath", project_path,
+        "-executeMethod", method,
+        "-logFile", "-"           # Log keluar secara real-time ke console
+    ]
+    if extra_args:
+        cmd.extend(extra_args)
+    
+    # Jalankan perintah dan tunggu sampai selesai
+    return subprocess.run(cmd, capture_output=False)
+
+# --- ENDPOINTS ---
 
 @app.get("/lisensi")
-async def get_alf():
-    for f in glob.glob("/tmp/*.alf"): os.remove(f)
-    subprocess.run([os.environ["UNITY_PATH"], "-batchmode", "-nographics", "-createManualActivationFile", "-logfile", "/dev/stdout"], cwd="/tmp")
-    found = glob.glob("/tmp/*.alf")
-    if found: return FileResponse(path=found[0], filename=os.path.basename(found[0]))
-    return JSONResponse(status_code=500, content={"error": "Gagal buat .alf"})
+async def generate_new_alf():
+    """Endpoint untuk generate file .alf baru jika lisensi lama Expired."""
+    # Bersihkan sisa file .alf sebelumnya
+    for f in glob.glob("/tmp/*.alf"):
+        try: os.remove(f)
+        except: pass
+        
+    print("🛠️ [LICENSE] Meminta file aktivasi (.alf) baru dari Unity...", flush=True)
+    cmd = [
+        os.environ["UNITY_PATH"], 
+        "-batchmode", "-nographics", 
+        "-createManualActivationFile", 
+        "-logfile", "/dev/stdout"
+    ]
+    subprocess.run(cmd, cwd="/tmp", timeout=60)
+    
+    found_alf = glob.glob("/tmp/*.alf")
+    if found_alf:
+        print(f"✅ [LICENSE] File .alf berhasil dibuat: {found_alf[0]}", flush=True)
+        return FileResponse(path=found_alf[0], filename=os.path.basename(found_alf[0]))
+    
+    return JSONResponse(status_code=500, content={"error": "Gagal generate .alf. Cek tab Logs."})
+
+@app.post("/convert")
+async def api_convert(req: ConversionRequest, background_tasks: BackgroundTasks):
+    """Endpoint utama untuk memicu pipeline convert dan upload."""
+    background_tasks.add_task(process_pipeline, req)
+    return {"status": "processing", "transaction_id": req.transaction_id}
+
+# --- INTI PROSES (PIPELINE) ---
 
 def process_pipeline(req: ConversionRequest):
     setup_license()
     
-    # Tambahkan timestamp sesuai permintaan sebelumnya agar file unik
-    timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
-    unique_filename = f"{req.filename}_{timestamp}"
-    
-    # Gunakan transaction_id untuk folder sesi agar tidak tabrakan
+    # Folder unik untuk setiap transaksi
     SESSION_PATH = f"/tmp/Project_{req.transaction_id}"
     extract_tmp = f"/tmp/extract_{req.transaction_id}"
     zip_tmp = f"/tmp/{req.transaction_id}.zip"
-    final_zepeto = f"/tmp/{unique_filename}.zepeto"
 
     try:
-        # Download
-        r = requests.get(req.file_url)
-        open(zip_tmp, 'wb').write(r.content)
+        # 1. DOWNLOAD & PREPARE
+        print(f"📥 [START] Mengambil aset: {req.transaction_id}", flush=True)
+        r = requests.get(req.file_url, timeout=30)
+        with open(zip_tmp, 'wb') as f:
+            f.write(r.content)
         
         os.makedirs(extract_tmp, exist_ok=True)
-        with zipfile.ZipFile(zip_tmp, 'r') as z: z.extractall(extract_tmp)
+        with zipfile.ZipFile(zip_tmp, 'r') as z:
+            z.extractall(extract_tmp)
         
-        # Setup Project
+        # 2. SETUP PROJECT WORKSPACE
+        # Salin UnityProject dasar ke folder temporer agar project asli tetap bersih
         shutil.copytree(BASE_PROJECT_PATH, SESSION_PATH, ignore=shutil.ignore_patterns("Library", "Temp"))
         target_in = os.path.join(SESSION_PATH, "Assets/InputRaw")
         os.makedirs(target_in, exist_ok=True)
-        for item in os.listdir(extract_tmp): shutil.move(os.path.join(extract_tmp, item), os.path.join(target_in, item))
+        
+        # Pindahkan file hasil ekstrak ke folder input project
+        for item in os.listdir(extract_tmp):
+            shutil.move(os.path.join(extract_tmp, item), os.path.join(target_in, item))
 
-        print(f"🚀 [UNITY] Memulai Export untuk {req.transaction_id}...", flush=True)
-        subprocess.run([os.environ["UNITY_PATH"], "-batchmode", "-nographics", "-quit", "-projectPath", SESSION_PATH, "-executeMethod", "TestBuilder.ManualConvert", "-logFile", "/dev/stdout"], capture_output=False)
+        # 3. TAHAP 1: PENYEDERHANAAN MESH
+        print(f"🛠️ [STEP 1] Menjalankan TestBuilder.SimplifyOnly...", flush=True)
+        step1 = run_unity_command(SESSION_PATH, "TestBuilder.SimplifyOnly")
 
-        export_dir = os.path.join(SESSION_PATH, "Assets/FinalPackage")
-        if os.path.exists(export_dir) and len(os.listdir(export_dir)) > 0:
-            make_structured_zepeto(export_dir, final_zepeto)
-            s3 = boto3.client('s3', endpoint_url=f"https://{R2_CONFIG['account_id']}.r2.cloudflarestorage.com", aws_access_key_id=R2_CONFIG['access_key'], aws_secret_access_key=R2_CONFIG['secret_key'])
-            
-            r2_path = f"packed/{unique_filename}.zepeto"
-            s3.upload_file(final_zepeto, R2_CONFIG['bucket_name'], r2_path)
-            print(f"✅ [SUCCESS] File dikirim ke R2: {r2_path}", flush=True)
+        if step1.returncode != 0:
+            print(f"❌ [FAILED] Step 1 Gagal (Exit Code: {step1.returncode}). Cek Logs di atas.", flush=True)
+            return
+
+        # 4. TAHAP 2: UPLOAD KE ZEPETO
+        print(f"🚀 [STEP 2] Menjalankan Zepeto CLI Upload...", flush=True)
+        upload_args = [
+            "-id", req.z_id,
+            "-password", req.z_pw,
+            "-upload"
+        ]
+        step2 = run_unity_command(SESSION_PATH, "ZepetoPackageCliBuilder.BuildWithArgs", upload_args)
+
+        if step2.returncode == 0:
+            print(f"✅ [SUCCESS] Item {req.transaction_id} telah terunggah ke ZEPETO Studio.", flush=True)
+        else:
+            print(f"❌ [FAILED] Step 2 Gagal (Exit Code: {step2.returncode}).", flush=True)
 
+    except Exception as e:
+        print(f"🔥 [CRITICAL ERROR] {str(e)}", flush=True)
+    
     finally:
-        for p in [SESSION_PATH, extract_tmp, zip_tmp, final_zepeto]:
-            if os.path.exists(p): 
+        # PEMBERSIHAN (Wajib agar disk tidak penuh)
+        print(f"🧹 [CLEANUP] Menghapus folder sesi {req.transaction_id}...", flush=True)
+        for p in [SESSION_PATH, extract_tmp, zip_tmp]:
+            if os.path.exists(p):
                 if os.path.isdir(p): shutil.rmtree(p)
                 else: os.remove(p)
 
-@app.post("/convert")
-async def api_convert(req: ConversionRequest, background_tasks: BackgroundTasks):
-    background_tasks.add_task(process_pipeline, req)
-    return {"status": "processing", "transaction_id": req.transaction_id}
-
 if __name__ == "__main__":
     import uvicorn
+    # Jalankan server FastAPI
     uvicorn.run(app, host="0.0.0.0", port=7860)