@lighthouse/common 4.37.0-canary-13 → 4.37.0-canary-14

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

@@ -15,15 +15,9 @@ function buildFetchUrl(url, options) {
     width,
     quality
   } = options;
-  console.info('Building fetch URL', {
-    url,
-    cloudfrontBaseUrl,
-    cloudinaryBaseUrl
-  });
   const shouldUseCloudfront = cloudfrontBaseUrl && cloudfrontBaseUrl.includes('.cloudfront.net');
 
   if (shouldUseCloudfront) {
-    console.info('Using CloudFront base URL', cloudfrontBaseUrl);
     const transformations = [];
     if (width) transformations.push(`width=${width.toString()}`);
     if (height) transformations.push(`height=${height.toString()}`);

package/dist/helpers/generate-cloudfront-jwt/index.js

@@ -9,9 +9,10 @@ exports.generateCloudFrontJWT = generateCloudFrontJWT;
 
 var _awsSdk = _interopRequireDefault(require("aws-sdk"));
 
-const region = process.env.AWS_REGION || 'us-east-1';
+const JWT_GENERATION_LAMBDA_ARN = process.env.JWT_GENERATION_LAMBDA_ARN;
+const REGION = process.env.AWS_REGION;
 const lambda = new _awsSdk.default.Lambda({
-  region
+  region: REGION
 });
 
 async function generateCloudFrontJWT(applicationId) {
@@ -20,7 +21,7 @@ async function generateCloudFrontJWT(applicationId) {
   }
 
   const params = {
-    FunctionName: `arn:aws:lambda:${region}:649076221710:function:image-optimisation-jwt-generation`,
+    FunctionName: JWT_GENERATION_LAMBDA_ARN,
     InvocationType: 'RequestResponse',
     Payload: JSON.stringify({
       applicationId
@@ -29,12 +30,7 @@ async function generateCloudFrontJWT(applicationId) {
 
   try {
     const result = await lambda.invoke(params).promise();
-    console.dir(result, {
-      depth: null
-    });
-    console.info('GenerateCloudFrontJWT: Raw Lambda result:', result);
     const response = JSON.parse(result.Payload);
-    console.info('GenerateCloudFrontJWT: Parsed Lambda response:', response);
     return {
       expiration: response.expiration,
       token: response.token

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

@@ -7,15 +7,9 @@ export function buildFetchUrl(url, options) {
       height = options.height,
       width = options.width,
       quality = options.quality;
-  console.info('Building fetch URL', {
-    url: url,
-    cloudfrontBaseUrl: cloudfrontBaseUrl,
-    cloudinaryBaseUrl: cloudinaryBaseUrl
-  });
   var shouldUseCloudfront = cloudfrontBaseUrl && cloudfrontBaseUrl.includes('.cloudfront.net');
 
   if (shouldUseCloudfront) {
-    console.info('Using CloudFront base URL', cloudfrontBaseUrl);
     var _transformations = [];
     if (width) _transformations.push("width=".concat(width.toString()));
     if (height) _transformations.push("height=".concat(height.toString()));

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/helpers/build-fetch-url/index.js"],"names":["buildFetchUrl","url","options","awsS3BaseUrl","cloudfrontBaseUrl","cloudinaryBaseUrl","fit","height","width","quality","console","info","shouldUseCloudfront","includes","transformations","push","toString","transformationsString","join","fetchUrl"],"mappings":"AAAA,OAAO,SAASA,aAAT,CAAuBC,GAAvB,EAA4BC,OAA5B,EAAqC;AAAA,MAExCC,YAFwC,GAStCD,OATsC,CAExCC,YAFwC;AAAA,8BAStCD,OATsC,CAGxCE,iBAHwC;AAAA,MAGxCA,iBAHwC,sCAGpB,EAHoB;AAAA,MAIxCC,iBAJwC,GAStCH,OATsC,CAIxCG,iBAJwC;AAAA,MAKxCC,GALwC,GAStCJ,OATsC,CAKxCI,GALwC;AAAA,MAMxCC,MANwC,GAStCL,OATsC,CAMxCK,MANwC;AAAA,MAOxCC,KAPwC,GAStCN,OATsC,CAOxCM,KAPwC;AAAA,MAQxCC,OARwC,GAStCP,OATsC,CAQxCO,OARwC;AAW1CC,EAAAA,OAAO,CAACC,IAAR,CAAa,oBAAb,EAAmC;AACjCV,IAAAA,GAAG,EAAHA,GADiC;AAEjCG,IAAAA,iBAAiB,EAAjBA,iBAFiC;AAGjCC,IAAAA,iBAAiB,EAAjBA;AAHiC,GAAnC;AAMA,MAAMO,mBAAmB,GACvBR,iBAAiB,IAAIA,iBAAiB,CAACS,QAAlB,CAA2B,iBAA3B,CADvB;;AAGA,MAAID,mBAAJ,EAAyB;AACvBF,IAAAA,OAAO,CAACC,IAAR,CAAa,2BAAb,EAA0CP,iBAA1C;AACA,QAAMU,gBAAe,GAAG,EAAxB;AAEA,QAAIN,KAAJ,EAAWM,gBAAe,CAACC,IAAhB,iBAA8BP,KAAK,CAACQ,QAAN,EAA9B;AACX,QAAIT,MAAJ,EAAYO,gBAAe,CAACC,IAAhB,kBAA+BR,MAAM,CAACS,QAAP,EAA/B;AACZ,QAAIP,OAAJ,EAAaK,gBAAe,CAACC,IAAhB,mBAAgCN,OAAO,CAACO,QAAR,EAAhC;;AACbF,IAAAA,gBAAe,CAACC,IAAhB;;AAEA,QAAME,sBAAqB,GAAGH,gBAAe,CAACI,IAAhB,CAAqB,GAArB,CAA9B;;AAEA,QAAMC,SAAQ,aAAMf,iBAAN,cAA2BH,GAA3B,cAAkCgB,sBAAlC,CAAd;;AACA,WAAOE,SAAP;AACD;;AAED,MAAML,eAAe,GAAG,EAAxB;AACA,MAAIG,qBAAqB,GAAG,EAA5B;AAEA,MAAIT,KAAJ,EAAWM,eAAe,CAACC,IAAhB,aAA0BP,KAAK,CAACQ,QAAN,EAA1B;AACX,MAAIT,MAAJ,EAAYO,eAAe,CAACC,IAAhB,aAA0BR,MAAM,CAACS,QAAP,EAA1B;AACZ,MAAIP,OAAJ,EAAaK,eAAe,CAACC,IAAhB,aAA0BN,OAAO,CAACO,QAAR,EAA1B;AACb,MAAIV,GAAJ,EAASQ,eAAe,CAACC,IAAhB,CAAqB,OAArB;AAETE,EAAAA,qBAAqB,aAAMH,eAAe,CAACI,IAAhB,CAAqB,GAArB,CAAN,MAArB;AAEA,MAAMC,QAAQ,aAAMd,iBAAN,cAA2BY,qBAA3B,SAAmDd,YAAnD,cAAmEF,GAAnE,CAAd;AAEA,SAAOkB,QAAP;AACD","sourcesContent":["export function buildFetchUrl(url, options) {\n  const {\n    awsS3BaseUrl,\n    cloudfrontBaseUrl = '',\n    cloudinaryBaseUrl,\n    fit,\n    height,\n    width,\n    quality,\n  } = options\n\n  console.info('Building fetch URL', {\n    url,\n    cloudfrontBaseUrl,\n    cloudinaryBaseUrl,\n  })\n\n  const shouldUseCloudfront =\n    cloudfrontBaseUrl && cloudfrontBaseUrl.includes('.cloudfront.net')\n\n  if (shouldUseCloudfront) {\n    console.info('Using CloudFront base URL', cloudfrontBaseUrl)\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"],"file":"index.js"}
+{"version":3,"sources":["../../../src/helpers/build-fetch-url/index.js"],"names":["buildFetchUrl","url","options","awsS3BaseUrl","cloudfrontBaseUrl","cloudinaryBaseUrl","fit","height","width","quality","shouldUseCloudfront","includes","transformations","push","toString","transformationsString","join","fetchUrl"],"mappings":"AAAA,OAAO,SAASA,aAAT,CAAuBC,GAAvB,EAA4BC,OAA5B,EAAqC;AAAA,MAExCC,YAFwC,GAStCD,OATsC,CAExCC,YAFwC;AAAA,8BAStCD,OATsC,CAGxCE,iBAHwC;AAAA,MAGxCA,iBAHwC,sCAGpB,EAHoB;AAAA,MAIxCC,iBAJwC,GAStCH,OATsC,CAIxCG,iBAJwC;AAAA,MAKxCC,GALwC,GAStCJ,OATsC,CAKxCI,GALwC;AAAA,MAMxCC,MANwC,GAStCL,OATsC,CAMxCK,MANwC;AAAA,MAOxCC,KAPwC,GAStCN,OATsC,CAOxCM,KAPwC;AAAA,MAQxCC,OARwC,GAStCP,OATsC,CAQxCO,OARwC;AAW1C,MAAMC,mBAAmB,GACvBN,iBAAiB,IAAIA,iBAAiB,CAACO,QAAlB,CAA2B,iBAA3B,CADvB;;AAGA,MAAID,mBAAJ,EAAyB;AACvB,QAAME,gBAAe,GAAG,EAAxB;AAEA,QAAIJ,KAAJ,EAAWI,gBAAe,CAACC,IAAhB,iBAA8BL,KAAK,CAACM,QAAN,EAA9B;AACX,QAAIP,MAAJ,EAAYK,gBAAe,CAACC,IAAhB,kBAA+BN,MAAM,CAACO,QAAP,EAA/B;AACZ,QAAIL,OAAJ,EAAaG,gBAAe,CAACC,IAAhB,mBAAgCJ,OAAO,CAACK,QAAR,EAAhC;;AACbF,IAAAA,gBAAe,CAACC,IAAhB;;AAEA,QAAME,sBAAqB,GAAGH,gBAAe,CAACI,IAAhB,CAAqB,GAArB,CAA9B;;AAEA,QAAMC,SAAQ,aAAMb,iBAAN,cAA2BH,GAA3B,cAAkCc,sBAAlC,CAAd;;AACA,WAAOE,SAAP;AACD;;AAED,MAAML,eAAe,GAAG,EAAxB;AACA,MAAIG,qBAAqB,GAAG,EAA5B;AAEA,MAAIP,KAAJ,EAAWI,eAAe,CAACC,IAAhB,aAA0BL,KAAK,CAACM,QAAN,EAA1B;AACX,MAAIP,MAAJ,EAAYK,eAAe,CAACC,IAAhB,aAA0BN,MAAM,CAACO,QAAP,EAA1B;AACZ,MAAIL,OAAJ,EAAaG,eAAe,CAACC,IAAhB,aAA0BJ,OAAO,CAACK,QAAR,EAA1B;AACb,MAAIR,GAAJ,EAASM,eAAe,CAACC,IAAhB,CAAqB,OAArB;AAETE,EAAAA,qBAAqB,aAAMH,eAAe,CAACI,IAAhB,CAAqB,GAArB,CAAN,MAArB;AAEA,MAAMC,QAAQ,aAAMZ,iBAAN,cAA2BU,qBAA3B,SAAmDZ,YAAnD,cAAmEF,GAAnE,CAAd;AAEA,SAAOgB,QAAP;AACD","sourcesContent":["export function buildFetchUrl(url, options) {\n  const {\n    awsS3BaseUrl,\n    cloudfrontBaseUrl = '',\n    cloudinaryBaseUrl,\n    fit,\n    height,\n    width,\n    quality,\n  } = options\n\n  const shouldUseCloudfront =\n    cloudfrontBaseUrl && cloudfrontBaseUrl.includes('.cloudfront.net')\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"],"file":"index.js"}

package/lib/helpers/generate-cloudfront-jwt/index.js

@@ -1,9 +1,10 @@
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import AWS from 'aws-sdk';
-var region = process.env.AWS_REGION || 'us-east-1';
+var JWT_GENERATION_LAMBDA_ARN = process.env.JWT_GENERATION_LAMBDA_ARN;
+var REGION = process.env.AWS_REGION;
 var lambda = new AWS.Lambda({
-  region: region
+  region: REGION
 });
 export function generateCloudFrontJWT(_x) {
   return _generateCloudFrontJWT.apply(this, arguments);
@@ -25,7 +26,7 @@ function _generateCloudFrontJWT() {
 
           case 2:
             params = {
-              FunctionName: "arn:aws:lambda:".concat(region, ":649076221710:function:image-optimisation-jwt-generation"),
+              FunctionName: JWT_GENERATION_LAMBDA_ARN,
               InvocationType: 'RequestResponse',
               Payload: JSON.stringify({
                 applicationId: applicationId
@@ -37,29 +38,24 @@ function _generateCloudFrontJWT() {
 
           case 6:
             result = _context.sent;
-            console.dir(result, {
-              depth: null
-            });
-            console.info('GenerateCloudFrontJWT: Raw Lambda result:', result);
             response = JSON.parse(result.Payload);
-            console.info('GenerateCloudFrontJWT: Parsed Lambda response:', response);
             return _context.abrupt("return", {
               expiration: response.expiration,
               token: response.token
             });
 
-          case 14:
-            _context.prev = 14;
+          case 11:
+            _context.prev = 11;
             _context.t0 = _context["catch"](3);
             console.error('Error invoking JWT Lambda:', _context.t0);
             throw new Error('Failed to generate CloudFront JWT');
 
-          case 18:
+          case 15:
           case "end":
             return _context.stop();
         }
       }
-    }, _callee, null, [[3, 14]]);
+    }, _callee, null, [[3, 11]]);
   }));
   return _generateCloudFrontJWT.apply(this, arguments);
 }

package/lib/helpers/generate-cloudfront-jwt/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/helpers/generate-cloudfront-jwt/index.js"],"names":["AWS","region","process","env","AWS_REGION","lambda","Lambda","generateCloudFrontJWT","applicationId","Error","params","FunctionName","InvocationType","Payload","JSON","stringify","invoke","promise","result","console","dir","depth","info","response","parse","expiration","token","error"],"mappings":";;AAAA,OAAOA,GAAP,MAAgB,SAAhB;AAEA,IAAMC,MAAM,GAAGC,OAAO,CAACC,GAAR,CAAYC,UAAZ,IAA0B,WAAzC;AACA,IAAMC,MAAM,GAAG,IAAIL,GAAG,CAACM,MAAR,CAAe;AAC5BL,EAAAA,MAAM,EAANA;AAD4B,CAAf,CAAf;AAIA,gBAAsBM,qBAAtB;AAAA;AAAA;;;oFAAO,iBAAqCC,aAArC;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,gBACAA,aADA;AAAA;AAAA;AAAA;;AAAA,kBAEG,IAAIC,KAAJ,CAAU,yDAAV,CAFH;;AAAA;AAKCC,YAAAA,MALD,GAKU;AACbC,cAAAA,YAAY,2BAAoBV,MAApB,6DADC;AAEbW,cAAAA,cAAc,EAAE,iBAFH;AAGbC,cAAAA,OAAO,EAAEC,IAAI,CAACC,SAAL,CAAe;AAAEP,gBAAAA,aAAa,EAAbA;AAAF,eAAf;AAHI,aALV;AAAA;AAAA;AAAA,mBAYkBH,MAAM,CAACW,MAAP,CAAcN,MAAd,EAAsBO,OAAtB,EAZlB;;AAAA;AAYGC,YAAAA,MAZH;AAcHC,YAAAA,OAAO,CAACC,GAAR,CAAYF,MAAZ,EAAoB;AAAEG,cAAAA,KAAK,EAAE;AAAT,aAApB;AACAF,YAAAA,OAAO,CAACG,IAAR,CAAa,2CAAb,EAA0DJ,MAA1D;AAEMK,YAAAA,QAjBH,GAiBcT,IAAI,CAACU,KAAL,CAAWN,MAAM,CAACL,OAAlB,CAjBd;AAkBHM,YAAAA,OAAO,CAACG,IAAR,CAAa,gDAAb,EAA+DC,QAA/D;AAlBG,6CAoBI;AACLE,cAAAA,UAAU,EAAEF,QAAQ,CAACE,UADhB;AAELC,cAAAA,KAAK,EAAEH,QAAQ,CAACG;AAFX,aApBJ;;AAAA;AAAA;AAAA;AAyBHP,YAAAA,OAAO,CAACQ,KAAR,CAAc,4BAAd;AAzBG,kBA0BG,IAAIlB,KAAJ,CAAU,mCAAV,CA1BH;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,G","sourcesContent":["import AWS from 'aws-sdk'\n\nconst region = process.env.AWS_REGION || 'us-east-1'\nconst lambda = new AWS.Lambda({\n  region,\n})\n\nexport async function generateCloudFrontJWT(applicationId) {\n  if (!applicationId) {\n    throw new Error('applicationId is required for CloudFront JWT generation')\n  }\n\n  const params = {\n    FunctionName: `arn:aws:lambda:${region}:649076221710:function:image-optimisation-jwt-generation`,\n    InvocationType: 'RequestResponse',\n    Payload: JSON.stringify({ applicationId }),\n  }\n\n  try {\n    const result = await lambda.invoke(params).promise()\n\n    console.dir(result, { depth: null })\n    console.info('GenerateCloudFrontJWT: Raw Lambda result:', result)\n\n    const response = JSON.parse(result.Payload)\n    console.info('GenerateCloudFrontJWT: Parsed Lambda response:', response)\n\n    return {\n      expiration: response.expiration,\n      token: response.token,\n    }\n  } catch (error) {\n    console.error('Error invoking JWT Lambda:', error)\n    throw new Error('Failed to generate CloudFront JWT')\n  }\n}\n"],"file":"index.js"}
+{"version":3,"sources":["../../../src/helpers/generate-cloudfront-jwt/index.js"],"names":["AWS","JWT_GENERATION_LAMBDA_ARN","process","env","REGION","AWS_REGION","lambda","Lambda","region","generateCloudFrontJWT","applicationId","Error","params","FunctionName","InvocationType","Payload","JSON","stringify","invoke","promise","result","response","parse","expiration","token","console","error"],"mappings":";;AAAA,OAAOA,GAAP,MAAgB,SAAhB;AAEA,IAAMC,yBAAyB,GAAGC,OAAO,CAACC,GAAR,CAAYF,yBAA9C;AACA,IAAMG,MAAM,GAAGF,OAAO,CAACC,GAAR,CAAYE,UAA3B;AACA,IAAMC,MAAM,GAAG,IAAIN,GAAG,CAACO,MAAR,CAAe;AAC5BC,EAAAA,MAAM,EAAEJ;AADoB,CAAf,CAAf;AAIA,gBAAsBK,qBAAtB;AAAA;AAAA;;;oFAAO,iBAAqCC,aAArC;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,gBACAA,aADA;AAAA;AAAA;AAAA;;AAAA,kBAEG,IAAIC,KAAJ,CAAU,yDAAV,CAFH;;AAAA;AAKCC,YAAAA,MALD,GAKU;AACbC,cAAAA,YAAY,EAAEZ,yBADD;AAEba,cAAAA,cAAc,EAAE,iBAFH;AAGbC,cAAAA,OAAO,EAAEC,IAAI,CAACC,SAAL,CAAe;AAAEP,gBAAAA,aAAa,EAAbA;AAAF,eAAf;AAHI,aALV;AAAA;AAAA;AAAA,mBAYkBJ,MAAM,CAACY,MAAP,CAAcN,MAAd,EAAsBO,OAAtB,EAZlB;;AAAA;AAYGC,YAAAA,MAZH;AAcGC,YAAAA,QAdH,GAccL,IAAI,CAACM,KAAL,CAAWF,MAAM,CAACL,OAAlB,CAdd;AAAA,6CAgBI;AACLQ,cAAAA,UAAU,EAAEF,QAAQ,CAACE,UADhB;AAELC,cAAAA,KAAK,EAAEH,QAAQ,CAACG;AAFX,aAhBJ;;AAAA;AAAA;AAAA;AAqBHC,YAAAA,OAAO,CAACC,KAAR,CAAc,4BAAd;AArBG,kBAsBG,IAAIf,KAAJ,CAAU,mCAAV,CAtBH;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,G","sourcesContent":["import AWS from 'aws-sdk'\n\nconst JWT_GENERATION_LAMBDA_ARN = process.env.JWT_GENERATION_LAMBDA_ARN\nconst REGION = process.env.AWS_REGION\nconst lambda = new AWS.Lambda({\n  region: REGION,\n})\n\nexport async function generateCloudFrontJWT(applicationId) {\n  if (!applicationId) {\n    throw new Error('applicationId is required for CloudFront JWT generation')\n  }\n\n  const params = {\n    FunctionName: JWT_GENERATION_LAMBDA_ARN,\n    InvocationType: 'RequestResponse',\n    Payload: JSON.stringify({ applicationId }),\n  }\n\n  try {\n    const result = await lambda.invoke(params).promise()\n\n    const response = JSON.parse(result.Payload)\n\n    return {\n      expiration: response.expiration,\n      token: response.token,\n    }\n  } catch (error) {\n    console.error('Error invoking JWT Lambda:', error)\n    throw new Error('Failed to generate CloudFront JWT')\n  }\n}\n"],"file":"index.js"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lighthouse/common",
-  "version": "4.37.0-canary-13",
+  "version": "4.37.0-canary-14",
   "description": "",
   "main": "dist/index.js",
   "module": "lib/index.js",