mielk-api 1.3.1 → 1.3.3

package/dist/db/mssql/connection/pool.js

@@ -4,6 +4,7 @@ let connectionString = '';
 export const initDb = (dbConfig) => {
     const { host, database, user, password, driver } = dbConfig;
     connectionString = `Server=${host};Database=${database};UID=${user};PWD=${password};Driver=${driver}`;
+    console.log(connectionString);
 };
 export const query = (queryText) => {
     return new Promise((resolve, reject) => {

package/dist/db/pg/connection/pool.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import { Msg } from '../../../internal/messaging/messageTags.js';
 import { Pool } from 'pg';
 import { openSshTunnel } from './tunnel.js';
-import { isProd } from '../../../express.js';
+import { isProd } from '../../../routing/express.js';
 let pool = null;
 let config = null;
 export const initDb = (dbConfig) => {

package/dist/http/apiResponse/apiResponse.js

@@ -1,6 +1,6 @@
 import { isObject, isPrimitive } from 'mielk-fn/variables';
 import { HttpResponseStatus } from '../httpResponseStatus/HttpResponseStatus.js';
-import { isProd } from '../../express.js';
+import { isProd } from '../../routing/express.js';
 export function success(res, status, data) {
     const apiResponse = {
         success: true,

package/dist/index.d.ts

@@ -3,4 +3,4 @@ export * as mssql from './db/mssql/index.js';
 export * as http from './http/index.js';
 export { dbRouter } from './routing/routes/db.route.js';
 export { healthRouter } from './routing/routes/health.route.js';
-export { createExpressApp } from './express.js';
+export { createExpressApp } from './routing/express.js';

package/dist/index.js

@@ -3,4 +3,4 @@ export * as mssql from './db/mssql/index.js';
 export * as http from './http/index.js';
 export { dbRouter } from './routing/routes/db.route.js';
 export { healthRouter } from './routing/routes/health.route.js';
-export { createExpressApp } from './express.js';
+export { createExpressApp } from './routing/express.js';

package/dist/middlewares/cors/cors.js

@@ -1,4 +1,4 @@
-import { isProd } from "../../express.js";
+import { isProd } from "../../routing/express.js";
 const corsConfig = {
     allowedOrigins: '',
     apiKey: ''

package/dist/middlewares/requestAuth/auth.middleware.js

@@ -1,6 +1,6 @@
 import { HttpResponseStatus } from '../../http/httpResponseStatus/HttpResponseStatus.js';
 import { Msg } from '../../internal/messaging/messageTags.js';
-import { isProd } from '../../express.js';
+import { isProd } from '../../routing/express.js';
 import { failure } from '../../http/index.js';
 import { apiKey } from '../cors/cors.js';
 export function apiKeyAuthorization(req, res, next) {

package/dist/routing/DbProvider.d.ts

@@ -0,0 +1 @@
+export type DbProvider = 'postgre' | 'mssql' | undefined;

package/dist/routing/DbProvider.js

@@ -0,0 +1 @@
+export {};

package/dist/routing/controllers/health.controller.js

@@ -1,5 +1,5 @@
 import { HttpResponseStatus, success } from '../../http/index.js';
-import { isProd } from '../../express.js';
+import { isProd } from '../express.js';
 export const getHealth = (_req, res) => {
     return success(res, HttpResponseStatus.OK, new Date().toISOString());
 };

package/dist/{express.d.ts → routing/express.d.ts}

@@ -1,6 +1,8 @@
-import { PostgreDbConfig } from './db/pg/index.js';
-import { MsSqlDbConfig } from './db/mssql/index.js';
-import { CorsConfig, RateLimitConfig } from './middlewares/index.js';
+import { PostgreDbConfig } from '../db/pg/index.js';
+import { MsSqlDbConfig } from '../db/mssql/index.js';
+import { CorsConfig, RateLimitConfig } from '../middlewares/index.js';
+import { DbProvider } from './DbProvider.js';
 export type DbConfig = PostgreDbConfig | MsSqlDbConfig;
 export declare const createExpressApp: (isProd: boolean, dbConfig: DbConfig, corsConfig: CorsConfig, rateLimitConfig?: RateLimitConfig) => import("express-serve-static-core").Express;
 export declare const isProd: () => boolean;
+export declare const getDbProvider: () => DbProvider;

package/dist/{express.js → routing/express.js}

@@ -1,13 +1,15 @@
 import express from 'express';
-import { initDb as postgreInitDb } from './db/pg/index.js';
-import { initDb as msSqlInitDb } from './db/mssql/index.js';
-import { initCors, setRateLimit } from './middlewares/index.js';
+import { initDb as postgreInitDb } from '../db/pg/index.js';
+import { initDb as msSqlInitDb } from '../db/mssql/index.js';
+import { initCors, setRateLimit } from '../middlewares/index.js';
 const env = {
-    isProd: true
+    isProd: true,
+    provider: undefined
 };
 export const createExpressApp = (isProd, dbConfig, corsConfig, rateLimitConfig) => {
     const app = express();
     env.isProd = isProd;
+    env.provider = dbConfig.provider;
     switch (dbConfig.provider) {
         case 'mssql':
             msSqlInitDb(dbConfig);
@@ -22,3 +24,4 @@ export const createExpressApp = (isProd, dbConfig, corsConfig, rateLimitConfig)
     return app;
 };
 export const isProd = () => env.isProd;
+export const getDbProvider = () => env.provider;

package/dist/routing/repositories/mssql.repository.d.ts

@@ -0,0 +1,2 @@
+export declare function selectDatabaseTime(): Promise<Date>;
+export declare function selectDatabaseVersion(): Promise<string>;

package/dist/routing/repositories/mssql.repository.js

@@ -0,0 +1,29 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+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());
+    });
+};
+import { query } from '../../db/mssql/connection/pool.js';
+export function selectDatabaseTime() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const field = 'timestamp';
+        const rows = yield query(`SELECT SYSDATETIME() AS [${field}]`);
+        const row = rows[0];
+        const value = row[field];
+        return value;
+    });
+}
+export function selectDatabaseVersion() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const field = 'version';
+        const rows = yield query(`SELECT @@VERSION AS [${field}]`);
+        const row = rows[0];
+        const value = row[field];
+        return value;
+    });
+}

