Skip to content

Commit 70c4a14

Browse files
wangxiaowangxiao
committed
Deprecated AV._request().
1 parent 8059cac commit 70c4a14

File tree

11 files changed

+90
-89
lines changed

11 files changed

+90
-89
lines changed

‎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
}

‎src/file.js‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ const _ = require('underscore');
77
const cos = require('./uploader/cos');
88
const qiniu = require('./uploader/qiniu');
99
const AVError = require('./error');
10+
const AVRequest = require('./request').request;
1011

1112
module.exports = function(AV) {
1213

@@ -607,7 +608,7 @@ module.exports = function(AV) {
607608
if (!this.id) {
608609
return AV.Promise.error('The file id is not eixsts.')._thenRunCallbacks(options);
609610
}
610-
var request = AV._request("files", null, this.id, 'DELETE', options && options.sessionToken);
611+
var request = AVRequest("files", null, this.id, 'DELETE', options && options.sessionToken);
611612
return request._thenRunCallbacks(options);
612613
},
613614

@@ -636,7 +637,7 @@ module.exports = function(AV) {
636637
this.attributes.metaData.mime_type = type;
637638
}
638639
this._qiniu_key = key;
639-
return AV._request(route, null, null, 'POST', data);
640+
return AVRequest(route, null, null, 'POST', data);
640641
},
641642

