equipped 5.0.0-beta.9 → 5.0.0-rc.2

package/lib/errors/types/accessTokenExpired.js

@@ -4,9 +4,9 @@ exports.AccessTokenExpired = void 0;
 const server_1 = require("../../server");
 const customError_1 = require("../customError");
 class AccessTokenExpired extends customError_1.CustomError {
+    statusCode = server_1.StatusCodes.AccessTokenExpired;
     constructor(message = 'Access token expired') {
         super(message, [{ message }]);
-        this.statusCode = server_1.StatusCodes.AccessTokenExpired;
     }
 }
 exports.AccessTokenExpired = AccessTokenExpired;

package/lib/errors/types/badRequestError.js

@@ -4,9 +4,9 @@ exports.BadRequestError = void 0;
 const server_1 = require("../../server");
 const customError_1 = require("../customError");
 class BadRequestError extends customError_1.CustomError {
+    statusCode = server_1.StatusCodes.BadRequest;
     constructor(message) {
         super(message, [{ message }]);
-        this.statusCode = server_1.StatusCodes.BadRequest;
     }
 }
 exports.BadRequestError = BadRequestError;

package/lib/errors/types/notAuthenticatedError.js

@@ -4,9 +4,9 @@ exports.NotAuthenticatedError = void 0;
 const server_1 = require("../../server");
 const customError_1 = require("../customError");
 class NotAuthenticatedError extends customError_1.CustomError {
+    statusCode = server_1.StatusCodes.NotAuthenticated;
     constructor(message = 'Not authenticated') {
         super(message, [{ message }]);
-        this.statusCode = server_1.StatusCodes.NotAuthenticated;
     }
 }
 exports.NotAuthenticatedError = NotAuthenticatedError;

package/lib/errors/types/notAuthorizedError.js

@@ -4,9 +4,9 @@ exports.NotAuthorizedError = void 0;
 const server_1 = require("../../server");
 const customError_1 = require("../customError");
 class NotAuthorizedError extends customError_1.CustomError {
+    statusCode = server_1.StatusCodes.NotAuthorized;
     constructor(message = 'Not authorized') {
         super(message, [{ message }]);
-        this.statusCode = server_1.StatusCodes.NotAuthorized;
     }
 }
 exports.NotAuthorizedError = NotAuthorizedError;

package/lib/errors/types/notFoundError.js

@@ -4,9 +4,9 @@ exports.NotFoundError = void 0;
 const server_1 = require("../../server");
 const customError_1 = require("../customError");
 class NotFoundError extends customError_1.CustomError {
+    statusCode = server_1.StatusCodes.NotFound;
     constructor(message = 'Not found') {
         super(message, [{ message }]);
-        this.statusCode = server_1.StatusCodes.NotFound;
     }
 }
 exports.NotFoundError = NotFoundError;

package/lib/errors/types/refreshTokenMisusedError.js

@@ -4,9 +4,9 @@ exports.RefreshTokenMisusedError = void 0;
 const server_1 = require("../../server");
 const customError_1 = require("../customError");
 class RefreshTokenMisusedError extends customError_1.CustomError {
+    statusCode = server_1.StatusCodes.NotAuthenticated;
     constructor(message = 'Refresh token misused') {
         super(message, [{ message }]);
-        this.statusCode = server_1.StatusCodes.NotAuthenticated;
     }
 }
 exports.RefreshTokenMisusedError = RefreshTokenMisusedError;

package/lib/errors/types/validationError.js

@@ -4,9 +4,9 @@ exports.ValidationError = void 0;
 const server_1 = require("../../server");
 const customError_1 = require("../customError");
 class ValidationError extends customError_1.CustomError {
+    statusCode = server_1.StatusCodes.ValidationError;
     constructor(errors) {
         super('Invalid request parameters', errors.map((e) => ({ field: e.field, message: e.messages.join('\n') })));
-        this.statusCode = server_1.StatusCodes.ValidationError;
     }
 }
 exports.ValidationError = ValidationError;

package/lib/events/index.js

