@lighthouse/common 5.0.0-canary-5 → 5.0.0-canary-6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -43,7 +43,7 @@ const fetchImageForPdfGeneratorService = async function (url) {
|
|
|
43
43
|
return alreadyTransformedImage.body.toString('base64');
|
|
44
44
|
}
|
|
45
45
|
|
|
46
|
-
const keyWithoutTransformations = keyWithTransformations.split('?')[0]
|
|
46
|
+
const keyWithoutTransformations = `/${keyWithTransformations.split('?')[0]}`;
|
|
47
47
|
const transformerResponse = await requestImageTransformation(keyWithoutTransformations);
|
|
48
48
|
const statusCode = transformerResponse.statusCode;
|
|
49
49
|
|
|
@@ -55,7 +55,7 @@ export var fetchImageForPdfGeneratorService = /*#__PURE__*/function () {
|
|
|
55
55
|
return _context.abrupt("return", alreadyTransformedImage.body.toString('base64'));
|
|
56
56
|
|
|
57
57
|
case 13:
|
|
58
|
-
keyWithoutTransformations = keyWithTransformations.split('?')[0];
|
|
58
|
+
keyWithoutTransformations = "/".concat(keyWithTransformations.split('?')[0]);
|
|
59
59
|
_context.next = 16;
|
|
60
60
|
return requestImageTransformation(keyWithoutTransformations);
|
|
61
61
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/helpers/fetch-image-for-pdf-generator-service/index.js"],"names":["AWS","REGION","process","env","AWS_REGION","lambda","Lambda","region","s3","S3","fetchImageForPdfGeneratorService","url","console","info","Error","urlMatch","match","applicationId","keyWithTransformations","substring","indexOf","fetchResourceFromS3","bucketName","S3_BUCKET_UPLOADS","key","alreadyTransformedImage","body","toString","keyWithoutTransformations","split","requestImageTransformation","transformerResponse","statusCode","log","redirectLocation","headers","Location","newlyTransformedImage","lambdaEvent","requestContext","http","method","path","params","FunctionName","IMAGE_TRANSFORMER_ARN","InvocationType","Payload","JSON","stringify","invoke","promise","result","response","parse","errorMessage","message","error","Bucket","Key","getObject","Body","contentType","ContentType","contentLength","ContentLength","lastModified","LastModified","etag","ETag","code"],"mappings":";;AAAA,OAAOA,GAAP,MAAgB,SAAhB;AACA,IAAMC,MAAM,GAAGC,OAAO,CAACC,GAAR,CAAYC,UAA3B;AAEA,IAAMC,MAAM,GAAG,IAAIL,GAAG,CAACM,MAAR,CAAe;AAC5BC,EAAAA,MAAM,EAAEN;AADoB,CAAf,CAAf;AAGA,IAAMO,EAAE,GAAG,IAAIR,GAAG,CAACS,EAAR,CAAW;AACpBF,EAAAA,MAAM,EAAEN;AADY,CAAX,CAAX;AAIA,OAAO,IAAMS,gCAAgC;AAAA,sEAAG,iBAAeC,GAAf;AAAA;;AAAA;AAAA;AAAA;AAAA;AAC9CC,YAAAA,OAAO,CAACC,IAAR,CACE,oEADF;;AAD8C,gBAKzCF,GALyC;AAAA;AAAA;AAAA;;AAAA,kBAMtC,IAAIG,KAAJ,CAAU,0DAAV,CANsC;;AAAA;AASxCC,YAAAA,QATwC,GAS7BJ,GAAG,IAAIA,GAAG,CAACK,KAAJ,CAAU,kBAAV,CATsB;AAUxCC,YAAAA,aAVwC,GAUxBF,QAAQ,IAAIA,QAAQ,CAAC,CAAD,CAVI;;AAAA,gBAYzCE,aAZyC;AAAA;AAAA;AAAA;;AAAA,kBAatC,IAAIH,KAAJ,CAAU,wCAAV,CAbsC;;AAAA;AAgBxCI,YAAAA,sBAhBwC,GAgBfP,GAAG,CAACQ,SAAJ,CAAcR,GAAG,CAACS,OAAJ,CAAYH,aAAZ,CAAd,CAhBe;AAAA;AAAA,mBAkBRI,mBAAmB,CAAC;AACxDC,cAAAA,UAAU,YAAKpB,OAAO,CAACC,GAAR,CAAYoB,iBAAjB,iBAD8C;AAExDC,cAAAA,GAAG,EAAEN;AAFmD,aAAD,CAlBX;;AAAA;AAkBxCO,YAAAA,uBAlBwC;;AAAA,kBAuB1CA,uBAAuB,IAAIA,uBAAuB,CAACC,IAvBT;AAAA;AAAA;AAAA;;AAAA,6CAwBrCD,uBAAuB,CAACC,IAAxB,CAA6BC,QAA7B,CAAsC,QAAtC,CAxBqC;;AAAA;AA2BxCC,YAAAA,yBA3BwC,
|
|
1
|
+
{"version":3,"sources":["../../../src/helpers/fetch-image-for-pdf-generator-service/index.js"],"names":["AWS","REGION","process","env","AWS_REGION","lambda","Lambda","region","s3","S3","fetchImageForPdfGeneratorService","url","console","info","Error","urlMatch","match","applicationId","keyWithTransformations","substring","indexOf","fetchResourceFromS3","bucketName","S3_BUCKET_UPLOADS","key","alreadyTransformedImage","body","toString","keyWithoutTransformations","split","requestImageTransformation","transformerResponse","statusCode","log","redirectLocation","headers","Location","newlyTransformedImage","lambdaEvent","requestContext","http","method","path","params","FunctionName","IMAGE_TRANSFORMER_ARN","InvocationType","Payload","JSON","stringify","invoke","promise","result","response","parse","errorMessage","message","error","Bucket","Key","getObject","Body","contentType","ContentType","contentLength","ContentLength","lastModified","LastModified","etag","ETag","code"],"mappings":"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","sourcesContent":["import 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.info(\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_UPLOADS}-transformed`,\n key: keyWithTransformations,\n })\n\n if (alreadyTransformedImage && alreadyTransformedImage.body) {\n return alreadyTransformedImage.body.toString('base64')\n }\n\n const keyWithoutTransformations = `/${keyWithTransformations.split('?')[0]}`\n\n const transformerResponse = await requestImageTransformation(keyWithoutTransformations)\n\n const statusCode = transformerResponse.statusCode\n\n switch (statusCode) {\n case 200:\n console.log('Image transformation successful')\n return transformerResponse.body\n case 302: {\n console.log(\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_UPLOADS}-transformed`,\n key: keyWithTransformations,\n })\n console.log('Image successfully fetched from S3 at:', redirectLocation)\n\n return newlyTransformedImage.body.toString('base64')\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.log(\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.info(\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.info('ERROR: s3 Image fetch', error.code) // TODO: Remove this testing log\n throw new Error(`Failed to fetch image: ${bucketName}/${key}`)\n }\n\n console.info('Image not found in transformed bucket, invoking transformer')\n }\n}\n"],"file":"index.js"}
|