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

package/dist/rpc/kafka/index.mjs

@@ -1,9 +1,8 @@
 import {
   Context,
   createControllerMetaMap,
-  detectAopDep,
-  genClientQueue
-} from "../../chunk-Z7NAAE4M.mjs";
+  detectAopDep
+} from "../../chunk-VX4BZEL7.mjs";
 import {
   __name
 } from "../../chunk-NQ55PA2X.mjs";
@@ -114,84 +113,6 @@ async function bind({ consumer, producer }, { moduleMap, meta }, opts = {}) {
   });
 }
 __name(bind, "bind");
-
-// src/rpc/kafka/client.ts
-import { EventEmitter } from "events";
-async function createClient({ producer, consumer }, controllers, opts) {
-  let eventId = 1;
-  let eventCount = 1;
-  const ret = {};
-  const emitter = new EventEmitter();
-  const clientQueue = genClientQueue(opts?.key);
-  await consumer.subscribe({
-    topic: clientQueue,
-    fromBeginning: true
-  });
-  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++}`;
-          producer.send({
-            topic: queue,
-            messages: [
-              {
-                value: JSON.stringify({
-                  _ps: 1,
-                  id,
-                  tag,
-                  queue: clientQueue,
-                  func: p,
-                  args
-                })
-              }
-            ]
-          });
-          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);
-          });
-        };
-      }
-    });
-  }
-  await consumer.run({
-    eachMessage: /* @__PURE__ */ __name(async ({ message, topic }) => {
-      if (clientQueue === topic && message.value) {
-        const { data, id, error } = JSON.parse(message.value.toString());
-        emitter.emit(id, data, error);
-      }
-    }, "eachMessage")
-  });
-  return ret;
-}
-__name(createClient, "createClient");
 export {
-  bind,
-  createClient
+  bind
 };

package/dist/rpc/nats/index.d.mts

@@ -1,8 +1,8 @@
 import { NatsConnection } from 'nats';
-import { F as Factory } from '../../core-DIfgUKIU.mjs';
-import { R as RpcCtx, a as RpcServerOptions, b as RpcClientOptions } from '../../types-DqH1qA-q.mjs';
-import { T as ToClientMap } from '../../meta-CR-D39hQ.mjs';
+import { F as Factory } from '../../core-jUg1HvYT.mjs';
+import { R as RpcCtx, a as RpcServerOptions } from '../../types-6qaaUIKZ.mjs';
 import 'phecda-core';
+import '../../meta-xvg6V7pH.mjs';
 
 interface NatsCtx extends RpcCtx {
     type: 'nats';
@@ -10,6 +10,4 @@ interface NatsCtx extends RpcCtx {
 }
 declare function bind(nc: NatsConnection, { moduleMap, meta }: Awaited<ReturnType<typeof Factory>>, opts?: RpcServerOptions): Promise<void>;
 
-declare function createClient<S extends Record<string, any>>(nc: NatsConnection, controllers: S, opts?: Omit<RpcClientOptions, 'key'>): Promise<ToClientMap<S>>;
-
-export { type NatsCtx, bind, createClient };
+export { type NatsCtx, bind };

package/dist/rpc/nats/index.d.ts

@@ -1,8 +1,8 @@
 import { NatsConnection } from 'nats';
-import { F as Factory } from '../../core-CUTbX_IS.js';
-import { R as RpcCtx, a as RpcServerOptions, b as RpcClientOptions } from '../../types-DYRu0vic.js';
-import { T as ToClientMap } from '../../meta-CR-D39hQ.js';
+import { F as Factory } from '../../core-CDzIy2g0.js';
+import { R as RpcCtx, a as RpcServerOptions } from '../../types-BtXOT5rI.js';
 import 'phecda-core';
+import '../../meta-xvg6V7pH.js';
 
 interface NatsCtx extends RpcCtx {
     type: 'nats';
@@ -10,6 +10,4 @@ interface NatsCtx extends RpcCtx {
 }
 declare function bind(nc: NatsConnection, { moduleMap, meta }: Awaited<ReturnType<typeof Factory>>, opts?: RpcServerOptions): Promise<void>;
 
-declare function createClient<S extends Record<string, any>>(nc: NatsConnection, controllers: S, opts?: Omit<RpcClientOptions, 'key'>): Promise<ToClientMap<S>>;
-
-export { type NatsCtx, bind, createClient };
+export { type NatsCtx, bind };

package/dist/rpc/nats/index.js

@@ -2,7 +2,7 @@
 
 
 
-var _chunkG7JFKM2Mjs = require('../../chunk-G7JFKM2M.js');
+var _chunkIJFIY6QNjs = require('../../chunk-IJFIY6QN.js');
 
 
 
@@ -17,18 +17,18 @@ async function bind(nc, { moduleMap, meta }, opts = {}) {
   const sc = _nats.StringCodec.call(void 0, );
   const subscriptionMap = {};
   const existQueue = /* @__PURE__ */ new Set();
-  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', _2 => _2.queue]) !== void 0) {
       debug(`register method "${func}" in module "${tag}"`);
       return true;
     }
   });
-  _chunkG7JFKM2Mjs.detectAopDep.call(void 0, meta, {
+  _chunkIJFIY6QNjs.detectAopDep.call(void 0, meta, {
     addons: globalAddons,
     guards: globalGuards
   }, "rpc");
-  _chunkG7JFKM2Mjs.Context.applyAddons(globalAddons, nc, "nats");
+  _chunkIJFIY6QNjs.Context.applyAddons(globalAddons, nc, "nats");
   async function subscribeQueues() {
     existQueue.clear();
     for (const [tag, record] of metaMap) {
@@ -56,12 +56,12 @@ async function bind(nc, { moduleMap, meta }, opts = {}) {
     const meta2 = metaMap.get(tag)[func];
     const { data: { rpc: { isEvent } = {} } } = meta2;
     if (isEvent) msg.respond("{}");
-    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: "nats",
       category: "rpc",
       moduleMap,
@@ -97,65 +97,5 @@ async function bind(nc, { moduleMap, meta }, opts = {}) {
 }
 _chunk4LLLQOMFjs.__name.call(void 0, bind, "bind");
 
-// src/rpc/nats/client.ts
 
-async function createClient(nc, controllers, opts) {
-  let eventId = 1;
-  let eventCount = 0;
-  const sc = _nats.StringCodec.call(void 0, );
-  const ret = {};
-  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++}`;
-          const request = nc.request(queue, sc.encode(JSON.stringify({
-            _ps: 1,
-            id,
-            args,
-            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"
-            });
-            request.catch(reject);
-            request.then((msg) => {
-              const { data, id: id2, error } = msg.json();
-              if (id2) handler(data, error);
-            });
-            let isEnd = false;
-            const timer = setTimeout(() => {
-              if (!isEnd) {
-                eventCount--;
-                reject({
-                  type: "timeout"
-                });
-              }
-            }, _optionalChain([opts, 'optionalAccess', _4 => _4.timeout]) || 5e3);
-            function handler(data, error) {
-              eventCount--;
-              isEnd = true;
-              clearTimeout(timer);
-              if (error) reject(data);
-              else resolve(data);
-            }
-            _chunk4LLLQOMFjs.__name.call(void 0, handler, "handler");
-            eventCount++;
-          });
-        };
-      }
-    });
-  }
-  return ret;
-}
-_chunk4LLLQOMFjs.__name.call(void 0, createClient, "createClient");
-
-
-
-exports.bind = bind; exports.createClient = createClient;
+exports.bind = bind;

