Skip to content

feat: migrate from axios to raw fetch #184

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
TrueCarry wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

feat: migrate from axios to raw fetch #184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
module.exports = {
preset: 'ts-jest',
testEnvironment: 'node',
setupFilesAfterEnv: ['<rootDir>/jest.setup.js'],
testPathIgnorePatterns: ["/node_modules/","/dist/"],
testTimeout: 60000,
moduleNameMapper: {
Expand Down
40 changes: 40 additions & 0 deletions jest.setup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
/**
* Copyright (c) Whales Corp.
* All Rights Reserved.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

// Polyfill Buffer for Node.js environment (similar to karma.setup.js)
const { Buffer } = require('buffer');
global.Buffer = Buffer;

// Extend default timeout for network operations and blockchain interactions
jest.setTimeout(60000);

// Setup fetch polyfill if needed
require('isomorphic-fetch');

// Global test utilities could be added here
global.testUtils = {
// Add any common test utilities here
};

// Mock console methods in test environment to reduce noise (optional)
// Uncomment if you want to suppress console output during tests
// const originalError = console.error;
// beforeAll(() => {
// console.error = (...args) => {
// if (args[0]?.includes?.('Warning:')) {
// return;
// }
// originalError.call(console, ...args);
// };
// });

// Setup process.env defaults for testing
if (!process.env.NODE_ENV) {
process.env.NODE_ENV = 'test';
}

13 changes: 7 additions & 6 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
],
"scripts": {
"docs": "rm -fr docs && typedoc src/index.ts",
"build": "rm -fr dist && tsc --declaration",
"build": "tsc --declaration",
"test": "jest --verbose --runInBand",
"release": "yarn build && yarn release-it --npm.yarn1"
},
Expand All @@ -20,9 +20,10 @@
"@ton/crypto": "3.2.0",
"@ton/emulator": "^2.1.1",
"@types/jest": "^27.0.1",
"@types/node": "^16.7.10",
"@types/node": "^24.3.0",
"buffer": "^6.0.3",
"expect": "^27.1.0",
"isomorphic-fetch": "^3.0.0",
"jest": "^27.1.0",
"jest-mock": "^27.1.0",
"karma": "^6.3.4",
Expand All @@ -32,11 +33,11 @@
"karma-webpack": "^5.0.0",
"prando": "^6.0.1",
"release-it": "^17.1.1",
"ts-jest": "^27.0.5",
"ts-loader": "^9.2.5",
"ts-node": "^10.7.0",
"ts-jest": "^29.4.1",
"ts-loader": "^9.5.4",
"ts-node": "^10.9.2",
"typedoc": "^0.23.24",
"typescript": "^5.6.3",
"typescript": "^5.9.2",
"webpack": "^5.51.2"
},
"dependencies": {
Expand Down
6 changes: 3 additions & 3 deletions src/client/TonClient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
*/

import { HttpApi } from "./api/HttpApi";
import { AxiosAdapter } from 'axios';
import {
Address,
beginCell,
Expand All @@ -30,6 +29,7 @@ import {
ExtraCurrency
} from '@ton/core';
import { Maybe } from "../utils/maybe";
import { Fetch } from "../types";

export type TonClientParameters = {
/**
Expand All @@ -48,9 +48,9 @@ export type TonClientParameters = {
apiKey?: string;

/**
* HTTP Adapter for axios
* HTTP Adapter for fetch
*/
httpAdapter?: AxiosAdapter;
httpAdapter?: Fetch;
}

export class TonClient {
Expand Down
111 changes: 86 additions & 25 deletions src/client/TonClient4.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,13 @@
* LICENSE file in the root directory of this source tree.
*/

import axios, { AxiosAdapter, InternalAxiosRequestConfig, AxiosInstance } from "axios";
// import axios, { AxiosAdapter, InternalAxiosRequestConfig, AxiosInstance } from "axios";
import { Address, beginCell, Cell, comment, Contract, ContractProvider, ContractState, external, ExtraCurrency, loadTransaction, openContract, OpenedContract, parseTuple, serializeTuple, StateInit, storeMessage, toNano, Transaction, TupleItem, TupleReader } from "@ton/core";
import { Maybe } from "../utils/maybe";
import { toUrlSafe } from "../utils/toUrlSafe";
import { z } from 'zod';
import { Fetch } from "../types";
import util from "util";

export type TonClient4Parameters = {

Expand All @@ -25,39 +27,99 @@ export type TonClient4Parameters = {
timeout?: number;

/**
* HTTP Adapter for axios
* HTTP Adapter for fetch
*/
httpAdapter?: AxiosAdapter;
httpAdapter?: Fetch;

/**
* HTTP request interceptor for axios
*/
requestInterceptor?: (config: InternalAxiosRequestConfig) => InternalAxiosRequestConfig;
// requestInterceptor?: (config: InternalAxiosRequestConfig) => InternalAxiosRequestConfig;
}

export class TonClient4 {

#endpoint: string;
#timeout: number;
#adapter?: AxiosAdapter;
#axios: AxiosInstance
#adapter?: Fetch;
// #axios: AxiosInstance

constructor(args: TonClient4Parameters) {
this.#axios = axios.create()
// 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)
// if (args.requestInterceptor) {
// this.#axios.interceptors.request.use(args.requestInterceptor)
// }
}

async getJson(url: string, options: RequestInit, {
timeout = this.#timeout,
}: {
timeout?: number;
} = {}) {
const timeoutAbortController = new AbortController();
setTimeout(() => {
timeoutAbortController.abort();
}, timeout);
let res = await fetch(url, {
...options,
signal: timeoutAbortController.signal
});
// if (res.status !== 200 || !res.ok) {
// throw Error('Received error: ' + res.statusText);
// }
let result;
try {
result = await res.json();
} catch (error) {
throw Error('Received error: ' + JSON.stringify(error));
}
return {res, data: result};
}

async postJson(url: string, body: any, options: RequestInit, {
timeout = this.#timeout,
}: {
timeout?: number;
} = {}) {
const timeoutAbortController = new AbortController();
setTimeout(() => {
timeoutAbortController.abort();
}, timeout);
console.log('postJson', body, JSON.stringify(body));
let res = await fetch(url, {
...options,
headers: {
'Content-Type': 'application/json',
},
method: 'POST',
body: JSON.stringify(body),
signal: timeoutAbortController.signal
});
// if (res.status !== 200 || !res.ok) {
// throw Error('Received error: ' + res.statusText);
// }
let result;
try {
const responseText = await res.text();
console.log('postJson response text', responseText);
result = JSON.parse(responseText) //await res.json();
} catch (error) {
// const responseText = await res.text();
// console.log('postJson response text', responseText);
throw Error('Received error: ' + JSON.stringify(error));
}
return {res, data: result};
}

/**
* Get Last Block
* @returns last block info
*/
async getLastBlock() {
let res = await this.#axios.get(this.#endpoint + '/block/latest', { adapter: this.#adapter, timeout: this.#timeout });
let res = await this.getJson(this.#endpoint + '/block/latest', {}, { timeout: this.#timeout });
let lastBlock = lastBlockCodec.safeParse(res.data);
if (!lastBlock.success) {
throw Error('Mailformed response: ' + lastBlock.error.format()._errors.join(', '));
Expand All @@ -71,7 +133,7 @@ export class TonClient4 {
* @returns block info
*/
async getBlock(seqno: number) {
let res = await this.#axios.get(this.#endpoint + '/block/' + seqno, { adapter: this.#adapter, timeout: this.#timeout });
let res = await this.getJson(this.#endpoint + '/block/' + seqno, {}, { timeout: this.#timeout });
let block = blockCodec.safeParse(res.data);
if (!block.success) {
throw Error('Mailformed response');
Expand All @@ -88,7 +150,7 @@ export class TonClient4 {
* @returns block info
*/
async getBlockByUtime(ts: number) {
let res = await this.#axios.get(this.#endpoint + '/block/utime/' + ts, { adapter: this.#adapter, timeout: this.#timeout });
let res = await this.getJson(this.#endpoint + '/block/utime/' + ts, {}, { timeout: this.#timeout });
let block = blockCodec.safeParse(res.data);
if (!block.success) {
throw Error('Mailformed response');
Expand All @@ -106,7 +168,7 @@ export class TonClient4 {
* @returns account info
*/
async getAccount(seqno: number, address: Address) {
let res = await this.#axios.get(this.#endpoint + '/block/' + seqno + '/' + address.toString({ urlSafe: true }), { adapter: this.#adapter, timeout: this.#timeout });
let res = await this.getJson(this.#endpoint + '/block/' + seqno + '/' + address.toString({ urlSafe: true }), {}, { timeout: this.#timeout });
let account = accountCodec.safeParse(res.data);
if (!account.success) {
throw Error('Mailformed response');
Expand All @@ -121,7 +183,7 @@ export class TonClient4 {
* @returns account lite info
*/
async getAccountLite(seqno: number, address: Address) {
let res = await this.#axios.get(this.#endpoint + '/block/' + seqno + '/' + address.toString({ urlSafe: true }) + '/lite', { adapter: this.#adapter, timeout: this.#timeout });
let res = await this.getJson(this.#endpoint + '/block/' + seqno + '/' + address.toString({ urlSafe: true }) + '/lite', {}, { timeout: this.#timeout });
let account = accountLiteCodec.safeParse(res.data);
if (!account.success) {
throw Error('Mailformed response');
Expand All @@ -148,7 +210,7 @@ export class TonClient4 {
* @returns account change info
*/
async isAccountChanged(seqno: number, address: Address, lt: bigint) {
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 res = await this.getJson(this.#endpoint + '/block/' + seqno + '/' + address.toString({ urlSafe: true }) + '/changed/' + lt.toString(10), {}, { timeout: this.#timeout });
let changed = changedCodec.safeParse(res.data);
if (!changed.success) {
throw Error('Mailformed response');
Expand All @@ -164,7 +226,7 @@ export class TonClient4 {
* @returns unparsed transactions
*/
async getAccountTransactions(address: Address, lt: bigint, hash: Buffer) {
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 res = await this.getJson(this.#endpoint + '/account/' + address.toString({ urlSafe: true }) + '/tx/' + lt.toString(10) + '/' + toUrlSafe(hash.toString('base64')), {}, { timeout: this.#timeout });
let transactions = transactionsCodec.safeParse(res.data);
if (!transactions.success) {
throw Error('Mailformed response');
Expand Down Expand Up @@ -199,14 +261,12 @@ export class TonClient4 {
* @returns parsed transactions
*/
async getAccountTransactionsParsed(address: Address, lt: bigint, hash: Buffer, count: number = 20) {
let res = await this.#axios.get(
this.#endpoint + '/account/' + address.toString({ urlSafe: true }) + '/tx/parsed/' + lt.toString(10) + '/' + toUrlSafe(hash.toString('base64')),
// todo check count
let res = await this.getJson(
this.#endpoint + '/account/' + address.toString({ urlSafe: true }) + '/tx/parsed/' + lt.toString(10) + '/' + toUrlSafe(hash.toString('base64')) + '?' + new URLSearchParams({ count: count.toString() }),
{},
{
adapter: this.#adapter,
timeout: this.#timeout,
params: {
count
}
}
);
let parsedTransactionsRes = parsedTransactionsCodec.safeParse(res.data);
Expand All @@ -229,7 +289,7 @@ export class TonClient4 {
if (ids && ids.length > 0) {
tail = '/' + [...ids].sort().join(',');
}
let res = await this.#axios.get(this.#endpoint + '/block/' + seqno + '/config' + tail, { adapter: this.#adapter, timeout: this.#timeout });
let res = await this.getJson(this.#endpoint + '/block/' + seqno + '/config' + tail, {}, { timeout: this.#timeout });
let config = configCodec.safeParse(res.data);
if (!config.success) {
throw Error('Mailformed response');
Expand All @@ -248,7 +308,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 this.#axios.get(url, { adapter: this.#adapter, timeout: this.#timeout });
let res = await this.getJson(url, {}, { timeout: this.#timeout });
let runMethod = runMethodCodec.safeParse(res.data);
if (!runMethod.success) {
throw Error('Mailformed response');
Expand All @@ -270,8 +330,9 @@ export class TonClient4 {
* @returns message status
*/
async sendMessage(message: Buffer) {
let res = await this.#axios.post(this.#endpoint + '/send', { boc: message.toString('base64') }, { adapter: this.#adapter, timeout: this.#timeout });
let res = await this.postJson(this.#endpoint + '/send', { boc: message.toString('base64') }, {}, { timeout: this.#timeout });
let send = sendCodec.safeParse(res.data);
console.log('send', res.data, util.inspect((send as any)?.error, { depth: null }));
if (!send.success) {
throw Error('Mailformed response');
}
Expand Down
Loading