@lighthouse/common 6.2.0-canary.7 → 6.2.0-canary.9

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

@@ -27,13 +27,10 @@ const fetchImageForPdfGeneratorService = async function (url) {
   if (!applicationId) {
     throw new Error('Requestor has insufficient permissions');
   }
-  const {
-    path,
-    queryParams
-  } = parseUrlString(url);
+  const keyWithTransformations = url.substring(url.indexOf(applicationId));
   const alreadyTransformedImage = await fetchResourceFromS3({
     bucketName: `${process.env.S3_BUCKET_IMAGE_TRANSFORMER_CACHE}`,
-    key: `${path}/${queryParams}`
+    key: keyWithTransformations
   });
   if (alreadyTransformedImage?.body) {
     const fullDataUrl = formatBase64Image({
@@ -42,7 +39,7 @@ const fetchImageForPdfGeneratorService = async function (url) {
     });
     return fullDataUrl;
   }
-  const transformerResponse = await requestImageTransformation(url);
+  const transformerResponse = await requestImageTransformation(keyWithTransformations);
   const statusCode = transformerResponse.statusCode;
   switch (statusCode) {
     case 200:
@@ -85,27 +82,60 @@ const fetchImageForPdfGeneratorService = async function (url) {
   }
 };
 exports.fetchImageForPdfGeneratorService = fetchImageForPdfGeneratorService;
-async function requestImageTransformation(key) {
-  if (!key) {
-    throw new Error('Image Path is required for image transformation');
+async function requestImageTransformation(url) {
+  if (!url) {
+    throw new Error('Image URL is required for image transformation');
+  }
+  console.debug('ImageTransformation: Invoking image transformer lambda for URL:', url);
+
+  // Parse the URL to extract path and query parameters
+  const {
+    path,
+    queryParams
+  } = parseUrlString(url);
+
+  // Convert comma-separated params back to ampersand format for rawQueryString
+  const rawQueryString = queryParams ? queryParams.replace(/,/g, '&') : '';
+
+  // Convert comma-separated query params string into an object
+  const queryParamsObject = {};
+  if (queryParams) {
+    queryParams.split(',').forEach(param => {
+      const [key, value] = param.split('=');
+      if (key && value) {
+        queryParamsObject[key] = value;
+      }
+    });
   }
-  console.debug('ImageTransformation: Invoking image transformer lambda for path:', key);
   const lambdaEvent = {
+    version: '2.0',
+    routeKey: '$default',
+    rawPath: `/${path}`,
+    rawQueryString: rawQueryString,
+    headers: {
+      'user-agent': 'Amazon Lambda',
+      host: process.env.LAMBDA_URL_DOMAIN || 'lambda-url.us-east-1.on.aws'
+    },
+    queryStringParameters: Object.keys(queryParamsObject).length > 0 ? queryParamsObject : null,
     requestContext: {
+      routeKey: '$default',
+      stage: '$default',
       http: {
         method: 'GET',
-        path: key
-      }
-    }
+        path: `/${path}`,
+        protocol: 'HTTP/1.1',
+        userAgent: 'Amazon Lambda'
+      },
+      time: new Date().toUTCString(),
+      timeEpoch: Date.now()
+    },
+    isBase64Encoded: false
   };
   const params = {
     FunctionName: process.env.IMAGE_TRANSFORMER_ARN,
     InvocationType: 'RequestResponse',
     Payload: JSON.stringify(lambdaEvent)
   };
-  console.log({
-    params
-  });
   try {
     const result = await lambda.invoke(params).promise();
     const response = JSON.parse(result.Payload);
@@ -179,18 +209,31 @@ function parseUrlString(urlString) {
   if (!urlString || typeof urlString !== 'string') {
     throw new Error('URL string is required and must be a string');
   }
+
+  // Split on the first occurrence of '?' to separate path from query parameters
   const [path, queryString] = urlString.split('?');
   if (!path) {
     throw new Error('Invalid URL string: missing path component');
   }
+
+  // If there are no query parameters, return path with empty queryParams
   if (!queryString) {
-    return `${path}`;
+    return {
+      path: path,
+      queryParams: ''
+    };
   }
 
   // Parse query parameters and convert to comma-separated format
-  const queryParams = queryString.split('&').join(',');
+  const queryParams = queryString.split('&').map(param => {
+    // Handle parameters that might not have '=' (though uncommon)
+    if (!param.includes('=')) {
+      return param;
+    }
+    return param;
+  }).join(',');
   return {
-    path,
-    queryParams
+    path: path,
+    queryParams: queryParams
   };
 }

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, _parseUrlString, path, queryParams, alreadyTransformedImage, fullDataUrl, transformerResponse, statusCode, _fullDataUrl, _transformerResponse$, redirectLocation, newlyTransformedImage, _fullDataUrl2, _t;
+    var urlMatch, applicationId, keyWithTransformations, alreadyTransformedImage, fullDataUrl, transformerResponse, statusCode, _fullDataUrl, _transformerResponse$, redirectLocation, newlyTransformedImage, _fullDataUrl2, _t;
     return _regeneratorRuntime.wrap(function (_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -31,11 +31,11 @@ export var fetchImageForPdfGeneratorService = /*#__PURE__*/function () {
           }
           throw new Error('Requestor has insufficient permissions');
         case 2:
-          _parseUrlString = parseUrlString(url), path = _parseUrlString.path, queryParams = _parseUrlString.queryParams;
+          keyWithTransformations = url.substring(url.indexOf(applicationId));
           _context.next = 3;
           return fetchResourceFromS3({
             bucketName: "".concat(process.env.S3_BUCKET_IMAGE_TRANSFORMER_CACHE),
-            key: "".concat(path, "/").concat(queryParams)
+            key: keyWithTransformations
           });
         case 3:
           alreadyTransformedImage = _context.sent;
@@ -50,7 +50,7 @@ export var fetchImageForPdfGeneratorService = /*#__PURE__*/function () {
           return _context.abrupt("return", fullDataUrl);
         case 4:
           _context.next = 5;
-          return requestImageTransformation(url);
+          return requestImageTransformation(keyWithTransformations);
         case 5:
           transformerResponse = _context.sent;
           statusCode = transformerResponse.statusCode;
@@ -110,34 +110,63 @@ export function requestImageTransformation(_x2) {
   return _requestImageTransformation.apply(this, arguments);
 }
 function _requestImageTransformation() {
-  _requestImageTransformation = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2(key) {
-    var lambdaEvent, params, result, response, errorMessage, _t2;
+  _requestImageTransformation = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2(url) {
+    var _parseUrlString, path, queryParams, rawQueryString, queryParamsObject, lambdaEvent, params, result, response, errorMessage, _t2;
     return _regeneratorRuntime.wrap(function (_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          if (key) {
+          if (url) {
             _context2.next = 1;
             break;
           }
-          throw new Error('Image Path is required for image transformation');
+          throw new Error('Image URL is required for image transformation');
         case 1:
-          console.debug('ImageTransformation: Invoking image transformer lambda for path:', key);
+          console.debug('ImageTransformation: Invoking image transformer lambda for URL:', url);
+
+          // Parse the URL to extract path and query parameters
+          _parseUrlString = parseUrlString(url), path = _parseUrlString.path, queryParams = _parseUrlString.queryParams; // Convert comma-separated params back to ampersand format for rawQueryString
+          rawQueryString = queryParams ? queryParams.replace(/,/g, '&') : ''; // Convert comma-separated query params string into an object
+          queryParamsObject = {};
+          if (queryParams) {
+            queryParams.split(',').forEach(function (param) {
+              var _param$split = param.split('='),
+                _param$split2 = _slicedToArray(_param$split, 2),
+                key = _param$split2[0],
+                value = _param$split2[1];
+              if (key && value) {
+                queryParamsObject[key] = value;
+              }
+            });
+          }
           lambdaEvent = {
+            version: '2.0',
+            routeKey: '$default',
+            rawPath: "/".concat(path),
+            rawQueryString: rawQueryString,
+            headers: {
+              'user-agent': 'Amazon Lambda',
+              host: process.env.LAMBDA_URL_DOMAIN || 'lambda-url.us-east-1.on.aws'
+            },
+            queryStringParameters: Object.keys(queryParamsObject).length > 0 ? queryParamsObject : null,
             requestContext: {
+              routeKey: '$default',
+              stage: '$default',
               http: {
                 method: 'GET',
-                path: key
-              }
-            }
+                path: "/".concat(path),
+                protocol: 'HTTP/1.1',
+                userAgent: 'Amazon Lambda'
+              },
+              time: new Date().toUTCString(),
+              timeEpoch: Date.now()
+            },
+            isBase64Encoded: false
           };
           params = {
             FunctionName: process.env.IMAGE_TRANSFORMER_ARN,
             InvocationType: 'RequestResponse',
             Payload: JSON.stringify(lambdaEvent)
           };
-          console.log({
-            params: params
-          });
           _context2.prev = 2;
           _context2.next = 3;
           return lambda.invoke(params).promise();
@@ -244,6 +273,8 @@ function parseUrlString(urlString) {
   if (!urlString || typeof urlString !== 'string') {
     throw new Error('URL string is required and must be a string');
   }
+
+  // Split on the first occurrence of '?' to separate path from query parameters
   var _urlString$split = urlString.split('?'),
     _urlString$split2 = _slicedToArray(_urlString$split, 2),
     path = _urlString$split2[0],
@@ -251,12 +282,23 @@ function parseUrlString(urlString) {
   if (!path) {
     throw new Error('Invalid URL string: missing path component');
   }
+
+  // If there are no query parameters, return path with empty queryParams
   if (!queryString) {
-    return "".concat(path);
+    return {
+      path: path,
+      queryParams: ''
+    };
   }
 
   // Parse query parameters and convert to comma-separated format
-  var queryParams = queryString.split('&').join(',');
+  var queryParams = queryString.split('&').map(function (param) {
+    // Handle parameters that might not have '=' (though uncommon)
+    if (!param.includes('=')) {
+      return param;
+    }
+    return param;
+  }).join(',');
   return {
     path: path,
     queryParams: queryParams

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","_parseUrlString","path","queryParams","alreadyTransformedImage","fullDataUrl","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","keyWithTransformations","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","log","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","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 { path, queryParams } = parseUrlString(url)\n\n  const alreadyTransformedImage = await fetchResourceFromS3({\n    bucketName: `${process.env.S3_BUCKET_IMAGE_TRANSFORMER_CACHE}`,\n    key: `${path}/${queryParams}`,\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 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: 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  console.log({ params })\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 {\n    path,\n    queryParams,\n  }\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","keyWithTransformations","alreadyTransformedImage","fullDataUrl","transformerResponse","statusCode","_fullDataUrl","_transformerResponse$","redirectLocation","newlyTransformedImage","_fullDataUrl2","_t","wrap","_context","prev","next","console","debug","Error","match","substring","indexOf","fetchResourceFromS3","bucketName","concat","S3_BUCKET_IMAGE_TRANSFORMER_CACHE","key","sent","body","formatBase64Image","base64String","toString","abrupt","requestImageTransformation","headers","Location","stop","_x","apply","arguments","_x2","_requestImageTransformation","_callee2","_parseUrlString","path","queryParams","rawQueryString","queryParamsObject","lambdaEvent","params","result","response","errorMessage","_t2","_context2","parseUrlString","replace","split","forEach","param","_param$split","_param$split2","_slicedToArray","value","version","routeKey","rawPath","host","LAMBDA_URL_DOMAIN","queryStringParameters","Object","keys","length","requestContext","stage","http","method","protocol","userAgent","time","Date","toUTCString","timeEpoch","now","isBase64Encoded","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","_urlString$split2","queryString","map","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 keyWithTransformations = url.substring(url.indexOf(applicationId))\n\n  const alreadyTransformedImage = await fetchResourceFromS3({\n    bucketName: `${process.env.S3_BUCKET_IMAGE_TRANSFORMER_CACHE}`,\n    key: keyWithTransformations,\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 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(url) {\n  if (!url) {\n    throw new Error('Image URL is required for image transformation')\n  }\n\n  console.debug(\n    'ImageTransformation: Invoking image transformer lambda for URL:',\n    url\n  )\n\n  // Parse the URL to extract path and query parameters\n  const { path, queryParams } = parseUrlString(url)\n\n  // Convert comma-separated params back to ampersand format for rawQueryString\n  const rawQueryString = queryParams ? queryParams.replace(/,/g, '&') : ''\n\n  // Convert comma-separated query params string into an object\n  const queryParamsObject = {}\n  if (queryParams) {\n    queryParams.split(',').forEach((param) => {\n      const [key, value] = param.split('=')\n      if (key && value) {\n        queryParamsObject[key] = value\n      }\n    })\n  }\n\n  const lambdaEvent = {\n    version: '2.0',\n    routeKey: '$default',\n    rawPath: `/${path}`,\n    rawQueryString: rawQueryString,\n    headers: {\n      'user-agent': 'Amazon Lambda',\n      host: process.env.LAMBDA_URL_DOMAIN || 'lambda-url.us-east-1.on.aws',\n    },\n    queryStringParameters:\n      Object.keys(queryParamsObject).length > 0 ? queryParamsObject : null,\n    requestContext: {\n      routeKey: '$default',\n      stage: '$default',\n      http: {\n        method: 'GET',\n        path: `/${path}`,\n        protocol: 'HTTP/1.1',\n        userAgent: 'Amazon Lambda',\n      },\n      time: new Date().toUTCString(),\n      timeEpoch: Date.now(),\n    },\n    isBase64Encoded: false,\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  // Split on the first occurrence of '?' to separate path from query parameters\n  const [path, queryString] = urlString.split('?')\n\n  if (!path) {\n    throw new Error('Invalid URL string: missing path component')\n  }\n\n  // If there are no query parameters, return path with empty queryParams\n  if (!queryString) {\n    return {\n      path: path,\n      queryParams: '',\n    }\n  }\n\n  // Parse query parameters and convert to comma-separated format\n  const queryParams = queryString\n    .split('&')\n    .map((param) => {\n      // Handle parameters that might not have '=' (though uncommon)\n      if (!param.includes('=')) {\n        return param\n      }\n      return param\n    })\n    .join(',')\n\n  return {\n    path: path,\n    queryParams: queryParams,\n  }\n}\n"],"mappings":"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","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lighthouse/common",
-  "version": "6.2.0-canary.7",
+  "version": "6.2.0-canary.9",
   "description": "",
   "main": "dist/index.js",
   "module": "lib/index.js",
@@ -24,9 +24,7 @@
     "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",
@@ -72,7 +70,6 @@
     "lint-staged": "^15.2.0",
     "mockdate": "^2.0.2",
     "nock": "^12.0.2",
-    "nodemon": "^3.0.0",
     "prettier": "^3.3.0",
     "react-visjs-timeline": "^1.6.0",
     "rimraf": "^2.6.3",