starta.microservice 0.1.4874 → 0.1.4882

package/lib/adapters/database/DBScripts/DBInitialise.js

@@ -1,22 +1,13 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const Version_1 = __importDefault(require("../../../entities/Version"));
-exports.default = (db, mongoDb, lastVersion) => __awaiter(void 0, void 0, void 0, function* () {
+exports.default = async (db, mongoDb, lastVersion) => {
     const collation = { locale: 'en', strength: 2 };
     const collections = db.getCollectionsNames();
     console.log(JSON.stringify(collections));
-    yield db.getCollection('versions').insertOne(new Version_1.default({ version: lastVersion, date: new Date() }));
-});
+    await db.getCollection('versions').insertOne(new Version_1.default({ version: lastVersion, date: new Date() }));
+};
 //# sourceMappingURL=DBInitialise.js.map

package/lib/adapters/database/DBScripts/DBInitialise.js.map

@@ -1 +1 @@
-{"version":3,"file":"DBInitialise.js","sourceRoot":"","sources":["../../../../src/adapters/database/DBScripts/DBInitialise.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAEA,wEAAgD;AAGhD,kBAAe,CAAO,EAAY,EAAE,OAAW,EAAE,WAAmB,EAAE,EAAE;IACtE,MAAM,SAAS,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC;IAChD,MAAM,WAAW,GAAG,EAAE,CAAC,mBAAmB,EAAE,CAAC;IAC7C,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC;IACzC,MAAM,EAAE,CAAC,aAAa,CAAU,UAAU,CAAC,CAAC,SAAS,CAAC,IAAI,iBAAO,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,IAAI,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC;AACjH,CAAC,CAAA,CAAC"}
+{"version":3,"file":"DBInitialise.js","sourceRoot":"","sources":["../../../../src/adapters/database/DBScripts/DBInitialise.ts"],"names":[],"mappings":";;;;;AAEA,wEAAgD;AAGhD,kBAAe,KAAK,EAAE,EAAY,EAAE,OAAW,EAAE,WAAmB,EAAE,EAAE;IACtE,MAAM,SAAS,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC;IAChD,MAAM,WAAW,GAAG,EAAE,CAAC,mBAAmB,EAAE,CAAC;IAC7C,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC;IACzC,MAAM,EAAE,CAAC,aAAa,CAAU,UAAU,CAAC,CAAC,SAAS,CAAC,IAAI,iBAAO,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,IAAI,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC;AACjH,CAAC,CAAC"}

package/lib/adapters/database/index.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -25,64 +16,56 @@ class Database {
     getCollection(collectionName) {
         return this.mongoDb.collection(collectionName);
     }
-    checkLiveness() {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                const collectionCursor = this.mongoDb.listCollections();
-                const array = yield collectionCursor.toArray();
-                return array.length > 0;
-            }
-            catch (_a) {
-                return false;
-            }
-        });
+    async checkLiveness() {
+        try {
+            const collectionCursor = this.mongoDb.listCollections();
+            const array = await collectionCursor.toArray();
+            return array.length > 0;
+        }
+        catch {
+            return false;
+        }
     }
-    connect() {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.mongoDbServer = yield mongodb_1.MongoClient.connect(this.connectionString);
-            this.mongoDb = this.mongoDbServer.db(this.dbName);
-        });
+    async connect() {
+        this.mongoDbServer = await mongodb_1.MongoClient.connect(this.connectionString);
+        this.mongoDb = this.mongoDbServer.db(this.dbName);
     }
-    disconnect() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.mongoDbServer) {
-                yield this.mongoDbServer.close(false);
-            }
-        });
+    async disconnect() {
+        if (this.mongoDbServer) {
+            await this.mongoDbServer.close(false);
+        }
     }
