dsh-bili-scroll 0.1.5 → 0.1.6

package/lib/login.mjs

@@ -1,103 +1,103 @@
-/**
- * lib/login.mjs —— 扫码登录（直接在 JS 里走 B站 passport 接口）
- * ============================================================================
- * 为什么不用它自带的 `bili_login`：那个把码存成 PNG 就返回，**字段全是空**（踩过一次，见 lesson）。
- * 我们按实测跑通的那条来：
- *   ① GET  /x/passport-login/web/qrcode/generate?source=main-fe-header  → data.url + data.qrcode_key
- *   ② 手机扫 → 轮询 /x/passport-login/web/qrcode/poll?qrcode_key=…
- *      data.code：86101 未扫 / 86090 已扫待确认 / 0 成功 / 86038 过期
- *   ③ ⭐ **凭证在轮询响应的 `Set-Cookie` 头里**（成功时那条 `data.url` 里没有 SESSDATA，
- *      那是别的域的游戏票 —— 别在 url 里找）
- *   ④ 写成 MCP 认识的四个字段：sessdata / bili_jct / buvid3 / dedeuserid
- *
- * 二维码图片：交给 venv 里的 Python `qrcode` 画（ASCII 的 URL，走 `-c` 安全；
- * 没装就退回"只给 URL"，前端会提示先跑「建 venv 装依赖」）。
- * ============================================================================
- */
-import { spawn } from 'node:child_process'
-import { existsSync, mkdirSync, writeFileSync } from 'node:fs'
-import { join } from 'node:path'
-
-const UA = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0 Safari/537.36'
-const GEN = 'https://passport.bilibili.com/x/passport-login/web/qrcode/generate?source=main-fe-header'
-const pollUrl = (key) => 'https://passport.bilibili.com/x/passport-login/web/qrcode/poll?qrcode_key=' + encodeURIComponent(key) + '&source=main-fe-header'
-const SPI = 'https://api.bilibili.com/x/frontend/finger/spi'
-
-/** 从 Set-Cookie 数组里抠出我们要的几个 */
-function pickCookies(list) {
-  const jar = {}
-  const want = { SESSDATA: 'sessdata', bili_jct: 'bili_jct', DedeUserID: 'dedeuserid', buvid3: 'buvid3' }
-  for (const raw of list ?? []) {
-    const first = String(raw).split(';')[0] || ''
-    const i = first.indexOf('=')
-    if (i <= 0) continue
-    const name = first.slice(0, i).trim()
-    const value = first.slice(i + 1).trim()
-    if (want[name]) jar[want[name]] = value
-  }
-  return jar
-}
-
-/** 拿不到 buvid3 时补一张"指纹"（非致命，失败就当空） */
-async function ensureBuvid3(jar) {
-  if (jar.buvid3) return jar
-  try {
-    const r = await fetch(SPI, { headers: { 'User-Agent': UA } })
-    const j = await r.json()
-    const v = j?.data?.b_3
-    if (v) jar.buvid3 = v
-  } catch { /* 拿不到就算了 */ }
-  return jar
-}
-
-export async function loginStart() {
-  const r = await fetch(GEN, { headers: { 'User-Agent': UA } })
-  const j = await r.json()
-  const data = j?.data
-  if (!data?.qrcode_key || !data?.url) throw new Error(`生成二维码失败：${j?.message || '返回里没有 qrcode_key'}`)
-  return { key: data.qrcode_key, url: data.url }
-}
-
-/** 轮询一次。state: waiting / scanned / ok / expired / unknown */
-export async function loginPoll(key) {
-  const res = await fetch(pollUrl(key), { headers: { 'User-Agent': UA }, redirect: 'manual' })
-  const setCookies = typeof res.headers.getSetCookie === 'function' ? res.headers.getSetCookie() : []
-  let body = {}
-  try { body = await res.json() } catch { /* poll 有时返回空体 */ }
-  const code = body?.data?.code
-  if (code === 0) {
-    const jar = await ensureBuvid3(pickCookies(setCookies))
-    if (!jar.sessdata) return { state: 'unknown', code, message: '登录成功了，但响应里没有 SESSDATA —— 把这次的结果记下来再排查' }
-    return { state: 'ok', code, credential: jar }
-  }
-  const map = { 86101: 'waiting', 86090: 'scanned', 86038: 'expired' }
-  return { state: map[code] ?? 'unknown', code, message: body?.message || '' }
-}
-
-/** 把凭证写进 MCP 读的那个文件（家目录里的 bili_credential.json） */
-export function saveCredential(stateDir, credential) {
-  mkdirSync(stateDir, { recursive: true })
-  const file = join(stateDir, 'bili_credential.json')
-  writeFileSync(file, JSON.stringify({
-    sessdata: credential.sessdata ?? '',
-    bili_jct: credential.bili_jct ?? '',
-    buvid3: credential.buvid3 || '',
-    dedeuserid: credential.dedeuserid ?? '',
-  }, null, 2), 'utf8')
-  return file
-}
-
-/** 用 Python 的 qrcode 画一张 PNG，返回 base64（拿不到就返回 null） */
-export function renderQrPng(pythonPath, stateDir, url) {
-  return new Promise((resolve) => {
-    const png = join(stateDir, 'qrcode_login.png')
-    const code = 'import sys, qrcode; qrcode.make(sys.argv[1]).save(sys.argv[2])'
-    let child
-    try {
-      child = spawn(pythonPath || 'python', ['-c', code, url, png], { cwd: stateDir, windowsHide: true })
-    } catch { return resolve(null) }
-    const done = () => { try { resolve(existsSync(png) ? png : null) } catch { resolve(null) } }
-    child.on('exit', (c) => { if (c === 0) done(); else resolve(null) })
-    child.on('error', () => resolve(null))
-  })
-}
+/**
+ * lib/login.mjs —— 扫码登录（直接在 JS 里走 B站 passport 接口）
+ * ============================================================================
+ * 为什么不用它自带的 `bili_login`：那个把码存成 PNG 就返回，**字段全是空**（踩过一次，见 lesson）。
+ * 我们按实测跑通的那条来：
+ *   ① GET  /x/passport-login/web/qrcode/generate?source=main-fe-header  → data.url + data.qrcode_key
+ *   ② 手机扫 → 轮询 /x/passport-login/web/qrcode/poll?qrcode_key=…
+ *      data.code：86101 未扫 / 86090 已扫待确认 / 0 成功 / 86038 过期
+ *   ③ ⭐ **凭证在轮询响应的 `Set-Cookie` 头里**（成功时那条 `data.url` 里没有 SESSDATA，
+ *      那是别的域的游戏票 —— 别在 url 里找）
+ *   ④ 写成 MCP 认识的四个字段：sessdata / bili_jct / buvid3 / dedeuserid
+ *
+ * 二维码图片：交给 venv 里的 Python `qrcode` 画（ASCII 的 URL，走 `-c` 安全；
+ * 没装就退回"只给 URL"，前端会提示先跑「建 venv 装依赖」）。
+ * ============================================================================
+ */
+import { spawn } from 'node:child_process'
+import { existsSync, mkdirSync, writeFileSync } from 'node:fs'
+import { join } from 'node:path'
+
+const UA = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0 Safari/537.36'
+const GEN = 'https://passport.bilibili.com/x/passport-login/web/qrcode/generate?source=main-fe-header'
+const pollUrl = (key) => 'https://passport.bilibili.com/x/passport-login/web/qrcode/poll?qrcode_key=' + encodeURIComponent(key) + '&source=main-fe-header'
+const SPI = 'https://api.bilibili.com/x/frontend/finger/spi'
+
+/** 从 Set-Cookie 数组里抠出我们要的几个 */
+function pickCookies(list) {
+  const jar = {}
+  const want = { SESSDATA: 'sessdata', bili_jct: 'bili_jct', DedeUserID: 'dedeuserid', buvid3: 'buvid3' }
+  for (const raw of list ?? []) {
+    const first = String(raw).split(';')[0] || ''
+    const i = first.indexOf('=')
+    if (i <= 0) continue
+    const name = first.slice(0, i).trim()
+    const value = first.slice(i + 1).trim()
+    if (want[name]) jar[want[name]] = value
+  }
+  return jar
+}
+
+/** 拿不到 buvid3 时补一张"指纹"（非致命，失败就当空） */
+async function ensureBuvid3(jar) {
+  if (jar.buvid3) return jar
+  try {
+    const r = await fetch(SPI, { headers: { 'User-Agent': UA } })
+    const j = await r.json()
+    const v = j?.data?.b_3
+    if (v) jar.buvid3 = v
+  } catch { /* 拿不到就算了 */ }
+  return jar
+}
+
+export async function loginStart() {
+  const r = await fetch(GEN, { headers: { 'User-Agent': UA } })
+  const j = await r.json()
+  const data = j?.data
+  if (!data?.qrcode_key || !data?.url) throw new Error(`生成二维码失败：${j?.message || '返回里没有 qrcode_key'}`)
+  return { key: data.qrcode_key, url: data.url }
+}
+
+/** 轮询一次。state: waiting / scanned / ok / expired / unknown */
+export async function loginPoll(key) {
+  const res = await fetch(pollUrl(key), { headers: { 'User-Agent': UA }, redirect: 'manual' })
+  const setCookies = typeof res.headers.getSetCookie === 'function' ? res.headers.getSetCookie() : []
+  let body = {}
+  try { body = await res.json() } catch { /* poll 有时返回空体 */ }
+  const code = body?.data?.code
+  if (code === 0) {
+    const jar = await ensureBuvid3(pickCookies(setCookies))
+    if (!jar.sessdata) return { state: 'unknown', code, message: '登录成功了，但响应里没有 SESSDATA —— 把这次的结果记下来再排查' }
+    return { state: 'ok', code, credential: jar }
+  }
+  const map = { 86101: 'waiting', 86090: 'scanned', 86038: 'expired' }
+  return { state: map[code] ?? 'unknown', code, message: body?.message || '' }
+}
+
+/** 把凭证写进 MCP 读的那个文件（家目录里的 bili_credential.json） */
+export function saveCredential(stateDir, credential) {
+  mkdirSync(stateDir, { recursive: true })
+  const file = join(stateDir, 'bili_credential.json')
+  writeFileSync(file, JSON.stringify({
+    sessdata: credential.sessdata ?? '',
+    bili_jct: credential.bili_jct ?? '',
+    buvid3: credential.buvid3 || '',
+    dedeuserid: credential.dedeuserid ?? '',
+  }, null, 2), 'utf8')
+  return file
+}
+
+/** 用 Python 的 qrcode 画一张 PNG，返回**文件路径**（拿不到就返回 null） */
+export function renderQrPng(pythonPath, stateDir, url) {
+  return new Promise((resolve) => {
+    const png = join(stateDir, 'qrcode_login.png')
+    const code = 'import sys, qrcode; qrcode.make(sys.argv[1]).save(sys.argv[2])'
+    let child
+    try {
+      child = spawn(pythonPath || 'python', ['-c', code, url, png], { cwd: stateDir, windowsHide: true })
+    } catch { return resolve(null) }
+    const done = () => { try { resolve(existsSync(png) ? png : null) } catch { resolve(null) } }
+    child.on('exit', (c) => { if (c === 0) done(); else resolve(null) })
+    child.on('error', () => resolve(null))
+  })
+}

