@distilled.cloud/cloudflare 1.0.0-rc.11 → 1.0.0-rc.13

package/lib/traits.d.ts

@@ -1,4 +1,4 @@
-import type * as HttpClientError from "effect/unstable/http/HttpClientError";
+import type * as HttpClientError from "effect/http/HttpClientError";
 import type * as Stream from "effect/Stream";
 export { Body, Header, Query, DeepQuery, Label, Http, ResponseCode, HttpBody, FormDataFile, StringEncoded, KeyDictionary, UnionCases, applyErrorMatchers, getErrorMatchers, type HttpTrait, type ErrorMatcher, bodySymbol, headerSymbol, querySymbol, deepQuerySymbol, labelSymbol, httpSymbol, responseCodeSymbol, httpBodySymbol, formDataFileSymbol, stringEncodedSymbol, keyDictionarySymbol, unionCasesSymbol, errorMatchersSymbol, } from "@distilled.cloud/core/trait";
 export declare const envelopePayloadRootSymbol: unique symbol;

package/lib/traits.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"traits.d.ts","sourceRoot":"","sources":["../src/traits.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,KAAK,eAAe,MAAM,sCAAsC,CAAC;AAC7E,OAAO,KAAK,KAAK,MAAM,MAAM,eAAe,CAAC;AAE7C,OAAO,EACL,IAAI,EACJ,MAAM,EACN,KAAK,EACL,SAAS,EACT,KAAK,EACL,IAAI,EACJ,YAAY,EACZ,QAAQ,EACR,YAAY,EACZ,aAAa,EACb,aAAa,EACb,UAAU,EACV,kBAAkB,EAClB,gBAAgB,EAChB,KAAK,SAAS,EACd,KAAK,YAAY,EACjB,UAAU,EACV,YAAY,EACZ,WAAW,EACX,eAAe,EACf,WAAW,EACX,UAAU,EACV,kBAAkB,EAClB,cAAc,EACd,kBAAkB,EAClB,mBAAmB,EACnB,mBAAmB,EACnB,gBAAgB,EAChB,mBAAmB,GACpB,MAAM,6BAA6B,CAAC;AAMrC,eAAO,MAAM,yBAAyB,eAErC,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,mBAAmB,wDACiB,CAAC;AAElD,eAAO,MAAM,gBAAgB,eAE5B,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,UAAU,wDAA+C,CAAC;AAEvE,eAAO,MAAM,qBAAqB,eAEjC,CAAC;AAEF;;;;;;;;;;GAUG;AACH,eAAO,MAAM,eAAe,wDACiB,CAAC;AAE9C,eAAO,MAAM,wBAAwB,eAEpC,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,kBAAkB,wDACiB,CAAC;AAEjD,sDAAsD;AACtD,MAAM,MAAM,kBAAkB,GAAG,MAAM,CAAC,MAAM,CAC5C,UAAU,EACV,eAAe,CAAC,eAAe,CAChC,CAAC"}
+{"version":3,"file":"traits.d.ts","sourceRoot":"","sources":["../src/traits.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,KAAK,eAAe,MAAM,6BAA6B,CAAC;AACpE,OAAO,KAAK,KAAK,MAAM,MAAM,eAAe,CAAC;AAE7C,OAAO,EACL,IAAI,EACJ,MAAM,EACN,KAAK,EACL,SAAS,EACT,KAAK,EACL,IAAI,EACJ,YAAY,EACZ,QAAQ,EACR,YAAY,EACZ,aAAa,EACb,aAAa,EACb,UAAU,EACV,kBAAkB,EAClB,gBAAgB,EAChB,KAAK,SAAS,EACd,KAAK,YAAY,EACjB,UAAU,EACV,YAAY,EACZ,WAAW,EACX,eAAe,EACf,WAAW,EACX,UAAU,EACV,kBAAkB,EAClB,cAAc,EACd,kBAAkB,EAClB,mBAAmB,EACnB,mBAAmB,EACnB,gBAAgB,EAChB,mBAAmB,GACpB,MAAM,6BAA6B,CAAC;AAMrC,eAAO,MAAM,yBAAyB,eAErC,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,mBAAmB,wDACiB,CAAC;AAElD,eAAO,MAAM,gBAAgB,eAE5B,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,UAAU,wDAA+C,CAAC;AAEvE,eAAO,MAAM,qBAAqB,eAEjC,CAAC;AAEF;;;;;;;;;;GAUG;AACH,eAAO,MAAM,eAAe,wDACiB,CAAC;AAE9C,eAAO,MAAM,wBAAwB,eAEpC,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,kBAAkB,wDACiB,CAAC;AAEjD,sDAAsD;AACtD,MAAM,MAAM,kBAAkB,GAAG,MAAM,CAAC,MAAM,CAC5C,UAAU,EACV,eAAe,CAAC,eAAe,CAChC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@distilled.cloud/cloudflare",
-  "version": "1.0.0-rc.11",
+  "version": "1.0.0-rc.13",
   "repository": {
     "type": "git",
     "url": "https://github.com/alchemy-run/distilled",
@@ -513,15 +513,15 @@
     }
   },
   "dependencies": {
-    "@distilled.cloud/core": "1.0.0-rc.11"
+    "@distilled.cloud/core": "1.0.0-rc.13"
   },
   "devDependencies": {
     "@types/bun": "1.3.14",
     "@types/node": "26.2.0",
-    "@effect/platform-bun": ">=4.0.0-rc.115 || >=4.0.0"
+    "@effect/platform-bun": "^4.0.0"
   },
   "peerDependencies": {
-    "effect": ">=4.0.0-rc.115 || >=4.0.0"
+    "effect": "^4.0.0"
   },
   "scripts": {
     "build": "tsc -b",

package/src/index.ts

@@ -15,4 +15,4 @@ export {
 } from "./protocol.ts";
 export { cloudflarePaginate, ResultInfo } from "./pagination.ts";
 export * as Retry from "./retry.ts";
-export * as Services from "./services/index.ts";
+export * from "./services/index.ts";

package/src/protocol.ts

@@ -24,10 +24,10 @@
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
 import type * as AST from "effect/SchemaAST";
-import type * as HttpClient from "effect/unstable/http/HttpClient";
-import type * as HttpClientError from "effect/unstable/http/HttpClientError";
-import type * as HttpClientRequest from "effect/unstable/http/HttpClientRequest";
-import type * as HttpClientResponse from "effect/unstable/http/HttpClientResponse";
+import type * as HttpClient from "effect/http/HttpClient";
+import type * as HttpClientError from "effect/http/HttpClientError";
+import type * as HttpClientRequest from "effect/http/HttpClientRequest";
+import type * as HttpClientResponse from "effect/http/HttpClientResponse";
 import * as API from "@distilled.cloud/core/api";
 import {
   bodySymbol,
@@ -54,6 +54,7 @@ import {
   TooManyRequests,
   Unauthorized,
 } from "@distilled.cloud/core/errors";
+import { validateResponse } from "@distilled.cloud/core/response-validation";
 import {
   parseRetryAfterForStatus,
   parseServerRetryHint,
@@ -67,6 +68,7 @@ import {
 import {
   type CloudflareError,
   CloudflareHttpError,
+  CloudflareParseError,
   type CloudflareRateLimited,
   type DefaultErrors,
   InvalidRoute,
@@ -389,9 +391,12 @@ const makeDecode =
           isTransientAuthBlip ? tagRetryable(error) : error;
 
         // 1. Per-operation typed error (matcher metadata on the class).
-        const typed = matchTypedError(errorClasses, status, [
-          { code: errorCode, message: errorMessage },
-        ]);
+        const typed = matchTypedError(
+          errorClasses,
+          status,
+          [{ code: errorCode, message: errorMessage }],
+          { body: nonJson ? text : json, headers },
+        );
         if (typed !== undefined) {
           return yield* Effect.fail(tagBlip(typed)) as Effect.Effect<never>;
         }
@@ -442,6 +447,16 @@ const makeDecode =
         );
       }
 
+      // Strict mode (core/response-validation) checks the TS-shaped output
+      // against the schema; lenient mode returns it as built.
+      const body: unknown = nonJson ? text : json;
+      const validate = (value: unknown) =>
+        validateResponse(
+          outputAst,
+          value,
+          (cause) => new CloudflareParseError({ body, cause }),
+        ).pipe(Effect.catch(fail));
+
       if (nonJson) json = {};
 
       // Unwrap the envelope: the payload is `result` (fall back to the whole
@@ -459,9 +474,13 @@ const makeDecode =
       // Bare-payload response: the whole value IS the envelope's `result`
       // (array/scalar), returned directly rather than wrapped in a struct.
       if (getAnn(outputAst, envelopePayloadRootSymbol) !== undefined) {
-        return mapKeys(outputAst, payload, "decode", rootDict);
+        return yield* validate(mapKeys(outputAst, payload, "decode", rootDict));
       }
 
+      // A non-JSON body for a struct output: lenient returns the text as
+      // read; strict fails it against the struct schema.
+      if (nonJson) return yield* validate(text);
+
       const result: Record<string, unknown> = {};
 
       for (const prop of getProps(outputAst)) {
@@ -503,7 +522,7 @@ const makeDecode =
           }
         }
       }
-      return result;
+      return yield* validate(result);
     });
 
 export const CloudflareProtocol: Layer.Layer<API.Protocol> = Layer.succeed(

package/src/response-validation.test.ts

@@ -0,0 +1,67 @@
+import { describe, expect, test } from "bun:test";
+import { runValidationModes } from "@distilled.cloud/core/testing";
+import * as Effect from "effect/Effect";
+import { credentials } from "./credentials.ts";
+import { CloudflareParseError } from "./errors.ts";
+import * as Retry from "./retry.ts";
+import { verifyToken } from "./services/user.ts";
+import type { CloudflareOpError } from "./protocol.ts";
+
+// verifyToken declares `{ id: string; status: string; expiresOn?: string | null; notBefore?: string | null }`,
+// unwrapped from the `{ success, errors, messages, result }` envelope.
+const run = (body: string) =>
+  runValidationModes(
+    verifyToken({}).pipe(
+      Retry.none,
+      Effect.provide(credentials({ apiToken: "test" })),
+    ),
+    { body },
+  );
+
+const envelope = (result: unknown) =>
+  JSON.stringify({ success: true, errors: [], messages: [], result });
+
+describe("Cloudflare response validation", () => {
+  test("a matching body succeeds unchanged in both modes", async () => {
+    const { lenient, strict } = await run(
+      envelope({
+        id: "ed17574386854bf78a67040be0a770b0",
+        status: "active",
+        expires_on: "2030-01-01T00:00:00Z",
+      }),
+    );
+    const expected = {
+      id: "ed17574386854bf78a67040be0a770b0",
+      status: "active",
+      expiresOn: "2030-01-01T00:00:00Z",
+    };
+    expect(lenient).toMatchObject({ _tag: "Success", success: expected });
+    expect(strict).toMatchObject({ _tag: "Success", success: expected });
+  });
+
+  test("a body missing required members: lenient returns it, strict fails", async () => {
+    const { lenient, strict } = await run(
+      envelope({ id: "ed17574386854bf78a67040be0a770b0" }),
+    );
+    expect(lenient).toMatchObject({
+      _tag: "Success",
+      success: { id: "ed17574386854bf78a67040be0a770b0" },
+    });
+    expect(strict._tag).toBe("Failure");
+    expect((strict as any).failure).toBeInstanceOf(CloudflareParseError);
+  });
+
+  test("a non-JSON body: lenient returns the text, strict fails", async () => {
+    const { lenient, strict } = await run("not json");
+    expect(lenient).toMatchObject({ _tag: "Success", success: "not json" });
+    expect((strict as any).failure).toBeInstanceOf(CloudflareParseError);
+    expect((strict as any).failure.body).toBe("not json");
+  });
+});
+
+// CloudflareParseError is part of every operation's declared error type.
+export const parseErrorIsDeclared: [CloudflareParseError] extends [
+  CloudflareOpError,
+]
+  ? true
+  : false = true;

package/src/services/dns.ts

@@ -182,6 +182,15 @@ export class PeerNotFound
     [{ status: 404 }],
   ) {}
 
