@h-ai/serv 0.1.0-alpha.56 → 0.1.0-alpha.58

package/dist/features/storage.d.ts

@@ -2,7 +2,7 @@ import * as _orpc_server from '@orpc/server';
 import * as zod_v4_core from 'zod/v4/core';
 import * as zod from 'zod';
 import { StorageFunctions } from '@h-ai/storage';
-import { a as ServContext } from '../serv-context-jc3rZxbj.js';
+import { S as ServContext } from '../serv-context-CkbS0M9G.js';
 import '@h-ai/core';
 
 /** Storage 默认 procedures 依赖。 */
@@ -11,8 +11,8 @@ interface StorageProcedureDeps {
 }
 /** 创建 Storage 默认 procedures。 */
 declare function createStorageProcedures(deps: StorageProcedureDeps): {
-    presignedUrls: _orpc_server.Lazyable<{
-        createDownload: _orpc_server.Lazyable<_orpc_server.Procedure<ServContext & {}, any, zod.ZodObject<{
+    presignedUrls: {
+        createDownload: _orpc_server.Procedure<ServContext & {}, any, zod.ZodObject<{
             key: zod.ZodString;
             expiresIn: zod.ZodOptional<zod.ZodNumber>;
         }, zod_v4_core.$strip>, zod.ZodDiscriminatedUnion<[zod.ZodObject<{
@@ -34,8 +34,8 @@ declare function createStorageProcedures(deps: StorageProcedureDeps): {
                 suggestion: zod.ZodOptional<zod.ZodString>;
                 ext: zod.ZodOptional<zod.ZodRecord<zod.ZodString, zod.ZodUnknown>>;
             }, zod_v4_core.$strip>;
-        }, zod_v4_core.$strip>], "success">, Record<never, never>, Record<never, never>>>;
-        createUpload: _orpc_server.Lazyable<_orpc_server.Procedure<ServContext & {}, any, zod.ZodObject<{
+        }, zod_v4_core.$strip>], "success">, Record<never, never>, Record<never, never>>;
+        createUpload: _orpc_server.Procedure<ServContext & {}, any, zod.ZodObject<{
             key: zod.ZodString;
             contentType: zod.ZodOptional<zod.ZodString>;
             contentLength: zod.ZodOptional<zod.ZodNumber>;
@@ -59,10 +59,10 @@ declare function createStorageProcedures(deps: StorageProcedureDeps): {
                 suggestion: zod.ZodOptional<zod.ZodString>;
                 ext: zod.ZodOptional<zod.ZodRecord<zod.ZodString, zod.ZodUnknown>>;
             }, zod_v4_core.$strip>;
-        }, zod_v4_core.$strip>], "success">, Record<never, never>, Record<never, never>>>;
-    }>;
-    files: _orpc_server.Lazyable<{
-        list: _orpc_server.Lazyable<_orpc_server.Procedure<ServContext & {}, any, zod.ZodObject<{
+        }, zod_v4_core.$strip>], "success">, Record<never, never>, Record<never, never>>;
+    };
+    files: {
+        list: _orpc_server.Procedure<ServContext & {}, any, zod.ZodObject<{
             prefix: zod.ZodOptional<zod.ZodString>;
             maxKeys: zod.ZodOptional<zod.ZodCoercedNumber<unknown>>;
             continuationToken: zod.ZodOptional<zod.ZodString>;
@@ -94,8 +94,8 @@ declare function createStorageProcedures(deps: StorageProcedureDeps): {
                 suggestion: zod.ZodOptional<zod.ZodString>;
                 ext: zod.ZodOptional<zod.ZodRecord<zod.ZodString, zod.ZodUnknown>>;
             }, zod_v4_core.$strip>;
-        }, zod_v4_core.$strip>], "success">, Record<never, never>, Record<never, never>>>;
-        getMetadata: _orpc_server.Lazyable<_orpc_server.Procedure<ServContext & {}, any, zod.ZodObject<{
+        }, zod_v4_core.$strip>], "success">, Record<never, never>, Record<never, never>>;
+        getMetadata: _orpc_server.Procedure<ServContext & {}, any, zod.ZodObject<{
             key: zod.ZodString;
         }, zod_v4_core.$strip>, zod.ZodDiscriminatedUnion<[zod.ZodObject<{
             success: zod.ZodLiteral<true>;
@@ -119,8 +119,8 @@ declare function createStorageProcedures(deps: StorageProcedureDeps): {
                 suggestion: zod.ZodOptional<zod.ZodString>;
                 ext: zod.ZodOptional<zod.ZodRecord<zod.ZodString, zod.ZodUnknown>>;
             }, zod_v4_core.$strip>;
-        }, zod_v4_core.$strip>], "success">, Record<never, never>, Record<never, never>>>;
-        delete: _orpc_server.Lazyable<_orpc_server.Procedure<ServContext & {}, any, zod.ZodObject<{
+        }, zod_v4_core.$strip>], "success">, Record<never, never>, Record<never, never>>;
+        delete: _orpc_server.Procedure<ServContext & {}, any, zod.ZodObject<{
             key: zod.ZodString;
         }, zod_v4_core.$strip>, zod.ZodDiscriminatedUnion<[zod.ZodObject<{
             success: zod.ZodLiteral<true>;
@@ -137,8 +137,8 @@ declare function createStorageProcedures(deps: StorageProcedureDeps): {
                 suggestion: zod.ZodOptional<zod.ZodString>;
                 ext: zod.ZodOptional<zod.ZodRecord<zod.ZodString, zod.ZodUnknown>>;
             }, zod_v4_core.$strip>;
-        }, zod_v4_core.$strip>], "success">, Record<never, never>, Record<never, never>>>;
-        deleteMany: _orpc_server.Lazyable<_orpc_server.Procedure<ServContext & {}, any, zod.ZodObject<{
+        }, zod_v4_core.$strip>], "success">, Record<never, never>, Record<never, never>>;
+        deleteMany: _orpc_server.Procedure<ServContext & {}, any, zod.ZodObject<{
             keys: zod.ZodArray<zod.ZodString>;
         }, zod_v4_core.$strip>, zod.ZodDiscriminatedUnion<[zod.ZodObject<{
             success: zod.ZodLiteral<true>;
@@ -155,8 +155,8 @@ declare function createStorageProcedures(deps: StorageProcedureDeps): {
                 suggestion: zod.ZodOptional<zod.ZodString>;
                 ext: zod.ZodOptional<zod.ZodRecord<zod.ZodString, zod.ZodUnknown>>;
             }, zod_v4_core.$strip>;
-        }, zod_v4_core.$strip>], "success">, Record<never, never>, Record<never, never>>>;
-    }>;
+        }, zod_v4_core.$strip>], "success">, Record<never, never>, Record<never, never>>;
+    };
 };
 
 export { type StorageProcedureDeps, createStorageProcedures };

