utility scripts: converted to use the Promise interface

bin/checkPad.js

@@ -7,121 +7,89 @@ if (process.argv.length != 3) {
   process.exit(1);
 }
 
-//get the padID
-var padId = process.argv[2];
+// get the padID
+const padId = process.argv[2];
 
-// initialize the variables
-var db, settings, padManager;
-var npm = require('../src/node_modules/npm');
-var async = require('../src/node_modules/async');
+// load and initialize NPM;
+let npm = require('../src/node_modules/npm');
+npm.load({}, async function() {
 
-var Changeset = require('ep_etherpad-lite/static/js/Changeset');
+  try {
+    // initialize database
+    let settings = require('../src/node/utils/Settings');
+    let db = require('../src/node/db/DB');
+    await db.init();
 
-async.series([
-  // load npm
-  function(callback) {
-    npm.load({}, function(er) {
-      callback(er);
-    });
-  },
+    // load modules
+    let Changeset = require('ep_etherpad-lite/static/js/Changeset');
+    let padManager = require('../src/node/db/PadManager');
 
-  // load modules
-  function(callback) {
-    settings = require('../src/node/utils/Settings');
-    db = require('../src/node/db/DB');
+    let exists = await padManager.doesPadExists(padId);
+    if (!exists) {
+      console.error("Pad does not exist");
+      process.exit(1);
+    }
 
-    // initialize the database
-    db.init(callback);
-  },
+    // get the pad
+    let pad = await padManager.getPad(padId);
 
-  // get the pad
-  function (callback) {
-    padManager = require('../src/node/db/PadManager');
-
-    padManager.doesPadExists(padId, function(err, exists) {
-      if (!exists) {
-        console.error("Pad does not exist");
-        process.exit(1);
-      }
-
-      padManager.getPad(padId, function(err, _pad) {
-        pad = _pad;
-        callback(err);
-      });
-    });
-  },
-
-  function (callback) {
     // create an array with key revisions
     // key revisions always save the full pad atext
-    var head = pad.getHeadRevisionNumber();
-    var keyRevisions = [];
-    for (var i = 0; i < head; i += 100) {
-      keyRevisions.push(i);
+    let head = pad.getHeadRevisionNumber();
+    let keyRevisions = [];
+    for (let rev = 0; rev < head; rev += 100) {
+      keyRevisions.push(rev);
     }
 
     // run through all key revisions
-    async.forEachSeries(keyRevisions, function(keyRev, callback) {
+    for (let keyRev of keyRevisions) {
+
       // create an array of revisions we need till the next keyRevision or the End
-      var revisionsNeeded = [];
-      for(var i = keyRev; i <= keyRev + 100 && i <= head; i++) {
-        revisionsNeeded.push(i);
+      let revisionsNeeded = [];
+      for (let rev = keyRev; rev <= keyRev + 100 && rev <= head; rev++) {
+        revisionsNeeded.push(rev);
       }
 
       // this array will hold all revision changesets
       var revisions = [];
 
       // run through all needed revisions and get them from the database
-      async.forEach(revisionsNeeded, function(revNum, callback) {
-        db.db.get("pad:" + padId + ":revs:" + revNum, function(err, revision) {
-          revisions[revNum] = revision;
-          callback(err);
-        });
-      },
-      function(err) {
-        if (err) {
-          callback(err);
-          return;
+      for (let revNum of revisionsNeeded) {
+        let revision = await db.get("pad:" + padId + ":revs:" + revNum);
+        revisions[revNum] = revision;
+      }
+
+      // check if the pad has a pool
+      if (pad.pool === undefined ) {
+        console.error("Attribute pool is missing");
+        process.exit(1);
+      }
+
+      // check if there is an atext in the keyRevisions
+      if (revisions[keyRev] === undefined || revisions[keyRev].meta === undefined || revisions[keyRev].meta.atext === undefined) {
+        console.error("No atext in key revision " + keyRev);
+        continue;
+      }
+
+      let apool = pad.pool;
+      let atext = revisions[keyRev].meta.atext;
+
+      for (let rev = keyRev + 1; rev <= keyRev + 100 && rev <= head; rev++) {
+        try {
+          // console.log("check revision " + rev);
+          let cs = revisions[rev].changeset;
+          atext = Changeset.applyToAText(cs, atext, apool);
+        } catch(e) {
+          console.error("Bad changeset at revision " + rev + " - " + e.message);
+          continue;
         }
+      }
+      console.log("finished");
+      process.exit(0);
+    }
 
-        // check if the pad has a pool
-        if (pad.pool === undefined) {
-          console.error("Attribute pool is missing");
-          process.exit(1);
-        }
-
-        // check if there is an atext in the keyRevisions
-        if (revisions[keyRev] === undefined || revisions[keyRev].meta === undefined || revisions[keyRev].meta.atext === undefined) {
-          console.error("No atext in key revision " + keyRev);
-          callback();
-          return;
-        }
-
-        var apool = pad.pool;
-        var atext = revisions[keyRev].meta.atext;
-
-        for (var i = keyRev + 1; i <= keyRev + 100 && i <= head; i++) {
-          try {
-            // console.log("check revision " + i);
-            var cs = revisions[i].changeset;
-            atext = Changeset.applyToAText(cs, atext, apool);
-          } catch(e) {
-            console.error("Bad changeset at revision " + i + " - " + e.message);
-            callback();
-            return;
-          }
-        }
-
-        callback();
-      });
-    }, callback);
-  }
-],
-function (err) {
-  if(err) {
-    throw err;
-  } else {
-    console.log("finished");
-    process.exit(0);
+  } catch (e) {
+    console.trace(e);
+    process.exit(1);
   }
 });