@zhin.js/adapter-sandbox 6.0.0 → 6.0.1

package/CHANGELOG.md

@@ -1,5 +1,35 @@
 # @zhin.js/adapter-process
 
+## 6.0.1
+
+### Patch Changes
+
+- 5691aba: 第二轮全量审计修复批（8 面 ~60 bug）：
+
+  - **安全**：email 附件路径穿越修复（basename + downloadPath 约束）；lark/telegram/satori webhook 鉴权（缺密钥告警、timingSafeEqual、±5min 时效窗、chat_type 修正）；onebot wss/webhook 缺 token 告警；qq webhook 改原始字节验签；renderJsx/JSX 转义注入修复；console runtime token 401 死循环。
+  - **P0 功能**：sandbox 多 endpoint 解析 + WS 路径隔离；short-url expand（undici opaqueredirect）改 follow；AI 压缩摘要失败不再静默丢历史（熔断恢复生效）；console-ui 实时推送事件名归一化 + IndexedDB schema 对齐；process-monitor 热重载不再误判崩溃。
+  - **生命周期**：email IMAP 断线重连 + 在飞锁；onebot11/12 start 失败清理；line replyToken TTL + push 兜底；wechat-mp token 过期重试 + MsgId 去重；weixin-ilink buf 推进/防抖写盘/媒体 TTL/QR abort；satori PONG 看门狗；退避自毁修复。
+  - **游戏**：text-adventure 终局 restart 复活 + requires 服务端校验；tic-tac-toe PvP 占用/restart/队列清理/TTL；idiom-chain/word-riddle 闲聊不扣失误；别名中间件不劫持普通聊天。
+  - **共享库**：schema falsy 默认值/date/tuple/union 修复；database parseCondition Date/未知操作符、sqlite TEXT 往返、query 分派、belongsToMany 方言、migration dry-run；schedule DST 回拨死循环、重复 id 去重、flush 串行化；game-kit fallback 编号/onboarding 提示/尾缀边界/活引用拷贝。
+  - **渲染语音**：fetch 全部超时 + 渲染并发闸；sanitizeHtml form 保文本；STT 扩展名映射 + 删临时文件；TTS 未知 provider 报错；emojiCache LRU 负缓存/fontCache style/clearFonts 恢复；register 错误分类收窄。
+
+- Updated dependencies [cdf64e7]
+- Updated dependencies [2d0a159]
+- Updated dependencies [5691aba]
+- Updated dependencies [078e3f7]
+- Updated dependencies [9c997b2]
+- Updated dependencies [09d4f25]
+- Updated dependencies [f0ec5ab]
+- Updated dependencies [fa66c4c]
+- Updated dependencies [fa66c4c]
+- Updated dependencies [6cb6152]
+  - @zhin.js/plugin-runtime@1.1.1
+  - @zhin.js/host-http@1.0.3
+  - @zhin.js/client@2.1.1
+  - @zhin.js/adapter@1.1.1
+  - @zhin.js/core@1.4.1
+  - @zhin.js/page@1.0.3
+
 ## 6.0.0
 
 ### Patch Changes

package/README.md

@@ -23,19 +23,19 @@ pnpm add @zhin.js/adapter-sandbox
 - `@zhin.js/adapter` — 约定式 `adapters/sandbox.ts`
 - `@zhin.js/host-http` — Root 提供的 `httpHostToken`（WebSocket `/sandbox` + Console HTTP）
 - `@zhin.js/core` — `messageGatewayToken` / ImRuntime 入站出站
-- `@zhin.js/page` + `pages/sandbox.tsx` — ADR 0046 约定页（`definePage`）
+- `@zhin.js/page` + `pages/index.tsx` — ADR 0046 约定页（`definePage`；路由 `/sandbox`）
 
 Root 在 `zhin runtime start` 时装载 `@zhin.js/host-http`、`ConsoleRuntime` 与
 `ClientBuildModuleRuntime`。打开 `http://<host>:<port>/console` 可浏览页面；Sandbox 页