package/dist/features/storage.js

@@ -1,5 +1,5 @@
 import { mapHaiResult } from '../chunk-27PCPE37.js';
-import { implement, servM } from '../chunk-KIWHKWLD.js';
+import { implement, servM } from '../chunk-R354OMWL.js';
 import { apiContract } from '@h-ai/api-contract';
 import { ok, err, HaiCommonError } from '@h-ai/core';
 

package/dist/index.d.ts

@@ -2,9 +2,9 @@ import * as _h_ai_core from '@h-ai/core';
 import { HaiResult, ValidationFormError } from '@h-ai/core';
 import { AIFunctions, AudioWsStartMessage, AudioFormat } from '@h-ai/ai';
 import { AnyContractRouter, OpenAPI } from '@orpc/contract';
-import { ProcedureHandler, ErrorMap, Meta, ProcedureHandlerOptions, ORPCErrorConstructorMap, Router, ContractRouter, Context, ContractProcedure, InferSchemaInput, InferSchemaOutput } from '@orpc/server';
-import { S as ServSession, a as ServContext, b as ServIam, R as RefreshCookieConfig, C as CreateServContext, p as parseRequestContext, c as buildAuthContextFactory } from './serv-context-jc3rZxbj.js';
-export { d as CreateServContextInput, N as NativeRefreshTokenTransportConfig, e as RefreshTokenPair } from './serv-context-jc3rZxbj.js';
+import { ProcedureHandler, ErrorMap, Meta, ProcedureHandlerOptions, ORPCErrorConstructorMap, Router, ContractRouter, Context, ContractProcedure, InferSchemaInput, InferSchemaOutput, UnlaziedRouter } from '@orpc/server';
+import { a as ServSession, S as ServContext, b as ServIam, R as RefreshCookieConfig, C as CreateServContext, p as parseRequestContext, c as buildAuthContextFactory } from './serv-context-CkbS0M9G.js';
+export { d as CreateServContextInput, N as NativeRefreshTokenTransportConfig, e as RefreshTokenPair } from './serv-context-CkbS0M9G.js';
 import { MiddlewareHandler } from 'hono';
 import { z, ZodType } from 'zod';
 import { CryptoFunctions, TransportKeyStore } from '@h-ai/crypto';
