phecda-server 7.0.0-alpha.1 → 7.0.0-alpha.2

package/dist/rpc/nats/index.js

@@ -3,7 +3,7 @@
 
 
 
-var _chunkGSPBHZBHjs = require('../../chunk-GSPBHZBH.js');
+var _chunkNQIFUZL4js = require('../../chunk-NQIFUZL4.js');
 
 
 var _chunkJ5CFUN4Vjs = require('../../chunk-J5CFUN4V.js');
@@ -17,18 +17,18 @@ async function bind(nc, { moduleMap, meta }, opts = {}) {
   const sc = _nats.StringCodec.call(void 0, );
   const subscriptionMap = {};
   const existQueue = /* @__PURE__ */ new Set();
-  const metaMap = _chunkGSPBHZBHjs.createControllerMetaMap.call(void 0, meta, (meta2) => {
+  const metaMap = _chunkNQIFUZL4js.createControllerMetaMap.call(void 0, meta, (meta2) => {
     const { controller, rpc, func, tag } = meta2.data;
     if (controller === "rpc" && _optionalChain([rpc, 'optionalAccess', _2 => _2.queue]) !== void 0) {
       debug(`register method "${func}" in module "${tag}"`);
       return true;
     }
   });
-  _chunkGSPBHZBHjs.detectAopDep.call(void 0, meta, {
+  _chunkNQIFUZL4js.detectAopDep.call(void 0, meta, {
     addons: globalAddons,
     guards: globalGuards
   }, "rpc");
-  _chunkGSPBHZBHjs.Context.applyAddons(globalAddons, nc, "nats");
+  _chunkNQIFUZL4js.Context.applyAddons(globalAddons, nc, "nats");
   async function subscribeQueues() {
     existQueue.clear();
     for (const [tag, record] of metaMap) {
@@ -56,13 +56,14 @@ async function bind(nc, { moduleMap, meta }, opts = {}) {
     const meta2 = metaMap.get(tag)[func];
     const { data: { rpc: { isEvent } = {} } } = meta2;
     if (isEvent) msg.respond("{}");
-    const aop = _chunkGSPBHZBHjs.Context.getAop(meta2, {
+    const aop = _chunkNQIFUZL4js.Context.getAop(meta2, {
       globalFilter,
       globalGuards,
       globalPipe
     });
-    const context = new (0, _chunkGSPBHZBHjs.Context)({
+    const context = new (0, _chunkNQIFUZL4js.Context)({
       type: "nats",
+      category: "rpc",
       moduleMap,
       meta: meta2,
       tag,
@@ -89,7 +90,7 @@ async function bind(nc, { moduleMap, meta }, opts = {}) {
   }
   _chunkJ5CFUN4Vjs.__name.call(void 0, handleRequest, "handleRequest");
   subscribeQueues();
-  _chunkGSPBHZBHjs.HMR.call(void 0, async () => {
+  _chunkNQIFUZL4js.HMR.call(void 0, async () => {
     for (const i in subscriptionMap) subscriptionMap[i].unsubscribe();
     await subscribeQueues();
   });

package/dist/rpc/nats/index.mjs

@@ -3,7 +3,7 @@ import {
   HMR,
   createControllerMetaMap,
   detectAopDep
-} from "../../chunk-V7EI76QQ.mjs";
+} from "../../chunk-3FHZB3Z5.mjs";
 import {
   __name
 } from "../../chunk-WHJ5FALK.mjs";
@@ -63,6 +63,7 @@ async function bind(nc, { moduleMap, meta }, opts = {}) {
     });
     const context = new Context({
       type: "nats",
+      category: "rpc",
       moduleMap,
       meta: meta2,
       tag,

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

@@ -1,7 +1,7 @@
 import amqplib from 'amqplib';
-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 { F as Factory } from '../../core-CSiaRU7r.mjs';
+import { R as RpcContext, a as RpcServerOptions, b as RpcClientOptions } from '../../types-JMhFVp-Z.mjs';
+import { T as ToClientMap } from '../../meta-D1M85Hef.mjs';
 import 'phecda-core';
 
 interface RabbitmqCtx extends RpcContext {

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

@@ -1,7 +1,7 @@
 import amqplib from 'amqplib';
-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 { F as Factory } from '../../core-C1kHRqU9.js';
+import { R as RpcContext, a as RpcServerOptions, b as RpcClientOptions } from '../../types-C9Remkup.js';
+import { T as ToClientMap } from '../../meta-D1M85Hef.js';
 import 'phecda-core';
 
 interface RabbitmqCtx extends RpcContext {

package/dist/rpc/rabbitmq/index.js

@@ -4,7 +4,7 @@
 
 
 
-var _chunkGSPBHZBHjs = require('../../chunk-GSPBHZBH.js');
+var _chunkNQIFUZL4js = require('../../chunk-NQIFUZL4.js');
 
 
 var _chunkJ5CFUN4Vjs = require('../../chunk-J5CFUN4V.js');
@@ -14,19 +14,19 @@ var _debug = require('debug'); var _debug2 = _interopRequireDefault(_debug);
 var debug = _debug2.default.call(void 0, "phecda-server/rabbitmq");
 async function bind(ch, { moduleMap, meta }, opts = {}) {
   const { globalGuards, globalFilter, globalPipe, globalAddons = [], defaultQueue } = opts;
-  const metaMap = _chunkGSPBHZBHjs.createControllerMetaMap.call(void 0, meta, (meta2) => {
+  const metaMap = _chunkNQIFUZL4js.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;
     }
   });
-  _chunkGSPBHZBHjs.detectAopDep.call(void 0, meta, {
+  _chunkNQIFUZL4js.detectAopDep.call(void 0, meta, {
     guards: globalGuards,
     addons: globalAddons
   }, "rpc");
   const existQueue = /* @__PURE__ */ new Set();
-  _chunkGSPBHZBHjs.Context.applyAddons(globalAddons, ch, "rabbitmq");
+  _chunkNQIFUZL4js.Context.applyAddons(globalAddons, ch, "rabbitmq");
   async function subscribeQueues() {
     existQueue.clear();
     for (const [tag, record] of metaMap) {
@@ -58,13 +58,14 @@ async function bind(ch, { moduleMap, meta }, opts = {}) {
       debug(`invoke method "${func}" in module "${tag}"`);
       const meta2 = metaMap.get(tag)[func];
       const { data: { rpc: { isEvent } = {} } } = meta2;
-      const aop = _chunkGSPBHZBHjs.Context.getAop(meta2, {
+      const aop = _chunkNQIFUZL4js.Context.getAop(meta2, {
         globalFilter,
         globalGuards,
         globalPipe
       });
-      const context = new (0, _chunkGSPBHZBHjs.Context)({
+      const context = new (0, _chunkNQIFUZL4js.Context)({
         type: "rabbitmq",
+        category: "rpc",
         moduleMap,
         meta: meta2,
         tag,
@@ -92,7 +93,7 @@ async function bind(ch, { moduleMap, meta }, opts = {}) {
   }
   _chunkJ5CFUN4Vjs.__name.call(void 0, handleRequest, "handleRequest");
   subscribeQueues();
-  _chunkGSPBHZBHjs.HMR.call(void 0, async () => {
+  _chunkNQIFUZL4js.HMR.call(void 0, async () => {
     for (const queue of existQueue) await ch.deleteQueue(queue);
     await subscribeQueues();
   });
@@ -106,7 +107,7 @@ async function createClient(ch, controllers, opts) {
   let eventCount = 0;
   const ret = {};
   const emitter = new (0, _events.EventEmitter)();
-  const clientQueue = _chunkGSPBHZBHjs.genClientQueue.call(void 0, _optionalChain([opts, 'optionalAccess', _2 => _2.key]));
+  const clientQueue = _chunkNQIFUZL4js.genClientQueue.call(void 0, _optionalChain([opts, 'optionalAccess', _2 => _2.key]));
   await ch.assertQueue(clientQueue);
   ch.consume(clientQueue, (msg) => {
     if (!msg) return;

package/dist/rpc/rabbitmq/index.mjs

@@ -4,7 +4,7 @@ import {
   createControllerMetaMap,
   detectAopDep,
   genClientQueue
-} from "../../chunk-V7EI76QQ.mjs";
+} from "../../chunk-3FHZB3Z5.mjs";
 import {
   __name
 } from "../../chunk-WHJ5FALK.mjs";
@@ -65,6 +65,7 @@ async function bind(ch, { moduleMap, meta }, opts = {}) {
       });
       const context = new Context({
         type: "rabbitmq",
+        category: "rpc",
         moduleMap,
         meta: meta2,
         tag,

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

@@ -1,7 +1,7 @@
 import Redis from 'ioredis';
-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 { F as Factory } from '../../core-CSiaRU7r.mjs';
+import { R as RpcContext, a as RpcServerOptions, b as RpcClientOptions } from '../../types-JMhFVp-Z.mjs';
+import { T as ToClientMap } from '../../meta-D1M85Hef.mjs';
 import 'phecda-core';
 
 interface RedisCtx extends RpcContext {

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

@@ -1,7 +1,7 @@
 import Redis from 'ioredis';
-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 { F as Factory } from '../../core-C1kHRqU9.js';
+import { R as RpcContext, a as RpcServerOptions, b as RpcClientOptions } from '../../types-C9Remkup.js';
+import { T as ToClientMap } from '../../meta-D1M85Hef.js';
 import 'phecda-core';
 
 interface RedisCtx extends RpcContext {

package/dist/rpc/redis/index.js

@@ -4,7 +4,7 @@
 
 
 
-var _chunkGSPBHZBHjs = require('../../chunk-GSPBHZBH.js');
+var _chunkNQIFUZL4js = require('../../chunk-NQIFUZL4.js');
 
 
 var _chunkJ5CFUN4Vjs = require('../../chunk-J5CFUN4V.js');
@@ -14,19 +14,19 @@ 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, globalFilter, globalPipe, globalAddons = [], defaultQueue } = opts;
-  const metaMap = _chunkGSPBHZBHjs.createControllerMetaMap.call(void 0, meta, (meta2) => {
+  const metaMap = _chunkNQIFUZL4js.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;
     }
   });
-  _chunkGSPBHZBHjs.detectAopDep.call(void 0, meta, {
+  _chunkNQIFUZL4js.detectAopDep.call(void 0, meta, {
     guards: globalGuards,
     addons: globalAddons
   }, "rpc");
   const existQueue = /* @__PURE__ */ new Set();
-  _chunkGSPBHZBHjs.Context.applyAddons(globalAddons, {
+  _chunkNQIFUZL4js.Context.applyAddons(globalAddons, {
     pub,
     sub
   }, "redis");
@@ -55,13 +55,14 @@ function bind({ sub, pub }, { moduleMap, meta }, opts = {}) {
       if (_ps !== 1) return;
       const meta2 = metaMap.get(tag)[func];
       const { data: { rpc: { isEvent } = {} } } = meta2;
-      const aop = _chunkGSPBHZBHjs.Context.getAop(meta2, {
+      const aop = _chunkNQIFUZL4js.Context.getAop(meta2, {
         globalFilter,
         globalGuards,
         globalPipe
       });
-      const context = new (0, _chunkGSPBHZBHjs.Context)({
+      const context = new (0, _chunkNQIFUZL4js.Context)({
         type: "redis",
+        category: "rpc",
         moduleMap,
         redis: sub,
         meta: meta2,
@@ -91,7 +92,7 @@ function bind({ sub, pub }, { moduleMap, meta }, opts = {}) {
     }
   });
   subscribeQueues();
-  _chunkGSPBHZBHjs.HMR.call(void 0, async () => {
+  _chunkNQIFUZL4js.HMR.call(void 0, async () => {
     for (const queue of existQueue) await sub.unsubscribe(queue);
     subscribeQueues();
   });
@@ -105,7 +106,7 @@ async function createClient({ pub, sub }, controllers, opts) {
   let eventId = 1;
   let eventCount = 0;
   const emitter = new (0, _events2.default)();
-  const clientQueue = _chunkGSPBHZBHjs.genClientQueue.call(void 0, _optionalChain([opts, 'optionalAccess', _2 => _2.key]));
+  const clientQueue = _chunkNQIFUZL4js.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](), {

package/dist/rpc/redis/index.mjs

@@ -4,7 +4,7 @@ import {
   createControllerMetaMap,
   detectAopDep,
   genClientQueue
-} from "../../chunk-V7EI76QQ.mjs";
+} from "../../chunk-3FHZB3Z5.mjs";
 import {
   __name
 } from "../../chunk-WHJ5FALK.mjs";
@@ -62,6 +62,7 @@ function bind({ sub, pub }, { moduleMap, meta }, opts = {}) {
       });
       const context = new Context({
         type: "redis",
+        category: "rpc",
         moduleMap,
         redis: sub,
         meta: meta2,

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-BIcUwV18.mjs';
-import { P as PickFunc } from './meta-BXKLFTgG.mjs';
+import { F as Factory } from './core-CSiaRU7r.mjs';
+import { P as PickFunc } from './meta-D1M85Hef.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" | "query" | "key" | "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, "use" | "on" | "set" | "query" | "type" | "accept" | "auth" | "withCredentials" | "retry" | "ok" | "redirects" | "timeout" | "buffer" | "serialize" | "parse" | "ca" | "key" | "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-CYwEPfN4.js';
-import { P as PickFunc } from './meta-BXKLFTgG.js';
+import { F as Factory } from './core-C1kHRqU9.js';
+import { P as PickFunc } from './meta-D1M85Hef.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" | "query" | "key" | "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, "use" | "on" | "set" | "query" | "type" | "accept" | "auth" | "withCredentials" | "retry" | "ok" | "redirects" | "timeout" | "buffer" | "serialize" | "parse" | "ca" | "key" | "pfx" | "cert"> & {
     module: <T extends Construct>(Module: T) => SuperTestRequest<PickFunc<InstanceType<T>>>;
 }>;
 

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

@@ -1,4 +1,4 @@
-import { D as DefaultOptions, B as BaseContext } from './meta-BXKLFTgG.mjs';
+import { D as DefaultOptions, B as BaseContext } from './meta-D1M85Hef.js';
 
 interface RpcServerOptions extends DefaultOptions {
     defaultQueue?: string;
@@ -13,6 +13,7 @@ interface RpcContext extends BaseContext {
     id: string;
     queue: string;
     isEvent?: boolean;
+    category: 'rpc';
 }
 
 export type { RpcContext as R, RpcServerOptions as a, RpcClientOptions as b };

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

@@ -1,4 +1,4 @@
-import { D as DefaultOptions, B as BaseContext } from './meta-BXKLFTgG.js';
+import { D as DefaultOptions, B as BaseContext } from './meta-D1M85Hef.mjs';
 
 interface RpcServerOptions extends DefaultOptions {
     defaultQueue?: string;
@@ -13,6 +13,7 @@ interface RpcContext extends BaseContext {
     id: string;
     queue: string;
     isEvent?: boolean;
+    category: 'rpc';
 }
 
 export type { RpcContext as R, RpcServerOptions as a, RpcClientOptions as b };

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

@@ -1,5 +1,5 @@
 import { IncomingHttpHeaders, IncomingMessage, ServerResponse } from 'node:http';
-import { D as DefaultOptions, B as BaseContext } from './meta-BXKLFTgG.js';
+import { D as DefaultOptions, B as BaseContext } from './meta-D1M85Hef.js';
 
 interface HttpOptions extends DefaultOptions {
     /**
@@ -22,6 +22,7 @@ interface HttpContext extends BaseContext {
     params: Record<string, string>;
     body: Record<string, any>;
     headers: IncomingHttpHeaders;
+    category: 'http';
     redirect: (url: string, status?: number) => void;
     getCookie(key: string): string | undefined;
     setCookie(key: string, value: string, opts?: CookieSerializeOptions): void;

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

@@ -1,5 +1,5 @@
 import { IncomingHttpHeaders, IncomingMessage, ServerResponse } from 'node:http';
-import { D as DefaultOptions, B as BaseContext } from './meta-BXKLFTgG.mjs';
+import { D as DefaultOptions, B as BaseContext } from './meta-D1M85Hef.mjs';
 
 interface HttpOptions extends DefaultOptions {
     /**
@@ -22,6 +22,7 @@ interface HttpContext extends BaseContext {
     params: Record<string, string>;
     body: Record<string, any>;
     headers: IncomingHttpHeaders;
+    category: 'http';
     redirect: (url: string, status?: number) => void;
     getCookie(key: string): string | undefined;
     setCookie(key: string, value: string, opts?: CookieSerializeOptions): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "phecda-server",
-  "version": "7.0.0-alpha.1",
+  "version": "7.0.0-alpha.2",
   "description": "server framework that provide IOC/type-reuse/http&rpc-adaptor",
   "author": "fgsreally",
   "license": "MIT",

package/register/loader.mjs

@@ -40,7 +40,7 @@ if (isLowVersion)
 
 let config
 
-const workdir = process.env.PS_WORKDIR || process.cwd()
+const workdir = process.cwd()
 
 const configPath = resolvePath(
   workdir,