phecda-server 7.0.0-alpha.11 → 7.0.0-alpha.13

package/dist/test.d.ts

@@ -2,9 +2,13 @@ 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-CUTbX_IS.js';
-import { P as PickFunc } from './meta-CR-D39hQ.js';
+import { F as Factory } from './core-CDzIy2g0.js';
+import { e as CustomResponse } from './meta-xvg6V7pH.js';
 
+type PickFuncKeys<Type> = {
+    [Key in keyof Type]: Type[Key] extends (...args: any) => any ? (ReturnType<Type[Key]> extends CustomResponse<any> ? never : Key) : never;
+}[keyof Type];
+type PickFunc<Instance> = Pick<Instance, PickFuncKeys<Instance>>;
 declare function TestFactory<T extends Construct[]>(...Modules: T): Promise<{
     get<C extends T[number]>(Model: C): InstanceType<C>;
 }>;
@@ -15,4 +19,4 @@ declare function TestHttp(app: Server | any, { moduleMap, meta }: Awaited<Return
     module: <T extends Construct>(Module: T) => SuperTestRequest<PickFunc<InstanceType<T>>>;
 }>;
 
-export { type SuperTestRequest, TestFactory, TestHttp };
+export { type PickFunc, type SuperTestRequest, TestFactory, TestHttp };

package/dist/types-6qaaUIKZ.d.mts

@@ -0,0 +1,14 @@
+import { D as DefaultOptions, B as BaseCtx } from './meta-xvg6V7pH.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-BF1TDbFV.d.ts → types-B-1OL-3P.d.ts}

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

package/dist/types-BtXOT5rI.d.ts

@@ -0,0 +1,14 @@
+import { D as DefaultOptions, B as BaseCtx } from './meta-xvg6V7pH.js';
+
+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-DYviSl5B.d.mts → types-Ctd6pLNE.d.mts}

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "phecda-server",
-  "version": "7.0.0-alpha.11",
+  "version": "7.0.0-alpha.13",
   "description": "server framework that provide IOC/type-reuse/http&rpc-adaptor",
   "author": "fgsreally",
   "license": "MIT",
@@ -74,6 +74,14 @@
       "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"
+    },
     "./register": "./register/index.mjs",
     "./*": "./*"
   },
@@ -160,8 +168,10 @@
     "@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",
@@ -178,7 +188,8 @@
     "supertest": "^6.3.3",
     "tsup": "^8.1.0",
     "typescript": "^5.7.2",
-    "unimport": "^3.7.1"
+    "unimport": "^3.7.1",
+    "ws": "^8.18.0"
   },
   "scripts": {
     "dev": "tsup --watch",

package/register/index.mjs

@@ -16,7 +16,6 @@ const fileModelMap = new Map()
 
 port1.on('message', async (data) => {
   const { type, files } = JSON.parse(data)
-
   if (!isRunning || type === 'relaunch')
     return RELAUNCH()// file change -> relaunch
 

package/register/loader.mjs

@@ -7,7 +7,6 @@ import {
   relative,
   resolve as resolvePath,
 } from 'path'
-import { existsSync } from 'fs'
 import { createRequire } from 'module'
 import ts from 'typescript'
 import chokidar from 'chokidar'
@@ -32,7 +31,6 @@ 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 = {}
@@ -137,9 +135,12 @@ 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) => {
@@ -151,46 +152,12 @@ export const resolve = async (specifier, context, nextResolve) => {
       shortCircuit: true,
     }
   }
-  // entrypoint
-  if (!context.parentURL) {
-    if (/^file:\/\/\//.test(specifier) && existsSync(fileURLToPath(specifier))) {
-      entryUrl = specifier
+  // if (isAbsolute(specifier))
+  //   specifier = pathToFileURL(specifier).href
 
-      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
-  // 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
-  }
+  // entrypoint
+  if (!context.parentURL)
+    return nextResolve(specifier)
 
   // import/require from external library
   if (context.parentURL.includes('/node_modules/'))
@@ -236,7 +203,6 @@ export const resolve = async (specifier, context, nextResolve) => {
     }
   }
 
-
   const resolveRet = await nextResolve(specifier)
 
   // ts resolve fail in some cases
@@ -248,9 +214,6 @@ export const resolve = async (specifier, context, nextResolve) => {
 // @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',
@@ -265,9 +228,8 @@ export const load = async (url, context, nextLoad) => {
     delete context.importAttributes.ps
   }
 
-
-
   url = url.split('?')[0]
+
   if (
     !url.includes('/node_modules/')
     && url.startsWith('file://')
@@ -324,8 +286,6 @@ export const load = async (url, context, nextLoad) => {
     const compiled = (await compile(code, url)).replace(/_ts_metadata\(\"design:paramtypes\"\,/g, '_ts_metadata("design:paramtypes",()=>')// handle cycle
 
     if (unimportRet) {
-
-
       const { injectImports } = unimportRet
 
       return {

package/register/utils.mjs

@@ -24,28 +24,28 @@ export async function compile(sourcecode, filename) {
 
       jsc: {
         parser: {
-          syntax: "typescript",
+          syntax: 'typescript',
           importAttributes: true,
           decorators: true,
           tsx: false,
           dynamicImport: true,
-          strictPropertyInitialization: false
+          strictPropertyInitialization: false,
         },
         experimental: {
-          keepImportAssertions: true
+          keepImportAssertions: true,
         },
         transform: {
           legacyDecorator: true,
-          decoratorMetadata: true
-        }
+          decoratorMetadata: true,
+        },
         // parser: {
         //   importAttributes: true
         // },
         // experimental: {
         //   keepImportAssertions: true
         // }
-      }
-    }
+      },
+    },
   })
 
   return injectInlineSourceMap({ code, map })

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-DYRu0vic.d.ts

@@ -1,19 +0,0 @@
-import { D as DefaultOptions, B as BaseCtx } from './meta-CR-D39hQ.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 };

package/dist/types-DqH1qA-q.d.mts

@@ -1,19 +0,0 @@
-import { D as DefaultOptions, B as BaseCtx } from './meta-CR-D39hQ.mjs';
-
-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 };