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

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

@@ -1,5 +1,5 @@
 import { IncomingHttpHeaders, IncomingMessage, ServerResponse } from 'node:http';
-import { B as BaseCtx, D as DefaultOptions } from './meta-B_HW7cWh.js';
+import { D as DefaultOptions, B as BaseCtx } from './meta-BX5jhe4Z.js';
 
 interface HttpOptions extends DefaultOptions {
     /**

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

@@ -1,5 +1,5 @@
 import { IncomingHttpHeaders, IncomingMessage, ServerResponse } from 'node:http';
-import { B as BaseCtx, D as DefaultOptions } from './meta-B_HW7cWh.mjs';
+import { D as DefaultOptions, B as BaseCtx } from './meta-BX5jhe4Z.mjs';
 
 interface HttpOptions extends DefaultOptions {
     /**

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

@@ -1,4 +1,4 @@
-import { B as BaseCtx, D as DefaultOptions } from './meta-B_HW7cWh.js';
+import { D as DefaultOptions, B as BaseCtx } from './meta-BX5jhe4Z.js';
 
 interface RpcServerOptions extends DefaultOptions {
     defaultQueue?: string;

package/package.json

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

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

@@ -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 (IS_DEV && !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(() => {