@the-convocation/twitter-scraper 0.1.5 → 0.3.0

package/dist/_module.d.ts

@@ -1,6 +1,6 @@
 export { Profile } from './profile';
 export { Scraper } from './scraper';
 export { SearchMode } from './search';
-export { QueryProfilesResponse, QueryTweetsResponse } from './timeline';
+export { QueryProfilesResponse, QueryTweetsResponse } from './timeline-v1';
 export { Tweet } from './tweets';
 //# sourceMappingURL=_module.d.ts.map

package/dist/_module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"_module.d.ts","sourceRoot":"","sources":["../src/_module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AACxE,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC"}
+{"version":3,"file":"_module.d.ts","sourceRoot":"","sources":["../src/_module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAC3E,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC"}

package/dist/api.d.ts

@@ -11,8 +11,24 @@ export type RequestApiResult<T> = {
     success: false;
     err: Error;
 };
-type GotRequestMethod = 'get' | 'post';
-export declare function requestApi<T>(url: string, auth: TwitterAuth, method?: GotRequestMethod): Promise<RequestApiResult<T>>;
+export declare function requestApi<T>(url: string, auth: TwitterAuth, method?: 'GET' | 'POST'): Promise<RequestApiResult<T>>;
+export declare function addApiFeatures(o: object): {
+    rweb_lists_timeline_redesign_enabled: boolean;
+    responsive_web_graphql_exclude_directive_enabled: boolean;
+    verified_phone_label_enabled: boolean;
+    creator_subscriptions_tweet_preview_api_enabled: boolean;
+    responsive_web_graphql_timeline_navigation_enabled: boolean;
+    responsive_web_graphql_skip_user_profile_image_extensions_enabled: boolean;
+    tweetypie_unmention_optimization_enabled: boolean;
+    responsive_web_edit_tweet_api_enabled: boolean;
+    graphql_is_translatable_rweb_tweet_is_translatable_enabled: boolean;
+    view_counts_everywhere_api_enabled: boolean;
+    longform_notetweets_consumption_enabled: boolean;
+    tweet_awards_web_tipping_enabled: boolean;
+    freedom_of_speech_not_reach_fetch_enabled: boolean;
+    standardized_nudges_misinfo: boolean;
+    longform_notetweets_rich_text_read_enabled: boolean;
+    responsive_web_enhance_cards_enabled: boolean;
+};
 export declare function addApiParams(params: URLSearchParams, includeTweetReplies: boolean): URLSearchParams;
-export {};
 //# sourceMappingURL=api.d.ts.map

package/dist/api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../src/api.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AAGrC,eAAO,MAAM,WAAW,uHAC8F,CAAC;AACvH,eAAO,MAAM,YAAY,6GACmF,CAAC;AAE7G;;GAEG;AACH,MAAM,MAAM,gBAAgB,CAAC,CAAC,IAC1B;IAAE,OAAO,EAAE,IAAI,CAAC;IAAC,KAAK,EAAE,CAAC,CAAA;CAAE,GAC3B;IAAE,OAAO,EAAE,KAAK,CAAC;IAAC,GAAG,EAAE,KAAK,CAAA;CAAE,CAAC;AAEnC,KAAK,gBAAgB,GAAG,KAAK,GAAG,MAAM,CAAC;AAEvC,wBAAsB,UAAU,CAAC,CAAC,EAChC,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,WAAW,EACjB,MAAM,GAAE,gBAAwB,GAC/B,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAoC9B;AAED,wBAAgB,YAAY,CAC1B,MAAM,EAAE,eAAe,EACvB,mBAAmB,EAAE,OAAO,GAC3B,eAAe,CAoCjB"}
+{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../src/api.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AAMrC,eAAO,MAAM,WAAW,uHAC8F,CAAC;AACvH,eAAO,MAAM,YAAY,6GACmF,CAAC;AAE7G;;GAEG;AACH,MAAM,MAAM,gBAAgB,CAAC,CAAC,IAC1B;IAAE,OAAO,EAAE,IAAI,CAAC;IAAC,KAAK,EAAE,CAAC,CAAA;CAAE,GAC3B;IAAE,OAAO,EAAE,KAAK,CAAC;IAAC,GAAG,EAAE,KAAK,CAAA;CAAE,CAAC;AAEnC,wBAAsB,UAAU,CAAC,CAAC,EAChC,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,WAAW,EACjB,MAAM,GAAE,KAAK,GAAG,MAAc,GAC7B,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAqC9B;AAED,wBAAgB,cAAc,CAAC,CAAC,EAAE,MAAM;;;;;;;;;;;;;;;;;EAoBvC;AAED,wBAAgB,YAAY,CAC1B,MAAM,EAAE,eAAe,EACvB,mBAAmB,EAAE,OAAO,GAC3B,eAAe,CAoCjB"}

package/dist/api.js

@@ -1,57 +1,73 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addApiParams = exports.requestApi = exports.bearerToken2 = exports.bearerToken = void 0;
-const got_scraping_1 = require("got-scraping");
+exports.addApiParams = exports.addApiFeatures = exports.requestApi = exports.bearerToken2 = exports.bearerToken = void 0;
 const errors_1 = require("./errors");
+const requests_1 = require("./requests");
+const headers_polyfill_1 = require("headers-polyfill");
+const cross_fetch_1 = __importDefault(require("cross-fetch"));
 exports.bearerToken = 'AAAAAAAAAAAAAAAAAAAAAPYXBAAAAAAACLXUNDekMxqa8h%2F40K4moUkGsoc%3DTYfbDKbT3jJPCEVnMYqilB28NHfOPqkca3qaAxGfsyKCs0wRbw';
 exports.bearerToken2 = 'AAAAAAAAAAAAAAAAAAAAANRILgAAAAAAnNwIzUejRCOuH5E6I8xnZz4puTs%3D1Zv7ttfk8LF81IUq16cHjhLTvJu4FA33AGWWjCpTnA';
-function requestApi(url, auth, method = 'get') {
-    return __awaiter(this, void 0, void 0, function* () {
-        const headers = {};
-        yield auth.installTo(headers, url);
-        let res;
-        try {
-            res = yield got_scraping_1.gotScraping[method]({
-                url,
-                headers,
-                cookieJar: auth.cookieJar(),
-            });
+async function requestApi(url, auth, method = 'GET') {
+    const headers = new headers_polyfill_1.Headers();
+    await auth.installTo(headers, url);
+    let res;
+    try {
+        res = await (0, cross_fetch_1.default)(url, {
+            method,
+            headers,
+        });
+    }
+    catch (err) {
+        if (!(err instanceof Error)) {
+            throw err;
         }
-        catch (err) {
-            if (!(err instanceof Error)) {
-                throw err;
-            }
-            return {
-                success: false,
-                err: new Error('Failed to perform request.'),
-            };
-        }
-        if (res.statusCode != 200) {
-            return {
-                success: false,
-                err: new errors_1.ApiError(res, `Response status: ${res.statusCode}`),
-            };
-        }
-        const value = JSON.parse(res.body);
-        if (res.headers['x-rate-limit-incoming'] == '0') {
-            auth.deleteToken();
-            return { success: true, value };
-        }
-        else {
-            return { success: true, value };
-        }
-    });
+        return {
+            success: false,
+            err: new Error('Failed to perform request.'),
+        };
+    }
+    await (0, requests_1.updateCookieJar)(auth.cookieJar(), res.headers);
+    if (!res.ok) {
+        return {
+            success: false,
+            err: new errors_1.ApiError(res, `Response status: ${res.status}`),
+        };
+    }
+    const value = await res.json();
+    if (res.headers.get('x-rate-limit-incoming') == '0') {
+        auth.deleteToken();
+        return { success: true, value };
+    }
+    else {
+        return { success: true, value };
+    }
 }
 exports.requestApi = requestApi;
+function addApiFeatures(o) {
+    return {
+        ...o,
+        rweb_lists_timeline_redesign_enabled: true,
+        responsive_web_graphql_exclude_directive_enabled: true,
+        verified_phone_label_enabled: false,
+        creator_subscriptions_tweet_preview_api_enabled: true,
+        responsive_web_graphql_timeline_navigation_enabled: true,
+        responsive_web_graphql_skip_user_profile_image_extensions_enabled: false,
+        tweetypie_unmention_optimization_enabled: true,
+        responsive_web_edit_tweet_api_enabled: true,
+        graphql_is_translatable_rweb_tweet_is_translatable_enabled: true,
+        view_counts_everywhere_api_enabled: true,
+        longform_notetweets_consumption_enabled: true,
+        tweet_awards_web_tipping_enabled: false,
+        freedom_of_speech_not_reach_fetch_enabled: true,
+        standardized_nudges_misinfo: true,
+        longform_notetweets_rich_text_read_enabled: true,
+        responsive_web_enhance_cards_enabled: false,
+    };
+}
+exports.addApiFeatures = addApiFeatures;
 function addApiParams(params, includeTweetReplies) {
     params.set('include_profile_interstitial_type', '1');
     params.set('include_blocking', '1');

package/dist/api.js.map

@@ -1 +1 @@
-{"version":3,"file":"api.js","sourceRoot":"","sources":["../src/api.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"api.js","sourceRoot":"","sources":["../src/api.ts"],"names":[],"mappings":";;;;;;AACA,qCAAoC;AACpC,yCAA6C;AAC7C,uDAA2C;AAC3C,8DAAgC;AAEnB,QAAA,WAAW,GACtB,oHAAoH,CAAC;AAC1G,QAAA,YAAY,GACvB,0GAA0G,CAAC;AAStG,KAAK,UAAU,UAAU,CAC9B,GAAW,EACX,IAAiB,EACjB,SAAyB,KAAK;IAE9B,MAAM,OAAO,GAAG,IAAI,0BAAO,EAAE,CAAC;IAC9B,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IAEnC,IAAI,GAAa,CAAC;IAClB,IAAI;QACF,GAAG,GAAG,MAAM,IAAA,qBAAK,EAAC,GAAG,EAAE;YACrB,MAAM;YACN,OAAO;SACR,CAAC,CAAC;KACJ;IAAC,OAAO,GAAG,EAAE;QACZ,IAAI,CAAC,CAAC,GAAG,YAAY,KAAK,CAAC,EAAE;YAC3B,MAAM,GAAG,CAAC;SACX;QAED,OAAO;YACL,OAAO,EAAE,KAAK;YACd,GAAG,EAAE,IAAI,KAAK,CAAC,4BAA4B,CAAC;SAC7C,CAAC;KACH;IAED,MAAM,IAAA,0BAAe,EAAC,IAAI,CAAC,SAAS,EAAE,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;IAErD,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE;QACX,OAAO;YACL,OAAO,EAAE,KAAK;YACd,GAAG,EAAE,IAAI,iBAAQ,CAAC,GAAG,EAAE,oBAAoB,GAAG,CAAC,MAAM,EAAE,CAAC;SACzD,CAAC;KACH;IAED,MAAM,KAAK,GAAM,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;IAClC,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,IAAI,GAAG,EAAE;QACnD,IAAI,CAAC,WAAW,EAAE,CAAC;QACnB,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;KACjC;SAAM;QACL,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;KACjC;AACH,CAAC;AAzCD,gCAyCC;AAED,SAAgB,cAAc,CAAC,CAAS;IACtC,OAAO;QACL,GAAG,CAAC;QACJ,oCAAoC,EAAE,IAAI;QAC1C,gDAAgD,EAAE,IAAI;QACtD,4BAA4B,EAAE,KAAK;QACnC,+CAA+C,EAAE,IAAI;QACrD,kDAAkD,EAAE,IAAI;QACxD,iEAAiE,EAAE,KAAK;QACxE,wCAAwC,EAAE,IAAI;QAC9C,qCAAqC,EAAE,IAAI;QAC3C,0DAA0D,EAAE,IAAI;QAChE,kCAAkC,EAAE,IAAI;QACxC,uCAAuC,EAAE,IAAI;QAC7C,gCAAgC,EAAE,KAAK;QACvC,yCAAyC,EAAE,IAAI;QAC/C,2BAA2B,EAAE,IAAI;QACjC,0CAA0C,EAAE,IAAI;QAChD,oCAAoC,EAAE,KAAK;KAC5C,CAAC;AACJ,CAAC;AApBD,wCAoBC;AAED,SAAgB,YAAY,CAC1B,MAAuB,EACvB,mBAA4B;IAE5B,MAAM,CAAC,GAAG,CAAC,mCAAmC,EAAE,GAAG,CAAC,CAAC;IACrD,MAAM,CAAC,GAAG,CAAC,kBAAkB,EAAE,GAAG,CAAC,CAAC;IACpC,MAAM,CAAC,GAAG,CAAC,oBAAoB,EAAE,GAAG,CAAC,CAAC;IACtC,MAAM,CAAC,GAAG,CAAC,qBAAqB,EAAE,GAAG,CAAC,CAAC;IACvC,MAAM,CAAC,GAAG,CAAC,uBAAuB,EAAE,GAAG,CAAC,CAAC;IACzC,MAAM,CAAC,GAAG,CAAC,mBAAmB,EAAE,GAAG,CAAC,CAAC;IACrC,MAAM,CAAC,GAAG,CAAC,gBAAgB,EAAE,GAAG,CAAC,CAAC;IAClC,MAAM,CAAC,GAAG,CAAC,uBAAuB,EAAE,GAAG,CAAC,CAAC;IACzC,MAAM,CAAC,GAAG,CAAC,4BAA4B,EAAE,GAAG,CAAC,CAAC;IAC9C,MAAM,CAAC,GAAG,CAAC,8BAA8B,EAAE,GAAG,CAAC,CAAC;IAChD,MAAM,CAAC,GAAG,CAAC,2BAA2B,EAAE,GAAG,CAAC,CAAC;IAC7C,MAAM,CAAC,GAAG,CAAC,aAAa,EAAE,GAAG,CAAC,CAAC;IAC/B,MAAM,CAAC,GAAG,CAAC,gBAAgB,EAAE,QAAQ,CAAC,CAAC;IACvC,MAAM,CAAC,GAAG,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC;IACjC,MAAM,CAAC,GAAG,CAAC,sBAAsB,EAAE,MAAM,CAAC,CAAC;IAC3C,MAAM,CAAC,GAAG,CAAC,oCAAoC,EAAE,OAAO,CAAC,CAAC;IAC1D,MAAM,CAAC,GAAG,CAAC,qBAAqB,EAAE,MAAM,CAAC,CAAC;IAC1C,MAAM,CAAC,GAAG,CAAC,qBAAqB,EAAE,GAAG,CAAC,CAAC;IACvC,MAAM,CAAC,GAAG,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;IACrC,MAAM,CAAC,GAAG,CAAC,4BAA4B,EAAE,MAAM,CAAC,CAAC;IACjD,MAAM,CAAC,GAAG,CAAC,mBAAmB,EAAE,MAAM,CAAC,CAAC;IACxC,MAAM,CAAC,GAAG,CAAC,kBAAkB,EAAE,MAAM,CAAC,CAAC;IACvC,MAAM,CAAC,GAAG,CAAC,uBAAuB,EAAE,MAAM,CAAC,CAAC;IAC5C,MAAM,CAAC,GAAG,CAAC,yBAAyB,EAAE,MAAM,CAAC,CAAC;IAC9C,MAAM,CAAC,GAAG,CAAC,gCAAgC,EAAE,MAAM,CAAC,CAAC;IACrD,MAAM,CAAC,GAAG,CAAC,qCAAqC,EAAE,MAAM,CAAC,CAAC;IAC1D,MAAM,CAAC,GAAG,CAAC,sCAAsC,EAAE,MAAM,CAAC,CAAC;IAC3D,MAAM,CAAC,GAAG,CAAC,kBAAkB,EAAE,MAAM,CAAC,CAAC;IACvC,MAAM,CAAC,GAAG,CAAC,qBAAqB,EAAE,MAAM,CAAC,CAAC;IAC1C,MAAM,CAAC,GAAG,CAAC,uBAAuB,EAAE,GAAG,mBAAmB,EAAE,CAAC,CAAC;IAC9D,MAAM,CAAC,GAAG,CACR,KAAK,EACL,iJAAiJ,CAClJ,CAAC;IACF,OAAO,MAAM,CAAC;AAChB,CAAC;AAvCD,oCAuCC"}

package/dist/auth-user.d.ts

@@ -1,4 +1,5 @@
 import { TwitterGuestAuth } from './auth';
+import { Headers } from 'headers-polyfill';
 /**
  * A user authentication token manager.
  */
@@ -7,9 +8,7 @@ export declare class TwitterUserAuth extends TwitterGuestAuth {
     isLoggedIn(): Promise<boolean>;
     login(username: string, password: string, email?: string): Promise<void>;
     logout(): Promise<void>;
-    installTo(headers: {
-        [key: string]: unknown;
-    }, url: string): Promise<void>;
+    installTo(headers: Headers, url: string): Promise<void>;
     private executeFlowTask;
 }
 //# sourceMappingURL=auth-user.d.ts.map

package/dist/auth-user.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"auth-user.d.ts","sourceRoot":"","sources":["../src/auth-user.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,QAAQ,CAAC;AA4C1C;;GAEG;AACH,qBAAa,eAAgB,SAAQ,gBAAgB;gBACvC,WAAW,EAAE,MAAM;IAIzB,UAAU,IAAI,OAAO,CAAC,OAAO,CAAC;IAa9B,KAAK,CACT,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,KAAK,CAAC,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,CAAC;IAgHV,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAcvB,SAAS,CACb,OAAO,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,EACnC,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,IAAI,CAAC;YAUF,eAAe;CAwE9B"}
+{"version":3,"file":"auth-user.d.ts","sourceRoot":"","sources":["../src/auth-user.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,QAAQ,CAAC;AAI1C,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AA2C3C;;GAEG;AACH,qBAAa,eAAgB,SAAQ,gBAAgB;gBACvC,WAAW,EAAE,MAAM;IAIzB,UAAU,IAAI,OAAO,CAAC,OAAO,CAAC;IAa9B,KAAK,CACT,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,KAAK,CAAC,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,CAAC;IAgHV,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAcvB,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;YAW/C,eAAe;CA2F9B"}

package/dist/auth-user.js

@@ -1,19 +1,15 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TwitterUserAuth = void 0;
-const got_scraping_1 = require("got-scraping");
 const auth_1 = require("./auth");
 const api_1 = require("./api");
 const tough_cookie_1 = require("tough-cookie");
+const requests_1 = require("./requests");
+const headers_polyfill_1 = require("headers-polyfill");
+const cross_fetch_1 = __importDefault(require("cross-fetch"));
 /**
  * A user authentication token manager.
  */
@@ -21,195 +17,199 @@ class TwitterUserAuth extends auth_1.TwitterGuestAuth {
     constructor(bearerToken) {
         super(bearerToken);
     }
-    isLoggedIn() {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            const res = yield (0, api_1.requestApi)('https://api.twitter.com/1.1/account/verify_credentials.json', this);
-            if (!res.success) {
-                return false;
-            }
-            const { value: verify } = res;
-            return verify && !((_a = verify.errors) === null || _a === void 0 ? void 0 : _a.length);
-        });
+    async isLoggedIn() {
+        const res = await (0, api_1.requestApi)('https://api.twitter.com/1.1/account/verify_credentials.json', this);
+        if (!res.success) {
+            return false;
+        }
+        const { value: verify } = res;
+        return verify && !verify.errors?.length;
     }
-    login(username, password, email) {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.updateGuestToken();
-            // Executes the potential acid step in the login flow
-            const executeFlowAcid = (ft) => this.executeFlowTask({
-                flow_token: ft,
-                subtask_inputs: [
-                    {
-                        subtask_id: 'LoginAcid',
-                        enter_text: {
-                            text: email,
-                            link: 'next_link',
-                        },
+    async login(username, password, email) {
+        await this.updateGuestToken();
+        // Executes the potential acid step in the login flow
+        const executeFlowAcid = (ft) => this.executeFlowTask({
+            flow_token: ft,
+            subtask_inputs: [
+                {
+                    subtask_id: 'LoginAcid',
+                    enter_text: {
+                        text: email,
+                        link: 'next_link',
                     },
-                ],
-            });
-            // Handles the result of a flow task
-            const handleFlowTokenResult = (p) => __awaiter(this, void 0, void 0, function* () {
-                const result = yield p;
-                const { status } = result;
-                if (status === 'error') {
-                    throw result.err;
-                }
-                else if (status === 'acid') {
-                    return yield handleFlowTokenResult(executeFlowAcid(result.flowToken));
-                }
-                else {
-                    return result.flowToken;
-                }
-            });
-            // Executes a flow subtask and handles the result
-            const executeFlowSubtask = (data) => handleFlowTokenResult(this.executeFlowTask(data));
-            yield executeFlowSubtask({
-                flow_name: 'login',
-                input_flow_data: {
-                    flow_context: {
-                        debug_overrides: {},
-                        start_location: {
-                            location: 'splash_screen',
-                        },
+                },
+            ],
+        });
+        // Handles the result of a flow task
+        const handleFlowTokenResult = async (p) => {
+            const result = await p;
+            const { status } = result;
+            if (status === 'error') {
+                throw result.err;
+            }
+            else if (status === 'acid') {
+                return await handleFlowTokenResult(executeFlowAcid(result.flowToken));
+            }
+            else {
+                return result.flowToken;
+            }
+        };
+        // Executes a flow subtask and handles the result
+        const executeFlowSubtask = (data) => handleFlowTokenResult(this.executeFlowTask(data));
+        await executeFlowSubtask({
+            flow_name: 'login',
+            input_flow_data: {
+                flow_context: {
+                    debug_overrides: {},
+                    start_location: {
+                        location: 'splash_screen',
                     },
                 },
-            })
-                .then((ft) => executeFlowSubtask({
-                flow_token: ft,
-                subtask_inputs: [
-                    {
-                        subtask_id: 'LoginJsInstrumentationSubtask',
-                        js_instrumentation: {
-                            response: '{}',
-                            link: 'next_link',
-                        },
+            },
+        })
+            .then((ft) => executeFlowSubtask({
+            flow_token: ft,
+            subtask_inputs: [
+                {
+                    subtask_id: 'LoginJsInstrumentationSubtask',
+                    js_instrumentation: {
+                        response: '{}',
+                        link: 'next_link',
                     },
-                ],
-            }))
-                .then((ft) => executeFlowSubtask({
-                flow_token: ft,
-                subtask_inputs: [
-                    {
-                        subtask_id: 'LoginEnterUserIdentifierSSO',
-                        settings_list: {
-                            setting_responses: [
-                                {
-                                    key: 'user_identifier',
-                                    response_data: {
-                                        text_data: { result: username },
-                                    },
+                },
+            ],
+        }))
+            .then((ft) => executeFlowSubtask({
+            flow_token: ft,
+            subtask_inputs: [
+                {
+                    subtask_id: 'LoginEnterUserIdentifierSSO',
+                    settings_list: {
+                        setting_responses: [
+                            {
+                                key: 'user_identifier',
+                                response_data: {
+                                    text_data: { result: username },
                                 },
-                            ],
-                            link: 'next_link',
-                        },
+                            },
+                        ],
+                        link: 'next_link',
                     },
-                ],
-            }))
-                .then((ft) => executeFlowSubtask({
-                flow_token: ft,
-                subtask_inputs: [
-                    {
-                        subtask_id: 'LoginEnterPassword',
-                        enter_password: {
-                            password,
-                            link: 'next_link',
-                        },
+                },
+            ],
+        }))
+            .then((ft) => executeFlowSubtask({
+            flow_token: ft,
+            subtask_inputs: [
+                {
+                    subtask_id: 'LoginEnterPassword',
+                    enter_password: {
+                        password,
+                        link: 'next_link',
                     },
-                ],
-            }))
-                .then((ft) => executeFlowSubtask({
-                flow_token: ft,
-                subtask_inputs: [
-                    {
-                        subtask_id: 'AccountDuplicationCheck',
-                        check_logged_in_account: {
-                            link: 'AccountDuplicationCheck_false',
-                        },
+                },
+            ],
+        }))
+            .then((ft) => executeFlowSubtask({
+            flow_token: ft,
+            subtask_inputs: [
+                {
+                    subtask_id: 'AccountDuplicationCheck',
+                    check_logged_in_account: {
+                        link: 'AccountDuplicationCheck_false',
                     },
-                ],
-            }));
-        });
+                },
+            ],
+        }));
     }
-    logout() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.isLoggedIn()) {
-                return;
-            }
-            yield (0, api_1.requestApi)('https://api.twitter.com/1.1/account/logout.json', this, 'post');
-            this.deleteToken();
-            this.jar = new tough_cookie_1.CookieJar();
-        });
+    async logout() {
+        if (!this.isLoggedIn()) {
+            return;
+        }
+        await (0, api_1.requestApi)('https://api.twitter.com/1.1/account/logout.json', this, 'POST');
+        this.deleteToken();
+        this.jar = new tough_cookie_1.CookieJar();
     }
-    installTo(headers, url) {
-        return __awaiter(this, void 0, void 0, function* () {
-            headers['authorization'] = `Bearer ${this.bearerToken}`;
-            const cookies = yield this.jar.getCookies(url);
-            const xCsrfToken = cookies.find((cookie) => cookie.key === 'ct0');
-            if (xCsrfToken) {
-                headers['x-csrf-token'] = xCsrfToken.value;
-            }
-        });
+    async installTo(headers, url) {
+        headers.set('authorization', `Bearer ${this.bearerToken}`);
+        headers.set('cookie', await this.jar.getCookieString(url));
+        const cookies = await this.jar.getCookies(url);
+        const xCsrfToken = cookies.find((cookie) => cookie.key === 'ct0');
+        if (xCsrfToken) {
+            headers.set('x-csrf-token', xCsrfToken.value);
+        }
     }
-    executeFlowTask(data) {
-        var _a, _b;
-        return __awaiter(this, void 0, void 0, function* () {
-            const token = this.guestToken;
-            if (token == null) {
-                throw new Error('Authentication token is null or undefined.');
-            }
-            const res = yield got_scraping_1.gotScraping.post({
-                url: 'https://api.twitter.com/1.1/onboarding/task.json',
-                headers: {
-                    authorization: `Bearer ${this.bearerToken}`,
-                    'content-type': 'application/json',
-                    'User-Agent': 'Mozilla/5.0 (Linux; Android 11; Nokia G20) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.88 Mobile Safari/537.36',
-                    'x-guest-token': token,
-                    'x-twitter-auth-type': 'OAuth2Client',
-                    'x-twitter-active-user': 'yes',
-                    'x-twitter-client-language': 'en',
-                },
-                cookieJar: this.jar,
-                json: data,
-            });
-            if (res.statusCode != 200) {
-                return { status: 'error', err: new Error(res.body) };
+    async executeFlowTask(data) {
+        const onboardingTaskUrl = 'https://api.twitter.com/1.1/onboarding/task.json';
+        const token = this.guestToken;
+        if (token == null) {
+            throw new Error('Authentication token is null or undefined.');
+        }
+        const headers = new headers_polyfill_1.Headers({
+            authorization: `Bearer ${this.bearerToken}`,
+            cookie: await this.jar.getCookieString(onboardingTaskUrl),
+            'content-type': 'application/json',
+            'User-Agent': 'Mozilla/5.0 (Linux; Android 11; Nokia G20) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.88 Mobile Safari/537.36',
+            'x-guest-token': token,
+            'x-twitter-auth-type': 'OAuth2Client',
+            'x-twitter-active-user': 'yes',
+            'x-twitter-client-language': 'en',
+        });
+        const res = await (0, cross_fetch_1.default)(onboardingTaskUrl, {
+            method: 'POST',
+            headers: headers,
+            body: JSON.stringify(data),
+        });
+        await (0, requests_1.updateCookieJar)(this.jar, res.headers);
+        if (!res.ok) {
+            return { status: 'error', err: new Error(await res.text()) };
+        }
+        const flow = await res.json();
+        if (flow?.flow_token == null) {
+            return { status: 'error', err: new Error('flow_token not found.') };
+        }
+        if (flow.errors?.length) {
+            return {
+                status: 'error',
+                err: new Error(`Authentication error (${flow.errors[0].code}): ${flow.errors[0].message}`),
+            };
+        }
+        if (typeof flow.flow_token !== 'string') {
+            return {
+                status: 'error',
+                err: new Error('flow_token was not a string.'),
+            };
+        }
+        if (flow.subtasks?.length) {
+            if (flow.subtasks[0].subtask_id === 'LoginEnterAlternateIdentifierSubtask') {
+                return {
+                    status: 'error',
+                    err: new Error('Authentication error: LoginEnterAlternateIdentifierSubtask'),
+                };
             }
-            const flow = JSON.parse(res.body);
-            if ((flow === null || flow === void 0 ? void 0 : flow.flow_token) == null) {
-                return { status: 'error', err: new Error('flow_token not found.') };
+            else if (flow.subtasks[0].subtask_id === 'LoginAcid') {
+                return {
+                    status: 'acid',
+                    flowToken: flow.flow_token,
+                };
             }
-            if ((_a = flow.errors) === null || _a === void 0 ? void 0 : _a.length) {
+            else if (flow.subtasks[0].subtask_id === 'LoginTwoFactorAuthChallenge') {
                 return {
                     status: 'error',
-                    err: new Error(`Authentication error (${flow.errors[0].code}): ${flow.errors[0].message}`),
+                    err: new Error('Authentication error: LoginTwoFactorAuthChallenge'),
                 };
             }
-            if (typeof flow.flow_token !== 'string') {
+            else if (flow.subtasks[0].subtask_id === 'DenyLoginSubtask') {
                 return {
                     status: 'error',
-                    err: new Error('flow_token was not a string.'),
+                    err: new Error('Authentication error: DenyLoginSubtask'),
                 };
             }
-            if ((_b = flow.subtasks) === null || _b === void 0 ? void 0 : _b.length) {
-                if (flow.subtasks[0].subtask_id === 'LoginEnterAlternateIdentifierSubtask') {
-                    return {
-                        status: 'error',
-                        err: new Error('Authentication error: LoginEnterAlternateIdentifierSubtask'),
-                    };
-                }
-                else if (flow.subtasks[0].subtask_id === 'LoginAcid') {
-                    return {
-                        status: 'acid',
-                        flowToken: flow.flow_token,
-                    };
-                }
-            }
-            return {
-                status: 'success',
-                flowToken: flow.flow_token,
-            };
-        });
+        }
+        return {
+            status: 'success',
+            flowToken: flow.flow_token,
+        };
     }
 }
 exports.TwitterUserAuth = TwitterUserAuth;