itlab-internal-services 2.2.0 → 2.2.2

package/dist/env.d.ts

@@ -3,3 +3,7 @@ export declare const ENV_JWT_SECRET = "JWT_SECRET";
 export declare const ENV_MONGO_SRV = "MONGO_SRV";
 export declare const ENV_MONGO_USERNAME = "MONGO_USERNAME";
 export declare const ENV_MONGO_PASSWORD = "MONGO_PASSWORD";
+export declare const ENV_MONGO_CERT_DIR = "MONGO_CERT_DIR";
+export declare const ENV_MONGO_TLS_CA_CRT = "MONGO_TLS_CA_CRT";
+export declare const ENV_MONGO_TLS_TLS_CRT = "MONGO_TLS_TLS_CRT";
+export declare const ENV_MONGO_TLS_TLS_KEY = "MONGO_TLS_TLS_KEY";

package/dist/env.js

@@ -1,8 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ENV_MONGO_PASSWORD = exports.ENV_MONGO_USERNAME = exports.ENV_MONGO_SRV = exports.ENV_JWT_SECRET = exports.ENV_K8S_TOKEN = void 0;
+exports.ENV_MONGO_TLS_TLS_KEY = exports.ENV_MONGO_TLS_TLS_CRT = exports.ENV_MONGO_TLS_CA_CRT = exports.ENV_MONGO_CERT_DIR = exports.ENV_MONGO_PASSWORD = exports.ENV_MONGO_USERNAME = exports.ENV_MONGO_SRV = exports.ENV_JWT_SECRET = exports.ENV_K8S_TOKEN = void 0;
 exports.ENV_K8S_TOKEN = 'K8S_TOKEN';
 exports.ENV_JWT_SECRET = 'JWT_SECRET';
 exports.ENV_MONGO_SRV = 'MONGO_SRV';
 exports.ENV_MONGO_USERNAME = 'MONGO_USERNAME';
 exports.ENV_MONGO_PASSWORD = 'MONGO_PASSWORD';
+exports.ENV_MONGO_CERT_DIR = 'MONGO_CERT_DIR';
+exports.ENV_MONGO_TLS_CA_CRT = 'MONGO_TLS_CA_CRT';
+exports.ENV_MONGO_TLS_TLS_CRT = 'MONGO_TLS_TLS_CRT';
+exports.ENV_MONGO_TLS_TLS_KEY = 'MONGO_TLS_TLS_KEY';

package/dist/favicon.controller.d.ts

@@ -0,0 +1,5 @@
+import { Response } from 'express';
+export declare class FaviconController {
+    private axios;
+    getFavicon(res: Response): Promise<void>;
+}

package/dist/favicon.controller.js

@@ -0,0 +1,54 @@
+"use strict";
+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 __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 __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FaviconController = 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 FaviconController = class FaviconController {
+    constructor() {
+        this.axios = axios_1.default.create();
+    }
+    getFavicon(res) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { data } = yield this.axios.get(favicon, { responseType: 'stream' });
+            data.pipe(res);
+        });
+    }
+};
+__decorate([
+    (0, common_1.Get)('favicon.ico'),
+    __param(0, (0, common_1.Res)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Promise)
+], FaviconController.prototype, "getFavicon", null);
+FaviconController = __decorate([
+    (0, swagger_1.ApiTags)('Favicon'),
+    (0, common_1.Controller)()
+], FaviconController);
+exports.FaviconController = FaviconController;

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', '/alive-db', '/favicon.ico'];
+        const ignore = ['/alive', '/favicon.ico'];
         if (url.includes('swagger') || url.startsWith('/api') || ignore.includes(url)) {
             next();
             return;

package/dist/index.d.ts

@@ -1,4 +1,5 @@
 export * from './exceptions';
+export * from './favicon.controller';
 export * from './guards';
 export * from './http.logger';
 export * from './interceptors';

package/dist/index.js

@@ -15,6 +15,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./exceptions"), exports);
+__exportStar(require("./favicon.controller"), exports);
 __exportStar(require("./guards"), exports);
 __exportStar(require("./http.logger"), exports);
 __exportStar(require("./interceptors"), exports);

package/dist/liveness.probe.d.ts

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

package/dist/liveness.probe.js

@@ -20,42 +20,24 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         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 });
 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();
