effect-cf 0.46.0 → 0.47.0

package/dist/index.mjs

@@ -34,9 +34,10 @@ import { Hyperdrive_exports } from "./Hyperdrive.mjs";
 import { Images_exports } from "./Images.mjs";
 import { Kv_exports } from "./Kv.mjs";
 import { R2_exports } from "./R2.mjs";
+import { RpcWebSocketClient_exports } from "./RpcWebSocketClient.mjs";
 import { Vectorize_exports } from "./Vectorize.mjs";
 import { WebTransport_exports } from "./WebTransport.mjs";
 import { WorkflowBinding_exports } from "./WorkflowBinding.mjs";
 import { WorkflowDefinition_exports } from "./WorkflowDefinition.mjs";
 import { Workflow_exports } from "./Workflow.mjs";
-export { AiGateway_exports as AiGateway, AnalyticsEngine_exports as AnalyticsEngine, Artifacts_exports as Artifacts, Binding_exports as Binding, BrowserRendering_exports as BrowserRendering, Cache_exports as Cache, CloudflareOtlp_exports as CloudflareOtlp, CloudflareTracer_exports as CloudflareTracer, ContainerNamespace_exports as ContainerNamespace, D1_exports as D1, DurableObject_exports as DurableObject, DurableObjectAlarm_exports as DurableObjectAlarm, DurableObjectDefinition_exports as DurableObjectDefinition, DurableObjectNamespace_exports as DurableObjectNamespace, DurableObjectRpcWebSocket_exports as DurableObjectRpcWebSocket, DurableObjectSqlite_exports as DurableObjectSqlite, DurableObjectState_exports as DurableObjectState, DurableObjectStorage_exports as DurableObjectStorage, DurableObjectWebSocket_exports as DurableObjectWebSocket, Email_exports as Email, Environment_exports as Environment, Hyperdrive_exports as Hyperdrive, Images_exports as Images, Kv_exports as Kv, Queue_exports as Queue, QueueBinding_exports as QueueBinding, QueueDefinition_exports as QueueDefinition, R2_exports as R2, Rpc_exports as Rpc, RpcDefinition_exports as RpcDefinition, RpcTargets_exports as RpcTargets, RpcTracing_exports as RpcTracing, ServiceBinding_exports as ServiceBinding, Vectorize_exports as Vectorize, WebTransport_exports as WebTransport, Worker_exports as Worker, WorkerConfig, WorkerDefinition_exports as WorkerDefinition, WorkerEnvironment, WorkersAi_exports as WorkersAi, Workflow_exports as Workflow, WorkflowBinding_exports as WorkflowBinding, WorkflowDefinition_exports as WorkflowDefinition };
+export { AiGateway_exports as AiGateway, AnalyticsEngine_exports as AnalyticsEngine, Artifacts_exports as Artifacts, Binding_exports as Binding, BrowserRendering_exports as BrowserRendering, Cache_exports as Cache, CloudflareOtlp_exports as CloudflareOtlp, CloudflareTracer_exports as CloudflareTracer, ContainerNamespace_exports as ContainerNamespace, D1_exports as D1, DurableObject_exports as DurableObject, DurableObjectAlarm_exports as DurableObjectAlarm, DurableObjectDefinition_exports as DurableObjectDefinition, DurableObjectNamespace_exports as DurableObjectNamespace, DurableObjectRpcWebSocket_exports as DurableObjectRpcWebSocket, DurableObjectSqlite_exports as DurableObjectSqlite, DurableObjectState_exports as DurableObjectState, DurableObjectStorage_exports as DurableObjectStorage, DurableObjectWebSocket_exports as DurableObjectWebSocket, Email_exports as Email, Environment_exports as Environment, Hyperdrive_exports as Hyperdrive, Images_exports as Images, Kv_exports as Kv, Queue_exports as Queue, QueueBinding_exports as QueueBinding, QueueDefinition_exports as QueueDefinition, R2_exports as R2, Rpc_exports as Rpc, RpcDefinition_exports as RpcDefinition, RpcTargets_exports as RpcTargets, RpcTracing_exports as RpcTracing, RpcWebSocketClient_exports as RpcWebSocketClient, ServiceBinding_exports as ServiceBinding, Vectorize_exports as Vectorize, WebTransport_exports as WebTransport, Worker_exports as Worker, WorkerConfig, WorkerDefinition_exports as WorkerDefinition, WorkerEnvironment, WorkersAi_exports as WorkersAi, Workflow_exports as Workflow, WorkflowBinding_exports as WorkflowBinding, WorkflowDefinition_exports as WorkflowDefinition };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "effect-cf",
-  "version": "0.46.0",
+  "version": "0.47.0",
   "description": "Effect-native primitives for Cloudflare Workers and bindings.",
   "license": "MIT",
   "repository": {
@@ -57,6 +57,11 @@
       "import": "./dist/Vitest.mjs",
       "default": "./dist/Vitest.mjs"
     },
