phecda-server 7.0.0-alpha.0 → 7.0.0-alpha.10

package/dist/{chunk-MBCHNDAY.js → chunk-KCPBITYZ.js}

@@ -1,6 +1,6 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunkJ5CFUN4Vjs = require('./chunk-J5CFUN4V.js');
+var _chunk4LLLQOMFjs = require('./chunk-4LLLQOMF.js');
 
 // src/decorators/param.ts
 var _phecdacore = require('phecda-core');
@@ -10,42 +10,42 @@ function BaseParam(data) {
     _phecdacore.setMeta.call(void 0, target, property, index, data);
   };
 }
-_chunkJ5CFUN4Vjs.__name.call(void 0, BaseParam, "BaseParam");
+_chunk4LLLQOMFjs.__name.call(void 0, BaseParam, "BaseParam");
 function Body(key = "") {
   return BaseParam({
     type: "body",
     key
   });
 }
-_chunkJ5CFUN4Vjs.__name.call(void 0, Body, "Body");
+_chunk4LLLQOMFjs.__name.call(void 0, Body, "Body");
 function Head(key) {
   return BaseParam({
     type: "headers",
     key: key.toLowerCase()
   });
 }
-_chunkJ5CFUN4Vjs.__name.call(void 0, Head, "Head");
+_chunk4LLLQOMFjs.__name.call(void 0, Head, "Head");
 function Query(key = "") {
   return BaseParam({
     type: "query",
     key
   });
 }
-_chunkJ5CFUN4Vjs.__name.call(void 0, Query, "Query");
+_chunk4LLLQOMFjs.__name.call(void 0, Query, "Query");
 function Param(key) {
   return BaseParam({
     type: "params",
     key
   });
 }
-_chunkJ5CFUN4Vjs.__name.call(void 0, Param, "Param");
+_chunk4LLLQOMFjs.__name.call(void 0, Param, "Param");
 function Arg(target, k, index) {
   BaseParam({
     type: "args",
     key: `${index}`
   })(target, k, index);
 }
-_chunkJ5CFUN4Vjs.__name.call(void 0, Arg, "Arg");
+_chunk4LLLQOMFjs.__name.call(void 0, Arg, "Arg");
 
 // src/decorators/aop.ts
 
@@ -56,7 +56,7 @@ function Guard(...guards) {
     });
   };
 }
-_chunkJ5CFUN4Vjs.__name.call(void 0, Guard, "Guard");
+_chunk4LLLQOMFjs.__name.call(void 0, Guard, "Guard");
 function Addon(...addons) {
   return (target, property) => {
     _phecdacore.setMeta.call(void 0, target, property, void 0, {
@@ -64,7 +64,7 @@ function Addon(...addons) {
     });
   };
 }
-_chunkJ5CFUN4Vjs.__name.call(void 0, Addon, "Addon");
+_chunk4LLLQOMFjs.__name.call(void 0, Addon, "Addon");
 function Filter(filter) {
   return (target, property) => {
     _phecdacore.setMeta.call(void 0, target, property, void 0, {
@@ -72,7 +72,7 @@ function Filter(filter) {
     });
   };
 }
-_chunkJ5CFUN4Vjs.__name.call(void 0, Filter, "Filter");
+_chunk4LLLQOMFjs.__name.call(void 0, Filter, "Filter");
 function Pipe(pipe) {
   return (target, property, index) => {
     if (typeof index === "number") {
@@ -86,7 +86,7 @@ function Pipe(pipe) {
     });
   };
 }
-_chunkJ5CFUN4Vjs.__name.call(void 0, Pipe, "Pipe");
+_chunk4LLLQOMFjs.__name.call(void 0, Pipe, "Pipe");
 
 // src/decorators/http.ts
 
@@ -100,7 +100,7 @@ function Route(route, type) {
     });
   };
 }
