7z-iterator 0.2.13 → 0.3.0

package/dist/esm/SevenZipIterator.js

@@ -1,11 +1,11 @@
-import BaseIterator from 'extract-base-iterator';
+import BaseIterator, { Lock } from 'extract-base-iterator';
 import fs from 'fs';
+import { rmSync } from 'fs-remove-compat';
 import path from 'path';
 import Queue from 'queue-cb';
 import shortHash from 'short-hash';
 import tempSuffix from 'temp-suffix';
 import { tmpdir } from './compat.js';
-import Lock from './lib/Lock.js';
 import streamToSource from './lib/streamToSource.js';
 import nextEntry from './nextEntry.js';
 import { setPassword } from './sevenz/codecs/index.js';
@@ -42,7 +42,7 @@ let SevenZipIterator = class SevenZipIterator extends BaseIterator {
     constructor(source, options = {}){
         super(options);
         this.lock = new Lock();
-        this.lock.iterator = this;
+        this.lock.onDestroy = (err)=>BaseIterator.prototype.end.call(this, err);
         const queue = new Queue(1);
         let cancelled = false;
         let archiveSource = null;
@@ -63,15 +63,22 @@ let SevenZipIterator = class SevenZipIterator extends BaseIterator {
                         if (this.done || cancelled) return;
                         if (err) return cb(err);
                         archiveSource = new FileSource(fd, stats.size);
-                        this.lock.fd = fd;
+                        // Register cleanup for file descriptor
+                        this.lock.registerCleanup(()=>{
+                            fs.closeSync(fd);
+                        });
                         cb();
                     });
                 });
             });
         } else {
             // Stream input - use hybrid memory/temp-file approach
-            // Store source stream in lock for cleanup if destroyed during download
-            this.lock.sourceStream = source;
+            // Register cleanup for source stream
+            const stream = source;
+            this.lock.registerCleanup(()=>{
+                const s = stream;
+                if (typeof s.destroy === 'function') s.destroy();
+            });
             const tempPath = path.join(tmpdir(), '7z-iterator', shortHash(process.cwd()), tempSuffix('tmp.7z'));
             queue.defer((cb)=>{
                 streamToSource(source, {
@@ -83,10 +90,21 @@ let SevenZipIterator = class SevenZipIterator extends BaseIterator {
                     if (!result) return cb(new Error('No result from streamToSource'));
                     archiveSource = result.source;
                     if (result.fd !== undefined) {
-                        this.lock.fd = result.fd;
+                        const fd = result.fd;
+                        // Register cleanup for file descriptor
+                        this.lock.registerCleanup(()=>{
+                            fs.closeSync(fd);
+                        });
                     }
                     if (result.tempPath) {
-                        this.lock.tempPath = result.tempPath;
+                        const tp = result.tempPath;
+                        // Register cleanup for temp file
+                        this.lock.registerCleanup(()=>{
+                            try {
+                                rmSync(tp);
+                            } catch (_e) {
+                            /* ignore */ }
+                        });
                     }
                     cb();
                 });

package/dist/esm/SevenZipIterator.js.map

@@ -1 +1 @@
-{"version":3,"sources":["/Users/kevin/Dev/OpenSource/iterators/7z-iterator/src/SevenZipIterator.ts"],"sourcesContent":["import BaseIterator from 'extract-base-iterator';\nimport fs from 'fs';\nimport path from 'path';\nimport Queue from 'queue-cb';\nimport shortHash from 'short-hash';\nimport tempSuffix from 'temp-suffix';\nimport { tmpdir } from './compat.ts';\nimport Lock from './lib/Lock.ts';\nimport streamToSource, { type SourceResult } from './lib/streamToSource.ts';\nimport nextEntry from './nextEntry.ts';\nimport { setPassword } from './sevenz/codecs/index.ts';\nimport { type ArchiveSource, FileSource, type SevenZipEntry, SevenZipParser } from './sevenz/SevenZipParser.ts';\n\nimport type { ExtractOptions, LockT, SevenZipFileIterator } from './types.ts';\n\n/**\n * Iterator wrapper around SevenZipParser entries\n */\nclass EntryIterator implements SevenZipFileIterator {\n  private parser: SevenZipParser;\n  private entries: SevenZipEntry[];\n  private index = 0;\n\n  constructor(parser: SevenZipParser) {\n    this.parser = parser;\n    this.entries = parser.getEntries();\n  }\n\n  next(): SevenZipEntry | null {\n    if (this.index >= this.entries.length) {\n      return null;\n    }\n    return this.entries[this.index++];\n  }\n\n  getParser(): SevenZipParser {\n    return this.parser;\n  }\n}\n\nexport default class SevenZipIterator extends BaseIterator {\n  lock: LockT;\n  iterator: SevenZipFileIterator;\n\n  constructor(source: string | NodeJS.ReadableStream, options: ExtractOptions = {}) {\n    super(options);\n    this.lock = new Lock();\n    this.lock.iterator = this;\n    const queue = new Queue(1);\n    let cancelled = false;\n    let archiveSource: ArchiveSource | null = null;\n    const setup = (): undefined => {\n      cancelled = true;\n      return undefined;\n    };\n    this.processing.push(setup);\n\n    // Set password (or clear if not provided)\n    setPassword(options.password || null);\n\n    if (typeof source === 'string') {\n      // File path input - use FileSource directly\n      queue.defer((cb: (err?: Error) => void) => {\n        fs.stat(source, (statErr, stats) => {\n          if (this.done || cancelled) return;\n          if (statErr) return cb(statErr);\n\n          fs.open(source, 'r', (err, fd) => {\n            if (this.done || cancelled) return;\n            if (err) return cb(err);\n\n            archiveSource = new FileSource(fd, stats.size);\n            this.lock.fd = fd;\n            cb();\n          });\n        });\n      });\n    } else {\n      // Stream input - use hybrid memory/temp-file approach\n      // Store source stream in lock for cleanup if destroyed during download\n      this.lock.sourceStream = source as NodeJS.ReadableStream;\n      const tempPath = path.join(tmpdir(), '7z-iterator', shortHash(process.cwd()), tempSuffix('tmp.7z'));\n      queue.defer((cb: (err?: Error) => void) => {\n        streamToSource(\n          source,\n          {\n            memoryThreshold: options.memoryThreshold,\n            tempPath: tempPath,\n          },\n          (err?: Error, result?: SourceResult) => {\n            if (this.done || cancelled) return;\n            if (err) return cb(err);\n            if (!result) return cb(new Error('No result from streamToSource'));\n\n            archiveSource = result.source;\n            if (result.fd !== undefined) {\n              this.lock.fd = result.fd;\n            }\n            if (result.tempPath) {\n              this.lock.tempPath = result.tempPath;\n            }\n            cb();\n          }\n        );\n      });\n    }\n\n    // Parse and build iterator\n    queue.defer((cb: (err?: Error) => void) => {\n      if (this.done || cancelled) return;\n      if (!archiveSource) return cb(new Error('No archive source'));\n\n      try {\n        const parser = new SevenZipParser(archiveSource);\n        parser.parse();\n        this.iterator = new EntryIterator(parser);\n        cb();\n      } catch (parseErr) {\n        cb(parseErr as Error);\n      }\n    });\n\n    // start processing\n    queue.await((err?: Error) => {\n      this.processing.remove(setup);\n      if (this.done || cancelled) return;\n      err ? this.end(err) : this.push(nextEntry);\n    });\n  }\n\n  end(err?: Error) {\n    if (this.lock) {\n      const lock = this.lock;\n      this.lock = null; // Clear before release to prevent re-entrancy\n      lock.err = err;\n      lock.release();\n    }\n    // Don't call base end here - Lock.__destroy() handles it\n    this.iterator = null;\n  }\n}\n"],"names":["BaseIterator","fs","path","Queue","shortHash","tempSuffix","tmpdir","Lock","streamToSource","nextEntry","setPassword","FileSource","SevenZipParser","EntryIterator","next","index","entries","length","getParser","parser","getEntries","SevenZipIterator","end","err","lock","release","iterator","source","options","queue","cancelled","archiveSource","setup","undefined","processing","push","password","defer","cb","stat","statErr","stats","done","open","fd","size","sourceStream","tempPath","join","process","cwd","memoryThreshold","result","Error","parse","parseErr","await","remove"],"mappings":"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"}
+{"version":3,"sources":["/Users/kevin/Dev/OpenSource/iterators/7z-iterator/src/SevenZipIterator.ts"],"sourcesContent":["import BaseIterator, { Lock } from 'extract-base-iterator';\nimport fs from 'fs';\nimport { rmSync } from 'fs-remove-compat';\nimport path from 'path';\nimport Queue from 'queue-cb';\nimport shortHash from 'short-hash';\nimport tempSuffix from 'temp-suffix';\nimport { tmpdir } from './compat.ts';\nimport streamToSource, { type SourceResult } from './lib/streamToSource.ts';\nimport nextEntry from './nextEntry.ts';\nimport { setPassword } from './sevenz/codecs/index.ts';\nimport { type ArchiveSource, FileSource, type SevenZipEntry, SevenZipParser } from './sevenz/SevenZipParser.ts';\n\nimport type { Entry, ExtractOptions, SevenZipFileIterator } from './types.ts';\n\n/**\n * Iterator wrapper around SevenZipParser entries\n */\nclass EntryIterator implements SevenZipFileIterator {\n  private parser: SevenZipParser;\n  private entries: SevenZipEntry[];\n  private index = 0;\n\n  constructor(parser: SevenZipParser) {\n    this.parser = parser;\n    this.entries = parser.getEntries();\n  }\n\n  next(): SevenZipEntry | null {\n    if (this.index >= this.entries.length) {\n      return null;\n    }\n    return this.entries[this.index++];\n  }\n\n  getParser(): SevenZipParser {\n    return this.parser;\n  }\n}\n\nexport default class SevenZipIterator extends BaseIterator<Entry> {\n  lock: Lock | null;\n  iterator: SevenZipFileIterator;\n\n  constructor(source: string | NodeJS.ReadableStream, options: ExtractOptions = {}) {\n    super(options);\n    this.lock = new Lock();\n    this.lock.onDestroy = (err) => BaseIterator.prototype.end.call(this, err);\n    const queue = new Queue(1);\n    let cancelled = false;\n    let archiveSource: ArchiveSource | null = null;\n    const setup = (): undefined => {\n      cancelled = true;\n      return undefined;\n    };\n    this.processing.push(setup);\n\n    // Set password (or clear if not provided)\n    setPassword(options.password || null);\n\n    if (typeof source === 'string') {\n      // File path input - use FileSource directly\n      queue.defer((cb: (err?: Error) => void) => {\n        fs.stat(source, (statErr, stats) => {\n          if (this.done || cancelled) return;\n          if (statErr) return cb(statErr);\n\n          fs.open(source, 'r', (err, fd) => {\n            if (this.done || cancelled) return;\n            if (err) return cb(err);\n\n            archiveSource = new FileSource(fd, stats.size);\n            // Register cleanup for file descriptor\n            this.lock.registerCleanup(() => {\n              fs.closeSync(fd);\n            });\n            cb();\n          });\n        });\n      });\n    } else {\n      // Stream input - use hybrid memory/temp-file approach\n      // Register cleanup for source stream\n      const stream = source as NodeJS.ReadableStream;\n      this.lock.registerCleanup(() => {\n        const s = stream as NodeJS.ReadableStream & { destroy?: () => void };\n        if (typeof s.destroy === 'function') s.destroy();\n      });\n\n      const tempPath = path.join(tmpdir(), '7z-iterator', shortHash(process.cwd()), tempSuffix('tmp.7z'));\n      queue.defer((cb: (err?: Error) => void) => {\n        streamToSource(\n          source,\n          {\n            memoryThreshold: options.memoryThreshold,\n            tempPath: tempPath,\n          },\n          (err?: Error, result?: SourceResult) => {\n            if (this.done || cancelled) return;\n            if (err) return cb(err);\n            if (!result) return cb(new Error('No result from streamToSource'));\n\n            archiveSource = result.source;\n            if (result.fd !== undefined) {\n              const fd = result.fd;\n              // Register cleanup for file descriptor\n              this.lock.registerCleanup(() => {\n                fs.closeSync(fd);\n              });\n            }\n            if (result.tempPath) {\n              const tp = result.tempPath;\n              // Register cleanup for temp file\n              this.lock.registerCleanup(() => {\n                try {\n                  rmSync(tp);\n                } catch (_e) {\n                  /* ignore */\n                }\n              });\n            }\n            cb();\n          }\n        );\n      });\n    }\n\n    // Parse and build iterator\n    queue.defer((cb: (err?: Error) => void) => {\n      if (this.done || cancelled) return;\n      if (!archiveSource) return cb(new Error('No archive source'));\n\n      try {\n        const parser = new SevenZipParser(archiveSource);\n        parser.parse();\n        this.iterator = new EntryIterator(parser);\n        cb();\n      } catch (parseErr) {\n        cb(parseErr as Error);\n      }\n    });\n\n    // start processing\n    queue.await((err?: Error) => {\n      this.processing.remove(setup);\n      if (this.done || cancelled) return;\n      err ? this.end(err) : this.push(nextEntry);\n    });\n  }\n\n  end(err?: Error) {\n    if (this.lock) {\n      const lock = this.lock;\n      this.lock = null; // Clear before release to prevent re-entrancy\n      lock.err = err;\n      lock.release();\n    }\n    // Don't call base end here - Lock.__destroy() handles it\n    this.iterator = null;\n  }\n}\n"],"names":["BaseIterator","Lock","fs","rmSync","path","Queue","shortHash","tempSuffix","tmpdir","streamToSource","nextEntry","setPassword","FileSource","SevenZipParser","EntryIterator","next","index","entries","length","getParser","parser","getEntries","SevenZipIterator","end","err","lock","release","iterator","source","options","onDestroy","prototype","call","queue","cancelled","archiveSource","setup","undefined","processing","push","password","defer","cb","stat","statErr","stats","done","open","fd","size","registerCleanup","closeSync","stream","s","destroy","tempPath","join","process","cwd","memoryThreshold","result","Error","tp","_e","parse","parseErr","await","remove"],"mappings":"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"}

package/dist/esm/sevenz/ArchiveSource.d.ts

@@ -0,0 +1,40 @@
+/**
+ * ArchiveSource - Abstraction for reading 7z archive data
+ *
+ * Provides a common interface for reading archive data from either
+ * a file descriptor or an in-memory buffer.
+ */
+/**
+ * Archive source abstraction - allows reading from file descriptor or buffer
+ */
+export interface ArchiveSource {
+    read(position: number, length: number): Buffer;
+    getSize(): number;
+    close(): void;
+}
+/**
+ * Buffer-based archive source
+ *
+ * Used when the entire archive is already in memory.
+ */
+export declare class BufferSource implements ArchiveSource {
+    private buffer;
+    constructor(buffer: Buffer);
+    read(position: number, length: number): Buffer;
+    getSize(): number;
+    close(): void;
+}
+/**
+ * File descriptor based archive source
+ *
+ * Used for reading directly from a file on disk.
+ * More memory efficient for large archives.
+ */
+export declare class FileSource implements ArchiveSource {
+    private fd;
+    private size;
+    constructor(fd: number, size: number);
+    read(position: number, length: number): Buffer;
+    getSize(): number;
+    close(): void;
+}

package/dist/esm/sevenz/ArchiveSource.js

@@ -0,0 +1,54 @@
+/**
+ * ArchiveSource - Abstraction for reading 7z archive data
+ *
+ * Provides a common interface for reading archive data from either
+ * a file descriptor or an in-memory buffer.
+ */ import { allocBuffer } from 'extract-base-iterator';
+import fs from 'fs';
+/**
+ * Buffer-based archive source
+ *
+ * Used when the entire archive is already in memory.
+ */ export class BufferSource {
+    read(position, length) {
+        return this.buffer.slice(position, position + length);
+    }
+    getSize() {
+        return this.buffer.length;
+    }
+    close() {
+    // Nothing to close for buffer
+    }
+    constructor(buffer){
+        this.buffer = buffer;
+    }
+}
+/**
+ * File descriptor based archive source
+ *
+ * Used for reading directly from a file on disk.
+ * More memory efficient for large archives.
+ */ export class FileSource {
+    read(position, length) {
+        const buf = allocBuffer(length);
+        const bytesRead = fs.readSync(this.fd, buf, 0, length, position);
+        if (bytesRead < length) {
+            return buf.slice(0, bytesRead);
+        }
+        return buf;
+    }
+    getSize() {
+        return this.size;
+    }
+    close() {
+        try {
+            fs.closeSync(this.fd);
+        } catch (_e) {
+        // Ignore close errors
+        }
+    }
+    constructor(fd, size){
+        this.fd = fd;
+        this.size = size;
+    }
+}

package/dist/esm/sevenz/ArchiveSource.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["/Users/kevin/Dev/OpenSource/iterators/7z-iterator/src/sevenz/ArchiveSource.ts"],"sourcesContent":["/**\n * ArchiveSource - Abstraction for reading 7z archive data\n *\n * Provides a common interface for reading archive data from either\n * a file descriptor or an in-memory buffer.\n */\n\nimport { allocBuffer } from 'extract-base-iterator';\nimport fs from 'fs';\n\n/**\n * Archive source abstraction - allows reading from file descriptor or buffer\n */\nexport interface ArchiveSource {\n  read(position: number, length: number): Buffer;\n  getSize(): number;\n  close(): void;\n}\n\n/**\n * Buffer-based archive source\n *\n * Used when the entire archive is already in memory.\n */\nexport class BufferSource implements ArchiveSource {\n  private buffer: Buffer;\n\n  constructor(buffer: Buffer) {\n    this.buffer = buffer;\n  }\n\n  read(position: number, length: number): Buffer {\n    return this.buffer.slice(position, position + length);\n  }\n\n  getSize(): number {\n    return this.buffer.length;\n  }\n\n  close(): void {\n    // Nothing to close for buffer\n  }\n}\n\n/**\n * File descriptor based archive source\n *\n * Used for reading directly from a file on disk.\n * More memory efficient for large archives.\n */\nexport class FileSource implements ArchiveSource {\n  private fd: number;\n  private size: number;\n\n  constructor(fd: number, size: number) {\n    this.fd = fd;\n    this.size = size;\n  }\n\n  read(position: number, length: number): Buffer {\n    const buf = allocBuffer(length);\n    const bytesRead = fs.readSync(this.fd, buf, 0, length, position);\n    if (bytesRead < length) {\n      return buf.slice(0, bytesRead);\n    }\n    return buf;\n  }\n\n  getSize(): number {\n    return this.size;\n  }\n\n  close(): void {\n    try {\n      fs.closeSync(this.fd);\n    } catch (_e) {\n      // Ignore close errors\n    }\n  }\n}\n"],"names":["allocBuffer","fs","BufferSource","read","position","length","buffer","slice","getSize","close","FileSource","buf","bytesRead","readSync","fd","size","closeSync","_e"],"mappings":"AAAA;;;;;CAKC,GAED,SAASA,WAAW,QAAQ,wBAAwB;AACpD,OAAOC,QAAQ,KAAK;AAWpB;;;;CAIC,GACD,OAAO,MAAMC;IAOXC,KAAKC,QAAgB,EAAEC,MAAc,EAAU;QAC7C,OAAO,IAAI,CAACC,MAAM,CAACC,KAAK,CAACH,UAAUA,WAAWC;IAChD;IAEAG,UAAkB;QAChB,OAAO,IAAI,CAACF,MAAM,CAACD,MAAM;IAC3B;IAEAI,QAAc;IACZ,8BAA8B;IAChC;IAdA,YAAYH,MAAc,CAAE;QAC1B,IAAI,CAACA,MAAM,GAAGA;IAChB;AAaF;AAEA;;;;;CAKC,GACD,OAAO,MAAMI;IASXP,KAAKC,QAAgB,EAAEC,MAAc,EAAU;QAC7C,MAAMM,MAAMX,YAAYK;QACxB,MAAMO,YAAYX,GAAGY,QAAQ,CAAC,IAAI,CAACC,EAAE,EAAEH,KAAK,GAAGN,QAAQD;QACvD,IAAIQ,YAAYP,QAAQ;YACtB,OAAOM,IAAIJ,KAAK,CAAC,GAAGK;QACtB;QACA,OAAOD;IACT;IAEAH,UAAkB;QAChB,OAAO,IAAI,CAACO,IAAI;IAClB;IAEAN,QAAc;QACZ,IAAI;YACFR,GAAGe,SAAS,CAAC,IAAI,CAACF,EAAE;QACtB,EAAE,OAAOG,IAAI;QACX,sBAAsB;QACxB;IACF;IAxBA,YAAYH,EAAU,EAAEC,IAAY,CAAE;QACpC,IAAI,CAACD,EAAE,GAAGA;QACV,IAAI,CAACC,IAAI,GAAGA;IACd;AAsBF"}

package/dist/esm/sevenz/SevenZipParser.d.ts

@@ -1,5 +1,26 @@
+/**
+ * SevenZipParser - Main 7z archive parser
+ *
+ * Handles reading archive structure and providing file streams.
+ *
+ * Parser Flow:
+ * 1. Read signature header (32 bytes) to get header location
+ * 2. Read encoded header from nextHeaderOffset
+ * 3. If header is compressed, decompress it first
+ * 4. Parse streams info (folder structure, pack positions)
+ * 5. Parse files info (names, sizes, attributes)
+ * 6. Build entry list for iteration
+ *
+ * Decompression:
+ * - 7z uses "folders" as decompression units
+ * - Solid archives: multiple files share one folder (decompress once)
+ * - Non-solid: one file per folder
+ * - Supports LZMA, LZMA2, COPY, BCJ2, and other codecs
+ */
 import Stream from 'stream';
+import type { ArchiveSource } from './ArchiveSource.js';
 type Readable = Stream.Readable;
+export { type ArchiveSource, BufferSource, FileSource } from './ArchiveSource.js';
 export interface SevenZipEntry {
     name: string;
     path: string;
@@ -16,35 +37,6 @@ export interface SevenZipEntry {
     _hasStream: boolean;
     _crc?: number;
 }
-/**
- * Archive source abstraction - allows reading from file descriptor or buffer
- */
-export interface ArchiveSource {
-    read(position: number, length: number): Buffer;
-    getSize(): number;
-    close(): void;
-}
-/**
- * Buffer-based archive source
- */
-export declare class BufferSource implements ArchiveSource {
-    private buffer;
-    constructor(buffer: Buffer);
-    read(position: number, length: number): Buffer;
-    getSize(): number;
-    close(): void;
-}
-/**
- * File descriptor based archive source
- */
-export declare class FileSource implements ArchiveSource {
-    private fd;
-    private size;
-    constructor(fd: number, size: number);
-    read(position: number, length: number): Buffer;
-    getSize(): number;
-    close(): void;
-}
 /**
  * SevenZipParser - parses 7z archives and provides entry iteration
  */
@@ -122,4 +114,3 @@ export declare class SevenZipParser {
      */
     close(): void;
 }
-export {};

package/dist/esm/sevenz/SevenZipParser.js

@@ -1,7 +1,22 @@
-// SevenZipParser - Main 7z archive parser
-// Handles reading archive structure and providing file streams
-import { allocBuffer, crc32 } from 'extract-base-iterator';
-import fs from 'fs';
+/**
+ * SevenZipParser - Main 7z archive parser
+ *
+ * Handles reading archive structure and providing file streams.
+ *
+ * Parser Flow:
+ * 1. Read signature header (32 bytes) to get header location
+ * 2. Read encoded header from nextHeaderOffset
+ * 3. If header is compressed, decompress it first
+ * 4. Parse streams info (folder structure, pack positions)
+ * 5. Parse files info (names, sizes, attributes)
+ * 6. Build entry list for iteration
+ *
+ * Decompression:
+ * - 7z uses "folders" as decompression units
+ * - Solid archives: multiple files share one folder (decompress once)
+ * - Non-solid: one file per folder
+ * - Supports LZMA, LZMA2, COPY, BCJ2, and other codecs
+ */ import { crc32 } from 'extract-base-iterator';
 import oo from 'on-one';
 import Stream from 'stream';
 import { decodeBcj2Multi, getCodec, getCodecName, isBcj2Codec, isCodecSupported } from './codecs/index.js';
@@ -16,48 +31,8 @@ if (major > 0) {
 import { createCodedError, ErrorCode, FileAttribute, PropertyId, SIGNATURE_HEADER_SIZE } from './constants.js';
 import { parseEncodedHeader, parseHeaderContent, parseSignatureHeader } from './headers.js';
 import { readNumber } from './NumberCodec.js';
-/**
- * Buffer-based archive source
- */ export class BufferSource {
-    read(position, length) {
-        return this.buffer.slice(position, position + length);
-    }
-    getSize() {
-        return this.buffer.length;
-    }
-    close() {
-    // Nothing to close for buffer
-    }
-    constructor(buffer){
-        this.buffer = buffer;
-    }
-}
-/**
- * File descriptor based archive source
- */ export class FileSource {
-    read(position, length) {
-        const buf = allocBuffer(length);
-        const bytesRead = fs.readSync(this.fd, buf, 0, length, position);
-        if (bytesRead < length) {
-            return buf.slice(0, bytesRead);
-        }
-        return buf;
-    }
-    getSize() {
-        return this.size;
-    }
-    close() {
-        try {
-            fs.closeSync(this.fd);
-        } catch (_e) {
-        // Ignore close errors
-        }
-    }
-    constructor(fd, size){
-        this.fd = fd;
-        this.size = size;
-    }
-}
+// Re-export for backwards compatibility
+export { BufferSource, FileSource } from './ArchiveSource.js';
 /**
  * SevenZipParser - parses 7z archives and provides entry iteration
  */ export class SevenZipParser {