+    "./rpc-websocket-client": {
+      "types": "./dist/RpcWebSocketClient.d.mts",
+      "import": "./dist/RpcWebSocketClient.mjs",
+      "default": "./dist/RpcWebSocketClient.mjs"
+    },
     "./package.json": "./package.json"
   },
   "publishConfig": {

package/src/AiGateway.ts

@@ -3,7 +3,6 @@ import * as Data from "effect/Data";
 import * as Effect from "effect/Effect";
 import * as S from "effect/Schema";
 import type { Layer } from "effect";
-import type { AiGateway as CloudflareAiGateway } from "@cloudflare/workers-types";
 
 import * as Binding from "./Binding";
 import type { WorkerEnvironment } from "./Environment";
@@ -30,14 +29,14 @@ export interface AiGatewayDefinition {
   readonly accountId?: string;
 }
 
-export type AiGatewayBinding = CloudflareAiGateway;
+export type AiGatewayBinding = AiGateway;
 type AiGatewayRunData = Parameters<AiGatewayBinding["run"]>[0];
 export type AiGatewayPatchLog = Parameters<AiGatewayBinding["patchLog"]>[1];
 export type AiGatewayLog = Awaited<ReturnType<AiGatewayBinding["getLog"]>>;
 export type AiGatewayProvider = NonNullable<Parameters<AiGatewayBinding["getUrl"]>[0]>;
 export type AiGatewayUniversalRequest = Exclude<AiGatewayRunData, ReadonlyArray<unknown>>;
 export type AiGatewayHeaders = NonNullable<AiGatewayUniversalRequest["headers"]>;
-export type AiGatewayRunOptions = Parameters<CloudflareAiGateway["run"]>[1];
+export type AiGatewayRunOptions = Parameters<AiGatewayBinding["run"]>[1];
 type AiGatewayBindingCandidate = Parameters<typeof isWorkersAiBinding>[0];
 
 const AiGatewayMetadata = S.Record(S.String, S.Union([S.String, S.Number, S.Boolean, S.Null]));

package/src/AnalyticsEngine.ts

@@ -1,7 +1,3 @@
-import type {
-  AnalyticsEngineDataPoint as CloudflareAnalyticsEngineDataPoint,
-  AnalyticsEngineDataset as CloudflareAnalyticsEngineDataset,
-} from "@cloudflare/workers-types";
 import * as Config from "effect/Config";
 import * as Context from "effect/Context";
 import * as Data from "effect/Data";
@@ -107,8 +103,8 @@ export interface AnalyticsEngineDefinition {
   readonly binding: string;
 }
 
-export type AnalyticsEngineBinding = CloudflareAnalyticsEngineDataset;
-export type AnalyticsEngineDataPoint = CloudflareAnalyticsEngineDataPoint;
+export type AnalyticsEngineBinding = AnalyticsEngineDataset;
+export type AnalyticsEngineDataPoint = globalThis.AnalyticsEngineDataPoint;
 export type AnalyticsEngineFieldValue = ArrayBuffer | string | null;
 export type AnalyticsEngineWriteError =
   | AnalyticsEngineOperationError

package/src/Artifacts.ts

@@ -1,11 +1,3 @@
-import type {
-  ArtifactsCreateRepoResult as CloudflareArtifactsCreateRepoResult,
-  ArtifactsCreateTokenResult as CloudflareArtifactsCreateTokenResult,
-  ArtifactsErrorCode as CloudflareArtifactsErrorCode,
-  ArtifactsRepoInfo as CloudflareArtifactsRepoInfo,
-  ArtifactsTokenInfo as CloudflareArtifactsTokenInfo,
-  ArtifactsTokenListResult as CloudflareArtifactsTokenListResult,
-} from "@cloudflare/workers-types";
 import * as Context from "effect/Context";
 import * as Data from "effect/Data";
 import * as Effect from "effect/Effect";
@@ -56,7 +48,7 @@ export const artifactsErrorCodes = [
   "UPSTREAM_UNAVAILABLE",
   "MEMORY_LIMIT",
   "INTERNAL_ERROR",
-] as const satisfies ReadonlyArray<CloudflareArtifactsErrorCode>;
+] as const satisfies ReadonlyArray<ArtifactsErrorCode>;
 
 export const artifactsErrorNumericCodes = {
   ALREADY_EXISTS: 10201,
@@ -71,9 +63,9 @@ export const artifactsErrorNumericCodes = {
   UPSTREAM_UNAVAILABLE: 10401,
   MEMORY_LIMIT: 10402,
   INTERNAL_ERROR: 10400,
-} as const satisfies Readonly<Record<CloudflareArtifactsErrorCode, number>>;
+} as const satisfies Readonly<Record<ArtifactsErrorCode, number>>;
 