-_chunkJ5CFUN4Vjs.__name.call(void 0, Route, "Route");
+_chunk4LLLQOMFjs.__name.call(void 0, Route, "Route");
 function Header(headers) {
   return (target, property) => {
     _phecdacore.setMeta.call(void 0, target, property, void 0, {
@@ -110,31 +110,31 @@ function Header(headers) {
     });
   };
 }
-_chunkJ5CFUN4Vjs.__name.call(void 0, Header, "Header");
+_chunk4LLLQOMFjs.__name.call(void 0, Header, "Header");
 function Get(route = "") {
   return Route(route, "get");
 }
-_chunkJ5CFUN4Vjs.__name.call(void 0, Get, "Get");
+_chunk4LLLQOMFjs.__name.call(void 0, Get, "Get");
 function Post(route = "") {
   return Route(route, "post");
 }
-_chunkJ5CFUN4Vjs.__name.call(void 0, Post, "Post");
+_chunk4LLLQOMFjs.__name.call(void 0, Post, "Post");
 function Put(route = "") {
   return Route(route, "put");
 }
-_chunkJ5CFUN4Vjs.__name.call(void 0, Put, "Put");
+_chunk4LLLQOMFjs.__name.call(void 0, Put, "Put");
 function Search(route = "") {
   return Route(route, "search");
 }
-_chunkJ5CFUN4Vjs.__name.call(void 0, Search, "Search");
+_chunk4LLLQOMFjs.__name.call(void 0, Search, "Search");
 function Patch(route = "") {
   return Route(route, "patch");
 }
-_chunkJ5CFUN4Vjs.__name.call(void 0, Patch, "Patch");
+_chunk4LLLQOMFjs.__name.call(void 0, Patch, "Patch");
 function Delete(route = "") {
   return Route(route, "delete");
 }
-_chunkJ5CFUN4Vjs.__name.call(void 0, Delete, "Delete");
+_chunk4LLLQOMFjs.__name.call(void 0, Delete, "Delete");
 function Controller(prefix = "") {
   return (target) => {
     _phecdacore.setMeta.call(void 0, target, void 0, void 0, {
@@ -145,7 +145,7 @@ function Controller(prefix = "") {
     });
   };
 }
-_chunkJ5CFUN4Vjs.__name.call(void 0, Controller, "Controller");
+_chunk4LLLQOMFjs.__name.call(void 0, Controller, "Controller");
 
 // src/decorators/rpc.ts
 
@@ -159,7 +159,7 @@ function Queue(queue = "", isEvent) {
     });
   };
 }
