dsh-qq-stack 0.1.2 → 0.1.4

package/client.js

@@ -48,7 +48,8 @@ window.__ModuleLoader__.load({
 .fs-login{display:flex;flex-direction:column;gap:10px}
 .fs-field{width:100%;box-sizing:border-box;border:0;border-bottom:1px solid rgba(127,127,127,.28);background:transparent;color:inherit;padding:10px 2px;font-size:15px;outline:none}
 .fs-wide{padding:11px}
-.fs-sep{text-align:center;font-size:12px;opacity:.5;margin-top:6px}`
+.fs-sep{text-align:center;font-size:12px;opacity:.5;margin-top:6px}
+.fs-install{font-size:14px;font-weight:600;margin-bottom:6px}`
 
     function Panel() {
       const [st, setSt] = react.useState(null)
@@ -78,11 +79,15 @@ window.__ModuleLoader__.load({
           row('OneBot 端口', !!st?.qq, st?.qq ? '已监听' : '未监听'),
           row('登录状态', logged, logged ? `已登录 ${st?.nickname || ''} ${st?.uin || ''}` : '未登录'),
         ),
-        !logged ? h('div', { className: 'fs-card fs-center' },
+        (st?.installed !== false && !st?.installing && !logged) ? h('div', { className: 'fs-card fs-center' },
           st?.qrAt
             ? h('img', { className: 'fs-qr', src: qrUrl, alt: '登录二维码' })
             : h('div', { className: 'fs-hint' }, '正在生成二维码…'),
         ) : null,
+        (st && (!st.installed || st.installing)) ? h('div', { className: 'fs-card' },
+          h('div', { className: 'fs-install' }, st.installing ? '正在安装 QQ 运行环境…' : '运行环境未就绪'),
+          h('div', { className: 'fs-hint' }, st.installTail || '首次安装约 250MB，请稍候'),
+        ) : null,
         logged ? h('div', { className: 'fs-card fs-account' },
           h('img', {
             className: 'fs-avatar',

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, openSync } 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,8 +154,10 @@ 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()
+      mkdirSync(`${cfg.root}/logs`, { recursive: true })
+      const fd = openSync(`${cfg.root}/logs/install.log`, 'a')
+      const child = spawnSafe('bash', [installer], { cwd: cfg.root, detached: true, stdio: ['ignore', fd, fd], env })
+      if (child?.pid) { try { writeFileSync(`${cfg.root}/install.pid`, String(child.pid)) } catch {} }
     } catch (e) { log(`[qq-stack] 安装启动失败：${e?.message ?? e}`) }
   }
 
@@ -155,8 +167,7 @@ function applyInner(ctx, pluginConfig = {}) {
       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()
+      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')
@@ -177,7 +188,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)
@@ -215,6 +226,15 @@ function applyInner(ctx, pluginConfig = {}) {
             const pidM = statSync(`${cfg.root}/qq.pid`).mtimeMs
             if (qrM >= pidM) qrAt = Math.floor(qrM)
           } catch {}
+          let installing = false
+          try { installing = alive(Number(readFileSync(`${cfg.root}/install.pid`, 'utf8').trim())) } catch {}
+          let installed = existsSync(`${cfg.root}/opt/opt/QQ/qq`)
+          let installTail = ''
+          try {
+            const raw = readFileSync(`${cfg.root}/logs/install.log`, 'utf8')
+            const lines = raw.split(/[\r\n]+/).map((x) => x.trim()).filter(Boolean)
+            installTail = lines.slice(-2).join(' ').slice(-160)
+          } catch {}
           const login = qq ? await probeLogin(Number(envFile.DSH_QQ_WS_PORT || cfg.wsPort || 3001), envFile.DSH_QQ_TOKEN || cfg.token) : { loggedIn: false, nickname: '' }
           if (login.loggedIn) {
             const qqUin = detectedUin || envFile.DSH_QQ_UIN || ''
@@ -228,7 +248,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) {
@@ -237,7 +257,7 @@ function applyInner(ctx, pluginConfig = {}) {
               writeFileSync(`${cfg.root}/config.env`, Object.entries(e2).map(([k, x]) => `${k}=${x}`).join('\n') + '\n')
             } catch {}
           }
-          return json({ ok: true, qq, loggedIn: !!login.loggedIn, nickname: login.nickname, uin: login.loggedIn ? login.uin : (envFile.DSH_QQ_UIN || detectedUin), port: envFile.DSH_QQ_WS_PORT || '3001', token: envFile.DSH_QQ_TOKEN || '', qrAt })
+          return json({ ok: true, qq, loggedIn: !!login.loggedIn, nickname: login.nickname, uin: login.loggedIn ? login.uin : (envFile.DSH_QQ_UIN || detectedUin), installed, installing, installTail, port: envFile.DSH_QQ_WS_PORT || '3001', token: envFile.DSH_QQ_TOKEN || '', qrAt })
         }
         if (req.method === 'GET' && p === '/qr.png') {
           let detectedUin = ''
@@ -283,11 +303,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/install.sh

@@ -32,9 +32,20 @@ QQ_DEB_URL="https://qqdl.gtimg.cn/qqfile/QQNT/9.9.36/beta/9ee04bef/linuxqq_${QQ_
 NAPCAT_ZIP="https://github.com/NapNeko/NapCatQQ/releases/latest/download/NapCat.Shell.zip"
 
 missing=""
-for p in xvfb libnss3 libgbm1 libasound2t64 libgtk-3-0 dbus-x11 unzip curl; do
-  dpkg -s "$p" >/dev/null 2>&1 || missing="$missing $p"
+for p in xvfb libnss3 libgbm1 libasound2t64 libasound2 libgtk-3-0 libgtk-3-0t64 dbus-x11 unzip curl; do
+  dpkg -s "$p" >/dev/null 2>&1 || continue
+  case "$p" in
+    libasound2) miss="$miss libasound2" ;;
+    libasound2t64) [ -n "${miss##*libasound2 }" ] && miss="$miss libasound2t64" ;;
+    libgtk-3-0) miss="$miss libgtk-3-0" ;;
+    libgtk-3-0t64) miss="$miss libgtk-3-0t64" ;;
+    *) miss="$miss $p" ;;
+  esac
 done
