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

package/dist/test.js

@@ -1,14 +1,14 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } }
 
-var _chunkXSMUJ77Ajs = require('./chunk-XSMUJ77A.js');
+var _chunkKJUD2BKEjs = require('./chunk-KJUD2BKE.js');
 
 
-var _chunkM5HGFUCVjs = require('./chunk-M5HGFUCV.js');
+var _chunk5RBTN33Ajs = require('./chunk-5RBTN33A.js');
 
 // src/test.ts
 var _phecdacore = require('phecda-core');
 async function TestFactory(...Modules) {
-  const { moduleMap, modelMap } = await _chunkXSMUJ77Ajs.Factory.call(void 0, Modules);
+  const { moduleMap, modelMap } = await _chunkKJUD2BKEjs.Factory.call(void 0, Modules);
   return {
     get(Model) {
       const tag = _phecdacore.getTag.call(void 0, Model);
@@ -19,7 +19,7 @@ async function TestFactory(...Modules) {
     }
   };
 }
-_chunkM5HGFUCVjs.__name.call(void 0, TestFactory, "TestFactory");
+_chunk5RBTN33Ajs.__name.call(void 0, TestFactory, "TestFactory");
 async function TestHttp(app, { moduleMap, meta }, isAgent = true) {
   const { default: request, agent } = await Promise.resolve().then(() => _interopRequireWildcard(require("supertest")));
   const Agent = agent(app);
@@ -59,11 +59,11 @@ async function TestHttp(app, { moduleMap, meta }, isAgent = true) {
       }
     });
   }
-  _chunkM5HGFUCVjs.__name.call(void 0, module, "module");
+  _chunk5RBTN33Ajs.__name.call(void 0, module, "module");
   Agent.module = module;
   return Agent;
 }
-_chunkM5HGFUCVjs.__name.call(void 0, TestHttp, "TestHttp");
+_chunk5RBTN33Ajs.__name.call(void 0, TestHttp, "TestHttp");
 
 
 

package/dist/test.mjs

@@ -1,9 +1,9 @@
 import {
   Factory
-} from "./chunk-RGSKKTHD.mjs";
+} from "./chunk-7ZGYJ5OW.mjs";
 import {
   __name
-} from "./chunk-C5BVKEGW.mjs";
+} from "./chunk-FXTJ3BJ6.mjs";
 
 // src/test.ts
 import { getTag } from "phecda-core";

package/dist/{types-CbfaGkPA.d.ts → types-B-rUM9Fm.d.mts}

