@hvedinich/db 0.0.6 → 0.0.7

package/package.json

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

package/src/migration/index.js

@@ -1,71 +1,65 @@
 /* eslint-disable no-await-in-loop */
 const schema = require('./schema');
 
+const run = async (createModel, serviceName, migrations = [], log, state) => {
+  log.debug('Migration: waiting for connection');
 
-const getOrWait = async (model, serviceName, log) => {
-  let waiting = true;
-  let result = { version: 0 };
-  while (waiting) {
-    log.debug('getOrWait: waiting for db');
-    const currentMigration = await model.findOne({ serviceName }).lean().exec();
-    if (currentMigration) {
-      if (!currentMigration.inProgress) {
-        const updated = await model.findOneAndUpdate(
-          { serviceName, inProgress: false },
-          { $set: { inProgress: true } },
-          { new: true },
-        );
-        if (updated) {
-          waiting = false;
-          result = currentMigration;
-        }
-      }
-      await new Promise(res => setTimeout(res, 1000));
-    } else {
-      waiting = false;
-    }
+  while (!state.connected) {
+    // eslint-disable-next-line no-await-in-loop
+    await new Promise(res => setTimeout(res, 100));
+    console.log(' while (!state.connected)');
   }
-  return result;
-};
 
-const run = async (createModel, serviceName, migrations = [], log, state) => {
-  log.debug('Migration: waiting for connection');
-  await new Promise(async (done) => {
-    while (!state.connected) {
-      // eslint-disable-next-line no-await-in-loop
-      await new Promise(res => setTimeout(res, 100));
-    }
-    done();
-  });
   log.debug('Migration: Start');
   const model = createModel({ name: 'Migration', schema });
-  try {
-    const currentMigration = await getOrWait(model, serviceName, log);
 
-    log.debug(`Migration: last version ${currentMigration.version}`);
-    const migrationToDo = migrations.filter(e => e.version > currentMigration.version);
+  const migrationList = await model.find({}).lean();
+  if (migrationList.length > 1) {
+    throw new Error('The migration fails due to an incorrect number of migration objects.');
+  }
+  const currentMigration =
+    migrationList[0] || (await model.create({ serviceName, startTime: Date.now() + 60000 * 10 }));
+  const isPrevMigrationStuck = currentMigration.inProgress && (currentMigration.startTime || 0) < Date.now();
+
+  if (isPrevMigrationStuck) {
+    log.error(`Previous migration stuck`);
+  }
 
-    for (let i = 0; i < migrationToDo.length; i += 1) {
-      log.debug(`Migration: update from ${currentMigration.version} to ${migrationToDo[i].version}`);
-      await migrationToDo[i].run();
+  if (!currentMigration.inProgress || isPrevMigrationStuck) {
+    try {
+      log.debug(`Migration: last version ${currentMigration.version}`);
+      await model.updateOne({ serviceName }, { $set: { inProgress: true } }).lean();
 
-      await model.updateOne(
-        { serviceName },
-        {
-          $set: { version: migrationToDo[i].version },
-          $push: { history: { version: migrationToDo[i].version } },
-        },
-        { upsert: true },
-      ).lean();
+      const migrationToDo = migrations.filter(e => e.version > currentMigration.version);
+
+      for (let i = 0; i < migrationToDo.length; i += 1) {
+        log.debug(`Migration: update from ${currentMigration.version} to ${migrationToDo[i].version}`);
+        await migrationToDo[i].run();
+
+        await model
+          .updateOne(
+            { serviceName },
+            {
+              $set: { version: migrationToDo[i].version },
+              $push: { history: { version: migrationToDo[i].version } },
+            },
+            { upsert: true },
+          )
+          .lean();
+      }
+      log.debug('Migration: migrations are done');
+    } finally {
+      await model
+        .updateOne(
+          { serviceName },
+          {
+            $set: { inProgress: false },
+          },
+        )
+        .lean();
     }
-    log.debug('Migration: migrations are done');
-  } finally {
-    await model.updateOne(
-      { serviceName, inProgress: true },
-      {
-        $set: { inProgress: false },
-      },
-    ).lean();
+  } else if (!isPrevMigrationStuck) {
+    log.debug('Migration is being performed by another instance');
   }
 };