dsh-qq-stack 0.1.0 → 0.1.2

package/README.md

@@ -54,3 +54,13 @@ dsh plugin --profile web add dsh-qq-stack
 ## 许可
 
 MIT
+
+## 卸载
+
+插件卸载后，后台会有一个清理器（20 秒内）自动停掉 QQ、删掉 `~/.dsh/qq-bot`（含 700MB+ 的客户端和登录数据）。
+
+如果想立刻清，也可以在卸载前手动执行：
+
+```bash
+bash ~/.dsh/qq-bot/stop-qq.sh && rm -rf ~/.dsh/qq-bot
+```

package/index.js

@@ -74,8 +74,8 @@ function resolveConfig(config = {}) {
 }
 
 let probeCache = { at: 0, loggedIn: false, nickname: '', uin: '' }
-async function probeLogin(port, token) {
-  if (Date.now() - probeCache.at < 15000) return probeCache
+async function probeLogin(port, token, force) {
+  if (!force && Date.now() - probeCache.at < 15000) return probeCache
   const result = await new Promise((resolve) => {
     let done = false
     const finish = (v) => { if (!done) { done = true; resolve(v) } }
@@ -149,6 +149,41 @@ function applyInner(ctx, pluginConfig = {}) {
     } catch (e) { log(`[qq-stack] 安装启动失败：${e?.message ?? e}`) }
   }
 
+  ctx.effect(() => {
+    try {
+      const watchPid = `${cfg.root}/watch.pid`
+      let pid = 0
+      try { pid = Number(readFileSync(watchPid, 'utf8').trim()) || 0 } catch {}
+      if (alive(pid)) return
+      const child = spawn(process.execPath, [`${SELF}watch.mjs`, SELF, cfg.root], { detached: true, stdio: 'ignore' })
+      child.unref()
+      try { writeFileSync(watchPid, String(child.pid)) } catch {}
+    } catch (e) { log(`[qq-stack] 卸载清理器启动失败：${e?.message ?? e}`) }
+  }, 'dsh-qq-stack: uninstall-watch')
+
+  ctx.effect(() => {
+    const timer = setInterval(async () => {
+      try {
+        const envFile = readEnvFile(cfg.root)
+        const port = Number(envFile.DSH_QQ_WS_PORT || cfg.wsPort || 3001)
+        const token = envFile.DSH_QQ_TOKEN || cfg.token
+        const login = await probeLogin(port, token, true)
+        if (login.loggedIn && login.uin && envFile.DSH_QQ_UIN !== login.uin) {
+          const next = { ...envFile, DSH_QQ_UIN: login.uin }
+          writeFileSync(`${cfg.root}/config.env`, Object.entries(next).map(([k, x]) => `${k}=${x}`).join('\n') + '\n')
+          log(`[qq-stack] 记住快登号 ${login.uin}`)
+        }
+        const healed = ensureOnebot(cfg.root, port, token)
+        if (healed && Date.now() - lastHealAt > 90000) {
+          lastHealAt = Date.now()
+          log('[qq-stack] 补齐 OneBot 配置，重启 QQ')
+          try { spawn('bash', ['-c', 'bash stop-qq.sh; bash start-qq.sh'], { cwd: cfg.root, detached: true, stdio: 'ignore' }).unref() } catch {}
+        }
+      } catch (e) { log(`[qq-stack] 巡检失败：${e?.message ?? e}`) }
+    }, 60000)
+    return () => clearInterval(timer)
+  }, 'dsh-qq-stack: config-check')
+
   ctx.effect(() => {
     const t = setTimeout(() => { try { ensureInstalled() } catch (e) { log(`[qq-stack] ${e?.message ?? e}`) } }, 8000)
     return () => clearTimeout(t)
@@ -195,7 +230,8 @@ function applyInner(ctx, pluginConfig = {}) {
             lastHealAt = Date.now()
             try { spawn('bash', ['-c', `bash stop-qq.sh; bash start-qq.sh`], { cwd: cfg.root, detached: true, stdio: 'ignore' }).unref() } catch {}
           }
-          if (login.loggedIn && login.uin && envFile.DSH_QQ_UIN !== login.uin) {
+          const probeFresh = Date.now() - (probeCache.at || 0) < 6000
+          if (login.loggedIn && login.uin && probeFresh && envFile.DSH_QQ_UIN !== login.uin) {
             try {
               const e2 = { ...envFile, DSH_QQ_UIN: login.uin }
               writeFileSync(`${cfg.root}/config.env`, Object.entries(e2).map(([k, x]) => `${k}=${x}`).join('\n') + '\n')

package/install.sh

@@ -54,7 +54,13 @@ QQ_APP="$ROOT/opt/opt/QQ/resources/app"
 
 if [ ! -f "$QQ_APP/app_launcher/napcat/napcat.mjs" ]; then
   say "下载 NapCat"
-  curl -fL --retry 3 -o /tmp/NapCat.Shell.zip "$NAPCAT_ZIP" || { say "NapCat 下载失败"; exit 1; }
+  if [ -f /tmp/NapCat.Shell.zip ] && unzip -t /tmp/NapCat.Shell.zip >/dev/null 2>&1; then
+    say "复用已下载的 NapCat 包"
+  else
+  curl -fL --retry 2 -o /tmp/NapCat.Shell.zip "$NAPCAT_ZIP" \
+    || curl -fL --retry 2 -o /tmp/NapCat.Shell.zip "https://gh-proxy.com/$NAPCAT_ZIP" \
+    || { say "NapCat 下载失败"; exit 1; }
+  fi
   rm -rf /tmp/napcat-unzip && mkdir -p /tmp/napcat-unzip
   unzip -q -o /tmp/NapCat.Shell.zip -d /tmp/napcat-unzip || { say "NapCat 解压失败"; exit 1; }
   mkdir -p "$QQ_APP/app_launcher"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-qq-stack",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "type": "module",
   "main": "./index.js",
   "description": "DeepSeek Harness 的 QQ 协议端底座：LinuxQQ + NapCat 随引擎自启，扫码一次后自动快登。",
@@ -22,7 +22,8 @@
     "install.sh",
     "cordis.patch.yml",
     "README.md",
-    "LICENSE"
+    "LICENSE",
+    "watch.mjs"
   ],
   "exports": {
     ".": "./index.js",

package/watch.mjs

@@ -0,0 +1,22 @@
+import { existsSync, readFileSync } from 'node:fs'
+import { spawnSync, spawn } from 'node:child_process'
+
+const [pkgDir, root] = process.argv.slice(2)
+if (!pkgDir || !root) process.exit(0)
+
+const alive = (pid) => {
+  try { process.kill(Number(pid), 0); return true } catch { return false }
+}
+
+function cleanup() {
+  try { spawnSync('bash', [`${root}/stop-qq.sh`], { timeout: 30000 }) } catch {}
+  try { spawnSync('bash', ['-c', `rm -rf "${root}"`], { timeout: 120000 }) } catch {}
+  try {
+    const pids = spawnSync('bash', ['-c', "ps -eo pid=,comm= | awk '$2==\"Xvfb\"{print $1}'"], { encoding: 'utf8' }).stdout
+    for (const p of String(pids).split(/\s+/).filter(Boolean)) { try { process.kill(Number(p), 'SIGKILL') } catch {} }
+  } catch {}
+}
+
+setInterval(() => {
+  if (!existsSync(`${pkgDir}/package.json`)) { cleanup(); process.exit(0) }
+}, 20000)