package/dist/rpc/nats/index.mjs

@@ -2,7 +2,7 @@ import {
   Context,
   createControllerMetaMap,
   detectAopDep
-} from "../../chunk-Z7NAAE4M.mjs";
+} from "../../chunk-VX4BZEL7.mjs";
 import {
   HMR,
   __name
@@ -96,66 +96,6 @@ async function bind(nc, { moduleMap, meta }, opts = {}) {
   });
 }
 __name(bind, "bind");
-
-// src/rpc/nats/client.ts
-import { StringCodec as StringCodec2 } from "nats";
-async function createClient(nc, controllers, opts) {
-  let eventId = 1;
-  let eventCount = 0;
-  const sc = StringCodec2();
-  const ret = {};
-  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++}`;
-          const request = nc.request(queue, sc.encode(JSON.stringify({
-            _ps: 1,
-            id,
-            args,
-            tag,
-            func: p
-          })));
-          if (isEvent) return null;
-          return new Promise((resolve, reject) => {
-            if (opts?.max && eventCount >= opts.max) reject({
-              type: "exceeded"
-            });
-            request.catch(reject);
-            request.then((msg) => {
-              const { data, id: id2, error } = msg.json();
-              if (id2) handler(data, error);
-            });
-            let isEnd = false;
-            const timer = setTimeout(() => {
-              if (!isEnd) {
-                eventCount--;
-                reject({
-                  type: "timeout"
-                });
-              }
-            }, opts?.timeout || 5e3);
-            function handler(data, error) {
-              eventCount--;
-              isEnd = true;
-              clearTimeout(timer);
-              if (error) reject(data);
-              else resolve(data);
-            }
-            __name(handler, "handler");
-            eventCount++;
-          });
-        };
-      }
-    });
-  }
-  return ret;
-}
-__name(createClient, "createClient");
 export {
-  bind,
-  createClient
+  bind
 };

package/dist/rpc/rabbitmq/index.d.mts

@@ -1,8 +1,8 @@
 import amqplib from 'amqplib';
-import { F as Factory } from '../../core-DIfgUKIU.mjs';
-import { R as RpcCtx, a as RpcServerOptions, b as RpcClientOptions } from '../../types-DqH1qA-q.mjs';
-import { T as ToClientMap } from '../../meta-CR-D39hQ.mjs';
+import { F as Factory } from '../../core-jUg1HvYT.mjs';
+import { R as RpcCtx, a as RpcServerOptions } from '../../types-6qaaUIKZ.mjs';
 import 'phecda-core';
+import '../../meta-xvg6V7pH.mjs';
 
 interface RabbitmqCtx extends RpcCtx {
     type: 'rabbitmq';
@@ -11,6 +11,4 @@ interface RabbitmqCtx extends RpcCtx {
 }
 declare function bind(ch: amqplib.Channel, { moduleMap, meta }: Awaited<ReturnType<typeof Factory>>, opts?: RpcServerOptions): Promise<void>;
 
-declare function createClient<S extends Record<string, any>>(ch: amqplib.Channel, controllers: S, opts?: RpcClientOptions): Promise<ToClientMap<S>>;
-
-export { type RabbitmqCtx, bind, createClient };
+export { type RabbitmqCtx, bind };

package/dist/rpc/rabbitmq/index.d.ts

@@ -1,8 +1,8 @@
 import amqplib from 'amqplib';
-import { F as Factory } from '../../core-CUTbX_IS.js';
-import { R as RpcCtx, a as RpcServerOptions, b as RpcClientOptions } from '../../types-DYRu0vic.js';
-import { T as ToClientMap } from '../../meta-CR-D39hQ.js';
+import { F as Factory } from '../../core-CDzIy2g0.js';
+import { R as RpcCtx, a as RpcServerOptions } from '../../types-BtXOT5rI.js';
 import 'phecda-core';
+import '../../meta-xvg6V7pH.js';
 
 interface RabbitmqCtx extends RpcCtx {
     type: 'rabbitmq';
@@ -11,6 +11,4 @@ interface RabbitmqCtx extends RpcCtx {
 }
 declare function bind(ch: amqplib.Channel, { moduleMap, meta }: Awaited<ReturnType<typeof Factory>>, opts?: RpcServerOptions): Promise<void>;
 
-declare function createClient<S extends Record<string, any>>(ch: amqplib.Channel, controllers: S, opts?: RpcClientOptions): Promise<ToClientMap<S>>;
-
-export { type RabbitmqCtx, bind, createClient };
+export { type RabbitmqCtx, bind };

package/dist/rpc/rabbitmq/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/rabbitmq");
 async function bind(ch, { 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, ch, "rabbitmq");
+  _chunkIJFIY6QNjs.Context.applyAddons(globalAddons, ch, "rabbitmq");
   async function subscribeQueues() {
     existQueue.clear();
     for (const [tag, record] of metaMap) {
@@ -58,12 +57,12 @@ async function bind(ch, { moduleMap, meta }, opts = {}) {
       debug(`invoke method "${func}" in module "${tag}"`);
       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: "rabbitmq",
         category: "rpc",
         moduleMap,
@@ -100,70 +99,5 @@ async function bind(ch, { moduleMap, meta }, opts = {}) {
 }
 _chunk4LLLQOMFjs.__name.call(void 0, bind, "bind");
 
-// src/rpc/rabbitmq/client.ts
-var _events = require('events');
-async function createClient(ch, controllers, opts) {
-  let eventId = 1;
-  let eventCount = 0;
-  const ret = {};
-  const emitter = new (0, _events.EventEmitter)();
-  const clientQueue = _chunkG7JFKM2Mjs.genClientQueue.call(void 0, _optionalChain([opts, 'optionalAccess', _2 => _2.key]));
-  await ch.assertQueue(clientQueue);
-  ch.consume(clientQueue, (msg) => {
-    if (!msg) return;
-    const { data, id, error } = JSON.parse(msg.content.toString());
-    emitter.emit(id, data, error);
-  });
-  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++}`;
-          ch.sendToQueue(queue, Buffer.from(JSON.stringify({
-            _ps: 1,
-            id,
-            args,
-            tag,
-            queue: clientQueue,
-            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);
-          });
-        };
-      }
-    });
-  }
-  return ret;
-}
-_chunk4LLLQOMFjs.__name.call(void 0, createClient, "createClient");
-
-
 