+export class RecordNotFound
+  extends /*@__PURE__*/ T.applyErrorMatchers(
+    /*@__PURE__*/ S.TaggedError<RecordNotFound>()("RecordNotFound", {
+      code: S.Number,
+      message: S.String,
+    }),
+    [{ code: 81044 }],
+  ) {}
+
 export class TsigNotFound
   extends /*@__PURE__*/ T.applyErrorMatchers(
     /*@__PURE__*/ S.TaggedError<TsigNotFound>()("TsigNotFound", {
@@ -31254,7 +31263,7 @@ export const deleteDnssec: API.OperationMethod<
   retry: Retry.Retry,
 }));
 
-export type DeleteRecordError = CloudflareOpError;
+export type DeleteRecordError = RecordNotFound | CloudflareOpError;
 /** Permanently removes a DNS record from the zone. */
 export const deleteRecord: API.OperationMethod<
   DeleteRecordRequest,
@@ -31264,7 +31273,7 @@ export const deleteRecord: API.OperationMethod<
 > = /*@__PURE__*/ API.make(() => ({
   input: DeleteRecordRequest,
   output: DeleteRecordResponse,
-  errors: [CloudflareRateLimited, CloudflareError],
+  errors: [RecordNotFound, CloudflareRateLimited, CloudflareError],
   protocol: CloudflareProtocol,
   retry: Retry.Retry,
 }));
