Merge branch 'master' into add-JSDoc-comments

server/image-data-uri.js

@@ -3,17 +3,21 @@
     Modified with 0 dependencies
  */
 let fs = require("fs");
+const { log } = require("../src/util");
 
 let ImageDataURI = (() => {
 
     /**
      * Decode the data:image/ URI
      * @param {string} dataURI data:image/ URI to decode
-     * @returns {Object}
+     * @returns {?Object} An object with properties "imageType" and "dataBase64".
+     * The former is the image type, e.g., "png", and the latter is a base64
+     * encoded string of the image's binary data. If it fails to parse, returns
+     * null instead of an object.
      */
     function decode(dataURI) {
         if (!/data:image\//.test(dataURI)) {
-            console.log("ImageDataURI :: Error :: It seems that it is not an Image Data URI. Couldn't match \"data:image/\"");
+            log.error("image-data-uri", "It seems that it is not an Image Data URI. Couldn't match \"data:image/\"");
             return null;
         }
 
@@ -29,11 +33,12 @@ let ImageDataURI = (() => {
      * Endcode an image into data:image/ URI
      * @param {(Buffer|string)} data Data to encode
      * @param {string} mediaType Media type of data
-     * @returns {(string|null)}
+     * @returns {(string|null)} A string representing the base64-encoded
+     * version of the given Buffer object or null if an error occurred.
      */
     function encode(data, mediaType) {
         if (!data || !mediaType) {
-            console.log("ImageDataURI :: Error :: Missing some of the required params: data, mediaType ");
+            log.error("image-data-uri", "Missing some of the required params: data, mediaType");
             return null;
         }
 
@@ -47,7 +52,7 @@ let ImageDataURI = (() => {
     /**
      * Write data URI to file
      * @param {string} dataURI data:image/ URI
-     * @param {string} filePath Path to write file to
+     * @param {string} [filePath] Path to write file to
      * @returns {Promise<string>}
      */
     function outputFile(dataURI, filePath) {