@lighthouse/common 6.2.0-canary.4 → 6.2.0-canary.40

package/dist/helpers/build-fetch-url/index.js

@@ -13,17 +13,27 @@ function buildFetchUrl(url, options) {
     height,
     width,
     quality,
-    shouldUseCloudfront
+    shouldUseCloudfront,
+    Policy,
+    KeyPairId,
+    Signature
   } = options;
   if (shouldUseCloudfront) {
-    const transformations = [];
-    if (width) transformations.push(`width=${width.toString()}`);
-    if (height) transformations.push(`height=${height.toString()}`);
-    if (quality) transformations.push(`quality=${quality.toString()}`);
-    transformations.push(`fit=contain`);
-    const transformationsString = transformations.join('&');
-    const fetchUrl = `${cloudfrontBaseUrl}/${url}?${transformationsString}`;
-    return fetchUrl;
+    const isWebContext = shouldUseCloudfront && typeof window === 'object';
+    const paramMap = {
+      width,
+      height,
+      quality,
+      fit: 'contain'
+    };
+    if (isWebContext) {
+      paramMap.Policy = Policy;
+      paramMap['Key-Pair-Id'] = KeyPairId;
+      paramMap.Signature = Signature;
+    }
+    const params = Object.entries(paramMap).filter(([, value]) => value != null).map(([key, value]) => `${key}=${String(value)}`);
+    const paramsString = params.join('&');
+    return `${cloudfrontBaseUrl}/${url}?${paramsString}`;
   }
   const transformations = [];
   let transformationsString = '';

package/dist/helpers/fetch-image/index.js