-_chunkJ5CFUN4Vjs.__name.call(void 0, Queue, "Queue");
+_chunk4LLLQOMFjs.__name.call(void 0, Queue, "Queue");
 function Rpc() {
   return (target) => {
     _phecdacore.setMeta.call(void 0, target, void 0, void 0, {
@@ -167,11 +167,11 @@ function Rpc() {
     });
   };
 }
-_chunkJ5CFUN4Vjs.__name.call(void 0, Rpc, "Rpc");
+_chunk4LLLQOMFjs.__name.call(void 0, Rpc, "Rpc");
 
 // src/decorators/ctx.ts
 
-var Ctx = /* @__PURE__ */ _chunkJ5CFUN4Vjs.__name.call(void 0, (target, property) => {
+var Ctx = /* @__PURE__ */ _chunk4LLLQOMFjs.__name.call(void 0, (target, property) => {
   _phecdacore.setMeta.call(void 0, target, _phecdacore.SHARE_KEY, void 0, {
     ctxs: [
       property
@@ -200,7 +200,7 @@ function Define(key, value) {
     }
   };
 }
-_chunkJ5CFUN4Vjs.__name.call(void 0, Define, "Define");
+_chunk4LLLQOMFjs.__name.call(void 0, Define, "Define");
 
 
 

package/dist/{chunk-HMVLXNV3.mjs → chunk-MUI6MTUO.mjs}

@@ -1,6 +1,6 @@
 import {
   __name
-} from "./chunk-WHJ5FALK.mjs";
+} from "./chunk-NQ55PA2X.mjs";
 
 // src/decorators/param.ts
 import { setMeta } from "phecda-core";

package/dist/chunk-NQ55PA2X.mjs

@@ -0,0 +1,152 @@
+var __defProp = Object.defineProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+
+// src/common.ts
+var ERROR_SYMBOL = "__PS_ERROR__";
+var IS_DEV = process.env.NODE_ENV === "development";
+var IS_ONLY_GENERATE = !!process.env.PS_GENERATE;
+var IS_STRICT = !!process.env.PS_STRICT;
+var IS_PURE = !!process.env.PS_PURE;
+var LOG_LEVEL = Number(process.env.PS_LOG_LEVEL || 0);
+var PS_EXIT_CODE = /* @__PURE__ */ function(PS_EXIT_CODE2) {
+  PS_EXIT_CODE2[PS_EXIT_CODE2["RELAUNCH"] = 4171] = "RELAUNCH";
+  PS_EXIT_CODE2[PS_EXIT_CODE2["EXIT"] = 4172] = "EXIT";
+  return PS_EXIT_CODE2;
+}({});
+
+// src/utils.ts
+import pc from "picocolors";
+import { Mixin } from "ts-mixer";
+var isObject = /* @__PURE__ */ __name((fn) => fn !== null && typeof fn === "object", "isObject");
+var isPlainObject = /* @__PURE__ */ __name((fn) => {
+  if (!isObject(fn)) return false;
+  const proto = Object.getPrototypeOf(fn);
+  if (proto === null) return true;
+  const ctor = Object.prototype.hasOwnProperty.call(proto, "constructor") && proto.constructor;
+  return typeof ctor === "function" && ctor instanceof ctor && Function.prototype.toString.call(ctor) === Function.prototype.toString.call(Object);
+}, "isPlainObject");
+var InternalLogger = class InternalLogger2 {
+  static {
+    __name(this, "InternalLogger");
+  }
+  time;
+  color = {
+    debug: "bgMagenta",
+    error: "red",
+    info: "gray",
+    warn: "yellow",
+    log: "green"
+  };
+  dateFormatter = new Intl.DateTimeFormat(void 0, {
+    year: "numeric",
+    hour: "numeric",
+    minute: "numeric",
+    second: "numeric",
+    day: "2-digit",
+    month: "2-digit"
+  });
+  diffTimestamp() {
+    const now = Date.now();
+    if (!this.time) return "";
+    const diff = now - this.time;
+    this.time = now;
+    return diff ? pc.yellow(` +${diff}`) : "";
+  }
+  colorize(message, logLevel) {
+    return pc[this.color[logLevel]](message);
+  }
+  isAllowLog(level) {
+    const logLevel = {
+      debug: -1,
+      info: 0,
+      log: 1,
+      warn: 2,
+      error: 3
+    }[level];
+    if (logLevel < LOG_LEVEL) return false;
+    return true;
+  }
+  stringifyMessage(message, logLevel) {
+    if (typeof message === "function") {
+      const messageAsStr = Function.prototype.toString.call(message);
+      const isClass = messageAsStr.startsWith("class ");
+      if (isClass) {
+        return this.stringifyMessage(message.name, logLevel);
+      }
+      return this.stringifyMessage(message(), logLevel);
+    }
+    return isPlainObject(message) || Array.isArray(message) ? `${this.colorize("Object:", logLevel)}
+${JSON.stringify(message, (key, value) => typeof value === "bigint" ? value.toString() : value, 2)}
+` : this.colorize(message, logLevel);
+  }
+  log(msg, level, ctx) {
+    if (!this.isAllowLog(level)) return;
+    msg = this.stringifyMessage(msg, level);
+    const pidMsg = this.colorize(`[${process.env.PS_APP_NAME || "phecda-server"}] ${process.pid}`, level);
+    const ctxMsg = ctx ? this.colorize(pc.bold(`[${ctx}] `), level) : "";
+    const timeDiff = this.diffTimestamp();
+    const levelMsg = this.colorize(level.toUpperCase().padStart(7, " "), level);
+    process.stdout.write(`${pidMsg} ${this.dateFormatter.format(Date.now())} ${levelMsg} ${ctxMsg}${msg}${timeDiff}
+`);
+  }
+};
+var _logger = new InternalLogger();
+function setLogger(logger) {
+  _logger = logger;
+}
+__name(setLogger, "setLogger");
+function getLogger() {
+  return _logger;
+}
+__name(getLogger, "getLogger");
+function log(msg, level = "log", ctx) {
+  _logger.log(msg, level, ctx);
+}
+__name(log, "log");
+function runMiddleware(ctx, middleware) {
+  return new Promise((resolve) => {
+    middleware(ctx.getRequest(), ctx.getResponse(), resolve);
+  });
+}
+__name(runMiddleware, "runMiddleware");
+
+// src/hmr.ts
+function HMR(cb) {
+  if (IS_DEV) {
+    if (!globalThis.__PS_HMR__) globalThis.__PS_HMR__ = [];
+    globalThis.__PS_HMR__.push(cb);
+  }
+}
+__name(HMR, "HMR");
+async function RELOAD(oldModels, newModels) {
+  log("reload module...");
+  for (const cb of globalThis.__PS_HMR__) await cb(oldModels, newModels);
+  log("reload done");
+}
+__name(RELOAD, "RELOAD");
+function RELAUNCH() {
+  if (IS_DEV) {
+    log("relaunch...");
+    process.exit(PS_EXIT_CODE.RELAUNCH);
+  }
+}
+__name(RELAUNCH, "RELAUNCH");
+
+export {
+  __name,
+  ERROR_SYMBOL,
+  IS_DEV,
+  IS_ONLY_GENERATE,
+  IS_STRICT,
+  IS_PURE,
+  LOG_LEVEL,
+  PS_EXIT_CODE,
+  setLogger,
+  getLogger,
+  log,
+  runMiddleware,
+  Mixin,
+  HMR,
+  RELOAD,
+  RELAUNCH
+};

package/dist/{chunk-5622RBNB.mjs → chunk-YCES6ABN.mjs}

@@ -1,9 +1,10 @@
 import {
-  IS_HMR,
+  HMR,
   IS_ONLY_GENERATE,
+  PS_EXIT_CODE,
   __name,
   log
-} from "./chunk-WHJ5FALK.mjs";
+} from "./chunk-NQ55PA2X.mjs";
 
 // src/meta.ts
 var Meta = class {
@@ -21,9 +22,9 @@ var Meta = class {
 // src/core.ts
 import "reflect-metadata";
 import EventEmitter from "node:events";
-import { getInject, getMergedMeta, getMetaKey, getMetaParams, getTag, invokeInit, invokeUnmount, isPhecda, setInject } from "phecda-core";
+import { getInject, getMergedMeta, getMetaKey, getMetaParams, getTag, invokeInit, invokeUnmount, setInject } from "phecda-core";
 import Debug from "debug";
-var debug = Debug("phecda-server(createPhecda)");
+var debug = Debug("phecda-server(Factory)");
 var emitter = new EventEmitter();
 function defaultServerInject() {
   if (!getInject("watcher")) {
@@ -61,63 +62,86 @@ var ServerPhecda = class {
   }
   async start(models) {
     for (const model of models) await this.buildDepModule(model);
-    const generateCode = /* @__PURE__ */ __name(async () => {
-      if (IS_HMR) {
-        return Promise.all(this.generators.map((generator) => {
-          debug(`generate "${generator.name}" code to ${generator.path}`);
-          return generator.output(this.meta);
-        }));
+    this.hmr();
+    this.generateCode().then(() => {
+      if (IS_ONLY_GENERATE) {
+        log("Only generate code");
+        process.exit(PS_EXIT_CODE.EXIT);
       }
-    }, "generateCode");
-    generateCode().then(() => {
-      if (IS_ONLY_GENERATE) process.exit(4);
     });
-    if (IS_HMR) {
-      if (!globalThis.__PS_HMR__) globalThis.__PS_HMR__ = [];
-      globalThis.__PS_HMR__?.push(async (files) => {
-        debug("reload files ");
-        for (const file of files) {
-          const models2 = await import(file);
-          for (const i in models2) {
-            if (isPhecda(models2[i])) await this.add(models2[i]);
-          }
-        }
-        generateCode();
-      });
-    }
   }
-  async add(Model) {
-    const tag = getTag(Model);
-    const oldInstance = await this.del(tag);
-    const { module: newModule } = await this.buildDepModule(Model);
-    if (oldInstance && this.dependenceGraph.has(tag)) {
-      debug(`replace module "${String(tag)}"`);
-      [
-        ...this.dependenceGraph.get(tag)
-      ].forEach((tag2) => {
-        const module = this.moduleMap.get(tag2);
-        for (const key in module) {
-          if (module[key] === oldInstance) module[key] = newModule;
-        }
-      });
-    }
-  }
-  async del(tag) {
-    if (!this.moduleMap.has(tag)) return;
-    const module = this.moduleMap.get(tag);
-    debug(`unmount module "${String(tag)}"`);
-    await invokeUnmount(module);
-    debug(`del module "${String(tag)}"`);
-    this.moduleMap.delete(tag);
-    this.modelMap.delete(module);
-    for (let i = this.meta.length - 1; i >= 0; i--) {
-      if (this.meta[i].data.tag === tag) this.meta.splice(i, 1);
-    }
-    return module;
+  generateCode = /* @__PURE__ */ __name(async () => {
+    return Promise.all(this.generators.map((generator) => {
+      debug(`generate "${generator.name}" code to ${generator.path}`);
+      return generator.output(this.meta);
+    }));
+  }, "generateCode");
+  hmr() {
+    HMR(async (oldModels, newModels) => {
+      debug("reload models ");
+      await this.replace(oldModels, newModels);
+      this.generateCode();
+    });
   }
+  // async add(Model: Construct) {
+  //   const tag = getTag(Model)
+  //   const oldInstance = await this.del(tag)
+  //   const { module: newModule } = await this.buildDepModule(Model)
+  //   if (oldInstance && this.dependenceGraph.has(tag)) {
+  //     debug(`replace module "${String(tag)}"`);
+  //     [...this.dependenceGraph.get(tag)!].forEach((tag) => {
+  //       const module = this.moduleMap.get(tag)
+  //       for (const key in module) {
+  //         if (module[key] === oldInstance)
+  //           module[key] = newModule
+  //       }
+  //     })
+  //   }
+  // }
+  // async del(modelOrTag: Construct | PropertyKey) {
+  //   const tag = typeof modelOrTag === 'function' ? getTag(modelOrTag) : modelOrTag
+  //   if (!this.moduleMap.has(tag))
+  //     return
+  //   const module = this.moduleMap.get(tag)
+  //   debug(`unmount module "${String(tag)}"`)
+  //   await invokeUnmount(module)
+  //   debug(`del module "${String(tag)}"`)
+  //   this.moduleMap.delete(tag)
+  //   this.modelMap.delete(module)
+  //   for (let i = this.meta.length - 1; i >= 0; i--) {
+  //     if (this.meta[i].data.tag === tag)
+  //       this.meta.splice(i, 1)
+  //   }
+  //   return module
+  // }
   async destroy() {
     debug("destroy all");
-    for (const [tag] of this.moduleMap) await this.del(tag);
+    this.replace(Object.values(this.modelMap), []);
+  }
+  createProxyModule(tag) {
+    const that = this;
+    return new Proxy({}, {
+      get(_target, prop) {
+        const module = that.moduleMap.get(tag);
+        return Reflect.get(module, prop, module);
+      },
+      set(_target, prop, newValue) {
+        const module = that.moduleMap.get(tag);
+        return Reflect.set(module, prop, newValue, module);
+      },
+      has(_target, prop) {
+        return Reflect.has(that.moduleMap.get(tag), prop);
+      },
+      ownKeys() {
+        return Reflect.ownKeys(that.moduleMap.get(tag));
+      },
+      getPrototypeOf() {
+        return Reflect.getPrototypeOf(that.moduleMap.get(tag));
+      },
+      getOwnPropertyDescriptor(_target, prop) {
+        return Reflect.getOwnPropertyDescriptor(that.moduleMap.get(tag), prop);
+      }
+    });
   }
   async buildDepModule(Model) {
     const paramtypes = getParamTypes(Model);
@@ -125,7 +149,13 @@ var ServerPhecda = class {
     const tag = getTag(Model);
     if (this.moduleMap.has(tag)) {
       module = this.moduleMap.get(tag);
-      if (!module) throw new Error(`exist Circular-Dependency or Multiple modules with the same name/tag [tag] ${String(tag)}--[module] ${Model}`);
+      if (!module) {
+        log(`Exist Circular-Dependency or Multiple modules with the same tag [${String(tag)}]`, "warn");
+        return {
+          module: this.createProxyModule(tag),
+          tag
+        };
+      }
       if (this.modelMap.get(module) !== Model && !this.modelSet.has(Model)) {
         this.modelSet.add(Model);
         if (module instanceof Model) log(`Module taged ${String(tag)} has been overridden`);
@@ -161,6 +191,42 @@ var ServerPhecda = class {
       tag
     };
   }
+  async replace(oldModels, newModels) {
+    const oldModules = (await Promise.all(oldModels.map(async (model) => {
+      const tag = getTag(model);
+      if (!this.has(tag)) return;
+      const module = this.moduleMap.get(tag);
+      debug(`unmount module "${String(tag)}"`);
+      await invokeUnmount(module);
+      debug(`del module "${String(tag)}"`);
+      this.moduleMap.delete(tag);
+      this.modelMap.delete(module);
+      for (let i = this.meta.length - 1; i >= 0; i--) {
+        if (this.meta[i].data.tag === tag) this.meta.splice(i, 1);
+      }
+      return module;
+    }))).filter((item) => item);
+    for (const model of newModels) {
+      debug(`mount module: ${model.name}`);
+      await this.buildDepModule(model);
+    }
+    debug("replace old modules");
+    for (const module of oldModules) {
+      const tag = getTag(module);
+      if (this.dependenceGraph.has(tag)) {
+        [
+          ...this.dependenceGraph.get(tag)
+        ].forEach((depTag) => {
+          const depModule = this.moduleMap.get(depTag);
+          if (depModule) {
+            for (const key in depModule) {
+              if (depModule[key] === module) depModule[key] = this.moduleMap.get(tag);
+            }
+          }
+        });
+      }
+    }
+  }
   has(modelOrTag) {
     return this.moduleMap.has(typeof modelOrTag === "function" ? getTag(modelOrTag) : modelOrTag);
   }
@@ -250,7 +316,9 @@ function deepFreeze(object) {
 }
 __name(deepFreeze, "deepFreeze");
 function getParamTypes(Model, key) {
-  return Reflect.getMetadata("design:paramtypes", Model, key);
+  const paramTypes = Reflect.getMetadata("design:paramtypes", Model, key);
+  if (typeof paramTypes === "function") return paramTypes();
+  else return paramTypes;
 }
 __name(getParamTypes, "getParamTypes");