phecda-server 5.0.0 → 5.0.1

package/dist/server/hyper-express/index.js

@@ -4,7 +4,7 @@
 
 
 
-var _chunk5YYZLGGNjs = require('../../chunk-5YYZLGGN.js');
+var _chunkYERBWZCSjs = require('../../chunk-YERBWZCS.js');
 
 
 var _chunkYR5Q5F2Kjs = require('../../chunk-YR5Q5F2K.js');
@@ -12,13 +12,11 @@ var _chunkYR5Q5F2Kjs = require('../../chunk-YR5Q5F2K.js');
 // src/server/hyper-express/bind.ts
 var _debug = require('debug'); var _debug2 = _interopRequireDefault(_debug);
 var debug = _debug2.default.call(void 0, "phecda-server/hyper-express");
-function bind(router, { moduleMap, meta }, ServerOptions = {}) {
-  const { globalGuards, globalInterceptors, route, plugins } = {
+function bind(router, { moduleMap, meta }, opts = {}) {
+  const { globalGuards, globalInterceptors, route, plugins, globalFilter, globalPipe } = {
     route: "/__PHECDA_SERVER__",
-    globalGuards: [],
-    globalInterceptors: [],
     plugins: [],
-    ...ServerOptions
+    ...opts
   };
   const metaMap = /* @__PURE__ */ new Map();
   function handleMeta() {
@@ -28,14 +26,6 @@ function bind(router, { moduleMap, meta }, ServerOptions = {}) {
       if (controller !== "http" || !_optionalChain([http, 'optionalAccess', _ => _.type]))
         continue;
       debug(`register method "${func}" in module "${tag}"`);
-      item.data.guards = [
-        ...globalGuards,
-        ...item.data.guards
-      ];
-      item.data.interceptors = [
-        ...globalInterceptors,
-        ...item.data.interceptors
-      ];
       if (metaMap.has(tag))
         metaMap.get(tag)[func] = item;
       else
@@ -48,27 +38,27 @@ function bind(router, { moduleMap, meta }, ServerOptions = {}) {
   async function createRoute() {
     router.post(route, {
       middlewares: [
-        ..._chunk5YYZLGGNjs.Context.usePlugin(plugins)
+        ..._chunkYERBWZCSjs.Context.usePlugin(plugins)
       ]
     }, async (req, res, next) => {
       const body = await req.json();
       async function errorHandler(e) {
-        const error = await _chunk5YYZLGGNjs.Context.filterRecord.default(e);
+        const error = await _chunkYERBWZCSjs.Context.filterRecord.default(e);
         return res.status(error.status).json(error);
       }
       _chunkYR5Q5F2Kjs.__name.call(void 0, errorHandler, "errorHandler");
       if (!Array.isArray(body))
-        return errorHandler(new (0, _chunk5YYZLGGNjs.BadRequestException)("data format should be an array"));
+        return errorHandler(new (0, _chunkYERBWZCSjs.BadRequestException)("data format should be an array"));
       try {
         return Promise.all(body.map((item, i) => {
           return new Promise(async (resolve) => {
             const { tag, func } = item;
             debug(`(parallel)invoke method "${func}" in module "${tag}"`);
             if (!metaMap.has(tag))
-              return resolve(await _chunk5YYZLGGNjs.Context.filterRecord.default(new (0, _chunk5YYZLGGNjs.BadRequestException)(`module "${tag}" doesn't exist`)));
+              return resolve(await _chunkYERBWZCSjs.Context.filterRecord.default(new (0, _chunkYERBWZCSjs.BadRequestException)(`module "${tag}" doesn't exist`)));
             const meta2 = metaMap.get(tag)[func];
             if (!meta2)
-              return resolve(await _chunk5YYZLGGNjs.Context.filterRecord.default(new (0, _chunk5YYZLGGNjs.BadRequestException)(`"${func}" in "${tag}" doesn't exist`)));
+              return resolve(await _chunkYERBWZCSjs.Context.filterRecord.default(new (0, _chunkYERBWZCSjs.BadRequestException)(`"${func}" in "${tag}" doesn't exist`)));
             const { data: { params } } = meta2;
             const contextData = {
               type: "hyper-express",
@@ -82,10 +72,15 @@ function bind(router, { moduleMap, meta }, ServerOptions = {}) {
               func,
               next,
               app: router,
-              ..._chunk5YYZLGGNjs.argToReq.call(void 0, params, item.args, req.headers)
+              ..._chunkYERBWZCSjs.argToReq.call(void 0, params, item.args, req.headers)
             };
-            const context = new (0, _chunk5YYZLGGNjs.Context)(contextData);
-            context.run(resolve, resolve);
+            const context = new (0, _chunkYERBWZCSjs.Context)(contextData);
+            context.run({
+              globalGuards,
+              globalInterceptors,
+              globalFilter,
+              globalPipe
+            }, resolve, resolve);
           });
         })).then((ret) => {
           res.json(ret);
@@ -101,7 +96,7 @@ function bind(router, { moduleMap, meta }, ServerOptions = {}) {
         if (!_optionalChain([http, 'optionalAccess', _2 => _2.type]))
           continue;
         const needBody = params.some((item) => item.type === "body");
-        router[http.type](http.prefix + http.route, ..._chunk5YYZLGGNjs.Context.usePlugin(plugins2), async (req, res, next) => {
+        router[http.type](http.prefix + http.route, ..._chunkYERBWZCSjs.Context.usePlugin(plugins2), async (req, res, next) => {
           debug(`invoke method "${func}" in module "${tag}"`);
           const contextData = {
             type: "hyper-express",
@@ -118,12 +113,17 @@ function bind(router, { moduleMap, meta }, ServerOptions = {}) {
             headers: req.headers,
             next
           };
-          const context = new (0, _chunk5YYZLGGNjs.Context)(contextData);
+          const context = new (0, _chunkYERBWZCSjs.Context)(contextData);
           if (http.headers) {
             for (const name in http.headers)
               res.set(name, http.headers[name]);
           }
-          await context.run((returnData) => {
+          await context.run({
+            globalGuards,
+            globalInterceptors,
+            globalFilter,
+            globalPipe
+          }, (returnData) => {
             if (res.writableEnded)
               return;
             if (typeof returnData === "string")
@@ -140,15 +140,15 @@ function bind(router, { moduleMap, meta }, ServerOptions = {}) {
     }
   }
   _chunkYR5Q5F2Kjs.__name.call(void 0, createRoute, "createRoute");
-  _chunk5YYZLGGNjs.detectAopDep.call(void 0, meta, {
+  _chunkYERBWZCSjs.detectAopDep.call(void 0, meta, {
     plugins,
     guards: globalGuards,
     interceptors: globalInterceptors
   });
   handleMeta();
   createRoute();
-  _chunk5YYZLGGNjs.HMR.call(void 0, () => {
-    _chunk5YYZLGGNjs.detectAopDep.call(void 0, meta, {
+  _chunkYERBWZCSjs.HMR.call(void 0, () => {
+    _chunkYERBWZCSjs.detectAopDep.call(void 0, meta, {
       plugins,
       guards: globalGuards,
       interceptors: globalInterceptors

package/dist/server/hyper-express/index.mjs

@@ -4,7 +4,7 @@ import {
   HMR,
   argToReq,
   detectAopDep
-} from "../../chunk-5VMFQOJ7.mjs";
+} from "../../chunk-AB4OX3WV.mjs";
 import {
   __name
 } from "../../chunk-ITTD2GBR.mjs";
@@ -12,13 +12,11 @@ import {
 // src/server/hyper-express/bind.ts
 import Debug from "debug";
 var debug = Debug("phecda-server/hyper-express");
-function bind(router, { moduleMap, meta }, ServerOptions = {}) {
-  const { globalGuards, globalInterceptors, route, plugins } = {
+function bind(router, { moduleMap, meta }, opts = {}) {
+  const { globalGuards, globalInterceptors, route, plugins, globalFilter, globalPipe } = {
     route: "/__PHECDA_SERVER__",
-    globalGuards: [],
-    globalInterceptors: [],
     plugins: [],
-    ...ServerOptions
+    ...opts
   };
   const metaMap = /* @__PURE__ */ new Map();
   function handleMeta() {
@@ -28,14 +26,6 @@ function bind(router, { moduleMap, meta }, ServerOptions = {}) {
       if (controller !== "http" || !http?.type)
         continue;
       debug(`register method "${func}" in module "${tag}"`);
-      item.data.guards = [
-        ...globalGuards,
-        ...item.data.guards
-      ];
-      item.data.interceptors = [
-        ...globalInterceptors,
-        ...item.data.interceptors
-      ];
       if (metaMap.has(tag))
         metaMap.get(tag)[func] = item;
       else
@@ -85,7 +75,12 @@ function bind(router, { moduleMap, meta }, ServerOptions = {}) {
               ...argToReq(params, item.args, req.headers)
             };
             const context = new Context(contextData);
-            context.run(resolve, resolve);
+            context.run({
+              globalGuards,
+              globalInterceptors,
+              globalFilter,
+              globalPipe
+            }, resolve, resolve);
           });
         })).then((ret) => {
           res.json(ret);
@@ -123,7 +118,12 @@ function bind(router, { moduleMap, meta }, ServerOptions = {}) {
             for (const name in http.headers)
               res.set(name, http.headers[name]);
           }
-          await context.run((returnData) => {
+          await context.run({
+            globalGuards,
+            globalInterceptors,
+            globalFilter,
+            globalPipe
+          }, (returnData) => {
             if (res.writableEnded)
               return;
             if (typeof returnData === "string")

package/dist/server/koa/index.d.ts

@@ -1,9 +1,9 @@
 import Router, { RouterParamContext } from '@koa/router';
 import { DefaultContext, DefaultState } from 'koa';
-import { S as ServerOptions } from '../../helper-88b19c66.js';
-import { H as HttpContext, F as Factory } from '../../core-eb646fe5.js';
+import { a as HttpContext, H as HttpOptions } from '../../helper-f29f082f.js';
+import { F as Factory } from '../../core-fd134ffa.js';
+import 'node:http';
 import 'phecda-core';
-import 'http';
 
 interface KoaCtx extends HttpContext {
     type: 'koa';
@@ -11,6 +11,6 @@ interface KoaCtx extends HttpContext {
     next: Function;
     app: Router;
 }
-declare function bind(router: Router, { moduleMap, meta }: Awaited<ReturnType<typeof Factory>>, ServerOptions?: ServerOptions): void;
+declare function bind(router: Router, { moduleMap, meta }: Awaited<ReturnType<typeof Factory>>, opts?: HttpOptions): void;
 
 export { KoaCtx, bind };

package/dist/server/koa/index.js

@@ -4,7 +4,7 @@
 
 
 
-var _chunk5YYZLGGNjs = require('../../chunk-5YYZLGGN.js');
+var _chunkYERBWZCSjs = require('../../chunk-YERBWZCS.js');
 
 
 var _chunkYR5Q5F2Kjs = require('../../chunk-YR5Q5F2K.js');
@@ -12,13 +12,11 @@ var _chunkYR5Q5F2Kjs = require('../../chunk-YR5Q5F2K.js');
 // src/server/koa/bind.ts
 var _debug = require('debug'); var _debug2 = _interopRequireDefault(_debug);
 var debug = _debug2.default.call(void 0, "phecda-server/koa");
-function bind(router, { moduleMap, meta }, ServerOptions = {}) {
-  const { globalGuards, globalInterceptors, route, plugins } = {
+function bind(router, { moduleMap, meta }, opts = {}) {
+  const { globalGuards, globalInterceptors, route, plugins, globalFilter, globalPipe } = {
     route: "/__PHECDA_SERVER__",
-    globalGuards: [],
-    globalInterceptors: [],
     plugins: [],
-    ...ServerOptions
+    ...opts
   };
   const originStack = router.stack.slice(0, router.stack.length);
   const metaMap = /* @__PURE__ */ new Map();
@@ -29,14 +27,6 @@ function bind(router, { moduleMap, meta }, ServerOptions = {}) {
       if (controller !== "http" || !_optionalChain([http, 'optionalAccess', _ => _.type]))
         continue;
       debug(`register method "${func}" in module "${tag}"`);
-      item.data.guards = [
-        ...globalGuards,
-        ...item.data.guards
-      ];
-      item.data.interceptors = [
-        ...globalInterceptors,
-        ...item.data.interceptors
-      ];
       if (metaMap.has(tag))
         metaMap.get(tag)[func] = item;
       else
@@ -47,26 +37,26 @@ function bind(router, { moduleMap, meta }, ServerOptions = {}) {
   }
   _chunkYR5Q5F2Kjs.__name.call(void 0, handleMeta, "handleMeta");
   async function createRoute() {
-    router.post(route, ..._chunk5YYZLGGNjs.Context.usePlugin(plugins), async (ctx, next) => {
+    router.post(route, ..._chunkYERBWZCSjs.Context.usePlugin(plugins), async (ctx, next) => {
       const { body } = ctx.request;
       async function errorHandler(e) {
-        const error = await _chunk5YYZLGGNjs.Context.filterRecord.default(e);
+        const error = await _chunkYERBWZCSjs.Context.filterRecord.default(e);
         ctx.status = error.status;
         ctx.body = error;
       }
       _chunkYR5Q5F2Kjs.__name.call(void 0, errorHandler, "errorHandler");
       if (!Array.isArray(body))
-        return errorHandler(new (0, _chunk5YYZLGGNjs.BadRequestException)("data format should be an array"));
+        return errorHandler(new (0, _chunkYERBWZCSjs.BadRequestException)("data format should be an array"));
       try {
         return Promise.all(body.map((item, i) => {
           return new Promise(async (resolve) => {
             const { tag, func } = item;
             debug(`(parallel)invoke method "${func}" in module "${tag}"`);
             if (!metaMap.has(tag))
-              return resolve(await _chunk5YYZLGGNjs.Context.filterRecord.default(new (0, _chunk5YYZLGGNjs.BadRequestException)(`module "${tag}" doesn't exist`)));
+              return resolve(await _chunkYERBWZCSjs.Context.filterRecord.default(new (0, _chunkYERBWZCSjs.BadRequestException)(`module "${tag}" doesn't exist`)));
             const meta2 = metaMap.get(tag)[func];
             if (!meta2)
-              return resolve(await _chunk5YYZLGGNjs.Context.filterRecord.default(new (0, _chunk5YYZLGGNjs.BadRequestException)(`"${func}" in "${tag}" doesn't exist`)));
+              return resolve(await _chunkYERBWZCSjs.Context.filterRecord.default(new (0, _chunkYERBWZCSjs.BadRequestException)(`"${func}" in "${tag}" doesn't exist`)));
             const { data: { params } } = meta2;
             const contextData = {
               type: "koa",
@@ -77,12 +67,17 @@ function bind(router, { moduleMap, meta }, ServerOptions = {}) {
               parallel: true,
               next,
               app: router,
-              ..._chunk5YYZLGGNjs.argToReq.call(void 0, params, item.args, ctx.headers),
+              ..._chunkYERBWZCSjs.argToReq.call(void 0, params, item.args, ctx.headers),
               tag,
               func
             };
-            const context = new (0, _chunk5YYZLGGNjs.Context)(contextData);
-            context.run(resolve, resolve);
+            const context = new (0, _chunkYERBWZCSjs.Context)(contextData);
+            context.run({
+              globalGuards,
+              globalInterceptors,
+              globalFilter,
+              globalPipe
+            }, resolve, resolve);
           });
         })).then((ret) => {
           ctx.body = ret;
@@ -97,7 +92,7 @@ function bind(router, { moduleMap, meta }, ServerOptions = {}) {
         const { data: { plugins: plugins2, http } } = meta2;
         if (!_optionalChain([http, 'optionalAccess', _2 => _2.type]))
           continue;
-        router[http.type](http.prefix + http.route, ..._chunk5YYZLGGNjs.Context.usePlugin(plugins2), async (ctx, next) => {
+        router[http.type](http.prefix + http.route, ..._chunkYERBWZCSjs.Context.usePlugin(plugins2), async (ctx, next) => {
           debug(`invoke method "${func}" in module "${tag}"`);
           const contextData = {
             type: "koa",
@@ -113,12 +108,17 @@ function bind(router, { moduleMap, meta }, ServerOptions = {}) {
             headers: ctx.headers,
             next
           };
-          const context = new (0, _chunk5YYZLGGNjs.Context)(contextData);
+          const context = new (0, _chunkYERBWZCSjs.Context)(contextData);
           if (http.headers) {
             for (const name in http.headers)
               ctx.set(name, http.headers[name]);
           }
-          await context.run((returnData) => {
+          await context.run({
+            globalGuards,
+            globalInterceptors,
+            globalFilter,
+            globalPipe
+          }, (returnData) => {
             if (ctx.res.writableEnded)
               return;
             ctx.body = returnData;
@@ -133,16 +133,16 @@ function bind(router, { moduleMap, meta }, ServerOptions = {}) {
     }
   }
   _chunkYR5Q5F2Kjs.__name.call(void 0, createRoute, "createRoute");
-  _chunk5YYZLGGNjs.detectAopDep.call(void 0, meta, {
+  _chunkYERBWZCSjs.detectAopDep.call(void 0, meta, {
     plugins,
     guards: globalGuards,
     interceptors: globalInterceptors
   });
   handleMeta();
   createRoute();
-  _chunk5YYZLGGNjs.HMR.call(void 0, async () => {
+  _chunkYERBWZCSjs.HMR.call(void 0, async () => {
     router.stack = originStack;
-    _chunk5YYZLGGNjs.detectAopDep.call(void 0, meta, {
+    _chunkYERBWZCSjs.detectAopDep.call(void 0, meta, {
       plugins,
       guards: globalGuards,
       interceptors: globalInterceptors

package/dist/server/koa/index.mjs

@@ -4,7 +4,7 @@ import {
   HMR,
   argToReq,
   detectAopDep
-} from "../../chunk-5VMFQOJ7.mjs";
+} from "../../chunk-AB4OX3WV.mjs";
 import {
   __name
 } from "../../chunk-ITTD2GBR.mjs";
@@ -12,13 +12,11 @@ import {
 // src/server/koa/bind.ts
 import Debug from "debug";
 var debug = Debug("phecda-server/koa");
-function bind(router, { moduleMap, meta }, ServerOptions = {}) {
-  const { globalGuards, globalInterceptors, route, plugins } = {
+function bind(router, { moduleMap, meta }, opts = {}) {
+  const { globalGuards, globalInterceptors, route, plugins, globalFilter, globalPipe } = {
     route: "/__PHECDA_SERVER__",
-    globalGuards: [],
-    globalInterceptors: [],
     plugins: [],
-    ...ServerOptions
+    ...opts
   };
   const originStack = router.stack.slice(0, router.stack.length);
   const metaMap = /* @__PURE__ */ new Map();
@@ -29,14 +27,6 @@ function bind(router, { moduleMap, meta }, ServerOptions = {}) {
       if (controller !== "http" || !http?.type)
         continue;
       debug(`register method "${func}" in module "${tag}"`);
-      item.data.guards = [
-        ...globalGuards,
-        ...item.data.guards
-      ];
-      item.data.interceptors = [
-        ...globalInterceptors,
-        ...item.data.interceptors
-      ];
       if (metaMap.has(tag))
         metaMap.get(tag)[func] = item;
       else
@@ -82,7 +72,12 @@ function bind(router, { moduleMap, meta }, ServerOptions = {}) {
               func
             };
             const context = new Context(contextData);
-            context.run(resolve, resolve);
+            context.run({
+              globalGuards,
+              globalInterceptors,
+              globalFilter,
+              globalPipe
+            }, resolve, resolve);
           });
         })).then((ret) => {
           ctx.body = ret;
@@ -118,7 +113,12 @@ function bind(router, { moduleMap, meta }, ServerOptions = {}) {
             for (const name in http.headers)
               ctx.set(name, http.headers[name]);
           }
-          await context.run((returnData) => {
+          await context.run({
+            globalGuards,
+            globalInterceptors,
+            globalFilter,
+            globalPipe
+          }, (returnData) => {
             if (ctx.res.writableEnded)
               return;
             ctx.body = returnData;

package/dist/test.d.ts

@@ -2,8 +2,7 @@ import * as supertest from 'supertest';
 import { Test } from 'supertest';
 import { Server } from 'node:http';
 import { Construct } from 'phecda-core';
-import { F as Factory, P as PickFunc } from './core-eb646fe5.js';
-import 'http';
+import { F as Factory, P as PickFunc } from './core-fd134ffa.js';
 
 declare function TestFactory<T extends Construct[]>(...Modules: T): Promise<{
     get<C extends T[number]>(Module: C): InstanceType<C>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "phecda-server",
-  "version": "5.0.0",
-  "description": "provide express middlewares, `nestjs` format",
+  "version": "5.0.1",
+  "description": "server framework that provide IOC/type-reuse/http&rpc-adaptor ",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",

package/dist/helper-88b19c66.d.ts

@@ -1,12 +0,0 @@
-import { C as ControllerMetaData } from './core-eb646fe5.js';
-
-declare function resolveDep(ret: any, key: string): any;
-interface ServerOptions {
-    route?: string;
-    globalGuards?: string[];
-    globalInterceptors?: string[];
-    plugins?: string[];
-}
-declare function argToReq(params: ControllerMetaData['params'], args: any[], headers: Record<string, any>): any;
-
-export { ServerOptions as S, argToReq as a, resolveDep as r };

package/dist/helper-9e206c66.d.ts

@@ -1,12 +0,0 @@
-declare function genClientQueue(key?: string): string;
-interface RpcServerOptions {
-    globalGuards?: string[];
-    globalInterceptors?: string[];
-}
-interface RpcClientOptions {
-    key?: string;
-    timeout?: number;
-    max?: number;
-}
-
-export { RpcServerOptions as R, RpcClientOptions as a, genClientQueue as g };