@hvedinich/db 0.0.5 → 1.0.0-beta.1

package/.eslintrc.js

@@ -0,0 +1,15 @@
+module.exports = {
+  extends: ["airbnb-base", "prettier"],
+  plugins: ["prettier"],
+  rules: {
+    "no-console": 0,
+    "no-underscore-dangle": [
+      "error",
+      {
+        allow: ["_id"],
+      },
+    ],
+    "arrow-body-style": "off",
+    "prefer-arrow-callback": "off",
+  },
+};

package/.prettierrc

@@ -0,0 +1,6 @@
+{
+  "singleQuote": true,
+  "trailingComma": "all",
+  "printWidth": 120,
+  "arrowParens": "avoid"
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hvedinich/db",
-  "version": "0.0.5",
+  "version": "1.0.0-beta.1",
   "description": "db",
   "main": "index.js",
   "scripts": {
@@ -17,15 +17,17 @@
   },
   "homepage": "https://github.com/hvedinich/DB#readme",
   "dependencies": {
-    "mongoose": "5.10.8"
+    "mongoose": "^5.13.15"
   },
   "devDependencies": {
-    "eslint": "5.16.0",
-    "eslint-config-airbnb-base": "13.1.0",
-    "eslint-plugin-graphql": "4.0.0",
-    "eslint-plugin-import": "2.17.2"
+    "eslint": "^7.32.0",
+    "eslint-config-airbnb-base": "^15.0.0",
+    "eslint-config-prettier": "^8.3.0",
+    "eslint-plugin-import": "2.26.0",
+    "eslint-plugin-prettier": "^4.0.0",
+    "prettier": "^2.5.1"
   },
   "publishConfig": {
     "access": "public"
   }
-}
+}

package/src/index.js

@@ -1,7 +1,7 @@
 const mongoose = require('mongoose');
 const migration = require('./migration');
 
-const init = (config) => {
+const init = config => {
   const db = mongoose.connection;
   const retry = 0;
   const state = { connected: false };
@@ -14,10 +14,11 @@ const init = (config) => {
     useFindAndModify: false,
   };
   mongoose.connect(config.mongo.url, opt);
-  db.on('disconnected', () => {
+  db.on('disconnected', async () => {
     state.connected = false;
     if (retry < 10) {
-      mongoose.connect(config.mongo.url, opt);
+      await new Promise(res => setTimeout(res, 1000));
+      await mongoose.connect(config.mongo.url, opt);
     }
     console.log('Can not connect to mongo');
   });
@@ -33,8 +34,8 @@ const init = (config) => {
 
   const createModel = ({ name, schema }) => mongoose.model(name, schema);
 
-  const runMigrations = (migrations, log = console) => migration
-    .run(createModel, config.serviceName, migrations, log, state);
+  const runMigrations = (migrations, log = console) =>
+    migration.run(createModel, config.serviceName, migrations, log, state);
 
   return {
     createModel,

package/src/migration/index.js

@@ -9,10 +9,9 @@ const getOrWait = async (model, serviceName, log) => {
     log.debug('getOrWait: waiting for db');
     const currentMigration = await model.findOne({ serviceName }).lean().exec();
     if (currentMigration) {
-      if (!currentMigration.inProgress
-        || new Date(currentMigration.updatedAt).getTime() + 60000 < Date.now()) {
+      if (!currentMigration.inProgress) {
         const updated = await model.findOneAndUpdate(
-          { serviceName },
+          { serviceName, inProgress: false },
           { $set: { inProgress: true } },
           { new: true },
         );

package/.eslintrc.json

@@ -1,14 +0,0 @@
-{
-    "extends": "airbnb-base",
-    "rules": {
-        "no-console": 0,
-        "no-underscore-dangle": [
-            "error",
-            {
-                "allow": [
-                    "_id"
-                ]
-            }
-        ]
-    }
-}