phecda-server 6.1.0 → 7.0.0-alpha.0

package/dist/index.mjs

@@ -1,4 +1,14 @@
 import {
+  Factory,
+  Meta,
+  ServerPhecda,
+  defaultServerInject,
+  emitter,
+  phecdaNamespace,
+  useS
+} from "./chunk-5622RBNB.mjs";
+import {
+  Addon,
   Arg,
   BaseParam,
   Body,
@@ -11,11 +21,9 @@ import {
   Guard,
   Head,
   Header,
-  Interceptor,
   Param,
   Patch,
   Pipe,
-  Plugin,
   Post,
   Put,
   Query,
@@ -23,16 +31,7 @@ import {
   Route,
   Rpc,
   Search
-} from "./chunk-J7B24YSE.mjs";
-import {
-  Factory,
-  Meta,
-  ServerPhecda,
-  defaultServerInject,
-  emitter,
-  phecdaNamespace,
-  useS
-} from "./chunk-3H3T54IC.mjs";
+} from "./chunk-HMVLXNV3.mjs";
 import {
   BadGatewayException,
   BadRequestException,
@@ -52,13 +51,12 @@ import {
   UnsupportedMediaTypeException,
   ValidateException,
   WorkerException,
+  addAddon,
   addFilter,
   addGuard,
-  addInterceptor,
   addPipe,
-  addPlugin,
   defaultPipe
-} from "./chunk-2CFYUXPM.mjs";
+} from "./chunk-P75VKZJY.mjs";
 import {
   ERROR_SYMBOL,
   IS_HMR,
@@ -70,8 +68,9 @@ import {
   __name,
   getLogger,
   log,
+  runMiddleware,
   setLogger
-} from "./chunk-G7TD2VB7.mjs";
+} from "./chunk-WHJ5FALK.mjs";
 
 // src/types.ts
 var ResponseSymbol = Symbol("response");
@@ -146,35 +145,19 @@ var PGuard = class extends ServerBase {
     __name(this, "PGuard");
   }
   key;
+  priority = 0;
   constructor(tag) {
     super();
     this.key = tag || getTag2(this);
-    addGuard(this.key, this.use.bind(this));
+    addGuard(this.key, this.use.bind(this), this.priority);
     this.onUnmount(() => {
       delete Context.guardRecord[this.key];
     });
   }
 };
 
-// src/modules/interceptor.ts
-import { getTag as getTag3 } from "phecda-core";
-var PInterceptor = class extends ServerBase {
-  static {
-    __name(this, "PInterceptor");
-  }
-  key;
-  constructor(tag) {
-    super();
-    this.key = tag || getTag3(this);
-    this.onUnmount(() => {
-      delete Context.interceptorRecord[this.key];
-    });
-    addInterceptor(this.key, this.use.bind(this));
-  }
-};
-
 // src/modules/pipe.ts
