@distilled.cloud/cloudflare 0.2.0-alpha → 0.2.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@distilled.cloud/cloudflare",
-  "version": "0.2.0-alpha",
+  "version": "0.2.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/alchemy-run/distilled",
@@ -57,19 +57,20 @@
     "specs:update": "git -C specs/cloudflare-typescript fetch && git -C specs/cloudflare-typescript checkout main && git -C specs/cloudflare-typescript pull"
   },
   "dependencies": {
-    "@distilled.cloud/core": "0.2.0",
-    "effect": "4.0.0-beta.25"
+    "@distilled.cloud/core": "0.2.0-alpha",
+    "effect": "4.0.0-beta.30"
   },
   "devDependencies": {
-    "@effect/platform-node": "4.0.0-beta.25",
-    "@effect/vitest": "4.0.0-beta.25",
+    "@effect/platform-node": "4.0.0-beta.30",
+    "@effect/vitest": "4.0.0-beta.30",
     "@types/bun": "^1.3.0",
     "@types/node": "^25.3.5",
     "dotenv": "^16.5.0",
+    "typescript": "^5.9.3",
     "vite": "^7.3.1",
     "vitest": "^3.2.3"
   },
   "peerDependencies": {
-    "effect": "4.0.0-beta.25"
+    "effect": "4.0.0-beta.30"
   }
 }

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/api-gateway.ts

@@ -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/zero-trust.ts

@@ -17689,7 +17689,7 @@ export const listDevices: API.OperationMethod<
 }));
 
 // =============================================================================
-// DeviceDevices_
+// DeviceDevice
 // =============================================================================
 
 export interface GetDeviceDevicesRequest {
@@ -17847,7 +17847,7 @@ export const GetDeviceDevicesResponse =
 
 export type GetDeviceDevicesError = DefaultErrors;
 
-export const getDeviceDevices_: API.OperationMethod<
+export const getDeviceDevices: API.OperationMethod<
   GetDeviceDevicesRequest,
   GetDeviceDevicesResponse,
   GetDeviceDevicesError,
@@ -17858,79 +17858,7 @@ export const getDeviceDevices_: API.OperationMethod<
   errors: [],
 }));
 
-export interface DeleteDeviceDevicesRequest {
-  deviceId: string;
-  accountId: string;
-}
-
-export const DeleteDeviceDevicesRequest =
-  /*@__PURE__*/ /*#__PURE__*/ Schema.Struct({
-    deviceId: Schema.String.pipe(T.HttpPath("deviceId")),
-    accountId: Schema.String.pipe(T.HttpPath("account_id")),
-  }).pipe(
-    T.Http({
-      method: "DELETE",
-      path: "/accounts/{account_id}/devices/physical-devices/{deviceId}",
-    }),
-  ) as unknown as Schema.Schema<DeleteDeviceDevicesRequest>;
-
-export type DeleteDeviceDevicesResponse = unknown;
-
-export const DeleteDeviceDevicesResponse =
-  /*@__PURE__*/ /*#__PURE__*/ Schema.Unknown as unknown as Schema.Schema<DeleteDeviceDevicesResponse>;
-
-export type DeleteDeviceDevicesError = DefaultErrors;
-
-export const deleteDeviceDevices_: API.OperationMethod<
-  DeleteDeviceDevicesRequest,
-  DeleteDeviceDevicesResponse,
-  DeleteDeviceDevicesError,
-  Credentials | HttpClient.HttpClient
-> = /*@__PURE__*/ /*#__PURE__*/ API.make(() => ({
-  input: DeleteDeviceDevicesRequest,
-  output: DeleteDeviceDevicesResponse,
-  errors: [],
-}));
-
-export interface RevokeDeviceDevicesRequest {
-  deviceId: string;
-  accountId: string;
-}
-
-export const RevokeDeviceDevicesRequest =
-  /*@__PURE__*/ /*#__PURE__*/ Schema.Struct({
-    deviceId: Schema.String.pipe(T.HttpPath("deviceId")),
-    accountId: Schema.String.pipe(T.HttpPath("account_id")),
-  }).pipe(
-    T.Http({
-      method: "POST",
-      path: "/accounts/{account_id}/devices/physical-devices/{deviceId}/revoke",
-    }),
-  ) as unknown as Schema.Schema<RevokeDeviceDevicesRequest>;
-
-export type RevokeDeviceDevicesResponse = unknown;
-
-export const RevokeDeviceDevicesResponse =
-  /*@__PURE__*/ /*#__PURE__*/ Schema.Unknown as unknown as Schema.Schema<RevokeDeviceDevicesResponse>;
-
-export type RevokeDeviceDevicesError = DefaultErrors;
-
-export const revokeDeviceDevices_: API.OperationMethod<
-  RevokeDeviceDevicesRequest,
-  RevokeDeviceDevicesResponse,
-  RevokeDeviceDevicesError,
-  Credentials | HttpClient.HttpClient
-> = /*@__PURE__*/ /*#__PURE__*/ API.make(() => ({
-  input: RevokeDeviceDevicesRequest,
-  output: RevokeDeviceDevicesResponse,
-  errors: [],
-}));
-
-// =============================================================================
-// DeviceDevicesS
-// =============================================================================
-
-export interface ListDeviceDevicesSRequest {
+export interface ListDeviceDevicesRequest {
   /** Path param: */
   accountId: string;
   /** Query param: Filter by a one or more device IDs. */
@@ -17960,7 +17888,7 @@ export interface ListDeviceDevicesSRequest {
   sortOrder?: "asc" | "desc";
 }
 
-export const ListDeviceDevicesSRequest =
+export const ListDeviceDevicesRequest =
   /*@__PURE__*/ /*#__PURE__*/ Schema.Struct({
     accountId: Schema.String.pipe(T.HttpPath("account_id")),
     id: Schema.optional(Schema.Array(Schema.String)).pipe(T.HttpQuery("id")),
@@ -17995,9 +17923,9 @@ export const ListDeviceDevicesSRequest =
       method: "GET",
       path: "/accounts/{account_id}/devices/physical-devices",
     }),
-  ) as unknown as Schema.Schema<ListDeviceDevicesSRequest>;
+  ) as unknown as Schema.Schema<ListDeviceDevicesRequest>;
 
