fixed UrlencodedParser

.gitignore

@@ -9,4 +9,5 @@
 .vscode
 
 
+.tmp/
 node_modules/

Readme.md

@@ -1,4 +1,6 @@
-![module info](https://nodei.co/npm/@gm5/request.png?downloads=true&downloadRank=true&stars=true)
+
+![downloads](https://img.shields.io/npm/dt/@gm5/request.svg)
+![version](https://img.shields.io/npm/v/@gm5/request.svg)
 
 # @gm5/equest
 > 对Http的request进一步封装, 提供常用的API.
@@ -19,115 +21,13 @@ http
   .createServer((req, res) => {
     let request = new Request(req, res)
 
-    console.log(request.origin) // {req, res}
-
     // print the fixed url
     console.log(request.url)
 
-    request.ip() // get client ip address
+    request.ip // get client ip address
 
     // http://test.com/?foo=bar
-    request.get('foo') // bar
+    request.query['foo'] // bar
   })
   .listen(3000)
 ```
-
-## API
-
-### origin 
-> 返回原始的response & request对象
-
-```js
-console.log(request.origin) // {req: request, res: response}
-```
-
-
-### app
-> 返回一级路由的名字
-
-```js
-// abc.com/foo/bar
-console.log(request.app) // foo
-```
-
-
-### path
-> 以数组形式,返回除一级路由之外剩下的路径
-
-```js
-// abc.com/foo/bar/aa/bb
-console.log(request.path) // ['bar', 'aa', 'bb']
-```
-
-### url
-> 返回修正过的url路径
-
-```js
-// abc.com/foo/bar/aa/bb
-// abc.com////foo///bar/aa/bb
-console.log(request.url) // foo/bar/aa/bb
-```
-
-
-
-### get([key[,xss]])
-
-* key `<String>` 字段名 [可选], 不则返回全部参数
-* xss `<Boolean>` 是否进行xss过滤 [可选], 默认为ture
-
-> 返回URL上的query参数, 类似于`$_GET[]`;
-
-
-```javascript
-// http://test.com?name=foo&age=18
-request.get('name') // foo
-request.get('age') // 18
-
-request.get() // {name: 'foo', age: 18}
-request.get('weight') // return null if not exists
-```
-
-### post([key[,xss]])
-
-* key `<String>` optional
-* xss `<Boolean>` optional
-
-> 读取post请求的body, 类似于 `$_POST[]`.
-
-> **该方法返回的是Promise对象**
-
-```javascript
-// http://test.com
-await request.post('name') // foo
-await request.post('age') // 18
-
-// return all if not yet argument given
-await request.post() // {name: 'foo', age: 18}
-await request.post('weight') // return null if not exists
-```
-
-### header([key])
-
-* key `<String>` 字段名[可选], 不传则返回全部
-
-> 返回请求头
-
-```javascript
-request.header('user-agent') // Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 ...
-
-// return all if not yet argument given
-request.header() // {'user-agent': '...'[, ...]}
-```
-
-### ip()
-
-> 获取客户端IP地址.
->
-> It would return '127.0.0.1' maybe if in local area network.
-
-
-### cookie(key)
-
-> 获取客户端带上的cookie.
-> 不传key时返回所有的
-

index.js

@@ -5,20 +5,21 @@
 
 import 'es.shim'
 
+import { fileURLToPath, parse } from 'node:url'
+import { dirname, resolve } from 'node:path'
+import fs from 'iofs'
+
 import Parser from './lib/index.js'
 import { parseCookie } from './lib/cookie.js'
-import fs from 'iofs'
+import { querystring } from './lib/helper.js'
-import URL from 'url'
-import QS from 'querystring'
-import PATH from 'path'
 
 const DEFAULT_FORM_TYPE = 'application/x-www-form-urlencoded'
 
-var __dirname = PATH.dirname(URL.fileURLToPath(import.meta.url))
+const __dirname = dirname(fileURLToPath(import.meta.url))
 
-var tmpdir = PATH.resolve(__dirname, '.tmp/')
+const tmpdir = resolve(__dirname, '.tmp/')
-var encode = encodeURIComponent
+const encode = encodeURIComponent
-var decode = decodeURIComponent
+const decode = decodeURIComponent
 
 if (fs.isdir(tmpdir)) {
   fs.rm(tmpdir, true)
@@ -36,226 +37,174 @@ function hideProperty(host, name, value) {
 }
 
 export default class Request {
-  constructor(req, res) {
+  #req = null
+  #res = null
+
+  #opts = {}
+
+  #query = null
+  #body = null
+  #cookies = Object.create(null)
+
+  controller = 'index'
+  method = 'GET'
+  path = []
+
+  url = ''
+  host = '127.0.0.1'
+  hostname = '127.0.0.1'
+  protocol = 'http'
+
+  constructor(req, res, opts = {}) {
     this.method = req.method.toUpperCase()
-    this.params = {}
 
-    hideProperty(this, 'origin', { req, res })
+    this.#req = req
-    hideProperty(this, '__GET__', null)
+    this.#res = res
-    hideProperty(this, '__POST__', null)
-    hideProperty(this, '__COOKIE__', parseCookie(this.header('cookie') || ''))
 
-    this.__fixUrl()
+    this.host = req.headers['host'] || '127.0.0.1'
+    this.hostname = this.host.split(':')[0]
+    this.protocol = req.headers['x-forwarded-proto'] || 'http'
+
+    this.#cookies = parseCookie(this.headers['cookie'] || '')
+
+    Object.assign(this.#opts, opts)
+
+    this.#init()
   }
 
   // 修正请求的url
-  __fixUrl() {
+  #init() {
-    let _url = URL.parse(this.origin.req.url)
+    let url = parse(this.#req.url)
       .pathname.slice(1)
       .replace(/[\/]+$/, '')
-    let app = '' // 将作为主控制器(即apps目录下的应用)
+    let controller = '' // 将作为主控制器(即apps目录下的应用)
-    let pathArr = []
+    let path = []
-    let tmpArr = []
 
     // URL上不允许有非法字符
-    if (/[^\w-/.@~!$&:+'=]/.test(decode(_url))) {
+    if (/[^\w-/.,@~!$&:+'"=]/.test(decode(url))) {
-      this.origin.res.rendered = true
+      this.#res.rendered = true
-      this.origin.res.writeHead(400, {
+      this.#res.writeHead(400, {
-        'X-debug': `url [/${encode(_url)}] contains invalid characters`
+        'X-debug': `url [/${encode(url)}] contains invalid characters`
       })
-      return this.origin.res.end(`Invalid characters: /${_url}`)
+      return this.#res.end(`Invalid characters: /${url}`)
     }
 
     // 修正url中可能出现的"多斜杠"
-    _url = _url.replace(/[\/]+/g, '/').replace(/^\//, '')
+    url = url.replace(/[\/]+/g, '/').replace(/^\//, '')
 
-    pathArr = _url.split('/')
+    path = url.split('/')
-    if (!pathArr[0] || pathArr[0] === '') {
+    if (!path[0] || path[0] === '') {
-      pathArr[0] = 'index'
+      path[0] = 'index'
     }
 
-    if (pathArr[0].indexOf('.') !== -1) {
+    if (path[0].includes('.')) {
-      app = pathArr[0].slice(0, pathArr[0].indexOf('.'))
+      controller = path[0].slice(0, path[0].indexOf('.'))
       // 如果app为空(这种情况一般是url前面带了个"."造成的),则自动默认为index
-      if (!app || app === '') {
+      if (!controller || controller === '') {
-        app = 'index'
+        controller = 'index'
       }
     } else {
-      app = pathArr[0]
+      controller = path[0]
     }
 
-    pathArr.shift()
+    path.shift()
 
-    // 将path第3段之后的部分, 每2个一组转为key-val数据对象, 存入params中
+    this.controller = controller
-    tmpArr = pathArr.slice(1).concat()
+    this.url = url
-    while (tmpArr.length) {
+    this.path = path
-      this.params[tmpArr.shift()] = tmpArr.shift() || null
-    }
-    tmpArr = undefined
-
-    for (let i in this.params) {
-      if (!this.params[i]) {
-        continue
-      }
-      // 修正数字类型,把符合条件的数字字符串转为数字(也许会误转, 但总的来说是利大弊)
-      this.params[i] = Number.parse(this.params[i])
-    }
-
-    this.app = app
-    this.url = _url
-    this.path = pathArr
   }
 
   /**
-   * [get 同php的$_GET]
+   * [解析请求体, 需要 await ]
-   */
-  get(key = '', xss = true) {
-    xss = !!xss
-    if (!this.__GET__) {
-      let para = URL.parse(this.origin.req.url).query
-      para = Object.assign({}, QS.parse(para))
-      if (xss) {
-        for (let i in para) {
-          if (!para[i]) {
-            continue
-          }
-
-          if (Array.isArray(para[i])) {
-            para[i] = para[i].map(it => {
-              it = Number.parse(it.trim().xss())
-              return it
-            })
-          } else {
-            para[i] = Number.parse(para[i].trim().xss())
-          }
-        }
-      }
-      this.__GET__ = para
-    }
-
-    return key
-      ? this.__GET__.hasOwnProperty(key)
-        ? this.__GET__[key]
-        : null
-      : this.__GET__
-  }
-
-  /**
-   * [post 接收post, 需要 await ]
    * @param  {Str}    key      [字段]
    */
-  post(key = '', xss = true) {
+  #parseBody() {
-    let para = {}
     let out = Promise.defer()
     let form, contentType
-    xss = !!xss
+    this.#body = {}
-
-    //如果之前已经缓存过,则直接从缓存读取
-    if (this.__POST__) {
-      if (key) {
-        return this.__POST__.hasOwnProperty(key) ? this.__POST__[key] : null
-      } else {
-        return this.__POST__
-      }
-    }
 
     contentType = this.header('content-type') || DEFAULT_FORM_TYPE
 
-    form = new Parser()
+    form = new Parser(this.#req, { ...this.#opts, uploadDir: tmpdir })
-    form.uploadDir = tmpdir
-    form.parse(this.origin.req)
 
-    form.on('field', (name, value) => {
+    form
+      .on('field', (name, value) => {
         if (name === false) {
-        para = value
+          this.#body = value
           return
         }
-      if (~contentType.indexOf('urlencoded')) {
-        if (
-          name.slice(0, 2) === '{"' &&
-          (name.slice(-2) === '"}' || value.slice(-2) === '"}')
-        ) {
-          name = name.replace(/\s/g, '+')
 
-          if (value.slice(0, 1) === '=') value = '=' + value
+        if (name.endsWith('[]')) {
-
-          return Object.assign(para, JSON.parse(name + value))
-        }
-      }
-
-      if (typeof value === 'string') {
-        value = xss ? value.xss() : value
-      }
-
-      if (name.slice(-2) === '[]') {
           name = name.slice(0, -2)
           if (typeof value === 'string') {
             value = [value]
           }
         } else if (name.slice(-1) === ']') {
-        let key = name.slice(name.lastIndexOf('[') + 1, -1)
+          let idx = name.lastIndexOf('[')
-        name = name.slice(0, name.lastIndexOf('['))
+          let key = name.slice(idx + 1, -1)
+          name = name.slice(0, idx)
 
           //多解析一层对象(也仅支持到这一层)
           if (name.slice(-1) === ']') {
-          let pkey = name.slice(name.lastIndexOf('[') + 1, -1)
+            idx = name.lastIndexOf('[')
-          name = name.slice(0, name.lastIndexOf('['))
+            let pkey = name.slice(idx + 1, -1)
+            name = name.slice(0, idx)
 
-          if (!para.hasOwnProperty(name)) {
+            if (!this.#body.hasOwnProperty(name)) {
-            para[name] = {}
+              this.#body[name] = {}
             }
 
-          if (!para[name].hasOwnProperty(pkey)) {
+            if (!this.#body[name].hasOwnProperty(pkey)) {
-            para[name][pkey] = {}
+              this.#body[name][pkey] = {}
             }
 
-          para[name][pkey][key] = value
+            this.#body[name][pkey][key] = value
           } else {
-          if (!para.hasOwnProperty(name)) {
+            if (!this.#body.hasOwnProperty(name)) {
-            para[name] = {}
+              this.#body[name] = {}
             }
 
-          para[name][key] = value
+            this.#body[name][key] = value
           }
           return
         }
 
-      para[name] = value
+        this.#body[name] = value
       })
-
+      .on('file', (name, file) => {
-    form.on('file', (name, file) => {
+        if (name === false) {
+          this.#body = file
+        } else {
           if (name.slice(-2) === '[]') {
             name = name.slice(0, -2)
           }
-      if (!para.hasOwnProperty(name)) {
+          if (!this.#body.hasOwnProperty(name)) {
-        para[name] = file
+            this.#body[name] = file
           } else {
-        if (!Array.isArray(para[name])) {
+            if (!Array.isArray(this.#body[name])) {
-          para[name] = [para[name]]
+              this.#body[name] = [this.#body[name]]
+            }
+            this.#body[name].push(file)
           }
-        para[name].push(file)
         }
       })
-
+      .on('buffer', buf => {
-    form.on('error', out.reject)
+        this.#body = buf
-
+      })
-    form.on('end', err => {
+      .on('error', out.reject)
-      if (~contentType.indexOf('urlencoded')) {
+      .on('end', _ => {
-        for (let i in para) {
+        if (contentType.includes('urlencoded')) {
-          if (typeof para[i] === 'string') {
+          for (let i in this.#body) {
-            if (!para[i]) {
+            if (typeof this.#body[i] === 'string') {
+              if (!this.#body[i]) {
                 continue
               }
-            para[i] = Number.parse(para[i])
+              this.#body[i] = Number.parse(this.#body[i])
             }
           }
         }
-      this._postParam = para
+
-      if (key) {
+        out.resolve(this.#body)
-        return out.resolve(para.hasOwnProperty(key) ? para[key] : null)
-      } else {
-        return out.resolve(para)
-      }
       })
     return out.promise
   }
@@ -263,23 +212,46 @@ export default class Request {
   //获取响应头
   header(key = '') {
     key = key ? (key + '').toLowerCase() : null
-    return !!key ? this.origin.req.headers[key] : this.origin.req.headers
+    return !!key ? this.#req.headers[key] : this.#req.headers
   }
 
   // 读取cookie
   cookie(key) {
     if (key) {
-      return this.__COOKIE__[key]
+      return this.#cookies[key]
     }
-    return this.__COOKIE__
+    return this.#cookies
+  }
+
+  get query() {
+    if (!this.#query) {
+      let data = parse(this.#req.url).query
+      this.#query = querystring(data)
+    }
+    return this.#query
+  }
+
+  get body() {
+    if (this.#body) {
+      return this.#body
+    }
+    return this.#parseBody()
+  }
+
+  get cookies() {
+    return this.#cookies
+  }
+
+  get headers() {
+    return this.#req.headers
   }
 
   //获取客户端IP
-  ip() {
+  get ip() {
     return (
-      this.header('x-real-ip') ||
+      this.headers['x-real-ip'] ||
-      this.header('x-forwarded-for') ||
+      this.headers['x-forwarded-for'] ||
-      this.origin.req.connection.remoteAddress.replace('::ffff:', '')
+      this.#req.connection.remoteAddress.replace('::ffff:', '')
     )
   }
 }

lib/cookie.js

@@ -4,16 +4,16 @@
  */
 
 // var KEY_REGEXP = /^[\u0009\u0020-\u007e\u0080-\u00ff]+$/
-var SPLIT_REGEXP = /; */
+const SPLIT_REGEXP = /; */
 // var encode = encodeURIComponent
-var decode = decodeURIComponent
+const decode = decodeURIComponent
 
 /**
  * [parse 格式化字符串]
  */
 export function parseCookie(str) {
-  var obj = {}
+  let obj = {}
-  var pairs
+  let pairs
 
   if (typeof str !== 'string') {
     return {}
@@ -27,8 +27,8 @@ export function parseCookie(str) {
       continue
     }
 
-    var key = item[0].trim()
+    let key = item[0].trim()
-    var val = item[1].trim()
+    let val = item[1].trim()
 
     obj[key] = decode(val)
   }

lib/file.js

@@ -1,38 +1,28 @@
-import util from 'util'
+import { WriteStream } from 'node:fs'
-import { WriteStream } from 'fs'
+import { EventEmitter } from 'node:events'
-import { EventEmitter } from 'events'
-import crypto from 'crypto'
 
-export default function File(properties) {
+export default class File extends EventEmitter {
-  EventEmitter.call(this)
+  #stream = null
 
-  this.size = 0
+  size = 0
-  this.path = null
+  path = null
-  this.name = null
+  name = null
-  this.type = null
+  type = null
-  this.hash = null
+  lastModifiedDate = null
-  this.lastModifiedDate = null
 
-  this._writeStream = null
+  constructor(props = {}) {
+    super()
 
-  for (var key in properties) {
+    for (let key in props) {
-    this[key] = properties[key]
+      this[key] = props[key]
+    }
   }
 
-  if (typeof this.hash === 'string') {
+  open() {
-    this.hash = crypto.createHash(properties.hash)
+    this.#stream = new WriteStream(this.path)
-  } else {
-    this.hash = null
   }
-}
 
-util.inherits(File, EventEmitter)
+  toJSON() {
-
-File.prototype.open = function() {
-  this._writeStream = new WriteStream(this.path)
-}
-
-File.prototype.toJSON = function() {
     return {
       size: this.size,
       path: this.path,
@@ -40,31 +30,19 @@ File.prototype.toJSON = function() {
       type: this.type,
       mtime: this.lastModifiedDate,
       length: this.length,
-    filename: this.filename,
+      filename: this.name,
-    mime: this.mime
+      mime: this.type
+    }
   }
-}
 
-File.prototype.write = function(buffer, cb) {
+  write(buffer) {
-  var self = this
+    this.#stream.write(buffer, _ => {
-  if (self.hash) {
+      this.size += buffer.length
-    self.hash.update(buffer)
-  }
-  this._writeStream.write(buffer, function() {
-    self.lastModifiedDate = new Date()
-    self.size += buffer.length
-    self.emit('progress', self.size)
-    cb()
     })
-}
+  }
 
-File.prototype.end = function(cb) {
+  end(callback) {
-  var self = this
+    this.lastModifiedDate = new Date()
-  if (self.hash) {
+    this.#stream.end(callback)
-    self.hash = self.hash.digest('hex')
   }
-  this._writeStream.end(function() {
-    self.emit('end')
-    cb()
-  })
 }

lib/helper.js

@@ -0,0 +1,32 @@
+/**
+ * {}
+ * @author yutent<yutent.io@gmail.com>
+ * @date 2024/07/16 17:01:43
+ */
+
+import { parse } from 'node:querystring'
+
+export function querystring(str) {
+  let query = parse(str)
+  for (let k of Object.keys(query)) {
+    let val = query[k]
+
+    if (k.endsWith('[]')) {
+      let _k = k.slice(0, -2)
+      query[_k] = val
+      delete query[k]
+    } else if (k.endsWith(']')) {
+      let idx = k.lastIndexOf('[')
+      let _pk = k.slice(0, idx)
+      let _k = k.slice(idx + 1, -1)
+
+      if (query[_pk]) {
+        query[_pk][_k] = val
+      } else {
+        query[_pk] = { [_k]: val }
+      }
+      delete query[k]
+    }
+  }
+  return query
+}

lib/index.js

@@ -1,348 +1,191 @@
-import crypto from 'crypto'
+import crypto from 'node:crypto'
-import fs from 'fs'
+import fs from 'node:fs'
-import util from 'util'
+import { join } from 'node:path'
-import path from 'path'
+import { EventEmitter } from 'node:events'
-import File from './file.js'
-import { EventEmitter } from 'events'
-import { Stream } from 'stream'
-import { StringDecoder } from 'string_decoder'
 
+import File from './file.js'
 import { MultipartParser } from './multipart_parser.js'
-import { QuerystringParser } from './querystring_parser.js'
+import { UrlencodedParser } from './urlencoded_parser.js'
-import { OctetParser } from './octet_parser.js'
+import { OctetParser, BufferParser, EmptyParser } from './octet_parser.js'
 import { JSONParser } from './json_parser.js'
 
-export default function IncomingForm(opts) {
+function randomPath(uploadDir) {
-  EventEmitter.call(this)
+  var name = 'upload_' + crypto.randomBytes(16).toString('hex')
+  return join(uploadDir, name)
+}
 
-  opts = opts || {}
+function parseFilename(headerValue) {
+  let matches = headerValue.match(/\bfilename="(.*?)"($|; )/i)
+  if (!matches) {
+    return
+  }
 
-  this.error = null
+  let filename = matches[1].slice(matches[1].lastIndexOf('\\') + 1)
-  this.ended = false
+  filename = filename.replace(/%22/g, '"')
+  filename = filename.replace(/&#([\d]{4});/g, function (m, code) {
+    return String.fromCharCode(code)
+  })
+  return filename
+}
+
+/* ------------------------------------- */
+
+export default class IncomingForm extends EventEmitter {
+  #req = null
+
+  #error = false
+  #ended = false
+
+  ended = false
+  headers = null
+
+  bytesReceived = null
+  bytesExpected = null
+
+  #parser = null
+  #pending = 0
+
+  #openedFiles = []
+
+  constructor(req, opts = {}) {
+    super()
+
+    this.#req = req
 
-  this.maxFields = opts.maxFields || 1000
-  this.maxFieldsSize = opts.maxFieldsSize || 2 * 1024 * 1024
-  this.keepExtensions = opts.keepExtensions || false
     this.uploadDir = opts.uploadDir
     this.encoding = opts.encoding || 'utf-8'
-  this.headers = null
-  this.type = null
-  this.hash = opts.hash || false
-  this.multiples = opts.multiples || false
 
-  this.bytesReceived = null
+    this.headers = req.headers
-  this.bytesExpected = null
+    this.#parseContentLength()
+    this.#parseContentType()
 
-  this._parser = null
-  this._flushing = 0
-  this._fieldsSize = 0
-  this.openedFiles = []
-}
-
-util.inherits(IncomingForm, EventEmitter)
-
-IncomingForm.prototype.parse = function(req, cb) {
-  this.pause = function() {
-    try {
-      req.pause()
-    } catch (err) {
-      // the stream was destroyed
-      if (!this.ended) {
-        // before it was completed, crash & burn
-        this._error(err)
-      }
-      return false
-    }
-    return true
-  }
-
-  this.resume = function() {
-    try {
-      req.resume()
-    } catch (err) {
-      // the stream was destroyed
-      if (!this.ended) {
-        // before it was completed, crash & burn
-        this._error(err)
-      }
-      return false
-    }
-
-    return true
-  }
-
-  // Setup callback first, so we don't miss anything from data events emitted
-  // immediately.
-  if (cb) {
-    var fields = {},
-      files = {}
-    this.on('field', function(name, value) {
-      fields[name] = value
-    })
-      .on('file', function(name, file) {
-        if (this.multiples) {
-          if (files[name]) {
-            if (!Array.isArray(files[name])) {
-              files[name] = [files[name]]
-            }
-            files[name].push(file)
-          } else {
-            files[name] = file
-          }
-        } else {
-          files[name] = file
-        }
-      })
-      .on('error', function(err) {
-        cb(err, fields, files)
-      })
-      .on('end', function() {
-        cb(null, fields, files)
-      })
-  }
-
-  // Parse headers and setup the parser, ready to start listening for data.
-  this.writeHeaders(req.headers)
-
-  // Start listening for data.
-  var self = this
     req
-    .on('error', function(err) {
+      .on('error', err => {
-      self._error(err)
+        this.#handleError(err)
+        this.#clearUploads()
       })
-    .on('aborted', function() {
+      .on('aborted', () => {
-      self.emit('aborted')
+        this.emit('aborted')
-      self._error(new Error('Request aborted'))
+        this.#clearUploads()
       })
-    .on('data', function(buffer) {
+      .on('data', buffer => this.#write(buffer))
-      self.write(buffer)
+      .on('end', () => {
-    })
+        if (this.#error) {
-    .on('end', function() {
-      if (self.error) {
           return
         }
-
+        let err = this.#parser.end()
-      var err = self._parser.end()
         if (err) {
-        self._error(err)
+          this.#handleError(err)
         }
       })
-
-  return this
-}
-
-IncomingForm.prototype.writeHeaders = function(headers) {
-  this.headers = headers
-  this._parseContentLength()
-  this._parseContentType()
-}
-
-IncomingForm.prototype.write = function(buffer) {
-  if (this.error) {
-    return
-  }
-  if (!this._parser) {
-    this._error(new Error('uninitialized parser'))
-    return
   }
 
+  #write(buffer) {
+    if (this.#error) {
+      return
+    }
+    if (!this.#parser) {
+      return this.#handleError(new Error('uninitialized parser'))
+    }
     this.bytesReceived += buffer.length
     this.emit('progress', this.bytesReceived, this.bytesExpected)
 
-  var bytesParsed = this._parser.write(buffer)
+    this.#parser.write(buffer)
-  if (bytesParsed !== buffer.length) {
-    this._error(
-      new Error(
-        'parser error, ' +
-          bytesParsed +
-          ' of ' +
-          buffer.length +
-          ' bytes parsed'
-      )
-    )
   }
 
-  return bytesParsed
+  #handlePart(part) {
-}
-
-IncomingForm.prototype.pause = function() {
-  // this does nothing, unless overwritten in IncomingForm.parse
-  return false
-}
-
-IncomingForm.prototype.resume = function() {
-  // this does nothing, unless overwritten in IncomingForm.parse
-  return false
-}
-
-IncomingForm.prototype.onPart = function(part) {
-  // this method can be overwritten by the user
-  this.handlePart(part)
-}
-
-IncomingForm.prototype.handlePart = function(part) {
-  var self = this
-
     if (part.filename === undefined) {
-    var value = '',
+      let value = Buffer.from('')
-      decoder = new StringDecoder(this.encoding)
 
-    part.on('data', function(buffer) {
+      part
-      self._fieldsSize += buffer.length
+        .on('data', buf => {
-      if (self._fieldsSize > self.maxFieldsSize) {
+          value = Buffer.concat([value, buf])
-        self._error(
-          new Error(
-            'maxFieldsSize exceeded, received ' +
-              self._fieldsSize +
-              ' bytes of field data'
-          )
-        )
-        return
-      }
-      value += decoder.write(buffer)
         })
-
+        .on('end', () => {
-    part.on('end', function() {
+          this.emit('field', part.name, value.toString(this.encoding))
-      self.emit('field', part.name, value)
         })
-    return
+    } else {
-  }
+      let file = new File({
-
+        path: randomPath(this.uploadDir),
-  this._flushing++
-
-  var file = new File({
-    path: this._uploadPath(part.filename),
         name: part.filename,
-    type: part.mime,
+        type: part.mime
-    hash: self.hash
       })
 
-  this.emit('fileBegin', part.name, file)
-
       file.open()
-  this.openedFiles.push(file)
 
-  part.on('data', function(buffer) {
+      this.#openedFiles.push(file)
+      // 表单解析完的时候文件写入不一定完成了, 所以需要加入pending计数
+      this.#pending++
+
+      part
+        .on('data', buffer => {
           if (buffer.length == 0) {
             return
           }
-    self.pause()
+          file.write(buffer)
-    file.write(buffer, function() {
+        })
-      self.resume()
+        .on('end', () => {
+          if (part.ended) {
+            return
+          }
+          part.ended = true
+          file.end(() => {
+            this.emit('file', part.name, file)
+            this.#pending--
           })
         })
-
-  part.on('end', function() {
-    file.end(function() {
-      self._flushing--
-      self.emit('file', part.name, file)
-      self._maybeEnd()
-    })
-  })
-}
-
-function dummyParser(self) {
-  return {
-    end: function() {
-      self.ended = true
-      self._maybeEnd()
-      return null
     }
   }
-}
 
-IncomingForm.prototype._parseContentType = function() {
+  #parseContentType() {
+    let contentType = this.headers['content-type'] || ''
+    let lower = contentType.toLowerCase()
+
     if (this.bytesExpected === 0) {
-    this._parser = dummyParser(this)
+      return (this.#parser = new EmptyParser())
-    return
     }
 
-  if (!this.headers['content-type']) {
+    if (lower.includes('octet-stream')) {
-    this._error(new Error('bad content-type header, no content-type'))
+      return this.#createStreamParser()
-    return
     }
 
-  if (this.headers['content-type'].match(/octet-stream/i)) {
+    if (lower.includes('urlencoded')) {
-    this._initOctetStream()
+      return this.#createUrlencodedParser()
-    return
     }
 
-  if (this.headers['content-type'].match(/urlencoded/i)) {
+    if (lower.includes('multipart')) {
-    this._initUrlencoded()
+      let matches = contentType.match(/boundary=(?:"([^"]+)"|([^;]+))/)
-    return
+      if (matches) {
-  }
+        this.#createMultipartParser(matches[1] || matches[2])
-
-  if (this.headers['content-type'].match(/multipart/i)) {
-    var m = this.headers['content-type'].match(
-      /boundary=(?:"([^"]+)"|([^;]+))/i
-    )
-    if (m) {
-      this._initMultipart(m[1] || m[2])
       } else {
-      this._error(new Error('bad content-type header, no multipart boundary'))
+        this.#handleError(new TypeError('unknow multipart boundary'))
       }
       return
     }
 
-  if (this.headers['content-type'].match(/json|appliation|plain|text/i)) {
+    if (lower.match(/json|appliation|plain|text/)) {
-    this._initJSONencoded()
+      return this.#createJsonParser()
-    return
     }
 
-  this._error(
+    this.#createBufferParser()
-    new Error(
-      'bad content-type header, unknown content-type: ' +
-        this.headers['content-type']
-    )
-  )
-}
-
-IncomingForm.prototype._error = function(err) {
-  if (this.error || this.ended) {
-    return
   }
 
-  this.error = err
+  #parseContentLength() {
-  this.emit('error', err)
-
-  if (Array.isArray(this.openedFiles)) {
-    this.openedFiles.forEach(function(file) {
-      file._writeStream.destroy()
-      setTimeout(fs.unlink, 0, file.path, function(error) {})
-    })
-  }
-}
-
-IncomingForm.prototype._parseContentLength = function() {
     this.bytesReceived = 0
     if (this.headers['content-length']) {
-    this.bytesExpected = parseInt(this.headers['content-length'], 10)
+      this.bytesExpected = +this.headers['content-length']
     } else if (this.headers['transfer-encoding'] === undefined) {
       this.bytesExpected = 0
     }
-
-  if (this.bytesExpected !== null) {
-    this.emit('progress', this.bytesReceived, this.bytesExpected)
   }
-}
 
-IncomingForm.prototype._newParser = function() {
+  #createMultipartParser(boundary) {
-  return new MultipartParser()
+    let headerField, headerValue, part
-}
 
-IncomingForm.prototype._initMultipart = function(boundary) {
+    this.#parser = new MultipartParser(boundary)
-  this.type = 'multipart'
 
-  var parser = new MultipartParser(),
+    this.#parser.$partBegin = function () {
-    self = this,
+      part = new EventEmitter()
-    headerField,
-    headerValue,
-    part
-
-  parser.initWithBoundary(boundary)
-
-  parser.onPartBegin = function() {
-    part = new Stream()
       part.readable = true
       part.headers = {}
       part.name = null
@@ -356,25 +199,25 @@ IncomingForm.prototype._initMultipart = function(boundary) {
       headerValue = ''
     }
 
-  parser.onHeaderField = function(b, start, end) {
+    this.#parser.$headerField = b => {
-    headerField += b.toString(self.encoding, start, end)
+      headerField += b.toString(this.encoding)
     }
 
-  parser.onHeaderValue = function(b, start, end) {
+    this.#parser.$headerValue = b => {
-    headerValue += b.toString(self.encoding, start, end)
+      headerValue += b.toString(this.encoding)
     }
 
-  parser.onHeaderEnd = function() {
+    this.#parser.$headerEnd = () => {
       headerField = headerField.toLowerCase()
       part.headers[headerField] = headerValue
 
-    var m = headerValue.match(/\bname="([^"]+)"/i)
+      let matches = headerValue.match(/\bname="([^"]+)"/i)
       if (headerField == 'content-disposition') {
-      if (m) {
+        if (matches) {
-        part.name = m[1]
+          part.name = matches[1]
         }
 
-      part.filename = self._fileName(headerValue)
+        part.filename = parseFilename(headerValue)
       } else if (headerField == 'content-type') {
         part.mime = headerValue
       } else if (headerField == 'content-transfer-encoding') {
@@ -385,187 +228,138 @@ IncomingForm.prototype._initMultipart = function(boundary) {
       headerValue = ''
     }
 
-  parser.onHeadersEnd = function() {
+    this.#parser.$headersEnd = () => {
       switch (part.transferEncoding) {
         case 'binary':
         case '7bit':
         case '8bit':
-        parser.onPartData = function(b, start, end) {
+          this.#parser.$partData = function (b) {
-          part.emit('data', b.slice(start, end))
+            part.emit('data', b)
           }
-
+          this.#parser.$partEnd = function () {
-        parser.onPartEnd = function() {
             part.emit('end')
           }
           break
 
         case 'base64':
-        parser.onPartData = function(b, start, end) {
+          this.#parser.$partData = function (b) {
-          part.transferBuffer += b.slice(start, end).toString('ascii')
+            part.transferBuffer += b.toString('ascii')
 
-          /*
+            // 确保offset的值能被4整除
-        four bytes (chars) in base64 converts to three bytes in binary
+            let offset = ~~(part.transferBuffer.length / 4) * 4
-        encoding. So we should always work with a number of bytes that
-        can be divided by 4, it will result in a number of buytes that
-        can be divided vy 3.
-        */
-          var offset = parseInt(part.transferBuffer.length / 4, 10) * 4
             part.emit(
               'data',
-            Buffer.from(part.transferBuffer.substring(0, offset), 'base64')
+              Buffer.from(part.transferBuffer.slice(0, offset), 'base64')
             )
-          part.transferBuffer = part.transferBuffer.substring(offset)
+            part.transferBuffer = part.transferBuffer.slice(offset)
           }
-
+          this.#parser.$partEnd = function () {
-        parser.onPartEnd = function() {
             part.emit('data', Buffer.from(part.transferBuffer, 'base64'))
             part.emit('end')
           }
           break
 
         default:
-        return self._error(new Error('unknown transfer-encoding'))
+          return this.#handleError(new Error('unknown transfer-encoding'))
       }
 
-    self.onPart(part)
+      this.#handlePart(part)
     }
 
-  parser.onEnd = function() {
+    this.#parser.$end = () => {
-    self.ended = true
+      if (this.#pending > 0) {
-    self._maybeEnd()
+        setTimeout(_ => this.#parser.$end())
-  }
-
-  this._parser = parser
-}
-
-IncomingForm.prototype._fileName = function(headerValue) {
-  var m = headerValue.match(/\bfilename="(.*?)"($|; )/i)
-  if (!m) return
-
-  var filename = m[1].substr(m[1].lastIndexOf('\\') + 1)
-  filename = filename.replace(/%22/g, '"')
-  filename = filename.replace(/&#([\d]{4});/g, function(m, code) {
-    return String.fromCharCode(code)
-  })
-  return filename
-}
-
-IncomingForm.prototype._initUrlencoded = function() {
-  this.type = 'urlencoded'
-
-  var parser = new QuerystringParser(this.maxFields)
-
-  parser.onField = (key, val) => {
-    this.emit('field', key, val)
-  }
-
-  parser.onEnd = () => {
-    this.ended = true
-    this._maybeEnd()
-  }
-
-  this._parser = parser
-}
-
-IncomingForm.prototype._initOctetStream = function() {
-  this.type = 'octet-stream'
-  var filename = this.headers['x-file-name']
-  var mime = this.headers['content-type']
-
-  var file = new File({
-    path: this._uploadPath(filename),
-    name: filename,
-    type: mime
-  })
-
-  this.emit('fileBegin', filename, file)
-  file.open()
-
-  this._flushing++
-
-  var self = this
-
-  self._parser = new OctetParser()
-
-  //Keep track of writes that haven't finished so we don't emit the file before it's done being written
-  var outstandingWrites = 0
-
-  self._parser.on('data', function(buffer) {
-    self.pause()
-    outstandingWrites++
-
-    file.write(buffer, function() {
-      outstandingWrites--
-      self.resume()
-
-      if (self.ended) {
-        self._parser.emit('doneWritingFile')
-      }
-    })
-  })
-
-  self._parser.on('end', function() {
-    self._flushing--
-    self.ended = true
-
-    var done = function() {
-      file.end(function() {
-        self.emit('file', 'file', file)
-        self._maybeEnd()
-      })
-    }
-
-    if (outstandingWrites === 0) {
-      done()
       } else {
-      self._parser.once('doneWritingFile', done)
+        this.#handleEnd()
+      }
+    }
   }
-  })
-}
 
-IncomingForm.prototype._initJSONencoded = function() {
+  #createUrlencodedParser() {
-  this.type = 'json'
+    this.#parser = new UrlencodedParser()
-
-  var parser = new JSONParser(),
-    self = this
 
     if (this.bytesExpected) {
-    parser.initWithLength(this.bytesExpected)
+      this.#parser.initLength(this.bytesExpected)
     }
 
-  parser.onField = function(key, val) {
+    this.#parser
-    self.emit('field', key, val)
+      .on('field', fields => this.emit('field', false, fields))
+      .on('end', () => this.#handleEnd())
   }
 
-  parser.onEnd = function() {
+  #createStreamParser() {
-    self.ended = true
+    let filename = this.headers['x-file-name']
-    self._maybeEnd()
+    let mime = this.headers['x-file-type']
+
+    this.#parser = new OctetParser(filename, mime, randomPath(this.uploadDir))
+
+    if (this.bytesExpected) {
+      this.#parser.initLength(this.bytesExpected)
     }
 
-  this._parser = parser
+    this.#parser
-}
+      .on('file', file => {
-
+        this.emit('file', false, file)
-IncomingForm.prototype._uploadPath = function(filename) {
+      })
-  var name = 'upload_'
+      .on('end', () => this.#handleEnd())
-  var buf = crypto.randomBytes(16)
+      .on('error', err => this.#handleError(err))
-  for (var i = 0; i < buf.length; ++i) {
-    name += ('0' + buf[i].toString(16)).slice(-2)
   }
 
-  if (this.keepExtensions) {
+  #createJsonParser() {
-    var ext = path.extname(filename)
+    this.#parser = new JSONParser()
-    ext = ext.replace(/(\.[a-z0-9]+).*/i, '$1')
 
-    name += ext
+    if (this.bytesExpected) {
+      this.#parser.initLength(this.bytesExpected)
     }
 
-  return path.join(this.uploadDir, name)
+    this.#parser
-}
+      .on('field', (key, val) => {
+        this.emit('field', key, val)
+      })
+      .on('end', () => this.#handleEnd())
+      .on('error', err => this.#handleError(err))
+  }
 
-IncomingForm.prototype._maybeEnd = function() {
+  #createBufferParser() {
-  if (!this.ended || this._flushing || this.error) {
+    this.#parser = new BufferParser()
+
+    if (this.bytesExpected) {
+      this.#parser.initLength(this.bytesExpected)
+    }
+
+    this.#parser
+      .on('buffer', buf => {
+        this.emit('buffer', buf)
+      })
+      .on('end', () => this.#handleEnd())
+      .on('error', err => this.#handleError(err))
+  }
+
+  #clearUploads() {
+    while (this.#openedFiles.length) {
+      let file = this.#openedFiles.pop()
+      file._writeStream.destroy()
+      setTimeout(_ => {
+        try {
+          fs.unlink(file.path)
+        } catch (e) {}
+      })
+    }
+  }
+
+  #handleError(err) {
+    if (this.#error || this.#ended) {
       return
     }
+    this.error = true
+    this.emit('error', err)
+  }
 
+  #handleEnd() {
+    if (this.#ended || this.#error) {
+      return
+    }
+    this.#ended = true
     this.emit('end')
+  }
 }

lib/json_parser.js

@@ -1,33 +1,43 @@
-export function JSONParser() {
+import { EventEmitter } from 'node:events'
-  this.data = Buffer.from('')
-  this.bytesWritten = 0
-}
 
-JSONParser.prototype.initWithLength = function(length) {
+export class JSONParser extends EventEmitter {
-  this.data = Buffer.alloc(length)
+  #buf = Buffer.from('')
-}
+  #byteLen = 0
 
-JSONParser.prototype.write = function(buffer) {
+  initLength(length) {
-  if (this.data.length >= this.bytesWritten + buffer.length) {
+    this.#byteLen = length
-    buffer.copy(this.data, this.bytesWritten)
-  } else {
-    this.data = Buffer.concat([this.data, buffer])
   }
-  this.bytesWritten += buffer.length
-  return buffer.length
-}
 
-JSONParser.prototype.end = function() {
+  write(buffer) {
-  var data = this.data.toString('utf8')
+    this.#buf = Buffer.concat([this.#buf, buffer])
-  var fields
+  }
+
+  end() {
+    if (this.#buf.length === this.#byteLen) {
+      let data = this.#buf.toString()
+      let fields = data
       try {
         fields = JSON.parse(data)
       } catch (e) {
-    fields = Function(`try{return ${data}}catch(e){}`)() || data
+        try {
+          // 非标准的json语法,尝试用 Function 解析
+          fields = Function(`try{return ${data}}catch(e){}`)()
+        } catch (err) {}
       }
 
-  this.onField(false, fields)
+      this.emit('field', false, fields)
-  this.data = null
+      this.emit('end')
 
-  this.onEnd()
+      this.#buf = null
+    } else {
+      this.emit(
+        'error',
+        new Error(
+          `The uploaded data is incomplete. Expected ${
+            this.#byteLen
+          }, Received ${this.#buf.length} .`
+        )
+      )
+    }
+  }
 }

