@heliyos/heliyos-api-core 1.0.17 → 1.0.18

package/dist/index.d.ts

@@ -20,4 +20,4 @@ export type { BaseError, CustomAxiosError } from "./@types/globals/customError";
 export { HttpError } from "./@types/globals/customError";
 export type { ICoreAppOptions } from "./@types/globals/middleware";
 export type { RolesPermissionsType, ResourcePolicyActionsType, } from "./static/auth_policy_file";
-export { Schema, Document, Model, FilterQuery, UpdateQuery, Connection, Pagination, Types, createModel, mongooseConnection, mongooseReplicaConnection, createBulkOperations, ensureIndexes, closeConnections, withTransaction, upsertDocument, checkDatabaseHealth, safeDelete, } from "./mongoose";
+export { Schema, Document, Model, FilterQuery, UpdateQuery, Connection, Pagination, Types, createModel, mongooseConnection, createBulkOperations, ensureIndexes, closeConnections, withTransaction, upsertDocument, safeDelete, } from "./mongoose";

package/dist/index.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.safeDelete = exports.checkDatabaseHealth = exports.upsertDocument = exports.withTransaction = exports.closeConnections = exports.ensureIndexes = exports.createBulkOperations = exports.mongooseReplicaConnection = exports.mongooseConnection = exports.createModel = exports.Types = exports.Connection = exports.Model = exports.Document = exports.Schema = exports.HttpError = exports.getSecretsManagerSecret = exports.resendSendEmail = exports.pusherTriggerBatch = exports.pusherTrigger = exports.pusher = exports.emailTemplates = exports.getEmailTemplate = exports.allowed_origin = exports.logger = exports.SQSUtil = exports.createRedisClient = exports.authorize_user = exports.database_config = exports.auth_policy = exports.loadAppEnv = exports.joiObject = exports.validate = exports.core_replica_knex = exports.core_knex = exports.axios = exports.core_app = exports.authentication = void 0;
+exports.safeDelete = exports.upsertDocument = exports.withTransaction = exports.closeConnections = exports.ensureIndexes = exports.createBulkOperations = exports.mongooseConnection = exports.createModel = exports.Types = exports.Connection = exports.Model = exports.Document = exports.Schema = exports.HttpError = exports.getSecretsManagerSecret = exports.resendSendEmail = exports.pusherTriggerBatch = exports.pusherTrigger = exports.pusher = exports.emailTemplates = exports.getEmailTemplate = exports.allowed_origin = exports.logger = exports.SQSUtil = exports.createRedisClient = exports.authorize_user = exports.database_config = exports.auth_policy = exports.loadAppEnv = exports.joiObject = exports.validate = exports.core_replica_knex = exports.core_knex = exports.axios = exports.core_app = exports.authentication = void 0;
 const dotenv = __importStar(require("dotenv"));
 dotenv.config();
 // Core exports
