@heliyos/heliyos-api-core 1.0.11 → 1.0.13

package/dist/env.d.ts

@@ -1 +1 @@
-export declare const loadAppEnv: () => Promise<any>;
+export declare const loadAppEnv: (isSetToEnv?: boolean) => Promise<any>;

package/dist/env.js

@@ -10,9 +10,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadAppEnv = void 0;
+const logger_1 = require("./logger");
 const ssm_1 = require("./ssm");
-const loadAppEnv = () => __awaiter(void 0, void 0, void 0, function* () {
-    const secretsJSON = yield (0, ssm_1.getSecretsManagerSecret)(process.env.ENV_SECRET_NAME);
+const loadAppEnv = (isSetToEnv = true) => __awaiter(void 0, void 0, void 0, function* () {
+    const secretsJSON = (yield (0, ssm_1.getSecretsManagerSecret)(process.env.ENV_SECRET_NAME));
+    if (isSetToEnv) {
+        for (const envKey of Object.keys(secretsJSON)) {
+            process.env[envKey] = secretsJSON[envKey];
+        }
+        logger_1.logger.info(`Environment variables loaded successfully.`);
+    }
     return secretsJSON;
 });
 exports.loadAppEnv = loadAppEnv;

package/dist/index.d.ts

@@ -3,6 +3,7 @@ export { core_app } from "./app";
 export { core_axios as axios } from "./axios";
 export { core_knex, core_replica_knex } from "./knex";
 export { validate, joiObject } from "./validate";
+export { loadAppEnv } from "./env";
 export { auth_policy } from "./static/auth_policy_file";
 export { database_config } from "./knexfile";
 export { authorize_user } from "./authorization";
@@ -11,7 +12,6 @@ export { SQSUtil } from "./sqs";
 export { logger } from "./logger";
 export { allowed_origin } from "./allowed_origin";
 export { getEmailTemplate, emailTemplates } from "./email";
-export { loadAppEnv } from "./env";
 export { pusher, pusherTrigger, pusherTriggerBatch } from "./pusher";
 export { resendSendEmail } from "./resend";
 export { getSecretsManagerSecret } from "./ssm";

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.loadAppEnv = exports.emailTemplates = exports.getEmailTemplate = exports.allowed_origin = exports.logger = exports.SQSUtil = exports.createRedisClient = exports.authorize_user = exports.database_config = exports.auth_policy = exports.joiObject = exports.validate = exports.core_replica_knex = exports.core_knex = exports.axios = exports.core_app = exports.authentication = void 0;
+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;
 const dotenv = __importStar(require("dotenv"));
 dotenv.config();
 // Core exports
@@ -39,6 +39,8 @@ Object.defineProperty(exports, "core_replica_knex", { enumerable: true, get: fun
 var validate_1 = require("./validate");
 Object.defineProperty(exports, "validate", { enumerable: true, get: function () { return validate_1.validate; } });
 Object.defineProperty(exports, "joiObject", { enumerable: true, get: function () { return validate_1.joiObject; } });
+var env_1 = require("./env");
+Object.defineProperty(exports, "loadAppEnv", { enumerable: true, get: function () { return env_1.loadAppEnv; } });
 var auth_policy_file_1 = require("./static/auth_policy_file");
 Object.defineProperty(exports, "auth_policy", { enumerable: true, get: function () { return auth_policy_file_1.auth_policy; } });
 var knexfile_1 = require("./knexfile");
@@ -57,8 +59,6 @@ Object.defineProperty(exports, "allowed_origin", { enumerable: true, get: functi
 var email_1 = require("./email");
 Object.defineProperty(exports, "getEmailTemplate", { enumerable: true, get: function () { return email_1.getEmailTemplate; } });
 Object.defineProperty(exports, "emailTemplates", { enumerable: true, get: function () { return email_1.emailTemplates; } });
-var env_1 = require("./env");
-Object.defineProperty(exports, "loadAppEnv", { enumerable: true, get: function () { return env_1.loadAppEnv; } });
 var pusher_1 = require("./pusher");
 Object.defineProperty(exports, "pusher", { enumerable: true, get: function () { return pusher_1.pusher; } });
 Object.defineProperty(exports, "pusherTrigger", { enumerable: true, get: function () { return pusher_1.pusherTrigger; } });

package/dist/mongoose.d.ts

@@ -16,7 +16,7 @@ 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, connection?: Connection | Promise<Connection>) => mongoose.Model<T, {}, {}, {}, mongoose.IfAny<T, any, mongoose.Document<unknown, {}, T> & mongoose.Default__v<mongoose.Require_id<T>>>, any>;
+export declare const createModel: <T extends mongoose.Document<unknown, any, any>>(name: string, schema: Schema, connection?: Connection | Promise<Connection>) => mongoose.Model<T, {}, {}, {}, mongoose.IfAny<T, any, mongoose.Document<unknown, {}, T> & mongoose.Default__v<mongoose.Require_id<T>>>, any> | Promise<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?: {
         filter: mongoose.FilterQuery<T>;

package/dist/mongoose.js

@@ -10,6 +10,18 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     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 __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 __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
@@ -22,12 +34,9 @@ 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.closeConnections = exports.checkDatabaseHealth = exports.upsertDocument = exports.safeDelete = exports.withTransaction = exports.ensureIndexes = exports.createBulkOperations = exports.createModel = exports.mongooseReplicaConnection = exports.mongooseConnection = void 0;
-const mongoose_1 = __importDefault(require("mongoose"));
+const mongoose_1 = __importStar(require("mongoose"));
 const ssm_1 = require("./ssm");
 const logger_1 = require("./logger");
 // Export commonly used mongoose types
@@ -35,7 +44,11 @@ __exportStar(require("mongoose"), exports);
 // Cache connections
 let cachedConnection;
 let cachedReplicaConnection;
-const connectionOptions = {};
+const connectionOptions = {
+    serverSelectionTimeoutMS: 5000,
+    socketTimeoutMS: 45000,
+    retryWrites: true,
+};
 const mongooseConnected = () => __awaiter(void 0, void 0, void 0, function* () {
     if (cachedConnection) {
         logger_1.logger.info("Cached MongoDB Connection");
@@ -54,6 +67,10 @@ const mongooseConnected = () => __awaiter(void 0, void 0, void 0, function* () {
         logger_1.logger.info(`Failed to get mongoose configuration for env:${nodeEnv}`);
         return null;
     }
+    if (!mongoUrl) {
+        logger_1.logger.info("MONGO_DATABASE_URL not set");
+        return null;
+    }
     logger_1.logger.info("New MongoDB Connection");
     const connection = mongoose_1.default.createConnection(mongoUrl, connectionOptions);
     connection.on("error", (err) => {
@@ -71,10 +88,6 @@ const replicaMongooseConnected = () => __awaiter(void 0, void 0, void 0, functio
     let replicaUrl;
     if (nodeEnv === "local") {
         replicaUrl = process.env.MONGO_REPLICA_DATABASE_URL;
-        if (!replicaUrl) {
-            logger_1.logger.info("MONGO_REPLICA_DATABASE_URL not set");
-            return null;
-        }
     }
     else if (["development", "production"].includes(nodeEnv)) {
         const secrets = yield (0, ssm_1.getSecretsManagerSecret)(process.env.ENV_SECRET_NAME);
@@ -84,6 +97,10 @@ const replicaMongooseConnected = () => __awaiter(void 0, void 0, void 0, functio
         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 = mongoose_1.default.createConnection(replicaUrl, connectionOptions);
     connection.on("error", (err) => {
@@ -111,8 +128,33 @@ exports.mongooseConnection = mongooseConnected();
 exports.mongooseReplicaConnection = replicaMongooseConnected();
 // Helper for creating typed models
 const createModel = (name, schema, connection = exports.mongooseConnection) => {
-    const conn = connection instanceof Promise ? cachedConnection : connection;
-    return conn.model(name, schema);
+    // Add debug logging
+    logger_1.logger.info(`Creating model ${name}`);
+    // If we already have a cached connection, use it synchronously
+    if (connection instanceof mongoose_1.Connection) {
+        try {
+            logger_1.logger.info(`Using existing connection for model ${name}`);
+            return connection.model(name, schema);
+        }
+        catch (error) {
+            logger_1.logger.info(`Error creating model ${name}:`, error);
+            return null;
+        }
+    }
+    // Otherwise, handle it asynchronously
+    return Promise.resolve(connection)
+        .then((conn) => {
+        if (!conn) {
+            logger_1.logger.info(`Database connection not established for model: ${name}`);
+            return null;
+        }
+        logger_1.logger.info(`Creating model ${name} with async connection`);
+        return conn.model(name, schema);
+    })
+        .catch((error) => {
+        logger_1.logger.info(`Error creating model ${name}:`, error);
+        return null;
+    });
 };
 exports.createModel = createModel;
 // Helper for bulk operations with better typing

package/package.json

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