dsh-model 0.18.1 → 0.19.0

package/plugin/index.js

@@ -9,7 +9,8 @@
 
 import { spawn } from 'node:child_process'
 import { randomBytes } from 'node:crypto'
-import { access, readFile } from 'node:fs/promises'
+import { readFileSync } from 'node:fs'
+import { access, readFile, writeFile } from 'node:fs/promises'
 import { homedir } from 'node:os'
 import { join } from 'node:path'
 import { fileURLToPath } from 'node:url'
@@ -17,6 +18,30 @@ import { fileURLToPath } from 'node:url'
 /** 本包根目录：插件就是完整的 dsh-model 包，自带命令行 */
 const PKG_ROOT = fileURLToPath(new URL('..', import.meta.url))
 const VPS_ROOT = '/opt/dsh-vps'
+const ADMIN_PATH_UNIT = '/etc/systemd/system/dsh-model-admin.path'
+
+/** 这份代码加载时的版本：插件装了新版但 dsh 没重启时，它和磁盘上的版本不一样 */
+const RUNNING_VERSION = (() => {
+  try {
+    return JSON.parse(readFileSync(join(PKG_ROOT, 'package.json'), 'utf8')).version
+  } catch {
+    return ''
+  }
+})()
+
+async function installedVersion() {
+  try {
+    return JSON.parse(await readFile(join(PKG_ROOT, 'package.json'), 'utf8')).version
+  } catch {
+    return RUNNING_VERSION
+  }
+}
+
+/** 页面能不能直接重启 dsh：只在 dsh-vps 上（交给 root 的 dsh-model-admin 执行 systemctl restart dsh-gate）；其他环境提示手动重启 */
+async function restartMode() {
+  if ((await exists(VPS_ROOT)) && (await exists(ADMIN_PATH_UNIT))) return 'vps'
+  return process.versions.electron ? 'desktop' : 'manual'
+}
 
 export const name = 'dsh-model'
 export const inject = []
