add support to promise

Author: mrbatista

lib/providers/filesystem/index.js

@@ -18,6 +18,8 @@ var fs = require('fs'),
   File = require('./file').File,
   Container = require('./container').Container;
 
+var utils = require('./../../utils');
+
 module.exports.storage = module.exports; // To make it consistent with pkgcloud
 
 module.exports.File = File;
@@ -95,6 +97,8 @@ function populateMetadata(stat, props) {
 }
 
 FileSystemProvider.prototype.getContainers = function(cb) {
+  cb = cb || utils.createPromiseCallback();
+
   var self = this;
   fs.readdir(self.root, function(err, files) {
     var containers = [];
@@ -119,15 +123,20 @@ FileSystemProvider.prototype.getContainers = function(cb) {
       }
     });
   });
+
+  return cb.promise;
 };
 
 FileSystemProvider.prototype.createContainer = function(options, cb) {
+  cb = cb || utils.createPromiseCallback();
+
   var self = this;
   var name = options.name;
   var dir = path.join(this.root, name);
   validateName(name, cb) && fs.mkdir(dir, options, function(err) {
     if (err) {
-      return cb && cb(err);
+      cb && cb(err);
+      return;
     }
     fs.stat(dir, function(err, stat) {
       var container = null;
@@ -139,9 +148,13 @@ FileSystemProvider.prototype.createContainer = function(options, cb) {
       cb && cb(err, container);
     });
   });
+
+  return cb.promise;
 };
 
 FileSystemProvider.prototype.destroyContainer = function(containerName, cb) {
+  cb = cb || utils.createPromiseCallback();
+
   if (!validateName(containerName, cb)) return;
 
   var dir = path.join(this.root, containerName);
@@ -160,9 +173,13 @@ FileSystemProvider.prototype.destroyContainer = function(containerName, cb) {
       }
     });
   });
+
+  return cb.promise;
 };
 
 FileSystemProvider.prototype.getContainer = function(containerName, cb) {
+  cb = cb || utils.createPromiseCallback();
+
   var self = this;
   if (!validateName(containerName, cb)) return;
   var dir = path.join(this.root, containerName);
@@ -175,6 +192,8 @@ FileSystemProvider.prototype.getContainer = function(containerName, cb) {
     }
     cb && cb(err, container);
   });
+
+  return cb.promise;
 };
 
 // File related functions
@@ -252,6 +271,9 @@ FileSystemProvider.prototype.getFiles = function(container, options, cb) {
     cb = options;
     options = false;
   }
+
+  cb = cb || utils.createPromiseCallback();
+
   var self = this;
   if (!validateName(container, cb)) return;
   var dir = path.join(this.root, container);
@@ -278,9 +300,13 @@ FileSystemProvider.prototype.getFiles = function(container, options, cb) {
       }
     });
   });
+
+  return cb.promise;
 };
 
 FileSystemProvider.prototype.getFile = function(container, file, cb) {
+  cb = cb || utils.createPromiseCallback();
+
   var self = this;
   if (!validateName(container, cb)) return;
   if (!validateName(file, cb)) return;
@@ -294,6 +320,8 @@ FileSystemProvider.prototype.getFile = function(container, file, cb) {
     }
     cb && cb(err, f);
   });
