skyeye-svc-common-utils 2.0.0-dev0.18 → 2.0.0-dev0.19

package/dist/utils/middleware/loadConfig.js

@@ -0,0 +1,143 @@
+"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 };
+};
+var _a;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.loadConfig = exports.environment = exports.appConfig = void 0;
+const dotenv_1 = __importDefault(require("dotenv"));
+const lib_1 = require("../../lib");
+const logger_1 = require("../logger/logger");
+const zod_1 = require("zod");
+const appConst_1 = require("../appConst");
+/**
+ * @description
+ * @property {string} appName - service's app name from package.json
+ * @property {string} version - service's version from package.json
+ * @property {enum} environment - current environment
+ * @property {string} keyVaultName - Azure key vault name
+ * @property {string} keyVaultSecretName - secret name of Azure key vault
+ * @todo migration to single typedef
+ */
+const zEnvFileAppConfig = zod_1.z.object({
+    appName: zod_1.z.string(),
+    version: zod_1.z.string(),
+    environment: appConst_1.zEnvironment,
+    keyVaultName: zod_1.z.string(),
+    keyVaultSecretName: zod_1.z.string()
+}).strict();
+/**
+ * @todo migration to single typedef
+ */
+const zElasticKeyVault = zod_1.z.object({
+    secretToken: zod_1.z.string(),
+    serverUrl: zod_1.z.string()
+});
+/**
+ * @todo migration to single typedef
+ */
+const zTeamsChannelWebHook = zod_1.z.object({
+    errorChannel: zod_1.z.string(),
+    warnChannel: zod_1.z.string()
+});
+/**
+ * @todo migration to single typedef
+ */
+const zTelemetry = zod_1.z.object({
+    teamsChannelWebHook: zTeamsChannelWebHook,
+    elasticKeyVault: zElasticKeyVault
+});
+/**
+ * @todo migration to single typedef
+ */
+const zSecretFileAppConfig = zod_1.z.object({
+    telemetry: zTelemetry,
+    serviceConfig: zod_1.z.any().nullable()
+});
+/**
+ * @todo move to loadConfig since all the environment fields should be loaded from appConfig
+ */
+exports.environment = (_a = process.env.NODE_ENV) !== null && _a !== void 0 ? _a : 'development';
+/**
+ * @description preload for app configuration, once it is been called, the appConfig will be loaded and be freezed
+ * @param packagePath - optional, path of `package.json` in order to load app name and version
+ */
+const loadConfig = (packagePath) => __awaiter(void 0, void 0, void 0, function* () {
+    logger_1.logger.verbose('start /appConfig/preload()');
+    // load environment file
+    dotenv_1.default.config({ path: `${exports.environment}.env` });
+    /**
+     * To load the appName and the version, we read the package information in the following order:
+     * 1. check if the environment value is defined directly
+     * 2. check if environment given from npm is defined
+     * 3. check if value in package.json is defined
+     */
+    const pkg = require(packagePath !== null && packagePath !== void 0 ? packagePath : `${process.env.PWD}/package.json`);
+    const appName = (() => {
+        if (!!process.env.APP_NAME) {
+            return process.env.APP_NAME;
+        }
+        if (!!process.env.npm_package_name) {
+            return process.env.npm_package_name;
+        }
+        if (!!pkg.name) {
+            return pkg.name;
+        }
+        return 'default-app-name';
+    })();
+    const version = (() => {
+        if (!!process.env.VERSION) {
+            return process.env.VERSION;
+        }
+        if (!!process.env.npm_package_version) {
+            return process.env.npm_package_version;
+        }
+        if (!!pkg.version) {
+            return pkg.version;
+        }
+        return '0.0.0';
+    })();
+    /**
+     * check the env which suppose to be hide as possible as it can,
+     * which is not allowed to define in-memory.
+     */
+    if (process.env.AZURE_TENANT_ID === undefined || process.env.AZURE_CLIENT_ID === undefined || process.env.AZURE_CLIENT_SECRET === undefined) {
+        throw new Error('/appConfig/preload: missing Azure configuration');
+    }
+    const envFileAppConfig = {
+        appName,
+        version,
+        environment: exports.environment,
+        keyVaultName: process.env.KEYVAULT_NAME,
+        keyVaultSecretName: process.env.LIBRARY_KEY_VAULT_SECRET_NAME
+    };
+    // check envFileAppConfig
+    const envTypeCheck = zEnvFileAppConfig.safeParse(envFileAppConfig);
+    if (!envTypeCheck.success) {
+        throw new Error('/appConfig/preload: invalid schema of envFileAppConfig');
+    }
+    // check secretFileAppConfig
+    const rawSecretResp = yield (0, lib_1.getKeyVault)(envFileAppConfig.keyVaultName, envFileAppConfig.keyVaultSecretName);
+    if (!rawSecretResp.isSuccess) {
+        throw new Error(rawSecretResp.message);
+    }
+    const secretFileAppConfig = rawSecretResp.data;
+    const secretFileTypeCheck = zSecretFileAppConfig.safeParse(secretFileAppConfig);
+    if (!secretFileTypeCheck.success) {
+        throw new Error('/appConfig/preload: invalid schema of secretFileAppConfig');
+    }
+    exports.appConfig = Object.assign(Object.assign({}, envFileAppConfig), secretFileAppConfig);
+    Object.freeze(exports.appConfig);
+    logger_1.logger.verbose('end /appConfig/preload()');
+});
+exports.loadConfig = loadConfig;
+//# sourceMappingURL=loadConfig.js.map

