dsh-qq-stack 0.1.1 → 0.1.3

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

@@ -1,5 +1,5 @@
 import { spawn } from 'node:child_process'
-import { existsSync, readFileSync, writeFileSync, statSync, readdirSync, unlinkSync } from 'node:fs'
+import { existsSync, readFileSync, writeFileSync, statSync, readdirSync, unlinkSync, mkdirSync } from 'node:fs'
 import { readFileSync as rf } from 'node:fs'
 
 export const name = 'dsh-qq-stack'
@@ -102,6 +102,16 @@ async function probeLogin(port, token, force) {
   return probeCache
 }
 
+
+function spawnSafe(cmd, args, opts) {
+  try {
+    const child = spawn(cmd, args, opts)
+    child.on('error', () => {})
+    child.unref()
+    return child
+  } catch { return null }
+}
+
 function alive(pid) {
   if (!pid) return false
   try { process.kill(pid, 0); return true } catch { return false }
@@ -113,6 +123,7 @@ export function apply(ctx, pluginConfig = {}) {
 
 function applyInner(ctx, pluginConfig = {}) {
   const cfg = resolveConfig(pluginConfig)
+  try { mkdirSync(cfg.root, { recursive: true }) } catch {}
   const log = (msg) => { try { ctx.logger?.info?.(msg); if (process.env.DSH_QQ_DEBUG) console.log(msg) } catch {} }
   log(`[qq-stack] 激活 root=${cfg.root} uin=${cfg.uin || '(空)'} autoInstall=${cfg.autoInstall}`)
 
@@ -131,8 +142,7 @@ function applyInner(ctx, pluginConfig = {}) {
       if (alive(pid)) return
       const script = `${cfg.root}/start-qq.sh`
       if (!existsSync(script)) return
-      const child = spawn('bash', [script], { cwd: cfg.root, detached: true, stdio: 'ignore', env })
-      child.unref()
+      const child = spawnSafe('bash', [script], { cwd: cfg.root, detached: true, stdio: 'ignore', env })
       log('[qq-stack] 拉起 QQ')
     } catch (e) { log(`[qq-stack] 启动失败：${e?.message ?? e}`) }
   }
@@ -144,11 +154,21 @@ function applyInner(ctx, pluginConfig = {}) {
     if (!existsSync(installer)) { log('[qq-stack] 找不到 install.sh'); return }
     log('[qq-stack] 首次安装开始（LinuxQQ + NapCat，约 250MB）')
     try {
-      const child = spawn('bash', [installer], { cwd: cfg.root, detached: true, stdio: 'ignore', env })
-      child.unref()
+      const child = spawnSafe('bash', [installer], { cwd: cfg.root, detached: true, stdio: 'ignore', env })
     } 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 = spawnSafe(process.execPath, [`${SELF}watch.mjs`, SELF, cfg.root], { detached: true, stdio: 'ignore' })
+      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 {
@@ -165,7 +185,7 @@ function applyInner(ctx, pluginConfig = {}) {
         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 {}
+          spawnSafe('bash', ['-c', 'bash stop-qq.sh; bash start-qq.sh'], { cwd: cfg.root, detached: true, stdio: 'ignore' })
         }
       } catch (e) { log(`[qq-stack] 巡检失败：${e?.message ?? e}`) }
     }, 60000)
@@ -216,7 +236,7 @@ function applyInner(ctx, pluginConfig = {}) {
           const healed = ensureOnebot(cfg.root, portNum, tokenVal)
           if (healed && !login.loggedIn && Date.now() - lastHealAt > 90000) {
             lastHealAt = Date.now()
-            try { spawn('bash', ['-c', `bash stop-qq.sh; bash start-qq.sh`], { cwd: cfg.root, detached: true, stdio: 'ignore' }).unref() } catch {}
+            spawnSafe('bash', ['-c', 'bash stop-qq.sh; bash start-qq.sh'], { cwd: cfg.root, detached: true, stdio: 'ignore' })
           }
           const probeFresh = Date.now() - (probeCache.at || 0) < 6000
           if (login.loggedIn && login.uin && probeFresh && envFile.DSH_QQ_UIN !== login.uin) {
@@ -271,11 +291,11 @@ function applyInner(ctx, pluginConfig = {}) {
             if (existsSync(auth)) unlinkSync(auth)
           } catch {}
           probeCache = { at: 0, loggedIn: false, nickname: '', uin: '' }
-          try { spawn('bash', ['-c', 'bash stop-qq.sh; bash start-qq.sh'], { cwd: cfg.root, detached: true, stdio: 'ignore' }).unref() } catch {}
+          spawnSafe('bash', ['-c', 'bash stop-qq.sh; bash start-qq.sh'], { cwd: cfg.root, detached: true, stdio: 'ignore' })
           return json({ ok: true })
         }
         if (req.method === 'POST' && p === '/restart') {
-          try { spawn('bash', ['-c', 'bash stop-qq.sh; bash start-qq.sh'], { cwd: cfg.root, detached: true, stdio: 'ignore' }).unref() } catch {}
+          spawnSafe('bash', ['-c', 'bash stop-qq.sh; bash start-qq.sh'], { cwd: cfg.root, detached: true, stdio: 'ignore' })
           return json({ ok: true })
         }
         json({ ok: false }, 404)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-qq-stack",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "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",
@@ -44,4 +45,4 @@
   "scripts": {
     "test": "node --input-type=module -e \"await import('./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)