@distilled.cloud/cloudflare 0.2.0-alpha → 0.2.4

package/src/client/api.ts

@@ -14,10 +14,54 @@ import {
   type OperationMethod,
   type PaginatedOperationMethod,
 } from "@distilled.cloud/core/client";
-import { CloudflareHttpError, UnknownCloudflareError } from "../errors.ts";
+import {
+  CloudflareHttpError,
+  HTTP_STATUS_MAP,
+  InternalServerError,
+  TooManyRequests,
+  UnknownCloudflareError,
+} from "../errors.ts";
 import { Credentials } from "../credentials.ts";
 import { type ErrorMatcher, getErrorMatchers } from "../traits.ts";
 
+// ============================================================================
+// Global Cloudflare error codes
+// ============================================================================
+
+/**
+ * Cloudflare error codes that map to global/default errors regardless of operation.
+ * These are infrastructure-level errors that can occur on any endpoint.
+ */
+const GLOBAL_ERROR_CODE_MAP: Record<number, (message: string) => unknown> = {
+  // "Please wait and consider throttling your request speed"
+  971: (message) => new TooManyRequests({ message }),
+};
+
+/**
+ * Create an appropriate error for an HTTP status code.
+ *
+ * For status codes in HTTP_STATUS_MAP (400, 401, 500, 502, 503, 504, etc.),
+ * returns the properly categorized error (with retry categories for 5xx).
+ * For unmapped 5xx codes (e.g., Cloudflare-specific 520-530), returns a
+ * CloudflareHttpError so the status is preserved.
+ */
+function httpStatusError(status: number, body?: string): unknown {
+  const ErrorClass = HTTP_STATUS_MAP[status as keyof typeof HTTP_STATUS_MAP];
+  if (ErrorClass) {
+    return new ErrorClass({ message: body ?? String(status) });
+  }
+  // For unmapped 5xx codes (e.g., Cloudflare-specific 520-530), use
+  // InternalServerError so they get ServerError + Retryable categories
+  if (status >= 500) {
+    return new InternalServerError({ message: body ?? String(status) });
+  }
+  return new CloudflareHttpError({
+    status,
+    statusText: String(status),
+    body,
+  });
+}
+
 export type { OperationMethod, PaginatedOperationMethod };
 
 // ============================================================================