-（路由形如 `/…/p-sandbox`）内置 WebSocket `/sandbox` 聊天壳。
+（路由 `/sandbox`，与 WebSocket `/sandbox` 同 path：GET 开页、Upgrade 走 WS）内置聊天壳。
 
 旧 `client/`（`register(api)` / `pageManager.addEntry`）仅保留给 legacy Host 栈参考，
 **不是** Plugin Runtime 生产入口。
 
-### 旧 Host 栈（`zhin dev` / full-bot）
+### 旧 Host 栈（已删除）
+
+原 legacy 插件包 `@zhin.js/host-router`（HTTP 服务）与 `@zhin.js/host-api`（Host 侧 Console API，`addEntry` 注册 Sandbox 扩展）已删除；`zhin dev` 现由 `@zhin.js/cli` 自动装配 Console/HTTP Host（`@zhin.js/host-http` + `@zhin.js/pagemanager`），无需安装任何 Host 插件。
 
-- `@zhin.js/host-router` — HTTP 服务（提供 Router 和 WebSocket）
-- `@zhin.js/host-api` — Host 侧 Console API（`addEntry` 注册 Sandbox 扩展）
 - `@zhin.js/client` — Remote Console 客户端 SDK（UI 在 zhin-console 仓库）
 
 出站 wire 只做 JSON 封装；旧 `segment-mapper`（canonical segments）归一化上移到 gateway/core 渲染链。

package/adapters/sandbox.ts

