@wireapp/api-client 27.3.1 → 27.3.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/lib/asset/AssetAPI.js
CHANGED
|
@@ -156,7 +156,7 @@ class AssetAPI {
|
|
|
156
156
|
}
|
|
157
157
|
const handleRequest = async () => {
|
|
158
158
|
try {
|
|
159
|
-
const response = await this.client.sendRequest(config
|
|
159
|
+
const response = await this.client.sendRequest(config);
|
|
160
160
|
return {
|
|
161
161
|
buffer: response.data,
|
|
162
162
|
mimeType: response.headers['content-type'],
|
|
@@ -196,7 +196,7 @@ class AssetAPI {
|
|
|
196
196
|
}
|
|
197
197
|
const handleRequest = async () => {
|
|
198
198
|
try {
|
|
199
|
-
const response = await this.client.sendRequest(config
|
|
199
|
+
const response = await this.client.sendRequest(config);
|
|
200
200
|
return {
|
|
201
201
|
buffer: response.data,
|
|
202
202
|
mimeType: response.headers['content-type'],
|
package/lib/http/HttpClient.d.ts
CHANGED
|
@@ -25,7 +25,7 @@ export declare class HttpClient extends EventEmitter {
|
|
|
25
25
|
getBaseUrl(): string;
|
|
26
26
|
useVersion(version: number): void;
|
|
27
27
|
private updateConnectionState;
|
|
28
|
-
_sendRequest<T>(config: AxiosRequestConfig,
|
|
28
|
+
_sendRequest<T>(config: AxiosRequestConfig, isFirstTry?: boolean): Promise<AxiosResponse<T>>;
|
|
29
29
|
static isAxiosError(errorCandidate: any): errorCandidate is AxiosError;
|
|
30
30
|
static isBackendError(errorCandidate: any): errorCandidate is AxiosError<BackendError> & {
|
|
31
31
|
response: BackendError;
|
|
@@ -44,7 +44,7 @@ export declare class HttpClient extends EventEmitter {
|
|
|
44
44
|
* @param {string} clientId - id of the client with which the new login session will be associated
|
|
45
45
|
*/
|
|
46
46
|
associateClientWithSession(clientId: string): Promise<AccessTokenData>;
|
|
47
|
-
sendRequest<T>(config: AxiosRequestConfig,
|
|
47
|
+
sendRequest<T>(config: AxiosRequestConfig, isSynchronousRequest?: boolean): Promise<AxiosResponse<T>>;
|
|
48
48
|
sendJSON<T>(config: AxiosRequestConfig, isSynchronousRequest?: boolean): Promise<AxiosResponse<T>>;
|
|
49
49
|
sendXML<T>(config: AxiosRequestConfig): Promise<AxiosResponse<T>>;
|
|
50
50
|
sendProtocolBuffer<T>(config: AxiosRequestConfig, isSynchronousRequest?: boolean): Promise<AxiosResponse<T>>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HttpClient.d.ts","sourceRoot":"","sources":["../../src/http/HttpClient.ts"],"names":[],"mappings":"AAmBA,OAAc,EAAC,UAAU,EAA+B,kBAAkB,EAAE,aAAa,EAAC,MAAM,OAAO,CAAC;AAKxG,OAAO,EAAC,YAAY,EAAC,MAAM,QAAQ,CAAC;AAKpC,OAAO,EACL,eAAe,EACf,gBAAgB,EAEhB,iBAAiB,EACjB,kBAAkB,EAEnB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAC,MAAM,EAAC,MAAM,WAAW,CAAC;AACjC,OAAO,EAAC,YAAY,EAAsB,eAAe,EAA0B,MAAM,UAAU,CAAC;AAIpG,aAAK,KAAK;IACR,0BAA0B,gDAAgD;IAC1E,gBAAgB,sCAAsC;CACvD;AAED,MAAM,WAAW,UAAU;IACzB,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,0BAA0B,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,eAAe,KAAK,IAAI,GAAG,IAAI,CAAC;IAE9F,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,gBAAgB,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,iBAAiB,GAAG,kBAAkB,KAAK,IAAI,GAAG,IAAI,CAAC;CAC5G;AAID,qBAAa,UAAW,SAAQ,YAAY;IAUxC,OAAO,CAAC,QAAQ,CAAC,MAAM;IAChB,gBAAgB,EAAE,gBAAgB;IAV3C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAgB;IACvC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAiB;IACxC,OAAO,CAAC,eAAe,CAAkB;IACzC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAgB;IAC7C,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAgB;IAC7C,gBAAuB,KAAK,eAAS;IACrC,OAAO,CAAC,aAAa,CAAM;gBAGR,MAAM,EAAE,MAAM,EACxB,gBAAgB,EAAE,gBAAgB;IAmDpC,UAAU;IAIV,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAIxC,OAAO,CAAC,qBAAqB;IAOhB,YAAY,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"HttpClient.d.ts","sourceRoot":"","sources":["../../src/http/HttpClient.ts"],"names":[],"mappings":"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"}
|
package/lib/http/HttpClient.js
CHANGED
|
@@ -129,21 +129,14 @@ class HttpClient extends events_1.EventEmitter {
|
|
|
129
129
|
this.emit(HttpClient.TOPIC.ON_CONNECTION_STATE_CHANGE, this.connectionState);
|
|
130
130
|
}
|
|
131
131
|
}
|
|
132
|
-
async _sendRequest(config,
|
|
132
|
+
async _sendRequest(config, isFirstTry = true) {
|
|
133
133
|
if (this.accessTokenStore.accessToken) {
|
|
134
|
+
// TODO: remove tokenAsParam
|
|
134
135
|
const { token_type, access_token } = this.accessTokenStore.accessToken;
|
|
135
|
-
|
|
136
|
-
config.
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
};
|
|
140
|
-
}
|
|
141
|
-
else {
|
|
142
|
-
config.headers = {
|
|
143
|
-
...config.headers,
|
|
144
|
-
Authorization: `${token_type} ${access_token}`,
|
|
145
|
-
};
|
|
146
|
-
}
|
|
136
|
+
config.headers = {
|
|
137
|
+
...config.headers,
|
|
138
|
+
Authorization: `${token_type} ${access_token}`,
|
|
139
|
+
};
|
|
147
140
|
}
|
|
148
141
|
try {
|
|
149
142
|
const response = await this.client.request({
|
|
@@ -163,7 +156,7 @@ class HttpClient extends events_1.EventEmitter {
|
|
|
163
156
|
config['axios-retry'] = {
|
|
164
157
|
retries: 0,
|
|
165
158
|
};
|
|
166
|
-
return this._sendRequest(config,
|
|
159
|
+
return this._sendRequest(config, false);
|
|
167
160
|
};
|
|
168
161
|
const hasAccessToken = !!this.accessTokenStore?.accessToken;
|
|
169
162
|
if (axios_1.default.isAxiosError(error) && error.response?.status === http_1.StatusCode.UNAUTHORIZED) {
|
|
@@ -243,10 +236,10 @@ class HttpClient extends events_1.EventEmitter {
|
|
|
243
236
|
const newToken = await this.postAccess(storedToken, clientId);
|
|
244
237
|
return this.accessTokenStore.updateToken(newToken);
|
|
245
238
|
}
|
|
246
|
-
async sendRequest(config,
|
|
239
|
+
async sendRequest(config, isSynchronousRequest = false) {
|
|
247
240
|
const promise = isSynchronousRequest
|
|
248
|
-
? this.requestQueue.add(() => this._sendRequest(config
|
|
249
|
-
: this._sendRequest(config
|
|
241
|
+
? this.requestQueue.add(() => this._sendRequest(config))
|
|
242
|
+
: this._sendRequest(config);
|
|
250
243
|
try {
|
|
251
244
|
return await promise;
|
|
252
245
|
}
|
|
@@ -255,7 +248,7 @@ class HttpClient extends events_1.EventEmitter {
|
|
|
255
248
|
// It will be retried after a (growing) delay
|
|
256
249
|
const isTooManyRequestsError = axios_1.default.isAxiosError(error) && error.response?.status === 420;
|
|
257
250
|
if (isTooManyRequestsError) {
|
|
258
|
-
return this.backOffQueue.add(() => this._sendRequest(config
|
|
251
|
+
return this.backOffQueue.add(() => this._sendRequest(config));
|
|
259
252
|
}
|
|
260
253
|
throw error;
|
|
261
254
|
}
|
|
@@ -272,28 +265,28 @@ class HttpClient extends events_1.EventEmitter {
|
|
|
272
265
|
'Content-Type': http_1.ContentType.APPLICATION_JSON,
|
|
273
266
|
'Content-Encoding': shouldGzipData ? 'gzip' : config.headers?.['Content-Encoding'],
|
|
274
267
|
};
|
|
275
|
-
return this.sendRequest(config,
|
|
268
|
+
return this.sendRequest(config, isSynchronousRequest);
|
|
276
269
|
}
|
|
277
270
|
sendXML(config) {
|
|
278
271
|
config.headers = {
|
|
279
272
|
...config.headers,
|
|
280
273
|
'Content-Type': http_1.ContentType.APPLICATION_XML,
|
|
281
274
|
};
|
|
282
|
-
return this.sendRequest(config, false
|
|
275
|
+
return this.sendRequest(config, false);
|
|
283
276
|
}
|
|
284
277
|
sendProtocolBuffer(config, isSynchronousRequest = false) {
|
|
285
278
|
config.headers = {
|
|
286
279
|
...config.headers,
|
|
287
280
|
'Content-Type': http_1.ContentType.APPLICATION_PROTOBUF,
|
|
288
281
|
};
|
|
289
|
-
return this.sendRequest(config,
|
|
282
|
+
return this.sendRequest(config, isSynchronousRequest);
|
|
290
283
|
}
|
|
291
284
|
sendProtocolMls(config, isSynchronousRequest = false) {
|
|
292
285
|
config.headers = {
|
|
293
286
|
...config.headers,
|
|
294
287
|
'Content-Type': http_1.ContentType.MESSAGES_MLS,
|
|
295
288
|
};
|
|
296
|
-
return this.sendRequest(config,
|
|
289
|
+
return this.sendRequest(config, isSynchronousRequest);
|
|
297
290
|
}
|
|
298
291
|
}
|
|
299
292
|
exports.HttpClient = HttpClient;
|
|
@@ -127,7 +127,7 @@ class MemberAPI {
|
|
|
127
127
|
};
|
|
128
128
|
const handleRequest = async () => {
|
|
129
129
|
try {
|
|
130
|
-
const response = await this.client.sendRequest(config
|
|
130
|
+
const response = await this.client.sendRequest(config);
|
|
131
131
|
return {
|
|
132
132
|
buffer: response.data,
|
|
133
133
|
mimeType: response.headers['content-type'],
|
package/package.json
CHANGED
|
@@ -16,8 +16,8 @@
|
|
|
16
16
|
"@wireapp/commons": "^5.2.10",
|
|
17
17
|
"@wireapp/priority-queue": "^2.1.8",
|
|
18
18
|
"@wireapp/protocol-messaging": "1.49.0",
|
|
19
|
-
"axios": "1.7.
|
|
20
|
-
"axios-retry": "4.
|
|
19
|
+
"axios": "1.7.3",
|
|
20
|
+
"axios-retry": "4.5.0",
|
|
21
21
|
"http-status-codes": "2.3.0",
|
|
22
22
|
"logdown": "3.3.1",
|
|
23
23
|
"pako": "2.1.0",
|
|
@@ -36,7 +36,7 @@
|
|
|
36
36
|
"@types/pako": "2",
|
|
37
37
|
"@types/spark-md5": "3.0.4",
|
|
38
38
|
"@types/tough-cookie": "4.0.5",
|
|
39
|
-
"@types/ws": "8.5.
|
|
39
|
+
"@types/ws": "8.5.12",
|
|
40
40
|
"@wireapp/store-engine": "^5.1.8",
|
|
41
41
|
"@wireapp/store-engine-fs": "^3.1.8",
|
|
42
42
|
"browser-sync": "3.0.2",
|
|
@@ -66,6 +66,6 @@
|
|
|
66
66
|
"watch": "webpack serve --config webpack.browser.js",
|
|
67
67
|
"prepare": "yarn dist"
|
|
68
68
|
},
|
|
69
|
-
"version": "27.3.
|
|
70
|
-
"gitHead": "
|
|
69
|
+
"version": "27.3.3",
|
|
70
|
+
"gitHead": "bc148b42b553167e0e450dc42b08665e6cc95778"
|
|
71
71
|
}
|