+# 成对包只留一个（t64 与旧名并存，供不同发行版）
+case " $miss " in *" libasound2 "*) miss=$(echo "$miss" | sed 's/ libasound2t64 / /g') ;; *) miss=$(echo "$miss" | sed 's/ libasound2 / /g') ;; esac
+case " $miss " in *" libgtk-3-0t64 "*) miss=$(echo "$miss" | sed 's/ libgtk-3-0 / /g') ;; *) miss=$(echo "$miss" | sed 's/ libgtk-3-0t64 / /g') ;; esac
+missing="$miss"
 if [ -n "$missing" ]; then
   say "安装依赖：$missing"
   export DEBIAN_FRONTEND=noninteractive
@@ -52,6 +63,29 @@ fi
 
 QQ_APP="$ROOT/opt/opt/QQ/resources/app"
 
+ensure_deps() {
+  need=0
+  command -v xvfb-run >/dev/null 2>&1 || need=1
+  command -v dbus-run-session >/dev/null 2>&1 || need=1
+  if [ -x "$ROOT/opt/opt/QQ/qq" ] && ldd "$ROOT/opt/opt/QQ/qq" 2>/dev/null | grep -q "not found"; then
+    need=1
+  fi
+  [ "$need" = 0 ] && return 0
+  say "补齐运行依赖"
+  export DEBIAN_FRONTEND=noninteractive
+  apt-get update -qq || true
+  pkgs=""
+  for p in xvfb dbus-x11 libnss3 libgbm1 libasound2t64 libasound2 libgtk-3-0t64 libgtk-3-0 \
+           libxss1 libxtst6 libdrm2 libxkbcommon0 libcups2 libpango-1.0-0 libcairo2 \
+           libatk1.0-0 libatk-bridge2.0-0 libxdamage1 libxrandr2 libatspi2.0-0 libnspr4 \
+           libxcomposite1 libxfixes3 libxrender1; do
+    apt-cache show "$p" >/dev/null 2>&1 && pkgs="$pkgs $p"
+  done
+  apt-get install -y $pkgs || { say "依赖安装失败"; exit 1; }
+}
+
+ensure_deps
+
 if [ ! -f "$QQ_APP/app_launcher/napcat/napcat.mjs" ]; then
   say "下载 NapCat"
   if [ -f /tmp/NapCat.Shell.zip ] && unzip -t /tmp/NapCat.Shell.zip >/dev/null 2>&1; then
@@ -160,4 +194,3 @@ fi
 chmod +x "$ROOT"/*.sh
 say "安装完成，启动 QQ"
 bash "$ROOT/start-qq.sh"
-say "完成（首次需要扫码，之后启动会走 ${UIN:-未设置账号} 的快速登录）"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-qq-stack",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "type": "module",
   "main": "./index.js",
   "description": "DeepSeek Harness 的 QQ 协议端底座：LinuxQQ + NapCat 随引擎自启，扫码一次后自动快登。",