Update Dockerfile

Dockerfile

@@ -10,15 +10,12 @@ const nextConfig = {
   images:{unoptimized:true},env:{},
   webpack:(config,{isServer})=>{
     if(!isServer)config.resolve.fallback={...config.resolve.fallback,fs:false,path:false};
-    config.watchOptions={...config.watchOptions,ignored:/[\/](logs|\.next)[\/]/};
-    return config;
+    config.watchOptions={...config.watchOptions,ignored:/[\/](logs|\.next)[\/]/};return config;
   },
   async headers(){return[{source:"/(.*)",headers:[{key:"X-Frame-Options",value:"ALLOWALL"},{key:"Content-Security-Policy",value:"frame-ancestors *"}]}];},
   async rewrites(){return[
-    {source:"/v1/v1/:path*",destination:"/api/v1/:path*"},
-    {source:"/v1/v1",destination:"/api/v1"},
-    {source:"/codex/:path*",destination:"/api/v1/responses"},
-    {source:"/v1/:path*",destination:"/api/v1/:path*"},
+    {source:"/v1/v1/:path*",destination:"/api/v1/:path*"},{source:"/v1/v1",destination:"/api/v1"},
+    {source:"/codex/:path*",destination:"/api/v1/responses"},{source:"/v1/:path*",destination:"/api/v1/:path*"},
     {source:"/v1",destination:"/api/v1"}
   ];}
 };
@@ -28,105 +25,65 @@ RUN npm install && npm run build
 
 # ---- Runtime ----
 FROM node:20-slim
