@lighthouse/common 6.10.0-canary.0 → 6.10.0-canary.2

package/CHANGELOG.md

@@ -1,3 +1,18 @@
+# 6.9.3 (Wed Feb 26 2026)
+
+#### 🐛 Bug Fix
+
+- 🐛 Fix - Cross-region S3/Lambda access for image transformer cache ([@AndrewFinlay](https://github.com/AndrewFinlay))
+  - Hardcode IMAGE_CACHE_REGION to us-east-1 for Lambda and S3 clients
+  - Fixes NoSuchBucket errors when generating PDFs with images in non-us-east-1 regions
+  - Image transformer Lambda and cache bucket only exist in us-east-1
+
+#### Authors: 1
+
+- Andrew Finlay ([@AndrewFinlay](https://github.com/AndrewFinlay))
+
+---
+
 # 4.27.5 (Fri May 12 2023)
 
 #### 🐛  Bug Fix

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

@@ -10,12 +10,14 @@ exports.formatBase64Image = formatBase64Image;
 exports.requestImageTransformation = requestImageTransformation;
 var _imageValidators = require("../image-validators");
 var _awsSdk = _interopRequireDefault(require("aws-sdk"));
-const REGION = process.env.AWS_REGION;
+// Image transformer and cache are always in us-east-1 (shared across all regions)
+// The image-optimisation-image-processing Lambda only exists in us-east-1
+const IMAGE_CACHE_REGION = 'us-east-1';
 const lambda = new _awsSdk.default.Lambda({
-  region: REGION
+  region: IMAGE_CACHE_REGION
 });
 const s3 = new _awsSdk.default.S3({
-  region: REGION
+  region: IMAGE_CACHE_REGION
 });
 const fetchImageForPdfGeneratorService = async function (url) {
   console.debug('Fetching image via CloudFront For Serverless Pdf Generator Service');
@@ -46,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:
       {
@@ -58,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

@@ -13,6 +13,18 @@ var _momentTimezone = _interopRequireDefault(require("moment-timezone"));
 var _helpers = require("../../../helpers");
 var _images = require("../../../images");
 var _ = require("../");
+function rewriteS3UrlToCloudfront(url, settings) {
+  const {
+    shouldUseCloudfront,
+    cloudfrontBaseUrl,
+    awsS3BaseUrl
+  } = settings;
+  if (!shouldUseCloudfront || !cloudfrontBaseUrl || !awsS3BaseUrl) return url;
+  if (typeof url === 'string' && url.startsWith(awsS3BaseUrl)) {
+    return url.replace(awsS3BaseUrl, cloudfrontBaseUrl);
+  }
+  return url;
+}
 function buildFile({
   file,
   settings,
@@ -41,7 +53,9 @@ function buildImage(options) {
     height = 210,
     settings = {},
     signedAsset,
-    width = 210
+    width = 210,
+    fieldLabel,
+    fieldType = 'image'
   } = options;
   const {
     awsS3BaseUrl,
@@ -71,7 +85,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 +143,15 @@ function buildSummaryField({
       };
     }
     // NOTE: shouldUseCloudfront, Signature, Policy and KeyPairId from settings are used in this context
-    return (0, _helpers.fetchImage)(value, settings).then(base64String => {
+    const signatureUrl = rewriteS3UrlToCloudfront(value, settings);
+    return (0, _helpers.fetchImage)(signatureUrl, {
+      ...settings,
+      context: {
+        stage: 'field',
+        fieldLabel: field.label,
+        fieldType: 'signature'
+      }
+    }).then(base64String => {
       return {
         alignment: 'left',
         image: base64String,
@@ -145,7 +175,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 +276,15 @@ 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 => {
+    const signatureUrl = rewriteS3UrlToCloudfront(value, settings);
+    return (0, _helpers.fetchImage)(signatureUrl, {
+      ...settings,
+      context: {
+        stage: 'field',
+        fieldLabel: label,
+        fieldType: 'signature'
+      }
+    }).then(base64String => {
       const values = {
         alignment: 'left',
         image: base64String,
@@ -254,22 +294,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) : [];
@@ -298,7 +355,7 @@ function buildTemplateFieldRow({
   }
   if (isFileField) {
     const fileList = (0, _lodash.map)(value, (file, index) => {
-      const signedAsset = signedAssets[index];
+      const signedAsset = signedAssets?.[index];
       return buildFile({
         file,
         settings,

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/dist/scheduling/helpers/generateRepeatingSchedule.js

@@ -1,13 +1,11 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.complyingServiceIntervalUnits = void 0;
 exports.generateRepeatingSchedule = generateRepeatingSchedule;
 var _fp = require("lodash/fp");
-var _momentTimezone = _interopRequireDefault(require("moment-timezone"));
 var _ = require(".");
 var _scheduling = require("../scheduling.types");
 var _generators = require("../generators");
@@ -49,17 +47,7 @@ function* generateRepeatingSchedule(props) {
     end,
     start
   });
-  console.log('[generateRepeatingSchedule] INIT:', {
-    start: _momentTimezone.default.tz(start, timezone).format('YYYY-MM-DD HH:mm:ss Z'),
-    end: _momentTimezone.default.tz(end, timezone).format('YYYY-MM-DD HH:mm:ss Z'),
-    isStartAndEndValid,
-    frequencyUnit,
-    timezone
-  });
-  if (!isStartAndEndValid) {
-    console.log('[generateRepeatingSchedule] INVALID START/END - RETURNING EARLY');
-    return [];
-  }
+  if (!isStartAndEndValid) return [];
   const serviceIntervalSequence = (0, _generators.serviceIntervalsGenerator)({
     end,
     serviceHours,
@@ -70,20 +58,7 @@ function* generateRepeatingSchedule(props) {
   // all service intervals otherwise service interval is from the start and end
   const complyToServiceHours = (0, _fp.includes)(frequencyUnit, complyingServiceIntervalUnits);
   const serviceIntervals = complyToServiceHours ? [...serviceIntervalSequence] : [[start, end]];
-  console.log('[generateRepeatingSchedule] SERVICE_INTERVALS:', {
-    count: serviceIntervals.length,
-    complyToServiceHours,
-    intervals: serviceIntervals.slice(0, 3).map(interval => ({
-      start: _momentTimezone.default.tz(interval[0], timezone).format('YYYY-MM-DD HH:mm:ss Z'),
-      end: _momentTimezone.default.tz(interval[1], timezone).format('YYYY-MM-DD HH:mm:ss Z')
-    }))
-  });
-  let serviceIntervalIndex = 0;
   for (const serviceInterval of serviceIntervals) {
-    console.log(`[generateRepeatingSchedule] PROCESSING_SERVICE_INTERVAL[${serviceIntervalIndex}]:`, {
-      start: _momentTimezone.default.tz(serviceInterval[0], timezone).format('YYYY-MM-DD HH:mm:ss Z'),
-      end: _momentTimezone.default.tz(serviceInterval[1], timezone).format('YYYY-MM-DD HH:mm:ss Z')
-    });
     yield {
       interval: serviceInterval,
       type: _scheduling.IntervalTypes.Service
@@ -94,27 +69,16 @@ function* generateRepeatingSchedule(props) {
       strategy,
       timezone
     });
-    let occurrenceCount = 0;
     for (const occurrenceInterval of occurrenceIntervalsSequence) {
-      console.log(`[generateRepeatingSchedule] OCCURRENCE[${occurrenceCount}]:`, {
-        start: _momentTimezone.default.tz(occurrenceInterval[0], timezone).format('YYYY-MM-DD HH:mm:ss Z'),
-        end: _momentTimezone.default.tz(occurrenceInterval[1], timezone).format('YYYY-MM-DD HH:mm:ss Z')
-      });
       yield {
         interval: occurrenceInterval,
         type: _scheduling.IntervalTypes.Occurrence
       };
-      occurrenceCount++;
     }
-    console.log(`[generateRepeatingSchedule] SERVICE_INTERVAL[${serviceIntervalIndex}] COMPLETED:`, {
-      occurrenceCount
-    });
 
     // NOTE: we must reset isInitial to true following the first service
     // interval otherwise the occurrence will not start exactly on the next
     // service interval start time
     isInitial = true;
-    serviceIntervalIndex++;
   }
-  console.log('[generateRepeatingSchedule] COMPLETE');
 }

package/dist/scheduling/helpers/generateScheduleEnd.js

@@ -26,18 +26,6 @@ function generateScheduleEnd({
   // NOTE: if frequency unit less than a week we must set end to jump a week
   // plus the interval length of the schedule frequency
   // so that we can ensure that we are within a service interval
-  // MODIFIED FOR TESTING: Changed from 2 weeks to 1 hour for testing endless generation bug
-  const end = isFrequencyLessThanWeek ? mStart.add(1, _scheduling.Unit.Hour).valueOf() : mStart.add(frequencyValue * 2, frequencyUnit).valueOf();
-  console.log('[generateScheduleEnd] START:', {
-    start: _momentTimezone.default.tz(start, timezone).format('YYYY-MM-DD HH:mm:ss Z'),
-    frequency: `${frequencyValue}${frequencyUnit}`,
-    isFrequencyLessThanWeek,
-    timezone
-  });
-  console.log('[generateScheduleEnd] END CALCULATED:', {
-    end: _momentTimezone.default.tz(end, timezone).format('YYYY-MM-DD HH:mm:ss Z'),
-    endTimestamp: end,
-    durationFromStart: `${(0, _momentTimezone.default)(end).diff((0, _momentTimezone.default)(start), 'hours')} hours`
-  });
+  const end = isFrequencyLessThanWeek ? mStart.add(2, _scheduling.Unit.Week).valueOf() : mStart.add(frequencyValue * 2, frequencyUnit).valueOf();
   return end;
 }

package/dist/scheduling/strategies/getNext.js

@@ -32,16 +32,6 @@ function* getNext({
   } = frequency;
   let initial = isInitial;
   let dateCursor = initial ? _momentTimezone.default.tz(start, timezone).valueOf() : _momentTimezone.default.tz(start, timezone).add(1, _scheduling.Unit.Millisecond).valueOf();
-  console.log('[getNext] START:', {
-    strategy: type,
-    start: _momentTimezone.default.tz(start, timezone).format('YYYY-MM-DD HH:mm:ss Z'),
-    end: _momentTimezone.default.tz(end, timezone).format('YYYY-MM-DD HH:mm:ss Z'),
-    dateCursor: _momentTimezone.default.tz(dateCursor, timezone).format('YYYY-MM-DD HH:mm:ss Z'),
-    isInitial,
-    frequency: `${frequencyValue}${frequencyUnit}`,
-    duration: `${durationValue}${durationUnit}`
-  });
-  let occurrenceCount = 0;
   while (dateCursor < end) {
     let nextOccurrenceStart;
     let nextOccurrenceEnd;
@@ -59,27 +49,12 @@ function* getNext({
       nextOccurrenceStart = _momentTimezone.default.max(earliestNextOccurrenceStart, nextOccurrenceStartByBackCalculation).valueOf();
     }
     if (nextOccurrenceEnd <= nextOccurrenceStart || nextOccurrenceEnd > end) {
-      console.log('[getNext] BOUNDARY CHECK FAILED:', {
-        occurrenceCount,
-        nextOccurrenceStart: _momentTimezone.default.tz(nextOccurrenceStart, timezone).format('YYYY-MM-DD HH:mm:ss Z'),
-        nextOccurrenceEnd: _momentTimezone.default.tz(nextOccurrenceEnd, timezone).format('YYYY-MM-DD HH:mm:ss Z'),
-        end: _momentTimezone.default.tz(end, timezone).format('YYYY-MM-DD HH:mm:ss Z'),
-        condition: `(${nextOccurrenceEnd} <= ${nextOccurrenceStart}) || (${nextOccurrenceEnd} > ${end})`
-      });
       return;
     }
     if (nextOccurrenceStart >= start) {
       const nextOccurrence = [nextOccurrenceStart, nextOccurrenceEnd - 1];
-      console.log(`[getNext] OCCURRENCE[${occurrenceCount}]:`, {
-        start: _momentTimezone.default.tz(nextOccurrenceStart, timezone).format('YYYY-MM-DD HH:mm:ss Z'),
-        end: _momentTimezone.default.tz(nextOccurrenceEnd - 1, timezone).format('YYYY-MM-DD HH:mm:ss Z')
-      });
       yield nextOccurrence;
-      occurrenceCount++;
     }
     dateCursor = nextOccurrenceEnd;
   }
-  console.log('[getNext] COMPLETE:', {
-    occurrenceCount
-  });
 }