phecda-server 7.0.0-alpha.11 → 7.0.0-alpha.12

package/dist/index.js

@@ -57,7 +57,7 @@ var _chunkKCPBITYZjs = require('./chunk-KCPBITYZ.js');
 
 
 
-var _chunkG7JFKM2Mjs = require('./chunk-G7JFKM2M.js');
+var _chunkIJFIY6QNjs = require('./chunk-IJFIY6QN.js');
 
 
 
@@ -136,9 +136,9 @@ var PFilter = class extends ServerBase {
   constructor(tag) {
     super();
     this.key = tag || _phecdacore.getTag.call(void 0, this);
-    _chunkG7JFKM2Mjs.addFilter.call(void 0, this.key, this.use.bind(this));
+    _chunkIJFIY6QNjs.addFilter.call(void 0, this.key, this.use.bind(this));
     this.onUnmount(() => {
-      delete _chunkG7JFKM2Mjs.Context.filterRecord[this.key];
+      delete _chunkIJFIY6QNjs.Context.filterRecord[this.key];
     });
   }
 };
@@ -154,9 +154,9 @@ var PGuard = (_class2 = class extends ServerBase {
   constructor(tag) {
     super();_class2.prototype.__init2.call(this);;
     this.key = tag || _phecdacore.getTag.call(void 0, this);
-    _chunkG7JFKM2Mjs.addGuard.call(void 0, this.key, this.use.bind(this), this.priority);
+    _chunkIJFIY6QNjs.addGuard.call(void 0, this.key, this.use.bind(this), this.priority);
     this.onUnmount(() => {
-      delete _chunkG7JFKM2Mjs.Context.guardRecord[this.key];
+      delete _chunkIJFIY6QNjs.Context.guardRecord[this.key];
     });
   }
 }, _class2);
@@ -171,9 +171,9 @@ var PPipe = class extends ServerBase {
   constructor(tag) {
     super();
     this.key = tag || _phecdacore.getTag.call(void 0, this);
-    _chunkG7JFKM2Mjs.addPipe.call(void 0, this.key, this.use.bind(this));
+    _chunkIJFIY6QNjs.addPipe.call(void 0, this.key, this.use.bind(this));
     this.onUnmount(() => {
-      delete _chunkG7JFKM2Mjs.Context.pipeRecord[this.key];
+      delete _chunkIJFIY6QNjs.Context.pipeRecord[this.key];
     });
   }
 };
@@ -189,9 +189,9 @@ var PAddon = (_class3 = class extends ServerBase {
   constructor(tag) {
     super();_class3.prototype.__init3.call(this);;
     this.key = tag || _phecdacore.getTag.call(void 0, this);
-    _chunkG7JFKM2Mjs.addAddon.call(void 0, this.key, this.use.bind(this), this.priority);
+    _chunkIJFIY6QNjs.addAddon.call(void 0, this.key, this.use.bind(this), this.priority);
     this.onUnmount(() => {
-      delete _chunkG7JFKM2Mjs.Context.addonRecord[this.key];
+      delete _chunkIJFIY6QNjs.Context.addonRecord[this.key];
     });
   }
 }, _class3);
@@ -209,27 +209,27 @@ var PExtension = class extends ServerBase {
     super();
     const key = this.key = tag || _phecdacore.getTag.call(void 0, this);
     if (this.pipe) {
-      _chunkG7JFKM2Mjs.addPipe.call(void 0, key, this.pipe.bind(this));
+      _chunkIJFIY6QNjs.addPipe.call(void 0, key, this.pipe.bind(this));
       this.onUnmount(() => {
-        delete _chunkG7JFKM2Mjs.Context.pipeRecord[key];
+        delete _chunkIJFIY6QNjs.Context.pipeRecord[key];
       });
     }
     if (this.addon) {
-      _chunkG7JFKM2Mjs.addAddon.call(void 0, key, this.addon.bind(this), this.addonPriority);
+      _chunkIJFIY6QNjs.addAddon.call(void 0, key, this.addon.bind(this), this.addonPriority);
       this.onUnmount(() => {
-        delete _chunkG7JFKM2Mjs.Context.addonRecord[key];
+        delete _chunkIJFIY6QNjs.Context.addonRecord[key];
       });
     }
     if (this.guard) {
-      _chunkG7JFKM2Mjs.addGuard.call(void 0, key, this.guard.bind(this), this.guardPriority);
+      _chunkIJFIY6QNjs.addGuard.call(void 0, key, this.guard.bind(this), this.guardPriority);
       this.onUnmount(() => {
-        delete _chunkG7JFKM2Mjs.Context.guardRecord[key];
+        delete _chunkIJFIY6QNjs.Context.guardRecord[key];
       });
     }
     if (this.filter) {
-      _chunkG7JFKM2Mjs.addFilter.call(void 0, key, this.filter.bind(this));
+      _chunkIJFIY6QNjs.addFilter.call(void 0, key, this.filter.bind(this));
       this.onUnmount(() => {
-        delete _chunkG7JFKM2Mjs.Context.filterRecord[key];
+        delete _chunkIJFIY6QNjs.Context.filterRecord[key];
       });
     }
   }
