rettiwt-api 6.0.0 → 6.0.2

package/README.md

@@ -143,8 +143,8 @@ When initializing a new Rettiwt instance, it can be configures using various par
 - `errorHandler` (interface) - The custom error handler to use.
 - `tidProvider` (interface) - The custom TID provider to use for generating transaction token.
 - `headers` (object) - Custom HTTP headers to append to the default headers.
-- `delay` (number/function) - The delay to use between concurrent requests, can either be a number in milliseconds, or a function that returns the number. Default is 1000.
-- `maxRetries` (number) - The maximum number of retries to use in case when a random error 404 is encountered. Default is 5.
+- `delay` (number/function) - The delay to use between concurrent requests, can either be a number in milliseconds, or a function that returns the number. Default is 0 (no delay).
+- `maxRetries` (number) - The maximum number of retries to use in case when a random error 404 is encountered. Default is 0 (no retries).
 
 Of these parameters, the following are hot-swappable, using their respective setters:
 

package/dist/index.d.ts

@@ -29,7 +29,6 @@ export * from './services/public/TweetService';
 export * from './services/public/UserService';
 export * from './types/args/FetchArgs';
 export * from './types/args/PostArgs';
-export * from './types/auth/TidProvider';
 export * from './types/data/CursoredData';
 export * from './types/data/List';
 export * from './types/data/Notification';

package/dist/index.js

@@ -51,7 +51,6 @@ __exportStar(require("./services/public/UserService"), exports);
 // TYPES
 __exportStar(require("./types/args/FetchArgs"), exports);
 __exportStar(require("./types/args/PostArgs"), exports);
-__exportStar(require("./types/auth/TidProvider"), exports);
 __exportStar(require("./types/data/CursoredData"), exports);
 __exportStar(require("./types/data/List"), exports);
 __exportStar(require("./types/data/Notification"), exports);

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,OAAO;AACP,4CAA0B;AAE1B,QAAQ;AACR,wDAAsC;AACtC,oDAAkC;AAClC,2DAAyC;AACzC,oDAAkC;AAClC,8CAA4B;AAC5B,yDAAuC;AACvC,+CAA6B;AAC7B,kDAAgC;AAChC,gDAA8B;AAC9B,uDAAqC;AACrC,mDAAiC;AACjC,gDAA8B;AAE9B,SAAS;AACT,0DAAwC;AACxC,yDAAuC;AACvC,6DAA2C;AAC3C,qDAAmC;AACnC,6DAA2C;AAC3C,sDAAoC;AACpC,qDAAmC;AACnC,+DAA6C;AAE7C,WAAW;AACX,kDAAgC;AAChC,mDAAiC;AACjC,mDAAiC;AACjC,kDAAgC;AAEhC,WAAW;AACX,mEAAiD;AACjD,gEAA8C;AAC9C,iEAA+C;AAC/C,gEAA8C;AAE9C,QAAQ;AACR,yDAAuC;AACvC,wDAAsC;AACtC,2DAAyC;AACzC,4DAA0C;AAC1C,oDAAkC;AAClC,4DAA0C;AAC1C,qDAAmC;AACnC,oDAAkC;AAClC,8DAA4C;AAC5C,2DAAyC;AAsDzC,uDAAqC;AACrC,wDAAsC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,OAAO;AACP,4CAA0B;AAE1B,QAAQ;AACR,wDAAsC;AACtC,oDAAkC;AAClC,2DAAyC;AACzC,oDAAkC;AAClC,8CAA4B;AAC5B,yDAAuC;AACvC,+CAA6B;AAC7B,kDAAgC;AAChC,gDAA8B;AAC9B,uDAAqC;AACrC,mDAAiC;AACjC,gDAA8B;AAE9B,SAAS;AACT,0DAAwC;AACxC,yDAAuC;AACvC,6DAA2C;AAC3C,qDAAmC;AACnC,6DAA2C;AAC3C,sDAAoC;AACpC,qDAAmC;AACnC,+DAA6C;AAE7C,WAAW;AACX,kDAAgC;AAChC,mDAAiC;AACjC,mDAAiC;AACjC,kDAAgC;AAEhC,WAAW;AACX,mEAAiD;AACjD,gEAA8C;AAC9C,iEAA+C;AAC/C,gEAA8C;AAE9C,QAAQ;AACR,yDAAuC;AACvC,wDAAsC;AACtC,4DAA0C;AAC1C,oDAAkC;AAClC,4DAA0C;AAC1C,qDAAmC;AACnC,oDAAkC;AAClC,8DAA4C;AAC5C,2DAAyC;AAsDzC,uDAAqC;AACrC,wDAAsC"}

