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

package/dist/test.d.mts

@@ -2,8 +2,8 @@ import * as supertest from 'supertest';
 import { Test } from 'supertest';
 import { Server } from 'node:http';
 import { Construct } from 'phecda-core';
-import { F as Factory } from './core-BIcUwV18.mjs';
-import { P as PickFunc } from './meta-BXKLFTgG.mjs';
+import { F as Factory } from './core-DIfgUKIU.mjs';
+import { P as PickFunc } from './meta-CR-D39hQ.mjs';
 
 declare function TestFactory<T extends Construct[]>(...Modules: T): Promise<{
     get<C extends T[number]>(Model: C): InstanceType<C>;
@@ -11,7 +11,7 @@ declare function TestFactory<T extends Construct[]>(...Modules: T): Promise<{
 type SuperTestRequest<T> = {
     [K in keyof T]: T[K] extends (...args: infer R) => any ? (...args: R) => Test : never;
 };
-declare function TestHttp(app: Server | any, { moduleMap, meta }: Awaited<ReturnType<typeof Factory>>, isAgent?: boolean): Promise<supertest.SuperTestWithHost<Test> & Pick<supertest.Request, "type" | "query" | "key" | "use" | "on" | "set" | "accept" | "auth" | "withCredentials" | "retry" | "ok" | "redirects" | "timeout" | "buffer" | "serialize" | "parse" | "ca" | "pfx" | "cert"> & {
+declare function TestHttp(app: Server | any, { moduleMap, meta }: Awaited<ReturnType<typeof Factory>>, isAgent?: boolean): Promise<supertest.SuperTestWithHost<Test> & Pick<supertest.Request, "use" | "on" | "set" | "query" | "type" | "accept" | "auth" | "withCredentials" | "retry" | "ok" | "redirects" | "timeout" | "buffer" | "serialize" | "parse" | "ca" | "key" | "pfx" | "cert"> & {
     module: <T extends Construct>(Module: T) => SuperTestRequest<PickFunc<InstanceType<T>>>;
 }>;
 

package/dist/test.d.ts

@@ -2,8 +2,8 @@ import * as supertest from 'supertest';
 import { Test } from 'supertest';
 import { Server } from 'node:http';
 import { Construct } from 'phecda-core';
-import { F as Factory } from './core-CYwEPfN4.js';
-import { P as PickFunc } from './meta-BXKLFTgG.js';
+import { F as Factory } from './core-CUTbX_IS.js';
+import { P as PickFunc } from './meta-CR-D39hQ.js';
 
 declare function TestFactory<T extends Construct[]>(...Modules: T): Promise<{
     get<C extends T[number]>(Model: C): InstanceType<C>;
@@ -11,7 +11,7 @@ declare function TestFactory<T extends Construct[]>(...Modules: T): Promise<{
 type SuperTestRequest<T> = {
     [K in keyof T]: T[K] extends (...args: infer R) => any ? (...args: R) => Test : never;
 };
-declare function TestHttp(app: Server | any, { moduleMap, meta }: Awaited<ReturnType<typeof Factory>>, isAgent?: boolean): Promise<supertest.SuperTestWithHost<Test> & Pick<supertest.Request, "type" | "query" | "key" | "use" | "on" | "set" | "accept" | "auth" | "withCredentials" | "retry" | "ok" | "redirects" | "timeout" | "buffer" | "serialize" | "parse" | "ca" | "pfx" | "cert"> & {
+declare function TestHttp(app: Server | any, { moduleMap, meta }: Awaited<ReturnType<typeof Factory>>, isAgent?: boolean): Promise<supertest.SuperTestWithHost<Test> & Pick<supertest.Request, "use" | "on" | "set" | "query" | "type" | "accept" | "auth" | "withCredentials" | "retry" | "ok" | "redirects" | "timeout" | "buffer" | "serialize" | "parse" | "ca" | "key" | "pfx" | "cert"> & {
     module: <T extends Construct>(Module: T) => SuperTestRequest<PickFunc<InstanceType<T>>>;
 }>;
 

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 _chunk7YQ57BQSjs = require('./chunk-7YQ57BQS.js');
+var _chunk6OQ2SB5Wjs = require('./chunk-6OQ2SB5W.js');
 
 
-var _chunkJ5CFUN4Vjs = require('./chunk-J5CFUN4V.js');
+var _chunk4LLLQOMFjs = require('./chunk-4LLLQOMF.js');
 
 // src/test.ts
 var _phecdacore = require('phecda-core');
 async function TestFactory(...Modules) {
-  const { moduleMap, modelMap } = await _chunk7YQ57BQSjs.Factory.call(void 0, Modules);
+  const { moduleMap, modelMap } = await _chunk6OQ2SB5Wjs.Factory.call(void 0, Modules);
   return {
     get(Model) {
       const tag = _phecdacore.getTag.call(void 0, Model);
@@ -19,7 +19,7 @@ async function TestFactory(...Modules) {
     }
   };
 }
-_chunkJ5CFUN4Vjs.__name.call(void 0, TestFactory, "TestFactory");
+_chunk4LLLQOMFjs.__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) {
       }
     });
   }
-  _chunkJ5CFUN4Vjs.__name.call(void 0, module, "module");
+  _chunk4LLLQOMFjs.__name.call(void 0, module, "module");
   Agent.module = module;
   return Agent;
 }
-_chunkJ5CFUN4Vjs.__name.call(void 0, TestHttp, "TestHttp");
+_chunk4LLLQOMFjs.__name.call(void 0, TestHttp, "TestHttp");
 
 
 

package/dist/test.mjs

@@ -1,9 +1,9 @@
 import {
   Factory
-} from "./chunk-XYVMNY2X.mjs";
+} from "./chunk-YCES6ABN.mjs";
 import {
   __name
-} from "./chunk-WHJ5FALK.mjs";
+} from "./chunk-NQ55PA2X.mjs";
 
 // src/test.ts
 import { getTag } from "phecda-core";

