dsh-offpeak-guard 0.3.1 → 0.3.3

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## 0.3.3 — 2026-11-14
+
+- 设置接口 `/plugins/dsh-offpeak-guard/action` 补上准入：路由只在 `webServer` 与 `connection` 两个服务都在位时注册，每个请求先过 `connection.requestRejection(req)`（Host/Origin 校验 + 浏览器令牌鉴权），返回 401/403 直接拒绝。此前本机任意网页都能改会话豁免、峰谷规则和暂停方式。
+- 拿不到 `connection` 或它抛错时一律按拒绝处理（失败关闭），不退回到只检查 Host/Origin/回环地址。
+- 请求体加 64 KiB 上限，超出返回 413；其余错误仍返回 400。
+- 新增 `test/admission.test.mjs`：覆盖缺服务、读取抛错、`requestRejection` 抛错、放行与 401/403 透传五条路径。
+- 适配 DSH 0.2.2-rc.2 的 `@deepseek-ai/dsh-client-connection` 服务约定（`requestRejection` 接收 `{ headers }`）。
+
+## 0.3.2 — 2026-11-06
+
+- 修复设置面板切换峰时策略时报 `Unexpected end of JSON input`：Host 启动顺序可能让 `webServer` 在插件 apply 时尚未就绪，导致设置路由根本没注册；改用 `ctx.inject(['webServer'], ...)` 后再挂载路由。
+- 客户端对非 JSON/空响应改为显示 `HTTP <status>`，不再把浏览器 JSON 解析异常直接抛到面板底部。
+- 已验证设置面板「立即暂停 / 完成当前轮后暂停」切换成功，路由返回 200。
+
 ## 0.3.1 — 2026-11-06
 
 - 左侧会话行悬停操作新增盾牌按钮：直接在对话索引里豁免/取消豁免，豁免中的会话行保留盾牌标记。

package/README.en.md

@@ -110,6 +110,15 @@ Click the sidebar clock to open it:
 - **Session exemptions**: searchable list of live root sessions; hover a session row in the left sidebar for a shield button, or use the **Exempt this session** button in the composer strip to toggle the current conversation directly;
 - **Holidays**: show the dynamic sync state.
 
+### Route admission
+
+The settings route `/plugins/dsh-offpeak-guard/action` goes through host authentication:
+
+- the route is only registered once both `webServer` and `connection` are available;
+- every request passes `connection.requestRejection(req)` first — its Host/Origin fence stops DNS rebinding and cross-site calls, and its browser authentication stops pages that never logged in; a 401/403 is answered before any business logic runs;
+- a missing `connection`, or one that throws, rejects the request (fail closed); there is no fallback to checking only Host, Origin or the loopback address;
+- request bodies are capped at 64 KiB and answer 413 above that.
+
 ## Subagents and waiting
 
 - Running subagents are allowed to finish; the parent is paused after the last child ends and resumed off-peak;

package/README.md

@@ -112,6 +112,15 @@
 
 面板里的修改立即生效并持久化。
 
+### 接口准入
+
+设置接口 `/plugins/dsh-offpeak-guard/action` 走宿主认证，不对外开放：
+
+- 路由在 `webServer` 与 `connection` 两个服务都在位时才注册；
+- 每个请求先过 `connection.requestRejection(req)`——Host/Origin 校验挡住 DNS rebinding 与跨站调用，浏览器令牌鉴权挡住没登录的本机网页；返回 401/403 时直接拒绝，不进入业务逻辑；
+- 拿不到 `connection` 或它抛错时一律按拒绝处理（失败关闭），不会退回只检查 Host、Origin 或回环地址；
+- 请求体上限 64 KiB，超出返回 413。
+
 ## 子代理与等待
 
 - 峰时开始时若会话有**正在运行的子代理**，先放行父会话与子代理；

package/client.js

@@ -231,7 +231,13 @@ window.__ModuleLoader__.load({
         headers: { 'content-type': 'application/json' },
         body: JSON.stringify(body),
       });
-      const json = await response.json();
+      const text = await response.text();
+      let json = {};
+      try {
+        json = text === '' ? {} : JSON.parse(text);
+      } catch {
+        json = {};
+      }
       if (!response.ok || json.ok === false) throw new Error(json.error ?? `HTTP ${response.status}`);
       if (sharedStatus.ctx !== null) await loadSharedStatus(sharedStatus.ctx);
       return json;
@@ -480,7 +486,13 @@ window.__ModuleLoader__.load({
             headers: { 'content-type': 'application/json' },
             body: JSON.stringify(body),
           });
