dsh-qq-stack 0.1.3 → 0.1.7

package/client.js

@@ -48,7 +48,10 @@ 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}
+.fs-bar{height:6px;border-radius:3px;background:rgba(127,127,127,.2);overflow:hidden;margin:8px 0 6px}
+.fs-bar-in{height:100%;background:#12b7f5;border-radius:3px;transition:width .4s}`
 
     function Panel() {
       const [st, setSt] = react.useState(null)
@@ -78,11 +81,20 @@ 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 ? `正在安装 ${st.installLabel || 'QQ 运行环境'}…` : '运行环境未就绪'),
+          (st.installPct >= 0) ? h('div', { className: 'fs-bar' },
+            h('div', { className: 'fs-bar-in', style: { width: `${Math.max(2, Math.min(100, st.installPct))}%` } }),
+          ) : null,
+          h('div', { className: 'fs-hint' },
+            st.installPct >= 0 ? `${st.installPct}%` : (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, mkdirSync } 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'
@@ -154,7 +154,10 @@ function applyInner(ctx, pluginConfig = {}) {
     if (!existsSync(installer)) { log('[qq-stack] 找不到 install.sh'); return }
     log('[qq-stack] 首次安装开始（LinuxQQ + NapCat，约 250MB）')
     try {
-      const child = spawnSafe('bash', [installer], { cwd: cfg.root, detached: true, stdio: 'ignore', env })
+      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}`) }
   }
 
@@ -223,6 +226,24 @@ 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 = ''
+          let installLabel = ''
+          let installPct = -1
+          try {
+            const raw = readFileSync(`${cfg.root}/logs/install.log`, 'utf8')
+            const lines = raw.split(/[\r\n]+/).map((x) => x.trim()).filter(Boolean)
+            const prog = [...lines].reverse().find((l) => l.startsWith('[progress]'))
+            if (prog) {
+              const m = prog.match(/\[progress\]\s+(.*?)\s+(\d+)%/)
+              if (m) { installLabel = m[1]; installPct = Number(m[2]) }
+              installTail = prog.slice(11).trim()
+            } else {
+              installTail = lines.slice(-1).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 || ''
@@ -245,7 +266,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, installLabel, installPct, port: envFile.DSH_QQ_WS_PORT || '3001', token: envFile.DSH_QQ_TOKEN || '', qrAt })
         }
         if (req.method === 'GET' && p === '/qr.png') {
           let detectedUin = ''

package/install.sh

@@ -19,6 +19,42 @@ DSH_QQ_TOKEN=$TOKEN
 EOF
 fi
 
+speed_of() {
+  curl -sL -r 0-262144 -o /dev/null --connect-timeout 6 --max-time 8 -w '%{speed_download}' "$1" 2>/dev/null || echo 0
+}
+
+pick_mirror() {
+  local best="" bestv=0 u v
+  echo "[progress] 测速中 0%" >&2
+  for u in $NAPCAT_MIRRORS; do
+    v=$(speed_of "$u")
+    case "$v" in ''|*[!0-9.]*) v=0 ;; esac
+    if awk -v a="$v" -v b="$bestv" 'BEGIN{exit !(a>b)}'; then best="$u"; bestv="$v"; fi
+  done
+  echo "[progress] 选源 $(( ${bestv%.*} / 1024 ))KB/s" >&2
+  echo "$best"
+}
+
+dl() {
+  local url="$1" out="$2" label="$3" total cur pid
+  echo "[progress] $label 0%"
+  total=$(curl -sIL --connect-timeout 8 --max-time 15 "$url" 2>/dev/null | awk 'tolower($1)=="content-length:"{print $2}' | tail -1)
+  curl -fL --retry 3 --connect-timeout 15 -o "$out" "$url" >/dev/null 2>&1 &
+  pid=$!
+  while kill -0 "$pid" 2>/dev/null; do
+    cur=$(stat -c %s "$out" 2>/dev/null || echo 0)
+    if [ -n "${total:-}" ] && [ "$total" -gt 0 ] 2>/dev/null; then
+      echo "[progress] $label $(( cur * 100 / total ))% ($(( cur / 1048576 ))/$(( total / 1048576 ))MB)"
+    else
+      echo "[progress] $label $(( cur / 1048576 ))MB"
+    fi
+    sleep 2
+  done
+  wait "$pid" || return 1
+  echo "[progress] $label 100%"
+  return 0
+}
+
 say() { echo "[install $(date +%H:%M:%S)] $*"; }
 
 ARCH="$(dpkg --print-architecture 2>/dev/null || uname -m)"
@@ -30,20 +66,18 @@ esac
 QQ_VER="3.2.34-53644"
 QQ_DEB_URL="https://qqdl.gtimg.cn/qqfile/QQNT/9.9.36/beta/9ee04bef/linuxqq_${QQ_VER}_${QQ_ARCH}.deb"
 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"
-done
-if [ -n "$missing" ]; then
-  say "安装依赖：$missing"
-  export DEBIAN_FRONTEND=noninteractive
-  apt-get update -qq && apt-get install -y $missing || { say "依赖安装失败"; exit 1; }
-fi
+NAPCAT_MIRRORS="
+https://github.com/NapNeko/NapCatQQ/releases/latest/download/NapCat.Shell.zip
+https://gh-proxy.com/$NAPCAT_ZIP
+https://ghfast.top/$NAPCAT_ZIP
+https://ghproxy.net/$NAPCAT_ZIP
+https://gh-proxy.org/$NAPCAT_ZIP
+https://hub.gitmirror.com/$NAPCAT_ZIP
+"
 
 if [ ! -x "$ROOT/opt/opt/QQ/qq" ]; then
   say "下载 LinuxQQ ${QQ_ARCH}（约 200MB）"
-  curl -fL --retry 3 -o /tmp/QQ.deb "$QQ_DEB_URL" || { say "LinuxQQ 下载失败"; exit 1; }
+  dl "$QQ_DEB_URL" /tmp/QQ.deb "LinuxQQ" || { say "LinuxQQ 下载失败"; exit 1; }
   dpkg -x /tmp/QQ.deb "$ROOT/opt" || { say "解包失败"; exit 1; }
   rm -f /tmp/QQ.deb
 else
@@ -52,14 +86,42 @@ 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
     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; }
+  MIRROR=$(pick_mirror)
+  if [ -n "$MIRROR" ]; then
+    say "使用镜像：$MIRROR"
+    dl "$MIRROR" /tmp/NapCat.Shell.zip "NapCat" || { say "NapCat 下载失败"; exit 1; }
+  else
+    say "所有源都不可用"
+    exit 1
+  fi
   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; }
@@ -160,4 +222,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.3",
+  "version": "0.1.7",
   "type": "module",
   "main": "./index.js",
   "description": "DeepSeek Harness 的 QQ 协议端底座：LinuxQQ + NapCat 随引擎自启，扫码一次后自动快登。",