-exports.bind = bind; exports.createClient = createClient;
+exports.bind = bind;

package/dist/rpc/rabbitmq/index.mjs

@@ -1,9 +1,8 @@
 import {
   Context,
   createControllerMetaMap,
-  detectAopDep,
-  genClientQueue
-} from "../../chunk-Z7NAAE4M.mjs";
+  detectAopDep
+} from "../../chunk-VX4BZEL7.mjs";
 import {
   HMR,
   __name
@@ -99,71 +98,6 @@ async function bind(ch, { moduleMap, meta }, opts = {}) {
   });
 }
 __name(bind, "bind");
-
-// src/rpc/rabbitmq/client.ts
-import { EventEmitter } from "events";
-async function createClient(ch, controllers, opts) {
-  let eventId = 1;
-  let eventCount = 0;
-  const ret = {};
-  const emitter = new EventEmitter();
-  const clientQueue = genClientQueue(opts?.key);
-  await ch.assertQueue(clientQueue);
-  ch.consume(clientQueue, (msg) => {
-    if (!msg) return;
-    const { data, id, error } = JSON.parse(msg.content.toString());
-    emitter.emit(id, data, error);
-  });
-  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++}`;
-          ch.sendToQueue(queue, Buffer.from(JSON.stringify({
-            _ps: 1,
-            id,
-            args,
-            tag,
-            queue: clientQueue,
-            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);
-          });
-        };
-      }
-    });
-  }
-  return ret;
-}
-__name(createClient, "createClient");
 export {
-  bind,
-  createClient
+  bind
 };

package/dist/rpc/redis/index.d.mts

@@ -1,8 +1,8 @@
 import Redis from 'ioredis';
-import { F as Factory } from '../../core-DIfgUKIU.mjs';
-import { R as RpcCtx, a as RpcServerOptions, b as RpcClientOptions } from '../../types-DqH1qA-q.mjs';
-import { T as ToClientMap } from '../../meta-CR-D39hQ.mjs';
+import { F as Factory } from '../../core-jUg1HvYT.mjs';
+import { R as RpcCtx, a as RpcServerOptions } from '../../types-6qaaUIKZ.mjs';
 import 'phecda-core';
+import '../../meta-xvg6V7pH.mjs';
 
 interface RedisCtx extends RpcCtx {
     type: 'redis';
@@ -15,9 +15,4 @@ declare function bind({ sub, pub }: {
     pub: Redis;
 }, { moduleMap, meta }: Awaited<ReturnType<typeof Factory>>, opts?: RpcServerOptions): void;
 
-declare function createClient<S extends Record<string, any>>({ pub, sub }: {
-    pub: Redis;
-    sub: Redis;
-}, controllers: S, opts?: RpcClientOptions): Promise<ToClientMap<S>>;
-
-export { type RedisCtx, bind, createClient };
+export { type RedisCtx, bind };

package/dist/rpc/redis/index.d.ts

@@ -1,8 +1,8 @@
 import Redis from 'ioredis';
-import { F as Factory } from '../../core-CUTbX_IS.js';
-import { R as RpcCtx, a as RpcServerOptions, b as RpcClientOptions } from '../../types-DYRu0vic.js';
-import { T as ToClientMap } from '../../meta-CR-D39hQ.js';
+import { F as Factory } from '../../core-CDzIy2g0.js';
+import { R as RpcCtx, a as RpcServerOptions } from '../../types-BtXOT5rI.js';
 import 'phecda-core';
+import '../../meta-xvg6V7pH.js';
 
 interface RedisCtx extends RpcCtx {
     type: 'redis';
@@ -15,9 +15,4 @@ declare function bind({ sub, pub }: {
     pub: Redis;
 }, { moduleMap, meta }: Awaited<ReturnType<typeof Factory>>, opts?: RpcServerOptions): void;
 
-declare function createClient<S extends Record<string, any>>({ pub, sub }: {
-    pub: Redis;
-    sub: Redis;
-}, controllers: S, opts?: RpcClientOptions): Promise<ToClientMap<S>>;
-
-export { type RedisCtx, bind, createClient };
+export { type RedisCtx, bind };