7z-iterator 0.1.2 → 0.1.4

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 os from 'os';\nimport osShim from 'os-shim';\nimport path from 'path';\nimport Queue from 'queue-cb';\nimport shortHash from 'short-hash';\nimport tempSuffix from 'temp-suffix';\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\nvar tmpdir = os.tmpdir || osShim.tmpdir;\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    var queue = new Queue(1);\n    var cancelled = false;\n    var archiveSource: ArchiveSource | null = null;\n    var 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      var 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        var 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","os","osShim","path","Queue","shortHash","tempSuffix","Lock","streamToSource","nextEntry","setPassword","FileSource","SevenZipParser","tmpdir","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","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 from 'extract-base-iterator';\nimport fs from 'fs';\nimport os from 'os';\nimport osShim from 'os-shim';\nimport path from 'path';\nimport Queue from 'queue-cb';\nimport shortHash from 'short-hash';\nimport tempSuffix from 'temp-suffix';\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\nvar tmpdir = os.tmpdir || osShim.tmpdir;\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    var queue = new Queue(1);\n    var cancelled = false;\n    var archiveSource: ArchiveSource | null = null;\n    var 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      var 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        var 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","os","osShim","path","Queue","shortHash","tempSuffix","Lock","streamToSource","nextEntry","setPassword","FileSource","SevenZipParser","tmpdir","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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"}

package/dist/esm/lib/Lock.d.ts

