Merge pull request ton-org#40 from yma-het/master

feat: Added ability to pass request interceptor to TonClient4
Shepherd36 · May 31, 2024 · 5ce48ae · 5ce48ae
2 parents 58d490f + c9534a7
commit 5ce48ae
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 13 deletions.
diff --git a/jest.config.js b/jest.config.js
@@ -2,5 +2,8 @@
 module.exports = {
   preset: 'ts-jest',
   testEnvironment: 'node',
-  testPathIgnorePatterns: ["/node_modules/","/dist/"]
+  testPathIgnorePatterns: ["/node_modules/","/dist/"],
+  moduleNameMapper: {
+    '^axios$': require.resolve('axios'),
+  }
 };
diff --git a/src/client/TonClient4.ts b/src/client/TonClient4.ts
@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import axios, { AxiosAdapter } from "axios";
+import axios, { AxiosAdapter, InternalAxiosRequestConfig, AxiosInstance } from "axios";
 import { Address, beginCell, Cell, comment, Contract, ContractProvider, ContractState, external, loadTransaction, openContract, OpenedContract, parseTuple, serializeTuple, StateInit, storeMessage, toNano, Transaction, TupleItem, TupleReader } from "@ton/core";
 import { Maybe } from "../utils/maybe";
 import { toUrlSafe } from "../utils/toUrlSafe";