642643
/**
@@ -695,7 +696,7 @@ module.exports = function(AV) {
695696
mime_type: this._guessedType,
696697
url: this.attributes.url
697698
};
698-
this._previousSave = AV._request('files', this.attributes.name, null, 'post', data).then((response) => {
699+
this._previousSave = AVRequest('files', this.attributes.name, null, 'post', data).then((response) => {
699700
this.attributes.name = response.name;
700701
this.attributes.url = response.url;
701702
this.id = response.objectId;
@@ -717,14 +718,14 @@ module.exports = function(AV) {
717718
// 判断是否数据已经是 base64
718719
if (this.attributes.base64) {
719720
data.base64 = this.attributes.base64;
720-
return AV._request('files', this.attributes.name, null, 'POST', data);
721+
return AVRequest('files', this.attributes.name, null, 'POST', data);
721722
} else if (typeof global.Buffer !== "undefined" && global.Buffer.isBuffer(file)) {
722723
data.base64 = file.toString('base64');
723-
return AV._request('files', this.attributes.name, null, 'POST', data);
724+
return AVRequest('files', this.attributes.name, null, 'POST', data);
724725
} else {
725726
return readAsync(file).then(function(base64) {
726727
data.base64 = base64;
727-
return AV._request('files', this.attributes.name, null, 'POST', data);
728+
return AVRequest('files', this.attributes.name, null, 'POST', data);
728729
});
729730
}
730731
}).then((response) => {
@@ -760,7 +761,7 @@ module.exports = function(AV) {
760761
options = arguments[1];
761762
}
762763

763-
var request = AV._request('files', null, this.id, 'GET', fetchOptions);
764+
var request = AVRequest('files', null, this.id, 'GET', fetchOptions);
764765
return request.then((response) => {
765766
var value = AV.Object.prototype.parse(response);
766767
value.attributes = {

‎src/insight.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
const _ = require('underscore');
77
const AVError = require('./error');
8+
const AVRequest = require('./request').request;
89

910
module.exports = function(AV) {
1011
/**
@@ -46,7 +47,7 @@ module.exports = function(AV) {
4647
jobConfig: jobConfig,
4748
appId: AV.applicationId
4849
};
49-
var request = AV._request("bigquery", 'jobs', null, 'POST',
50+
var request = AVRequest("bigquery", 'jobs', null, 'POST',
5051
AV._encode(data, null, true));
5152

5253
return request.then(function(resp) {
@@ -129,7 +130,7 @@ module.exports = function(AV) {
129130
limit: this._limit
130131
};
131132

132-
var request = AV._request("bigquery", 'jobs', this.id, "GET",
133+
var request = AVRequest("bigquery", 'jobs', this.id, "GET",
133134
params);
134135
var self = this;
135136
return request.then(function(response) {

‎src/object.js‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
const _ = require('underscore');
77
const AVError = require('./error');
8+
const AVRequest = require('./request').request;
89

910
// AV.Object is analogous to the Java AVObject.
1011
// It also implements the same interface as a Backbone model.
@@ -808,7 +809,7 @@ module.exports = function(AV) {
808809
}
809810

810811
var self = this;
811-
var request = AV._request('classes', this.className, this.id, 'GET',
812+
var request = AVRequest('classes', this.className, this.id, 'GET',
812813
fetchOptions, options.sessionToken);
813814
return request.then(function(response) {
814815
self._finishFetch(self.parse(response), true);
@@ -962,7 +963,7 @@ module.exports = function(AV) {
962963
className = null;
963964
}
964965
//hook makeRequest in options.
965-
var makeRequest = options._makeRequest || AV._request;
966+
var makeRequest = options._makeRequest || AVRequest;
966967
var request = makeRequest(route, className, model.id, method, json, options.sessionToken);
967968

968969
request = request.then(function(resp) {
@@ -1013,7 +1014,7 @@ module.exports = function(AV) {
10131014
}
10141015

10151016
var request =
1016-
AV._request('classes', this.className, this.id, 'DELETE', null, options.sessionToken);
1017+
AVRequest('classes', this.className, this.id, 'DELETE', null, options.sessionToken);
10171018
return request.then(function() {
10181019
if (options.wait) {
10191020
triggerDestroy();
@@ -1283,7 +1284,7 @@ module.exports = function(AV) {
12831284
}
12841285
});
12851286
var request =
1286-
AV._request('classes', className, id, 'DELETE', null, options.sessionToken);
1287+
AVRequest('classes', className, id, 'DELETE', null, options.sessionToken);
12871288
return request._thenRunCallbacks(options);
12881289
};
12891290

@@ -1511,7 +1512,7 @@ module.exports = function(AV) {
15111512

15121513
// Save a single batch, whether previous saves succeeded or failed.
15131514
return readyToStart._continueWith(function() {
1514-
return AV._request("batch", null, null, "POST", {
1515+
return AVRequest("batch", null, null, "POST", {
15151516
requests: _.map(batch, function(object) {
15161517
var json = object._getSaveJSON();
15171518
var method = "POST";

‎src/push.js‎

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

6-
'use strict';
6+
const AVRequest = require('./request').request;
77

88
module.exports = function(AV) {
99
AV.Installation = AV.Object.extend("_Installation");
@@ -57,7 +57,7 @@ module.exports = function(AV) {
5757
throw "Both expiration_time and expiration_time_interval can't be set";
5858
}
5959

60-
var request = AV._request('push', null, null, 'POST', data);
60+
var request = AVRequest('push', null, null, 'POST', data);
6161
return request._thenRunCallbacks(options);
6262
};
6363
};

‎src/query.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
const _ = require('underscore');
77
const AVError = require('./error');
8+
const AVRequest = require('./request').request;
89

910
// AV.Query is a way to create a list of AV.Objects.
1011
module.exports = function(AV) {
@@ -154,7 +155,7 @@ module.exports = function(AV) {
154155
options = pvalues;
155156
}
156157

157-
var request = AV._request('cloudQuery', null, null, 'GET', params, options && options.sessionToken);
158+
var request = AVRequest('cloudQuery', null, null, 'GET', params, options && options.sessionToken);
158159
return request.then(function(response) {
159160
//query to process results.
160161
var query = new AV.Query(response.className);
@@ -251,7 +252,7 @@ module.exports = function(AV) {
251252
return obj;
252253
},
253254
_createRequest: function(params, options){
254-
return AV._request('classes', this.className, null, "GET",
255+
return AVRequest('classes', this.className, null, "GET",
255256
params || this.toJSON(), options && options.sessionToken);
256257
},
257258

‎src/request.js‎

Lines changed: 31 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ const debug = require('debug')('request');
88
const md5 = require('md5');
99
const Promise = require('./promise');
1010
const Cache = require('./cache');
11-
const AVError = require('./error').error;
11+
const AVError = require('./error');
12+
const AV = require('./av');
1213

1314
// 计算 X-LC-Sign 的签名方法
1415
const sign = (key, isMasterKey) => {
@@ -88,7 +89,7 @@ const ajax = (method, resourceUrl, data, headers = {}, onprogress) => {
8889
return promise;
8990
};
9091

91-
const setHeaders = (AV, sessionToken) => {
92+
const setHeaders = (sessionToken) => {
9293
const headers = {
9394
'X-LC-Id': AV.applicationId,
9495
'Content-Type': 'application/json;charset=UTF-8',
@@ -128,7 +129,7 @@ const setHeaders = (AV, sessionToken) => {
128129
return promise;
129130
};
130131

131-
const createApiUrl = (AV, route, className, objectId, method, dataObject) => {
132+
const createApiUrl = (route, className, objectId, method, dataObject) => {
132133
// TODO: 兼容 AV.serverURL 旧方式设置 API Host，后续去掉
133134
if (AV.serverURL) {
134135
AV._config.APIServerURL = AV.serverURL;
@@ -182,7 +183,7 @@ const cacheServerURL = (serverURL, ttl) => {
182183
};
183184

184185
// handle AV._request Error
185-
const handleError = (AV, res) => {
186+
const handleError = (res) => {
186187
const promise = new Promise();
187188
/**
188189
When API request need to redirect to the right location,
@@ -212,7 +213,7 @@ const handleError = (AV, res) => {
212213
return promise;
213214
};
214215

215-
const setServerUrlByRegion = (AV, region = 'cn') => {
216+
const setServerUrlByRegion = (region = 'cn') => {
216217
// 服务器请求的节点 host
217218
const API_HOST = {
218219
cn: 'https://api.leancloud.cn',
@@ -248,39 +249,37 @@ const setServerUrlByRegion = (AV, region = 'cn') => {
248249
}
249250
};
250251

251-
const init = (AV) => {
252-
/**
253-
* route is classes, users, login, etc.
254-
* objectId is null if there is no associated objectId.
255-
* method is the http method for the REST API.
256-
* dataObject is the payload as an object, or null if there is none.
257-
* @ignore
258-
*/
259-
AV._request = (route, className, objectId, method, dataObject = {}, sessionToken) => {
260-
if (!AV.applicationId) {
261-
throw new Error('You must specify your applicationId using AV.init()');
262-
}
252+
/**
253+
* route is classes, users, login, etc.
254+
* objectId is null if there is no associated objectId.
255+
* method is the http method for the REST API.
256+
* dataObject is the payload as an object, or null if there is none.
257+
* @ignore
258+
*/
259+
const AVRequest = (route, className, objectId, method, dataObject = {}, sessionToken) => {
260+
if (!AV.applicationId) {
261+
throw new Error('You must specify your applicationId using AV.init()');
262+
}
263263

264-
if (!AV.applicationKey && !AV.masterKey) {
265-
throw new Error('You must specify a AppKey using AV.init()');
266-
}
264+
if (!AV.applicationKey && !AV.masterKey) {
265+
throw new Error('You must specify a AppKey using AV.init()');
266+
}
267267

268-
checkRouter(route);
269-
const apiURL = createApiUrl(AV, route, className, objectId, method, dataObject);
268+
checkRouter(route);
269+
const apiURL = createApiUrl(route, className, objectId, method, dataObject);
270270

271-
return setHeaders(AV, sessionToken).then(
272-
headers => ajax(method, apiURL, dataObject, headers)
273-
.then(
274-
null,
275-
res => handleError(AV, res)
276-
.then(location => ajax(method, location, dataObject, headers))
277-
)
278-
);
279-
};
271+
return setHeaders(sessionToken).then(
272+
headers => ajax(method, apiURL, dataObject, headers)
273+
.then(
274+
null,
275+
res => handleError(res)
276+
.then(location => ajax(method, location, dataObject, headers))
277+
)
278+
);
280279
};
281280

282281
module.exports = {
283-
init,
284282
ajax,
283+
request: AVRequest,
285284
setServerUrlByRegion,
286285
};

‎src/search.js‎

Lines changed: 3 additions & 4 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
/**
@@ -125,7 +124,7 @@ module.exports = function(AV) {
125124
_highlights: null,
126125
_sortBuilder: null,
127126
_createRequest: function(params, options){
128-
return AV._request('search/select', null, null, 'GET',
127+
return AVRequest('search/select', null, null, 'GET',
129128
params || this.toJSON(), options && options.sessionToken);
130129
},
131130

0 commit comments

Comments
 (0)