-import { getTag as getTag4 } from "phecda-core";
+import { getTag as getTag3 } from "phecda-core";
 var PPipe = class extends ServerBase {
   static {
     __name(this, "PPipe");
@@ -182,7 +165,7 @@ var PPipe = class extends ServerBase {
   key;
   constructor(tag) {
     super();
-    this.key = tag || getTag4(this);
+    this.key = tag || getTag3(this);
     addPipe(this.key, this.use.bind(this));
     this.onUnmount(() => {
       delete Context.pipeRecord[this.key];
@@ -190,53 +173,50 @@ var PPipe = class extends ServerBase {
   }
 };
 
-// src/modules/plugin.ts
-import { getTag as getTag5 } from "phecda-core";
-var PPlugin = class extends ServerBase {
+// src/modules/addon.ts
+import { getTag as getTag4 } from "phecda-core";
+var PAddon = class extends ServerBase {
   static {
-    __name(this, "PPlugin");
+    __name(this, "PAddon");
   }
   key;
+  priority = 0;
   constructor(tag) {
     super();
-    this.key = tag || getTag5(this);
-    addPlugin(this.key, this.use.bind(this));
+    this.key = tag || getTag4(this);
+    addAddon(this.key, this.use.bind(this), this.priority);
     this.onUnmount(() => {
-      delete Context.pluginRecord[this.key];
+      delete Context.addonRecord[this.key];
     });
   }
 };
 
 // src/modules/extension.ts
-import { getTag as getTag6 } from "phecda-core";
+import { getTag as getTag5 } from "phecda-core";
 var PExtension = class extends ServerBase {
   static {
     __name(this, "PExtension");
   }
   key;
+  guardPriority;
+  addonPriority;
   constructor(tag) {
     super();
-    const key = this.key = tag || getTag6(this);
+    const key = this.key = tag || getTag5(this);
     if (this.pipe) {
       addPipe(key, this.pipe.bind(this));
       this.onUnmount(() => {
         delete Context.pipeRecord[key];
       });
     }
-    if (this.plugin) {
-      addPlugin(key, this.plugin.bind(this));
-      this.onUnmount(() => {
-        delete Context.pluginRecord[key];
-      });
-    }
-    if (this.intercept) {
-      addInterceptor(key, this.intercept.bind(this));
+    if (this.addon) {
+      addAddon(key, this.addon.bind(this), this.addonPriority);
       this.onUnmount(() => {
-        delete Context.interceptorRecord[key];
+        delete Context.addonRecord[key];
       });
     }
     if (this.guard) {
-      addGuard(key, this.guard.bind(this));
+      addGuard(key, this.guard.bind(this), this.guardPriority);
       this.onUnmount(() => {
         delete Context.guardRecord[key];
       });
@@ -348,6 +328,7 @@ return ret
 // src/index.ts
 export * from "phecda-core";
 export {
+  Addon,
   Arg,
   BadGatewayException,
   BadRequestException,
@@ -376,24 +357,21 @@ export {
   IS_HMR,
   IS_ONLY_GENERATE,
   IS_STRICT,
-  Interceptor,
   InvalidInputException,
   LOG_LEVEL,
   Meta,
   Mixin,
   NotFoundException,
+  PAddon,
   PExtension,
   PFilter,
   PGuard,
-  PInterceptor,
   PPipe,
-  PPlugin,
   PS_EXIT_CODE,
   Param,
   Patch,
   PayloadLargeException,
   Pipe,
-  Plugin,
   Post,
   Put,
   Query,
@@ -413,17 +391,17 @@ export {
   UnsupportedMediaTypeException,
   ValidateException,
   WorkerException,
+  addAddon,
   addFilter,
   addGuard,
-  addInterceptor,
   addPipe,
-  addPlugin,
   defaultPipe,
   defaultServerInject,
   emitter,
   getLogger,
   log,
   phecdaNamespace,
+  runMiddleware,
   setLogger,
   useS
 };

package/dist/{meta-KtfiBIde.d.ts → meta-BXKLFTgG.d.mts}

@@ -41,9 +41,9 @@ interface BaseContext {
 }
 interface DefaultOptions {
     globalGuards?: string[];
-    globalInterceptors?: string[];
     globalFilter?: string;
     globalPipe?: string;
+    globalAddons?: string[];
 }
 interface BaseError {
     [ERROR_SYMBOL]: true;
@@ -91,8 +91,7 @@ interface ControllerMetaData extends ServiceMetaData {
     guards: string[];
     pipe?: string;
     filter?: string;
-    interceptors: string[];
-    plugins: string[];
+    addons: string[];
 }
 type MetaData = ControllerMetaData | ServiceMetaData;
 declare class Meta {

package/dist/{meta-KtfiBIde.d.mts → meta-BXKLFTgG.d.ts}

@@ -41,9 +41,9 @@ interface BaseContext {
 }
 interface DefaultOptions {
     globalGuards?: string[];
-    globalInterceptors?: string[];
     globalFilter?: string;
     globalPipe?: string;
+    globalAddons?: string[];
 }
 interface BaseError {
     [ERROR_SYMBOL]: true;
@@ -91,8 +91,7 @@ interface ControllerMetaData extends ServiceMetaData {
     guards: string[];
     pipe?: string;
     filter?: string;
-    interceptors: string[];
-    plugins: string[];
+    addons: string[];
 }
 type MetaData = ControllerMetaData | ServiceMetaData;
 declare class Meta {

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

@@ -1,17 +1,17 @@
 import { WorkerOptions, QueueOptions, Worker, Queue } from 'bullmq';
-import { F as Factory } from '../../core-P1CsH6jz.mjs';
-import { R as RpcContext, a as RpcServerOptions, b as RpcClientOptions } from '../../types-t9D1fU6G.mjs';
-import { T as ToClientMap } from '../../meta-KtfiBIde.mjs';
+import { F as Factory } from '../../core-BIcUwV18.mjs';
+import { R as RpcContext, a as RpcServerOptions, b as RpcClientOptions } from '../../types-BtbL49Zs.mjs';
+import { T as ToClientMap } from '../../meta-BXKLFTgG.mjs';
 import 'phecda-core';
 
 interface BullmqCtx extends RpcContext {
     type: 'bullmq';
 }
-interface BullmqOptions {
+type BullmqOptions = Omit<RpcServerOptions, 'globalAddons'> & {
     workerOpts?: WorkerOptions;
     queueOpts?: QueueOptions;
-}
-declare function create({ moduleMap, meta }: Awaited<ReturnType<typeof Factory>>, opts?: BullmqOptions & RpcServerOptions): Promise<{
+};
+declare function create({ moduleMap, meta }: Awaited<ReturnType<typeof Factory>>, opts?: BullmqOptions): Promise<{
     workerMap: Record<string, Worker<any, any, string>>;
     queueMap: Record<string, Queue<any, any, string>>;
 }>;

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

@@ -1,17 +1,17 @@
 import { WorkerOptions, QueueOptions, Worker, Queue } from 'bullmq';
-import { F as Factory } from '../../core-BlN0Spy9.js';
-import { R as RpcContext, a as RpcServerOptions, b as RpcClientOptions } from '../../types-JVT0mgLD.js';
-import { T as ToClientMap } from '../../meta-KtfiBIde.js';
+import { F as Factory } from '../../core-CYwEPfN4.js';
+import { R as RpcContext, a as RpcServerOptions, b as RpcClientOptions } from '../../types-m3IEDKjP.js';
+import { T as ToClientMap } from '../../meta-BXKLFTgG.js';
 import 'phecda-core';
 
 interface BullmqCtx extends RpcContext {
     type: 'bullmq';
 }
-interface BullmqOptions {
+type BullmqOptions = Omit<RpcServerOptions, 'globalAddons'> & {
     workerOpts?: WorkerOptions;
     queueOpts?: QueueOptions;
-}
-declare function create({ moduleMap, meta }: Awaited<ReturnType<typeof Factory>>, opts?: BullmqOptions & RpcServerOptions): Promise<{
+};
+declare function create({ moduleMap, meta }: Awaited<ReturnType<typeof Factory>>, opts?: BullmqOptions): Promise<{
     workerMap: Record<string, Worker<any, any, string>>;
     queueMap: Record<string, Queue<any, any, string>>;
 }>;

package/dist/rpc/bullmq/index.js

@@ -4,47 +4,47 @@
 
 
 
-var _chunkDVTBLV6Ijs = require('../../chunk-DVTBLV6I.js');
+var _chunkSW5IKE5Hjs = require('../../chunk-SW5IKE5H.js');
 
 
-var _chunkTVT62GIXjs = require('../../chunk-TVT62GIX.js');
+var _chunkJ5CFUN4Vjs = require('../../chunk-J5CFUN4V.js');
 
-// src/rpc/bullmq/bind.ts
+// src/rpc/bullmq/create.ts
 var _bullmq = require('bullmq');
 var _debug = require('debug'); var _debug2 = _interopRequireDefault(_debug);
 var debug = _debug2.default.call(void 0, "phecda-server/bullmq");
 async function create({ moduleMap, meta }, opts = {}) {
-  const { globalGuards, globalInterceptors, globalFilter, globalPipe, workerOpts, queueOpts } = opts;
+  const { globalGuards, globalFilter, globalPipe, workerOpts, queueOpts, defaultQueue } = opts;
   const workerMap = {};
   const queueMap = {};
   const existQueue = /* @__PURE__ */ new Set();
-  const metaMap = _chunkDVTBLV6Ijs.createControllerMetaMap.call(void 0, meta, (meta2) => {
+  const metaMap = _chunkSW5IKE5Hjs.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;
     }
   });
-  _chunkDVTBLV6Ijs.detectAopDep.call(void 0, meta, {
-    guards: globalGuards,
-    interceptors: globalInterceptors
+  _chunkSW5IKE5Hjs.detectAopDep.call(void 0, meta, {
+    guards: globalGuards
   }, "rpc");
   async function subscribeQueues() {
     existQueue.clear();
     for (const [tag, record] of metaMap) {
       for (const func in record) {
         const meta2 = metaMap.get(tag)[func];
-        const { data: { rpc } } = meta2;
+        const { data: { rpc, addons } } = meta2;
         if (rpc) {
-          const queue = rpc.queue || tag;
+          const queue = rpc.queue || defaultQueue || tag;
           if (existQueue.has(queue)) continue;
           existQueue.add(queue);
           workerMap[queue] = new (0, _bullmq.Worker)(queue, handleRequest, workerOpts);
+          _chunkSW5IKE5Hjs.Context.applyAddons(addons, workerMap[queue], "bullmq");
         }
       }
     }
   }
-  _chunkTVT62GIXjs.__name.call(void 0, subscribeQueues, "subscribeQueues");
+  _chunkJ5CFUN4Vjs.__name.call(void 0, subscribeQueues, "subscribeQueues");
   async function handleRequest(job) {
     const { data } = job;
     const { tag, func, args, id, queue: clientQueue, _ps } = data;
@@ -53,7 +53,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 context = new (0, _chunkDVTBLV6Ijs.Context)({
+    const aop = _chunkSW5IKE5Hjs.Context.getAop(meta2, {
+      globalFilter,
+      globalGuards,
+      globalPipe
+    });
+    const context = new (0, _chunkSW5IKE5Hjs.Context)({
       type: "bullmq",
       moduleMap,
       meta: meta2,
@@ -65,12 +70,7 @@ async function create({ moduleMap, meta }, opts = {}) {
       queue: job.queueName,
       isEvent
     });
-    await context.run({
-      globalGuards,
-      globalInterceptors,
-      globalFilter,
-      globalPipe
-    }, (returnData) => {
+    await context.run(aop, (returnData) => {
       if (!isEvent) queueMap[clientQueue].add(`${tag}-${func}`, {
         data: returnData,
         id
@@ -85,9 +85,9 @@ async function create({ moduleMap, meta }, opts = {}) {
       }
     });
   }
-  _chunkTVT62GIXjs.__name.call(void 0, handleRequest, "handleRequest");
+  _chunkJ5CFUN4Vjs.__name.call(void 0, handleRequest, "handleRequest");
   subscribeQueues();
-  _chunkDVTBLV6Ijs.HMR.call(void 0, async () => {
+  _chunkSW5IKE5Hjs.HMR.call(void 0, async () => {
     for (const i in workerMap) await workerMap[i].close(true);
     for (const i in queueMap) await queueMap[i].close();
     await subscribeQueues();
@@ -97,7 +97,7 @@ async function create({ moduleMap, meta }, opts = {}) {
     queueMap
   };
 }
-_chunkTVT62GIXjs.__name.call(void 0, create, "create");
+_chunkJ5CFUN4Vjs.__name.call(void 0, create, "create");
 
 // src/rpc/bullmq/client.ts
 var _events = require('events');
@@ -108,7 +108,7 @@ async function createClient(controllers, opts = {}) {
   const { max, workerOpts, queueOpts, timeout, key } = opts;
   const ret = {};
   const emitter = new (0, _events.EventEmitter)();
-  const clientQueue = _chunkDVTBLV6Ijs.genClientQueue.call(void 0, key);
+  const clientQueue = _chunkSW5IKE5Hjs.genClientQueue.call(void 0, key);
   const queueMap = {};
   new (0, _bullmq.Worker)(clientQueue, async (job) => {
     const { data, id, error } = job.data;
@@ -153,7 +153,7 @@ async function createClient(controllers, opts = {}) {
               if (error) reject(data);
               else resolve(data);
             }
-            _chunkTVT62GIXjs.__name.call(void 0, listener, "listener");
+            _chunkJ5CFUN4Vjs.__name.call(void 0, listener, "listener");
             eventCount++;
             emitter.once(id, listener);
           });
@@ -163,7 +163,7 @@ async function createClient(controllers, opts = {}) {
   }
   return ret;
 }
-_chunkTVT62GIXjs.__name.call(void 0, createClient, "createClient");
+_chunkJ5CFUN4Vjs.__name.call(void 0, createClient, "createClient");
 
 
 

package/dist/rpc/bullmq/index.mjs

@@ -4,17 +4,17 @@ import {
   createControllerMetaMap,
   detectAopDep,
   genClientQueue
-} from "../../chunk-2CFYUXPM.mjs";
+} from "../../chunk-P75VKZJY.mjs";
 import {
   __name
-} from "../../chunk-G7TD2VB7.mjs";
+} from "../../chunk-WHJ5FALK.mjs";
 
-// src/rpc/bullmq/bind.ts
+// src/rpc/bullmq/create.ts
 import { Queue, Worker } from "bullmq";
 import Debug from "debug";
 var debug = Debug("phecda-server/bullmq");
 async function create({ moduleMap, meta }, opts = {}) {
-  const { globalGuards, globalInterceptors, globalFilter, globalPipe, workerOpts, queueOpts } = opts;
+  const { globalGuards, globalFilter, globalPipe, workerOpts, queueOpts, defaultQueue } = opts;
   const workerMap = {};
   const queueMap = {};
   const existQueue = /* @__PURE__ */ new Set();
@@ -26,20 +26,20 @@ async function create({ moduleMap, meta }, opts = {}) {
     }
   });
   detectAopDep(meta, {
-    guards: globalGuards,
-    interceptors: globalInterceptors
+    guards: globalGuards
   }, "rpc");
   async function subscribeQueues() {
     existQueue.clear();
     for (const [tag, record] of metaMap) {
       for (const func in record) {
         const meta2 = metaMap.get(tag)[func];
-        const { data: { rpc } } = meta2;
+        const { data: { rpc, addons } } = meta2;
         if (rpc) {
-          const queue = rpc.queue || tag;
+          const queue = rpc.queue || defaultQueue || tag;
           if (existQueue.has(queue)) continue;
           existQueue.add(queue);
           workerMap[queue] = new Worker(queue, handleRequest, workerOpts);
+          Context.applyAddons(addons, workerMap[queue], "bullmq");
         }
       }
     }
@@ -53,6 +53,11 @@ 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 Queue(clientQueue, queueOpts);
+    const aop = Context.getAop(meta2, {
+      globalFilter,
+      globalGuards,
+      globalPipe
+    });
     const context = new Context({
       type: "bullmq",
       moduleMap,
@@ -65,12 +70,7 @@ async function create({ moduleMap, meta }, opts = {}) {
       queue: job.queueName,
       isEvent
     });
-    await context.run({
-      globalGuards,
-      globalInterceptors,
-      globalFilter,
-      globalPipe
-    }, (returnData) => {
+    await context.run(aop, (returnData) => {
       if (!isEvent) queueMap[clientQueue].add(`${tag}-${func}`, {
         data: returnData,
         id

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

@@ -1,7 +1,7 @@
 import { Consumer, Producer } from 'kafkajs';
-import { F as Factory } from '../../core-P1CsH6jz.mjs';
-import { R as RpcContext, a as RpcServerOptions, b as RpcClientOptions } from '../../types-t9D1fU6G.mjs';
-import { T as ToClientMap } from '../../meta-KtfiBIde.mjs';
+import { F as Factory } from '../../core-BIcUwV18.mjs';
+import { R as RpcContext, a as RpcServerOptions, b as RpcClientOptions } from '../../types-BtbL49Zs.mjs';
+import { T as ToClientMap } from '../../meta-BXKLFTgG.mjs';
 import 'phecda-core';
 
 interface KafkaCtx extends RpcContext {

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

@@ -1,7 +1,7 @@
 import { Consumer, Producer } from 'kafkajs';
-import { F as Factory } from '../../core-BlN0Spy9.js';
-import { R as RpcContext, a as RpcServerOptions, b as RpcClientOptions } from '../../types-JVT0mgLD.js';
-import { T as ToClientMap } from '../../meta-KtfiBIde.js';
+import { F as Factory } from '../../core-CYwEPfN4.js';
+import { R as RpcContext, a as RpcServerOptions, b as RpcClientOptions } from '../../types-m3IEDKjP.js';
+import { T as ToClientMap } from '../../meta-BXKLFTgG.js';
 import 'phecda-core';
 
 interface KafkaCtx extends RpcContext {