@zhin.js/host-http 1.0.3 → 1.0.5

package/lib/console-rest-pages.js

@@ -17,8 +17,7 @@ export function registerConsoleRestPages(host, ctx, options = {}) {
     const base = normalizeBase(options.apiBase ?? '/api');
     const fetchFn = options.fetchFn ?? fetch;
     const pluginRegistryUrl = options.pluginRegistryUrl ?? 'https://zhin.js.org/plugins.json';
-    const npmRegistryUrl = (options.npmRegistryUrl ?? 'https://registry.npmmirror.com')
-        .replace(/\/+$/u, '');
+    const npmRegistryUrl = trimTrailingSlashes(options.npmRegistryUrl ?? 'https://registry.npmmirror.com');
     const disposers = [];
     const route = (method, path, handler, meta) => {
         const dispose = host.route(method, path, handler, meta);
@@ -672,10 +671,16 @@ function decodePathParam(raw) {
         return raw;
     }
 }
+function trimTrailingSlashes(s) {
+    let i = s.length;
+    while (i > 0 && s[i - 1] === '/')
+        i--;
+    return s.slice(0, i);
+}
 function normalizeBase(value) {
     if (!value.startsWith('/'))
         return `/${value}`;
-    return value.replace(/\/+$/u, '') || '/api';
+    return trimTrailingSlashes(value) || '/api';
 }
 function writeJson(response, status, body) {
     const payload = JSON.stringify(body);

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.3",
+  "version": "1.0.5",
   "description": "Minimal HTTP and WebSocket host for Plugin Runtime (no Koa)",
   "type": "module",
   "main": "./lib/index.js",
@@ -17,13 +17,14 @@
     "src"
   ],
   "dependencies": {
-    "ws": "^8.21.0",
+    "ws": "^8.21.1",
     "@zhin.js/console-protocol": "1.1.0",
+    "@zhin.js/host-http-contract": "1.0.0",
     "@zhin.js/logger": "1.0.75",
-    "@zhin.js/plugin-runtime": "1.1.1"
+    "@zhin.js/plugin-runtime": "1.1.2"
   },
   "devDependencies": {
-    "@types/node": "^26.1.0",
+    "@types/node": "^26.1.2",
     "@types/ws": "^8.18.1",
     "typescript": "^6.0.3"
   },

package/src/console-rest-pages.ts

@@ -128,8 +128,9 @@ export function registerConsoleRestPages(
   const base = normalizeBase(options.apiBase ?? '/api');
   const fetchFn = options.fetchFn ?? fetch;
   const pluginRegistryUrl = options.pluginRegistryUrl ?? 'https://zhin.js.org/plugins.json';
-  const npmRegistryUrl = (options.npmRegistryUrl ?? 'https://registry.npmmirror.com')
-    .replace(/\/+$/u, '');
+  const npmRegistryUrl = trimTrailingSlashes(
+    options.npmRegistryUrl ?? 'https://registry.npmmirror.com',
+  );
   const disposers: Array<() => void> = [];
   const route: typeof host.route = (method, path, handler, meta) => {
     const dispose = host.route(method, path, handler, meta);
@@ -874,9 +875,15 @@ function decodePathParam(raw: string): string {
   }
 }
 
+function trimTrailingSlashes(s: string): string {
+  let i = s.length;
+  while (i > 0 && s[i - 1] === '/') i--;
+  return s.slice(0, i);
+}
+
 function normalizeBase(value: string): string {
   if (!value.startsWith('/')) return `/${value}`;
-  return value.replace(/\/+$/u, '') || '/api';
+  return trimTrailingSlashes(value) || '/api';
 }
 
 function writeJson(response: ServerResponse, status: number, body: unknown): void {

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';