-    initialize() {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.logger.generic.info('starting db initialization');
-            try {
-                const versions = yield this.getCollection('versions').find({}).sort({ version: -1 }).limit(1).toArray();
-                const currentVersion = versions && versions[0];
-                if (!currentVersion) {
-                    try {
-                        this.logger.generic.info('initializing new db');
-                        yield (0, DBInitialise_1.default)(this, this.mongoDb, this.getMigrations()[this.getMigrations().length - 1].version);
-                        this.logger.generic.info('initializing completed');
-                        return true;
-                    }
-                    catch (ex) {
-                        this.logger.internalError(ex, 'failed to initialize DB');
-                        throw ex;
-                    }
+    async initialize() {
+        this.logger.generic.info('starting db initialization');
+        try {
+            const versions = await this.getCollection('versions').find({}).sort({ version: -1 }).limit(1).toArray();
+            const currentVersion = versions && versions[0];
+            if (!currentVersion) {
+                try {
+                    this.logger.generic.info('initializing new db');
+                    await (0, DBInitialise_1.default)(this, this.mongoDb, this.getMigrations()[this.getMigrations().length - 1].version);
+                    this.logger.generic.info('initializing completed');
+                    return true;
+                }
+                catch (ex) {
+                    this.logger.internalError(ex, 'failed to initialize DB');
+                    throw ex;
                 }
-                this.logger.generic.info('found version: ' + versions[0].version, { version: versions[0].version });
-                yield this.getMigrations().filter(m => m.version > versions[0].version)
-                    .reduce((promise, migrationData) => __awaiter(this, void 0, void 0, function* () {
-                    yield promise;
-                    this.logger.generic.info('migration to version: ' + migrationData.version, { version: migrationData.version });
-                    yield migrationData.migration.up();
-                    yield this.getCollection('versions').insertOne(new Version_1.default({ version: migrationData.version, date: new Date() }));
-                    this.logger.generic.info('migrated to version: ' + migrationData.version, { version: migrationData.version });
-                }), Promise.resolve());
-            }
-            catch (ex) {
-                this.logger.internalError(ex, 'DB initializing failed');
-                throw ex;
             }
-        });
+            this.logger.generic.info('found version: ' + versions[0].version, { version: versions[0].version });
+            await this.getMigrations().filter(m => m.version > versions[0].version)
+                .reduce(async (promise, migrationData) => {
+                await promise;
+                this.logger.generic.info('migration to version: ' + migrationData.version, { version: migrationData.version });
+                await migrationData.migration.up();
+                await this.getCollection('versions').insertOne(new Version_1.default({ version: migrationData.version, date: new Date() }));
+                this.logger.generic.info('migrated to version: ' + migrationData.version, { version: migrationData.version });
+            }, Promise.resolve());
+        }
+        catch (ex) {
+            this.logger.internalError(ex, 'DB initializing failed');
+            throw ex;
+        }
     }
 }
 exports.default = Database;

package/lib/adapters/database/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/adapters/database/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/adapters/database/index.ts"],"names":[],"mappings":"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"}

package/lib/adapters/logger/index.js

@@ -13,7 +13,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _ServerLogger_params;
+var _ServerLogger_params, _ServerLogger_genericLogger;
 Object.defineProperty(exports, "__esModule", { value: true });
 const winston_1 = __importDefault(require("winston"));
 //import RotatingFile from 'winston-daily-rotate-file';
