@tinify-dev/client 0.1.0 → 0.1.1

package/dist/cli.cjs

@@ -13,6 +13,7 @@ var DEFAULT_MAX_RETRIES = 3;
 var DEFAULT_TIMEOUT_MS = 6e4;
 var BACKOFF_BASE_MS = 500;
 var BACKOFF_CAP_MS = 8e3;
+var MAX_RETRY_AFTER_MS = 3e4;
 var MAX_FILE_BYTES = 41943040;
 var DEFAULT_UPLOAD_CONCURRENCY = 4;
 var DEFAULT_POLL_INTERVAL_MS = 1e3;
@@ -67,105 +68,6 @@ var TinifyTimeoutError = class extends TinifyError {
   }
 };
 
-// src/inputs.ts
-var DEFAULT_FILENAME = "image";
-async function normalizeInput(input, filename) {
-  if (typeof input === "string") {
-    let fs;
-    let path;
-    try {
-      fs = await import('fs/promises');
-      path = await import('path');
-    } catch {
-      throw new TinifyError(
-        "File path inputs are only supported in Node.js. Pass a Blob or File instead."
-      );
-    }
-    const bytes = await fs.readFile(input);
-    return {
-      blob: new Blob([bytesToView(bytes)]),
-      filename: filename ?? path.basename(input)
-    };
-  }
-  if (typeof Blob !== "undefined" && input instanceof Blob) {
-    const name = filename ?? (typeof File !== "undefined" && input instanceof File && input.name ? input.name : DEFAULT_FILENAME);
-    return { blob: input, filename: name };
-  }
-  if (input instanceof ArrayBuffer) {
-    return { blob: new Blob([input]), filename: filename ?? DEFAULT_FILENAME };
-  }
-  if (ArrayBuffer.isView(input)) {
-    return {
-      blob: new Blob([bytesToView(input)]),
-      filename: filename ?? DEFAULT_FILENAME
-    };
-  }
-  throw new TypeError(
-    "Unsupported input: expected a file path, Uint8Array, ArrayBuffer, Blob, or File."
-  );
-}
-function bytesToView(view) {
-  const bytes = new Uint8Array(view.buffer, view.byteOffset, view.byteLength);
-  if (bytes.buffer instanceof ArrayBuffer && bytes.byteOffset === 0 && bytes.byteLength === bytes.buffer.byteLength) {
-    return bytes;
-  }
-  const copy = new Uint8Array(new ArrayBuffer(bytes.byteLength));
-  copy.set(bytes);
-  return copy;
-}
-
-// src/batches.ts
-var TERMINAL = new Set(BATCH_TERMINAL_STATUSES);
-function isTerminalBatchStatus(status) {
-  return TERMINAL.has(status);
-}
-async function uploadBatchFiles(fetchImpl, session, files, options = {}) {
-  const missing = session.uploads.map((upload) => upload.client_id).filter((clientId) => !(clientId in files));
-  if (missing.length > 0) {
-    throw new TinifyError(
-      `Missing input for batch client_id(s): ${missing.join(", ")}. Pass a { client_id: input } record covering every file in the session.`
-    );
-  }
-  const queue = [...session.uploads];
-  const concurrency = Math.max(
-    1,
-    Math.min(options.concurrency ?? DEFAULT_UPLOAD_CONCURRENCY, queue.length)
-  );
-  const workers = Array.from({ length: concurrency }, async () => {
-    for (; ; ) {
-      const upload = queue.shift();
-      if (upload === void 0) return;
-      options.signal?.throwIfAborted();
-      await putOne(fetchImpl, upload, files[upload.client_id], options.signal);
-    }
-  });
-  await Promise.all(workers);
-}
-async function putOne(fetchImpl, upload, input, signal) {
-  const { blob } = await normalizeInput(input);
-  let response;
-  try {
-    response = await fetchImpl(upload.upload_url, {
-      method: "PUT",
-      headers: upload.headers,
-      body: blob,
-      ...signal !== void 0 ? { signal } : {}
-    });
-  } catch (error) {
-    throw new TinifyNetworkError(
-      `Upload for client_id "${upload.client_id}" failed: ${error instanceof Error ? error.message : String(error)}`,
-      { cause: error }
-    );
-  }
-  if (!response.ok) {
-    const text = await response.text().catch(() => "");
-    throw new TinifyError(
-      `Upload for client_id "${upload.client_id}" was rejected with HTTP ${response.status}` + (text ? `: ${text.slice(0, 200)}` : ".")
-    );
-  }
-  await response.arrayBuffer().catch(() => void 0);
-}
-
 // src/http.ts
 var RETRYABLE_STATUSES = /* @__PURE__ */ new Set([429, 503]);
 function generateIdempotencyKey() {
@@ -236,6 +138,38 @@ async function throwApiError(response) {
     ...retryAfterMs !== void 0 ? { retryAfter: retryAfterMs / 1e3 } : {}
   });
 }
