From 6a6563b4de85878e9394b3c52f6750ad0289d191 Mon Sep 17 00:00:00 2001
From: Mark Faga <mjfaga@gmail.com>
Date: Fri, 21 Mar 2025 14:44:59 -0400
Subject: [PATCH] fix: don't require trailing line break on terminal boundary

---
 src/__test__/PatchResolver.spec.js | 40 ++++++++++++++++++++++++++++--
 src/parseMultipartHttp.js          |  2 +-
 2 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/src/__test__/PatchResolver.spec.js b/src/__test__/PatchResolver.spec.js
index b465005..cdefbcc 100644
--- a/src/__test__/PatchResolver.spec.js
+++ b/src/__test__/PatchResolver.spec.js
@@ -4,10 +4,13 @@ import { TextEncoder, TextDecoder } from 'util';
 global.TextEncoder = TextEncoder;
 global.TextDecoder = TextDecoder;
 
-function getMultiPartResponse(data, boundary) {
+function getMultiPartResponse(data, boundary, includeTrailingLineBreak = true) {
     const json = JSON.stringify(data);
+    const maybeLineBreak = includeTrailingLineBreak ? '\r\n' : '';
 
-    return ['Content-Type: application/json', '', json, `--${boundary}\r\n`].join('\r\n');
+    return ['Content-Type: application/json', '', json, `--${boundary}${maybeLineBreak}`].join(
+        '\r\n'
+    );
 }
 
 describe('PathResolver', function () {
@@ -188,6 +191,39 @@ describe('PathResolver', function () {
                 resolver.handleChunk(chunk2b);
                 expect(onResponse.mock.calls[0][0]).toEqual([chunk2Data]);
             });
+
+            it('should work when final chunk ends with terminating boundary and no line break', function () {
+                const onResponse = jest.fn();
+                const resolver = new PatchResolver({
+                    onResponse,
+                    boundary,
+                });
+
+                resolver.handleChunk(`\r\n--${boundary}\r\n`);
+
+                expect(onResponse).not.toHaveBeenCalled();
+
+                resolver.handleChunk(chunk1);
+                expect(onResponse.mock.calls[0][0]).toEqual([chunk1Data]);
+
+                onResponse.mockClear();
+                resolver.handleChunk(chunk2);
+                expect(onResponse.mock.calls[0][0]).toEqual([chunk2Data]);
+
+                onResponse.mockClear();
+                resolver.handleChunk(chunk3);
+                expect(onResponse.mock.calls[0][0]).toEqual([chunk3Data]);
+
+                onResponse.mockClear();
+                const chunk4FinalBoundary = getMultiPartResponse(
+                    chunk4Data,
+                    `${boundary}--`,
+                    false
+                );
+                resolver.handleChunk(chunk4FinalBoundary);
+                expect(onResponse.mock.calls[0][0]).toEqual([chunk4Data]);
+            });
+
             it('should work when final chunk ends with terminating boundary', function () {
                 const onResponse = jest.fn();
                 const resolver = new PatchResolver({
diff --git a/src/parseMultipartHttp.js b/src/parseMultipartHttp.js
index f52c76e..3373ca0 100644
--- a/src/parseMultipartHttp.js
+++ b/src/parseMultipartHttp.js
@@ -3,7 +3,7 @@ function getDelimiter(boundary) {
 }
 
 function getClosingDelimiter(boundary) {
-    return `\r\n--${boundary}--\r\n`;
+    return `\r\n--${boundary}--`;
 }
 
 function splitWithRest(string, delim) {