@@ -31490,7 +31499,7 @@ export const getDnssec: API.OperationMethod<
   retry: Retry.Retry,
 }));
 
-export type GetRecordError = Forbidden | CloudflareOpError;
+export type GetRecordError = Forbidden | RecordNotFound | CloudflareOpError;
 /** Retrieves details for a specific DNS record in the zone. */
 export const getRecord: API.OperationMethod<
   GetRecordRequest,
@@ -31500,7 +31509,7 @@ export const getRecord: API.OperationMethod<
 > = /*@__PURE__*/ API.make(() => ({
   input: GetRecordRequest,
   output: GetRecordResponse,
-  errors: [Forbidden, CloudflareRateLimited, CloudflareError],
+  errors: [Forbidden, RecordNotFound, CloudflareRateLimited, CloudflareError],
   protocol: CloudflareProtocol,
   retry: Retry.Retry,
 }));

package/src/services/queues.ts

@@ -152,6 +152,23 @@ export class QueueHandlerMissing
     ],
   ) {}
 
+export class QueueHttpPullNotEnabled
+  extends /*@__PURE__*/ T.applyErrorMatchers(
+    /*@__PURE__*/ S.TaggedError<QueueHttpPullNotEnabled>()(
+      "QueueHttpPullNotEnabled",
+      {
+        code: S.Number,
+        message: S.String,
+      },
+    ),
+    [
+      {
+        code: 0,
+        message: "messages cannot be pulled unless http_pull mode is enabled",
+      },
+    ],
+  ) {}
+
 export class QueueInUseByEventNotification
   extends /*@__PURE__*/ T.applyErrorMatchers(
     /*@__PURE__*/ S.TaggedError<QueueInUseByEventNotification>()(
@@ -5384,6 +5401,7 @@ export type PullMessageError =
   | InvalidQueueId
   | QueueNotFound
   | InvalidRoute
+  | QueueHttpPullNotEnabled
   | CloudflareOpError;
 /** Pull a batch of messages from a Queue */
 export const pullMessage: API.OperationMethod<
@@ -5399,6 +5417,7 @@ export const pullMessage: API.OperationMethod<
     InvalidQueueId,
     QueueNotFound,
     InvalidRoute,
+    QueueHttpPullNotEnabled,
     CloudflareRateLimited,
     CloudflareError,
   ],

package/src/services/r2.ts

@@ -206,6 +206,35 @@ export class QueueNotFound
     [{ code: 11000 }],
   ) {}
 