-export type ListDeviceDevicesSResponse = {
+export type ListDeviceDevicesResponse = {
   id: string;
   activeRegistrations: number;
   createdAt: string;
@@ -18031,7 +17959,7 @@ export type ListDeviceDevicesSResponse = {
   serialNumber?: string | null;
 }[];
 
-export const ListDeviceDevicesSResponse =
+export const ListDeviceDevicesResponse =
   /*@__PURE__*/ /*#__PURE__*/ Schema.Array(
     Schema.Struct({
       id: Schema.String,
@@ -18115,18 +18043,86 @@ export const ListDeviceDevicesSResponse =
         serialNumber: "serial_number",
       }),
     ),
-  ) as unknown as Schema.Schema<ListDeviceDevicesSResponse>;
+  ) as unknown as Schema.Schema<ListDeviceDevicesResponse>;
+
+export type ListDeviceDevicesError = DefaultErrors;
+
+export const listDeviceDevices: API.OperationMethod<
+  ListDeviceDevicesRequest,
+  ListDeviceDevicesResponse,
+  ListDeviceDevicesError,
+  Credentials | HttpClient.HttpClient
+> = /*@__PURE__*/ /*#__PURE__*/ API.make(() => ({
+  input: ListDeviceDevicesRequest,
+  output: ListDeviceDevicesResponse,
+  errors: [],
+}));
+
+export interface DeleteDeviceDevicesRequest {
+  deviceId: string;
+  accountId: string;
+}
+
+export const DeleteDeviceDevicesRequest =
+  /*@__PURE__*/ /*#__PURE__*/ Schema.Struct({
+    deviceId: Schema.String.pipe(T.HttpPath("deviceId")),
+    accountId: Schema.String.pipe(T.HttpPath("account_id")),
+  }).pipe(
+    T.Http({
+      method: "DELETE",
+      path: "/accounts/{account_id}/devices/physical-devices/{deviceId}",
+    }),
+  ) as unknown as Schema.Schema<DeleteDeviceDevicesRequest>;
 
-export type ListDeviceDevicesSError = DefaultErrors;
+export type DeleteDeviceDevicesResponse = unknown;
 
-export const listDeviceDevicesS: API.OperationMethod<
-  ListDeviceDevicesSRequest,
-  ListDeviceDevicesSResponse,
-  ListDeviceDevicesSError,
+export const DeleteDeviceDevicesResponse =
+  /*@__PURE__*/ /*#__PURE__*/ Schema.Unknown as unknown as Schema.Schema<DeleteDeviceDevicesResponse>;
+
+export type DeleteDeviceDevicesError = DefaultErrors;
+
+export const deleteDeviceDevices: API.OperationMethod<
+  DeleteDeviceDevicesRequest,
+  DeleteDeviceDevicesResponse,
+  DeleteDeviceDevicesError,
   Credentials | HttpClient.HttpClient
 > = /*@__PURE__*/ /*#__PURE__*/ API.make(() => ({
-  input: ListDeviceDevicesSRequest,
-  output: ListDeviceDevicesSResponse,
+  input: DeleteDeviceDevicesRequest,
+  output: DeleteDeviceDevicesResponse,
+  errors: [],
+}));
+
+export interface RevokeDeviceDevicesRequest {
+  deviceId: string;
+  accountId: string;
+}
+
+export const RevokeDeviceDevicesRequest =
+  /*@__PURE__*/ /*#__PURE__*/ Schema.Struct({
+    deviceId: Schema.String.pipe(T.HttpPath("deviceId")),
+    accountId: Schema.String.pipe(T.HttpPath("account_id")),
+  }).pipe(
+    T.Http({
+      method: "POST",
+      path: "/accounts/{account_id}/devices/physical-devices/{deviceId}/revoke",
+    }),
+  ) as unknown as Schema.Schema<RevokeDeviceDevicesRequest>;
+
+export type RevokeDeviceDevicesResponse = unknown;
+
+export const RevokeDeviceDevicesResponse =
+  /*@__PURE__*/ /*#__PURE__*/ Schema.Unknown as unknown as Schema.Schema<RevokeDeviceDevicesResponse>;
+
+export type RevokeDeviceDevicesError = DefaultErrors;
+
+export const revokeDeviceDevices: API.OperationMethod<
+  RevokeDeviceDevicesRequest,
+  RevokeDeviceDevicesResponse,
+  RevokeDeviceDevicesError,
+  Credentials | HttpClient.HttpClient
+> = /*@__PURE__*/ /*#__PURE__*/ API.make(() => ({
+  input: RevokeDeviceDevicesRequest,
+  output: RevokeDeviceDevicesResponse,
   errors: [],
 }));