start using "thenify" to support callback and promises

PadManager.sanitizePadId() can't use thenify: single arg callback

src/node/db/PadManager.js

@@ -22,6 +22,7 @@ var ERR = require("async-stacktrace");
 var customError = require("../utils/customError");
 var Pad = require("../db/Pad").Pad;
 var db = require("./DB").db;
+const thenify = require("thenify").withCallback;
 
 /**
  * A cache of all loaded Pads.
@@ -53,7 +54,7 @@ var padList = {
   list: [],
   sorted : false,
   initiated: false,
-  init: function(cb) {
+  init: thenify(function(cb) {
     db.findKeys("pad:*", "*:*:*", function(err, dbData) {
       if (ERR(err, cb)) return;
 
@@ -68,18 +69,18 @@ var padList = {
     });
 
     return this;
-  },
-  load: function(cb) {
+  }),
+  load: thenify(function(cb) {
     if (this.initiated) {
       cb && cb();
     } else {
       this.init(cb);
     }
-  },
+  }),
   /**
    * Returns all pads in alphabetical order as array.
    */
-  getPads: function(cb) {
+  getPads: thenify(function(cb) {
     this.load(function() {
       if (!padList.sorted) {
         padList.list = padList.list.sort();
@@ -88,7 +89,7 @@ var padList = {
 
       cb && cb(padList.list);
     })
-  },
+  }),
   addPad: function(name) {
     if (!this.initiated) return;
 
@@ -125,7 +126,7 @@ var padIdTransforms = [
  * @param id A String with the id of the pad
  * @param {Function} callback
  */
-exports.getPad = function(id, text, callback)
+exports.getPad = thenify(function(id, text, callback)
 {
   // check if this is a valid padId
   if (!exports.isValidPadId(id)) {
@@ -177,17 +178,17 @@ exports.getPad = function(id, text, callback)
     padList.addPad(id);
     callback(null, pad);
   });
-}
+});
 
-exports.listAllPads = function(cb)
+exports.listAllPads = thenify(function(cb)
 {
   padList.getPads(function(list) {
     cb && cb(null, {padIDs: list});
   });
-}
+});
 
 // checks if a pad exists
-exports.doesPadExists = function(padId, callback)
+exports.doesPadExists = thenify(function(padId, callback)
 {
   db.get("pad:" + padId, function(err, value) {
     if (ERR(err, callback)) return;
@@ -198,10 +199,10 @@ exports.doesPadExists = function(padId, callback)
       callback(null, false);
     }
   });
-}
+});
 
 // returns a sanitized padId, respecting legacy pad id formats
-exports.sanitizePadId = function(padId, callback) {
+function sanitizePadId(padId, callback) {
   var transform_index = arguments[2] || 0;
 
   // we're out of possible transformations, so just return it
@@ -228,10 +229,19 @@ exports.sanitizePadId = function(padId, callback) {
     }
 
     // check the next transform
-    exports.sanitizePadId(transformedPadId, callback, transform_index);
+    sanitizePadId(transformedPadId, callback, transform_index);
   });
 }
 
+// sanitizePadId can't use thenify: single arg callback
+exports.sanitizePadId = function(padId, callback) {
+  if (callback) {
+    return sanitizePadId(padId, callback);
+  } else {
+    return new Promise(resolve => sanitizePadId(padId, resolve));
+  }
+}
+
 exports.isValidPadId = function(padId)
 {
   return /^(g.[a-zA-Z0-9]{16}\$)?[^$]{1,50}$/.test(padId);