@@ -30,7 +30,10 @@ const factory = (params) => {
         levels: Object.assign({}, winston_1.default.config.npm.levels, { fatal: -1 }),
         defaultMeta: params,
         transports: [
-            new winston_1.default.transports.Console(Object.assign(Object.assign({}, commonOptions), { level: 'debug' })),
+            new winston_1.default.transports.Console({
+                ...commonOptions,
+                level: 'debug',
+            }),
             // new RotatingFile({
             //   ...commonOptions,
             //   json: true,
@@ -51,25 +54,33 @@ const divider = '\n-----------------------------------\n';
 class ServerLogger {
     constructor(params = null) {
         _ServerLogger_params.set(this, void 0);
-        __classPrivateFieldSet(this, _ServerLogger_params, Object.assign({ serviceName: config_1.default.serviceName, serviceVersion: config_1.default.version.toString() }, (params || {})), "f");
+        _ServerLogger_genericLogger.set(this, void 0);
+        __classPrivateFieldSet(this, _ServerLogger_params, {
+            serviceName: config_1.default.serviceName,
+            serviceVersion: config_1.default.version.toString(),
+            ...(params || {}),
+        }, "f");
+        __classPrivateFieldSet(this, _ServerLogger_genericLogger, factory(__classPrivateFieldGet(this, _ServerLogger_params, "f")), "f");
     }
     get generic() {
-        return factory(__classPrivateFieldGet(this, _ServerLogger_params, "f"));
+        return __classPrivateFieldGet(this, _ServerLogger_genericLogger, "f");
     }
     withParams(params) {
-        return new ServerLogger(Object.assign(Object.assign({}, (__classPrivateFieldGet(this, _ServerLogger_params, "f") || {})), params));
+        return new ServerLogger({
+            ...(__classPrivateFieldGet(this, _ServerLogger_params, "f") || {}),
+            ...params,
+        });
     }
     internalServerError(error, req) {
-        var _a, _b;
         if (error.toHash)
             error = error.toHash();
-        const username = ((_b = (_a = req === null || req === void 0 ? void 0 : req.session) === null || _a === void 0 ? void 0 : _a.account) === null || _b === void 0 ? void 0 : _b.login) || 'anonymous';
-        const permissions = JSON.stringify(req === null || req === void 0 ? void 0 : req.currentOrgPermissions);
+        const username = req?.session?.account?.login || 'anonymous';
+        const permissions = JSON.stringify(req?.currentOrgPermissions);
         const requestPayload = dataSelector(req);
-        if (requestPayload === null || requestPayload === void 0 ? void 0 : requestPayload.password) {
+        if (requestPayload?.password) {
             requestPayload.password = '*********';
         }
-        if (requestPayload === null || requestPayload === void 0 ? void 0 : requestPayload.passwordConfirm) {
+        if (requestPayload?.passwordConfirm) {
             requestPayload.passwordConfirm = '*********';
         }
         const requestString = util_1.default.format('INTERNAL SERVER ERROR\n%s %s\nusername: %s\npermissions: %s\n%j', req.originalRequest.method, req.originalRequest.url, username, permissions, requestPayload);
@@ -87,19 +98,18 @@ class ServerLogger {
             error = error.toHash();
         const eventString = util_1.default.format('INTERNAL EVENT ERROR\n%s %s\n%j', eventData.channel, eventData.message);
         const errorString = util_1.default.format('%s\n%s\n%s', error, error.code || 'no code', error.stack);
-        this.generic.error(eventString + ' ' + errorString, Object.assign(Object.assign({}, eventData), { error }));
+        this.generic.error(eventString + ' ' + errorString, { ...eventData, error });
     }
     debugBadRequest(error, req) {
-        var _a, _b;
         if (error.toHash)
             error = error.toHash();
-        const username = ((_b = (_a = req === null || req === void 0 ? void 0 : req.session) === null || _a === void 0 ? void 0 : _a.account) === null || _b === void 0 ? void 0 : _b.login) || 'anonymous';
-        const permissions = JSON.stringify(req === null || req === void 0 ? void 0 : req.currentOrgPermissions);
+        const username = req?.session?.account?.login || 'anonymous';
+        const permissions = JSON.stringify(req?.currentOrgPermissions);
         const requestPayload = dataSelector(req);
-        if (requestPayload === null || requestPayload === void 0 ? void 0 : requestPayload.password) {
+        if (requestPayload?.password) {
             requestPayload.password = '*********';
         }
-        if (requestPayload === null || requestPayload === void 0 ? void 0 : requestPayload.passwordConfirm) {
+        if (requestPayload?.passwordConfirm) {
             requestPayload.passwordConfirm = '*********';
         }
         const requestString = util_1.default.format('BAD REQUEST\n%s %s\nusername: %s\npermissions: %s\n%j', req.originalRequest.method, req.originalRequest.url, username, permissions, requestPayload);
@@ -117,6 +127,6 @@ class ServerLogger {
             `LAN: http://${ip_1.default.address()}:${port}`);
     }
 }
-_ServerLogger_params = new WeakMap();
+_ServerLogger_params = new WeakMap(), _ServerLogger_genericLogger = new WeakMap();
 exports.default = ServerLogger;
 //# sourceMappingURL=index.js.map

package/lib/adapters/logger/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/adapters/logger/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,sDAA8B;AAC9B,uDAAuD;AACvD,4CAAoB;AACpB,gDAAwB;AAExB,iFAAyD;AAGzD,0DAAkC;AAElC,MAAM,aAAa,GAAG;IACpB,SAAS,EAAE,IAAI;CAChB,CAAC;AAEF,MAAM,OAAO,GAAG,CAAC,MAAe,EAAmB,EAAE;IACnD,MAAM,MAAM,GAAG,iBAAO,CAAC,YAAY,CAAC;QAClC,MAAM,EAAE,iBAAO,CAAC,MAAM,CAAC,OAAO,CAC5B,iBAAO,CAAC,MAAM,CAAC,SAAS,EAAE,EAC1B,iBAAO,CAAC,MAAM,CAAC,IAAI,EAAE,CACtB;QACD,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,iBAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC;QACnE,WAAW,EAAE,MAAM;QACnB,UAAU,EAAE;YACV,IAAI,iBAAO,CAAC,UAAU,CAAC,OAAO,iCACzB,aAAa,KAChB,KAAK,EAAE,OAAO,IACd;YACF,qBAAqB;YACrB,sBAAsB;YACtB,gBAAgB;YAChB,oBAAoB;YACpB,kCAAkC;YAClC,wCAAwC;YACxC,+BAA+B;YAC/B,yBAAyB;YACzB,oBAAoB;YACpB,MAAM;SACP;KACF,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;IAElD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAEF,MAAM,YAAY,GAAG,uBAAa,CAAC,gBAAgB,CACjD,uBAAa,CAAC,YAAY,EAC1B,uBAAa,CAAC,WAAW,EACzB,uBAAa,CAAC,UAAU,CACzB,CAAC;AAEF,MAAM,OAAO,GAAG,yCAAyC,CAAC;AAE1D,MAAM,YAAY;IAGhB,YAAY,SAAiB,IAAI;QAFjC,uCAAiB;QAGf,uBAAA,IAAI,wCACF,WAAW,EAAE,gBAAM,CAAC,WAAW,EAC/B,cAAc,EAAE,gBAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,IACtC,CAAC,MAAM,IAAI,EAAE,CAAC,OAClB,CAAC;IACJ,CAAC;IAED,IAAW,OAAO;QAChB,OAAO,OAAO,CAAC,uBAAA,IAAI,4BAAQ,CAAC,CAAC;IAC/B,CAAC;IAED,UAAU,CAAC,MAAc;QACvB,OAAO,IAAI,YAAY,iCAClB,CAAC,uBAAA,IAAI,4BAAQ,IAAI,EAAE,CAAC,GACpB,MAAM,EACT,CAAA;IACJ,CAAC;IAED,mBAAmB,CAAC,KAAK,EAAE,GAAuB;;QAChD,IAAI,KAAK,CAAC,MAAM;YAAE,KAAK,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;QACzC,MAAM,QAAQ,GAAG,CAAA,MAAA,MAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,OAAO,0CAAE,OAAO,0CAAE,KAAK,KAAI,WAAW,CAAC;QAC7D,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,qBAAqB,CAAC,CAAC;QAE/D,MAAM,cAAc,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC;QACzC,IAAI,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,QAAQ,EAAE;YAC5B,cAAc,CAAC,QAAQ,GAAG,WAAW,CAAC;SACvC;QACD,IAAI,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,eAAe,EAAE;YACnC,cAAc,CAAC,eAAe,GAAG,WAAW,CAAC;SAC9C;QACD,MAAM,aAAa,GAAG,cAAI,CAAC,MAAM,CAAC,iEAAiE,EAAE,GAAG,CAAC,eAAe,CAAC,MAAM,EAAE,GAAG,CAAC,eAAe,CAAC,GAAG,EAAE,QAAQ,EAAE,WAAW,EAAE,cAAc,CAAC,CAAC;QACjM,MAAM,WAAW,GAAG,cAAI,CAAC,MAAM,CAAC,yBAAyB,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;QAEpF,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,aAAa,GAAG,GAAG,GAAG,WAAW,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,CAAC,CAAC;IAC7F,CAAC;IAGD,aAAa,CAAC,KAAK,EAAE,OAAe;QAClC,IAAI,KAAK,CAAC,MAAM;YAAE,KAAK,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;QACzC,MAAM,WAAW,GAAG,cAAI,CAAC,MAAM,CAAC,YAAY,EAAE,KAAK,EAAE,KAAK,CAAC,IAAI,IAAI,SAAS,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;QAE3F,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,GAAG,GAAG,GAAG,WAAW,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;IACtE,CAAC;IAED,UAAU,CAAC,KAAK,EAAE,SAAS;QACzB,IAAI,KAAK,CAAC,MAAM;YAAE,KAAK,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;QACzC,MAAM,WAAW,GAAG,cAAI,CAAC,MAAM,CAAC,iCAAiC,EAAE,SAAS,CAAC,OAAO,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC;QACzG,MAAM,WAAW,GAAG,cAAI,CAAC,MAAM,CAAC,YAAY,EAAE,KAAK,EAAE,KAAK,CAAC,IAAI,IAAI,SAAS,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;QAE3F,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,WAAW,GAAG,GAAG,GAAG,WAAW,kCAAO,SAAS,KAAE,KAAK,IAAG,CAAC;IAC/E,CAAC;IAED,eAAe,CAAC,KAAK,EAAE,GAAuB;;QAC5C,IAAI,KAAK,CAAC,MAAM;YAAE,KAAK,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;QACzC,MAAM,QAAQ,GAAG,CAAA,MAAA,MAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,OAAO,0CAAE,OAAO,0CAAE,KAAK,KAAI,WAAW,CAAC;QAC7D,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,qBAAqB,CAAC,CAAC;QAC/D,MAAM,cAAc,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC;QACzC,IAAI,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,QAAQ,EAAE;YAC5B,cAAc,CAAC,QAAQ,GAAG,WAAW,CAAC;SACvC;QACD,IAAI,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,eAAe,EAAE;YACnC,cAAc,CAAC,eAAe,GAAG,WAAW,CAAC;SAC9C;QACD,MAAM,aAAa,GAAG,cAAI,CAAC,MAAM,CAAC,uDAAuD,EAAE,GAAG,CAAC,eAAe,CAAC,MAAM,EAAE,GAAG,CAAC,eAAe,CAAC,GAAG,EAAE,QAAQ,EAAE,WAAW,EAAE,cAAc,CAAC,CAAC;QACvL,MAAM,WAAW,GAAG,cAAI,CAAC,MAAM,CAAC,kCAAkC,EAAE,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,IAAI,WAAW,EAAE,KAAK,CAAC,UAAU,IAAI,GAAG,CAAC,CAAC;QAEtI,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,aAAa,GAAG,GAAG,GAAG,WAAW,EAAE,EAAE,KAAK,EAAE,cAAc,EAAE,CAAC,CAAC;IACnF,CAAC;IAED,UAAU,CAAC,IAAI,EAAE,aAAa,GAAG,KAAK;QACpC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;QAEtC,IAAI,aAAa,EAAE;YACjB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;SAC3C;QAED,IAAI,CAAC,OAAO,CAAC,IAAI,CACf,gBAAgB;YAChB,OAAO;YACP,+BAA+B,IAAI,EAAE,GAAG,IAAI;YAC5C,eAAe,YAAE,CAAC,OAAO,EAAE,IAAI,IAAI,EAAE,CACtC,CAAC;IACJ,CAAC;CACF;;AAED,kBAAe,YAAY,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/adapters/logger/index.ts"],"names":[],"mappings":"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"}

package/lib/adapters/{rabbitmq/index.d.ts → messageBroker/Rabbitmq.d.ts}

@@ -1,6 +1,7 @@
 import amqp from 'amqplib';
 import ServerLogger from '../../adapters/logger';
-declare class Rabbitmq {
+import { IMessageBroker } from './types';
+declare class Rabbitmq implements IMessageBroker {
     #private;
     constructor(logger: ServerLogger);
     connect(tryRecconect?: boolean, timeout?: number): Promise<void>;
@@ -8,12 +9,9 @@ declare class Rabbitmq {
     emitEvent(exchange: string, eventData: Object): Promise<void>;
     consume(exchange: string, queue: string, onMessage: (msg: amqp.Message, { logger }?: {
         logger: ServerLogger;
-    }) => Promise<void>, options?: {
-        pattern: string;
-        noAck: boolean;
-    }): Promise<void>;
+    }) => Promise<void>): Promise<void>;
     checkLiveness(): Promise<boolean>;
-    createExchanges(exchanges: string[], type?: string, durable?: boolean): Promise<void>;
+    createTopics(exchanges: string[]): Promise<void>;
     createQueues(queues: string[], durable?: boolean): Promise<void>;
 }
 export default Rabbitmq;

package/lib/adapters/messageBroker/Rabbitmq.js

@@ -0,0 +1,159 @@
+"use strict";
+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 __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 __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+var _Rabbitmq_logger, _Rabbitmq_connection, _Rabbitmq_channel, _Rabbitmq_createdExchanges, _Rabbitmq_createdQueues;
+Object.defineProperty(exports, "__esModule", { value: true });
+const amqp_connection_manager_1 = __importDefault(require("amqp-connection-manager"));
+const config_1 = __importDefault(require("../../config"));
+const executionContext_1 = __importDefault(require("../../contexts/executionContext"));
+const loggerContext_1 = __importDefault(require("../../contexts/loggerContext"));
+class Rabbitmq {
+    constructor(logger) {
+        _Rabbitmq_logger.set(this, void 0);
+        _Rabbitmq_connection.set(this, void 0);
+        _Rabbitmq_channel.set(this, void 0);
+        _Rabbitmq_createdExchanges.set(this, new Set());
+        _Rabbitmq_createdQueues.set(this, new Set());
+        __classPrivateFieldSet(this, _Rabbitmq_logger, logger, "f");
+    }
+    async connect(tryRecconect = false, timeout = 1000) {
+        const self = this;
+        const reconnect = async () => {
+            const promise = self.connect.call(self, true, Math.min(timeout * 2, 20000));
+            await promise;
+        };
+        __classPrivateFieldGet(this, _Rabbitmq_logger, "f").generic.info("Connecting to rabbit");
+        try {
+            __classPrivateFieldSet(this, _Rabbitmq_connection, await amqp_connection_manager_1.default.connect(config_1.default.rabbitmq.uri), "f");
+        }
+        catch (err) {
+            __classPrivateFieldGet(this, _Rabbitmq_logger, "f").generic.error("rabbit error", err);
+            if (tryRecconect) {
+                setTimeout(reconnect, timeout);
+            }
+            return;
+        }
+        __classPrivateFieldGet(this, _Rabbitmq_connection, "f").on("error", function (err) {
+            __classPrivateFieldGet(this, _Rabbitmq_logger, "f").generic.error("rabbit error", err);
+        });
+        __classPrivateFieldGet(this, _Rabbitmq_connection, "f").on("close", function (err) {
+            __classPrivateFieldGet(self, _Rabbitmq_logger, "f").generic.error("rabbit error", err);
+        });
+        __classPrivateFieldSet(this, _Rabbitmq_channel, await __classPrivateFieldGet(this, _Rabbitmq_connection, "f").createChannel({
+            setup: function (channel) {
+                return channel.assertQueue('testqueue', { durable: true });
+            },
+        }), "f");
+        __classPrivateFieldGet(this, _Rabbitmq_logger, "f").generic.info("Connected to rabbit");
+    }
+    async disconnect() {
+        __classPrivateFieldGet(this, _Rabbitmq_logger, "f").generic.info("Disconnecting from rabbit");
+        await __classPrivateFieldGet(this, _Rabbitmq_channel, "f").close();
+        await __classPrivateFieldGet(this, _Rabbitmq_connection, "f").close();
+        __classPrivateFieldGet(this, _Rabbitmq_logger, "f").generic.info("Disconnected from rabbit");
+    }
+    async emitEvent(exchange, eventData) {
+        const logger = (loggerContext_1.default.getLogger() ?? __classPrivateFieldGet(this, _Rabbitmq_logger, "f")).withParams({
+            serviceBroker: { exchange },
+        });
+        await this.createTopics([exchange]);
+        const emit = () => __classPrivateFieldGet(this, _Rabbitmq_channel, "f").publish(exchange, '*', Buffer.from(JSON.stringify(eventData)), {
+            headers: {
+                context: executionContext_1.default.getFullData()
+            }
+        });
+        try {
+            emit();
+            logger.generic.info("Message published to rabbit");
+        }
+        catch (e) {
+            logger.internalError(e, "Unable to publish to rabbit");
+            try {
+                await this.disconnect();
+            }
+            finally {
+                await this.connect();
+                emit();
+            }
+        }
+    }
+    async consume(exchange, queue, onMessage) {
+        if (!exchange) {
+            throw 'exchange is null';
+        }
+        await this.createTopics([exchange]);
+        await this.createQueues([queue]);
+        await __classPrivateFieldGet(this, _Rabbitmq_channel, "f").bindQueue(queue, exchange, '*');
+        await __classPrivateFieldGet(this, _Rabbitmq_channel, "f").consume(queue, async (msg) => {
+            const startTime = process.hrtime();
+            const contextData = msg.properties.headers.context;
+            if (contextData) {
+                executionContext_1.default.setFullData(contextData);
+            }
+            const logger = __classPrivateFieldGet(this, _Rabbitmq_logger, "f").withParams({
+                correlationId: executionContext_1.default.getCorrelationId(),
+                login: executionContext_1.default.getAuthorizedUserLogin(),
+                serviceBroker: { queue, exchange },
+            });
+            loggerContext_1.default.setLogger(logger);
+            const contentString = msg.content.toString();
+            try {
+                logger.generic.info("Consuming started");
+                const contentObject = JSON.parse(contentString);
+                await onMessage(contentObject, { logger });
+                const diff = process.hrtime(startTime);
+                const timeInMilliseconds = diff[0] * 1000 + diff[1] / 1000000;
+                logger.generic.info("Consuming finished", { taskDuration: timeInMilliseconds });
+            }
+            catch (e) {
+                logger.generic.error(`
+Consuming error
+error: |${JSON.stringify(e.toHash ? e.toHash() : e.stack)}|
+object: |${msg.content.toString()}|
+          `, e);
+                const errorQueueName = 'ERROR:' + queue;
+                await this.createQueues([errorQueueName]);
+                __classPrivateFieldGet(this, _Rabbitmq_channel, "f").publish('', errorQueueName, Buffer.from(JSON.stringify({
+                    message: msg.content.toString(),
+                    error: e
+                })), {
+                    headers: {
+                        context: executionContext_1.default.getFullData()
+                    }
+                });
+            }
+        }, { noAck: true });
+    }
+    async checkLiveness() {
+        return __classPrivateFieldGet(this, _Rabbitmq_connection, "f").isConnected();
+    }
+    async createTopics(exchanges) {
+        const exchangesToCreate = exchanges.filter(exchange => !__classPrivateFieldGet(this, _Rabbitmq_createdExchanges, "f").has(exchange));
+        await Promise.all(exchangesToCreate.map(async (exchange) => {
+            await __classPrivateFieldGet(this, _Rabbitmq_channel, "f").assertExchange(exchange, 'direct', { durable: true });
+            __classPrivateFieldGet(this, _Rabbitmq_createdExchanges, "f").add(exchange);
+        }));
+    }
+    async createQueues(queues, durable = true) {
+        const queuesToCreate = queues.filter(queue => !__classPrivateFieldGet(this, _Rabbitmq_createdQueues, "f").has(queue));
+        await Promise.all(queuesToCreate.map(async (queue) => {
+            await __classPrivateFieldGet(this, _Rabbitmq_channel, "f").assertQueue(queue, { durable });
+            __classPrivateFieldGet(this, _Rabbitmq_createdQueues, "f").add(queue);
+        }));
+    }
+}
+_Rabbitmq_logger = new WeakMap(), _Rabbitmq_connection = new WeakMap(), _Rabbitmq_channel = new WeakMap(), _Rabbitmq_createdExchanges = new WeakMap(), _Rabbitmq_createdQueues = new WeakMap();
+exports.default = Rabbitmq;
+//# sourceMappingURL=Rabbitmq.js.map

package/lib/adapters/messageBroker/Rabbitmq.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Rabbitmq.js","sourceRoot":"","sources":["../../../src/adapters/messageBroker/Rabbitmq.ts"],"names":[],"mappings":"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"}

package/lib/adapters/messageBroker/SnsSqs.d.ts

@@ -0,0 +1,19 @@
+import ServerLogger from '../logger';
+import { IMessageBroker } from '../messageBroker/types';
+declare class SnsSqs implements IMessageBroker {
+    #private;
+    constructor(logger: ServerLogger);
+    createTopics(topics: string[]): Promise<void>;
+    connect(): Promise<void>;
+    checkLiveness(): Promise<boolean>;
+    disconnect(): Promise<void>;
+    emitEvent(topicName: string, eventData: Object): Promise<void>;
+    consume(topicName: string, queueName: string, onMessage: (msg: any, { logger }?: {
+        logger: ServerLogger;
+    }) => Promise<void>): Promise<void>;
+    private processMessagesInParallel;
+    private createTopic;
+    private createQueueWithDLQ;
+    private subscribeQueueToTopic;
+}
+export default SnsSqs;