@@ -78,11 +78,9 @@ Object.defineProperty(exports, "Connection", { enumerable: true, get: function (
 Object.defineProperty(exports, "Types", { enumerable: true, get: function () { return mongoose_1.Types; } });
 Object.defineProperty(exports, "createModel", { enumerable: true, get: function () { return mongoose_1.createModel; } });
 Object.defineProperty(exports, "mongooseConnection", { enumerable: true, get: function () { return mongoose_1.mongooseConnection; } });
-Object.defineProperty(exports, "mongooseReplicaConnection", { enumerable: true, get: function () { return mongoose_1.mongooseReplicaConnection; } });
 Object.defineProperty(exports, "createBulkOperations", { enumerable: true, get: function () { return mongoose_1.createBulkOperations; } });
 Object.defineProperty(exports, "ensureIndexes", { enumerable: true, get: function () { return mongoose_1.ensureIndexes; } });
 Object.defineProperty(exports, "closeConnections", { enumerable: true, get: function () { return mongoose_1.closeConnections; } });
 Object.defineProperty(exports, "withTransaction", { enumerable: true, get: function () { return mongoose_1.withTransaction; } });
 Object.defineProperty(exports, "upsertDocument", { enumerable: true, get: function () { return mongoose_1.upsertDocument; } });
-Object.defineProperty(exports, "checkDatabaseHealth", { enumerable: true, get: function () { return mongoose_1.checkDatabaseHealth; } });
 Object.defineProperty(exports, "safeDelete", { enumerable: true, get: function () { return mongoose_1.safeDelete; } });

package/dist/knex.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 };
 };
@@ -15,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.core_replica_knex = exports.core_knex = void 0;
 const knexfile_1 = require("./knexfile");
 const logger_1 = require("./logger");
-const ssm_1 = require("./ssm");
 const knex_1 = __importDefault(require("knex"));
 const Builder = require("knex/lib/query/querybuilder");
 //	Create Knex connection based on the environment
@@ -34,6 +24,10 @@ const knex_connected = () => {
         logger_1.logger.error(`Failed to get knex configuration for env:${process.env.NODE_ENV}`);
         return null;
     }
+    if (!process.env.POSTGRES_DATABASE_URL) {
+        logger_1.logger.error(`POSTGRES_DATABASE_URL not set, cannot establish connection`);
+        return null;
+    }
     logger_1.logger.info("New Connection");
     const connection = (0, knex_1.default)(cachedConfigEnvironment || configByEnvironment);
     cachedConnection = connection;
@@ -49,23 +43,11 @@ const replica_knex_connected = () => {
         logger_1.logger.error(`Failed to get knex configuration for env:${process.env.NODE_ENV}`);
         return null;
     }
-    if (process.env.NODE_ENV === "local") {
-        if (process.env.REPLICA_DATABASE_URL) {
-            configByEnvironment.connection = process.env.REPLICA_DATABASE_URL;
-        }
-        else {
-            logger_1.logger.info(`REPLICA_DATABASE_URL not set, cannot establish replica connection`);
-            return null;
-        }
-    }
-    else if (["development", "production"].includes(process.env.NODE_ENV)) {
-        configByEnvironment.connection = () => __awaiter(void 0, void 0, void 0, function* () {
-            const ENV_SECRETS = yield (0, ssm_1.getSecretsManagerSecret)(process.env.ENV_SECRET_NAME);
-            return ENV_SECRETS.REPLICA_DATABASE_URL;
-        });
+    if (process.env.POSTGRES_REPLICA_DATABASE_URL) {
+        configByEnvironment.connection = process.env.POSTGRES_REPLICA_DATABASE_URL;
     }
     else {
-        logger_1.logger.info(`Replica not supported for this NODE_ENV=${process.env.NODE_ENV}`);
+        logger_1.logger.info(`POSTGRES_REPLICA_DATABASE_URL not set, cannot establish replica connection`);
         return null;
     }
     logger_1.logger.info("New Replica Connection");

package/dist/knexfile.js

@@ -1,29 +1,12 @@
 "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 _a, _b;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.database_config = void 0;
-const ssm_1 = require("./ssm");
-const getSecrets = (isTest = false) => __awaiter(void 0, void 0, void 0, function* () {
-    const ENV_SECRETS = yield (0, ssm_1.getSecretsManagerSecret)(process.env.ENV_SECRET_NAME);
-    if (isTest) {
-        return ENV_SECRETS.TEST_DATABASE_URL;
-    }
-    return ENV_SECRETS.DATABASE_URL;
-});
 //	Config settings for Knex
-const DATABASE_URL = process.env.DATABASE_URL;
-const TEST_DATABASE_URL = process.env.TEST_DATABASE_URL;
-const CONNECTION_POOL_MIN = parseInt((_a = process.env.CONNECTION_POOL_MIN) !== null && _a !== void 0 ? _a : "1", 10);
-const CONNECTION_POOL_MAX = parseInt((_b = process.env.CONNECTION_POOL_MAX) !== null && _b !== void 0 ? _b : "10", 10);
+const DATABASE_URL = process.env.POSTGRES_DATABASE_URL;
+const TEST_DATABASE_URL = process.env.POSTGRES_TEST_DATABASE_URL;
+const CONNECTION_POOL_MIN = parseInt((_a = process.env.POSTGRES_CONNECTION_POOL_MIN) !== null && _a !== void 0 ? _a : "1", 10);
+const CONNECTION_POOL_MAX = parseInt((_b = process.env.POSTGRES_CONNECTION_POOL_MAX) !== null && _b !== void 0 ? _b : "10", 10);
 const config = {
     local: {
         client: "postgresql",
@@ -39,7 +22,7 @@ const config = {
     },
     development: {
         client: "postgresql",
-        connection: () => __awaiter(void 0, void 0, void 0, function* () { return yield getSecrets(); }),
+        connection: DATABASE_URL,
         ssl: true,
         migrations: {
             tableName: "knex_migrations",
@@ -51,7 +34,7 @@ const config = {
     },
     staging: {
         client: "postgresql",
-        connection: () => __awaiter(void 0, void 0, void 0, function* () { return yield getSecrets(); }),
+        connection: DATABASE_URL,
         ssl: true,
         migrations: {
             tableName: "knex_migrations",
@@ -63,7 +46,7 @@ const config = {
     },
     production: {
         client: "postgresql",
-        connection: () => __awaiter(void 0, void 0, void 0, function* () { return yield getSecrets(); }),
+        connection: DATABASE_URL,
         ssl: true,
         migrations: {
             tableName: "knex_migrations",

package/dist/mongoose.d.ts

@@ -15,7 +15,6 @@ declare module "mongoose" {
     }
 }
 export declare const mongooseConnection: Promise<mongoose.Connection>;
-export declare const mongooseReplicaConnection: Promise<mongoose.Connection>;
 export declare const createModel: <T extends mongoose.Document<unknown, any, any>>(name: string, schema: Schema) => mongoose.Model<T, {}, {}, {}, mongoose.IfAny<T, any, mongoose.Document<unknown, {}, T> & mongoose.Default__v<mongoose.Require_id<T>>>, any>;
 export declare const createBulkOperations: <T>(operations: {
     updateOne?: {
@@ -38,8 +37,4 @@ export declare const ensureIndexes: (models: Model<any>[]) => Promise<void>;
 export declare const withTransaction: <T>(callback: (session: mongoose.ClientSession) => Promise<T>) => Promise<T>;
 export declare const safeDelete: <T extends mongoose.Document<unknown, any, any>>(model: mongoose.Model<T, {}, {}, {}, mongoose.IfAny<T, any, mongoose.Document<unknown, {}, T> & mongoose.Default__v<mongoose.Require_id<T>>>, any>, filter: mongoose.FilterQuery<T>) => Promise<boolean>;
 export declare const upsertDocument: <T extends mongoose.Document<unknown, any, any>>(model: mongoose.Model<T, {}, {}, {}, mongoose.IfAny<T, any, mongoose.Document<unknown, {}, T> & mongoose.Default__v<mongoose.Require_id<T>>>, any>, filter: mongoose.FilterQuery<T>, update: mongoose.UpdateQuery<T>) => Promise<T>;
-export declare const checkDatabaseHealth: () => Promise<{
-    primary: boolean;
-    replica: boolean;
-}>;
 export declare const closeConnections: () => Promise<void>;

package/dist/mongoose.js

@@ -26,9 +26,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.closeConnections = exports.checkDatabaseHealth = exports.upsertDocument = exports.safeDelete = exports.withTransaction = exports.ensureIndexes = exports.createBulkOperations = exports.createModel = exports.mongooseReplicaConnection = exports.mongooseConnection = void 0;
+exports.closeConnections = exports.upsertDocument = exports.safeDelete = exports.withTransaction = exports.ensureIndexes = exports.createBulkOperations = exports.createModel = exports.mongooseConnection = void 0;
 const mongoose_1 = __importDefault(require("mongoose"));
-const ssm_1 = require("./ssm");
 const logger_1 = require("./logger");
 // Export commonly used mongoose types
 __exportStar(require("mongoose"), exports);
@@ -36,21 +35,9 @@ __exportStar(require("mongoose"), exports);
 let cachedConnection;
 let cachedReplicaConnection;
 const connectionOptions = {
-    // Timeouts
-    serverSelectionTimeoutMS: 60000,
-    connectTimeoutMS: 60000,
-    socketTimeoutMS: 360000,
     // Connection pool settings
-    maxPoolSize: 10,
-    minPoolSize: 1,
-    // Heartbeat monitoring
-    heartbeatFrequencyMS: 10000,
-    // Modern reliability settings
-    retryWrites: true,
-    retryReads: true,
-    // Required for newer MongoDB versions
-    useNewUrlParser: true,
-    useUnifiedTopology: true,
+    maxPoolSize: parseInt(process.env.MONGO_MAX_POOL_SIZE || "10", 10) || 10,
+    minPoolSize: parseInt(process.env.MONGO_MIN_POOL_SIZE || "1", 10) || 1,
 };
 const MAX_RETRY_ATTEMPTS = 10; // Increased from 5
 const INITIAL_RETRY_DELAY = 2000; // Increased from 1000
@@ -82,7 +69,7 @@ const connectWithRetry = (mongoUrl, attempt = 1) => __awaiter(void 0, void 0, vo
                 connection.once("connected", () => resolve());
                 connection.once("error", (err) => reject(err));
             }),
-            new Promise((_, reject) => setTimeout(() => reject(new Error("Connection timeout")), connectionOptions.connectTimeoutMS)),
+            new Promise((_, reject) => setTimeout(() => reject(new Error("Connection timeout")), 60000)),
         ]);
         return connection;
     }
@@ -121,21 +108,15 @@ const mongooseConnected = () => __awaiter(void 0, void 0, void 0, function* () {
         }
         let mongoUrl;
         const nodeEnv = process.env.NODE_ENV;
-        if (nodeEnv === "local") {
+        if (process.env.MONGO_DATABASE_URL) {
             mongoUrl = process.env.MONGO_DATABASE_URL || "";
             // Add logging to debug URL
         }
-        else if (["development", "production"].includes(nodeEnv)) {
-            const secrets = yield (0, ssm_1.getSecretsManagerSecret)(process.env.ENV_SECRET_NAME);
-            mongoUrl = secrets.MONGO_DATABASE_URL;
-        }
         else {
             logger_1.logger.error(`Invalid NODE_ENV: ${nodeEnv}`);
             return null;
         }
-        if (nodeEnv === "development") {
-            logger_1.logger.info(`Connecting to MongoDB URL: ${mongoUrl === null || mongoUrl === void 0 ? void 0 : mongoUrl.replace(/\/\/[^@]*@/, "//****:****@")}`);
-        }
+        logger_1.logger.info(`Connecting to MongoDB URL: ${mongoUrl === null || mongoUrl === void 0 ? void 0 : mongoUrl.replace(/\/\/[^@]*@/, "//****:****@")}`);
         if (!mongoUrl) {
             logger_1.logger.error("MONGO_DATABASE_URL not set");
             return null;
@@ -178,40 +159,6 @@ const mongooseConnected = () => __awaiter(void 0, void 0, void 0, function* () {
         return null;
     }
 });
-const replicaMongooseConnected = () => __awaiter(void 0, void 0, void 0, function* () {
-    if (cachedReplicaConnection) {
-        logger_1.logger.info("Cached MongoDB Replica Connection");
-        return cachedReplicaConnection;
-    }
-    const nodeEnv = process.env.NODE_ENV;
-    let replicaUrl;
-    if (nodeEnv === "local") {
-        replicaUrl = process.env.MONGO_REPLICA_DATABASE_URL;
-    }
-    else if (["development", "production"].includes(nodeEnv)) {
-        const secrets = yield (0, ssm_1.getSecretsManagerSecret)(process.env.ENV_SECRET_NAME);
-        replicaUrl = secrets.MONGO_REPLICA_DATABASE_URL;
-    }
-    else {
-        logger_1.logger.info(`Failed to get mongoose configuration for env:${nodeEnv}`);
-        return null;
-    }
-    if (!replicaUrl) {
-        logger_1.logger.info("MONGO_REPLICA_DATABASE_URL not set");
-        return null;
-    }
-    logger_1.logger.info("New MongoDB Replica Connection");
-    const connection = yield connectWithRetry(replicaUrl);
-    if (!connection) {
-        logger_1.logger.error("Failed to establish MongoDB replica connection after retries");
-        return null;
-    }
-    connection.on("error", (err) => {
-        console.error("MongoDB replica connection error:", err);
-    });
-    cachedReplicaConnection = connection;
-    return connection;
-});
 mongoose_1.default.Query.prototype.paginate = function (page = 1, limit = 10) {
     return __awaiter(this, void 0, void 0, function* () {
         const offset = (page - 1) * limit;
@@ -228,7 +175,7 @@ mongoose_1.default.Query.prototype.paginate = function (page = 1, limit = 10) {
 };
 // Initialize and export connections
 exports.mongooseConnection = mongooseConnected();
-exports.mongooseReplicaConnection = replicaMongooseConnected();
+// export const mongooseReplicaConnection = replicaMongooseConnected();
 // Helper for creating typed models
 const createModel = (name, schema) => {
     logger_1.logger.info(`Creating model ${name}`);
@@ -308,21 +255,6 @@ const upsertDocument = (model, filter, update) => __awaiter(void 0, void 0, void
     return model.findOneAndUpdate(filter, update, { upsert: true, new: true });
 });
 exports.upsertDocument = upsertDocument;
-// Connection health check utility
-const checkDatabaseHealth = () => __awaiter(void 0, void 0, void 0, function* () {
-    try {
-        const [primary, replica] = yield Promise.all([
-            exports.mongooseConnection.then((conn) => conn.readyState === mongoose_1.default.ConnectionStates.connected),
-            exports.mongooseReplicaConnection.then((conn) => { var _a; return (_a = (conn === null || conn === void 0 ? void 0 : conn.readyState) === mongoose_1.default.ConnectionStates.connected) !== null && _a !== void 0 ? _a : false; }),
-        ]);
-        return { primary, replica };
-    }
-    catch (error) {
-        console.error("Database health check failed:", error);
-        return { primary: false, replica: false };
-    }
-});
-exports.checkDatabaseHealth = checkDatabaseHealth;
 // Graceful shutdown helper
 const closeConnections = () => __awaiter(void 0, void 0, void 0, function* () {
     try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@heliyos/heliyos-api-core",
-  "version": "1.0.17",
+  "version": "1.0.18",
   "description": "Heliyos's core api functions and middlewares. Its a private package hosted on npm.",
   "main": "./dist/index.js",
   "scripts": {