@zhin.js/host-http 1.0.4 → 1.0.6

package/lib/console-rpc.d.ts

@@ -2,6 +2,20 @@ import type { AuthScope } from './token-registry.js';
 import type { DatabaseHostConsole } from '@zhin.js/plugin-runtime';
 import { type ConsoleEndpointSummary } from '@zhin.js/console-protocol';
 import { type ConsoleRpcExtendedCtx } from './console-rpc-extended.js';
+/**
+ * Console RPC 请求结构：未锚定 endpoint 的会话地址（结构对齐
+ * `Omit<ConversationRef,'endpoint'>`；host/http 架构分层不允许依赖
+ * `@zhin.js/im-contract`，故本地结构化声明，endpoint 由 ImRuntime 锚定）。
+ */
+export interface ConversationAddress {
+    readonly kind: 'private' | 'group' | 'channel';
+    readonly id: string;
+    readonly parent?: Readonly<{
+        readonly kind: 'group' | 'channel';
+        readonly id: string;
+    }>;
+    readonly threadId?: string;
+}
 export type RuntimeConsoleRpcMessage = {
     readonly type?: unknown;
     readonly requestId?: unknown;
@@ -83,14 +97,8 @@ export type RuntimeDatabaseInfo = {
 export type RuntimeEndpointSendInput = {
     readonly adapter: string;
     readonly endpointId: string;
-    readonly channelId: string;
-    readonly channelType: string;
+    readonly conversation: ConversationAddress;
     readonly content: unknown;
-    readonly parent?: {
-        type?: string;
-        id?: string;
-        name?: string;
-    };
 };
 export declare function pickRpcReply(message: RuntimeConsoleRpcMessage, payloads: readonly RuntimeConsoleRpcReply[]): RuntimeConsoleRpcReply | null;
 export declare function dispatchRuntimeConsoleRpc(message: RuntimeConsoleRpcMessage, ctx: RuntimeConsoleRpcContext): Promise<RuntimeConsoleRpcReply[]>;

package/lib/console-rpc.js

@@ -1,5 +1,22 @@
 import { assertDemoConsoleRpcAllowed, endpointSendResult, normalizeConsoleRpcMessage, } from '@zhin.js/console-protocol';
 import { dispatchExtendedConsoleRpc } from './console-rpc-extended.js';
+/** `$channel_type`/`$channel_id`/`$parent` wire 字段 → 会话地址（RPC 边界组帧）。 */
+function wireConversation(channelType, channelId, parent) {
+    // console 旧 wire 允许 channel_id 自带场景前缀（`group:123`），解析结果优先
+    const prefixed = /^(private|group|channel|direct|c2c|temp):(.+)$/iu.exec(channelId);
+    const rawKind = channelType || prefixed?.[1] || 'private';
+    const kind = rawKind === 'group' || rawKind === 'channel' ? rawKind : 'private';
+    const wire = parent && typeof parent === 'object'
+        ? parent
+        : undefined;
+    const parentKind = wire?.type === 'group' || wire?.type === 'channel' ? wire.type : undefined;
+    const parentId = typeof wire?.id === 'string' && wire.id ? wire.id : undefined;
+    return {
+        kind,
+        id: prefixed ? prefixed[2] : channelId,
+        ...(parentKind && parentId ? { parent: { kind: parentKind, id: parentId } } : {}),
+    };
+}
 export function pickRpcReply(message, payloads) {
     const requestId = message.requestId;
     return ((requestId != null ? payloads.find((payload) => payload.requestId === requestId) : undefined)
@@ -557,8 +574,7 @@ export async function dispatchRuntimeConsoleRpc(message, ctx) {
                 const channelId = String(data.$channel_id ?? '');
                 const channelType = String(data.$channel_type ?? '');
                 const content = data.$content;
-                // channelType is optional: ImRuntime tolerates an empty value and
-                // targets the bare channel id (parity with the legacy RPC handler).
+                // channelType 可省：wireConversation 归一为 private（与旧 RPC 行为对齐）。
                 if (!adapter || !endpointId || !channelId || content === undefined) {
                     emit({
                         requestId,
@@ -573,10 +589,8 @@ export async function dispatchRuntimeConsoleRpc(message, ctx) {
                 const result = await ctx.sendEndpointMessage({
                     adapter,
                     endpointId,
-                    channelId,
-                    channelType,
+                    conversation: wireConversation(channelType, channelId, data.$parent),
                     content,
-                    parent: data.$parent,
                 });
                 // Legacy contract: { message_id }. Keep messageId for new callers.
                 emit({ requestId, data: endpointSendResult(result.messageId) });

package/lib/json-body.d.ts

@@ -1,12 +1,2 @@
-import type { IncomingMessage } from 'node:http';
-export declare class HttpBodyError extends Error {
-    readonly statusCode: number;
-    constructor(message: string, statusCode?: number);
-}
-/**
- * Read and parse a JSON request body with a size limit (default 1 MiB).
- * Empty bodies become `undefined`.
- */
-export declare function readJsonBody<T = unknown>(request: IncomingMessage, options?: {
-    readonly limit?: number;
-}): Promise<T | undefined>;
+/** @deprecated Import from @zhin.js/host-http-contract in protocol hosts. */
+export { HttpBodyError, readJsonBody } from '@zhin.js/host-http-contract';

package/lib/json-body.js

@@ -1,45 +1,2 @@
-export class HttpBodyError extends Error {
-    statusCode;
-    constructor(message, statusCode = 400) {
-        super(message);
-        this.statusCode = statusCode;
-        this.name = 'HttpBodyError';
-    }
-}
-/**
- * Read and parse a JSON request body with a size limit (default 1 MiB).
- * Empty bodies become `undefined`.
- */
-export async function readJsonBody(request, options = {}) {
-    const limit = options.limit ?? 1_048_576;
-    const chunks = [];
-    let size = 0;
-    let exceeded = false;
-    for await (const chunk of request) {
-        // 超限后继续 drain 到 end：提前 break 会 destroy 底层 socket，
-        // 客户端将永远收不到后面的 413 响应。
-        if (exceeded)
-            continue;
-        const buffer = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk);
-        size += buffer.length;
-        if (size > limit) {
-            exceeded = true;
-            chunks.length = 0;
-            continue;
-        }
-        chunks.push(buffer);
-    }
-    if (exceeded)
-        throw new HttpBodyError(`Request body exceeds ${limit} bytes`, 413);
-    if (chunks.length === 0)
-        return undefined;
-    const raw = Buffer.concat(chunks).toString('utf8').trim();
-    if (!raw)
-        return undefined;
-    try {
-        return JSON.parse(raw);
-    }
-    catch {
-        throw new HttpBodyError('Invalid JSON body', 400);
-    }
-}
+/** @deprecated Import from @zhin.js/host-http-contract in protocol hosts. */
+export { HttpBodyError, readJsonBody } from '@zhin.js/host-http-contract';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhin.js/host-http",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "Minimal HTTP and WebSocket host for Plugin Runtime (no Koa)",
   "type": "module",
   "main": "./lib/index.js",
@@ -19,8 +19,9 @@
   "dependencies": {
     "ws": "^8.21.1",
     "@zhin.js/console-protocol": "1.1.0",
-    "@zhin.js/plugin-runtime": "1.1.1",
-    "@zhin.js/logger": "1.0.75"
+    "@zhin.js/host-http-contract": "1.0.0",
+    "@zhin.js/logger": "1.0.75",
+    "@zhin.js/plugin-runtime": "1.1.3"
   },
   "devDependencies": {
     "@types/node": "^26.1.2",

package/src/console-rpc.ts

@@ -8,6 +8,44 @@ import {
 } from '@zhin.js/console-protocol';
 import { dispatchExtendedConsoleRpc, type ConsoleRpcExtendedCtx } from './console-rpc-extended.js';
 
+/**
+ * Console RPC 请求结构：未锚定 endpoint 的会话地址（结构对齐
+ * `Omit<ConversationRef,'endpoint'>`；host/http 架构分层不允许依赖
+ * `@zhin.js/im-contract`，故本地结构化声明，endpoint 由 ImRuntime 锚定）。
+ */
+export interface ConversationAddress {
+  readonly kind: 'private' | 'group' | 'channel';
+  readonly id: string;
+  readonly parent?: Readonly<{
+    readonly kind: 'group' | 'channel';
+    readonly id: string;
+  }>;
+  readonly threadId?: string;
+}
+
+/** `$channel_type`/`$channel_id`/`$parent` wire 字段 → 会话地址（RPC 边界组帧）。 */
+function wireConversation(
+  channelType: string,
+  channelId: string,
+  parent: unknown,
+): ConversationAddress {
+  // console 旧 wire 允许 channel_id 自带场景前缀（`group:123`），解析结果优先
+  const prefixed = /^(private|group|channel|direct|c2c|temp):(.+)$/iu.exec(channelId);
+  const rawKind = channelType || prefixed?.[1] || 'private';
+  const kind: ConversationAddress['kind'] =
+    rawKind === 'group' || rawKind === 'channel' ? rawKind : 'private';
+  const wire = parent && typeof parent === 'object'
+    ? parent as { readonly type?: unknown; readonly id?: unknown }
+    : undefined;
+  const parentKind = wire?.type === 'group' || wire?.type === 'channel' ? wire.type : undefined;
+  const parentId = typeof wire?.id === 'string' && wire.id ? wire.id : undefined;
+  return {
+    kind,
+    id: prefixed ? prefixed[2]! : channelId,
+    ...(parentKind && parentId ? { parent: { kind: parentKind, id: parentId } } : {}),
+  };
+}
+
 export type RuntimeConsoleRpcMessage = {
   readonly type?: unknown;
   readonly requestId?: unknown;
@@ -86,10 +124,8 @@ export type RuntimeDatabaseInfo = {
 export type RuntimeEndpointSendInput = {
   readonly adapter: string;
   readonly endpointId: string;
-  readonly channelId: string;
-  readonly channelType: string;
+  readonly conversation: ConversationAddress;
   readonly content: unknown;
-  readonly parent?: { type?: string; id?: string; name?: string };
 };
 
 export function pickRpcReply(
@@ -625,8 +661,7 @@ export async function dispatchRuntimeConsoleRpc(
         const channelId = String(data.$channel_id ?? '');
         const channelType = String(data.$channel_type ?? '');
         const content = data.$content;
-        // channelType is optional: ImRuntime tolerates an empty value and
-        // targets the bare channel id (parity with the legacy RPC handler).
+        // channelType 可省：wireConversation 归一为 private（与旧 RPC 行为对齐）。
         if (!adapter || !endpointId || !channelId || content === undefined) {
           emit({
             requestId,
@@ -641,11 +676,8 @@ export async function dispatchRuntimeConsoleRpc(
         const result = await ctx.sendEndpointMessage({
           adapter,
           endpointId,
-          channelId,
-          channelType,
+          conversation: wireConversation(channelType, channelId, data.$parent),
           content,
-          parent: data.$parent as
-            { type?: string; id?: string; name?: string } | undefined,
         });
         // Legacy contract: { message_id }. Keep messageId for new callers.
         emit({ requestId, data: endpointSendResult(result.messageId) });

package/src/json-body.ts

@@ -1,47 +1,2 @@
-import type { IncomingMessage } from 'node:http';
-
-export class HttpBodyError extends Error {
-  constructor(
-    message: string,
-    readonly statusCode: number = 400,
-  ) {
-    super(message);
-    this.name = 'HttpBodyError';
-  }
-}
-
-/**
- * Read and parse a JSON request body with a size limit (default 1 MiB).
- * Empty bodies become `undefined`.
- */
-export async function readJsonBody<T = unknown>(
-  request: IncomingMessage,
-  options: { readonly limit?: number } = {},
-): Promise<T | undefined> {
-  const limit = options.limit ?? 1_048_576;
-  const chunks: Buffer[] = [];
-  let size = 0;
-  let exceeded = false;
-  for await (const chunk of request) {
-    // 超限后继续 drain 到 end：提前 break 会 destroy 底层 socket，
-    // 客户端将永远收不到后面的 413 响应。
-    if (exceeded) continue;
-    const buffer = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk);
-    size += buffer.length;
-    if (size > limit) {
-      exceeded = true;
-      chunks.length = 0;
-      continue;
-    }
-    chunks.push(buffer);
-  }
-  if (exceeded) throw new HttpBodyError(`Request body exceeds ${limit} bytes`, 413);
-  if (chunks.length === 0) return undefined;
-  const raw = Buffer.concat(chunks).toString('utf8').trim();
-  if (!raw) return undefined;
-  try {
-    return JSON.parse(raw) as T;
-  } catch {
-    throw new HttpBodyError('Invalid JSON body', 400);
-  }
-}
+/** @deprecated Import from @zhin.js/host-http-contract in protocol hosts. */
+export { HttpBodyError, readJsonBody } from '@zhin.js/host-http-contract';