use cli subdir. more re-use of code

Author: kvz

.github/workflows/integration.yml .github/workflows/e2e.yml.github/workflows/integration.yml renamed to .github/workflows/e2e.yml

@@ -1,4 +1,4 @@
-name: Integration tests
+name: e2e tests
 
 on:
   workflow_dispatch:
@@ -12,7 +12,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     strategy:
-      # Integration tests are not yet ready to run in parallel
+      # e2e tests are not yet ready to run in parallel
       max-parallel: 1
       matrix:
         node:
@@ -33,7 +33,7 @@ jobs:
       #      - name: Setup tmate session
       #        uses: mxschmitt/action-tmate@v3
 
-      - run: corepack yarn test:all
+      - run: corepack yarn test
         env:
           TRANSLOADIT_KEY: ${{ secrets.TRANSLOADIT_KEY }}
           TRANSLOADIT_SECRET: ${{ secrets.TRANSLOADIT_SECRET }}

CONTRIBUTING.md

@@ -50,9 +50,9 @@ yarn test:unit
 
 This will also generate a coverage report in the `coverage` directory.
 
-### Integration tests
+### e2e tests
 
-Integration tests are in the [`test/integration`](test/integration) folder. They require some extra setup.
+e2e tests are in the [`test/e2e`](test/e2e) folder. They require some extra setup.
 
 Firstly, these tests require the Cloudflare executable. You can download this with:
 
@@ -63,10 +63,10 @@ chmod +x cloudflared-linux-amd64
 
 They also require a Transloadit key and secret, which you can get from https://transloadit.com/c/credentials.
 
-You can run the integration tests with:
+You can run the e2e tests with:
 
 ```sh
-TRANSLOADIT_KEY='YOUR_TRANSLOADIT_KEY' TRANSLOADIT_SECRET='YOUR_TRANSLOADIT_SECRET' CLOUDFLARED_PATH='./cloudflared-linux-amd64' yarn test:integration
+TRANSLOADIT_KEY='YOUR_TRANSLOADIT_KEY' TRANSLOADIT_SECRET='YOUR_TRANSLOADIT_SECRET' CLOUDFLARED_PATH='./cloudflared-linux-amd64' yarn test:e2e
 ```
 
 ### Code Coverage

MIGRATION.md

@@ -19,11 +19,11 @@ Version 4 focuses on type-safety, clearer errors, and modern Node support. Most
 ```js
 // CommonJS import example
 async function getClient() {
-  const { Transloadit } = await import("transloadit");
+  const { Transloadit } = await import('transloadit')
   return new Transloadit({
-    authKey: process.env.TRANSLOADIT_KEY ?? "",
-    authSecret: process.env.TRANSLOADIT_SECRET ?? "",
-  });
+    authKey: process.env.TRANSLOADIT_KEY ?? '',
+    authSecret: process.env.TRANSLOADIT_SECRET ?? '',
+  })
 }
 ```
 
@@ -48,16 +48,16 @@ The package also exports `AssemblyInstructionsInput`, `AssemblyIndexItem`, `Asse
 const params: AssemblyInstructionsInput = {
   steps: {
     resize: {
-      use: ":original",
-      robot: "/image/resize",
+      use: ':original',
+      robot: '/image/resize',
       width: 320,
       height: 240,
       result: true,
     },
   },
-};
+}
 
-await transloadit.createAssembly({ params, waitForCompletion: true });
+await transloadit.createAssembly({ params, waitForCompletion: true })
 ```
 
 ## 3. Adjust API result handling
@@ -82,15 +82,15 @@ const createdAssembly = await transloadit.createAssembly(...);
 
 ```ts
 try {
-  await transloadit.createAssembly({ params });
+  await transloadit.createAssembly({ params })
 } catch (error) {
   if (error instanceof ApiError && error.response.assembly_id) {
     console.error(
-      "Troubleshoot at https://transloadit.com/c/assemblies/" +
+      'Troubleshoot at https://transloadit.com/c/assemblies/' +
         error.response.assembly_id
-    );
+    )
   }
-  throw error;
+  throw error
 }
 ```
 