-          const json = await response.json();
+          const text = await response.text();
+          let json = {};
+          try {
+            json = text === '' ? {} : JSON.parse(text);
+          } catch {
+            json = {};
+          }
           if (!response.ok || json.ok === false) throw new Error(json.error ?? `HTTP ${response.status}`);
           await refresh();
         } catch (caught) {

package/index.js

@@ -149,11 +149,25 @@ export function envConfig(env = process.env) {
   return out;
 }
 
+/** 设置接口只收几个字段的小 JSON，超过这个体积按可疑请求拒绝。 */
+const MAX_BODY_BYTES = 64 * 1024;
+
 async function readJsonBody(req) {
-  let raw = '';
-  for await (const chunk of req) raw += chunk;
-  if (raw === '') return {};
-  return JSON.parse(raw);
+  const chunks = [];
+  let size = 0;
+  for await (const chunk of req) {
+    size += chunk?.byteLength ?? Buffer.byteLength(String(chunk));
+    if (size > MAX_BODY_BYTES) {
+      // 先排空再拒绝，让客户端读到响应而不是被一刀切断连接。
+      req.resume();
+      const error = new Error('request body too large');
+      error.statusCode = 413;
+      throw error;
+    }
+    chunks.push(chunk);
+  }
+  if (size === 0) return {};
+  return JSON.parse(Buffer.concat(chunks, size).toString('utf8'));
 }
 
 function sendJson(res, status, payload) {
@@ -164,6 +178,33 @@ function sendJson(res, status, payload) {
   res.end(body);
 }
 
+/**
+ * 设置路由的准入栅栏。
+ *
+ * `connection.requestRejection` 是宿主唯一的本机接口准入点：它同时做 Host/Origin
+ * 校验（挡 DNS rebinding 和跨站请求）与浏览器令牌鉴权（挡没登录的本机网页）。
+ * 没有它，本机任意网页都能改会话豁免、峰谷规则和暂停方式。
+ *
+ * 拿不到 `connection`、或它自己抛错时一律拒绝（失败关闭），不退回到只检查
+ * Host/Origin/回环地址——那条路挡不住别的网页。
+ */
+export function admissionRejection(ctx, req) {
+  let connection;
+  try {
+    connection = Reflect.get(ctx, 'connection');
+  } catch {
+    return 403;
+  }
+  if (connection === undefined || connection === null || typeof connection.requestRejection !== 'function') {
+    return 403;
+  }
+  try {
+    return connection.requestRejection({ headers: req.headers }) ?? undefined;
+  } catch {
+    return 403;
+  }
+}
+
 export function apply(ctx, rawConfig = {}) {
   const config = { ...(rawConfig ?? {}), ...envConfig() };
   const guard = createGuard(ctx, config);
@@ -197,15 +238,19 @@ export function apply(ctx, rawConfig = {}) {
     };
   }, 'offpeak-guard: tools');
 
-  const webServer = ctx.get('webServer');
-  if (webServer !== undefined && typeof webServer.register === 'function') {
-    ctx.effect(
+  ctx.inject(['webServer', 'connection'], (webCtx) => {
+    webCtx.effect(
       () =>
-        webServer.register({
+        webCtx.webServer.register({
           kind: 'prefix',
           path: '/plugins/dsh-offpeak-guard',
           async handler(req, res) {
             try {
+              const rejection = admissionRejection(webCtx, req);
+              if (rejection !== undefined) {
+                sendJson(res, rejection, { ok: false, error: 'unauthorized' });
+                return;
+              }
               const url = new URL(req.url || '/', 'http://x');
               const rest = url.pathname.replace(/^\/plugins\/dsh-offpeak-guard/, '') || '/';
               if (req.method !== 'POST' || rest !== '/action') {
@@ -235,11 +280,12 @@ export function apply(ctx, rawConfig = {}) {
               }
               sendJson(res, 400, { ok: false, error: 'unknown action' });
             } catch (error) {
-              sendJson(res, 400, { ok: false, error: String(error?.message ?? error) });
+              const status = Number.isInteger(error?.statusCode) ? error.statusCode : 400;
+              sendJson(res, status, { ok: false, error: String(error?.message ?? error) });
             }
           },
         }),
       'offpeak-guard: settings route',
     );
-  }
+  });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-offpeak-guard",
-  "version": "0.3.1",
+  "version": "0.3.3",
   "description": "DeepSeek peak/off-peak pricing guard for DSH: detects the price window and current model, pauses running tasks at peak, resumes them automatically when off-peak begins, and schedules work for the next off-peak window.",
   "private": false,
   "type": "module",