package/dist/{types-h40T3cRG.d.mts → types-BF1TDbFV.d.ts}

@@ -1,5 +1,5 @@
 import { IncomingHttpHeaders, IncomingMessage, ServerResponse } from 'node:http';
-import { D as DefaultOptions, B as BaseContext } from './meta-BXKLFTgG.mjs';
+import { D as DefaultOptions, B as BaseCtx } from './meta-CR-D39hQ.js';
 
 interface HttpOptions extends DefaultOptions {
     /**
@@ -15,13 +15,14 @@ interface HttpOptions extends DefaultOptions {
      */
     dynamic?: boolean;
 }
-interface HttpContext extends BaseContext {
+interface HttpCtx extends BaseCtx {
     parallel?: true;
     index?: number;
     query: Record<string, any>;
     params: Record<string, string>;
     body: Record<string, any>;
     headers: IncomingHttpHeaders;
+    category: 'http';
     redirect: (url: string, status?: number) => void;
     getCookie(key: string): string | undefined;
     setCookie(key: string, value: string, opts?: CookieSerializeOptions): void;
@@ -44,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-BtbL49Zs.d.mts → types-DYRu0vic.d.ts}

@@ -1,4 +1,4 @@
-import { D as DefaultOptions, B as BaseContext } from './meta-BXKLFTgG.mjs';
+import { D as DefaultOptions, B as BaseCtx } from './meta-CR-D39hQ.js';
 
 interface RpcServerOptions extends DefaultOptions {
     defaultQueue?: string;
@@ -8,11 +8,12 @@ interface RpcClientOptions {
     timeout?: number;
     max?: number;
 }
-interface RpcContext extends BaseContext {
+interface RpcCtx extends BaseCtx {
     args: any[];
     id: string;
     queue: string;
     isEvent?: boolean;
+    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-VFzEM7LL.d.ts → types-DYviSl5B.d.mts}

@@ -1,5 +1,5 @@
 import { IncomingHttpHeaders, IncomingMessage, ServerResponse } from 'node:http';
-import { D as DefaultOptions, B as BaseContext } from './meta-BXKLFTgG.js';
+import { D as DefaultOptions, B as BaseCtx } from './meta-CR-D39hQ.mjs';
 
 interface HttpOptions extends DefaultOptions {
     /**
@@ -15,13 +15,14 @@ interface HttpOptions extends DefaultOptions {
      */
     dynamic?: boolean;
 }
-interface HttpContext extends BaseContext {
+interface HttpCtx extends BaseCtx {
     parallel?: true;
     index?: number;
     query: Record<string, any>;
     params: Record<string, string>;
     body: Record<string, any>;
     headers: IncomingHttpHeaders;
+    category: 'http';
     redirect: (url: string, status?: number) => void;
     getCookie(key: string): string | undefined;
     setCookie(key: string, value: string, opts?: CookieSerializeOptions): void;
@@ -44,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-m3IEDKjP.d.ts → types-DqH1qA-q.d.mts}

@@ -1,4 +1,4 @@
-import { D as DefaultOptions, B as BaseContext } from './meta-BXKLFTgG.js';
+import { D as DefaultOptions, B as BaseCtx } from './meta-CR-D39hQ.mjs';
 
 interface RpcServerOptions extends DefaultOptions {
     defaultQueue?: string;
@@ -8,11 +8,12 @@ interface RpcClientOptions {
     timeout?: number;
     max?: number;
 }
-interface RpcContext extends BaseContext {
+interface RpcCtx extends BaseCtx {
     args: any[];
     id: string;
     queue: string;
     isEvent?: boolean;
+    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,15 +1,16 @@
 {
   "name": "phecda-server",
-  "version": "7.0.0-alpha.1",
+  "version": "7.0.0-alpha.10",
   "description": "server framework that provide IOC/type-reuse/http&rpc-adaptor",
   "author": "fgsreally",
   "license": "MIT",
   "repository": "https://github.com/fgsreally/phecda/tree/main/packages/server",
   "keywords": [
     "server",
+    "http",
     "IOC",
     "rpc",
-    "types-share"
+    "types-safe"
   ],
   "exports": {
     ".": {
@@ -129,7 +130,8 @@
     }
   },
   "bin": {
-    "phecda": "bin/cli.mjs"
+    "phecda": "bin/cli.mjs",
+    "phecda-server": "bin/cli.mjs"
   },
   "files": [
     "dist",
@@ -143,11 +145,11 @@
     "chokidar": "^3.5.3",
     "debug": "^4.3.4",
     "fs-extra": "^11.2.0",
-    "h3": "^1.12.0",
     "picocolors": "^1.0.0",
     "reflect-metadata": "^0.1.13",
     "ts-mixer": "^6.0.4",
-    "phecda-core": "4.0.1"
+    "unconfig": "^0.6.0",
+    "phecda-core": "4.1.0-alpha.0"
   },
   "devDependencies": {
     "@koa/router": "^12.0.1",
@@ -164,6 +166,7 @@
     "elysia": "^1.0.17",
     "express": "^4.18.2",
     "fastify": "^4.25.1",
+    "h3": "^1.12.0",
     "hono": "^4.3.4",
     "hyper-express": "^6.15.2",
     "ioredis": "^5.3.2",

package/register/export.mjs

@@ -0,0 +1,30 @@
+export default ['Addon', 'Arg', 'Assign', 'BadGatewayException', 'BadRequestException',
+  'Base', 'Body', 'Clear',
+  'ConflictException', 'Controller',
+  'Ctx', 'CustomResponse',
+  'Delete',
+  'Define',
+  'ERROR_SYMBOL',
+  'Effect', 'Empty', 'Err', 'Exception', 'Expose', 'Factory', 'Filter', 'ForbiddenException',
+  'FrameworkException',
+  'Generator', 'Get', 'Global', 'Guard', 'HTTPGenerator', 'Head', 'Header', 'HttpBase',
+  'If', 'Init', 'Inject', 'Injectable',
+  'InvalidInputException', 'Isolate',
+  'Mixin',
+  'NotFoundException', 'PAddon', 'PExtension', 'PFilter', 'PGuard',
+  'PPipe', 'Param', 'Patch', 'PayloadLargeException', 'Pipe', 'Pipeline', 'Post',
+  'Provide', 'Put', 'Query', 'Queue', 'RPCGenerator', 'Route',
+  'Rpc', 'RpcBase', 'Search', 'ServerBase', 'ServerPhecda', 'ServiceUnavailableException', 'Storage',
+  'Tag', 'TimeoutException', 'TimerException', 'UnauthorizedException', 'UndefinedException',
+  'Unique', 'Unmount', 'UnsupportedMediaTypeException', 'ValidateException',
+  'Watcher', 'WorkerException',
+  'addAddon', 'addDecoToClass',
+  'addFilter', 'addGuard', 'addPipe', 'emitter',
+  'getMergedMeta',
+  'getMeta', 'getMetaKey', 'getMetaParams', 'getOwnMeta', 'getOwnMetaKey', 'getOwnMetaParams',
+  'getTag',
+  'isPhecda', 'log', 'phecdaNamespace', 'runMiddleware',
+  'setInject',
+  'setLogger',
+  'setMeta',
+  'useS', 'wait']

package/register/index.mjs

@@ -1,40 +1,50 @@
-import { register } from 'node:module'
-import { MessageChannel } from 'node:worker_threads'
-import { log } from '../dist/index.mjs'
-const { port1, port2 } = new MessageChannel()
-
-register('./loader.mjs', {
-  parentURL: import.meta.url,
-  data: { port: port2 },
-  transferList: [port2],
-})
-
-let isRunning = true
-
-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')
-  }
-})
-
-process.on('uncaughtException', (err) => {
-  log('Uncaught Exception:', 'error')
-  isRunning = false
-  console.error(err)
-})
-
-process.on('unhandledRejection', (err) => {
-  log('Unhandled Promise Rejection:', 'error')
-  isRunning = false
-
-  console.error(err)
-})
+import { register } from 'node:module'
+import { MessageChannel } from 'node:worker_threads'
+import { isPhecda, log } from '../dist/index.mjs'
+import { RELAUNCH, RELOAD } from '../dist/helper.mjs'
+const { port1, port2 } = new MessageChannel()
+
+register('./loader.mjs', {
+  parentURL: import.meta.url,
+  data: { port: port2 },
+  transferList: [port2],
+})
+
+let isRunning = true
+
+const fileModelMap = new Map()
+
+port1.on('message', async (data) => {
+  const { type, files } = JSON.parse(data)
+
+  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)
+  }
+})
+
+process.on('uncaughtException', (err) => {
+  log('Uncaught Exception:', 'error')
+  isRunning = false
+  console.error(err)
+})
+
+process.on('unhandledRejection', (err) => {
+  log('Unhandled Promise Rejection:', 'error')
+  isRunning = false
+
+  console.error(err)
+})

package/register/loader.mjs

@@ -2,26 +2,57 @@ import { fileURLToPath, pathToFileURL } from 'url'
 import { writeFile } from 'fs/promises'
 import {
   basename,
+  dirname,
   extname,
   isAbsolute,
   relative,
   resolve as resolvePath,
 } from 'path'
-import { createRequire } from 'module'
+import { existsSync } from 'fs'
 import ts from 'typescript'
 import chokidar from 'chokidar'
-import { log } from '../dist/index.mjs'
+import Debug from 'debug'
+import { loadConfig } from 'unconfig'
 import { compile, genUnImportRet, handleClassTypes, slash } from './utils.mjs'
 
-let port
+const debug = Debug('phecda-server/loader')
 
 const isLowVersion = parseFloat(process.version.slice(1)) < 18.19
-// this part is important or not?
-const EXTENSIONS = [ts.Extension.Ts, ts.Extension.Tsx, ts.Extension.Mts]
-const tsconfig = {
+const IS_DEV = process.env.NODE_ENV === 'development'
+let port
+let config
+const workdir = process.cwd()
+const configPath = resolvePath(
+  workdir,
+  process.env.PS_CONFIG_FILE || 'ps.json',
+)
+
+// unimport
+let unimportRet
+const dtsPath = process.env.PS_DTS_PATH || 'ps.d.ts'
+
+// graph
+let entryUrl
+const watchFiles = new Set()
+const filesRecord = new Map()
+const moduleGraph = {}
+// ts
+let tsconfig = {
   module: ts.ModuleKind.ESNext,
   moduleResolution: ts.ModuleResolutionKind.NodeNext,
 }
+const EXTENSIONS = [ts.Extension.Ts, ts.Extension.Tsx, ts.Extension.Mts]
+const tsconfigPath = resolvePath(process.cwd(), 'tsconfig.json')
+const tsRet = ts.readConfigFile(tsconfigPath, ts.sys.readFile)
+if (!tsRet.error) {
+  const { error, options } = ts.parseJsonConfigFileContent(
+    tsRet.config,
+    ts.sys,
+    dirname(tsconfigPath),
+  )
+  if (!error)
+    tsconfig = options
+}
 const moduleResolutionCache = ts.createModuleResolutionCache(
   ts.sys.getCurrentDirectory(),
   x => x,
@@ -32,32 +63,31 @@ const host = {
   readFile: ts.sys.readFile,
 }
 
-let unimportRet
-const dtsPath = 'ps.d.ts'
-
 if (isLowVersion)
   await initialize()
 
-let config
-
-const workdir = process.env.PS_WORKDIR || process.cwd()
-
-const configPath = resolvePath(
-  workdir,
-  process.env.PS_CONFIG_FILE || 'ps.json',
-)
-
-const require = createRequire(import.meta.url)
 export async function initialize(data) {
   if (data)
     port = data.port
-  log('read config...')
 
-  config = require(configPath)
+  debug('read config...')
+
+  const unconfigRet = await loadConfig({
+    sources: [
+      {
+        files: configPath,
+        extensions: ['ts', 'mts', 'cts', 'js', 'mjs', 'cjs', 'json', ''],
+      },
+    ],
+    merge: false,
+  })
+  config = unconfigRet.config
   if (!config.virtualFile)
     config.virtualFile = {}
+  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({
@@ -71,17 +101,18 @@ export async function initialize(data) {
     return
   unimportRet = await genUnImportRet(config.unimport)
   if (unimportRet) {
-    log('auto import...')
+    debug('auto import...')
     await unimportRet.init()
 
+    const unimportDtsPath = resolvePath(workdir, dtsPath)
     writeFile(
-      resolvePath(workdir, config.unimport.dtsPath || dtsPath),
+      unimportDtsPath,
       handleClassTypes(
         await unimportRet.generateTypeDeclarations({
           resolvePath: (i) => {
             if (i.from.startsWith('.') || isAbsolute(i.from)) {
               const related = slash(
-                relative(workdir, i.from).replace(/\.ts(x)?$/, ''),
+                relative(dirname(unimportDtsPath), i.from).replace(/\.ts(x)?$/, ''),
               )
 
               return !related.startsWith('.') ? `./${related}` : related
@@ -94,12 +125,6 @@ export async function initialize(data) {
   }
 }
 
-const watchFiles = new Set()
-const filesRecord = new Map()
-const moduleGraph = {}
-
-let entryUrl
-
 function addUrlToGraph(url, parent) {
   if (!(url in moduleGraph))
     moduleGraph[url] = new Set()
@@ -127,13 +152,20 @@ export const resolve = async (specifier, context, nextResolve) => {
   }
   // entrypoint
   if (!context.parentURL) {
-    entryUrl = specifier
-    return {
-      format: EXTENSIONS.some(ext => specifier.endsWith(ext))
-        ? 'ts'
-        : undefined,
-      url: specifier,
-      shortCircuit: true,
+    if (/^file:\/\/\//.test(specifier) && existsSync(fileURLToPath(specifier))) {
+      entryUrl = specifier
+
+      return {
+        format: EXTENSIONS.some(ext => specifier.endsWith(ext))
+          ? 'ts'
+          : undefined,
+        url: specifier,
+        shortCircuit: true,
+      }
+    }
+    else {
+      // won't resolve virtual file as entry in vite
+      return nextResolve(specifier)
     }
   }
   // url import
@@ -229,32 +261,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(() => {
@@ -289,7 +306,8 @@ export const load = async (url, context, nextLoad) => {
 
     const code
       = typeof source === 'string' ? source : Buffer.from(source).toString()
-    const compiled = await compile(code, url)
+    const compiled = (await compile(code, url)).replace(/_ts_metadata\(\"design:paramtypes\"\,/g, '_ts_metadata("design:paramtypes",()=>')// handle cycle
+
     if (unimportRet) {
       const { injectImports } = unimportRet
       return {
@@ -357,7 +375,7 @@ export function isModuleFileUrl(url) {
       'addon',
       'filter',
       'pipe',
-      'edge',
+      'solo',
     ].includes(midName)
   )
     return true