lib/multipart_parser.js

@@ -1,5 +1,11 @@
-var s = 0,
+/**
-  S = {
+ * {}
+ * @author yutent<yutent.io@gmail.com>
+ * @date 2023/10/30 16:41:59
+ */
+
+let s = 0
+const STATE_DICT = {
   PARSER_UNINITIALIZED: s++,
   START: s++,
   START_BOUNDARY: s++,
@@ -13,56 +19,82 @@ var s = 0,
   PART_DATA: s++,
   PART_END: s++,
   END: s++
-  },
+}
-  f = 1,
+let f = 1
-  F = {
+const FLAG_DICT = {
   PART_BOUNDARY: f,
   LAST_BOUNDARY: (f *= 2)
-  },
+}
-  LF = 10,
+
-  CR = 13,
+const LF = 10
-  SPACE = 32,
+const CR = 13
-  HYPHEN = 45,
+const SPACE = 32
-  COLON = 58,
+const HYPHEN = 45
-  A = 97,
+const COLON = 58
-  Z = 122,
+const LETTER_A = 97
-  lower = function(c) {
+const LETTER_Z = 122
+
+function lower(c) {
   return c | 0x20
-  }
-
-export function MultipartParser() {
-  this.boundary = null
-  this.boundaryChars = null
-  this.lookbehind = null
-  this.state = S.PARSER_UNINITIALIZED
-
-  this.index = null
-  this.flags = 0
 }
 
-MultipartParser.stateToString = function(stateNumber) {
+function stateToString(value) {
-  for (var state in S) {
+  for (let key in STATE_DICT) {
-    var number = S[state]
+    let number = STATE_DICT[key]
-    if (number === stateNumber) return state
+    if (number === value) {
+      return key
+    }
   }
 }
 
-MultipartParser.prototype.initWithBoundary = function(str) {
+export class MultipartParser {
+  boundary = null
+  boundaryChars = null
+  lookbehind = null
+  state = STATE_DICT.PARSER_UNINITIALIZED
+
+  index = null
+  flags = 0
+
+  constructor(str) {
     this.boundary = Buffer.alloc(str.length + 4)
     this.boundary.write('\r\n--', 0)
     this.boundary.write(str, 4)
     this.lookbehind = Buffer.alloc(this.boundary.length + 8)
-  this.state = S.START
+    this.state = STATE_DICT.START
 
     this.boundaryChars = {}
-  for (var i = 0; i < this.boundary.length; i++) {
+    for (let i = 0; i < this.boundary.length; i++) {
       this.boundaryChars[this.boundary[i]] = true
     }
-}
+  }
 
-MultipartParser.prototype.write = function(buffer) {
+  #mark(k, v) {
-  var self = this,
+    this[k + 'Mark'] = v
-    i = 0,
+  }
+
+  #emit(name, buf, idx, cleanup) {
+    let mark = name + 'Mark'
+    if (this[mark] !== void 0) {
+      let start = this[mark]
+      let end = buf.length
+
+      if (cleanup) {
+        end = idx
+        delete this[mark]
+      } else {
+        this[mark] = 0
+      }
+
+      if (start === end) {
+        return
+      }
+      this['$' + name](buf.slice(start, end))
+    }
+  }
+
+  write(buffer) {
+    let idx = 0,
       len = buffer.length,
       prevIndex = this.index,
       index = this.index,
@@ -75,67 +107,39 @@ MultipartParser.prototype.write = function(buffer) {
       boundaryEnd = boundaryLength - 1,
       bufferLength = buffer.length,
       c,
-    cl,
+      cl
-    mark = function(name) {
-      self[name + 'Mark'] = i
-    },
-    clear = function(name) {
-      delete self[name + 'Mark']
-    },
-    callback = function(name, buffer, start, end) {
-      if (start !== undefined && start === end) {
-        return
-      }
 
-      var callbackSymbol =
+    for (idx = 0; idx < len; idx++) {
-        'on' + name.substr(0, 1).toUpperCase() + name.substr(1)
+      c = buffer[idx]
-      if (callbackSymbol in self) {
-        self[callbackSymbol](buffer, start, end)
-      }
-    },
-    dataCallback = function(name, clear) {
-      var markSymbol = name + 'Mark'
-      if (!(markSymbol in self)) {
-        return
-      }
 
-      if (!clear) {
-        callback(name, buffer, self[markSymbol], buffer.length)
-        self[markSymbol] = 0
-      } else {
-        callback(name, buffer, self[markSymbol], i)
-        delete self[markSymbol]
-      }
-    }
-
-  for (i = 0; i < len; i++) {
-    c = buffer[i]
       switch (state) {
-      case S.PARSER_UNINITIALIZED:
+        case STATE_DICT.PARSER_UNINITIALIZED:
-        return i
+          return
-      case S.START:
+
+        case STATE_DICT.START:
           index = 0
-        state = S.START_BOUNDARY
+          state = STATE_DICT.START_BOUNDARY
-      case S.START_BOUNDARY:
+
+        case STATE_DICT.START_BOUNDARY:
           if (index == boundary.length - 2) {
             if (c == HYPHEN) {
-            flags |= F.LAST_BOUNDARY
+              flags |= FLAG_DICT.LAST_BOUNDARY
             } else if (c != CR) {
-            return i
+              return
             }
             index++
             break
           } else if (index - 1 == boundary.length - 2) {
-          if (flags & F.LAST_BOUNDARY && c == HYPHEN) {
+            if (flags & FLAG_DICT.LAST_BOUNDARY && c == HYPHEN) {
-            callback('end')
+              this.$end()
-            state = S.END
+              state = STATE_DICT.END
               flags = 0
-          } else if (!(flags & F.LAST_BOUNDARY) && c == LF) {
+            } else if (!(flags & FLAG_DICT.LAST_BOUNDARY) && c == LF) {
               index = 0
-            callback('partBegin')
+              this.$partBegin()
-            state = S.HEADER_FIELD_START
+              state = STATE_DICT.HEADER_FIELD_START
             } else {
-            return i
+              return
             }
             break
           }
@@ -147,14 +151,16 @@ MultipartParser.prototype.write = function(buffer) {
             index++
           }
           break
-      case S.HEADER_FIELD_START:
+
-        state = S.HEADER_FIELD
+        case STATE_DICT.HEADER_FIELD_START:
-        mark('headerField')
+          state = STATE_DICT.HEADER_FIELD
+          this.#mark('headerField', idx)
           index = 0
-      case S.HEADER_FIELD:
+
+        case STATE_DICT.HEADER_FIELD:
           if (c == CR) {
-          clear('headerField')
+            delete this.headerFieldMark
-          state = S.HEADERS_ALMOST_DONE
+            state = STATE_DICT.HEADERS_ALMOST_DONE
             break
           }
 
@@ -166,66 +172,72 @@ MultipartParser.prototype.write = function(buffer) {
           if (c == COLON) {
             if (index == 1) {
               // empty header field
-            return i
+              return
             }
-          dataCallback('headerField', true)
+            this.#emit('headerField', buffer, idx, true)
-          state = S.HEADER_VALUE_START
+            state = STATE_DICT.HEADER_VALUE_START
             break
           }
 
           cl = lower(c)
-        if (cl < A || cl > Z) {
+          if (cl < LETTER_A || cl > LETTER_Z) {
-          return i
+            return
           }
           break
-      case S.HEADER_VALUE_START:
+
+        case STATE_DICT.HEADER_VALUE_START:
           if (c == SPACE) {
             break
           }
 
-        mark('headerValue')
+          this.#mark('headerValue', idx)
-        state = S.HEADER_VALUE
+          state = STATE_DICT.HEADER_VALUE
-      case S.HEADER_VALUE:
+
+        case STATE_DICT.HEADER_VALUE:
           if (c == CR) {
-          dataCallback('headerValue', true)
+            this.#emit('headerValue', buffer, idx, true)
-          callback('headerEnd')
+            this.$headerEnd()
-          state = S.HEADER_VALUE_ALMOST_DONE
+            state = STATE_DICT.HEADER_VALUE_ALMOST_DONE
           }
           break
-      case S.HEADER_VALUE_ALMOST_DONE:
+
+        case STATE_DICT.HEADER_VALUE_ALMOST_DONE:
           if (c != LF) {
-          return i
+            return
           }
-        state = S.HEADER_FIELD_START
+          state = STATE_DICT.HEADER_FIELD_START
           break
-      case S.HEADERS_ALMOST_DONE:
+
+        case STATE_DICT.HEADERS_ALMOST_DONE:
           if (c != LF) {
-          return i
+            return
           }
 
-        callback('headersEnd')
+          this.$headersEnd()
-        state = S.PART_DATA_START
+          state = STATE_DICT.PART_DATA_START
           break
-      case S.PART_DATA_START:
+
-        state = S.PART_DATA
+        case STATE_DICT.PART_DATA_START:
-        mark('partData')
+          state = STATE_DICT.PART_DATA
-      case S.PART_DATA:
+          this.#mark('partData', idx)
+
+        case STATE_DICT.PART_DATA:
           prevIndex = index
 
           if (index === 0) {
             // boyer-moore derrived algorithm to safely skip non-boundary data
-          i += boundaryEnd
+            idx += boundaryEnd
-          while (i < bufferLength && !(buffer[i] in boundaryChars)) {
+            while (idx < bufferLength && !(buffer[idx] in boundaryChars)) {
-            i += boundaryLength
+              idx += boundaryLength
             }
-          i -= boundaryEnd
+            idx -= boundaryEnd
-          c = buffer[i]
+            c = buffer[idx]
           }
 
           if (index < boundary.length) {
             if (boundary[index] == c) {
               if (index === 0) {
-              dataCallback('partData', true)
+                this.#emit('partData', buffer, idx, true)
               }
               index++
             } else {
@@ -235,29 +247,29 @@ MultipartParser.prototype.write = function(buffer) {
             index++
             if (c == CR) {
               // CR = part boundary
-            flags |= F.PART_BOUNDARY
+              flags |= FLAG_DICT.PART_BOUNDARY
             } else if (c == HYPHEN) {
               // HYPHEN = end boundary
-            flags |= F.LAST_BOUNDARY
+              flags |= FLAG_DICT.LAST_BOUNDARY
             } else {
               index = 0
             }
           } else if (index - 1 == boundary.length) {
-          if (flags & F.PART_BOUNDARY) {
+            if (flags & FLAG_DICT.PART_BOUNDARY) {
               index = 0
               if (c == LF) {
                 // unset the PART_BOUNDARY flag
-              flags &= ~F.PART_BOUNDARY
+                flags &= ~FLAG_DICT.PART_BOUNDARY
-              callback('partEnd')
+                this.$partEnd()
-              callback('partBegin')
+                this.$partBegin()
-              state = S.HEADER_FIELD_START
+                state = STATE_DICT.HEADER_FIELD_START
                 break
               }
-          } else if (flags & F.LAST_BOUNDARY) {
+            } else if (flags & FLAG_DICT.LAST_BOUNDARY) {
               if (c == HYPHEN) {
-              callback('partEnd')
+                this.$partEnd()
-              callback('end')
+                this.$end()
-              state = S.END
+                state = STATE_DICT.END
                 flags = 0
               } else {
                 index = 0
@@ -274,54 +286,50 @@ MultipartParser.prototype.write = function(buffer) {
           } else if (prevIndex > 0) {
             // if our boundary turned out to be rubbish, the captured lookbehind
             // belongs to partData
-          callback('partData', lookbehind, 0, prevIndex)
+
+            this.$partData(lookbehind.slice(0, prevIndex))
             prevIndex = 0
-          mark('partData')
+            this.#mark('partData', idx)
 
             // reconsider the current character even so it interrupted the sequence
             // it could be the beginning of a new sequence
-          i--
+            idx--
           }
 
           break
-      case S.END:
+
+        case STATE_DICT.END:
           break
+
         default:
-        return i
+          return
       }
     }
 
-  dataCallback('headerField')
+    this.#emit('headerField', buffer, idx)
-  dataCallback('headerValue')
+    this.#emit('headerValue', buffer, idx)
-  dataCallback('partData')
+    this.#emit('partData', buffer, idx)
 
     this.index = index
     this.state = state
     this.flags = flags
-
-  return len
-}
-
-MultipartParser.prototype.end = function() {
-  var callback = function(self, name) {
-    var callbackSymbol = 'on' + name.substr(0, 1).toUpperCase() + name.substr(1)
-    if (callbackSymbol in self) {
-      self[callbackSymbol]()
-    }
   }
+
+  end() {
     if (
-    (this.state == S.HEADER_FIELD_START && this.index === 0) ||
+      (this.state === STATE_DICT.HEADER_FIELD_START && this.index === 0) ||
-    (this.state == S.PART_DATA && this.index == this.boundary.length)
+      (this.state === STATE_DICT.PART_DATA &&
+        this.index == this.boundary.length)
     ) {
-    callback(this, 'partEnd')
+      this.$end()
-    callback(this, 'end')
+    } else if (this.state !== STATE_DICT.END) {
-  } else if (this.state != S.END) {
       return new Error(
         'MultipartParser.end(): stream ended unexpectedly: ' + this.explain()
       )
     }
-}
+  }
 
-MultipartParser.prototype.explain = function() {
+  explain() {
-  return 'state = ' + MultipartParser.stateToString(this.state)
+    return 'state = ' + stateToString(this.state)
+  }
 }

lib/octet_parser.js

@@ -1,17 +1,86 @@
-import { EventEmitter } from 'events'
+/**
-import util from 'util'
+ * {}
+ * @author yutent<yutent.io@gmail.com>
+ * @date 2023/10/27 14:23:22
+ */
 
-export function OctetParser() {
+import { EventEmitter } from 'node:events'
-  EventEmitter.call(this)
+import File from './file.js'
-}
 
-util.inherits(OctetParser, EventEmitter)
+export class OctetParser extends EventEmitter {
+  #file = null
+  #byteLen = 0
+  #wroteLen = 0
 
-OctetParser.prototype.write = function(buffer) {
+  constructor(name, type, path) {
-  this.emit('data', buffer)
+    super()
-  return buffer.length
-}
 
-OctetParser.prototype.end = function() {
+    this.#file = new File({ path, name, type })
+    this.#file.open()
+  }
+
+  initLength(length) {
+    this.#byteLen = length
+  }
+
+  write(buffer) {
+    this.#file.write(buffer)
+    this.#wroteLen += buffer.length
+  }
+
+  end() {
+    this.#file.end(_ => {
+      if (this.#wroteLen === this.#byteLen) {
+        this.emit('file', this.#file)
         this.emit('end')
+      } else {
+        this.emit(
+          'error',
+          new Error(
+            `The uploaded data is incomplete. Expected ${
+              this.#byteLen
+            }, Received ${this.#wroteLen} .`
+          )
+        )
+      }
+    })
+  }
+}
+
+export class BufferParser extends EventEmitter {
+  #buf = Buffer.from('')
+  #byteLen = 0
+
+  initLength(length) {
+    this.#byteLen = length
+  }
+
+  write(buffer) {
+    this.#buf = Buffer.concat([this.#buf, buffer])
+  }
+
+  end() {
+    if (this.#buf.length === this.#byteLen) {
+      this.emit('buffer', this.#buf)
+      this.emit('end')
+      this.#buf = null
+    } else {
+      this.emit(
+        'error',
+        new Error(
+          `The uploaded data is incomplete. Expected ${
+            this.#byteLen
+          }, Received ${this.#buf.length} .`
+        )
+      )
+    }
+  }
+}
+
+export class EmptyParser extends EventEmitter {
+  write() {}
+
+  end() {
+    this.emit('end')
+  }
 }

lib/querystring_parser.js

@@ -1,27 +0,0 @@
-// This is a buffering parser, not quite as nice as the multipart one.
-// If I find time I'll rewrite this to be fully streaming as well
-import querystring from 'querystring'
-
-export class QuerystringParser {
-  constructor(maxKeys) {
-    this.maxKeys = maxKeys
-    this.buffer = ''
-  }
-
-  write(buffer) {
-    this.buffer += buffer.toString('ascii')
-    return buffer.length
-  }
-
-  end() {
-    var fields = querystring.parse(this.buffer, '&', '=', {
-      maxKeys: this.maxKeys
-    })
-    for (var field in fields) {
-      this.onField(field, fields[field])
-    }
-    this.buffer = ''
-
-    this.onEnd()
-  }
-}

lib/urlencoded_parser.js

@@ -0,0 +1,43 @@
+/**
+ * {}
+ * @author yutent<yutent.io@gmail.com>
+ * @date 2023/10/27 12:14:05
+ */
+
+import { EventEmitter } from 'node:events'
+import { querystring } from './helper.js'
+
+export class UrlencodedParser extends EventEmitter {
+  #buf = Buffer.from('')
+  #byteLen = 0
+
+  initLength(length) {
+    this.#byteLen = length
+  }
+
+  write(buffer) {
+    this.#buf = Buffer.concat([this.#buf, buffer])
+  }
+
+  end() {
+    if (this.#buf.length === this.#byteLen) {
+      let data = this.#buf.toString()
+      let fields = querystring(data)
+
+      this.#buf = null
+
+      this.emit('field', fields)
+      this.emit('end')
+      this.#buf = null
+    } else {
+      this.emit(
+        'error',
+        new Error(
+          `The uploaded data is incomplete. Expected ${
+            this.#byteLen
+          }, Received ${this.#buf.length} .`
+        )
+      )
+    }
+  }
+}

package.json

@@ -1,22 +1,23 @@
 {
   "name": "@gm5/request",
-  "version": "1.2.8",
+  "version": "2.0.7",
-  "description": "对Http的request进一步封装, 提供常用的API",
+  "description": "对Http的Request进一步封装, 提供常用的API",
   "main": "index.js",
   "author": "yutent",
   "type": "module",
   "keywords": [
     "five",
-    "node-five",
+    "gmf",
+    "gm5",
     "five.js",
     "fivejs",
     "request",
     "http"
   ],
   "dependencies": {
-    "es.shim": "^2.0.1",
+    "es.shim": "^2.2.0",
-    "iofs": "^1.5.0"
+    "iofs": "^1.5.3"
   },
-  "repository": "https://github.com/bytedo/gmf.request.git",
+  "repository": "https://git.wkit.fun/gm5/request.git",
   "license": "MIT"
 }