+
+  return cb.promise;
 };
 
 FileSystemProvider.prototype.getUrl = function(options) {
@@ -303,9 +331,13 @@ FileSystemProvider.prototype.getUrl = function(options) {
 };
 
 FileSystemProvider.prototype.removeFile = function(container, file, cb) {
+  cb = cb || utils.createPromiseCallback();
+
   if (!validateName(container, cb)) return;
   if (!validateName(file, cb)) return;
 
   var filePath = path.join(this.root, container, file);
   fs.unlink(filePath, cb);
+
+  return cb.promise;
 };

lib/storage-service.js

@@ -6,6 +6,7 @@
 
 var factory = require('./factory');
 var handler = require('./storage-handler');
+var utils = require('./utils');
 
 var storage = require('pkgcloud').storage;
 var debug = require('debug')('loopback:storage:service');
@@ -64,8 +65,11 @@ function map(obj) {
  * @callback {Function} callback Callback function
  * @param {Object|String} err Error string or object
  * @param {Object[]} containers An array of container metadata objects
+ * @promise
  */
 StorageService.prototype.getContainers = function(cb) {
+  cb = cb || utils.createPromiseCallback();
+
   this.client.getContainers(function(err, containers) {
     if (err) {
       cb(err, containers);
@@ -75,6 +79,8 @@ StorageService.prototype.getContainers = function(cb) {
       }));
     }
   });
+
+  return cb.promise;
 };
 
 /**
@@ -85,29 +91,38 @@ StorageService.prototype.getContainers = function(cb) {
  * @callback {Function} cb Callback function
  * @param {Object|String} err Error string or object
  * @param {Object} container Container metadata object
+ * @promise
  */
 
 StorageService.prototype.createContainer = function(options, cb) {
   options = options || {};
+  cb = cb || utils.createPromiseCallback();
+
   if ('object' === typeof options && !(options instanceof storage.Container)) {
     options.Name = options.name; // Amazon expects Name
     var Container = factory.getProvider(this.provider).storage.Container;
     options = new Container(this.client, options);
   }
   debug('Creating container with options %o', options);
-  return this.client.createContainer(options, function(err, container) {
+  this.client.createContainer(options, function(err, container) {
     return cb(err, map(container));
   });
+
+  return cb.promise;
 };
 
 /**
  * Destroy an existing storage service container.
  * @param {String} container Container name.
  * @callback {Function} callback Callback function.
  * @param {Object|String} err Error string or object
+ * @promise
  */
 StorageService.prototype.destroyContainer = function(container, cb) {
-  return this.client.destroyContainer(container, cb);
+  cb = cb || utils.createPromiseCallback();
+
+  this.client.destroyContainer(container, cb);
+  return cb.promise;
 };
 
 /**
@@ -116,15 +131,20 @@ StorageService.prototype.destroyContainer = function(container, cb) {
  * @callback {Function} callback Callback function.
  * @param {Object|String} err Error string or object
  * @param {Object} container Container metadata object
+ * @promise
  */
 StorageService.prototype.getContainer = function(container, cb) {
-  return this.client.getContainer(container, function(err, container) {
+  cb = cb || utils.createPromiseCallback();
+
+  this.client.getContainer(container, function(err, container) {
     if (err && err.code === 'ENOENT') {
       err.statusCode = err.status = 404;
       return cb(err);
     }
     return cb(err, map(container));
   });
+
+  return cb.promise;
 };
 
 /**
@@ -178,14 +198,18 @@ StorageService.prototype.downloadStream = function(container, file, options) {
  * @callback {Function} cb Callback function
  * @param {Object|String} err Error string or object
  * @param {Object[]} files An array of file metadata objects
+ * @promise
  */
 StorageService.prototype.getFiles = function(container, options, cb) {
   if (typeof options === 'function' && !cb) {
     // options argument is not present
     cb = options;
     options = {};
   }
-  return this.client.getFiles(container, options, function(err, files) {
+
+  cb = cb || utils.createPromiseCallback();
+
+  this.client.getFiles(container, options, function(err, files) {
     if (err) {
       cb(err, files);
     } else {
@@ -194,6 +218,8 @@ StorageService.prototype.getFiles = function(container, options, cb) {
       }));
     }
   });
+
+  return cb.promise;
 };
 
 /**
@@ -203,15 +229,20 @@ StorageService.prototype.getFiles = function(container, options, cb) {
  * @callback {Function} cb Callback function
  * @param {Object|String} err Error string or object
  * @param {Object} file File metadata object
+ * @promise
  */
 StorageService.prototype.getFile = function(container, file, cb) {
-  return this.client.getFile(container, file, function(err, f) {
+  cb = cb || utils.createPromiseCallback();
+
+  this.client.getFile(container, file, function(err, f) {
     if (err && err.code === 'ENOENT') {
       err.statusCode = err.status = 404;
       return cb(err);
     }
     return cb(err, map(f));
   });
+
+  return cb.promise;
 };
 
 /**
@@ -220,9 +251,13 @@ StorageService.prototype.getFile = function(container, file, cb) {
  * @param {String} file File name
  * @callback {Function} cb Callback function
  * @param {Object|String} err Error string or object
+ * @promise
  */
 StorageService.prototype.removeFile = function(container, file, cb) {
-  return this.client.removeFile(container, file, cb);
+  cb = cb || utils.createPromiseCallback();
+
+  this.client.removeFile(container, file, cb);
+  return cb.promise;
 };
 
 /**
@@ -232,6 +267,7 @@ StorageService.prototype.removeFile = function(container, file, cb) {
  * @param {Response} res Response object
  * @param {Object} [options] Options for upload
  * @param {Function} cb Callback function
+ * @promise
  */
 StorageService.prototype.upload = function(container, req, res, options, cb) {
   debug('Configuring upload with options %o', options);
@@ -247,6 +283,9 @@ StorageService.prototype.upload = function(container, req, res, options, cb) {
     cb = options;
     options = {};
   }
+
+  cb = cb || utils.createPromiseCallback();
+
   if (this.getFilename && !options.getFilename) {
     options.getFilename = this.getFilename;
   }
@@ -269,7 +308,9 @@ StorageService.prototype.upload = function(container, req, res, options, cb) {
     options.container = container;
   }
   debug('Upload configured with options %o', options);
-  return handler.upload(this.client, req, res, options, cb);
+
+  handler.upload(this.client, req, res, options, cb);
+  return cb.promise;
 };
 
 /**
@@ -279,9 +320,13 @@ StorageService.prototype.upload = function(container, req, res, options, cb) {
  * @param {Request} req HTTP request
  * @param {Response} res HTTP response
  * @param {Function} cb Callback function
+ * @promise
  */
 StorageService.prototype.download = function(container, file, req, res, cb) {
-  return handler.download(this.client, req, res, container, file, cb);
+  cb = cb || utils.createPromiseCallback();
+
+  handler.download(this.client, req, res, container, file, cb);
+  return cb.promise;
 };
 
 StorageService.modelName = 'storage';

lib/utils.js

@@ -0,0 +1,15 @@
+'use strict';
+
+exports.createPromiseCallback = createPromiseCallback;
+
+function createPromiseCallback() {
+  var cb;
+  var promise = new Promise(function(resolve, reject) {
+    cb = function(err, data) {
+      if (err) return reject(err);
+      return resolve(data);
+    };
+  });
+  cb.promise = promise;
+  return cb;
+}