@@ -28,26 +28,36 @@ export type TonClient4Parameters = {
      * HTTP Adapter for axios
      */
     httpAdapter?: AxiosAdapter;
+
+    /**
+     * HTTP request interceptor for axios
+     */
+    requestInterceptor?: (config: InternalAxiosRequestConfig) => InternalAxiosRequestConfig;
 }
 
 export class TonClient4 {
 
     #endpoint: string;
     #timeout: number;
     #adapter?: AxiosAdapter;
+    #axios: AxiosInstance
 
     constructor(args: TonClient4Parameters) {
+        this.#axios = axios.create()
         this.#endpoint = args.endpoint;
         this.#timeout = args.timeout || 5000;
         this.#adapter = args.httpAdapter;
+        if (args.requestInterceptor) {
+            this.#axios.interceptors.request.use(args.requestInterceptor)
+        }
     }
 
     /**
      * Get Last Block
      * @returns last block info
      */
     async getLastBlock() {
-        let res = await axios.get(this.#endpoint + '/block/latest', { adapter: this.#adapter, timeout: this.#timeout });
+        let res = await this.#axios.get(this.#endpoint + '/block/latest', { adapter: this.#adapter, timeout: this.#timeout });
         let lastBlock = lastBlockCodec.safeParse(res.data);
         if (!lastBlock.success) {
             throw Error('Mailformed response: ' + lastBlock.error.format()._errors.join(', '));
@@ -61,7 +71,7 @@ export class TonClient4 {
      * @returns block info
      */
     async getBlock(seqno: number) {
-        let res = await axios.get(this.#endpoint + '/block/' + seqno, { adapter: this.#adapter, timeout: this.#timeout });
+        let res = await this.#axios.get(this.#endpoint + '/block/' + seqno, { adapter: this.#adapter, timeout: this.#timeout });
         let block = blockCodec.safeParse(res.data);
         if (!block.success) {
             throw Error('Mailformed response');
@@ -78,7 +88,7 @@ export class TonClient4 {
      * @returns block info
      */
     async getBlockByUtime(ts: number) {
-        let res = await axios.get(this.#endpoint + '/block/utime/' + ts, { adapter: this.#adapter, timeout: this.#timeout });
+        let res = await this.#axios.get(this.#endpoint + '/block/utime/' + ts, { adapter: this.#adapter, timeout: this.#timeout });
         let block = blockCodec.safeParse(res.data);
         if (!block.success) {
             throw Error('Mailformed response');
@@ -96,7 +106,7 @@ export class TonClient4 {
      * @returns account info
      */
     async getAccount(seqno: number, address: Address) {
-        let res = await axios.get(this.#endpoint + '/block/' + seqno + '/' + address.toString({ urlSafe: true }), { adapter: this.#adapter, timeout: this.#timeout });
+        let res = await this.#axios.get(this.#endpoint + '/block/' + seqno + '/' + address.toString({ urlSafe: true }), { adapter: this.#adapter, timeout: this.#timeout });
         let account = accountCodec.safeParse(res.data);
         if (!account.success) {
             throw Error('Mailformed response');
@@ -111,7 +121,7 @@ export class TonClient4 {
      * @returns account lite info
      */
     async getAccountLite(seqno: number, address: Address) {
-        let res = await axios.get(this.#endpoint + '/block/' + seqno + '/' + address.toString({ urlSafe: true }) + '/lite', { adapter: this.#adapter, timeout: this.#timeout });
+        let res = await this.#axios.get(this.#endpoint + '/block/' + seqno + '/' + address.toString({ urlSafe: true }) + '/lite', { adapter: this.#adapter, timeout: this.#timeout });
         let account = accountLiteCodec.safeParse(res.data);
         if (!account.success) {
             throw Error('Mailformed response');
@@ -138,7 +148,7 @@ export class TonClient4 {
      * @returns account change info
      */
     async isAccountChanged(seqno: number, address: Address, lt: bigint) {
-        let res = await axios.get(this.#endpoint + '/block/' + seqno + '/' + address.toString({ urlSafe: true }) + '/changed/' + lt.toString(10), { adapter: this.#adapter, timeout: this.#timeout });
+        let res = await this.#axios.get(this.#endpoint + '/block/' + seqno + '/' + address.toString({ urlSafe: true }) + '/changed/' + lt.toString(10), { adapter: this.#adapter, timeout: this.#timeout });
         let changed = changedCodec.safeParse(res.data);
         if (!changed.success) {
             throw Error('Mailformed response');
@@ -154,7 +164,7 @@ export class TonClient4 {
      * @returns unparsed transactions
      */
     async getAccountTransactions(address: Address, lt: bigint, hash: Buffer) {
-        let res = await axios.get(this.#endpoint + '/account/' + address.toString({ urlSafe: true }) + '/tx/' + lt.toString(10) + '/' + toUrlSafe(hash.toString('base64')), { adapter: this.#adapter, timeout: this.#timeout });
+        let res = await this.#axios.get(this.#endpoint + '/account/' + address.toString({ urlSafe: true }) + '/tx/' + lt.toString(10) + '/' + toUrlSafe(hash.toString('base64')), { adapter: this.#adapter, timeout: this.#timeout });
         let transactions = transactionsCodec.safeParse(res.data);
         if (!transactions.success) {
             throw Error('Mailformed response');
@@ -189,7 +199,7 @@ export class TonClient4 {
      * @returns parsed transactions
      */
     async getAccountTransactionsParsed(address: Address, lt: bigint, hash: Buffer, count: number = 20) {
-        let res = await axios.get(
+        let res = await this.#axios.get(
             this.#endpoint + '/account/' + address.toString({ urlSafe: true }) + '/tx/parsed/' + lt.toString(10) + '/' + toUrlSafe(hash.toString('base64')),
             {
                 adapter: this.#adapter,
@@ -219,7 +229,7 @@ export class TonClient4 {
         if (ids && ids.length > 0) {
             tail = '/' + [...ids].sort().join(',');
         }
-        let res = await axios.get(this.#endpoint + '/block/' + seqno + '/config' + tail, { adapter: this.#adapter, timeout: this.#timeout });
+        let res = await this.#axios.get(this.#endpoint + '/block/' + seqno + '/config' + tail, { adapter: this.#adapter, timeout: this.#timeout });
         let config = configCodec.safeParse(res.data);
         if (!config.success) {
             throw Error('Mailformed response');
@@ -238,7 +248,7 @@ export class TonClient4 {
     async runMethod(seqno: number, address: Address, name: string, args?: TupleItem[]) {
         let tail = args && args.length > 0 ? '/' + toUrlSafe(serializeTuple(args).toBoc({ idx: false, crc32: false }).toString('base64')) : '';
         let url = this.#endpoint + '/block/' + seqno + '/' + address.toString({ urlSafe: true }) + '/run/' + encodeURIComponent(name) + tail;
-        let res = await axios.get(url, { adapter: this.#adapter, timeout: this.#timeout });
+        let res = await this.#axios.get(url, { adapter: this.#adapter, timeout: this.#timeout });
         let runMethod = runMethodCodec.safeParse(res.data);
         if (!runMethod.success) {
             throw Error('Mailformed response');
@@ -260,7 +270,7 @@ export class TonClient4 {
      * @returns message status
      */
     async sendMessage(message: Buffer) {
-        let res = await axios.post(this.#endpoint + '/send', { boc: message.toString('base64') }, { adapter: this.#adapter, timeout: this.#timeout });
+        let res = await this.#axios.post(this.#endpoint + '/send', { boc: message.toString('base64') }, { adapter: this.#adapter, timeout: this.#timeout });
         let send = sendCodec.safeParse(res.data);
         if (!send.success) {
             throw Error('Mailformed response');