rettiwt-api 6.1.3 → 6.1.4
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.
|
@@ -45,6 +45,7 @@ const Logging_1 = require("../../enums/Logging");
|
|
|
45
45
|
const FetchArgs_1 = require("../../models/args/FetchArgs");
|
|
46
46
|
const PostArgs_1 = require("../../models/args/PostArgs");
|
|
47
47
|
const AuthCredential_1 = require("../../models/auth/AuthCredential");
|
|
48
|
+
const TwitterError_1 = require("../../models/errors/TwitterError");
|
|
48
49
|
const AuthService_1 = require("../internal/AuthService");
|
|
49
50
|
const ErrorService_1 = require("../internal/ErrorService");
|
|
50
51
|
const LogService_1 = require("../internal/LogService");
|
|
@@ -296,8 +297,25 @@ class FetcherService {
|
|
|
296
297
|
};
|
|
297
298
|
// Introducing a delay
|
|
298
299
|
await this._wait();
|
|
300
|
+
// Getting the response body
|
|
301
|
+
const responseData = (await (0, axios_1.default)(config)).data;
|
|
302
|
+
// Check for Twitter API errors in response body
|
|
303
|
+
// Type guard to check if response contains errors
|
|
304
|
+
const potentialErrorResponse = responseData;
|
|
305
|
+
if (potentialErrorResponse.errors && Array.isArray(potentialErrorResponse.errors)) {
|
|
306
|
+
// Throw TwitterError using existing error class
|
|
307
|
+
const axiosError = {
|
|
308
|
+
response: {
|
|
309
|
+
data: { errors: potentialErrorResponse.errors },
|
|
310
|
+
status: 200,
|
|
311
|
+
},
|
|
312
|
+
message: potentialErrorResponse.errors[0]?.message ?? 'Twitter API Error',
|
|
313
|
+
status: 200,
|
|
314
|
+
};
|
|
315
|
+
throw new TwitterError_1.TwitterError(axiosError);
|
|
316
|
+
}
|
|
299
317
|
// Returning the reponse body
|
|
300
|
-
return
|
|
318
|
+
return responseData;
|
|
301
319
|
}
|
|
302
320
|
catch (err) {
|
|
303
321
|
// If it's an error 404, retry
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FetcherService.js","sourceRoot":"","sources":["../../../src/services/public/FetcherService.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+
|
|
1
|
+
{"version":3,"file":"FetcherService.js","sourceRoot":"","sources":["../../../src/services/public/FetcherService.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import axios, { isAxiosError } from 'axios';
|
|
1
|
+
import axios, { AxiosError, isAxiosError } from 'axios';
|
|
2
2
|
import { Cookie } from 'cookiejar';
|
|
3
3
|
import { JSDOM } from 'jsdom';
|
|
4
4
|
import { ClientTransaction } from 'x-client-transaction-id';
|
|
@@ -11,11 +11,13 @@ import { ResourceType } from '../../enums/Resource';
|
|
|
11
11
|
import { FetchArgs } from '../../models/args/FetchArgs';
|
|
12
12
|
import { PostArgs } from '../../models/args/PostArgs';
|
|
13
13
|
import { AuthCredential } from '../../models/auth/AuthCredential';
|
|
14
|
+
import { TwitterError } from '../../models/errors/TwitterError';
|
|
14
15
|
import { RettiwtConfig } from '../../models/RettiwtConfig';
|
|
15
16
|
import { IFetchArgs } from '../../types/args/FetchArgs';
|
|
16
17
|
import { IPostArgs } from '../../types/args/PostArgs';
|
|
17
18
|
import { ITransactionHeader } from '../../types/auth/TransactionHeader';
|
|
18
19
|
import { IErrorHandler } from '../../types/ErrorHandler';
|
|
20
|
+
import { IErrorData } from '../../types/raw/base/Error';
|
|
19
21
|
|
|
20
22
|
import { AuthService } from '../internal/AuthService';
|
|
21
23
|
import { ErrorService } from '../internal/ErrorService';
|
|
@@ -322,8 +324,27 @@ export class FetcherService {
|
|
|
322
324
|
// Introducing a delay
|
|
323
325
|
await this._wait();
|
|
324
326
|
|
|
327
|
+
// Getting the response body
|
|
328
|
+
const responseData = (await axios<T>(config)).data;
|
|
329
|
+
|
|
330
|
+
// Check for Twitter API errors in response body
|
|
331
|
+
// Type guard to check if response contains errors
|
|
332
|
+
const potentialErrorResponse = responseData as unknown as Partial<IErrorData>;
|
|
333
|
+
if (potentialErrorResponse.errors && Array.isArray(potentialErrorResponse.errors)) {
|
|
334
|
+
// Throw TwitterError using existing error class
|
|
335
|
+
const axiosError = {
|
|
336
|
+
response: {
|
|
337
|
+
data: { errors: potentialErrorResponse.errors },
|
|
338
|
+
status: 200,
|
|
339
|
+
},
|
|
340
|
+
message: potentialErrorResponse.errors[0]?.message ?? 'Twitter API Error',
|
|
341
|
+
status: 200,
|
|
342
|
+
} as AxiosError<IErrorData>;
|
|
343
|
+
throw new TwitterError(axiosError);
|
|
344
|
+
}
|
|
345
|
+
|
|
325
346
|
// Returning the reponse body
|
|
326
|
-
return
|
|
347
|
+
return responseData;
|
|
327
348
|
} catch (err) {
|
|
328
349
|
// If it's an error 404, retry
|
|
329
350
|
if (isAxiosError(err) && err.status === 404) {
|