@hvedinich/db 0.0.7 → 0.0.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hvedinich/db",
-  "version": "0.0.7",
+  "version": "0.0.9",
   "description": "db",
   "main": "index.js",
   "scripts": {

package/src/index.js

@@ -1,9 +1,11 @@
 const mongoose = require('mongoose');
 const migration = require('./migration');
 
-const init = config => {
+const init = ({ config, setStatus }) => {
   const db = mongoose.connection;
-  const retry = 0;
+  let retry = 0;
+  const maxCount = 10;
+
   const state = { connected: false };
   const opt = {
     useNewUrlParser: true,
@@ -13,29 +15,49 @@ const init = config => {
     useUnifiedTopology: true,
     useFindAndModify: false,
   };
-  mongoose.connect(config.mongo.url, opt);
+
+  mongoose.connect(config.mongo.url, opt).catch(err => {
+    if (retry >= maxCount) {
+      setStatus(false);
+    }
+    console.log(`consction error: ${err}`);
+  });
+
   db.on('disconnected', async () => {
+    console.log(`Can not connect to mongo retry: ${retry}`);
     state.connected = false;
-    if (retry < 10) {
+    if (retry < maxCount) {
+      retry = retry + 1;
       await new Promise(res => setTimeout(res, 1000));
-      await mongoose.connect(config.mongo.url, opt);
+      try {
+        await mongoose.connect(config.mongo.url, opt);
+      } catch (err) {
+        if (retry >= maxCount) {
+          setStatus(false);
+        }
+        console.log(`retry error: ${err?.message || JSON.stringify(err)}`);
+      }
+    }
+    if (retry >= maxCount) {
+      setStatus(false);
     }
-    console.log('Can not connect to mongo');
   });
 
   db.on('error', () => {
     console.log('connection error:');
     mongoose.disconnect();
   });
-  db.once('open', () => {
+  db.on('open', () => {
     console.log(`Mongo conected to ${config.mongo.url}`);
     state.connected = true;
+    setStatus(true);
+    retry = 0;
   });
 
   const createModel = ({ name, schema }) => mongoose.model(name, schema);
 
   const runMigrations = (migrations, log = console) =>
-    migration.run(createModel, config.serviceName, migrations, log, state);
+    migration.run(createModel, config.serviceName, migrations, log, state, setStatus);
 
   return {
     createModel,

package/src/migration/index.js

@@ -1,13 +1,18 @@
 /* eslint-disable no-await-in-loop */
 const schema = require('./schema');
 
-const run = async (createModel, serviceName, migrations = [], log, state) => {
+const run = async (createModel, serviceName, migrations = [], log, state, setStatus) => {
   log.debug('Migration: waiting for connection');
+  let count = 0;
+  const maxCount = 60;
 
   while (!state.connected) {
+    count += 1;
+    if (count >= maxCount) setStatus(false);
+
     // eslint-disable-next-line no-await-in-loop
-    await new Promise(res => setTimeout(res, 100));
-    console.log(' while (!state.connected)');
+    await new Promise(res => setTimeout(res, 1000));
+    console.log(`while (!state.connected)${count}`);
   }
 
   log.debug('Migration: Start');
@@ -27,13 +32,14 @@ const run = async (createModel, serviceName, migrations = [], log, state) => {
 
   if (!currentMigration.inProgress || isPrevMigrationStuck) {
     try {
-      log.debug(`Migration: last version ${currentMigration.version}`);
+      const currentVersion = currentMigration.version || 0;
+      log.debug(`Migration: last version ${currentVersion}`);
       await model.updateOne({ serviceName }, { $set: { inProgress: true } }).lean();
 
-      const migrationToDo = migrations.filter(e => e.version > currentMigration.version);
+      const migrationToDo = migrations.filter(e => e.version > currentVersion);
 
       for (let i = 0; i < migrationToDo.length; i += 1) {
-        log.debug(`Migration: update from ${currentMigration.version} to ${migrationToDo[i].version}`);
+        log.debug(`Migration: update from ${currentVersion} to ${migrationToDo[i].version}`);
         await migrationToDo[i].run();
 
         await model