-export type ArtifactsErrorCode = CloudflareArtifactsErrorCode;
+export type ArtifactsErrorCode = globalThis.ArtifactsErrorCode;
 
 export class ArtifactsOperationError extends Data.TaggedError("ArtifactsOperationError")<{
   readonly binding: string;
@@ -105,9 +97,9 @@ export type ArtifactsTokenState = "active" | "expired" | "revoked";
 
 export type ArtifactsRepoStatus = "ready" | "importing" | "forking";
 
-export type ArtifactsRepoInfo = CloudflareArtifactsRepoInfo;
+export type ArtifactsRepoInfo = globalThis.ArtifactsRepoInfo;
 
-export type ArtifactsCreateRepoResult = Readonly<CloudflareArtifactsCreateRepoResult>;
+export type ArtifactsCreateRepoResult = Readonly<globalThis.ArtifactsCreateRepoResult>;
 
 export interface ArtifactsRepoListEntry extends ArtifactsRepoInfo {
   readonly status: ArtifactsRepoStatus;
@@ -120,13 +112,13 @@ export interface ArtifactsRepoListResult {
 }
 
 /** Result of creating a repository token. */
-export type ArtifactsCreateTokenResult = CloudflareArtifactsCreateTokenResult;
+export type ArtifactsCreateTokenResult = globalThis.ArtifactsCreateTokenResult;
 
 /** Repository token metadata, excluding its plaintext secret. */
-export type ArtifactsTokenInfo = CloudflareArtifactsTokenInfo;
+export type ArtifactsTokenInfo = globalThis.ArtifactsTokenInfo;
 
 /** Repository token list result. */
-export type ArtifactsTokenListResult = CloudflareArtifactsTokenListResult;
+export type ArtifactsTokenListResult = globalThis.ArtifactsTokenListResult;
 
 /** Identity recorded for a Git commit author or committer. */
 export interface ArtifactsCommitIdentity {

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/DurableObjectRpcWebSocket.ts

@@ -148,6 +148,7 @@ interface LegacyAttachmentMetadata {
   readonly version: 1;
   readonly clientId: number;
   readonly hasPendingRequests: boolean;
+  readonly serialization?: string | undefined;
 }
 
 interface PersistedPendingBatch {
@@ -170,6 +171,7 @@ interface ResumableAttachmentMetadata {
   readonly hasPendingRequests: boolean;
   readonly hasNonResumableRequests: boolean;
   readonly subscriptions: ReadonlyArray<PersistedSubscription>;
+  readonly serialization?: string | undefined;
 }
 
 type AttachmentMetadata = LegacyAttachmentMetadata | ResumableAttachmentMetadata;
@@ -200,6 +202,7 @@ const ResumableAttachmentMetadataSchema = Schema.Struct({
   hasPendingRequests: Schema.Boolean,
   hasNonResumableRequests: Schema.Boolean,
   subscriptions: Schema.Array(PersistedSubscriptionSchema),
+  serialization: Schema.optionalKey(Schema.String),
 });
 
 const decodeResumableAttachment = Schema.decodeUnknownOption(ResumableAttachmentMetadataSchema);
@@ -279,6 +282,7 @@ export const layer = (
           version: legacyAttachmentVersion,
           clientId: id,
           hasPendingRequests: false,
+          serialization: serialization.contentType,
         };
 
         writeAttachment(socket.raw, attachmentKey, created);
@@ -392,6 +396,7 @@ export const layer = (
                 version: legacyAttachmentVersion,
                 clientId: connection.id,
                 hasPendingRequests: connection.requestIds.size > 0,
+                serialization: serialization.contentType,
               });
 
               return;
@@ -407,6 +412,7 @@ export const layer = (
               hasPendingRequests: connection.requestIds.size > 0,
               hasNonResumableRequests: connection.nonResumableRequestIds.size > 0,
               subscriptions,
+              serialization: serialization.contentType,
             });
           },
           catch: (cause) => new DurableWebSocketAttachmentError({ operation: "serialize", cause }),
@@ -589,6 +595,14 @@ export const layer = (
 
         const metadata = attachment.metadata;
 
+        if (
+          metadata.serialization !== undefined &&
+          metadata.serialization !== serialization.contentType
+        ) {
+          yield* resetSocket(socket);
+          continue;
+        }
+
         if (metadata.version === legacyAttachmentVersion) {
           if (metadata.hasPendingRequests) {
             yield* resetSocket(socket);
@@ -1036,7 +1050,11 @@ export const layer = (
                 : send(connection, RpcMessage.ResponseDefectEncoded(encodeDefect(cause)));
             }),
           ),
-        close: unregister,
+        close: (socket) =>
+          Effect.gen(function* () {
+            resetSockets.add(socket.raw);
+            yield* socket.close(1000).pipe(Effect.ignore);
+          }).pipe(Effect.ensuring(unregister(socket)), Effect.uninterruptible),
         error: resetSocket,
         checkpoint,
       });
@@ -1102,13 +1120,17 @@ const readAttachment = (socket: WebSocket, key: string): AttachmentRead => {
   const hasPendingRequests = Predicate.hasProperty(metadata, "hasPendingRequests")
     ? metadata.hasPendingRequests
     : false;
+  const serialization = Predicate.hasProperty(metadata, "serialization")
+    ? metadata.serialization
+    : undefined;
 
   if (
     (!Predicate.hasProperty(metadata, "version") || metadata.version === legacyAttachmentVersion) &&
     Predicate.hasProperty(metadata, "clientId") &&
     Predicate.isNumber(metadata.clientId) &&
     isClientId(metadata.clientId) &&
-    Predicate.isBoolean(hasPendingRequests)
+    Predicate.isBoolean(hasPendingRequests) &&
+    (serialization === undefined || Predicate.isString(serialization))
   ) {
     return {
       _tag: "Valid",
@@ -1116,6 +1138,7 @@ const readAttachment = (socket: WebSocket, key: string): AttachmentRead => {
         version: legacyAttachmentVersion,
         clientId: metadata.clientId,
         hasPendingRequests,
+        serialization,
       },
     };
   }

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()";