@@ -123,12 +167,18 @@ const matchError = (
   errorBody: unknown,
   errors?: readonly ApiErrorClass[],
 ): Effect.Effect<never, unknown> => {
-  // Handle non-JSON error responses (e.g., HTML from malformed URLs)
+  // Handle non-JSON error responses (e.g., HTML from malformed URLs, 520 pages)
   const isNonJsonError =
     typeof errorBody === "object" &&
     errorBody !== null &&
     "_nonJsonError" in errorBody;
   if (isNonJsonError) {
+    // For 5xx errors, return a properly categorized error so retries work
+    if (status >= 500) {
+      return Effect.fail(
+        httpStatusError(status, String((errorBody as any).body)),
+      );
+    }
     return Effect.fail(
       new CloudflareHttpError({
         status,
@@ -165,12 +215,17 @@ const matchError = (
 
   if (!isEnvelope) {
     // Not a Cloudflare envelope — HTTP-level error
+    // For 5xx errors, return a properly categorized error so retries work
+    const bodyStr =
+      typeof errorBody === "string" ? errorBody : JSON.stringify(errorBody);
+    if (status >= 500) {
+      return Effect.fail(httpStatusError(status, bodyStr));
+    }
     return Effect.fail(
       new CloudflareHttpError({
         status,
         statusText: String(status),
-        body:
-          typeof errorBody === "string" ? errorBody : JSON.stringify(errorBody),
+        body: bodyStr,
       }),
     );
   }
@@ -221,6 +276,11 @@ const matchError = (
     }
   }
 
+  // Check global error codes before falling through to unknown
+  if (errorCode !== undefined && errorCode in GLOBAL_ERROR_CODE_MAP) {
+    return Effect.fail(GLOBAL_ERROR_CODE_MAP[errorCode](errorMessage));
+  }
+
   // No match — return unknown Cloudflare error
   return Effect.fail(
     new UnknownCloudflareError({

package/src/errors.ts

@@ -2,10 +2,12 @@
  * Cloudflare-specific error types.
  */
 export {
+  BadGateway,
   BadRequest,
   Conflict,
   ConfigError,
   Forbidden,
+  GatewayTimeout,
   InternalServerError,
   NotFound,
   ServiceUnavailable,
@@ -21,16 +23,6 @@ export type { DefaultErrors } from "@distilled.cloud/core/errors";
 import * as Schema from "effect/Schema";
 import * as Category from "@distilled.cloud/core/category";
 
-// Generic Cloudflare API Error
-export class CloudflareApiError extends Schema.TaggedErrorClass<CloudflareApiError>()(
-  "CloudflareApiError",
-  {
-    code: Schema.optional(Schema.Number),
-    message: Schema.optional(Schema.String),
-    body: Schema.Unknown,
-  },
-).pipe(Category.withServerError) {}
-
 // Schema parse error wrapper
 export class CloudflareParseError extends Schema.TaggedErrorClass<CloudflareParseError>()(
   "CloudflareParseError",

package/src/services/abuse-reports.ts

@@ -8,9 +8,9 @@
 import * as Schema from "effect/Schema";
 import type * as HttpClient from "effect/unstable/http/HttpClient";
 import * as API from "../client/api.ts";
-import * as T from "../traits";
-import type { Credentials } from "../credentials";
-import { type DefaultErrors } from "../errors";
+import * as T from "../traits.ts";
+import type { Credentials } from "../credentials.ts";
+import { type DefaultErrors } from "../errors.ts";
 
 // =============================================================================
 // Errors

package/src/services/accounts.ts

@@ -8,9 +8,9 @@
 import * as Schema from "effect/Schema";
 import type * as HttpClient from "effect/unstable/http/HttpClient";
 import * as API from "../client/api.ts";
-import * as T from "../traits";
-import type { Credentials } from "../credentials";
-import { type DefaultErrors } from "../errors";
+import * as T from "../traits.ts";
+import type { Credentials } from "../credentials.ts";
+import { type DefaultErrors } from "../errors.ts";
 
 // =============================================================================
 // Errors

package/src/services/acm.ts

@@ -8,9 +8,9 @@
 import * as Schema from "effect/Schema";
 import type * as HttpClient from "effect/unstable/http/HttpClient";
 import * as API from "../client/api.ts";
-import * as T from "../traits";
-import type { Credentials } from "../credentials";
-import { type DefaultErrors } from "../errors";
+import * as T from "../traits.ts";
+import type { Credentials } from "../credentials.ts";
+import { type DefaultErrors } from "../errors.ts";
 
 // =============================================================================
 // Errors

package/src/services/addressing.ts

@@ -8,9 +8,9 @@
 import * as Schema from "effect/Schema";
 import type * as HttpClient from "effect/unstable/http/HttpClient";
 import * as API from "../client/api.ts";
-import * as T from "../traits";
-import type { Credentials } from "../credentials";
-import { type DefaultErrors } from "../errors";
+import * as T from "../traits.ts";
+import type { Credentials } from "../credentials.ts";
+import { type DefaultErrors } from "../errors.ts";
 
 // =============================================================================
 // Errors

package/src/services/ai-gateway.ts

@@ -8,9 +8,9 @@
 import * as Schema from "effect/Schema";
 import type * as HttpClient from "effect/unstable/http/HttpClient";
 import * as API from "../client/api.ts";
-import * as T from "../traits";
-import type { Credentials } from "../credentials";
-import { type DefaultErrors } from "../errors";
+import * as T from "../traits.ts";
+import type { Credentials } from "../credentials.ts";
+import { type DefaultErrors } from "../errors.ts";
 
 // =============================================================================
 // Errors

package/src/services/ai.ts

@@ -8,10 +8,10 @@
 import * as Schema from "effect/Schema";
 import type * as HttpClient from "effect/unstable/http/HttpClient";
 import * as API from "../client/api.ts";
-import * as T from "../traits";
-import type { Credentials } from "../credentials";
-import { type DefaultErrors } from "../errors";
-import { UploadableSchema } from "../schemas";
+import * as T from "../traits.ts";
+import type { Credentials } from "../credentials.ts";
+import { type DefaultErrors } from "../errors.ts";
+import { UploadableSchema } from "../schemas.ts";
 
 // =============================================================================
 // Errors

package/src/services/aisearch.ts

@@ -8,9 +8,9 @@
 import * as Schema from "effect/Schema";
 import type * as HttpClient from "effect/unstable/http/HttpClient";
 import * as API from "../client/api.ts";
-import * as T from "../traits";
-import type { Credentials } from "../credentials";
-import { type DefaultErrors } from "../errors";
+import * as T from "../traits.ts";
+import type { Credentials } from "../credentials.ts";
+import { type DefaultErrors } from "../errors.ts";
 
 // =============================================================================
 // Errors

package/src/services/alerting.ts

@@ -8,9 +8,9 @@
 import * as Schema from "effect/Schema";
 import type * as HttpClient from "effect/unstable/http/HttpClient";
 import * as API from "../client/api.ts";
-import * as T from "../traits";
-import type { Credentials } from "../credentials";
-import { type DefaultErrors } from "../errors";
+import * as T from "../traits.ts";
+import type { Credentials } from "../credentials.ts";
+import { type DefaultErrors } from "../errors.ts";
 
 // =============================================================================
 // Errors

package/src/services/api-gateway.ts

@@ -8,10 +8,10 @@
 import * as Schema from "effect/Schema";
 import type * as HttpClient from "effect/unstable/http/HttpClient";
 import * as API from "../client/api.ts";
-import * as T from "../traits";
-import type { Credentials } from "../credentials";
-import { type DefaultErrors } from "../errors";
-import { UploadableSchema } from "../schemas";
+import * as T from "../traits.ts";
+import type { Credentials } from "../credentials.ts";
+import { type DefaultErrors } from "../errors.ts";
+import { UploadableSchema } from "../schemas.ts";
 
 // =============================================================================
 // Errors
@@ -27,7 +27,7 @@ export class NotEntitled extends Schema.TaggedErrorClass<NotEntitled>()(
   "NotEntitled",
   { code: Schema.Number, message: Schema.String },
 ) {}
-T.applyErrorMatchers(NotEntitled, [{ code: 10403 }]);
+T.applyErrorMatchers(NotEntitled, [{ code: 10403 }, { code: 10404 }]);
 
 export class OperationNotFound extends Schema.TaggedErrorClass<OperationNotFound>()(
   "OperationNotFound",

package/src/services/argo.ts

@@ -8,9 +8,9 @@
 import * as Schema from "effect/Schema";
 import type * as HttpClient from "effect/unstable/http/HttpClient";
 import * as API from "../client/api.ts";
-import * as T from "../traits";
-import type { Credentials } from "../credentials";
-import { type DefaultErrors } from "../errors";
+import * as T from "../traits.ts";
+import type { Credentials } from "../credentials.ts";
+import { type DefaultErrors } from "../errors.ts";
 
 // =============================================================================
 // Errors

package/src/services/audit-logs.ts

@@ -8,9 +8,9 @@
 import * as Schema from "effect/Schema";
 import type * as HttpClient from "effect/unstable/http/HttpClient";
 import * as API from "../client/api.ts";
-import * as T from "../traits";
-import type { Credentials } from "../credentials";
-import { type DefaultErrors } from "../errors";
+import * as T from "../traits.ts";
+import type { Credentials } from "../credentials.ts";
+import { type DefaultErrors } from "../errors.ts";
 
 // =============================================================================
 // AuditLog

package/src/services/billing.ts

@@ -8,9 +8,9 @@
 import * as Schema from "effect/Schema";
 import type * as HttpClient from "effect/unstable/http/HttpClient";
 import * as API from "../client/api.ts";
-import * as T from "../traits";
-import type { Credentials } from "../credentials";
-import { type DefaultErrors } from "../errors";
+import * as T from "../traits.ts";
+import type { Credentials } from "../credentials.ts";
+import { type DefaultErrors } from "../errors.ts";
 
 // =============================================================================
 // Profile

package/src/services/bot-management.ts

@@ -8,9 +8,9 @@
 import * as Schema from "effect/Schema";
 import type * as HttpClient from "effect/unstable/http/HttpClient";
 import * as API from "../client/api.ts";
-import * as T from "../traits";
-import type { Credentials } from "../credentials";
-import { type DefaultErrors } from "../errors";
+import * as T from "../traits.ts";
+import type { Credentials } from "../credentials.ts";
+import { type DefaultErrors } from "../errors.ts";
 
 // =============================================================================
 // BotManagement

package/src/services/botnet-feed.ts

@@ -8,9 +8,9 @@
 import * as Schema from "effect/Schema";
 import type * as HttpClient from "effect/unstable/http/HttpClient";
 import * as API from "../client/api.ts";
-import * as T from "../traits";
-import type { Credentials } from "../credentials";
-import { type DefaultErrors } from "../errors";
+import * as T from "../traits.ts";
+import type { Credentials } from "../credentials.ts";
+import { type DefaultErrors } from "../errors.ts";
 
 // =============================================================================
 // ConfigAsn

package/src/services/brand-protection.ts

@@ -8,10 +8,10 @@
 import * as Schema from "effect/Schema";
 import type * as HttpClient from "effect/unstable/http/HttpClient";
 import * as API from "../client/api.ts";
-import * as T from "../traits";
-import type { Credentials } from "../credentials";
-import { type DefaultErrors } from "../errors";
-import { UploadableSchema } from "../schemas";
+import * as T from "../traits.ts";
+import type { Credentials } from "../credentials.ts";
+import { type DefaultErrors } from "../errors.ts";
+import { UploadableSchema } from "../schemas.ts";
 
 // =============================================================================
 // BrandProtection

package/src/services/browser-rendering.ts

@@ -8,9 +8,9 @@
 import * as Schema from "effect/Schema";
 import type * as HttpClient from "effect/unstable/http/HttpClient";
 import * as API from "../client/api.ts";
-import * as T from "../traits";
-import type { Credentials } from "../credentials";
-import { type DefaultErrors } from "../errors";
+import * as T from "../traits.ts";
+import type { Credentials } from "../credentials.ts";
+import { type DefaultErrors } from "../errors.ts";
 
 // =============================================================================
 // Content

package/src/services/cache.ts

@@ -8,9 +8,9 @@
 import * as Schema from "effect/Schema";
 import type * as HttpClient from "effect/unstable/http/HttpClient";
 import * as API from "../client/api.ts";
-import * as T from "../traits";
-import type { Credentials } from "../credentials";
-import { type DefaultErrors } from "../errors";
+import * as T from "../traits.ts";
+import type { Credentials } from "../credentials.ts";
+import { type DefaultErrors } from "../errors.ts";
 
 // =============================================================================
 // Cache

package/src/services/calls.ts

@@ -8,9 +8,9 @@
 import * as Schema from "effect/Schema";
 import type * as HttpClient from "effect/unstable/http/HttpClient";
 import * as API from "../client/api.ts";
-import * as T from "../traits";
-import type { Credentials } from "../credentials";
-import { type DefaultErrors } from "../errors";
+import * as T from "../traits.ts";
+import type { Credentials } from "../credentials.ts";
+import { type DefaultErrors } from "../errors.ts";
 
 // =============================================================================
 // Sfu

package/src/services/certificate-authorities.ts

@@ -8,9 +8,9 @@
 import * as Schema from "effect/Schema";
 import type * as HttpClient from "effect/unstable/http/HttpClient";
 import * as API from "../client/api.ts";
-import * as T from "../traits";
-import type { Credentials } from "../credentials";
-import { type DefaultErrors } from "../errors";
+import * as T from "../traits.ts";
+import type { Credentials } from "../credentials.ts";
+import { type DefaultErrors } from "../errors.ts";
 
 // =============================================================================
 // HostnameAssociation

package/src/services/client-certificates.ts

@@ -8,9 +8,9 @@
 import * as Schema from "effect/Schema";
 import type * as HttpClient from "effect/unstable/http/HttpClient";
 import * as API from "../client/api.ts";
-import * as T from "../traits";
-import type { Credentials } from "../credentials";
-import { type DefaultErrors } from "../errors";
+import * as T from "../traits.ts";
+import type { Credentials } from "../credentials.ts";
+import { type DefaultErrors } from "../errors.ts";
 
 // =============================================================================
 // ClientCertificate

package/src/services/cloud-connector.ts

@@ -8,9 +8,9 @@
 import * as Schema from "effect/Schema";
 import type * as HttpClient from "effect/unstable/http/HttpClient";
 import * as API from "../client/api.ts";
-import * as T from "../traits";
-import type { Credentials } from "../credentials";
-import { type DefaultErrors } from "../errors";
+import * as T from "../traits.ts";
+import type { Credentials } from "../credentials.ts";
+import { type DefaultErrors } from "../errors.ts";
 
 // =============================================================================
 // Rule

package/src/services/cloudforce-one.ts

@@ -8,10 +8,10 @@
 import * as Schema from "effect/Schema";
 import type * as HttpClient from "effect/unstable/http/HttpClient";
 import * as API from "../client/api.ts";
-import * as T from "../traits";
-import type { Credentials } from "../credentials";
-import { type DefaultErrors } from "../errors";
-import { UploadableSchema } from "../schemas";
+import * as T from "../traits.ts";
+import type { Credentials } from "../credentials.ts";
+import { type DefaultErrors } from "../errors.ts";
+import { UploadableSchema } from "../schemas.ts";
 
 // =============================================================================
 // BinaryStorage

package/src/services/connectivity.ts

@@ -8,9 +8,9 @@
 import * as Schema from "effect/Schema";
 import type * as HttpClient from "effect/unstable/http/HttpClient";
 import * as API from "../client/api.ts";
-import * as T from "../traits";
-import type { Credentials } from "../credentials";
-import { type DefaultErrors } from "../errors";
+import * as T from "../traits.ts";
+import type { Credentials } from "../credentials.ts";
+import { type DefaultErrors } from "../errors.ts";
 
 // =============================================================================
 // DirectoryService

package/src/services/content-scanning.ts

@@ -8,9 +8,9 @@
 import * as Schema from "effect/Schema";
 import type * as HttpClient from "effect/unstable/http/HttpClient";
 import * as API from "../client/api.ts";
-import * as T from "../traits";
-import type { Credentials } from "../credentials";
-import { type DefaultErrors } from "../errors";
+import * as T from "../traits.ts";
+import type { Credentials } from "../credentials.ts";
+import { type DefaultErrors } from "../errors.ts";
 
 // =============================================================================
 // ContentScanning

package/src/services/custom-certificates.ts

@@ -8,9 +8,9 @@
 import * as Schema from "effect/Schema";
 import type * as HttpClient from "effect/unstable/http/HttpClient";
 import * as API from "../client/api.ts";
-import * as T from "../traits";
-import type { Credentials } from "../credentials";
-import { type DefaultErrors } from "../errors";
+import * as T from "../traits.ts";
+import type { Credentials } from "../credentials.ts";
+import { type DefaultErrors } from "../errors.ts";
 
 // =============================================================================
 // CustomCertificate

package/src/services/custom-hostnames.ts

@@ -8,9 +8,9 @@
 import * as Schema from "effect/Schema";
 import type * as HttpClient from "effect/unstable/http/HttpClient";
 import * as API from "../client/api.ts";
-import * as T from "../traits";
-import type { Credentials } from "../credentials";
-import { type DefaultErrors } from "../errors";
+import * as T from "../traits.ts";
+import type { Credentials } from "../credentials.ts";
+import { type DefaultErrors } from "../errors.ts";
 
 // =============================================================================
 // CertificatePackCertificate

package/src/services/custom-nameservers.ts

@@ -8,9 +8,9 @@
 import * as Schema from "effect/Schema";
 import type * as HttpClient from "effect/unstable/http/HttpClient";
 import * as API from "../client/api.ts";
-import * as T from "../traits";
-import type { Credentials } from "../credentials";
-import { type DefaultErrors } from "../errors";
+import * as T from "../traits.ts";
+import type { Credentials } from "../credentials.ts";
+import { type DefaultErrors } from "../errors.ts";
 
 // =============================================================================
 // CustomNameserver

package/src/services/custom-pages.ts

@@ -8,9 +8,9 @@
 import * as Schema from "effect/Schema";
 import type * as HttpClient from "effect/unstable/http/HttpClient";
 import * as API from "../client/api.ts";
-import * as T from "../traits";
-import type { Credentials } from "../credentials";
-import { type DefaultErrors } from "../errors";
+import * as T from "../traits.ts";
+import type { Credentials } from "../credentials.ts";
+import { type DefaultErrors } from "../errors.ts";
 
 // =============================================================================
 // CustomPage

package/src/services/d1.ts

@@ -8,9 +8,9 @@
 import * as Schema from "effect/Schema";
 import type * as HttpClient from "effect/unstable/http/HttpClient";
 import * as API from "../client/api.ts";
-import * as T from "../traits";
-import type { Credentials } from "../credentials";
-import { type DefaultErrors } from "../errors";
+import * as T from "../traits.ts";
+import type { Credentials } from "../credentials.ts";
+import { type DefaultErrors } from "../errors.ts";
 
 // =============================================================================
 // Errors

package/src/services/dcv-delegation.ts

@@ -8,9 +8,9 @@
 import * as Schema from "effect/Schema";
 import type * as HttpClient from "effect/unstable/http/HttpClient";
 import * as API from "../client/api.ts";
-import * as T from "../traits";
-import type { Credentials } from "../credentials";
-import { type DefaultErrors } from "../errors";
+import * as T from "../traits.ts";
+import type { Credentials } from "../credentials.ts";
+import { type DefaultErrors } from "../errors.ts";
 
 // =============================================================================
 // DCVDelegation

package/src/services/diagnostics.ts

@@ -8,9 +8,9 @@
 import * as Schema from "effect/Schema";
 import type * as HttpClient from "effect/unstable/http/HttpClient";
 import * as API from "../client/api.ts";
-import * as T from "../traits";
-import type { Credentials } from "../credentials";
-import { type DefaultErrors } from "../errors";
+import * as T from "../traits.ts";
+import type { Credentials } from "../credentials.ts";
+import { type DefaultErrors } from "../errors.ts";
 
 // =============================================================================
 // EndpointHealthcheck

package/src/services/dns-firewall.ts

@@ -8,9 +8,9 @@
 import * as Schema from "effect/Schema";
 import type * as HttpClient from "effect/unstable/http/HttpClient";
 import * as API from "../client/api.ts";
-import * as T from "../traits";
-import type { Credentials } from "../credentials";
-import { type DefaultErrors } from "../errors";
+import * as T from "../traits.ts";
+import type { Credentials } from "../credentials.ts";
+import { type DefaultErrors } from "../errors.ts";
 
 // =============================================================================
 // AnalyticReport

package/src/services/dns.ts

@@ -8,9 +8,9 @@
 import * as Schema from "effect/Schema";
 import type * as HttpClient from "effect/unstable/http/HttpClient";
 import * as API from "../client/api.ts";
-import * as T from "../traits";
-import type { Credentials } from "../credentials";
-import { type DefaultErrors } from "../errors";
+import * as T from "../traits.ts";
+import type { Credentials } from "../credentials.ts";
+import { type DefaultErrors } from "../errors.ts";
 
 // =============================================================================
 // AnalyticReport

package/src/services/durable-objects.ts

@@ -8,9 +8,9 @@
 import * as Schema from "effect/Schema";
 import type * as HttpClient from "effect/unstable/http/HttpClient";
 import * as API from "../client/api.ts";
-import * as T from "../traits";
-import type { Credentials } from "../credentials";
-import { type DefaultErrors } from "../errors";
+import * as T from "../traits.ts";
+import type { Credentials } from "../credentials.ts";
+import { type DefaultErrors } from "../errors.ts";
 
 // =============================================================================
 // Errors