effect-cf 0.0.3 → 0.1.0

package/src/Worker.ts

@@ -167,27 +167,12 @@ export type RpcHandlers<ROut, Api> = {
     : never;
 };
 
-export interface WorkerOptions<
-  ROut,
-  Rpc extends WorkerRpc<ROut>,
-  RRequest = never,
-  RequestLayerError = never,
-> {
-  readonly fetch?: Effect.Effect<WorkerFetchSuccess, unknown, WorkerFetchContext<ROut | RRequest>>;
-  /**
-   * Per-request services provided while evaluating the fetch handler.
-   *
-   * This scope closes when the handler produces a `Response`; it is not kept
-   * open until a streaming response body is consumed by the platform.
-   */
-  readonly requestLayer?: Layer.Layer<RRequest, RequestLayerError, WorkerFetchContext<ROut>>;
+export interface WorkerOptions<ROut, Rpc extends WorkerRpc<ROut>> {
+  readonly fetch?: Effect.Effect<WorkerFetchSuccess, unknown, WorkerFetchContext<ROut>>;
   readonly rpc?: Rpc;
 }
 
-export type FetchWorkerOptions<ROut, RRequest = never, RequestLayerError = never> = Omit<
-  WorkerOptions<ROut, Record<never, never>, RRequest, RequestLayerError>,
-  "rpc"
-> & {
+export type FetchWorkerOptions<ROut> = Omit<WorkerOptions<ROut, Record<never, never>>, "rpc"> & {
   readonly rpc?: never;
 };
 
@@ -226,15 +211,9 @@ const renderFetchSuccess = <E, R>(
         ),
   );
 
-export const make = <
-  ROut,
-  LayerError,
-  const Rpc extends WorkerRpc<ROut> = Record<never, never>,
-  RRequest = never,
-  RequestLayerError = never,
->(
+export const make = <ROut, LayerError, const Rpc extends WorkerRpc<ROut> = Record<never, never>>(
   layer: Layer.Layer<ROut, LayerError, ExecutionContext | WorkerContext | WorkerEnvironment>,
-  options: WorkerOptions<ROut, Rpc, RRequest, RequestLayerError>,
+  options: WorkerOptions<ROut, Rpc>,
 ): WorkerClass<Rpc, ROut> => {
   class EffectWorker extends CloudflareWorkerEntrypoint<WorkerEnv> {
     readonly runtime: ManagedRuntime.ManagedRuntime<RuntimeContext<ROut>, LayerError>;
@@ -281,14 +260,9 @@ export const make = <
         Layer.succeed(NativeRequest, request),
         Layer.succeed(HttpServerRequest.HttpServerRequest, HttpServerRequest.fromWeb(request)),
       );
-      const fetchEffect = renderFetchSuccess(fetchHandler);
-      const requestEffect =
-        options.requestLayer === undefined
-          ? fetchEffect
-          : fetchEffect.pipe(Effect.provide(options.requestLayer));
 
       return this[RunSymbol](
-        requestEffect.pipe(Effect.provide(requestServices)) as Effect.Effect<
+        renderFetchSuccess(fetchHandler).pipe(Effect.provide(requestServices)) as Effect.Effect<
           Response,
           unknown,
           RuntimeContext<ROut> | Scope.Scope
@@ -308,15 +282,9 @@ export const make = <
   return Entrypoint.assumeEntrypointClass<WorkerClass<Rpc, ROut>>(EffectWorker);
 };
 
-export const makeFetchHandler = <
-  ROut,
-  LayerError,
-  RRequest = never,
-  RequestLayerError = never,
-  Env extends WorkerEnv = WorkerEnv,
->(
+export const makeFetchHandler = <ROut, LayerError, Env extends WorkerEnv = WorkerEnv>(
   layer: Layer.Layer<ROut, LayerError, ExecutionContext | WorkerContext | WorkerEnvironment>,
-  options: FetchWorkerOptions<ROut, RRequest, RequestLayerError>,
+  options: FetchWorkerOptions<ROut>,
 ): FetchHandler<Env> => {
   const WorkerClass = make(layer, options);
 
@@ -350,12 +318,10 @@ export type Handlers<
   Self extends WorkerDefinition.Definition.Any,
 > = WorkerDefinition.Handlers<ROut, Self>;
 
-export type Options<
+export type Options<ROut, Self extends WorkerDefinition.Definition.Any> = WorkerDefinition.Options<
   ROut,
-  Self extends WorkerDefinition.Definition.Any,
-  RRequest = never,
-  RequestLayerError = never,
-> = WorkerDefinition.Options<ROut, Self, RRequest, RequestLayerError>;
+  Self
+>;
 
 export type HandlerEffect<
   ROut,

package/src/WorkerDefinition.ts

@@ -74,13 +74,8 @@ type BoundaryHandlers<ROut, Self extends Definition.Any> = {
 /**
  * Worker constructor options for a specific RPC definition.
  */
-export interface Options<
-  ROut,
-  Self extends Definition.Any,
-  RRequest = never,
-  RequestLayerError = never,
-> extends Omit<
-  WorkerEntrypoint.WorkerOptions<ROut, Handlers<ROut, Self>, RRequest, RequestLayerError>,
+export interface Options<ROut, Self extends Definition.Any> extends Omit<
+  WorkerEntrypoint.WorkerOptions<ROut, Handlers<ROut, Self>>,
   "rpc"
 > {
   readonly rpc: Handlers<ROut, Self>;
@@ -113,13 +108,13 @@ const makeDefinition = <Id extends string, const MethodsShape extends RpcDefinit
   const definition: SelfDefinition = RpcDefinition.make(id, methods);
 
   return Object.assign(definition, {
-    make: <ROut, LayerError, RRequest = never, RequestLayerError = never>(
+    make: <ROut, LayerError>(
       layer: Layer.Layer<
         ROut,
         LayerError,
         WorkerEntrypoint.ExecutionContext | WorkerEntrypoint.WorkerContext | WorkerEnvironment
       >,
-      options: Options<ROut, SelfDefinition, RRequest, RequestLayerError>,
+      options: Options<ROut, SelfDefinition>,
     ) =>
       WorkerEntrypoint.make(layer, {
         ...options,

package/src/index.ts

@@ -1,5 +1,6 @@
 export * as Binding from "./Binding";
 export * as DurableObject from "./DurableObject";
+export * as DurableObjectAlarm from "./DurableObjectAlarm";
 export * as DurableObjectDefinition from "./DurableObjectDefinition";
 export * as DurableObjectNamespace from "./DurableObjectNamespace";
 export * as DurableObjectRpcWebSocket from "./DurableObjectRpcWebSocket";