-
Notifications
You must be signed in to change notification settings - Fork 36
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: support file mode on default stream mode (#30)
- Loading branch information
1 parent
ed2d003
commit 7eb534f
Showing
22 changed files
with
249 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,6 +3,7 @@ language: node_js | |
node_js: | ||
- '8' | ||
- '10' | ||
- '12' | ||
install: | ||
- npm i npminstall && npminstall | ||
script: | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
'use strict'; | ||
|
||
module.exports = async ctx => { | ||
ctx.body = { | ||
body: ctx.request.body, | ||
files: ctx.request.files, | ||
}; | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
'use strict'; | ||
|
||
module.exports = app => { | ||
app.post('/upload', app.controller.upload); | ||
app.post('/upload_file', app.controller.upload); | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
<form method="POST" action="/upload_file?_csrf={{ ctx.csrf | safe }}" enctype="multipart/form-data"> | ||
title: <input name="title" /> | ||
file1: <input name="file1" type="file" /> | ||
file2: <input name="file2" type="file" /> | ||
file3: <input name="file3" type="file" /> | ||
other: <input name="other" /> | ||
<button type="submit">上传</button> | ||
</form> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
'use strict'; | ||
|
||
exports.multipart = { | ||
mode: 'stream', | ||
fileModeMatch: /^\/upload_file$/ | ||
}; | ||
|
||
exports.keys = 'multipart'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
'use strict'; | ||
|
||
exports.logger = { | ||
consoleLevel: 'NONE', | ||
coreLogger: { | ||
// consoleLevel: 'DEBUG', | ||
}, | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
{ | ||
"name": "multipart-file-mode-demo" | ||
} |
8 changes: 8 additions & 0 deletions
8
test/fixtures/apps/wrong-fileModeMatch-value/config/config.default.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
'use strict'; | ||
|
||
exports.multipart = { | ||
mode: 'stream', | ||
fileModeMatch: 'foobar', | ||
}; | ||
|
||
exports.keys = 'multipart'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
{ | ||
"name": "multipart-wrong-mode-demo" | ||
} |
8 changes: 8 additions & 0 deletions
8
test/fixtures/apps/wrong-fileModeMatch/config/config.default.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
'use strict'; | ||
|
||
exports.multipart = { | ||
mode: 'file', | ||
fileModeMatch: /^\/upload$/, | ||
}; | ||
|
||
exports.keys = 'multipart'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
{ | ||
"name": "multipart-wrong-mode-demo" | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,103 @@ | ||
'use strict'; | ||
|
||
const assert = require('assert'); | ||
const formstream = require('formstream'); | ||
const urllib = require('urllib'); | ||
const path = require('path'); | ||
const fs = require('fs'); | ||
const mock = require('egg-mock'); | ||
const rimraf = require('mz-modules/rimraf'); | ||
|
||
describe('test/stream-mode-with-filematch.test.js', () => { | ||
let app; | ||
let server; | ||
let host; | ||
before(() => { | ||
app = mock.app({ | ||
baseDir: 'apps/fileModeMatch', | ||
}); | ||
return app.ready(); | ||
}); | ||
before(() => { | ||
server = app.listen(); | ||
host = 'http://127.0.0.1:' + server.address().port; | ||
}); | ||
after(() => { | ||
return rimraf(app.config.multipart.tmpdir); | ||
}); | ||
after(() => app.close()); | ||
after(() => server.close()); | ||
beforeEach(() => app.mockCsrf()); | ||
afterEach(mock.restore); | ||
|
||
it('should upload match file mode', async () => { | ||
const form = formstream(); | ||
form.field('foo', 'fengmk2').field('love', 'egg'); | ||
form.file('file1', __filename, 'foooooooo.js'); | ||
form.file('file2', __filename); | ||
// will ignore empty file | ||
form.buffer('file3', Buffer.from(''), '', 'application/octet-stream'); | ||
form.file('bigfile', path.join(__dirname, 'fixtures', 'bigfile.js')); | ||
// other form fields | ||
form.field('work', 'with Node.js'); | ||
|
||
const headers = form.headers(); | ||
const res = await urllib.request(host + '/upload_file', { | ||
method: 'POST', | ||
headers, | ||
stream: form, | ||
}); | ||
|
||
assert(res.status === 200); | ||
const data = JSON.parse(res.data); | ||
assert.deepStrictEqual(data.body, { foo: 'fengmk2', love: 'egg', work: 'with Node.js' }); | ||
assert(data.files.length === 3); | ||
assert(data.files[0].field === 'file1'); | ||
assert(data.files[0].filename === 'foooooooo.js'); | ||
assert(data.files[0].encoding === '7bit'); | ||
assert(data.files[0].mime === 'application/javascript'); | ||
assert(data.files[0].filepath.startsWith(app.config.multipart.tmpdir)); | ||
|
||
assert(data.files[1].field === 'file2'); | ||
assert(data.files[1].filename === 'stream-mode-with-filematch.test.js'); | ||
assert(data.files[1].encoding === '7bit'); | ||
assert(data.files[1].mime === 'application/javascript'); | ||
assert(data.files[1].filepath.startsWith(app.config.multipart.tmpdir)); | ||
|
||
assert(data.files[2].field === 'bigfile'); | ||
assert(data.files[2].filename === 'bigfile.js'); | ||
assert(data.files[2].encoding === '7bit'); | ||
assert(data.files[2].mime === 'application/javascript'); | ||
assert(data.files[2].filepath.startsWith(app.config.multipart.tmpdir)); | ||
}); | ||
|
||
it('should upload not match file mode', async () => { | ||
const form = formstream(); | ||
form.field('foo', 'fengmk2').field('love', 'egg'); | ||
form.file('file1', __filename, 'foooooooo.js'); | ||
form.file('file2', __filename); | ||
// will ignore empty file | ||
form.buffer('file3', Buffer.from(''), '', 'application/octet-stream'); | ||
form.file('bigfile', path.join(__dirname, 'fixtures', 'bigfile.js')); | ||
// other form fields | ||
form.field('work', 'with Node.js'); | ||
|
||
const headers = form.headers(); | ||
const res = await urllib.request(host + '/upload', { | ||
method: 'POST', | ||
headers, | ||
stream: form, | ||
}); | ||
|
||
assert(res.status === 200); | ||
const data = JSON.parse(res.data); | ||
assert.deepStrictEqual(data, { body: {} }); | ||
}); | ||
|
||
it('should register clean_tmpdir schedule', () => { | ||
// [egg-schedule]: register schedule /hello/egg-multipart/app/schedule/clean_tmpdir.js | ||
const logger = app.loggers.scheduleLogger; | ||
const content = fs.readFileSync(logger.options.file, 'utf8'); | ||
assert(/\[egg-schedule\]: register schedule .+clean_tmpdir\.js/.test(content)); | ||
}); | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters