node-pptx-templater 1.0.18 → 1.0.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-pptx-templater",
-  "version": "1.0.18",
+  "version": "1.0.19",
   "description": "High-performance, low-level PowerPoint (PPTX) OpenXML template engine for Node.js. Dynamically replace text, insert images, update charts (with Excel workbook data caching), and merge table cells without PowerPoint corruption or Repair Mode prompts.",
   "main": "./src/index.js",
   "type": "commonjs",

package/src/managers/MediaManager.js

@@ -40,20 +40,9 @@ const { createHash } = require('crypto')
 const { createLogger } = require('../utils/logger.js')
 const { PPTXError } = require('../utils/errors.js')
 const fsExtra = require('fs-extra')
-const fs = require('fs')
 
 const logger = createLogger('MediaManager')
 
-function getFileHash(filePath) {
-  return new Promise((resolve, reject) => {
-    const hash = createHash('sha1')
-    const stream = fs.createReadStream(filePath)
-    stream.on('data', chunk => hash.update(chunk))
-    stream.on('end', () => resolve(hash.digest('hex')))
-    stream.on('error', reject)
-  })
-}
-
 function streamToBuffer(stream) {
   return new Promise((resolve, reject) => {
     const chunks = []
@@ -182,119 +171,58 @@ class MediaManager {
     let hash
     let size
     const isStream = source && typeof source.on === 'function' && typeof source.pipe === 'function'
-    let streamForZip = null
 
     if (isStream) {
-      if (source.path) {
-        // It's a file stream (fs.createReadStream)
+      // Buffer the stream to avoid JSZip streaming pipeline crashes and file locks
+      data = await streamToBuffer(source)
+      if (source.path && typeof source.path === 'string') {
         const filePath = source.path
-        hash = await getFileHash(filePath)
         ext = filePath.split('.').pop().toLowerCase()
-        mimeType = mimeType || EXT_TO_MIME[ext] || 'image/png'
-
-        // Check for duplicate (content-addressable dedup)
-        if (this.#mediaHashIndex.has(hash)) {
-          const existingPath = this.#mediaHashIndex.get(hash)
-          logger.debug(`Reusing existing media: ${existingPath} (hash: ${hash.substring(0, 8)}...)`)
-          return existingPath
-        }
-
-        // Ensure all media from template is hashed to check for duplicates
-        await this.#ensureAllMediaHashed()
-
-        if (this.#mediaHashIndex.has(hash)) {
-          const existingPath = this.#mediaHashIndex.get(hash)
-          logger.debug(`Reusing existing media: ${existingPath} (hash: ${hash.substring(0, 8)}...)`)
-          return existingPath
-        }
-
-        const stat = await fsExtra.stat(filePath)
-        size = stat.size
-        streamForZip = fs.createReadStream(filePath)
       } else {
-        // Generic stream - we must buffer it to hash and reuse
-        data = await streamToBuffer(source)
-        hash = this.#hashBytes(data)
         ext = this.#detectExtension(data)
-        mimeType = mimeType || EXT_TO_MIME[ext] || 'image/png'
-        size = data.length
-
-        // Check for duplicate (content-addressable dedup)
-        if (this.#mediaHashIndex.has(hash)) {
-          const existingPath = this.#mediaHashIndex.get(hash)
-          logger.debug(`Reusing existing media: ${existingPath} (hash: ${hash.substring(0, 8)}...)`)
-          return existingPath
-        }
-
-        // Ensure all media from template is hashed to check for duplicates
-        await this.#ensureAllMediaHashed()
-
-        if (this.#mediaHashIndex.has(hash)) {
-          const existingPath = this.#mediaHashIndex.get(hash)
-          logger.debug(`Reusing existing media: ${existingPath} (hash: ${hash.substring(0, 8)}...)`)
-          return existingPath
-        }
       }
+      mimeType = mimeType || EXT_TO_MIME[ext] || 'image/png'
+      hash = this.#hashBytes(data)
+      size = data.length
     } else if (typeof source === 'string') {
-      // Load from file path
-      hash = await getFileHash(source)
+      // Load from file path directly to buffer
+      data = await fsExtra.readFile(source)
       ext = source.split('.').pop().toLowerCase()
       mimeType = mimeType || EXT_TO_MIME[ext] || 'image/png'
-
-      if (this.#mediaHashIndex.has(hash)) {
-        const existingPath = this.#mediaHashIndex.get(hash)
-        logger.debug(`Reusing existing media: ${existingPath} (hash: ${hash.substring(0, 8)}...)`)
-        return existingPath
-      }
-
-      // Ensure all media from template is hashed to check for duplicates
-      await this.#ensureAllMediaHashed()
-
-      if (this.#mediaHashIndex.has(hash)) {
-        const existingPath = this.#mediaHashIndex.get(hash)
-        logger.debug(`Reusing existing media: ${existingPath} (hash: ${hash.substring(0, 8)}...)`)
-        return existingPath
-      }
-
-      const stat = await fsExtra.stat(source)
-      size = stat.size
-      streamForZip = fs.createReadStream(source)
+      hash = this.#hashBytes(data)
+      size = data.length
     } else if (Buffer.isBuffer(source) || source instanceof Uint8Array) {
       data = source
       ext = this.#detectExtension(data)
       mimeType = mimeType || EXT_TO_MIME[ext] || 'image/png'
       hash = this.#hashBytes(data)
       size = data.length
-
-      if (this.#mediaHashIndex.has(hash)) {
-        const existingPath = this.#mediaHashIndex.get(hash)
-        logger.debug(`Reusing existing media: ${existingPath} (hash: ${hash.substring(0, 8)}...)`)
-        return existingPath
-      }
-
-      // Ensure all media from template is hashed to check for duplicates
-      await this.#ensureAllMediaHashed()
-
-      if (this.#mediaHashIndex.has(hash)) {
-        const existingPath = this.#mediaHashIndex.get(hash)
-        logger.debug(`Reusing existing media: ${existingPath} (hash: ${hash.substring(0, 8)}...)`)
-        return existingPath
-      }
     } else {
       throw new PPTXError(
         'embedImage: source must be a file path string, Buffer, or Readable Stream'
       )
     }
 
+    if (this.#mediaHashIndex.has(hash)) {
+      const existingPath = this.#mediaHashIndex.get(hash)
+      logger.debug(`Reusing existing media: ${existingPath} (hash: ${hash.substring(0, 8)}...)`)
+      return existingPath
+    }
+
+    // Ensure all media from template is hashed to check for duplicates
+    await this.#ensureAllMediaHashed()
+
+    if (this.#mediaHashIndex.has(hash)) {
+      const existingPath = this.#mediaHashIndex.get(hash)
+      logger.debug(`Reusing existing media: ${existingPath} (hash: ${hash.substring(0, 8)}...)`)
+      return existingPath
+    }
+
     // Create a new media file
     const mediaId = this.#nextMediaId++
     const zipPath = `ppt/media/image${mediaId}.${ext}`
 
-    if (streamForZip) {
-      this.#zipManager.writeBinaryFile(zipPath, streamForZip)
-    } else {
-      this.#zipManager.writeBinaryFile(zipPath, data)
-    }
+    this.#zipManager.writeBinaryFile(zipPath, data)
 
     this.#mediaHashIndex.set(hash, zipPath)
     this.#mediaRegistry.set(zipPath, { zipPath, hash, mimeType, size })