package/dist/routing/services/db.service.js

@@ -7,14 +7,27 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import * as dbRepository from '../repositories/db.repository.js';
+import * as postgreRepository from '../repositories/postgre.repository.js';
+import * as msSqlRepository from '../repositories/mssql.repository.js';
+import { getDbProvider } from '../express.js';
+import { Msg } from '../../internal/messaging/messageTags.js';
 export function getDatabaseTime() {
     return __awaiter(this, void 0, void 0, function* () {
-        return dbRepository.selectDatabaseTime();
+        const provider = getDbProvider();
+        const repository = provider === 'postgre' ? postgreRepository : provider === 'mssql' ? msSqlRepository : undefined;
+        if (repository) {
+            return repository.selectDatabaseTime();
+        }
+        throw new Error(Msg.connection.notInitialized);
     });
 }
 export function getDatabaseVersion() {
     return __awaiter(this, void 0, void 0, function* () {
-        return dbRepository.selectDatabaseVersion();
+        const provider = getDbProvider();
+        const repository = provider === 'postgre' ? postgreRepository : provider === 'mssql' ? msSqlRepository : undefined;
+        if (repository) {
+            return repository.selectDatabaseVersion();
+        }
+        throw new Error(Msg.connection.notInitialized);
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "mielk-api",
-	"version": "1.3.1",
+	"version": "1.3.3",
 	"keywords": [],
 	"author": "mielk",
 	"description": "Wrapper for API operations",