Compare commits
No commits in common. "2ab38350a8730efffdd2419b1684f164d8bbe6d9" and "148684bf3546981f6a97a5bf8bda0e7a9cf09154" have entirely different histories.
2ab38350a8
...
148684bf35
|
|
@ -9,5 +9,4 @@
|
|||
.vscode
|
||||
|
||||
|
||||
.tmp/
|
||||
node_modules/
|
||||
234
index.js
234
index.js
|
|
@ -8,17 +8,17 @@ import 'es.shim'
|
|||
import Parser from './lib/index.js'
|
||||
import { parseCookie } from './lib/cookie.js'
|
||||
import fs from 'iofs'
|
||||
import { fileURLToPath, parse } from 'node:url'
|
||||
import QS from 'node:querystring'
|
||||
import { dirname, resolve } from 'node:path'
|
||||
import URL from 'url'
|
||||
import QS from 'querystring'
|
||||
import PATH from 'path'
|
||||
|
||||
const DEFAULT_FORM_TYPE = 'application/x-www-form-urlencoded'
|
||||
|
||||
const __dirname = dirname(fileURLToPath(import.meta.url))
|
||||
var __dirname = PATH.dirname(URL.fileURLToPath(import.meta.url))
|
||||
|
||||
const tmpdir = resolve(__dirname, '.tmp/')
|
||||
const encode = encodeURIComponent
|
||||
const decode = decodeURIComponent
|
||||
var tmpdir = PATH.resolve(__dirname, '.tmp/')
|
||||
var encode = encodeURIComponent
|
||||
var decode = decodeURIComponent
|
||||
|
||||
if (fs.isdir(tmpdir)) {
|
||||
fs.rm(tmpdir, true)
|
||||
|
|
@ -36,50 +36,34 @@ function hideProperty(host, name, value) {
|
|||
}
|
||||
|
||||
export default class Request {
|
||||
#req = null
|
||||
#res = null
|
||||
|
||||
#opts = {}
|
||||
|
||||
#query = null
|
||||
#body = null
|
||||
#cookies = Object.create(null)
|
||||
|
||||
method = 'GET'
|
||||
path = []
|
||||
|
||||
url = ''
|
||||
host = '127.0.0.1'
|
||||
|
||||
constructor(req, res, opts = {}) {
|
||||
constructor(req, res) {
|
||||
this.method = req.method.toUpperCase()
|
||||
this.params = {}
|
||||
|
||||
this.#req = req
|
||||
this.#res = res
|
||||
hideProperty(this, 'origin', { req, res })
|
||||
hideProperty(this, '__GET__', null)
|
||||
hideProperty(this, '__POST__', null)
|
||||
hideProperty(this, '__COOKIE__', parseCookie(this.header('cookie') || ''))
|
||||
|
||||
this.host = req.headers['host']
|
||||
this.#cookies = parseCookie(this.headers['cookie'] || '')
|
||||
|
||||
Object.assign(this.#opts, opts)
|
||||
|
||||
this.#init()
|
||||
this.__fixUrl()
|
||||
}
|
||||
|
||||
// 修正请求的url
|
||||
#init() {
|
||||
let _url = parse(this.#req.url)
|
||||
__fixUrl() {
|
||||
let _url = URL.parse(this.origin.req.url)
|
||||
.pathname.slice(1)
|
||||
.replace(/[\/]+$/, '')
|
||||
let app = '' // 将作为主控制器(即apps目录下的应用)
|
||||
let pathArr = []
|
||||
let tmpArr = []
|
||||
|
||||
// URL上不允许有非法字符
|
||||
if (/[^\w-/.,@~!$&:+'"=]/.test(decode(_url))) {
|
||||
this.#res.rendered = true
|
||||
this.#res.writeHead(400, {
|
||||
if (/[^\w-/.@~!$&:+'=]/.test(decode(_url))) {
|
||||
this.origin.res.rendered = true
|
||||
this.origin.res.writeHead(400, {
|
||||
'X-debug': `url [/${encode(_url)}] contains invalid characters`
|
||||
})
|
||||
return this.#res.end(`Invalid characters: /${_url}`)
|
||||
return this.origin.res.end(`Invalid characters: /${_url}`)
|
||||
}
|
||||
|
||||
// 修正url中可能出现的"多斜杠"
|
||||
|
|
@ -102,28 +86,88 @@ export default class Request {
|
|||
|
||||
pathArr.shift()
|
||||
|
||||
// 将path第3段之后的部分, 每2个一组转为key-val数据对象, 存入params中
|
||||
tmpArr = pathArr.slice(1).concat()
|
||||
while (tmpArr.length) {
|
||||
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
|
||||
}
|
||||
|
||||
/**
|
||||
* [解析请求体, 需要 await ]
|
||||
* [get 同php的$_GET]
|
||||
*/
|
||||
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 [字段]
|
||||
*/
|
||||
#parseBody() {
|
||||
post(key = '', xss = true) {
|
||||
let para = {}
|
||||
let out = Promise.defer()
|
||||
let form, contentType
|
||||
this.#body = {}
|
||||
xss = !!xss
|
||||
|
||||
//如果之前已经缓存过,则直接从缓存读取
|
||||
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(this.#req, { ...this.#opts, uploadDir: tmpdir })
|
||||
form = new Parser()
|
||||
form.uploadDir = tmpdir
|
||||
form.parse(this.origin.req)
|
||||
|
||||
form
|
||||
.on('field', (name, value) => {
|
||||
form.on('field', (name, value) => {
|
||||
if (name === false) {
|
||||
this.#body = value
|
||||
para = value
|
||||
return
|
||||
}
|
||||
if (~contentType.indexOf('urlencoded')) {
|
||||
|
|
@ -135,10 +179,14 @@ export default class Request {
|
|||
|
||||
if (value.slice(0, 1) === '=') value = '=' + value
|
||||
|
||||
return Object.assign(this.#body, JSON.parse(name + value))
|
||||
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') {
|
||||
|
|
@ -153,58 +201,61 @@ export default class Request {
|
|||
let pkey = name.slice(name.lastIndexOf('[') + 1, -1)
|
||||
name = name.slice(0, name.lastIndexOf('['))
|
||||
|
||||
if (!this.#body.hasOwnProperty(name)) {
|
||||
this.#body[name] = {}
|
||||
if (!para.hasOwnProperty(name)) {
|
||||
para[name] = {}
|
||||
}
|
||||
|
||||
if (!this.#body[name].hasOwnProperty(pkey)) {
|
||||
this.#body[name][pkey] = {}
|
||||
if (!para[name].hasOwnProperty(pkey)) {
|
||||
para[name][pkey] = {}
|
||||
}
|
||||
|
||||
this.#body[name][pkey][key] = value
|
||||
para[name][pkey][key] = value
|
||||
} else {
|
||||
if (!this.#body.hasOwnProperty(name)) {
|
||||
this.#body[name] = {}
|
||||
if (!para.hasOwnProperty(name)) {
|
||||
para[name] = {}
|
||||
}
|
||||
|
||||
this.#body[name][key] = value
|
||||
para[name][key] = value
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
this.#body[name] = value
|
||||
para[name] = value
|
||||
})
|
||||
.on('file', (name, file) => {
|
||||
if (name === false) {
|
||||
this.#body = file
|
||||
} else {
|
||||
|
||||
form.on('file', (name, file) => {
|
||||
if (name.slice(-2) === '[]') {
|
||||
name = name.slice(0, -2)
|
||||
}
|
||||
if (!this.#body.hasOwnProperty(name)) {
|
||||
this.#body[name] = file
|
||||
if (!para.hasOwnProperty(name)) {
|
||||
para[name] = file
|
||||
} else {
|
||||
if (!Array.isArray(this.#body[name])) {
|
||||
this.#body[name] = [this.#body[name]]
|
||||
}
|
||||
this.#body[name].push(file)
|
||||
if (!Array.isArray(para[name])) {
|
||||
para[name] = [para[name]]
|
||||
}
|
||||
para[name].push(file)
|
||||
}
|
||||
})
|
||||
.on('error', out.reject)
|
||||
.on('end', _ => {
|
||||
if (contentType.includes('urlencoded')) {
|
||||
for (let i in this.#body) {
|
||||
if (typeof this.#body[i] === 'string') {
|
||||
if (!this.#body[i]) {
|
||||
|
||||
form.on('error', out.reject)
|
||||
|
||||
form.on('end', err => {
|
||||
if (~contentType.indexOf('urlencoded')) {
|
||||
for (let i in para) {
|
||||
if (typeof para[i] === 'string') {
|
||||
if (!para[i]) {
|
||||
continue
|
||||
}
|
||||
this.#body[i] = Number.parse(this.#body[i])
|
||||
para[i] = Number.parse(para[i])
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
out.resolve(this.#body)
|
||||
this._postParam = para
|
||||
if (key) {
|
||||
return out.resolve(para.hasOwnProperty(key) ? para[key] : null)
|
||||
} else {
|
||||
return out.resolve(para)
|
||||
}
|
||||
})
|
||||
return out.promise
|
||||
}
|
||||
|
|
@ -212,46 +263,23 @@ export default class Request {
|
|||
//获取响应头
|
||||
header(key = '') {
|
||||
key = key ? (key + '').toLowerCase() : null
|
||||
return !!key ? this.#req.headers[key] : this.#req.headers
|
||||
return !!key ? this.origin.req.headers[key] : this.origin.req.headers
|
||||
}
|
||||
|
||||
// 读取cookie
|
||||
cookie(key) {
|
||||
if (key) {
|
||||
return this.#cookies[key]
|
||||
return this.__COOKIE__[key]
|
||||
}
|
||||
return this.#cookies
|
||||
}
|
||||
|
||||
get query() {
|
||||
if (!this.#query) {
|
||||
let para = parse(this.#req.url).query
|
||||
this.#query = QS.parse(para)
|
||||
}
|
||||
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
|
||||
return this.__COOKIE__
|
||||
}
|
||||
|
||||
//获取客户端IP
|
||||
get ip() {
|
||||
ip() {
|
||||
return (
|
||||
this.headers['x-real-ip'] ||
|
||||
this.headers['x-forwarded-for'] ||
|
||||
this.#req.connection.remoteAddress.replace('::ffff:', '')
|
||||
this.header('x-real-ip') ||
|
||||
this.header('x-forwarded-for') ||
|
||||
this.origin.req.connection.remoteAddress.replace('::ffff:', '')
|
||||
)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,16 +4,16 @@
|
|||
*/
|
||||
|
||||
// var KEY_REGEXP = /^[\u0009\u0020-\u007e\u0080-\u00ff]+$/
|
||||
const SPLIT_REGEXP = /; */
|
||||
var SPLIT_REGEXP = /; */
|
||||
// var encode = encodeURIComponent
|
||||
const decode = decodeURIComponent
|
||||
var decode = decodeURIComponent
|
||||
|
||||
/**
|
||||
* [parse 格式化字符串]
|
||||
*/
|
||||
export function parseCookie(str) {
|
||||
let obj = {}
|
||||
let pairs
|
||||
var obj = {}
|
||||
var pairs
|
||||
|
||||
if (typeof str !== 'string') {
|
||||
return {}
|
||||
|
|
@ -27,8 +27,8 @@ export function parseCookie(str) {
|
|||
continue
|
||||
}
|
||||
|
||||
let key = item[0].trim()
|
||||
let val = item[1].trim()
|
||||
var key = item[0].trim()
|
||||
var val = item[1].trim()
|
||||
|
||||
obj[key] = decode(val)
|
||||
}
|
||||
|
|
|
|||
70
lib/file.js
70
lib/file.js
|
|
@ -1,28 +1,38 @@
|
|||
import { WriteStream } from 'node:fs'
|
||||
import { EventEmitter } from 'node:events'
|
||||
import util from 'util'
|
||||
import { WriteStream } from 'fs'
|
||||
import { EventEmitter } from 'events'
|
||||
import crypto from 'crypto'
|
||||
|
||||
export default class File extends EventEmitter {
|
||||
#stream = null
|
||||
export default function File(properties) {
|
||||
EventEmitter.call(this)
|
||||
|
||||
size = 0
|
||||
path = null
|
||||
name = null
|
||||
type = null
|
||||
lastModifiedDate = null
|
||||
this.size = 0
|
||||
this.path = null
|
||||
this.name = null
|
||||
this.type = null
|
||||
this.hash = null
|
||||
this.lastModifiedDate = null
|
||||
|
||||
constructor(props = {}) {
|
||||
super()
|
||||
this._writeStream = null
|
||||
|
||||
for (let key in props) {
|
||||
this[key] = props[key]
|
||||
for (var key in properties) {
|
||||
this[key] = properties[key]
|
||||
}
|
||||
|
||||
if (typeof this.hash === 'string') {
|
||||
this.hash = crypto.createHash(properties.hash)
|
||||
} else {
|
||||
this.hash = null
|
||||
}
|
||||
}
|
||||
|
||||
open() {
|
||||
this.#stream = new WriteStream(this.path)
|
||||
util.inherits(File, EventEmitter)
|
||||
|
||||
File.prototype.open = function() {
|
||||
this._writeStream = new WriteStream(this.path)
|
||||
}
|
||||
|
||||
toJSON() {
|
||||
File.prototype.toJSON = function() {
|
||||
return {
|
||||
size: this.size,
|
||||
path: this.path,
|
||||
|
|
@ -30,19 +40,31 @@ export default class File extends EventEmitter {
|
|||
type: this.type,
|
||||
mtime: this.lastModifiedDate,
|
||||
length: this.length,
|
||||
filename: this.name,
|
||||
mime: this.type
|
||||
filename: this.filename,
|
||||
mime: this.mime
|
||||
}
|
||||
}
|
||||
|
||||
write(buffer) {
|
||||
this.#stream.write(buffer, _ => {
|
||||
this.size += buffer.length
|
||||
File.prototype.write = function(buffer, cb) {
|
||||
var self = this
|
||||
if (self.hash) {
|
||||
self.hash.update(buffer)
|
||||
}
|
||||
this._writeStream.write(buffer, function() {
|
||||
self.lastModifiedDate = new Date()
|
||||
self.size += buffer.length
|
||||
self.emit('progress', self.size)
|
||||
cb()
|
||||
})
|
||||
}
|
||||
|
||||
end(callback) {
|
||||
this.lastModifiedDate = new Date()
|
||||
this.#stream.end(callback)
|
||||
File.prototype.end = function(cb) {
|
||||
var self = this
|
||||
if (self.hash) {
|
||||
self.hash = self.hash.digest('hex')
|
||||
}
|
||||
this._writeStream.end(function() {
|
||||
self.emit('end')
|
||||
cb()
|
||||
})
|
||||
}
|
||||
|
|
|
|||
623
lib/index.js
623
lib/index.js
|
|
@ -1,191 +1,348 @@
|
|||
import crypto from 'node:crypto'
|
||||
import fs from 'node:fs'
|
||||
import { join } from 'node:path'
|
||||
import { EventEmitter } from 'node:events'
|
||||
|
||||
import crypto from 'crypto'
|
||||
import fs from 'fs'
|
||||
import util from 'util'
|
||||
import path from 'path'
|
||||
import File from './file.js'
|
||||
import { EventEmitter } from 'events'
|
||||
import { Stream } from 'stream'
|
||||
import { StringDecoder } from 'string_decoder'
|
||||
|
||||
import { MultipartParser } from './multipart_parser.js'
|
||||
import { UrlencodedParser } from './urlencoded_parser.js'
|
||||
import { OctetParser, EmptyParser } from './octet_parser.js'
|
||||
import { QuerystringParser } from './querystring_parser.js'
|
||||
import { OctetParser } from './octet_parser.js'
|
||||
import { JSONParser } from './json_parser.js'
|
||||
|
||||
function randomPath(uploadDir) {
|
||||
var name = 'upload_' + crypto.randomBytes(16).toString('hex')
|
||||
return join(uploadDir, name)
|
||||
}
|
||||
export default function IncomingForm(opts) {
|
||||
EventEmitter.call(this)
|
||||
|
||||
function parseFilename(headerValue) {
|
||||
let matches = headerValue.match(/\bfilename="(.*?)"($|; )/i)
|
||||
if (!matches) {
|
||||
return
|
||||
}
|
||||
opts = opts || {}
|
||||
|
||||
let filename = matches[1].slice(matches[1].lastIndexOf('\\') + 1)
|
||||
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.error = null
|
||||
this.ended = false
|
||||
|
||||
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.headers = req.headers
|
||||
this.#parseContentLength()
|
||||
this.#parseContentType()
|
||||
this.bytesReceived = null
|
||||
this.bytesExpected = null
|
||||
|
||||
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', err => {
|
||||
this.#handleError(err)
|
||||
this.#clearUploads()
|
||||
.on('error', function(err) {
|
||||
self._error(err)
|
||||
})
|
||||
.on('aborted', () => {
|
||||
this.emit('aborted')
|
||||
this.#clearUploads()
|
||||
.on('aborted', function() {
|
||||
self.emit('aborted')
|
||||
self._error(new Error('Request aborted'))
|
||||
})
|
||||
.on('data', buffer => this.#write(buffer))
|
||||
.on('end', () => {
|
||||
if (this.#error) {
|
||||
.on('data', function(buffer) {
|
||||
self.write(buffer)
|
||||
})
|
||||
.on('end', function() {
|
||||
if (self.error) {
|
||||
return
|
||||
}
|
||||
let err = this.#parser.end()
|
||||
if (err) {
|
||||
this.#handleError(err)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
#write(buffer) {
|
||||
if (this.#error) {
|
||||
var err = self._parser.end()
|
||||
if (err) {
|
||||
self._error(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) {
|
||||
return this.#handleError(new Error('uninitialized parser'))
|
||||
if (!this._parser) {
|
||||
this._error(new Error('uninitialized parser'))
|
||||
return
|
||||
}
|
||||
|
||||
this.bytesReceived += buffer.length
|
||||
this.emit('progress', this.bytesReceived, this.bytesExpected)
|
||||
|
||||
this.#parser.write(buffer)
|
||||
var bytesParsed = this._parser.write(buffer)
|
||||
if (bytesParsed !== buffer.length) {
|
||||
this._error(
|
||||
new Error(
|
||||
'parser error, ' +
|
||||
bytesParsed +
|
||||
' of ' +
|
||||
buffer.length +
|
||||
' bytes parsed'
|
||||
)
|
||||
)
|
||||
}
|
||||
|
||||
#handlePart(part) {
|
||||
if (part.filename === undefined) {
|
||||
let value = Buffer.from('')
|
||||
return bytesParsed
|
||||
}
|
||||
|
||||
part
|
||||
.on('data', buff => {
|
||||
value = Buffer.concat([value, buff])
|
||||
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 = '',
|
||||
decoder = new StringDecoder(this.encoding)
|
||||
|
||||
part.on('data', function(buffer) {
|
||||
self._fieldsSize += buffer.length
|
||||
if (self._fieldsSize > self.maxFieldsSize) {
|
||||
self._error(
|
||||
new Error(
|
||||
'maxFieldsSize exceeded, received ' +
|
||||
self._fieldsSize +
|
||||
' bytes of field data'
|
||||
)
|
||||
)
|
||||
return
|
||||
}
|
||||
value += decoder.write(buffer)
|
||||
})
|
||||
.on('end', () => {
|
||||
this.emit('field', part.name, value.toString(this.encoding))
|
||||
|
||||
part.on('end', function() {
|
||||
self.emit('field', part.name, value)
|
||||
})
|
||||
} else {
|
||||
let file = new File({
|
||||
path: randomPath(this.uploadDir),
|
||||
return
|
||||
}
|
||||
|
||||
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)
|
||||
|
||||
this.#openedFiles.push(file)
|
||||
// 表单解析完的时候文件写入不一定完成了, 所以需要加入pending计数
|
||||
this.#pending++
|
||||
|
||||
part
|
||||
.on('data', buffer => {
|
||||
part.on('data', function(buffer) {
|
||||
if (buffer.length == 0) {
|
||||
return
|
||||
}
|
||||
file.write(buffer)
|
||||
self.pause()
|
||||
file.write(buffer, function() {
|
||||
self.resume()
|
||||
})
|
||||
})
|
||||
|
||||
part.on('end', function() {
|
||||
file.end(function() {
|
||||
self._flushing--
|
||||
self.emit('file', part.name, file)
|
||||
self._maybeEnd()
|
||||
})
|
||||
})
|
||||
.on('end', () => {
|
||||
if (part.ended) {
|
||||
return
|
||||
}
|
||||
part.ended = true
|
||||
file.end(() => {
|
||||
this.emit('file', part.name, file)
|
||||
this.#pending--
|
||||
})
|
||||
})
|
||||
|
||||
function dummyParser(self) {
|
||||
return {
|
||||
end: function() {
|
||||
self.ended = true
|
||||
self._maybeEnd()
|
||||
return null
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#parseContentType() {
|
||||
let contentType = this.headers['content-type']
|
||||
let lower = contentType.toLowerCase()
|
||||
|
||||
IncomingForm.prototype._parseContentType = function() {
|
||||
if (this.bytesExpected === 0) {
|
||||
return (this.#parser = new EmptyParser())
|
||||
this._parser = dummyParser(this)
|
||||
return
|
||||
}
|
||||
|
||||
if (lower.includes('octet-stream')) {
|
||||
return this.#createStreamParser()
|
||||
if (!this.headers['content-type']) {
|
||||
this._error(new Error('bad content-type header, no content-type'))
|
||||
return
|
||||
}
|
||||
|
||||
if (lower.includes('urlencoded')) {
|
||||
return this.#createUrlencodedParser()
|
||||
if (this.headers['content-type'].match(/octet-stream/i)) {
|
||||
this._initOctetStream()
|
||||
return
|
||||
}
|
||||
|
||||
if (lower.includes('multipart')) {
|
||||
let matches = contentType.match(/boundary=(?:"([^"]+)"|([^;]+))/)
|
||||
if (matches) {
|
||||
this.#createMultipartParser(matches[1] || matches[2])
|
||||
if (this.headers['content-type'].match(/urlencoded/i)) {
|
||||
this._initUrlencoded()
|
||||
return
|
||||
}
|
||||
|
||||
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.#handleError(new TypeError('unknow multipart boundary'))
|
||||
this._error(new Error('bad content-type header, no multipart boundary'))
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
if (lower.match(/json|appliation|plain|text/)) {
|
||||
return this.#createJsonParser()
|
||||
if (this.headers['content-type'].match(/json|appliation|plain|text/i)) {
|
||||
this._initJSONencoded()
|
||||
return
|
||||
}
|
||||
|
||||
this.#handleError(new TypeError('unknown content-type: ' + contentType))
|
||||
this._error(
|
||||
new Error(
|
||||
'bad content-type header, unknown content-type: ' +
|
||||
this.headers['content-type']
|
||||
)
|
||||
)
|
||||
}
|
||||
|
||||
#parseContentLength() {
|
||||
IncomingForm.prototype._error = function(err) {
|
||||
if (this.error || this.ended) {
|
||||
return
|
||||
}
|
||||
|
||||
this.error = err
|
||||
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 = +this.headers['content-length']
|
||||
this.bytesExpected = parseInt(this.headers['content-length'], 10)
|
||||
} else if (this.headers['transfer-encoding'] === undefined) {
|
||||
this.bytesExpected = 0
|
||||
}
|
||||
|
||||
if (this.bytesExpected !== null) {
|
||||
this.emit('progress', this.bytesReceived, this.bytesExpected)
|
||||
}
|
||||
}
|
||||
|
||||
#createMultipartParser(boundary) {
|
||||
let headerField, headerValue, part
|
||||
IncomingForm.prototype._newParser = function() {
|
||||
return new MultipartParser()
|
||||
}
|
||||
|
||||
this.#parser = new MultipartParser(boundary)
|
||||
IncomingForm.prototype._initMultipart = function(boundary) {
|
||||
this.type = 'multipart'
|
||||
|
||||
this.#parser.$partBegin = function () {
|
||||
part = new EventEmitter()
|
||||
var parser = new MultipartParser(),
|
||||
self = this,
|
||||
headerField,
|
||||
headerValue,
|
||||
part
|
||||
|
||||
parser.initWithBoundary(boundary)
|
||||
|
||||
parser.onPartBegin = function() {
|
||||
part = new Stream()
|
||||
part.readable = true
|
||||
part.headers = {}
|
||||
part.name = null
|
||||
|
|
@ -199,25 +356,25 @@ export default class IncomingForm extends EventEmitter {
|
|||
headerValue = ''
|
||||
}
|
||||
|
||||
this.#parser.$headerField = b => {
|
||||
headerField += b.toString(this.encoding)
|
||||
parser.onHeaderField = function(b, start, end) {
|
||||
headerField += b.toString(self.encoding, start, end)
|
||||
}
|
||||
|
||||
this.#parser.$headerValue = b => {
|
||||
headerValue += b.toString(this.encoding)
|
||||
parser.onHeaderValue = function(b, start, end) {
|
||||
headerValue += b.toString(self.encoding, start, end)
|
||||
}
|
||||
|
||||
this.#parser.$headerEnd = () => {
|
||||
parser.onHeaderEnd = function() {
|
||||
headerField = headerField.toLowerCase()
|
||||
part.headers[headerField] = headerValue
|
||||
|
||||
let matches = headerValue.match(/\bname="([^"]+)"/i)
|
||||
var m = headerValue.match(/\bname="([^"]+)"/i)
|
||||
if (headerField == 'content-disposition') {
|
||||
if (matches) {
|
||||
part.name = matches[1]
|
||||
if (m) {
|
||||
part.name = m[1]
|
||||
}
|
||||
|
||||
part.filename = parseFilename(headerValue)
|
||||
part.filename = self._fileName(headerValue)
|
||||
} else if (headerField == 'content-type') {
|
||||
part.mime = headerValue
|
||||
} else if (headerField == 'content-transfer-encoding') {
|
||||
|
|
@ -228,119 +385,187 @@ export default class IncomingForm extends EventEmitter {
|
|||
headerValue = ''
|
||||
}
|
||||
|
||||
this.#parser.$headersEnd = () => {
|
||||
parser.onHeadersEnd = function() {
|
||||
switch (part.transferEncoding) {
|
||||
case 'binary':
|
||||
case '7bit':
|
||||
case '8bit':
|
||||
this.#parser.$partData = function (b) {
|
||||
part.emit('data', b)
|
||||
parser.onPartData = function(b, start, end) {
|
||||
part.emit('data', b.slice(start, end))
|
||||
}
|
||||
this.#parser.$partEnd = function () {
|
||||
|
||||
parser.onPartEnd = function() {
|
||||
part.emit('end')
|
||||
}
|
||||
break
|
||||
|
||||
case 'base64':
|
||||
this.#parser.$partData = function (b) {
|
||||
part.transferBuffer += b.toString('ascii')
|
||||
parser.onPartData = function(b, start, end) {
|
||||
part.transferBuffer += b.slice(start, end).toString('ascii')
|
||||
|
||||
// 确保offset的值能被4整除
|
||||
let offset = ~~(part.transferBuffer.length / 4) * 4
|
||||
/*
|
||||
four bytes (chars) in base64 converts to three bytes in binary
|
||||
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.slice(0, offset), 'base64')
|
||||
Buffer.from(part.transferBuffer.substring(0, offset), 'base64')
|
||||
)
|
||||
part.transferBuffer = part.transferBuffer.slice(offset)
|
||||
part.transferBuffer = part.transferBuffer.substring(offset)
|
||||
}
|
||||
this.#parser.$partEnd = function () {
|
||||
|
||||
parser.onPartEnd = function() {
|
||||
part.emit('data', Buffer.from(part.transferBuffer, 'base64'))
|
||||
part.emit('end')
|
||||
}
|
||||
break
|
||||
|
||||
default:
|
||||
return this.#handleError(new Error('unknown transfer-encoding'))
|
||||
return self._error(new Error('unknown transfer-encoding'))
|
||||
}
|
||||
|
||||
this.#handlePart(part)
|
||||
self.onPart(part)
|
||||
}
|
||||
|
||||
this.#parser.$end = () => {
|
||||
if (this.#pending > 0) {
|
||||
setTimeout(_ => this.#parser.$end())
|
||||
} else {
|
||||
this.#handleEnd()
|
||||
}
|
||||
}
|
||||
parser.onEnd = function() {
|
||||
self.ended = true
|
||||
self._maybeEnd()
|
||||
}
|
||||
|
||||
#createUrlencodedParser() {
|
||||
this.#parser = new UrlencodedParser()
|
||||
|
||||
this.#parser
|
||||
.on('field', fields => this.emit('field', false, fields))
|
||||
.on('end', () => this.#handleEnd())
|
||||
this._parser = parser
|
||||
}
|
||||
|
||||
#createStreamParser() {
|
||||
let filename = this.headers['x-file-name']
|
||||
let mime = this.headers['x-file-type']
|
||||
IncomingForm.prototype._fileName = function(headerValue) {
|
||||
var m = headerValue.match(/\bfilename="(.*?)"($|; )/i)
|
||||
if (!m) return
|
||||
|
||||
this.#parser = new OctetParser(filename, mime, randomPath(this.uploadDir))
|
||||
|
||||
if (this.bytesExpected) {
|
||||
this.#parser.initLength(this.bytesExpected)
|
||||
}
|
||||
|
||||
this.#parser
|
||||
.on('file', file => {
|
||||
this.emit('file', false, file)
|
||||
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)
|
||||
})
|
||||
.on('end', () => this.#handleEnd())
|
||||
.on('error', err => this.#handleError(err))
|
||||
return filename
|
||||
}
|
||||
|
||||
#createJsonParser() {
|
||||
this.#parser = new JSONParser()
|
||||
IncomingForm.prototype._initUrlencoded = function() {
|
||||
this.type = 'urlencoded'
|
||||
|
||||
if (this.bytesExpected) {
|
||||
this.#parser.initLength(this.bytesExpected)
|
||||
}
|
||||
var parser = new QuerystringParser(this.maxFields)
|
||||
|
||||
this.#parser
|
||||
.on('field', (key, val) => {
|
||||
parser.onField = (key, val) => {
|
||||
this.emit('field', key, val)
|
||||
})
|
||||
.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) {}
|
||||
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)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
#handleError(err) {
|
||||
if (this.#error || this.#ended) {
|
||||
return
|
||||
}
|
||||
this.error = true
|
||||
this.emit('error', err)
|
||||
IncomingForm.prototype._initJSONencoded = function() {
|
||||
this.type = 'json'
|
||||
|
||||
var parser = new JSONParser(),
|
||||
self = this
|
||||
|
||||
if (this.bytesExpected) {
|
||||
parser.initWithLength(this.bytesExpected)
|
||||
}
|
||||
|
||||
#handleEnd() {
|
||||
if (this.#ended || this.#error) {
|
||||
parser.onField = function(key, val) {
|
||||
self.emit('field', key, val)
|
||||
}
|
||||
|
||||
parser.onEnd = function() {
|
||||
self.ended = true
|
||||
self._maybeEnd()
|
||||
}
|
||||
|
||||
this._parser = parser
|
||||
}
|
||||
|
||||
IncomingForm.prototype._uploadPath = function(filename) {
|
||||
var name = 'upload_'
|
||||
var buf = crypto.randomBytes(16)
|
||||
for (var i = 0; i < buf.length; ++i) {
|
||||
name += ('0' + buf[i].toString(16)).slice(-2)
|
||||
}
|
||||
|
||||
if (this.keepExtensions) {
|
||||
var ext = path.extname(filename)
|
||||
ext = ext.replace(/(\.[a-z0-9]+).*/i, '$1')
|
||||
|
||||
name += ext
|
||||
}
|
||||
|
||||
return path.join(this.uploadDir, name)
|
||||
}
|
||||
|
||||
IncomingForm.prototype._maybeEnd = function() {
|
||||
if (!this.ended || this._flushing || this.error) {
|
||||
return
|
||||
}
|
||||
this.#ended = true
|
||||
|
||||
this.emit('end')
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,43 +1,33 @@
|
|||
import { EventEmitter } from 'node:events'
|
||||
|
||||
export class JSONParser extends EventEmitter {
|
||||
#buff = Buffer.from('')
|
||||
#byteLen = 0
|
||||
|
||||
initLength(length) {
|
||||
this.#byteLen = length
|
||||
export function JSONParser() {
|
||||
this.data = Buffer.from('')
|
||||
this.bytesWritten = 0
|
||||
}
|
||||
|
||||
write(buffer) {
|
||||
this.#buff = Buffer.concat([this.#buff, buffer])
|
||||
JSONParser.prototype.initWithLength = function(length) {
|
||||
this.data = Buffer.alloc(length)
|
||||
}
|
||||
|
||||
end() {
|
||||
if (this.#buff.length === this.#byteLen) {
|
||||
let data = this.#buff.toString()
|
||||
let fields = data
|
||||
JSONParser.prototype.write = function(buffer) {
|
||||
if (this.data.length >= this.bytesWritten + buffer.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() {
|
||||
var data = this.data.toString('utf8')
|
||||
var fields
|
||||
try {
|
||||
fields = JSON.parse(data)
|
||||
} catch (e) {
|
||||
try {
|
||||
// 非标准的json语法,尝试用 Function 解析
|
||||
fields = Function(`try{return ${data}}catch(e){}`)()
|
||||
} catch (err) {}
|
||||
fields = Function(`try{return ${data}}catch(e){}`)() || data
|
||||
}
|
||||
|
||||
this.emit('field', false, fields)
|
||||
this.emit('end')
|
||||
this.onField(false, fields)
|
||||
this.data = null
|
||||
|
||||
this.#buff = null
|
||||
} else {
|
||||
this.emit(
|
||||
'error',
|
||||
new Error(
|
||||
`The uploaded data is incomplete. Expected ${
|
||||
this.#byteLen
|
||||
}, Received ${this.#buff.length} .`
|
||||
)
|
||||
)
|
||||
}
|
||||
}
|
||||
this.onEnd()
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,5 @@
|
|||
/**
|
||||
* {}
|
||||
* @author yutent<yutent.io@gmail.com>
|
||||
* @date 2023/10/30 16:41:59
|
||||
*/
|
||||
|
||||
let s = 0
|
||||
const STATE_DICT = {
|
||||
var s = 0,
|
||||
S = {
|
||||
PARSER_UNINITIALIZED: s++,
|
||||
START: s++,
|
||||
START_BOUNDARY: s++,
|
||||
|
|
@ -19,82 +13,56 @@ const STATE_DICT = {
|
|||
PART_DATA: s++,
|
||||
PART_END: s++,
|
||||
END: s++
|
||||
}
|
||||
let f = 1
|
||||
const FLAG_DICT = {
|
||||
},
|
||||
f = 1,
|
||||
F = {
|
||||
PART_BOUNDARY: f,
|
||||
LAST_BOUNDARY: (f *= 2)
|
||||
}
|
||||
|
||||
const LF = 10
|
||||
const CR = 13
|
||||
const SPACE = 32
|
||||
const HYPHEN = 45
|
||||
const COLON = 58
|
||||
const LETTER_A = 97
|
||||
const LETTER_Z = 122
|
||||
|
||||
function lower(c) {
|
||||
},
|
||||
LF = 10,
|
||||
CR = 13,
|
||||
SPACE = 32,
|
||||
HYPHEN = 45,
|
||||
COLON = 58,
|
||||
A = 97,
|
||||
Z = 122,
|
||||
lower = function(c) {
|
||||
return c | 0x20
|
||||
}
|
||||
|
||||
function stateToString(value) {
|
||||
for (let key in STATE_DICT) {
|
||||
let number = STATE_DICT[key]
|
||||
if (number === value) {
|
||||
return key
|
||||
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) {
|
||||
for (var state in S) {
|
||||
var number = S[state]
|
||||
if (number === stateNumber) return state
|
||||
}
|
||||
}
|
||||
|
||||
export class MultipartParser {
|
||||
boundary = null
|
||||
boundaryChars = null
|
||||
lookbehind = null
|
||||
state = STATE_DICT.PARSER_UNINITIALIZED
|
||||
|
||||
index = null
|
||||
flags = 0
|
||||
|
||||
constructor(str) {
|
||||
MultipartParser.prototype.initWithBoundary = function(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 = STATE_DICT.START
|
||||
this.state = S.START
|
||||
|
||||
this.boundaryChars = {}
|
||||
for (let i = 0; i < this.boundary.length; i++) {
|
||||
for (var i = 0; i < this.boundary.length; i++) {
|
||||
this.boundaryChars[this.boundary[i]] = true
|
||||
}
|
||||
}
|
||||
|
||||
#mark(k, v) {
|
||||
this[k + 'Mark'] = v
|
||||
}
|
||||
|
||||
#emit(name, buff, idx, cleanup) {
|
||||
let mark = name + 'Mark'
|
||||
if (this[mark] !== void 0) {
|
||||
let start = this[mark]
|
||||
let end = buff.length
|
||||
|
||||
if (cleanup) {
|
||||
end = idx
|
||||
delete this[mark]
|
||||
} else {
|
||||
this[mark] = 0
|
||||
}
|
||||
|
||||
if (start === end) {
|
||||
return
|
||||
}
|
||||
this['$' + name](buff.slice(start, end))
|
||||
}
|
||||
}
|
||||
|
||||
write(buffer) {
|
||||
let idx = 0,
|
||||
MultipartParser.prototype.write = function(buffer) {
|
||||
var self = this,
|
||||
i = 0,
|
||||
len = buffer.length,
|
||||
prevIndex = this.index,
|
||||
index = this.index,
|
||||
|
|
@ -107,39 +75,67 @@ export class MultipartParser {
|
|||
boundaryEnd = boundaryLength - 1,
|
||||
bufferLength = buffer.length,
|
||||
c,
|
||||
cl
|
||||
|
||||
for (idx = 0; idx < len; idx++) {
|
||||
c = buffer[idx]
|
||||
|
||||
switch (state) {
|
||||
case STATE_DICT.PARSER_UNINITIALIZED:
|
||||
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
|
||||
}
|
||||
|
||||
case STATE_DICT.START:
|
||||
var callbackSymbol =
|
||||
'on' + name.substr(0, 1).toUpperCase() + name.substr(1)
|
||||
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:
|
||||
return i
|
||||
case S.START:
|
||||
index = 0
|
||||
state = STATE_DICT.START_BOUNDARY
|
||||
|
||||
case STATE_DICT.START_BOUNDARY:
|
||||
state = S.START_BOUNDARY
|
||||
case S.START_BOUNDARY:
|
||||
if (index == boundary.length - 2) {
|
||||
if (c == HYPHEN) {
|
||||
flags |= FLAG_DICT.LAST_BOUNDARY
|
||||
flags |= F.LAST_BOUNDARY
|
||||
} else if (c != CR) {
|
||||
return
|
||||
return i
|
||||
}
|
||||
index++
|
||||
break
|
||||
} else if (index - 1 == boundary.length - 2) {
|
||||
if (flags & FLAG_DICT.LAST_BOUNDARY && c == HYPHEN) {
|
||||
this.$end()
|
||||
state = STATE_DICT.END
|
||||
if (flags & F.LAST_BOUNDARY && c == HYPHEN) {
|
||||
callback('end')
|
||||
state = S.END
|
||||
flags = 0
|
||||
} else if (!(flags & FLAG_DICT.LAST_BOUNDARY) && c == LF) {
|
||||
} else if (!(flags & F.LAST_BOUNDARY) && c == LF) {
|
||||
index = 0
|
||||
this.$partBegin()
|
||||
state = STATE_DICT.HEADER_FIELD_START
|
||||
callback('partBegin')
|
||||
state = S.HEADER_FIELD_START
|
||||
} else {
|
||||
return
|
||||
return i
|
||||
}
|
||||
break
|
||||
}
|
||||
|
|
@ -151,16 +147,14 @@ export class MultipartParser {
|
|||
index++
|
||||
}
|
||||
break
|
||||
|
||||
case STATE_DICT.HEADER_FIELD_START:
|
||||
state = STATE_DICT.HEADER_FIELD
|
||||
this.#mark('headerField', idx)
|
||||
case S.HEADER_FIELD_START:
|
||||
state = S.HEADER_FIELD
|
||||
mark('headerField')
|
||||
index = 0
|
||||
|
||||
case STATE_DICT.HEADER_FIELD:
|
||||
case S.HEADER_FIELD:
|
||||
if (c == CR) {
|
||||
delete this.headerFieldMark
|
||||
state = STATE_DICT.HEADERS_ALMOST_DONE
|
||||
clear('headerField')
|
||||
state = S.HEADERS_ALMOST_DONE
|
||||
break
|
||||
}
|
||||
|
||||
|
|
@ -172,72 +166,66 @@ export class MultipartParser {
|
|||
if (c == COLON) {
|
||||
if (index == 1) {
|
||||
// empty header field
|
||||
return
|
||||
return i
|
||||
}
|
||||
this.#emit('headerField', buffer, idx, true)
|
||||
state = STATE_DICT.HEADER_VALUE_START
|
||||
dataCallback('headerField', true)
|
||||
state = S.HEADER_VALUE_START
|
||||
break
|
||||
}
|
||||
|
||||
cl = lower(c)
|
||||
if (cl < LETTER_A || cl > LETTER_Z) {
|
||||
return
|
||||
if (cl < A || cl > Z) {
|
||||
return i
|
||||
}
|
||||
break
|
||||
|
||||
case STATE_DICT.HEADER_VALUE_START:
|
||||
case S.HEADER_VALUE_START:
|
||||
if (c == SPACE) {
|
||||
break
|
||||
}
|
||||
|
||||
this.#mark('headerValue', idx)
|
||||
state = STATE_DICT.HEADER_VALUE
|
||||
|
||||
case STATE_DICT.HEADER_VALUE:
|
||||
mark('headerValue')
|
||||
state = S.HEADER_VALUE
|
||||
case S.HEADER_VALUE:
|
||||
if (c == CR) {
|
||||
this.#emit('headerValue', buffer, idx, true)
|
||||
this.$headerEnd()
|
||||
state = STATE_DICT.HEADER_VALUE_ALMOST_DONE
|
||||
dataCallback('headerValue', true)
|
||||
callback('headerEnd')
|
||||
state = S.HEADER_VALUE_ALMOST_DONE
|
||||
}
|
||||
break
|
||||
|
||||
case STATE_DICT.HEADER_VALUE_ALMOST_DONE:
|
||||
case S.HEADER_VALUE_ALMOST_DONE:
|
||||
if (c != LF) {
|
||||
return
|
||||
return i
|
||||
}
|
||||
state = STATE_DICT.HEADER_FIELD_START
|
||||
state = S.HEADER_FIELD_START
|
||||
break
|
||||
|
||||
case STATE_DICT.HEADERS_ALMOST_DONE:
|
||||
case S.HEADERS_ALMOST_DONE:
|
||||
if (c != LF) {
|
||||
return
|
||||
return i
|
||||
}
|
||||
|
||||
this.$headersEnd()
|
||||
state = STATE_DICT.PART_DATA_START
|
||||
callback('headersEnd')
|
||||
state = S.PART_DATA_START
|
||||
break
|
||||
|
||||
case STATE_DICT.PART_DATA_START:
|
||||
state = STATE_DICT.PART_DATA
|
||||
this.#mark('partData', idx)
|
||||
|
||||
case STATE_DICT.PART_DATA:
|
||||
case S.PART_DATA_START:
|
||||
state = S.PART_DATA
|
||||
mark('partData')
|
||||
case S.PART_DATA:
|
||||
prevIndex = index
|
||||
|
||||
if (index === 0) {
|
||||
// boyer-moore derrived algorithm to safely skip non-boundary data
|
||||
idx += boundaryEnd
|
||||
while (idx < bufferLength && !(buffer[idx] in boundaryChars)) {
|
||||
idx += boundaryLength
|
||||
i += boundaryEnd
|
||||
while (i < bufferLength && !(buffer[i] in boundaryChars)) {
|
||||
i += boundaryLength
|
||||
}
|
||||
idx -= boundaryEnd
|
||||
c = buffer[idx]
|
||||
i -= boundaryEnd
|
||||
c = buffer[i]
|
||||
}
|
||||
|
||||
if (index < boundary.length) {
|
||||
if (boundary[index] == c) {
|
||||
if (index === 0) {
|
||||
this.#emit('partData', buffer, idx, true)
|
||||
dataCallback('partData', true)
|
||||
}
|
||||
index++
|
||||
} else {
|
||||
|
|
@ -247,29 +235,29 @@ export class MultipartParser {
|
|||
index++
|
||||
if (c == CR) {
|
||||
// CR = part boundary
|
||||
flags |= FLAG_DICT.PART_BOUNDARY
|
||||
flags |= F.PART_BOUNDARY
|
||||
} else if (c == HYPHEN) {
|
||||
// HYPHEN = end boundary
|
||||
flags |= FLAG_DICT.LAST_BOUNDARY
|
||||
flags |= F.LAST_BOUNDARY
|
||||
} else {
|
||||
index = 0
|
||||
}
|
||||
} else if (index - 1 == boundary.length) {
|
||||
if (flags & FLAG_DICT.PART_BOUNDARY) {
|
||||
if (flags & F.PART_BOUNDARY) {
|
||||
index = 0
|
||||
if (c == LF) {
|
||||
// unset the PART_BOUNDARY flag
|
||||
flags &= ~FLAG_DICT.PART_BOUNDARY
|
||||
this.$partEnd()
|
||||
this.$partBegin()
|
||||
state = STATE_DICT.HEADER_FIELD_START
|
||||
flags &= ~F.PART_BOUNDARY
|
||||
callback('partEnd')
|
||||
callback('partBegin')
|
||||
state = S.HEADER_FIELD_START
|
||||
break
|
||||
}
|
||||
} else if (flags & FLAG_DICT.LAST_BOUNDARY) {
|
||||
} else if (flags & F.LAST_BOUNDARY) {
|
||||
if (c == HYPHEN) {
|
||||
this.$partEnd()
|
||||
this.$end()
|
||||
state = STATE_DICT.END
|
||||
callback('partEnd')
|
||||
callback('end')
|
||||
state = S.END
|
||||
flags = 0
|
||||
} else {
|
||||
index = 0
|
||||
|
|
@ -286,50 +274,54 @@ export class MultipartParser {
|
|||
} else if (prevIndex > 0) {
|
||||
// if our boundary turned out to be rubbish, the captured lookbehind
|
||||
// belongs to partData
|
||||
|
||||
this.$partData(lookbehind.slice(0, prevIndex))
|
||||
callback('partData', lookbehind, 0, prevIndex)
|
||||
prevIndex = 0
|
||||
this.#mark('partData', idx)
|
||||
mark('partData')
|
||||
|
||||
// reconsider the current character even so it interrupted the sequence
|
||||
// it could be the beginning of a new sequence
|
||||
idx--
|
||||
i--
|
||||
}
|
||||
|
||||
break
|
||||
|
||||
case STATE_DICT.END:
|
||||
case S.END:
|
||||
break
|
||||
|
||||
default:
|
||||
return
|
||||
return i
|
||||
}
|
||||
}
|
||||
|
||||
this.#emit('headerField', buffer, idx)
|
||||
this.#emit('headerValue', buffer, idx)
|
||||
this.#emit('partData', buffer, idx)
|
||||
dataCallback('headerField')
|
||||
dataCallback('headerValue')
|
||||
dataCallback('partData')
|
||||
|
||||
this.index = index
|
||||
this.state = state
|
||||
this.flags = flags
|
||||
|
||||
return len
|
||||
}
|
||||
|
||||
end() {
|
||||
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]()
|
||||
}
|
||||
}
|
||||
if (
|
||||
(this.state === STATE_DICT.HEADER_FIELD_START && this.index === 0) ||
|
||||
(this.state === STATE_DICT.PART_DATA &&
|
||||
this.index == this.boundary.length)
|
||||
(this.state == S.HEADER_FIELD_START && this.index === 0) ||
|
||||
(this.state == S.PART_DATA && this.index == this.boundary.length)
|
||||
) {
|
||||
this.$end()
|
||||
} else if (this.state !== STATE_DICT.END) {
|
||||
callback(this, 'partEnd')
|
||||
callback(this, 'end')
|
||||
} else if (this.state != S.END) {
|
||||
return new Error(
|
||||
'MultipartParser.end(): stream ended unexpectedly: ' + this.explain()
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
explain() {
|
||||
return 'state = ' + stateToString(this.state)
|
||||
}
|
||||
MultipartParser.prototype.explain = function() {
|
||||
return 'state = ' + MultipartParser.stateToString(this.state)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,56 +1,17 @@
|
|||
/**
|
||||
* {}
|
||||
* @author yutent<yutent.io@gmail.com>
|
||||
* @date 2023/10/27 14:23:22
|
||||
*/
|
||||
import { EventEmitter } from 'events'
|
||||
import util from 'util'
|
||||
|
||||
import { EventEmitter } from 'node:events'
|
||||
import File from './file.js'
|
||||
|
||||
export class OctetParser extends EventEmitter {
|
||||
#file = null
|
||||
#byteLen = 0
|
||||
#wroteLen = 0
|
||||
|
||||
constructor(name, type, path) {
|
||||
super()
|
||||
|
||||
this.#file = new File({ path, name, type })
|
||||
this.#file.open()
|
||||
export function OctetParser() {
|
||||
EventEmitter.call(this)
|
||||
}
|
||||
|
||||
initLength(length) {
|
||||
this.#byteLen = length
|
||||
util.inherits(OctetParser, EventEmitter)
|
||||
|
||||
OctetParser.prototype.write = function(buffer) {
|
||||
this.emit('data', buffer)
|
||||
return buffer.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 EmptyParser extends EventEmitter {
|
||||
write() {}
|
||||
|
||||
end() {
|
||||
OctetParser.prototype.end = function() {
|
||||
this.emit('end')
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,27 @@
|
|||
// 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()
|
||||
}
|
||||
}
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
/**
|
||||
* {}
|
||||
* @author yutent<yutent.io@gmail.com>
|
||||
* @date 2023/10/27 12:14:05
|
||||
*/
|
||||
|
||||
import { parse } from 'node:querystring'
|
||||
import { EventEmitter } from 'node:events'
|
||||
|
||||
export class UrlencodedParser extends EventEmitter {
|
||||
#buff = Buffer.from('')
|
||||
|
||||
write(buffer) {
|
||||
this.#buff = Buffer.concat([this.#buff, buffer])
|
||||
}
|
||||
|
||||
end() {
|
||||
let data = this.#buff.toString()
|
||||
let fields = parse(data)
|
||||
|
||||
this.#buff = null
|
||||
|
||||
this.emit('field', fields)
|
||||
this.emit('end')
|
||||
}
|
||||
}
|
||||
|
|
@ -1,14 +1,13 @@
|
|||
{
|
||||
"name": "@gm5/request",
|
||||
"version": "2.0.0",
|
||||
"description": "对Http的Request进一步封装, 提供常用的API",
|
||||
"version": "1.2.8",
|
||||
"description": "对Http的request进一步封装, 提供常用的API",
|
||||
"main": "index.js",
|
||||
"author": "yutent",
|
||||
"type": "module",
|
||||
"keywords": [
|
||||
"five",
|
||||
"gmf",
|
||||
"gm5",
|
||||
"node-five",
|
||||
"five.js",
|
||||
"fivejs",
|
||||
"request",
|
||||
|
|
|
|||
Loading…
Reference in New Issue