phecda-server 6.1.0 → 7.0.0-alpha.0

package/dist/rpc/redis/index.js

@@ -4,28 +4,32 @@
 
 
 
-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/redis/bind.ts
 var _debug = require('debug'); var _debug2 = _interopRequireDefault(_debug);
 var debug = _debug2.default.call(void 0, "phecda-server/redis");
 function bind({ sub, pub }, { moduleMap, meta }, opts = {}) {
-  const { globalGuards, globalInterceptors, globalFilter, globalPipe } = opts;
-  const metaMap = _chunkDVTBLV6Ijs.createControllerMetaMap.call(void 0, meta, (meta2) => {
+  const { globalGuards, globalFilter, globalPipe, globalAddons = [], defaultQueue } = opts;
+  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, {
+  _chunkSW5IKE5Hjs.detectAopDep.call(void 0, meta, {
     guards: globalGuards,
-    interceptors: globalInterceptors
+    addons: globalAddons
   }, "rpc");
   const existQueue = /* @__PURE__ */ new Set();
+  _chunkSW5IKE5Hjs.Context.applyAddons(globalAddons, {
+    pub,
+    sub
+  }, "redis");
   async function subscribeQueues() {
     existQueue.clear();
     for (const [tag, record] of metaMap) {
@@ -33,7 +37,7 @@ function bind({ sub, pub }, { moduleMap, meta }, opts = {}) {
         const meta2 = metaMap.get(tag)[func];
         const { data: { rpc } } = meta2;
         if (rpc) {
-          const queue = rpc.queue || tag;
+          const queue = rpc.queue || defaultQueue || tag;
           if (existQueue.has(queue)) continue;
           existQueue.add(queue);
           await sub.subscribe(queue);
@@ -41,7 +45,7 @@ function bind({ sub, pub }, { moduleMap, meta }, opts = {}) {
       }
     }
   }
-  _chunkTVT62GIXjs.__name.call(void 0, subscribeQueues, "subscribeQueues");
+  _chunkJ5CFUN4Vjs.__name.call(void 0, subscribeQueues, "subscribeQueues");
   sub.on("message", async (channel, msg) => {
     if (!existQueue.has(channel)) return;
     if (msg) {
@@ -51,7 +55,12 @@ function bind({ sub, pub }, { moduleMap, meta }, opts = {}) {
       if (_ps !== 1) return;
       const meta2 = metaMap.get(tag)[func];
       const { data: { rpc: { isEvent } = {} } } = meta2;
-      const context = new (0, _chunkDVTBLV6Ijs.Context)({
+      const aop = _chunkSW5IKE5Hjs.Context.getAop(meta2, {
+        globalFilter,
+        globalGuards,
+        globalPipe
+      });
+      const context = new (0, _chunkSW5IKE5Hjs.Context)({
         type: "redis",
         moduleMap,
         redis: sub,
@@ -65,12 +74,7 @@ function bind({ sub, pub }, { moduleMap, meta }, opts = {}) {
         isEvent,
         queue: channel
       });
-      await context.run({
-        globalGuards,
-        globalInterceptors,
-        globalFilter,
-        globalPipe
-      }, (returnData) => {
+      await context.run(aop, (returnData) => {
         if (!isEvent) pub.publish(clientQueue, JSON.stringify({
           data: returnData,
           id
@@ -87,12 +91,12 @@ function bind({ sub, pub }, { moduleMap, meta }, opts = {}) {
     }
   });
   subscribeQueues();
-  _chunkDVTBLV6Ijs.HMR.call(void 0, async () => {
+  _chunkSW5IKE5Hjs.HMR.call(void 0, async () => {
     for (const queue of existQueue) await sub.unsubscribe(queue);
     subscribeQueues();
   });
 }
-_chunkTVT62GIXjs.__name.call(void 0, bind, "bind");
+_chunkJ5CFUN4Vjs.__name.call(void 0, bind, "bind");
 
 // src/rpc/redis/client.ts
 var _events = require('events'); var _events2 = _interopRequireDefault(_events);
@@ -101,7 +105,7 @@ async function createClient({ pub, sub }, controllers, opts) {
   let eventId = 1;
   let eventCount = 0;
   const emitter = new (0, _events2.default)();
-  const clientQueue = _chunkDVTBLV6Ijs.genClientQueue.call(void 0, _optionalChain([opts, 'optionalAccess', _2 => _2.key]));
+  const clientQueue = _chunkSW5IKE5Hjs.genClientQueue.call(void 0, _optionalChain([opts, 'optionalAccess', _2 => _2.key]));
   await sub.subscribe(clientQueue);
   for (const i in controllers) {
     ret[i] = new Proxy(new controllers[i](), {
@@ -141,7 +145,7 @@ async function createClient({ pub, sub }, 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);
           });
@@ -157,7 +161,7 @@ async function createClient({ pub, sub }, controllers, opts) {
   });
   return ret;
 }
-_chunkTVT62GIXjs.__name.call(void 0, createClient, "createClient");
+_chunkJ5CFUN4Vjs.__name.call(void 0, createClient, "createClient");
 
 
 

package/dist/rpc/redis/index.mjs

@@ -4,16 +4,16 @@ import {
   createControllerMetaMap,
   detectAopDep,
   genClientQueue
-} from "../../chunk-2CFYUXPM.mjs";
+} from "../../chunk-P75VKZJY.mjs";
 import {
   __name
-} from "../../chunk-G7TD2VB7.mjs";
+} from "../../chunk-WHJ5FALK.mjs";
 
 // src/rpc/redis/bind.ts
 import Debug from "debug";
 var debug = Debug("phecda-server/redis");
 function bind({ sub, pub }, { moduleMap, meta }, opts = {}) {
-  const { globalGuards, globalInterceptors, globalFilter, globalPipe } = opts;
+  const { globalGuards, globalFilter, globalPipe, globalAddons = [], defaultQueue } = opts;
   const metaMap = createControllerMetaMap(meta, (meta2) => {
     const { controller, rpc, func, tag } = meta2.data;
     if (controller === "rpc" && rpc?.queue !== void 0) {
@@ -23,9 +23,13 @@ function bind({ sub, pub }, { moduleMap, meta }, opts = {}) {
   });
   detectAopDep(meta, {
     guards: globalGuards,
-    interceptors: globalInterceptors
+    addons: globalAddons
   }, "rpc");
   const existQueue = /* @__PURE__ */ new Set();
+  Context.applyAddons(globalAddons, {
+    pub,
+    sub
+  }, "redis");
   async function subscribeQueues() {
     existQueue.clear();
     for (const [tag, record] of metaMap) {
@@ -33,7 +37,7 @@ function bind({ sub, pub }, { moduleMap, meta }, opts = {}) {
         const meta2 = metaMap.get(tag)[func];
         const { data: { rpc } } = meta2;
         if (rpc) {
-          const queue = rpc.queue || tag;
+          const queue = rpc.queue || defaultQueue || tag;
           if (existQueue.has(queue)) continue;
           existQueue.add(queue);
           await sub.subscribe(queue);
@@ -51,6 +55,11 @@ function bind({ sub, pub }, { moduleMap, meta }, opts = {}) {
       if (_ps !== 1) return;
       const meta2 = metaMap.get(tag)[func];
       const { data: { rpc: { isEvent } = {} } } = meta2;
+      const aop = Context.getAop(meta2, {
+        globalFilter,
+        globalGuards,
+        globalPipe
+      });
       const context = new Context({
         type: "redis",
         moduleMap,
@@ -65,12 +74,7 @@ function bind({ sub, pub }, { moduleMap, meta }, opts = {}) {
         isEvent,
         queue: channel
       });
-      await context.run({
-        globalGuards,
-        globalInterceptors,
-        globalFilter,
-        globalPipe
-      }, (returnData) => {
+      await context.run(aop, (returnData) => {
         if (!isEvent) pub.publish(clientQueue, JSON.stringify({
           data: returnData,
           id

package/dist/test.d.mts

@@ -2,8 +2,8 @@ import * as supertest from 'supertest';
 import { Test } from 'supertest';
 import { Server } from 'node:http';
 import { Construct } from 'phecda-core';
-import { F as Factory } from './core-P1CsH6jz.mjs';
-import { P as PickFunc } from './meta-KtfiBIde.mjs';
+import { F as Factory } from './core-BIcUwV18.mjs';
+import { P as PickFunc } from './meta-BXKLFTgG.mjs';
 
 declare function TestFactory<T extends Construct[]>(...Modules: T): Promise<{
     get<C extends T[number]>(Model: C): InstanceType<C>;
@@ -11,7 +11,7 @@ declare function TestFactory<T extends Construct[]>(...Modules: T): Promise<{
 type SuperTestRequest<T> = {
     [K in keyof T]: T[K] extends (...args: infer R) => any ? (...args: R) => Test : never;
 };
-declare function TestHttp(app: Server | any, { moduleMap, meta }: Awaited<ReturnType<typeof Factory>>, isAgent?: boolean): Promise<supertest.SuperTestWithHost<Test> & Pick<supertest.Request, "type" | "key" | "query" | "use" | "on" | "set" | "accept" | "auth" | "withCredentials" | "retry" | "ok" | "redirects" | "timeout" | "buffer" | "serialize" | "parse" | "ca" | "pfx" | "cert"> & {
+declare function TestHttp(app: Server | any, { moduleMap, meta }: Awaited<ReturnType<typeof Factory>>, isAgent?: boolean): Promise<supertest.SuperTestWithHost<Test> & Pick<supertest.Request, "type" | "query" | "key" | "use" | "on" | "set" | "accept" | "auth" | "withCredentials" | "retry" | "ok" | "redirects" | "timeout" | "buffer" | "serialize" | "parse" | "ca" | "pfx" | "cert"> & {
     module: <T extends Construct>(Module: T) => SuperTestRequest<PickFunc<InstanceType<T>>>;
 }>;
 

package/dist/test.d.ts

@@ -2,8 +2,8 @@ import * as supertest from 'supertest';
 import { Test } from 'supertest';
 import { Server } from 'node:http';
 import { Construct } from 'phecda-core';
-import { F as Factory } from './core-BlN0Spy9.js';
-import { P as PickFunc } from './meta-KtfiBIde.js';
+import { F as Factory } from './core-CYwEPfN4.js';
+import { P as PickFunc } from './meta-BXKLFTgG.js';
 
 declare function TestFactory<T extends Construct[]>(...Modules: T): Promise<{
     get<C extends T[number]>(Model: C): InstanceType<C>;
@@ -11,7 +11,7 @@ declare function TestFactory<T extends Construct[]>(...Modules: T): Promise<{
 type SuperTestRequest<T> = {
     [K in keyof T]: T[K] extends (...args: infer R) => any ? (...args: R) => Test : never;
 };
-declare function TestHttp(app: Server | any, { moduleMap, meta }: Awaited<ReturnType<typeof Factory>>, isAgent?: boolean): Promise<supertest.SuperTestWithHost<Test> & Pick<supertest.Request, "type" | "key" | "query" | "use" | "on" | "set" | "accept" | "auth" | "withCredentials" | "retry" | "ok" | "redirects" | "timeout" | "buffer" | "serialize" | "parse" | "ca" | "pfx" | "cert"> & {
+declare function TestHttp(app: Server | any, { moduleMap, meta }: Awaited<ReturnType<typeof Factory>>, isAgent?: boolean): Promise<supertest.SuperTestWithHost<Test> & Pick<supertest.Request, "type" | "query" | "key" | "use" | "on" | "set" | "accept" | "auth" | "withCredentials" | "retry" | "ok" | "redirects" | "timeout" | "buffer" | "serialize" | "parse" | "ca" | "pfx" | "cert"> & {
     module: <T extends Construct>(Module: T) => SuperTestRequest<PickFunc<InstanceType<T>>>;
 }>;
 

package/dist/test.js

@@ -1,14 +1,14 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } }
 
-var _chunkNL6QBQARjs = require('./chunk-NL6QBQAR.js');
+var _chunkBGXSMOLXjs = require('./chunk-BGXSMOLX.js');
 
 
-var _chunkTVT62GIXjs = require('./chunk-TVT62GIX.js');
+var _chunkJ5CFUN4Vjs = require('./chunk-J5CFUN4V.js');
 
 // src/test.ts
 var _phecdacore = require('phecda-core');
 async function TestFactory(...Modules) {
-  const { moduleMap, modelMap } = await _chunkNL6QBQARjs.Factory.call(void 0, Modules);
+  const { moduleMap, modelMap } = await _chunkBGXSMOLXjs.Factory.call(void 0, Modules);
   return {
     get(Model) {
       const tag = _phecdacore.getTag.call(void 0, Model);
@@ -19,7 +19,7 @@ async function TestFactory(...Modules) {
     }
   };
 }
-_chunkTVT62GIXjs.__name.call(void 0, TestFactory, "TestFactory");
+_chunkJ5CFUN4Vjs.__name.call(void 0, TestFactory, "TestFactory");
 async function TestHttp(app, { moduleMap, meta }, isAgent = true) {
   const { default: request, agent } = await Promise.resolve().then(() => _interopRequireWildcard(require("supertest")));
   const Agent = agent(app);
@@ -59,11 +59,11 @@ async function TestHttp(app, { moduleMap, meta }, isAgent = true) {
       }
     });
   }
-  _chunkTVT62GIXjs.__name.call(void 0, module, "module");
+  _chunkJ5CFUN4Vjs.__name.call(void 0, module, "module");
   Agent.module = module;
   return Agent;
 }
-_chunkTVT62GIXjs.__name.call(void 0, TestHttp, "TestHttp");
+_chunkJ5CFUN4Vjs.__name.call(void 0, TestHttp, "TestHttp");
 
 
 

package/dist/test.mjs

@@ -1,9 +1,9 @@
 import {
   Factory
-} from "./chunk-3H3T54IC.mjs";
+} from "./chunk-5622RBNB.mjs";
 import {
   __name
-} from "./chunk-G7TD2VB7.mjs";
+} from "./chunk-WHJ5FALK.mjs";
 
 // src/test.ts
 import { getTag } from "phecda-core";

package/dist/{types-JVT0mgLD.d.ts → types-BtbL49Zs.d.mts}

@@ -1,6 +1,7 @@
-import { D as DefaultOptions, B as BaseContext } from './meta-KtfiBIde.js';
+import { D as DefaultOptions, B as BaseContext } from './meta-BXKLFTgG.mjs';
 
 interface RpcServerOptions extends DefaultOptions {
+    defaultQueue?: string;
 }
 interface RpcClientOptions {
     key?: string;

package/dist/{types-DIw7B6Up.d.ts → types-VFzEM7LL.d.ts}

@@ -1,5 +1,5 @@
 import { IncomingHttpHeaders, IncomingMessage, ServerResponse } from 'node:http';
-import { D as DefaultOptions, B as BaseContext } from './meta-KtfiBIde.js';
+import { D as DefaultOptions, B as BaseContext } from './meta-BXKLFTgG.js';
 
 interface HttpOptions extends DefaultOptions {
     /**
@@ -9,11 +9,11 @@ interface HttpOptions extends DefaultOptions {
     /**
      * 专用路由的插件(work for merge request)，
      */
-    parallelPlugins?: string[];
+    parallelAddons?: string[];
     /**
-       *  only work for http server
-       */
-    globalPlugins?: string[];
+     * 是否动态计算pipe/guards/filer
+     */
+    dynamic?: boolean;
 }
 interface HttpContext extends BaseContext {
     parallel?: true;

package/dist/{types-BvD3B5Ny.d.mts → types-h40T3cRG.d.mts}

@@ -1,5 +1,5 @@
 import { IncomingHttpHeaders, IncomingMessage, ServerResponse } from 'node:http';
-import { D as DefaultOptions, B as BaseContext } from './meta-KtfiBIde.mjs';
+import { D as DefaultOptions, B as BaseContext } from './meta-BXKLFTgG.mjs';
 
 interface HttpOptions extends DefaultOptions {
     /**
@@ -9,11 +9,11 @@ interface HttpOptions extends DefaultOptions {
     /**
      * 专用路由的插件(work for merge request)，
      */
-    parallelPlugins?: string[];
+    parallelAddons?: string[];
     /**
-       *  only work for http server
-       */
-    globalPlugins?: string[];
+     * 是否动态计算pipe/guards/filer
+     */
+    dynamic?: boolean;
 }
 interface HttpContext extends BaseContext {
     parallel?: true;

package/dist/{types-t9D1fU6G.d.mts → types-m3IEDKjP.d.ts}

@@ -1,6 +1,7 @@
-import { D as DefaultOptions, B as BaseContext } from './meta-KtfiBIde.mjs';
+import { D as DefaultOptions, B as BaseContext } from './meta-BXKLFTgG.js';
 
 interface RpcServerOptions extends DefaultOptions {
+    defaultQueue?: string;
 }
 interface RpcClientOptions {
     key?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "phecda-server",
-  "version": "6.1.0",
+  "version": "7.0.0-alpha.0",
   "description": "server framework that provide IOC/type-reuse/http&rpc-adaptor",
   "author": "fgsreally",
   "license": "MIT",
@@ -26,32 +26,32 @@
       "import": "./dist/test.mjs"
     },
     "./h3": {
-      "require": "./dist/server/h3/index.js",
-      "import": "./dist/server/h3/index.mjs"
+      "require": "./dist/http/h3/index.js",
+      "import": "./dist/http/h3/index.mjs"
     },
     "./express": {
-      "require": "./dist/server/express/index.js",
-      "import": "./dist/server/express/index.mjs"
+      "require": "./dist/http/express/index.js",
+      "import": "./dist/http/express/index.mjs"
     },
     "./koa": {
-      "require": "./dist/server/koa/index.js",
-      "import": "./dist/server/koa/index.mjs"
+      "require": "./dist/http/koa/index.js",
+      "import": "./dist/http/koa/index.mjs"
     },
     "./fastify": {
-      "require": "./dist/server/fastify/index.js",
-      "import": "./dist/server/fastify/index.mjs"
+      "require": "./dist/http/fastify/index.js",
+      "import": "./dist/http/fastify/index.mjs"
     },
     "./hyper-express": {
-      "require": "./dist/server/hyper-express/index.js",
-      "import": "./dist/server/hyper-express/index.mjs"
+      "require": "./dist/http/hyper-express/index.js",
+      "import": "./dist/http/hyper-express/index.mjs"
     },
     "./hono": {
-      "require": "./dist/server/hono/index.js",
-      "import": "./dist/server/hono/index.mjs"
+      "require": "./dist/http/hono/index.js",
+      "import": "./dist/http/hono/index.mjs"
     },
     "./elysia": {
-      "require": "./dist/server/elysia/index.js",
-      "import": "./dist/server/elysia/index.mjs"
+      "require": "./dist/http/elysia/index.js",
+      "import": "./dist/http/elysia/index.mjs"
     },
     "./redis": {
       "require": "./dist/rpc/redis/index.js",
@@ -91,25 +91,25 @@
         "dist/helper.d.ts"
       ],
       "h3": [
-        "dist/server/h3/index.d.ts"
+        "dist/http/h3/index.d.ts"
       ],
       "express": [
-        "dist/server/express/index.d.ts"
+        "dist/http/express/index.d.ts"
       ],
       "koa": [
-        "dist/server/koa/index.d.ts"
+        "dist/http/koa/index.d.ts"
       ],
       "fastify": [
-        "dist/server/fastify/index.d.ts"
+        "dist/http/fastify/index.d.ts"
       ],
       "hyper-express": [
-        "dist/server/hyper-express/index.d.ts"
+        "dist/http/hyper-express/index.d.ts"
       ],
       "hono": [
-        "dist/server/hono/index.d.ts"
+        "dist/http/hono/index.d.ts"
       ],
       "elysia": [
-        "dist/server/elysia/index.d.ts"
+        "dist/http/elysia/index.d.ts"
       ],
       "redis": [
         "dist/rpc/redis/index.d.ts"
@@ -143,6 +143,7 @@
     "chokidar": "^3.5.3",
     "debug": "^4.3.4",
     "fs-extra": "^11.2.0",
+    "h3": "^1.12.0",
     "picocolors": "^1.0.0",
     "reflect-metadata": "^0.1.13",
     "ts-mixer": "^6.0.4",
@@ -163,7 +164,6 @@
     "elysia": "^1.0.17",
     "express": "^4.18.2",
     "fastify": "^4.25.1",
-    "h3": "^1.11.1",
     "hono": "^4.3.4",
     "hyper-express": "^6.15.2",
     "ioredis": "^5.3.2",