package/lib/mcp.mjs

@@ -1,115 +1,119 @@
-/**
- * lib/mcp.mjs —— 一个极小的 MCP stdio 客户端（只做我们需要的三件事）
- * ============================================================================
- * 为什么不用 `@deepseek-ai/dsh-mcp-client`：那是个"把 MCP 挂成 dsh 工具"的完整插件，
- * 而我们要的是**插件内部自己起这个 Python MCP**（用户选了 A 方案：装完就能用，
- * Python 路径和登录都在设置页里，不用去改 profile 的 patch）。
- *
- * 协议就三句话：`initialize` → `notifications/initialized` → `tools/call`，
- * stdio 上是**一行一个 JSON-RPC**。
- * ============================================================================
- */
-import { spawn } from 'node:child_process'
-
-export class McpClient {
-  constructor({ command, args = [], cwd, env, log = () => {} }) {
-    this.cfg = { command, args, cwd, env, log }
-    this.proc = null
-    this.buf = ''
-    this.nextId = 1
-    this.pending = new Map()
-    this.stderr = ''
-    this.starting = null
-  }
-
-  get running() { return Boolean(this.proc) }
-
-  async start() {
-    if (this.proc) return
-    if (this.starting) return this.starting
-    this.starting = (async () => {
-      const { command, args, cwd, env, log } = this.cfg
-      this.proc = spawn(command, args, {
-        cwd,
-        env: { ...process.env, ...(env || {}) },
-        stdio: ['pipe', 'pipe', 'pipe'],
-        windowsHide: true,
-      })
-      this.proc.stdout.setEncoding('utf8')
-      this.proc.stdout.on('data', (chunk) => this.#onData(chunk))
-      this.proc.stderr.setEncoding('utf8')
-      this.proc.stderr.on('data', (c) => { this.stderr = (this.stderr + c).slice(-4000) })
-      this.proc.on('error', (e) => log(`MCP 子进程启动失败：${e?.message ?? e}`))
-      this.proc.on('exit', (code) => {
-        log(`MCP 子进程退出（code=${code}）`)
-        for (const [, p] of this.pending) p.reject(new Error(`MCP 子进程退出（code=${code}）${this.stderr ? '：' + this.stderr.slice(-300) : ''}`))
-        this.pending.clear()
-        this.proc = null
-      })
-      await this.#request('initialize', {
-        protocolVersion: '2024-11-05',
-        capabilities: {},
-        clientInfo: { name: 'dsh-bili-duty', version: '0.1.0' },
-      })
-      this.#notify('notifications/initialized', {})
-      log('MCP 已就绪')
-    })()
-    try { await this.starting } finally { this.starting = null }
-  }
-
-  stop() {
-    try { this.proc?.kill() } catch { /* 已经没了 */ }
-    this.proc = null
-  }
-
-  /** 调一个 MCP 工具：能解析成 JSON 就返回对象，否则返回字符串 */
-  async call(name, args = {}, { timeoutMs = 180000 } = {}) {
-    await this.start()
-    const result = await this.#request('tools/call', { name, arguments: args }, timeoutMs)
-    const text = (result?.content ?? []).map((c) => c?.text ?? '').join('\n').trim()
-    if (result?.isError) throw new Error(text || `MCP 工具 ${name} 报错`)
-    try { return text ? JSON.parse(text) : {} } catch { return text }
-  }
-
-  #onData(chunk) {
-    this.buf += chunk
-    let idx
-    while ((idx = this.buf.indexOf('\n')) >= 0) {
-      const line = this.buf.slice(0, idx).trim()
-      this.buf = this.buf.slice(idx + 1)
-      if (!line) continue
-      let msg
-      try { msg = JSON.parse(line) } catch { continue }   // 非 JSON 行（有些库会往 stdout 打日志）忽略
-      if (msg.id !== undefined && this.pending.has(msg.id)) {
-        const p = this.pending.get(msg.id)
-        this.pending.delete(msg.id)
-        if (msg.error) p.reject(new Error(msg.error?.message ? String(msg.error.message) : JSON.stringify(msg.error)))
-        else p.resolve(msg.result)
-      }
-    }
-  }
-
-  #send(obj) {
-    if (!this.proc?.stdin?.writable) throw new Error('MCP 子进程不在运行')
-    this.proc.stdin.write(JSON.stringify(obj) + '\n')
-  }
-
-  #notify(method, params) { this.#send({ jsonrpc: '2.0', method, params }) }
-
-  #request(method, params, timeoutMs = 60000) {
-    const id = this.nextId++
-    return new Promise((resolve, reject) => {
-      const timer = setTimeout(() => {
-        this.pending.delete(id)
-        reject(new Error(`MCP ${method} 超时（${timeoutMs}ms）${this.stderr ? '：' + this.stderr.slice(-200) : ''}`))
-      }, timeoutMs)
-      this.pending.set(id, {
-        resolve: (v) => { clearTimeout(timer); resolve(v) },
-        reject: (e) => { clearTimeout(timer); reject(e) },
-      })
-      try { this.#send({ jsonrpc: '2.0', id, method, params }) } catch (e) {
-        clearTimeout(timer); this.pending.delete(id); reject(e)
-      }
-    })
-  }
-}
+/**
+ * lib/mcp.mjs —— 一个极小的 MCP stdio 客户端（只做我们需要的三件事）
+ * ============================================================================
+ * 为什么不用 `@deepseek-ai/dsh-mcp-client`：那是个"把 MCP 挂成 dsh 工具"的完整插件，
+ * 而我们要的是**插件内部自己起这个 Python MCP**（用户选了 A 方案：装完就能用，
+ * Python 路径和登录都在设置页里，不用去改 profile 的 patch）。
+ *
+ * 协议就三句话：`initialize` → `notifications/initialized` → `tools/call`，
+ * stdio 上是**一行一个 JSON-RPC**。
+ * ============================================================================
+ */
+import { spawn } from 'node:child_process'
+import { readFileSync } from 'node:fs'
+
+// 报给对端的身份：版本号**从 package.json 读**，别手写（手写的那份永远追不上发版）
+const PKG = (() => { try { return JSON.parse(readFileSync(new URL('../package.json', import.meta.url), 'utf8')) } catch { return {} } })()
+
+export class McpClient {
+  constructor({ command, args = [], cwd, env, log = () => {} }) {
+    this.cfg = { command, args, cwd, env, log }
+    this.proc = null
+    this.buf = ''
+    this.nextId = 1
+    this.pending = new Map()
+    this.stderr = ''
+    this.starting = null
+  }
+
+  get running() { return Boolean(this.proc) }
+
+  async start() {
+    if (this.proc) return
+    if (this.starting) return this.starting
+    this.starting = (async () => {
+      const { command, args, cwd, env, log } = this.cfg
+      this.proc = spawn(command, args, {
+        cwd,
+        env: { ...process.env, ...(env || {}) },
+        stdio: ['pipe', 'pipe', 'pipe'],
+        windowsHide: true,
+      })
+      this.proc.stdout.setEncoding('utf8')
+      this.proc.stdout.on('data', (chunk) => this.#onData(chunk))
+      this.proc.stderr.setEncoding('utf8')
+      this.proc.stderr.on('data', (c) => { this.stderr = (this.stderr + c).slice(-4000) })
+      this.proc.on('error', (e) => log(`MCP 子进程启动失败：${e?.message ?? e}`))
+      this.proc.on('exit', (code) => {
+        log(`MCP 子进程退出（code=${code}）`)
+        for (const [, p] of this.pending) p.reject(new Error(`MCP 子进程退出（code=${code}）${this.stderr ? '：' + this.stderr.slice(-300) : ''}`))
+        this.pending.clear()
+        this.proc = null
+      })
+      await this.#request('initialize', {
+        protocolVersion: '2024-11-05',
+        capabilities: {},
+        clientInfo: { name: PKG.name || 'dsh-bili-scroll', version: PKG.version || '0.0.0' },
+      })
+      this.#notify('notifications/initialized', {})
+      log('MCP 已就绪')
+    })()
+    try { await this.starting } finally { this.starting = null }
+  }
+
+  stop() {
+    try { this.proc?.kill() } catch { /* 已经没了 */ }
+    this.proc = null
+  }
+
+  /** 调一个 MCP 工具：能解析成 JSON 就返回对象，否则返回字符串 */
+  async call(name, args = {}, { timeoutMs = 180000 } = {}) {
+    await this.start()
+    const result = await this.#request('tools/call', { name, arguments: args }, timeoutMs)
+    const text = (result?.content ?? []).map((c) => c?.text ?? '').join('\n').trim()
+    if (result?.isError) throw new Error(text || `MCP 工具 ${name} 报错`)
+    try { return text ? JSON.parse(text) : {} } catch { return text }
+  }
+
+  #onData(chunk) {
+    this.buf += chunk
+    let idx
+    while ((idx = this.buf.indexOf('\n')) >= 0) {
+      const line = this.buf.slice(0, idx).trim()
+      this.buf = this.buf.slice(idx + 1)
+      if (!line) continue
+      let msg
+      try { msg = JSON.parse(line) } catch { continue }   // 非 JSON 行（有些库会往 stdout 打日志）忽略
+      if (msg.id !== undefined && this.pending.has(msg.id)) {
+        const p = this.pending.get(msg.id)
+        this.pending.delete(msg.id)
+        if (msg.error) p.reject(new Error(msg.error?.message ? String(msg.error.message) : JSON.stringify(msg.error)))
+        else p.resolve(msg.result)
+      }
+    }
+  }
+
+  #send(obj) {
+    if (!this.proc?.stdin?.writable) throw new Error('MCP 子进程不在运行')
+    this.proc.stdin.write(JSON.stringify(obj) + '\n')
+  }
+
+  #notify(method, params) { this.#send({ jsonrpc: '2.0', method, params }) }
+
+  #request(method, params, timeoutMs = 60000) {
+    const id = this.nextId++
+    return new Promise((resolve, reject) => {
+      const timer = setTimeout(() => {
+        this.pending.delete(id)
+        reject(new Error(`MCP ${method} 超时（${timeoutMs}ms）${this.stderr ? '：' + this.stderr.slice(-200) : ''}`))
+      }, timeoutMs)
+      this.pending.set(id, {
+        resolve: (v) => { clearTimeout(timer); resolve(v) },
+        reject: (e) => { clearTimeout(timer); reject(e) },
+      })
+      try { this.#send({ jsonrpc: '2.0', id, method, params }) } catch (e) {
+        clearTimeout(timer); this.pending.delete(id); reject(e)
+      }
+    })
+  }
+}