@@ -103,18 +103,18 @@ try {
     authKey,
     authSecret,
     validateResponses: true,
-  });
+  })
   ```
 
 - `getSignedSmartCDNUrl` generates Smart CDN URLs with signatures that match the server-side implementation:
 
   ```ts
   const signedUrl = transloadit.getSignedSmartCDNUrl({
-    workspace: "my-team",
-    template: "hero-image",
-    input: "landing.jpg",
-    urlParams: { format: "webp" },
-  });
+    workspace: 'my-team',
+    template: 'hero-image',
+    input: 'landing.jpg',
+    urlParams: { format: 'webp' },
+  })
   ```
 
 ## 6. Removed `createAssembly` callback support
@@ -135,7 +135,7 @@ As a consequence of upgrading `got` to v14, the `gotRetry` option no longer acce
 
 ## Testing & troubleshooting
 
-- Run your existing integration tests on Node 20+. If you relied on CommonJS `require`, convert those modules or wrap calls in `import()` shims as shown above.
+- Run your existing e2e tests on Node 20+. If you relied on CommonJS `require`, convert those modules or wrap calls in `import()` shims as shown above.
 - If TypeScript raises errors about unfamiliar properties, import the respective types from `transloadit` instead of redefining them.
 - Schemas intentionally mirror the current public API. Some properties remain permissive while we tighten validation in the API itself; report gaps if the SDK raises or misses invalid data.
 

package.json

@@ -67,13 +67,10 @@
     "lint:js": "biome check .",
     "lint": "npm-run-all --parallel 'lint:js'",
     "fix": "npm-run-all --serial 'fix:js'",
-    "next:update": "next-update --keep true --tldr",
     "prepack": "rm -f tsconfig.tsbuildinfo tsconfig.build.tsbuildinfo && tsc --build tsconfig.build.json",
     "test:unit": "vitest run --coverage ./test/unit",
-    "test:integration": "vitest run ./test/integration",
     "test:e2e": "vitest run ./test/e2e",
-    "test:all": "vitest run --coverage",
-    "test": "yarn test:unit"
+    "test": "vitest run --coverage"
   },
   "license": "MIT",
   "main": "./dist/Transloadit.js",

src/cli/JobsPromise.ts

@@ -1,27 +1,46 @@
-import { EventEmitter } from 'node:events'
+/**
+ * Tracks a collection of promises and emits errors as they occur.
+ * Used to run multiple async operations in parallel while:
+ * 1. Reporting errors as they happen (via onError callback)
+ * 2. Waiting for all operations to complete at the end
+ */
+export default class JobsPromise {
+  private promises: Set<Promise<unknown>> = new Set()
+  private onError: ((err: unknown) => void) | null = null
 
-export default class JobsPromise extends EventEmitter {
-  private promises: Set<Promise<unknown>>
-
-  constructor() {
-    super()
-    this.promises = new Set()
+  /**
+   * Set the error handler for individual promise rejections.
+   * Errors are reported immediately when promises reject.
+   */
+  setErrorHandler(handler: (err: unknown) => void): void {
+    this.onError = handler
   }
 
+  /**
+   * Add a promise to track. If the promise rejects,
+   * the error handler will be called.
+   */
   add(promise: Promise<unknown>): void {
     this.promises.add(promise)
     promise
-      .finally(() => this.promises.delete(promise))
       .catch((err: unknown) => {
-        this.emit('error', err)
+        this.onError?.(err)
+      })
+      .finally(() => {
+        this.promises.delete(promise)
       })
   }
 
-  promise(): Promise<unknown[]> {
-    const promises: Promise<unknown>[] = []
-    for (const promise of this.promises) {
-      promises.push(promise)
-    }
-    return Promise.all(promises)
+  /**
+   * Wait for all tracked promises to settle.
+   * Returns array of fulfilled values (rejects are filtered out
+   * since errors were already handled via the error handler).
+   */
+  async allSettled(): Promise<unknown[]> {
+    const promises = [...this.promises]
+    const results = await Promise.allSettled(promises)
+    return results
+      .filter((r): r is PromiseFulfilledResult<unknown> => r.status === 'fulfilled')
+      .map((r) => r.value)
   }
 }

src/cli/assemblies-create.ts

@@ -449,7 +449,7 @@ function dismissStaleJobs(jobEmitter: EventEmitter): MyEventEmitter {
 
   const jobsPromise = new JobsPromise()
 
-  jobEmitter.on('end', () => jobsPromise.promise().then(() => emitter.emit('end')))
+  jobEmitter.on('end', () => jobsPromise.allSettled().then(() => emitter.emit('end')))
   jobEmitter.on('error', (err: Error) => emitter.emit('error', err))
   jobEmitter.on('job', (job: Job) => {
     if (job.in == null || job.out == null) {
@@ -730,8 +730,8 @@ export default async function run(
       }
     })
 
-    jobsPromise.on('error', (err: Error) => {
-      outputctl.error(err)
+    jobsPromise.setErrorHandler((err: unknown) => {
+      outputctl.error(err as Error)
     })
 
     emitter.on('error', (err: Error) => {
@@ -740,7 +740,7 @@ export default async function run(
     })
 
     emitter.on('end', () => {
-      resolve(jobsPromise.promise())
+      resolve(jobsPromise.allSettled())
     })
   })
 }

src/cli/assemblies.ts

@@ -2,7 +2,7 @@ import { z } from 'zod'
 import { tryCatch } from '../alphalib/tryCatch.ts'
 import type { Transloadit } from '../Transloadit.ts'
 import assembliesCreate from './assemblies-create.ts'
-import { createReadStream, formatAPIError, stream2buf } from './helpers.ts'
+import { createReadStream, formatAPIError, streamToBuffer } from './helpers.ts'
 import type { IOutputCtl } from './OutputCtl.ts'
 import { ensureError } from './types.ts'
 
@@ -112,13 +112,7 @@ export async function replay(
 ): Promise<void> {
   if (steps) {
     try {
-      const buf = await new Promise<Buffer>((resolve, reject) => {
-        stream2buf(createReadStream(steps), (err, buf) => {
-          if (err) reject(err)
-          else if (buf) resolve(buf)
-          else reject(new Error('No buffer received'))
-        })
-      })
+      const buf = await streamToBuffer(createReadStream(steps))
       const parsed: unknown = JSON.parse(buf.toString())
       const validated = StepsSchema.safeParse(parsed)
       if (!validated.success) {