dsh-instruction-memory 1.4.7 → 1.4.8

package/lib/client.js

@@ -20,7 +20,40 @@ window.__ModuleLoader__.load({
     const React = require('react')
     const h = React.createElement
 
-    const API = '/instruction-memory/api'
+    /**
+     * F19: the route path RESOLVED against the page, not assumed to be at root.
+     *
+     * `/instruction-memory/api` is correct only when the GUI is served from `/`.
+     * Behind a reverse proxy that mounts the app under a prefix (`/ui/`) the
+     * browser posts to the proxy root instead, and every request 404s even
+     * though the panel rendered. The harness itself resolves its own client
+     * paths the same way (`new URL(path.slice(1), document.baseURI)`), so this
+     * follows the page wherever it is served from.
+     *
+     * Computed per call, not once at load: a test harness (or a page that
+     * rewrites `<base>`) can establish the base after this module evaluates.
+     *
+     * @param {string} [suffix] query string to append, e.g. `?lite=1`.
+     * @returns {string} absolute or root-relative URL for the route.
+     */
+    const apiEndpoint = (suffix) => {
+      const tail = typeof suffix === 'string' ? suffix : ''
+      const path = 'instruction-memory/api'
+      if (typeof document === 'undefined' || typeof document.baseURI !== 'string' || document.baseURI === '') {
+        return '/' + path + tail
+      }
+      try {
+        const base = new URL(document.baseURI)
+        // A base of `https://host/ui` (no trailing slash) would otherwise
+        // resolve against `/` — `ui` is the mount point itself, so treat it as
+        // the directory the app lives in.
+        if (!base.pathname.endsWith('/')) base.pathname += '/'
+        const url = new URL(path, base)
+        return url.pathname + url.search + tail
+      } catch {
+        return '/' + path + tail
+      }
+    }
 
     // The Host bounds one delivery at 60 s (lib/mailer.js SMTP_TOTAL_TIMEOUT_MS).
     // Waiting longer than the generic 15 s keeps the panel honest: aborting while
@@ -383,6 +416,7 @@ window.__ModuleLoader__.load({
         'diag.copied': '诊断信息已复制到剪贴板',
         'diag.copyManual': '自动复制不可用；请手动全选复制下方文本。',
         'diag.hostWarn': '安全提示：设置路由当前绑定在非回环地址（{host}），同一网络内的设备可以无鉴权访问此页面，请勿在不可信网络暴露；如需对外发布，请阅读 README 的「经反向代理对外发布」。',
+        'diag.hostWarnFence': '安全提示：设置路由当前绑定在非回环地址（{host}），但宿主鉴权门已挂载——访问仍需登录 DSH 后的浏览器会话，未登录请求会被 401/403 拒绝；仍建议只在可信网络暴露。',
         'diag.groupStorage': '存储',
         'diag.groupInjection': '注入',
         'diag.groupBackup': '备份与历史',
@@ -667,6 +701,7 @@ window.__ModuleLoader__.load({
         'diag.copied': 'Diagnostics copied to the clipboard',
         'diag.copyManual': 'Automatic copy is unavailable; select and copy the text below manually.',
         'diag.hostWarn': 'Security notice: the settings route is bound to a non-loopback address ({host}); other devices on the same network can reach this page without authentication. Do not expose it on an untrusted network — for public deployments read “Publishing behind a reverse proxy” in the README.',
+        'diag.hostWarnFence': 'Security notice: the settings route is bound to a non-loopback address ({host}), but the host authentication fence is attached — access still requires a signed-in DSH browser session, and unauthenticated requests are refused with 401/403. Keep it on a trusted network anyway.',
         'diag.groupStorage': 'Storage',
         'diag.groupInjection': 'Injection',
         'diag.groupBackup': 'Backup & history',
@@ -1469,7 +1504,7 @@ window.__ModuleLoader__.load({
       const controller = typeof AbortController === 'function' ? new AbortController() : null
       const timer = controller !== null ? setTimeout(() => controller.abort(), timeoutMs) : null
       try {
-        const response = await fetch(API, {
+        const response = await fetch(apiEndpoint(), {
           method: 'POST',
           headers: { 'content-type': 'application/json' },
           body: JSON.stringify({ method, args: args === undefined ? null : args }),
@@ -2522,7 +2557,7 @@ window.__ModuleLoader__.load({
         // flag ignores the query string and keeps sending full frames — the
         // branch below still accepts those, so the negotiation is additive and
         // one-way: neither side has to know the other's version.
-        const source = new EventSource(API + '?lite=1')
+        const source = new EventSource(apiEndpoint('?lite=1'))
         let alive = true
         let refreshing = false
         let missed = false
@@ -2875,9 +2910,15 @@ window.__ModuleLoader__.load({
         feedbackCard,
         // F12: the non-loopback warning stays high in the panel — directly
         // under the feedback entry — so it cannot be missed.
+        // Two different situations, two different texts: with the host fence
+        // attached the route is NOT open to the LAN (it needs a signed-in
+        // browser session), so claiming "no authentication" would be a false
+        // alarm. `authFence` is what the route itself checked on this request.
         security.hostGuarded === false
           ? h('div', { className: 'im-hostwarn', key: 'hostwarn' },
-            t('diag.hostWarn', { host: security.boundHost !== '' ? security.boundHost : '?' }))
+            security.authFence === true
+              ? t('diag.hostWarnFence', { host: security.boundHost !== '' ? security.boundHost : '?' })
+              : t('diag.hostWarn', { host: security.boundHost !== '' ? security.boundHost : '?' }))
           : null,
         h('div', { className: 'im-row' },
           h('div', null,
@@ -3676,7 +3717,12 @@ window.__ModuleLoader__.load({
         try {
           mountPanel(ctx, target)
           return true
-        } catch {
+        } catch (err) {
+          // F19: this used to swallow the throw outright — the panel simply
+          // never appeared and nothing anywhere said so.
+          const detail = '注册设置页时抛出异常：' + (err !== null && err !== undefined && typeof err.message === 'string' ? err.message : String(err))
+          console.error('[instruction-memory] ' + detail)
+          showMountFailureNotice(detail)
           return false
         }
       }
@@ -3696,10 +3742,10 @@ window.__ModuleLoader__.load({
           return
         }
         if (attempt >= SLOT_RETRY_LIMIT) {
-          console.error(
-            '[instruction-memory] slots service unavailable after '
-            + (SLOT_RETRY_LIMIT * SLOT_RETRY_DELAY_MS) + 'ms of retries; settings page not registered',
-          )
+          const detail = '宿主没有发布 slots 服务（重试 '
+            + SLOT_RETRY_LIMIT + ' 次，约 ' + (SLOT_RETRY_LIMIT * SLOT_RETRY_DELAY_MS) + 'ms）'
+          console.error('[instruction-memory] ' + detail + '；settings page not registered')
+          showMountFailureNotice(detail)
           return
         }
         schedule(retry)
@@ -3707,6 +3753,120 @@ window.__ModuleLoader__.load({
       schedule(retry)
     }
 
+    /**
+     * R8: read the running plugin version for the mount-failure notice.
+     *
+     * The settings route does not depend on `slots`, so `state` normally
+     * answers even when the panel could not mount — which is exactly the
+     * moment someone copies a version number into a bug report. Best effort in
+     * every direction: no `fetch`, no route, a refusal by the host's auth
+     * gate, a timeout or a malformed body all resolve to null, and the notice
+     * simply omits the line.
+     */
+    function probePluginVersion() {
+      try {
+        if (typeof fetch !== 'function') return Promise.resolve(null)
+        const controller = typeof AbortController === 'function' ? new AbortController() : null
+        const options = {
+          method: 'POST',
+          headers: { 'content-type': 'application/json' },
+          body: JSON.stringify({ method: 'state', args: null }),
+        }
+        if (controller !== null) {
+          options.signal = controller.signal
+          const timer = setTimeout(() => controller.abort(), 2000)
+          if (timer !== null && typeof timer === 'object' && typeof timer.unref === 'function') timer.unref()
+        }
+        return fetch(apiEndpoint(), options)
+          .then((response) => (response.ok === true ? response.json() : null))
+          .then((payload) => (payload !== null && payload !== undefined
+            && payload.ok === true
+            && payload.snapshot !== null && typeof payload.snapshot === 'object'
+            && typeof payload.snapshot.pluginVersion === 'string'
+            && payload.snapshot.pluginVersion !== ''
+            ? payload.snapshot.pluginVersion
+            : null))
+          .catch(() => null)
+      } catch {
+        return Promise.resolve(null)
+      }
+    }
+
+    /**
+     * F19: make a failed mount VISIBLE instead of console-only.
+     *
+     * The panel is how the user sees and edits their memory. When `slots` never
+     * resolves, the previous code wrote one console.error: the plugin looked
+     * installed, the settings page had no section, and nothing told the user
+     * why. A console line is not a user interface.
+     *
+     * The notice is deliberately dependency-free — plain DOM, inline styles,
+     * `textContent` only (never innerHTML) — because the very thing that failed
+     * is the service that would supply a styled component. It is non-modal and
+     * self-removing so it cannot become a permanent artefact of a transient
+     * race (a late `slots` publish still mounts the panel; the banner then
+     * only says the panel appeared late).
+     */
+    function showMountFailureNotice(detail) {
+      try {
+        if (typeof document === 'undefined' || document.body === null) return
+        const id = 'dsh-instruction-memory-mount-failure'
+        const existing = document.getElementById(id)
+        if (existing !== null) existing.remove()
+
+        const box = document.createElement('div')
+        box.id = id
+        box.setAttribute('role', 'status')
+        box.style.cssText = [
+          'position:fixed', 'right:16px', 'bottom:16px', 'z-index:2147483000',
+          'max-width:min(380px,calc(100vw - 32px))',
+          'background:#3a1d1d', 'color:#ffe8e8', 'border:1px solid #7a3a3a',
+          'border-radius:10px', 'padding:12px 14px',
+          'font:13px/1.5 system-ui,-apple-system,Segoe UI,sans-serif',
+          'box-shadow:0 8px 24px rgba(0,0,0,.45)',
+        ].join(';')
+
+        const title = document.createElement('div')
+        title.style.cssText = 'font-weight:600;margin-bottom:4px'
+        title.textContent = '指令记忆：设置页挂载失败'
+        box.appendChild(title)
+
+        const body = document.createElement('div')
+        body.textContent = detail
+        box.appendChild(body)
+
+        const hint = document.createElement('div')
+        hint.style.cssText = 'margin-top:6px;opacity:.75'
+        hint.textContent = '记忆注入本身仍在工作；请检查宿主版本与插件日志，或重装插件后刷新页面。'
+        box.appendChild(hint)
+
+        const close = document.createElement('button')
+        close.type = 'button'
+        close.textContent = '关闭'
+        close.style.cssText = 'margin-top:8px;background:transparent;color:#ffe8e8;border:1px solid #7a3a3a;border-radius:6px;padding:2px 10px;cursor:pointer;font:inherit'
+        close.addEventListener('click', () => box.remove())
+        box.appendChild(close)
+
+        document.body.appendChild(box)
+        // R8: name the running version. Appended after the banner exists so a
+        // slow or refused probe can never delay the warning itself.
+        probePluginVersion().then((version) => {
+          if (version === null) return
+          const meta = document.createElement('div')
+          meta.style.cssText = 'margin-top:6px;opacity:.75'
+          meta.textContent = '插件版本 ' + version
+          box.appendChild(meta)
+        }).catch(() => {})
+        // Non-modal and self-removing: a failure that persists past 30 s has
+        // already been reported once; leaving a banner on screen forever is
+        // worse than a dismissible one the user can re-trigger by reloading.
+        const timer = setTimeout(() => box.remove(), 30000)
+        if (timer !== null && typeof timer === 'object' && typeof timer.unref === 'function') timer.unref()
+      } catch {
+        // A banner is a courtesy: never let it be the reason the plugin throws.
+      }
+    }
+
     function schedule(fn) {
       const timer = setTimeout(fn, SLOT_RETRY_DELAY_MS)
       // Never hold a process open just to finish retrying.