@lighthouse/common 6.9.5 → 6.9.7-canary.0

package/dist/errors/FetchImageError.js

@@ -0,0 +1,19 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.FetchImageError = void 0;
+/**
+ * Custom error class for image fetching operations
+ * Includes context information for better debugging
+ */
+class FetchImageError extends Error {
+  constructor(message, context = {}) {
+    super(message);
+    this.name = 'FetchImageError';
+    this.context = context;
+    this.url = context.url;
+  }
+}
+exports.FetchImageError = FetchImageError;

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

@@ -4,7 +4,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.buildFetchUrl = buildFetchUrl;
+var _index = require("../validate-url/index.js");
 function buildFetchUrl(url, options) {
+  // Validate url parameter
+  if (!url || typeof url !== 'string') {
+    throw new Error(`buildFetchUrl: Invalid url parameter. url=${JSON.stringify(url)}`);
+  }
   const {
     awsS3BaseUrl,
     cloudfrontBaseUrl = '',
@@ -19,6 +24,10 @@ function buildFetchUrl(url, options) {
     Signature
   } = options;
   if (shouldUseCloudfront) {
+    // Validate cloudfrontBaseUrl when using CloudFront
+    if (!cloudfrontBaseUrl) {
+      throw new Error(`buildFetchUrl: cloudfrontBaseUrl is required when shouldUseCloudfront=true. cloudfrontBaseUrl=${JSON.stringify(cloudfrontBaseUrl)}`);
+    }
     const isWebContext = shouldUseCloudfront && typeof window === 'object';
     const paramMap = {
       width,
@@ -33,7 +42,18 @@ function buildFetchUrl(url, options) {
     }
     const params = Object.entries(paramMap).filter(([, value]) => value != null).map(([key, value]) => `${key}=${String(value)}`);
     const paramsString = params.join('&');
-    return `${cloudfrontBaseUrl}/${url}?${paramsString}`;
+    const result = `${cloudfrontBaseUrl}/${url}?${paramsString}`;
+
+    // Validate output is absolute URL
+    if (!(0, _index.isAbsoluteUrl)(result)) {
+      throw new Error(`buildFetchUrl: Constructed URL is not absolute. cloudfrontBaseUrl=${JSON.stringify(cloudfrontBaseUrl)}, url=${JSON.stringify(url)}, result=${JSON.stringify(result)}`);
+    }
+    return result;
+  }
+
+  // Validate required base URLs for Cloudinary path
+  if (!cloudinaryBaseUrl || !awsS3BaseUrl) {
+    throw new Error(`buildFetchUrl: cloudinaryBaseUrl and awsS3BaseUrl are required. cloudinaryBaseUrl=${JSON.stringify(cloudinaryBaseUrl)}, awsS3BaseUrl=${JSON.stringify(awsS3BaseUrl)}`);
   }
   const transformations = [];
   let transformationsString = '';
@@ -43,5 +63,10 @@ function buildFetchUrl(url, options) {
   if (fit) transformations.push('c_fit');
   transformationsString = `${transformations.join(',')}/`;
   const fetchUrl = `${cloudinaryBaseUrl}/${transformationsString}${awsS3BaseUrl}/${url}`;
+
+  // Validate output is absolute URL
+  if (!(0, _index.isAbsoluteUrl)(fetchUrl)) {
+    throw new Error(`buildFetchUrl: Constructed URL is not absolute. cloudinaryBaseUrl=${JSON.stringify(cloudinaryBaseUrl)}, awsS3BaseUrl=${JSON.stringify(awsS3BaseUrl)}, url=${JSON.stringify(url)}, result=${JSON.stringify(fetchUrl)}`);
+  }
   return fetchUrl;
 }

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

@@ -15,6 +15,7 @@ var _constants = require("../../constants");
 var _images = require("../../images");
 var _fetchImageForPdfGeneratorService = require("../fetch-image-for-pdf-generator-service");
 var _fetchImageForWeb = require("../fetch-image-for-web");
+var _index = require("../validate-url/index.js");
 // NOTE use the native fetch if it's available in the browser, because the
 // ponyfill (which actually uses the github polyfill) does not support all the
 // same options as native fetch
@@ -37,8 +38,29 @@ const defaultOptions = {
 };
 function fetchImage(url, options = {}) {
   const {
-    shouldUseCloudfront
+    shouldUseCloudfront,
+    isHeader = false,
+    context = {}
   } = options;
+
+  // Validate url parameter
+  if (!url || typeof url !== 'string') {
+    const error = new Error(`fetchImage: Invalid url parameter. url=${JSON.stringify(url)}`);
+    if (isHeader) {
+      console.error('FetchImageHeaderError', {
+        message: error.message,
+        url,
+        context
+      });
+      return fetchImage(_constants.LIGHTHOUSE_LOGO_URL, defaultOptions);
+    }
+    console.error('FetchImageError', {
+      message: error.message,
+      url,
+      context
+    });
+    return _bluebird.default.resolve(_images.imageNotFound);
+  }
   if (shouldUseCloudfront) {
     const isWebContext = typeof window === 'object';
     return isWebContext ?
@@ -50,9 +72,6 @@ function fetchImage(url, options = {}) {
     ...defaultOptions,
     ...options
   };
-  const {
-    isHeader = false
-  } = options;
   return fetch(encodedUrl, fetchOptions).then(response => {
     const contentHeader = response.headers.get('content-length');
     const contentType = response.headers.get('content-type');
@@ -60,10 +79,10 @@ function fetchImage(url, options = {}) {
     // NOTE: the response will be ok but we won't be able to render any
     // image meaning pdfmake will error. Raise error here and return early.
     if (contentHeader === '0') {
-      return _bluebird.default.reject(new Error(`Failed to fetch image as no content length: ${encodedUrl}`));
+      return _bluebird.default.reject(new Error(`Failed to fetch image as no content length: ${url}`));
     }
     if (!response.ok) {
-      return _bluebird.default.reject(new Error(`Failed to fetch image: ${encodedUrl}`));
+      return _bluebird.default.reject(new Error(`Failed to fetch image: ${url}`));
     }
     const imageType = contentTypes[contentType];
     return response.arrayBuffer().then(buffer => ({
@@ -85,10 +104,20 @@ function fetchImage(url, options = {}) {
   }).catch(error => {
     if (isHeader) {
       // NOTE: Replace failed headers with LH logo
-      console.error('FetchImageHeaderError', error);
+      console.error('FetchImageHeaderError', {
+        url,
+        message: error.message,
+        context,
+        stack: error.stack
+      });
       return fetchImage(_constants.LIGHTHOUSE_LOGO_URL, defaultOptions);
     }
-    console.error(error);
+    console.error('FetchImageError', {
+      url,
+      message: error.message,
+      context,
+      stack: error.stack
+    });
     return _images.imageNotFound;
   });
 }

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

@@ -48,6 +48,7 @@ const fetchImageForPdfGeneratorService = async function (url) {
   }
   const transformerResponse = await requestImageTransformation(`/${path}`, searchParamsObject);
   const statusCode = transformerResponse.statusCode;
+  const redirectLocation = transformerResponse.headers?.Location;
   switch (statusCode) {
     case 200:
       {
@@ -60,21 +61,24 @@ const fetchImageForPdfGeneratorService = async function (url) {
       }
     case 302:
       {
-        console.debug('Image transformation successful but image is too big for lambda delivery, fetching directly from S3');
-        const redirectLocation = transformerResponse.headers.Location;
+        console.debug('Image transformation successful but image is too big for lambda delivery, fetching directly via redirect URL');
         if (!redirectLocation) {
           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'),
+        let response;
+        try {
+          response = await fetch(redirectLocation);
+        } catch (error) {
+          throw new Error(`Failed to fetch image from redirect URL: ${error.message}`);
+        }
+        if (!response.ok) {
+          throw new Error(`Failed to fetch image from redirect: ${response.status}`);
+        }
+        const buffer = Buffer.from(await response.arrayBuffer());
+        return formatBase64Image({
+          base64String: buffer.toString('base64'),
           key: transformedBucketImagePath
         });
-        return fullDataUrl;
       }
     case 400:
       throw new Error(`Bad request to image transformer: ${transformerResponse.body}`);

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

@@ -6,13 +6,34 @@ Object.defineProperty(exports, "__esModule", {
 exports.fetchImageForWeb = void 0;
 var _images = require("../../images");
 var _fetchLighthouseLogo = require("../fetch-lighthouse-logo");
+var _index = require("../validate-url/index.js");
 const fetchImageForWeb = async function (url, options) {
   const {
     isHeader = false,
     Signature,
     Policy,
-    KeyPairId
+    KeyPairId,
+    context = {}
   } = options;
+
+  // Validate url parameter
+  if (!url || typeof url !== 'string') {
+    const error = new Error(`fetchImageForWeb: Invalid url parameter. url=${JSON.stringify(url)}`);
+    if (isHeader) {
+      console.error('FetchImageHeaderError', {
+        message: error.message,
+        url,
+        context
+      });
+      return (0, _fetchLighthouseLogo.fetchLighthouseLogo)();
+    }
+    console.error('FetchImageError', {
+      message: error.message,
+      url,
+      context
+    });
+    return _images.imageNotFound;
+  }
   try {
     const firstParamConnector = url.indexOf('?') > -1 ? '&' : '?';
     const hasSignatureParams = url.includes('Signature=') && url.includes('Policy=') && url.includes('Key-Pair-Id=');
@@ -21,19 +42,29 @@ const fetchImageForWeb = async function (url, options) {
     const imageResponse = await fetch(constructedUrl);
     const contentLengthHeader = imageResponse.headers.get('content-length');
     if (contentLengthHeader === '0') {
-      return Promise.reject(new Error(`Failed to fetch image as no content length: ${encodedUrl}`));
+      return Promise.reject(new Error(`Failed to fetch image as no content length: ${url}`));
     }
     if (!imageResponse.ok) {
-      return Promise.reject(new Error(`Failed to fetch image: ${encodedUrl}`));
+      return Promise.reject(new Error(`Failed to fetch image: ${url}`));
     }
     return await imageResponse.arrayBuffer();
   } catch (error) {
     if (isHeader) {
       // NOTE: Replace failed headers with LH logo
-      console.error('FetchImageHeaderError', error);
+      console.error('FetchImageHeaderError', {
+        url,
+        message: error.message,
+        context,
+        stack: error.stack
+      });
       return (0, _fetchLighthouseLogo.fetchLighthouseLogo)();
     }
-    console.error(error);
+    console.error('FetchImageError', {
+      url,
+      message: error.message,
+      context,
+      stack: error.stack
+    });
     return _images.imageNotFound;
   }
 };

package/dist/helpers/validate-url/index.js

@@ -0,0 +1,15 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.isAbsoluteUrl = isAbsoluteUrl;
+/**
+ * Checks if a URL is absolute (starts with http:// or https://)
+ * @param {string} url - The URL to validate
+ * @returns {boolean} - True if URL is absolute, false otherwise
+ */
+function isAbsoluteUrl(url) {
+  if (!url || typeof url !== 'string') return false;
+  return url.startsWith('http://') || url.startsWith('https://');
+}

package/dist/pdf/helpers/default-header/index.js

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.defaultHeader = defaultHeader;
 var _helpers = require("../../../helpers");
+var _constants = require("../../../constants");
+var _index = require("../../../helpers/validate-url/index.js");
 function defaultHeader({
   Signature,
   Policy,
@@ -19,7 +21,15 @@ function defaultHeader({
     timestamp,
     timezone
   });
-  return (0, _helpers.fetchImage)(logoUrl, {
+
+  // Validate logoUrl and use fallback if invalid
+  const effectiveLogoUrl = (0, _index.isAbsoluteUrl)(logoUrl) ? logoUrl : _constants.LIGHTHOUSE_LOGO_URL;
+  if (!(0, _index.isAbsoluteUrl)(logoUrl)) {
+    console.warn('defaultHeader: Invalid logoUrl, using Lighthouse logo', {
+      providedLogoUrl: logoUrl
+    });
+  }
+  return (0, _helpers.fetchImage)(effectiveLogoUrl, {
     Signature,
     Policy,
     KeyPairId,

package/dist/pdf/helpers/fields/index.js

@@ -41,7 +41,9 @@ function buildImage(options) {
     height = 210,
     settings = {},
     signedAsset,
-    width = 210
+    width = 210,
+    fieldLabel,
+    fieldType = 'image'
   } = options;
   const {
     awsS3BaseUrl,
@@ -71,7 +73,15 @@ function buildImage(options) {
   });
 
   // NOTE: shouldUseCloudfront, Signature, Policy and KeyPairId from settings are used in this context
-  return (0, _helpers.fetchImage)(url, settings).then(base64String => ({
+  return (0, _helpers.fetchImage)(url, {
+    ...settings,
+    context: {
+      stage: 'field',
+      fieldLabel,
+      fieldType,
+      filepath
+    }
+  }).then(base64String => ({
     alignment,
     fit: [width, height],
     image: base64String,
@@ -121,7 +131,14 @@ function buildSummaryField({
       };
     }
     // NOTE: shouldUseCloudfront, Signature, Policy and KeyPairId from settings are used in this context
-    return (0, _helpers.fetchImage)(value, settings).then(base64String => {
+    return (0, _helpers.fetchImage)(value, {
+      ...settings,
+      context: {
+        stage: 'field',
+        fieldLabel: field.label,
+        fieldType: 'signature'
+      }
+    }).then(base64String => {
       return {
         alignment: 'left',
         image: base64String,
@@ -145,7 +162,9 @@ function buildSummaryField({
       height: 140,
       width: 140,
       settings,
-      signedAsset: signedAssets && (0, _lodash.isArray)(signedAssets) ? signedAssets[0] : null
+      signedAsset: signedAssets && (0, _lodash.isArray)(signedAssets) ? signedAssets[0] : null,
+      fieldLabel: field.label,
+      fieldType: 'media'
     });
     return image;
   }
@@ -244,7 +263,14 @@ function buildTemplateFieldRow({
   if (isSignatureField) {
     if (!value) return [labelText, ''];
     // NOTE: shouldUseCloudfront, Signature, Policy and KeyPairId from settings are used in this context
-    return (0, _helpers.fetchImage)(value, settings).then(base64String => {
+    return (0, _helpers.fetchImage)(value, {
+      ...settings,
+      context: {
+        stage: 'field',
+        fieldLabel: label,
+        fieldType: 'signature'
+      }
+    }).then(base64String => {
       const values = {
         alignment: 'left',
         image: base64String,
@@ -254,22 +280,39 @@ function buildTemplateFieldRow({
     });
   }
   if (isDisplayImageField) {
-    return _bluebird.default.map([value], (filepath, index) => {
+    // Guard against nullish values
+    if (!value) {
+      return [[], {}];
+    }
+
+    // Ensure value is always treated as an array of filepaths
+    const filepaths = (0, _lodash.isArray)(value) ? value : [value];
+    return _bluebird.default.map(filepaths, (filepath, index) => {
       const signedAssetValue = (0, _lodash.isArray)(signedAssets) ? signedAssets[index] : signedAssets;
       return buildImage({
         filepath,
         settings,
-        signedAsset: signedAssetValue
+        signedAsset: signedAssetValue,
+        fieldLabel: label,
+        fieldType: 'image-display'
       });
     }).then(fieldImages => [fieldImages, {}]);
   }
   if (isPhotoField) {
+    // Guard against nullish values
+    if (!value || (0, _lodash.isArray)(value) && value.length === 0) {
+      return [labelText, {
+        text: ''
+      }];
+    }
     return _bluebird.default.map(value, (filepath, index) => {
       const signedAssetValue = (0, _lodash.isArray)(signedAssets) ? signedAssets[index] : signedAssets;
       return buildImage({
         filepath,
         settings,
-        signedAsset: signedAssetValue
+        signedAsset: signedAssetValue,
+        fieldLabel: label,
+        fieldType: 'media'
       });
     }).then(fieldImages => {
       const tables = !(0, _lodash.isEmpty)(fieldImages) ? (0, _.imageTables)(fieldImages) : [];

package/dist/pdf/helpers/generate-definition/index.js

@@ -52,8 +52,16 @@ function generateDefinition(options) {
     pageOrientation,
     pageSize,
     styles: pdfStyles
-  })).catch(err => {
-    throw new Error(`GenerateDefinitionError: ${err.message}`);
+  })).catch(error => {
+    // Preserve structured error information for better debugging
+    console.error('GenerateDefinitionError', {
+      message: error.message,
+      context: error.context,
+      url: error.url,
+      type: options.type,
+      stack: error.stack
+    });
+    throw error; // Preserve original error instead of wrapping
   });
 }
 function pdfHeader(header) {

package/lib/errors/FetchImageError.js

@@ -0,0 +1,27 @@
+import _createClass from "@babel/runtime/helpers/createClass";
+import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
+import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
+import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
+import _inherits from "@babel/runtime/helpers/inherits";
+import _wrapNativeSuper from "@babel/runtime/helpers/wrapNativeSuper";
+function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
+function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
+/**
+ * Custom error class for image fetching operations
+ * Includes context information for better debugging
+ */
+export var FetchImageError = /*#__PURE__*/function (_Error) {
+  function FetchImageError(message) {
+    var _this;
+    var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+    _classCallCheck(this, FetchImageError);
+    _this = _callSuper(this, FetchImageError, [message]);
+    _this.name = 'FetchImageError';
+    _this.context = context;
+    _this.url = context.url;
+    return _this;
+  }
+  _inherits(FetchImageError, _Error);
+  return _createClass(FetchImageError);
+}(/*#__PURE__*/_wrapNativeSuper(Error));
+//# sourceMappingURL=FetchImageError.js.map

package/lib/errors/FetchImageError.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"FetchImageError.js","names":["FetchImageError","_Error","message","_this","context","arguments","length","undefined","_classCallCheck","_callSuper","name","url","_inherits","_createClass","_wrapNativeSuper","Error"],"sources":["../../src/errors/FetchImageError.js"],"sourcesContent":["/**\n * Custom error class for image fetching operations\n * Includes context information for better debugging\n */\nexport class FetchImageError extends Error {\n  constructor(message, context = {}) {\n    super(message)\n    this.name = 'FetchImageError'\n    this.context = context\n    this.url = context.url\n  }\n}\n"],"mappings":";;;;;;;;AAAA;AACA;AACA;AACA;AACA,WAAaA,eAAe,0BAAAC,MAAA;EAC1B,SAAAD,gBAAYE,OAAO,EAAgB;IAAA,IAAAC,KAAA;IAAA,IAAdC,OAAO,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,CAAC,CAAC;IAAAG,eAAA,OAAAR,eAAA;IAC/BG,KAAA,GAAAM,UAAA,OAAAT,eAAA,GAAME,OAAO;IACbC,KAAA,CAAKO,IAAI,GAAG,iBAAiB;IAC7BP,KAAA,CAAKC,OAAO,GAAGA,OAAO;IACtBD,KAAA,CAAKQ,GAAG,GAAGP,OAAO,CAACO,GAAG;IAAA,OAAAR,KAAA;EACxB;EAACS,SAAA,CAAAZ,eAAA,EAAAC,MAAA;EAAA,OAAAY,YAAA,CAAAb,eAAA;AAAA,eAAAc,gBAAA,CANkCC,KAAK","ignoreList":[]}

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

@@ -1,6 +1,11 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _typeof from "@babel/runtime/helpers/typeof";
+import { isAbsoluteUrl } from '../validate-url/index.js';
 export function buildFetchUrl(url, options) {
+  // Validate url parameter
+  if (!url || typeof url !== 'string') {
+    throw new Error("buildFetchUrl: Invalid url parameter. url=".concat(JSON.stringify(url)));
+  }
   var awsS3BaseUrl = options.awsS3BaseUrl,
     _options$cloudfrontBa = options.cloudfrontBaseUrl,
     cloudfrontBaseUrl = _options$cloudfrontBa === void 0 ? '' : _options$cloudfrontBa,
@@ -14,6 +19,10 @@ export function buildFetchUrl(url, options) {
     KeyPairId = options.KeyPairId,
     Signature = options.Signature;
   if (shouldUseCloudfront) {
+    // Validate cloudfrontBaseUrl when using CloudFront
+    if (!cloudfrontBaseUrl) {
+      throw new Error("buildFetchUrl: cloudfrontBaseUrl is required when shouldUseCloudfront=true. cloudfrontBaseUrl=".concat(JSON.stringify(cloudfrontBaseUrl)));
+    }
     var isWebContext = shouldUseCloudfront && (typeof window === "undefined" ? "undefined" : _typeof(window)) === 'object';
     var paramMap = {
       width: width,
@@ -37,7 +46,18 @@ export function buildFetchUrl(url, options) {
       return "".concat(key, "=").concat(String(value));
     });
     var paramsString = params.join('&');
-    return "".concat(cloudfrontBaseUrl, "/").concat(url, "?").concat(paramsString);
+    var result = "".concat(cloudfrontBaseUrl, "/").concat(url, "?").concat(paramsString);
+
+    // Validate output is absolute URL
+    if (!isAbsoluteUrl(result)) {
+      throw new Error("buildFetchUrl: Constructed URL is not absolute. cloudfrontBaseUrl=".concat(JSON.stringify(cloudfrontBaseUrl), ", url=").concat(JSON.stringify(url), ", result=").concat(JSON.stringify(result)));
+    }
+    return result;
+  }
+
+  // Validate required base URLs for Cloudinary path
+  if (!cloudinaryBaseUrl || !awsS3BaseUrl) {
+    throw new Error("buildFetchUrl: cloudinaryBaseUrl and awsS3BaseUrl are required. cloudinaryBaseUrl=".concat(JSON.stringify(cloudinaryBaseUrl), ", awsS3BaseUrl=").concat(JSON.stringify(awsS3BaseUrl)));
   }
   var transformations = [];
   var transformationsString = '';
@@ -47,6 +67,11 @@ export function buildFetchUrl(url, options) {
   if (fit) transformations.push('c_fit');
   transformationsString = "".concat(transformations.join(','), "/");
   var fetchUrl = "".concat(cloudinaryBaseUrl, "/").concat(transformationsString).concat(awsS3BaseUrl, "/").concat(url);
+
+  // Validate output is absolute URL
+  if (!isAbsoluteUrl(fetchUrl)) {
+    throw new Error("buildFetchUrl: Constructed URL is not absolute. cloudinaryBaseUrl=".concat(JSON.stringify(cloudinaryBaseUrl), ", awsS3BaseUrl=").concat(JSON.stringify(awsS3BaseUrl), ", url=").concat(JSON.stringify(url), ", result=").concat(JSON.stringify(fetchUrl)));
+  }
   return fetchUrl;
 }
 //# sourceMappingURL=index.js.map

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","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":[]}
+{"version":3,"file":"index.js","names":["isAbsoluteUrl","buildFetchUrl","url","options","Error","concat","JSON","stringify","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","String","paramsString","join","result","transformations","transformationsString","push","toString","fetchUrl"],"sources":["../../../src/helpers/build-fetch-url/index.js"],"sourcesContent":["import { isAbsoluteUrl } from '../validate-url/index.js'\n\nexport function buildFetchUrl(url, options) {\n  // Validate url parameter\n  if (!url || typeof url !== 'string') {\n    throw new Error(\n      `buildFetchUrl: Invalid url parameter. url=${JSON.stringify(url)}`\n    )\n  }\n\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    // Validate cloudfrontBaseUrl when using CloudFront\n    if (!cloudfrontBaseUrl) {\n      throw new Error(\n        `buildFetchUrl: cloudfrontBaseUrl is required when shouldUseCloudfront=true. cloudfrontBaseUrl=${JSON.stringify(cloudfrontBaseUrl)}`\n      )\n    }\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    const result = `${cloudfrontBaseUrl}/${url}?${paramsString}`\n\n    // Validate output is absolute URL\n    if (!isAbsoluteUrl(result)) {\n      throw new Error(\n        `buildFetchUrl: Constructed URL is not absolute. cloudfrontBaseUrl=${JSON.stringify(cloudfrontBaseUrl)}, url=${JSON.stringify(url)}, result=${JSON.stringify(result)}`\n      )\n    }\n\n    return result\n  }\n\n  // Validate required base URLs for Cloudinary path\n  if (!cloudinaryBaseUrl || !awsS3BaseUrl) {\n    throw new Error(\n      `buildFetchUrl: cloudinaryBaseUrl and awsS3BaseUrl are required. cloudinaryBaseUrl=${JSON.stringify(cloudinaryBaseUrl)}, awsS3BaseUrl=${JSON.stringify(awsS3BaseUrl)}`\n    )\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  // Validate output is absolute URL\n  if (!isAbsoluteUrl(fetchUrl)) {\n    throw new Error(\n      `buildFetchUrl: Constructed URL is not absolute. cloudinaryBaseUrl=${JSON.stringify(cloudinaryBaseUrl)}, awsS3BaseUrl=${JSON.stringify(awsS3BaseUrl)}, url=${JSON.stringify(url)}, result=${JSON.stringify(fetchUrl)}`\n    )\n  }\n\n  return fetchUrl\n}\n"],"mappings":"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","ignoreList":[]}

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

@@ -8,6 +8,7 @@ import { LIGHTHOUSE_LOGO_URL } from '../../constants';
 import { imageNotFound } from '../../images';
 import { fetchImageForPdfGeneratorService } from '../fetch-image-for-pdf-generator-service';
 import { fetchImageForWeb } from '../fetch-image-for-web';
+import { isAbsoluteUrl } from '../validate-url/index.js';
 
 // NOTE use the native fetch if it's available in the browser, because the
 // ponyfill (which actually uses the github polyfill) does not support all the
@@ -31,7 +32,30 @@ var defaultOptions = {
 };
 export function fetchImage(url) {
   var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  var shouldUseCloudfront = options.shouldUseCloudfront;
+  var shouldUseCloudfront = options.shouldUseCloudfront,
+    _options$isHeader = options.isHeader,
+    isHeader = _options$isHeader === void 0 ? false : _options$isHeader,
+    _options$context = options.context,
+    context = _options$context === void 0 ? {} : _options$context;
+
+  // Validate url parameter
+  if (!url || typeof url !== 'string') {
+    var error = new Error("fetchImage: Invalid url parameter. url=".concat(JSON.stringify(url)));
+    if (isHeader) {
+      console.error('FetchImageHeaderError', {
+        message: error.message,
+        url: url,
+        context: context
+      });
+      return fetchImage(LIGHTHOUSE_LOGO_URL, defaultOptions);
+    }
+    console.error('FetchImageError', {
+      message: error.message,
+      url: url,
+      context: context
+    });
+    return Promise.resolve(imageNotFound);
+  }
   if (shouldUseCloudfront) {
     var isWebContext = (typeof window === "undefined" ? "undefined" : _typeof(window)) === 'object';
     return isWebContext ?
@@ -40,8 +64,6 @@ export function fetchImage(url) {
   }
   var encodedUrl = encodeURI(url);
   var fetchOptions = _objectSpread(_objectSpread({}, defaultOptions), options);
-  var _options$isHeader = options.isHeader,
-    isHeader = _options$isHeader === void 0 ? false : _options$isHeader;
   return fetch(encodedUrl, fetchOptions).then(function (response) {
     var contentHeader = response.headers.get('content-length');
     var contentType = response.headers.get('content-type');
@@ -49,10 +71,10 @@ export function fetchImage(url) {
     // NOTE: the response will be ok but we won't be able to render any
     // image meaning pdfmake will error. Raise error here and return early.
     if (contentHeader === '0') {
-      return Promise.reject(new Error("Failed to fetch image as no content length: ".concat(encodedUrl)));
+      return Promise.reject(new Error("Failed to fetch image as no content length: ".concat(url)));
     }
     if (!response.ok) {
-      return Promise.reject(new Error("Failed to fetch image: ".concat(encodedUrl)));
+      return Promise.reject(new Error("Failed to fetch image: ".concat(url)));
     }
     var imageType = contentTypes[contentType];
     return response.arrayBuffer().then(function (buffer) {
@@ -75,10 +97,20 @@ export function fetchImage(url) {
   }).catch(function (error) {
     if (isHeader) {
       // NOTE: Replace failed headers with LH logo
-      console.error('FetchImageHeaderError', error);
+      console.error('FetchImageHeaderError', {
+        url: url,
+        message: error.message,
+        context: context,
+        stack: error.stack
+      });
       return fetchImage(LIGHTHOUSE_LOGO_URL, defaultOptions);
     }
-    console.error(error);
+    console.error('FetchImageError', {
+      url: url,
+      message: error.message,
+      context: context,
+      stack: error.stack
+    });
     return imageNotFound;
   });
 }