+export class SuperSlurperJobOperationFailed
+  extends /*@__PURE__*/ T.applyErrorMatchers(
+    /*@__PURE__*/ S.TaggedError<SuperSlurperJobOperationFailed>()(
+      "SuperSlurperJobOperationFailed",
+      {
+        code: S.Number,
+        message: S.String,
+      },
+    ),
+    [{ status: 500, message: "Internal Server Error" }],
+  ) {}
+
+export class SuperSlurperPreconnectivityFailed
+  extends /*@__PURE__*/ T.applyErrorMatchers(
+    /*@__PURE__*/ S.TaggedError<SuperSlurperPreconnectivityFailed>()(
+      "SuperSlurperPreconnectivityFailed",
+      {
+        code: S.Number,
+        message: S.String,
+      },
+    ),
+    [
+      {
+        status: 403,
+        message: "Preconnectivity failed, please verify tokens and try again",
+      },
+    ],
+  ) {}
+
 export interface AbortAllSuperSlurperJobRequest {
   accountId: string;
 }
@@ -5126,7 +5155,9 @@ export const abortAllSuperSlurperJob: API.OperationMethod<
   retry: Retry.Retry,
 }));
 
-export type AbortSuperSlurperJobError = CloudflareOpError;
+export type AbortSuperSlurperJobError =
+  | SuperSlurperJobOperationFailed
+  | CloudflareOpError;
 /** Cancels a specific R2 Super Slurper migration job. Any objects in the middle of a transfer will finish, but no new objects will start transferring. */
 export const abortSuperSlurperJob: API.OperationMethod<
   AbortSuperSlurperJobRequest,