@@ -713,8 +713,8 @@ interface ServRouteMethod<TContract extends ServContract, TInitialContext extend
     <TPath extends TRemaining>(path: TPath): ServRouteRegistration<TContract, TInitialContext, TCurrentContext, TRemaining, TPath>;
 }
 type ServRouterBuilderBuild<TContract extends ServContract, TInitialContext extends Context, TRemaining> = [TRemaining] extends [never] ? {
-    /** 所有 contract procedures 均实现后才可调用。 */
-    readonly build: () => Router<TContract, TInitialContext>;
+    /** 同步返回完整的普通 router，允许按需选用嵌套的默认 procedures。 */
+    readonly build: () => UnlaziedRouter<Router<TContract, TInitialContext>>;
 } : {
     /** 仅供 TypeScript/IDE 展示尚未实现的 route；运行时不存在。 */
     readonly missingRoutes: TRemaining;

package/dist/index.js

@@ -1,12 +1,12 @@
-import { servM, WILDCARD_ROLE, WILDCARD_PERMISSION, implement, normalizeServLocale, buildHaiErrorBody } from './chunk-KIWHKWLD.js';
+import { servM, WILDCARD_ROLE, WILDCARD_PERMISSION, implement, normalizeServLocale, buildHaiErrorBody } from './chunk-R354OMWL.js';
 import process from 'process';
-import { serve } from '@hono/node-server';
+import { upgradeWebSocket, serve } from '@hono/node-server';
 import { apiContract, AUDIO_WS_PATH, AudioWsClientMessageSchema } from '@h-ai/api-contract';
 import { core, ok, err, HaiCommonError } from '@h-ai/core';
-import { createNodeWebSocket } from '@hono/node-ws';
 import { OpenAPIHandler } from '@orpc/openapi/fetch';
 import { RPCHandler } from '@orpc/server/fetch';
 import { Hono } from 'hono';
+import { WebSocketServer } from 'ws';
 import { Buffer } from 'buffer';
 import { z } from 'zod';
 import { getCookie } from 'hono/cookie';
@@ -36,7 +36,7 @@ var CODE_PROTOCOL = "hai:ai:050";
 var CODE_TICKET = "hai:ai:054";
 var CODE_TOO_LARGE = "hai:ai:058";
 var CODE_TIMEOUT = "hai:ai:057";
-function registerAudioWsRoute(app, path, upgradeWebSocket, deps) {
+function registerAudioWsRoute(app, path, upgradeWebSocket2, deps) {
   const limits = {
     maxMessageBytes: deps.maxMessageBytes ?? DEFAULT_MAX_MESSAGE_BYTES,
     maxBufferedBytes: deps.maxBufferedBytes ?? DEFAULT_MAX_BUFFERED_BYTES,
@@ -46,7 +46,7 @@ function registerAudioWsRoute(app, path, upgradeWebSocket, deps) {
   };
   const maxSessionMs = deps.maxSessionMs ?? DEFAULT_MAX_SESSION_MS;
   const preAuthTimeoutMs = deps.preAuthTimeoutMs ?? DEFAULT_PRE_AUTH_TIMEOUT_MS;
-  app.get(path, upgradeWebSocket((c) => {
+  app.get(path, upgradeWebSocket2((c) => {
     const ticket = c.req.query("ticket");
     const conn = new AudioConnection(deps, ticket, limits);
     let sessionTimer;
@@ -77,6 +77,7 @@ var AsyncQueue = class {
   constructor(maxItems) {
     this.maxItems = maxItems;
   }
+  maxItems;
   items = [];
   waiting = null;
   ended = false;
@@ -130,6 +131,9 @@ var AudioConnection = class {
     this.audioQueue = new AsyncQueue(MAX_QUEUE_ITEMS);
     this.textQueue = new AsyncQueue(MAX_QUEUE_ITEMS);
   }
+  deps;
+  ticket;
+  limits;
   state = "connecting";
   start;
   session;
@@ -1145,10 +1149,14 @@ function isEncryptedPayloadShape(value) {
 
 // src/serv-app.ts
 var API_METHODS = ["GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS"];
-var audioWsInjectors = /* @__PURE__ */ new WeakMap();
+var audioWsServers = /* @__PURE__ */ new WeakMap();
 function createApp(options) {
   const http = resolveServHttpConfig(options.http);
   const app = new Hono();
+  app.notFound((c) => c.json(buildHaiErrorBody(
+    HaiCommonError.NOT_FOUND,
+    core.i18n.coreM("core_errorNotFound", { locale: resolveRequestLocale(c.req.raw.headers) })
+  ), 404));
   const iamRef = options.iam;
   const verifyToken = options.verifyToken ?? (iamRef ? (token) => iamRef.session.verifyToken(token) : void 0);
   const createContext = options.createContext ?? (verifyToken ? buildAuthContextFactory(verifyToken) : parseRequestContext);
@@ -1180,7 +1188,6 @@ function createApp(options) {
   if (options.refreshCookie)
     mountRefreshCookieRoutes(app, http.apiPrefix, options.refreshCookie, options.iam);
   if (options.audio) {
-    const { injectWebSocket, upgradeWebSocket } = createNodeWebSocket({ app });
     const audioPath = `${http.apiPrefix}${options.audio.path ?? AUDIO_WS_PATH}`;
     registerAudioWsRoute(app, audioPath, upgradeWebSocket, {
       ai: options.audio.ai,
@@ -1195,7 +1202,7 @@ function createApp(options) {
       maxPendingMessages: options.audio.maxPendingMessages,
       maxSendBufferBytes: options.audio.maxSendBufferBytes
     });
-    audioWsInjectors.set(app, injectWebSocket);
+    audioWsServers.set(app, new WebSocketServer({ noServer: true }));
   }
   mountOpenAPIRoutes(app, options.procedures, http.apiPrefix, createContext);
   if (http.rpc !== false)
@@ -1310,13 +1317,11 @@ var DEFAULT_SERV_PORT = 3e3;
 function listen(app, options = {}) {
   const host = options.host ?? DEFAULT_SERV_HOST;
   const port = options.port ?? DEFAULT_SERV_PORT;
+  const audioServer = audioWsServers.get(app);
   const server = serve(
-    { fetch: app.fetch, hostname: host, port },
+    { fetch: app.fetch, hostname: host, port, websocket: audioServer ? { server: audioServer } : void 0 },
     options.onListening
   );
-  const injectWebSocket = audioWsInjectors.get(app);
-  if (injectWebSocket)
-    injectWebSocket(server);
   const handle = {
     server,
     address: { host, port },