@data-fair/lib-node 2.3.0 → 2.3.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@data-fair/lib-node",
-  "version": "2.3.0",
+  "version": "2.3.2",
   "description": "Small nodejs related utility functions for the data-fair stack.",
   "main": "index.js",
   "files": [

package/upgrade-scripts.d.ts

@@ -5,4 +5,4 @@ export interface UpgradeScript {
     description: string;
     exec: (db: Db, debug: Debugger) => Promise<void>;
 }
-export default function (db: Db, locks: Locks, basePath?: string, bootstrap?: () => Promise<undefined | string>): Promise<void>;
+export default function (db: Db, locks: Locks, basePath?: string, isFresh?: () => Promise<boolean>): Promise<void>;

package/upgrade-scripts.js

@@ -1,10 +1,10 @@
 import semver from 'semver'
 import path from 'path'
-import { readdirSync, readFileSync } from 'fs'
+import { readdirSync, readFileSync, statSync } from 'fs'
 import Debug from 'debug'
 const debug = Debug('upgrade')
 // chose the proper scripts to execute, then run them
-export default async function (db, locks, basePath = './', bootstrap) {
+export default async function (db, locks, basePath = './', isFresh) {
   const ack = await locks.acquire('upgrade')
   if (!ack) {
     console.warn('upgrade scripts lock is already acquired, skip them')
@@ -15,13 +15,13 @@ export default async function (db, locks, basePath = './', bootstrap) {
     // are not considered "up" and the previous versions keep running in the mean time
   } else {
     try {
-      await runScripts(db, basePath, bootstrap)
+      await runScripts(db, basePath, isFresh)
     } finally {
       await locks.release('upgrade')
     }
   }
 }
-async function runScripts (db, basePath, bootstrap) {
+async function runScripts (db, basePath, isFresh) {
   const dir = path.resolve(basePath)
   const pjsonPath = path.join(dir, 'package.json')
   debug('read service info from ' + pjsonPath)
@@ -38,15 +38,15 @@ async function runScripts (db, basePath, bootstrap) {
   } else {
     debug('No service version found in database, this is the first time the upgrade system is run')
     scripts = scripts.filter(scriptDef => scriptDef.version === 'init')
-    if (bootstrap) {
-      previousPersion = await bootstrap()
-      if (previousPersion) {
-        debug('Bootstrap function returned version %s', previousPersion)
+    if (isFresh) {
+      if (await isFresh()) {
+        debug('isFresh function returned true, this is a fresh install, do not run any script')
       } else {
-        debug('Bootstrap function returned no version, this is fresh install, do not run any script')
+        debug('isFresh function returned false, this is not a fresh install, run all init scripts')
+        previousPersion = '0.0.0'
       }
     } else {
-      debug('No bootstrap function, it could be a fresh install, do not run any script')
+      debug('No isFresh function, it could be a fresh install, do not run any script')
     }
   }
   if (previousPersion) {
@@ -68,7 +68,9 @@ async function runScripts (db, basePath, bootstrap) {
 }
 // Walk the scripts directories
 async function listScripts (scriptsRoot) {
-  const dirs = readdirSync(scriptsRoot).sort()
+  const dirs = readdirSync(scriptsRoot)
+    .filter(dir => statSync(path.join(scriptsRoot, dir)).isDirectory())
+    .sort()
   return dirs.map(dir => {
     return {
       version: dir,