Merge pull request #314 from qbikez/fix-double-callback

Eliminate the possibilty of invoking callback twice.

Author: ricardo-devis-agullo

packages/oc-azure-storage-adapter/index.js

@@ -91,14 +91,16 @@ module.exports = function (conf) {
         return callback(err);
       }
 
+      let parsed = null;
       try {
-        callback(null, JSON.parse(file));
+        parsed = JSON.parse(file);
       } catch (er) {
         return callback({
           code: strings.errors.STORAGE.FILE_NOT_VALID_CODE,
           msg: format(strings.errors.STORAGE.FILE_NOT_VALID, filePath)
         });
       }
+      callback(null, parsed);
     });
   };
 
@@ -205,76 +207,84 @@ module.exports = function (conf) {
   };
 
   const putFileContent = (fileContent, fileName, isPrivate, callback) => {
-    const fileInfo = getFileInfo(fileName);
-    const contentSettings = {
-      cacheControl: 'public, max-age=31556926'
-    };
-    if (fileInfo.mimeType) {
-      contentSettings.contentType = fileInfo.mimeType;
-    }
+    try {
+      const fileInfo = getFileInfo(fileName);
+      const contentSettings = {
+        cacheControl: 'public, max-age=31556926'
+      };
+      if (fileInfo.mimeType) {
+        contentSettings.contentType = fileInfo.mimeType;
+      }
 
-    if (fileInfo.gzip) {
-      contentSettings.contentEncoding = 'gzip';
-    }
+      if (fileInfo.gzip) {
+        contentSettings.contentEncoding = 'gzip';
+      }
+
+      const uploadToAzureContainer = (rereadable, containerName, cb) => {
+        try {
+          if (fileContent instanceof stream.Stream) {
+            return fileContent.pipe(
+              getClient().createWriteStreamToBlockBlob(
+                containerName,
+                fileName,
+                { contentSettings: contentSettings },
+                (err, res) => {
+                  if (rereadable) {
+                    // I need  a fresh read stream and this is the only thing I came up with
+                    // very ugly and has poor performance, but works
+                    fileContent = getClient().createReadStream(
+                      containerName,
+                      fileName
+                    );
+                  }
+
+                  cb(err, res);
+                }
+              )
+            );
+          }
 
-    const uploadToAzureContainer = (rereadable, containerName, cb) => {
-      if (fileContent instanceof stream.Stream) {
-        return fileContent.pipe(
-          getClient().createWriteStreamToBlockBlob(
+          getClient().createBlockBlobFromText(
             containerName,
             fileName,
+            fileContent,
             { contentSettings: contentSettings },
-            (err, res) => {
-              if (rereadable) {
-                // I need  a fresh read stream and this is the only thing I came up with
-                // very ugly and has poor performance, but works
-                fileContent = getClient().createReadStream(
-                  containerName,
-                  fileName
-                );
-              }
-
-              cb(err, res);
-            }
-          )
-        );
-      }
+            cb
+          );
+        } catch (err) {
+          return cb(err);
+        }
+      };
 
-      getClient().createBlockBlobFromText(
-        containerName,
-        fileName,
-        fileContent,
-        { contentSettings: contentSettings },
-        cb
-      );
-    };
+      const makeReReadable = !isPrivate;
+      uploadToAzureContainer(
+        makeReReadable,
+        conf.privateContainerName,
+        (err, result) => {
+          if (err) {
+            return callback(err);
+          }
 
-    const makeReReadable = !isPrivate;
-    uploadToAzureContainer(
-      makeReReadable,
-      conf.privateContainerName,
-      (err, result) => {
-        if (err) {
-          return callback(err);
-        }
+          if (!isPrivate) {
+            return uploadToAzureContainer(
+              false,
+              conf.publicContainerName,
+              callback
+            );
+          }
 
-        if (!isPrivate) {
-          return uploadToAzureContainer(
-            false,
-            conf.publicContainerName,
-            callback
-          );
+          return callback(null, result);
         }
-
-        return callback(null, result);
-      }
-    );
+      );
+    } catch (err) {
+      return callback(err);
+    }
   };
 
   const putFile = (filePath, fileName, isPrivate, callback) => {
     try {
       const stream = fs.createReadStream(filePath);
-      return putFileContent(stream, fileName, isPrivate, callback);
+      putFileContent(stream, fileName, isPrivate, callback);
     } catch (e) {
       return callback(e);
     }