@ubercode/multipart-stream 1.0.0 → 1.1.0

package/dist/index.d.cts

@@ -90,7 +90,7 @@ declare class MultipartAbortError extends Error {
     constructor(reason?: unknown, options?: ErrorOptions);
 }
 /**
- * Thrown when the source stream ends without dicer observing the closing
+ * Thrown when the source stream ends without parser observing the closing
  * multipart boundary (FR-022) — typically a mid-flight server hangup or
  * transport-layer cut. Cleanup per FR-010 still runs.
  *
@@ -285,7 +285,7 @@ declare function extractBoundary(contentTypeHeader: string | null | undefined):
 interface StreamingMultipartPart {
     /**
      * Zero-based ordinal of this part within the multipart envelope, in the
-     * order dicer emits them.
+     * order parser emits them.
      */
     readonly index: number;
     /**
@@ -295,14 +295,13 @@ interface StreamingMultipartPart {
     readonly boundary: string;
     /**
      * Lowercased part headers as flat strings. Names are normalized to
-     * lowercase; values are the result of internal flattening over dicer's
-     * `Buffer | Buffer[] | Buffer[][]` shapes.
+     * lowercase; repeated values are joined with `, `.
      *
      * Reads are `string | undefined` due to `noUncheckedIndexedAccess`.
      */
     readonly headers: Readonly<Record<string, string | undefined>>;
     /**
-     * Raw header block bytes captured from dicer (concatenated).
+     * Raw header block bytes, including the terminating CRLF pair.
      *
      * Surfaced for callers who need byte-exact framing for re-emission or
      * signature verification.
@@ -319,15 +318,15 @@ interface StreamingMultipartPart {
     readonly contentId?: string | undefined;
     /**
      * Pre-extracted `content-length` parsed via `parseInt(_, 10)`, or
-     * `undefined` if the header is absent or non-numeric. Note: dicer streams
+     * `undefined` if the header is absent or non-numeric. Note: parser streams
      * regardless — this value is informational, not a contract.
      */
     readonly contentLength?: number | undefined;
     /**
      * The streaming body of this part as a Node `Readable`. Backed directly by
-     * dicer's per-part stream — no intermediate buffering. Callers MUST consume
-     * (drain, pipe, or destroy) before requesting the next part; the library
-     * cannot pause dicer's state machine for them.
+     * parser's per-part stream — no intermediate buffering. The parser applies
+     * backpressure when this stream's buffer fills. Callers should consume
+     * (drain, pipe, or destroy) before requesting the next part.
      */
     readonly body: Readable;
 }
