@brimble/models 1.4.18 → 1.4.20

package/dist/index.d.ts

@@ -12,9 +12,6 @@ export { default as Log } from "./logs";
 export { IUser, IGit, IProject, IFollowing, IIntegration, IEnv, IDomain, IToken, IMember, ITeam, IInstalledIntegration, ILog, } from "./types";
 export { GIT_TYPE, INTEGRATION_TYPE, OAUTH_PERMISSIONS, ENVIRONMENT, ROLES, PROJECT_STATUS, } from "./enum";
 import mongoose from "mongoose";
-export declare const connectToMongo: (mongoUrl: string) => Promise<void>;
+export declare const connectToMongo: (mongoUrl: string, retryCount?: number) => Promise<void>;
 export declare const db: mongoose.Connection;
-export declare const closeMongo: (options?: {
-    restart: boolean;
-    url: string;
-}) => void;
+export declare const closeMongo: () => Promise<void>;

package/dist/index.js

@@ -45,7 +45,7 @@ Object.defineProperty(exports, "PROJECT_STATUS", { enumerable: true, get: functi
 const mongoose_1 = __importDefault(require("mongoose"));
 const utils_1 = require("@brimble/utils");
 // Connection to Mongo
-const connectToMongo = (mongoUrl) => __awaiter(void 0, void 0, void 0, function* () {
+const connectToMongo = (mongoUrl, retryCount) => __awaiter(void 0, void 0, void 0, function* () {
     const options = {
         useNewUrlParser: true,
         useUnifiedTopology: true,
@@ -55,7 +55,15 @@ const connectToMongo = (mongoUrl) => __awaiter(void 0, void 0, void 0, function*
     mongoose_1.default.set("useFindAndModify", false);
     mongoose_1.default.set("useCreateIndex", true);
     // connect to mongo
-    mongoose_1.default.connect(mongoUrl, options);
+    mongoose_1.default.connect(mongoUrl, options).catch((err) => {
+        if (retryCount && retryCount > 0) {
+            setTimeout(() => {
+                (0, exports.connectToMongo)(mongoUrl, retryCount - 1);
+            }, 5000);
+        }
+        else
+            process.exit(1);
+    });
     // listen for connection
     mongoose_1.default.connection.on("connected", () => {
         console.log("Database connection successful 🚀");
@@ -68,10 +76,5 @@ const connectToMongo = (mongoUrl) => __awaiter(void 0, void 0, void 0, function*
 });
 exports.connectToMongo = connectToMongo;
 exports.db = mongoose_1.default.connection;
-const closeMongo = (options) => {
-    if (options === null || options === void 0 ? void 0 : options.restart)
-        mongoose_1.default.connection.close(() => { (0, exports.connectToMongo)(options.url); });
-    else
-        mongoose_1.default.connection.close(true);
-};
+const closeMongo = () => mongoose_1.default.connection.close(true);
 exports.closeMongo = closeMongo;

package/index.ts

@@ -36,7 +36,10 @@ import mongoose from "mongoose";
 import { log } from "@brimble/utils";
 
 // Connection to Mongo
-export const connectToMongo = async (mongoUrl: string): Promise<void> => {
+export const connectToMongo = async (
+  mongoUrl: string,
+  retryCount?: number,
+): Promise<void> => {
   const options = {
     useNewUrlParser: true,
     useUnifiedTopology: true,
@@ -47,7 +50,13 @@ export const connectToMongo = async (mongoUrl: string): Promise<void> => {
   mongoose.set("useCreateIndex", true);
 
   // connect to mongo
-  mongoose.connect(mongoUrl, options);
+  mongoose.connect(mongoUrl, options).catch((err) => {
+    if (retryCount && retryCount > 0) {
+      setTimeout(() => {
+        connectToMongo(mongoUrl, retryCount - 1);
+      }, 5000);
+    } else process.exit(1);
+  });
 
   // listen for connection
   mongoose.connection.on("connected", () => {
@@ -63,7 +72,4 @@ export const connectToMongo = async (mongoUrl: string): Promise<void> => {
 
 export const db = mongoose.connection;
 
-export const closeMongo = (options?: { restart: boolean, url:string }) => {
-  if (options?.restart) mongoose.connection.close(() => { connectToMongo(options.url); });
-  else mongoose.connection.close(true);
-};
+export const closeMongo = () => mongoose.connection.close(true);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brimble/models",
-  "version": "1.4.18",
+  "version": "1.4.20",
   "description": "Brimble models",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",