Skip to content

Commit 165097d

Browse files
committed
Merge pull request #285 from wangxiao/node
Support API server response status 410 and redirect location.
2 parents eac51df + 603be05 commit 165097d

File tree

18 files changed

+569
-573
lines changed

18 files changed

+569
-573
lines changed

.eslintrc.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,6 @@ module.exports = {
88
'max-len': 0,
99
'no-console': [ 2, { allow: ['warn'] } ],
1010
'no-restricted-syntax': [ 0, 'ForInStatement' ],
11+
'no-new': 0,
1112
}
1213
};

src/av.js

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@ AV.Cache = require('./cache');
2222
AV._config = AV._config || {};
2323

2424
require('./utils').init(AV);
25-
require('./request').init(AV);
2625

27-
require('./error')(AV);
2826
require('./event')(AV);
2927
require('./geopoint')(AV);
3028
require('./acl')(AV);
@@ -40,3 +38,13 @@ require('./push')(AV);
4038
require('./status')(AV);
4139
require('./search')(AV);
4240
require('./insight')(AV);
41+
42+
// TODO: deprecated AV.Error()
43+
const AVError = require('./error');
44+
/**
45+
* @deprecated AV.Error() is deprecated, and will be removed in next release.
46+
*/
47+
AV.Error = (...args) => {
48+
console.warn('AV.Error() is deprecated, and will be removed in next release.');
49+
new AVError(...args);
50+
};

src/cache.js

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
1-
'use strict';
1+
/**
2+
* 每位工程师都有保持代码优雅的义务
3+
* Each engineer has a duty to keep the code elegant
4+
**/
5+
26
const storage = require('./localstorage');
37
const AV = require('./av');
48

59
const remove = exports.remove = storage.removeItemAsync.bind(storage);
610

7-
exports.get = (key) => {
8-
return storage.getItemAsync(`${AV.applicationId}/${key}`)
11+
exports.get = (key) =>
12+
storage.getItemAsync(`${AV.applicationId}/${key}`)
913
.then(cache => {
1014
try {
1115
cache = JSON.parse(cache);
@@ -21,12 +25,9 @@ exports.get = (key) => {
2125
}
2226
return null;
2327
});
24-
};
2528

2629
exports.set = (key, value, ttl) => {
27-
const cache = {
28-
value
29-
};
30+
const cache = { value };
3031
if (typeof ttl === 'number') {
3132
cache.expiredAt = Date.now() + ttl;
3233
}

src/cloudfunction.js

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
* Each engineer has a duty to keep the code elegant
44
**/
55

6-
'use strict';
7-
8-
var _ = require('underscore');
6+
const _ = require('underscore');
7+
const AVRequest = require('./request').request;
98

109
module.exports = function(AV) {
1110
/**
@@ -31,7 +30,7 @@ module.exports = function(AV) {
3130
* of the function.
3231
*/
3332
run: function(name, data, options) {
34-
var request = AV._request('functions', name, null, 'POST',
33+
var request = AVRequest('functions', name, null, 'POST',
3534
AV._encode(data, null, true), options && options.sessionToken);
3635

3736
return request.then(function(resp) {
@@ -53,7 +52,7 @@ module.exports = function(AV) {
5352
._thenRunCallbacks(options);
5453
}
5554

56-
return AV._request('call', name, null, 'POST', AV._encodeObjectOrArray(data)).then(function(resp) {
55+
return AVRequest('call', name, null, 'POST', AV._encodeObjectOrArray(data)).then(function(resp) {
5756
return AV._decode('', resp).result;
5857
})._thenRunCallbacks(options);
5958
},
@@ -70,7 +69,7 @@ module.exports = function(AV) {
7069
* @since 0.5.9
7170
*/
7271
getServerDate: function(options) {
73-
var request = AV._request("date", null, null, 'GET');
72+
var request = AVRequest("date", null, null, 'GET');
7473

7574
return request.then(function(resp) {
7675
return AV._decode(null, resp);
@@ -92,7 +91,7 @@ module.exports = function(AV) {
9291
if(!data.mobilePhoneNumber) {
9392
throw "Missing mobilePhoneNumber.";
9493
}
95-
var request = AV._request("requestSmsCode", null, null, 'POST',
94+
var request = AVRequest("requestSmsCode", null, null, 'POST',
9695
data);
9796
return request._thenRunCallbacks(options);
9897
},
@@ -116,7 +115,7 @@ module.exports = function(AV) {
116115
options = phone;
117116
}
118117

119-
var request = AV._request("verifySmsCode", code, null, 'POST',
118+
var request = AVRequest("verifySmsCode", code, null, 'POST',
120119
params);
121120
return request._thenRunCallbacks(options);
122121
}

0 commit comments

Comments
 (0)