Skip to content

get函数支持配置超时时间 #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.

Sign up for GitHub

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

Open
imseon wants to merge 3 commits into
base: master
Choose a base branch
from
Open

get函数支持配置超时时间 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ec2e8fa
get函数支持配置超时时间
Feb 19, 2016
f1a15a0
处理超时错误
Feb 19, 2016
743d9d4
添加超时时间测试用例
Mar 24, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions lib/get.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,26 @@ var request = require("request");
var auth = require('node-weixin-auth');
var settings = require('node-weixin-settings');

var DEFAULT_TIMEOUT = 10 * 1000;

module.exports = function get(app, url, params, cb) {
auth.determine(app, function () {
settings.get(app.id, 'auth', function(authData) {
params.access_token = authData.accessToken;
url = url + util.toParam(params);
request(url, function (error, response, body) {
if (!error && response.statusCode === 200) {
//Return false if succeeded, else true
cb(false, JSON.parse(body));
} else {
cb(true, {message: body});
}
settings.get(app.id,'request',function (requestData) {
Copy link
Member

@calidion calidion Feb 24, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

app.id,'request',function (
=>
app.id, 'request', function(

requestData = requestData || {};
requestData.timeout = requestData.timeout || DEFAULT_TIMEOUT;
request(url, requestData, function (error, response, body) {
if (!error && response.statusCode === 200) {
//Return false if succeeded, else true
cb(false, JSON.parse(body));
} else if (error) {
cb(true, {message: String(error)});
} else {
cb(true, {message: body});
}
});
});
});

Expand Down
18 changes: 18 additions & 0 deletions test/test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
var assert = require('assert');
var nodeWeixinUser = require('../');
var validator = require("validator");
var settings = require('node-weixin-settings');

var app = {
id: process.env.APP_ID,
Expand Down Expand Up @@ -137,5 +138,22 @@ describe('node-weixin-user node module', function () {
});
});

it('should be timeout to get', function (done) {
var get = require('../lib/get');
settings.set(app.id,'request',{
timeout:1
},function(){
get(app, 'https://you.abc.cc.com/', {
}, function(error,data) {
assert.equal(data.message,'Error: ETIMEDOUT');
settings.set(app.id,'request',{
timeout:null
},function(){
done();
});
});
});
});


});