itlab-internal-services 2.1.2 → 2.2.0

package/dist/http.logger.js

@@ -5,7 +5,7 @@ const common_1 = require("@nestjs/common");
 function useHttpLogger(app) {
     app.use((req, res, next) => {
         const { method, url } = req;
-        const ignore = ['/alive', '/favicon.ico'];
+        const ignore = ['/alive', '/alive-db', '/favicon.ico'];
         if (url.includes('swagger') || url.startsWith('/api') || ignore.includes(url)) {
             next();
             return;

package/dist/interceptors/errors.interceptor.d.ts

@@ -1,4 +1,4 @@
-import { CallHandler, ExecutionContext, NestInterceptor } from '@nestjs/common';
+import { CallHandler, ExecutionContext, INestApplication, NestInterceptor } from '@nestjs/common';
 import { Observable } from 'rxjs';
 export declare class ErrorsInterceptor implements NestInterceptor {
     private readonly dictionary;
@@ -7,4 +7,5 @@ export declare class ErrorsInterceptor implements NestInterceptor {
     intercept(_context: ExecutionContext, next: CallHandler): Observable<any>;
     protected transform(message: string, parent: string[]): string;
 }
-export declare const UseErrorsInterceptor: (dictionary?: Record<string, string>) => <TFunction extends Function, Y>(target: object | TFunction, propertyKey?: string | symbol, descriptor?: TypedPropertyDescriptor<Y>) => void;
+export declare const UsesErrorsInterceptor: (dictionary?: Record<string, string>) => <TFunction extends Function, Y>(target: object | TFunction, propertyKey?: string | symbol, descriptor?: TypedPropertyDescriptor<Y>) => void;
+export declare const useGlobalErrrorsInterceptor: (app: INestApplication, dictionary?: Record<string, string>) => void;

package/dist/interceptors/errors.interceptor.js

@@ -9,7 +9,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.UseErrorsInterceptor = exports.ErrorsInterceptor = void 0;
+exports.useGlobalErrrorsInterceptor = exports.UsesErrorsInterceptor = exports.ErrorsInterceptor = void 0;
 const common_1 = require("@nestjs/common");
 const rxjs_1 = require("rxjs");
 let ErrorsInterceptor = class ErrorsInterceptor {
@@ -56,5 +56,9 @@ ErrorsInterceptor = __decorate([
     __metadata("design:paramtypes", [Object])
 ], ErrorsInterceptor);
 exports.ErrorsInterceptor = ErrorsInterceptor;
-const UseErrorsInterceptor = (dictionary) => (0, common_1.applyDecorators)((0, common_1.UseInterceptors)(new ErrorsInterceptor(dictionary)));
-exports.UseErrorsInterceptor = UseErrorsInterceptor;
+const UsesErrorsInterceptor = (dictionary) => (0, common_1.applyDecorators)((0, common_1.UseInterceptors)(new ErrorsInterceptor(dictionary)));
+exports.UsesErrorsInterceptor = UsesErrorsInterceptor;
+const useGlobalErrrorsInterceptor = (app, dictionary) => {
+    app.useGlobalInterceptors(new ErrorsInterceptor(dictionary));
+};
+exports.useGlobalErrrorsInterceptor = useGlobalErrrorsInterceptor;

package/dist/liveness.probe.d.ts

@@ -1,7 +1,8 @@
 import { Response } from 'express';
 export declare class LivenessProbe {
     private axios;
-    private favicon;
-    getAlive(): string;
+    getAlive(): {
+        ok: number;
+    };
     getFavicon(res: Response): Promise<void>;
 }

package/dist/liveness.probe.js

@@ -28,17 +28,17 @@ exports.LivenessProbe = void 0;
 const common_1 = require("@nestjs/common");
 const swagger_1 = require("@nestjs/swagger");
 const axios_1 = __importDefault(require("axios"));
+const favicon = 'https://file.svi-itlab.com/650d514c58cbe60df3494bc0';
 let LivenessProbe = class LivenessProbe {
     constructor() {
         this.axios = axios_1.default.create();
-        this.favicon = 'https://file.svi-itlab.com/650d514c58cbe60df3494bc0';
     }
     getAlive() {
-        return 'service is up and running';
+        return { ok: 1 };
     }
     getFavicon(res) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { data } = yield this.axios.get(this.favicon, { responseType: 'stream' });
+            const { data } = yield this.axios.get(favicon, { responseType: 'stream' });
             data.pipe(res);
         });
     }
@@ -47,7 +47,7 @@ __decorate([
     (0, common_1.Get)('alive'),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", []),
-    __metadata("design:returntype", String)
+    __metadata("design:returntype", void 0)
 ], LivenessProbe.prototype, "getAlive", null);
 __decorate([
     (0, common_1.Get)('favicon.ico'),

package/dist/modules/database/database.module.js

@@ -1,12 +1,47 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+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 DatabaseModule_1;
 Object.defineProperty(exports, "__esModule", { value: true });
@@ -14,8 +49,11 @@ exports.DatabaseModule = void 0;
 const common_1 = require("@nestjs/common");
 const config_1 = require("@nestjs/config");
 const mongoose_1 = require("@nestjs/mongoose");
-const mongoose_2 = __importDefault(require("mongoose"));
+const swagger_1 = require("@nestjs/swagger");
+const fs_1 = require("fs");
+const mongoose_2 = __importStar(require("mongoose"));
 const path_1 = require("path");
+const exceptions_1 = require("../../exceptions");
 const model_service_1 = require("./model-service/model.service");
 const populate_service_1 = require("./populate-service/populate.service");
 const service_mapper_service_1 = require("./service-mapper-service/service-mapper.service");
@@ -31,33 +69,51 @@ let DatabaseModule = DatabaseModule_1 = class DatabaseModule {
                     inject: [config_1.ConfigService],
                     useFactory: (configService) => {
                         mongoose_2.default.set('strictQuery', true);
-                        const production = configService.getOrThrow('NODE_ENV', 'development') === 'production';
-                        if (production)
-                            this.logger.log('Running in production mode... Connecting internally without tls');
-                        else
-                            this.logger.log('Running in development mode... Connecting externally with tls');
+                        const mongoSrv = configService.getOrThrow('MONGO_SRV');
                         const username = configService.getOrThrow('MONGO_USERNAME');
                         const password = configService.getOrThrow('MONGO_PASSWORD');
-                        const generalOpts = {
-                            uri: configService.getOrThrow('MONGO_SRV'),
+                        const production = configService.getOrThrow('NODE_ENV', 'development') === 'production';
+                        const tlsDir = (0, path_1.join)(process.cwd(), configService.get('MONGO_CERT_DIR', 'mongo-tls'));
+                        const tlsCAFile = (0, path_1.join)(tlsDir, 'hub-services-mongodb.ca.pem');
+                        const tlsCertificateKeyFile = (0, path_1.join)(tlsDir, 'hub-services-mongodb.cert-key.pem');
+                        if (production) {
+                            this.logger.log('Running in production mode... Creating certificates');
+                            (0, fs_1.mkdirSync)(tlsDir, { recursive: true });
+                            const caCrt = configService.getOrThrow('MONGO_TLS_CA_CRT');
+                            const tlsCrt = configService.getOrThrow('MONGO_TLS_TLS_CRT');
+                            const tlsKey = configService.getOrThrow('MONGO_TLS_TLS_KEY');
+                            (0, fs_1.rmSync)(tlsCAFile, { force: true, recursive: true });
+                            (0, fs_1.writeFileSync)(tlsCAFile, caCrt);
+                            this.logger.log('Created Certificate Authority (.pem)');
+                            (0, fs_1.rmSync)(tlsCertificateKeyFile, { force: true, recursive: true });
+                            (0, fs_1.writeFileSync)(tlsCertificateKeyFile, `${tlsCrt}\n${tlsKey}`);
+                            this.logger.log('Created Client Certificate and Key (.pem)');
+                        }
+                        else {
+                            this.logger.log(`Running in development mode... Using local certificates in ${tlsDir}`);
+                            if (!(0, fs_1.existsSync)(tlsCAFile))
+                                this.logger.error("Couldn't locate Certificate Authority (.pem) at " + tlsCAFile);
+                            if (!(0, fs_1.existsSync)(tlsCertificateKeyFile))
+                                this.logger.error("Couldn't locate Client Certificate and Key (.pem) at " + tlsCertificateKeyFile);
+                        }
+                        return {
+                            uri: `mongodb+srv://${mongoSrv}/`,
                             auth: { username, password },
                             appName: options.appName,
                             dbName: options.dbName,
                             authMechanism: 'SCRAM-SHA-256',
                             authSource: 'admin',
-                            replicaSet: 'organisation-hub-mongodb',
+                            replicaSet: 'hub-services-mongodb',
                             serverSelectionTimeoutMS: 2000,
-                        };
-                        const certDir = () => configService.getOrThrow('MONGO_CERT_DIR');
-                        const tlsOpts = () => ({
+                            retryAttempts: 3,
                             tls: true,
-                            tlsCAFile: (0, path_1.join)(process.cwd(), certDir(), 'ca.crt'),
-                            tlsCertificateKeyFile: (0, path_1.join)(process.cwd(), certDir(), 'certificate-key.pem'),
-                        });
-                        return Object.assign({}, generalOpts, production ? {} : tlsOpts());
+                            tlsCAFile,
+                            tlsCertificateKeyFile,
+                        };
                     },
                 }),
             ],
+            controllers: [DatabaseLivenessProbe],
         };
     }
 };
@@ -66,3 +122,28 @@ DatabaseModule = DatabaseModule_1 = __decorate([
     (0, common_1.Module)({})
 ], DatabaseModule);
 exports.DatabaseModule = DatabaseModule;
+let DatabaseLivenessProbe = class DatabaseLivenessProbe {
+    constructor(connection) {
+        this.connection = connection;
+    }
+    alive() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const result = yield this.connection.db.admin().ping();
+            if (result && result.ok)
+                return { ok: 1 };
+            throw new exceptions_1.ErrorException('Could not connect to MongoDB', common_1.HttpStatus.UNAUTHORIZED);
+        });
+    }
+};
+__decorate([
+    (0, common_1.Get)('/alive-db'),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], DatabaseLivenessProbe.prototype, "alive", null);
+DatabaseLivenessProbe = __decorate([
+    (0, swagger_1.ApiTags)('Kubernetes DB Liveness Probe'),
+    (0, common_1.Controller)(),
+    __param(0, (0, mongoose_1.InjectConnection)()),
+    __metadata("design:paramtypes", [mongoose_2.Connection])
+], DatabaseLivenessProbe);

package/package.json

@@ -5,7 +5,7 @@
     "email": "timo.scheuermann@sv-informatik.de",
     "url": "https://timos.design"
   },
-  "version": "2.1.2",
+  "version": "2.2.0",
   "type": "commonjs",
   "files": [
     "dist"