@webex/helper-image 3.0.0-beta.9 → 3.0.0-beta.91

package/dist/process-image.js

@@ -1,21 +1,14 @@
 "use strict";
 
 var _Object$defineProperty = require("@babel/runtime-corejs2/core-js/object/define-property");
-
 var _interopRequireDefault = require("@babel/runtime-corejs2/helpers/interopRequireDefault");
-
 _Object$defineProperty(exports, "__esModule", {
   value: true
 });
-
 exports.default = processImage;
-
 var _promise = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/promise"));
-
 var _pick2 = _interopRequireDefault(require("lodash/pick"));
-
 var _gm = _interopRequireDefault(require("gm"));
-
 /*!
  * Copyright (c) 2015-2020 Cisco Systems, Inc. See LICENSE file.
  */
@@ -32,29 +25,26 @@ var _gm = _interopRequireDefault(require("gm"));
  */
 function processImage(_ref) {
   var file = _ref.file,
-      type = _ref.type,
-      thumbnailMaxWidth = _ref.thumbnailMaxWidth,
-      thumbnailMaxHeight = _ref.thumbnailMaxHeight,
-      enableThumbnails = _ref.enableThumbnails,
-      logger = _ref.logger;
+    type = _ref.type,
+    thumbnailMaxWidth = _ref.thumbnailMaxWidth,
+    thumbnailMaxHeight = _ref.thumbnailMaxHeight,
+    enableThumbnails = _ref.enableThumbnails,
+    logger = _ref.logger;
   var fileType = type || file.type;
-
   if (!fileType || !fileType.startsWith('image')) {
     return _promise.default.resolve();
   }
-
   var fileDimensions = new _promise.default(function (resolve, reject) {
     (0, _gm.default)(file).size(function (err, size) {
       if (err) {
         reject(err);
         return;
       }
-
       resolve((0, _pick2.default)(size, 'width', 'height'));
     });
   });
-  var thumbnail, thumbnailDimensions;
-
+  var thumbnail;
+  var thumbnailDimensions;
   if (enableThumbnails) {
     thumbnail = new _promise.default(function (resolve, reject) {
       (0, _gm.default)(file).resize(thumbnailMaxWidth, thumbnailMaxHeight).autoOrient().toBuffer('PNG', function (err, buffer) {
@@ -62,7 +52,6 @@ function processImage(_ref) {
           reject(err);
           return;
         }
-
         resolve(buffer);
       });
     });
@@ -73,31 +62,25 @@ function processImage(_ref) {
             reject(err);
             return;
           }
-
           resolve((0, _pick2.default)(size, 'width', 'height'));
         });
       });
     });
   }
-
   return _promise.default.all([thumbnail, fileDimensions, thumbnailDimensions]).catch(function (err) {
     var errorString = err.toString();
-
     if (errorString.includes('EPIPE')) {
       logger.warn(err, 'Is GraphicsMagick installed?');
       return _promise.default.resolve();
     }
-
     if (errorString.includes('No decode delegate for this image format')) {
       logger.debug(err, 'File does not appear to be an image');
       return _promise.default.resolve();
     }
-
     if (errorString.includes('Stream yields empty buffer')) {
       logger.debug(err, 'File does not appear to be an image');
       return _promise.default.resolve();
     }
-
     return _promise.default.reject(err);
   });
 }

package/dist/process-image.js.map