@@ -2,9 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DefaultSubscribeOptions = exports.EventBus = void 0;
 class EventBus {
-    constructor() {
-        this._subscribers = [];
-    }
+    _subscribers = [];
     async startSubscribers() {
         return Promise.all(this._subscribers.map((sub) => sub()));
     }

package/lib/events/kafka.d.ts

@@ -3,7 +3,7 @@ export declare class KafkaEventBus extends EventBus {
     #private;
     constructor();
     createPublisher<Event extends Events[keyof Events]>(topic: Event['topic']): {
-        publish: (data: Event['data']) => Promise<boolean>;
+        publish: (data: Event["data"]) => Promise<boolean>;
     };
     createSubscriber<Event extends Events[keyof Events]>(topic: Event['topic'], onMessage: (data: Event['data']) => Promise<void>, options?: Partial<SubscribeOptions>): {
         subscribe: () => Promise<void>;

package/lib/events/kafka.js

@@ -1,10 +1,4 @@
 "use strict";
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _KafkaEventBus_instances, _KafkaEventBus_client, _KafkaEventBus_createTopic, _KafkaEventBus_deleteGroup;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.KafkaEventBus = void 0;
 const kafkajs_1 = require("kafkajs");
@@ -14,19 +8,18 @@ const instance_1 = require("../instance");
 const json_1 = require("../utils/json");
 const utils_1 = require("../utils/utils");
 class KafkaEventBus extends _1.EventBus {
+    #client = new kafkajs_1.Kafka({
+        clientId: instance_1.Instance.get().settings.eventColumnName,
+        brokers: instance_1.Instance.get().settings.kafkaURIs,
+        logLevel: kafkajs_1.logLevel.NOTHING
+    });
     constructor() {
         super();
-        _KafkaEventBus_instances.add(this);
-        _KafkaEventBus_client.set(this, new kafkajs_1.Kafka({
-            clientId: instance_1.Instance.get().settings.eventColumnName,
-            brokers: instance_1.Instance.get().settings.kafkaURIs,
-            logLevel: kafkajs_1.logLevel.NOTHING
-        }));
     }
     createPublisher(topic) {
         const publish = async (data) => {
             try {
-                const producer = __classPrivateFieldGet(this, _KafkaEventBus_client, "f").producer();
+                const producer = this.#client.producer();
                 await producer.connect();
                 await producer.send({
                     topic,
@@ -47,11 +40,11 @@ class KafkaEventBus extends _1.EventBus {
             if (started)
                 return;
             started = true;
-            await __classPrivateFieldGet(this, _KafkaEventBus_instances, "m", _KafkaEventBus_createTopic).call(this, topic);
+            await this.#createTopic(topic);
             const groupId = options.fanout
                 ? `${instance_1.Instance.get().settings.appId}-fanout-${utils_1.Random.string(10)}`
                 : `${instance_1.Instance.get().settings.appId}-${topic}`;
-            const consumer = __classPrivateFieldGet(this, _KafkaEventBus_client, "f").consumer({ groupId });
+            const consumer = this.#client.consumer({ groupId });
             await consumer.connect();
             await consumer.subscribe({ topic });
             await consumer.run({
@@ -66,20 +59,21 @@ class KafkaEventBus extends _1.EventBus {
             if (options.fanout)
                 (0, exit_1.addWaitBeforeExit)(async () => {
                     await consumer.disconnect();
-                    await __classPrivateFieldGet(this, _KafkaEventBus_instances, "m", _KafkaEventBus_deleteGroup).call(this, groupId);
+                    await this.#deleteGroup(groupId);
                 });
         };
         this._subscribers.push(subscribe);
         return { subscribe };
     }
+    async #createTopic(topic) {
+        const admin = this.#client.admin();
+        await admin.createTopics({
+            topics: [{ topic, numPartitions: 5 }],
+        }).catch();
+    }
+    async #deleteGroup(groupId) {
+        const admin = this.#client.admin();
+        await admin.deleteGroups([groupId]).catch();
+    }
 }
 exports.KafkaEventBus = KafkaEventBus;
-_KafkaEventBus_client = new WeakMap(), _KafkaEventBus_instances = new WeakSet(), _KafkaEventBus_createTopic = async function _KafkaEventBus_createTopic(topic) {
-    const admin = __classPrivateFieldGet(this, _KafkaEventBus_client, "f").admin();
-    await admin.createTopics({
-        topics: [{ topic, numPartitions: 5 }],
-    }).catch();
-}, _KafkaEventBus_deleteGroup = async function _KafkaEventBus_deleteGroup(groupId) {
-    const admin = __classPrivateFieldGet(this, _KafkaEventBus_client, "f").admin();
-    await admin.deleteGroups([groupId]).catch();
-};

package/lib/events/rabbit.d.ts

@@ -3,7 +3,7 @@ export declare class RabbitEventBus extends EventBus {
     #private;
     constructor();
     createPublisher<Event extends Events[keyof Events]>(topic: Event['topic']): {
-        publish: (data: Event['data']) => Promise<boolean>;
+        publish: (data: Event["data"]) => Promise<boolean>;
     };
     createSubscriber<Event extends Events[keyof Events]>(topic: Event['topic'], onMessage: (data: Event['data']) => Promise<void>, options?: Partial<SubscribeOptions>): {
         subscribe: () => Promise<void>;

package/lib/events/rabbit.js

@@ -1,44 +1,32 @@
 "use strict";
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
-    if (kind === "m") throw new TypeError("Private method is not writable");
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
-    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _RabbitEventBus_client, _RabbitEventBus_columnName;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RabbitEventBus = void 0;
 const amqp_connection_manager_1 = __importDefault(require("amqp-connection-manager"));
-const exit_1 = require("src/exit");
+const exit_1 = require("../exit");
 const _1 = require(".");
 const instance_1 = require("../instance");
 const json_1 = require("../utils/json");
 const utils_1 = require("../utils/utils");
 class RabbitEventBus extends _1.EventBus {
+    #client;
+    #columnName = instance_1.Instance.get().settings.eventColumnName;
     constructor() {
         super();
-        _RabbitEventBus_client.set(this, void 0);
-        _RabbitEventBus_columnName.set(this, instance_1.Instance.get().settings.eventColumnName);
-        __classPrivateFieldSet(this, _RabbitEventBus_client, amqp_connection_manager_1.default.connect([instance_1.Instance.get().settings.rabbitURI])
+        this.#client = amqp_connection_manager_1.default.connect([instance_1.Instance.get().settings.rabbitURI])
             .createChannel({
             json: false,
             setup: async (channel) => {
-                await channel.assertExchange(__classPrivateFieldGet(this, _RabbitEventBus_columnName, "f"), 'direct', { durable: true });
+                await channel.assertExchange(this.#columnName, 'direct', { durable: true });
                 await channel.prefetch(1);
             },
-        }), "f");
+        });
     }
     createPublisher(topic) {
         const publish = async (data) => {
-            return await __classPrivateFieldGet(this, _RabbitEventBus_client, "f").publish(__classPrivateFieldGet(this, _RabbitEventBus_columnName, "f"), topic, JSON.stringify(data), { persistent: true });
+            return await this.#client.publish(this.#columnName, topic, JSON.stringify(data), { persistent: true });
         };
         return { publish };
     }
@@ -49,12 +37,12 @@ class RabbitEventBus extends _1.EventBus {
             if (started)
                 return;
             started = true;
-            await __classPrivateFieldGet(this, _RabbitEventBus_client, "f").addSetup(async (channel) => {
+            await this.#client.addSetup(async (channel) => {
                 const queueName = options.fanout
                     ? `${instance_1.Instance.get().settings.appId}-fanout-${utils_1.Random.string(10)}`
                     : `${instance_1.Instance.get().settings.appId}-${topic}`;
                 const { queue } = await channel.assertQueue(queueName, { durable: !options.fanout, exclusive: options.fanout });
-                await channel.bindQueue(queue, __classPrivateFieldGet(this, _RabbitEventBus_columnName, "f"), topic);
+                await channel.bindQueue(queue, this.#columnName, topic);
                 channel.consume(queue, async (msg) => {
                     (0, exit_1.addWaitBeforeExit)((async () => {
                         if (!msg)
@@ -75,4 +63,3 @@ class RabbitEventBus extends _1.EventBus {
     }
 }
 exports.RabbitEventBus = RabbitEventBus;
-_RabbitEventBus_client = new WeakMap(), _RabbitEventBus_columnName = new WeakMap();

package/lib/instance/index.d.ts

@@ -1,6 +1,7 @@
 import pino from 'pino';
 import { BullJob } from '../bull';
 import { Cache } from '../cache/cache';
+import { RedisCache } from '../cache/types/redis-cache';
 import { MongoDb } from '../db/mongoose';
 import { EventBus } from '../events/';
 import { Server } from '../server';
@@ -10,7 +11,7 @@ export declare class Instance {
     private constructor();
     get logger(): pino.Logger<any>;
     get job(): BullJob;
-    get cache(): Cache;
+    get cache(): Cache | RedisCache;
     get eventBus(): EventBus;
     get server(): Server<any, any>;
     get dbs(): {

package/lib/instance/index.js

@@ -1,19 +1,7 @@
 "use strict";
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
-    if (kind === "m") throw new TypeError("Private method is not writable");
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
-    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _a, _Instance_initialized, _Instance_instance, _Instance_settings, _Instance_logger, _Instance_job, _Instance_cache, _Instance_eventBus, _Instance_server, _Instance_dbs;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Instance = void 0;
 const pino_1 = __importDefault(require("pino"));
@@ -25,43 +13,45 @@ const exit_1 = require("../exit");
 const server_1 = require("../server");
 const settings_1 = require("./settings");
 class Instance {
+    static #initialized = false;
+    static #instance;
+    #settings = { ...settings_1.defaulInstanceSetting };
+    #logger = null;
+    #job = null;
+    #cache = null;
+    #eventBus = null;
+    #server = null;
+    #dbs = null;
     constructor() {
-        _Instance_settings.set(this, { ...settings_1.defaulInstanceSetting });
-        _Instance_logger.set(this, null);
-        _Instance_job.set(this, null);
-        _Instance_cache.set(this, null);
-        _Instance_eventBus.set(this, null);
-        _Instance_server.set(this, null);
-        _Instance_dbs.set(this, null);
     }
     get logger() {
-        return __classPrivateFieldSet(this, _Instance_logger, __classPrivateFieldGet(this, _Instance_logger, "f") || _a.createLogger(), "f");
+        return this.#logger ||= Instance.createLogger();
     }
     get job() {
-        return __classPrivateFieldSet(this, _Instance_job, __classPrivateFieldGet(this, _Instance_job, "f") || new bull_1.BullJob(), "f");
+        return this.#job ||= new bull_1.BullJob();
     }
     get cache() {
-        return __classPrivateFieldSet(this, _Instance_cache, __classPrivateFieldGet(this, _Instance_cache, "f") || new redis_cache_1.RedisCache(), "f");
+        return this.#cache ||= new redis_cache_1.RedisCache();
     }
     get eventBus() {
-        return __classPrivateFieldSet(this, _Instance_eventBus, __classPrivateFieldGet(this, _Instance_eventBus, "f") || new kafka_1.KafkaEventBus(), "f");
+        return this.#eventBus ||= new kafka_1.KafkaEventBus();
     }
     get server() {
-        return __classPrivateFieldSet(this, _Instance_server, __classPrivateFieldGet(this, _Instance_server, "f") || server_1.serverTypes[this.settings.server](), "f");
+        return this.#server ||= server_1.serverTypes[this.settings.server]();
     }
     get dbs() {
-        return __classPrivateFieldSet(this, _Instance_dbs, __classPrivateFieldGet(this, _Instance_dbs, "f") || { mongo: new mongoose_1.MongoDb() }, "f");
+        return this.#dbs ||= { mongo: new mongoose_1.MongoDb() };
     }
     get listener() {
         return this.server.listener;
     }
     get settings() {
-        return __classPrivateFieldGet(this, _Instance_settings, "f");
+        return this.#settings;
     }
     static createLogger() {
         const defaultLogLevel = 'info';
         return (0, pino_1.default)({
-            level: __classPrivateFieldGet(_a, _a, "f", _Instance_initialized) ? _a.get().settings?.logLevel ?? defaultLogLevel : defaultLogLevel,
+            level: Instance.#initialized ? Instance.get().settings?.logLevel ?? defaultLogLevel : defaultLogLevel,
             serializers: {
                 err: pino_1.default.stdSerializers.err,
                 req: pino_1.default.stdSerializers.req,
@@ -70,30 +60,30 @@ class Instance {
         });
     }
     static initialize(settings) {
-        __classPrivateFieldSet(_a, _a, true, "f", _Instance_initialized);
-        const instanceSettings = _a.get().settings;
+        Instance.#initialized = true;
+        const instanceSettings = Instance.get().settings;
         Object.entries(settings).forEach(([key, value]) => {
             instanceSettings[key] = value;
         });
     }
     static get() {
-        if (!__classPrivateFieldGet(this, _a, "f", _Instance_initialized))
+        if (!this.#initialized)
             return (0, exit_1.exit)('Has not been initialized. Make sure initialize is called before you get an instance');
-        if (!__classPrivateFieldGet(_a, _a, "f", _Instance_instance))
-            __classPrivateFieldSet(_a, _a, new _a(), "f", _Instance_instance);
-        return __classPrivateFieldGet(_a, _a, "f", _Instance_instance);
+        if (!Instance.#instance)
+            Instance.#instance = new Instance();
+        return Instance.#instance;
     }
     async startConnections() {
         try {
-            await _a.get().cache.start();
-            await _a.get().listener.start();
-            await Promise.all(Object.values(_a.get().dbs).map(async (db) => {
+            await Instance.get().cache.start();
+            await Instance.get().listener.start();
+            await Promise.all(Object.values(Instance.get().dbs).map(async (db) => {
                 await db.start();
                 await db.startAllDbChanges();
                 (0, exit_1.addWaitBeforeExit)(db.close);
             }));
-            await _a.get().eventBus.startSubscribers();
-            (0, exit_1.addWaitBeforeExit)(_a.get().cache.close);
+            await Instance.get().eventBus.startSubscribers();
+            (0, exit_1.addWaitBeforeExit)(Instance.get().cache.close);
         }
         catch (error) {
             (0, exit_1.exit)(`Error starting connections: ${error}`);
@@ -101,6 +91,3 @@ class Instance {
     }
 }
 exports.Instance = Instance;
-_a = Instance, _Instance_settings = new WeakMap(), _Instance_logger = new WeakMap(), _Instance_job = new WeakMap(), _Instance_cache = new WeakMap(), _Instance_eventBus = new WeakMap(), _Instance_server = new WeakMap(), _Instance_dbs = new WeakMap();
-_Instance_initialized = { value: false };
-_Instance_instance = { value: void 0 };

package/lib/instance/settings.d.ts

@@ -1,7 +1,6 @@
 import { Level } from 'pino';
 import type { ServerTypes } from '../server';
 export type Settings = {
-    isDev: boolean;
     accessTokenKey: string;
     accessTokenTTL: number;
     refreshTokenKey: string;
@@ -26,7 +25,8 @@ export type Settings = {
     paginationDefaultLimit: number;
     server: ServerTypes;
     openapiDocsVersion: string;
-    openapiDocsUrl: string;
+    openapiDocsBaseUrl: string[];
+    openapiDocsPath: string;
     logLevel: Level;
     logRequests: boolean;
     requestSchemaValidation: boolean;

package/lib/instance/settings.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.defaulInstanceSetting = void 0;
 exports.defaulInstanceSetting = {
-    isDev: false,
     accessTokenKey: 'accessTokenKey',
     accessTokenTTL: 60 * 60,
     refreshTokenKey: 'refreshTokenKey',
@@ -18,16 +17,17 @@ exports.defaulInstanceSetting = {
     maxFileUploadSizeInMb: 500,
     useRateLimit: false,
     rateLimitPeriodInMs: 60 * 60 * 1000,
-    rateLimit: 2500,
+    rateLimit: 5000,
     useSlowDown: false,
     slowDownPeriodInMs: 10 * 60 * 1000,
-    slowDownAfter: 1000,
+    slowDownAfter: 2000,
     slowDownDelayInMs: 500,
     hashSaltRounds: 10,
     paginationDefaultLimit: 100,
     server: 'express',
     openapiDocsVersion: '1.0.0',
-    openapiDocsUrl: '/__docs',
+    openapiDocsBaseUrl: ['/'],
+    openapiDocsPath: '/__docs',
     logLevel: 'info',
     logRequests: true,
     requestSchemaValidation: false,

package/lib/listeners/emitter.d.ts

@@ -13,9 +13,12 @@ export declare class Listener {
     #private;
     constructor(socket: io.Server, callers: SocketCallers);
     start(): Promise<void>;
-    created(channels: string[], data: BaseEntity): Promise<void>;
-    updated(channels: string[], data: BaseEntity): Promise<void>;
-    deleted(channels: string[], data: BaseEntity): Promise<void>;
+    created<T extends BaseEntity<any, any>>(channels: string[], data: T): Promise<void>;
+    updated<T extends BaseEntity<any, any>>(channels: string[], { after, before }: {
+        after: T;
+        before: T;
+    }): Promise<void>;
+    deleted<T extends BaseEntity<any, any>>(channels: string[], data: T): Promise<void>;
     set callers(callers: SocketCallers);
     register(channel: string, onJoin?: OnJoinFn): this;
 }