chore: replace some concurrent promise requests with sequential

Author: elylucas

test/helpers.ts

@@ -46,14 +46,14 @@ export const initClient = (options: Partial<CreateHttpClientParams> = {}) => {
   }
   return createClient({
     accessToken,
-    throttle: 3,
+    throttle: 5,
     ...params,
     ...options,
   })
 }
 
 // Shared instance to reduce rate limiting issues due to recreation of clients and therefore loosing track of requests per second
-export const defaultClient = initClient({ throttle: 3, ...params })
+export const defaultClient = initClient({ throttle: 5, ...params })
 
 /**
  * @returns {import('../lib/contentful-management').PlainClientAPI}
@@ -62,7 +62,7 @@ export const initPlainClient = (defaults = {}) => {
   return createClient(
     {
       accessToken,
-      throttle: 3,
+      throttle: 5,
       ...params,
     },
     {
@@ -190,7 +190,7 @@ export const cleanupTaxonomy = async (olderThan = 1000 * 60 * 60) => {
     console.log(`Deleting ${conceptsToBeDeleted.length} concepts`)
   }
 
-  await Promise.all(
+  await promiseAllSequential(
     conceptsToBeDeleted.map((item) =>
       client.concept.delete({
         conceptId: item.sys.id,
@@ -252,3 +252,19 @@ export async function waitForBulkActionV2Processing<T extends BulkActionV2Payloa
     options,
   )
 }
+
+/**
+ * Executes an array of promises sequentially, waiting for each one to complete
+ * before starting the next one. This is useful for rate limiting or when you need
+ * to avoid overwhelming an API with concurrent requests.
+ * 
+ * @param promises Array of promises to execute sequentially
+ * @returns Promise that resolves to an array of results in the same order
+ */
+export async function promiseAllSequential<T>(promises: Promise<T>[]): Promise<T[]> {
+  const results: T[] = []
+  for (const promise of promises) {
+    results.push(await promise)
+  }
+  return results
+}

test/integration/tag-integration.test.ts

@@ -1,10 +1,11 @@
-import { describe, it, beforeAll, afterAll, afterEach } from 'vitest'
+import { describe, it, beforeAll, afterAll, afterEach, beforeEach } from 'vitest'
 import { expect } from 'vitest'
 import {
   defaultClient,
   generateRandomId,
   createTestSpace,
   timeoutToCalmRateLimiting,
+  promiseAllSequential,
 } from '../helpers'
 import type { Space, Environment, Tag, Link } from '../../lib/export-types'
 
@@ -29,8 +30,7 @@ describe('Tags API', () => {
 
   afterEach(async () => {
     const tags = await environment.getTags({ limit: 1000 })
-    const deleting = tags.items.map((tag) => tag.delete())
-    await Promise.allSettled(deleting)
+    await promiseAllSequential(tags.items.map((tag) => tag.delete()))
   })
 
   afterAll(async () => {

test/integration/taxonomy-integration.test.ts

@@ -1,7 +1,12 @@
 import { describe, it, beforeEach, afterEach, expect, afterAll } from 'vitest'
 import type { ConceptProps, CreateConceptProps } from '../../lib/entities/concept'
 import type { ConceptSchemeProps, CreateConceptSchemeProps } from '../../lib/export-types'
-import { getTestOrganizationId, initPlainClient, timeoutToCalmRateLimiting } from '../helpers'
+import {
+  getTestOrganizationId,
+  initPlainClient,
+  promiseAllSequential,
+  timeoutToCalmRateLimiting,
+} from '../helpers'
 
 let conceptsToDelete: ConceptProps[] = []
 let conceptSchemesToDelete: ConceptSchemeProps[] = []
@@ -214,7 +219,7 @@ describe('Taxonomy Integration', () => {
   })
 
   it('concept getTotal', async () => {
-    await Promise.all(
+    await promiseAllSequential(
       Array(3)
         .fill(null)
         .map(async (i) => {
@@ -235,7 +240,7 @@ describe('Taxonomy Integration', () => {
   })
 
   it('gets a list of all concepts', async () => {
-    await Promise.all(
+    await promiseAllSequential(
       Array(3)
         .fill(null)
         .map(async (i) => {
@@ -255,7 +260,7 @@ describe('Taxonomy Integration', () => {
   })
 
   it('gets a list of all paginated concepts', async () => {
-    await Promise.all(
+    await promiseAllSequential(
       Array(3)
         .fill(null)
         .map(async (i) => {
@@ -526,7 +531,7 @@ describe('Taxonomy Integration', () => {
   })
 
   it('conceptScheme getTotal', async () => {
-    await Promise.all(
+    const results = await promiseAllSequential(
       Array(3)
         .fill(null)
         .map(async (i) => {
@@ -536,18 +541,19 @@ describe('Taxonomy Integration', () => {
             },
           }
 
-          const result = await client.conceptScheme.create({}, conceptScheme)
-          conceptSchemesToDelete.push(result)
+          return client.conceptScheme.create({}, conceptScheme)
         }),
     )
 
+    conceptSchemesToDelete.push(...results)
+
     const { total } = await client.conceptScheme.getTotal({})
 
     expect(total).toBe(3)
   })
 
   it('gets a list of all concept schemes', async () => {
-    await Promise.all(
+    const results = await promiseAllSequential(
       Array(3)
         .fill(null)
         .map(async (i) => {
@@ -557,17 +563,18 @@ describe('Taxonomy Integration', () => {
             },
           }
 
-          const result = await client.conceptScheme.create({}, conceptScheme)
-          conceptSchemesToDelete.push(result)
+          return client.conceptScheme.create({}, conceptScheme)
         }),
     )
 
+    conceptSchemesToDelete.push(...results)
+
     const { items } = await client.conceptScheme.getMany({})
     expect(items.length).toBe(3)
   })
 
   it('gets a list of all paginated concept schemes', async () => {
-    await Promise.all(
+    const results = await promiseAllSequential(
       Array(3)
         .fill(null)
         .map(async (i) => {
@@ -577,11 +584,12 @@ describe('Taxonomy Integration', () => {
             },
           }
 
-          const result = await client.conceptScheme.create({}, conceptScheme)
-          conceptSchemesToDelete.push(result)
+          return client.conceptScheme.create({}, conceptScheme)
         }),
     )
 
+    conceptSchemesToDelete.push(...results)
+
     const { items, pages } = await client.conceptScheme.getMany({
       query: {
         limit: 2,