phecda-server 7.0.0-alpha.7 → 7.0.0-alpha.9

package/bin/cli.mjs

@@ -30,7 +30,7 @@ if (nodeVersion < 18.19) {
 
 function startChild(file, args) {
   child = fork(file, {
-    env: { NODE_ENV: 'development', ...process.env },
+    env: { ...process.env },
     stdio: 'inherit',
     execArgv: [
       nodeVersion < 18.19
@@ -114,9 +114,18 @@ cli
   .alias('run')
   .allowUnknownOptions()
   .alias('run')
+  .option('-p,--prod [prod]', 'prod mode', {
+    default: false,
+  })
   .action((file, root, options) => {
     if (root)
       process.chdir(root)
+
+    if (options.prod)
+      process.env.NODE_ENV = 'production'
+    else
+      process.env.NODE_ENV = 'development'
+
     process.env.PS_CONFIG_FILE = options.config
 
     log('process start!')

package/dist/{chunk-M5HGFUCV.js → chunk-5RBTN33A.js}

@@ -3,11 +3,10 @@ var __name = (target, value) => __defProp(target, "name", { value, configurable:
 
 // src/common.ts
 var ERROR_SYMBOL = "__PS_ERROR__";
-var IS_HMR = process.env.NODE_ENV === "development";
+var IS_DEV = process.env.NODE_ENV === "development";
 var IS_ONLY_GENERATE = !!process.env.PS_GENERATE;
 var IS_STRICT = !!process.env.PS_STRICT;
 var LOG_LEVEL = Number(process.env.PS_LOG_LEVEL || 0);
-var IS_READY = Symbol("IS_READY");
 var PS_EXIT_CODE = /* @__PURE__ */ function(PS_EXIT_CODE2) {
   PS_EXIT_CODE2[PS_EXIT_CODE2["RELAUNCH"] = 2] = "RELAUNCH";
   PS_EXIT_CODE2[PS_EXIT_CODE2["CODE"] = 4] = "CODE";
@@ -110,6 +109,27 @@ function runMiddleware(ctx, middleware) {
 }
 __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) process.exit(2);
+}
+__name(RELAUNCH, "RELAUNCH");
+
+
+
 
 
 
@@ -124,4 +144,4 @@ __name(runMiddleware, "runMiddleware");
 
 
 
-exports.__name = __name; exports.ERROR_SYMBOL = ERROR_SYMBOL; exports.IS_HMR = IS_HMR; exports.IS_ONLY_GENERATE = IS_ONLY_GENERATE; exports.IS_STRICT = IS_STRICT; exports.LOG_LEVEL = LOG_LEVEL; exports.IS_READY = IS_READY; exports.PS_EXIT_CODE = PS_EXIT_CODE; exports.setLogger = setLogger; exports.getLogger = getLogger; exports.log = log; exports.runMiddleware = runMiddleware; exports.Mixin = _tsmixer.Mixin;
+exports.__name = __name; exports.ERROR_SYMBOL = ERROR_SYMBOL; exports.IS_DEV = IS_DEV; exports.IS_ONLY_GENERATE = IS_ONLY_GENERATE; exports.IS_STRICT = IS_STRICT; exports.LOG_LEVEL = LOG_LEVEL; exports.PS_EXIT_CODE = PS_EXIT_CODE; exports.setLogger = setLogger; exports.getLogger = getLogger; exports.log = log; exports.runMiddleware = runMiddleware; exports.Mixin = _tsmixer.Mixin; exports.HMR = HMR; exports.RELOAD = RELOAD; exports.RELAUNCH = RELAUNCH;

package/dist/{chunk-RGSKKTHD.mjs → chunk-7ZGYJ5OW.mjs}

@@ -1,9 +1,9 @@
 import {
-  IS_HMR,
+  HMR,
   IS_ONLY_GENERATE,
   __name,
   log
-} from "./chunk-C5BVKEGW.mjs";
+} from "./chunk-FXTJ3BJ6.mjs";
 
 // src/meta.ts
 var Meta = class {
@@ -21,7 +21,7 @@ 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(Factory)");
 var emitter = new EventEmitter();
@@ -61,63 +61,58 @@ 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);
-        }));
-      }
-    }, "generateCode");
-    generateCode().then(() => {
+    this.hmr();
+    this.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;
@@ -133,6 +128,9 @@ var ServerPhecda = class {
       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));
       },
@@ -189,6 +187,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);
   }

package/dist/{chunk-IRXNF6ZE.mjs → chunk-CVPZWDXU.mjs}