@@ -1,4 +1,4 @@
-import { D as DefaultOptions, B as BaseContext } from './meta-BTnLXuCa.js';
+import { D as DefaultOptions, B as BaseCtx } from './meta-BX5jhe4Z.mjs';
 
 interface RpcServerOptions extends DefaultOptions {
     defaultQueue?: string;
@@ -8,7 +8,7 @@ interface RpcClientOptions {
     timeout?: number;
     max?: number;
 }
-interface RpcContext extends BaseContext {
+interface RpcCtx extends BaseCtx {
     args: any[];
     id: string;
     queue: string;
@@ -16,4 +16,4 @@ interface RpcContext extends BaseContext {
     category: 'rpc';
 }
 
-export type { RpcContext as R, RpcServerOptions as a, RpcClientOptions as b };
+export type { RpcCtx as R, RpcServerOptions as a, RpcClientOptions as b };

package/dist/{types--E-OCZhC.d.ts → types-CMeuFoyd.d.ts}

@@ -1,5 +1,5 @@
 import { IncomingHttpHeaders, IncomingMessage, ServerResponse } from 'node:http';
-import { D as DefaultOptions, B as BaseContext } from './meta-BTnLXuCa.js';
+import { D as DefaultOptions, B as BaseCtx } from './meta-BX5jhe4Z.js';
 
 interface HttpOptions extends DefaultOptions {
     /**
@@ -15,7 +15,7 @@ interface HttpOptions extends DefaultOptions {
      */
     dynamic?: boolean;
 }
-interface HttpContext extends BaseContext {
+interface HttpCtx extends BaseCtx {
     parallel?: true;
     index?: number;
     query: Record<string, any>;
@@ -45,4 +45,4 @@ interface CookieSerializeOptions {
     partitioned?: boolean;
 }
 
-export type { CookieSerializeOptions as C, HttpContext as H, HttpOptions as a };
+export type { CookieSerializeOptions as C, HttpCtx as H, HttpOptions as a };

package/dist/{types-BxlzVoRv.d.mts → types-DKVhyZk_.d.mts}

@@ -1,5 +1,5 @@
 import { IncomingHttpHeaders, IncomingMessage, ServerResponse } from 'node:http';
-import { D as DefaultOptions, B as BaseContext } from './meta-BTnLXuCa.mjs';
+import { D as DefaultOptions, B as BaseCtx } from './meta-BX5jhe4Z.mjs';
 
 interface HttpOptions extends DefaultOptions {
     /**
@@ -15,7 +15,7 @@ interface HttpOptions extends DefaultOptions {
      */
     dynamic?: boolean;
 }
-interface HttpContext extends BaseContext {
+interface HttpCtx extends BaseCtx {
     parallel?: true;
     index?: number;
     query: Record<string, any>;
@@ -45,4 +45,4 @@ interface CookieSerializeOptions {
     partitioned?: boolean;
 }
 
-export type { CookieSerializeOptions as C, HttpContext as H, HttpOptions as a };
+export type { CookieSerializeOptions as C, HttpCtx as H, HttpOptions as a };

package/dist/{types-BYqBeqrs.d.mts → types-MxxtkZXw.d.ts}

@@ -1,4 +1,4 @@
-import { D as DefaultOptions, B as BaseContext } from './meta-BTnLXuCa.mjs';
+import { D as DefaultOptions, B as BaseCtx } from './meta-BX5jhe4Z.js';
 
 interface RpcServerOptions extends DefaultOptions {
     defaultQueue?: string;
@@ -8,7 +8,7 @@ interface RpcClientOptions {
     timeout?: number;
     max?: number;
 }
-interface RpcContext extends BaseContext {
+interface RpcCtx extends BaseCtx {
     args: any[];
     id: string;
     queue: string;
@@ -16,4 +16,4 @@ interface RpcContext extends BaseContext {
     category: 'rpc';
 }
 
-export type { RpcContext as R, RpcServerOptions as a, RpcClientOptions as b };
+export type { RpcCtx as R, RpcServerOptions as a, RpcClientOptions as b };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "phecda-server",
-  "version": "7.0.0-alpha.7",
+  "version": "7.0.0-alpha.9",
   "description": "server framework that provide IOC/type-reuse/http&rpc-adaptor",
   "author": "fgsreally",
   "license": "MIT",
@@ -129,7 +129,8 @@
     }
   },
   "bin": {
-    "phecda": "bin/cli.mjs"
+    "phecda": "bin/cli.mjs",
+    "phecda-server": "bin/cli.mjs"
   },
   "files": [
     "dist",

package/register/index.mjs

@@ -1,7 +1,7 @@
 import { register } from 'node:module'
 import { MessageChannel } from 'node:worker_threads'
-import { log } from '../dist/index.mjs'
-
+import { isPhecda, log } from '../dist/index.mjs'
+import { RELAUNCH, RELOAD } from '../dist/helper.mjs'
 const { port1, port2 } = new MessageChannel()
 
 register('./loader.mjs', {
@@ -12,18 +12,27 @@ register('./loader.mjs', {
 
 let isRunning = true
 
+const fileModelMap = new Map()
+
 port1.on('message', async (data) => {
   const { type, files } = JSON.parse(data)
 
-  if (!isRunning || !globalThis.__PS_HMR__ || type === 'relaunch')
-    return process.exit(2)// file change -> relaunch
-
-  if (type === 'change') {
-    log('reload module...')
-
-    for (const cb of globalThis.__PS_HMR__) await cb(files)
-
-    log('reload done')
+  if (!isRunning || type === 'relaunch')
+    return RELAUNCH()// file change -> relaunch
+
+  if (type === 'change' || type === 'init') {
+    if (!files.length)
+      return
+    const oldModels = []
+    const newModels = []
+    for (const file of files) {
+      oldModels.push(...fileModelMap.get(file) || [])
+      const models = Object.values(await import(file)).filter(isPhecda)
+      fileModelMap.set(file, models)
+      newModels.push(...models)
+    }
+    if (type === 'change')
+      return RELOAD(oldModels, newModels)
   }
 })
 

package/register/loader.mjs

@@ -12,7 +12,7 @@ import { createRequire } from 'module'
 import { existsSync } from 'fs'
 import ts from 'typescript'
 import chokidar from 'chokidar'
-import { log } from '../dist/index.mjs'
+import { IS_DEV, log } from '../dist/index.mjs'
 import { compile, genUnImportRet, handleClassTypes, slash } from './utils.mjs'
 
 let port
@@ -75,7 +75,7 @@ export async function initialize(data) {
   if (!config.paths)
     config.paths = {}
 
-  if (!process.env.PS_HMR_BAN) {
+  if (IS_DEV) {
     chokidar.watch(configPath, { persistent: true }).on('change', () => {
       port.postMessage(
         JSON.stringify({
@@ -254,32 +254,17 @@ export const load = async (url, context, nextLoad) => {
     && !isLowVersion
   ) {
     watchFiles.add(url)
-    // watch(
-    //   fileURLToPath(url),
-    //   debounce((type) => {
-    //     if (type === 'change') {
-    //       try {
-    //         const files = [...findTopScope(url, Date.now())].reverse()
-
-    //         port.postMessage(
-    //           JSON.stringify({
-    //             type: 'change',
-    //             files,
-    //           }),
-    //         )
-    //       }
-    //       catch (e) {
-    //         port.postMessage(
-    //           JSON.stringify({
-    //             type: 'relaunch',
-    //           }),
-    //         )
-    //       }
-    //     }
-    //   }),
-    // )
-
-    if (!process.env.PS_HMR_BAN) {
+
+    if (IS_DEV) {
+      if (isModuleFileUrl(url)) {
+        port.postMessage(
+          JSON.stringify({
+            type: 'init',
+            files: [fileURLToPath(url)],
+          }),
+        )
+      }
+
       chokidar.watch(fileURLToPath(url), { persistent: true }).on(
         'change',
         debounce(() => {