package/dist/utils/middleware/loadConfig.js.map

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

package/dist/utils/middleware/startdbConnection.js

@@ -11,18 +11,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.startConnection = void 0;
 const typeorm_1 = require("typeorm");
-const dataSourceManager_1 = require("../baseClass/dataSourceManager");
 const appConfig_1 = require("../appConfig");
 const azureKeyVault_1 = require("../../lib/azure/azureKeyVault");
 const logger_1 = require("../logger/logger");
 function startConnection(entities) {
     return __awaiter(this, void 0, void 0, function* () {
         const options = Object.assign(Object.assign({}, JSON.parse(yield (0, azureKeyVault_1.getKey)(appConfig_1.commonAppConfig.SqlConnectionConfigKey))), { synchronize: false, entities: entities });
-        const myDataSource = new typeorm_1.DataSource(options);
         if (appConfig_1.commonAppConfig.SqlEnable) {
-            (0, dataSourceManager_1.createDataSource)(options).then(() => {
+            (0, typeorm_1.createConnection)(options).then((connection) => __awaiter(this, void 0, void 0, function* () {
                 logger_1.logger.info("TypeORM connected");
-            }).catch(error => logger_1.logger.info("TypeORM connection error: ", error));
+            })).catch(error => logger_1.logger.info("TypeORM connection error: ", error));
         }
     });
 }

package/dist/utils/middleware/startdbConnection.js.map