+function withTimeoutSignal(timeoutMs, signal) {
+  const timeout = AbortSignal.timeout(timeoutMs);
+  if (signal === void 0) return { signal: timeout, timeout };
+  const anyOf = AbortSignal.any;
+  if (typeof anyOf === "function") return { signal: anyOf([signal, timeout]), timeout };
+  const controller = new AbortController();
+  const abortFrom = (src) => controller.abort(src.reason);
+  if (signal.aborted) controller.abort(signal.reason);
+  else if (timeout.aborted) controller.abort(timeout.reason);
+  else {
+    signal.addEventListener("abort", () => abortFrom(signal), { once: true });
+    timeout.addEventListener("abort", () => abortFrom(timeout), { once: true });
+  }
+  return { signal: controller.signal, timeout };
+}
+function asTimeoutError(error, timeoutMs) {
+  if (typeof error === "object" && error !== null && error.name === "TimeoutError") {
+    return new TinifyTimeoutError(`Request timed out after ${timeoutMs} ms.`, timeoutMs);
+  }
+  return error;
+}
+async function fetchWithTimeout(fetchImpl, url, init, timeoutMs, userSignal) {
+  const { signal, timeout } = withTimeoutSignal(timeoutMs, userSignal);
+  try {
+    return await fetchImpl(url, { ...init, signal });
+  } catch (error) {
+    if (timeout.aborted) {
+      throw new TinifyTimeoutError(`Request timed out after ${timeoutMs} ms.`, timeoutMs);
+    }
+    throw error;
+  }
+}
 var HttpClient = class {
   config;
   constructor(config) {
@@ -268,19 +202,21 @@ var HttpClient = class {
       const headers = {
         authorization: `Bearer ${this.config.apiKey}`,
         accept: "application/json",
-        "user-agent": "@tinify-dev/client/0.1.0"
+        "user-agent": "@tinify-dev/client/0.1.1"
       };
       if (idempotencyKey !== void 0) headers["idempotency-key"] = idempotencyKey;
       if (options.contentType !== void 0) headers["content-type"] = options.contentType;
       let response;
       try {
-        response = await this.fetchWithTimeout(
+        response = await fetchWithTimeout(
+          this.config.fetchImpl,
           url,
           {
             method: options.method,
             headers,
             ...options.body !== void 0 ? { body: options.body() } : {}
           },
+          this.config.timeoutMs,
           options.signal
         );
       } catch (error) {
@@ -299,7 +235,8 @@ var HttpClient = class {
       if (RETRYABLE_STATUSES.has(response.status) && attempt < this.config.maxRetries) {
         const retryAfter = parseRetryAfterMs(response.headers.get("retry-after"));
         await response.arrayBuffer().catch(() => void 0);
-        await sleep(retryAfter ?? backoffMs(attempt), options.signal);
+        const wait = Math.min(retryAfter ?? backoffMs(attempt), MAX_RETRY_AFTER_MS);
+        await sleep(wait, options.signal);
         attempt += 1;
         continue;
       }
@@ -315,10 +252,14 @@ var HttpClient = class {
   async requestJson(options) {
     const result = await this.request(options);
     let body;
-    if (result.response.status === 204) {
-      body = void 0;
-    } else {
-      body = await result.response.json();
+    try {
+      if (result.response.status === 204) {
+        body = void 0;
+      } else {
+        body = await result.response.json();
+      }
+    } catch (error) {
+      throw asTimeoutError(error, this.config.timeoutMs);
     }
     const bodyRequestId = body?.request_id;
     return {
@@ -327,29 +268,112 @@ var HttpClient = class {
       rateLimit: result.rateLimit
     };
   }
-  async fetchWithTimeout(url, init, signal) {
-    const controller = new AbortController();
-    const timeoutError = new TinifyTimeoutError(
-      `Request timed out after ${this.config.timeoutMs} ms.`,
-      this.config.timeoutMs
-    );
-    const timer = setTimeout(() => controller.abort(timeoutError), this.config.timeoutMs);
-    const onAbort = () => controller.abort(abortReason(signal));
-    signal?.addEventListener("abort", onAbort, { once: true });
+  /** The configured per-request timeout (ms); used by download/upload paths. */
+  get timeoutMs() {
+    return this.config.timeoutMs;
+  }
+};
+
+// src/inputs.ts
+var DEFAULT_FILENAME = "image";
+async function normalizeInput(input, filename) {
+  if (typeof input === "string") {
+    let fs;
+    let path;
     try {
-      return await this.config.fetchImpl(url, { ...init, signal: controller.signal });
-    } catch (error) {
-      if (error === timeoutError) throw error;
-      if (controller.signal.aborted && controller.signal.reason === timeoutError) {
-        throw timeoutError;
-      }
-      throw error;
-    } finally {
-      clearTimeout(timer);
-      signal?.removeEventListener("abort", onAbort);
+      fs = await import('fs/promises');
+      path = await import('path');
+    } catch {
+      throw new TinifyError(
+        "File path inputs are only supported in Node.js. Pass a Blob or File instead."
+      );
     }
+    const bytes = await fs.readFile(input);
+    return {
+      blob: new Blob([bytesToView(bytes)]),
+      filename: filename ?? path.basename(input)
+    };
   }
-};
+  if (typeof Blob !== "undefined" && input instanceof Blob) {
+    const name = filename ?? (typeof File !== "undefined" && input instanceof File && input.name ? input.name : DEFAULT_FILENAME);
+    return { blob: input, filename: name };
+  }
+  if (input instanceof ArrayBuffer) {
+    return { blob: new Blob([input]), filename: filename ?? DEFAULT_FILENAME };
+  }
+  if (ArrayBuffer.isView(input)) {
+    return {
+      blob: new Blob([bytesToView(input)]),
+      filename: filename ?? DEFAULT_FILENAME
+    };
+  }
+  throw new TypeError(
+    "Unsupported input: expected a file path, Uint8Array, ArrayBuffer, Blob, or File."
+  );
+}
+function bytesToView(view) {
+  const bytes = new Uint8Array(view.buffer, view.byteOffset, view.byteLength);
+  if (bytes.buffer instanceof ArrayBuffer && bytes.byteOffset === 0 && bytes.byteLength === bytes.buffer.byteLength) {
+    return bytes;
+  }
+  const copy = new Uint8Array(new ArrayBuffer(bytes.byteLength));
+  copy.set(bytes);
+  return copy;
+}
+
+// src/batches.ts
+var TERMINAL = new Set(BATCH_TERMINAL_STATUSES);
+function isTerminalBatchStatus(status) {
+  return TERMINAL.has(status);
+}
+async function uploadBatchFiles(fetchImpl, session, files, options, timeoutMs) {
+  const missing = session.uploads.map((upload) => upload.client_id).filter((clientId) => !(clientId in files));
+  if (missing.length > 0) {
+    throw new TinifyError(
+      `Missing input for batch client_id(s): ${missing.join(", ")}. Pass a { client_id: input } record covering every file in the session.`
+    );
+  }
+  const queue = [...session.uploads];
+  const concurrency = Math.max(
+    1,
+    Math.min(options.concurrency ?? DEFAULT_UPLOAD_CONCURRENCY, queue.length)
+  );
+  const workers = Array.from({ length: concurrency }, async () => {
+    for (; ; ) {
+      const upload = queue.shift();
+      if (upload === void 0) return;
+      options.signal?.throwIfAborted();
+      await putOne(fetchImpl, upload, files[upload.client_id], timeoutMs, options.signal);
+    }
+  });
+  await Promise.all(workers);
+}
+async function putOne(fetchImpl, upload, input, timeoutMs, signal) {
+  const { blob } = await normalizeInput(input);
+  let response;
+  try {
+    response = await fetchWithTimeout(
+      fetchImpl,
+      upload.upload_url,
+      { method: "PUT", headers: upload.headers, body: blob },
+      timeoutMs,
+      signal
+    );
+  } catch (error) {
+    if (error instanceof TinifyTimeoutError) throw error;
+    throw new TinifyNetworkError(
+      `Upload for client_id "${upload.client_id}" failed: ${error instanceof Error ? error.message : String(error)}`,
+      { cause: error }
+    );
+  }
+  if (!response.ok) {
+    const text = await response.text().catch(() => "");
+    throw new TinifyError(
+      `Upload for client_id "${upload.client_id}" was rejected with HTTP ${response.status}` + (text ? `: ${text.slice(0, 200)}` : ".")
+    );
+  }
+  await response.arrayBuffer().catch(() => void 0);
+}
 
 // src/client.ts
 var TinifyClient = class {
@@ -453,12 +477,19 @@ var TinifyClient = class {
   async download(resultOrUrl, options = {}) {
     const raw = typeof resultOrUrl === "string" ? resultOrUrl : "download_url" in resultOrUrl ? resultOrUrl.download_url : resultOrUrl.data.download_url;
     const url = new URL(raw, `${this.http.baseUrl}/`).toString();
-    const response = await this.http.fetchImpl(url, {
-      method: "GET",
-      ...options.signal !== void 0 ? { signal: options.signal } : {}
-    });
+    const response = await fetchWithTimeout(
+      this.http.fetchImpl,
+      url,
+      { method: "GET" },
+      this.http.timeoutMs,
+      options.signal
+    );
     if (!response.ok) await throwApiError(response);
-    return response.blob();
+    try {
+      return await response.blob();
+    } catch (error) {
+      throw asTimeoutError(error, this.http.timeoutMs);
+    }
   }
   // -------------------------------------------------------------------------
   // Batches
@@ -483,7 +514,7 @@ var TinifyClient = class {
    * `client_id`. Runs up to `concurrency` (default 4) PUTs in parallel.
    */
   uploadBatchFiles(session, files, options = {}) {
-    return uploadBatchFiles(this.http.fetchImpl, session, files, options);
+    return uploadBatchFiles(this.http.fetchImpl, session, files, options, this.http.timeoutMs);
   }
   /** Commits an uploaded batch for processing. */
   async commitBatch(batchId, options = {}) {
@@ -548,7 +579,11 @@ var TinifyClient = class {
       path: `/api/v1/batches/${encodeURIComponent(batchId)}/archive`,
       ...options.signal !== void 0 ? { signal: options.signal } : {}
     });
-    return result.response.blob();
+    try {
+      return await result.response.blob();
+    } catch (error) {
+      throw asTimeoutError(error, this.http.timeoutMs);
+    }
   }
   // -------------------------------------------------------------------------
   // Internals
@@ -584,7 +619,7 @@ var CliUsageError = class extends Error {
     this.name = "CliUsageError";
   }
 };
-var HELP_TEXT = `tinify-dev \u2014 Tinify.dev image API CLI
+var HELP_TEXT = `tinify-dev - Tinify.dev image API CLI
 
 Usage:
   tinify-dev <command> [options] <files...>