-
Notifications
You must be signed in to change notification settings - Fork 2
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
refactor: use async function and support koa@2 #4
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
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 |
---|---|---|
|
@@ -8,18 +8,18 @@ module.exports = options => { | |
options = options || {}; | ||
options.allowedMethods = options.allowedMethods || [ 'POST' ]; | ||
|
||
return function* overrideMethod(next) { | ||
const orginalMethod = this.request.method; | ||
if (options.allowedMethods.indexOf(orginalMethod) === -1) return yield next; | ||
return function overrideMethod(ctx, next) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. arrow function ? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. arrow function 就丢函数名了 There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. ok |
||
const orginalMethod = ctx.request.method; | ||
if (options.allowedMethods.indexOf(orginalMethod) === -1) return next(); | ||
|
||
let method; | ||
// body support | ||
const body = this.request.body; | ||
const body = ctx.request.body; | ||
if (body && body._method) { | ||
method = body._method.toUpperCase(); | ||
} else { | ||
// header support | ||
const header = this.get('x-http-method-override'); | ||
const header = ctx.get('x-http-method-override'); | ||
if (header) { | ||
method = header.toUpperCase(); | ||
} | ||
|
@@ -30,11 +30,11 @@ module.exports = options => { | |
// if you want to support other methods, | ||
// just create your own utility! | ||
if (methods.indexOf(method) === -1) { | ||
this.throw(400, `invalid overriden method: "${method}"`); | ||
ctx.throw(400, `invalid overriden method: "${method}"`); | ||
} | ||
this.request.method = method; | ||
ctx.request.method = method; | ||
} | ||
|
||
yield next; | ||
return next(); | ||
}; | ||
}; |
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 |
---|---|---|
|
@@ -7,8 +7,8 @@ | |
"index.js" | ||
], | ||
"scripts": { | ||
"test": "mocha -r co-mocha -R spec -t 5000 test/*.test.js", | ||
"cov": "nyc -r text-summary -r lcov npm test", | ||
"test": "egg-bin test", | ||
"cov": "egg-bin cov", | ||
"lint": "eslint test *.js", | ||
"ci": "npm run lint && npm run cov", | ||
"autod": "autod -w --prefix '^'" | ||
|
@@ -18,14 +18,12 @@ | |
}, | ||
"devDependencies": { | ||
"autod": "*", | ||
"co-mocha": "^1.2.0", | ||
"egg-bin": "^4.3.5", | ||
"egg-ci": "^1.7.0", | ||
"eslint": "^4.0.0", | ||
"eslint-config-egg": "^4.2.1", | ||
"koa": "1", | ||
"koa-body-parser": "1", | ||
"mocha": "*", | ||
"nyc": "^11.0.2", | ||
"koa": "2", | ||
"koa-bodyparser": "4", | ||
"supertest": "3" | ||
}, | ||
"homepage": "https:/node-modules/koa-override", | ||
|
@@ -44,10 +42,10 @@ | |
"rewrite" | ||
], | ||
"engines": { | ||
"node": ">= 4.0.0" | ||
"node": ">= 8.0.0" | ||
}, | ||
"ci": { | ||
"version": "4, 6, 8" | ||
"version": "8, 9" | ||
}, | ||
"author": "fengmk2 <[email protected]> (http://fengmk2.com)", | ||
"license": "MIT" | ||
|
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
.... 这个库名不会坑死人么
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
无所谓了,koa-bodyparser 是我们维护的,body-parser 估计是最早占了坑了