@@ -5,6 +5,7 @@ export default class Lock {
     fd: number;
     iterator: BaseIterator;
     err: Error;
+    sourceStream: NodeJS.ReadableStream;
     retain(): void;
     release(): void;
     private __destroy;

package/dist/esm/lib/Lock.js

@@ -11,6 +11,12 @@ let Lock = class Lock {
         if (this.count === 0) this.__destroy();
     }
     __destroy() {
+        // Destroy source stream FIRST to stop data flow (e.g., during download)
+        if (this.sourceStream) {
+            const stream = this.sourceStream;
+            if (typeof stream.destroy === 'function') stream.destroy();
+            this.sourceStream = null;
+        }
         if (this.tempPath) {
             try {
                 rimraf2.sync(this.tempPath, {
@@ -36,6 +42,8 @@ let Lock = class Lock {
         this.fd = null;
         this.iterator = null;
         this.err = null;
+        // cleanup resources
+        this.sourceStream = null;
     }
 };
 export { Lock as default };

package/dist/esm/lib/Lock.js.map

@@ -1 +1 @@
-{"version":3,"sources":["/Users/kevin/Dev/OpenSource/iterators/7z-iterator/src/lib/Lock.ts"],"sourcesContent":["import BaseIterator from 'extract-base-iterator';\nimport fs from 'fs';\nimport rimraf2 from 'rimraf2';\n\nexport default class Lock {\n  private count = 1;\n\n  // members\n  tempPath: string = null;\n  fd: number = null;\n  iterator: BaseIterator = null;\n  err: Error = null;\n\n  retain() {\n    this.count++;\n  }\n\n  release() {\n    if (this.count <= 0) throw new Error('Lock count is corrupted');\n    this.count--;\n    if (this.count === 0) this.__destroy();\n  }\n\n  private __destroy() {\n    if (this.tempPath) {\n      try {\n        rimraf2.sync(this.tempPath, { disableGlob: true });\n      } catch (_err) {\n        /* empty */\n      }\n      this.tempPath = null;\n    }\n\n    if (this.fd) {\n      fs.closeSync(this.fd);\n      this.fd = null;\n    }\n\n    if (this.iterator) {\n      BaseIterator.prototype.end.call(this.iterator, this.err || null);\n      this.iterator = null;\n    }\n  }\n}\n"],"names":["BaseIterator","fs","rimraf2","Lock","retain","count","release","Error","__destroy","tempPath","sync","disableGlob","_err","fd","closeSync","iterator","prototype","end","call","err"],"mappings":"AAAA,OAAOA,kBAAkB,wBAAwB;AACjD,OAAOC,QAAQ,KAAK;AACpB,OAAOC,aAAa,UAAU;AAEf,IAAA,AAAMC,OAAN,MAAMA;IASnBC,SAAS;QACP,IAAI,CAACC,KAAK;IACZ;IAEAC,UAAU;QACR,IAAI,IAAI,CAACD,KAAK,IAAI,GAAG,MAAM,IAAIE,MAAM;QACrC,IAAI,CAACF,KAAK;QACV,IAAI,IAAI,CAACA,KAAK,KAAK,GAAG,IAAI,CAACG,SAAS;IACtC;IAEQA,YAAY;QAClB,IAAI,IAAI,CAACC,QAAQ,EAAE;YACjB,IAAI;gBACFP,QAAQQ,IAAI,CAAC,IAAI,CAACD,QAAQ,EAAE;oBAAEE,aAAa;gBAAK;YAClD,EAAE,OAAOC,MAAM;YACb,SAAS,GACX;YACA,IAAI,CAACH,QAAQ,GAAG;QAClB;QAEA,IAAI,IAAI,CAACI,EAAE,EAAE;YACXZ,GAAGa,SAAS,CAAC,IAAI,CAACD,EAAE;YACpB,IAAI,CAACA,EAAE,GAAG;QACZ;QAEA,IAAI,IAAI,CAACE,QAAQ,EAAE;YACjBf,aAAagB,SAAS,CAACC,GAAG,CAACC,IAAI,CAAC,IAAI,CAACH,QAAQ,EAAE,IAAI,CAACI,GAAG,IAAI;YAC3D,IAAI,CAACJ,QAAQ,GAAG;QAClB;IACF;;aArCQV,QAAQ;QAEhB,UAAU;aACVI,WAAmB;aACnBI,KAAa;aACbE,WAAyB;aACzBI,MAAa;;AAgCf;AAvCA,SAAqBhB,kBAuCpB"}
+{"version":3,"sources":["/Users/kevin/Dev/OpenSource/iterators/7z-iterator/src/lib/Lock.ts"],"sourcesContent":["import BaseIterator from 'extract-base-iterator';\nimport fs from 'fs';\nimport rimraf2 from 'rimraf2';\n\nexport default class Lock {\n  private count = 1;\n\n  // members\n  tempPath: string = null;\n  fd: number = null;\n  iterator: BaseIterator = null;\n  err: Error = null;\n\n  // cleanup resources\n  sourceStream: NodeJS.ReadableStream = null;\n\n  retain() {\n    this.count++;\n  }\n\n  release() {\n    if (this.count <= 0) throw new Error('Lock count is corrupted');\n    this.count--;\n    if (this.count === 0) this.__destroy();\n  }\n\n  private __destroy() {\n    // Destroy source stream FIRST to stop data flow (e.g., during download)\n    if (this.sourceStream) {\n      const stream = this.sourceStream as NodeJS.ReadableStream & { destroy?: () => void };\n      if (typeof stream.destroy === 'function') stream.destroy();\n      this.sourceStream = null;\n    }\n\n    if (this.tempPath) {\n      try {\n        rimraf2.sync(this.tempPath, { disableGlob: true });\n      } catch (_err) {\n        /* empty */\n      }\n      this.tempPath = null;\n    }\n\n    if (this.fd) {\n      fs.closeSync(this.fd);\n      this.fd = null;\n    }\n\n    if (this.iterator) {\n      BaseIterator.prototype.end.call(this.iterator, this.err || null);\n      this.iterator = null;\n    }\n  }\n}\n"],"names":["BaseIterator","fs","rimraf2","Lock","retain","count","release","Error","__destroy","sourceStream","stream","destroy","tempPath","sync","disableGlob","_err","fd","closeSync","iterator","prototype","end","call","err"],"mappings":"AAAA,OAAOA,kBAAkB,wBAAwB;AACjD,OAAOC,QAAQ,KAAK;AACpB,OAAOC,aAAa,UAAU;AAEf,IAAA,AAAMC,OAAN,MAAMA;IAYnBC,SAAS;QACP,IAAI,CAACC,KAAK;IACZ;IAEAC,UAAU;QACR,IAAI,IAAI,CAACD,KAAK,IAAI,GAAG,MAAM,IAAIE,MAAM;QACrC,IAAI,CAACF,KAAK;QACV,IAAI,IAAI,CAACA,KAAK,KAAK,GAAG,IAAI,CAACG,SAAS;IACtC;IAEQA,YAAY;QAClB,wEAAwE;QACxE,IAAI,IAAI,CAACC,YAAY,EAAE;YACrB,MAAMC,SAAS,IAAI,CAACD,YAAY;YAChC,IAAI,OAAOC,OAAOC,OAAO,KAAK,YAAYD,OAAOC,OAAO;YACxD,IAAI,CAACF,YAAY,GAAG;QACtB;QAEA,IAAI,IAAI,CAACG,QAAQ,EAAE;YACjB,IAAI;gBACFV,QAAQW,IAAI,CAAC,IAAI,CAACD,QAAQ,EAAE;oBAAEE,aAAa;gBAAK;YAClD,EAAE,OAAOC,MAAM;YACb,SAAS,GACX;YACA,IAAI,CAACH,QAAQ,GAAG;QAClB;QAEA,IAAI,IAAI,CAACI,EAAE,EAAE;YACXf,GAAGgB,SAAS,CAAC,IAAI,CAACD,EAAE;YACpB,IAAI,CAACA,EAAE,GAAG;QACZ;QAEA,IAAI,IAAI,CAACE,QAAQ,EAAE;YACjBlB,aAAamB,SAAS,CAACC,GAAG,CAACC,IAAI,CAAC,IAAI,CAACH,QAAQ,EAAE,IAAI,CAACI,GAAG,IAAI;YAC3D,IAAI,CAACJ,QAAQ,GAAG;QAClB;IACF;;aA/CQb,QAAQ;QAEhB,UAAU;aACVO,WAAmB;aACnBI,KAAa;aACbE,WAAyB;aACzBI,MAAa;QAEb,oBAAoB;aACpBb,eAAsC;;AAuCxC;AAjDA,SAAqBN,kBAiDpB"}

package/dist/esm/nextEntry.js

@@ -21,8 +21,8 @@ export default function nextEntry(iterator, callback) {
             value: null
         });
     });
-    // done: signal iteration is complete
-    if (iterator.isDone() || !entry) return callback(null, {
+    // done: signal iteration is complete (guard against stale lock)
+    if (!iterator.lock || iterator.isDone() || !entry) return callback(null, {
         done: true,
         value: null
     });

package/dist/esm/nextEntry.js.map

@@ -1 +1 @@
-{"version":3,"sources":["/Users/kevin/Dev/OpenSource/iterators/7z-iterator/src/nextEntry.ts"],"sourcesContent":["import once from 'call-once-fn';\nimport { type DirectoryAttributes, DirectoryEntry, type FileAttributes, type LinkAttributes, SymbolicLinkEntry } from 'extract-base-iterator';\nimport compact from 'lodash.compact';\nimport path from 'path';\nimport FileEntry from './FileEntry.ts';\nimport type SevenZipIterator from './SevenZipIterator.ts';\nimport type { SevenZipEntry } from './sevenz/SevenZipParser.ts';\nimport type { Entry, EntryCallback } from './types.ts';\n\nexport type NextCallback = (error?: Error, entry?: Entry) => undefined;\n\n// Entry attributes object that gets mutated in switch - union of possible shapes\n// mtime is number for FileAttributes compatibility (timestamp in ms)\ntype EntryAttributesBuilder = {\n  path: string;\n  basename: string;\n  mtime: number;\n  mode: number;\n  type?: 'file' | 'directory';\n  size?: number;\n};\n\nexport default function nextEntry<_T>(iterator: SevenZipIterator, callback: EntryCallback): undefined {\n  if (!iterator.iterator) {\n    callback(new Error('iterator missing'));\n    return;\n  }\n\n  var entry: SevenZipEntry | null = null;\n  entry = iterator.iterator.next();\n\n  var nextCallback = once((err?: Error, entry?: Entry) => {\n    // keep processing\n    if (entry) iterator.push(nextEntry);\n    err ? callback(err) : callback(null, entry ? { done: false, value: entry } : { done: true, value: null });\n  }) as NextCallback;\n\n  // done: signal iteration is complete\n  if (iterator.isDone() || !entry) return callback(null, { done: true, value: null });\n\n  // Skip anti-files (these mark files to delete in delta archives)\n  if (entry.isAntiFile) {\n    iterator.push(nextEntry);\n    return callback(null, null);\n  }\n\n  // Determine type from entry\n  var type = entry.type;\n\n  // Default modes (decimal values for Node 0.8 compatibility)\n  // 0o755 = 493, 0o644 = 420\n  var defaultMode = type === 'directory' ? 493 : 420;\n\n  // Build attributes from 7z entry\n  // mtime must be timestamp (number) for FileAttributes compatibility\n  var mtimeDate = entry.mtime || new Date();\n  var attributes: EntryAttributesBuilder = {\n    path: compact(entry.path.split(path.sep)).join(path.sep),\n    basename: entry.name,\n    mtime: mtimeDate.getTime(),\n    mode: entry.mode !== undefined ? entry.mode : defaultMode,\n  };\n\n  switch (type) {\n    case 'directory':\n      attributes.type = 'directory';\n      return nextCallback(null, new DirectoryEntry(attributes as DirectoryAttributes));\n\n    case 'link': {\n      // For symlinks, the file content IS the symlink target path\n      // Read the content to get the linkpath for SymbolicLinkEntry\n      var parser = iterator.iterator.getParser();\n      var stream = parser.getEntryStream(entry);\n      var chunks: Buffer[] = [];\n\n      stream.on('data', (chunk: Buffer) => {\n        chunks.push(chunk);\n      });\n      stream.on('end', () => {\n        var linkpath = Buffer.concat(chunks).toString('utf8');\n\n        var linkAttributes: LinkAttributes = {\n          path: attributes.path,\n          mtime: attributes.mtime,\n          mode: attributes.mode,\n          linkpath: linkpath,\n        };\n\n        nextCallback(null, new SymbolicLinkEntry(linkAttributes));\n      });\n      stream.on('error', (err: Error) => {\n        nextCallback(err);\n      });\n      return;\n    }\n\n    case 'file': {\n      attributes.type = 'file';\n      attributes.size = entry.size;\n      var parser2 = iterator.iterator.getParser();\n      return nextCallback(null, new FileEntry(attributes as FileAttributes, entry, parser2, iterator.lock));\n    }\n  }\n\n  return callback(new Error(`Unrecognized entry type: ${type}`));\n}\n"],"names":["once","DirectoryEntry","SymbolicLinkEntry","compact","path","FileEntry","nextEntry","iterator","callback","Error","entry","next","nextCallback","err","push","done","value","isDone","isAntiFile","type","defaultMode","mtimeDate","mtime","Date","attributes","split","sep","join","basename","name","getTime","mode","undefined","parser","getParser","stream","getEntryStream","chunks","on","chunk","linkpath","Buffer","concat","toString","linkAttributes","size","parser2","lock"],"mappings":"AAAA,OAAOA,UAAU,eAAe;AAChC,SAAmCC,cAAc,EAA4CC,iBAAiB,QAAQ,wBAAwB;AAC9I,OAAOC,aAAa,iBAAiB;AACrC,OAAOC,UAAU,OAAO;AACxB,OAAOC,eAAe,iBAAiB;AAkBvC,eAAe,SAASC,UAAcC,QAA0B,EAAEC,QAAuB;IACvF,IAAI,CAACD,SAASA,QAAQ,EAAE;QACtBC,SAAS,IAAIC,MAAM;QACnB;IACF;IAEA,IAAIC,QAA8B;IAClCA,QAAQH,SAASA,QAAQ,CAACI,IAAI;IAE9B,IAAIC,eAAeZ,KAAK,CAACa,KAAaH;QACpC,kBAAkB;QAClB,IAAIA,OAAOH,SAASO,IAAI,CAACR;QACzBO,MAAML,SAASK,OAAOL,SAAS,MAAME,QAAQ;YAAEK,MAAM;YAAOC,OAAON;QAAM,IAAI;YAAEK,MAAM;YAAMC,OAAO;QAAK;IACzG;IAEA,qCAAqC;IACrC,IAAIT,SAASU,MAAM,MAAM,CAACP,OAAO,OAAOF,SAAS,MAAM;QAAEO,MAAM;QAAMC,OAAO;IAAK;IAEjF,iEAAiE;IACjE,IAAIN,MAAMQ,UAAU,EAAE;QACpBX,SAASO,IAAI,CAACR;QACd,OAAOE,SAAS,MAAM;IACxB;IAEA,4BAA4B;IAC5B,IAAIW,OAAOT,MAAMS,IAAI;IAErB,4DAA4D;IAC5D,2BAA2B;IAC3B,IAAIC,cAAcD,SAAS,cAAc,MAAM;IAE/C,iCAAiC;IACjC,oEAAoE;IACpE,IAAIE,YAAYX,MAAMY,KAAK,IAAI,IAAIC;IACnC,IAAIC,aAAqC;QACvCpB,MAAMD,QAAQO,MAAMN,IAAI,CAACqB,KAAK,CAACrB,KAAKsB,GAAG,GAAGC,IAAI,CAACvB,KAAKsB,GAAG;QACvDE,UAAUlB,MAAMmB,IAAI;QACpBP,OAAOD,UAAUS,OAAO;QACxBC,MAAMrB,MAAMqB,IAAI,KAAKC,YAAYtB,MAAMqB,IAAI,GAAGX;IAChD;IAEA,OAAQD;QACN,KAAK;YACHK,WAAWL,IAAI,GAAG;YAClB,OAAOP,aAAa,MAAM,IAAIX,eAAeuB;QAE/C,KAAK;YAAQ;gBACX,4DAA4D;gBAC5D,6DAA6D;gBAC7D,IAAIS,SAAS1B,SAASA,QAAQ,CAAC2B,SAAS;gBACxC,IAAIC,SAASF,OAAOG,cAAc,CAAC1B;gBACnC,IAAI2B,SAAmB,EAAE;gBAEzBF,OAAOG,EAAE,CAAC,QAAQ,CAACC;oBACjBF,OAAOvB,IAAI,CAACyB;gBACd;gBACAJ,OAAOG,EAAE,CAAC,OAAO;oBACf,IAAIE,WAAWC,OAAOC,MAAM,CAACL,QAAQM,QAAQ,CAAC;oBAE9C,IAAIC,iBAAiC;wBACnCxC,MAAMoB,WAAWpB,IAAI;wBACrBkB,OAAOE,WAAWF,KAAK;wBACvBS,MAAMP,WAAWO,IAAI;wBACrBS,UAAUA;oBACZ;oBAEA5B,aAAa,MAAM,IAAIV,kBAAkB0C;gBAC3C;gBACAT,OAAOG,EAAE,CAAC,SAAS,CAACzB;oBAClBD,aAAaC;gBACf;gBACA;YACF;QAEA,KAAK;YAAQ;gBACXW,WAAWL,IAAI,GAAG;gBAClBK,WAAWqB,IAAI,GAAGnC,MAAMmC,IAAI;gBAC5B,IAAIC,UAAUvC,SAASA,QAAQ,CAAC2B,SAAS;gBACzC,OAAOtB,aAAa,MAAM,IAAIP,UAAUmB,YAA8Bd,OAAOoC,SAASvC,SAASwC,IAAI;YACrG;IACF;IAEA,OAAOvC,SAAS,IAAIC,MAAM,CAAC,yBAAyB,EAAEU,MAAM;AAC9D"}
+{"version":3,"sources":["/Users/kevin/Dev/OpenSource/iterators/7z-iterator/src/nextEntry.ts"],"sourcesContent":["import once from 'call-once-fn';\nimport { type DirectoryAttributes, DirectoryEntry, type FileAttributes, type LinkAttributes, SymbolicLinkEntry } from 'extract-base-iterator';\nimport compact from 'lodash.compact';\nimport path from 'path';\nimport FileEntry from './FileEntry.ts';\nimport type SevenZipIterator from './SevenZipIterator.ts';\nimport type { SevenZipEntry } from './sevenz/SevenZipParser.ts';\nimport type { Entry, EntryCallback } from './types.ts';\n\nexport type NextCallback = (error?: Error, entry?: Entry) => undefined;\n\n// Entry attributes object that gets mutated in switch - union of possible shapes\n// mtime is number for FileAttributes compatibility (timestamp in ms)\ntype EntryAttributesBuilder = {\n  path: string;\n  basename: string;\n  mtime: number;\n  mode: number;\n  type?: 'file' | 'directory';\n  size?: number;\n};\n\nexport default function nextEntry<_T>(iterator: SevenZipIterator, callback: EntryCallback): undefined {\n  if (!iterator.iterator) {\n    callback(new Error('iterator missing'));\n    return;\n  }\n\n  var entry: SevenZipEntry | null = null;\n  entry = iterator.iterator.next();\n\n  var nextCallback = once((err?: Error, entry?: Entry) => {\n    // keep processing\n    if (entry) iterator.push(nextEntry);\n    err ? callback(err) : callback(null, entry ? { done: false, value: entry } : { done: true, value: null });\n  }) as NextCallback;\n\n  // done: signal iteration is complete (guard against stale lock)\n  if (!iterator.lock || iterator.isDone() || !entry) return callback(null, { done: true, value: null });\n\n  // Skip anti-files (these mark files to delete in delta archives)\n  if (entry.isAntiFile) {\n    iterator.push(nextEntry);\n    return callback(null, null);\n  }\n\n  // Determine type from entry\n  var type = entry.type;\n\n  // Default modes (decimal values for Node 0.8 compatibility)\n  // 0o755 = 493, 0o644 = 420\n  var defaultMode = type === 'directory' ? 493 : 420;\n\n  // Build attributes from 7z entry\n  // mtime must be timestamp (number) for FileAttributes compatibility\n  var mtimeDate = entry.mtime || new Date();\n  var attributes: EntryAttributesBuilder = {\n    path: compact(entry.path.split(path.sep)).join(path.sep),\n    basename: entry.name,\n    mtime: mtimeDate.getTime(),\n    mode: entry.mode !== undefined ? entry.mode : defaultMode,\n  };\n\n  switch (type) {\n    case 'directory':\n      attributes.type = 'directory';\n      return nextCallback(null, new DirectoryEntry(attributes as DirectoryAttributes));\n\n    case 'link': {\n      // For symlinks, the file content IS the symlink target path\n      // Read the content to get the linkpath for SymbolicLinkEntry\n      var parser = iterator.iterator.getParser();\n      var stream = parser.getEntryStream(entry);\n      var chunks: Buffer[] = [];\n\n      stream.on('data', (chunk: Buffer) => {\n        chunks.push(chunk);\n      });\n      stream.on('end', () => {\n        var linkpath = Buffer.concat(chunks).toString('utf8');\n\n        var linkAttributes: LinkAttributes = {\n          path: attributes.path,\n          mtime: attributes.mtime,\n          mode: attributes.mode,\n          linkpath: linkpath,\n        };\n\n        nextCallback(null, new SymbolicLinkEntry(linkAttributes));\n      });\n      stream.on('error', (err: Error) => {\n        nextCallback(err);\n      });\n      return;\n    }\n\n    case 'file': {\n      attributes.type = 'file';\n      attributes.size = entry.size;\n      var parser2 = iterator.iterator.getParser();\n      return nextCallback(null, new FileEntry(attributes as FileAttributes, entry, parser2, iterator.lock));\n    }\n  }\n\n  return callback(new Error(`Unrecognized entry type: ${type}`));\n}\n"],"names":["once","DirectoryEntry","SymbolicLinkEntry","compact","path","FileEntry","nextEntry","iterator","callback","Error","entry","next","nextCallback","err","push","done","value","lock","isDone","isAntiFile","type","defaultMode","mtimeDate","mtime","Date","attributes","split","sep","join","basename","name","getTime","mode","undefined","parser","getParser","stream","getEntryStream","chunks","on","chunk","linkpath","Buffer","concat","toString","linkAttributes","size","parser2"],"mappings":"AAAA,OAAOA,UAAU,eAAe;AAChC,SAAmCC,cAAc,EAA4CC,iBAAiB,QAAQ,wBAAwB;AAC9I,OAAOC,aAAa,iBAAiB;AACrC,OAAOC,UAAU,OAAO;AACxB,OAAOC,eAAe,iBAAiB;AAkBvC,eAAe,SAASC,UAAcC,QAA0B,EAAEC,QAAuB;IACvF,IAAI,CAACD,SAASA,QAAQ,EAAE;QACtBC,SAAS,IAAIC,MAAM;QACnB;IACF;IAEA,IAAIC,QAA8B;IAClCA,QAAQH,SAASA,QAAQ,CAACI,IAAI;IAE9B,IAAIC,eAAeZ,KAAK,CAACa,KAAaH;QACpC,kBAAkB;QAClB,IAAIA,OAAOH,SAASO,IAAI,CAACR;QACzBO,MAAML,SAASK,OAAOL,SAAS,MAAME,QAAQ;YAAEK,MAAM;YAAOC,OAAON;QAAM,IAAI;YAAEK,MAAM;YAAMC,OAAO;QAAK;IACzG;IAEA,gEAAgE;IAChE,IAAI,CAACT,SAASU,IAAI,IAAIV,SAASW,MAAM,MAAM,CAACR,OAAO,OAAOF,SAAS,MAAM;QAAEO,MAAM;QAAMC,OAAO;IAAK;IAEnG,iEAAiE;IACjE,IAAIN,MAAMS,UAAU,EAAE;QACpBZ,SAASO,IAAI,CAACR;QACd,OAAOE,SAAS,MAAM;IACxB;IAEA,4BAA4B;IAC5B,IAAIY,OAAOV,MAAMU,IAAI;IAErB,4DAA4D;IAC5D,2BAA2B;IAC3B,IAAIC,cAAcD,SAAS,cAAc,MAAM;IAE/C,iCAAiC;IACjC,oEAAoE;IACpE,IAAIE,YAAYZ,MAAMa,KAAK,IAAI,IAAIC;IACnC,IAAIC,aAAqC;QACvCrB,MAAMD,QAAQO,MAAMN,IAAI,CAACsB,KAAK,CAACtB,KAAKuB,GAAG,GAAGC,IAAI,CAACxB,KAAKuB,GAAG;QACvDE,UAAUnB,MAAMoB,IAAI;QACpBP,OAAOD,UAAUS,OAAO;QACxBC,MAAMtB,MAAMsB,IAAI,KAAKC,YAAYvB,MAAMsB,IAAI,GAAGX;IAChD;IAEA,OAAQD;QACN,KAAK;YACHK,WAAWL,IAAI,GAAG;YAClB,OAAOR,aAAa,MAAM,IAAIX,eAAewB;QAE/C,KAAK;YAAQ;gBACX,4DAA4D;gBAC5D,6DAA6D;gBAC7D,IAAIS,SAAS3B,SAASA,QAAQ,CAAC4B,SAAS;gBACxC,IAAIC,SAASF,OAAOG,cAAc,CAAC3B;gBACnC,IAAI4B,SAAmB,EAAE;gBAEzBF,OAAOG,EAAE,CAAC,QAAQ,CAACC;oBACjBF,OAAOxB,IAAI,CAAC0B;gBACd;gBACAJ,OAAOG,EAAE,CAAC,OAAO;oBACf,IAAIE,WAAWC,OAAOC,MAAM,CAACL,QAAQM,QAAQ,CAAC;oBAE9C,IAAIC,iBAAiC;wBACnCzC,MAAMqB,WAAWrB,IAAI;wBACrBmB,OAAOE,WAAWF,KAAK;wBACvBS,MAAMP,WAAWO,IAAI;wBACrBS,UAAUA;oBACZ;oBAEA7B,aAAa,MAAM,IAAIV,kBAAkB2C;gBAC3C;gBACAT,OAAOG,EAAE,CAAC,SAAS,CAAC1B;oBAClBD,aAAaC;gBACf;gBACA;YACF;QAEA,KAAK;YAAQ;gBACXY,WAAWL,IAAI,GAAG;gBAClBK,WAAWqB,IAAI,GAAGpC,MAAMoC,IAAI;gBAC5B,IAAIC,UAAUxC,SAASA,QAAQ,CAAC4B,SAAS;gBACzC,OAAOvB,aAAa,MAAM,IAAIP,UAAUoB,YAA8Bf,OAAOqC,SAASxC,SAASU,IAAI;YACrG;IACF;IAEA,OAAOT,SAAS,IAAIC,MAAM,CAAC,yBAAyB,EAAEW,MAAM;AAC9D"}

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

@@ -4,6 +4,15 @@ export interface NumberReadResult {
 }
 /**
  * Read a variable-length encoded number from a buffer
+ * Uses 7z's variable-length uint64 encoding where the first byte indicates
+ * how many additional bytes follow based on its value:
+ * - 0x00-0x7F: 0 extra bytes (7 bits of data)
+ * - 0x80-0xBF: 1 extra byte (14 bits of data)
+ * - 0xC0-0xDF: 2 extra bytes (21 bits of data)
+ * - 0xE0-0xEF: 3 extra bytes (28 bits of data)
+ * - etc.
+ * - 0xFF: 8 extra bytes (full 64-bit value)
+ *
  * @param buf - Buffer containing encoded number
  * @param offset - Offset to start reading from
  * @returns Object with value and number of bytes consumed

package/dist/esm/sevenz/NumberCodec.js

@@ -17,32 +17,66 @@
 import { readUInt64LE } from 'extract-base-iterator';
 /**
  * Read a variable-length encoded number from a buffer
+ * Uses 7z's variable-length uint64 encoding where the first byte indicates
+ * how many additional bytes follow based on its value:
+ * - 0x00-0x7F: 0 extra bytes (7 bits of data)
+ * - 0x80-0xBF: 1 extra byte (14 bits of data)
+ * - 0xC0-0xDF: 2 extra bytes (21 bits of data)
+ * - 0xE0-0xEF: 3 extra bytes (28 bits of data)
+ * - etc.
+ * - 0xFF: 8 extra bytes (full 64-bit value)
+ *
  * @param buf - Buffer containing encoded number
  * @param offset - Offset to start reading from
  * @returns Object with value and number of bytes consumed
  */ export function readNumber(buf, offset) {
     var firstByte = buf[offset];
-    // Count leading 1 bits to determine extra bytes
-    var mask = 0x80;
-    var extraBytes = 0;
-    while((firstByte & mask) !== 0 && extraBytes < 8){
-        extraBytes++;
-        mask = mask >>> 1;
-    }
-    // Special case: all 8 bits set means 8 extra bytes
-    if (extraBytes === 8) {
-        // Full 64-bit value follows
+    // Special case: 0xFF means 8 extra bytes (full 64-bit value)
+    if (firstByte === 0xff) {
         return {
             value: readUInt64LE(buf, offset + 1),
             bytesRead: 9
         };
     }
-    // Mask off the length bits from first byte
-    var value = firstByte & (mask - 1 | mask);
-    // Add remaining bytes (big-endian order)
+    // Determine number of extra bytes based on first byte value thresholds
+    // This matches the 7z format specification
+    var extraBytes = 0;
+    var mask = 0x80;
+    if (firstByte <= 0x7f) {
+        extraBytes = 0;
+        mask = 0x80;
+    } else if (firstByte <= 0xbf) {
+        extraBytes = 1;
+        mask = 0x40;
+    } else if (firstByte <= 0xdf) {
+        extraBytes = 2;
+        mask = 0x20;
+    } else if (firstByte <= 0xef) {
+        extraBytes = 3;
+        mask = 0x10;
+    } else if (firstByte <= 0xf7) {
+        extraBytes = 4;
+        mask = 0x08;
+    } else if (firstByte <= 0xfb) {
+        extraBytes = 5;
+        mask = 0x04;
+    } else if (firstByte <= 0xfd) {
+        extraBytes = 6;
+        mask = 0x02;
+    } else {
+        // 0xFE
+        extraBytes = 7;
+        mask = 0x01;
+    }
+    // Get high part from first byte (bits below the length indicator)
+    var highPart = firstByte & mask - 1;
+    // Read extra bytes as LITTLE-ENDIAN
+    var value = 0;
     for(var i = 0; i < extraBytes; i++){
-        value = value * 256 + buf[offset + 1 + i];
+        value += buf[offset + 1 + i] * 256 ** i;
     }
+    // Combine: value + (highPart << (extraBytes * 8))
+    value += highPart * 256 ** extraBytes;
     return {
         value: value,
         bytesRead: 1 + extraBytes

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

@@ -1 +1 @@
-{"version":3,"sources":["/Users/kevin/Dev/OpenSource/iterators/7z-iterator/src/sevenz/NumberCodec.ts"],"sourcesContent":["// Variable-length integer encoding for 7z format\n// Reference: https://py7zr.readthedocs.io/en/latest/archive_format.html\n//\n// 7z uses a space-efficient encoding where the first byte determines length:\n// 0xxxxxxx                    -> 1 byte  (0-127)\n// 10xxxxxx xxxxxxxx           -> 2 bytes (0-16383)\n// 110xxxxx + 2 bytes          -> 3 bytes\n// 1110xxxx + 3 bytes          -> 4 bytes\n// 11110xxx + 4 bytes          -> 5 bytes\n// 111110xx + 5 bytes          -> 6 bytes\n// 1111110x + 6 bytes          -> 7 bytes\n// 11111110 + 7 bytes          -> 8 bytes\n// 11111111 + 8 bytes          -> 9 bytes (full 64-bit)\n//\n// NOTE: Returns JavaScript number which is accurate up to 2^53 - 1 (~9 PB).\n// This covers all practical file sizes.\n\nimport { readUInt64LE } from 'extract-base-iterator';\n\nexport interface NumberReadResult {\n  value: number;\n  bytesRead: number;\n}\n\n/**\n * Read a variable-length encoded number from a buffer\n * @param buf - Buffer containing encoded number\n * @param offset - Offset to start reading from\n * @returns Object with value and number of bytes consumed\n */\nexport function readNumber(buf: Buffer, offset: number): NumberReadResult {\n  var firstByte = buf[offset];\n\n  // Count leading 1 bits to determine extra bytes\n  var mask = 0x80;\n  var extraBytes = 0;\n\n  while ((firstByte & mask) !== 0 && extraBytes < 8) {\n    extraBytes++;\n    mask = mask >>> 1;\n  }\n\n  // Special case: all 8 bits set means 8 extra bytes\n  if (extraBytes === 8) {\n    // Full 64-bit value follows\n    return {\n      value: readUInt64LE(buf, offset + 1),\n      bytesRead: 9,\n    };\n  }\n\n  // Mask off the length bits from first byte\n  var value = firstByte & ((mask - 1) | mask);\n\n  // Add remaining bytes (big-endian order)\n  for (var i = 0; i < extraBytes; i++) {\n    value = value * 256 + buf[offset + 1 + i];\n  }\n\n  return {\n    value: value,\n    bytesRead: 1 + extraBytes,\n  };\n}\n\n/**\n * Read a raw 64-bit little-endian number (used in some fixed-size fields)\n * @param buf - Buffer containing the number\n * @param offset - Offset to start reading from\n * @returns The number value\n */\nexport function readRawNumber(buf: Buffer, offset: number): number {\n  return readUInt64LE(buf, offset);\n}\n\n/**\n * Calculate the encoded size of a number\n * @param value - The number to encode\n * @returns Number of bytes needed to encode the value\n */\nexport function encodedSize(value: number): number {\n  if (value < 0x80) return 1; // 7 bits\n  if (value < 0x4000) return 2; // 14 bits\n  if (value < 0x200000) return 3; // 21 bits\n  if (value < 0x10000000) return 4; // 28 bits\n  if (value < 0x800000000) return 5; // 35 bits\n  if (value < 0x40000000000) return 6; // 42 bits\n  if (value < 0x2000000000000) return 7; // 49 bits\n  // 2^56 = 72057594037927936 (use calculated value to avoid precision loss)\n  if (value < 72057594037927936) return 8; // 56 bits\n  return 9; // 64 bits\n}\n\n/**\n * Read a boolean encoded as a single byte\n * @param buf - Buffer to read from\n * @param offset - Offset to read from\n * @returns true if byte is non-zero\n */\nexport function readBoolean(buf: Buffer, offset: number): boolean {\n  return buf[offset] !== 0;\n}\n\n/**\n * Read a \"defined\" bitmask for an array of items.\n * Used when some items in a list have optional values.\n *\n * Format: If \"allDefined\" byte is 0, a bitmask follows indicating which items have values.\n * If \"allDefined\" byte is non-zero, all items are defined.\n *\n * @param buf - Buffer to read from\n * @param offset - Offset to start reading\n * @param count - Number of items\n * @returns Object with defined array and bytes consumed\n */\nexport function readDefinedVector(buf: Buffer, offset: number, count: number): { defined: boolean[]; bytesRead: number } {\n  var allDefined = buf[offset] !== 0;\n  var bytesRead = 1;\n  var defined: boolean[] = [];\n\n  if (allDefined) {\n    // All items are defined\n    for (var i = 0; i < count; i++) {\n      defined.push(true);\n    }\n  } else {\n    // Read bitmask\n    var bitsNeeded = count;\n    var bytesNeeded = Math.ceil(bitsNeeded / 8);\n\n    for (var byteIdx = 0; byteIdx < bytesNeeded; byteIdx++) {\n      var byte = buf[offset + 1 + byteIdx];\n      for (var bit = 7; bit >= 0 && defined.length < count; bit--) {\n        defined.push((byte & (1 << bit)) !== 0);\n      }\n    }\n    bytesRead += bytesNeeded;\n  }\n\n  return { defined: defined, bytesRead: bytesRead };\n}\n\n/**\n * Read an array of variable-length numbers\n * @param buf - Buffer to read from\n * @param offset - Offset to start reading\n * @param count - Number of items to read\n * @returns Object with values array and bytes consumed\n */\nexport function readNumberArray(buf: Buffer, offset: number, count: number): { values: number[]; bytesRead: number } {\n  var values: number[] = [];\n  var totalBytesRead = 0;\n\n  for (var i = 0; i < count; i++) {\n    var result = readNumber(buf, offset + totalBytesRead);\n    values.push(result.value);\n    totalBytesRead += result.bytesRead;\n  }\n\n  return { values: values, bytesRead: totalBytesRead };\n}\n"],"names":["readUInt64LE","readNumber","buf","offset","firstByte","mask","extraBytes","value","bytesRead","i","readRawNumber","encodedSize","readBoolean","readDefinedVector","count","allDefined","defined","push","bitsNeeded","bytesNeeded","Math","ceil","byteIdx","byte","bit","length","readNumberArray","values","totalBytesRead","result"],"mappings":"AAAA,iDAAiD;AACjD,wEAAwE;AACxE,EAAE;AACF,6EAA6E;AAC7E,iDAAiD;AACjD,mDAAmD;AACnD,yCAAyC;AACzC,yCAAyC;AACzC,yCAAyC;AACzC,yCAAyC;AACzC,yCAAyC;AACzC,yCAAyC;AACzC,uDAAuD;AACvD,EAAE;AACF,4EAA4E;AAC5E,wCAAwC;AAExC,SAASA,YAAY,QAAQ,wBAAwB;AAOrD;;;;;CAKC,GACD,OAAO,SAASC,WAAWC,GAAW,EAAEC,MAAc;IACpD,IAAIC,YAAYF,GAAG,CAACC,OAAO;IAE3B,gDAAgD;IAChD,IAAIE,OAAO;IACX,IAAIC,aAAa;IAEjB,MAAO,AAACF,CAAAA,YAAYC,IAAG,MAAO,KAAKC,aAAa,EAAG;QACjDA;QACAD,OAAOA,SAAS;IAClB;IAEA,mDAAmD;IACnD,IAAIC,eAAe,GAAG;QACpB,4BAA4B;QAC5B,OAAO;YACLC,OAAOP,aAAaE,KAAKC,SAAS;YAClCK,WAAW;QACb;IACF;IAEA,2CAA2C;IAC3C,IAAID,QAAQH,YAAa,CAAA,AAACC,OAAO,IAAKA,IAAG;IAEzC,yCAAyC;IACzC,IAAK,IAAII,IAAI,GAAGA,IAAIH,YAAYG,IAAK;QACnCF,QAAQA,QAAQ,MAAML,GAAG,CAACC,SAAS,IAAIM,EAAE;IAC3C;IAEA,OAAO;QACLF,OAAOA;QACPC,WAAW,IAAIF;IACjB;AACF;AAEA;;;;;CAKC,GACD,OAAO,SAASI,cAAcR,GAAW,EAAEC,MAAc;IACvD,OAAOH,aAAaE,KAAKC;AAC3B;AAEA;;;;CAIC,GACD,OAAO,SAASQ,YAAYJ,KAAa;IACvC,IAAIA,QAAQ,MAAM,OAAO,GAAG,SAAS;IACrC,IAAIA,QAAQ,QAAQ,OAAO,GAAG,UAAU;IACxC,IAAIA,QAAQ,UAAU,OAAO,GAAG,UAAU;IAC1C,IAAIA,QAAQ,YAAY,OAAO,GAAG,UAAU;IAC5C,IAAIA,QAAQ,aAAa,OAAO,GAAG,UAAU;IAC7C,IAAIA,QAAQ,eAAe,OAAO,GAAG,UAAU;IAC/C,IAAIA,QAAQ,iBAAiB,OAAO,GAAG,UAAU;IACjD,0EAA0E;IAC1E,IAAIA,QAAQ,mBAAmB,OAAO,GAAG,UAAU;IACnD,OAAO,GAAG,UAAU;AACtB;AAEA;;;;;CAKC,GACD,OAAO,SAASK,YAAYV,GAAW,EAAEC,MAAc;IACrD,OAAOD,GAAG,CAACC,OAAO,KAAK;AACzB;AAEA;;;;;;;;;;;CAWC,GACD,OAAO,SAASU,kBAAkBX,GAAW,EAAEC,MAAc,EAAEW,KAAa;IAC1E,IAAIC,aAAab,GAAG,CAACC,OAAO,KAAK;IACjC,IAAIK,YAAY;IAChB,IAAIQ,UAAqB,EAAE;IAE3B,IAAID,YAAY;QACd,wBAAwB;QACxB,IAAK,IAAIN,IAAI,GAAGA,IAAIK,OAAOL,IAAK;YAC9BO,QAAQC,IAAI,CAAC;QACf;IACF,OAAO;QACL,eAAe;QACf,IAAIC,aAAaJ;QACjB,IAAIK,cAAcC,KAAKC,IAAI,CAACH,aAAa;QAEzC,IAAK,IAAII,UAAU,GAAGA,UAAUH,aAAaG,UAAW;YACtD,IAAIC,OAAOrB,GAAG,CAACC,SAAS,IAAImB,QAAQ;YACpC,IAAK,IAAIE,MAAM,GAAGA,OAAO,KAAKR,QAAQS,MAAM,GAAGX,OAAOU,MAAO;gBAC3DR,QAAQC,IAAI,CAAC,AAACM,CAAAA,OAAQ,KAAKC,GAAG,MAAO;YACvC;QACF;QACAhB,aAAaW;IACf;IAEA,OAAO;QAAEH,SAASA;QAASR,WAAWA;IAAU;AAClD;AAEA;;;;;;CAMC,GACD,OAAO,SAASkB,gBAAgBxB,GAAW,EAAEC,MAAc,EAAEW,KAAa;IACxE,IAAIa,SAAmB,EAAE;IACzB,IAAIC,iBAAiB;IAErB,IAAK,IAAInB,IAAI,GAAGA,IAAIK,OAAOL,IAAK;QAC9B,IAAIoB,SAAS5B,WAAWC,KAAKC,SAASyB;QACtCD,OAAOV,IAAI,CAACY,OAAOtB,KAAK;QACxBqB,kBAAkBC,OAAOrB,SAAS;IACpC;IAEA,OAAO;QAAEmB,QAAQA;QAAQnB,WAAWoB;IAAe;AACrD"}
+{"version":3,"sources":["/Users/kevin/Dev/OpenSource/iterators/7z-iterator/src/sevenz/NumberCodec.ts"],"sourcesContent":["// Variable-length integer encoding for 7z format\n// Reference: https://py7zr.readthedocs.io/en/latest/archive_format.html\n//\n// 7z uses a space-efficient encoding where the first byte determines length:\n// 0xxxxxxx                    -> 1 byte  (0-127)\n// 10xxxxxx xxxxxxxx           -> 2 bytes (0-16383)\n// 110xxxxx + 2 bytes          -> 3 bytes\n// 1110xxxx + 3 bytes          -> 4 bytes\n// 11110xxx + 4 bytes          -> 5 bytes\n// 111110xx + 5 bytes          -> 6 bytes\n// 1111110x + 6 bytes          -> 7 bytes\n// 11111110 + 7 bytes          -> 8 bytes\n// 11111111 + 8 bytes          -> 9 bytes (full 64-bit)\n//\n// NOTE: Returns JavaScript number which is accurate up to 2^53 - 1 (~9 PB).\n// This covers all practical file sizes.\n\nimport { readUInt64LE } from 'extract-base-iterator';\n\nexport interface NumberReadResult {\n  value: number;\n  bytesRead: number;\n}\n\n/**\n * Read a variable-length encoded number from a buffer\n * Uses 7z's variable-length uint64 encoding where the first byte indicates\n * how many additional bytes follow based on its value:\n * - 0x00-0x7F: 0 extra bytes (7 bits of data)\n * - 0x80-0xBF: 1 extra byte (14 bits of data)\n * - 0xC0-0xDF: 2 extra bytes (21 bits of data)\n * - 0xE0-0xEF: 3 extra bytes (28 bits of data)\n * - etc.\n * - 0xFF: 8 extra bytes (full 64-bit value)\n *\n * @param buf - Buffer containing encoded number\n * @param offset - Offset to start reading from\n * @returns Object with value and number of bytes consumed\n */\nexport function readNumber(buf: Buffer, offset: number): NumberReadResult {\n  var firstByte = buf[offset];\n\n  // Special case: 0xFF means 8 extra bytes (full 64-bit value)\n  if (firstByte === 0xff) {\n    return {\n      value: readUInt64LE(buf, offset + 1),\n      bytesRead: 9,\n    };\n  }\n\n  // Determine number of extra bytes based on first byte value thresholds\n  // This matches the 7z format specification\n  var extraBytes = 0;\n  var mask = 0x80;\n\n  if (firstByte <= 0x7f) {\n    extraBytes = 0;\n    mask = 0x80;\n  } else if (firstByte <= 0xbf) {\n    extraBytes = 1;\n    mask = 0x40;\n  } else if (firstByte <= 0xdf) {\n    extraBytes = 2;\n    mask = 0x20;\n  } else if (firstByte <= 0xef) {\n    extraBytes = 3;\n    mask = 0x10;\n  } else if (firstByte <= 0xf7) {\n    extraBytes = 4;\n    mask = 0x08;\n  } else if (firstByte <= 0xfb) {\n    extraBytes = 5;\n    mask = 0x04;\n  } else if (firstByte <= 0xfd) {\n    extraBytes = 6;\n    mask = 0x02;\n  } else {\n    // 0xFE\n    extraBytes = 7;\n    mask = 0x01;\n  }\n\n  // Get high part from first byte (bits below the length indicator)\n  var highPart = firstByte & (mask - 1);\n\n  // Read extra bytes as LITTLE-ENDIAN\n  var value = 0;\n  for (var i = 0; i < extraBytes; i++) {\n    value += buf[offset + 1 + i] * 256 ** i;\n  }\n\n  // Combine: value + (highPart << (extraBytes * 8))\n  value += highPart * 256 ** extraBytes;\n\n  return {\n    value: value,\n    bytesRead: 1 + extraBytes,\n  };\n}\n\n/**\n * Read a raw 64-bit little-endian number (used in some fixed-size fields)\n * @param buf - Buffer containing the number\n * @param offset - Offset to start reading from\n * @returns The number value\n */\nexport function readRawNumber(buf: Buffer, offset: number): number {\n  return readUInt64LE(buf, offset);\n}\n\n/**\n * Calculate the encoded size of a number\n * @param value - The number to encode\n * @returns Number of bytes needed to encode the value\n */\nexport function encodedSize(value: number): number {\n  if (value < 0x80) return 1; // 7 bits\n  if (value < 0x4000) return 2; // 14 bits\n  if (value < 0x200000) return 3; // 21 bits\n  if (value < 0x10000000) return 4; // 28 bits\n  if (value < 0x800000000) return 5; // 35 bits\n  if (value < 0x40000000000) return 6; // 42 bits\n  if (value < 0x2000000000000) return 7; // 49 bits\n  // 2^56 = 72057594037927936 (use calculated value to avoid precision loss)\n  if (value < 72057594037927936) return 8; // 56 bits\n  return 9; // 64 bits\n}\n\n/**\n * Read a boolean encoded as a single byte\n * @param buf - Buffer to read from\n * @param offset - Offset to read from\n * @returns true if byte is non-zero\n */\nexport function readBoolean(buf: Buffer, offset: number): boolean {\n  return buf[offset] !== 0;\n}\n\n/**\n * Read a \"defined\" bitmask for an array of items.\n * Used when some items in a list have optional values.\n *\n * Format: If \"allDefined\" byte is 0, a bitmask follows indicating which items have values.\n * If \"allDefined\" byte is non-zero, all items are defined.\n *\n * @param buf - Buffer to read from\n * @param offset - Offset to start reading\n * @param count - Number of items\n * @returns Object with defined array and bytes consumed\n */\nexport function readDefinedVector(buf: Buffer, offset: number, count: number): { defined: boolean[]; bytesRead: number } {\n  var allDefined = buf[offset] !== 0;\n  var bytesRead = 1;\n  var defined: boolean[] = [];\n\n  if (allDefined) {\n    // All items are defined\n    for (var i = 0; i < count; i++) {\n      defined.push(true);\n    }\n  } else {\n    // Read bitmask\n    var bitsNeeded = count;\n    var bytesNeeded = Math.ceil(bitsNeeded / 8);\n\n    for (var byteIdx = 0; byteIdx < bytesNeeded; byteIdx++) {\n      var byte = buf[offset + 1 + byteIdx];\n      for (var bit = 7; bit >= 0 && defined.length < count; bit--) {\n        defined.push((byte & (1 << bit)) !== 0);\n      }\n    }\n    bytesRead += bytesNeeded;\n  }\n\n  return { defined: defined, bytesRead: bytesRead };\n}\n\n/**\n * Read an array of variable-length numbers\n * @param buf - Buffer to read from\n * @param offset - Offset to start reading\n * @param count - Number of items to read\n * @returns Object with values array and bytes consumed\n */\nexport function readNumberArray(buf: Buffer, offset: number, count: number): { values: number[]; bytesRead: number } {\n  var values: number[] = [];\n  var totalBytesRead = 0;\n\n  for (var i = 0; i < count; i++) {\n    var result = readNumber(buf, offset + totalBytesRead);\n    values.push(result.value);\n    totalBytesRead += result.bytesRead;\n  }\n\n  return { values: values, bytesRead: totalBytesRead };\n}\n"],"names":["readUInt64LE","readNumber","buf","offset","firstByte","value","bytesRead","extraBytes","mask","highPart","i","readRawNumber","encodedSize","readBoolean","readDefinedVector","count","allDefined","defined","push","bitsNeeded","bytesNeeded","Math","ceil","byteIdx","byte","bit","length","readNumberArray","values","totalBytesRead","result"],"mappings":"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"}

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

@@ -85,10 +85,23 @@ export declare class SevenZipParser {
      * Get a readable stream for an entry's content
      */
     getEntryStream(entry: SevenZipEntry): Readable;
+    /**
+     * Check if a folder uses BCJ2 codec
+     */
+    private folderHasBcj2;
     /**
      * Get decompressed data for a folder, with caching for solid archives
      */
     private getDecompressedFolder;
+    /**
+     * Decompress a BCJ2 folder with multi-stream handling
+     * BCJ2 uses 4 input streams: main, call, jump, range coder
+     */
+    private decompressBcj2Folder;
+    /**
+     * Get processing order for coders (dependency order)
+     */
+    private getCoderProcessOrder;
     /**
      * Close the parser and release resources
      */

package/dist/esm/sevenz/SevenZipParser.js

@@ -3,7 +3,7 @@
 import { allocBuffer, crc32 } from 'extract-base-iterator';
 import fs from 'fs';
 import { PassThrough } from 'readable-stream';
-import { getCodec, getCodecName, isCodecSupported } from './codecs/index.js';
+import { decodeBcj2Multi, getCodec, getCodecName, isBcj2Codec, isCodecSupported } from './codecs/index.js';
 import { createCodedError, ErrorCode, FileAttribute, PropertyId, SIGNATURE_HEADER_SIZE } from './constants.js';
 import { parseEncodedHeader, parseHeaderContent, parseSignatureHeader } from './headers.js';
 import { readNumber } from './NumberCodec.js';
@@ -101,19 +101,66 @@ import { readNumber } from './NumberCodec.js';
         // This tells us how to decompress the actual header
         // Read pack info from the encoded header structure
         var packInfoResult = this.parseEncodedHeaderStreams(headerBuf, 1);
-        // Read the compressed header data
+        // Calculate compressed header position
+        // For simple archives: header is at SIGNATURE_HEADER_SIZE + packPos
+        // For BCJ2/complex archives: header may be at the END of pack data area
+        // The pack data area ends at nextHeaderOffset (where encoded header starts)
         var compressedStart = SIGNATURE_HEADER_SIZE + packInfoResult.packPos;
         var compressedData = this.source.read(compressedStart, packInfoResult.packSize);
         // Decompress using the specified codec
         var codec = getCodec(packInfoResult.codecId);
-        var decompressedHeader = codec.decode(compressedData, packInfoResult.properties, packInfoResult.unpackSize);
-        // Verify CRC if present
-        if (packInfoResult.unpackCRC !== undefined) {
-            var actualCRC = crc32(decompressedHeader);
-            if (actualCRC !== packInfoResult.unpackCRC) {
-                throw createCodedError('Decompressed header CRC mismatch', ErrorCode.CRC_MISMATCH);
+        var decompressedHeader = null;
+        // Try decompressing from the calculated position first
+        try {
+            decompressedHeader = codec.decode(compressedData, packInfoResult.properties, packInfoResult.unpackSize);
+            // Verify CRC if present
+            if (packInfoResult.unpackCRC !== undefined) {
+                var actualCRC = crc32(decompressedHeader);
+                if (actualCRC !== packInfoResult.unpackCRC) {
+                    decompressedHeader = null; // CRC mismatch, need to search
+                }
+            }
+        } catch  {
+            decompressedHeader = null; // Decompression failed, need to search
+        }
+        // If initial decompression failed, search for the correct position as a fallback
+        // This handles edge cases where packPos doesn't point directly to header pack data
+        if (decompressedHeader === null && this.signature) {
+            var packAreaEnd = SIGNATURE_HEADER_SIZE + this.signature.nextHeaderOffset;
+            var searchStart = packAreaEnd - packInfoResult.packSize;
+            var searchEnd = Math.max(SIGNATURE_HEADER_SIZE, compressedStart - 100000);
+            // Scan for LZMA data starting with 0x00 (range coder init)
+            // Try each candidate and validate with CRC
+            var scanChunkSize = 4096;
+            searchLoop: for(var chunkStart = searchStart; chunkStart >= searchEnd; chunkStart -= scanChunkSize){
+                var chunk = this.source.read(chunkStart, scanChunkSize + packInfoResult.packSize);
+                for(var i = 0; i < Math.min(chunk.length, scanChunkSize); i++){
+                    if (chunk[i] === 0x00) {
+                        var candidateData = chunk.subarray(i, i + packInfoResult.packSize);
+                        if (candidateData.length === packInfoResult.packSize) {
+                            try {
+                                var candidateDecompressed = codec.decode(candidateData, packInfoResult.properties, packInfoResult.unpackSize);
+                                if (packInfoResult.unpackCRC !== undefined) {
+                                    var candCRC = crc32(candidateDecompressed);
+                                    if (candCRC === packInfoResult.unpackCRC) {
+                                        decompressedHeader = candidateDecompressed;
+                                        break searchLoop;
+                                    }
+                                } else {
+                                    decompressedHeader = candidateDecompressed;
+                                    break searchLoop;
+                                }
+                            } catch  {
+                            // Decompression failed, continue searching
+                            }
+                        }
+                    }
+                }
             }
         }
+        if (decompressedHeader === null) {
+            throw createCodedError('Failed to decompress header - could not find valid LZMA data', ErrorCode.CORRUPT_HEADER);
+        }
         // Now parse the decompressed header
         // It should start with kHeader
         var decompOffset = 0;
@@ -354,6 +401,16 @@ import { readNumber } from './NumberCodec.js';
         return outputStream;
     }
     /**
+   * Check if a folder uses BCJ2 codec
+   */ folderHasBcj2(folder) {
+        for(var i = 0; i < folder.coders.length; i++){
+            if (isBcj2Codec(folder.coders[i].id)) {
+                return true;
+            }
+        }
+        return false;
+    }
+    /**
    * Get decompressed data for a folder, with caching for solid archives
    */ getDecompressedFolder(folderIndex) {
         // Check cache first
@@ -364,6 +421,12 @@ import { readNumber } from './NumberCodec.js';
             throw createCodedError('No streams info available', ErrorCode.CORRUPT_HEADER);
         }
         var folder = this.streamsInfo.folders[folderIndex];
+        // Check if this folder uses BCJ2 (requires special multi-stream handling)
+        if (this.folderHasBcj2(folder)) {
+            var data = this.decompressBcj2Folder(folderIndex);
+            this.decompressedCache[folderIndex] = data;
+            return data;
+        }
         // Calculate packed data position
         var packPos = SIGNATURE_HEADER_SIZE + this.streamsInfo.packPos;
         // Find which pack stream this folder uses
@@ -379,17 +442,193 @@ import { readNumber } from './NumberCodec.js';
         // Read packed data
         var packedData = this.source.read(packPos, packSize);
         // Decompress through codec chain
-        var data = packedData;
+        var data2 = packedData;
         for(var l = 0; l < folder.coders.length; l++){
             var coderInfo = folder.coders[l];
             var codec = getCodec(coderInfo.id);
             // Get unpack size for this coder (needed by LZMA)
             var unpackSize = folder.unpackSizes[l];
-            data = codec.decode(data, coderInfo.properties, unpackSize);
+            data2 = codec.decode(data2, coderInfo.properties, unpackSize);
         }
         // Cache for solid archives (when multiple files share a folder)
-        this.decompressedCache[folderIndex] = data;
-        return data;
+        this.decompressedCache[folderIndex] = data2;
+        return data2;
+    }
+    /**
+   * Decompress a BCJ2 folder with multi-stream handling
+   * BCJ2 uses 4 input streams: main, call, jump, range coder
+   */ decompressBcj2Folder(folderIndex) {
+        if (!this.streamsInfo) {
+            throw createCodedError('No streams info available', ErrorCode.CORRUPT_HEADER);
+        }
+        var folder = this.streamsInfo.folders[folderIndex];
+        // Calculate starting pack position
+        var packPos = SIGNATURE_HEADER_SIZE + this.streamsInfo.packPos;
+        // Find which pack stream index this folder starts at
+        var packStreamIndex = 0;
+        for(var j = 0; j < folderIndex; j++){
+            packStreamIndex += this.streamsInfo.folders[j].packedStreams.length;
+        }
+        // Calculate position
+        for(var k = 0; k < packStreamIndex; k++){
+            packPos += this.streamsInfo.packSizes[k];
+        }
+        // Read all pack streams for this folder
+        var numPackStreams = folder.packedStreams.length;
+        var packStreams = [];
+        var currentPos = packPos;
+        for(var p = 0; p < numPackStreams; p++){
+            var size = this.streamsInfo.packSizes[packStreamIndex + p];
+            packStreams.push(this.source.read(currentPos, size));
+            currentPos += size;
+        }
+        // Build a map of coder outputs
+        // For BCJ2, typical structure is:
+        //   Coder 0: LZMA2 (main stream) - 1 in, 1 out
+        //   Coder 1: LZMA (call stream) - 1 in, 1 out
+        //   Coder 2: LZMA (jump stream) - 1 in, 1 out
+        //   Coder 3: BCJ2 - 4 in, 1 out
+        // Pack streams map to: coder inputs not bound to other coder outputs
+        // First, decompress each non-BCJ2 coder
+        var coderOutputs = {};
+        // Find the BCJ2 coder
+        var bcj2CoderIndex = -1;
+        for(var c = 0; c < folder.coders.length; c++){
+            if (isBcj2Codec(folder.coders[c].id)) {
+                bcj2CoderIndex = c;
+                break;
+            }
+        }
+        if (bcj2CoderIndex === -1) {
+            throw createCodedError('BCJ2 coder not found in folder', ErrorCode.CORRUPT_HEADER);
+        }
+        // Build input stream index -> pack stream mapping
+        // folder.packedStreams tells us which input indices are unbound and their order
+        var inputToPackStream = {};
+        for(var pi = 0; pi < folder.packedStreams.length; pi++){
+            inputToPackStream[folder.packedStreams[pi]] = pi;
+        }
+        // Build output stream index -> coder mapping
+        var outputToCoder = {};
+        var totalOutputs = 0;
+        for(var co = 0; co < folder.coders.length; co++){
+            var numOut = folder.coders[co].numOutStreams;
+            for(var outp = 0; outp < numOut; outp++){
+                outputToCoder[totalOutputs + outp] = co;
+            }
+            totalOutputs += numOut;
+        }
+        // Decompress non-BCJ2 coders (LZMA, LZMA2)
+        // We need to process in dependency order
+        var processed = {};
+        var processOrder = this.getCoderProcessOrder(folder, bcj2CoderIndex);
+        for(var po = 0; po < processOrder.length; po++){
+            var coderIdx = processOrder[po];
+            if (coderIdx === bcj2CoderIndex) continue;
+            var coder = folder.coders[coderIdx];
+            var codec = getCodec(coder.id);
+            // Find input for this coder
+            var coderInputStart = 0;
+            for(var ci2 = 0; ci2 < coderIdx; ci2++){
+                coderInputStart += folder.coders[ci2].numInStreams;
+            }
+            // Get input data (from pack stream)
+            var inputIdx = coderInputStart;
+            var packStreamIdx = inputToPackStream[inputIdx];
+            var inputData = packStreams[packStreamIdx];
+            // Decompress
+            var unpackSize = folder.unpackSizes[coderIdx];
+            var outputData = codec.decode(inputData, coder.properties, unpackSize);
+            // Store in coder outputs
+            var coderOutputStart = 0;
+            for(var co2 = 0; co2 < coderIdx; co2++){
+                coderOutputStart += folder.coders[co2].numOutStreams;
+            }
+            coderOutputs[coderOutputStart] = outputData;
+            processed[coderIdx] = true;
+        }
+        // Now process BCJ2
+        // BCJ2 has 4 inputs, need to map them correctly
+        // Standard order: main(LZMA2 output), call(LZMA output), jump(LZMA output), range(raw pack)
+        var bcj2InputStart = 0;
+        for(var ci3 = 0; ci3 < bcj2CoderIndex; ci3++){
+            bcj2InputStart += folder.coders[ci3].numInStreams;
+        }
+        var bcj2Inputs = [];
+        for(var bi = 0; bi < 4; bi++){
+            var globalIdx = bcj2InputStart + bi;
+            // Check if this input is bound to a coder output
+            var boundOutput = -1;
+            for(var bp2 = 0; bp2 < folder.bindPairs.length; bp2++){
+                if (folder.bindPairs[bp2].inIndex === globalIdx) {
+                    boundOutput = folder.bindPairs[bp2].outIndex;
+                    break;
+                }
+            }
+            if (boundOutput >= 0) {
+                // Get from coder outputs
+                bcj2Inputs.push(coderOutputs[boundOutput]);
+            } else {
+                // Get from pack streams
+                var psIdx = inputToPackStream[globalIdx];
+                bcj2Inputs.push(packStreams[psIdx]);
+            }
+        }
+        // Get BCJ2 unpack size
+        var bcj2OutputStart = 0;
+        for(var co3 = 0; co3 < bcj2CoderIndex; co3++){
+            bcj2OutputStart += folder.coders[co3].numOutStreams;
+        }
+        var bcj2UnpackSize = folder.unpackSizes[bcj2OutputStart];
+        // Decode BCJ2
+        return decodeBcj2Multi(bcj2Inputs, undefined, bcj2UnpackSize);
+    }
+    /**
+   * Get processing order for coders (dependency order)
+   */ getCoderProcessOrder(folder, excludeIdx) {
+        var order = [];
+        var processed = {};
+        // Simple approach: process coders that don't depend on unprocessed outputs
+        var changed = true;
+        while(changed){
+            changed = false;
+            for(var c = 0; c < folder.coders.length; c++){
+                if (processed[c] || c === excludeIdx) continue;
+                // Check if all inputs are satisfied
+                var inputStart = 0;
+                for(var i = 0; i < c; i++){
+                    inputStart += folder.coders[i].numInStreams;
+                }
+                var canProcess = true;
+                for(var inp = 0; inp < folder.coders[c].numInStreams; inp++){
+                    var globalIdx = inputStart + inp;
+                    // Check if bound to an unprocessed coder
+                    for(var bp = 0; bp < folder.bindPairs.length; bp++){
+                        if (folder.bindPairs[bp].inIndex === globalIdx) {
+                            // Find which coder produces this output
+                            var outIdx = folder.bindPairs[bp].outIndex;
+                            var outStart = 0;
+                            for(var oc = 0; oc < folder.coders.length; oc++){
+                                var numOut = folder.coders[oc].numOutStreams;
+                                if (outIdx < outStart + numOut) {
+                                    if (!processed[oc] && oc !== excludeIdx) {
+                                        canProcess = false;
+                                    }
+                                    break;
+                                }
+                                outStart += numOut;
+                            }
+                        }
+                    }
+                }
+                if (canProcess) {
+                    order.push(c);
+                    processed[c] = true;
+                    changed = true;
+                }
+            }
+        }
+        return order;
     }
     /**
    * Close the parser and release resources