@@ -1 +1 @@
-{"version":3,"file":"startdbConnection.js","sourceRoot":"","sources":["../../../src/utils/middleware/startdbConnection.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAwD;AACxD,sEAAkE;AAClE,4CAA+C;AAC/C,iEAAuD;AACvD,6CAA0C;AAE1C,SAAsB,eAAe,CAAC,QAAe;;QACjD,MAAM,OAAO,mCAEN,IAAI,CAAC,KAAK,CAAC,MAAM,IAAA,sBAAM,EAAC,2BAAe,CAAC,sBAAsB,CAAC,CAAC,KACnE,WAAW,EAAE,KAAK,EAClB,QAAQ,EAAE,QAAQ,GACrB,CAAC;QACF,MAAM,YAAY,GAAG,IAAI,oBAAU,CAAC,OAAO,CAAC,CAAC;QAC7C,IAAI,2BAAe,CAAC,SAAS,EAAE,CAAC;YAC5B,IAAA,oCAAgB,EAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;gBAChC,eAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;YACrC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,eAAM,CAAC,IAAI,CAAC,4BAA4B,EAAE,KAAK,CAAC,CAAC,CAAC;QACxE,CAAC;IACL,CAAC;CAAA;AAbD,0CAaC"}
+{"version":3,"file":"startdbConnection.js","sourceRoot":"","sources":["../../../src/utils/middleware/startdbConnection.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAA8D;AAC9D,4CAA+C;AAC/C,iEAAuD;AACvD,6CAA0C;AAE1C,SAAsB,eAAe,CAAC,QAAe;;QACjD,MAAM,OAAO,mCAEN,IAAI,CAAC,KAAK,CAAC,MAAM,IAAA,sBAAM,EAAC,2BAAe,CAAC,sBAAsB,CAAC,CAAC,KACnE,WAAW,EAAE,KAAK,EAClB,QAAQ,EAAE,QAAQ,GACrB,CAAC;QACF,IAAI,2BAAe,CAAC,SAAS,EAAE;YAC3B,IAAA,0BAAgB,EAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAM,UAAU,EAAC,EAAE;gBAC9C,eAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;YACrC,CAAC,CAAA,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,eAAM,CAAC,IAAI,CAAC,4BAA4B,EAAE,KAAK,CAAC,CAAC,CAAC;SACvE;IACL,CAAC;CAAA;AAZD,0CAYC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skyeye-svc-common-utils",
-  "version": "2.0.0-dev0.18",
+  "version": "2.0.0-dev0.19",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -23,7 +23,7 @@
     "@azure/data-tables": "^13.2.2",
     "@azure/identity": "latest",
     "@azure/keyvault-secrets": "latest",
-    "@azure/service-bus": "7.9.1",
+    "@azure/service-bus": "7.9.2",
     "@azure/storage-blob": "^12.1.2",
     "@azure/storage-queue": "^12.0.2",
     "@sendgrid/mail": "^7.7.0",

package/src/index.ts

@@ -7,10 +7,9 @@ export * from './utils/logger/morganLogger';
 export * from './utils/middleware/handleError';
 export * from './utils/middleware/isPublicUser';
 export * from './utils/middleware/overwriteConst';
-export * from './utils/middleware/startdbConnection';
 export * from './utils/baseClass/baseController';
 export * from './utils/baseClass/baseService';
-export * from './utils/baseClass/dataSourceManager';
+export * from './utils/baseClass/appDataSource';
 export * from './interfaces/index';
 export * from './lib/azure/azureKeyVault';
 export * from './lib/azure/azureServiceBusClient';

package/src/utils/baseClass/appDataSource.ts

@@ -0,0 +1,23 @@
+import { DataSource, DataSourceOptions } from 'typeorm';
+import { logger } from '../logger/logger';
+
+export class AppDataSource {
+
+    private static instance: DataSource;
+
+    private constructor() {}
+
+    public static getInstance() {
+        return AppDataSource.instance;
+    }
+
+    public static async startConnection(options: DataSourceOptions) {
+        if (!AppDataSource.instance) {
+            AppDataSource.instance = new DataSource(options);
+        }
+
+        if (!AppDataSource.instance.isInitialized) {
+            await AppDataSource.instance.initialize();
+        }
+    }
+}

package/src/utils/baseClass/baseController.ts

@@ -7,7 +7,7 @@ import { QueryRunner } from 'typeorm';
 import { commonAppConst } from '../appConst';
 import { commonAppConfig } from '../appConfig';
 import { Mutex } from 'async-mutex';
-import { getDataSource } from './dataSourceManager';
+import { AppDataSource } from './appDataSource';
 
 
 export abstract class BaseController {
@@ -18,8 +18,8 @@ export abstract class BaseController {
         let queryRunner: QueryRunner;
 
         try {
-            const connection = getDataSource();
-            queryRunner = connection.createQueryRunner();
+            // Use queryRunner if transaction is needed
+            queryRunner = AppDataSource.getInstance().createQueryRunner();
             await queryRunner.startTransaction();
 
             return Promise.resolve(queryRunner);
@@ -59,12 +59,12 @@ export abstract class BaseController {
         } catch (err) {
             logger.error(`BaseController/endTransaction: ${err}`);
         } finally {
-            if (!baseControllerParameter.queryRunner.isReleased) {
-                try {
-                    await baseControllerParameter.queryRunner.release();
-                } catch (err) {
-                    logger.error(`BaseController/endTransaction Release Error: ${err}`);
+            try {
+                if (!baseControllerParameter.queryRunner.isReleased) {
+                        await baseControllerParameter.queryRunner.release();
                 }
+            } catch (err) {
+                logger.error(`BaseController/endTransaction Release Error: ${err}`);
             }
         }
     }
@@ -149,7 +149,7 @@ export abstract class BaseController {
                     baseControllerParameter.serviceResponse.isSuccess = false;
                     baseControllerParameter.serviceResponse.error = true;
                     baseControllerParameter.serviceResponse.message = err.message;
-
+                    
                     throw err;
                 });
             }

package/dist/utils/baseClass/dataSourceManager.d.ts

@@ -1,11 +0,0 @@
-import { DataSource, DataSourceOptions } from 'typeorm';
-export declare class DataSourceManager {
-    private static instance;
-    private dataSources;
-    private constructor();
-    static getInstance(): DataSourceManager;
-    createDataSource(name?: string, options?: DataSourceOptions): Promise<DataSource>;
-    getDataSource(dataSourceName?: string): DataSource;
-}
-export declare function getDataSource(dataSourceName?: string): DataSource;
-export declare function createDataSource(options?: DataSourceOptions, name?: string): Promise<DataSource>;

package/dist/utils/baseClass/dataSourceManager.js

@@ -1,59 +0,0 @@
-"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());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createDataSource = exports.getDataSource = exports.DataSourceManager = void 0;
-const typeorm_1 = require("typeorm");
-const logger_1 = require("../logger/logger");
-// to be used instead of getConnectionManager()
-class DataSourceManager {
-    constructor() {
-        this.dataSources = new Map();
-    }
-    static getInstance() {
-        if (!DataSourceManager.instance) {
-            logger_1.logger.info(`##### No DataSource manager instance`);
-            DataSourceManager.instance = new DataSourceManager();
-        }
-        return DataSourceManager.instance;
-    }
-    createDataSource(name = 'default', options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const _options = options;
-            return new Promise((resolve, reject) => {
-                new typeorm_1.DataSource(_options).initialize()
-                    .then((dataSource) => {
-                    logger_1.logger.info(`Data Source Initialize ${name}`);
-                    this.dataSources.set(name, dataSource);
-                    const retrievedData = this.dataSources.get(name);
-                    resolve(retrievedData);
-                })
-                    .catch((e) => {
-                    reject(e);
-                });
-            });
-        });
-    }
-    getDataSource(dataSourceName = 'default') {
-        logger_1.logger.info(`Retrieve data source with name ${dataSourceName}`);
-        return this.dataSources.get(dataSourceName);
-    }
-}
-exports.DataSourceManager = DataSourceManager;
-// to be used instead of getConnection()
-function getDataSource(dataSourceName) {
-    return DataSourceManager.getInstance().getDataSource(dataSourceName);
-}
-exports.getDataSource = getDataSource;
-function createDataSource(options, name) {
-    return DataSourceManager.getInstance().createDataSource(name, options);
-}
-exports.createDataSource = createDataSource;
-//# sourceMappingURL=dataSourceManager.js.map

package/dist/utils/baseClass/dataSourceManager.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"dataSourceManager.js","sourceRoot":"","sources":["../../../src/utils/baseClass/dataSourceManager.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAiG;AACjG,6CAA0C;AAE1C,+CAA+C;AAC/C,MAAa,iBAAiB;IAI1B;QAFQ,gBAAW,GAA4B,IAAI,GAAG,EAAE,CAAC;IAElC,CAAC;IAEjB,MAAM,CAAC,WAAW;QACrB,IAAI,CAAC,iBAAiB,CAAC,QAAQ,EAAE,CAAC;YAC9B,eAAM,CAAC,IAAI,CAAC,sCAAsC,CAAC,CAAC;YACpD,iBAAiB,CAAC,QAAQ,GAAG,IAAI,iBAAiB,EAAE,CAAC;QACzD,CAAC;QACD,OAAO,iBAAiB,CAAC,QAAQ,CAAC;IACtC,CAAC;IAEY,gBAAgB,CAAC,OAAe,SAAS,EAAE,OAA2B;;YAC/E,MAAM,QAAQ,GAAG,OAAO,CAAC;YACzB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBACnC,IAAI,oBAAU,CAAC,QAAQ,CAAC,CAAC,UAAU,EAAE;qBACpC,IAAI,CAAC,CAAC,UAAsB,EAAE,EAAE;oBAC7B,eAAM,CAAC,IAAI,CAAC,0BAA0B,IAAI,EAAE,CAAC,CAAC;oBAC9C,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;oBACvC,MAAM,aAAa,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;oBACjD,OAAO,CAAC,aAAa,CAAC,CAAC;gBAC3B,CAAC,CAAC;qBACD,KAAK,CAAC,CAAC,CAAM,EAAE,EAAE;oBACd,MAAM,CAAC,CAAC,CAAC,CAAC;gBACd,CAAC,CAAC,CAAA;YACN,CAAC,CAAC,CAAC;QACP,CAAC;KAAA;IAEM,aAAa,CAAC,iBAAyB,SAAS;QACnD,eAAM,CAAC,IAAI,CAAC,kCAAkC,cAAc,EAAE,CAAC,CAAC;QAChE,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IAChD,CAAC;CAEJ;AAnCD,8CAmCC;AAED,wCAAwC;AACxC,SAAgB,aAAa,CAAC,cAAuB;IACjD,OAAO,iBAAiB,CAAC,WAAW,EAAE,CAAC,aAAa,CAAC,cAAc,CAAC,CAAC;AACzE,CAAC;AAFD,sCAEC;AAED,SAAgB,gBAAgB,CAAC,OAA2B,EAAE,IAAa;IACvE,OAAO,iBAAiB,CAAC,WAAW,EAAE,CAAC,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AAC3E,CAAC;AAFD,4CAEC"}

package/src/utils/baseClass/dataSourceManager.ts

@@ -1,49 +0,0 @@
-import { DataSource, DataSourceOptions, EntityTarget, ObjectLiteral, Repository } from 'typeorm';
-import { logger } from '../logger/logger';
-
-// to be used instead of getConnectionManager()
-export class DataSourceManager {
-    private static instance: DataSourceManager;
-    private dataSources: Map<string, DataSource> = new Map();
-    
-    private constructor() {}
-    
-    public static getInstance(): DataSourceManager {
-        if (!DataSourceManager.instance) {
-            logger.info(`##### No DataSource manager instance`);
-            DataSourceManager.instance = new DataSourceManager();
-        }
-        return DataSourceManager.instance;
-    }
-
-    public async createDataSource(name: string = 'default', options?: DataSourceOptions): Promise<DataSource> {
-        const _options = options;
-        return new Promise((resolve, reject) => {
-            new DataSource(_options).initialize()
-            .then((dataSource: DataSource) => {
-                logger.info(`Data Source Initialize ${name}`);
-                this.dataSources.set(name, dataSource);
-                const retrievedData = this.dataSources.get(name);
-                resolve(retrievedData);
-            })
-            .catch((e: any) => {
-                reject(e);
-            })
-        });
-    }
-
-    public getDataSource(dataSourceName: string = 'default'): DataSource {
-        logger.info(`Retrieve data source with name ${dataSourceName}`);
-        return this.dataSources.get(dataSourceName);
-    }
-    
-}
-
-// to be used instead of getConnection()
-export function getDataSource(dataSourceName?: string): DataSource {
-    return DataSourceManager.getInstance().getDataSource(dataSourceName);
-}
-
-export function createDataSource(options?: DataSourceOptions, name?: string) {
-    return DataSourceManager.getInstance().createDataSource(name, options);
-}

package/src/utils/middleware/startdbConnection.ts

@@ -1,20 +0,0 @@
-import { DataSourceOptions, DataSource } from 'typeorm';
-import { createDataSource } from '../baseClass/dataSourceManager';
-import { commonAppConfig } from '../appConfig';
-import { getKey } from '../../lib/azure/azureKeyVault';
-import { logger } from '../logger/logger';
-
-export async function startConnection(entities: any[]) {
-    const options: DataSourceOptions =
-    {
-        ...JSON.parse(await getKey(commonAppConfig.SqlConnectionConfigKey)),
-        synchronize: false,
-        entities: entities
-    };
-    const myDataSource = new DataSource(options);
-    if (commonAppConfig.SqlEnable) {
-        createDataSource(options).then(() => {
-            logger.info("TypeORM connected");
-        }).catch(error => logger.info("TypeORM connection error: ", error));
-    }
-}