@@ -15,6 +15,11 @@ export type { SandboxEndpointOptions } from '../src/endpoint.js';
 
 export default defineAdapter<SandboxAdapterConfig>({
   capabilities: ['inbound', 'outbound'],
+  // Console UI 直接渲染 base64 内联媒体；交互段由 Console 原生承载。
+  segments: {
+    outboundMedia: ['base64'],
+    interactive: 'native',
+  },
   create(context) {
     return new SandboxWsEndpoint({
       id: context.id,

package/lib/endpoint.d.ts

@@ -9,6 +9,10 @@ export interface SandboxEndpointOptions {
     readonly http: HttpHost;
     readonly defaults: ResolvedSandboxBot;
 }
+/**
+ * Sandbox 是本地开发/测试面，无平台社交图谱（好友/群/频道），
+ * 不适用 EndpointManagement 语义端口；本 endpoint 不暴露该端口。
+ */
 export declare class SandboxWsEndpoint implements EndpointInstance {
     #private;
     constructor(options: SandboxEndpointOptions);

package/lib/endpoint.js

@@ -5,10 +5,50 @@ import { randomUUID } from 'node:crypto';
 import { formatCompact, getLogger } from '@zhin.js/logger';
 import { bindSandboxWsSocket, formatSandboxOutbound, parseSandboxWsPayload, whenWsOpen, } from './protocol.js';
 const logger = getLogger('sandbox');
+/**
+ * 多 sandbox endpoint 共用同一个 HttpHost 时，同 path 的所有 WS listener
+ * 都会被回调（入站重复、出站互窜）。按 endpoint 名隔离挂载路径：
+ * 首个占用 `/sandbox`（保持 Console 默认兼容），其余退到 `/sandbox/<name>`。
+ * 认领记录按 HttpHost 隔离，endpoint stop() 时必须 release。
+ */
+const claimedWsPaths = new WeakMap();
+function claimSandboxWsPath(http, name) {
+    let claims = claimedWsPaths.get(http);
+    if (!claims) {
+        claims = new Map();
+        claimedWsPaths.set(http, claims);
+    }
+    const candidates = ['/sandbox', `/sandbox/${encodeURIComponent(name)}`];
+    let path = candidates.find((candidate) => !claims.has(candidate) || claims.get(candidate) === name);
+    if (!path) {
+        let index = 2;
+        path = `/sandbox/${encodeURIComponent(name)}-${index}`;
+        while (claims.has(path)) {
+            index += 1;
+            path = `/sandbox/${encodeURIComponent(name)}-${index}`;
+        }
+    }
+    claims.set(path, name);
+    const claimed = path;
+    const registry = claims;
+    return {
+        path: claimed,
+        release: () => {
+            if (registry.get(claimed) === name)
+                registry.delete(claimed);
+        },
+    };
+}
+/**
+ * Sandbox 是本地开发/测试面，无平台社交图谱（好友/群/频道），
+ * 不适用 EndpointManagement 语义端口；本 endpoint 不暴露该端口。
+ */
 export class SandboxWsEndpoint {
     #options;
     #connections = new Map();
     #wsHandleRelease;
+    #wsPathRelease;
+    #wsPath = '/sandbox';
     #open = false;
     #started = false;
     constructor(options) {
@@ -22,7 +62,11 @@ export class SandboxWsEndpoint {
         if (this.#started)
             return;
         this.#started = true;
-        const handle = this.#options.http.ws('/sandbox');
+        // 多 endpoint 同 path 会被全部回调（入站重复、出站互窜），按名隔离。
+        const claim = claimSandboxWsPath(this.#options.http, this.#options.defaults.name);
+        this.#wsPathRelease = claim.release;
+        this.#wsPath = claim.path;
+        const handle = this.#options.http.ws(claim.path);
         this.#wsHandleRelease = handle.onConnection((connection) => {
             this.#acceptConnection(connection);
         });
@@ -31,7 +75,7 @@ export class SandboxWsEndpoint {
         }
         logger.info(formatCompact({
             op: 'sandbox_ws_mounted',
-            path: '/sandbox',
+            path: claim.path,
             endpoint: this.#options.defaults.name,
         }));
     }
@@ -45,6 +89,8 @@ export class SandboxWsEndpoint {
         this.#open = false;
         this.#wsHandleRelease?.();
         this.#wsHandleRelease = undefined;
+        this.#wsPathRelease?.();
+        this.#wsPathRelease = undefined;
         for (const connection of this.#connections.values()) {
             connection.release();
             if (!connection.placeholder) {
@@ -194,7 +240,7 @@ export class SandboxWsEndpoint {
                         data: {
                             text: [
                                 `已连接 Sandbox「${target}」`,
-                                '与 Node Host 控制台沙盒协议一致（/sandbox）',
+                                `与 Node Host 控制台沙盒协议一致（${this.#wsPath}）`,
                                 '命令: help · ping · zt · status',
                             ].join('\n'),
                         },

package/lib/protocol.d.ts

@@ -19,6 +19,11 @@ export type ResolvedSandboxBot = {
     readonly randomNamePerConnection: boolean;
 };
 export interface SandboxAdapterConfig {
+    /** Runtime expands `endpoints[i]` onto the top level — prefer these. */
+    readonly context?: string;
+    readonly name?: string;
+    readonly owner?: string;
+    /** Legacy shape: endpoint entries nested under `endpoints[]`. */
     readonly endpoints?: ReadonlyArray<{
         readonly context?: string;
         readonly name?: string;

package/lib/protocol.js

@@ -1,9 +1,14 @@
 /** Sandbox WebSocket wire protocol helpers (no legacy Adapter/Endpoint). */
 export function resolveSandboxEndpoint(appConfig) {
     const entry = appConfig.endpoints?.find((item) => item.context === 'sandbox');
-    const fixedName = typeof entry?.name === 'string' ? entry.name : undefined;
+    const fixedName = typeof appConfig.name === 'string' && appConfig.name
+        ? appConfig.name
+        : typeof entry?.name === 'string' && entry.name
+            ? entry.name
+            : undefined;
     const name = fixedName || process.env.SANDBOX_BOT_NAME || 'sandbox-bot';
-    const owner = (typeof entry?.owner === 'string' && entry.owner)
+    const owner = (typeof appConfig.owner === 'string' && appConfig.owner)
+        || (typeof entry?.owner === 'string' && entry.owner)
         || process.env.SANDBOX_BOT_OWNER
         || 'sandbox-user';
     return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhin.js/adapter-sandbox",
-  "version": "6.0.0",
+  "version": "6.0.1",
   "description": "Zhin.js Sandbox adapter for Plugin Runtime (WebSocket /sandbox)",
   "type": "module",
   "main": "./lib/index.js",
@@ -48,14 +48,14 @@
   "dependencies": {
     "lucide-react": "^0.525.0",
     "react": "^19.1.0",
-    "@zhin.js/client": "2.1.0",
+    "@zhin.js/adapter": "1.1.1",
+    "@zhin.js/client": "2.1.1",
     "@zhin.js/console-contract": "1.0.0",
-    "@zhin.js/adapter": "1.1.0",
-    "@zhin.js/core": "1.4.0",
-    "@zhin.js/host-http": "1.0.2",
+    "@zhin.js/core": "1.4.1",
+    "@zhin.js/host-http": "1.0.3",
     "@zhin.js/logger": "1.0.75",
-    "@zhin.js/page": "1.0.2",
-    "@zhin.js/plugin-runtime": "1.1.0"
+    "@zhin.js/page": "1.0.3",
+    "@zhin.js/plugin-runtime": "1.1.1"
   },
   "devDependencies": {
     "@types/react": "^19.1.8",
@@ -63,18 +63,18 @@
     "typescript": "^6.0.3",
     "vitest": "^4.1.10",
     "ws": "^8.21.0",
-    "@zhin.js/pagemanager": "2.0.5",
-    "@zhin.js/runtime": "1.0.2"
+    "@zhin.js/pagemanager": "2.0.6",
+    "@zhin.js/runtime": "1.0.3"
   },
   "peerDependencies": {
     "react": "^19.0.0",
-    "@zhin.js/adapter": "1.1.0",
-    "@zhin.js/client": "2.1.0",
+    "@zhin.js/adapter": "1.1.1",
+    "@zhin.js/client": "2.1.1",
     "@zhin.js/console-contract": "1.0.0",
-    "@zhin.js/core": "1.4.0",
-    "@zhin.js/host-http": "1.0.2",
-    "@zhin.js/page": "1.0.2",
-    "@zhin.js/plugin-runtime": "1.1.0"
+    "@zhin.js/core": "1.4.1",
+    "@zhin.js/host-http": "1.0.3",
+    "@zhin.js/page": "1.0.3",
+    "@zhin.js/plugin-runtime": "1.1.1"
   },
   "peerDependenciesMeta": {
     "react": {

package/pages/{sandbox.tsx → index.tsx}

@@ -9,6 +9,7 @@ export const meta = definePage({
 
 /**
  * Convention page entry (ADR 0046).
+ * `pages/index.tsx` → `/sandbox` (plugin path; no `/p-` leaf).
  * Restores the pre-runtime-migration Sandbox console UI (channels + rich text + faces).
  * WebSocket targets Host `/sandbox` via zhin_api_base + token (see sandboxTransport.ts).
  */

package/src/endpoint.ts

@@ -18,6 +18,46 @@ import {
 
 const logger = getLogger('sandbox');
 
+/**
+ * 多 sandbox endpoint 共用同一个 HttpHost 时，同 path 的所有 WS listener
+ * 都会被回调（入站重复、出站互窜）。按 endpoint 名隔离挂载路径：
+ * 首个占用 `/sandbox`（保持 Console 默认兼容），其余退到 `/sandbox/<name>`。
+ * 认领记录按 HttpHost 隔离，endpoint stop() 时必须 release。
+ */
+const claimedWsPaths = new WeakMap<HttpHost, Map<string, string>>();
+
+function claimSandboxWsPath(
+  http: HttpHost,
+  name: string,
+): { readonly path: string; readonly release: () => void } {
+  let claims = claimedWsPaths.get(http);
+  if (!claims) {
+    claims = new Map();
+    claimedWsPaths.set(http, claims);
+  }
+  const candidates = ['/sandbox', `/sandbox/${encodeURIComponent(name)}`];
+  let path = candidates.find(
+    (candidate) => !claims!.has(candidate) || claims!.get(candidate) === name,
+  );
+  if (!path) {
+    let index = 2;
+    path = `/sandbox/${encodeURIComponent(name)}-${index}`;
+    while (claims.has(path)) {
+      index += 1;
+      path = `/sandbox/${encodeURIComponent(name)}-${index}`;
+    }
+  }
+  claims.set(path, name);
+  const claimed = path;
+  const registry = claims;
+  return {
+    path: claimed,
+    release: () => {
+      if (registry.get(claimed) === name) registry.delete(claimed);
+    },
+  };
+}
+
 interface SandboxChannel {
   readonly type: string;
   readonly id: string;
@@ -44,10 +84,16 @@ export interface SandboxEndpointOptions {
   readonly defaults: ResolvedSandboxBot;
 }
 
+/**
+ * Sandbox 是本地开发/测试面，无平台社交图谱（好友/群/频道），
+ * 不适用 EndpointManagement 语义端口；本 endpoint 不暴露该端口。
+ */
 export class SandboxWsEndpoint implements EndpointInstance {
   readonly #options: SandboxEndpointOptions;
   readonly #connections = new Map<string, SandboxConnection>();
   #wsHandleRelease?: () => void;
+  #wsPathRelease?: () => void;
+  #wsPath = '/sandbox';
   #open = false;
   #started = false;
 
@@ -63,7 +109,11 @@ export class SandboxWsEndpoint implements EndpointInstance {
   start(): void {
     if (this.#started) return;
     this.#started = true;
-    const handle = this.#options.http.ws('/sandbox');
+    // 多 endpoint 同 path 会被全部回调（入站重复、出站互窜），按名隔离。
+    const claim = claimSandboxWsPath(this.#options.http, this.#options.defaults.name);
+    this.#wsPathRelease = claim.release;
+    this.#wsPath = claim.path;
+    const handle = this.#options.http.ws(claim.path);
     this.#wsHandleRelease = handle.onConnection((connection) => {
       this.#acceptConnection(connection);
     });
@@ -72,7 +122,7 @@ export class SandboxWsEndpoint implements EndpointInstance {
     }
     logger.info(formatCompact({
       op: 'sandbox_ws_mounted',
-      path: '/sandbox',
+      path: claim.path,
       endpoint: this.#options.defaults.name,
     }));
   }
@@ -89,6 +139,8 @@ export class SandboxWsEndpoint implements EndpointInstance {
     this.#open = false;
     this.#wsHandleRelease?.();
     this.#wsHandleRelease = undefined;
+    this.#wsPathRelease?.();
+    this.#wsPathRelease = undefined;
     for (const connection of this.#connections.values()) {
       connection.release();
       if (!connection.placeholder) {
@@ -237,7 +289,7 @@ export class SandboxWsEndpoint implements EndpointInstance {
           data: {
             text: [
               `已连接 Sandbox「${target}」`,
-              '与 Node Host 控制台沙盒协议一致（/sandbox）',
+              `与 Node Host 控制台沙盒协议一致（${this.#wsPath}）`,
               '命令: help · ping · zt · status',
             ].join('\n'),
           },

package/src/protocol.ts

@@ -33,6 +33,11 @@ export type ResolvedSandboxBot = {
 };
 
 export interface SandboxAdapterConfig {
+  /** Runtime expands `endpoints[i]` onto the top level — prefer these. */
+  readonly context?: string;
+  readonly name?: string;
+  readonly owner?: string;
+  /** Legacy shape: endpoint entries nested under `endpoints[]`. */
   readonly endpoints?: ReadonlyArray<{
     readonly context?: string;
     readonly name?: string;
@@ -44,9 +49,14 @@ export function resolveSandboxEndpoint(
   appConfig: SandboxAdapterConfig,
 ): ResolvedSandboxBot {
   const entry = appConfig.endpoints?.find((item) => item.context === 'sandbox');
-  const fixedName = typeof entry?.name === 'string' ? entry.name : undefined;
+  const fixedName = typeof appConfig.name === 'string' && appConfig.name
+    ? appConfig.name
+    : typeof entry?.name === 'string' && entry.name
+      ? entry.name
+      : undefined;
   const name = fixedName || process.env.SANDBOX_BOT_NAME || 'sandbox-bot';
-  const owner = (typeof entry?.owner === 'string' && entry.owner)
+  const owner = (typeof appConfig.owner === 'string' && appConfig.owner)
+    || (typeof entry?.owner === 'string' && entry.owner)
     || process.env.SANDBOX_BOT_OWNER
     || 'sandbox-user';
   return {