@flowaccount/pdfmake 1.0.1 → 1.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flowaccount/pdfmake",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Client/server side PDF printing in pure JavaScript",
   "main": "src/printer.js",
   "browser": "build/pdfmake.js",

package/src/documentContext.js

@@ -75,7 +75,7 @@ DocumentContext.prototype.resetMarginXTopParent = function () {
 	this.marginXTopParent = null;
 };
 
-DocumentContext.prototype.beginColumn = function (width, offset, endingCell) {
+DocumentContext.prototype.beginColumn = function (width, offset, endingCell, heightOffset) {
 	var saved = this.snapshots[this.snapshots.length - 1];
 
 	this.calculateBottomMost(saved, endingCell);
@@ -84,7 +84,7 @@ DocumentContext.prototype.beginColumn = function (width, offset, endingCell) {
 	this.x = this.x + this.lastColumnWidth + (offset || 0);
 	this.y = saved.y;
 	this.availableWidth = width;	//saved.availableWidth - offset;
-	this.availableHeight = saved.availableHeight;
+	this.availableHeight = saved.availableHeight - (heightOffset || 0);
 
 	this.lastColumnWidth = width;
 };

package/src/layoutBuilder.js

@@ -990,7 +990,7 @@ LayoutBuilder.prototype._getRowSpanEndingCell = function (tableBody, rowIndex, c
 	return null;
 };
 
-LayoutBuilder.prototype.processRow = function ({ marginX = [0, 0], dontBreakRows = false, rowsWithoutPageBreak = 0, cells, widths, gaps, tableNode, tableBody, rowIndex, height }) {
+LayoutBuilder.prototype.processRow = function ({ marginX = [0, 0], dontBreakRows = false, rowsWithoutPageBreak = 0, cells, widths, gaps, tableNode, tableBody, rowIndex, height, heightOffset = 0 }) {
 	var self = this;
 	var isUnbreakableRow = dontBreakRows || rowIndex <= rowsWithoutPageBreak - 1;
 	var pageBreaks = [];
@@ -1053,6 +1053,13 @@ LayoutBuilder.prototype.processRow = function ({ marginX = [0, 0], dontBreakRows
 			}
 		}
 
+		// Apply heightOffset from table definition to adjust page break calculation
+		// This allows fine-tuning of page break detection for specific tables
+		// heightOffset is passed as parameter from processTable
+		if (heightOffset) {
+			estimatedHeight = (estimatedHeight || 0) + heightOffset;
+		}
+
 		// Check if row won't fit on current page
 		// Strategy: Force break if row won't fit AND we're not too close to page boundary
 		// "Too close" means availableHeight is very small (< 5px) - at that point forcing
@@ -1141,7 +1148,7 @@ LayoutBuilder.prototype.processRow = function ({ marginX = [0, 0], dontBreakRows
 			}
 
 			// We pass the endingSpanCell reference to store the context just after processing rowspan cell
-			self.writer.context().beginColumn(width, leftOffset, endOfRowSpanCell);
+			self.writer.context().beginColumn(width, leftOffset, endOfRowSpanCell, heightOffset);
 
 			if (!cell._span) {
 				self.processNode(cell);
@@ -1328,6 +1335,8 @@ LayoutBuilder.prototype.processTable = function (tableNode) {
 			height = undefined;
 		}
 
+		var heightOffset = tableNode.heightOffset != undefined ? tableNode.heightOffset : 0;
+
 		var pageBeforeProcessing = this.writer.context().page;
 
 		var result = this.processRow({
@@ -1340,7 +1349,8 @@ LayoutBuilder.prototype.processTable = function (tableNode) {
 			tableBody: tableNode.table.body,
 			tableNode,
 			rowIndex: i,
-			height
+			height,
+			heightOffset
 		});
 		addAll(tableNode.positions, result.positions);
 

package/src/printer.js

@@ -45,6 +45,9 @@ var findFont = function (fonts, requiredFonts, defaultFont) {
  * @class Creates an instance of a PdfPrinter which turns document definition into a pdf
  *
  * @param {Object} fontDescriptors font definition dictionary
+ * @param {Object} [options] optional configuration
+ * @param {Number} [options.maxImageCacheSize] maximum number of images to cache (default: 100)
+ * @param {Number} [options.imageCacheTTL] cache time-to-live in milliseconds (default: 3600000 = 1 hour)
  *
  * @example
  * var fontDescriptors = {
@@ -56,10 +59,22 @@ var findFont = function (fonts, requiredFonts, defaultFont) {
  *	}
  * };
  *
- * var printer = new PdfPrinter(fontDescriptors);
+ * var printer = new PdfPrinter(fontDescriptors, {
+ *   maxImageCacheSize: 50,
+ *   imageCacheTTL: 30 * 60 * 1000 // 30 minutes
+ * });
  */
-function PdfPrinter(fontDescriptors) {
+function PdfPrinter(fontDescriptors, options) {
 	this.fontDescriptors = fontDescriptors;
+	options = options || {};
+
+	// Cache configuration with memory leak prevention
+	this._cacheConfig = {
+		maxSize: isNumber(options.maxImageCacheSize) ? options.maxImageCacheSize : 100,
+		ttl: isNumber(options.imageCacheTTL) ? options.imageCacheTTL : 3600000 // 1 hour default
+	};
+
+	// LRU cache: Map maintains insertion order, so we can implement LRU easily
 	this._remoteImageCache = new Map();
 }
 
@@ -200,6 +215,62 @@ PdfPrinter.prototype.resolveRemoteImages = function (docDefinition, timeoutMs) {
 	return resolveRemoteImages.call(this, docDefinition, timeoutMs);
 };
 
+/**
+ * Clears the remote image cache
+ * Useful for freeing memory or forcing fresh image fetches
+ */
+PdfPrinter.prototype.clearImageCache = function () {
+	this._remoteImageCache.clear();
+};
+
+/**
+ * Gets cache statistics for monitoring
+ * @return {Object} Cache statistics
+ */
+PdfPrinter.prototype.getImageCacheStats = function () {
+	var now = Date.now();
+	var cache = this._remoteImageCache;
+	var expired = 0;
+	var valid = 0;
+
+	cache.forEach(function (entry) {
+		if (now - entry.timestamp > this._cacheConfig.ttl) {
+			expired++;
+		} else {
+			valid++;
+		}
+	}, this);
+
+	return {
+		size: cache.size,
+		maxSize: this._cacheConfig.maxSize,
+		ttl: this._cacheConfig.ttl,
+		validEntries: valid,
+		expiredEntries: expired
+	};
+};
+
+/**
+ * Removes expired entries from cache
+ */
+PdfPrinter.prototype.cleanExpiredCache = function () {
+	var now = Date.now();
+	var cache = this._remoteImageCache;
+	var keysToDelete = [];
+
+	cache.forEach(function (entry, key) {
+		if (now - entry.timestamp > this._cacheConfig.ttl) {
+			keysToDelete.push(key);
+		}
+	}, this);
+
+	keysToDelete.forEach(function (key) {
+		cache.delete(key);
+	});
+
+	return keysToDelete.length;
+};
+
 PdfPrinter.prototype.createPdfKitDocumentAsync = function (docDefinition, options) {
 	if (!docDefinition || typeof docDefinition !== 'object') {
 		return Promise.reject(new Error('docDefinition parameter is required and must be an object'));
@@ -808,11 +879,12 @@ function resolveRemoteImages(docDefinition, timeoutMs) {
 
 	var timeout = typeof timeoutMs === 'number' && timeoutMs > 0 ? timeoutMs : undefined;
 	var tasks = [];
+	var cacheConfig = this._cacheConfig;
 
 	remoteTargets.forEach(function (descriptor, key) {
 		var cacheKey = createCacheKey(descriptor.url, descriptor.headers);
 		tasks.push(
-			ensureRemoteBuffer(descriptor.url, descriptor.headers, cacheKey, cache, timeout)
+			ensureRemoteBuffer(descriptor.url, descriptor.headers, cacheKey, cache, timeout, cacheConfig)
 				.then(function (buffer) {
 					images[key] = buffer;
 				})
@@ -914,9 +986,41 @@ function registerInlineImage(node, images) {
 	return null;
 }
 
-function ensureRemoteBuffer(url, headers, cacheKey, cache, timeout) {
-	// Cache disabled - always fetch fresh images
-	return fetchRemote(url, headers, timeout);
+function ensureRemoteBuffer(url, headers, cacheKey, cache, timeout, cacheConfig) {
+	var now = Date.now();
+
+	// Check if image is in cache and not expired
+	var cached = cache.get(cacheKey);
+	if (cached) {
+		var age = now - cached.timestamp;
+		if (age < cacheConfig.ttl) {
+			// Move to end (LRU: mark as recently used)
+			cache.delete(cacheKey);
+			cache.set(cacheKey, cached);
+			return Promise.resolve(cached.buffer);
+		} else {
+			// Expired - remove from cache
+			cache.delete(cacheKey);
+		}
+	}
+
+	// Fetch remote image and cache the result
+	return fetchRemote(url, headers, timeout).then(function (buffer) {
+		// Implement LRU eviction if cache is full
+		if (cache.size >= cacheConfig.maxSize) {
+			// Remove oldest entry (first entry in Map)
+			var firstKey = cache.keys().next().value;
+			cache.delete(firstKey);
+		}
+
+		// Store with timestamp for TTL
+		cache.set(cacheKey, {
+			buffer: buffer,
+			timestamp: now
+		});
+
+		return buffer;
+	});
 }
 
 function parseRemoteDescriptor(value) {