Merge pull request #3 from imagekit-developer/promisification

Promisification

Author: imagekitio

.eslintrc.js

@@ -3,6 +3,7 @@ module.exports = {
     browser: true,
     commonjs: true,
     es6: true,
+    es5: true,
     mocha: true,
   },
   extends: [

.github/workflows/npmpublish.yml

@@ -0,0 +1,47 @@
+name: Publish
+
+on:
+  release:
+    types: [published]
+
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [8.x, 10.x, 12.x]
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v1
+      with:
+        node-version: ${{ matrix.node-version }}
+    - name: npm install, build, and test
+      run: |
+        npm i -g yarn
+        yarn install
+        yarn test
+      env:
+        CI: true
+  
+  publish: 
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    - uses: actions/setup-node@v1
+      with:
+        node-version: 12
+        registry-url: https://registry.npmjs.org/
+    - name: yarn publish
+      run: |
+        npm i -g yarn
+        yarn config set //registry.npmjs.org/:_authToken=$NODE_AUTH_TOKEN
+        yarn publish        
+      env:
+        NODE_AUTH_TOKEN: ${{secrets.npm_token}}
+        CI: true

index.js

@@ -32,6 +32,33 @@ var ImageKit = function(opts) {
         throw new Error(errorMessages.MANDATORY_INITIALIZATION_MISSING.message);
     }
 
+    const promisify = function(f) {
+        return function(...args) {
+            const self = this;            
+            if (args.length === f.length) {
+                if (typeof args[args.length-1] !== 'function') {
+                    throw new Error('Callback must be a function.')
+                }
+                f.call(self, ...args)
+            } else {
+                if (typeof Promise !== 'function') {
+                    throw new Error('Promises should be defined as a global function.')
+                }
+                return new Promise((resolve, reject) => {
+                    const callback = function(err, ...results) {
+                        if (err) {
+                            return reject(err);
+                        } else {
+                            resolve(results.length > 1 ? results : results[0])
+                        }
+                    }
+                    args.push(callback);
+                    f.call(self, ...args);
+                });
+            }
+        }
+    }
+
     if(!transformationUtils.validParameters(this.options)) {
         throw new Error(errorMessages.INVALID_TRANSFORMATION_POSITION.message);
     }
@@ -46,53 +73,53 @@ var ImageKit = function(opts) {
     /*
         Upload API
     */
-    this.upload = function(uploadOptions, callback) {
+    this.upload = promisify(function(uploadOptions, callback) {
         return upload(uploadOptions, this.options, callback);
-    };
+    });
 
     /*
         Image Management APIs
     */
 
     // List and Search Files API
-    this.listFiles = function(listOptions, callback) {
+    this.listFiles = promisify(function(listOptions, callback) {
         return manage.listFiles(listOptions, this.options, callback);
-    };
+    });
 
     // Get File Details API
-    this.getFileDetails = function(fileId, callback) {
+    this.getFileDetails = promisify(function(fileId, callback) {
         return manage.getFileDetails(fileId, this.options, callback);
-    };
+    });
 
     // Get File Metadata API
-    this.getFileMetadata = function(fileId, callback) {
+    this.getFileMetadata = promisify(function(fileId, callback) {
         return manage.getFileMetadata(fileId, this.options, callback);
-    };
+    });
 
     // Update File Details API
-    this.updateFileDetails = function(fileId, updateData, callback) {
+    this.updateFileDetails = promisify(function(fileId, updateData, callback) {
         return manage.updateFileDetails(fileId, updateData, this.options, callback);
-    };
+    });
 
     // Delete File API
-    this.deleteFile = function(fileId, callback) {
+    this.deleteFile = promisify(function(fileId, callback) {
         return manage.deleteFile(fileId, this.options, callback);
-    };
+    });
 
     // Purge Cache API
-    this.purgeCache = function(url, callback) {
+    this.purgeCache = promisify(function(url, callback) {
         return manage.purgeCache(url, this.options, callback);
-    };
+    });
 
     // Purge Cache Status API
-    this.getPurgeCacheStatus = function(requestId, callback) {
+    this.getPurgeCacheStatus = promisify(function(requestId, callback) {
         return manage.getPurgeCacheStatus(requestId, this.options, callback);
-    };
+    });
 
     // To generate Signature for upload request
     this.getAuthenticationParameters = function(token, timestamp) {
         return signature.getAuthenticationParameters(token, timestamp, this.options);   
-    }
+    };
 
     // To calculate distance between two pHash strings
     this.pHashDistance = function(firstPHash, secondPHash) {

libs/manage/file.js

@@ -40,7 +40,6 @@ module.exports.getMetadata = function(fileId, defaultOptions, callback) {
         respond(true, errorMessages.FILE_ID_MISSING, callback);
         return;
     }
-
     var requestOptions = {
         url : "https://api.imagekit.io/v1/files/" + fileId + "/metadata",
         method : "GET",
@@ -144,7 +143,8 @@ module.exports.listFiles = function(listOptions, defaultOptions, callback) {
     var requestOptions = {
         url : "https://api.imagekit.io/v1/files/",
         method : "GET",
-        json : listOptions
+        qs : listOptions,
+        json : true
     };
 
     request(requestOptions, defaultOptions, function(err, response, body) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "imagekit",
-  "version": "2.0.2",
+  "version": "3.0.0",
   "description": "Offical NodeJS SDK for ImageKit.io integration",
   "main": "index.js",
   "scripts": {