@@ -401,7 +400,7 @@ interface ProgressSnapshot {
  * union, not a positional argument.
  *
  * Per NFR-DR-S-008, `meta` NEVER contains raw chunk bytes. When the library
- * logs an `Error` whose source is dicer or the source stream, it passes only
+ * logs an `Error` whose source is parser or the source stream, it passes only
  * an `errSummary: { name, message }` object with `message` truncated to <=
  * 120 chars, control characters redacted, and the value JSON-stringified
  * per NFR-DR-S-006.
@@ -471,7 +470,7 @@ interface ParseMultipartOptions {
      */
     maxParts?: number | undefined;
     /**
-     * Maximum number of distinct headers per part (NFR-DR-S-004). Defaults to
+     * Maximum number of header lines per part, including repeated names (NFR-DR-S-004). Defaults to
      * `100` when omitted.
      */
     maxHeadersPerPart?: number | undefined;
@@ -531,10 +530,10 @@ interface MultipartHandlerOptions<T> {
  *      forwards the caller's `AbortSignal` to fetch directly so a network-
  *      time abort cancels the request before any bytes flow.
  *   3. Validates the response Content-Type (FR-021) case-insensitively
- *      against `multipart/related` BEFORE constructing dicer. The offending
+ *      against `multipart/related` BEFORE constructing parser. The offending
  *      Content-Type is sanitized via `truncateForErrorEmbed` per
- *      NFR-DR-S-006. T-035 asserts the dicer-activity harness sees zero
- *      Dicer instances on this path.
+ *      NFR-DR-S-006. T-035 asserts the parser-activity harness sees zero
+ *      Parser instances on this path.
  *   4. Captures `status` + `headers` BEFORE consuming the body
  *      (FR-DR-A-029 — the Response is gone after iteration).
  *   5. Forwards `idleTimeoutMs` / `totalTimeoutMs` / `signal` / `onProgress`
@@ -586,11 +585,11 @@ interface MultipartHandlerOptions<T> {
  *   — T-013 spies on `globalThis.fetch` to verify.
  * @throws {Error} `multipart: response Content-Type is not multipart/related;
  *   got <actual>` when the response Content-Type doesn't start with
- *   `multipart/related` (case-insensitive) (FR-021). Dicer is NEVER
- *   constructed on this path — T-035 asserts via the dicer-activity
+ *   `multipart/related` (case-insensitive) (FR-021). Parser is NEVER
+ *   constructed on this path — T-035 asserts via the parser-activity
  *   harness.
  * @throws Any error from `parseMultipartRelated` (idle/total timeout,
- *   abort mid-stream, truncation, source error, dicer error, cap overflow).
+ *   abort mid-stream, truncation, source error, parser error, cap overflow).
  * @throws Any error from `options.parser`.
  *
  * @example
@@ -604,7 +603,7 @@ interface MultipartHandlerOptions<T> {
 declare function fetchAndHandleMultipart<T>(url: string | URL, options: MultipartHandlerOptions<T>): Promise<MultipartFetchResult<T>>;
 
 /**
- * `parseMultipartRelated` — Layer A (parser/dicer adapter). FR-001.
+ * `parseMultipartRelated` — streaming parser adapter. FR-001.
  *
  * Resource-cap enforcement (NFR-DR-S-001/004/012):
  *   - `maxPartBytes` (NFR-DR-S-001): each per-part body Readable gets a
@@ -612,7 +611,7 @@ declare function fetchAndHandleMultipart<T>(url: string | URL, options: Multipar
  *     the listener pushes `MultipartPartTooLargeError` into the queue and
  *     destroys the offending part body. No default — when undefined, no
  *     cap is enforced.
- *   - `maxParts` (NFR-DR-S-012): the dicer 'part' counter is checked at
+ *   - `maxParts` (NFR-DR-S-012): the parser 'part' counter is checked at
  *     each emit; on overflow, push `MultipartTooManyPartsError`. Default
  *     `10_000` when undefined.
  *   - `maxHeadersPerPart` + `maxHeaderBytesPerPart` (NFR-DR-S-004): on
@@ -638,9 +637,9 @@ declare function fetchAndHandleMultipart<T>(url: string | URL, options: Multipar
  *
  * Cleanup contract: the `finally` cleanup drains unyielded part bodies
  * (FR-010), removes 'data'/'error'/'end' listeners on source and 'part'/
- * 'finish' on dicer, unpipes + destroys source, and KEEPS dicer's 'error'
+ * 'finish' on parser, unpipes + destroys source, and KEEPS parser's 'error'
  * listener for late-emit observability (FR-011). Truncation detection
- * (FR-022) fires when source 'end' arrives without dicer 'finish' having
+ * (FR-022) fires when source 'end' arrives without parser 'finish' having
  * fired.
  */
 
@@ -656,7 +655,7 @@ declare function fetchAndHandleMultipart<T>(url: string | URL, options: Multipar
  *   are validated synchronously via `validatePositiveTimeout` — both must be
  *   positive finite integers in `[1, 2_147_483_647]` (NFR-DR-S-009).
  * @returns An `AsyncGenerator<StreamingMultipartPart, void, void>` that
- *   yields parts in dicer's emit order.
+ *   yields parts in parser's emit order.
  *
  * @throws {TypeError} `multipart: idleTimeoutMs must be a positive finite
  *   integer in [1, 2_147_483_647]; …` when `idleTimeoutMs` is missing,
@@ -680,7 +679,7 @@ declare function fetchAndHandleMultipart<T>(url: string | URL, options: Multipar
  *   aborted at call time — first `.next()` rejects synchronously per FR-009).
  *   `error.reason` is the caller's `signal.reason` verbatim (F-S-006).
  * @throws {MultipartTruncatedError} when the source emits `'end'` before
- *   dicer emits `'finish'` (FR-022).
+ *   parser emits `'finish'` (FR-022).
  *
  * @example
  *   for await (const part of parseMultipartRelated(res, {

package/dist/index.d.ts

@@ -90,7 +90,7 @@ declare class MultipartAbortError extends Error {
     constructor(reason?: unknown, options?: ErrorOptions);
 }
 /**
- * Thrown when the source stream ends without dicer observing the closing
+ * Thrown when the source stream ends without parser observing the closing
  * multipart boundary (FR-022) — typically a mid-flight server hangup or
  * transport-layer cut. Cleanup per FR-010 still runs.
  *
@@ -285,7 +285,7 @@ declare function extractBoundary(contentTypeHeader: string | null | undefined):
 interface StreamingMultipartPart {
     /**
      * Zero-based ordinal of this part within the multipart envelope, in the
-     * order dicer emits them.
+     * order parser emits them.
      */
     readonly index: number;
     /**
@@ -295,14 +295,13 @@ interface StreamingMultipartPart {
     readonly boundary: string;
     /**
      * Lowercased part headers as flat strings. Names are normalized to
-     * lowercase; values are the result of internal flattening over dicer's
-     * `Buffer | Buffer[] | Buffer[][]` shapes.
+     * lowercase; repeated values are joined with `, `.
      *
      * Reads are `string | undefined` due to `noUncheckedIndexedAccess`.
      */
     readonly headers: Readonly<Record<string, string | undefined>>;
     /**
-     * Raw header block bytes captured from dicer (concatenated).
+     * Raw header block bytes, including the terminating CRLF pair.
      *
      * Surfaced for callers who need byte-exact framing for re-emission or
      * signature verification.
@@ -319,15 +318,15 @@ interface StreamingMultipartPart {
     readonly contentId?: string | undefined;
     /**
      * Pre-extracted `content-length` parsed via `parseInt(_, 10)`, or
-     * `undefined` if the header is absent or non-numeric. Note: dicer streams
+     * `undefined` if the header is absent or non-numeric. Note: parser streams
      * regardless — this value is informational, not a contract.
      */
     readonly contentLength?: number | undefined;
     /**
      * The streaming body of this part as a Node `Readable`. Backed directly by
-     * dicer's per-part stream — no intermediate buffering. Callers MUST consume
-     * (drain, pipe, or destroy) before requesting the next part; the library
-     * cannot pause dicer's state machine for them.
+     * parser's per-part stream — no intermediate buffering. The parser applies
+     * backpressure when this stream's buffer fills. Callers should consume
+     * (drain, pipe, or destroy) before requesting the next part.
      */
     readonly body: Readable;
 }
@@ -401,7 +400,7 @@ interface ProgressSnapshot {
  * union, not a positional argument.
  *
  * Per NFR-DR-S-008, `meta` NEVER contains raw chunk bytes. When the library
- * logs an `Error` whose source is dicer or the source stream, it passes only
+ * logs an `Error` whose source is parser or the source stream, it passes only
  * an `errSummary: { name, message }` object with `message` truncated to <=
  * 120 chars, control characters redacted, and the value JSON-stringified
  * per NFR-DR-S-006.
@@ -471,7 +470,7 @@ interface ParseMultipartOptions {
      */
     maxParts?: number | undefined;
     /**
-     * Maximum number of distinct headers per part (NFR-DR-S-004). Defaults to
+     * Maximum number of header lines per part, including repeated names (NFR-DR-S-004). Defaults to
      * `100` when omitted.
      */
     maxHeadersPerPart?: number | undefined;
@@ -531,10 +530,10 @@ interface MultipartHandlerOptions<T> {
  *      forwards the caller's `AbortSignal` to fetch directly so a network-
  *      time abort cancels the request before any bytes flow.
  *   3. Validates the response Content-Type (FR-021) case-insensitively
- *      against `multipart/related` BEFORE constructing dicer. The offending
+ *      against `multipart/related` BEFORE constructing parser. The offending
  *      Content-Type is sanitized via `truncateForErrorEmbed` per
- *      NFR-DR-S-006. T-035 asserts the dicer-activity harness sees zero
- *      Dicer instances on this path.
+ *      NFR-DR-S-006. T-035 asserts the parser-activity harness sees zero
+ *      Parser instances on this path.
  *   4. Captures `status` + `headers` BEFORE consuming the body
  *      (FR-DR-A-029 — the Response is gone after iteration).
  *   5. Forwards `idleTimeoutMs` / `totalTimeoutMs` / `signal` / `onProgress`
@@ -586,11 +585,11 @@ interface MultipartHandlerOptions<T> {
  *   — T-013 spies on `globalThis.fetch` to verify.
  * @throws {Error} `multipart: response Content-Type is not multipart/related;
  *   got <actual>` when the response Content-Type doesn't start with
- *   `multipart/related` (case-insensitive) (FR-021). Dicer is NEVER
- *   constructed on this path — T-035 asserts via the dicer-activity
+ *   `multipart/related` (case-insensitive) (FR-021). Parser is NEVER
+ *   constructed on this path — T-035 asserts via the parser-activity
  *   harness.
  * @throws Any error from `parseMultipartRelated` (idle/total timeout,
- *   abort mid-stream, truncation, source error, dicer error, cap overflow).
+ *   abort mid-stream, truncation, source error, parser error, cap overflow).
  * @throws Any error from `options.parser`.
  *
  * @example
@@ -604,7 +603,7 @@ interface MultipartHandlerOptions<T> {
 declare function fetchAndHandleMultipart<T>(url: string | URL, options: MultipartHandlerOptions<T>): Promise<MultipartFetchResult<T>>;
 
 /**
- * `parseMultipartRelated` — Layer A (parser/dicer adapter). FR-001.
+ * `parseMultipartRelated` — streaming parser adapter. FR-001.
  *
  * Resource-cap enforcement (NFR-DR-S-001/004/012):
  *   - `maxPartBytes` (NFR-DR-S-001): each per-part body Readable gets a
@@ -612,7 +611,7 @@ declare function fetchAndHandleMultipart<T>(url: string | URL, options: Multipar
  *     the listener pushes `MultipartPartTooLargeError` into the queue and
  *     destroys the offending part body. No default — when undefined, no
  *     cap is enforced.
- *   - `maxParts` (NFR-DR-S-012): the dicer 'part' counter is checked at
+ *   - `maxParts` (NFR-DR-S-012): the parser 'part' counter is checked at
  *     each emit; on overflow, push `MultipartTooManyPartsError`. Default
  *     `10_000` when undefined.
  *   - `maxHeadersPerPart` + `maxHeaderBytesPerPart` (NFR-DR-S-004): on
@@ -638,9 +637,9 @@ declare function fetchAndHandleMultipart<T>(url: string | URL, options: Multipar
  *
  * Cleanup contract: the `finally` cleanup drains unyielded part bodies
  * (FR-010), removes 'data'/'error'/'end' listeners on source and 'part'/
- * 'finish' on dicer, unpipes + destroys source, and KEEPS dicer's 'error'
+ * 'finish' on parser, unpipes + destroys source, and KEEPS parser's 'error'
  * listener for late-emit observability (FR-011). Truncation detection
- * (FR-022) fires when source 'end' arrives without dicer 'finish' having
+ * (FR-022) fires when source 'end' arrives without parser 'finish' having
  * fired.
  */
 
@@ -656,7 +655,7 @@ declare function fetchAndHandleMultipart<T>(url: string | URL, options: Multipar
  *   are validated synchronously via `validatePositiveTimeout` — both must be
  *   positive finite integers in `[1, 2_147_483_647]` (NFR-DR-S-009).
  * @returns An `AsyncGenerator<StreamingMultipartPart, void, void>` that
- *   yields parts in dicer's emit order.
+ *   yields parts in parser's emit order.
  *
  * @throws {TypeError} `multipart: idleTimeoutMs must be a positive finite
  *   integer in [1, 2_147_483_647]; …` when `idleTimeoutMs` is missing,
@@ -680,7 +679,7 @@ declare function fetchAndHandleMultipart<T>(url: string | URL, options: Multipar
  *   aborted at call time — first `.next()` rejects synchronously per FR-009).
  *   `error.reason` is the caller's `signal.reason` verbatim (F-S-006).
  * @throws {MultipartTruncatedError} when the source emits `'end'` before
- *   dicer emits `'finish'` (FR-022).
+ *   parser emits `'finish'` (FR-022).
  *
  * @example
  *   for await (const part of parseMultipartRelated(res, {

package/dist/index.js

@@ -1,5 +1,5 @@
-import { Readable, PassThrough } from 'stream';
-import dicerMod from 'dicer';
+import { Readable, Writable, PassThrough } from 'stream';
+import StreamSearch from 'streamsearch';
 
 // src/errors.ts
 var MultipartIdleTimeoutError = class extends Error {
@@ -293,7 +293,7 @@ function flattenHeaderValue(v) {
   }
   return "";
 }
-function flattenDicerHeaders(raw) {
+function flattenPartHeaders(raw) {
   if (raw == null) return {};
   const out = {};
   for (const key of Object.keys(raw)) {
@@ -303,6 +303,213 @@ function flattenDicerHeaders(raw) {
   }
   return out;
 }
+var HEADER_END = Buffer.from("\r\n\r\n");
+var INITIAL_CRLF = Buffer.from("\r\n");
+var CLOSING_DASHES = Buffer.from("--");
+var CLOSING_CR = Buffer.from("--\r");
+var MAX_HEADER_BYTES = 80 * 1024;
+var MAX_HEADER_PAIRS = 2e3;
+var MultipartPartStream = class extends Readable {
+  constructor(onRead) {
+    super();
+    this.onRead = onRead;
+  }
+  onRead;
+  _read() {
+    this.onRead();
+  }
+};
+function parseHeaders(block) {
+  const headers = /* @__PURE__ */ Object.create(null);
+  if (block.length === 0) return headers;
+  const lines = block.toString("latin1").split("\r\n");
+  let previousName;
+  let count = 0;
+  for (const line of lines) {
+    if (line.startsWith(" ") || line.startsWith("	")) {
+      if (previousName === void 0) {
+        throw new Error("Unexpected folded header value");
+      }
+      const values = headers[previousName];
+      if (values === void 0) throw new Error("Malformed part header");
+      values[values.length - 1] += line;
+      continue;
+    }
+    const colon = line.indexOf(":");
+    if (colon <= 0) throw new Error("Malformed part header");
+    const name = line.slice(0, colon);
+    if (!/^[!#$%&'*+.^_`|~0-9A-Za-z-]+$/.test(name)) {
+      throw new Error("Malformed part header");
+    }
+    const value = line.slice(colon + 1).replace(/^[ \t]/, "");
+    if (/[\x00-\x08\x0a-\x1f\x7f]/.test(value)) {
+      throw new Error("Malformed part header");
+    }
+    const key = name.toLowerCase();
+    (headers[key] ??= []).push(value);
+    previousName = key;
+    if (++count > MAX_HEADER_PAIRS) throw new Error("Too many part headers");
+  }
+  return headers;
+}
+var MultipartParser = class extends Writable {
+  needle;
+  search;
+  state = "preamble";
+  part;
+  headerBytes = Buffer.alloc(0);
+  suffix = Buffer.alloc(0);
+  candidate = false;
+  pausedPart;
+  pendingWrite;
+  openParts = 0;
+  finalCallback;
+  constructor(boundary) {
+    super();
+    if (boundary.length === 0) throw new TypeError("Boundary required");
+    this.needle = Buffer.from(`\r
+--${boundary}`);
+    this.search = new StreamSearch(this.needle, (matched, data, start, end, safe) => {
+      if (this.state !== "done" && data && start < end) {
+        const chunk = data.subarray(start, end);
+        this.consume(safe ? chunk : Buffer.from(chunk));
+      }
+      if (this.state === "done") return;
+      if (matched) {
+        if (this.state === "headers") throw new Error("Malformed part header");
+        this.candidate = true;
+      }
+    });
+    this.search.push(INITIAL_CRLF);
+  }
+  _write(chunk, _encoding, callback) {
+    try {
+      this.search.push(chunk);
+      if (this.pausedPart) this.pendingWrite = callback;
+      else callback();
+    } catch (error) {
+      callback(error instanceof Error ? error : new Error(String(error)));
+    }
+  }
+  _final(callback) {
+    try {
+      this.search.destroy();
+    } catch (error) {
+      callback(error instanceof Error ? error : new Error(String(error)));
+      return;
+    }
+    if (this.candidate && this.suffix.equals(CLOSING_DASHES)) {
+      this.candidate = false;
+      this.endPart();
+      this.state = "done";
+    }
+    if (this.state !== "done") {
+      const error = new Error("Unexpected end of multipart data");
+      this.endPart();
+      callback(error);
+      return;
+    }
+    if (this.openParts === 0) callback();
+    else this.finalCallback = callback;
+  }
+  resumeWrite(part) {
+    if (this.pausedPart !== part) return;
+    this.pausedPart = void 0;
+    const callback = this.pendingWrite;
+    this.pendingWrite = void 0;
+    callback?.();
+  }
+  endPart() {
+    const part = this.part;
+    if (part === void 0) return;
+    this.part = void 0;
+    part.push(null);
+  }
+  beginPart() {
+    this.headerBytes = Buffer.alloc(0);
+    this.state = "headers";
+    const part = new MultipartPartStream(() => this.resumeWrite(part));
+    this.part = part;
+    this.openParts++;
+    let settled = false;
+    const onPartDone = () => {
+      if (settled) return;
+      settled = true;
+      this.openParts--;
+      this.resumeWrite(part);
+      if (this.openParts === 0 && this.finalCallback) {
+        const callback = this.finalCallback;
+        this.finalCallback = void 0;
+        callback();
+      }
+    };
+    part.once("end", onPartDone);
+    part.once("close", onPartDone);
+    this.emit("part", part);
+  }
+  consume(data) {
+    if (this.candidate) {
+      if (this.suffix.length < 2) {
+        const taken = Math.min(2 - this.suffix.length, data.length);
+        this.suffix = Buffer.concat([this.suffix, data.subarray(0, taken)]);
+        data = data.subarray(taken);
+      }
+      if (this.suffix.length < 2) return;
+      if (this.suffix.equals(CLOSING_DASHES)) {
+        if (data.length === 0) return;
+        if (data[0] === 13) {
+          this.suffix = CLOSING_CR;
+          data = data.subarray(1);
+          if (data.length === 0) return;
+        }
+      }
+      if (this.suffix.equals(CLOSING_CR) && data.length === 0) return;
+      const suffix = this.suffix;
+      this.suffix = Buffer.alloc(0);
+      this.candidate = false;
+      if (suffix.equals(INITIAL_CRLF)) {
+        this.endPart();
+        this.beginPart();
+      } else if (suffix.equals(CLOSING_CR) && data[0] === 10) {
+        data = data.subarray(1);
+        this.endPart();
+        this.state = "done";
+        return;
+      } else if (this.state === "headers") {
+        data = Buffer.concat([this.needle, suffix, data]);
+      } else if (this.state === "body") {
+        this.consumeBody(this.needle);
+        this.consumeBody(suffix);
+      }
+    }
+    if (this.state === "headers") {
+      const pending = this.headerBytes.length;
+      const scan = data.subarray(0, MAX_HEADER_BYTES + HEADER_END.length - pending);
+      const combined = Buffer.concat([this.headerBytes, scan]);
+      const empty = combined.length >= 2 && combined.subarray(0, 2).equals(INITIAL_CRLF);
+      const end = empty ? 0 : combined.indexOf(HEADER_END);
+      if (end < 0) {
+        if (combined.length > MAX_HEADER_BYTES) throw new Error("Part headers too large");
+        this.headerBytes = combined;
+        return;
+      }
+      if (end > MAX_HEADER_BYTES) throw new Error("Part headers too large");
+      const headers = parseHeaders(combined.subarray(0, end));
+      const rawHeaders = Buffer.from(combined.subarray(0, end + (empty ? 2 : HEADER_END.length)));
+      this.headerBytes = Buffer.alloc(0);
+      this.state = "body";
+      this.part?.emit("header", headers, rawHeaders);
+      this.consumeBody(data.subarray(end + (empty ? 2 : HEADER_END.length) - pending));
+    } else if (this.state === "body") {
+      this.consumeBody(data);
+    }
+  }
+  consumeBody(data) {
+    if (data.length > 0 && this.part && !this.part.destroyed && !this.part.push(data)) {
+      this.pausedPart = this.part;
+    }
+  }
+};
 function looksLikeResponse(input) {
   if (typeof Response !== "undefined" && input instanceof Response) {
     return true;
@@ -464,19 +671,6 @@ function setupTimers(opts, startMs) {
 }
 
 // src/parse-multipart-related.ts
-function measureHeaderValueBytes(value) {
-  if (typeof value === "string") return Buffer.byteLength(value);
-  if (Array.isArray(value)) {
-    let total = 0;
-    for (const inner of value) {
-      total += measureHeaderValueBytes(inner);
-    }
-    return total;
-  }
-  if (Buffer.isBuffer(value)) return value.length;
-  return 0;
-}
-var Dicer = dicerMod.default ?? dicerMod;
 function parseMultipartRelated(input, opts) {
   return parseMultipartRelatedImpl(input, opts);
 }
@@ -491,11 +685,11 @@ async function* parseMultipartRelatedImpl(input, opts) {
     boundary: opts.boundary
   });
   const logger = opts.logger ?? defaultLogger;
-  const dicer = new Dicer({ boundary });
+  const parser = new MultipartParser(boundary);
   const queue = createQueueNotifier();
   let bytesReceived = 0;
   let nextPartIndex = 0;
-  let dicerFinished = false;
+  let parserFinished = false;
   let cleaned = false;
   let abortPushed = false;
   const allPartStreams = /* @__PURE__ */ new Set();
@@ -553,21 +747,13 @@ async function* parseMultipartRelatedImpl(input, opts) {
     const headersAccumulator = {
       value: {}
     };
-    const onHeader = (raw) => {
+    const onHeader = (raw, rawHeaderBlock) => {
       const bag = raw;
       let headerCount = 0;
-      let headerBytes = 0;
-      if (bag != null) {
-        for (const name of Object.keys(bag)) {
-          const value = bag[name];
-          const nameBytes = Buffer.byteLength(name);
-          const values = Array.isArray(value) ? value : [value];
-          for (const inner of values) {
-            headerCount += 1;
-            headerBytes += nameBytes + 4 + measureHeaderValueBytes(inner);
-          }
-        }
+      if (bag !== void 0) {
+        for (const values of Object.values(bag)) headerCount += values.length;
       }
+      const headerBytes = rawHeaderBlock.length;
       if (headerCount > maxHeadersPerPart) {
         if (!partStream.destroyed) partStream.destroy();
         queue.signalError(
@@ -592,7 +778,7 @@ async function* parseMultipartRelatedImpl(input, opts) {
         );
         return;
       }
-      headersAccumulator.value = flattenDicerHeaders(
+      headersAccumulator.value = flattenPartHeaders(
         raw
       );
       const headers = headersAccumulator.value;
@@ -644,12 +830,12 @@ async function* parseMultipartRelatedImpl(input, opts) {
         index: partIndex,
         boundary,
         headers,
-        rawHeaders: Buffer.alloc(0),
+        rawHeaders: rawHeaderBlock,
         contentType,
         ...contentId !== void 0 ? { contentId } : {},
         ...contentLength !== void 0 ? { contentLength } : {},
         // When maxPartBytes is configured, body is the PassThrough that
-        // wraps dicer's per-part Readable; otherwise body is dicer's
+        // wraps parser's per-part Readable; otherwise body is parser's
         // per-part Readable directly. Both expose Node `Readable`.
         body: publicBody
       };
@@ -670,10 +856,10 @@ async function* parseMultipartRelatedImpl(input, opts) {
     });
   };
   const onFinish = () => {
-    dicerFinished = true;
+    parserFinished = true;
     queue.signalEnd();
   };
-  const onDicerError = (err) => {
+  const onParserError = (err) => {
     if (cleaned) {
       logger({
         level: "warn",
@@ -693,18 +879,18 @@ async function* parseMultipartRelatedImpl(input, opts) {
   };
   const onSourceEnd = () => {
     setImmediate(() => {
-      if (dicerFinished) return;
+      if (parserFinished) return;
       if (cleaned) return;
       queue.signalError(new MultipartTruncatedError(bytesReceived));
     });
   };
-  dicer.on("part", onPart);
-  dicer.on("finish", onFinish);
-  dicer.on("error", onDicerError);
+  parser.on("part", onPart);
+  parser.on("finish", onFinish);
+  parser.on("error", onParserError);
   source.on("data", onSourceData);
   source.on("error", onSourceError);
   source.on("end", onSourceEnd);
-  source.pipe(dicer);
+  source.pipe(parser);
   const cleanup = () => {
     if (cleaned) return;
     cleaned = true;
@@ -712,7 +898,7 @@ async function* parseMultipartRelatedImpl(input, opts) {
     source.off("error", onSourceError);
     source.off("end", onSourceEnd);
     try {
-      source.unpipe(dicer);
+      source.unpipe(parser);
     } catch (err) {
       logger({
         level: "warn",
@@ -730,8 +916,8 @@ async function* parseMultipartRelatedImpl(input, opts) {
       if (!partStream.destroyed) partStream.destroy();
     }
     allPartStreams.clear();
-    dicer.off("part", onPart);
-    dicer.off("finish", onFinish);
+    parser.off("part", onPart);
+    parser.off("finish", onFinish);
     timers.signal.removeEventListener("abort", onCombinedAbort);
     timers.cleanup();
   };