@@ -5136,7 +5167,11 @@ export const abortSuperSlurperJob: API.OperationMethod<
 > = /*@__PURE__*/ API.make(() => ({
   input: AbortSuperSlurperJobRequest,
   output: AbortSuperSlurperJobResponse,
-  errors: [CloudflareRateLimited, CloudflareError],
+  errors: [
+    SuperSlurperJobOperationFailed,
+    CloudflareRateLimited,
+    CloudflareError,
+  ],
   protocol: CloudflareProtocol,
   retry: Retry.Retry,
 }));
@@ -5191,7 +5226,9 @@ export const createBucketDomainCustom: API.OperationMethod<
   retry: Retry.Retry,
 }));
 
-export type CreateSuperSlurperJobError = CloudflareOpError;
+export type CreateSuperSlurperJobError =
+  | SuperSlurperPreconnectivityFailed
+  | CloudflareOpError;
 /** Creates a new R2 Super Slurper migration job to transfer objects from a source bucket (e.g. S3, GCS, R2) to R2. */
 export const createSuperSlurperJob: API.OperationMethod<
   CreateSuperSlurperJobRequest,
@@ -5201,7 +5238,11 @@ export const createSuperSlurperJob: API.OperationMethod<
 > = /*@__PURE__*/ API.make(() => ({
   input: CreateSuperSlurperJobRequest,
   output: CreateSuperSlurperJobResponse,
-  errors: [CloudflareRateLimited, CloudflareError],
+  errors: [
+    SuperSlurperPreconnectivityFailed,
+    CloudflareRateLimited,
+    CloudflareError,
+  ],
   protocol: CloudflareProtocol,
   retry: Retry.Retry,
 }));
@@ -5558,7 +5599,9 @@ export const getBucketSippy: API.OperationMethod<
   retry: Retry.Retry,
 }));
 
-export type GetSuperSlurperJobError = CloudflareOpError;
+export type GetSuperSlurperJobError =
+  | SuperSlurperJobOperationFailed
+  | CloudflareOpError;
 /** Retrieves detailed status and configuration for a specific R2 Super Slurper migration job. */
 export const getSuperSlurperJob: API.OperationMethod<
   GetSuperSlurperJobRequest,
@@ -5568,7 +5611,11 @@ export const getSuperSlurperJob: API.OperationMethod<
 > = /*@__PURE__*/ API.make(() => ({
   input: GetSuperSlurperJobRequest,
   output: GetSuperSlurperJobResponse,
-  errors: [CloudflareRateLimited, CloudflareError],
+  errors: [
+    SuperSlurperJobOperationFailed,
+    CloudflareRateLimited,
+    CloudflareError,
+  ],
   protocol: CloudflareProtocol,
   retry: Retry.Retry,
 }));