-RUN apt-get update && apt-get install -y python3 python3-pip curl && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get install -y python3 python3-pip && rm -rf /var/lib/apt/lists/*
 RUN pip3 install huggingface_hub --break-system-packages --quiet
-
 WORKDIR /app
 COPY --from=builder /app/.next/standalone ./
 COPY --from=builder /app/.next/static ./.next/static
 COPY --from=builder /app/public ./public
 COPY --from=builder /app/open-sse ./open-sse
-
-ENV PORT=7860
-ENV HOSTNAME=0.0.0.0
+ENV PORT=7860 HOSTNAME=0.0.0.0
 ENV NEXT_PUBLIC_BASE_URL=https://gunnybd01-9router.hf.space
-ENV INITIAL_PASSWORD=123456
-ENV AUTH_COOKIE_SECURE=true
+ENV INITIAL_PASSWORD=123456 AUTH_COOKIE_SECURE=true
 ENV DB_PATH=/root/.9router/db/data.sqlite
 ENV HF_DATASET=gunnybd01/9router-db-backup
 ENV SYNC_INTERVAL=3600
-
 EXPOSE 7860
 
-# Python script: push DB lên HF Dataset
 RUN cat > /sync_db.py << 'PYEOF'
-import os, sys, time
+import os,sys,time
 from huggingface_hub import HfApi
-
-DB_FILE = os.environ.get("DB_PATH", "/root/.9router/db/data.sqlite")
-TOKEN   = os.environ.get("HF_TOKEN", "")
-DATASET = os.environ.get("HF_DATASET", "gunnybd01/9router-db-backup")
-
-if not TOKEN:
-    print("[sync] HF_TOKEN not set, skip"); sys.exit(0)
-if not os.path.exists(DB_FILE):
-    print(f"[sync] DB not found: {DB_FILE}"); sys.exit(0)
-
-sz = os.path.getsize(DB_FILE)
-print(f"[sync] Pushing DB ({sz} bytes) -> {DATASET} ...")
+db=os.environ.get("DB_PATH","/root/.9router/db/data.sqlite")
+tok=os.environ.get("HF_TOKEN",""); ds=os.environ.get("HF_DATASET","gunnybd01/9router-db-backup")
+if not tok: print("[sync] no HF_TOKEN"); sys.exit(0)
+if not os.path.exists(db): print("[sync] no DB"); sys.exit(0)
+print(f"[sync] {os.path.getsize(db)}b -> {ds} @ {time.strftime('%H:%M:%S')}")
 try:
-    api = HfApi(token=TOKEN)
-    api.upload_file(
-        path_or_fileobj=DB_FILE,
-        path_in_repo="data.sqlite",
-        repo_id=DATASET,
-        repo_type="dataset",
-        commit_message=f"DB sync {time.strftime('%Y-%m-%d %H:%M')}",
-    )
-    print(f"[sync] OK at {time.strftime('%Y-%m-%d %H:%M:%S')}")
-except Exception as e:
-    print(f"[sync] ERROR: {e}")
+  HfApi(token=tok).upload_file(path_or_fileobj=db,path_in_repo="data.sqlite",
+    repo_id=ds,repo_type="dataset",commit_message=f"backup {time.strftime('%Y-%m-%d %H:%M')}")
+  print("[sync] OK")
+except Exception as e: print(f"[sync] ERR: {e}")
 PYEOF
 
-# Python script: pull DB từ HF Dataset khi startup
 RUN cat > /restore_db.py << 'PYEOF2'
-import os, sys
+import os,sys,shutil
 from huggingface_hub import hf_hub_download
-
-DB_FILE = os.environ.get("DB_PATH", "/root/.9router/db/data.sqlite")
-TOKEN   = os.environ.get("HF_TOKEN", "")
-DATASET = os.environ.get("HF_DATASET", "gunnybd01/9router-db-backup")
-
-os.makedirs(os.path.dirname(DB_FILE), exist_ok=True)
-
-if not TOKEN:
-    print("[restore] HF_TOKEN not set, starting fresh"); sys.exit(0)
-
-print(f"[restore] Pulling DB from {DATASET}...")
+db=os.environ.get("DB_PATH","/root/.9router/db/data.sqlite")
+tok=os.environ.get("HF_TOKEN",""); ds=os.environ.get("HF_DATASET","gunnybd01/9router-db-backup")
+os.makedirs(os.path.dirname(db),exist_ok=True)
+if not tok: print("[restore] no HF_TOKEN"); sys.exit(0)
+print(f"[restore] Pulling from {ds}...")
 try:
-    path = hf_hub_download(
-        repo_id=DATASET,
-        filename="data.sqlite",
-        repo_type="dataset",
-        token=TOKEN,
-        local_dir="/tmp/hf_restore",
-    )
-    sz = os.path.getsize(path)
-    if sz > 4096:
-        import shutil
-        shutil.copy2(path, DB_FILE)
-        print(f"[restore] OK - {sz} bytes restored from backup")
-    else:
-        print(f"[restore] Backup too small ({sz}b), starting fresh")
-except Exception as e:
-    print(f"[restore] No backup yet ({e}), starting fresh")
+  dl=hf_hub_download(repo_id=ds,filename="data.sqlite",repo_type="dataset",token=tok,local_dir="/tmp/hfr")
+  sz=os.path.getsize(dl)
+  if sz>4096: shutil.copy2(dl,db); print(f"[restore] OK {sz}b")
+  else: print(f"[restore] too small {sz}b, fresh")
+except Exception as e: print(f"[restore] no backup: {e}")
 PYEOF2
 
+# Wrapper script cho trap (tranh sh quoting issues)
+RUN printf '#!/bin/sh\npython3 /sync_db.py\n' > /do_sync.sh && chmod +x /do_sync.sh
+
 RUN cat > /start.sh << 'STARTEOF'
 #!/bin/sh
-# 1. Restore DB from backup
 python3 /restore_db.py
-# 2. Start Next.js
 node /app/server.js &
 APP_PID=$!
-# 3. Sync loop (default 1h)
 INTERVAL="${SYNC_INTERVAL:-3600}"
-(while true; do sleep "$INTERVAL"; python3 /sync_db.py; done) &
-# 4. Sync on SIGTERM (Space sleeping)
-trap "echo "[trap] Syncing before sleep..."; python3 /sync_db.py; kill $APP_PID 2>/dev/null; exit 0" TERM INT
-# 5. Wait
+echo "[start] Sync every ${INTERVAL}s, PID=$$"
+(while true; do sleep "$INTERVAL"; /do_sync.sh; done) &
+trap /do_sync.sh TERM INT
 wait $APP_PID
 STARTEOF
-
 RUN chmod +x /start.sh
 CMD ["/bin/sh", "/start.sh"]