package/dist/models/RettiwtConfig.d.ts

@@ -1,5 +1,4 @@
 import { Agent } from 'https';
-import { ITidProvider } from '../types/auth/TidProvider';
 import { IErrorHandler } from '../types/ErrorHandler';
 import { IRettiwtConfig } from '../types/RettiwtConfig';
 /**
@@ -30,7 +29,6 @@ export declare class RettiwtConfig implements IRettiwtConfig {
     readonly errorHandler?: IErrorHandler;
     readonly logging?: boolean;
     readonly maxRetries: number;
-    readonly tidProvider?: ITidProvider;
     readonly timeout?: number;
     /**
      * @param config - The config for Rettiwt of type {@link IRettiwtConfig}.

package/dist/models/RettiwtConfig.js

@@ -37,7 +37,6 @@ class RettiwtConfig {
     errorHandler;
     logging;
     maxRetries;
-    tidProvider;
     timeout;
     /**
      * @param config - The config for Rettiwt of type {@link IRettiwtConfig}.
@@ -46,11 +45,10 @@ class RettiwtConfig {
         this._apiKey = config?.apiKey;
         this._httpsAgent = config?.proxyUrl ? new https_proxy_agent_1.HttpsProxyAgent(config?.proxyUrl) : new https_1.Agent();
         this._userId = config?.apiKey ? AuthService_1.AuthService.getUserId(config?.apiKey) : undefined;
-        this.delay = config?.delay ?? 1000;
-        this.maxRetries = config?.maxRetries ?? 5;
+        this.delay = config?.delay ?? 0;
+        this.maxRetries = config?.maxRetries ?? 0;
         this.errorHandler = config?.errorHandler;
         this.logging = config?.logging;
-        this.tidProvider = config?.tidProvider;
         this.timeout = config?.timeout;
         this.apiKey = config?.apiKey;
         this._headers = {

package/dist/models/RettiwtConfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"RettiwtConfig.js","sourceRoot":"","sources":["../../src/models/RettiwtConfig.ts"],"names":[],"mappings":";;;AAAA,iCAA8B;AAE9B,yDAAoD;AAEpD,kEAA+D;AAK/D;;;;GAIG;AACH,MAAM,cAAc,GAAG;IACtB,yDAAyD;IAEzD,SAAS,EAAE,OAAO;IAClB,iBAAiB,EAAE,gBAAgB;IACnC,eAAe,EAAE,UAAU;IAC3B,OAAO,EAAE,eAAe;IACxB,YAAY,EACX,iHAAiH;IAClH,uBAAuB,EAAE,KAAK;IAC9B,2BAA2B,EAAE,IAAI;IAEjC,wDAAwD;CACxD,CAAC;AA6EyB,+CAAqB;AA3EhD;;;;GAIG;AACH,MAAa,aAAa;IACzB,8BAA8B;IACtB,OAAO,CAAU;IACjB,QAAQ,CAA4B;IACpC,WAAW,CAAQ;IACnB,OAAO,CAAqB;IAEpC,uDAAuD;IACvC,KAAK,CAA6C;IAClD,YAAY,CAAiB;IAC7B,OAAO,CAAW;IAClB,UAAU,CAAS;IACnB,WAAW,CAAgB;IAC3B,OAAO,CAAU;IAEjC;;OAEG;IACH,YAAmB,MAAuB;QACzC,IAAI,CAAC,OAAO,GAAG,MAAM,EAAE,MAAM,CAAC;QAC9B,IAAI,CAAC,WAAW,GAAG,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,mCAAe,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,aAAK,EAAE,CAAC;QAC1F,IAAI,CAAC,OAAO,GAAG,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,yBAAW,CAAC,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAClF,IAAI,CAAC,KAAK,GAAG,MAAM,EAAE,KAAK,IAAI,IAAI,CAAC;QACnC,IAAI,CAAC,UAAU,GAAG,MAAM,EAAE,UAAU,IAAI,CAAC,CAAC;QAC1C,IAAI,CAAC,YAAY,GAAG,MAAM,EAAE,YAAY,CAAC;QACzC,IAAI,CAAC,OAAO,GAAG,MAAM,EAAE,OAAO,CAAC;QAC/B,IAAI,CAAC,WAAW,GAAG,MAAM,EAAE,WAAW,CAAC;QACvC,IAAI,CAAC,OAAO,GAAG,MAAM,EAAE,OAAO,CAAC;QAC/B,IAAI,CAAC,MAAM,GAAG,MAAM,EAAE,MAAM,CAAC;QAC7B,IAAI,CAAC,QAAQ,GAAG;YACf,GAAG,cAAc;YACjB,GAAG,MAAM,EAAE,OAAO;SAClB,CAAC;IACH,CAAC;IAED,IAAW,MAAM;QAChB,OAAO,IAAI,CAAC,OAAO,CAAC;IACrB,CAAC;IAED,IAAW,OAAO;QACjB,OAAO,IAAI,CAAC,QAAQ,CAAC;IACtB,CAAC;IAED,uCAAuC;IACvC,IAAW,UAAU;QACpB,OAAO,IAAI,CAAC,WAAW,CAAC;IACzB,CAAC;IAED,8DAA8D;IAC9D,IAAW,MAAM;QAChB,OAAO,IAAI,CAAC,OAAO,CAAC;IACrB,CAAC;IAED,IAAW,MAAM,CAAC,MAA0B;QAC3C,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,CAAC,CAAC,yBAAW,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IACnE,CAAC;IAED,IAAW,OAAO,CAAC,OAA8C;QAChE,IAAI,CAAC,QAAQ,GAAG;YACf,GAAG,cAAc;YACjB,GAAG,OAAO;SACV,CAAC;IACH,CAAC;IAED,IAAW,QAAQ,CAAC,QAAyB;QAC5C,IAAI,CAAC,WAAW,GAAG,QAAQ,CAAC,CAAC,CAAC,IAAI,mCAAe,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,aAAK,EAAE,CAAC;IAC3E,CAAC;CACD;AApED,sCAoEC"}
+{"version":3,"file":"RettiwtConfig.js","sourceRoot":"","sources":["../../src/models/RettiwtConfig.ts"],"names":[],"mappings":";;;AAAA,iCAA8B;AAE9B,yDAAoD;AAEpD,kEAA+D;AAI/D;;;;GAIG;AACH,MAAM,cAAc,GAAG;IACtB,yDAAyD;IAEzD,SAAS,EAAE,OAAO;IAClB,iBAAiB,EAAE,gBAAgB;IACnC,eAAe,EAAE,UAAU;IAC3B,OAAO,EAAE,eAAe;IACxB,YAAY,EACX,iHAAiH;IAClH,uBAAuB,EAAE,KAAK;IAC9B,2BAA2B,EAAE,IAAI;IAEjC,wDAAwD;CACxD,CAAC;AA2EyB,+CAAqB;AAzEhD;;;;GAIG;AACH,MAAa,aAAa;IACzB,8BAA8B;IACtB,OAAO,CAAU;IACjB,QAAQ,CAA4B;IACpC,WAAW,CAAQ;IACnB,OAAO,CAAqB;IAEpC,uDAAuD;IACvC,KAAK,CAA6C;IAClD,YAAY,CAAiB;IAC7B,OAAO,CAAW;IAClB,UAAU,CAAS;IACnB,OAAO,CAAU;IAEjC;;OAEG;IACH,YAAmB,MAAuB;QACzC,IAAI,CAAC,OAAO,GAAG,MAAM,EAAE,MAAM,CAAC;QAC9B,IAAI,CAAC,WAAW,GAAG,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,mCAAe,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,aAAK,EAAE,CAAC;QAC1F,IAAI,CAAC,OAAO,GAAG,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,yBAAW,CAAC,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAClF,IAAI,CAAC,KAAK,GAAG,MAAM,EAAE,KAAK,IAAI,CAAC,CAAC;QAChC,IAAI,CAAC,UAAU,GAAG,MAAM,EAAE,UAAU,IAAI,CAAC,CAAC;QAC1C,IAAI,CAAC,YAAY,GAAG,MAAM,EAAE,YAAY,CAAC;QACzC,IAAI,CAAC,OAAO,GAAG,MAAM,EAAE,OAAO,CAAC;QAC/B,IAAI,CAAC,OAAO,GAAG,MAAM,EAAE,OAAO,CAAC;QAC/B,IAAI,CAAC,MAAM,GAAG,MAAM,EAAE,MAAM,CAAC;QAC7B,IAAI,CAAC,QAAQ,GAAG;YACf,GAAG,cAAc;YACjB,GAAG,MAAM,EAAE,OAAO;SAClB,CAAC;IACH,CAAC;IAED,IAAW,MAAM;QAChB,OAAO,IAAI,CAAC,OAAO,CAAC;IACrB,CAAC;IAED,IAAW,OAAO;QACjB,OAAO,IAAI,CAAC,QAAQ,CAAC;IACtB,CAAC;IAED,uCAAuC;IACvC,IAAW,UAAU;QACpB,OAAO,IAAI,CAAC,WAAW,CAAC;IACzB,CAAC;IAED,8DAA8D;IAC9D,IAAW,MAAM;QAChB,OAAO,IAAI,CAAC,OAAO,CAAC;IACrB,CAAC;IAED,IAAW,MAAM,CAAC,MAA0B;QAC3C,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,CAAC,CAAC,yBAAW,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IACnE,CAAC;IAED,IAAW,OAAO,CAAC,OAA8C;QAChE,IAAI,CAAC,QAAQ,GAAG;YACf,GAAG,cAAc;YACjB,GAAG,OAAO;SACV,CAAC;IACH,CAAC;IAED,IAAW,QAAQ,CAAC,QAAyB;QAC5C,IAAI,CAAC,WAAW,GAAG,QAAQ,CAAC,CAAC,CAAC,IAAI,mCAAe,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,aAAK,EAAE,CAAC;IAC3E,CAAC;CACD;AAlED,sCAkEC"}

package/dist/services/public/FetcherService.d.ts

@@ -14,8 +14,6 @@ export declare class FetcherService {
     private readonly _delay?;
     /** The service used to handle HTTP and API errors */
     private readonly _errorHandler;