@@ -5747,7 +5794,9 @@ export const patchBucket: API.OperationMethod<
   retry: Retry.Retry,
 }));
 
-export type PauseSuperSlurperJobError = CloudflareOpError;
+export type PauseSuperSlurperJobError =
+  | SuperSlurperJobOperationFailed
+  | CloudflareOpError;
 /** Pauses a running R2 Super Slurper migration job. The job can be resumed later to continue transferring. */
 export const pauseSuperSlurperJob: API.OperationMethod<
   PauseSuperSlurperJobRequest,
@@ -5757,7 +5806,11 @@ export const pauseSuperSlurperJob: API.OperationMethod<
 > = /*@__PURE__*/ API.make(() => ({
   input: PauseSuperSlurperJobRequest,
   output: PauseSuperSlurperJobResponse,
-  errors: [CloudflareRateLimited, CloudflareError],
+  errors: [
+    SuperSlurperJobOperationFailed,
+    CloudflareRateLimited,
+    CloudflareError,
+  ],
   protocol: CloudflareProtocol,
   retry: Retry.Retry,
 }));
@@ -5901,7 +5954,9 @@ export const putBucketSippy: API.OperationMethod<
   retry: Retry.Retry,
 }));
 
-export type ResumeSuperSlurperJobError = CloudflareOpError;
+export type ResumeSuperSlurperJobError =
+  | SuperSlurperJobOperationFailed
+  | CloudflareOpError;
 /** Resumes a paused R2 Super Slurper migration job, continuing the transfer from where it stopped. */
 export const resumeSuperSlurperJob: API.OperationMethod<
   ResumeSuperSlurperJobRequest,
@@ -5911,7 +5966,11 @@ export const resumeSuperSlurperJob: API.OperationMethod<
 > = /*@__PURE__*/ API.make(() => ({
   input: ResumeSuperSlurperJobRequest,
   output: ResumeSuperSlurperJobResponse,
-  errors: [CloudflareRateLimited, CloudflareError],
+  errors: [
+    SuperSlurperJobOperationFailed,
+    CloudflareRateLimited,
+    CloudflareError,
+  ],
   protocol: CloudflareProtocol,
   retry: Retry.Retry,
 }));

package/src/services/workers.ts

@@ -335,6 +335,18 @@ export class ObservabilityDestinationPreflightFailed
     [{ status: 400, message: "Bad Request" }],
   ) {}
 
+export class PreviewAlreadyExists
+  extends /*@__PURE__*/ T.applyErrorMatchers(
+    /*@__PURE__*/ S.TaggedError<PreviewAlreadyExists>()(
+      "PreviewAlreadyExists",
+      {
+        code: S.Number,
+        message: S.String,
+      },
+    ),
+    [{ status: 409, message: { includes: "already exists" } }],
+  ) {}
+
 export class PreviewDeploymentNotFound
   extends /*@__PURE__*/ T.applyErrorMatchers(
     /*@__PURE__*/ S.TaggedError<PreviewDeploymentNotFound>()(
@@ -36495,7 +36507,10 @@ export const createObservabilitySharedQuery: API.OperationMethod<
   retry: Retry.Retry,
 }));
 
-export type CreatePreviewError = WorkerNotFound | CloudflareOpError;
+export type CreatePreviewError =
+  | WorkerNotFound
+  | PreviewAlreadyExists
+  | CloudflareOpError;
 /** Create a Worker Preview. Does not deploy code; follow with createPreviewDeployment. */
 export const createPreview: API.OperationMethod<
   CreatePreviewRequest,
@@ -36505,7 +36520,12 @@ export const createPreview: API.OperationMethod<
 > = /*@__PURE__*/ API.make(() => ({
   input: CreatePreviewRequest,
   output: PreviewResource,
-  errors: [WorkerNotFound, CloudflareRateLimited, CloudflareError],
+  errors: [
+    WorkerNotFound,
+    PreviewAlreadyExists,
+    CloudflareRateLimited,
+    CloudflareError,
+  ],
   protocol: CloudflareProtocol,
   retry: Retry.Retry,
 }));