effect-cf 0.45.0 → 0.46.1

package/src/Cache.ts

@@ -1,9 +1,3 @@
-import type {
-  Cache as CloudflareCache,
-  CacheQueryOptions as CloudflareCacheQueryOptions,
-  CacheStorage as CloudflareCacheStorage,
-  RequestInfo as CloudflareRequestInfo,
-} from "@cloudflare/workers-types";
 import * as Context from "effect/Context";
 import * as Data from "effect/Data";
 import * as Effect from "effect/Effect";
@@ -12,9 +6,9 @@ import * as Option from "effect/Option";
 
 import * as ErrorMessage from "./internal/ErrorMessage";
 
-export type CacheRequest = CloudflareRequestInfo | URL;
+export type CacheRequest = RequestInfo | URL;
 
-export type CacheQueryOptions = CloudflareCacheQueryOptions;
+export type CacheQueryOptions = globalThis.CacheQueryOptions;
 
 export type CacheOperation = "open" | "match" | "put" | "delete";
 
@@ -42,13 +36,13 @@ export interface CacheClient {
     request: CacheRequest,
     options?: CacheQueryOptions,
   ) => Effect.Effect<boolean, CacheOperationError>;
-  readonly rawUnsafe: Effect.Effect<CloudflareCache>;
+  readonly rawUnsafe: Effect.Effect<Cache>;
 }
 
 export interface CacheStorageClient {
   readonly default: CacheClient;
   readonly open: (name: string) => Effect.Effect<CacheClient, CacheOperationError>;
-  readonly rawUnsafe: Effect.Effect<CloudflareCacheStorage>;
+  readonly rawUnsafe: Effect.Effect<globalThis.CacheStorage>;
 }
 
 export class CacheStorage extends Context.Service<CacheStorage, CacheStorageClient>()(
@@ -72,7 +66,7 @@ const spanOptions = (cache: string, operation: CacheOperation) => ({
   attributes: { cache, operation },
 });
 
-export const makeCacheClient = (cache: CloudflareCache, name = "default"): CacheClient => ({
+export const makeCacheClient = (cache: Cache, name = "default"): CacheClient => ({
   name,
   match: Effect.fn(
     "Cache.match",
@@ -97,7 +91,7 @@ export const makeCacheClient = (cache: CloudflareCache, name = "default"): Cache
   rawUnsafe: Effect.succeed(cache),
 });
 
-export const makeClient = (storage: CloudflareCacheStorage): CacheStorageClient => ({
+export const makeClient = (storage: globalThis.CacheStorage): CacheStorageClient => ({
   default: makeCacheClient(storage.default),
   open: (name) =>
     tryCachePromise(name, "open", () => storage.open(name)).pipe(
@@ -107,7 +101,7 @@ export const makeClient = (storage: CloudflareCacheStorage): CacheStorageClient
   rawUnsafe: Effect.succeed(storage),
 });
 
-export const layerFrom = (storage: CloudflareCacheStorage): Layer.Layer<CacheStorage> =>
+export const layerFrom = (storage: globalThis.CacheStorage): Layer.Layer<CacheStorage> =>
   Layer.succeed(CacheStorage, makeClient(storage));
 
 export const layer: Layer.Layer<CacheStorage> = Layer.sync(CacheStorage, () => makeClient(caches));

package/src/DurableObject.ts

@@ -43,7 +43,7 @@ type HandlerContext<ROut> = RuntimeContext<ROut> | Scope.Scope;
 
 type FetchContext<ROut> = HandlerContext<ROut> | NativeRequest;
 /** Metadata available before an event effect or its event layer starts. */
-export interface RunOptions {
+export interface RunOptions extends Runtime.RunOptions {
   readonly eventLayer?: boolean;
   readonly event?:
     | "fetch"
@@ -331,6 +331,7 @@ export function make<
           effect as Effect.Effect<A, E, HandlerContext<ROut | RAlarm>>,
           undefined,
           parentSpan,
+          runOptions.onFailure,
         );
       }
 
@@ -341,7 +342,7 @@ export function make<
         REvent,
         EventLayerError,
         LayerError
-      >(this.runtime, effect, eventLayer, parentSpan);
+      >(this.runtime, effect, eventLayer, parentSpan, runOptions.onFailure);
     }
 
     fetch(request: Request): Promise<Response> {

package/src/Email.ts

@@ -1,9 +1,3 @@
-import type {
-  EmailAddress as CloudflareEmailAddress,
-  EmailAttachment as CloudflareEmailAttachment,
-  EmailSendResult as CloudflareEmailSendResult,
-  SendEmail as CloudflareSendEmail,
-} from "@cloudflare/workers-types";
 import * as Context from "effect/Context";
 import * as Data from "effect/Data";
 import * as Effect from "effect/Effect";
@@ -103,11 +97,11 @@ export interface EmailDefinition {
   readonly binding: string;
 }
 
-export type EmailAddress = CloudflareEmailAddress;
-export type EmailAttachment = CloudflareEmailAttachment;
-export type EmailMessageBuilder = Parameters<CloudflareSendEmail["send"]>[0];
-export type EmailSendResult = CloudflareEmailSendResult;
-export type EmailBinding = CloudflareSendEmail;
+export type EmailAddress = globalThis.EmailAddress;
+export type EmailAttachment = globalThis.EmailAttachment;
+export type EmailSendResult = globalThis.EmailSendResult;
+export type EmailMessageBuilder = Parameters<SendEmail["send"]>[0];
+export type EmailBinding = SendEmail;
 export type EmailRecipients = string | EmailAddress | ReadonlyArray<string | EmailAddress>;
 export type EmailSendError = EmailOperationError | EmailValidationError;
 type EmailFieldCandidate = Parameters<typeof Predicate.isUnknown>[0];

package/src/Images.ts

@@ -1,26 +1,3 @@
-import type {
-  HostedImagesBinding as CloudflareHostedImagesBinding,
-  ImageDirectUploadOptions as CloudflareImageDirectUploadOptions,
-  ImageDirectUploadResult as CloudflareImageDirectUploadResult,
-  ImageDrawOptions as CloudflareImageDrawOptions,
-  ImageHandle as CloudflareImageHandle,
-  ImageInfoResponse as CloudflareImageInfoResponse,
-  ImageInputOptions as CloudflareImageInputOptions,
-  ImageList as CloudflareImageList,
-  ImageListOptions as CloudflareImageListOptions,
-  ImageMetadata as CloudflareImageMetadata,
-  ImageOutputOptions as CloudflareImageOutputOptions,
-  ImageSignedUrlOptions as CloudflareImageSignedUrlOptions,
-  ImageTransform as CloudflareImageTransform,
-  ImageTransformationOutputOptions as CloudflareImageTransformationOutputOptions,
-  ImageTransformationResponseOptions as CloudflareImageTransformationResponseOptions,
-  ImageTransformationResult as CloudflareImageTransformationResult,
-  ImageTransformer as CloudflareImageTransformer,
-  ImageUpdateOptions as CloudflareImageUpdateOptions,
-  ImageUploadOptions as CloudflareImageUploadOptions,
-  Response as CloudflareResponse,
-  TextOptions as CloudflareTextOptions,
-} from "@cloudflare/workers-types";
 import * as Context from "effect/Context";
 import * as Data from "effect/Data";
 import * as Effect from "effect/Effect";
@@ -55,28 +32,28 @@ export interface ImagesDefinition {
   readonly binding: string;
 }
 
-export type ImageInfoResponse = CloudflareImageInfoResponse;
-export type ImageTransform = CloudflareImageTransform;
-export type ImageDrawOptions = CloudflareImageDrawOptions;
-export type ImageInputOptions = CloudflareImageInputOptions;
-export type ImageOutputOptions = CloudflareImageOutputOptions;
-export type ImageTransformationOutputOptions = CloudflareImageTransformationOutputOptions;
-export type ImageTransformationResponseOptions = CloudflareImageTransformationResponseOptions;
-export type ImageTransformationResult = CloudflareImageTransformationResult;
-export type ImageUploadOptions = CloudflareImageUploadOptions;
-export type ImageUpdateOptions = CloudflareImageUpdateOptions;
-export type ImageListOptions = CloudflareImageListOptions;
-export type ImageList = CloudflareImageList;
-export type ImageMetadata = CloudflareImageMetadata;
-export type ImageSignedUrlOptions = CloudflareImageSignedUrlOptions;
-export type ImageDirectUploadOptions = CloudflareImageDirectUploadOptions;
-export type ImageDirectUploadResult = CloudflareImageDirectUploadResult;
-export type TextOptions = CloudflareTextOptions;
+export type ImageDirectUploadOptions = globalThis.ImageDirectUploadOptions;
+export type ImageDirectUploadResult = globalThis.ImageDirectUploadResult;
+export type ImageDrawOptions = globalThis.ImageDrawOptions;
+export type ImageInfoResponse = globalThis.ImageInfoResponse;
+export type ImageInputOptions = globalThis.ImageInputOptions;
+export type ImageList = globalThis.ImageList;
+export type ImageListOptions = globalThis.ImageListOptions;
+export type ImageMetadata = globalThis.ImageMetadata;
+export type ImageOutputOptions = globalThis.ImageOutputOptions;
+export type ImageSignedUrlOptions = globalThis.ImageSignedUrlOptions;
+export type ImageTransform = globalThis.ImageTransform;
+export type ImageTransformationOutputOptions = globalThis.ImageTransformationOutputOptions;
+export type ImageTransformationResponseOptions = globalThis.ImageTransformationResponseOptions;
+export type ImageTransformationResult = globalThis.ImageTransformationResult;
+export type ImageUpdateOptions = globalThis.ImageUpdateOptions;
+export type ImageUploadOptions = globalThis.ImageUploadOptions;
+export type TextOptions = globalThis.TextOptions;
 export type ImageInputValue = ReadableStream<Uint8Array> | ArrayBuffer;
 export type ImageUploadValue = ReadableStream<Uint8Array> | ArrayBuffer;
 
 export interface DrawStepOptions {
-  readonly image: ReadableStream<Uint8Array> | CloudflareImageTransformer;
+  readonly image: ReadableStream<Uint8Array> | ImageTransformer;
   readonly options?: ImageDrawOptions;
 }
 
@@ -107,10 +84,10 @@ export type ProcessOptions =
     };
 
 export interface ImagesTransformationResultClient {
-  readonly raw: CloudflareImageTransformationResult;
+  readonly raw: ImageTransformationResult;
   readonly response: (
     options?: ImageTransformationResponseOptions,
-  ) => Effect.Effect<CloudflareResponse, ImagesOperationError>;
+  ) => Effect.Effect<Response, ImagesOperationError>;
   readonly contentType: Effect.Effect<string, ImagesOperationError>;
   readonly image: (
     options?: ImageTransformationOutputOptions,
@@ -118,7 +95,7 @@ export interface ImagesTransformationResultClient {
 }
 
 export interface ImageHandleClient {
-  readonly raw: CloudflareImageHandle;
+  readonly raw: ImageHandle;
   readonly details: Effect.Effect<Option.Option<ImageMetadata>, ImagesOperationError>;
   readonly bytes: Effect.Effect<Option.Option<ReadableStream<Uint8Array>>, ImagesOperationError>;
   readonly signedUrl: (
@@ -140,7 +117,7 @@ export interface HostedImagesClient {
   readonly createDirectUpload: (
     options?: ImageDirectUploadOptions,
   ) => Effect.Effect<ImageDirectUploadResult, ImagesOperationError>;
-  readonly rawUnsafe: Effect.Effect<CloudflareHostedImagesBinding>;
+  readonly rawUnsafe: Effect.Effect<HostedImagesBinding>;
 }
 
 export interface ImagesRuntimeBinding {
@@ -148,12 +125,9 @@ export interface ImagesRuntimeBinding {
     image: ImageInputValue,
     options?: ImageInputOptions,
   ) => Promise<ImageInfoResponse>;
-  readonly input: (
-    image: ImageInputValue,
-    options?: ImageInputOptions,
-  ) => CloudflareImageTransformer;
-  readonly text?: (content: string, options: TextOptions) => CloudflareImageTransformer;
-  readonly hosted?: CloudflareHostedImagesBinding;
+  readonly input: (image: ImageInputValue, options?: ImageInputOptions) => ImageTransformer;
+  readonly text?: (content: string, options: TextOptions) => ImageTransformer;
+  readonly hosted?: HostedImagesBinding;
 }
 
 export interface ImagesClient {
@@ -164,11 +138,11 @@ export interface ImagesClient {
   readonly input: (
     image: ImageInputValue,
     options?: ImageInputOptions,
-  ) => Effect.Effect<CloudflareImageTransformer, ImagesOperationError>;
+  ) => Effect.Effect<ImageTransformer, ImagesOperationError>;
   readonly text: (
     content: string,
     options: TextOptions,
-  ) => Effect.Effect<CloudflareImageTransformer, ImagesOperationError>;
+  ) => Effect.Effect<ImageTransformer, ImagesOperationError>;
   readonly process: (
     steps: Steps,
     options: ProcessOptions,
@@ -257,7 +231,7 @@ const hasFunction = <Candidate>(value: Candidate, key: string): boolean =>
 
 const isHostedImagesBinding = <Candidate>(
   value: Candidate,
-): value is Candidate & CloudflareHostedImagesBinding =>
+): value is Candidate & HostedImagesBinding =>
   hasFunction(value, "image") &&
   hasFunction(value, "upload") &&
   hasFunction(value, "list") &&
@@ -270,7 +244,7 @@ export const isImagesBinding = <Candidate>(
 
 const wrapResult = (
   binding: string,
-  result: CloudflareImageTransformationResult,
+  result: ImageTransformationResult,
 ): ImagesTransformationResultClient => ({
   raw: result,
   response: (options) => tryImagesSync(binding, "response", () => result.response(options)),
@@ -278,7 +252,7 @@ const wrapResult = (
   image: (options) => tryImagesSync(binding, "image", () => result.image(options)),
 });
 
-const wrapHandle = (binding: string, handle: CloudflareImageHandle): ImageHandleClient => ({
+const wrapHandle = (binding: string, handle: ImageHandle): ImageHandleClient => ({
   raw: handle,
   details: tryImagesPromise(binding, "details", () => handle.details()).pipe(
     Effect.map(maybe),
@@ -299,10 +273,7 @@ const wrapHandle = (binding: string, handle: CloudflareImageHandle): ImageHandle
   ),
 });
 
-const wrapHosted = (
-  binding: string,
-  hosted: CloudflareHostedImagesBinding,
-): HostedImagesClient => ({
+const wrapHosted = (binding: string, hosted: HostedImagesBinding): HostedImagesClient => ({
   image: (imageId) => wrapHandle(binding, hosted.image(imageId)),
   upload: Effect.fn("Images.upload")((image: ImageUploadValue, options?: ImageUploadOptions) =>
     tryImagesPromise(binding, "upload", () => hosted.upload(image, options)),

package/src/Kv.ts

@@ -1,7 +1,3 @@
-import type {
-  KVNamespaceListOptions as CloudflareKVNamespaceListOptions,
-  KVNamespacePutOptions as CloudflareKVNamespacePutOptions,
-} from "@cloudflare/workers-types";
 import * as Context from "effect/Context";
 import * as Data from "effect/Data";
 import * as Effect from "effect/Effect";
@@ -31,8 +27,8 @@ export class KvOperationError extends Data.TaggedError("KvOperationError")<{
   }
 }
 
-export type KvPutOptions = CloudflareKVNamespacePutOptions;
-export type KvListOptions<Metadata = unknown> = CloudflareKVNamespaceListOptions & {
+export type KvPutOptions = KVNamespacePutOptions;
+export type KvListOptions<Metadata = unknown> = KVNamespaceListOptions & {
   readonly metadataSchema?: S.Codec<Metadata, unknown>;
 };
 

package/src/QueueBinding.ts

@@ -1,12 +1,3 @@
-import type {
-  MessageSendRequest as CloudflareMessageSendRequest,
-  Queue as CloudflareQueue,
-  QueueMetrics as CloudflareQueueMetrics,
-  QueueSendBatchOptions as CloudflareQueueSendBatchOptions,
-  QueueSendBatchResponse as CloudflareQueueSendBatchResponse,
-  QueueSendOptions as CloudflareQueueSendOptions,
-  QueueSendResponse as CloudflareQueueSendResponse,
-} from "@cloudflare/workers-types";
 import * as Data from "effect/Data";
 import * as Effect from "effect/Effect";
 import * as Predicate from "effect/Predicate";
@@ -16,15 +7,15 @@ import type { Context } from "effect";
 import * as Binding from "./Binding";
 import type * as RpcDefinition from "./RpcDefinition";
 
-export type QueueSendOptions = CloudflareQueueSendOptions;
-export type QueueSendResponse = CloudflareQueueSendResponse;
-export type QueueSendBatchOptions = CloudflareQueueSendBatchOptions;
-export type QueueSendBatchResponse = CloudflareQueueSendBatchResponse;
-export type QueueMetrics = CloudflareQueueMetrics;
-export type MessageSendRequest<Body> = CloudflareMessageSendRequest<Body>;
+export type MessageSendRequest<Body> = globalThis.MessageSendRequest<Body>;
+export type QueueMetrics = globalThis.QueueMetrics;
+export type QueueSendBatchOptions = globalThis.QueueSendBatchOptions;
+export type QueueSendBatchResponse = globalThis.QueueSendBatchResponse;
+export type QueueSendOptions = globalThis.QueueSendOptions;
+export type QueueSendResponse = globalThis.QueueSendResponse;
 
-export type QueueProducer<Body> = Pick<CloudflareQueue<Body>, "send"> &
-  Partial<Pick<CloudflareQueue<Body>, "sendBatch" | "metrics">>;
+export type QueueProducer<Body> = Pick<Queue<Body>, "send"> &
+  Partial<Pick<Queue<Body>, "sendBatch" | "metrics">>;
 
 const expectedQueueProducer = "Queue producer binding with send(); optional sendBatch()/metrics()";
 

package/src/R2.ts

@@ -1,17 +1,3 @@
-import type {
-  R2Bucket as CloudflareR2Bucket,
-  R2Conditional as CloudflareR2Conditional,
-  R2GetOptions as CloudflareR2GetOptions,
-  R2ListOptions as CloudflareR2ListOptions,
-  R2MultipartOptions as CloudflareR2MultipartOptions,
-  R2MultipartUpload as CloudflareR2MultipartUpload,
-  R2Object as CloudflareR2Object,
-  R2ObjectBody as CloudflareR2ObjectBody,
-  R2Objects as CloudflareR2Objects,
-  R2PutOptions as CloudflareR2PutOptions,
-  R2UploadPartOptions as CloudflareR2UploadPartOptions,
-  R2UploadedPart as CloudflareR2UploadedPart,
-} from "@cloudflare/workers-types";
 import * as Context from "effect/Context";
 import * as Data from "effect/Data";
 import * as Effect from "effect/Effect";
@@ -60,19 +46,19 @@ export interface R2Definition {
   readonly binding: string;
 }
 
-export type R2GetOptions = CloudflareR2GetOptions;
-export type R2PutOptions = CloudflareR2PutOptions;
-export type R2ListOptions = CloudflareR2ListOptions;
-export type R2MultipartOptions = CloudflareR2MultipartOptions;
-export type R2UploadPartOptions = CloudflareR2UploadPartOptions;
+export type R2GetOptions = globalThis.R2GetOptions;
+export type R2ListOptions = globalThis.R2ListOptions;
+export type R2MultipartOptions = globalThis.R2MultipartOptions;
+export type R2PutOptions = globalThis.R2PutOptions;
+export type R2UploadPartOptions = globalThis.R2UploadPartOptions;
 export type R2PutValue = ReadableStream | ArrayBuffer | ArrayBufferView | string | null | Blob;
 export type R2UploadPartValue = ReadableStream | ArrayBuffer | ArrayBufferView | string | Blob;
 
 export interface R2ObjectBodyClient extends Omit<
-  CloudflareR2ObjectBody,
+  R2ObjectBody,
   "arrayBuffer" | "blob" | "bytes" | "json" | "text"
 > {
-  readonly raw: CloudflareR2ObjectBody;
+  readonly raw: R2ObjectBody;
   readonly arrayBuffer: Effect.Effect<ArrayBuffer, R2OperationError>;
   readonly bytes: Effect.Effect<Uint8Array, R2OperationError>;
   readonly text: Effect.Effect<string, R2OperationError>;
@@ -81,29 +67,27 @@ export interface R2ObjectBodyClient extends Omit<
 }
 
 export interface R2MultipartUploadClient {
-  readonly raw: CloudflareR2MultipartUpload;
+  readonly raw: R2MultipartUpload;
   readonly key: string;
   readonly uploadId: string;
   readonly uploadPart: (
     partNumber: number,
     value: R2UploadPartValue,
     options?: R2UploadPartOptions,
-  ) => Effect.Effect<CloudflareR2UploadedPart, R2OperationError>;
+  ) => Effect.Effect<R2UploadedPart, R2OperationError>;
   readonly abort: Effect.Effect<void, R2OperationError>;
   readonly complete: (
-    uploadedParts: ReadonlyArray<CloudflareR2UploadedPart>,
-  ) => Effect.Effect<CloudflareR2Object, R2OperationError>;
+    uploadedParts: ReadonlyArray<R2UploadedPart>,
+  ) => Effect.Effect<R2Object, R2OperationError>;
 }
 
 export interface R2Client {
-  readonly head: (
-    key: string,
-  ) => Effect.Effect<Option.Option<CloudflareR2Object>, R2OperationError>;
+  readonly head: (key: string) => Effect.Effect<Option.Option<R2Object>, R2OperationError>;
   readonly get: {
     (
       key: string,
-      options: R2GetOptions & { readonly onlyIf: CloudflareR2Conditional | Headers },
-    ): Effect.Effect<Option.Option<R2ObjectBodyClient | CloudflareR2Object>, R2OperationError>;
+      options: R2GetOptions & { readonly onlyIf: R2Conditional | Headers },
+    ): Effect.Effect<Option.Option<R2ObjectBodyClient | R2Object>, R2OperationError>;
     (
       key: string,
       options?: R2GetOptions,
@@ -113,13 +97,13 @@ export interface R2Client {
     (
       key: string,
       value: R2PutValue,
-      options: R2PutOptions & { readonly onlyIf: CloudflareR2Conditional | Headers },
-    ): Effect.Effect<Option.Option<CloudflareR2Object>, R2OperationError>;
+      options: R2PutOptions & { readonly onlyIf: R2Conditional | Headers },
+    ): Effect.Effect<Option.Option<R2Object>, R2OperationError>;
     (
       key: string,
       value: R2PutValue,
       options?: R2PutOptions,
-    ): Effect.Effect<CloudflareR2Object, R2OperationError>;
+    ): Effect.Effect<R2Object, R2OperationError>;
   };
   readonly createMultipartUpload: (
     key: string,
@@ -130,8 +114,8 @@ export interface R2Client {
     uploadId: string,
   ) => Effect.Effect<R2MultipartUploadClient, R2OperationError>;
   readonly delete: (keys: string | ReadonlyArray<string>) => Effect.Effect<void, R2OperationError>;
-  readonly list: (options?: R2ListOptions) => Effect.Effect<CloudflareR2Objects, R2OperationError>;
-  readonly rawUnsafe: Effect.Effect<CloudflareR2Bucket>;
+  readonly list: (options?: R2ListOptions) => Effect.Effect<R2Objects, R2OperationError>;
+  readonly rawUnsafe: Effect.Effect<R2Bucket>;
   readonly definition: R2Definition;
 }
 
@@ -189,9 +173,7 @@ const spanOptions = (binding: string, operation: R2Operation) => ({
   attributes: { binding, operation },
 });
 
-const isR2ObjectBody = (
-  value: CloudflareR2ObjectBody | CloudflareR2Object,
-): value is CloudflareR2ObjectBody =>
+const isR2ObjectBody = (value: R2ObjectBody | R2Object): value is R2ObjectBody =>
   "body" in value &&
   Predicate.isFunction(value.arrayBuffer) &&
   Predicate.isFunction(value.bytes) &&
@@ -199,7 +181,7 @@ const isR2ObjectBody = (
   Predicate.isFunction(value.json) &&
   Predicate.isFunction(value.blob);
 
-const wrapObjectBody = (binding: string, object: CloudflareR2ObjectBody): R2ObjectBodyClient => ({
+const wrapObjectBody = (binding: string, object: R2ObjectBody): R2ObjectBodyClient => ({
   key: object.key,
   version: object.version,
   size: object.size,
@@ -238,8 +220,8 @@ const wrapObjectBody = (binding: string, object: CloudflareR2ObjectBody): R2Obje
 
 const wrapGetResult = (
   binding: string,
-  object: CloudflareR2ObjectBody | CloudflareR2Object | null,
-): R2ObjectBodyClient | CloudflareR2Object | null => {
+  object: R2ObjectBody | R2Object | null,
+): R2ObjectBodyClient | R2Object | null => {
   if (object === null || !isR2ObjectBody(object)) {
     return object;
   }
@@ -250,7 +232,7 @@ const wrapGetResult = (
 type R2BindingValue = Schema.Schema.Type<typeof Schema.Unknown>;
 
 const R2BucketSchema = Schema.declare(
-  (value: R2BindingValue): value is CloudflareR2Bucket =>
+  (value: R2BindingValue): value is R2Bucket =>
     Predicate.hasProperty(value, "head") &&
     Predicate.isFunction(value.head) &&
     Predicate.hasProperty(value, "get") &&
@@ -268,13 +250,11 @@ const R2BucketSchema = Schema.declare(
 );
 const decodeR2Bucket = Schema.decodeUnknownOption(R2BucketSchema);
 
-export const isR2Bucket = (value: R2BindingValue): value is CloudflareR2Bucket =>
+export const isR2Bucket = (value: R2BindingValue): value is R2Bucket =>
   Option.isSome(decodeR2Bucket(value));
 
-export const makeClient = (
-  definition: R2Definition,
-): ((bucket: CloudflareR2Bucket) => R2Client) => {
-  const wrapUpload = (upload: CloudflareR2MultipartUpload): R2MultipartUploadClient => ({
+export const makeClient = (definition: R2Definition): ((bucket: R2Bucket) => R2Client) => {
+  const wrapUpload = (upload: R2MultipartUpload): R2MultipartUploadClient => ({
     raw: upload,
     key: upload.key,
     uploadId: upload.uploadId,
@@ -295,7 +275,7 @@ export const makeClient = (
     complete: Effect.fn(
       "R2.completeMultipartUpload",
       spanOptions(definition.binding, "completeMultipartUpload"),
-    )((uploadedParts: ReadonlyArray<CloudflareR2UploadedPart>) =>
+    )((uploadedParts: ReadonlyArray<R2UploadedPart>) =>
       tryR2Promise(definition.binding, "completeMultipartUpload", () =>
         upload.complete([...uploadedParts]),
       ),
@@ -332,7 +312,7 @@ export const makeClient = (
         tryR2Promise(definition.binding, "put", () => bucket.put(key, value, options)).pipe(
           Effect.map((object) => {
             if (object === null) {
-              return Option.none<CloudflareR2Object>();
+              return Option.none<R2Object>();
             }
 
             if (options !== undefined && "onlyIf" in options) {

package/src/Vectorize.ts

@@ -5,22 +5,6 @@ import * as Option from "effect/Option";
 import * as Predicate from "effect/Predicate";
 import * as Schema from "effect/Schema";
 import type { Layer } from "effect";
-import type {
-  Vectorize as CloudflareVectorize,
-  VectorizeAsyncMutation as CloudflareVectorizeAsyncMutation,
-  VectorizeIndex as CloudflareVectorizeIndex,
-  VectorizeIndexDetails as CloudflareVectorizeIndexDetails,
-  VectorizeIndexInfo as CloudflareVectorizeIndexInfo,
-  VectorizeMatch as CloudflareVectorizeMatch,
-  VectorizeMatches as CloudflareVectorizeMatches,
-  VectorizeQueryOptions as CloudflareVectorizeQueryOptions,
-  VectorizeVector as CloudflareVectorizeVector,
-  VectorizeVectorMetadata as CloudflareVectorizeVectorMetadata,
-  VectorizeVectorMetadataFilter as CloudflareVectorizeVectorMetadataFilter,
-  VectorizeVectorMetadataValue as CloudflareVectorizeVectorMetadataValue,
-  VectorizeVectorMutation as CloudflareVectorizeVectorMutation,
-} from "@cloudflare/workers-types";
-
 import * as Binding from "./Binding";
 import type { WorkerEnvironment } from "./Environment";
 import * as ErrorMessage from "./internal/ErrorMessage";
@@ -53,19 +37,17 @@ export interface VectorizeDefinition {
   readonly binding: string;
 }
 
-export type VectorizeBinding = CloudflareVectorize | CloudflareVectorizeIndex;
-export type VectorizeVector = CloudflareVectorizeVector;
-export type VectorizeVectorMetadata = CloudflareVectorizeVectorMetadata;
-export type VectorizeVectorMetadataValue = CloudflareVectorizeVectorMetadataValue;
-export type VectorizeVectorMetadataFilter = CloudflareVectorizeVectorMetadataFilter;
-export type VectorizeQueryOptions = CloudflareVectorizeQueryOptions;
-export type VectorizeMatches = CloudflareVectorizeMatches;
-export type VectorizeMatch = CloudflareVectorizeMatch;
-export type VectorizeIndexInfo = CloudflareVectorizeIndexInfo;
-export type VectorizeIndexDetails = CloudflareVectorizeIndexDetails;
-export type VectorizeMutation =
-  | CloudflareVectorizeAsyncMutation
-  | CloudflareVectorizeVectorMutation;
+export type VectorizeBinding = Vectorize | VectorizeIndex;
+export type VectorizeIndexDetails = globalThis.VectorizeIndexDetails;
+export type VectorizeIndexInfo = globalThis.VectorizeIndexInfo;
+export type VectorizeMatch = globalThis.VectorizeMatch;
+export type VectorizeMatches = globalThis.VectorizeMatches;
+export type VectorizeQueryOptions = globalThis.VectorizeQueryOptions;
+export type VectorizeVector = globalThis.VectorizeVector;
+export type VectorizeVectorMetadata = globalThis.VectorizeVectorMetadata;
+export type VectorizeVectorMetadataFilter = globalThis.VectorizeVectorMetadataFilter;
+export type VectorizeVectorMetadataValue = globalThis.VectorizeVectorMetadataValue;
+export type VectorizeMutation = VectorizeAsyncMutation | VectorizeVectorMutation;
 export type VectorizeValues = Float32Array | Float64Array | ReadonlyArray<number>;
 
 interface VectorizeRuntimeBinding {

package/src/WebTransport.ts

@@ -29,7 +29,6 @@
  * {@link inboundTransport} decodes the HTTP/3-relevant request metadata that
  * the edge does provide.
  */
-import type { Request as CloudflareRequest } from "@cloudflare/workers-types";
 import * as Data from "effect/Data";
 import * as Effect from "effect/Effect";
 import * as Option from "effect/Option";
@@ -61,9 +60,8 @@ const decodeInboundTransport = S.decodeUnknownResult(InboundTransport);
  * dev` or when a Worker invokes another Worker directly) or does not match
  * the expected shape.
  */
-export const inboundTransport = (
-  request: Pick<CloudflareRequest, "cf">,
-): Option.Option<InboundTransport> => Result.getSuccess(decodeInboundTransport(request.cf));
+export const inboundTransport = (request: Pick<Request, "cf">): Option.Option<InboundTransport> =>
+  Result.getSuccess(decodeInboundTransport(request.cf));
 
 export const isHttp3 = (transport: InboundTransport): boolean =>
   transport.clientQuicRtt !== undefined || transport.httpProtocol === "HTTP/3";

package/src/Worker.ts

@@ -108,7 +108,7 @@ export const RunSymbol = Symbol.for("effect-cf/Worker/run");
 const FetchSymbol = Symbol.for("effect-cf/Worker/fetch");
 
 /** Metadata available before an event effect or its event layer starts. */
-export interface RunOptions {
+export interface RunOptions extends Runtime.RunOptions {
   readonly event?: "fetch" | "rpc" | "queue";
   readonly rpc?: RpcInvocationInfo;
 }
@@ -438,6 +438,7 @@ export function make<
           effect as Effect.Effect<A, E, RuntimeContext<ROut> | Scope.Scope>,
           undefined,
           parentSpan,
+          runOptions.onFailure,
         );
       }
 
@@ -448,7 +449,7 @@ export function make<
         REvent,
         EventLayerError,
         LayerError
-      >(this.runtime, effect, eventLayer, parentSpan);
+      >(this.runtime, effect, eventLayer, parentSpan, runOptions.onFailure);
     }
 
     fetch(request: Request): Promise<Response> {