-    /** Service responsible for generating the `x-client-transaction-id` header. */
-    private readonly _tidProvider;
     /** The max wait time for a response. */
     private readonly _timeout;
     /** The config object. */

package/dist/services/public/FetcherService.js

@@ -36,6 +36,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FetcherService = void 0;
 const axios_1 = __importStar(require("axios"));
 const cookiejar_1 = require("cookiejar");
+const x_client_transaction_id_1 = require("x-client-transaction-id");
 const Groups_1 = require("../../collections/Groups");
 const Requests_1 = require("../../collections/Requests");
 const Api_1 = require("../../enums/Api");
@@ -46,7 +47,6 @@ const AuthCredential_1 = require("../../models/auth/AuthCredential");
 const AuthService_1 = require("../internal/AuthService");
 const ErrorService_1 = require("../internal/ErrorService");
 const LogService_1 = require("../internal/LogService");
-const TidService_1 = require("../internal/TidService");
 /**
  * The base service that handles all HTTP requests.
  *
@@ -59,8 +59,6 @@ class FetcherService {
     _delay;
     /** The service used to handle HTTP and API errors */
     _errorHandler;
-    /** Service responsible for generating the `x-client-transaction-id` header. */
-    _tidProvider;
     /** The max wait time for a response. */
     _timeout;
     /** The config object. */
