dsh-cnb-assist 1.0.2 → 1.0.3

package/client.js

@@ -1,5 +1,5 @@
 /**
- * dsh-cnb-assist — Client half.
+ * @local/dsh-cnb-assist — Client half.
  *
  * 三个落点，按有没有装 dsh-better-sidebar 自动选：
  *   1. better-sidebar 在 → 右侧栏页签「CNB」（页签 = 一个组件，数据经 host.call 从 Host 半身取）
@@ -10,13 +10,13 @@
  * 样式只用 --dsw-alias-* 主题令牌，亮色/暗色跟随宿主。
  */
 window.__ModuleLoader__.load({
-  id: 'dsh-cnb-assist',
+  id: '@local/dsh-cnb-assist',
   factory(require) {
     const React = require('react')
     const h = React.createElement
     const { useState, useEffect, useMemo, useRef, useSyncExternalStore, createContext, useContext } = React
 
-    const PLUGIN_ID = 'dsh-cnb-assist'
+    const PLUGIN_ID = '@local/dsh-cnb-assist'
     const ROUTE = 'cnb-assist/api'
     const ASSIST_KEY = 'dsh-cnb-assist'
     /** 本插件在宿主 locale 注册表里的命名空间（也是 slot 项的 locale 标记）。 */

package/index.js

@@ -1,5 +1,5 @@
 /**
- * dsh-cnb-assist — Host half.
+ * @local/dsh-cnb-assist — Host half.
  *
  * 把 cnb-assist-wpf/core 里那套已经跑通的 CNB 逻辑搬进 DSH：
  *   Api.cs        → 这里的 callCnb / 各 endpoint
@@ -29,6 +29,17 @@ export const inject = ['webServer', 'tools']
 /** CNB 地址固定的反代端口（用户已确认固定，见 AGENTS.md §7）。 */
 const RELAY_PORT = 9001
 
+/**
+ * 阶段日志里平台注入的地址模板，形如：
+ *   PROXY_URI=https://n2lc6c2bdm-{{port}}.cnb.run
+ * ★ {{port}} 是字面量双大括号，不是模板字符串语法。
+ * ★ 这一行有时会和后面的输出粘在同一行尾（`... ===== register skipped`），必须按空白截断。
+ */
+const PROXY_URI_RX = /PROXY_URI\s*=\s*([^\s"'`,;]+)/
+
+/** 把地址模板里的 {{port}} 换成真实端口。 */
+const PORT_PLACEHOLDER_RX = /\{\{\s*port\s*\}\}/gi
+
 /** 浏览器半身投递的路由。 */
 const ROUTE = '/cnb-assist/api'
 
@@ -542,15 +553,47 @@ async function buildMonthSummary(call) {
 
 // ───────────────────────────── 反代地址 ─────────────────────────────
 
-/** business_id + 固定端口拼地址（最后一级兜底）。 */
+/** business_id + 固定端口拼地址（兜底之一）。 */
 function relayFromBusinessId(businessId) {
   const id = String(businessId ?? '').trim()
   return id === '' ? null : `https://${id}-${RELAY_PORT}.cnb.run/v1`
 }
 
+/**
+ * 把地址里的 {{port}} 占位符换成真实端口，再补成可用的 /v1 地址。
+ * 已经是成品地址的（没有占位符）原样保留，只补 /v1。
+ */
+function materializeRelayUrl(raw) {
+  const text = String(raw ?? '').trim()
+  if (text === '') return null
+  let url = text.replace(PORT_PLACEHOLDER_RX, String(RELAY_PORT))
+  let parsed
+  try {
+    parsed = new URL(url)
+  } catch {
+    return null
+  }
+  if (!parsed.host.toLowerCase().endsWith('.cnb.run')) return null
+  const path = parsed.pathname.replace(/\/+$/, '')
+  parsed.pathname = path.toLowerCase().endsWith('/v1') ? path : `${path}/v1`
+  return parsed.toString()
+}
+
+/**
+ * 从阶段日志里取 PROXY_URI 模板。
+ * ★ 这是最权威的来源：容器重建后 business_id 由平台重新分配，模板里的就是新值。
+ */
+function relayFromProxyUri(text) {
+  if (typeof text !== 'string' || text === '') return null
+  const match = PROXY_URI_RX.exec(text)
+  return match === null ? null : materializeRelayUrl(match[1])
+}
+
 /**
  * 从阶段日志里抠地址，带打分：来自该 business_id 的 > 路径以 /v1 结尾的 >
  * 端口是 9001 的。找不到 cnb.run 就返回 null。
+ * ★ new URL() 能"接受" {{port}}（它把整段当主机名），所以旧写法不会报错，
+ *   只会把没替换占位符的字符串原样展示出去。必须先 materialize 再判分。
  */
 function extractRelayAddress(text, businessId = '') {
   if (typeof text !== 'string' || text === '') return null
@@ -561,9 +604,11 @@ function extractRelayAddress(text, businessId = '') {
     const raw = match[0].replace(/[.，。；]+$/, '')
     if (raw.length <= 12) continue
     if (!raw.includes('.cnb.run')) continue
+    const normalized = materializeRelayUrl(raw)
+    if (normalized === null) continue
     let url
     try {
-      url = new URL(raw)
+      url = new URL(normalized)
     } catch {
       continue
     }
@@ -571,17 +616,18 @@ function extractRelayAddress(text, businessId = '') {
     let score = 1
     if (businessId !== '' && host.startsWith(`${businessId.toLowerCase()}-`)) score += 10
     if (url.pathname.replace(/\/+$/, '').toLowerCase().endsWith('/v1')) score += 4
-    if (url.port === String(RELAY_PORT) || host.endsWith(`-${RELAY_PORT}.cnb.run`)) score += 3
+    if (host.endsWith(`-${RELAY_PORT}.cnb.run`)) score += 3
+    if (PORT_PLACEHOLDER_RX.test(raw)) score += 5
+    PORT_PLACEHOLDER_RX.lastIndex = 0
     if (score > bestScore) {
       bestScore = score
-      best = raw
+      best = normalized
     }
   }
   return bestScore > 0 ? best : null
 }
 
 async function resolveRelayAddress(call, slug, sn, pipelineId) {
-  const businessRelay = (item) => relayFromBusinessId(item?.business_id)
   if (slug === '' || sn === '') return null
   const status = await call(`/${enc(slug)}/-/build/status/${enc(sn)}`)
   const stageIds = []
@@ -595,18 +641,25 @@ async function resolveRelayAddress(call, slug, sn, pipelineId) {
   }
   // stage-0 优先（AGENTS.md §7.3：不同仓库可能没有这个阶段名，所以逐阶段扫）。
   stageIds.sort((a, b) => (a === 'stage-0' ? 0 : 1) - (b === 'stage-0' ? 0 : 1))
+
+  // 先找 PROXY_URI 那一行（权威来源），扫不到再退回通用打分。两轮都扫同一批日志。
+  let scanned = ''
   for (const stage of stageIds) {
     const log = await call(
       `/${enc(slug)}/-/build/logs/stage/${enc(sn)}/${enc(pipelineId)}/${enc(stage)}`,
     )
     if (!log.ok) continue
     const content = Array.isArray(log.json?.content) ? log.json.content.join('\n') : ''
-    const found = extractRelayAddress(content, '')
-    if (found !== null) return found
+    scanned += `${content}\n`
+    const fromTemplate = relayFromProxyUri(content)
+    if (fromTemplate !== null) return fromTemplate
   }
+  const fromLog = extractRelayAddress(scanned, '')
+  if (fromLog !== null) return fromLog
+
   const listed = await listWorkspaces(call)
   const me = listed.items.find(item => String(item?.sn ?? '') === sn)
-  return businessRelay(me)
+  return relayFromBusinessId(me?.business_id)
 }
 
 /** 运行中容器一行：地址还没解析出来时先给 business_id 兜底值。 */
@@ -622,13 +675,19 @@ async function buildRelayRows(call) {
     const slug = String(item?.slug ?? '')
     const pipelineId = String(item?.pipeline_id ?? '')
     const businessRelay = relayFromBusinessId(item?.business_id)
-    let address = businessRelay
+    // ★ 两路都要试：日志里的 PROXY_URI 模板是平台重建后注入的新值，比 business_id 新。
+    //   先查日志，查不到才退回 business_id 拼的地址。
+    let address = null
+    let source = 'none'
+    try {
+      address = await resolveRelayAddress(call, slug, sn, pipelineId)
+      if (address !== null) source = 'log'
+    } catch {
+      address = null
+    }
     if (address === null) {
-      try {
-        address = await resolveRelayAddress(call, slug, sn, pipelineId)
-      } catch {
-        address = null
-      }
+      address = businessRelay
+      if (address !== null) source = 'businessId'
     }
     const created = parseTime(item?.create_time)
     const seconds = created === null ? Number(item?.duration) || 0 : (Date.now() - created) / 1000
@@ -641,6 +700,7 @@ async function buildRelayRows(call) {
       pipelineId,
       businessId: String(item?.business_id ?? ''),
       address,
+      addressSource: source,
       createdAt: created,
       runningSeconds: Math.max(0, seconds),
       text: {
@@ -734,8 +794,13 @@ async function runRestart(call, input, settings) {
     const listed = await listWorkspaces(call)
     const me = listed.items.find(item => String(item?.sn ?? '') === newSn)
     if (me === undefined) continue
-    address = relayFromBusinessId(me?.business_id)
-      ?? await resolveRelayAddress(call, String(me?.slug ?? slug), newSn, String(me?.pipeline_id ?? ''))
+    let fromLog = null
+    try {
+      fromLog = await resolveRelayAddress(call, String(me?.slug ?? slug), newSn, String(me?.pipeline_id ?? ''))
+    } catch {
+      fromLog = null
+    }
+    address = fromLog ?? relayFromBusinessId(me?.business_id)
     if (address !== null) break
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-cnb-assist",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "CNB 反代辅助（DSH 插件）：查看各组织额度与本月 AI 用量，管理运行中容器的反代地址，一键写回模型 baseURL",
   "type": "module",
   "main": "index.js",
@@ -17,7 +17,8 @@
     "icon.svg",
     "locale",
     "README.md",
-    "selfcheck.mjs"
+    "selfcheck.mjs",
+    "selfcheck-relay.mjs"
   ],
   "icon": "./icon.svg",
   "keywords": [

package/selfcheck-relay.mjs

@@ -0,0 +1,127 @@
+/**
+ * 反代地址规则的离线自检：不联网，纯字符串。
+ * 覆盖两种来源（PROXY_URI 模板 / business_id 拼）、占位符替换、以及旧版会漏掉的情形。
+ */
+import assert from 'node:assert/strict'
+
+const RELAY_PORT = 9001
+const PROXY_URI_RX = /PROXY_URI\s*=\s*([^\s"'`,;]+)/
+const PORT_PLACEHOLDER_RX = /\{\{\s*port\s*\}\}/gi
+
+function materializeRelayUrl(raw) {
+  const text = String(raw ?? '').trim()
+  if (text === '') return null
+  let url = text.replace(PORT_PLACEHOLDER_RX, String(RELAY_PORT))
+  let parsed
+  try {
+    parsed = new URL(url)
+  } catch {
+    return null
+  }
+  if (!parsed.host.toLowerCase().endsWith('.cnb.run')) return null
+  const path = parsed.pathname.replace(/\/+$/, '')
+  parsed.pathname = path.toLowerCase().endsWith('/v1') ? path : `${path}/v1`
+  return parsed.toString()
+}
+
+function relayFromProxyUri(text) {
+  if (typeof text !== 'string' || text === '') return null
+  const match = PROXY_URI_RX.exec(text)
+  return match === null ? null : materializeRelayUrl(match[1])
+}
+
+function relayFromBusinessId(businessId) {
+  const id = String(businessId ?? '').trim()
+  return id === '' ? null : `https://${id}-${RELAY_PORT}.cnb.run/v1`
+}
+
+let pass = 0
+function ok(name, cond) {
+  assert.ok(cond, name)
+  pass += 1
+  console.log('PASS ', name)
+}
+function eq(name, actual, expected) {
+  assert.equal(actual, expected, `${name}\n  actual  : ${actual}\n  expected: ${expected}`)
+  pass += 1
+  console.log('PASS ', name)
+}
+
+// ── 1. 真实日志原样（今天从 cnb-ps0-1k77t7qst 抓的）
+const REAL = [
+  'Runner[10.235.16.12][docker] 2026-11-12 20:55:52 $',
+  '===== proxy self-check: health OK =====',
+  '{"status":"ok","uptime_sec":1}',
+  'PROXY_URI=https://n2lc6c2bdm-{{port}}.cnb.run',
+  '===== register skipped (REGISTER_URL / REG_TOKEN / PROXY_URI missing) =====',
+].join('\n')
+
+eq('真实日志 → 模板地址',
+  relayFromProxyUri(REAL),
+  'https://n2lc6c2bdm-9001.cnb.run/v1')
+
+// ── 2. 占位符替换本身
+eq('{{port}} 换成 9001',
+  materializeRelayUrl('https://n2lc6c2bdm-{{port}}.cnb.run'),
+  'https://n2lc6c2bdm-9001.cnb.run/v1')
+eq('带空格 {{ port }} 也认',
+  materializeRelayUrl('https://abc-{{ port }}.cnb.run'),
+  'https://abc-9001.cnb.run/v1')
+eq('大写 {{PORT}} 也认',
+  materializeRelayUrl('https://abc-{{PORT}}.cnb.run'),
+  'https://abc-9001.cnb.run/v1')
+
+// ── 3. 已经是成品地址的不该被破坏
+eq('成品地址原样保留',
+  materializeRelayUrl('https://n2lc6c2bdm-9001.cnb.run/v1'),
+  'https://n2lc6c2bdm-9001.cnb.run/v1')
+eq('成品地址缺 /v1 要补',
+  materializeRelayUrl('https://n2lc6c2bdm-9001.cnb.run'),
+  'https://n2lc6c2bdm-9001.cnb.run/v1')
+
+// ── 4. 粘在行尾的情形（真实日志里出现过）
+eq('PROXY_URI 后面粘了别的输出',
+  relayFromProxyUri('PROXY_URI=https://n2lc6c2bdm-{{port}}.cnb.run ===== register skipped ====='),
+  'https://n2lc6c2bdm-9001.cnb.run/v1')
+
+// ── 5. 多行里夹杂其它 URL，只认 PROXY_URI 那行
+eq('只认 PROXY_URI 那行',
+  relayFromProxyUri('see https://example.com/x\nPROXY_URI=https://zz9-{{port}}.cnb.run\nmore https://other.cnb.run/y'),
+  'https://zz9-9001.cnb.run/v1')
+
+// ── 6. 没有模板行 → null，交给 business_id 兜底
+eq('无模板行返回 null', relayFromProxyUri('nothing here'), null)
+eq('空串返回 null', relayFromProxyUri(''), null)
+eq('非字符串返回 null', relayFromProxyUri(null), null)
+
+// ── 7. business_id 兜底
+eq('business_id 拼地址',
+  relayFromBusinessId('n2lc6c2bdm'),
+  'https://n2lc6c2bdm-9001.cnb.run/v1')
+eq('business_id 为空返回 null', relayFromBusinessId(''), null)
+eq('business_id 是 undefined 返回 null', relayFromBusinessId(undefined), null)
+
+// ── 8. 两种来源必须同址（本容器实测）
+eq('模板与 business_id 结果一致',
+  relayFromProxyUri(REAL),
+  relayFromBusinessId('n2lc6c2bdm'))
+
+// ── 9. 旧版行为回归：模板行不会被 new URL() 拒绝（它把 {{port}} 当主机名的一部分），
+//    但旧代码会以"未替换占位符"的形态胜出并展示出去，且拿不到端口那 3 分。
+//    ★ 这一点很容易误判成"旧代码会抛异常"——实测不会。
+const oldParsed = new URL('https://n2lc6c2bdm-{{port}}.cnb.run')
+ok('模板能被 new URL() 解析（所以旧代码不是抛异常，是错在别处）',
+  oldParsed.host === 'n2lc6c2bdm-{{port}}.cnb.run')
+ok('旧代码的端口判分条件不成立（拿不到 +3 分）',
+  oldParsed.host.toLowerCase().endsWith(`-${RELAY_PORT}.cnb.run`) === false)
+ok('旧代码会原样输出未替换的占位符',
+  oldParsed.toString().includes('{{port}}'))
+ok('新代码输出已替换的成品地址',
+  relayFromProxyUri(REAL) === 'https://n2lc6c2bdm-9001.cnb.run/v1')
+ok('新代码输出不再含占位符',
+  !relayFromProxyUri(REAL).includes('{{'))
+
+// ── 10. 非 cnb.run 域名不该被当成反代地址
+eq('非 cnb.run 返回 null', materializeRelayUrl('https://evil.example.com/{{port}}'), null)
+
+console.log(`\nall ${pass} checks passed`)