effect-cf 0.30.0 → 0.32.0

package/src/Images.ts

@@ -1,5 +1,7 @@
 import type {
   HostedImagesBinding as CloudflareHostedImagesBinding,
+  ImageDirectUploadOptions as CloudflareImageDirectUploadOptions,
+  ImageDirectUploadResult as CloudflareImageDirectUploadResult,
   ImageDrawOptions as CloudflareImageDrawOptions,
   ImageHandle as CloudflareImageHandle,
   ImageInfoResponse as CloudflareImageInfoResponse,
@@ -8,13 +10,16 @@ import type {
   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 { Context, Data, Effect, Function, Option, Predicate, type Layer } from "effect";
 
@@ -51,12 +56,17 @@ 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 ImageInputValue = ReadableStream<Uint8Array> | ArrayBuffer;
 export type ImageUploadValue = ReadableStream<Uint8Array> | ArrayBuffer;
 
@@ -79,15 +89,23 @@ export interface Steps {
   readonly steps: ReadonlyArray<Step>;
 }
 
-export interface ProcessOptions {
-  readonly stream: ImageInputValue;
-  readonly inputOptions?: ImageInputOptions;
-  readonly outputOptions: ImageOutputOptions;
-}
+export type ProcessOptions =
+  | {
+      readonly stream: ImageInputValue;
+      readonly inputOptions?: ImageInputOptions;
+      readonly outputOptions: ImageOutputOptions;
+    }
+  | {
+      readonly text: string;
+      readonly textOptions: TextOptions;
+      readonly outputOptions: ImageOutputOptions;
+    };
 
 export interface ImagesTransformationResultClient {
   readonly raw: CloudflareImageTransformationResult;
-  readonly response: Effect.Effect<CloudflareResponse, ImagesOperationError>;
+  readonly response: (
+    options?: ImageTransformationResponseOptions,
+  ) => Effect.Effect<CloudflareResponse, ImagesOperationError>;
   readonly contentType: Effect.Effect<string, ImagesOperationError>;
   readonly image: (
     options?: ImageTransformationOutputOptions,
@@ -98,6 +116,9 @@ export interface ImageHandleClient {
   readonly raw: CloudflareImageHandle;
   readonly details: Effect.Effect<Option.Option<ImageMetadata>, ImagesOperationError>;
   readonly bytes: Effect.Effect<Option.Option<ReadableStream<Uint8Array>>, ImagesOperationError>;
+  readonly signedUrl: (
+    options: ImageSignedUrlOptions,
+  ) => Effect.Effect<string, ImagesOperationError>;
   readonly update: (
     options: ImageUpdateOptions,
   ) => Effect.Effect<ImageMetadata, ImagesOperationError>;
@@ -111,6 +132,9 @@ export interface HostedImagesClient {
     options?: ImageUploadOptions,
   ) => Effect.Effect<ImageMetadata, ImagesOperationError>;
   readonly list: (options?: ImageListOptions) => Effect.Effect<ImageList, ImagesOperationError>;
+  readonly createDirectUpload: (
+    options?: ImageDirectUploadOptions,
+  ) => Effect.Effect<ImageDirectUploadResult, ImagesOperationError>;
   readonly rawUnsafe: Effect.Effect<CloudflareHostedImagesBinding>;
 }
 
@@ -123,6 +147,7 @@ export interface ImagesRuntimeBinding {
     image: ImageInputValue,
     options?: ImageInputOptions,
   ) => CloudflareImageTransformer;
+  readonly text?: (content: string, options: TextOptions) => CloudflareImageTransformer;
   readonly hosted?: CloudflareHostedImagesBinding;
 }
 
@@ -135,6 +160,10 @@ export interface ImagesClient {
     image: ImageInputValue,
     options?: ImageInputOptions,
   ) => Effect.Effect<CloudflareImageTransformer, ImagesOperationError>;
+  readonly text: (
+    content: string,
+    options: TextOptions,
+  ) => Effect.Effect<CloudflareImageTransformer, ImagesOperationError>;
   readonly process: (
     steps: Steps,
     options: ProcessOptions,
@@ -230,7 +259,10 @@ const hasFunction = <Candidate>(value: Candidate, key: string): boolean =>
 const isHostedImagesBinding = <Candidate>(
   value: Candidate,
 ): value is Candidate & CloudflareHostedImagesBinding =>
-  hasFunction(value, "image") && hasFunction(value, "upload") && hasFunction(value, "list");
+  hasFunction(value, "image") &&
+  hasFunction(value, "upload") &&
+  hasFunction(value, "list") &&
+  hasFunction(value, "createDirectUpload");
 
 export const isImagesBinding = <Candidate>(
   value: Candidate,
@@ -242,7 +274,7 @@ const wrapResult = (
   result: CloudflareImageTransformationResult,
 ): ImagesTransformationResultClient => ({
   raw: result,
-  response: tryImagesSync(binding, "response", () => result.response()),
+  response: (options) => tryImagesSync(binding, "response", () => result.response(options)),
   contentType: tryImagesSync(binding, "contentType", () => result.contentType()),
   image: (options) => tryImagesSync(binding, "image", () => result.image(options)),
 });
@@ -257,6 +289,9 @@ const wrapHandle = (binding: string, handle: CloudflareImageHandle): ImageHandle
     Effect.map(maybe),
     Effect.withSpan("Images.bytes"),
   ),
+  signedUrl: Effect.fn("Images.signedUrl")((options: ImageSignedUrlOptions) =>
+    tryImagesPromise(binding, "signedUrl", () => handle.signedUrl(options)),
+  ),
   update: Effect.fn("Images.update")((options: ImageUpdateOptions) =>
     tryImagesPromise(binding, "update", () => handle.update(options)),
   ),
@@ -276,6 +311,9 @@ const wrapHosted = (
   list: Effect.fn("Images.list")((options?: ImageListOptions) =>
     tryImagesPromise(binding, "list", () => hosted.list(options)),
   ),
+  createDirectUpload: Effect.fn("Images.createDirectUpload")((options?: ImageDirectUploadOptions) =>
+    tryImagesPromise(binding, "createDirectUpload", () => hosted.createDirectUpload(options)),
+  ),
   rawUnsafe: Effect.succeed(hosted),
 });
 
@@ -285,8 +323,20 @@ export const makeClient =
     const input = (image: ImageInputValue, options?: ImageInputOptions) =>
       tryImagesSync(definition.binding, "input", () => images.input(image, options));
 
+    const text = (content: string, options: TextOptions) =>
+      tryImagesSync(definition.binding, "text", () => {
+        if (!hasFunction(images, "text")) {
+          throw new Error("Images binding is missing text()");
+        }
+
+        return images.text!(content, options);
+      });
+
     const process = Effect.fn("Images.process")(function* (steps: Steps, options: ProcessOptions) {
-      let transformer = yield* input(options.stream, options.inputOptions);
+      let transformer =
+        "text" in options
+          ? yield* text(options.text, options.textOptions)
+          : yield* input(options.stream, options.inputOptions);
 
       for (const step of steps.steps) {
         transformer = yield* Step.$match(step, {
@@ -314,6 +364,7 @@ export const makeClient =
         tryImagesPromise(definition.binding, "info", () => images.info(image, options)),
       ),
       input,
+      text,
       process,
       hosted: isHostedImagesBinding(images.hosted)
         ? Option.some(wrapHosted(definition.binding, images.hosted))

package/src/Vitest.ts

@@ -1,5 +1,5 @@
 /**
- * Effect-native helpers for tests running in Cloudflare's Vitest Workers pool.
+ * Effect-native helpers for tests running in Cloudflare's Workers Vitest plugin.
  *
  * Import this module through the `effect-cf/vitest` subpath. It is intended to
  * run inside the Workers test runtime, where `cloudflare:test` is available.
@@ -37,7 +37,7 @@ import type { WorkflowInstanceStatusName } from "./WorkflowBinding";
 const currentEnv: WorkerEnv = env;
 
 /**
- * Provides the Workers pool environment as both {@link WorkerEnvironment} and
+ * Provides the Workers test environment as both {@link WorkerEnvironment} and
  * the active Effect `ConfigProvider`.
  */
 export const layer: Layer.Layer<WorkerEnvironment> = Layer.mergeAll(
@@ -134,7 +134,7 @@ type PagesEventContextInitData<Context> =
       : { readonly data: Data }
     : never;
 
-/** Initialization accepted by Pool Workers for a Pages Function. */
+/** Initialization accepted by the Workers Vitest plugin for a Pages Function. */
 export type PagesEventContextInit<Function extends AnyPagesFunction> = PagesEventContextInitBase &
   PagesEventContextInitParams<Parameters<Function>[0]> &
   PagesEventContextInitData<Parameters<Function>[0]>;
@@ -162,14 +162,14 @@ interface QueueWorker {
   queue(batch: globalThis.MessageBatch): Promise<void>;
 }
 
-/** Input message accepted by Pool Workers' `createMessageBatch` helper. */
+/** Input message accepted by the Workers Vitest plugin's `createMessageBatch` helper. */
 export type QueueMessage<Body> = {
   readonly id: string;
   readonly timestamp: Date;
   readonly attempts: number;
 } & ({ readonly body: Body } | { readonly serializedBody: ArrayBuffer | ArrayBufferView });
 
-/** Acknowledgement and retry result returned by Pool Workers. */
+/** Acknowledgement and retry result returned by the Workers Vitest plugin. */
 export type QueueResult = Awaited<ReturnType<typeof getQueueResult>>;
 
 /** Result of invoking a queue consumer through {@link queue}. */
@@ -180,7 +180,7 @@ export interface QueueRunResult<Body> {
 
 /**
  * Invokes an Effect-backed queue consumer, drains its `waitUntil` work, and
- * returns Pool Workers' acknowledgement and retry result.
+ * returns the Workers Vitest plugin's acknowledgement and retry result.
  */
 export const queue = Effect.fn("effect-cf/vitest/queue")(function* <
   Body,
@@ -280,7 +280,7 @@ export const evictAllDurableObjects = Effect.fn("effect-cf/vitest/evictAllDurabl
   },
 );
 
-/** A D1 migration accepted by Pool Workers. */
+/** A D1 migration accepted by the Workers Vitest plugin. */
 export interface D1Migration {
   readonly name: string;
   readonly queries: ReadonlyArray<string>;
@@ -310,7 +310,7 @@ export interface SecretsStoreSecret {
   readonly metadata?: { readonly uuid: string };
 }
 
-/** Effect-native wrapper around Pool Workers' Secrets Store admin API. */
+/** Effect-native wrapper around the Workers Vitest plugin's Secrets Store admin API. */
 export interface SecretsStoreAdmin {
   readonly raw: NativeSecretsStoreAdmin;
   readonly create: (value: string) => Effect.Effect<string>;
@@ -445,7 +445,7 @@ const runWorkflowModifier = Effect.fnUntraced(function* <A, E, R>(
     }
 
     if (callbackExit === undefined) {
-      throw new Error("Pool Workers did not invoke the Workflow modifier callback");
+      throw new Error("The Workers Vitest plugin did not invoke the Workflow modifier callback");
     }
 
     return callbackExit;

package/src/Worker.ts

@@ -46,6 +46,8 @@ export interface WorkerContextService {
     options?: Omit<WorkerContextWaitUntilOptions<E, R2>, "mode">,
   ): Effect.Effect<void, never, R | R2>;
   readonly passThroughOnException: Effect.Effect<void>;
+  /** Abort the current stateless Worker invocation (`ExecutionContext.abort`). */
+  abort(reason?: string): Effect.Effect<void>;
 }
 
 /**

package/src/WorkflowBinding.ts

@@ -3,7 +3,9 @@ import type {
   Workflow as CloudflareWorkflow,
   WorkflowInstance as CloudflareWorkflowInstance,
   WorkflowInstanceCreateOptions as CloudflareWorkflowInstanceCreateOptions,
+  WorkflowInstanceLocationHint as CloudflareWorkflowInstanceLocationHint,
   WorkflowInstanceRestartOptions as CloudflareWorkflowInstanceRestartOptions,
+  WorkflowInstanceTerminateOptions as CloudflareWorkflowInstanceTerminateOptions,
 } from "@cloudflare/workers-types";
 import { type Context, Data, Effect, Option, Predicate, Schema as S } from "effect";
 
@@ -23,6 +25,8 @@ export type WorkflowInstanceCreateBatchOptions<Payload, EncodedPayload = unknown
 >;
 
 export type WorkflowInstanceRestartOptions = CloudflareWorkflowInstanceRestartOptions;
+export type WorkflowInstanceTerminateOptions = CloudflareWorkflowInstanceTerminateOptions;
+export type WorkflowInstanceLocationHint = CloudflareWorkflowInstanceLocationHint;
 
 export type WorkflowInstanceStatusName = CloudflareInstanceStatus["status"];
 
@@ -40,10 +44,13 @@ export interface WorkflowInstance<Result> {
   readonly id: string;
   readonly pause: Effect.Effect<void, WorkflowOperationError>;
   readonly resume: Effect.Effect<void, WorkflowOperationError>;
-  readonly terminate: Effect.Effect<void, WorkflowOperationError>;
+  readonly terminate: (
+    options?: WorkflowInstanceTerminateOptions,
+  ) => Effect.Effect<void, WorkflowOperationError>;
   readonly restart: (
     options?: WorkflowInstanceRestartOptions,
   ) => Effect.Effect<void, WorkflowOperationError>;
+  readonly delete: Effect.Effect<void, WorkflowOperationError>;
   readonly status: Effect.Effect<
     WorkflowInstanceStatus<Result>,
     WorkflowOperationError | WorkflowResultDecodeError
@@ -165,8 +172,9 @@ export const makeClient = <
       id: raw.id,
       pause: operation("pause", () => raw.pause()),
       resume: operation("resume", () => raw.resume()),
-      terminate: operation("terminate", () => raw.terminate()),
+      terminate: (options) => operation("terminate", () => raw.terminate(options)),
       restart: (options) => operation("restart", () => raw.restart(options)),
+      delete: operation("delete", () => raw.delete()),
       status: operation("status", () => raw.status()).pipe(
         Effect.flatMap((status) =>
           Effect.gen(function* () {

package/src/internal/WorkerContext.ts

@@ -101,5 +101,6 @@ export const fromExecutionContext = (
       options?: Omit<WorkerContextWaitUntilOptions<E, R2>, "mode">,
     ) => schedule(effect, options, "propagate"),
     passThroughOnException: Effect.sync(() => ctx.passThroughOnException()),
+    abort: (reason?: string) => Effect.sync(() => ctx.abort(reason)),
   };
 };