Add a unique function for handling uploading from a stream

Author: nsand

lib/model/cloudcontroller/Apps.js

@@ -4,15 +4,6 @@ const CloudControllerBase = require("./CloudControllerBase");
 const rest = require("restler");//TODO: Analyze a way to remove this dependency
 const fs = require("fs");
 
-/**
- * Is it a ReadableStream?
- * @param {Object} [source] the source of information
- * @returns {Boolean} true is the argument is a ReadableStream; otherwise, false
- */
-function isReadableStream(source) {
-    return source && typeof source.pipe === 'function';
-}
-
 /**
  * This public class manages the operations related with Applications on Cloud Controller.
  */
@@ -301,12 +292,12 @@ class Apps extends CloudControllerBase {
      * function File(path, filename, fileSize, encoding, contentType)
      * 'application': rest.file(path, null, fileSizeInBytes, null, 'application/zip')
      *
-     * @param  {String} appGuid                          [App guid]
-     * @param  {String|stream.ReadableStream} source     [file path or readable stream to upload]
-     * @param  {Boolean} async                           [Sync/Async]
-     * @return {JSON/String}                             [{}/Job information]
+     * @param  {String} appGuid     [App guid]
+     * @param  {String} filePath     [file path to upload]
+     * @param  {Boolean} async        [Sync/Async]
+     * @return {JSON/String}              [{}/Job information]
      */
-    upload (appGuid, source, async) {
+    upload (appGuid, filePath, async) {
 
         const url = `${this.API_URL}/v2/apps/${appGuid}/bits`;
         const zipResources = [];
@@ -318,36 +309,60 @@ class Apps extends CloudControllerBase {
                 asyncFlag = true;
             }
         }
+        var options = {
+            multipart: true,
+            accessToken: this.UAA_TOKEN.access_token,
+            query: {
+                guid: appGuid,
+                async: asyncFlag
+            },
+            data: {
+                resources: JSON.stringify(zipResources)
+            }
+        };
 
-        let promise;
-        if (typeof source === "string" || isReadableStream(source)) {
-            let options = {
-              headers: {
-                  Authorization: `${this.UAA_TOKEN.token_type} ${this.UAA_TOKEN.access_token}`
-              },
-              qs: {
-                  async: asyncFlag
-              }
-            };
-            promise = this.REST.uploadStream(url, options, typeof source === "string" ? fs.createReadStream(source) : source, this.HttpStatus.CREATED, false);
+        if (typeof filePath === "string") {
+            stats = fs.statSync(filePath);
+            options.data.application = rest.file(filePath, null, stats.size, null, "application/zip");
         } else {
-            let options = {
-              multipart: true,
-              data: {
-                  resources: JSON.stringify(zipResources)
-              },
-              application: rest.data(null, "application/zip", source.toBuffer()),
-              query: {
-                  guid: appGuid,
-                  async: asyncFlag
-              }
-            }
-            promise = this.REST.upload(url, options, this.HttpStatus.CREATED, false);
+            options.data.application = rest.data(null, "application/zip", filePath.toBuffer());
         }
 
-        return promise;
+        return this.REST.upload(url, options, this.HttpStatus.CREATED, false);
     }
 
+    /**
+     * Upload source code from a ReadableStream
+     * {@link http://apidocs.cloudfoundry.org/214/apps/uploads_the_bits_for_an_app.html}
+     *
+     *
+     * @param  {String} appGuid                   [App guid]
+     * @param  {stream.ReadableStream} stream     [stream to upload]
+     * @param  {Boolean} async                    [Sync/Async]
+     * @return {JSON/String}                      [{}/Job information]
+     */
+    uploadFromStream (appGuid, stream, async) {
+
+        const url = `${this.API_URL}/v2/apps/${appGuid}/bits`;
+        const zipResources = [];
+        let asyncFlag = false;
+        var stats = null;
+
+        if (typeof async === "boolean") {
+            if (async) {
+                asyncFlag = true;
+            }
+        }
+        let options = {
+            headers: {
+                Authorization: `${this.UAA_TOKEN.token_type} ${this.UAA_TOKEN.access_token}`
+            },
+            qs: {
+                async: asyncFlag
+            }
+        };
+        return this.REST.uploadStream(url, options, stream, this.HttpStatus.CREATED, false);
+    }
 
     /**
      * Get Instances