@@ -73,7 +71,6 @@ class FetcherService {
         this.config = config;
         this._delay = config.delay;
         this._errorHandler = config.errorHandler ?? new ErrorService_1.ErrorService();
-        this._tidProvider = config.tidProvider ?? new TidService_1.TidService(config);
         this._timeout = config.timeout ?? 0;
         this._auth = new AuthService_1.AuthService(config);
     }
@@ -120,20 +117,19 @@ class FetcherService {
      * @returns The header containing the transaction ID.
      */
     async _getTransactionHeader(method, url) {
+        // Get the X homepage HTML document (using utility function)
+        const document = await (0, x_client_transaction_id_1.handleXMigration)();
+        // Create and initialize ClientTransaction instance
+        const transaction = await x_client_transaction_id_1.ClientTransaction.create(document);
         // Getting the URL path excluding all params
         const path = new URL(url).pathname.split('?')[0].trim();
         // Generating the transaction ID
-        const tid = await this._tidProvider.generate(method.toUpperCase(), path);
-        if (tid) {
-            return {
-                /* eslint-disable @typescript-eslint/naming-convention */
-                'x-client-transaction-id': tid,
-                /* eslint-enable @typescript-eslint/naming-convention */
-            };
-        }
-        else {
-            return undefined;
-        }
+        const tid = await transaction.generateTransactionId(method.toUpperCase(), path);
+        return {
+            /* eslint-disable @typescript-eslint/naming-convention */
+            'x-client-transaction-id': tid,
+            /* eslint-enable @typescript-eslint/naming-convention */
+        };
     }
     /**
      * Validates the given args against the given resource.
@@ -205,6 +201,8 @@ class FetcherService {
      * ```
      */
     async request(resource, args) {
+        /** The current retry number. */
+        let retry = 0;
         /** The error, if any. */
         let error = undefined;
         // Logging
@@ -221,16 +219,20 @@ class FetcherService {
         config.headers = {
             ...config.headers,
             ...cred.toHeader(),
-            ...(await this._getTransactionHeader(config.method ?? '', config.url ?? '')),
             ...this.config.headers,
         };
         config.httpAgent = this.config.httpsAgent;
         config.httpsAgent = this.config.httpsAgent;
         config.timeout = this._timeout;
         // Using retries for error 404
-        for (let retry = 1; retry <= this.config.maxRetries; retry++) {
+        do {
             // Sending the request
             try {
+                // Getting and appending transaction information
+                config.headers = {
+                    ...config.headers,
+                    ...(await this._getTransactionHeader(config.method ?? '', config.url ?? '')),
+                };
                 // Introducing a delay
                 await this._wait();
                 // Returning the reponse body
@@ -248,7 +250,11 @@ class FetcherService {
                     throw err;
                 }
             }
-        }
+            finally {
+                // Incrementing the number of retries done
+                retry++;
+            }
+        } while (retry < this.config.maxRetries);
         /** If request not successful even after retries, throw the error */
         throw error;
     }

package/dist/services/public/FetcherService.js.map

@@ -1 +1 @@
-{"version":3,"file":"FetcherService.js","sourceRoot":"","sources":["../../../src/services/public/FetcherService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"FetcherService.js","sourceRoot":"","sources":["../../../src/services/public/FetcherService.ts"],"names":[],"mappings":"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"}

package/dist/types/RettiwtConfig.d.ts

@@ -1,4 +1,3 @@
-import { ITidProvider } from './auth/TidProvider';
 import { IErrorHandler } from './ErrorHandler';
 /**
  * The configuration for initializing a new Rettiwt instance.
@@ -20,8 +19,6 @@ export interface IRettiwtConfig {
     logging?: boolean;
     /** Optional custom error handler to define error conditions and process API/HTTP errors in responses. */
     errorHandler?: IErrorHandler;
-    /** Optional custom `x-client-transaction-id` header provider. */
-    tidProvider?: ITidProvider;
     /**
      * Optional custom HTTP headers to add to all requests to Twitter API.
      *

package/dist/types/auth/TransactionHeader.d.ts

@@ -0,0 +1,6 @@
+/**
+ * The transaction information for Twitter.
+ */
+export interface ITransactionHeader {
+    'x-client-transaction-id': string;
+}

package/dist/types/auth/TransactionHeader.js

@@ -0,0 +1,4 @@
+"use strict";
+/* eslint-disable @typescript-eslint/naming-convention */
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=TransactionHeader.js.map

package/dist/types/auth/TransactionHeader.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"TransactionHeader.js","sourceRoot":"","sources":["../../../src/types/auth/TransactionHeader.ts"],"names":[],"mappings":";AAAA,yDAAyD"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "rettiwt-api",
-	"version": "6.0.0",
+	"version": "6.0.2",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
 	"description": "An API for fetching data from TwitterAPI, without any rate limits!",
@@ -50,6 +50,7 @@
 		"commander": "^11.1.0",
 		"cookiejar": "^2.1.4",
 		"https-proxy-agent": "^7.0.6",
-		"node-html-parser": "^7.0.1"
+		"node-html-parser": "^7.0.1",
+		"x-client-transaction-id": "^0.1.7"
 	}
 }

package/src/index.ts

@@ -40,7 +40,6 @@ export * from './services/public/UserService';
 // TYPES
 export * from './types/args/FetchArgs';
 export * from './types/args/PostArgs';
-export * from './types/auth/TidProvider';
 export * from './types/data/CursoredData';
 export * from './types/data/List';
 export * from './types/data/Notification';

package/src/models/RettiwtConfig.ts

@@ -3,7 +3,6 @@ import { Agent } from 'https';
 import { HttpsProxyAgent } from 'https-proxy-agent';
 
 import { AuthService } from '../services/internal/AuthService';
-import { ITidProvider } from '../types/auth/TidProvider';
 import { IErrorHandler } from '../types/ErrorHandler';
 import { IRettiwtConfig } from '../types/RettiwtConfig';
 
@@ -44,7 +43,6 @@ export class RettiwtConfig implements IRettiwtConfig {
 	public readonly errorHandler?: IErrorHandler;
 	public readonly logging?: boolean;
 	public readonly maxRetries: number;
-	public readonly tidProvider?: ITidProvider;
 	public readonly timeout?: number;
 
 	/**
@@ -54,11 +52,10 @@ export class RettiwtConfig implements IRettiwtConfig {
 		this._apiKey = config?.apiKey;
 		this._httpsAgent = config?.proxyUrl ? new HttpsProxyAgent(config?.proxyUrl) : new Agent();
 		this._userId = config?.apiKey ? AuthService.getUserId(config?.apiKey) : undefined;
-		this.delay = config?.delay ?? 1000;
-		this.maxRetries = config?.maxRetries ?? 5;
+		this.delay = config?.delay ?? 0;
+		this.maxRetries = config?.maxRetries ?? 0;
 		this.errorHandler = config?.errorHandler;
 		this.logging = config?.logging;
-		this.tidProvider = config?.tidProvider;
 		this.timeout = config?.timeout;
 		this.apiKey = config?.apiKey;
 		this._headers = {

package/src/services/public/FetcherService.ts

@@ -1,5 +1,6 @@
 import axios, { isAxiosError } from 'axios';
 import { Cookie } from 'cookiejar';
+import { ClientTransaction, handleXMigration } from 'x-client-transaction-id';
 
 import { AllowGuestAuthenticationGroup, FetchResourcesGroup, PostResourcesGroup } from '../../collections/Groups';
 import { Requests } from '../../collections/Requests';
@@ -12,14 +13,12 @@ import { AuthCredential } from '../../models/auth/AuthCredential';
 import { RettiwtConfig } from '../../models/RettiwtConfig';
 import { IFetchArgs } from '../../types/args/FetchArgs';
 import { IPostArgs } from '../../types/args/PostArgs';
-import { ITidHeader } from '../../types/auth/TidHeader';
-import { ITidProvider } from '../../types/auth/TidProvider';
+import { ITransactionHeader } from '../../types/auth/TransactionHeader';
 import { IErrorHandler } from '../../types/ErrorHandler';
 
 import { AuthService } from '../internal/AuthService';
 import { ErrorService } from '../internal/ErrorService';
 import { LogService } from '../internal/LogService';
-import { TidService } from '../internal/TidService';
 
 /**
  * The base service that handles all HTTP requests.
@@ -36,9 +35,6 @@ export class FetcherService {
 	/** The service used to handle HTTP and API errors */
 	private readonly _errorHandler: IErrorHandler;
 
-	/** Service responsible for generating the `x-client-transaction-id` header. */
-	private readonly _tidProvider: ITidProvider;
-
 	/** The max wait time for a response. */
 	private readonly _timeout: number;
 
@@ -53,7 +49,6 @@ export class FetcherService {
 		this.config = config;
 		this._delay = config.delay;
 		this._errorHandler = config.errorHandler ?? new ErrorService();
-		this._tidProvider = config.tidProvider ?? new TidService(config);
 		this._timeout = config.timeout ?? 0;
 		this._auth = new AuthService(config);
 	}
@@ -106,22 +101,24 @@ export class FetcherService {
 	 *
 	 * @returns The header containing the transaction ID.
 	 */
-	private async _getTransactionHeader(method: string, url: string): Promise<ITidHeader | undefined> {
+	private async _getTransactionHeader(method: string, url: string): Promise<ITransactionHeader> {
+		// Get the X homepage HTML document (using utility function)
+		const document = await handleXMigration();
+
+		// Create and initialize ClientTransaction instance
+		const transaction = await ClientTransaction.create(document);
+
 		// Getting the URL path excluding all params
 		const path = new URL(url).pathname.split('?')[0].trim();
 
 		// Generating the transaction ID
-		const tid = await this._tidProvider.generate(method.toUpperCase(), path);
-
-		if (tid) {
-			return {
-				/* eslint-disable @typescript-eslint/naming-convention */
-				'x-client-transaction-id': tid,
-				/* eslint-enable @typescript-eslint/naming-convention */
-			};
-		} else {
-			return undefined;
-		}
+		const tid = await transaction.generateTransactionId(method.toUpperCase(), path);
+
+		return {
+			/* eslint-disable @typescript-eslint/naming-convention */
+			'x-client-transaction-id': tid,
+			/* eslint-enable @typescript-eslint/naming-convention */
+		};
 	}
 
 	/**
@@ -199,6 +196,9 @@ export class FetcherService {
 	 * ```
 	 */
 	public async request<T = unknown>(resource: ResourceType, args: IFetchArgs | IPostArgs): Promise<T> {
+		/** The current retry number. */
+		let retry = 0;
+
 		/** The error, if any. */
 		let error: unknown = undefined;
 
@@ -221,7 +221,6 @@ export class FetcherService {
 		config.headers = {
 			...config.headers,
 			...cred.toHeader(),
-			...(await this._getTransactionHeader(config.method ?? '', config.url ?? '')),
 			...this.config.headers,
 		};
 		config.httpAgent = this.config.httpsAgent;
@@ -229,9 +228,15 @@ export class FetcherService {
 		config.timeout = this._timeout;
 
 		// Using retries for error 404
-		for (let retry = 1; retry <= this.config.maxRetries; retry++) {
+		do {
 			// Sending the request
 			try {
+				// Getting and appending transaction information
+				config.headers = {
+					...config.headers,
+					...(await this._getTransactionHeader(config.method ?? '', config.url ?? '')),
+				};
+
 				// Introducing a delay
 				await this._wait();
 
@@ -248,8 +253,11 @@ export class FetcherService {
 					this._errorHandler.handle(err);
 					throw err;
 				}
+			} finally {
+				// Incrementing the number of retries done
+				retry++;
 			}
-		}
+		} while (retry < this.config.maxRetries);
 
 		/** If request not successful even after retries, throw the error */
 		throw error;

package/src/types/RettiwtConfig.ts

@@ -1,4 +1,3 @@
-import { ITidProvider } from './auth/TidProvider';
 import { IErrorHandler } from './ErrorHandler';
 
 /**
@@ -26,9 +25,6 @@ export interface IRettiwtConfig {
 	/** Optional custom error handler to define error conditions and process API/HTTP errors in responses. */
 	errorHandler?: IErrorHandler;
 
-	/** Optional custom `x-client-transaction-id` header provider. */
-	tidProvider?: ITidProvider;
-
 	/**
 	 * Optional custom HTTP headers to add to all requests to Twitter API.
 	 *

package/src/types/auth/TransactionHeader.ts

@@ -0,0 +1,8 @@
+/* eslint-disable @typescript-eslint/naming-convention */
+
+/**
+ * The transaction information for Twitter.
+ */
+export interface ITransactionHeader {
+	'x-client-transaction-id': string;
+}

package/dist/helper/TidUtils.d.ts

@@ -1,4 +0,0 @@
-import { ITidParams } from '../types/auth/TidParams';
-export declare function getUnixTime(): number;
-export declare function getNanosecondPrecisionTime(): number;
-export declare function calculateClientTransactionIdHeader(args: ITidParams): string;

package/dist/helper/TidUtils.js

@@ -1,171 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUnixTime = getUnixTime;
-exports.getNanosecondPrecisionTime = getNanosecondPrecisionTime;
-exports.calculateClientTransactionIdHeader = calculateClientTransactionIdHeader;
-const node_crypto_1 = require("node:crypto");
-function getUnixTime() {
-    const [seconds, nanoseconds] = process.hrtime();
-    return Date.now() / 1000 + seconds + nanoseconds / 1e9;
-}
-function getNanosecondPrecisionTime() {
-    return Number(((BigInt(Date.now()) * 1000000n + process.hrtime.bigint()) * 1000n) / BigInt(1000000)) / 1000000;
-}
-function calculateClientTransactionIdHeader(args) {
-    const time = Math.floor(((args.time || getUnixTime()) * 1000 - 1682924400 * 1000) / 1000);
-    const timeBuffer = new Uint8Array(new Uint32Array([time]).buffer);
-    const keyBytes = Array.from(Buffer.from(args.verificationKey, 'base64'));
-    const animationKey = args.animationKey || getAnimationKey(keyBytes, args.frames, args.indices);
-    const value = [args.method, args.path, time].join('!') + args.keyword + animationKey;
-    const valueEncoded = new TextEncoder().encode(value);
-    const hash = (0, node_crypto_1.createHash)('sha-256').update(valueEncoded).digest();
-    const hashBytes = Array.from(new Uint8Array(hash));
-    const xorByte = args.xorByte || Math.floor(Math.random() * 256);
-    const bytes = new Uint8Array(keyBytes.concat(Array.from(timeBuffer), hashBytes.slice(0, 16), [args.extraByte]));
-    return encode(xor(xorByte, bytes));
-}
-function getAnimationKey(keyBytes, frames, indices) {
-    const totalTime = 4096;
-    const rowIndex = keyBytes[indices[0]] % 16;
-    const frameTime = indices
-        .slice(1)
-        .map((idx) => keyBytes[idx] % 16)
-        .reduce((a, b) => a * b, 1);
-    const targetTime = frameTime / totalTime;
-    const frameRow = frames[keyBytes[5] % 4][rowIndex];
-    return animate(frameRow, targetTime);
-}
-function animate(frameRow, targetTime) {
-    const curves = frameRow.slice(7).map((v, i) => Number(a(v, b(i), 1).toFixed(2)));
-    const cubicValue = getCubicCurveValue(curves, targetTime);
-    const fromColor = [...frameRow.slice(0, 3), 1];
-    const toColor = [...frameRow.slice(3, 6), 1];
-    const color = interpolate(fromColor, toColor, cubicValue);
-    const fromRotation = [0];
-    const toRotation = [Math.floor(a(frameRow[6], 60, 360))];
-    const rotation = interpolate(fromRotation, toRotation, cubicValue);
-    const matrix = convertRotationToMatrix(rotation[0]);
-    const strArray = [];
-    for (let i = 0; i < color.length - 1; i++) {
-        strArray.push(Math.round(color[i]).toString(16));
-    }
-    for (let i = 0; i < matrix.length; i++) {
-        let rounded = Number(matrix[i].toFixed(2));
-        if (rounded < 0) {
-            rounded = -rounded;
-        }
-        const hexValue = floatToHex(rounded);
-        if (hexValue.startsWith('.')) {
-            strArray.push('0' + hexValue);
-        }
-        else if (hexValue) {
-            strArray.push(hexValue);
-        }
-        else {
-            strArray.push('0');
-        }
-    }
-    strArray.push('0', '0');
-    return strArray.join('').replace(/[.-]/g, '').toLowerCase();
-}
-function a(b, c, d) {
-    return (b * (d - c)) / 255 + c;
-}
-function b(a) {
-    return a % 2 === 1 ? -1 : 0;
-}
-function getCubicCurveValue(curves, time) {
-    let startGradient = 0;
-    let endGradient = 0;
-    if (time <= 0) {
-        if (curves[0] > 0) {
-            startGradient = curves[1] / curves[0];
-        }
-        else if (curves[1] === 0 && curves[2] > 0) {
-            startGradient = curves[3] / curves[2];
-        }
-        return startGradient * time;
-    }
-    if (time >= 1) {
-        if (curves[2] < 1) {
-            endGradient = (curves[3] - 1) / (curves[2] - 1);
-        }
-        else if (curves[2] === 1 && curves[0] < 1) {
-            endGradient = (curves[1] - 1) / (curves[0] - 1);
-        }
-        return 1 + endGradient * (time - 1);
-    }
-    let start = 0;
-    let end = 1;
-    let mid = 0;
-    while (start < end) {
-        mid = (start + end) / 2;
-        const xEst = calculateBezier(curves[0], curves[2], mid);
-        if (Math.abs(time - xEst) < 0.00001) {
-            return calculateBezier(curves[1], curves[3], mid);
-        }
-        if (xEst < time) {
-            start = mid;
-        }
-        else {
-            end = mid;
-        }
-    }
-    return calculateBezier(curves[1], curves[3], mid);
-}
-function calculateBezier(a, b, m) {
-    return 3 * a * (1 - m) * (1 - m) * m + 3 * b * (1 - m) * m * m + m * m * m;
-}
-function interpolate(from, to, f) {
-    const out = [];
-    for (let i = 0; i < from.length; i++) {
-        out.push(from[i] * (1 - f) + to[i] * f);
-    }
-    return out;
-}
-function convertRotationToMatrix(degrees) {
-    const radians = (degrees * Math.PI) / 180;
-    const c = Math.cos(radians);
-    const s = Math.sin(radians);
-    return [c, -s, s, c];
-}
-function floatToHex(x) {
-    const result = [];
-    let quotient = Math.floor(x);
-    let fraction = x - quotient;
-    while (quotient > 0) {
-        const remainder = quotient % 16;
-        quotient = Math.floor(quotient / 16);
-        if (remainder > 9) {
-            result.unshift(String.fromCharCode(remainder + 55));
-        }
-        else {
-            result.unshift(remainder.toString());
-        }
-    }
-    if (fraction === 0) {
-        return result.join('');
-    }
-    result.push('.');
-    while (fraction > 0) {
-        fraction *= 16;
-        const integer = Math.floor(fraction);
-        fraction -= integer;
-        if (integer > 9) {
-            result.push(String.fromCharCode(integer + 55));
-        }
-        else {
-            result.push(integer.toString());
-        }
-    }
-    return result.join('');
-}
-function xor(xorByte, data) {
-    return new Uint8Array([xorByte, ...data.map((v) => v ^ xorByte)]);
-}
-function encode(data) {
-    return btoa(Array.from(data)
-        .map((v) => String.fromCharCode(v))
-        .join('')).replaceAll('=', '');
-}
-//# sourceMappingURL=TidUtils.js.map