Update Dockerfile

Dockerfile

@@ -1,26 +1,13 @@
-FROM node:22-alpine
-
-# sqlite: 一致性备份用；rclone: 连接 Google Drive
-RUN apk add --no-cache sqlite rclone
-
-WORKDIR /app
-RUN npm install -g omniroute
-
-ENV PORT=7860
-ENV HOST=0.0.0.0
-ENV NODE_ENV=production
-
-EXPOSE 7860
-
-# ───────── 下载 + 反向代理服务（监听 7860）─────────
 RUN cat > /app/download_server.js << 'EOF'
 const http = require('http');
 const fs   = require('fs');
 const path = require('path');
+const { execFile } = require('child_process');
 
-const PORT          = 7860;          // HF 唯一暴露端口
-const UPSTREAM_PORT = 8860;          // omniroute 内部端口
+const PORT          = 7860;
+const UPSTREAM_PORT = 8860;
 const ALLOWED_DIRS  = ['/data', '/root/.omniroute'];
+const GD_REMOTE     = 'om:om-backup';
 
 function safeResolvePath(filename) {
   if (!filename || filename.includes('/') || filename.includes('\\') || filename.includes('..')) return null;
@@ -31,10 +18,45 @@ function safeResolvePath(filename) {
   return null;
 }
 
+// 执行一次：sqlite 一致性快照 -> 上传 Google Drive
+function runBackup(cb) {
+  const src = '/root/.omniroute/storage.sqlite';
+  const tmp = '/data/omni_storage.sqlite';
+  if (!fs.existsSync(src)) return cb(new Error('storage.sqlite 不存在'));
+
+  execFile('sqlite3', [src, `.backup '${tmp}'`], (e1) => {
+    if (e1) return cb(new Error('sqlite 快照失败: ' + e1.message));
+    execFile('rclone', ['copyto', tmp, `${GD_REMOTE}/omni_storage.sqlite`], (e2) => {
+      if (e2) return cb(new Error('rclone 上传失败: ' + e2.message));
+      // settings.json 一并备份（存在才传）
+      const setSrc = '/root/.omniroute/settings.json';
+      if (fs.existsSync(setSrc)) {
+        execFile('rclone', ['copyto', setSrc, `${GD_REMOTE}/omni_settings.json`], () => cb(null));
+      } else {
+        cb(null);
+      }
+    });
+  });
+}
+
 const server = http.createServer((req, res) => {
   const url   = new URL(req.url, `http://localhost:${PORT}`);
   const route = url.pathname;
 
+  // ── 手动触发备份 ──
+  if (route === '/backup') {
+    runBackup((err) => {
+      if (err) {
+        res.writeHead(500, { 'Content-Type': 'application/json' });
+        res.end(JSON.stringify({ ok: false, error: err.message }));
+      } else {
+        res.writeHead(200, { 'Content-Type': 'application/json' });
+        res.end(JSON.stringify({ ok: true, msg: 'backup -> GDrive 成功', time: new Date().toISOString() }));
+      }
+    });
+    return;
+  }
+
   if (route === '/list') {
     const result = {};
     for (const dir of ALLOWED_DIRS) {
@@ -65,11 +87,10 @@ const server = http.createServer((req, res) => {
       'Content-Length':      stat.size,
     });
     fs.createReadStream(fullPath).pipe(res);
-    console.log(`[download] ${fullPath} (${stat.size} bytes)`);
     return;
   }
 
-  // 其余请求反向代理给 omniroute (8860)
+  // 其余反向代理给 omniroute
   const proxyReq = http.request(
     { hostname: '127.0.0.1', port: UPSTREAM_PORT, path: req.url, method: req.method, headers: req.headers },
     proxyRes => { res.writeHead(proxyRes.statusCode, proxyRes.headers); proxyRes.pipe(res); }
@@ -82,80 +103,6 @@ const server = http.createServer((req, res) => {
 });
 
 server.listen(PORT, '0.0.0.0', () => {
-  console.log(`[server] listening ${PORT}; routes /list /download, proxy -> ${UPSTREAM_PORT}`);
+  console.log(`[server] listening ${PORT}; routes /list /download /backup, proxy -> ${UPSTREAM_PORT}`);
 });
 EOF
-
-# ───────── 启动脚本 ─────────
-RUN cat > /app/entrypoint.sh << 'EOF'
-#!/bin/sh
-set -u
-
-mkdir -p /root/.omniroute /data /root/.config/rclone
-
-# ── 写入 rclone 配置（来自 HF Secret: RCLONE_CONF）──
-if [ -n "${RCLONE_CONF:-}" ]; then
-  printf '%s\n' "$RCLONE_CONF" > /root/.config/rclone/rclone.conf
-  echo "✅ 已写入 rclone 配置"
-else
-  echo "⚠️ 未设置 RCLONE_CONF，Google Drive 备份将不可用"
-fi
-
-# ── 固定加密 key（来自 HF Secret: STORAGE_ENCRYPTION_KEY）──
-# 不固定的话，重启会生成新 key，导致恢复的旧库无法解密！
-if [ -n "${STORAGE_ENCRYPTION_KEY:-}" ]; then
-  echo "STORAGE_ENCRYPTION_KEY=$STORAGE_ENCRYPTION_KEY" > /root/.omniroute/.env
-  echo "✅ 已写入固定 STORAGE_ENCRYPTION_KEY"
-else
-  echo "⚠️ 未设置 STORAGE_ENCRYPTION_KEY，重启后恢复的库可能解不开！"
-fi
-
-# Google Drive 备份目录：远程名 om，文件夹 om-backup
-GD_REMOTE="om:om-backup"
-
-# ── 开机：从 Google Drive 拉取备份覆盖恢复 ──
-if [ -n "${RCLONE_CONF:-}" ]; then
-  if rclone copyto "$GD_REMOTE/omni_storage.sqlite" /root/.omniroute/storage.sqlite --no-traverse 2>/dev/null; then
-    echo "✅ 从 GDrive 恢复 storage.sqlite"
-    # 恢复后清掉残留 WAL，避免脏数据覆盖
-    rm -f /root/.omniroute/storage.sqlite-wal /root/.omniroute/storage.sqlite-shm
-  else
-    echo "⚠️ GDrive 无 storage 备份，跳过恢复"
-  fi
-  if rclone copyto "$GD_REMOTE/omni_settings.json" /root/.omniroute/settings.json --no-traverse 2>/dev/null; then
-    echo "✅ 从 GDrive 恢复 settings.json"
-  else
-    echo "⚠️ GDrive 无 settings 备份，跳过恢复"
-  fi
-fi
-
-# ── 每 60 秒：一致性快照 + 覆盖上传到 Google Drive ──
-(while true; do
-  sleep 60
-  if [ -f /root/.omniroute/storage.sqlite ]; then
-    if sqlite3 /root/.omniroute/storage.sqlite ".backup '/data/omni_storage.sqlite'" 2>/dev/null; then
-      if [ -n "${RCLONE_CONF:-}" ]; then
-        rclone copyto /data/omni_storage.sqlite "$GD_REMOTE/omni_storage.sqlite" 2>/dev/null \
-          && echo "💾 [backup] storage.sqlite → GDrive(覆盖)" \
-          || echo "⚠️ [backup] GDrive 上传失败"
-      fi
-    fi
-  fi
-  if [ -f /root/.omniroute/settings.json ]; then
-    cp /root/.omniroute/settings.json /data/omni_settings.json
-    if [ -n "${RCLONE_CONF:-}" ]; then
-      rclone copyto /data/omni_settings.json "$GD_REMOTE/omni_settings.json" 2>/dev/null \
-        && echo "💾 [backup] settings.json → GDrive(覆盖)"
-    fi
-  fi
-done) &
-
-# ── 启动下载+代理服务（7860）──
-node /app/download_server.js &
-
-# ── 前台启动 omniroute（内部 8860）──
-exec env PORT=8860 omniroute
-EOF
-RUN chmod +x /app/entrypoint.sh
-
-CMD ["/app/entrypoint.sh"]