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

package/dist/rpc/redis/index.js

@@ -2,8 +2,7 @@
 
 
 
-
-var _chunkG7JFKM2Mjs = require('../../chunk-G7JFKM2M.js');
+var _chunkIJFIY6QNjs = require('../../chunk-IJFIY6QN.js');
 
 
 
@@ -14,19 +13,19 @@ var _debug = require('debug'); var _debug2 = _interopRequireDefault(_debug);
 var debug = _debug2.default.call(void 0, "phecda-server/redis");
 function bind({ sub, pub }, { moduleMap, meta }, opts = {}) {
   const { globalGuards, globalFilter, globalPipe, globalAddons = [], defaultQueue } = opts;
-  const metaMap = _chunkG7JFKM2Mjs.createControllerMetaMap.call(void 0, meta, (meta2) => {
+  const metaMap = _chunkIJFIY6QNjs.createControllerMetaMap.call(void 0, meta, (meta2) => {
     const { controller, rpc, func, tag } = meta2.data;
     if (controller === "rpc" && _optionalChain([rpc, 'optionalAccess', _ => _.queue]) !== void 0) {
       debug(`register method "${func}" in module "${tag}"`);
       return true;
     }
   });
-  _chunkG7JFKM2Mjs.detectAopDep.call(void 0, meta, {
+  _chunkIJFIY6QNjs.detectAopDep.call(void 0, meta, {
     guards: globalGuards,
     addons: globalAddons
   }, "rpc");
   const existQueue = /* @__PURE__ */ new Set();
-  _chunkG7JFKM2Mjs.Context.applyAddons(globalAddons, {
+  _chunkIJFIY6QNjs.Context.applyAddons(globalAddons, {
     pub,
     sub
   }, "redis");
@@ -55,12 +54,12 @@ function bind({ sub, pub }, { moduleMap, meta }, opts = {}) {
       if (_ps !== 1) return;
       const meta2 = metaMap.get(tag)[func];
       const { data: { rpc: { isEvent } = {} } } = meta2;
-      const aop = _chunkG7JFKM2Mjs.Context.getAop(meta2, {
+      const aop = _chunkIJFIY6QNjs.Context.getAop(meta2, {
         globalFilter,
         globalGuards,
         globalPipe
       });
-      const context = new (0, _chunkG7JFKM2Mjs.Context)({
+      const context = new (0, _chunkIJFIY6QNjs.Context)({
         type: "redis",
         category: "rpc",
         moduleMap,
@@ -99,71 +98,5 @@ function bind({ sub, pub }, { moduleMap, meta }, opts = {}) {
 }
 _chunk4LLLQOMFjs.__name.call(void 0, bind, "bind");
 
-// src/rpc/redis/client.ts
-var _events = require('events'); var _events2 = _interopRequireDefault(_events);
-async function createClient({ pub, sub }, controllers, opts) {
-  const ret = {};
-  let eventId = 1;
-  let eventCount = 0;
-  const emitter = new (0, _events2.default)();
-  const clientQueue = _chunkG7JFKM2Mjs.genClientQueue.call(void 0, _optionalChain([opts, 'optionalAccess', _2 => _2.key]));
-  await sub.subscribe(clientQueue);
-  for (const i in controllers) {
-    ret[i] = new Proxy(new controllers[i](), {
-      get(target, p) {
-        if (typeof target[p] !== "function") throw new Error(`"${p}" in "${i}" is not an exposed rpc `);
-        let { tag, queue, isEvent } = target[p]();
-        return async (...args) => {
-          if (!queue) queue = tag;
-          const id = `${eventId++}`;
-          pub.publish(queue, JSON.stringify({
-            _ps: 1,
-            args,
-            id,
-            queue: clientQueue,
-            tag,
-            func: p
-          }));
-          if (isEvent) return null;
-          return new Promise((resolve, reject) => {
-            if (_optionalChain([opts, 'optionalAccess', _3 => _3.max]) && eventCount >= opts.max) reject({
-              type: "exceeded"
-            });
-            let isEnd = false;
-            const timer = setTimeout(() => {
-              if (!isEnd) {
-                eventCount--;
-                emitter.off(id, listener);
-                reject({
-                  type: "timeout"
-                });
-              }
-            }, _optionalChain([opts, 'optionalAccess', _4 => _4.timeout]) || 5e3);
-            function listener(data, error) {
-              eventCount--;
-              isEnd = true;
-              clearTimeout(timer);
-              if (error) reject(data);
-              else resolve(data);
-            }
-            _chunk4LLLQOMFjs.__name.call(void 0, listener, "listener");
-            eventCount++;
-            emitter.once(id, listener);
-          });
-        };
-      }
-    });
-  }
-  sub.on("message", async (channel, msg) => {
-    if (channel === clientQueue && msg) {
-      const { data, id, error } = JSON.parse(msg);
-      emitter.emit(id, data, error);
-    }
-  });
-  return ret;
-}
-_chunk4LLLQOMFjs.__name.call(void 0, createClient, "createClient");
-
-
 
-exports.bind = bind; exports.createClient = createClient;
+exports.bind = bind;

package/dist/rpc/redis/index.mjs

@@ -1,9 +1,8 @@
 import {
   Context,
   createControllerMetaMap,
-  detectAopDep,
-  genClientQueue
-} from "../../chunk-Z7NAAE4M.mjs";
+  detectAopDep
+} from "../../chunk-VX4BZEL7.mjs";
 import {
   HMR,
   __name
@@ -98,72 +97,6 @@ function bind({ sub, pub }, { moduleMap, meta }, opts = {}) {
   });
 }
 __name(bind, "bind");
-
-// src/rpc/redis/client.ts
-import EventEmitter from "events";
-async function createClient({ pub, sub }, controllers, opts) {
-  const ret = {};
-  let eventId = 1;
-  let eventCount = 0;
-  const emitter = new EventEmitter();
-  const clientQueue = genClientQueue(opts?.key);
-  await sub.subscribe(clientQueue);
-  for (const i in controllers) {
-    ret[i] = new Proxy(new controllers[i](), {
-      get(target, p) {
-        if (typeof target[p] !== "function") throw new Error(`"${p}" in "${i}" is not an exposed rpc `);
-        let { tag, queue, isEvent } = target[p]();
-        return async (...args) => {
-          if (!queue) queue = tag;
-          const id = `${eventId++}`;
-          pub.publish(queue, JSON.stringify({
-            _ps: 1,
-            args,
-            id,
-            queue: clientQueue,
-            tag,
-            func: p
-          }));
-          if (isEvent) return null;
-          return new Promise((resolve, reject) => {
-            if (opts?.max && eventCount >= opts.max) reject({
-              type: "exceeded"
-            });
-            let isEnd = false;
-            const timer = setTimeout(() => {
-              if (!isEnd) {
-                eventCount--;
-                emitter.off(id, listener);
-                reject({
-                  type: "timeout"
-                });
-              }
-            }, opts?.timeout || 5e3);
-            function listener(data, error) {
-              eventCount--;
-              isEnd = true;
-              clearTimeout(timer);
-              if (error) reject(data);
-              else resolve(data);
-            }
-            __name(listener, "listener");
-            eventCount++;
-            emitter.once(id, listener);
-          });
-        };
-      }
-    });
-  }
-  sub.on("message", async (channel, msg) => {
-    if (channel === clientQueue && msg) {
-      const { data, id, error } = JSON.parse(msg);
-      emitter.emit(id, data, error);
-    }
-  });
-  return ret;
-}
-__name(createClient, "createClient");
 export {
-  bind,
-  createClient
+  bind
 };

package/dist/test.d.mts

@@ -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-DIfgUKIU.mjs';
-import { P as PickFunc } from './meta-CR-D39hQ.mjs';
+import { F as Factory } from './core-jUg1HvYT.mjs';
+import { e as CustomResponse } from './meta-xvg6V7pH.mjs';
 
+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/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.12",
   "description": "server framework that provide IOC/type-reuse/http&rpc-adaptor",
   "author": "fgsreally",
   "license": "MIT",

package/register/loader.mjs

@@ -180,7 +180,6 @@ export const resolve = async (specifier, context, nextResolve) => {
   //   }
   // }
 
-
   // hmr import
   if (
     context.parentURL.includes('/node_modules/phecda-server')
@@ -236,7 +235,6 @@ export const resolve = async (specifier, context, nextResolve) => {
     }
   }
 
-
   const resolveRet = await nextResolve(specifier)
 
   // ts resolve fail in some cases
@@ -248,9 +246,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,8 +260,6 @@ export const load = async (url, context, nextLoad) => {
     delete context.importAttributes.ps
   }
 
-
-
   url = url.split('?')[0]
   if (
     !url.includes('/node_modules/')
@@ -324,8 +317,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/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 };