@@ -1,11 +1,12 @@
 import {
   ERROR_SYMBOL,
-  IS_HMR,
+  HMR,
+  IS_DEV,
   IS_STRICT,
   LOG_LEVEL,
   __name,
   log
-} from "./chunk-C5BVKEGW.mjs";
+} from "./chunk-FXTJ3BJ6.mjs";
 
 // src/helper.ts
 import pc2 from "picocolors";
@@ -230,10 +231,25 @@ var Context = class _Context {
   };
   static guardRecord = {};
   static addonRecord = {};
+  ctx;
+  canGetCtx;
   constructor(data) {
     this.data = data;
-    if (IS_HMR)
+    this.canGetCtx = true;
+    if (IS_DEV)
       data._context = this;
+    const that = this;
+    this.ctx = new Proxy(data, {
+      get(target, p) {
+        if (IS_DEV && !that.canGetCtx) throw new FrameworkException("ctx must be obtained within the same request cycle in controller");
+        if (!(p in target)) log(`attribute "${p}" does not exist on ctx, which might be due to a missing AOP role (such as a guard).`, "warn", data.tag);
+        return target[p];
+      },
+      set(target, p, newValue) {
+        target[p] = newValue;
+        return true;
+      }
+    });
   }
   static getAop(meta, opts) {
     const { globalGuards = [], globalFilter = "default", globalPipe = "default" } = opts;
@@ -269,14 +285,20 @@ ${pc.red(`Filter ${filter2}[${filter2 || "default"}]`)}`);
           if (index === guards.length) {
             const instance = moduleMap.get(tag);
             if (ctxs) {
-              ctxs.forEach((ctx) => instance[ctx] = this.data);
+              ctxs.forEach((ctx) => instance[ctx] = this.ctx);
             }
             const args = await Promise.all(params.map((item, i) => pipe[i]({
               arg: resolveDep(this.data[item.type], item.key),
               reflect: paramsType[item.index],
               ...item
-            }, this.data)));
+            }, this.ctx)));
+            if (IS_DEV) {
+              Promise.resolve().then(() => {
+                this.canGetCtx = false;
+              });
+            }
             res = await instance[func](...args);
+            this.canGetCtx = true;
           } else {
             let nextPromise;
             async function next() {
@@ -289,7 +311,7 @@ ${pc.red(`Filter ${filter2}[${filter2 || "default"}]`)}`);
               });
             }
             __name(next, "next");
-            const ret = await guards[index](this.data, next);
+            const ret = await guards[index](this.ctx, next);
             if (ret !== void 0) {
               res = ret;
             } else {
@@ -302,7 +324,7 @@ ${pc.red(`Filter ${filter2}[${filter2 || "default"}]`)}`);
       await nextHandler(0)();
       return successCb(res);
     } catch (e) {
-      const err = await filter(e, this.data);
+      const err = await filter(e, this.ctx);
       return failCb(err);
     }
   }
@@ -356,32 +378,12 @@ function addAddon(key, addon, priority = 0) {
 }
 __name(addAddon, "addAddon");
 
-// src/hmr.ts
-function HMR(cb) {
-  if (IS_HMR) globalThis.__PS_HMR__?.push(cb);
-}
-__name(HMR, "HMR");
-
 // src/http/helper.ts
 function resolveDep(ret, key) {
   if (key) return ret?.[key];
   return ret;
 }
 __name(resolveDep, "resolveDep");
-function argToReq(params, args, headers) {
-  const req = {
-    body: {},
-    query: {},
-    params: {},
-    headers
-  };
-  params.forEach((param) => {
-    if (param.key) req[param.type][param.key] = args[param.index];
-    else req[param.type] = args[param.index];
-  });
-  return req;
-}
-__name(argToReq, "argToReq");
 
 // src/rpc/helper.ts
 import { hostname } from "os";
@@ -498,6 +500,14 @@ function detectAopDep(meta, { guards, addons } = {}, controller = "http") {
   };
 }
 __name(detectAopDep, "detectAopDep");
+function joinUrl(base, ...paths) {
+  const joinedPath = [
+    base,
+    ...paths
+  ].filter((p) => p).map((path) => path.replace(/(^\/)/g, "")).join("/");
+  return `/${joinedPath}`;
+}
+__name(joinUrl, "joinUrl");
 
 export {
   defaultPipe,
@@ -523,12 +533,11 @@ export {
   addFilter,
   addGuard,
   addAddon,
-  HMR,
   resolveDep,
-  argToReq,
   genClientQueue,
   shallowClone,
   mergeObject,
   createControllerMetaMap,
-  detectAopDep
+  detectAopDep,
+  joinUrl
 };