Merge pull request #186 from fireblocks/PIK-10232-timeout-and-pagination-guards

PIK-10232 fixed tmouts due to duplications and infinite loops in pagi…

Author: OzBalasFB

v2/api-validator/src/client/SecureClient.ts

@@ -168,7 +168,9 @@ export class HttpRequestWithSecurityHeaders extends BaseHttpRequest {
   ) {
     super(openAPIConfig);
 
-    this.axiosClient = axios.create();
+    this.axiosClient = axios.create({
+      timeout: 30000,
+    });
 
     this.axiosClient.interceptors.request.use((request) => {
       log.debug('Sending HTTP request', { request });

v2/api-validator/tests/server-tests/withdrawals.test.ts

@@ -93,7 +93,7 @@ describe.skipIf(noTransfersCapability)('Withdrawals', () => {
     const accounts = await arrayFromAsyncGenerator(paginated(getAccounts));
     accountsMap = new Map<string, Account>();
     accounts.forEach((account) => accountsMap.set(account.id, account));
-  });
+  }, 60000);
 
   describe('Capabilities', () => {
     it('should return only known assets in response', () => {
@@ -205,7 +205,7 @@ describe.skipIf(noTransfersCapability)('Withdrawals', () => {
         getSubAccountWithdrawals,
         transfersCapableAccountIds
       );
-    });
+    }, 60000);
 
     it('should be sorted by creation time in a descending order', () => {
       const allWithdrawalResponses = [

v2/api-validator/tests/utils/pagination.ts

@@ -1,22 +1,38 @@
 import config from '../../src/config';
 
 const LIMIT = config.get('paginationLimit');
-
 // Function supporting pagination
 export type Pageable<T> = (limit: number, startingAfter?: string) => Promise<T[]>;
-
 /**
  * Wraps a pageable function with a generator function, returning all the items
  * one by one while automagically managing the pagination behind the scene.
  */
 export async function* paginated<T>(f: Pageable<T>, idPropName = 'id'): AsyncGenerator<T> {
-  let page = await f(LIMIT);
-  while (page.length > 0) {
-    for (const item of page) {
+  const MAX_PAGES = 1000;
+  let pageCount = 0;
+  let startingAfter: string | undefined;
+  
+  while (pageCount < MAX_PAGES) {
+    const currentPage = await f(LIMIT, startingAfter);
+    
+    if (currentPage.length === 0) {
+      break;
+    }
+    
+    pageCount++;
+    
+    for (const item of currentPage) {
       yield item;
     }
-    const startingAfter = page.at(-1)?.[idPropName];
-    page = await f(LIMIT, startingAfter);
+    
+    const lastItem = currentPage[currentPage.length - 1];
+    const lastItemId = lastItem?.[idPropName];
+    
+    if (!lastItemId || lastItemId === startingAfter) {
+      break;
+    }
+    
+    startingAfter = lastItemId;
   }
 }