-    }
-    getAlive() {
-        return { ok: 1 };
-    }
-    getFavicon(res) {
+    getAlive(response) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { data } = yield this.axios.get(favicon, { responseType: 'stream' });
-            data.pipe(res);
+            response.status(200).send({ ok: 1 });
         });
     }
 };
 __decorate([
-    (0, common_1.Get)('alive'),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", []),
-    __metadata("design:returntype", void 0)
-], LivenessProbe.prototype, "getAlive", null);
-__decorate([
-    (0, common_1.Get)('favicon.ico'),
+    (0, common_1.Get)('/alive'),
     __param(0, (0, common_1.Res)()),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object]),
     __metadata("design:returntype", Promise)
-], LivenessProbe.prototype, "getFavicon", null);
+], LivenessProbe.prototype, "getAlive", null);
 LivenessProbe = __decorate([
     (0, swagger_1.ApiTags)('Kubernetes Liveness Probe'),
     (0, common_1.Controller)()

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

@@ -53,7 +53,7 @@ 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 env_1 = require("../../env");
 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");
@@ -69,19 +69,19 @@ let DatabaseModule = DatabaseModule_1 = class DatabaseModule {
                     inject: [config_1.ConfigService],
                     useFactory: (configService) => {
                         mongoose_2.default.set('strictQuery', true);
-                        const mongoSrv = configService.getOrThrow('MONGO_SRV');
-                        const username = configService.getOrThrow('MONGO_USERNAME');
-                        const password = configService.getOrThrow('MONGO_PASSWORD');
+                        const mongoSrv = configService.getOrThrow(env_1.ENV_MONGO_SRV);
+                        const username = configService.getOrThrow(env_1.ENV_MONGO_USERNAME);
+                        const password = configService.getOrThrow(env_1.ENV_MONGO_PASSWORD);
                         const production = configService.getOrThrow('NODE_ENV', 'development') === 'production';
-                        const tlsDir = (0, path_1.join)(process.cwd(), configService.get('MONGO_CERT_DIR', 'mongo-tls'));
+                        const tlsDir = (0, path_1.join)(process.cwd(), configService.get(env_1.ENV_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');
+                            const caCrt = configService.getOrThrow(env_1.ENV_MONGO_TLS_CA_CRT);
+                            const tlsCrt = configService.getOrThrow(env_1.ENV_MONGO_TLS_TLS_CRT);
+                            const tlsKey = configService.getOrThrow(env_1.ENV_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)');
@@ -126,23 +126,35 @@ let DatabaseLivenessProbe = class DatabaseLivenessProbe {
     constructor(connection) {
         this.connection = connection;
     }
-    alive() {
+    getAlive(response) {
         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);
+            if (!this.connection || this.connection.readyState !== 1) {
+                response.status(500).send('Not connected to MongoDB');
+                return;
+            }
+            try {
+                const result = yield this.connection.db.admin().ping();
+                if (!!((result === null || result === void 0 ? void 0 : result.ok) === 1)) {
+                    response.status(200).send({ ok: 1, db: 1 });
+                    return;
+                }
+                throw new Error('Could not connect to MongoDB');
+            }
+            catch (error) {
+                response.status(500).send("Couldn't connect to MongoDB");
+            }
         });
     }
 };
 __decorate([
-    (0, common_1.Get)('/alive-db'),
+    (0, common_1.Get)('/alive'),
+    __param(0, (0, common_1.Res)()),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", []),
+    __metadata("design:paramtypes", [Object]),
     __metadata("design:returntype", Promise)
-], DatabaseLivenessProbe.prototype, "alive", null);
+], DatabaseLivenessProbe.prototype, "getAlive", null);
 DatabaseLivenessProbe = __decorate([
-    (0, swagger_1.ApiTags)('Kubernetes DB Liveness Probe'),
+    (0, swagger_1.ApiTags)('Kubernetes Liveness Probe'),
     (0, common_1.Controller)(),
     __param(0, (0, mongoose_1.InjectConnection)()),
     __metadata("design:paramtypes", [mongoose_2.Connection])

package/package.json

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