@@ -309,7 +309,7 @@ var HTTPGenerator = (_class5 = class extends Generator {constructor(...args4) {
   addMethod(args) {
     const { http, name, func, params, tag } = args;
     if (!_optionalChain([http, 'optionalAccess', _2 => _2.type])) return;
-    const url = _chunkG7JFKM2Mjs.joinUrl.call(void 0, http.prefix, http.route).replace(/\/\:([^\/]*)/g, (_, js) => `/{{${js}}}`);
+    const url = _chunkIJFIY6QNjs.joinUrl.call(void 0, http.prefix, http.route).replace(/\/\:([^\/]*)/g, (_, js) => `/{{${js}}}`);
     if (!this.classMap[name]) this.classMap[name] = {};
     this.classMap[name][func] = `
     ${func}(...args){
@@ -410,4 +410,4 @@ return ret
 
 
 
-exports.Addon = _chunkKCPBITYZjs.Addon; exports.Arg = _chunkKCPBITYZjs.Arg; exports.BadGatewayException = _chunkG7JFKM2Mjs.BadGatewayException; exports.BadRequestException = _chunkG7JFKM2Mjs.BadRequestException; exports.BaseParam = _chunkKCPBITYZjs.BaseParam; exports.Body = _chunkKCPBITYZjs.Body; exports.ConflictException = _chunkG7JFKM2Mjs.ConflictException; exports.Context = _chunkG7JFKM2Mjs.Context; exports.Controller = _chunkKCPBITYZjs.Controller; exports.Ctx = _chunkKCPBITYZjs.Ctx; exports.CustomResponse = CustomResponse; exports.Define = _chunkKCPBITYZjs.Define; exports.Delete = _chunkKCPBITYZjs.Delete; exports.ERROR_SYMBOL = _chunk4LLLQOMFjs.ERROR_SYMBOL; exports.Exception = _chunkG7JFKM2Mjs.Exception; exports.Factory = _chunk6OQ2SB5Wjs.Factory; exports.Filter = _chunkKCPBITYZjs.Filter; exports.ForbiddenException = _chunkG7JFKM2Mjs.ForbiddenException; exports.FrameworkException = _chunkG7JFKM2Mjs.FrameworkException; exports.Generator = Generator; exports.Get = _chunkKCPBITYZjs.Get; exports.Guard = _chunkKCPBITYZjs.Guard; exports.HTTPGenerator = HTTPGenerator; exports.Head = _chunkKCPBITYZjs.Head; exports.Header = _chunkKCPBITYZjs.Header; exports.HttpBase = HttpBase; exports.IS_DEV = _chunk4LLLQOMFjs.IS_DEV; exports.IS_ONLY_GENERATE = _chunk4LLLQOMFjs.IS_ONLY_GENERATE; exports.IS_PURE = _chunk4LLLQOMFjs.IS_PURE; exports.IS_STRICT = _chunk4LLLQOMFjs.IS_STRICT; exports.InvalidInputException = _chunkG7JFKM2Mjs.InvalidInputException; exports.LOG_LEVEL = _chunk4LLLQOMFjs.LOG_LEVEL; exports.Meta = _chunk6OQ2SB5Wjs.Meta; exports.Mixin = _chunk4LLLQOMFjs.Mixin; exports.NotFoundException = _chunkG7JFKM2Mjs.NotFoundException; exports.PAddon = PAddon; exports.PExtension = PExtension; exports.PFilter = PFilter; exports.PGuard = PGuard; exports.PPipe = PPipe; exports.PS_EXIT_CODE = _chunk4LLLQOMFjs.PS_EXIT_CODE; exports.Param = _chunkKCPBITYZjs.Param; exports.Patch = _chunkKCPBITYZjs.Patch; exports.PayloadLargeException = _chunkG7JFKM2Mjs.PayloadLargeException; exports.Pipe = _chunkKCPBITYZjs.Pipe; exports.Post = _chunkKCPBITYZjs.Post; exports.Put = _chunkKCPBITYZjs.Put; exports.Query = _chunkKCPBITYZjs.Query; exports.Queue = _chunkKCPBITYZjs.Queue; exports.RPCGenerator = RPCGenerator; exports.Route = _chunkKCPBITYZjs.Route; exports.Rpc = _chunkKCPBITYZjs.Rpc; exports.RpcBase = RpcBase; exports.Search = _chunkKCPBITYZjs.Search; exports.ServerBase = ServerBase; exports.ServerPhecda = _chunk6OQ2SB5Wjs.ServerPhecda; exports.ServiceUnavailableException = _chunkG7JFKM2Mjs.ServiceUnavailableException; exports.TimeoutException = _chunkG7JFKM2Mjs.TimeoutException; exports.TimerException = _chunkG7JFKM2Mjs.TimerException; exports.UnauthorizedException = _chunkG7JFKM2Mjs.UnauthorizedException; exports.UndefinedException = _chunkG7JFKM2Mjs.UndefinedException; exports.UnsupportedMediaTypeException = _chunkG7JFKM2Mjs.UnsupportedMediaTypeException; exports.ValidateException = _chunkG7JFKM2Mjs.ValidateException; exports.WorkerException = _chunkG7JFKM2Mjs.WorkerException; exports.addAddon = _chunkG7JFKM2Mjs.addAddon; exports.addFilter = _chunkG7JFKM2Mjs.addFilter; exports.addGuard = _chunkG7JFKM2Mjs.addGuard; exports.addPipe = _chunkG7JFKM2Mjs.addPipe; exports.defaultPipe = _chunkG7JFKM2Mjs.defaultPipe; exports.defaultServerInject = _chunk6OQ2SB5Wjs.defaultServerInject; exports.emitter = _chunk6OQ2SB5Wjs.emitter; exports.getLogger = _chunk4LLLQOMFjs.getLogger; exports.log = _chunk4LLLQOMFjs.log; exports.phecdaNamespace = _chunk6OQ2SB5Wjs.phecdaNamespace; exports.runMiddleware = _chunk4LLLQOMFjs.runMiddleware; exports.setLogger = _chunk4LLLQOMFjs.setLogger; exports.useS = _chunk6OQ2SB5Wjs.useS;
+exports.Addon = _chunkKCPBITYZjs.Addon; exports.Arg = _chunkKCPBITYZjs.Arg; exports.BadGatewayException = _chunkIJFIY6QNjs.BadGatewayException; exports.BadRequestException = _chunkIJFIY6QNjs.BadRequestException; exports.BaseParam = _chunkKCPBITYZjs.BaseParam; exports.Body = _chunkKCPBITYZjs.Body; exports.ConflictException = _chunkIJFIY6QNjs.ConflictException; exports.Context = _chunkIJFIY6QNjs.Context; exports.Controller = _chunkKCPBITYZjs.Controller; exports.Ctx = _chunkKCPBITYZjs.Ctx; exports.CustomResponse = CustomResponse; exports.Define = _chunkKCPBITYZjs.Define; exports.Delete = _chunkKCPBITYZjs.Delete; exports.ERROR_SYMBOL = _chunk4LLLQOMFjs.ERROR_SYMBOL; exports.Exception = _chunkIJFIY6QNjs.Exception; exports.Factory = _chunk6OQ2SB5Wjs.Factory; exports.Filter = _chunkKCPBITYZjs.Filter; exports.ForbiddenException = _chunkIJFIY6QNjs.ForbiddenException; exports.FrameworkException = _chunkIJFIY6QNjs.FrameworkException; exports.Generator = Generator; exports.Get = _chunkKCPBITYZjs.Get; exports.Guard = _chunkKCPBITYZjs.Guard; exports.HTTPGenerator = HTTPGenerator; exports.Head = _chunkKCPBITYZjs.Head; exports.Header = _chunkKCPBITYZjs.Header; exports.HttpBase = HttpBase; exports.IS_DEV = _chunk4LLLQOMFjs.IS_DEV; exports.IS_ONLY_GENERATE = _chunk4LLLQOMFjs.IS_ONLY_GENERATE; exports.IS_PURE = _chunk4LLLQOMFjs.IS_PURE; exports.IS_STRICT = _chunk4LLLQOMFjs.IS_STRICT; exports.InvalidInputException = _chunkIJFIY6QNjs.InvalidInputException; exports.LOG_LEVEL = _chunk4LLLQOMFjs.LOG_LEVEL; exports.Meta = _chunk6OQ2SB5Wjs.Meta; exports.Mixin = _chunk4LLLQOMFjs.Mixin; exports.NotFoundException = _chunkIJFIY6QNjs.NotFoundException; exports.PAddon = PAddon; exports.PExtension = PExtension; exports.PFilter = PFilter; exports.PGuard = PGuard; exports.PPipe = PPipe; exports.PS_EXIT_CODE = _chunk4LLLQOMFjs.PS_EXIT_CODE; exports.Param = _chunkKCPBITYZjs.Param; exports.Patch = _chunkKCPBITYZjs.Patch; exports.PayloadLargeException = _chunkIJFIY6QNjs.PayloadLargeException; exports.Pipe = _chunkKCPBITYZjs.Pipe; exports.Post = _chunkKCPBITYZjs.Post; exports.Put = _chunkKCPBITYZjs.Put; exports.Query = _chunkKCPBITYZjs.Query; exports.Queue = _chunkKCPBITYZjs.Queue; exports.RPCGenerator = RPCGenerator; exports.Route = _chunkKCPBITYZjs.Route; exports.Rpc = _chunkKCPBITYZjs.Rpc; exports.RpcBase = RpcBase; exports.Search = _chunkKCPBITYZjs.Search; exports.ServerBase = ServerBase; exports.ServerPhecda = _chunk6OQ2SB5Wjs.ServerPhecda; exports.ServiceUnavailableException = _chunkIJFIY6QNjs.ServiceUnavailableException; exports.TimeoutException = _chunkIJFIY6QNjs.TimeoutException; exports.TimerException = _chunkIJFIY6QNjs.TimerException; exports.UnauthorizedException = _chunkIJFIY6QNjs.UnauthorizedException; exports.UndefinedException = _chunkIJFIY6QNjs.UndefinedException; exports.UnsupportedMediaTypeException = _chunkIJFIY6QNjs.UnsupportedMediaTypeException; exports.ValidateException = _chunkIJFIY6QNjs.ValidateException; exports.WorkerException = _chunkIJFIY6QNjs.WorkerException; exports.addAddon = _chunkIJFIY6QNjs.addAddon; exports.addFilter = _chunkIJFIY6QNjs.addFilter; exports.addGuard = _chunkIJFIY6QNjs.addGuard; exports.addPipe = _chunkIJFIY6QNjs.addPipe; exports.defaultPipe = _chunkIJFIY6QNjs.defaultPipe; exports.defaultServerInject = _chunk6OQ2SB5Wjs.defaultServerInject; exports.emitter = _chunk6OQ2SB5Wjs.emitter; exports.getLogger = _chunk4LLLQOMFjs.getLogger; exports.log = _chunk4LLLQOMFjs.log; exports.phecdaNamespace = _chunk6OQ2SB5Wjs.phecdaNamespace; exports.runMiddleware = _chunk4LLLQOMFjs.runMiddleware; exports.setLogger = _chunk4LLLQOMFjs.setLogger; exports.useS = _chunk6OQ2SB5Wjs.useS;

package/dist/index.mjs

@@ -57,7 +57,7 @@ import {
   addPipe,
   defaultPipe,
   joinUrl
-} from "./chunk-Z7NAAE4M.mjs";
+} from "./chunk-VX4BZEL7.mjs";
 import {
   ERROR_SYMBOL,
   IS_DEV,

package/dist/{meta-CR-D39hQ.d.mts → meta-xvg6V7pH.d.mts}

@@ -1,4 +1,4 @@
-import { Events, Construct } from 'phecda-core';
+import { Events } from 'phecda-core';
 
 declare const ERROR_SYMBOL = "__PS_ERROR__";
 declare const IS_DEV: boolean;
@@ -18,20 +18,6 @@ interface Emitter {
     removeAllListeners<N extends keyof Events>(eventName: N): void;
     emit<N extends keyof Events>(eventName: N, param: Events[N]): void;
 }
-type AnyFunction = (...args: any) => any;
-type ParseInstance<Instance extends Record<string, AnyFunction>> = {
-    [Key in keyof Instance]: ToClientFn<Instance[Key]>;
-};
-type PickFuncKeys<Type> = {
-    [Key in keyof Type]: Type[Key] extends (...args: any) => any ? (ReturnType<Type[Key]> extends CustomResponse<any> ? never : Key) : never;
-}[keyof Type];
-type ToClientMap<ControllerMap extends Record<string, Construct>> = {
-    [Key in keyof ControllerMap]: ToClientInstance<InstanceType<ControllerMap[Key]>>;
-};
-type ToClientInstance<Instance extends Record<string, any>> = ParseInstance<PickFunc<Instance>>;
-type ToClientFn<Func extends AnyFunction> = (...p: Parameters<Func>) => Promise<BaseReturn<ReturnType<Func>>>;
-type PickFunc<Instance> = Pick<Instance, PickFuncKeys<Instance>>;
-type OmitFunction<Instance> = Omit<Instance, PickFuncKeys<Instance>>;
 interface BaseCtx {
     meta: ControllerMeta;
     moduleMap: Record<string, any>;
@@ -53,9 +39,6 @@ interface BaseError {
     message: string;
     description: string;
 }
-type BaseReturn<T> = Awaited<T> extends {
-    toJSON(): infer R;
-} ? R : Awaited<T>;
 type BaseRequestType = 'get' | 'post' | 'put' | 'delete' | 'patch' | 'options';
 declare const ResponseSymbol: unique symbol;
 declare class CustomResponse<Value> {
@@ -105,4 +88,4 @@ interface ControllerMeta extends Meta {
     data: ControllerMetaData;
 }
 
-export { type BaseCtx as B, type ControllerMeta as C, type DefaultOptions as D, type Emitter as E, IS_DEV as I, LOG_LEVEL as L, Meta as M, type OmitFunction as O, type PickFunc as P, type ServiceMetaData as S, type ToClientMap as T, type ControllerMetaData as a, type MetaData as b, type BaseError as c, type ToClientInstance as d, type ToClientFn as e, type BaseReturn as f, type BaseRequestType as g, CustomResponse as h, type ExtractResponse as i, ERROR_SYMBOL as j, IS_ONLY_GENERATE as k, IS_STRICT as l, IS_PURE as m, PS_EXIT_CODE as n };
+export { type BaseCtx as B, type ControllerMeta as C, type DefaultOptions as D, type Emitter as E, IS_DEV as I, LOG_LEVEL as L, Meta as M, PS_EXIT_CODE as P, type ServiceMetaData as S, type ControllerMetaData as a, type MetaData as b, type BaseError as c, type BaseRequestType as d, CustomResponse as e, type ExtractResponse as f, ERROR_SYMBOL as g, IS_ONLY_GENERATE as h, IS_STRICT as i, IS_PURE as j };

package/dist/{meta-CR-D39hQ.d.ts → meta-xvg6V7pH.d.ts}

@@ -1,4 +1,4 @@
-import { Events, Construct } from 'phecda-core';
+import { Events } from 'phecda-core';
 
 declare const ERROR_SYMBOL = "__PS_ERROR__";
 declare const IS_DEV: boolean;
@@ -18,20 +18,6 @@ interface Emitter {
     removeAllListeners<N extends keyof Events>(eventName: N): void;
     emit<N extends keyof Events>(eventName: N, param: Events[N]): void;
 }
-type AnyFunction = (...args: any) => any;
-type ParseInstance<Instance extends Record<string, AnyFunction>> = {
-    [Key in keyof Instance]: ToClientFn<Instance[Key]>;
-};
-type PickFuncKeys<Type> = {
-    [Key in keyof Type]: Type[Key] extends (...args: any) => any ? (ReturnType<Type[Key]> extends CustomResponse<any> ? never : Key) : never;
-}[keyof Type];
-type ToClientMap<ControllerMap extends Record<string, Construct>> = {
-    [Key in keyof ControllerMap]: ToClientInstance<InstanceType<ControllerMap[Key]>>;
-};
-type ToClientInstance<Instance extends Record<string, any>> = ParseInstance<PickFunc<Instance>>;
-type ToClientFn<Func extends AnyFunction> = (...p: Parameters<Func>) => Promise<BaseReturn<ReturnType<Func>>>;
-type PickFunc<Instance> = Pick<Instance, PickFuncKeys<Instance>>;
-type OmitFunction<Instance> = Omit<Instance, PickFuncKeys<Instance>>;
 interface BaseCtx {
     meta: ControllerMeta;
     moduleMap: Record<string, any>;
@@ -53,9 +39,6 @@ interface BaseError {
     message: string;
     description: string;
 }
-type BaseReturn<T> = Awaited<T> extends {
-    toJSON(): infer R;
-} ? R : Awaited<T>;
 type BaseRequestType = 'get' | 'post' | 'put' | 'delete' | 'patch' | 'options';
 declare const ResponseSymbol: unique symbol;
 declare class CustomResponse<Value> {
@@ -105,4 +88,4 @@ interface ControllerMeta extends Meta {
     data: ControllerMetaData;
 }
 
-export { type BaseCtx as B, type ControllerMeta as C, type DefaultOptions as D, type Emitter as E, IS_DEV as I, LOG_LEVEL as L, Meta as M, type OmitFunction as O, type PickFunc as P, type ServiceMetaData as S, type ToClientMap as T, type ControllerMetaData as a, type MetaData as b, type BaseError as c, type ToClientInstance as d, type ToClientFn as e, type BaseReturn as f, type BaseRequestType as g, CustomResponse as h, type ExtractResponse as i, ERROR_SYMBOL as j, IS_ONLY_GENERATE as k, IS_STRICT as l, IS_PURE as m, PS_EXIT_CODE as n };
+export { type BaseCtx as B, type ControllerMeta as C, type DefaultOptions as D, type Emitter as E, IS_DEV as I, LOG_LEVEL as L, Meta as M, PS_EXIT_CODE as P, type ServiceMetaData as S, type ControllerMetaData as a, type MetaData as b, type BaseError as c, type BaseRequestType as d, CustomResponse as e, type ExtractResponse as f, ERROR_SYMBOL as g, IS_ONLY_GENERATE as h, IS_STRICT as i, IS_PURE as j };

package/dist/rpc/bullmq/index.d.mts

@@ -1,8 +1,8 @@
 import { WorkerOptions, QueueOptions, Worker, Queue } from 'bullmq';
-import { F as Factory } from '../../core-DIfgUKIU.mjs';
-import { R as RpcCtx, a as RpcServerOptions, b as RpcClientOptions } from '../../types-DqH1qA-q.mjs';
-import { T as ToClientMap } from '../../meta-CR-D39hQ.mjs';
+import { F as Factory } from '../../core-jUg1HvYT.mjs';
+import { R as RpcCtx, a as RpcServerOptions } from '../../types-6qaaUIKZ.mjs';
 import 'phecda-core';
+import '../../meta-xvg6V7pH.mjs';
 
 interface BullmqCtx extends RpcCtx {
     type: 'bullmq';
@@ -16,6 +16,4 @@ declare function create({ moduleMap, meta }: Awaited<ReturnType<typeof Factory>>
     queueMap: Record<string, Queue<any, any, string, any, any, string>>;
 }>;
 
-declare function createClient<S extends Record<string, any>>(controllers: S, opts?: RpcClientOptions & BullmqOptions): Promise<ToClientMap<S>>;
-
-export { type BullmqCtx, type BullmqOptions, create, createClient };
+export { type BullmqCtx, type BullmqOptions, create };

package/dist/rpc/bullmq/index.d.ts

@@ -1,8 +1,8 @@
 import { WorkerOptions, QueueOptions, Worker, Queue } from 'bullmq';
-import { F as Factory } from '../../core-CUTbX_IS.js';
-import { R as RpcCtx, a as RpcServerOptions, b as RpcClientOptions } from '../../types-DYRu0vic.js';
-import { T as ToClientMap } from '../../meta-CR-D39hQ.js';
+import { F as Factory } from '../../core-CDzIy2g0.js';
+import { R as RpcCtx, a as RpcServerOptions } from '../../types-BtXOT5rI.js';
 import 'phecda-core';
+import '../../meta-xvg6V7pH.js';
 
 interface BullmqCtx extends RpcCtx {
     type: 'bullmq';
@@ -16,6 +16,4 @@ declare function create({ moduleMap, meta }: Awaited<ReturnType<typeof Factory>>
     queueMap: Record<string, Queue<any, any, string, any, any, string>>;
 }>;
 
-declare function createClient<S extends Record<string, any>>(controllers: S, opts?: RpcClientOptions & BullmqOptions): Promise<ToClientMap<S>>;
-
-export { type BullmqCtx, type BullmqOptions, create, createClient };
+export { type BullmqCtx, type BullmqOptions, create };

package/dist/rpc/bullmq/index.js

@@ -2,8 +2,7 @@
 
 
 
-
-var _chunkG7JFKM2Mjs = require('../../chunk-G7JFKM2M.js');
+var _chunkIJFIY6QNjs = require('../../chunk-IJFIY6QN.js');
 
 
 
@@ -18,14 +17,14 @@ async function create({ moduleMap, meta }, opts = {}) {
   const workerMap = {};
   const queueMap = {};
   const existQueue = /* @__PURE__ */ new Set();
-  const metaMap = _chunkG7JFKM2Mjs.createControllerMetaMap.call(void 0, meta, (meta2) => {
+  const metaMap = _chunkIJFIY6QNjs.createControllerMetaMap.call(void 0, meta, (meta2) => {
     const { controller, rpc, func, tag } = meta2.data;
     if (controller === "rpc" && _optionalChain([rpc, 'optionalAccess', _ => _.queue]) !== void 0) {
       debug(`register method "${func}" in module "${tag}"`);
       return true;
     }
   });
-  _chunkG7JFKM2Mjs.detectAopDep.call(void 0, meta, {
+  _chunkIJFIY6QNjs.detectAopDep.call(void 0, meta, {
     guards: globalGuards
   }, "rpc");
   async function subscribeQueues() {
@@ -39,7 +38,7 @@ async function create({ moduleMap, meta }, opts = {}) {
           if (existQueue.has(queue)) continue;
           existQueue.add(queue);
           workerMap[queue] = new (0, _bullmq.Worker)(queue, handleRequest, workerOpts);
-          _chunkG7JFKM2Mjs.Context.applyAddons(addons, workerMap[queue], "bullmq");
+          _chunkIJFIY6QNjs.Context.applyAddons(addons, workerMap[queue], "bullmq");
         }
       }
     }
@@ -53,12 +52,12 @@ async function create({ moduleMap, meta }, opts = {}) {
     const meta2 = metaMap.get(tag)[func];
     const { data: { rpc: { isEvent } = {} } } = meta2;
     if (!isEvent && !(clientQueue in queueMap)) queueMap[clientQueue] = new (0, _bullmq.Queue)(clientQueue, queueOpts);
-    const aop = _chunkG7JFKM2Mjs.Context.getAop(meta2, {
+    const aop = _chunkIJFIY6QNjs.Context.getAop(meta2, {
       globalFilter,
       globalGuards,
       globalPipe
     });
-    const context = new (0, _chunkG7JFKM2Mjs.Context)({
+    const context = new (0, _chunkIJFIY6QNjs.Context)({
       type: "bullmq",
       category: "rpc",
       moduleMap,
@@ -100,72 +99,5 @@ async function create({ moduleMap, meta }, opts = {}) {
 }
 _chunk4LLLQOMFjs.__name.call(void 0, create, "create");
 
-// src/rpc/bullmq/client.ts
-var _events = require('events');
-
-async function createClient(controllers, opts = {}) {
-  let eventId = 1;
-  let eventCount = 0;
-  const { max, workerOpts, queueOpts, timeout, key } = opts;
-  const ret = {};
-  const emitter = new (0, _events.EventEmitter)();
-  const clientQueue = _chunkG7JFKM2Mjs.genClientQueue.call(void 0, key);
-  const queueMap = {};
-  new (0, _bullmq.Worker)(clientQueue, async (job) => {
-    const { data, id, error } = job.data;
-    emitter.emit(id, data, error);
-  }, workerOpts);
-  for (const i in controllers) {
-    ret[i] = new Proxy(new controllers[i](), {
-      get(target, p) {
-        if (typeof target[p] !== "function") throw new Error(`"${p}" in "${i}" is not an exposed rpc `);
-        let { tag, queue, isEvent } = target[p]();
-        return async (...args) => {
-          if (!queue) queue = tag;
-          if (!(queue in queueMap)) queueMap[queue] = new (0, _bullmq.Queue)(queue, queueOpts);
-          const id = `${eventId++}`;
-          queueMap[queue].add(`${tag}-${p}`, {
-            _ps: 1,
-            id,
-            args,
-            tag,
-            queue: clientQueue,
-            func: p
-          });
-          if (isEvent) return null;
-          return new Promise((resolve, reject) => {
-            if (max && eventCount >= max) reject({
-              type: "exceeded"
-            });
-            let isEnd = false;
-            const timer = setTimeout(() => {
-              if (!isEnd) {
-                eventCount--;
-                emitter.off(id, listener);
-                reject({
-                  type: "timeout"
-                });
-              }
-            }, timeout || 5e3);
-            function listener(data, error) {
-              eventCount--;
-              isEnd = true;
-              clearTimeout(timer);
-              if (error) reject(data);
-              else resolve(data);
-            }
-            _chunk4LLLQOMFjs.__name.call(void 0, listener, "listener");
-            eventCount++;
-            emitter.once(id, listener);
-          });
-        };
-      }
-    });
-  }
-  return ret;
-}
-_chunk4LLLQOMFjs.__name.call(void 0, createClient, "createClient");
-
-
 
-exports.create = create; exports.createClient = createClient;
+exports.create = create;

package/dist/rpc/bullmq/index.mjs

@@ -1,9 +1,8 @@
 import {
   Context,
   createControllerMetaMap,
-  detectAopDep,
-  genClientQueue
-} from "../../chunk-Z7NAAE4M.mjs";
+  detectAopDep
+} from "../../chunk-VX4BZEL7.mjs";
 import {
   HMR,
   __name
@@ -99,73 +98,6 @@ async function create({ moduleMap, meta }, opts = {}) {
   };
 }
 __name(create, "create");
-
-// src/rpc/bullmq/client.ts
-import { EventEmitter } from "events";
-import { Queue as Queue2, Worker as Worker2 } from "bullmq";
-async function createClient(controllers, opts = {}) {
-  let eventId = 1;
-  let eventCount = 0;
-  const { max, workerOpts, queueOpts, timeout, key } = opts;
-  const ret = {};
-  const emitter = new EventEmitter();
-  const clientQueue = genClientQueue(key);
-  const queueMap = {};
-  new Worker2(clientQueue, async (job) => {
-    const { data, id, error } = job.data;
-    emitter.emit(id, data, error);
-  }, workerOpts);
-  for (const i in controllers) {
-    ret[i] = new Proxy(new controllers[i](), {
-      get(target, p) {
-        if (typeof target[p] !== "function") throw new Error(`"${p}" in "${i}" is not an exposed rpc `);
-        let { tag, queue, isEvent } = target[p]();
-        return async (...args) => {
-          if (!queue) queue = tag;
-          if (!(queue in queueMap)) queueMap[queue] = new Queue2(queue, queueOpts);
-          const id = `${eventId++}`;
-          queueMap[queue].add(`${tag}-${p}`, {
-            _ps: 1,
-            id,
-            args,
-            tag,
-            queue: clientQueue,
-            func: p
-          });
-          if (isEvent) return null;
-          return new Promise((resolve, reject) => {
-            if (max && eventCount >= max) reject({
-              type: "exceeded"
-            });
-            let isEnd = false;
-            const timer = setTimeout(() => {
-              if (!isEnd) {
-                eventCount--;
-                emitter.off(id, listener);
-                reject({
-                  type: "timeout"
-                });
-              }
-            }, timeout || 5e3);
-            function listener(data, error) {
-              eventCount--;
-              isEnd = true;
-              clearTimeout(timer);
-              if (error) reject(data);
-              else resolve(data);
-            }
-            __name(listener, "listener");
-            eventCount++;
-            emitter.once(id, listener);
-          });
-        };
-      }
-    });
-  }
-  return ret;
-}
-__name(createClient, "createClient");
 export {
-  create,
-  createClient
+  create
 };

package/dist/rpc/kafka/index.d.mts

@@ -1,8 +1,8 @@
 import { Consumer, Producer } from 'kafkajs';
-import { F as Factory } from '../../core-DIfgUKIU.mjs';
-import { R as RpcCtx, a as RpcServerOptions, b as RpcClientOptions } from '../../types-DqH1qA-q.mjs';
-import { T as ToClientMap } from '../../meta-CR-D39hQ.mjs';
+import { F as Factory } from '../../core-jUg1HvYT.mjs';
+import { R as RpcCtx, a as RpcServerOptions } from '../../types-6qaaUIKZ.mjs';
 import 'phecda-core';
+import '../../meta-xvg6V7pH.mjs';
 
 interface KafkaCtx extends RpcCtx {
     type: 'kafka';
@@ -16,9 +16,4 @@ declare function bind({ consumer, producer }: {
     producer: Producer;
 }, { moduleMap, meta }: Awaited<ReturnType<typeof Factory>>, opts?: RpcServerOptions): Promise<void>;
 
-declare function createClient<S extends Record<string, any>>({ producer, consumer }: {
-    producer: Producer;
-    consumer: Consumer;
-}, controllers: S, opts?: RpcClientOptions): Promise<ToClientMap<S>>;
-
-export { type KafkaCtx, bind, createClient };
+export { type KafkaCtx, bind };

package/dist/rpc/kafka/index.d.ts

@@ -1,8 +1,8 @@
 import { Consumer, Producer } from 'kafkajs';
-import { F as Factory } from '../../core-CUTbX_IS.js';
-import { R as RpcCtx, a as RpcServerOptions, b as RpcClientOptions } from '../../types-DYRu0vic.js';
-import { T as ToClientMap } from '../../meta-CR-D39hQ.js';
+import { F as Factory } from '../../core-CDzIy2g0.js';
+import { R as RpcCtx, a as RpcServerOptions } from '../../types-BtXOT5rI.js';
 import 'phecda-core';
+import '../../meta-xvg6V7pH.js';
 
 interface KafkaCtx extends RpcCtx {
     type: 'kafka';
@@ -16,9 +16,4 @@ declare function bind({ consumer, producer }: {
     producer: Producer;
 }, { moduleMap, meta }: Awaited<ReturnType<typeof Factory>>, opts?: RpcServerOptions): Promise<void>;
 
-declare function createClient<S extends Record<string, any>>({ producer, consumer }: {
-    producer: Producer;
-    consumer: Consumer;
-}, controllers: S, opts?: RpcClientOptions): Promise<ToClientMap<S>>;
-
-export { type KafkaCtx, bind, createClient };
+export { type KafkaCtx, bind };

package/dist/rpc/kafka/index.js

@@ -2,8 +2,7 @@
 
 
 
-
-var _chunkG7JFKM2Mjs = require('../../chunk-G7JFKM2M.js');
+var _chunkIJFIY6QNjs = require('../../chunk-IJFIY6QN.js');
 
 
 var _chunk4LLLQOMFjs = require('../../chunk-4LLLQOMF.js');
@@ -14,18 +13,18 @@ var debug = _debug2.default.call(void 0, "phecda-server/kafka");
 async function bind({ consumer, producer }, { moduleMap, meta }, opts = {}) {
   const { globalGuards, globalFilter, globalPipe, globalAddons = [], defaultQueue } = opts;
   const existQueue = /* @__PURE__ */ new Set();
-  const metaMap = _chunkG7JFKM2Mjs.createControllerMetaMap.call(void 0, meta, (meta2) => {
+  const metaMap = _chunkIJFIY6QNjs.createControllerMetaMap.call(void 0, meta, (meta2) => {
     const { controller, rpc, func, tag } = meta2.data;
     if (controller === "rpc" && _optionalChain([rpc, 'optionalAccess', _ => _.queue]) !== void 0) {
       debug(`register method "${func}" in module "${tag}"`);
       return true;
     }
   });
-  _chunkG7JFKM2Mjs.detectAopDep.call(void 0, meta, {
+  _chunkIJFIY6QNjs.detectAopDep.call(void 0, meta, {
     guards: globalGuards,
     addons: globalAddons
   }, "rpc");
-  _chunkG7JFKM2Mjs.Context.applyAddons(globalAddons, {
+  _chunkIJFIY6QNjs.Context.applyAddons(globalAddons, {
     consumer,
     producer
   }, "kafka");
@@ -59,12 +58,12 @@ async function bind({ consumer, producer }, { moduleMap, meta }, opts = {}) {
       const meta2 = metaMap.get(tag)[func];
       const { data: { rpc } } = meta2;
       const isEvent = rpc.isEvent;
-      const aop = _chunkG7JFKM2Mjs.Context.getAop(meta2, {
+      const aop = _chunkIJFIY6QNjs.Context.getAop(meta2, {
         globalFilter,
         globalGuards,
         globalPipe
       });
-      const context = new (0, _chunkG7JFKM2Mjs.Context)({
+      const context = new (0, _chunkIJFIY6QNjs.Context)({
         type: "kafka",
         category: "rpc",
         moduleMap,
@@ -115,83 +114,5 @@ async function bind({ consumer, producer }, { moduleMap, meta }, opts = {}) {
 }
 _chunk4LLLQOMFjs.__name.call(void 0, bind, "bind");
 
-// src/rpc/kafka/client.ts
-var _events = require('events');
-async function createClient({ producer, consumer }, controllers, opts) {
-  let eventId = 1;
-  let eventCount = 1;
-  const ret = {};
-  const emitter = new (0, _events.EventEmitter)();
-  const clientQueue = _chunkG7JFKM2Mjs.genClientQueue.call(void 0, _optionalChain([opts, 'optionalAccess', _2 => _2.key]));
-  await consumer.subscribe({
-    topic: clientQueue,
-    fromBeginning: true
-  });
-  for (const i in controllers) {
-    ret[i] = new Proxy(new controllers[i](), {
-      get(target, p) {
-        if (typeof target[p] !== "function") throw new Error(`"${p}" in "${i}" is not an exposed rpc `);
-        let { tag, queue, isEvent } = target[p]();
-        return async (...args) => {
-          if (!queue) queue = tag;
-          const id = `${eventId++}`;
-          producer.send({
-            topic: queue,
-            messages: [
-              {
-                value: JSON.stringify({
-                  _ps: 1,
-                  id,
-                  tag,
-                  queue: clientQueue,
-                  func: p,
-                  args
-                })
-              }
-            ]
-          });
-          if (isEvent) return null;
-          return new Promise((resolve, reject) => {
-            if (_optionalChain([opts, 'optionalAccess', _3 => _3.max]) && eventCount >= opts.max) reject({
-              type: "exceeded"
-            });
-            let isEnd = false;
-            const timer = setTimeout(() => {
-              if (!isEnd) {
-                eventCount--;
-                emitter.off(id, listener);
-                reject({
-                  type: "timeout"
-                });
-              }
-            }, _optionalChain([opts, 'optionalAccess', _4 => _4.timeout]) || 5e3);
-            function listener(data, error) {
-              eventCount--;
-              isEnd = true;
-              clearTimeout(timer);
-              if (error) reject(data);
-              else resolve(data);
-            }
-            _chunk4LLLQOMFjs.__name.call(void 0, listener, "listener");
-            eventCount++;
-            emitter.once(id, listener);
-          });
-        };
-      }
-    });
-  }
-  await consumer.run({
-    eachMessage: /* @__PURE__ */ _chunk4LLLQOMFjs.__name.call(void 0, async ({ message, topic }) => {
-      if (clientQueue === topic && message.value) {
-        const { data, id, error } = JSON.parse(message.value.toString());
-        emitter.emit(id, data, error);
-      }
-    }, "eachMessage")
-  });
-  return ret;
-}
-_chunk4LLLQOMFjs.__name.call(void 0, createClient, "createClient");
-
-
 
-exports.bind = bind; exports.createClient = createClient;
+exports.bind = bind;