@the-convocation/twitter-scraper 0.20.0 → 0.20.2

package/dist/default/cjs/index.js

@@ -271,14 +271,17 @@ class TwitterGuestAuth {
     }
     return new Date(this.guestCreatedAt);
   }
-  async installTo(headers) {
-    if (this.shouldUpdate()) {
-      await this.updateGuestToken();
-    }
-    if (this.guestToken) {
-      headers.set("x-guest-token", this.guestToken);
+  async installTo(headers, _url, bearerTokenOverride) {
+    const tokenToUse = bearerTokenOverride ?? this.bearerToken;
+    if (!bearerTokenOverride) {
+      if (this.shouldUpdate()) {
+        await this.updateGuestToken();
+      }
+      if (this.guestToken) {
+        headers.set("x-guest-token", this.guestToken);
+      }
     }
-    headers.set("authorization", `Bearer ${this.bearerToken}`);
+    headers.set("authorization", `Bearer ${tokenToUse}`);
     headers.set(
       "user-agent",
       "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/135.0.0.0 Safari/537.36"
@@ -518,13 +521,14 @@ async function generateTransactionId(url, fetchFn, method) {
 
 const log$1 = debug("twitter-scraper:api");
 const bearerToken = "AAAAAAAAAAAAAAAAAAAAAFQODgEAAAAAVHTp76lzh3rFzcHbmHVvQxYYpTw%3DckAlMINMjmCwxUcaXbAN4XqJVdgMJaHqNOFgPMK0zN1qLqLQCF";
+const bearerToken2 = "AAAAAAAAAAAAAAAAAAAAANRILgAAAAAAnNwIzUejRCOuH5E6I8xnZz4puTs%3D1Zv7ttfk8LF81IUq16cHjhLTvJu4FA33AGWWjCpTnA";
 async function jitter(maxMs) {
   const jitter2 = Math.random() * maxMs;
   await new Promise((resolve) => setTimeout(resolve, jitter2));
 }
-async function requestApi(url, auth, method = "GET", platform = new Platform(), headers = new headersPolyfill.Headers()) {
+async function requestApi(url, auth, method = "GET", platform = new Platform(), headers = new headersPolyfill.Headers(), bearerTokenOverride) {
   log$1(`Making ${method} request to ${url}`);
-  await auth.installTo(headers, url);
+  await auth.installTo(headers, url, bearerTokenOverride);
   await platform.randomizeCiphers();
   if (auth instanceof TwitterGuestAuth && auth.options?.experimental?.xClientTransactionId) {
     const transactionId = await generateTransactionId(
@@ -765,8 +769,9 @@ class TwitterUserAuth extends TwitterGuestAuth {
       this.jar = new toughCookie.CookieJar();
     }
   }
-  async installTo(headers) {
-    headers.set("authorization", `Bearer ${this.bearerToken}`);
+  async installTo(headers, _url, bearerTokenOverride) {
+    const tokenToUse = bearerTokenOverride ?? this.bearerToken;
+    headers.set("authorization", `Bearer ${tokenToUse}`);
     headers.set(
       "user-agent",
       "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/135.0.0.0 Safari/537.36"
@@ -1008,7 +1013,7 @@ class TwitterUserAuth extends TwitterGuestAuth {
       "x-twitter-active-user": "yes",
       "x-twitter-client-language": "en"
     });
-    await this.installTo(headers);
+    await this.installTo(headers, onboardingTaskUrl);
     if (this.options?.experimental?.xClientTransactionId) {
       const transactionId = await generateTransactionId(
         onboardingTaskUrl,
@@ -1185,7 +1190,14 @@ function parseProfile(legacy, isBlueVerified) {
 async function getProfile(username, auth) {
   const request = apiRequestFactory.createUserByScreenNameRequest();
   request.variables.screen_name = username;
-  const res = await requestApi(request.toRequestUrl(), auth);
+  const res = await requestApi(
+    request.toRequestUrl(),
+    auth,
+    "GET",
+    void 0,
+    void 0,
+    bearerToken2
+  );
   if (!res.success) {
     return res;
   }
@@ -2039,7 +2051,11 @@ async function getTrends(auth) {
   params.set("entity_tokens", "false");
   const res = await requestApi(
     `https://api.x.com/2/guide.json?${params.toString()}`,
-    auth
+    auth,
+    "GET",
+    void 0,
+    void 0,
+    bearerToken2
   );
   if (!res.success) {
     throw res.err;
@@ -2122,7 +2138,11 @@ async function fetchTweets(userId, maxTweets, cursor, auth) {
   }
   const res = await requestApi(
     userTweetsRequest.toRequestUrl(),
-    auth
+    auth,
+    "GET",
+    void 0,
+    void 0,
+    bearerToken2
   );
   if (!res.success) {
     throw res.err;
@@ -2268,7 +2288,11 @@ async function getTweet(id, auth) {
   tweetDetailRequest.variables.focalTweetId = id;
   const res = await requestApi(
     tweetDetailRequest.toRequestUrl(),
-    auth
+    auth,
+    "GET",
+    void 0,
+    void 0,
+    bearerToken2
   );
   if (!res.success) {
     throw res.err;
@@ -2284,7 +2308,11 @@ async function getTweetAnonymous(id, auth) {
   tweetResultByRestIdRequest.variables.tweetId = id;
   const res = await requestApi(
     tweetResultByRestIdRequest.toRequestUrl(),
-    auth
+    auth,
+    "GET",
+    void 0,
+    void 0,
+    bearerToken2
   );
   if (!res.success) {
     throw res.err;