Support parsing multipart/mixed mime type #232

Huachao · Dec 1, 2018 · 3e64c18 · 3e64c18
1 parent bf0ccbe
commit 3e64c18
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/src/utils/httpRequestParser.ts b/src/utils/httpRequestParser.ts
@@ -71,17 +71,20 @@ export class HttpRequestParser implements IRequestParser {
                 headers = RequestParserUtil.parseRequestHeaders(headerLines.slice(index));
 
                 // get body range
-                let bodyStartLine = ArrayUtility.firstIndexOf(lines, value => value.trim() !== '', headerEndLine);
+                const bodyStartLine = ArrayUtility.firstIndexOf(lines, value => value.trim() !== '', headerEndLine);
                 if (bodyStartLine !== -1) {
-                    let contentTypeHeader = getHeader(headers, 'content-type') || getHeader(this._restClientSettings.defaultHeaders, 'content-type');
+                    const contentTypeHeader = getHeader(headers, 'content-type') || getHeader(this._restClientSettings.defaultHeaders, 'content-type');
                     firstEmptyLine = ArrayUtility.firstIndexOf(lines, value => value.trim() === '', bodyStartLine);
-                    let bodyEndLine = MimeUtility.isMultiPartFormData(contentTypeHeader) || firstEmptyLine === -1 ? lines.length : firstEmptyLine;
+                    const bodyEndLine =
+                        MimeUtility.isMultiPartFormData(contentTypeHeader) || MimeUtility.isMultiPartMixed(contentTypeHeader) || firstEmptyLine === -1
+                            ? lines.length
+                            : firstEmptyLine;
                     bodyLines = lines.slice(bodyStartLine, bodyEndLine);
                 }
             } else {
                 // parse body, since no headers provided
-                let firstEmptyLine = ArrayUtility.firstIndexOf(lines, value => value.trim() === '', headerStartLine);
-                let bodyEndLine = firstEmptyLine === -1 ? lines.length : firstEmptyLine;
+                const firstEmptyLine = ArrayUtility.firstIndexOf(lines, value => value.trim() === '', headerStartLine);
+                const bodyEndLine = firstEmptyLine === -1 ? lines.length : firstEmptyLine;
                 bodyLines = lines.slice(headerStartLine, bodyEndLine);
             }
         }

diff --git a/src/utils/mimeUtility.ts b/src/utils/mimeUtility.ts
@@ -100,6 +100,14 @@ export class MimeUtility {
         return MimeUtility.parse(contentTypeString).type === 'text/css';
     }
 
+    public static isMultiPartMixed(contentTypeString: string): boolean {
+        if (!contentTypeString) {
+            return false;
+        }
+
+        return MimeUtility.parse(contentTypeString).type === 'multipart/mixed';
+    }
+
     public static isMultiPartFormData(contentTypeString: string): boolean {
         if (!contentTypeString) {
             return false;