scrapebadger 0.2.0 → 0.3.1

package/README.md

@@ -19,7 +19,8 @@ The official Node.js/TypeScript client library for the [ScrapeBadger](https://sc
 - **Full TypeScript Support** - Complete type definitions for all API endpoints
 - **Modern ESM & CommonJS** - Works with both module systems
 - **Async Iterators** - Automatic pagination with `for await...of` syntax
-- **Retry Logic** - Built-in exponential backoff for reliability
+- **Smart Rate Limit Handling** - Reads API rate limit headers and automatically throttles pagination to avoid hitting limits
+- **Resilient Retries** - 10 automatic retries with exponential backoff on server errors, with colored console warnings on each retry
 - **Error Handling** - Typed exceptions for different error scenarios
 - **Tree Shakeable** - Import only what you need
 
@@ -345,20 +346,45 @@ const client = new ScrapeBadger({
   // Required: Your API key (or use SCRAPEBADGER_API_KEY env var)
   apiKey: "your-api-key",
 
-  // Optional: Custom base URL (default: https://api.scrapebadger.com)
-  baseUrl: "https://api.scrapebadger.com",
+  // Optional: Custom base URL (default: https://scrapebadger.com)
+  baseUrl: "https://scrapebadger.com",
 
   // Optional: Request timeout in milliseconds (default: 30000)
   timeout: 30000,
 
-  // Optional: Maximum retry attempts (default: 3)
-  maxRetries: 3,
+  // Optional: Maximum retry attempts (default: 10)
+  maxRetries: 10,
 
   // Optional: Initial retry delay in milliseconds (default: 1000)
   retryDelay: 1000,
 });
 ```
 
+### Retry Behavior
+
+The SDK automatically retries requests that fail with server errors (5xx) or rate
+limits (429) using exponential backoff (1s, 2s, 4s, 8s, ...). Each retry prints a
+colored warning:
+
+```
+⚠ ScrapeBadger: 503 Service Unavailable — retrying in 4s (attempt 3/10)
+```
+
+### Rate Limit Aware Pagination
+
+When using `*All` pagination methods (e.g. `searchAll`, `getFollowersAll`), the SDK
+reads `X-RateLimit-Remaining` and `X-RateLimit-Reset` headers from each response.
+When remaining requests drop below 20% of your tier's limit, pagination automatically
+slows down to spread requests across the remaining window — preventing 429 errors:
+
+```
+⚠ ScrapeBadger: Rate limit: 25/300 remaining (resets in 42s), throttling pagination
+```
+
+This works transparently with all tier levels (Free: 60/min, Basic: 300/min,
+Pro: 1000/min, Enterprise: 5000/min).
+```
+
 ## API Reference
 
 ### Client

package/dist/{index-BbCkdZXy.d.cts → index-Cg0sNluO.d.cts}

@@ -27,6 +27,15 @@ interface ResolvedConfig {
  * Base HTTP client with retry logic and error handling.
  */
 
+interface RateLimit {
+    limit: number;
+    remaining: number;
+    reset: number;
+}
+interface ResponseWithHeaders<T> {
+    data: T;
+    rateLimit?: RateLimit;
+}
 interface RequestOptions {
     method?: "GET" | "POST" | "PUT" | "DELETE" | "PATCH";
     params?: Record<string, string | number | boolean | undefined>;
@@ -43,10 +52,22 @@ declare class BaseClient {
      * Make an HTTP request to the API.
      */
     request<T>(path: string, options?: RequestOptions): Promise<T>;
+    /**
+     * Make an HTTP request and return both data and rate limit headers.
+     */
+    requestWithHeaders<T>(path: string, options?: RequestOptions): Promise<ResponseWithHeaders<T>>;
+    /**
+     * Internal method that builds the request and executes it, returning data and rate limit info.
+     */
+    private requestRaw;
     /**
      * Execute request with exponential backoff retry logic.
      */
     private executeWithRetry;
+    /**
+     * Parse rate limit headers from an HTTP response.
+     */
+    private parseRateLimitHeaders;
     /**
      * Fetch with timeout support.
      */
@@ -64,6 +85,7 @@ declare class BaseClient {
 /**
  * Pagination utilities for the ScrapeBadger SDK.
  */
+
 /**
  * Response wrapper for paginated API responses.
  */
@@ -256,6 +278,26 @@ interface Tweet {
     username?: string;
     /** Author's display name */
     user_name?: string;
+    /** Author's profile image URL */
+    user_profile_image_url?: string;
+    /** Author's bio */
+    user_description?: string;
+    /** Author's location */
+    user_location?: string;
+    /** Author's website URL */
+    user_url?: string;
+    /** Author's follower count */
+    user_followers_count?: number;
+    /** Author's following count */
+    user_following_count?: number;
+    /** Author's tweet count */
+    user_tweet_count?: number;
+    /** Author's legacy verification status */
+    user_verified?: boolean;
+    /** Author's Twitter Blue verification status */
+    user_is_blue_verified?: boolean;
+    /** Author's account creation date */
+    user_created_at?: string;
     /** Number of likes */
     favorite_count: number;
     /** Number of retweets */

package/dist/{index-BbCkdZXy.d.ts → index-Cg0sNluO.d.ts}

@@ -27,6 +27,15 @@ interface ResolvedConfig {
  * Base HTTP client with retry logic and error handling.
  */
 
+interface RateLimit {
+    limit: number;
+    remaining: number;
+    reset: number;
+}
+interface ResponseWithHeaders<T> {
+    data: T;
+    rateLimit?: RateLimit;
+}
 interface RequestOptions {
     method?: "GET" | "POST" | "PUT" | "DELETE" | "PATCH";
     params?: Record<string, string | number | boolean | undefined>;
@@ -43,10 +52,22 @@ declare class BaseClient {
      * Make an HTTP request to the API.
      */
     request<T>(path: string, options?: RequestOptions): Promise<T>;
+    /**
+     * Make an HTTP request and return both data and rate limit headers.
+     */
+    requestWithHeaders<T>(path: string, options?: RequestOptions): Promise<ResponseWithHeaders<T>>;
+    /**
+     * Internal method that builds the request and executes it, returning data and rate limit info.
+     */
+    private requestRaw;
     /**
      * Execute request with exponential backoff retry logic.
      */
     private executeWithRetry;
+    /**
+     * Parse rate limit headers from an HTTP response.
+     */
+    private parseRateLimitHeaders;
     /**
      * Fetch with timeout support.
      */
@@ -64,6 +85,7 @@ declare class BaseClient {
 /**
  * Pagination utilities for the ScrapeBadger SDK.
  */
+
 /**
  * Response wrapper for paginated API responses.
  */
@@ -256,6 +278,26 @@ interface Tweet {
     username?: string;
     /** Author's display name */
     user_name?: string;
+    /** Author's profile image URL */
+    user_profile_image_url?: string;
+    /** Author's bio */
+    user_description?: string;
+    /** Author's location */
+    user_location?: string;
+    /** Author's website URL */
+    user_url?: string;
+    /** Author's follower count */
+    user_followers_count?: number;
+    /** Author's following count */
+    user_following_count?: number;
+    /** Author's tweet count */
+    user_tweet_count?: number;
+    /** Author's legacy verification status */
+    user_verified?: boolean;
+    /** Author's Twitter Blue verification status */
+    user_is_blue_verified?: boolean;
+    /** Author's account creation date */
+    user_created_at?: string;
     /** Number of likes */
     favorite_count: number;
     /** Number of retweets */

package/dist/index.d.cts

@@ -1,5 +1,5 @@
-import { B as BaseClient, T as TwitterClient, S as ScrapeBadgerConfig } from './index-BbCkdZXy.cjs';
-export { e as AccountRestrictedError, _ as ApiResponse, A as AuthenticationError, ae as BillingLog, af as BillingLogList, j as CommunitiesClient, J as Community, E as CommunityBanner, K as CommunityMember, F as CommunityRule, p as CommunityTweetType, C as ConflictError, ag as ConnectOptions, a6 as ConnectedEvent, a3 as CreateMonitorParams, ac as DeliveryLog, ad as DeliveryLogList, a9 as ErrorEvent, aj as FilterRuleCreate, ao as FilterRuleDeliveryLog, ap as FilterRuleDeliveryLogListResponse, am as FilterRuleListResponse, al as FilterRulePricingTier, aq as FilterRulePricingTiersResponse, ai as FilterRuleResponse, ah as FilterRuleStatus, ak as FilterRuleUpdate, an as FilterRuleValidateResponse, G as GeoClient, l as GeoSearchOptions, H as Hashtag, I as InsufficientCreditsError, g as IteratorOptions, D as List, $ as ListResponse, L as ListsClient, X as Location, M as Media, a0 as MonitorStatus, N as NotFoundError, P as PaginatedResponse, f as PaginationOptions, a7 as PingEvent, Z as Place, Y as PlaceTrends, r as Poll, q as PollOption, Q as QueryType, b as RateLimitError, R as ResolvedConfig, a as ScrapeBadgerError, c as ServerError, m as StreamClient, n as StreamEmitter, aa as StreamEvent, ab as StreamEventType, a1 as StreamMonitor, a2 as StreamMonitorList, a5 as StreamTweet, d as TimeoutError, O as Trend, o as TrendCategory, k as TrendsClient, w as Tweet, a8 as TweetEvent, u as TweetPlace, i as TweetsClient, a4 as UpdateMonitorParams, s as Url, x as User, y as UserAbout, z as UserIds, t as UserMention, U as UsersClient, V as ValidationError, W as WebSocketStreamError, h as collectAll, v as verifyWebhookSignature } from './index-BbCkdZXy.cjs';
+import { B as BaseClient, T as TwitterClient, S as ScrapeBadgerConfig } from './index-Cg0sNluO.cjs';
+export { e as AccountRestrictedError, _ as ApiResponse, A as AuthenticationError, ae as BillingLog, af as BillingLogList, j as CommunitiesClient, J as Community, E as CommunityBanner, K as CommunityMember, F as CommunityRule, p as CommunityTweetType, C as ConflictError, ag as ConnectOptions, a6 as ConnectedEvent, a3 as CreateMonitorParams, ac as DeliveryLog, ad as DeliveryLogList, a9 as ErrorEvent, aj as FilterRuleCreate, ao as FilterRuleDeliveryLog, ap as FilterRuleDeliveryLogListResponse, am as FilterRuleListResponse, al as FilterRulePricingTier, aq as FilterRulePricingTiersResponse, ai as FilterRuleResponse, ah as FilterRuleStatus, ak as FilterRuleUpdate, an as FilterRuleValidateResponse, G as GeoClient, l as GeoSearchOptions, H as Hashtag, I as InsufficientCreditsError, g as IteratorOptions, D as List, $ as ListResponse, L as ListsClient, X as Location, M as Media, a0 as MonitorStatus, N as NotFoundError, P as PaginatedResponse, f as PaginationOptions, a7 as PingEvent, Z as Place, Y as PlaceTrends, r as Poll, q as PollOption, Q as QueryType, b as RateLimitError, R as ResolvedConfig, a as ScrapeBadgerError, c as ServerError, m as StreamClient, n as StreamEmitter, aa as StreamEvent, ab as StreamEventType, a1 as StreamMonitor, a2 as StreamMonitorList, a5 as StreamTweet, d as TimeoutError, O as Trend, o as TrendCategory, k as TrendsClient, w as Tweet, a8 as TweetEvent, u as TweetPlace, i as TweetsClient, a4 as UpdateMonitorParams, s as Url, x as User, y as UserAbout, z as UserIds, t as UserMention, U as UsersClient, V as ValidationError, W as WebSocketStreamError, h as collectAll, v as verifyWebhookSignature } from './index-Cg0sNluO.cjs';
 import 'node:events';
 
 /**

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { B as BaseClient, T as TwitterClient, S as ScrapeBadgerConfig } from './index-BbCkdZXy.js';
-export { e as AccountRestrictedError, _ as ApiResponse, A as AuthenticationError, ae as BillingLog, af as BillingLogList, j as CommunitiesClient, J as Community, E as CommunityBanner, K as CommunityMember, F as CommunityRule, p as CommunityTweetType, C as ConflictError, ag as ConnectOptions, a6 as ConnectedEvent, a3 as CreateMonitorParams, ac as DeliveryLog, ad as DeliveryLogList, a9 as ErrorEvent, aj as FilterRuleCreate, ao as FilterRuleDeliveryLog, ap as FilterRuleDeliveryLogListResponse, am as FilterRuleListResponse, al as FilterRulePricingTier, aq as FilterRulePricingTiersResponse, ai as FilterRuleResponse, ah as FilterRuleStatus, ak as FilterRuleUpdate, an as FilterRuleValidateResponse, G as GeoClient, l as GeoSearchOptions, H as Hashtag, I as InsufficientCreditsError, g as IteratorOptions, D as List, $ as ListResponse, L as ListsClient, X as Location, M as Media, a0 as MonitorStatus, N as NotFoundError, P as PaginatedResponse, f as PaginationOptions, a7 as PingEvent, Z as Place, Y as PlaceTrends, r as Poll, q as PollOption, Q as QueryType, b as RateLimitError, R as ResolvedConfig, a as ScrapeBadgerError, c as ServerError, m as StreamClient, n as StreamEmitter, aa as StreamEvent, ab as StreamEventType, a1 as StreamMonitor, a2 as StreamMonitorList, a5 as StreamTweet, d as TimeoutError, O as Trend, o as TrendCategory, k as TrendsClient, w as Tweet, a8 as TweetEvent, u as TweetPlace, i as TweetsClient, a4 as UpdateMonitorParams, s as Url, x as User, y as UserAbout, z as UserIds, t as UserMention, U as UsersClient, V as ValidationError, W as WebSocketStreamError, h as collectAll, v as verifyWebhookSignature } from './index-BbCkdZXy.js';
+import { B as BaseClient, T as TwitterClient, S as ScrapeBadgerConfig } from './index-Cg0sNluO.js';
+export { e as AccountRestrictedError, _ as ApiResponse, A as AuthenticationError, ae as BillingLog, af as BillingLogList, j as CommunitiesClient, J as Community, E as CommunityBanner, K as CommunityMember, F as CommunityRule, p as CommunityTweetType, C as ConflictError, ag as ConnectOptions, a6 as ConnectedEvent, a3 as CreateMonitorParams, ac as DeliveryLog, ad as DeliveryLogList, a9 as ErrorEvent, aj as FilterRuleCreate, ao as FilterRuleDeliveryLog, ap as FilterRuleDeliveryLogListResponse, am as FilterRuleListResponse, al as FilterRulePricingTier, aq as FilterRulePricingTiersResponse, ai as FilterRuleResponse, ah as FilterRuleStatus, ak as FilterRuleUpdate, an as FilterRuleValidateResponse, G as GeoClient, l as GeoSearchOptions, H as Hashtag, I as InsufficientCreditsError, g as IteratorOptions, D as List, $ as ListResponse, L as ListsClient, X as Location, M as Media, a0 as MonitorStatus, N as NotFoundError, P as PaginatedResponse, f as PaginationOptions, a7 as PingEvent, Z as Place, Y as PlaceTrends, r as Poll, q as PollOption, Q as QueryType, b as RateLimitError, R as ResolvedConfig, a as ScrapeBadgerError, c as ServerError, m as StreamClient, n as StreamEmitter, aa as StreamEvent, ab as StreamEventType, a1 as StreamMonitor, a2 as StreamMonitorList, a5 as StreamTweet, d as TimeoutError, O as Trend, o as TrendCategory, k as TrendsClient, w as Tweet, a8 as TweetEvent, u as TweetPlace, i as TweetsClient, a4 as UpdateMonitorParams, s as Url, x as User, y as UserAbout, z as UserIds, t as UserMention, U as UsersClient, V as ValidationError, W as WebSocketStreamError, h as collectAll, v as verifyWebhookSignature } from './index-Cg0sNluO.js';
 import 'node:events';
 
 /**

package/dist/index.js

@@ -130,6 +130,19 @@ var BaseClient = class {
    * Make an HTTP request to the API.
    */
   async request(path, options = {}) {
+    const { data } = await this.requestRaw(path, options);
+    return data;
+  }
+  /**
+   * Make an HTTP request and return both data and rate limit headers.
+   */
+  async requestWithHeaders(path, options = {}) {
+    return this.requestRaw(path, options);
+  }
+  /**
+   * Internal method that builds the request and executes it, returning data and rate limit info.
+   */
+  async requestRaw(path, options = {}) {
     const { method = "GET", params, body, headers = {} } = options;
     const url = new URL(path, this.config.baseUrl);
     if (params) {
@@ -143,7 +156,7 @@ var BaseClient = class {
       "Content-Type": "application/json",
       Accept: "application/json",
       "X-API-Key": this.config.apiKey,
-      "User-Agent": "scrapebadger-node/0.1.0",
+      "User-Agent": "scrapebadger-node/0.3.1",
       ...headers
     };
     const fetchOptions = {
@@ -162,8 +175,10 @@ var BaseClient = class {
     let lastError;
     for (let attempt = 0; attempt <= this.config.maxRetries; attempt++) {
       try {
-        const response = await this.fetchWithTimeout(url, options);
-        return await this.handleResponse(response);
+        const httpResponse = await this.fetchWithTimeout(url, options);
+        const data = await this.handleResponse(httpResponse);
+        const rateLimit = this.parseRateLimitHeaders(httpResponse.headers);
+        return { data, rateLimit };
       } catch (error) {
         lastError = error;
         if (error instanceof ScrapeBadgerError && !(error instanceof RateLimitError)) {
@@ -173,18 +188,56 @@ var BaseClient = class {
           break;
         }
         const delay = this.config.retryDelay * Math.pow(2, attempt);
-        if (error instanceof RateLimitError && error.retryAfter) {
-          const retryDelay = (error.retryAfter - Date.now() / 1e3) * 1e3;
-          if (retryDelay > 0 && retryDelay < 6e4) {
-            await this.sleep(retryDelay);
-            continue;
+        const delaySec = Math.round(delay / 1e3);
+        const attemptNum = attempt + 1;
+        const maxRetries = this.config.maxRetries;
+        if (error instanceof RateLimitError) {
+          console.warn(
+            `\x1B[33m\u26A0 ScrapeBadger: 429 Rate Limited \u2014 retrying in ${delaySec}s (attempt ${attemptNum}/${maxRetries})\x1B[0m`
+          );
+          if (error.retryAfter) {
+            const retryDelay = (error.retryAfter - Date.now() / 1e3) * 1e3;
+            if (retryDelay > 0 && retryDelay < 6e4) {
+              await this.sleep(retryDelay);
+              continue;
+            }
           }
+        } else if (error instanceof TimeoutError) {
+          console.warn(
+            `\x1B[33m\u26A0 ScrapeBadger: TimeoutError \u2014 retrying in ${delaySec}s (attempt ${attemptNum}/${maxRetries})\x1B[0m`
+          );
+        } else if (error instanceof ServerError) {
+          console.warn(
+            `\x1B[33m\u26A0 ScrapeBadger: ${error.statusCode} ${error.message} \u2014 retrying in ${delaySec}s (attempt ${attemptNum}/${maxRetries})\x1B[0m`
+          );
+        } else {
+          console.warn(
+            `\x1B[33m\u26A0 ScrapeBadger: ${error.name} \u2014 retrying in ${delaySec}s (attempt ${attemptNum}/${maxRetries})\x1B[0m`
+          );
         }
         await this.sleep(delay);
       }
     }
     throw lastError ?? new ScrapeBadgerError("Request failed after retries");
   }
+  /**
+   * Parse rate limit headers from an HTTP response.
+   */
+  parseRateLimitHeaders(headers) {
+    const limit = headers.get("X-RateLimit-Limit");
+    const remaining = headers.get("X-RateLimit-Remaining");
+    const reset = headers.get("X-RateLimit-Reset");
+    if (limit === null || remaining === null || reset === null) {
+      return void 0;
+    }
+    const parsedLimit = parseInt(limit, 10);
+    const parsedRemaining = parseInt(remaining, 10);
+    const parsedReset = parseInt(reset, 10);
+    if (isNaN(parsedLimit) || isNaN(parsedRemaining) || isNaN(parsedReset)) {
+      return void 0;
+    }
+    return { limit: parsedLimit, remaining: parsedRemaining, reset: parsedReset };
+  }
   /**
    * Fetch with timeout support.
    */
@@ -266,7 +319,7 @@ var BaseClient = class {
 // src/internal/config.ts
 var DEFAULT_BASE_URL = "https://scrapebadger.com";
 var DEFAULT_TIMEOUT = 3e4;
-var DEFAULT_MAX_RETRIES = 3;
+var DEFAULT_MAX_RETRIES = 10;
 var DEFAULT_RETRY_DELAY = 1e3;
 function resolveConfig(config) {
   if (!config.apiKey) {
@@ -295,12 +348,26 @@ function createPaginatedResponse(data, cursor) {
     hasMore: !!cursor
   };
 }
+var RATE_LIMIT_WARN_THRESHOLD = 0.2;
 async function* paginate(fetchPage, options = {}) {
   const { maxItems } = options;
   let cursor;
   let totalYielded = 0;
   do {
-    const response = await fetchPage(cursor);
+    const { response, rateLimit } = await fetchPage(cursor);
+    if (rateLimit) {
+      const { limit, remaining, reset } = rateLimit;
+      if (limit > 0 && remaining / limit < RATE_LIMIT_WARN_THRESHOLD) {
+        const nowSec = Date.now() / 1e3;
+        const windowRemainingSec = Math.max(reset - nowSec, 1);
+        const delayMs = remaining > 0 ? windowRemainingSec / remaining * 1e3 : windowRemainingSec * 1e3;
+        const resetInSec = Math.round(windowRemainingSec);
+        console.warn(
+          `\x1B[33m\u26A0 ScrapeBadger: Rate limit: ${remaining}/${limit} remaining (resets in ${resetInSec}s), throttling pagination\x1B[0m`
+        );
+        await sleep(delayMs);
+      }
+    }
     for (const item of response.data) {
       yield item;
       totalYielded++;
@@ -318,6 +385,9 @@ async function collectAll(generator) {
   }
   return items;
 }
+function sleep(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
 
 // src/twitter/tweets.ts
 var TweetsClient = class {
@@ -515,7 +585,8 @@ var TweetsClient = class {
    */
   async *getQuotesAll(tweetId, options = {}) {
     const fetchPage = async (cursor) => {
-      return this.getQuotes(tweetId, { ...options, cursor });
+      const { data, rateLimit } = await this.client.requestWithHeaders(`/v1/twitter/tweets/tweet/${tweetId}/quotes`, { params: { cursor } });
+      return { response: createPaginatedResponse(data.data ?? [], data.next_cursor), rateLimit };
     };
     yield* paginate(fetchPage, options);
   }
@@ -582,7 +653,15 @@ var TweetsClient = class {
    */
   async *searchAll(query, options = {}) {
     const fetchPage = async (cursor) => {
-      return this.search(query, { ...options, cursor });
+      const { data, rateLimit } = await this.client.requestWithHeaders("/v1/twitter/tweets/advanced_search", {
+        params: {
+          query,
+          query_type: options.queryType ?? "Top",
+          count: options.count,
+          cursor
+        }
+      });
+      return { response: createPaginatedResponse(data.data ?? [], data.next_cursor), rateLimit };
     };
     yield* paginate(fetchPage, options);
   }
@@ -626,7 +705,8 @@ var TweetsClient = class {
    */
   async *getUserTweetsAll(username, options = {}) {
     const fetchPage = async (cursor) => {
-      return this.getUserTweets(username, { ...options, cursor });
+      const { data, rateLimit } = await this.client.requestWithHeaders(`/v1/twitter/users/${username}/latest_tweets`, { params: { cursor } });
+      return { response: createPaginatedResponse(data.data ?? [], data.next_cursor), rateLimit };
     };
     yield* paginate(fetchPage, options);
   }
@@ -736,7 +816,8 @@ var UsersClient = class {
    */
   async *getFollowersAll(username, options = {}) {
     const fetchPage = async (cursor) => {
-      return this.getFollowers(username, { ...options, cursor });
+      const { data, rateLimit } = await this.client.requestWithHeaders(`/v1/twitter/users/${username}/followers`, { params: { cursor } });
+      return { response: createPaginatedResponse(data.data ?? [], data.next_cursor), rateLimit };
     };
     yield* paginate(fetchPage, options);
   }
@@ -771,7 +852,8 @@ var UsersClient = class {
    */
   async *getFollowingAll(username, options = {}) {
     const fetchPage = async (cursor) => {
-      return this.getFollowing(username, { ...options, cursor });
+      const { data, rateLimit } = await this.client.requestWithHeaders(`/v1/twitter/users/${username}/followings`, { params: { cursor } });
+      return { response: createPaginatedResponse(data.data ?? [], data.next_cursor), rateLimit };
     };
     yield* paginate(fetchPage, options);
   }
@@ -934,7 +1016,8 @@ var UsersClient = class {
    */
   async *searchAll(query, options = {}) {
     const fetchPage = async (cursor) => {
-      return this.search(query, { ...options, cursor });
+      const { data, rateLimit } = await this.client.requestWithHeaders("/v1/twitter/users/search_users", { params: { query, cursor } });
+      return { response: createPaginatedResponse(data.data ?? [], data.next_cursor), rateLimit };
     };
     yield* paginate(fetchPage, options);
   }
@@ -994,7 +1077,8 @@ var ListsClient = class {
    */
   async *getTweetsAll(listId, options = {}) {
     const fetchPage = async (cursor) => {
-      return this.getTweets(listId, { ...options, cursor });
+      const { data, rateLimit } = await this.client.requestWithHeaders(`/v1/twitter/lists/${listId}/tweets`, { params: { cursor } });
+      return { response: createPaginatedResponse(data.data ?? [], data.next_cursor), rateLimit };
     };
     yield* paginate(fetchPage, options);
   }
@@ -1029,7 +1113,8 @@ var ListsClient = class {
    */
   async *getMembersAll(listId, options = {}) {
     const fetchPage = async (cursor) => {
-      return this.getMembers(listId, { ...options, cursor });
+      const { data, rateLimit } = await this.client.requestWithHeaders(`/v1/twitter/lists/${listId}/members`, { params: { cursor } });
+      return { response: createPaginatedResponse(data.data ?? [], data.next_cursor), rateLimit };
     };
     yield* paginate(fetchPage, options);
   }
@@ -1177,7 +1262,14 @@ var CommunitiesClient = class {
    */
   async *getTweetsAll(communityId, options = {}) {
     const fetchPage = async (cursor) => {
-      return this.getTweets(communityId, { ...options, cursor });
+      const { data, rateLimit } = await this.client.requestWithHeaders(`/v1/twitter/communities/${communityId}/tweets`, {
+        params: {
+          tweet_type: options.tweetType ?? "Top",
+          count: options.count ?? 40,
+          cursor
+        }
+      });
+      return { response: createPaginatedResponse(data.data ?? [], data.next_cursor), rateLimit };
     };
     yield* paginate(fetchPage, options);
   }