@@ -40,6 +40,10 @@ function fetchImage(url, options = {}) {
   const {
     shouldUseCloudfront
   } = options;
+  console.log('FETCH IMAGE OPTIONS AND URL', {
+    options,
+    url
+  });
   if (shouldUseCloudfront) {
     const isWebContext = typeof window === 'object';
     return isWebContext ?

package/dist/helpers/fetch-image-for-pdf-generator-service/index.js

@@ -27,24 +27,26 @@ const fetchImageForPdfGeneratorService = async function (url) {
   if (!applicationId) {
     throw new Error('Requestor has insufficient permissions');
   }
-  const transformedBuckeKey = parseUrlString(url);
-  console.debug({
-    transformedBuckeKey,
-    url
+  const {
+    path,
+    queryString
+  } = parseUrlString(url);
+  const transformedBucketImagePath = path + (queryString ? `/${queryString}` : '');
+  console.debug("", {
+    transformedBucketImagePath
   });
   const alreadyTransformedImage = await fetchResourceFromS3({
     bucketName: `${process.env.S3_BUCKET_IMAGE_TRANSFORMER_CACHE}`,
-    key: transformedBuckeKey
+    key: transformedBucketImagePath
   });
   if (alreadyTransformedImage?.body) {
     const fullDataUrl = formatBase64Image({
       base64String: alreadyTransformedImage.body.toString('base64'),
-      key: keyWithTransformations
+      key: transformedBucketImagePath
     });
     return fullDataUrl;
   }
-  const keyWithTransformations = url.substring(url.indexOf(applicationId));
-  const transformerResponse = await requestImageTransformation(keyWithTransformations);
+  const transformerResponse = await requestImageTransformation(url);
   const statusCode = transformerResponse.statusCode;
   switch (statusCode) {
     case 200:
@@ -52,27 +54,27 @@ const fetchImageForPdfGeneratorService = async function (url) {
         console.debug('Image transformation successful');
         const fullDataUrl = formatBase64Image({
           base64String: transformerResponse.body.toString('base64'),
-          key: keyWithTransformations
+          key: url
         });
         return fullDataUrl;
       }
     case 302:
       {
         console.debug('Image transformation successful but image is too big for lambda delivery, fetching directly from S3');
-        const redirectLocation = transformerResponse.headers?.Location;
-        if (redirectLocation) {
-          const newlyTransformedImage = await fetchResourceFromS3({
-            bucketName: `${process.env.S3_BUCKET_IMAGE_TRANSFORMER_CACHE}`,
-            key: keyWithTransformations
-          });
-          console.debug('Image successfully fetched from S3 at:', redirectLocation);
-          const fullDataUrl = formatBase64Image({
-            base64String: newlyTransformedImage.body.toString('base64'),
-            key: keyWithTransformations
-          });
-          return fullDataUrl;
+        const redirectLocation = transformerResponse.headers.Location;
+        if (!redirectLocation) {
+          throw new Error('Redirect response received but no location provided');
         }
-        throw new Error('Redirect response received but no location provided');
+        const newlyTransformedImage = await fetchResourceFromS3({
+          bucketName: `${process.env.S3_BUCKET_IMAGE_TRANSFORMER_CACHE}`,
+          key: transformedBucketImagePath
+        });
+        console.debug('Image successfully fetched from S3 at:', redirectLocation);
+        const fullDataUrl = formatBase64Image({
+          base64String: newlyTransformedImage.body.toString('base64'),
+          key: transformedBucketImagePath
+        });
+        return fullDataUrl;
       }
     case 400:
       throw new Error(`Bad request to image transformer: ${transformerResponse.body}`);
@@ -168,25 +170,35 @@ function formatBase64Image({
 
 /**
  * Parses a URL-like string into path and query parameters
- * @param {string} urlString - String like "<applicationId>/<path>/filename.jpeg?width=100&height=100"
- * @returns {Object} - Object with { path: string, queryParams: string }
+ * @param {string} urlString - String like "https://example.cloudfront.net/<applicationId>/<path>/filename.jpeg?width=100&height=100"
+ * @returns {Object} - Object with { path: string, queryString: string }
  * @example
- * parseUrlString("abc123/folder/image.jpeg?width=100&height=100")
- * // Returns: { path: "abc123/folder/image.jpeg", queryParams: "width=100,height=100" }
+ * parseUrlString("https://example.cloudfront.net/abc123/folder/image.jpeg?width=100&height=100")
+ * // Returns: { path: "abc123/folder/image.jpeg", queryString: "width=100&t=456" }
  */
 function parseUrlString(urlString) {
   if (!urlString || typeof urlString !== 'string') {
     throw new Error('URL string is required and must be a string');
   }
-  const [path, queryString] = urlString.split('?');
+
+  // Extract the path after the domain
+  const url = new URL(urlString);
+  const pathname = url.pathname;
+  // Remove leading slash if present
+  const pathWithoutLeadingSlash = pathname.startsWith('/') ? pathname.slice(1) : pathname;
+
+  // Get everything after the domain (path + query)
+  const fullPath = pathWithoutLeadingSlash + url.search;
+  let [path, queryString] = fullPath.split('?');
+
+  // change query string to ve seperated by commas instead of &
+
+  queryString = queryString ? queryString.replace(/&/g, ',') : '';
   if (!path) {
     throw new Error('Invalid URL string: missing path component');
   }
-  if (!queryString) {
-    return `${path}`;
-  }
-
-  // Parse query parameters and convert to comma-separated format
-  const queryParams = queryString.split('&').join(',');
-  return `${path}/${queryParams}`;
+  return {
+    path,
+    queryString
+  };
 }

package/dist/helpers/fetch-image-for-web/index.js

@@ -6,12 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.fetchImageForWeb = void 0;
 var _images = require("../../images");
 var _fetchLighthouseLogo = require("../fetch-lighthouse-logo");
-var _fetchImage = require("../fetch-image");
-var _imageValidators = require("../image-validators");
-const contentTypes = {
-  'image/png': 'png',
-  'image/jpeg': 'jpeg'
-};
 const fetchImageForWeb = async function (url, options) {
   const {
     isHeader = false,
@@ -21,26 +15,18 @@ const fetchImageForWeb = async function (url, options) {
   } = options;
   try {
     const firstParamConnector = url.indexOf('?') > -1 ? '&' : '?';
-    const urlToEncode = `${url}${firstParamConnector}Signature=${Signature}&Policy=${Policy}&Key-Pair-Id=${KeyPairId}`;
-    const encodedUrl = encodeURI(urlToEncode);
+    const hasSignatureParams = url.includes('Signature=') && url.includes('Policy=') && url.includes('Key-Pair-Id=');
+    const constructedUrl = !hasSignatureParams ? `${url}${firstParamConnector}Signature=${Signature}&Policy=${Policy}&Key-Pair-Id=${KeyPairId}` : url;
     console.debug('Fetching image via CloudFront For Web');
-    const imageResponse = await fetch(encodedUrl);
+    const imageResponse = await fetch(constructedUrl);
     const contentLengthHeader = imageResponse.headers.get('content-length');
-    const contentType = imageResponse.headers.get('content-type');
     if (contentLengthHeader === '0') {
       return Promise.reject(new Error(`Failed to fetch image as no content length: ${encodedUrl}`));
     }
     if (!imageResponse.ok) {
       return Promise.reject(new Error(`Failed to fetch image: ${encodedUrl}`));
     }
-    const imageType = contentTypes[contentType];
-    const logoArrayBuffer = await imageResponse.arrayBuffer();
-    const base64Flag = `data:image/${imageType};base64,`;
-    const imageStr = (0, _fetchImage.arrayBufferToBase64)(logoArrayBuffer);
-    const base64 = `${base64Flag}${imageStr}`;
-    const isValid = (0, _imageValidators.validateBase64Image)(base64);
-    if (!isValid) throw new Error('InvalidImageError');
-    return base64;
+    return await imageResponse.arrayBuffer();
   } catch (error) {
     if (isHeader) {
       // NOTE: Replace failed headers with LH logo

package/dist/helpers/get-audit-items-data/index.js

@@ -12,6 +12,9 @@ function getAuditItemsData(items, data) {
       awsS3BaseUrl,
       cloudinaryBaseUrl,
       cloudfrontBaseUrl,
+      Policy,
+      KeyPairId,
+      Signature,
       shouldUseCloudfront
     } = {},
     entity: {
@@ -55,11 +58,14 @@ function getAuditItemsData(items, data) {
           awsS3BaseUrl,
           cloudfrontBaseUrl,
           cloudinaryBaseUrl,
-          shouldUseCloudfront,
-          fit: true,
           height: 400,
           width: 600,
-          quality: 50
+          quality: 50,
+          fit: true,
+          shouldUseCloudfront,
+          Policy,
+          KeyPairId,
+          Signature
         });
         const link = `${awsS3BaseUrl}/${asset}`;
         const thumbnailUrl = (0, _.buildFetchUrl)(asset, {
@@ -68,7 +74,12 @@ function getAuditItemsData(items, data) {
           cloudinaryBaseUrl,
           shouldUseCloudfront,
           width: 100,
-          quality: 50
+          quality: 50,
+          fit: true,
+          shouldUseCloudfront,
+          Policy,
+          KeyPairId,
+          Signature
         });
         const key = `${groupIndex}-item-asset-${assetIndex}`;
         return {

package/dist/pdf/audit/index.js

@@ -62,6 +62,7 @@ function generateContent(data) {
   const {
     entity
   } = data;
+  console.log("Data in generateContent:", data);
   const {
     followUps = [],
     footerFields = {},
@@ -195,8 +196,11 @@ function generateContent(data) {
   const followUpItems = (0, _helpers.buildAuditFollowUps)(followUps, {
     timezone
   });
+  console.log("Data before passing t buildAuditContent", {
+    data
+  });
   const promises = {
-    entry: (0, _helpers.buildAuditContent)(groupedData.items),
+    entry: (0, _helpers.buildAuditContent)(groupedData.items, data.settings),
     footerTemplate: (0, _helpers.buildTemplateContent)(footerFields.formGroups, data),
     headerTemplate: (0, _helpers.buildTemplateContent)(headerFields.formGroups, data)
   };

package/dist/pdf/helpers/build-audit-content/index.js

@@ -71,6 +71,13 @@ const buildAuditContent = exports.buildAuditContent = _bluebird.default.method((
           rows.push(commentsRow);
         }
         return rows;
+      }).catch(err => {
+        console.log("ERROR FETCHING IMAGE FOR AUDIT CONTENT", {
+          err,
+          item,
+          assetUrl: item.assetUrl
+        });
+        throw err;
       });
     }).then(groupTableRows => {
       const actual = (0, _lodash.round)(group.groupActualScore, 2);

package/lib/helpers/build-fetch-url/index.js

@@ -1,3 +1,5 @@
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+import _typeof from "@babel/runtime/helpers/typeof";
 export function buildFetchUrl(url, options) {
   var awsS3BaseUrl = options.awsS3BaseUrl,
     _options$cloudfrontBa = options.cloudfrontBaseUrl,
@@ -7,16 +9,35 @@ export function buildFetchUrl(url, options) {
     height = options.height,
     width = options.width,
     quality = options.quality,
-    shouldUseCloudfront = options.shouldUseCloudfront;
+    shouldUseCloudfront = options.shouldUseCloudfront,
+    Policy = options.Policy,
+    KeyPairId = options.KeyPairId,
+    Signature = options.Signature;
   if (shouldUseCloudfront) {
-    var _transformations = [];
-    if (width) _transformations.push("width=".concat(width.toString()));
-    if (height) _transformations.push("height=".concat(height.toString()));
-    if (quality) _transformations.push("quality=".concat(quality.toString()));
-    _transformations.push("fit=contain");
-    var _transformationsString = _transformations.join('&');
-    var _fetchUrl = "".concat(cloudfrontBaseUrl, "/").concat(url, "?").concat(_transformationsString);
-    return _fetchUrl;
+    var isWebContext = shouldUseCloudfront && (typeof window === "undefined" ? "undefined" : _typeof(window)) === 'object';
+    var paramMap = {
+      width: width,
+      height: height,
+      quality: quality,
+      fit: 'contain'
+    };
+    if (isWebContext) {
+      paramMap.Policy = Policy;
+      paramMap['Key-Pair-Id'] = KeyPairId;
+      paramMap.Signature = Signature;
+    }
+    var params = Object.entries(paramMap).filter(function (_ref) {
+      var _ref2 = _slicedToArray(_ref, 2),
+        value = _ref2[1];
+      return value != null;
+    }).map(function (_ref3) {
+      var _ref4 = _slicedToArray(_ref3, 2),
+        key = _ref4[0],
+        value = _ref4[1];
+      return "".concat(key, "=").concat(String(value));
+    });
+    var paramsString = params.join('&');
+    return "".concat(cloudfrontBaseUrl, "/").concat(url, "?").concat(paramsString);
   }
   var transformations = [];
   var transformationsString = '';

package/lib/helpers/build-fetch-url/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["buildFetchUrl","url","options","awsS3BaseUrl","_options$cloudfrontBa","cloudfrontBaseUrl","cloudinaryBaseUrl","fit","height","width","quality","shouldUseCloudfront","transformations","push","concat","toString","transformationsString","join","fetchUrl"],"sources":["../../../src/helpers/build-fetch-url/index.js"],"sourcesContent":["export function buildFetchUrl(url, options) {\n  const {\n    awsS3BaseUrl,\n    cloudfrontBaseUrl = '',\n    cloudinaryBaseUrl,\n    fit,\n    height,\n    width,\n    quality,\n    shouldUseCloudfront,\n  } = options\n\n  if (shouldUseCloudfront) {\n    const transformations = []\n\n    if (width) transformations.push(`width=${width.toString()}`)\n    if (height) transformations.push(`height=${height.toString()}`)\n    if (quality) transformations.push(`quality=${quality.toString()}`)\n    transformations.push(`fit=contain`)\n\n    const transformationsString = transformations.join('&')\n\n    const fetchUrl = `${cloudfrontBaseUrl}/${url}?${transformationsString}`\n    return fetchUrl\n  }\n\n  const transformations = []\n  let transformationsString = ''\n\n  if (width) transformations.push(`w_${width.toString()}`)\n  if (height) transformations.push(`h_${height.toString()}`)\n  if (quality) transformations.push(`q_${quality.toString()}`)\n  if (fit) transformations.push('c_fit')\n\n  transformationsString = `${transformations.join(',')}/`\n\n  const fetchUrl = `${cloudinaryBaseUrl}/${transformationsString}${awsS3BaseUrl}/${url}`\n\n  return fetchUrl\n}\n"],"mappings":"AAAA,OAAO,SAASA,aAAaA,CAACC,GAAG,EAAEC,OAAO,EAAE;EAC1C,IACEC,YAAY,GAQVD,OAAO,CARTC,YAAY;IAAAC,qBAAA,GAQVF,OAAO,CAPTG,iBAAiB;IAAjBA,iBAAiB,GAAAD,qBAAA,cAAG,EAAE,GAAAA,qBAAA;IACtBE,iBAAiB,GAMfJ,OAAO,CANTI,iBAAiB;IACjBC,GAAG,GAKDL,OAAO,CALTK,GAAG;IACHC,MAAM,GAIJN,OAAO,CAJTM,MAAM;IACNC,KAAK,GAGHP,OAAO,CAHTO,KAAK;IACLC,OAAO,GAELR,OAAO,CAFTQ,OAAO;IACPC,mBAAmB,GACjBT,OAAO,CADTS,mBAAmB;EAGrB,IAAIA,mBAAmB,EAAE;IACvB,IAAMC,gBAAe,GAAG,EAAE;IAE1B,IAAIH,KAAK,EAAEG,gBAAe,CAACC,IAAI,UAAAC,MAAA,CAAUL,KAAK,CAACM,QAAQ,CAAC,CAAC,CAAE,CAAC;IAC5D,IAAIP,MAAM,EAAEI,gBAAe,CAACC,IAAI,WAAAC,MAAA,CAAWN,MAAM,CAACO,QAAQ,CAAC,CAAC,CAAE,CAAC;IAC/D,IAAIL,OAAO,EAAEE,gBAAe,CAACC,IAAI,YAAAC,MAAA,CAAYJ,OAAO,CAACK,QAAQ,CAAC,CAAC,CAAE,CAAC;IAClEH,gBAAe,CAACC,IAAI,cAAc,CAAC;IAEnC,IAAMG,sBAAqB,GAAGJ,gBAAe,CAACK,IAAI,CAAC,GAAG,CAAC;IAEvD,IAAMC,SAAQ,MAAAJ,MAAA,CAAMT,iBAAiB,OAAAS,MAAA,CAAIb,GAAG,OAAAa,MAAA,CAAIE,sBAAqB,CAAE;IACvE,OAAOE,SAAQ;EACjB;EAEA,IAAMN,eAAe,GAAG,EAAE;EAC1B,IAAII,qBAAqB,GAAG,EAAE;EAE9B,IAAIP,KAAK,EAAEG,eAAe,CAACC,IAAI,MAAAC,MAAA,CAAML,KAAK,CAACM,QAAQ,CAAC,CAAC,CAAE,CAAC;EACxD,IAAIP,MAAM,EAAEI,eAAe,CAACC,IAAI,MAAAC,MAAA,CAAMN,MAAM,CAACO,QAAQ,CAAC,CAAC,CAAE,CAAC;EAC1D,IAAIL,OAAO,EAAEE,eAAe,CAACC,IAAI,MAAAC,MAAA,CAAMJ,OAAO,CAACK,QAAQ,CAAC,CAAC,CAAE,CAAC;EAC5D,IAAIR,GAAG,EAAEK,eAAe,CAACC,IAAI,CAAC,OAAO,CAAC;EAEtCG,qBAAqB,MAAAF,MAAA,CAAMF,eAAe,CAACK,IAAI,CAAC,GAAG,CAAC,MAAG;EAEvD,IAAMC,QAAQ,MAAAJ,MAAA,CAAMR,iBAAiB,OAAAQ,MAAA,CAAIE,qBAAqB,EAAAF,MAAA,CAAGX,YAAY,OAAAW,MAAA,CAAIb,GAAG,CAAE;EAEtF,OAAOiB,QAAQ;AACjB","ignoreList":[]}
+{"version":3,"file":"index.js","names":["buildFetchUrl","url","options","awsS3BaseUrl","_options$cloudfrontBa","cloudfrontBaseUrl","cloudinaryBaseUrl","fit","height","width","quality","shouldUseCloudfront","Policy","KeyPairId","Signature","isWebContext","window","_typeof","paramMap","params","Object","entries","filter","_ref","_ref2","_slicedToArray","value","map","_ref3","_ref4","key","concat","String","paramsString","join","transformations","transformationsString","push","toString","fetchUrl"],"sources":["../../../src/helpers/build-fetch-url/index.js"],"sourcesContent":["export function buildFetchUrl(url, options) {\n  const {\n    awsS3BaseUrl,\n    cloudfrontBaseUrl = '',\n    cloudinaryBaseUrl,\n    fit,\n    height,\n    width,\n    quality,\n    shouldUseCloudfront,\n    Policy,\n    KeyPairId,\n    Signature,\n  } = options\n\n  if (shouldUseCloudfront) {\n    const isWebContext = shouldUseCloudfront && typeof window === 'object'\n\n    const paramMap = {\n      width,\n      height,\n      quality,\n      fit: 'contain',\n    }\n\n    if (isWebContext) {\n      paramMap.Policy = Policy\n      paramMap['Key-Pair-Id'] = KeyPairId\n      paramMap.Signature = Signature\n    }\n    const params = Object.entries(paramMap)\n      .filter(([, value]) => value != null)\n      .map(([key, value]) => `${key}=${String(value)}`)\n\n    const paramsString = params.join('&')\n    return `${cloudfrontBaseUrl}/${url}?${paramsString}`\n  }\n\n  const transformations = []\n  let transformationsString = ''\n\n  if (width) transformations.push(`w_${width.toString()}`)\n  if (height) transformations.push(`h_${height.toString()}`)\n  if (quality) transformations.push(`q_${quality.toString()}`)\n  if (fit) transformations.push('c_fit')\n\n  transformationsString = `${transformations.join(',')}/`\n\n  const fetchUrl = `${cloudinaryBaseUrl}/${transformationsString}${awsS3BaseUrl}/${url}`\n\n  return fetchUrl\n}\n"],"mappings":";;AAAA,OAAO,SAASA,aAAaA,CAACC,GAAG,EAAEC,OAAO,EAAE;EAC1C,IACEC,YAAY,GAWVD,OAAO,CAXTC,YAAY;IAAAC,qBAAA,GAWVF,OAAO,CAVTG,iBAAiB;IAAjBA,iBAAiB,GAAAD,qBAAA,cAAG,EAAE,GAAAA,qBAAA;IACtBE,iBAAiB,GASfJ,OAAO,CATTI,iBAAiB;IACjBC,GAAG,GAQDL,OAAO,CARTK,GAAG;IACHC,MAAM,GAOJN,OAAO,CAPTM,MAAM;IACNC,KAAK,GAMHP,OAAO,CANTO,KAAK;IACLC,OAAO,GAKLR,OAAO,CALTQ,OAAO;IACPC,mBAAmB,GAIjBT,OAAO,CAJTS,mBAAmB;IACnBC,MAAM,GAGJV,OAAO,CAHTU,MAAM;IACNC,SAAS,GAEPX,OAAO,CAFTW,SAAS;IACTC,SAAS,GACPZ,OAAO,CADTY,SAAS;EAGX,IAAIH,mBAAmB,EAAE;IACvB,IAAMI,YAAY,GAAGJ,mBAAmB,IAAI,QAAOK,MAAM,iCAAAC,OAAA,CAAND,MAAM,OAAK,QAAQ;IAEtE,IAAME,QAAQ,GAAG;MACfT,KAAK,EAALA,KAAK;MACLD,MAAM,EAANA,MAAM;MACNE,OAAO,EAAPA,OAAO;MACPH,GAAG,EAAE;IACP,CAAC;IAED,IAAIQ,YAAY,EAAE;MAChBG,QAAQ,CAACN,MAAM,GAAGA,MAAM;MACxBM,QAAQ,CAAC,aAAa,CAAC,GAAGL,SAAS;MACnCK,QAAQ,CAACJ,SAAS,GAAGA,SAAS;IAChC;IACA,IAAMK,MAAM,GAAGC,MAAM,CAACC,OAAO,CAACH,QAAQ,CAAC,CACpCI,MAAM,CAAC,UAAAC,IAAA;MAAA,IAAAC,KAAA,GAAAC,cAAA,CAAAF,IAAA;QAAIG,KAAK,GAAAF,KAAA;MAAA,OAAME,KAAK,IAAI,IAAI;IAAA,EAAC,CACpCC,GAAG,CAAC,UAAAC,KAAA;MAAA,IAAAC,KAAA,GAAAJ,cAAA,CAAAG,KAAA;QAAEE,GAAG,GAAAD,KAAA;QAAEH,KAAK,GAAAG,KAAA;MAAA,UAAAE,MAAA,CAASD,GAAG,OAAAC,MAAA,CAAIC,MAAM,CAACN,KAAK,CAAC;IAAA,CAAE,CAAC;IAEnD,IAAMO,YAAY,GAAGd,MAAM,CAACe,IAAI,CAAC,GAAG,CAAC;IACrC,UAAAH,MAAA,CAAU1B,iBAAiB,OAAA0B,MAAA,CAAI9B,GAAG,OAAA8B,MAAA,CAAIE,YAAY;EACpD;EAEA,IAAME,eAAe,GAAG,EAAE;EAC1B,IAAIC,qBAAqB,GAAG,EAAE;EAE9B,IAAI3B,KAAK,EAAE0B,eAAe,CAACE,IAAI,MAAAN,MAAA,CAAMtB,KAAK,CAAC6B,QAAQ,CAAC,CAAC,CAAE,CAAC;EACxD,IAAI9B,MAAM,EAAE2B,eAAe,CAACE,IAAI,MAAAN,MAAA,CAAMvB,MAAM,CAAC8B,QAAQ,CAAC,CAAC,CAAE,CAAC;EAC1D,IAAI5B,OAAO,EAAEyB,eAAe,CAACE,IAAI,MAAAN,MAAA,CAAMrB,OAAO,CAAC4B,QAAQ,CAAC,CAAC,CAAE,CAAC;EAC5D,IAAI/B,GAAG,EAAE4B,eAAe,CAACE,IAAI,CAAC,OAAO,CAAC;EAEtCD,qBAAqB,MAAAL,MAAA,CAAMI,eAAe,CAACD,IAAI,CAAC,GAAG,CAAC,MAAG;EAEvD,IAAMK,QAAQ,MAAAR,MAAA,CAAMzB,iBAAiB,OAAAyB,MAAA,CAAIK,qBAAqB,EAAAL,MAAA,CAAG5B,YAAY,OAAA4B,MAAA,CAAI9B,GAAG,CAAE;EAEtF,OAAOsC,QAAQ;AACjB","ignoreList":[]}

package/lib/helpers/fetch-image/index.js

@@ -33,6 +33,10 @@ var defaultOptions = {
 export function fetchImage(url) {
   var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var shouldUseCloudfront = options.shouldUseCloudfront;
+  console.log('FETCH IMAGE OPTIONS AND URL', {
+    options: options,
+    url: url
+  });
   if (shouldUseCloudfront) {
     var isWebContext = (typeof window === "undefined" ? "undefined" : _typeof(window)) === 'object';
     return isWebContext ?

package/lib/helpers/fetch-image/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["atob","btoa","fetchPonyfill","Promise","LIGHTHOUSE_LOGO_URL","imageNotFound","fetchImageForPdfGeneratorService","fetchImageForWeb","fetch","self","_typeof","contentTypes","defaultOptions","cache","fetchImage","url","options","arguments","length","undefined","shouldUseCloudfront","isWebContext","window","encodedUrl","encodeURI","fetchOptions","_objectSpread","_options$isHeader","isHeader","then","response","contentHeader","headers","get","contentType","reject","Error","concat","ok","imageType","arrayBuffer","buffer","_ref","base64Flag","imageStr","arrayBufferToBase64","base64","isValid","validateBase64Image","catch","error","console","binary","bytes","slice","call","Uint8Array","forEach","b","String","fromCharCode","base64String","isJpeg","startsWith","validateJpegImage","isPng","validatePngImage","base64string","src","imageData","from","replace","c","charCodeAt","imageCorrupted","sequence","i"],"sources":["../../../src/helpers/fetch-image/index.js"],"sourcesContent":["import { atob, btoa } from '@lighthouse/abab'\nimport fetchPonyfill from 'fetch-ponyfill'\nimport Promise from 'bluebird'\nimport { LIGHTHOUSE_LOGO_URL } from '../../constants'\nimport { imageNotFound } from '../../images'\nimport { fetchImageForPdfGeneratorService } from '../fetch-image-for-pdf-generator-service'\nimport { fetchImageForWeb } from '../fetch-image-for-web'\n\n// NOTE use the native fetch if it's available in the browser, because the\n// ponyfill (which actually uses the github polyfill) does not support all the\n// same options as native fetch\nconst fetch =\n  (typeof self === 'object' && self.fetch) || fetchPonyfill({ Promise }).fetch\n\nconst contentTypes = {\n  'image/png': 'png',\n  'image/jpeg': 'jpeg',\n}\n\nconst defaultOptions = {\n  // NOTE The cache: no-cache option is important to avoid an issue with CORS\n  // and caching on Chrome. Here's a good explanation of the issue:\n  // https://stackoverflow.com/a/37455118\n  // In our case, when loading the web version of a form, the signature image is\n  // cached without the correct CORS headers. If the pdf is then generated,\n  // there's a mismatch between the cached image headers and the CORS headers\n  // sent from the fetch request, causing an error\n  cache: 'no-cache',\n}\n\nexport function fetchImage(url, options = {}) {\n  const { shouldUseCloudfront } = options\n\n  if (shouldUseCloudfront) {\n    const isWebContext = typeof window === 'object'\n\n    return isWebContext\n      ? // Values used from options: isHeader, Signature, Policy, KeyPairId\n        fetchImageForWeb(url, options)\n      : fetchImageForPdfGeneratorService(url)\n  }\n\n  const encodedUrl = encodeURI(url)\n\n  const fetchOptions = {\n    ...defaultOptions,\n    ...options,\n  }\n  const { isHeader = false } = options\n\n  return fetch(encodedUrl, fetchOptions)\n    .then(response => {\n      const contentHeader = response.headers.get('content-length')\n      const contentType = response.headers.get('content-type')\n\n      // NOTE: the response will be ok but we won't be able to render any\n      // image meaning pdfmake will error. Raise error here and return early.\n      if (contentHeader === '0') {\n        return Promise.reject(\n          new Error(`Failed to fetch image as no content length: ${encodedUrl}`)\n        )\n      }\n\n      if (!response.ok) {\n        return Promise.reject(new Error(`Failed to fetch image: ${encodedUrl}`))\n      }\n\n      const imageType = contentTypes[contentType]\n\n      return response.arrayBuffer().then(buffer => ({\n        buffer,\n        imageType,\n      }))\n    })\n    .then(({ buffer, imageType }) => {\n      const base64Flag = `data:image/${imageType};base64,`\n      const imageStr = arrayBufferToBase64(buffer)\n\n      const base64 = `${base64Flag}${imageStr}`\n      const isValid = validateBase64Image(base64)\n\n      if (!isValid) {\n        return Promise.reject(new Error('InvalidImageError'))\n      }\n\n      return base64\n    })\n    .catch(error => {\n      if (isHeader) {\n        // NOTE: Replace failed headers with LH logo\n        console.error('FetchImageHeaderError', error)\n        return fetchImage(LIGHTHOUSE_LOGO_URL, defaultOptions)\n      }\n\n      console.error(error)\n      return imageNotFound\n    })\n}\n\nexport function arrayBufferToBase64(buffer) {\n  let binary = ''\n  const bytes = [].slice.call(new Uint8Array(buffer))\n\n  bytes.forEach(b => (binary += String.fromCharCode(b)))\n\n  return btoa(binary)\n}\n\nexport function validateBase64Image(base64String) {\n  const isJpeg = base64String.startsWith('data:image/jpeg;base64,')\n\n  if (isJpeg) return validateJpegImage(base64String)\n\n  const isPng = base64String.startsWith('data:image/png;base64,')\n\n  if (isPng) return validatePngImage(base64String)\n\n  return false\n}\n\n// See SO for more info: https://stackoverflow.com/a/41635312\n// Fiddle: https://jsfiddle.net/Lnyxuchw/\nexport function validateJpegImage(base64string) {\n  const src = base64string\n  const imageData = Uint8Array.from(\n    atob(src.replace('data:image/jpeg;base64,', '')),\n    c => c.charCodeAt(0)\n  )\n  const imageCorrupted =\n    imageData[imageData.length - 1] === 217 &&\n    imageData[imageData.length - 2] === 255\n\n  return imageCorrupted\n}\n\n// See SO for more info: https://stackoverflow.com/a/41635312\n// Fiddle: https://jsfiddle.net/Lnyxuchw/\nexport function validatePngImage(base64string) {\n  const src = base64string\n  const imageData = Uint8Array.from(\n    atob(src.replace('data:image/png;base64,', '')),\n    c => c.charCodeAt(0)\n  )\n  const sequence = [0, 0, 0, 0, 73, 69, 78, 68, 174, 66, 96, 130]\n\n  //check last 12 elements of array so they contains needed values\n  for (let i = 12; i > 0; i--) {\n    if (imageData[imageData.length - i] !== sequence[12 - i]) {\n      return false\n    }\n  }\n\n  return true\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"index.js","names":["atob","btoa","fetchPonyfill","Promise","LIGHTHOUSE_LOGO_URL","imageNotFound","fetchImageForPdfGeneratorService","fetchImageForWeb","fetch","self","_typeof","contentTypes","defaultOptions","cache","fetchImage","url","options","arguments","length","undefined","shouldUseCloudfront","console","log","isWebContext","window","encodedUrl","encodeURI","fetchOptions","_objectSpread","_options$isHeader","isHeader","then","response","contentHeader","headers","get","contentType","reject","Error","concat","ok","imageType","arrayBuffer","buffer","_ref","base64Flag","imageStr","arrayBufferToBase64","base64","isValid","validateBase64Image","catch","error","binary","bytes","slice","call","Uint8Array","forEach","b","String","fromCharCode","base64String","isJpeg","startsWith","validateJpegImage","isPng","validatePngImage","base64string","src","imageData","from","replace","c","charCodeAt","imageCorrupted","sequence","i"],"sources":["../../../src/helpers/fetch-image/index.js"],"sourcesContent":["import { atob, btoa } from '@lighthouse/abab'\nimport fetchPonyfill from 'fetch-ponyfill'\nimport Promise from 'bluebird'\nimport { LIGHTHOUSE_LOGO_URL } from '../../constants'\nimport { imageNotFound } from '../../images'\nimport { fetchImageForPdfGeneratorService } from '../fetch-image-for-pdf-generator-service'\nimport { fetchImageForWeb } from '../fetch-image-for-web'\n\n// NOTE use the native fetch if it's available in the browser, because the\n// ponyfill (which actually uses the github polyfill) does not support all the\n// same options as native fetch\nconst fetch =\n  (typeof self === 'object' && self.fetch) || fetchPonyfill({ Promise }).fetch\n\nconst contentTypes = {\n  'image/png': 'png',\n  'image/jpeg': 'jpeg',\n}\n\nconst defaultOptions = {\n  // NOTE The cache: no-cache option is important to avoid an issue with CORS\n  // and caching on Chrome. Here's a good explanation of the issue:\n  // https://stackoverflow.com/a/37455118\n  // In our case, when loading the web version of a form, the signature image is\n  // cached without the correct CORS headers. If the pdf is then generated,\n  // there's a mismatch between the cached image headers and the CORS headers\n  // sent from the fetch request, causing an error\n  cache: 'no-cache',\n}\n\nexport function fetchImage(url, options = {}) {\n  const { shouldUseCloudfront } = options\n\n  console.log('FETCH IMAGE OPTIONS AND URL', { options, url })\n  if (shouldUseCloudfront) {\n    const isWebContext = typeof window === 'object'\n\n    return isWebContext\n      ? // Values used from options: isHeader, Signature, Policy, KeyPairId\n        fetchImageForWeb(url, options)\n      : fetchImageForPdfGeneratorService(url)\n  }\n\n  const encodedUrl = encodeURI(url)\n\n  const fetchOptions = {\n    ...defaultOptions,\n    ...options,\n  }\n  const { isHeader = false } = options\n\n  return fetch(encodedUrl, fetchOptions)\n    .then((response) => {\n      const contentHeader = response.headers.get('content-length')\n      const contentType = response.headers.get('content-type')\n\n      // NOTE: the response will be ok but we won't be able to render any\n      // image meaning pdfmake will error. Raise error here and return early.\n      if (contentHeader === '0') {\n        return Promise.reject(\n          new Error(`Failed to fetch image as no content length: ${encodedUrl}`)\n        )\n      }\n\n      if (!response.ok) {\n        return Promise.reject(new Error(`Failed to fetch image: ${encodedUrl}`))\n      }\n\n      const imageType = contentTypes[contentType]\n\n      return response.arrayBuffer().then((buffer) => ({\n        buffer,\n        imageType,\n      }))\n    })\n    .then(({ buffer, imageType }) => {\n      const base64Flag = `data:image/${imageType};base64,`\n      const imageStr = arrayBufferToBase64(buffer)\n\n      const base64 = `${base64Flag}${imageStr}`\n      const isValid = validateBase64Image(base64)\n\n      if (!isValid) {\n        return Promise.reject(new Error('InvalidImageError'))\n      }\n\n      return base64\n    })\n    .catch((error) => {\n      if (isHeader) {\n        // NOTE: Replace failed headers with LH logo\n        console.error('FetchImageHeaderError', error)\n        return fetchImage(LIGHTHOUSE_LOGO_URL, defaultOptions)\n      }\n\n      console.error(error)\n      return imageNotFound\n    })\n}\n\nexport function arrayBufferToBase64(buffer) {\n  let binary = ''\n  const bytes = [].slice.call(new Uint8Array(buffer))\n\n  bytes.forEach((b) => (binary += String.fromCharCode(b)))\n\n  return btoa(binary)\n}\n\nexport function validateBase64Image(base64String) {\n  const isJpeg = base64String.startsWith('data:image/jpeg;base64,')\n\n  if (isJpeg) return validateJpegImage(base64String)\n\n  const isPng = base64String.startsWith('data:image/png;base64,')\n\n  if (isPng) return validatePngImage(base64String)\n\n  return false\n}\n\n// See SO for more info: https://stackoverflow.com/a/41635312\n// Fiddle: https://jsfiddle.net/Lnyxuchw/\nexport function validateJpegImage(base64string) {\n  const src = base64string\n  const imageData = Uint8Array.from(\n    atob(src.replace('data:image/jpeg;base64,', '')),\n    (c) => c.charCodeAt(0)\n  )\n  const imageCorrupted =\n    imageData[imageData.length - 1] === 217 &&\n    imageData[imageData.length - 2] === 255\n\n  return imageCorrupted\n}\n\n// See SO for more info: https://stackoverflow.com/a/41635312\n// Fiddle: https://jsfiddle.net/Lnyxuchw/\nexport function validatePngImage(base64string) {\n  const src = base64string\n  const imageData = Uint8Array.from(\n    atob(src.replace('data:image/png;base64,', '')),\n    (c) => c.charCodeAt(0)\n  )\n  const sequence = [0, 0, 0, 0, 73, 69, 78, 68, 174, 66, 96, 130]\n\n  //check last 12 elements of array so they contains needed values\n  for (let i = 12; i > 0; i--) {\n    if (imageData[imageData.length - i] !== sequence[12 - i]) {\n      return false\n    }\n  }\n\n  return true\n}\n"],"mappings":"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","ignoreList":[]}

package/lib/helpers/fetch-image-for-pdf-generator-service/index.js

@@ -12,7 +12,7 @@ var s3 = new AWS.S3({
 });
 export var fetchImageForPdfGeneratorService = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(url) {
-    var urlMatch, applicationId, transformedBuckeKey, alreadyTransformedImage, fullDataUrl, keyWithTransformations, transformerResponse, statusCode, _fullDataUrl, _transformerResponse$, redirectLocation, newlyTransformedImage, _fullDataUrl2, _t;
+    var urlMatch, applicationId, _parseUrlString, path, queryString, transformedBucketImagePath, alreadyTransformedImage, fullDataUrl, transformerResponse, statusCode, _fullDataUrl, redirectLocation, newlyTransformedImage, _fullDataUrl2, _t;
     return _regeneratorRuntime.wrap(function (_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -31,15 +31,15 @@ export var fetchImageForPdfGeneratorService = /*#__PURE__*/function () {
           }
           throw new Error('Requestor has insufficient permissions');
         case 2:
-          transformedBuckeKey = parseUrlString(url);
-          console.debug({
-            transformedBuckeKey: transformedBuckeKey,
-            url: url
+          _parseUrlString = parseUrlString(url), path = _parseUrlString.path, queryString = _parseUrlString.queryString;
+          transformedBucketImagePath = path + (queryString ? "/".concat(queryString) : '');
+          console.debug("", {
+            transformedBucketImagePath: transformedBucketImagePath
           });
           _context.next = 3;
           return fetchResourceFromS3({
             bucketName: "".concat(process.env.S3_BUCKET_IMAGE_TRANSFORMER_CACHE),
-            key: transformedBuckeKey
+            key: transformedBucketImagePath
           });
         case 3:
           alreadyTransformedImage = _context.sent;
@@ -49,13 +49,12 @@ export var fetchImageForPdfGeneratorService = /*#__PURE__*/function () {
           }
           fullDataUrl = formatBase64Image({
             base64String: alreadyTransformedImage.body.toString('base64'),
-            key: keyWithTransformations
+            key: transformedBucketImagePath
           });
           return _context.abrupt("return", fullDataUrl);
         case 4:
-          keyWithTransformations = url.substring(url.indexOf(applicationId));
           _context.next = 5;
-          return requestImageTransformation(keyWithTransformations);
+          return requestImageTransformation(url);
         case 5:
           transformerResponse = _context.sent;
           statusCode = transformerResponse.statusCode;
@@ -66,31 +65,31 @@ export var fetchImageForPdfGeneratorService = /*#__PURE__*/function () {
           console.debug('Image transformation successful');
           _fullDataUrl = formatBase64Image({
             base64String: transformerResponse.body.toString('base64'),
-            key: keyWithTransformations
+            key: url
           });
           return _context.abrupt("return", _fullDataUrl);
         case 7:
           console.debug('Image transformation successful but image is too big for lambda delivery, fetching directly from S3');
-          redirectLocation = (_transformerResponse$ = transformerResponse.headers) === null || _transformerResponse$ === void 0 ? void 0 : _transformerResponse$.Location;
-          if (!redirectLocation) {
-            _context.next = 9;
+          redirectLocation = transformerResponse.headers.Location;
+          if (redirectLocation) {
+            _context.next = 8;
             break;
           }
-          _context.next = 8;
+          throw new Error('Redirect response received but no location provided');
+        case 8:
+          _context.next = 9;
           return fetchResourceFromS3({
             bucketName: "".concat(process.env.S3_BUCKET_IMAGE_TRANSFORMER_CACHE),
-            key: keyWithTransformations
+            key: transformedBucketImagePath
           });
-        case 8:
+        case 9:
           newlyTransformedImage = _context.sent;
           console.debug('Image successfully fetched from S3 at:', redirectLocation);
           _fullDataUrl2 = formatBase64Image({
             base64String: newlyTransformedImage.body.toString('base64'),
-            key: keyWithTransformations
+            key: transformedBucketImagePath
           });
           return _context.abrupt("return", _fullDataUrl2);
-        case 9:
-          throw new Error('Redirect response received but no location provided');
         case 10:
           throw new Error("Bad request to image transformer: ".concat(transformerResponse.body));
         case 11:
@@ -236,29 +235,39 @@ export function formatBase64Image(_ref3) {
 
 /**
  * Parses a URL-like string into path and query parameters
- * @param {string} urlString - String like "<applicationId>/<path>/filename.jpeg?width=100&height=100"
- * @returns {Object} - Object with { path: string, queryParams: string }
+ * @param {string} urlString - String like "https://example.cloudfront.net/<applicationId>/<path>/filename.jpeg?width=100&height=100"
+ * @returns {Object} - Object with { path: string, queryString: string }
  * @example
- * parseUrlString("abc123/folder/image.jpeg?width=100&height=100")
- * // Returns: { path: "abc123/folder/image.jpeg", queryParams: "width=100,height=100" }
+ * parseUrlString("https://example.cloudfront.net/abc123/folder/image.jpeg?width=100&height=100")
+ * // Returns: { path: "abc123/folder/image.jpeg", queryString: "width=100&t=456" }
  */
 function parseUrlString(urlString) {
   if (!urlString || typeof urlString !== 'string') {
     throw new Error('URL string is required and must be a string');
   }
-  var _urlString$split = urlString.split('?'),
-    _urlString$split2 = _slicedToArray(_urlString$split, 2),
-    path = _urlString$split2[0],
-    queryString = _urlString$split2[1];
+
+  // Extract the path after the domain
+  var url = new URL(urlString);
+  var pathname = url.pathname;
+  // Remove leading slash if present
+  var pathWithoutLeadingSlash = pathname.startsWith('/') ? pathname.slice(1) : pathname;
+
+  // Get everything after the domain (path + query)
+  var fullPath = pathWithoutLeadingSlash + url.search;
+  var _fullPath$split = fullPath.split('?'),
+    _fullPath$split2 = _slicedToArray(_fullPath$split, 2),
+    path = _fullPath$split2[0],
+    queryString = _fullPath$split2[1];
+
+  // change query string to ve seperated by commas instead of &
+
+  queryString = queryString ? queryString.replace(/&/g, ',') : '';
   if (!path) {
     throw new Error('Invalid URL string: missing path component');
   }
-  if (!queryString) {
-    return "".concat(path);
-  }
-
-  // Parse query parameters and convert to comma-separated format
-  var queryParams = queryString.split('&').join(',');
-  return "".concat(path, "/").concat(queryParams);
+  return {
+    path: path,
+    queryString: queryString
+  };
 }
 //# sourceMappingURL=index.js.map

package/lib/helpers/fetch-image-for-pdf-generator-service/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["validateBase64Image","AWS","REGION","process","env","AWS_REGION","lambda","Lambda","region","s3","S3","fetchImageForPdfGeneratorService","_ref","_asyncToGenerator","_regeneratorRuntime","mark","_callee","url","urlMatch","applicationId","transformedBuckeKey","alreadyTransformedImage","fullDataUrl","keyWithTransformations","transformerResponse","statusCode","_fullDataUrl","_transformerResponse$","redirectLocation","newlyTransformedImage","_fullDataUrl2","_t","wrap","_context","prev","next","console","debug","Error","match","parseUrlString","fetchResourceFromS3","bucketName","concat","S3_BUCKET_IMAGE_TRANSFORMER_CACHE","key","sent","body","formatBase64Image","base64String","toString","abrupt","substring","indexOf","requestImageTransformation","headers","Location","stop","_x","apply","arguments","_x2","_requestImageTransformation","_callee2","lambdaEvent","params","result","response","errorMessage","_t2","_context2","requestContext","http","method","path","FunctionName","IMAGE_TRANSFORMER_ARN","InvocationType","Payload","JSON","stringify","invoke","promise","parse","message","error","_x3","_fetchResourceFromS","_callee3","_ref2","_t3","_context3","Bucket","Key","getObject","Body","contentType","ContentType","contentLength","ContentLength","lastModified","LastModified","etag","ETag","code","_ref3","imageType","toLowerCase","includes","base64Flag","isValid","urlString","_urlString$split","split","_urlString$split2","_slicedToArray","queryString","queryParams","join"],"sources":["../../../src/helpers/fetch-image-for-pdf-generator-service/index.js"],"sourcesContent":["import { validateBase64Image } from '../image-validators'\nimport AWS from 'aws-sdk'\nconst REGION = process.env.AWS_REGION\n\nconst lambda = new AWS.Lambda({\n  region: REGION,\n})\nconst s3 = new AWS.S3({\n  region: REGION,\n})\n\nexport const fetchImageForPdfGeneratorService = async function (url) {\n  console.debug(\n    'Fetching image via CloudFront For Serverless Pdf Generator Service'\n  )\n\n  if (!url) {\n    throw new Error('URL is required to fetch image for PDF generator service')\n  }\n\n  const urlMatch = url && url.match(/([a-f0-9]{24})\\//)\n  const applicationId = urlMatch && urlMatch[1]\n\n  if (!applicationId) {\n    throw new Error('Requestor has insufficient permissions')\n  }\n\n  const transformedBuckeKey = parseUrlString(url)\n  console.debug({ transformedBuckeKey, url })\n\n  const alreadyTransformedImage = await fetchResourceFromS3({\n    bucketName: `${process.env.S3_BUCKET_IMAGE_TRANSFORMER_CACHE}`,\n    key: transformedBuckeKey,\n  })\n\n  if (alreadyTransformedImage?.body) {\n    const fullDataUrl = formatBase64Image({\n      base64String: alreadyTransformedImage.body.toString('base64'),\n      key: keyWithTransformations,\n    })\n    return fullDataUrl\n  }\n\n  const keyWithTransformations = url.substring(url.indexOf(applicationId))\n  const transformerResponse = await requestImageTransformation(\n    keyWithTransformations\n  )\n\n  const statusCode = transformerResponse.statusCode\n\n  switch (statusCode) {\n    case 200: {\n      console.debug('Image transformation successful')\n\n      const fullDataUrl = formatBase64Image({\n        base64String: transformerResponse.body.toString('base64'),\n        key: keyWithTransformations,\n      })\n\n      return fullDataUrl\n    }\n    case 302: {\n      console.debug(\n        'Image transformation successful but image is too big for lambda delivery, fetching directly from S3'\n      )\n      const redirectLocation = transformerResponse.headers?.Location\n      if (redirectLocation) {\n        const newlyTransformedImage = await fetchResourceFromS3({\n          bucketName: `${process.env.S3_BUCKET_IMAGE_TRANSFORMER_CACHE}`,\n          key: keyWithTransformations,\n        })\n        console.debug(\n          'Image successfully fetched from S3 at:',\n          redirectLocation\n        )\n\n        const fullDataUrl = formatBase64Image({\n          base64String: newlyTransformedImage.body.toString('base64'),\n          key: keyWithTransformations,\n        })\n\n        return fullDataUrl\n      }\n      throw new Error('Redirect response received but no location provided')\n    }\n    case 400:\n      throw new Error(\n        `Bad request to image transformer: ${transformerResponse.body}`\n      )\n    case 403:\n      throw new Error('Requested transformed image is too big')\n    case 404:\n      throw new Error('The requested image does not exist')\n    case 500:\n      throw new Error(\n        `Image transformation failed: ${transformerResponse.body}`\n      )\n    default:\n      throw new Error(\n        `Unexpected response from image transformer: ${statusCode} - ${transformerResponse.body}`\n      )\n  }\n}\n\nexport async function requestImageTransformation(key) {\n  if (!key) {\n    throw new Error('Image Path is required for image transformation')\n  }\n\n  console.debug(\n    'ImageTransformation: Invoking image transformer lambda for path:',\n    key\n  )\n\n  const lambdaEvent = {\n    requestContext: {\n      http: {\n        method: 'GET',\n        path: key,\n      },\n    },\n  }\n\n  const params = {\n    FunctionName: process.env.IMAGE_TRANSFORMER_ARN,\n    InvocationType: 'RequestResponse',\n    Payload: JSON.stringify(lambdaEvent),\n  }\n\n  try {\n    const result = await lambda.invoke(params).promise()\n\n    const response = JSON.parse(result.Payload)\n\n    return response\n  } catch (error) {\n    const errorMessage = `Failed to invoke image transformer lambda: ${error.message}`\n    console.error(errorMessage, error)\n    throw new Error(errorMessage)\n  }\n}\n\nexport async function fetchResourceFromS3({ bucketName, key }) {\n  console.debug(\n    `Fetching resource from S3 Bucket: '${bucketName}' at path: '${key}'`\n  )\n  if (!bucketName || !key) {\n    throw new Error(\n      'bucketName and key are required for S3 resource fetch ' +\n        JSON.stringify({ bucketName, key })\n    )\n  }\n\n  const params = {\n    Bucket: bucketName,\n    Key: key,\n  }\n\n  try {\n    const result = await s3.getObject(params).promise()\n\n    return {\n      body: result.Body,\n      contentType: result.ContentType,\n      contentLength: result.ContentLength,\n      lastModified: result.LastModified,\n      etag: result.ETag,\n    }\n  } catch (error) {\n    if (error.code !== 'NoSuchKey') {\n      console.error('Failed to fetch image:', error)\n      throw new Error(`Failed to fetch image: ${bucketName}/${key}`)\n    }\n\n    console.debug('Image not found in transformed bucket, invoking transformer')\n  }\n}\n\nexport function formatBase64Image({ base64String, key }) {\n  if (!key) {\n    throw new Error('Key is required for image formatting')\n  }\n\n  const imageType = key.toLowerCase().includes('.png') ? 'png' : 'jpeg'\n  const base64Flag = `data:image/${imageType};base64,`\n  const fullDataUrl = `${base64Flag}${base64String}`\n\n  // Validate the formatted data URL\n  const isValid = validateBase64Image(fullDataUrl)\n  if (!isValid) {\n    throw new Error('InvalidImageError')\n  }\n\n  return fullDataUrl\n}\n\n/**\n * Parses a URL-like string into path and query parameters\n * @param {string} urlString - String like \"<applicationId>/<path>/filename.jpeg?width=100&height=100\"\n * @returns {Object} - Object with { path: string, queryParams: string }\n * @example\n * parseUrlString(\"abc123/folder/image.jpeg?width=100&height=100\")\n * // Returns: { path: \"abc123/folder/image.jpeg\", queryParams: \"width=100,height=100\" }\n */\nfunction parseUrlString(urlString) {\n  if (!urlString || typeof urlString !== 'string') {\n    throw new Error('URL string is required and must be a string')\n  }\n\n  const [path, queryString] = urlString.split('?')\n\n  if (!path) {\n    throw new Error('Invalid URL string: missing path component')\n  }\n\n  if (!queryString) {\n    return `${path}`\n  }\n\n  // Parse query parameters and convert to comma-separated format\n  const queryParams = queryString.split('&').join(',')\n\n  return `${path}/${queryParams}`\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"index.js","names":["validateBase64Image","AWS","REGION","process","env","AWS_REGION","lambda","Lambda","region","s3","S3","fetchImageForPdfGeneratorService","_ref","_asyncToGenerator","_regeneratorRuntime","mark","_callee","url","urlMatch","applicationId","_parseUrlString","path","queryString","transformedBucketImagePath","alreadyTransformedImage","fullDataUrl","transformerResponse","statusCode","_fullDataUrl","redirectLocation","newlyTransformedImage","_fullDataUrl2","_t","wrap","_context","prev","next","console","debug","Error","match","parseUrlString","concat","fetchResourceFromS3","bucketName","S3_BUCKET_IMAGE_TRANSFORMER_CACHE","key","sent","body","formatBase64Image","base64String","toString","abrupt","requestImageTransformation","headers","Location","stop","_x","apply","arguments","_x2","_requestImageTransformation","_callee2","lambdaEvent","params","result","response","errorMessage","_t2","_context2","requestContext","http","method","FunctionName","IMAGE_TRANSFORMER_ARN","InvocationType","Payload","JSON","stringify","invoke","promise","parse","message","error","_x3","_fetchResourceFromS","_callee3","_ref2","_t3","_context3","Bucket","Key","getObject","Body","contentType","ContentType","contentLength","ContentLength","lastModified","LastModified","etag","ETag","code","_ref3","imageType","toLowerCase","includes","base64Flag","isValid","urlString","URL","pathname","pathWithoutLeadingSlash","startsWith","slice","fullPath","search","_fullPath$split","split","_fullPath$split2","_slicedToArray","replace"],"sources":["../../../src/helpers/fetch-image-for-pdf-generator-service/index.js"],"sourcesContent":["import { validateBase64Image } from '../image-validators'\nimport AWS from 'aws-sdk'\nconst REGION = process.env.AWS_REGION\n\nconst lambda = new AWS.Lambda({\n  region: REGION,\n})\nconst s3 = new AWS.S3({\n  region: REGION,\n})\n\nexport const fetchImageForPdfGeneratorService = async function (url) {\n  console.debug(\n    'Fetching image via CloudFront For Serverless Pdf Generator Service'\n  )\n  \n  if (!url) {\n    throw new Error('URL is required to fetch image for PDF generator service')\n  }\n\n  const urlMatch = url && url.match(/([a-f0-9]{24})\\//)\n  const applicationId = urlMatch && urlMatch[1]\n\n  if (!applicationId) {\n    throw new Error('Requestor has insufficient permissions')\n  }\n\n  const { path, queryString } = parseUrlString(url)\n\n  const transformedBucketImagePath =\n    path + (queryString ? `/${queryString}` : '')\n  console.debug(\"\",{\n    transformedBucketImagePath,\n  })\n  const alreadyTransformedImage = await fetchResourceFromS3({\n    bucketName: `${process.env.S3_BUCKET_IMAGE_TRANSFORMER_CACHE}`,\n    key: transformedBucketImagePath,\n  })\n    \n  if (alreadyTransformedImage?.body) {\n    const fullDataUrl = formatBase64Image({\n      base64String: alreadyTransformedImage.body.toString('base64'),\n      key: transformedBucketImagePath,\n    })\n    return fullDataUrl\n  }\n\n  const transformerResponse = await requestImageTransformation(url)\n\n  const statusCode = transformerResponse.statusCode\n\n  switch (statusCode) {\n    case 200: {\n      console.debug('Image transformation successful')\n\n      const fullDataUrl = formatBase64Image({\n        base64String: transformerResponse.body.toString('base64'),\n        key: url,\n      })\n\n      return fullDataUrl\n    }\n    case 302: {\n      console.debug(\n        'Image transformation successful but image is too big for lambda delivery, fetching directly from S3'\n      )\n      const redirectLocation = transformerResponse.headers.Location\n\n      if (!redirectLocation) {\n        throw new Error('Redirect response received but no location provided')\n      }\n\n      const newlyTransformedImage = await fetchResourceFromS3({\n        bucketName: `${process.env.S3_BUCKET_IMAGE_TRANSFORMER_CACHE}`,\n        key: transformedBucketImagePath,\n      })\n      console.debug('Image successfully fetched from S3 at:', redirectLocation)\n\n      const fullDataUrl = formatBase64Image({\n        base64String: newlyTransformedImage.body.toString('base64'),\n        key: transformedBucketImagePath,\n      })\n\n      return fullDataUrl\n    }\n    case 400:\n      throw new Error(\n        `Bad request to image transformer: ${transformerResponse.body}`\n      )\n    case 403:\n      throw new Error('Requested transformed image is too big')\n    case 404:\n      throw new Error('The requested image does not exist')\n    case 500:\n      throw new Error(\n        `Image transformation failed: ${transformerResponse.body}`\n      )\n    default:\n      throw new Error(\n        `Unexpected response from image transformer: ${statusCode} - ${transformerResponse.body}`\n      )\n  }\n}\n\nexport async function requestImageTransformation(key) {\n  if (!key) {\n    throw new Error('Image Path is required for image transformation')\n  }\n\n  console.debug(\n    'ImageTransformation: Invoking image transformer lambda for path:',\n    key\n  )\n\n  const lambdaEvent = {\n    requestContext: {\n      http: {\n        method: 'GET',\n        path: key,\n      },\n    },\n  }\n\n  const params = {\n    FunctionName: process.env.IMAGE_TRANSFORMER_ARN,\n    InvocationType: 'RequestResponse',\n    Payload: JSON.stringify(lambdaEvent),\n  }\n\n  try {\n    const result = await lambda.invoke(params).promise()\n\n    const response = JSON.parse(result.Payload)\n\n    return response\n  } catch (error) {\n    const errorMessage = `Failed to invoke image transformer lambda: ${error.message}`\n    console.error(errorMessage, error)\n    throw new Error(errorMessage)\n  }\n}\n\nexport async function fetchResourceFromS3({ bucketName, key }) {\n  console.debug(\n    `Fetching resource from S3 Bucket: '${bucketName}' at path: '${key}'`\n  )\n  if (!bucketName || !key) {\n    throw new Error(\n      'bucketName and key are required for S3 resource fetch ' +\n        JSON.stringify({ bucketName, key })\n    )\n  }\n\n  const params = {\n    Bucket: bucketName,\n    Key: key,\n  }\n\n  try {\n    const result = await s3.getObject(params).promise()\n\n    return {\n      body: result.Body,\n      contentType: result.ContentType,\n      contentLength: result.ContentLength,\n      lastModified: result.LastModified,\n      etag: result.ETag,\n    }\n  } catch (error) {\n    if (error.code !== 'NoSuchKey') {\n      console.error('Failed to fetch image:', error)\n      throw new Error(`Failed to fetch image: ${bucketName}/${key}`)\n    }\n\n    console.debug('Image not found in transformed bucket, invoking transformer')\n  }\n}\n\nexport function formatBase64Image({ base64String, key }) {\n  if (!key) {\n    throw new Error('Key is required for image formatting')\n  }\n\n  const imageType = key.toLowerCase().includes('.png') ? 'png' : 'jpeg'\n  const base64Flag = `data:image/${imageType};base64,`\n  const fullDataUrl = `${base64Flag}${base64String}`\n\n  // Validate the formatted data URL\n  const isValid = validateBase64Image(fullDataUrl)\n  if (!isValid) {\n    throw new Error('InvalidImageError')\n  }\n\n  return fullDataUrl\n}\n\n/**\n * Parses a URL-like string into path and query parameters\n * @param {string} urlString - String like \"https://example.cloudfront.net/<applicationId>/<path>/filename.jpeg?width=100&height=100\"\n * @returns {Object} - Object with { path: string, queryString: string }\n * @example\n * parseUrlString(\"https://example.cloudfront.net/abc123/folder/image.jpeg?width=100&height=100\")\n * // Returns: { path: \"abc123/folder/image.jpeg\", queryString: \"width=100&t=456\" }\n */\nfunction parseUrlString(urlString) {\n  if (!urlString || typeof urlString !== 'string') {\n    throw new Error('URL string is required and must be a string')\n  }\n\n  // Extract the path after the domain\n  const url = new URL(urlString)\n  const pathname = url.pathname\n  // Remove leading slash if present\n  const pathWithoutLeadingSlash = pathname.startsWith('/')\n    ? pathname.slice(1)\n    : pathname\n\n  // Get everything after the domain (path + query)\n  const fullPath = pathWithoutLeadingSlash + url.search\n\n  let [path, queryString] = fullPath.split('?')\n\n  // change query string to ve seperated by commas instead of &\n\n  queryString = queryString ? queryString.replace(/&/g, ',') : ''\n\n  if (!path) {\n    throw new Error('Invalid URL string: missing path component')\n  }\n\n  return {\n    path,\n    queryString,\n  }\n}\n"],"mappings":";;;AAAA,SAASA,mBAAmB,QAAQ,qBAAqB;AACzD,OAAOC,GAAG,MAAM,SAAS;AACzB,IAAMC,MAAM,GAAGC,OAAO,CAACC,GAAG,CAACC,UAAU;AAErC,IAAMC,MAAM,GAAG,IAAIL,GAAG,CAACM,MAAM,CAAC;EAC5BC,MAAM,EAAEN;AACV,CAAC,CAAC;AACF,IAAMO,EAAE,GAAG,IAAIR,GAAG,CAACS,EAAE,CAAC;EACpBF,MAAM,EAAEN;AACV,CAAC,CAAC;AAEF,OAAO,IAAMS,gCAAgC;EAAA,IAAAC,IAAA,GAAAC,iBAAA,cAAAC,mBAAA,CAAAC,IAAA,CAAG,SAAAC,QAAgBC,GAAG;IAAA,IAAAC,QAAA,EAAAC,aAAA,EAAAC,eAAA,EAAAC,IAAA,EAAAC,WAAA,EAAAC,0BAAA,EAAAC,uBAAA,EAAAC,WAAA,EAAAC,mBAAA,EAAAC,UAAA,EAAAC,YAAA,EAAAC,gBAAA,EAAAC,qBAAA,EAAAC,aAAA,EAAAC,EAAA;IAAA,OAAAlB,mBAAA,CAAAmB,IAAA,WAAAC,QAAA;MAAA,kBAAAA,QAAA,CAAAC,IAAA,GAAAD,QAAA,CAAAE,IAAA;QAAA;UACjEC,OAAO,CAACC,KAAK,CACX,oEACF,CAAC;UAAA,IAEIrB,GAAG;YAAAiB,QAAA,CAAAE,IAAA;YAAA;UAAA;UAAA,MACA,IAAIG,KAAK,CAAC,0DAA0D,CAAC;QAAA;UAGvErB,QAAQ,GAAGD,GAAG,IAAIA,GAAG,CAACuB,KAAK,CAAC,kBAAkB,CAAC;UAC/CrB,aAAa,GAAGD,QAAQ,IAAIA,QAAQ,CAAC,CAAC,CAAC;UAAA,IAExCC,aAAa;YAAAe,QAAA,CAAAE,IAAA;YAAA;UAAA;UAAA,MACV,IAAIG,KAAK,CAAC,wCAAwC,CAAC;QAAA;UAAAnB,eAAA,GAG7BqB,cAAc,CAACxB,GAAG,CAAC,EAAzCI,IAAI,GAAAD,eAAA,CAAJC,IAAI,EAAEC,WAAW,GAAAF,eAAA,CAAXE,WAAW;UAEnBC,0BAA0B,GAC9BF,IAAI,IAAIC,WAAW,OAAAoB,MAAA,CAAOpB,WAAW,IAAK,EAAE,CAAC;UAC/Ce,OAAO,CAACC,KAAK,CAAC,EAAE,EAAC;YACff,0BAA0B,EAA1BA;UACF,CAAC,CAAC;UAAAW,QAAA,CAAAE,IAAA;UAAA,OACoCO,mBAAmB,CAAC;YACxDC,UAAU,KAAAF,MAAA,CAAKvC,OAAO,CAACC,GAAG,CAACyC,iCAAiC,CAAE;YAC9DC,GAAG,EAAEvB;UACP,CAAC,CAAC;QAAA;UAHIC,uBAAuB,GAAAU,QAAA,CAAAa,IAAA;UAAA,MAKzBvB,uBAAuB,aAAvBA,uBAAuB,eAAvBA,uBAAuB,CAAEwB,IAAI;YAAAd,QAAA,CAAAE,IAAA;YAAA;UAAA;UACzBX,WAAW,GAAGwB,iBAAiB,CAAC;YACpCC,YAAY,EAAE1B,uBAAuB,CAACwB,IAAI,CAACG,QAAQ,CAAC,QAAQ,CAAC;YAC7DL,GAAG,EAAEvB;UACP,CAAC,CAAC;UAAA,OAAAW,QAAA,CAAAkB,MAAA,WACK3B,WAAW;QAAA;UAAAS,QAAA,CAAAE,IAAA;UAAA,OAGciB,0BAA0B,CAACpC,GAAG,CAAC;QAAA;UAA3DS,mBAAmB,GAAAQ,QAAA,CAAAa,IAAA;UAEnBpB,UAAU,GAAGD,mBAAmB,CAACC,UAAU;UAAAK,EAAA,GAEzCL,UAAU;UAAAO,QAAA,CAAAE,IAAA,GAAAJ,EAAA,KACX,GAAG,OAAAA,EAAA,KAUH,GAAG,OAAAA,EAAA,KAuBH,GAAG,QAAAA,EAAA,KAIH,GAAG,QAAAA,EAAA,KAEH,GAAG,QAAAA,EAAA,KAEH,GAAG;UAAA;QAAA;UAxCNK,OAAO,CAACC,KAAK,CAAC,iCAAiC,CAAC;UAE1Cb,YAAW,GAAGwB,iBAAiB,CAAC;YACpCC,YAAY,EAAExB,mBAAmB,CAACsB,IAAI,CAACG,QAAQ,CAAC,QAAQ,CAAC;YACzDL,GAAG,EAAE7B;UACP,CAAC,CAAC;UAAA,OAAAiB,QAAA,CAAAkB,MAAA,WAEK3B,YAAW;QAAA;UAGlBY,OAAO,CAACC,KAAK,CACX,qGACF,CAAC;UACKT,gBAAgB,GAAGH,mBAAmB,CAAC4B,OAAO,CAACC,QAAQ;UAAA,IAExD1B,gBAAgB;YAAAK,QAAA,CAAAE,IAAA;YAAA;UAAA;UAAA,MACb,IAAIG,KAAK,CAAC,qDAAqD,CAAC;QAAA;UAAAL,QAAA,CAAAE,IAAA;UAAA,OAGpCO,mBAAmB,CAAC;YACtDC,UAAU,KAAAF,MAAA,CAAKvC,OAAO,CAACC,GAAG,CAACyC,iCAAiC,CAAE;YAC9DC,GAAG,EAAEvB;UACP,CAAC,CAAC;QAAA;UAHIO,qBAAqB,GAAAI,QAAA,CAAAa,IAAA;UAI3BV,OAAO,CAACC,KAAK,CAAC,wCAAwC,EAAET,gBAAgB,CAAC;UAEnEJ,aAAW,GAAGwB,iBAAiB,CAAC;YACpCC,YAAY,EAAEpB,qBAAqB,CAACkB,IAAI,CAACG,QAAQ,CAAC,QAAQ,CAAC;YAC3DL,GAAG,EAAEvB;UACP,CAAC,CAAC;UAAA,OAAAW,QAAA,CAAAkB,MAAA,WAEK3B,aAAW;QAAA;UAAA,MAGZ,IAAIc,KAAK,sCAAAG,MAAA,CACwBhB,mBAAmB,CAACsB,IAAI,CAC/D,CAAC;QAAA;UAAA,MAEK,IAAIT,KAAK,CAAC,wCAAwC,CAAC;QAAA;UAAA,MAEnD,IAAIA,KAAK,CAAC,oCAAoC,CAAC;QAAA;UAAA,MAE/C,IAAIA,KAAK,iCAAAG,MAAA,CACmBhB,mBAAmB,CAACsB,IAAI,CAC1D,CAAC;QAAA;UAAA,MAEK,IAAIT,KAAK,gDAAAG,MAAA,CACkCf,UAAU,SAAAe,MAAA,CAAMhB,mBAAmB,CAACsB,IAAI,CACzF,CAAC;QAAA;QAAA;UAAA,OAAAd,QAAA,CAAAsB,IAAA;MAAA;IAAA,GAAAxC,OAAA;EAAA,CAEN;EAAA,gBA3FYL,gCAAgCA,CAAA8C,EAAA;IAAA,OAAA7C,IAAA,CAAA8C,KAAA,OAAAC,SAAA;EAAA;AAAA,GA2F5C;AAED,gBAAsBN,0BAA0BA,CAAAO,GAAA;EAAA,OAAAC,2BAAA,CAAAH,KAAA,OAAAC,SAAA;AAAA;AAoC/C,SAAAE,4BAAA;EAAAA,2BAAA,GAAAhD,iBAAA,cAAAC,mBAAA,CAAAC,IAAA,CApCM,SAAA+C,SAA0ChB,GAAG;IAAA,IAAAiB,WAAA,EAAAC,MAAA,EAAAC,MAAA,EAAAC,QAAA,EAAAC,YAAA,EAAAC,GAAA;IAAA,OAAAtD,mBAAA,CAAAmB,IAAA,WAAAoC,SAAA;MAAA,kBAAAA,SAAA,CAAAlC,IAAA,GAAAkC,SAAA,CAAAjC,IAAA;QAAA;UAAA,IAC7CU,GAAG;YAAAuB,SAAA,CAAAjC,IAAA;YAAA;UAAA;UAAA,MACA,IAAIG,KAAK,CAAC,iDAAiD,CAAC;QAAA;UAGpEF,OAAO,CAACC,KAAK,CACX,kEAAkE,EAClEQ,GACF,CAAC;UAEKiB,WAAW,GAAG;YAClBO,cAAc,EAAE;cACdC,IAAI,EAAE;gBACJC,MAAM,EAAE,KAAK;gBACbnD,IAAI,EAAEyB;cACR;YACF;UACF,CAAC;UAEKkB,MAAM,GAAG;YACbS,YAAY,EAAEtE,OAAO,CAACC,GAAG,CAACsE,qBAAqB;YAC/CC,cAAc,EAAE,iBAAiB;YACjCC,OAAO,EAAEC,IAAI,CAACC,SAAS,CAACf,WAAW;UACrC,CAAC;UAAAM,SAAA,CAAAlC,IAAA;UAAAkC,SAAA,CAAAjC,IAAA;UAAA,OAGsB9B,MAAM,CAACyE,MAAM,CAACf,MAAM,CAAC,CAACgB,OAAO,CAAC,CAAC;QAAA;UAA9Cf,MAAM,GAAAI,SAAA,CAAAtB,IAAA;UAENmB,QAAQ,GAAGW,IAAI,CAACI,KAAK,CAAChB,MAAM,CAACW,OAAO,CAAC;UAAA,OAAAP,SAAA,CAAAjB,MAAA,WAEpCc,QAAQ;QAAA;UAAAG,SAAA,CAAAlC,IAAA;UAAAiC,GAAA,GAAAC,SAAA;UAETF,YAAY,iDAAAzB,MAAA,CAAiD0B,GAAA,CAAMc,OAAO;UAChF7C,OAAO,CAAC8C,KAAK,CAAChB,YAAY,EAAAC,GAAO,CAAC;UAAA,MAC5B,IAAI7B,KAAK,CAAC4B,YAAY,CAAC;QAAA;QAAA;UAAA,OAAAE,SAAA,CAAAb,IAAA;MAAA;IAAA,GAAAM,QAAA;EAAA,CAEhC;EAAA,OAAAD,2BAAA,CAAAH,KAAA,OAAAC,SAAA;AAAA;AAED,gBAAsBhB,mBAAmBA,CAAAyC,GAAA;EAAA,OAAAC,mBAAA,CAAA3B,KAAA,OAAAC,SAAA;AAAA;AAkCxC,SAAA0B,oBAAA;EAAAA,mBAAA,GAAAxE,iBAAA,cAAAC,mBAAA,CAAAC,IAAA,CAlCM,SAAAuE,SAAAC,KAAA;IAAA,IAAA3C,UAAA,EAAAE,GAAA,EAAAkB,MAAA,EAAAC,MAAA,EAAAuB,GAAA;IAAA,OAAA1E,mBAAA,CAAAmB,IAAA,WAAAwD,SAAA;MAAA,kBAAAA,SAAA,CAAAtD,IAAA,GAAAsD,SAAA,CAAArD,IAAA;QAAA;UAAqCQ,UAAU,GAAA2C,KAAA,CAAV3C,UAAU,EAAEE,GAAG,GAAAyC,KAAA,CAAHzC,GAAG;UACzDT,OAAO,CAACC,KAAK,uCAAAI,MAAA,CAC2BE,UAAU,kBAAAF,MAAA,CAAeI,GAAG,MACpE,CAAC;UAAA,MACG,CAACF,UAAU,IAAI,CAACE,GAAG;YAAA2C,SAAA,CAAArD,IAAA;YAAA;UAAA;UAAA,MACf,IAAIG,KAAK,CACb,wDAAwD,GACtDsC,IAAI,CAACC,SAAS,CAAC;YAAElC,UAAU,EAAVA,UAAU;YAAEE,GAAG,EAAHA;UAAI,CAAC,CACtC,CAAC;QAAA;UAGGkB,MAAM,GAAG;YACb0B,MAAM,EAAE9C,UAAU;YAClB+C,GAAG,EAAE7C;UACP,CAAC;UAAA2C,SAAA,CAAAtD,IAAA;UAAAsD,SAAA,CAAArD,IAAA;UAAA,OAGsB3B,EAAE,CAACmF,SAAS,CAAC5B,MAAM,CAAC,CAACgB,OAAO,CAAC,CAAC;QAAA;UAA7Cf,MAAM,GAAAwB,SAAA,CAAA1C,IAAA;UAAA,OAAA0C,SAAA,CAAArC,MAAA,WAEL;YACLJ,IAAI,EAAEiB,MAAM,CAAC4B,IAAI;YACjBC,WAAW,EAAE7B,MAAM,CAAC8B,WAAW;YAC/BC,aAAa,EAAE/B,MAAM,CAACgC,aAAa;YACnCC,YAAY,EAAEjC,MAAM,CAACkC,YAAY;YACjCC,IAAI,EAAEnC,MAAM,CAACoC;UACf,CAAC;QAAA;UAAAZ,SAAA,CAAAtD,IAAA;UAAAqD,GAAA,GAAAC,SAAA;UAAA,MAEGD,GAAA,CAAMc,IAAI,KAAK,WAAW;YAAAb,SAAA,CAAArD,IAAA;YAAA;UAAA;UAC5BC,OAAO,CAAC8C,KAAK,CAAC,wBAAwB,EAAAK,GAAO,CAAC;UAAA,MACxC,IAAIjD,KAAK,2BAAAG,MAAA,CAA2BE,UAAU,OAAAF,MAAA,CAAII,GAAG,CAAE,CAAC;QAAA;UAGhET,OAAO,CAACC,KAAK,CAAC,6DAA6D,CAAC;QAAA;QAAA;UAAA,OAAAmD,SAAA,CAAAjC,IAAA;MAAA;IAAA,GAAA8B,QAAA;EAAA,CAE/E;EAAA,OAAAD,mBAAA,CAAA3B,KAAA,OAAAC,SAAA;AAAA;AAED,OAAO,SAASV,iBAAiBA,CAAAsD,KAAA,EAAwB;EAAA,IAArBrD,YAAY,GAAAqD,KAAA,CAAZrD,YAAY;IAAEJ,GAAG,GAAAyD,KAAA,CAAHzD,GAAG;EACnD,IAAI,CAACA,GAAG,EAAE;IACR,MAAM,IAAIP,KAAK,CAAC,sCAAsC,CAAC;EACzD;EAEA,IAAMiE,SAAS,GAAG1D,GAAG,CAAC2D,WAAW,CAAC,CAAC,CAACC,QAAQ,CAAC,MAAM,CAAC,GAAG,KAAK,GAAG,MAAM;EACrE,IAAMC,UAAU,iBAAAjE,MAAA,CAAiB8D,SAAS,aAAU;EACpD,IAAM/E,WAAW,MAAAiB,MAAA,CAAMiE,UAAU,EAAAjE,MAAA,CAAGQ,YAAY,CAAE;;EAElD;EACA,IAAM0D,OAAO,GAAG5G,mBAAmB,CAACyB,WAAW,CAAC;EAChD,IAAI,CAACmF,OAAO,EAAE;IACZ,MAAM,IAAIrE,KAAK,CAAC,mBAAmB,CAAC;EACtC;EAEA,OAAOd,WAAW;AACpB;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAASgB,cAAcA,CAACoE,SAAS,EAAE;EACjC,IAAI,CAACA,SAAS,IAAI,OAAOA,SAAS,KAAK,QAAQ,EAAE;IAC/C,MAAM,IAAItE,KAAK,CAAC,6CAA6C,CAAC;EAChE;;EAEA;EACA,IAAMtB,GAAG,GAAG,IAAI6F,GAAG,CAACD,SAAS,CAAC;EAC9B,IAAME,QAAQ,GAAG9F,GAAG,CAAC8F,QAAQ;EAC7B;EACA,IAAMC,uBAAuB,GAAGD,QAAQ,CAACE,UAAU,CAAC,GAAG,CAAC,GACpDF,QAAQ,CAACG,KAAK,CAAC,CAAC,CAAC,GACjBH,QAAQ;;EAEZ;EACA,IAAMI,QAAQ,GAAGH,uBAAuB,GAAG/F,GAAG,CAACmG,MAAM;EAErD,IAAAC,eAAA,GAA0BF,QAAQ,CAACG,KAAK,CAAC,GAAG,CAAC;IAAAC,gBAAA,GAAAC,cAAA,CAAAH,eAAA;IAAxChG,IAAI,GAAAkG,gBAAA;IAAEjG,WAAW,GAAAiG,gBAAA;;EAEtB;;EAEAjG,WAAW,GAAGA,WAAW,GAAGA,WAAW,CAACmG,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,GAAG,EAAE;EAE/D,IAAI,CAACpG,IAAI,EAAE;IACT,MAAM,IAAIkB,KAAK,CAAC,4CAA4C,CAAC;EAC/D;EAEA,OAAO;IACLlB,IAAI,EAAJA,IAAI;IACJC,WAAW,EAAXA;EACF,CAAC;AACH","ignoreList":[]}

package/lib/helpers/fetch-image-for-web/index.js

@@ -2,30 +2,23 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { imageNotFound } from '../../images';
 import { fetchLighthouseLogo } from '../fetch-lighthouse-logo';
-import { arrayBufferToBase64 } from '../fetch-image';
-import { validateBase64Image } from '../image-validators';
-var contentTypes = {
-  'image/png': 'png',
-  'image/jpeg': 'jpeg'
-};
 export var fetchImageForWeb = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(url, options) {
-    var _options$isHeader, isHeader, Signature, Policy, KeyPairId, firstParamConnector, urlToEncode, encodedUrl, imageResponse, contentLengthHeader, contentType, imageType, logoArrayBuffer, base64Flag, imageStr, base64, isValid, _t;
+    var _options$isHeader, isHeader, Signature, Policy, KeyPairId, firstParamConnector, hasSignatureParams, constructedUrl, imageResponse, contentLengthHeader, _t;
     return _regeneratorRuntime.wrap(function (_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           _options$isHeader = options.isHeader, isHeader = _options$isHeader === void 0 ? false : _options$isHeader, Signature = options.Signature, Policy = options.Policy, KeyPairId = options.KeyPairId;
           _context.prev = 1;
           firstParamConnector = url.indexOf('?') > -1 ? '&' : '?';
-          urlToEncode = "".concat(url).concat(firstParamConnector, "Signature=").concat(Signature, "&Policy=").concat(Policy, "&Key-Pair-Id=").concat(KeyPairId);
-          encodedUrl = encodeURI(urlToEncode);
+          hasSignatureParams = url.includes('Signature=') && url.includes('Policy=') && url.includes('Key-Pair-Id=');
+          constructedUrl = !hasSignatureParams ? "".concat(url).concat(firstParamConnector, "Signature=").concat(Signature, "&Policy=").concat(Policy, "&Key-Pair-Id=").concat(KeyPairId) : url;
           console.debug('Fetching image via CloudFront For Web');
           _context.next = 2;
-          return fetch(encodedUrl);
+          return fetch(constructedUrl);
         case 2:
           imageResponse = _context.sent;
           contentLengthHeader = imageResponse.headers.get('content-length');
-          contentType = imageResponse.headers.get('content-type');
           if (!(contentLengthHeader === '0')) {
             _context.next = 3;
             break;
@@ -38,40 +31,28 @@ export var fetchImageForWeb = /*#__PURE__*/function () {
           }
           return _context.abrupt("return", Promise.reject(new Error("Failed to fetch image: ".concat(encodedUrl))));
         case 4:
-          imageType = contentTypes[contentType];
           _context.next = 5;
           return imageResponse.arrayBuffer();
         case 5:
-          logoArrayBuffer = _context.sent;
-          base64Flag = "data:image/".concat(imageType, ";base64,");
-          imageStr = arrayBufferToBase64(logoArrayBuffer);
-          base64 = "".concat(base64Flag).concat(imageStr);
-          isValid = validateBase64Image(base64);
-          if (isValid) {
-            _context.next = 6;
-            break;
-          }
-          throw new Error('InvalidImageError');
+          return _context.abrupt("return", _context.sent);
         case 6:
-          return _context.abrupt("return", base64);
-        case 7:
-          _context.prev = 7;
+          _context.prev = 6;
           _t = _context["catch"](1);
           if (!isHeader) {
-            _context.next = 8;
+            _context.next = 7;
             break;
           }
           // NOTE: Replace failed headers with LH logo
           console.error('FetchImageHeaderError', _t);
           return _context.abrupt("return", fetchLighthouseLogo());
-        case 8:
+        case 7:
           console.error(_t);
           return _context.abrupt("return", imageNotFound);
-        case 9:
+        case 8:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[1, 7]]);
+    }, _callee, null, [[1, 6]]);
   }));
   return function fetchImageForWeb(_x, _x2) {
     return _ref.apply(this, arguments);

package/lib/helpers/fetch-image-for-web/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["imageNotFound","fetchLighthouseLogo","arrayBufferToBase64","validateBase64Image","contentTypes","fetchImageForWeb","_ref","_asyncToGenerator","_regeneratorRuntime","mark","_callee","url","options","_options$isHeader","isHeader","Signature","Policy","KeyPairId","firstParamConnector","urlToEncode","encodedUrl","imageResponse","contentLengthHeader","contentType","imageType","logoArrayBuffer","base64Flag","imageStr","base64","isValid","_t","wrap","_context","prev","next","indexOf","concat","encodeURI","console","debug","fetch","sent","headers","get","abrupt","Promise","reject","Error","ok","arrayBuffer","error","stop","_x","_x2","apply","arguments"],"sources":["../../../src/helpers/fetch-image-for-web/index.js"],"sourcesContent":["import { imageNotFound } from '../../images'\nimport { fetchLighthouseLogo } from '../fetch-lighthouse-logo'\nimport { arrayBufferToBase64 } from '../fetch-image'\nimport { validateBase64Image } from '../image-validators'\nconst contentTypes = {\n  'image/png': 'png',\n  'image/jpeg': 'jpeg',\n}\n\nexport const fetchImageForWeb = async function(url, options) {\n  const { isHeader = false, Signature, Policy, KeyPairId } = options\n\n  try {\n    const firstParamConnector = url.indexOf('?') > -1 ? '&' : '?'\n    const urlToEncode = `${url}${firstParamConnector}Signature=${Signature}&Policy=${Policy}&Key-Pair-Id=${KeyPairId}`\n\n    const encodedUrl = encodeURI(urlToEncode)\n\n    console.debug('Fetching image via CloudFront For Web')\n\n    const imageResponse = await fetch(encodedUrl)\n\n    const contentLengthHeader = imageResponse.headers.get('content-length')\n    const contentType = imageResponse.headers.get('content-type')\n\n    if (contentLengthHeader === '0') {\n      return Promise.reject(\n        new Error(`Failed to fetch image as no content length: ${encodedUrl}`)\n      )\n    }\n\n    if (!imageResponse.ok) {\n      return Promise.reject(new Error(`Failed to fetch image: ${encodedUrl}`))\n    }\n\n    const imageType = contentTypes[contentType]\n\n    const logoArrayBuffer = await imageResponse.arrayBuffer()\n\n    const base64Flag = `data:image/${imageType};base64,`\n    const imageStr = arrayBufferToBase64(logoArrayBuffer)\n\n    const base64 = `${base64Flag}${imageStr}`\n    const isValid = validateBase64Image(base64)\n\n    if (!isValid) throw new Error('InvalidImageError')\n\n    return base64\n  } catch (error) {\n    if (isHeader) {\n      // NOTE: Replace failed headers with LH logo\n      console.error('FetchImageHeaderError', error)\n      return fetchLighthouseLogo()\n    }\n\n    console.error(error)\n    return imageNotFound\n  }\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"index.js","names":["imageNotFound","fetchLighthouseLogo","fetchImageForWeb","_ref","_asyncToGenerator","_regeneratorRuntime","mark","_callee","url","options","_options$isHeader","isHeader","Signature","Policy","KeyPairId","firstParamConnector","hasSignatureParams","constructedUrl","imageResponse","contentLengthHeader","_t","wrap","_context","prev","next","indexOf","includes","concat","console","debug","fetch","sent","headers","get","abrupt","Promise","reject","Error","encodedUrl","ok","arrayBuffer","error","stop","_x","_x2","apply","arguments"],"sources":["../../../src/helpers/fetch-image-for-web/index.js"],"sourcesContent":["import { imageNotFound } from '../../images'\nimport { fetchLighthouseLogo } from '../fetch-lighthouse-logo'\nexport const fetchImageForWeb = async function (url, options) {\n  const { isHeader = false, Signature, Policy, KeyPairId } = options\n\n  try {\n    const firstParamConnector = url.indexOf('?') > -1 ? '&' : '?'\n\n    const hasSignatureParams =\n      url.includes('Signature=') &&\n      url.includes('Policy=') &&\n      url.includes('Key-Pair-Id=')\n\n    const constructedUrl = !hasSignatureParams\n      ? `${url}${firstParamConnector}Signature=${Signature}&Policy=${Policy}&Key-Pair-Id=${KeyPairId}`\n      : url\n\n    console.debug('Fetching image via CloudFront For Web')\n\n    const imageResponse = await fetch(constructedUrl)\n\n    const contentLengthHeader = imageResponse.headers.get('content-length')\n\n    if (contentLengthHeader === '0') {\n      return Promise.reject(\n        new Error(`Failed to fetch image as no content length: ${encodedUrl}`)\n      )\n    }\n\n    if (!imageResponse.ok) {\n      return Promise.reject(new Error(`Failed to fetch image: ${encodedUrl}`))\n    }\n\n    return await imageResponse.arrayBuffer()\n  } catch (error) {\n    if (isHeader) {\n      // NOTE: Replace failed headers with LH logo\n      console.error('FetchImageHeaderError', error)\n      return fetchLighthouseLogo()\n    }\n\n    console.error(error)\n    return imageNotFound\n  }\n}\n"],"mappings":"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","ignoreList":[]}

package/lib/helpers/get-audit-items-data/index.js

@@ -1,3 +1,4 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import { find, groupBy, map, get, round } from 'lodash';
 import { buildFetchUrl } from '../';
 export function getAuditItemsData(items, data) {
@@ -6,6 +7,9 @@ export function getAuditItemsData(items, data) {
     awsS3BaseUrl = _data$settings2.awsS3BaseUrl,
     cloudinaryBaseUrl = _data$settings2.cloudinaryBaseUrl,
     cloudfrontBaseUrl = _data$settings2.cloudfrontBaseUrl,
+    Policy = _data$settings2.Policy,
+    KeyPairId = _data$settings2.KeyPairId,
+    Signature = _data$settings2.Signature,
     shouldUseCloudfront = _data$settings2.shouldUseCloudfront,
     _data$entity = data.entity,
     _data$entity2 = _data$entity === void 0 ? {} : _data$entity,
@@ -47,21 +51,25 @@ export function getAuditItemsData(items, data) {
           awsS3BaseUrl: awsS3BaseUrl,
           cloudfrontBaseUrl: cloudfrontBaseUrl,
           cloudinaryBaseUrl: cloudinaryBaseUrl,
-          shouldUseCloudfront: shouldUseCloudfront,
-          fit: true,
           height: 400,
           width: 600,
-          quality: 50
+          quality: 50,
+          fit: true,
+          shouldUseCloudfront: shouldUseCloudfront,
+          Policy: Policy,
+          KeyPairId: KeyPairId,
+          Signature: Signature
         });
         var link = "".concat(awsS3BaseUrl, "/").concat(asset);
-        var thumbnailUrl = buildFetchUrl(asset, {
+        var thumbnailUrl = buildFetchUrl(asset, _defineProperty(_defineProperty(_defineProperty(_defineProperty({
           awsS3BaseUrl: awsS3BaseUrl,
           cloudfrontBaseUrl: cloudfrontBaseUrl,
           cloudinaryBaseUrl: cloudinaryBaseUrl,
           shouldUseCloudfront: shouldUseCloudfront,
           width: 100,
-          quality: 50
-        });
+          quality: 50,
+          fit: true
+        }, "shouldUseCloudfront", shouldUseCloudfront), "Policy", Policy), "KeyPairId", KeyPairId), "Signature", Signature));
         var key = "".concat(groupIndex, "-item-asset-").concat(assetIndex);
         return {
           assetUrl: assetUrl,

package/lib/helpers/get-audit-items-data/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["find","groupBy","map","get","round","buildFetchUrl","getAuditItemsData","items","data","_data$settings","settings","_data$settings2","awsS3BaseUrl","cloudinaryBaseUrl","cloudfrontBaseUrl","shouldUseCloudfront","_data$entity","entity","_data$entity2","groupScores","groupedItems","auditData","overallActualScore","overallMaximumScore","groupIndex","key","skipped","group","title","label","groupData","groupMaximumScore","groupActualScore","groupResultScore","groupPercentageResultScore","currentGroupScores","max","actual","result","percentageResult","item","itemIndex","hasScore","score","rawAssets","assets","assetCount","length","asset","assetIndex","assetUrl","fit","height","width","quality","link","concat","thumbnailUrl","comments","matchingScore","scores","value","scoreLabel","scoreWeight","weight","questionId","_id"],"sources":["../../../src/helpers/get-audit-items-data/index.js"],"sourcesContent":["import { find, groupBy, map, get, round } from 'lodash'\n\nimport { buildFetchUrl } from '../'\n\nexport function getAuditItemsData(items, data) {\n  const {\n    settings: {\n      awsS3BaseUrl,\n      cloudinaryBaseUrl,\n      cloudfrontBaseUrl,\n      shouldUseCloudfront,\n    } = {},\n    entity: { groupScores } = {},\n  } = data\n\n  const groupedItems = groupBy(items, 'group.id')\n\n  const auditData = {\n    overallActualScore: 0,\n    overallMaximumScore: 0,\n  }\n\n  auditData.items = map(groupedItems, (items, groupIndex) => {\n    const key = groupIndex\n    const skipped = !!items[0].group.skipped\n    const title = items[0].group.label\n\n    const groupData = {\n      key,\n      groupMaximumScore: 0,\n      groupActualScore: 0,\n      groupResultScore: 0,\n      groupPercentageResultScore: 0,\n      skipped,\n      title,\n    }\n\n    const currentGroupScores = get(groupScores, key)\n\n    if (currentGroupScores) {\n      groupData.groupMaximumScore = round(currentGroupScores.max, 2)\n      groupData.groupActualScore = round(currentGroupScores.actual, 2)\n      groupData.groupResultScore = currentGroupScores.result\n      groupData.groupPercentageResultScore = currentGroupScores.percentageResult\n    }\n\n    groupData.items = items.map((item, itemIndex) => {\n      // NOTE: we handle scores of -1, 0 and 1\n      // -1 scores are skipped from group max and actual score\n      // 0 and 1 must be included in the final scores\n      const hasScore = item.score !== null && item.score !== -1\n      const rawAssets = item.assets || []\n      const assetCount = rawAssets.length\n\n      const assets = rawAssets.map((asset, assetIndex) => {\n        const assetUrl = buildFetchUrl(asset, {\n          awsS3BaseUrl,\n          cloudfrontBaseUrl,\n          cloudinaryBaseUrl,\n          shouldUseCloudfront,\n          fit: true,\n          height: 400,\n          width: 600,\n          quality: 50,\n        })\n\n        const link = `${awsS3BaseUrl}/${asset}`\n\n        const thumbnailUrl = buildFetchUrl(asset, {\n          awsS3BaseUrl,\n          cloudfrontBaseUrl,\n          cloudinaryBaseUrl,\n          shouldUseCloudfront,\n          width: 100,\n          quality: 50,\n        })\n\n        const key = `${groupIndex}-item-asset-${assetIndex}`\n\n        return {\n          assetUrl,\n          key,\n          link,\n          thumbnailUrl,\n        }\n      })\n\n      const comments = item.comments\n      const label = item.label\n      const score = item.score\n      const key = `${groupIndex}-item-${itemIndex}`\n      const matchingScore = find(item.scores, { value: score })\n\n      // NOTE: ensure we have a score otherwise fallback to - value\n      const scoreLabel =\n        hasScore && matchingScore && !skipped ? matchingScore.label : '-'\n      const scoreWeight = hasScore && !skipped ? item.scoreWeight : '-'\n      const weight = hasScore ? item.weight : '-'\n\n      return {\n        assetCount,\n        assets,\n        comments,\n        key,\n        label,\n        questionId: item._id,\n        score,\n        scoreLabel,\n        scoreWeight,\n        weight,\n      }\n    })\n\n    return groupData\n  })\n\n  return auditData\n}\n"],"mappings":"AAAA,SAASA,IAAI,EAAEC,OAAO,EAAEC,GAAG,EAAEC,GAAG,EAAEC,KAAK,QAAQ,QAAQ;AAEvD,SAASC,aAAa,QAAQ,KAAK;AAEnC,OAAO,SAASC,iBAAiBA,CAACC,KAAK,EAAEC,IAAI,EAAE;EAC7C,IAAAC,cAAA,GAQID,IAAI,CAPNE,QAAQ;IAAAC,eAAA,GAAAF,cAAA,cAKJ,CAAC,CAAC,GAAAA,cAAA;IAJJG,YAAY,GAAAD,eAAA,CAAZC,YAAY;IACZC,iBAAiB,GAAAF,eAAA,CAAjBE,iBAAiB;IACjBC,iBAAiB,GAAAH,eAAA,CAAjBG,iBAAiB;IACjBC,mBAAmB,GAAAJ,eAAA,CAAnBI,mBAAmB;IAAAC,YAAA,GAGnBR,IAAI,CADNS,MAAM;IAAAC,aAAA,GAAAF,YAAA,cAAoB,CAAC,CAAC,GAAAA,YAAA;IAAlBG,WAAW,GAAAD,aAAA,CAAXC,WAAW;EAGvB,IAAMC,YAAY,GAAGnB,OAAO,CAACM,KAAK,EAAE,UAAU,CAAC;EAE/C,IAAMc,SAAS,GAAG;IAChBC,kBAAkB,EAAE,CAAC;IACrBC,mBAAmB,EAAE;EACvB,CAAC;EAEDF,SAAS,CAACd,KAAK,GAAGL,GAAG,CAACkB,YAAY,EAAE,UAACb,KAAK,EAAEiB,UAAU,EAAK;IACzD,IAAMC,GAAG,GAAGD,UAAU;IACtB,IAAME,OAAO,GAAG,CAAC,CAACnB,KAAK,CAAC,CAAC,CAAC,CAACoB,KAAK,CAACD,OAAO;IACxC,IAAME,KAAK,GAAGrB,KAAK,CAAC,CAAC,CAAC,CAACoB,KAAK,CAACE,KAAK;IAElC,IAAMC,SAAS,GAAG;MAChBL,GAAG,EAAHA,GAAG;MACHM,iBAAiB,EAAE,CAAC;MACpBC,gBAAgB,EAAE,CAAC;MACnBC,gBAAgB,EAAE,CAAC;MACnBC,0BAA0B,EAAE,CAAC;MAC7BR,OAAO,EAAPA,OAAO;MACPE,KAAK,EAALA;IACF,CAAC;IAED,IAAMO,kBAAkB,GAAGhC,GAAG,CAACgB,WAAW,EAAEM,GAAG,CAAC;IAEhD,IAAIU,kBAAkB,EAAE;MACtBL,SAAS,CAACC,iBAAiB,GAAG3B,KAAK,CAAC+B,kBAAkB,CAACC,GAAG,EAAE,CAAC,CAAC;MAC9DN,SAAS,CAACE,gBAAgB,GAAG5B,KAAK,CAAC+B,kBAAkB,CAACE,MAAM,EAAE,CAAC,CAAC;MAChEP,SAAS,CAACG,gBAAgB,GAAGE,kBAAkB,CAACG,MAAM;MACtDR,SAAS,CAACI,0BAA0B,GAAGC,kBAAkB,CAACI,gBAAgB;IAC5E;IAEAT,SAAS,CAACvB,KAAK,GAAGA,KAAK,CAACL,GAAG,CAAC,UAACsC,IAAI,EAAEC,SAAS,EAAK;MAC/C;MACA;MACA;MACA,IAAMC,QAAQ,GAAGF,IAAI,CAACG,KAAK,KAAK,IAAI,IAAIH,IAAI,CAACG,KAAK,KAAK,CAAC,CAAC;MACzD,IAAMC,SAAS,GAAGJ,IAAI,CAACK,MAAM,IAAI,EAAE;MACnC,IAAMC,UAAU,GAAGF,SAAS,CAACG,MAAM;MAEnC,IAAMF,MAAM,GAAGD,SAAS,CAAC1C,GAAG,CAAC,UAAC8C,KAAK,EAAEC,UAAU,EAAK;QAClD,IAAMC,QAAQ,GAAG7C,aAAa,CAAC2C,KAAK,EAAE;UACpCpC,YAAY,EAAZA,YAAY;UACZE,iBAAiB,EAAjBA,iBAAiB;UACjBD,iBAAiB,EAAjBA,iBAAiB;UACjBE,mBAAmB,EAAnBA,mBAAmB;UACnBoC,GAAG,EAAE,IAAI;UACTC,MAAM,EAAE,GAAG;UACXC,KAAK,EAAE,GAAG;UACVC,OAAO,EAAE;QACX,CAAC,CAAC;QAEF,IAAMC,IAAI,MAAAC,MAAA,CAAM5C,YAAY,OAAA4C,MAAA,CAAIR,KAAK,CAAE;QAEvC,IAAMS,YAAY,GAAGpD,aAAa,CAAC2C,KAAK,EAAE;UACxCpC,YAAY,EAAZA,YAAY;UACZE,iBAAiB,EAAjBA,iBAAiB;UACjBD,iBAAiB,EAAjBA,iBAAiB;UACjBE,mBAAmB,EAAnBA,mBAAmB;UACnBsC,KAAK,EAAE,GAAG;UACVC,OAAO,EAAE;QACX,CAAC,CAAC;QAEF,IAAM7B,GAAG,MAAA+B,MAAA,CAAMhC,UAAU,kBAAAgC,MAAA,CAAeP,UAAU,CAAE;QAEpD,OAAO;UACLC,QAAQ,EAARA,QAAQ;UACRzB,GAAG,EAAHA,GAAG;UACH8B,IAAI,EAAJA,IAAI;UACJE,YAAY,EAAZA;QACF,CAAC;MACH,CAAC,CAAC;MAEF,IAAMC,QAAQ,GAAGlB,IAAI,CAACkB,QAAQ;MAC9B,IAAM7B,KAAK,GAAGW,IAAI,CAACX,KAAK;MACxB,IAAMc,KAAK,GAAGH,IAAI,CAACG,KAAK;MACxB,IAAMlB,GAAG,MAAA+B,MAAA,CAAMhC,UAAU,YAAAgC,MAAA,CAASf,SAAS,CAAE;MAC7C,IAAMkB,aAAa,GAAG3D,IAAI,CAACwC,IAAI,CAACoB,MAAM,EAAE;QAAEC,KAAK,EAAElB;MAAM,CAAC,CAAC;;MAEzD;MACA,IAAMmB,UAAU,GACdpB,QAAQ,IAAIiB,aAAa,IAAI,CAACjC,OAAO,GAAGiC,aAAa,CAAC9B,KAAK,GAAG,GAAG;MACnE,IAAMkC,WAAW,GAAGrB,QAAQ,IAAI,CAAChB,OAAO,GAAGc,IAAI,CAACuB,WAAW,GAAG,GAAG;MACjE,IAAMC,MAAM,GAAGtB,QAAQ,GAAGF,IAAI,CAACwB,MAAM,GAAG,GAAG;MAE3C,OAAO;QACLlB,UAAU,EAAVA,UAAU;QACVD,MAAM,EAANA,MAAM;QACNa,QAAQ,EAARA,QAAQ;QACRjC,GAAG,EAAHA,GAAG;QACHI,KAAK,EAALA,KAAK;QACLoC,UAAU,EAAEzB,IAAI,CAAC0B,GAAG;QACpBvB,KAAK,EAALA,KAAK;QACLmB,UAAU,EAAVA,UAAU;QACVC,WAAW,EAAXA,WAAW;QACXC,MAAM,EAANA;MACF,CAAC;IACH,CAAC,CAAC;IAEF,OAAOlC,SAAS;EAClB,CAAC,CAAC;EAEF,OAAOT,SAAS;AAClB","ignoreList":[]}
+{"version":3,"file":"index.js","names":["find","groupBy","map","get","round","buildFetchUrl","getAuditItemsData","items","data","_data$settings","settings","_data$settings2","awsS3BaseUrl","cloudinaryBaseUrl","cloudfrontBaseUrl","Policy","KeyPairId","Signature","shouldUseCloudfront","_data$entity","entity","_data$entity2","groupScores","groupedItems","auditData","overallActualScore","overallMaximumScore","groupIndex","key","skipped","group","title","label","groupData","groupMaximumScore","groupActualScore","groupResultScore","groupPercentageResultScore","currentGroupScores","max","actual","result","percentageResult","item","itemIndex","hasScore","score","rawAssets","assets","assetCount","length","asset","assetIndex","assetUrl","height","width","quality","fit","link","concat","thumbnailUrl","_defineProperty","comments","matchingScore","scores","value","scoreLabel","scoreWeight","weight","questionId","_id"],"sources":["../../../src/helpers/get-audit-items-data/index.js"],"sourcesContent":["import { find, groupBy, map, get, round } from 'lodash'\n\nimport { buildFetchUrl } from '../'\n\nexport function getAuditItemsData(items, data) {\n  const {\n    settings: {\n      awsS3BaseUrl,\n      cloudinaryBaseUrl,\n      cloudfrontBaseUrl,\n      Policy,\n      KeyPairId,\n      Signature,\n      shouldUseCloudfront,\n    } = {},\n    entity: { groupScores } = {},\n  } = data\n\n  const groupedItems = groupBy(items, 'group.id')\n\n  const auditData = {\n    overallActualScore: 0,\n    overallMaximumScore: 0,\n  }\n\n  auditData.items = map(groupedItems, (items, groupIndex) => {\n    const key = groupIndex\n    const skipped = !!items[0].group.skipped\n    const title = items[0].group.label\n\n    const groupData = {\n      key,\n      groupMaximumScore: 0,\n      groupActualScore: 0,\n      groupResultScore: 0,\n      groupPercentageResultScore: 0,\n      skipped,\n      title,\n    }\n\n    const currentGroupScores = get(groupScores, key)\n\n    if (currentGroupScores) {\n      groupData.groupMaximumScore = round(currentGroupScores.max, 2)\n      groupData.groupActualScore = round(currentGroupScores.actual, 2)\n      groupData.groupResultScore = currentGroupScores.result\n      groupData.groupPercentageResultScore = currentGroupScores.percentageResult\n    }\n\n    groupData.items = items.map((item, itemIndex) => {\n      // NOTE: we handle scores of -1, 0 and 1\n      // -1 scores are skipped from group max and actual score\n      // 0 and 1 must be included in the final scores\n      const hasScore = item.score !== null && item.score !== -1\n      const rawAssets = item.assets || []\n      const assetCount = rawAssets.length\n\n      const assets = rawAssets.map((asset, assetIndex) => {\n        const assetUrl = buildFetchUrl(asset, {\n          awsS3BaseUrl,\n          cloudfrontBaseUrl,\n          cloudinaryBaseUrl,\n          height: 400,\n          width: 600,\n          quality: 50,\n          fit: true,\n          shouldUseCloudfront,\n          Policy,\n          KeyPairId,\n          Signature,\n        })\n\n        const link = `${awsS3BaseUrl}/${asset}`\n\n        const thumbnailUrl = buildFetchUrl(asset, {\n          awsS3BaseUrl,\n          cloudfrontBaseUrl,\n          cloudinaryBaseUrl,\n          shouldUseCloudfront,\n          width: 100,\n          quality: 50,\n          fit: true,\n          shouldUseCloudfront,\n          Policy,\n          KeyPairId,\n          Signature,\n        })\n\n        const key = `${groupIndex}-item-asset-${assetIndex}`\n\n        return {\n          assetUrl,\n          key,\n          link,\n          thumbnailUrl,\n        }\n      })\n\n      const comments = item.comments\n      const label = item.label\n      const score = item.score\n      const key = `${groupIndex}-item-${itemIndex}`\n      const matchingScore = find(item.scores, { value: score })\n\n      // NOTE: ensure we have a score otherwise fallback to - value\n      const scoreLabel =\n        hasScore && matchingScore && !skipped ? matchingScore.label : '-'\n      const scoreWeight = hasScore && !skipped ? item.scoreWeight : '-'\n      const weight = hasScore ? item.weight : '-'\n\n      return {\n        assetCount,\n        assets,\n        comments,\n        key,\n        label,\n        questionId: item._id,\n        score,\n        scoreLabel,\n        scoreWeight,\n        weight,\n      }\n    })\n\n    return groupData\n  })\n\n  return auditData\n}\n"],"mappings":";AAAA,SAASA,IAAI,EAAEC,OAAO,EAAEC,GAAG,EAAEC,GAAG,EAAEC,KAAK,QAAQ,QAAQ;AAEvD,SAASC,aAAa,QAAQ,KAAK;AAEnC,OAAO,SAASC,iBAAiBA,CAACC,KAAK,EAAEC,IAAI,EAAE;EAC7C,IAAAC,cAAA,GAWID,IAAI,CAVNE,QAAQ;IAAAC,eAAA,GAAAF,cAAA,cAQJ,CAAC,CAAC,GAAAA,cAAA;IAPJG,YAAY,GAAAD,eAAA,CAAZC,YAAY;IACZC,iBAAiB,GAAAF,eAAA,CAAjBE,iBAAiB;IACjBC,iBAAiB,GAAAH,eAAA,CAAjBG,iBAAiB;IACjBC,MAAM,GAAAJ,eAAA,CAANI,MAAM;IACNC,SAAS,GAAAL,eAAA,CAATK,SAAS;IACTC,SAAS,GAAAN,eAAA,CAATM,SAAS;IACTC,mBAAmB,GAAAP,eAAA,CAAnBO,mBAAmB;IAAAC,YAAA,GAGnBX,IAAI,CADNY,MAAM;IAAAC,aAAA,GAAAF,YAAA,cAAoB,CAAC,CAAC,GAAAA,YAAA;IAAlBG,WAAW,GAAAD,aAAA,CAAXC,WAAW;EAGvB,IAAMC,YAAY,GAAGtB,OAAO,CAACM,KAAK,EAAE,UAAU,CAAC;EAE/C,IAAMiB,SAAS,GAAG;IAChBC,kBAAkB,EAAE,CAAC;IACrBC,mBAAmB,EAAE;EACvB,CAAC;EAEDF,SAAS,CAACjB,KAAK,GAAGL,GAAG,CAACqB,YAAY,EAAE,UAAChB,KAAK,EAAEoB,UAAU,EAAK;IACzD,IAAMC,GAAG,GAAGD,UAAU;IACtB,IAAME,OAAO,GAAG,CAAC,CAACtB,KAAK,CAAC,CAAC,CAAC,CAACuB,KAAK,CAACD,OAAO;IACxC,IAAME,KAAK,GAAGxB,KAAK,CAAC,CAAC,CAAC,CAACuB,KAAK,CAACE,KAAK;IAElC,IAAMC,SAAS,GAAG;MAChBL,GAAG,EAAHA,GAAG;MACHM,iBAAiB,EAAE,CAAC;MACpBC,gBAAgB,EAAE,CAAC;MACnBC,gBAAgB,EAAE,CAAC;MACnBC,0BAA0B,EAAE,CAAC;MAC7BR,OAAO,EAAPA,OAAO;MACPE,KAAK,EAALA;IACF,CAAC;IAED,IAAMO,kBAAkB,GAAGnC,GAAG,CAACmB,WAAW,EAAEM,GAAG,CAAC;IAEhD,IAAIU,kBAAkB,EAAE;MACtBL,SAAS,CAACC,iBAAiB,GAAG9B,KAAK,CAACkC,kBAAkB,CAACC,GAAG,EAAE,CAAC,CAAC;MAC9DN,SAAS,CAACE,gBAAgB,GAAG/B,KAAK,CAACkC,kBAAkB,CAACE,MAAM,EAAE,CAAC,CAAC;MAChEP,SAAS,CAACG,gBAAgB,GAAGE,kBAAkB,CAACG,MAAM;MACtDR,SAAS,CAACI,0BAA0B,GAAGC,kBAAkB,CAACI,gBAAgB;IAC5E;IAEAT,SAAS,CAAC1B,KAAK,GAAGA,KAAK,CAACL,GAAG,CAAC,UAACyC,IAAI,EAAEC,SAAS,EAAK;MAC/C;MACA;MACA;MACA,IAAMC,QAAQ,GAAGF,IAAI,CAACG,KAAK,KAAK,IAAI,IAAIH,IAAI,CAACG,KAAK,KAAK,CAAC,CAAC;MACzD,IAAMC,SAAS,GAAGJ,IAAI,CAACK,MAAM,IAAI,EAAE;MACnC,IAAMC,UAAU,GAAGF,SAAS,CAACG,MAAM;MAEnC,IAAMF,MAAM,GAAGD,SAAS,CAAC7C,GAAG,CAAC,UAACiD,KAAK,EAAEC,UAAU,EAAK;QAClD,IAAMC,QAAQ,GAAGhD,aAAa,CAAC8C,KAAK,EAAE;UACpCvC,YAAY,EAAZA,YAAY;UACZE,iBAAiB,EAAjBA,iBAAiB;UACjBD,iBAAiB,EAAjBA,iBAAiB;UACjByC,MAAM,EAAE,GAAG;UACXC,KAAK,EAAE,GAAG;UACVC,OAAO,EAAE,EAAE;UACXC,GAAG,EAAE,IAAI;UACTvC,mBAAmB,EAAnBA,mBAAmB;UACnBH,MAAM,EAANA,MAAM;UACNC,SAAS,EAATA,SAAS;UACTC,SAAS,EAATA;QACF,CAAC,CAAC;QAEF,IAAMyC,IAAI,MAAAC,MAAA,CAAM/C,YAAY,OAAA+C,MAAA,CAAIR,KAAK,CAAE;QAEvC,IAAMS,YAAY,GAAGvD,aAAa,CAAC8C,KAAK,EAAAU,eAAA,CAAAA,eAAA,CAAAA,eAAA,CAAAA,eAAA;UACtCjD,YAAY,EAAZA,YAAY;UACZE,iBAAiB,EAAjBA,iBAAiB;UACjBD,iBAAiB,EAAjBA,iBAAiB;UACjBK,mBAAmB,EAAnBA,mBAAmB;UACnBqC,KAAK,EAAE,GAAG;UACVC,OAAO,EAAE,EAAE;UACXC,GAAG,EAAE;QAAI,0BACTvC,mBAAmB,aACnBH,MAAM,gBACNC,SAAS,gBACTC,SAAS,CACV,CAAC;QAEF,IAAMW,GAAG,MAAA+B,MAAA,CAAMhC,UAAU,kBAAAgC,MAAA,CAAeP,UAAU,CAAE;QAEpD,OAAO;UACLC,QAAQ,EAARA,QAAQ;UACRzB,GAAG,EAAHA,GAAG;UACH8B,IAAI,EAAJA,IAAI;UACJE,YAAY,EAAZA;QACF,CAAC;MACH,CAAC,CAAC;MAEF,IAAME,QAAQ,GAAGnB,IAAI,CAACmB,QAAQ;MAC9B,IAAM9B,KAAK,GAAGW,IAAI,CAACX,KAAK;MACxB,IAAMc,KAAK,GAAGH,IAAI,CAACG,KAAK;MACxB,IAAMlB,GAAG,MAAA+B,MAAA,CAAMhC,UAAU,YAAAgC,MAAA,CAASf,SAAS,CAAE;MAC7C,IAAMmB,aAAa,GAAG/D,IAAI,CAAC2C,IAAI,CAACqB,MAAM,EAAE;QAAEC,KAAK,EAAEnB;MAAM,CAAC,CAAC;;MAEzD;MACA,IAAMoB,UAAU,GACdrB,QAAQ,IAAIkB,aAAa,IAAI,CAAClC,OAAO,GAAGkC,aAAa,CAAC/B,KAAK,GAAG,GAAG;MACnE,IAAMmC,WAAW,GAAGtB,QAAQ,IAAI,CAAChB,OAAO,GAAGc,IAAI,CAACwB,WAAW,GAAG,GAAG;MACjE,IAAMC,MAAM,GAAGvB,QAAQ,GAAGF,IAAI,CAACyB,MAAM,GAAG,GAAG;MAE3C,OAAO;QACLnB,UAAU,EAAVA,UAAU;QACVD,MAAM,EAANA,MAAM;QACNc,QAAQ,EAARA,QAAQ;QACRlC,GAAG,EAAHA,GAAG;QACHI,KAAK,EAALA,KAAK;QACLqC,UAAU,EAAE1B,IAAI,CAAC2B,GAAG;QACpBxB,KAAK,EAALA,KAAK;QACLoB,UAAU,EAAVA,UAAU;QACVC,WAAW,EAAXA,WAAW;QACXC,MAAM,EAANA;MACF,CAAC;IACH,CAAC,CAAC;IAEF,OAAOnC,SAAS;EAClB,CAAC,CAAC;EAEF,OAAOT,SAAS;AAClB","ignoreList":[]}

package/lib/pdf/audit/index.js

@@ -56,6 +56,7 @@ export function buildAuditPdf(pdfOptions, data) {
 }
 function generateContent(data) {
   var entity = data.entity;
+  console.log("Data in generateContent:", data);
   var _entity$followUps = entity.followUps,
     followUps = _entity$followUps === void 0 ? [] : _entity$followUps,
     _entity$footerFields = entity.footerFields,
@@ -191,8 +192,11 @@ function generateContent(data) {
   var followUpItems = buildAuditFollowUps(followUps, {
     timezone: timezone
   });
+  console.log("Data before passing t buildAuditContent", {
+    data: data
+  });
   var promises = {
-    entry: buildAuditContent(groupedData.items),
+    entry: buildAuditContent(groupedData.items, data.settings),
     footerTemplate: buildTemplateContent(footerFields.formGroups, data),
     headerTemplate: buildTemplateContent(headerFields.formGroups, data)
   };

package/lib/pdf/audit/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["Promise","isEmpty","round","moment","buildAuditContent","buildAuditFollowUps","buildTemplateContent","generateDefinition","getFormattedAddress","horizontalLine","text","twoColumnTable","getAuditEntryDetails","buildAuditPdf","pdfOptions","data","entity","timezone","_pdfOptions$flags","flags","sequenceId","timestamp","createdAt","title","fileTitle","concat","generateContent","then","content","_objectSpread","type","catch","err","Error","message","_entity$followUps","followUps","_entity$footerFields","footerFields","_entity$gps","gps","_entity$headerFields","headerFields","_entity$score","score","_entity$title","entityDetails","gpsText","groupedData","locationText","referenceValue","timezoneHourTime","scoreText","target","targetServiceLevel","renderTargetFields","headerTitle","style","headerScore","alignment","firstRow","subTitle","headerSubTitle","colSpan","secondRow","reverseGeocoded","address","renderHeaderAddress","dummyColumn","headerAddress","renderThirdRow","thirdRow","serviceLevelBelow","serviceLevelText","scoreServiceLevelSubTitle","truncatedTargetPercent","scoreTargetText","scoreTargetSubTitle","scoreBreakdown","actual","max","scorePercentage","scoreTitle","body","submittedAtInTimezone","submittedAt","tz","format","showSimplifiedDuration","push","startedAtInTimezone","startedAt","momentDuration","duration","Math","abs","formDuration","days","floor","asDays","toString","padStart","hours","minutes","seconds","formattedFormDuration","titleTable","layout","widths","margin","totalScoreTable","hLineTop","hLineBottom","followUpItems","promises","entry","items","footerTemplate","formGroups","headerTemplate","auditItemsTitle","font","lineHeight","props","_ref","_toConsumableArray"],"sources":["../../../src/pdf/audit/index.js"],"sourcesContent":["import Promise from 'bluebird'\nimport { isEmpty, round } from 'lodash'\nimport moment from 'moment-timezone'\n\nimport {\n  buildAuditContent,\n  buildAuditFollowUps,\n  buildTemplateContent,\n  generateDefinition,\n  getFormattedAddress,\n  horizontalLine,\n  text,\n  twoColumnTable,\n} from '../helpers'\nimport { getAuditEntryDetails } from '../../helpers'\n\n/**\n * buildAuditPdf\n *\n * @param {object} pdfOptions - the pdf options\n * @param {string} pdfOptions.fileTitle - pdf file title\n * @param {function} pdfOptions.footer - function executed to generate footer\n * @param {function} pdfOptions.header - function executed to generate header\n * @param {string} pdfOptions.logoUrl - pdf logo url\n * @param {array} pdfOptions.pageMargins - pdf page margins\n * @param {string} pdfOptions.pageOrientation - pdf page orientation\n * @param {string} pdfOptions.pageSize - pdf page size\n * @param {object} pdfOptions.styles - pdf styles\n * @param {object} pdfOptions.title - pdf title\n * @param {object} pdfOptions.flags - flags to conditionally render parts of the pdf\n * @param {object} data - pdf data\n * @param {object} data.entity - audit document\n * @param {object} data.locations - locations documents\n * @param {object} data.settings - settings properties\n * @param {string} data.settings.awsS3BaseUrl - aws S3 base url\n * @param {string} data.settings.cloudinaryBaseUrl - cloudinary base url\n * @param {string} data.timezone - timezone string\n * @param {object} data.users - application user documents\n * @returns {Promise} returns pdfmake definition object\n */\nexport function buildAuditPdf(pdfOptions, data) {\n  const { entity, timezone } = data\n  const { flags = {} } = pdfOptions\n\n  const sequenceId = entity.sequenceId\n  const timestamp = entity.createdAt\n  const title = entity.title || 'Unknown'\n  const fileTitle = `Audit Report - ${title}`\n\n  return generateContent(data, flags)\n    .then(content =>\n      generateDefinition({\n        content,\n        fileTitle,\n        sequenceId,\n        timestamp,\n        timezone,\n        type: 'Audit',\n        ...pdfOptions,\n      })\n    )\n    .catch(err => {\n      throw new Error(`BuildAuditPdfError: ${err.message}`)\n    })\n}\n\nfunction generateContent(data) {\n  const { entity } = data\n\n  const {\n    followUps = [],\n    footerFields = {},\n    gps = {},\n    headerFields = {},\n    score = {},\n    title = 'Unknown',\n  } = entity\n\n  const timezone = entity?.timezone || data?.timezone || 'UTC'\n  const entityDetails = getAuditEntryDetails(data)\n\n  const {\n    gpsText,\n    groupedData,\n    locationText,\n    referenceValue,\n    timezoneHourTime,\n    scoreText,\n    target,\n    targetServiceLevel,\n  } = entityDetails\n\n  const renderTargetFields = !!targetServiceLevel\n  const headerTitle = text(title, { style: 'title' })\n  const headerScore = text(scoreText, { alignment: 'right', style: 'title' })\n  const firstRow = [headerTitle, headerScore]\n  const subTitle = `${locationText ||\n    gpsText} - ${timezoneHourTime} by ${referenceValue}`\n\n  let headerSubTitle = text(subTitle, { colSpan: 2, style: 'subTitle' })\n  let secondRow = [headerSubTitle]\n\n  const reverseGeocoded = gps.reverseGeocoded\n  const address = !isEmpty(reverseGeocoded)\n    ? getFormattedAddress(reverseGeocoded)\n    : ''\n  const renderHeaderAddress = !isEmpty(reverseGeocoded)\n  const dummyColumn = text(' ', { style: 'small' })\n\n  let headerAddress = text(address, { colSpan: 2, style: 'small' })\n  const renderThirdRow = renderHeaderAddress || renderTargetFields\n  let thirdRow = renderHeaderAddress ? [headerAddress] : []\n\n  if (renderTargetFields) {\n    headerSubTitle = text(subTitle, { style: 'subTitle' })\n\n    const serviceLevelBelow = targetServiceLevel === 'below'\n    const serviceLevelText =\n      targetServiceLevel === 'above'\n        ? 'Above Target'\n        : targetServiceLevel === 'on'\n        ? 'On Target'\n        : targetServiceLevel === 'below'\n        ? 'Below Target'\n        : ''\n\n    const scoreServiceLevelSubTitle = text(serviceLevelText, {\n      alignment: 'right',\n      style: serviceLevelBelow ? 'serviceLevelBelow' : 'serviceLevelAboveOrOn',\n    })\n\n    secondRow = [headerSubTitle, scoreServiceLevelSubTitle]\n    headerAddress = text(address, { style: 'small' })\n\n    const truncatedTargetPercent = round(target, 2)\n    const scoreTargetText = `(Target - ${truncatedTargetPercent}%)`\n    const scoreTargetSubTitle = text(scoreTargetText, {\n      alignment: 'right',\n      style: 'subTitle',\n    })\n\n    thirdRow = renderHeaderAddress\n      ? [headerAddress, scoreTargetSubTitle]\n      : [dummyColumn, scoreTargetSubTitle]\n  }\n\n  const scoreBreakdown = text(\n    `${round(score.actual, 2)} / ${round(score.max, 2)}`,\n    {\n      alignment: 'right',\n      style: 'totalScore',\n    }\n  )\n  const scorePercentage = text(scoreText, {\n    alignment: 'right',\n    colSpan: 2,\n    style: 'totalAuditScore',\n  })\n  const scoreTitle = text('Total Score', { style: 'totalScore' })\n\n  const body = renderThirdRow\n    ? [firstRow, secondRow, thirdRow]\n    : [firstRow, secondRow]\n\n  const submittedAtInTimezone = entity.submittedAt\n    ? moment(entity.submittedAt)\n        .tz(timezone)\n        .format('YYYY-MM-DD HH:mm:ss z')\n    : 'Not recorded'\n  const submittedAt = text(`Submitted: ${submittedAtInTimezone}`, {\n    colSpan: 2,\n    style: 'small',\n  })\n\n  if (entity.showSimplifiedDuration) {\n    body.push([submittedAt, dummyColumn])\n  } else {\n    const startedAtInTimezone = entity.startedAt\n      ? moment(entity.startedAt)\n          .tz(timezone)\n          .format('YYYY-MM-DD HH:mm:ss z')\n      : 'Not recorded'\n    const startedAt = text(`Started: ${startedAtInTimezone}`, {\n      colSpan: 2,\n      style: 'small',\n    })\n\n    const submittedAtInTimezone = entity.submittedAt\n      ? moment(entity.submittedAt)\n          .tz(timezone)\n          .format('YYYY-MM-DD HH:mm:ss z')\n      : 'Not recorded'\n    const submittedAt = text(`Submitted: ${submittedAtInTimezone}`, {\n      colSpan: 2,\n      style: 'small',\n    })\n\n    const momentDuration = moment.duration(Math.abs(entity.formDuration))\n    const days = Math.floor(momentDuration.asDays())\n      .toString()\n      .padStart(2, '0')\n    const hours = Math.floor(momentDuration.hours())\n      .toString()\n      .padStart(2, '0')\n    const minutes = momentDuration\n      .minutes()\n      .toString()\n      .padStart(2, '0')\n    const seconds = momentDuration\n      .seconds()\n      .toString()\n      .padStart(2, '0')\n    const formattedFormDuration = entity.formDuration\n      ? `${\n          entity.formDuration < 0 ? '-' : ''\n        }${days}:${hours}:${minutes}:${seconds}`\n      : 'Not recorded'\n    const formDuration = text(\n      `Form Duration (DD:HH:MM:SS): ${formattedFormDuration}`,\n      {\n        colSpan: 2,\n        style: 'small',\n      }\n    )\n\n    body.push([startedAt, dummyColumn])\n    body.push([submittedAt, dummyColumn])\n    body.push([formDuration, dummyColumn])\n  }\n\n  const titleTable = twoColumnTable({\n    body,\n    layout: 'noBorders',\n    style: 'titleTable',\n    widths: ['*', 100],\n    margin: [0, 0, 0, 30],\n  })\n\n  const totalScoreTable = twoColumnTable({\n    body: [[scoreTitle, scoreBreakdown], [scorePercentage]],\n    layout: 'noBorders',\n    widths: ['*', 100],\n  })\n\n  const hLineTop = horizontalLine({ margin: [0, 10, 0, 0] })\n  const hLineBottom = horizontalLine()\n\n  const followUpItems = buildAuditFollowUps(followUps, { timezone })\n\n  const promises = {\n    entry: buildAuditContent(groupedData.items),\n    footerTemplate: buildTemplateContent(footerFields.formGroups, data),\n    headerTemplate: buildTemplateContent(headerFields.formGroups, data),\n  }\n\n  const auditItemsTitle = [\n    {\n      text: 'Audit Items',\n      style: {\n        font: 'Gotham',\n        lineHeight: 1.1,\n      },\n    },\n    hLineTop,\n  ]\n\n  return Promise.props(promises)\n    .then(({ entry, footerTemplate, headerTemplate }) => [\n      titleTable,\n      followUpItems,\n      ...auditItemsTitle,\n      ...headerTemplate,\n      ...entry,\n      hLineTop,\n      totalScoreTable,\n      hLineBottom,\n      ...footerTemplate,\n    ])\n    .catch(err => {\n      throw new Error(`GenerateContentError: ${err.message}`)\n    })\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"index.js","names":["Promise","isEmpty","round","moment","buildAuditContent","buildAuditFollowUps","buildTemplateContent","generateDefinition","getFormattedAddress","horizontalLine","text","twoColumnTable","getAuditEntryDetails","buildAuditPdf","pdfOptions","data","entity","timezone","_pdfOptions$flags","flags","sequenceId","timestamp","createdAt","title","fileTitle","concat","generateContent","then","content","_objectSpread","type","catch","err","Error","message","console","log","_entity$followUps","followUps","_entity$footerFields","footerFields","_entity$gps","gps","_entity$headerFields","headerFields","_entity$score","score","_entity$title","entityDetails","gpsText","groupedData","locationText","referenceValue","timezoneHourTime","scoreText","target","targetServiceLevel","renderTargetFields","headerTitle","style","headerScore","alignment","firstRow","subTitle","headerSubTitle","colSpan","secondRow","reverseGeocoded","address","renderHeaderAddress","dummyColumn","headerAddress","renderThirdRow","thirdRow","serviceLevelBelow","serviceLevelText","scoreServiceLevelSubTitle","truncatedTargetPercent","scoreTargetText","scoreTargetSubTitle","scoreBreakdown","actual","max","scorePercentage","scoreTitle","body","submittedAtInTimezone","submittedAt","tz","format","showSimplifiedDuration","push","startedAtInTimezone","startedAt","momentDuration","duration","Math","abs","formDuration","days","floor","asDays","toString","padStart","hours","minutes","seconds","formattedFormDuration","titleTable","layout","widths","margin","totalScoreTable","hLineTop","hLineBottom","followUpItems","promises","entry","items","settings","footerTemplate","formGroups","headerTemplate","auditItemsTitle","font","lineHeight","props","_ref","_toConsumableArray"],"sources":["../../../src/pdf/audit/index.js"],"sourcesContent":["import Promise from 'bluebird'\nimport { isEmpty, round } from 'lodash'\nimport moment from 'moment-timezone'\n\nimport {\n  buildAuditContent,\n  buildAuditFollowUps,\n  buildTemplateContent,\n  generateDefinition,\n  getFormattedAddress,\n  horizontalLine,\n  text,\n  twoColumnTable,\n} from '../helpers'\nimport { getAuditEntryDetails } from '../../helpers'\n\n/**\n * buildAuditPdf\n *\n * @param {object} pdfOptions - the pdf options\n * @param {string} pdfOptions.fileTitle - pdf file title\n * @param {function} pdfOptions.footer - function executed to generate footer\n * @param {function} pdfOptions.header - function executed to generate header\n * @param {string} pdfOptions.logoUrl - pdf logo url\n * @param {array} pdfOptions.pageMargins - pdf page margins\n * @param {string} pdfOptions.pageOrientation - pdf page orientation\n * @param {string} pdfOptions.pageSize - pdf page size\n * @param {object} pdfOptions.styles - pdf styles\n * @param {object} pdfOptions.title - pdf title\n * @param {object} pdfOptions.flags - flags to conditionally render parts of the pdf\n * @param {object} data - pdf data\n * @param {object} data.entity - audit document\n * @param {object} data.locations - locations documents\n * @param {object} data.settings - settings properties\n * @param {string} data.settings.awsS3BaseUrl - aws S3 base url\n * @param {string} data.settings.cloudinaryBaseUrl - cloudinary base url\n * @param {string} data.timezone - timezone string\n * @param {object} data.users - application user documents\n * @returns {Promise} returns pdfmake definition object\n */\nexport function buildAuditPdf(pdfOptions, data) {\n  const { entity, timezone } = data\n  const { flags = {} } = pdfOptions\n\n  const sequenceId = entity.sequenceId\n  const timestamp = entity.createdAt\n  const title = entity.title || 'Unknown'\n  const fileTitle = `Audit Report - ${title}`\n\n  return generateContent(data, flags)\n    .then(content =>\n      generateDefinition({\n        content,\n        fileTitle,\n        sequenceId,\n        timestamp,\n        timezone,\n        type: 'Audit',\n        ...pdfOptions,\n      })\n    )\n    .catch(err => {\n      throw new Error(`BuildAuditPdfError: ${err.message}`)\n    })\n}\n\nfunction generateContent(data) {\n  const { entity } = data\n  console.log(\"Data in generateContent:\", data)\n  const {\n    followUps = [],\n    footerFields = {},\n    gps = {},\n    headerFields = {},\n    score = {},\n    title = 'Unknown',\n  } = entity\n\n  const timezone = entity?.timezone || data?.timezone || 'UTC'\n  const entityDetails = getAuditEntryDetails(data)\n\n  const {\n    gpsText,\n    groupedData,\n    locationText,\n    referenceValue,\n    timezoneHourTime,\n    scoreText,\n    target,\n    targetServiceLevel,\n  } = entityDetails\n\n  const renderTargetFields = !!targetServiceLevel\n  const headerTitle = text(title, { style: 'title' })\n  const headerScore = text(scoreText, { alignment: 'right', style: 'title' })\n  const firstRow = [headerTitle, headerScore]\n  const subTitle = `${locationText ||\n    gpsText} - ${timezoneHourTime} by ${referenceValue}`\n\n  let headerSubTitle = text(subTitle, { colSpan: 2, style: 'subTitle' })\n  let secondRow = [headerSubTitle]\n\n  const reverseGeocoded = gps.reverseGeocoded\n  const address = !isEmpty(reverseGeocoded)\n    ? getFormattedAddress(reverseGeocoded)\n    : ''\n  const renderHeaderAddress = !isEmpty(reverseGeocoded)\n  const dummyColumn = text(' ', { style: 'small' })\n\n  let headerAddress = text(address, { colSpan: 2, style: 'small' })\n  const renderThirdRow = renderHeaderAddress || renderTargetFields\n  let thirdRow = renderHeaderAddress ? [headerAddress] : []\n\n  if (renderTargetFields) {\n    headerSubTitle = text(subTitle, { style: 'subTitle' })\n\n    const serviceLevelBelow = targetServiceLevel === 'below'\n    const serviceLevelText =\n      targetServiceLevel === 'above'\n        ? 'Above Target'\n        : targetServiceLevel === 'on'\n        ? 'On Target'\n        : targetServiceLevel === 'below'\n        ? 'Below Target'\n        : ''\n\n    const scoreServiceLevelSubTitle = text(serviceLevelText, {\n      alignment: 'right',\n      style: serviceLevelBelow ? 'serviceLevelBelow' : 'serviceLevelAboveOrOn',\n    })\n\n    secondRow = [headerSubTitle, scoreServiceLevelSubTitle]\n    headerAddress = text(address, { style: 'small' })\n\n    const truncatedTargetPercent = round(target, 2)\n    const scoreTargetText = `(Target - ${truncatedTargetPercent}%)`\n    const scoreTargetSubTitle = text(scoreTargetText, {\n      alignment: 'right',\n      style: 'subTitle',\n    })\n\n    thirdRow = renderHeaderAddress\n      ? [headerAddress, scoreTargetSubTitle]\n      : [dummyColumn, scoreTargetSubTitle]\n  }\n\n  const scoreBreakdown = text(\n    `${round(score.actual, 2)} / ${round(score.max, 2)}`,\n    {\n      alignment: 'right',\n      style: 'totalScore',\n    }\n  )\n  const scorePercentage = text(scoreText, {\n    alignment: 'right',\n    colSpan: 2,\n    style: 'totalAuditScore',\n  })\n  const scoreTitle = text('Total Score', { style: 'totalScore' })\n\n  const body = renderThirdRow\n    ? [firstRow, secondRow, thirdRow]\n    : [firstRow, secondRow]\n\n  const submittedAtInTimezone = entity.submittedAt\n    ? moment(entity.submittedAt)\n        .tz(timezone)\n        .format('YYYY-MM-DD HH:mm:ss z')\n    : 'Not recorded'\n  const submittedAt = text(`Submitted: ${submittedAtInTimezone}`, {\n    colSpan: 2,\n    style: 'small',\n  })\n\n  if (entity.showSimplifiedDuration) {\n    body.push([submittedAt, dummyColumn])\n  } else {\n    const startedAtInTimezone = entity.startedAt\n      ? moment(entity.startedAt)\n          .tz(timezone)\n          .format('YYYY-MM-DD HH:mm:ss z')\n      : 'Not recorded'\n    const startedAt = text(`Started: ${startedAtInTimezone}`, {\n      colSpan: 2,\n      style: 'small',\n    })\n\n    const submittedAtInTimezone = entity.submittedAt\n      ? moment(entity.submittedAt)\n          .tz(timezone)\n          .format('YYYY-MM-DD HH:mm:ss z')\n      : 'Not recorded'\n    const submittedAt = text(`Submitted: ${submittedAtInTimezone}`, {\n      colSpan: 2,\n      style: 'small',\n    })\n\n    const momentDuration = moment.duration(Math.abs(entity.formDuration))\n    const days = Math.floor(momentDuration.asDays())\n      .toString()\n      .padStart(2, '0')\n    const hours = Math.floor(momentDuration.hours())\n      .toString()\n      .padStart(2, '0')\n    const minutes = momentDuration\n      .minutes()\n      .toString()\n      .padStart(2, '0')\n    const seconds = momentDuration\n      .seconds()\n      .toString()\n      .padStart(2, '0')\n    const formattedFormDuration = entity.formDuration\n      ? `${\n          entity.formDuration < 0 ? '-' : ''\n        }${days}:${hours}:${minutes}:${seconds}`\n      : 'Not recorded'\n    const formDuration = text(\n      `Form Duration (DD:HH:MM:SS): ${formattedFormDuration}`,\n      {\n        colSpan: 2,\n        style: 'small',\n      }\n    )\n\n    body.push([startedAt, dummyColumn])\n    body.push([submittedAt, dummyColumn])\n    body.push([formDuration, dummyColumn])\n  }\n\n  const titleTable = twoColumnTable({\n    body,\n    layout: 'noBorders',\n    style: 'titleTable',\n    widths: ['*', 100],\n    margin: [0, 0, 0, 30],\n  })\n\n  const totalScoreTable = twoColumnTable({\n    body: [[scoreTitle, scoreBreakdown], [scorePercentage]],\n    layout: 'noBorders',\n    widths: ['*', 100],\n  })\n\n  const hLineTop = horizontalLine({ margin: [0, 10, 0, 0] })\n  const hLineBottom = horizontalLine()\n\n  const followUpItems = buildAuditFollowUps(followUps, { timezone })\n  console.log(\"Data before passing t buildAuditContent\",{data})\n  const promises = {\n    entry: buildAuditContent(groupedData.items, data.settings),\n    footerTemplate: buildTemplateContent(footerFields.formGroups, data),\n    headerTemplate: buildTemplateContent(headerFields.formGroups, data),\n  }\n\n  const auditItemsTitle = [\n    {\n      text: 'Audit Items',\n      style: {\n        font: 'Gotham',\n        lineHeight: 1.1,\n      },\n    },\n    hLineTop,\n  ]\n\n  return Promise.props(promises)\n    .then(({ entry, footerTemplate, headerTemplate }) => [\n      titleTable,\n      followUpItems,\n      ...auditItemsTitle,\n      ...headerTemplate,\n      ...entry,\n      hLineTop,\n      totalScoreTable,\n      hLineBottom,\n      ...footerTemplate,\n    ])\n    .catch(err => {\n      throw new Error(`GenerateContentError: ${err.message}`)\n    })\n}\n"],"mappings":"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","ignoreList":[]}

package/lib/pdf/helpers/build-audit-content/index.js

@@ -67,6 +67,13 @@ export var buildAuditContent = Promise.method(function (items) {
           rows.push(commentsRow);
         }
         return rows;
+      }).catch(function (err) {
+        console.log("ERROR FETCHING IMAGE FOR AUDIT CONTENT", {
+          err: err,
+          item: item,
+          assetUrl: item.assetUrl
+        });
+        throw err;
       });
     }).then(function (groupTableRows) {
       var actual = round(group.groupActualScore, 2);

package/lib/pdf/helpers/build-audit-content/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["flatten","isEmpty","round","Promise","fetchImage","fourColumnTable","horizontalLine","imageTables","table","text","LIGHT_BLUE","WHITE","buildAuditContent","method","items","settings","arguments","length","undefined","map","group","item","index","assets","_ref","assetUrl","link","then","base64String","alignment","fit","image","rowImages","rows","fillColor","hasImages","hasComments","comments","label","id","questionId","push","scoreLabel","weight","scoreWeight","imageRow","colSpan","stack","commentsRow","margin","style","groupTableRows","actual","groupActualScore","max","groupMaximumScore","resultText","concat","groupPercentageResultScore","skipped","groupScoreText","bold","headerText","title","groupHeaderTable","body","layout","widths","groupTableHeader","groupTable","headerRows","_toConsumableArray","hLine"],"sources":["../../../../src/pdf/helpers/build-audit-content/index.js"],"sourcesContent":["import { flatten, isEmpty, round } from 'lodash'\nimport Promise from 'bluebird'\n\nimport { fetchImage } from '../../../helpers'\nimport { fourColumnTable, horizontalLine, imageTables, table, text } from '../'\nimport { LIGHT_BLUE, WHITE } from '../table'\n\nexport const buildAuditContent = Promise.method((items, settings = {}) => {\n  return Promise.map(items, group => {\n    return Promise.map(group.items, (item, index) => {\n      return Promise.map(item.assets, ({ assetUrl, link }) => {\n        // NOTE: Signature, Policy and KeyPairId are the only used values from settings in this context\n        return fetchImage(assetUrl, settings).then(base64String => ({\n          alignment: 'center',\n          fit: [210, 210],\n          image: base64String,\n          link,\n        }))\n      }).then(rowImages => {\n        const rows = []\n\n        const fillColor = index % 2 === 0 ? WHITE : LIGHT_BLUE\n        const hasImages = !isEmpty(rowImages)\n        const hasComments = !isEmpty(item.comments)\n\n        // Some audits use questionId to link a follow-up issue and its question\n        const label = { text: item.label, fillColor, id: item.questionId }\n\n        rows.push([\n          label,\n          { text: item.scoreLabel, fillColor },\n          { alignment: 'center', text: item.weight, fillColor },\n          { alignment: 'right', text: item.scoreWeight, fillColor },\n        ])\n\n        if (hasImages) {\n          const imageRow = [\n            {\n              colSpan: 4,\n              fillColor,\n              stack: imageTables(rowImages),\n            },\n          ]\n\n          rows.push(imageRow)\n        }\n\n        if (hasComments) {\n          const commentsRow = [\n            {\n              colSpan: 4,\n              fillColor,\n              margin: [0, -10, 0, 0],\n              stack: [\n                { text: 'Comments:', style: 'commentsHeader' },\n                { text: item.comments },\n              ],\n            },\n          ]\n\n          rows.push(commentsRow)\n        }\n\n        return rows\n      })\n    }).then(groupTableRows => {\n      const actual = round(group.groupActualScore, 2)\n      const max = round(group.groupMaximumScore, 2)\n      const resultText = `${group.groupPercentageResultScore}%`\n\n      const { skipped } = group\n\n      const groupScoreText = skipped\n        ? null\n        : text(`${actual} / ${max} (${resultText})`, {\n            alignment: 'right',\n            bold: true,\n          })\n      const headerText = text(group.title)\n\n      const groupHeaderTable = table({\n        body: [[headerText, groupScoreText]],\n        layout: 'noBorders',\n        style: 'groupHeaderTable',\n        widths: ['*', '*'],\n      })\n\n      const groupTableHeader = [\n        text('Question', { bold: true }),\n        text('Answer', { bold: true }),\n        text('Weight', { alignment: 'center', bold: true }),\n        text('Score', { alignment: 'right', bold: true }),\n      ]\n\n      const groupTable = fourColumnTable({\n        headerRows: 0,\n        // NOTE: must flatten here as we have arrays of rows\n        body: [groupTableHeader, ...flatten(groupTableRows)],\n        widths: ['60%', '24%', '8%', '8%'],\n      })\n\n      const hLine = horizontalLine()\n\n      return [groupHeaderTable, hLine, groupTable]\n    })\n  })\n})\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"index.js","names":["flatten","isEmpty","round","Promise","fetchImage","fourColumnTable","horizontalLine","imageTables","table","text","LIGHT_BLUE","WHITE","buildAuditContent","method","items","settings","arguments","length","undefined","map","group","item","index","assets","_ref","assetUrl","link","then","base64String","alignment","fit","image","rowImages","rows","fillColor","hasImages","hasComments","comments","label","id","questionId","push","scoreLabel","weight","scoreWeight","imageRow","colSpan","stack","commentsRow","margin","style","catch","err","console","log","groupTableRows","actual","groupActualScore","max","groupMaximumScore","resultText","concat","groupPercentageResultScore","skipped","groupScoreText","bold","headerText","title","groupHeaderTable","body","layout","widths","groupTableHeader","groupTable","headerRows","_toConsumableArray","hLine"],"sources":["../../../../src/pdf/helpers/build-audit-content/index.js"],"sourcesContent":["import { flatten, isEmpty, round } from 'lodash'\nimport Promise from 'bluebird'\n\nimport { fetchImage } from '../../../helpers'\nimport { fourColumnTable, horizontalLine, imageTables, table, text } from '../'\nimport { LIGHT_BLUE, WHITE } from '../table'\n\nexport const buildAuditContent = Promise.method((items, settings = {}) => {\n  return Promise.map(items, group => {\n    return Promise.map(group.items, (item, index) => {\n      return Promise.map(item.assets, ({ assetUrl, link }) => {\n        // NOTE: Signature, Policy and KeyPairId are the only used values from settings in this context\n        return fetchImage(assetUrl, settings).then(base64String => ({\n          alignment: 'center',\n          fit: [210, 210],\n          image: base64String,\n          link,\n        }))\n      }).then(rowImages => {\n        const rows = []\n\n        const fillColor = index % 2 === 0 ? WHITE : LIGHT_BLUE\n        const hasImages = !isEmpty(rowImages)\n        const hasComments = !isEmpty(item.comments)\n\n        // Some audits use questionId to link a follow-up issue and its question\n        const label = { text: item.label, fillColor, id: item.questionId }\n\n        rows.push([\n          label,\n          { text: item.scoreLabel, fillColor },\n          { alignment: 'center', text: item.weight, fillColor },\n          { alignment: 'right', text: item.scoreWeight, fillColor },\n        ])\n\n        if (hasImages) {\n          const imageRow = [\n            {\n              colSpan: 4,\n              fillColor,\n              stack: imageTables(rowImages),\n            },\n          ]\n\n          rows.push(imageRow)\n        }\n\n        if (hasComments) {\n          const commentsRow = [\n            {\n              colSpan: 4,\n              fillColor,\n              margin: [0, -10, 0, 0],\n              stack: [\n                { text: 'Comments:', style: 'commentsHeader' },\n                { text: item.comments },\n              ],\n            },\n          ]\n\n          rows.push(commentsRow)\n        }\n\n        return rows\n      }).catch(err=> {\n          console.log(\"ERROR FETCHING IMAGE FOR AUDIT CONTENT\", {err, item, assetUrl: item.assetUrl})\n          throw err\n        })\n    }).then(groupTableRows => {\n      const actual = round(group.groupActualScore, 2)\n      const max = round(group.groupMaximumScore, 2)\n      const resultText = `${group.groupPercentageResultScore}%`\n\n      const { skipped } = group\n\n      const groupScoreText = skipped\n        ? null\n        : text(`${actual} / ${max} (${resultText})`, {\n            alignment: 'right',\n            bold: true,\n          })\n      const headerText = text(group.title)\n\n      const groupHeaderTable = table({\n        body: [[headerText, groupScoreText]],\n        layout: 'noBorders',\n        style: 'groupHeaderTable',\n        widths: ['*', '*'],\n      })\n\n      const groupTableHeader = [\n        text('Question', { bold: true }),\n        text('Answer', { bold: true }),\n        text('Weight', { alignment: 'center', bold: true }),\n        text('Score', { alignment: 'right', bold: true }),\n      ]\n\n      const groupTable = fourColumnTable({\n        headerRows: 0,\n        // NOTE: must flatten here as we have arrays of rows\n        body: [groupTableHeader, ...flatten(groupTableRows)],\n        widths: ['60%', '24%', '8%', '8%'],\n      })\n\n      const hLine = horizontalLine()\n\n      return [groupHeaderTable, hLine, groupTable]\n    })\n  })\n})\n"],"mappings":"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","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lighthouse/common",
-  "version": "6.2.0-canary.4",
+  "version": "6.2.0-canary.40",
   "description": "",
   "main": "dist/index.js",
   "module": "lib/index.js",
@@ -17,16 +17,17 @@
     "precommit": "lint-staged",
     "prepublishOnly": "yarn build",
     "preversion": "yarn test",
-    "storybook:html": "start-storybook -p 9001 -c .storybook-html -s ./src",
-    "storybook:react": "start-storybook -p 9002 -c .storybook-react -s ./src",
+    "storybook:html": "sb dev -p 9001 -c .storybook-html",
+    "storybook:react": "sb dev -p 9002 -c .storybook-react",
+    "build-storybook:html": "sb build -c .storybook-html",
+    "build-storybook:react": "sb build -c .storybook-react",
     "test": "TZ=UTC vitest run",
+    "test:watch": "TZ=UTC vitest watch",
     "test:ci": "yarn lint && yarn type-check && yarn test --coverage",
     "type-check": "tsc --noEmit",
     "type-check:watch": "yarn type-check --watch",
     "validate:circleci": "circleci config validate -c .circleci/config.yml",
-    "version": "yarn build",
-    "watch:es": "nodemon --watch src --ext js,ts --exec \"yarn build:es\"",
-    "watch:node": "nodemon --watch src --ext js,ts --exec \"yarn build:node\""
+    "version": "yarn build"
   },
   "repository": {
     "type": "git",
@@ -55,11 +56,13 @@
     "@babel/preset-env": "^7.12.1",
     "@babel/preset-react": "^7.8.3",
     "@babel/preset-typescript": "^7.8.3",
-    "@storybook/addon-actions": "^5.3.14",
-    "@storybook/addon-knobs": "^5.3.14",
-    "@storybook/addon-notes": "^5.3.14",
-    "@storybook/html": "^5.3.14",
-    "@storybook/react": "^5.3.14",
+    "@storybook/addon-actions": "^7.6.20",
+    "@storybook/addon-essentials": "^7.6.20",
+    "@storybook/cli": "^7.6.20",
+    "@storybook/html": "^7.6.20",
+    "@storybook/html-webpack5": "^7.6.20",
+    "@storybook/react": "^7.6.20",
+    "@storybook/react-webpack5": "^7.6.20",
     "@types/lodash": "^4.14.149",
     "@types/node": "^12.7.5",
     "@types/yup": "^0.26.32",
@@ -72,8 +75,9 @@
     "lint-staged": "^15.2.0",
     "mockdate": "^2.0.2",
     "nock": "^12.0.2",
-    "nodemon": "^3.0.0",
     "prettier": "^3.3.0",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
     "react-visjs-timeline": "^1.6.0",
     "rimraf": "^2.6.3",
     "typescript": "^3.8.3",