refactor: pass mode and mtime in headers

Author: achingbrain

src/parser.js

@@ -45,55 +45,51 @@ const ignore = async (stream) => {
 }
 
 async function * parseEntry (stream, options) {
-  let entry = {}
-
   for await (const part of stream) {
-    let type
+    if (!part.headers['content-type']) {
+      throw new Error('No content-type in multipart part')
+    }
 
-    if (part.headers['content-type']) {
-      type = Content.type(part.headers['content-type'])
+    const type = Content.type(part.headers['content-type'])
 
-      if (type.boundary) {
-        // recursively parse nested multiparts
-        yield * parser(part.body, {
-          ...options,
-          boundary: type.boundary
-        })
+    if (type.boundary) {
+      // recursively parse nested multiparts
+      yield * parser(part.body, {
+        ...options,
+        boundary: type.boundary
+      })
 
-        continue
-      }
+      continue
     }
 
     if (!part.headers['content-disposition']) {
       throw new Error('No content disposition in multipart part')
     }
 
-    const disposition = parseDisposition(part.headers['content-disposition'])
+    const entry = {}
 
-    if (disposition.name.includes('mtime')) {
-      entry.mtime = parseInt((await collect(part.body)).toString('utf8'), 10)
+    if (part.headers.mtime) {
+      entry.mtime = parseInt(part.headers.mtime, 10)
     }
 
-    if (disposition.name.includes('mode')) {
-      entry.mode = parseInt((await collect(part.body)).toString('utf8'), 10)
+    if (part.headers.mode) {
+      entry.mode = parseInt(part.headers.mode, 8)
     }
 
-    if (type) {
-      if (isDirectory(type.mime)) {
-        entry.type = 'directory'
-      } else if (type.mime === applicationSymlink) {
-        entry.type = 'symlink'
-      } else {
-        entry.type = 'file'
-      }
+    if (isDirectory(type.mime)) {
+      entry.type = 'directory'
+    } else if (type.mime === applicationSymlink) {
+      entry.type = 'symlink'
+    } else {
+      entry.type = 'file'
+    }
 
-      entry.name = decodeURIComponent(disposition.filename)
-      entry.body = part.body
+    const disposition = parseDisposition(part.headers['content-disposition'])
 
-      yield entry
+    entry.name = decodeURIComponent(disposition.filename)
+    entry.body = part.body
 
-      entry = {}
-    }
+    yield entry
   }
 }
 

test/parser.spec.js

@@ -111,13 +111,28 @@ describe('parser', () => {
 
     it('parses regular multipart requests correctly', (done) => {
       const formData = {
-        mtime: fileMtime,
-        mode: fileMode,
         file: fs.createReadStream(filePath)
       }
 
       request.post({ url: `http://localhost:${PORT}`, formData: formData }, (err) => done(err))
     })
+
+    it('parses multipart requests with metatdata correctly', (done) => {
+      const r = request.post({ url: `http://localhost:${PORT}` }, (err) => done(err))
+
+      // request uses an old version of form-data so this is clunky
+      const CRLF = '\r\n'
+      const form = r.form()
+      form.append('file', fileContent, {
+        header: [
+          `--${form.getBoundary()}`,
+          'content-type: application/octet-stream',
+          'content-disposition: form-data; filename="file.txt"; name="file"',
+          `mtime: ${fileMtime}`,
+          `mode: ${fileMode}`
+        ].join(CRLF) + CRLF
+      })
+    })
   })
 
   describe('directory', () => {