refactor: use formdata-polyfill library in example (#806)

jimmywarting · web-flow · commit b627d7980710 · 2022-01-01T23:01:27.000+01:00
diff --git a/examples/multipart-parser.js b/examples/multipart-parser.js
@@ -1,14 +1,24 @@
+import { Blob } from 'node:buffer';
+import { Readable } from 'node:stream';
+import { FormData, formDataToBlob } from 'formdata-polyfill/esm.min.js'
 import { MultipartParser } from '../src/index.js';
 
+const blob1 = new Blob(
+  ['Content of a.txt.'],
+  { type: 'text/plain' }
+);
 
-// hand crafted multipart
-const boundary = '--abcxyz';
-const next = '\r\n';
-const formData = 'Content-Disposition: form-data; ';
-const bufferToWrite = Buffer.from(
-  `${boundary}${next}${formData}name="text"${next}${next}some text ...${next}${next}${boundary}${next}${formData}name="z"${next}${next}text inside z${next}${next}${boundary}${next}${formData}name="file1"; filename="a.txt"${next}Content-Type: text/plain${next}${next}Content of a.txt.${next}${next}${boundary}${next}${formData}name="file2"; filename="a.html"${next}Content-Type: text/html${next}${next}<!DOCTYPE html><title>Content of a.html.</title>${next}${next}${boundary}--`,
+const blob2 = new Blob(
+  ['<!DOCTYPE html><title>Content of a.html.</title>'],
+  { type: 'text/html' }
 );
 
+const fd = new FormData();
+fd.set('text', 'some text ...');
+fd.set('z', 'text inside z');
+fd.set('file1', blob1, 'a.txt');
+fd.set('file2', blob2, 'a.html');
+
 const multipartParser = new MultipartParser();
 multipartParser.on('data', ({ name, buffer, start, end }) => {
   console.log(`${name}:`);
@@ -17,12 +27,11 @@ multipartParser.on('data', ({ name, buffer, start, end }) => {
   }
   console.log();
 });
-multipartParser.on('error', (error) => {
-  console.error(error);
-});
+multipartParser.on('error', console.error);
+
+const blob = formDataToBlob(fd);
+const boundary = blob.type.split('boundary=')[1];
+
+multipartParser.initWithBoundary(boundary);
 
-multipartParser.initWithBoundary(boundary.substring(2)); // todo make better error message when it is forgotten
-// const shouldWait = !multipartParser.write(buffer);
-multipartParser.write(bufferToWrite);
-multipartParser.end();
-// multipartParser.destroy();
+Readable.from(blob.stream()).pipe(multipartParser);
diff --git a/package.json b/package.json
@@ -45,6 +45,7 @@
     "eslint-plugin-import": "2.20.2",
     "eslint-plugin-prettier": "3.1.3",
     "express": "4.17.1",
+    "formdata-polyfill": "^4.0.10",
     "husky": "4.2.5",
     "jest": "27.2.4",
     "koa": "2.11.0",
diff --git a/yarn.lock b/yarn.lock
@@ -2298,6 +2298,13 @@ fb-watchman@^2.0.0:
   dependencies:
     bser "2.1.1"
 
+fetch-blob@^3.1.2:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/fetch-blob/-/fetch-blob-3.1.3.tgz#a7dca4855e39d3e3c5a1da62d4ee335c37d26012"
+  integrity sha512-ax1Y5I9w+9+JiM+wdHkhBoxew+zG4AJ2SvAD1v1szpddUIiPERVGBxrMcB2ZqW0Y3PP8bOWYv2zqQq1Jp2kqUQ==
+  dependencies:
+    web-streams-polyfill "^3.0.3"
+
 figures@^3.0.0, figures@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af"
@@ -2408,6 +2415,13 @@ form-data@~2.3.2:
     combined-stream "^1.0.6"
     mime-types "^2.1.12"
 
+formdata-polyfill@^4.0.10:
+  version "4.0.10"
+  resolved "https://registry.yarnpkg.com/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz#24807c31c9d402e002ab3d8c720144ceb8848423"
+  integrity sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==
+  dependencies:
+    fetch-blob "^3.1.2"
+
 formidable@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/formidable/-/formidable-1.2.2.tgz#bf69aea2972982675f00865342b982986f6b8dd9"
@@ -5548,6 +5562,11 @@ wcwidth@^1.0.1:
   dependencies:
     defaults "^1.0.3"
 
+web-streams-polyfill@^3.0.3:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/web-streams-polyfill/-/web-streams-polyfill-3.2.0.tgz#a6b74026b38e4885869fb5c589e90b95ccfc7965"
+  integrity sha512-EqPmREeOzttaLRm5HS7io98goBgZ7IVz79aDvqjD0kYXLtFZTc0T/U6wHTPKyIjb+MdN7DFIIX6hgdBEpWmfPA==
+
 webidl-conversions@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz#ae59c8a00b121543a2acc65c0434f57b0fc11aff"
