@paragraphcms/client 2.1.0 → 2.2.0

package/README.md

@@ -10,7 +10,9 @@ Replace this block with the README image.
 </p>
 -->
 
-`@paragraphcms/client` is a small, typed SDK built on top of the standard Fetch API. It runs in Node.js 18+ and other server-side runtimes that expose `fetch`.
+`@paragraphcms/client` is a small, typed SDK for the Paragraph CMS API. It runs in Node.js 18+ and other server-side runtimes that expose `fetch`.
+
+Internally, the client uses `ky` for HTTP transport and retries, plus `Bottleneck` for per-instance rate limiting.
 
 ## Install
 

package/dist/client.d.ts

@@ -1,11 +1,10 @@
 import type { AiContentResult, AiMetaDescriptionResult, AiMetaNameResult, ApiInfo, ClientOptions, Collection, CollectionListQuery, CollectionMutationResult, CreateCollectionRequest, CreateDataModelRequest, CreateLabelRequest, CreateLocaleRequest, CreatePageRequest, CreatePageTranslationRequest, CreateStatusRequest, DataModel, DataModelListQuery, DataModelMutationResult, DeleteByCodeResult, DeleteResult, GenerateContentRequest, GenerateMetaRequest, GetPageQuery, Label, LabelMutationResult, LabelListQuery, ListResponse, Locale, LocaleMutationResult, Media, MediaDeleteResult, MediaDetail, MediaListQuery, MediaMutationResult, MediaUploadResult, Member, MemberListQuery, Page, PageListQuery, PageSummary, PageMutationResult, PageRestoreResult, PermanentDeleteResult, ReorderLabelsRequest, ReorderResult, ReorderStatusesRequest, RequestOptions, Status, StatusListQuery, StatusMutationResult, UpdateCollectionRequest, UpdateDataModelRequest, UpdateLabelRequest, UpdateMediaRequest, UpdatePageRequest, UpdateStatusRequest, UploadMediaRequest } from "./types.js";
 export declare class Client {
     private readonly apiKey;
-    private readonly fetchImpl;
+    private readonly http;
     private readonly defaultHeaders;
     private readonly timeoutMs?;
     private readonly maxRateLimitRetries;
-    private readonly limiter;
     readonly pages: {
         list: (query?: PageListQuery, options?: RequestOptions) => Promise<ListResponse<PageSummary>>;
         create: (body?: CreatePageRequest, options?: RequestOptions) => Promise<PageMutationResult>;

package/dist/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"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"}

package/dist/client.js

@@ -1,15 +1,33 @@
+import ky, { HTTPError, TimeoutError, } from "ky";
 import { ParagraphApiError, ParagraphClientError, } from "./errors.js";
 import { RequestRateLimiter } from "./rate-limiter.js";
 const API_BASE_URL = "https://api.paragraphcms.com/v1";
 const DEFAULT_REQUESTS_PER_SECOND = 5;
-const DEFAULT_RATE_LIMIT_RETRIES = 2;
-const DEFAULT_RATE_LIMIT_RETRY_DELAY_MS = 1000;
+const DEFAULT_RATE_LIMIT_RETRIES = 3;
 const LOOKUP_PAGE_SIZE = 100;
 const PRESERVED_TRANSFORM_KEYS = new Set([
     "content",
     "editorNode",
     "fields",
 ]);
+const RETRYABLE_METHODS = [
+    "get",
+    "post",
+    "patch",
+    "delete",
+];
+const SAFE_TRANSIENT_RETRY_METHODS = new Set([
+    "GET",
+    "DELETE",
+]);
+const RETRYABLE_STATUS_CODES = [
+    429,
+    500,
+    502,
+    503,
+    504,
+];
+const RETRY_AFTER_STATUS_CODES = [429, 503];
 function resolveFetchImplementation(customFetch) {
     const fetchImpl = customFetch ?? globalThis.fetch;
     if (typeof fetchImpl !== "function") {
@@ -111,81 +129,20 @@ function createRequestDescriptor(method, url) {
         url: url.toString(),
     };
 }
-function createRequestSignal(signal, timeoutMs) {
-    if (!signal && (!timeoutMs || timeoutMs <= 0)) {
-        return {
-            signal: undefined,
-            cleanup: () => { },
-            didTimeout: () => false,
-        };
-    }
-    const controller = new AbortController();
-    let timedOut = false;
-    let timeoutId;
-    const onAbort = () => {
-        controller.abort(signal?.reason);
-    };
-    if (signal) {
-        if (signal.aborted) {
-            controller.abort(signal.reason);
-        }
-        else {
-            signal.addEventListener("abort", onAbort, { once: true });
-        }
-    }
-    if (timeoutMs && timeoutMs > 0) {
-        timeoutId = setTimeout(() => {
-            timedOut = true;
-            controller.abort(new Error(`Request timed out after ${timeoutMs}ms.`));
-        }, timeoutMs);
-    }
-    return {
-        signal: controller.signal,
-        cleanup: () => {
-            if (timeoutId !== undefined) {
-                clearTimeout(timeoutId);
-            }
-            if (signal) {
-                signal.removeEventListener("abort", onAbort);
-            }
-        },
-        didTimeout: () => timedOut,
-    };
+function toKyInput(url) {
+    const path = url.pathname
+        .replace(/^\/v1/, "")
+        .replace(/^\/+/, "");
+    return `${path}${url.search}`;
 }
-function waitForDelay(delayMs, signal) {
-    if (delayMs <= 0) {
-        return Promise.resolve();
-    }
-    return new Promise((resolve, reject) => {
-        let timeoutId;
-        const cleanup = () => {
-            if (timeoutId !== undefined) {
-                clearTimeout(timeoutId);
-            }
-            if (signal) {
-                signal.removeEventListener("abort", onAbort);
-            }
-        };
-        const onAbort = () => {
-            cleanup();
-            reject(signal?.reason ??
-                new DOMException("The operation was aborted.", "AbortError"));
-        };
-        if (signal) {
-            if (signal.aborted) {
-                onAbort();
-                return;
-            }
-            signal.addEventListener("abort", onAbort, { once: true });
-        }
-        timeoutId = setTimeout(() => {
-            cleanup();
-            resolve();
-        }, delayMs);
-    });
+function canRetryTransientRequest(method) {
+    return (typeof method === "string" &&
+        SAFE_TRANSIENT_RETRY_METHODS.has(method.toUpperCase()));
 }
 function isAbortError(error) {
-    return (error instanceof DOMException && error.name === "AbortError");
+    return ((error instanceof DOMException &&
+        error.name === "AbortError") ||
+        (error instanceof Error && error.name === "AbortError"));
 }
 function resolveMaxRateLimitRetries(value, fallback = DEFAULT_RATE_LIMIT_RETRIES) {
     const resolved = value ?? fallback;
@@ -195,23 +152,30 @@ function resolveMaxRateLimitRetries(value, fallback = DEFAULT_RATE_LIMIT_RETRIES
     }
     return resolved;
 }
-function parseRetryAfterMs(headerValue) {
-    if (!headerValue) {
-        return undefined;
-    }
-    const seconds = Number(headerValue);
-    if (Number.isFinite(seconds) && seconds >= 0) {
-        return Math.ceil(seconds * 1000);
-    }
-    const retryAt = Date.parse(headerValue);
-    if (Number.isNaN(retryAt)) {
-        return undefined;
-    }
-    return Math.max(0, retryAt - Date.now());
+function resolveTotalTimeout(timeoutMs) {
+    return timeoutMs && timeoutMs > 0 ? timeoutMs : false;
 }
-function resolveRateLimitRetryDelayMs(headers, retryCount) {
-    return (parseRetryAfterMs(headers.get("retry-after")) ??
-        DEFAULT_RATE_LIMIT_RETRY_DELAY_MS * 2 ** retryCount);
+function createRetryOptions(limit) {
+    return {
+        limit,
+        methods: [...RETRYABLE_METHODS],
+        statusCodes: [...RETRYABLE_STATUS_CODES],
+        afterStatusCodes: [...RETRY_AFTER_STATUS_CODES],
+        retryOnTimeout: false,
+        shouldRetry: ({ error }) => {
+            if (error instanceof HTTPError) {
+                if (error.response.status === 429) {
+                    return true;
+                }
+                return canRetryTransientRequest(error.request.method)
+                    ? undefined
+                    : false;
+            }
+            return canRetryTransientRequest(error.request?.method)
+                ? undefined
+                : false;
+        },
+    };
 }
 function toBlobPart(file) {
     if (typeof File !== "undefined" && file instanceof File) {
@@ -300,11 +264,10 @@ function createUploadFormData(input) {
 }
 export class Client {
     apiKey;
-    fetchImpl;
+    http;
     defaultHeaders;
     timeoutMs;
     maxRateLimitRetries;
-    limiter;
     pages = {
         list: (query, options) => this.listPages(query, options),
         create: (body = {}, options) => this.requestData("POST", "/pages", {
@@ -524,11 +487,16 @@ export class Client {
             throw new ParagraphClientError("`apiKey` is required.");
         }
         this.apiKey = options.apiKey.trim();
-        this.fetchImpl = resolveFetchImplementation(options.fetch);
         this.defaultHeaders = new Headers(options.headers);
         this.timeoutMs = options.timeoutMs;
         this.maxRateLimitRetries = resolveMaxRateLimitRetries(options.maxRateLimitRetries);
-        this.limiter = new RequestRateLimiter(options.maxRequestsPerSecond ?? DEFAULT_REQUESTS_PER_SECOND);
+        const fetchImpl = resolveFetchImplementation(options.fetch);
+        const limiter = new RequestRateLimiter(options.maxRequestsPerSecond ?? DEFAULT_REQUESTS_PER_SECOND);
+        this.http = ky.create({
+            fetch: (input, init) => limiter.schedule(() => fetchImpl(input, init)),
+            prefix: API_BASE_URL,
+            timeout: false,
+        });
     }
     getInfo(options) {
         return this.requestData("GET", "", { options });
@@ -651,6 +619,7 @@ export class Client {
     }
     requestJson(method, path, config) {
         const url = buildUrl(path, config?.query);
+        const kyInput = toKyInput(url);
         const request = createRequestDescriptor(method, url);
         const headers = new Headers(this.defaultHeaders);
         const timeoutMs = config?.options?.timeoutMs ?? this.timeoutMs;
@@ -678,27 +647,28 @@ export class Client {
         if (config?.formData) {
             headers.delete("content-type");
         }
-        const requestSignal = createRequestSignal(config?.options?.signal, timeoutMs);
         return (async () => {
-            let retryCount = 0;
             try {
-                const fetchImpl = this.fetchImpl;
-                while (true) {
-                    const response = await this.limiter.schedule(() => fetchImpl(url, {
-                        method,
-                        headers,
-                        body,
-                        signal: requestSignal.signal,
-                    }));
-                    const payload = await parseResponse(response);
-                    if (response.ok) {
-                        return toSdkPayload(payload);
-                    }
-                    const responseHeaders = new Headers(response.headers);
-                    const apiError = isApiErrorPayload(payload)
+                const response = await this.http(kyInput, {
+                    method,
+                    headers,
+                    body,
+                    signal: config?.options?.signal,
+                    timeout: false,
+                    totalTimeout: resolveTotalTimeout(timeoutMs),
+                    retry: createRetryOptions(maxRateLimitRetries),
+                });
+                const payload = await parseResponse(response);
+                return toSdkPayload(payload);
+            }
+            catch (error) {
+                if (error instanceof HTTPError) {
+                    const responseHeaders = new Headers(error.response.headers);
+                    const payload = error.data;
+                    throw isApiErrorPayload(payload)
                         ? new ParagraphApiError({
                             body: toSdkPayload(payload),
-                            status: response.status,
+                            status: error.response.status,
                             code: payload.error.code,
                             message: payload.error.message,
                             details: toSdkPayload(payload.error.details),
@@ -706,32 +676,19 @@ export class Client {
                             request,
                         })
                         : new ParagraphApiError({
-                            status: response.status,
-                            code: response.status === 401
+                            status: error.response.status,
+                            code: error.response.status === 401
                                 ? "unauthorized"
                                 : "requestFailed",
                             message: typeof payload === "string" && payload.length > 0
                                 ? payload
-                                : response.statusText || "Request failed.",
+                                : error.response.statusText ||
+                                    "Request failed.",
                             headers: responseHeaders,
                             request,
                         });
-                    if (response.status === 429 &&
-                        retryCount < maxRateLimitRetries) {
-                        const retryDelayMs = resolveRateLimitRetryDelayMs(responseHeaders, retryCount);
-                        retryCount += 1;
-                        await waitForDelay(retryDelayMs, requestSignal.signal);
-                        continue;
-                    }
-                    throw apiError;
                 }
-            }
-            catch (error) {
-                if (error instanceof ParagraphApiError ||
-                    error instanceof ParagraphClientError) {
-                    throw error;
-                }
-                if (requestSignal.didTimeout()) {
+                if (error instanceof TimeoutError) {
                     throw new ParagraphClientError(`Request timed out after ${timeoutMs}ms.`, {
                         request,
                         cause: error,
@@ -746,9 +703,6 @@ export class Client {
                     cause: error,
                 });
             }
-            finally {
-                requestSignal.cleanup();
-            }
         })();
     }
 }

package/dist/rate-limiter.d.ts

@@ -1,9 +1,6 @@
 export declare class RequestRateLimiter {
-    private readonly minIntervalMs;
-    private nextAvailableAt;
-    private scheduling;
+    private readonly limiter;
     constructor(requestsPerSecond: number);
     schedule<T>(task: () => Promise<T>): Promise<T>;
-    private reserveSlot;
 }
 //# sourceMappingURL=rate-limiter.d.ts.map

package/dist/rate-limiter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rate-limiter.d.ts","sourceRoot":"","sources":["../src/rate-limiter.ts"],"names":[],"mappings":"AAQA,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAS;IACvC,OAAO,CAAC,eAAe,CAAK;IAC5B,OAAO,CAAC,UAAU,CAAoC;gBAE1C,iBAAiB,EAAE,MAAM;IAarC,QAAQ,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC;IAKlC,OAAO,CAAC,WAAW;CAiBpB"}
+{"version":3,"file":"rate-limiter.d.ts","sourceRoot":"","sources":["../src/rate-limiter.ts"],"names":[],"mappings":"AAKA,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAa;gBAEzB,iBAAiB,EAAE,MAAM;IAgBrC,QAAQ,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC;CAGnC"}

package/dist/rate-limiter.js

@@ -1,35 +1,19 @@
+import Bottleneck from "bottleneck";
 import { ParagraphClientError } from "./errors.js";
-function sleep(ms) {
-    return new Promise((resolve) => {
-        setTimeout(resolve, ms);
-    });
-}
+const DEFAULT_MAX_CONCURRENT_REQUESTS = 3;
 export class RequestRateLimiter {
-    minIntervalMs;
-    nextAvailableAt = 0;
-    scheduling = Promise.resolve();
+    limiter;
     constructor(requestsPerSecond) {
         if (!Number.isFinite(requestsPerSecond) ||
             requestsPerSecond <= 0) {
             throw new ParagraphClientError("`maxRequestsPerSecond` must be a positive number.");
         }
-        this.minIntervalMs = Math.ceil(1000 / requestsPerSecond);
+        this.limiter = new Bottleneck({
+            minTime: Math.ceil(1000 / requestsPerSecond),
+            maxConcurrent: DEFAULT_MAX_CONCURRENT_REQUESTS,
+        });
     }
     schedule(task) {
-        const slot = this.reserveSlot();
-        return slot.then(task);
-    }
-    reserveSlot() {
-        const slot = this.scheduling.then(async () => {
-            const now = Date.now();
-            const scheduledAt = Math.max(now, this.nextAvailableAt);
-            const delayMs = scheduledAt - now;
-            this.nextAvailableAt = scheduledAt + this.minIntervalMs;
-            if (delayMs > 0) {
-                await sleep(delayMs);
-            }
-        });
-        this.scheduling = slot.catch(() => { });
-        return slot;
+        return this.limiter.schedule(task);
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paragraphcms/client",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "description": "Official TypeScript client for the Paragraph CMS API.",
   "license": "MIT",
   "author": "Paragraph CMS",
@@ -41,5 +41,9 @@
   ],
   "devDependencies": {
     "typescript": "^5.9.3"
+  },
+  "dependencies": {
+    "bottleneck": "^2.19.5",
+    "ky": "^2.0.2"
   }
 }