@@ -1 +1 @@
-{"version":3,"names":["processImage","file","type","thumbnailMaxWidth","thumbnailMaxHeight","enableThumbnails","logger","fileType","startsWith","resolve","fileDimensions","reject","gm","size","err","thumbnail","thumbnailDimensions","resize","autoOrient","toBuffer","buffer","then","all","catch","errorString","toString","includes","warn","debug"],"sources":["process-image.js"],"sourcesContent":["/*!\n * Copyright (c) 2015-2020 Cisco Systems, Inc. See LICENSE file.\n */\n\nimport gm from 'gm';\nimport {pick} from 'lodash';\n\n/**\n * Measures an image file and produces a thumbnail for it\n * @param {Object} options\n * @param {Blob|ArrayBuffer} options.file\n * @param {Number} options.thumbnailMaxWidth\n * @param {Number} options.thumbnailMaxHeight\n * @param {Boolean} options.enableThumbnails\n * @param {Object} options.logger\n * @returns {Promise<Array>} Buffer, Dimensions, thumbnailDimensions\n */\nexport default function processImage({\n  file, type, thumbnailMaxWidth, thumbnailMaxHeight, enableThumbnails, logger\n}) {\n  const fileType = type || file.type;\n\n  if (!fileType || !fileType.startsWith('image')) {\n    return Promise.resolve();\n  }\n\n  const fileDimensions = new Promise((resolve, reject) => {\n    gm(file).size((err, size) => {\n      if (err) {\n        reject(err);\n\n        return;\n      }\n\n      resolve(pick(size, 'width', 'height'));\n    });\n  });\n\n  let thumbnail, thumbnailDimensions;\n\n  if (enableThumbnails) {\n    thumbnail = new Promise((resolve, reject) => {\n      gm(file).resize(thumbnailMaxWidth, thumbnailMaxHeight)\n        .autoOrient()\n        .toBuffer('PNG', (err, buffer) => {\n          if (err) {\n            reject(err);\n\n            return;\n          }\n\n          resolve(buffer);\n        });\n    });\n\n    thumbnailDimensions = thumbnail.then((buffer) => new Promise((resolve, reject) => {\n      gm(buffer)\n        .size((err, size) => {\n          if (err) {\n            reject(err);\n\n            return;\n          }\n\n          resolve(pick(size, 'width', 'height'));\n        });\n    }));\n  }\n\n\n  return Promise.all([thumbnail, fileDimensions, thumbnailDimensions])\n    .catch((err) => {\n      const errorString = err.toString();\n\n      if (errorString.includes('EPIPE')) {\n        logger.warn(err, 'Is GraphicsMagick installed?');\n\n        return Promise.resolve();\n      }\n\n      if (errorString.includes('No decode delegate for this image format')) {\n        logger.debug(err, 'File does not appear to be an image');\n\n        return Promise.resolve();\n      }\n\n      if (errorString.includes('Stream yields empty buffer')) {\n        logger.debug(err, 'File does not appear to be an image');\n\n        return Promise.resolve();\n      }\n\n      return Promise.reject(err);\n    });\n}\n"],"mappings":"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"}
+{"version":3,"names":["processImage","file","type","thumbnailMaxWidth","thumbnailMaxHeight","enableThumbnails","logger","fileType","startsWith","resolve","fileDimensions","reject","gm","size","err","thumbnail","thumbnailDimensions","resize","autoOrient","toBuffer","buffer","then","all","catch","errorString","toString","includes","warn","debug"],"sources":["process-image.js"],"sourcesContent":["/*!\n * Copyright (c) 2015-2020 Cisco Systems, Inc. See LICENSE file.\n */\n\nimport gm from 'gm';\nimport {pick} from 'lodash';\n\n/**\n * Measures an image file and produces a thumbnail for it\n * @param {Object} options\n * @param {Blob|ArrayBuffer} options.file\n * @param {Number} options.thumbnailMaxWidth\n * @param {Number} options.thumbnailMaxHeight\n * @param {Boolean} options.enableThumbnails\n * @param {Object} options.logger\n * @returns {Promise<Array>} Buffer, Dimensions, thumbnailDimensions\n */\nexport default function processImage({\n  file,\n  type,\n  thumbnailMaxWidth,\n  thumbnailMaxHeight,\n  enableThumbnails,\n  logger,\n}) {\n  const fileType = type || file.type;\n\n  if (!fileType || !fileType.startsWith('image')) {\n    return Promise.resolve();\n  }\n\n  const fileDimensions = new Promise((resolve, reject) => {\n    gm(file).size((err, size) => {\n      if (err) {\n        reject(err);\n\n        return;\n      }\n\n      resolve(pick(size, 'width', 'height'));\n    });\n  });\n\n  let thumbnail;\n  let thumbnailDimensions;\n\n  if (enableThumbnails) {\n    thumbnail = new Promise((resolve, reject) => {\n      gm(file)\n        .resize(thumbnailMaxWidth, thumbnailMaxHeight)\n        .autoOrient()\n        .toBuffer('PNG', (err, buffer) => {\n          if (err) {\n            reject(err);\n\n            return;\n          }\n\n          resolve(buffer);\n        });\n    });\n\n    thumbnailDimensions = thumbnail.then(\n      (buffer) =>\n        new Promise((resolve, reject) => {\n          gm(buffer).size((err, size) => {\n            if (err) {\n              reject(err);\n\n              return;\n            }\n\n            resolve(pick(size, 'width', 'height'));\n          });\n        })\n    );\n  }\n\n  return Promise.all([thumbnail, fileDimensions, thumbnailDimensions]).catch((err) => {\n    const errorString = err.toString();\n\n    if (errorString.includes('EPIPE')) {\n      logger.warn(err, 'Is GraphicsMagick installed?');\n\n      return Promise.resolve();\n    }\n\n    if (errorString.includes('No decode delegate for this image format')) {\n      logger.debug(err, 'File does not appear to be an image');\n\n      return Promise.resolve();\n    }\n\n    if (errorString.includes('Stream yields empty buffer')) {\n      logger.debug(err, 'File does not appear to be an image');\n\n      return Promise.resolve();\n    }\n\n    return Promise.reject(err);\n  });\n}\n"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webex/helper-image",
-  "version": "3.0.0-beta.9",
+  "version": "3.0.0-beta.91",
   "description": "",
   "license": "MIT",
   "author": "Saurabh Jain <saurjai3@cisco.com>",
@@ -28,11 +28,11 @@
     "sinon": "^9.2.4"
   },
   "dependencies": {
-    "@webex/helper-image": "3.0.0-beta.9",
-    "@webex/http-core": "3.0.0-beta.9",
-    "@webex/test-helper-chai": "3.0.0-beta.9",
-    "@webex/test-helper-file": "3.0.0-beta.9",
-    "@webex/test-helper-mocha": "3.0.0-beta.9",
+    "@webex/helper-image": "3.0.0-beta.91",
+    "@webex/http-core": "3.0.0-beta.91",
+    "@webex/test-helper-chai": "3.0.0-beta.91",
+    "@webex/test-helper-file": "3.0.0-beta.91",
+    "@webex/test-helper-mocha": "3.0.0-beta.91",
     "exifr": "^5.0.3",
     "gm": "^1.23.1",
     "lodash": "^4.17.21",

package/src/detect-filetype.js

@@ -26,16 +26,15 @@ export default function detectFileType(file, logger) {
 
   // This kinda belongs in http core, but since we have no guarantee that
   // buffers are expected to have names there, it'll stay here for now.
-  return detect(file)
-    .then((type) => {
-      if (type === 'application/x-msi' || type === 'application/octet-stream') {
-        logger.info(`detected filetype to be ${type}. Falling back to mime.lookup`);
+  return detect(file).then((type) => {
+    if (type === 'application/x-msi' || type === 'application/octet-stream') {
+      logger.info(`detected filetype to be ${type}. Falling back to mime.lookup`);
 
-        return getType(file.name);
-      }
+      return getType(file.name);
+    }
 
-      logger.info(`detected filetype to be ${type}. returning it`);
+    logger.info(`detected filetype to be ${type}. returning it`);
 
-      return type;
-    });
+    return type;
+  });
 }

package/src/index.js

@@ -3,18 +3,18 @@
  */
 
 /* eslint no-unused-vars: ["error", { "vars": "local" }] */
-/* global FileReader */
+// eslint-disable-next-line no-redeclare
 
 const {Buffer} = require('safe-buffer');
 const {parse} = require('exifr/dist/lite.umd');
 
 /**
-* Updates the image file with exif information, required to correctly rotate the image activity
-* @param {Object} file
-* @param {Object} options
-* @param {boolean} options.shouldNotAddExifData
-* @returns {Promise<Object>}
-*/
+ * Updates the image file with exif information, required to correctly rotate the image activity
+ * @param {Object} file
+ * @param {Object} options
+ * @param {boolean} options.shouldNotAddExifData
+ * @returns {Promise<Object>}
+ */
 export function updateImageOrientation(file, options = {}) {
   return new Promise((resolve) => {
     const reader = new FileReader();
@@ -26,28 +26,24 @@ export function updateImageOrientation(file, options = {}) {
 
       resolve(buf);
     };
-  })
-    .then((buf) => {
-      if (options.shouldNotAddExifData) {
-        return buf;
-      }
+  }).then((buf) => {
+    if (options.shouldNotAddExifData) {
+      return buf;
+    }
 
-      return readExifData(file, buf);
-    });
+    return readExifData(file, buf);
+  });
 }
 
 /**
-* Adds exif orientation information on the image file
-* @param {Object} file
-* @param {Object} buf
-* @returns {Promise<ExifImage>}
-*/
+ * Adds exif orientation information on the image file
+ * @param {Object} file
+ * @param {Object} buf
+ * @returns {Promise<ExifImage>}
+ */
 export async function readExifData(file, buf) {
   // For avatar images the file.type is set as image/jpeg, however for images shared in an activity file.mimeType is set as image/jpeg. Handling both conditions.
-  if (
-    file &&
-    (file.type === 'image/jpeg' || file.mimeType === 'image/jpeg')
-  ) {
+  if (file && (file.type === 'image/jpeg' || file.mimeType === 'image/jpeg')) {
     const exifData = await parse(buf, {translateValues: false});
 
     if (exifData) {
@@ -68,15 +64,13 @@ export async function readExifData(file, buf) {
 
 /* eslint-disable complexity */
 /**
-* Rotates/flips the image on the canvas as per exif information
-* @param {Object} options(orientation: image exif orientation range from 1-8, img: Image object, x: start x-axis, y: start y-axis, width: width of the thumbnail, height: height of the thumbnail, ctx: canvas context)
-* @param {Object} file
-* @returns {Object}
-*/
+ * Rotates/flips the image on the canvas as per exif information
+ * @param {Object} options(orientation: image exif orientation range from 1-8, img: Image object, x: start x-axis, y: start y-axis, width: width of the thumbnail, height: height of the thumbnail, ctx: canvas context)
+ * @param {Object} file
+ * @returns {Object}
+ */
 export function orient(options, file) {
-  const {
-    width, height, ctx, img, orientation, x, y
-  } = options;
+  const {width, height, ctx, img, orientation, x, y} = options;
 
   if (file && file.orientation && file.orientation !== 1) {
     // explanation of orientation:
@@ -87,27 +81,27 @@ export function orient(options, file) {
         ctx.transform(-1, 0, 0, 1, width, 0);
         break;
       case 3:
-      // rotateImage180
+        // rotateImage180
         ctx.transform(-1, 0, 0, -1, width, height);
         break;
       case 4:
-      // rotate180AndFlipImage
+        // rotate180AndFlipImage
         ctx.transform(1, 0, 0, -1, 0, height);
         break;
       case 5:
-      // rotate90AndFlipImage
+        // rotate90AndFlipImage
         ctx.transform(0, 1, 1, 0, 0, 0);
         break;
       case 6:
-      // rotateImage90
+        // rotateImage90
         ctx.transform(0, 1, -1, 0, height, 0);
         break;
       case 7:
-      // rotateNeg90AndFlipImage
+        // rotateNeg90AndFlipImage
         ctx.transform(0, -1, -1, 0, height, width);
         break;
       case 8:
-      // rotateNeg90
+        // rotateNeg90
         ctx.transform(0, -1, 1, 0, 0, width);
         break;
       default:

package/src/process-image.browser.js

@@ -19,23 +19,22 @@ import {orient} from './index';
 function computeDimensions({width, height}, maxWidth, maxHeight) {
   if (height > width) {
     if (height > maxHeight) {
-      width = width * maxHeight / height;
+      width = (width * maxHeight) / height;
       height = maxHeight;
     }
 
     if (width > maxWidth) {
-      height = height * maxWidth / width;
+      height = (height * maxWidth) / width;
       width = maxWidth;
     }
-  }
-  else {
+  } else {
     if (width > maxWidth) {
-      height = height * maxWidth / width;
+      height = (height * maxWidth) / width;
       width = maxWidth;
     }
 
     if (height > maxHeight) {
-      width = width * maxHeight / height;
+      width = (width * maxHeight) / height;
       height = maxHeight;
     }
   }
@@ -55,7 +54,13 @@ function computeDimensions({width, height}, maxWidth, maxHeight) {
  * @returns {Promise<Array>} Buffer, Dimensions, thumbnailDimensions
  */
 export default function processImage({
-  file, type, thumbnailMaxWidth, thumbnailMaxHeight, enableThumbnails, logger, isAvatar
+  file,
+  type,
+  thumbnailMaxWidth,
+  thumbnailMaxHeight,
+  enableThumbnails,
+  logger,
+  isAvatar,
 }) {
   if (!type || !type.startsWith('image')) {
     return Promise.resolve();
@@ -71,66 +76,69 @@ export default function processImage({
     };
     img.onerror = reject;
     img.src = URL.createObjectURL(file);
-  })
-    .then((img) => {
-      const fileDimensions = pick(img, 'height', 'width');
-
-      if (isAvatar) { // only if image is a profile avatar
-        logger.info('dimensions will be set for avatar image');
-        const size = fileDimensions.height > fileDimensions.width ? fileDimensions.height : fileDimensions.width;
-
-        fileDimensions.height = size;
-        fileDimensions.width = size;
-      }
-      if (!enableThumbnails) {
-        logger.info('thumbnails not enabled');
-
-        return [null, fileDimensions, null];
-      }
-      const thumbnailDimensions = computeDimensions(fileDimensions, thumbnailMaxWidth, thumbnailMaxHeight);
-
-      const canvas = document.createElement('canvas');
-      const ctx = canvas.getContext('2d');
-      const {width, height} = thumbnailDimensions;
-
-      // explanation of orientation:
-      // https://stackoverflow.com/questions/20600800/js-client-side-exif-orientation-rotate-and-mirror-jpeg-images
-      if (file.orientation && file.orientation > 4) {
-        canvas.width = height;
-        canvas.height = width;
-        thumbnailDimensions.width = height;
-        thumbnailDimensions.height = width;
-      }
-      else {
-        canvas.width = thumbnailDimensions.width;
-        canvas.height = thumbnailDimensions.height;
-      }
-
-
-      orient(
-        {
-          orientation: file && file.orientation ? file.orientation : '',
-          img,
-          x: 0,
-          y: 0,
-          width,
-          height,
-          ctx
-        },
-        file
-      );
-
-      const parts = canvas.toDataURL('image/png').split(',');
-      // Thumbnail uploads were failing with common/base64 decoding
-      const byteString = atob(parts[1]);
-
-      const buffer = new ArrayBuffer(byteString.length);
-      const view = new DataView(buffer);
-
-      for (let i = 0; i < byteString.length; i += 1) {
-        view.setUint8(i, byteString.charCodeAt(i));
-      }
-
-      return [buffer, fileDimensions, thumbnailDimensions];
-    });
+  }).then((img) => {
+    const fileDimensions = pick(img, 'height', 'width');
+
+    if (isAvatar) {
+      // only if image is a profile avatar
+      logger.info('dimensions will be set for avatar image');
+      const size =
+        fileDimensions.height > fileDimensions.width ? fileDimensions.height : fileDimensions.width;
+
+      fileDimensions.height = size;
+      fileDimensions.width = size;
+    }
+    if (!enableThumbnails) {
+      logger.info('thumbnails not enabled');
+
+      return [null, fileDimensions, null];
+    }
+    const thumbnailDimensions = computeDimensions(
+      fileDimensions,
+      thumbnailMaxWidth,
+      thumbnailMaxHeight
+    );
+
+    const canvas = document.createElement('canvas');
+    const ctx = canvas.getContext('2d');
+    const {width, height} = thumbnailDimensions;
+
+    // explanation of orientation:
+    // https://stackoverflow.com/questions/20600800/js-client-side-exif-orientation-rotate-and-mirror-jpeg-images
+    if (file.orientation && file.orientation > 4) {
+      canvas.width = height;
+      canvas.height = width;
+      thumbnailDimensions.width = height;
+      thumbnailDimensions.height = width;
+    } else {
+      canvas.width = thumbnailDimensions.width;
+      canvas.height = thumbnailDimensions.height;
+    }
+
+    orient(
+      {
+        orientation: file && file.orientation ? file.orientation : '',
+        img,
+        x: 0,
+        y: 0,
+        width,
+        height,
+        ctx,
+      },
+      file
+    );
+
+    const parts = canvas.toDataURL('image/png').split(',');
+    // Thumbnail uploads were failing with common/base64 decoding
+    const byteString = atob(parts[1]);
+
+    const buffer = new ArrayBuffer(byteString.length);
+    const view = new DataView(buffer);
+
+    for (let i = 0; i < byteString.length; i += 1) {
+      view.setUint8(i, byteString.charCodeAt(i));
+    }
+
+    return [buffer, fileDimensions, thumbnailDimensions];
+  });
 }

package/src/process-image.js

@@ -16,7 +16,12 @@ import {pick} from 'lodash';
  * @returns {Promise<Array>} Buffer, Dimensions, thumbnailDimensions
  */
 export default function processImage({
-  file, type, thumbnailMaxWidth, thumbnailMaxHeight, enableThumbnails, logger
+  file,
+  type,
+  thumbnailMaxWidth,
+  thumbnailMaxHeight,
+  enableThumbnails,
+  logger,
 }) {
   const fileType = type || file.type;
 
@@ -36,11 +41,13 @@ export default function processImage({
     });
   });
 
-  let thumbnail, thumbnailDimensions;
+  let thumbnail;
+  let thumbnailDimensions;
 
   if (enableThumbnails) {
     thumbnail = new Promise((resolve, reject) => {
-      gm(file).resize(thumbnailMaxWidth, thumbnailMaxHeight)
+      gm(file)
+        .resize(thumbnailMaxWidth, thumbnailMaxHeight)
         .autoOrient()
         .toBuffer('PNG', (err, buffer) => {
           if (err) {
@@ -53,43 +60,43 @@ export default function processImage({
         });
     });
 
-    thumbnailDimensions = thumbnail.then((buffer) => new Promise((resolve, reject) => {
-      gm(buffer)
-        .size((err, size) => {
-          if (err) {
-            reject(err);
+    thumbnailDimensions = thumbnail.then(
+      (buffer) =>
+        new Promise((resolve, reject) => {
+          gm(buffer).size((err, size) => {
+            if (err) {
+              reject(err);
 
-            return;
-          }
+              return;
+            }
 
-          resolve(pick(size, 'width', 'height'));
-        });
-    }));
+            resolve(pick(size, 'width', 'height'));
+          });
+        })
+    );
   }
 
+  return Promise.all([thumbnail, fileDimensions, thumbnailDimensions]).catch((err) => {
+    const errorString = err.toString();
 
-  return Promise.all([thumbnail, fileDimensions, thumbnailDimensions])
-    .catch((err) => {
-      const errorString = err.toString();
+    if (errorString.includes('EPIPE')) {
+      logger.warn(err, 'Is GraphicsMagick installed?');
 
-      if (errorString.includes('EPIPE')) {
-        logger.warn(err, 'Is GraphicsMagick installed?');
+      return Promise.resolve();
+    }
 
-        return Promise.resolve();
-      }
+    if (errorString.includes('No decode delegate for this image format')) {
+      logger.debug(err, 'File does not appear to be an image');
 
-      if (errorString.includes('No decode delegate for this image format')) {
-        logger.debug(err, 'File does not appear to be an image');
+      return Promise.resolve();
+    }
 
-        return Promise.resolve();
-      }
-
-      if (errorString.includes('Stream yields empty buffer')) {
-        logger.debug(err, 'File does not appear to be an image');
+    if (errorString.includes('Stream yields empty buffer')) {
+      logger.debug(err, 'File does not appear to be an image');
 
-        return Promise.resolve();
-      }
+      return Promise.resolve();
+    }
 
-      return Promise.reject(err);
-    });
+    return Promise.reject(err);
+  });
 }