@@ -36,11 +61,14 @@ const ALLOWED = [
   ['POST', /^\/keys\/[A-Za-z0-9._-]{1,40}\/reveal$/],
   ['GET', /^\/endpoints$/],
   ['GET', /^\/self$/],
+  ['GET', /^\/failures$/],
+  ['POST', /^\/models\/test$/],
   ['POST', /^\/self\/(update|uninstall)$/],
   ['GET', /^\/sources\/[a-z-]{2,20}\/models$/],
   ['POST', /^\/sources\/[a-z-]{2,20}\/models$/],
   ['POST', /^\/sources\/[a-z-]{2,20}\/(enable|disable|logout)$/],
   ['POST', /^\/opencode\/key$/],
+  ['POST', /^\/apikey\/[a-z-]{2,20}$/],
   ['GET', /^\/login\/[A-Za-z0-9._-]{1,120}$/],
   ['POST', /^\/login\/[A-Za-z0-9._-]{1,120}\/callback$/],
   ['DELETE', /^\/login\/[A-Za-z0-9._-]{1,120}$/],
@@ -98,25 +126,26 @@ function check(req, token, needToken = true) {
 const exists = (p) => access(p).then(() => true, () => false)
 
 /** 从页面一键执行 setup / repair（只在本机模式：VPS 上要 root，页面只给命令）。同一时间只跑一个 */
-let running = null
-function runCli(args) {
-  if (running) return running
-  running = new Promise((resolve) => {
-    let out = ''
-    const child = spawn(process.execPath, [join(PKG_ROOT, 'bin/dsh-model.js'), ...args], {
-      windowsHide: true,
-      // dsh 桌面版可能跑在 Electron 里：让它当普通 Node 用
-      env: { ...process.env, ELECTRON_RUN_AS_NODE: '1', NO_COLOR: '1', FORCE_COLOR: '0' },
-      stdio: ['ignore', 'pipe', 'pipe'],
-    })
-    const add = (b) => { out = (out + b.toString()).slice(-20000) }
-    child.stdout.on('data', add)
-    child.stderr.on('data', add)
-    const timer = setTimeout(() => child.kill('SIGTERM'), 10 * 60 * 1000)
-    child.on('error', (e) => { clearTimeout(timer); resolve({ code: -1, output: `${out}\n${e.message}` }) })
-    child.on('exit', (code) => { clearTimeout(timer); resolve({ code: code ?? -1, output: out.replace(/\x1b\[[0-9;]*m/g, '') }) })
-  }).finally(() => { running = null })
-  return running
+/** 一键安装 / 修复的进度：页面每秒来取一次新输出 */
+let job = null
+function startCli(action, args) {
+  if (job && job.running) return job
+  job = { action, running: true, output: '', code: null, startedAt: Date.now() }
+  const current = job
+  const child = spawn(process.execPath, [join(PKG_ROOT, 'bin/dsh-model.js'), ...args], {
+    windowsHide: true,
+    // dsh 桌面版可能跑在 Electron 里：让它当普通 Node 用
+    env: { ...process.env, ELECTRON_RUN_AS_NODE: '1', NO_COLOR: '1', FORCE_COLOR: '0' },
+    stdio: ['ignore', 'pipe', 'pipe'],
+  })
+  const add = (b) => { current.output = (current.output + b.toString().replace(/\x1b\[[0-9;]*m/g, '')).slice(-20000) }
+  child.stdout.on('data', add)
+  child.stderr.on('data', add)
+  const timer = setTimeout(() => child.kill('SIGTERM'), 10 * 60 * 1000)
+  const done = (code) => { clearTimeout(timer); current.running = false; current.code = code }
+  child.on('error', (e) => { add(`\n${e.message}`); done(-1) })
+  child.on('exit', (code) => done(code ?? -1))
+  return job
 }
 
 export function apply(ctx) {
@@ -168,6 +197,30 @@ export function apply(ctx) {
       }),
     )
 
+    // 插件版本与重启：装了新版但 dsh 还在跑旧代码时，页面提示（VPS 上可一键重启）
+    track(
+      ws.register({
+        kind: 'exact',
+        path: '/api-dsh-model/host',
+        handler: async (req, res) => {
+          const bad = check(req, token)
+          if (bad) return json(res, bad.code, { error: { code: 'refused', message: bad.error } })
+          let body
+          try {
+            body = JSON.parse((await readBody(req)) || '{}')
+          } catch {
+            return json(res, 400, { error: { code: 'invalid_json', message: 'invalid JSON' } })
+          }
+          const mode = await restartMode()
+          if (body.action !== 'restart') return json(res, 200, { running: RUNNING_VERSION, installed: await installedVersion(), restart: mode })
+          if (mode !== 'vps') return json(res, 409, { error: { code: 'restart_unsupported', message: 'restart dsh manually' } })
+          // 写给 root 的 dsh-model-admin：它只认几件固定的事，这里是 restart-dsh
+          await writeFile(join(home(), 'admin', 'request'), JSON.stringify({ action: 'restart-dsh' }), { mode: 0o600 })
+          return json(res, 200, { restarting: true })
+        },
+      }),
+    )
+
     // 页面上的「一键安装 / 修复」
     track(
       ws.register({
@@ -183,10 +236,12 @@ export function apply(ctx) {
             return json(res, 400, { error: { code: 'invalid_json', message: 'invalid JSON' } })
           }
           if (await exists(VPS_ROOT)) return json(res, 200, { vps: true })
+          // { poll: true }：只取进度；否则开始（已经在跑就接着看同一个）
+          if (body.poll) return json(res, 200, job ? { running: job.running, output: job.output, code: job.code, action: job.action } : { running: false, output: '', code: null })
           const action = body.action === 'repair' ? 'repair' : 'setup'
           const lang = body.lang === 'en' ? 'en' : 'zh'
-          const r = await runCli(action === 'repair' ? ['repair', '--lang', lang] : ['setup', '--skip-dsh-plugin', '--lang', lang])
-          return json(res, 200, r)
+          const j = startCli(action, action === 'repair' ? ['repair', '--lang', lang] : ['setup', '--skip-dsh-plugin', '--lang', lang])
+          return json(res, 200, { running: j.running, output: j.output, code: j.code, action: j.action })
         },
       }),
     )