phecda-server 7.0.0-alpha.8 → 7.0.0

package/dist/types-E-rqlg3-.d.mts

@@ -0,0 +1,14 @@
+import { B as BaseCtx, D as DefaultOptions } from './meta-BoS1E-Nz.mjs';
+
+interface RpcServerOptions extends DefaultOptions {
+    defaultQueue?: string;
+}
+interface RpcCtx extends BaseCtx {
+    args: any[];
+    id: string;
+    queue: string;
+    isEvent?: boolean;
+    category: 'rpc';
+}
+
+export type { RpcCtx as R, RpcServerOptions as a };

package/dist/{types-C2SQ9U9V.d.mts → types-SCJZFCYt.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 { B as BaseCtx, D as DefaultOptions } from './meta-BoS1E-Nz.mjs';
 
 interface HttpOptions extends DefaultOptions {
     /**

package/dist/{types-PFPIQWVF.d.ts → types-xruyYmyu.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 { B as BaseCtx, D as DefaultOptions } from './meta-BoS1E-Nz.js';
 
 interface HttpOptions extends DefaultOptions {
     /**

package/package.json

@@ -1,21 +1,21 @@
 {
   "name": "phecda-server",
-  "version": "7.0.0-alpha.8",
+  "version": "7.0.0",
   "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": {
     ".": {
       "require": "./dist/index.js",
-      "import": "./dist/index.mjs",
-      "node": "./dist/index.js"
+      "import": "./dist/index.mjs"
     },
     "./helper": {
       "require": "./dist/helper.js",
@@ -73,6 +73,18 @@
       "require": "./dist/rpc/nats/index.js",
       "import": "./dist/rpc/nats/index.mjs"
     },
+    "./electron": {
+      "require": "./dist/rpc/electron/index.js",
+      "import": "./dist/rpc/electron/index.mjs"
+    },
+    "./ws": {
+      "require": "./dist/rpc/ws/index.js",
+      "import": "./dist/rpc/ws/index.mjs"
+    },
+    "./web-ext": {
+      "require": "./dist/rpc/web-ext/index.js",
+      "import": "./dist/rpc/web-ext/index.mjs"
+    },
     "./register": "./register/index.mjs",
     "./*": "./*"
   },
@@ -144,27 +156,30 @@
     "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.1.0-alpha.0"
+    "phecda-core": "4.1.0"
   },
   "devDependencies": {
     "@koa/router": "^12.0.1",
     "@nucleoidjs/kafkajs-mock": "^0.0.1",
     "@types/amqplib": "^0.10.1",
+    "@types/chrome": "^0.0.309",
     "@types/debug": "^4.1.12",
     "@types/express": "^4.17.17",
     "@types/fs-extra": "^11.0.4",
     "@types/koa": "^2.13.12",
     "@types/koa__router": "^12.0.4",
     "@types/supertest": "^2.0.12",
+    "@types/ws": "^8.5.13",
     "amqplib": "^0.10.3",
     "bullmq": "^5.7.1",
+    "electron": "^33.2.1",
     "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",
@@ -176,8 +191,9 @@
     "nats": "^2.22.0",
     "supertest": "^6.3.3",
     "tsup": "^8.1.0",
-    "typescript": "^5.4.5",
-    "unimport": "^3.7.1"
+    "typescript": "^5.8.3",
+    "unimport": "^3.7.1",
+    "ws": "^8.18.0"
   },
   "scripts": {
     "dev": "tsup --watch",

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', 'OneFile', 'ManyFiles']

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,26 @@ 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 !== 'init') || type === 'relaunch')
+    return 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

@@ -3,31 +3,45 @@ 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 { IS_DEV, log } from '../dist/index.mjs'
+import Debug from 'debug'
 import { compile, genUnImportRet, handleClassTypes, slash } from './utils.mjs'
 
+const require = createRequire(import.meta.url)
+const debug = Debug('phecda-server/loader')
+
+const isLowVersion = parseFloat(process.version.slice(1)) < 18.19
+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, customLoad, customResolve
+const dtsPath = process.env.PS_DTS_PATH || 'ps.d.ts'
+
+// graph
+const watchFiles = new Set()
+const filesRecord = new Map()
+const moduleGraph = {}
+// ts
 let tsconfig = {
   module: ts.ModuleKind.ESNext,
   moduleResolution: ts.ModuleResolutionKind.NodeNext,
 }
-
-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 tsconfigPath = resolvePath(process.cwd(), 'tsconfig.json')
 const tsRet = ts.readConfigFile(tsconfigPath, ts.sys.readFile)
-
 if (!tsRet.error) {
   const { error, options } = ts.parseJsonConfigFileContent(
     tsRet.config,
@@ -48,34 +62,32 @@ const host = {
   readFile: ts.sys.readFile,
 }
 
-let unimportRet
-const dtsPath = 'ps.d.ts'
-
 if (isLowVersion)
   await initialize()
 
-let config
-
-const 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...')
+
+  debug('read config...')
 
   config = require(configPath)
-  if (!config.virtualFile)
-    config.virtualFile = {}
+
   if (!config.paths)
     config.paths = {}
 
-  if (!process.env.PS_HMR_BAN) {
+  const loaderPath = process.env.PS_LOADER_PATH
+
+  if (loaderPath) {
+    const loader = await import(loaderPath.startsWith('.') ? resolvePath(workdir, loaderPath) : loaderPath)
+
+    if (typeof loader.load === 'function')
+      customLoad = loader.load
+
+    if (typeof loader.resolve === 'function')
+      customResolve = loader.resolve
+  }
+  if (IS_DEV) {
     chokidar.watch(configPath, { persistent: true }).on('change', () => {
       port.postMessage(
         JSON.stringify({
@@ -87,19 +99,21 @@ export async function initialize(data) {
 
   if (!config.unimport)
     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
@@ -112,12 +126,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()
@@ -129,63 +137,34 @@ function addUrlToGraph(url, parent) {
 function getFileMid(file) {
   const filename = basename(file)
   const ret = filename.split('.')
-  if (ret.length === 3)
-    return ret[1]
-  else return ''
+  if (!['js', 'mjs', 'cjs', 'ts', 'tsx', 'mts', 'cts'].includes(ret.pop()))
+    return ''
+  if (!ret[0])// .dockerfile
+    return ''
+
+  return ret[1]
 }
 
 export const resolve = async (specifier, context, nextResolve) => {
-  // virtual file
-  if (config.virtualFile[specifier]) {
-    return {
-      format: 'ts',
-      url: specifier,
-      shortCircuit: true,
-    }
-  }
-  // entrypoint
-  if (!context.parentURL) {
-    if (/^file:\/\/\//.test(specifier) && existsSync(fileURLToPath(specifier))) {
-      entryUrl = specifier
-
+  if (customResolve) {
+    const url = await customResolve(specifier, context)
+    if (url) {
       return {
-        format: EXTENSIONS.some(ext => specifier.endsWith(ext))
-          ? 'ts'
-          : undefined,
-        url: specifier,
+        format: 'ts',
+        url,
         shortCircuit: true,
       }
     }
-    else {
-      // won't resolve virtual file as entry in vite
-      return nextResolve(specifier)
-    }
-  }
-  // url import
-  // it seems useless
-  if (/^file:\/\/\//.test(specifier) && extname(specifier) === '.ts') {
-    const url = addUrlToGraph(specifier, context.parentURL.split('?')[0])
-    return {
-      format: 'ts',
-      url,
-      shortCircuit: true,
-    }
-  }
-
-  // hmr import
-  if (
-    context.parentURL.includes('/node_modules/phecda-server')
-    && isAbsolute(specifier)
-  ) {
-    specifier = relative(fileURLToPath(entryUrl), specifier)
-      .replace(/\.ts$/, '')
-      .slice(1)
-    context.parentURL = entryUrl
   }
 
-  // import/require from external library
-  if (context.parentURL.includes('/node_modules/'))
+  // entrypoint
+  if (!context.parentURL)
     return nextResolve(specifier)
+
+  // @todo skip resolve to improve performance
+  // if (context.parentURL.includes('/node_modules/') && specifier.includes('/node_modules/'))
+  //   return nextResolve(specifier)
+
   const { resolvedModule } = ts.resolveModuleName(
     specifier,
     fileURLToPath(context.parentURL),
@@ -194,7 +173,7 @@ export const resolve = async (specifier, context, nextResolve) => {
     moduleResolutionCache,
   )
 
-  // import between loacl projects
+  // import among files in local project
   if (
     resolvedModule
     && !resolvedModule.resolvedFileName.includes('/node_modules/')
@@ -230,23 +209,24 @@ export const resolve = async (specifier, context, nextResolve) => {
   const resolveRet = await nextResolve(specifier)
 
   // ts resolve fail in some cases
-  if (resolveRet.url && isAbsolute(resolveRet.url))
-    resolveRet.url = pathToFileURL(resolveRet.url).href
+  if (resolveRet.url && isAbsolute(resolveRet.url)) {
+    const [path, query] = resolveRet.url.split('?')
+    resolveRet.url = pathToFileURL(path).href + (query ? `?${query}` : '')
+  }
 
   return resolveRet
 }
 // @todo the first params may be url or path, need to distinguish
 
 export const load = async (url, context, nextLoad) => {
-  if (config.virtualFile[url]) {
-    return {
-      format: 'module',
-      source: config.virtualFile[url],
-      shortCircuit: true,
-    }
+  let mode
+  if (context.importAttributes.ps) {
+    mode = context.importAttributes.ps
+    delete context.importAttributes.ps
   }
 
   url = url.split('?')[0]
+
   if (
     !url.includes('/node_modules/')
     && url.startsWith('file://')
@@ -254,32 +234,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 && mode !== 'not-hmr') {
+      if (isModuleFileUrl(url)) {
+        port.postMessage(
+          JSON.stringify({
+            type: 'init',
+            files: [fileURLToPath(url)],
+          }),
+        )
+      }
+
       chokidar.watch(fileURLToPath(url), { persistent: true }).on(
         'change',
         debounce(() => {
@@ -304,6 +269,17 @@ export const load = async (url, context, nextLoad) => {
       )
     }
   }
+  // after hmr
+  if (customLoad) {
+    const source = await customLoad(url, context)
+    if (source) {
+      return {
+        format: 'module',
+        source,
+        shortCircuit: true,
+      }
+    }
+  }
   // resolveModuleName failed
   // I don't know why it failed
   if (!context.format && url.endsWith('.ts'))
@@ -314,10 +290,12 @@ export const load = async (url, context, nextLoad) => {
 
     const code
       = typeof source === 'string' ? source : Buffer.from(source).toString()
+
     const compiled = (await compile(code, url)).replace(/_ts_metadata\(\"design:paramtypes\"\,/g, '_ts_metadata("design:paramtypes",()=>')// handle cycle
 
     if (unimportRet) {
       const { injectImports } = unimportRet
+
       return {
         format: 'module',
         source: (

package/register/utils.mjs

@@ -1,5 +1,6 @@
 import { basename } from 'path'
 import { transform } from '@swc-node/core'
+import psExports from './export.mjs'
 const injectInlineSourceMap = ({ code, map }) => {
   if (map) {
     const base64Map = Buffer.from(map, 'utf8').toString('base64')
@@ -19,6 +20,32 @@ export async function compile(sourcecode, filename) {
     emitDecoratorMetadata: true,
     experimentalDecorators: true,
     esModuleInterop: false,
+    swc: {
+
+      jsc: {
+        parser: {
+          syntax: 'typescript',
+          importAttributes: true,
+          decorators: true,
+          tsx: false,
+          dynamicImport: true,
+          strictPropertyInitialization: false,
+        },
+        experimental: {
+          keepImportAssertions: true,
+        },
+        transform: {
+          legacyDecorator: true,
+          decoratorMetadata: true,
+        },
+        // parser: {
+        //   importAttributes: true
+        // },
+        // experimental: {
+        //   keepImportAssertions: true
+        // }
+      },
+    },
   })
 
   return injectInlineSourceMap({ code, map })
@@ -26,18 +53,21 @@ export async function compile(sourcecode, filename) {
 
 export async function genUnImportRet(opts) {
   try {
-    const psExports = Object.keys(await import('../dist/index.mjs'))
     const { createUnimport } = await import('unimport')
     return createUnimport({
       ...opts,
-      imports: psExports
-        .map((k) => {
-          return { name: k, from: 'phecda-server' }
-        })
-        .concat(opts.imports || []),
+
+      presets: [
+        {
+          from: 'phecda-server',
+          imports: psExports,
+        },
+      ]
+        .concat(opts.presets || []),
     })
   }
   catch (e) {
+    console.error(e)
     return false
   }
 }

package/assets/ps.json

@@ -1,24 +0,0 @@
-{
-  "$schema": "https://unpkg.com/phecda-server/assets/schema.json",
-  "resolve": [
-    {
-      "source": "controller",
-      "importer": "http",
-      "path": ".ps/http.js"
-    },
-    {
-      "source": "rpc",
-      "importer": "client",
-      "path": ".ps/rpc.js"
-    }
-  ],
-  "unimport": {
-    "dirs": ["."],
-    "dirsScanOptions": {
-      "filePatterns": ["*.{service,controller,module,rpc,solo,guard,extension,pipe,filter,addon}.ts"]
-    }
-  },
-  "virtualFile": {},
-  "moduleFile": []
-
-}

package/assets/tsconfig.json

@@ -1,21 +0,0 @@
-{
-    "compilerOptions": {
-      "target": "esnext",
-      "useDefineForClassFields": false,
-      "experimentalDecorators": true,
-      "emitDecoratorMetadata": true,
-      "module": "esnext",
-      "lib": ["esnext", "DOM"],
-      "strictPropertyInitialization": false,
-      "moduleResolution": "Node",
-      "strict": true,
-      "resolveJsonModule": true,
-      "esModuleInterop": true,
-      "noEmit": true,
-      "noUnusedLocals": true,
-      "noUnusedParameters": true,
-      "noImplicitReturns": true,
-      "skipLibCheck": true
-    },
-    "include": [".","./ps.d.ts"]
-  }

package/dist/types-CYF0vha6.d.ts

@@ -1,19 +0,0 @@
-import { B as BaseCtx, D as DefaultOptions } from './meta-B_HW7cWh.js';
-
-interface RpcServerOptions extends DefaultOptions {
-    defaultQueue?: string;
-}
-interface RpcClientOptions {
-    key?: string;
-    timeout?: number;
-    max?: number;
-}
-interface RpcCtx extends BaseCtx {
-    args: any[];
-    id: string;
-    queue: string;
-    isEvent?: boolean;
-    category: 'rpc';
-}
-
-export type { RpcCtx as R, RpcServerOptions as a, RpcClientOptions as b };