phecda-server 5.0.0-alpha.12 → 5.0.0-alpha.14

package/dist/{chunk-27WMBKFH.js → chunk-WOJAARJJ.js}

@@ -2,8 +2,7 @@
 
 
 
-
-var _chunkGWLM5DEJjs = require('./chunk-GWLM5DEJ.js');
+var _chunkT4C6CCWMjs = require('./chunk-T4C6CCWM.js');
 
 // src/meta.ts
 var Meta = class {
@@ -16,10 +15,10 @@ var Meta = class {
     this.paramsType = paramsType;
   }
 };
-_chunkGWLM5DEJjs.__name.call(void 0, Meta, "Meta");
+_chunkT4C6CCWMjs.__name.call(void 0, Meta, "Meta");
 
 // src/compiler/rpc.ts
-var Compiler = /* @__PURE__ */ _chunkGWLM5DEJjs.__name.call(void 0,  (_class =class Compiler2 {
+var Compiler = /* @__PURE__ */ _chunkT4C6CCWMjs.__name.call(void 0,  (_class =class Compiler2 {
   __init() {this.classMap = {}}
   constructor() {;_class.prototype.__init.call(this);
   }
@@ -55,10 +54,10 @@ function generateRPCCode(meta) {
     compiler.addMethod(i);
   return compiler.getContent();
 }
-_chunkGWLM5DEJjs.__name.call(void 0, generateRPCCode, "generateRPCCode");
+_chunkT4C6CCWMjs.__name.call(void 0, generateRPCCode, "generateRPCCode");
 
 // src/compiler/http.ts
-var Compiler3 = /* @__PURE__ */ _chunkGWLM5DEJjs.__name.call(void 0,  (_class2 =class Compiler4 {
+var Compiler3 = /* @__PURE__ */ _chunkT4C6CCWMjs.__name.call(void 0,  (_class2 =class Compiler4 {
   __init2() {this.classMap = {}}
   constructor() {;_class2.prototype.__init2.call(this);
   }
@@ -97,7 +96,7 @@ function generateHTTPCode(meta) {
     compiler.addMethod(i);
   return compiler.getContent();
 }
-_chunkGWLM5DEJjs.__name.call(void 0, generateHTTPCode, "generateHTTPCode");
+_chunkT4C6CCWMjs.__name.call(void 0, generateHTTPCode, "generateHTTPCode");
 
 // src/core.ts
 require('reflect-metadata');
@@ -108,7 +107,7 @@ var _debug = require('debug'); var _debug2 = _interopRequireDefault(_debug);
 function Injectable() {
   return (target) => _phecdacore.Empty.call(void 0, target);
 }
-_chunkGWLM5DEJjs.__name.call(void 0, Injectable, "Injectable");
+_chunkT4C6CCWMjs.__name.call(void 0, Injectable, "Injectable");
 var debug = _debug2.default.call(void 0, "phecda-server");
 var emitter = new (0, _events2.default)();
 async function Factory(Modules, opts = {}) {
@@ -121,27 +120,22 @@ async function Factory(Modules, opts = {}) {
   if (!_phecdacore.getProperty.call(void 0, "watcher")) {
     _phecdacore.injectProperty.call(void 0, "watcher", ({ eventName, instance, key, options }) => {
       const fn = typeof instance[key] === "function" ? instance[key].bind(instance) : (v) => instance[key] = v;
-      if (!instance[_chunkGWLM5DEJjs.UNMOUNT_SYMBOL])
-        instance[_chunkGWLM5DEJjs.UNMOUNT_SYMBOL] = [];
-      instance[_chunkGWLM5DEJjs.UNMOUNT_SYMBOL].push(() => {
-        emitter.off(eventName, fn);
-      });
       if (_optionalChain([options, 'optionalAccess', _2 => _2.once]))
         emitter.once(eventName, fn);
       else
         emitter.on(eventName, fn);
+      return () => {
+        emitter.off(eventName, fn);
+      };
     });
   }
   async function del(tag) {
     if (!moduleMap.has(tag))
       return;
     const instance = moduleMap.get(tag);
-    debug(`unmount module "${tag}"`);
-    if (_optionalChain([instance, 'optionalAccess', _3 => _3[_chunkGWLM5DEJjs.UNMOUNT_SYMBOL]])) {
-      for (const cb of instance[_chunkGWLM5DEJjs.UNMOUNT_SYMBOL])
-        await cb();
-    }
-    debug(`del module "${tag}"`);
+    debug(`unmount module "${String(tag)}"`);
+    _phecdacore.unmountParallel.call(void 0, instance);
+    debug(`del module "${String(tag)}"`);
     moduleMap.delete(tag);
     constructorMap.delete(tag);
     for (let i = meta.length - 1; i >= 0; i--) {
@@ -150,15 +144,15 @@ async function Factory(Modules, opts = {}) {
     }
     return instance;
   }
-  _chunkGWLM5DEJjs.__name.call(void 0, del, "del");
+  _chunkT4C6CCWMjs.__name.call(void 0, del, "del");
   async function destroy() {
     debug("destroy all");
     for (const [tag] of moduleMap)
       await del(tag);
   }
-  _chunkGWLM5DEJjs.__name.call(void 0, destroy, "destroy");
+  _chunkT4C6CCWMjs.__name.call(void 0, destroy, "destroy");
   async function add(Module) {
-    const tag = _optionalChain([Module, 'access', _4 => _4.prototype, 'optionalAccess', _5 => _5.__TAG__]) || Module.name;
+    const tag = _optionalChain([Module, 'access', _3 => _3.prototype, 'optionalAccess', _4 => _4.__TAG__]) || Module.name;
     const oldInstance = await del(tag);
     const { instance: newModule } = await buildNestModule(Module);
     if (oldInstance && moduleGraph.has(tag)) {
@@ -174,7 +168,7 @@ async function Factory(Modules, opts = {}) {
       });
     }
   }
-  _chunkGWLM5DEJjs.__name.call(void 0, add, "add");
+  _chunkT4C6CCWMjs.__name.call(void 0, add, "add");
   async function buildNestModule(Module) {
     const paramtypes = getParamTypes(Module);
     let instance;
@@ -182,10 +176,10 @@ async function Factory(Modules, opts = {}) {
     if (moduleMap.has(tag)) {
       instance = moduleMap.get(tag);
       if (!instance)
-        throw new Error(`exist Circular-Dependency or Multiple modules with the same name/tag [tag] ${tag}--[module] ${Module}`);
+        throw new Error(`exist Circular-Dependency or Multiple modules with the same name/tag [tag] ${String(tag)}--[module] ${Module}`);
       if (constructorMap.get(tag) !== Module && !constructorSet.has(Module)) {
         constructorSet.add(Module);
-        _chunkGWLM5DEJjs.log.call(void 0, `Synonym module: Module taged "${tag}" has been loaded before, so phecda-server won't load Module "${Module.name}"`, "warn");
+        _chunkT4C6CCWMjs.log.call(void 0, `Synonym module: Module taged "${String(tag)}" has been loaded before, so phecda-server won't load Module "${Module.name}"`, "warn");
       }
       return {
         instance,
@@ -193,7 +187,7 @@ async function Factory(Modules, opts = {}) {
       };
     }
     moduleMap.set(tag, void 0);
-    debug(`instantiate module "${tag}"`);
+    debug(`instantiate module "${String(tag)}"`);
     if (paramtypes) {
       const paramtypesInstances = [];
       for (const i in paramtypes) {
@@ -208,9 +202,9 @@ async function Factory(Modules, opts = {}) {
       instance = new Module();
     }
     meta.push(...getMetaFromInstance(instance, tag, Module.name));
-    debug(`init module "${tag}"`);
+    debug(`init module "${String(tag)}"`);
     await _phecdacore.registerSerial.call(void 0, instance);
-    debug(`add module "${tag}"`);
+    debug(`add module "${String(tag)}"`);
     moduleMap.set(tag, instance);
     constructorMap.set(tag, Module);
     return {
@@ -218,7 +212,7 @@ async function Factory(Modules, opts = {}) {
       tag
     };
   }
-  _chunkGWLM5DEJjs.__name.call(void 0, buildNestModule, "buildNestModule");
+  _chunkT4C6CCWMjs.__name.call(void 0, buildNestModule, "buildNestModule");
   for (const Module of Modules)
     await buildNestModule(Module);
   function writeCode() {
@@ -231,12 +225,12 @@ async function Factory(Modules, opts = {}) {
       _fs2.default.promises.writeFile(rpc, generateRPCCode(meta.map((item) => item.data)));
     }
   }
-  _chunkGWLM5DEJjs.__name.call(void 0, writeCode, "writeCode");
+  _chunkT4C6CCWMjs.__name.call(void 0, writeCode, "writeCode");
   writeCode();
-  if (_chunkGWLM5DEJjs.IS_DEV) {
+  if (_chunkT4C6CCWMjs.IS_DEV) {
     if (!globalThis.__PS_HMR__)
       globalThis.__PS_HMR__ = [];
-    _optionalChain([globalThis, 'access', _6 => _6.__PS_HMR__, 'optionalAccess', _7 => _7.push, 'call', _8 => _8(async (files) => {
+    _optionalChain([globalThis, 'access', _5 => _5.__PS_HMR__, 'optionalAccess', _6 => _6.push, 'call', _7 => _7(async (files) => {
       debug("reload files ");
       for (const file of files) {
         const module = await Promise.resolve().then(() => require(file));
@@ -257,7 +251,7 @@ async function Factory(Modules, opts = {}) {
     destroy
   };
 }
-_chunkGWLM5DEJjs.__name.call(void 0, Factory, "Factory");
+_chunkT4C6CCWMjs.__name.call(void 0, Factory, "Factory");
 function getMetaFromInstance(instance, tag, name) {
   const vars = _phecdacore.getExposeKey.call(void 0, instance).filter((item) => item !== _phecdacore.SHARE_KEY);
   const baseState = _phecdacore.getState.call(void 0, instance, _phecdacore.SHARE_KEY) || {};
@@ -268,7 +262,7 @@ function getMetaFromInstance(instance, tag, name) {
     initState(state);
     if (state.http) {
       meta.http = {
-        route: (_optionalChain([baseState, 'access', _9 => _9.http, 'optionalAccess', _10 => _10.route]) || "") + state.http.route,
+        route: (_optionalChain([baseState, 'access', _8 => _8.http, 'optionalAccess', _9 => _9.route]) || "") + state.http.route,
         type: state.http.type
       };
     }
@@ -280,6 +274,8 @@ function getMetaFromInstance(instance, tag, name) {
         ...state.rpc
       };
     }
+    if (typeof tag !== "string" && (meta.rpc || meta.http))
+      _chunkT4C6CCWMjs.log.call(void 0, `can't use Tag with ${typeof tag} on http/rpc controller "${instance.constructor.name}",instead with "${tag = String(tag)}"`, "error");
     meta.name = name;
     meta.tag = tag;
     meta.method = i;
@@ -320,11 +316,11 @@ function getMetaFromInstance(instance, tag, name) {
     return new Meta(meta, _phecdacore.getHandler.call(void 0, instance, i), getParamTypes(instance, i) || []);
   });
 }
-_chunkGWLM5DEJjs.__name.call(void 0, getMetaFromInstance, "getMetaFromInstance");
+_chunkT4C6CCWMjs.__name.call(void 0, getMetaFromInstance, "getMetaFromInstance");
 function getParamTypes(Module, key) {
   return Reflect.getMetadata("design:paramtypes", Module, key);
 }
-_chunkGWLM5DEJjs.__name.call(void 0, getParamTypes, "getParamTypes");
+_chunkT4C6CCWMjs.__name.call(void 0, getParamTypes, "getParamTypes");
 function initState(state) {
   if (!state.define)
     state.define = {};
@@ -337,7 +333,7 @@ function initState(state) {
   if (!state.interceptors)
     state.interceptors = [];
 }
-_chunkGWLM5DEJjs.__name.call(void 0, initState, "initState");
+_chunkT4C6CCWMjs.__name.call(void 0, initState, "initState");
 
 
 

package/dist/{core-295348b7.d.ts → core-b8dcc009.d.ts}

@@ -1,4 +1,5 @@
 import { Events, Construct } from 'phecda-core';
+import { IncomingHttpHeaders } from 'node:http';
 
 declare class Exception extends Error {
     message: string;
@@ -56,6 +57,13 @@ declare namespace P {
         tag: string;
         [key: string]: any;
     }
+    interface HttpContext extends BaseContext {
+        query: Record<string, any>;
+        params: Record<string, string>;
+        body: Record<string, any>;
+        headers: IncomingHttpHeaders;
+        index?: number;
+    }
     interface Error {
         [ERROR_SYMBOL]: true;
         status: number;
@@ -65,7 +73,9 @@ declare namespace P {
     type ResOrErr<R> = {
         [K in keyof R]: Awaited<R[K]> | Error;
     };
-    type Res<T> = T;
+    type Res<T> = T extends {
+        toJSON(): infer R;
+    } ? R : T;
     type Guard<C extends BaseContext = any> = ((ctx: C) => Promise<boolean> | boolean);
     type Interceptor<C extends BaseContext = any> = (ctx: C) => (any | ((ret: any) => any));
     type Pipe<C extends BaseContext = any> = (arg: {
@@ -104,7 +114,7 @@ declare namespace P {
         plugins: string[];
         method: string;
         name: string;
-        tag: string;
+        tag: PropertyKey;
     }
 }
 
@@ -114,11 +124,11 @@ declare function Factory(Modules: (new (...args: any) => any)[], opts?: {
     http?: string;
     rpc?: string;
 }): Promise<{
-    moduleMap: Map<string, any>;
+    moduleMap: Map<PropertyKey, any>;
     meta: Meta[];
     constructorMap: Map<any, any>;
     add: (Module: Construct) => Promise<void>;
-    del: (tag: string) => Promise<any>;
+    del: (tag: PropertyKey) => Promise<any>;
     destroy: () => Promise<void>;
 }>;
 

package/dist/index.d.ts

@@ -1,7 +1,8 @@
-import { E as Exception, P, M as Meta, U as UNMOUNT_SYMBOL } from './core-295348b7.js';
-export { A as APP_SYMBOL, k as ERROR_SYMBOL, a as Emitter, F as Factory, h as IS_DEV, j as IS_LOG_BAN, i as IS_STRICT, I as Injectable, d as MERGE_SYMBOL, g as META_SYMBOL, f as MODULE_SYMBOL, l as PS_FILE_RE, m as PS_IMPORT_RE, c as PickFunc, b as PickKeysByValue, R as RequestType, T as ToControllerMap, e as emitter } from './core-295348b7.js';
-import { Construct } from 'phecda-core';
+import { E as Exception, P, M as Meta, U as UNMOUNT_SYMBOL } from './core-b8dcc009.js';
+export { A as APP_SYMBOL, k as ERROR_SYMBOL, a as Emitter, F as Factory, h as IS_DEV, j as IS_LOG_BAN, i as IS_STRICT, I as Injectable, d as MERGE_SYMBOL, g as META_SYMBOL, f as MODULE_SYMBOL, l as PS_FILE_RE, m as PS_IMPORT_RE, c as PickFunc, b as PickKeysByValue, R as RequestType, T as ToControllerMap, e as emitter } from './core-b8dcc009.js';
+import { Construct, AbConstruct } from 'phecda-core';
 export * from 'phecda-core';
+import 'node:http';
 
 declare class Histroy {
     guard: string[];
@@ -71,11 +72,11 @@ declare class Context<Data extends P.BaseContext> {
     method: string;
     params: string[];
     history: Histroy;
-    static filterRecord: Record<string, P.Filter>;
-    static pipeRecord: Record<string, P.Pipe>;
-    static guardRecord: Record<string, P.Guard>;
-    static interceptorRecord: Record<string, P.Interceptor>;
-    static addonRecord: Record<string, any>;
+    static filterRecord: Record<PropertyKey, P.Filter>;
+    static pipeRecord: Record<PropertyKey, P.Pipe>;
+    static guardRecord: Record<PropertyKey, P.Guard>;
+    static interceptorRecord: Record<PropertyKey, P.Interceptor>;
+    static pluginRecord: Record<PropertyKey, any>;
     postInterceptors: Function[];
     constructor(data: Data);
     usePipe(args: {
@@ -93,11 +94,11 @@ declare class Context<Data extends P.BaseContext> {
     useInterceptor(interceptors: string[]): Promise<any>;
     static usePlugin(plugins: string[]): any[];
 }
-declare function addAddon<T>(key: string, handler: T): void;
-declare function addPipe<C extends P.BaseContext>(key: string, handler: P.Pipe<C>): void;
-declare function addFilter<C extends P.BaseContext>(key: string, handler: P.Filter<C>): void;
-declare function addGuard<C extends P.BaseContext>(key: string, handler: P.Guard<C>): void;
-declare function addInterceptor<C extends P.BaseContext>(key: string, handler: P.Interceptor<C>): void;
+declare function addPlugin<T>(key: PropertyKey, handler: T): void;
+declare function addPipe<C extends P.BaseContext>(key: PropertyKey, handler: P.Pipe<C>): void;
+declare function addFilter<C extends P.BaseContext>(key: PropertyKey, handler: P.Filter<C>): void;
+declare function addGuard<C extends P.BaseContext>(key: PropertyKey, handler: P.Guard<C>): void;
+declare function addInterceptor<C extends P.BaseContext>(key: PropertyKey, handler: P.Interceptor<C>): void;
 declare function isAopDepInject(meta: Meta[], { guards, interceptors, plugins }?: {
     guards?: string[];
     interceptors?: string[];
@@ -133,32 +134,35 @@ declare function Define(key: string, value: any): (target: any, k?: PropertyKey)
 declare const defaultPipe: P.Pipe;
 
 declare function resolveDep(ret: any, key: string): any;
+declare function argToReq(params: Meta['data']['params'], args: any[], headers: Record<string, any>): any;
 
 declare class Dev {
     private readonly [UNMOUNT_SYMBOL];
+    protected context: P.BaseContext;
     onUnmount(cb: () => void): void;
+    private unmount;
 }
 
 declare abstract class PFilter<C extends P.BaseContext = any, E extends Exception = Exception> extends Dev {
-    readonly key: string;
+    readonly key: PropertyKey;
     constructor(tag?: string);
     abstract use(error: Error | E, ctx?: C): P.Error;
 }
 
 declare abstract class PGuard<C extends P.BaseContext = any> extends Dev {
     abstract use(ctx: C): Promise<boolean> | boolean;
-    readonly key: string;
+    readonly key: PropertyKey;
     constructor(tag?: string);
 }
 
 declare abstract class PInterceptor<C extends P.BaseContext = any> extends Dev {
     abstract use(ctx: C): Function | Promise<Function> | any;
-    readonly key: string;
+    readonly key: PropertyKey;
     constructor(tag?: string);
 }
 
 declare abstract class PPipe<C extends P.BaseContext = any> extends Dev {
-    readonly key: string;
+    readonly key: PropertyKey;
     constructor(tag?: string);
     abstract use(param: {
         arg: any;
@@ -170,8 +174,8 @@ declare abstract class PPipe<C extends P.BaseContext = any> extends Dev {
     }, ctx: C): any;
 }
 
-declare abstract class PAddon<Params extends any[] = any[]> extends Dev {
-    readonly key: string;
+declare abstract class PPlugin<Params extends any[] = any[]> extends Dev {
+    readonly key: PropertyKey;
     constructor(tag?: string);
     abstract use(...args: Params): void;
 }
@@ -188,10 +192,10 @@ interface PExtension<C extends P.BaseContext = any, E extends Exception = Except
         reflect: any;
     }, ctx: C): any;
     filter(error: Error | E, ctx?: C): P.Error;
-    addon(...args: any): void;
+    plugin(...args: any): void;
 }
 declare class PExtension extends Dev {
-    readonly key: string;
+    readonly key: PropertyKey;
     constructor(tag?: string);
 }
 
@@ -202,6 +206,6 @@ declare function generateHTTPCode(meta: P.MetaData[]): string;
 declare function log(msg: string, level?: 'error' | 'info' | 'warn'): void;
 declare function getConfig<C = any>(key: string, defaultConf?: C): C;
 declare function setConfig<C = any>(key: string, conf: C, force?: boolean): void;
-declare function Mix<C1 extends Construct, C2 extends Construct>(InternalClass: C1, ExtendClass: C2): new (...args: ConstructorParameters<C2>) => InstanceType<C1> & InstanceType<C2>;
+declare function Mix<C1 extends Construct | AbConstruct, C2 extends Construct>(InternalClass: C1, ExtendClass: C2): new (...args: ConstructorParameters<C2>) => InstanceType<C1> & InstanceType<C2>;
 
-export { Arg, BadGatewayException, BadRequestException, BaseParam, Body, ConflictException, Context, Controller, Define, Delete, Dev, Event, Exception, Filter, ForbiddenException, FrameworkException, Get, Guard, Head, Header, Interceptor, InvalidInputException, Meta, Mix, NotFoundException, P, PAddon, PExtension, PFilter, PGuard, PInterceptor, PPipe, Param, Patch, PayloadLargeException, Pipe, Plugin, Post, Put, Query, Route, Rpc, ServiceUnavailableException, TimeoutException, UNMOUNT_SYMBOL, UnauthorizedException, UndefinedException, UnsupportedMediaTypeException, ValidateException, addAddon, addFilter, addGuard, addInterceptor, addPipe, defaultPipe, generateHTTPCode, generateRPCCode, getConfig, guardRecord, isAopDepInject, log, resolveDep, setConfig };
+export { Arg, BadGatewayException, BadRequestException, BaseParam, Body, ConflictException, Context, Controller, Define, Delete, Dev, Event, Exception, Filter, ForbiddenException, FrameworkException, Get, Guard, Head, Header, Interceptor, InvalidInputException, Meta, Mix, NotFoundException, P, PExtension, PFilter, PGuard, PInterceptor, PPipe, PPlugin, Param, Patch, PayloadLargeException, Pipe, Plugin, Post, Put, Query, Route, Rpc, ServiceUnavailableException, TimeoutException, UNMOUNT_SYMBOL, UnauthorizedException, UndefinedException, UnsupportedMediaTypeException, ValidateException, addFilter, addGuard, addInterceptor, addPipe, addPlugin, argToReq, defaultPipe, generateHTTPCode, generateRPCCode, getConfig, guardRecord, isAopDepInject, log, resolveDep, setConfig };