liminal 0.17.11 → 0.17.12

package/dist/workerd/WorkerdActorNamespace.d.ts

@@ -0,0 +1,23 @@
+import { Layer, Effect, Scope, Schema as S, Context, Duration } from "effect";
+import { NativeRequest } from "effect-workerd";
+import { HttpServerResponse, HttpClient } from "effect/unstable/http";
+import type { Actor } from "../Actor.ts";
+import type { ProtocolDefinition } from "../Protocol.ts";
+import { type TopFromString } from "../_util/schema.ts";
+import * as Method from "../Method.ts";
+export interface ActorNamespaceDefinition<ActorSelf, ActorId extends string, Name extends TopFromString, AttachmentFields extends S.Struct.Fields, ClientSelf, ClientId extends string, D extends ProtocolDefinition, PreludeROut, PreludeE, RunROut, RunE> {
+    readonly ""?: this["actor"]["definition"]["client"]["protocol"];
+    readonly actor: Actor<ActorSelf, ActorId, Name, AttachmentFields, ClientSelf, ClientId, D>;
+    readonly prelude: Layer.Layer<PreludeROut | NonNullable<this[""]>["F"]["Payload"]["DecodingServices"] | NonNullable<this[""]>["F"]["Success"]["EncodingServices"] | NonNullable<this[""]>["F"]["Failure"]["EncodingServices"] | NonNullable<this[""]>["Event"]["EncodingServices"] | S.Struct<AttachmentFields>["DecodingServices"] | S.Struct<AttachmentFields>["EncodingServices"] | Name["EncodingServices"] | Name["DecodingServices"], PreludeE>;
+    readonly layer: Layer.Layer<RunROut, RunE, ActorSelf | HttpClient.HttpClient | PreludeROut>;
+    readonly handlers: Method.Handlers<D["methods"], ActorSelf | HttpClient.HttpClient | PreludeROut | RunROut | Scope.Scope>;
+    readonly onConnect: Effect.Effect<void, never, ActorSelf | HttpClient.HttpClient | PreludeROut | RunROut | Scope.Scope>;
+    readonly hibernation?: Duration.Input | undefined;
+}
+export interface ActorNamespace<NamespaceSelf, NamespaceId extends string, ActorSelf, ActorId extends string, Name extends TopFromString, AttachmentFields extends S.Struct.Fields, ClientSelf, ClientId extends string, D extends ProtocolDefinition, PreludeROut, PreludeE, RunROut, RunE> extends Context.Service<NamespaceSelf, DurableObjectNamespace> {
+    new (state: globalThis.DurableObjectState<{}>): Context.ServiceClass.Shape<NamespaceId, DurableObjectNamespace>;
+    readonly definition: ActorNamespaceDefinition<ActorSelf, ActorId, Name, AttachmentFields, ClientSelf, ClientId, D, PreludeROut, PreludeE, RunROut, RunE>;
+    readonly upgrade: (name: Name["Type"], attachments: S.Struct<AttachmentFields>["Type"]) => Effect.Effect<HttpServerResponse.HttpServerResponse, S.SchemaError, NamespaceSelf | NativeRequest.NativeRequest>;
+    readonly layer: (binding: string) => Layer.Layer<NamespaceSelf, S.SchemaError, never>;
+}
+export declare const Service: <NamespaceSelf>() => <NamespaceId extends string, ActorSelf, ActorId extends string, Name extends TopFromString, AttachmentFields extends S.Struct.Fields, ClientSelf, ClientId extends string, D extends ProtocolDefinition, PreludeROut, PreludeE, RunROut, RunE>(id: NamespaceId, definition: ActorNamespaceDefinition<ActorSelf, ActorId, Name, AttachmentFields, ClientSelf, ClientId, D, PreludeROut, PreludeE, RunROut, RunE>) => ActorNamespace<NamespaceSelf, NamespaceId, ActorSelf, ActorId, Name, AttachmentFields, ClientSelf, ClientId, D, PreludeROut, PreludeE, RunROut, RunE>;

package/dist/{actor/ActorRegistry.js → workerd/WorkerdActorNamespace.js}

@@ -1,19 +1,17 @@
 import { Layer, Effect, Scope, Schema as S, Context, ManagedRuntime, ConfigProvider, Duration, flow, String, Array, Encoding, Option, } from "effect";
+import { Binding, DoState, NativeRequest } from "effect-workerd";
+import { SecWebSocketProtocol, close } from "effect-workerd/socket_util";
 import { HttpServerResponse, HttpClient, FetchHttpClient } from "effect/unstable/http";
-import * as Binding from "../Binding.js";
-import * as DoState from "../DoState.js";
-import * as NativeRequest from "../NativeRequest.js";
-import { SecWebSocketProtocol, close } from "../socket_util.js";
-import { boundLayer } from "../util/boundLayer.js";
-import * as Diagnostic from "../util/Diagnostic.js";
-import { logCause } from "../util/logCause.js";
-import * as Mutex from "../util/Mutex.js";
-import { encodeJsonString, decodeJsonString } from "../util/schema.js";
-import * as Actor from "./Actor.js";
-import * as ClientDirectory from "./ClientDirectory.js";
-const { debug, span } = Diagnostic.module("cloudflare.ActorRegistry");
+import { boundLayer } from "liminal-util/boundLayer";
+import { logCause } from "liminal-util/logCause";
+import { diagnostic } from "../_diagnostic.js";
+import * as Mutex from "../_util/Mutex.js";
+import { encodeJsonString, decodeJsonString } from "../_util/schema.js";
+import * as ClientDirectory from "../ClientDirectory.js";
+import * as Method from "../Method.js";
+const { debug, span } = diagnostic("workerd.WorkerdActorNamespace");
 export const Service = () => (id, definition) => {
-    const { hibernation, actor, prelude, runLayer, handlers, onConnect } = definition;
+    const { hibernation, actor, prelude, handlers, layer: runLayer, onConnect } = definition;
     const { definition: { name: Name, client: { key: clientId, protocol: P }, attachments: AttachmentFields, }, } = actor;
     const encodeName = S.encodeEffect(Name);
     const decodeName = S.decodeUnknownEffect(Name);
@@ -73,19 +71,20 @@ export const Service = () => (id, definition) => {
                     clients: this.directory.handles,
                     currentClient,
                 });
-                yield* onConnect.pipe(Effect.scoped, span("onConnect"), Effect.provide([ActorLive, runLayer.pipe(Layer.provideMerge(ActorLive))]));
+                yield* onConnect.pipe(Effect.scoped, span("onConnect"), Effect.scoped, Effect.provide(Layer.provideMerge(runLayer, ActorLive)));
+                yield* debug("ClientRegistered");
                 return new Response(null, {
                     status: 101,
                     webSocket,
                     headers: { [SecWebSocketProtocol]: "liminal" },
                 });
-            }).pipe(Effect.scoped, Effect.tapCause(logCause), span("fetch"), this.runtime.runPromise);
+            }).pipe(Effect.tapCause(logCause), span("fetch"), this.runtime.runPromise);
         }
         webSocketMessage(socket, raw) {
             Effect.gen({ self: this }, function* () {
                 const currentClient = yield* this.directory.get(socket);
                 const name = yield* Effect.fromNullishOr(this.#name);
-                const layer = Layer.succeed(actor, {
+                const ActorLive = Layer.succeed(actor, {
                     name,
                     clients: this.directory.handles,
                     currentClient,
@@ -100,7 +99,7 @@ export const Service = () => (id, definition) => {
                 }
                 const { id, payload } = message;
                 const { _tag, value } = payload;
-                yield* handlers[_tag](value).pipe(Effect.provide(runLayer.pipe(Layer.provideMerge(layer))), Effect.matchEffect({
+                yield* handlers[_tag](value).pipe(Effect.matchEffect({
                     onSuccess: (value) => encodeFSuccess({
                         _tag: "F.Success",
                         id,
@@ -111,7 +110,7 @@ export const Service = () => (id, definition) => {
                         id,
                         failure: { _tag, value },
                     }),
-                }), span("handler", { attributes: { _tag } }), Effect.andThen((v) => Effect.sync(() => socket.send(v))), Effect.scoped);
+                }), span("handler", { attributes: { _tag } }), Effect.andThen((v) => Effect.sync(() => socket.send(v))), Effect.scoped, Effect.provide(Layer.provideMerge(runLayer, ActorLive)));
             }).pipe(Effect.scoped, Mutex.task, Effect.tapCause(logCause), span("webSocketMessage"), this.runtime.runFork);
         }
         webSocketClose(socket, _code, _reason, _wasClean) {
@@ -150,4 +149,4 @@ export const Service = () => (id, definition) => {
     const layer = Binding.layer(tag, ["getByName"]);
     return Object.assign(tag, { definition, upgrade, layer });
 };
-//# sourceMappingURL=ActorRegistry.js.map
+//# sourceMappingURL=WorkerdActorNamespace.js.map

package/dist/workerd/WorkerdActorNamespace.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"WorkerdActorNamespace.js","sourceRoot":"","sources":["../../workerd/WorkerdActorNamespace.ts"],"names":[],"mappings":"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"}

package/dist/workerd/index.d.ts

@@ -0,0 +1 @@
+export * as WorkerdActorNamespace from "./WorkerdActorNamespace.ts";

package/dist/workerd/index.js

@@ -0,0 +1,2 @@
+export * as WorkerdActorNamespace from "./WorkerdActorNamespace.js";
+//# sourceMappingURL=index.js.map

package/dist/workerd/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../workerd/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,qBAAqB,MAAM,4BAA4B,CAAA"}

package/index.ts

@@ -1,12 +1,11 @@
-export * as Ai from "./Ai.ts"
-export * as Assets from "./Assets.ts"
-export * as Binding from "./Binding.ts"
-export * as D1 from "./D1.ts"
-export * as DoState from "./DoState.ts"
-export * as Hyperdrive from "./Hyperdrive.ts"
-export * as Images from "./Images.ts"
-export * as Kv from "./Kv.ts"
-export * as NativeRequest from "./NativeRequest.ts"
-export * as R2 from "./R2.ts"
-export * as Worker from "./Worker.ts"
-export * as WorkerLoader from "./WorkerLoader.ts"
+export * as Accumulator from "./Accumulator.ts"
+export * as Actor from "./Actor.ts"
+export * as Audition from "./Audition.ts"
+export * as Client from "./Client.ts"
+export * as ClientDirectory from "./ClientDirectory.ts"
+export * as ClientHandle from "./ClientHandle.ts"
+export * as Method from "./Method.ts"
+export * as Protocol from "./Protocol.ts"
+export * from "./ActorTransport.ts"
+export * from "./F.ts"
+export * from "./errors.ts"

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "liminal",
-  "version": "0.17.11",
-  "description": "Effect x Cloudflare",
+  "version": "0.17.12",
+  "description": "Effect x Actors",
   "bugs": {
     "url": "https://github.com/crosshatch/liminal/issues"
   },
@@ -11,9 +11,6 @@
     "url": "https://github.com/crosshatch/liminal.git",
     "directory": "liminal"
   },
-  "bin": {
-    "liminal": "./dist/main.js"
-  },
   "type": "module",
   "sideEffects": false,
   "exports": {
@@ -25,27 +22,26 @@
       "types": "./*.ts",
       "default": "./dist/*.js"
     },
-    "./actor": {
-      "types": "./actor/index.ts",
-      "default": "./dist/actor/index.js"
+    "./browser": {
+      "types": "./browser/index.ts",
+      "default": "./dist/browser/index.js"
     },
     "./experimental": {
       "types": "./experimental/index.ts",
       "default": "./dist/experimental/index.js"
     },
-    "./platform": {
-      "types": "./platform/index.ts",
-      "default": "./dist/platform/index.js"
-    },
-    "./util/*": {
-      "types": "./util/*.ts",
-      "default": "./dist/util/*.js"
+    "./workerd": {
+      "types": "./workerd/index.ts",
+      "default": "./dist/workerd/index.js"
     },
     "./package.json": "./package.json"
   },
   "peerDependencies": {
     "@cloudflare/workers-types": "^4.20260414.1",
+    "@effect/platform-browser": "4.0.0-beta.50",
     "@effect/sql-d1": "4.0.0-beta.50",
-    "effect": "4.0.0-beta.50"
+    "effect": "4.0.0-beta.50",
+    "effect-workerd": "0.0.2",
+    "liminal-util": "0.0.2"
   }
 }

package/tsconfig.json

@@ -6,5 +6,6 @@
     "types": ["@cloudflare/workers-types"]
   },
   "include": [".", "package.json"],
-  "exclude": ["dist"]
+  "exclude": ["dist"],
+  "references": [{ "path": "../effect-workerd" }, { "path": "../liminal-util" }]
 }

package/{actor/ActorRegistry.ts → workerd/WorkerdActorNamespace.ts}

@@ -13,27 +13,25 @@ import {
   Encoding,
   Option,
 } from "effect"
+import { Binding, DoState, NativeRequest } from "effect-workerd"
+import { SecWebSocketProtocol, close } from "effect-workerd/socket_util"
 import { HttpServerResponse, HttpClient, FetchHttpClient } from "effect/unstable/http"
+import { boundLayer } from "liminal-util/boundLayer"
+import { logCause } from "liminal-util/logCause"
 
-import type { ActorTransport } from "./ActorTransport.ts"
-import type * as Method from "./Method.ts"
-import type { ProtocolDefinition } from "./Protocol.ts"
-
-import * as Binding from "../Binding.ts"
-import * as DoState from "../DoState.ts"
-import * as NativeRequest from "../NativeRequest.ts"
-import { SecWebSocketProtocol, close } from "../socket_util.ts"
-import { boundLayer } from "../util/boundLayer.ts"
-import * as Diagnostic from "../util/Diagnostic.ts"
-import { logCause } from "../util/logCause.ts"
-import * as Mutex from "../util/Mutex.ts"
-import { type TopFromString, encodeJsonString, decodeJsonString } from "../util/schema.ts"
-import * as Actor from "./Actor.ts"
-import * as ClientDirectory from "./ClientDirectory.ts"
-
-const { debug, span } = Diagnostic.module("cloudflare.ActorRegistry")
-
-export interface ActorRegistryDefinition<
+import type { Actor } from "../Actor.ts"
+import type { ActorTransport } from "../ActorTransport.ts"
+import type { ProtocolDefinition } from "../Protocol.ts"
+
+import { diagnostic } from "../_diagnostic.ts"
+import * as Mutex from "../_util/Mutex.ts"
+import { type TopFromString, encodeJsonString, decodeJsonString } from "../_util/schema.ts"
+import * as ClientDirectory from "../ClientDirectory.ts"
+import * as Method from "../Method.ts"
+
+const { debug, span } = diagnostic("workerd.WorkerdActorNamespace")
+
+export interface ActorNamespaceDefinition<
   ActorSelf,
   ActorId extends string,
   Name extends TopFromString,
@@ -48,7 +46,7 @@ export interface ActorRegistryDefinition<
 > {
   readonly ""?: this["actor"]["definition"]["client"]["protocol"]
 
-  readonly actor: Actor.Actor<ActorSelf, ActorId, Name, AttachmentFields, ClientSelf, ClientId, D>
+  readonly actor: Actor<ActorSelf, ActorId, Name, AttachmentFields, ClientSelf, ClientId, D>
 
   readonly prelude: Layer.Layer<
     | PreludeROut
@@ -63,25 +61,25 @@ export interface ActorRegistryDefinition<
     PreludeE
   >
 
-  readonly runLayer: Layer.Layer<RunROut, RunE, ActorSelf | PreludeROut>
+  readonly layer: Layer.Layer<RunROut, RunE, ActorSelf | HttpClient.HttpClient | PreludeROut>
 
   readonly handlers: Method.Handlers<
     D["methods"],
-    ActorSelf | RunROut | HttpClient.HttpClient | PreludeROut | Scope.Scope
+    ActorSelf | HttpClient.HttpClient | PreludeROut | RunROut | Scope.Scope
   >
 
   readonly onConnect: Effect.Effect<
     void,
     never,
-    ActorSelf | RunROut | HttpClient.HttpClient | PreludeROut | Scope.Scope
+    ActorSelf | HttpClient.HttpClient | PreludeROut | RunROut | Scope.Scope
   >
 
   readonly hibernation?: Duration.Input | undefined
 }
 
-export interface ActorRegistry<
-  RegistrySelf,
-  RegistryId extends string,
+export interface ActorNamespace<
+  NamespaceSelf,
+  NamespaceId extends string,
   ActorSelf,
   ActorId extends string,
   Name extends TopFromString,
@@ -93,10 +91,10 @@ export interface ActorRegistry<
   PreludeE,
   RunROut,
   RunE,
-> extends Context.Service<RegistrySelf, DurableObjectNamespace> {
-  new (state: globalThis.DurableObjectState<{}>): Context.ServiceClass.Shape<RegistryId, DurableObjectNamespace>
+> extends Context.Service<NamespaceSelf, DurableObjectNamespace> {
+  new (state: globalThis.DurableObjectState<{}>): Context.ServiceClass.Shape<NamespaceId, DurableObjectNamespace>
 
-  readonly definition: ActorRegistryDefinition<
+  readonly definition: ActorNamespaceDefinition<
     ActorSelf,
     ActorId,
     Name,
@@ -113,15 +111,15 @@ export interface ActorRegistry<
   readonly upgrade: (
     name: Name["Type"],
     attachments: S.Struct<AttachmentFields>["Type"],
-  ) => Effect.Effect<HttpServerResponse.HttpServerResponse, S.SchemaError, RegistrySelf | NativeRequest.NativeRequest>
+  ) => Effect.Effect<HttpServerResponse.HttpServerResponse, S.SchemaError, NamespaceSelf | NativeRequest.NativeRequest>
 
-  readonly layer: (binding: string) => Layer.Layer<RegistrySelf, S.SchemaError, never>
+  readonly layer: (binding: string) => Layer.Layer<NamespaceSelf, S.SchemaError, never>
 }
 
 export const Service =
-  <RegistrySelf>() =>
+  <NamespaceSelf>() =>
   <
-    RegistryId extends string,
+    NamespaceId extends string,
     ActorSelf,
     ActorId extends string,
     Name extends TopFromString,
@@ -134,8 +132,8 @@ export const Service =
     RunROut,
     RunE,
   >(
-    id: RegistryId,
-    definition: ActorRegistryDefinition<
+    id: NamespaceId,
+    definition: ActorNamespaceDefinition<
       ActorSelf,
       ActorId,
       Name,
@@ -148,9 +146,9 @@ export const Service =
       RunROut,
       RunE
     >,
-  ): ActorRegistry<
-    RegistrySelf,
-    RegistryId,
+  ): ActorNamespace<
+    NamespaceSelf,
+    NamespaceId,
     ActorSelf,
     ActorId,
     Name,
@@ -163,7 +161,7 @@ export const Service =
     RunROut,
     RunE
   > => {
-    const { hibernation, actor, prelude, runLayer, handlers, onConnect } = definition
+    const { hibernation, actor, prelude, handlers, layer: runLayer, onConnect } = definition
     const {
       definition: {
         name: Name,
@@ -196,7 +194,7 @@ export const Service =
         encodeAttachments(attachments).pipe(Effect.andThen((v) => Effect.sync(() => socket.serializeAttachment(v)))),
     }
 
-    const tag = class tag extends Context.Service<RegistrySelf, DurableObjectNamespace>()(id) {
+    const tag = class tag extends Context.Service<NamespaceSelf, DurableObjectNamespace>()(id) {
       readonly runtime
       readonly directory = ClientDirectory.make(actor, transport)
 
@@ -261,21 +259,23 @@ export const Service =
           yield* onConnect.pipe(
             Effect.scoped,
             span("onConnect"),
-            Effect.provide([ActorLive, runLayer.pipe(Layer.provideMerge(ActorLive))]),
+            Effect.scoped,
+            Effect.provide(Layer.provideMerge(runLayer, ActorLive)),
           )
+          yield* debug("ClientRegistered")
           return new Response(null, {
             status: 101,
             webSocket,
             headers: { [SecWebSocketProtocol]: "liminal" },
           })
-        }).pipe(Effect.scoped, Effect.tapCause(logCause), span("fetch"), this.runtime.runPromise)
+        }).pipe(Effect.tapCause(logCause), span("fetch"), this.runtime.runPromise)
       }
 
       webSocketMessage(socket: WebSocket, raw: string | ArrayBuffer) {
         Effect.gen({ self: this }, function* () {
           const currentClient = yield* this.directory.get(socket)
           const name = yield* Effect.fromNullishOr(this.#name)
-          const layer = Layer.succeed(actor, {
+          const ActorLive = Layer.succeed(actor, {
             name,
             clients: this.directory.handles,
             currentClient,
@@ -291,7 +291,6 @@ export const Service =
           const { id, payload } = message
           const { _tag, value } = payload as never
           yield* handlers[_tag]!(value).pipe(
-            Effect.provide(runLayer.pipe(Layer.provideMerge(layer))),
             Effect.matchEffect({
               onSuccess: (value) =>
                 encodeFSuccess({
@@ -309,6 +308,7 @@ export const Service =
             span("handler", { attributes: { _tag } }),
             Effect.andThen((v) => Effect.sync(() => socket.send(v))),
             Effect.scoped,
+            Effect.provide(Layer.provideMerge(runLayer, ActorLive)),
           )
         }).pipe(Effect.scoped, Mutex.task, Effect.tapCause(logCause), span("webSocketMessage"), this.runtime.runFork)
       }

package/workerd/index.ts

@@ -0,0 +1 @@
+export * as WorkerdActorNamespace from "./WorkerdActorNamespace.ts"

package/Ai.ts

@@ -1,7 +0,0 @@
-import { Context } from "effect"
-
-import * as Binding from "./Binding.ts"
-
-export class Ai extends Context.Service<Ai, globalThis.Ai>()("liminal/Ai") {}
-
-export const layer = Binding.layer(Ai, ["run"])

package/Assets.ts

@@ -1,21 +0,0 @@
-import { Effect, Context } from "effect"
-import { HttpServerResponse } from "effect/unstable/http"
-
-import * as Binding from "./Binding.ts"
-import { NativeRequest } from "./NativeRequest.ts"
-
-export class Assets extends Context.Service<
-  Assets,
-  {
-    readonly fetch: typeof fetch
-  }
->()("liminal/Assets") {}
-
-export const layer = Binding.layer(Assets, ["fetch"])
-
-export const forward = Effect.gen({ self: this }, function* () {
-  const assets = yield* Assets
-  const request = yield* NativeRequest
-  const response = yield* Effect.promise(() => assets.fetch(request))
-  return HttpServerResponse.fromWeb(response)
-})

package/Binding.ts

@@ -1,40 +0,0 @@
-import { env } from "cloudflare:workers"
-import { Context, Layer, Effect, Schema as S, SchemaIssue } from "effect"
-
-export const layer =
-  <Self, Identifier extends string, Shape, ROut = never, E = never, RIn = never>(
-    tag: Context.ServiceClass<Self, Identifier, Shape>,
-    keys: ReadonlyArray<string>,
-    derive?: (resource: Shape) => Layer.Layer<ROut, E, RIn> | undefined,
-  ) =>
-  (binding: string) =>
-    Effect.gen(function* () {
-      const resolved = (env as never)[binding]
-      if (!resolved) {
-        return yield* Effect.fail(
-          new S.SchemaError(
-            new SchemaIssue.Pointer(
-              [binding],
-              new SchemaIssue.MissingKey({
-                messageMissingKey: `Missing binding "${binding}" on env`,
-              }),
-            ),
-          ),
-        )
-      }
-      for (const key of keys) {
-        if (!(key in resolved)) {
-          return yield* Effect.fail(
-            new S.SchemaError(
-              new SchemaIssue.Pointer(
-                [key],
-                new SchemaIssue.MissingKey({
-                  messageMissingKey: `Expected key \`${key}\` on binding \`${binding}\``,
-                }),
-              ),
-            ),
-          )
-        }
-      }
-      return Layer.mergeAll(Layer.succeed(tag, resolved), derive?.(resolved) ?? Layer.empty)
-    }).pipe(Layer.unwrap)

package/D1.ts

@@ -1,8 +0,0 @@
-import { D1Client } from "@effect/sql-d1"
-import { Context } from "effect"
-
-import * as Binding from "./Binding.ts"
-
-export class D1 extends Context.Service<D1, D1Database>()("liminal/D1") {}
-
-export const layer = Binding.layer(D1, ["exec"], (db) => D1Client.layer({ db }))

package/DoState.ts

@@ -1,3 +0,0 @@
-import { Context } from "effect"
-
-export class DoState extends Context.Service<DoState, globalThis.DurableObjectState<{}>>()("liminal/DoState") {}

package/Hyperdrive.ts

@@ -1,11 +0,0 @@
-import { Effect, Redacted, Context } from "effect"
-
-import * as Binding from "./Binding.ts"
-
-export class Hyperdrive extends Context.Service<Hyperdrive, globalThis.Hyperdrive>()("liminal/Hyperdrive") {}
-
-export const layer = Binding.layer(Hyperdrive, ["connectionString"])
-
-export const connectionString = Hyperdrive.asEffect().pipe(
-  Effect.map(({ connectionString }) => Redacted.make(connectionString)),
-)

package/Images.ts

@@ -1,101 +0,0 @@
-import { Data, Context, Pipeable, Function, Effect } from "effect"
-
-import * as Binding from "./Binding.ts"
-
-export class Images extends Context.Service<Images, globalThis.ImagesBinding>()("liminal/ImageTransformer") {}
-
-export const layer = Binding.layer(Images, ["transform", "draw", "output"])
-
-const TypeId = "~liminal/Images/Transformation" as const
-
-export interface Steps extends Pipeable.Pipeable {
-  readonly [TypeId]: typeof TypeId
-  readonly steps: ReadonlyArray<Step>
-}
-
-export interface DrawOptions {
-  image: ReadableStream<Uint8Array> | ImageTransformer
-  options?: ImageDrawOptions | undefined
-}
-
-export type Step = Data.TaggedEnum<{
-  Transform: {
-    transform: ImageTransform
-  }
-  Draw: DrawOptions
-}>
-
-export const empty: Steps = {
-  [TypeId]: TypeId,
-  steps: [],
-  pipe() {
-    return Pipeable.pipeArguments(this, arguments)
-  },
-}
-
-export const transform: {
-  (transform: ImageTransform): (steps: Steps) => Steps
-  (steps: Steps, transform: ImageTransform): Steps
-} = Function.dual(2, (steps: Steps, transform: ImageTransform) => ({
-  [TypeId]: TypeId,
-  steps: [
-    ...steps.steps,
-    {
-      _tag: "Transform",
-      transform,
-    },
-  ],
-  pipe() {
-    return Pipeable.pipeArguments(this, arguments)
-  },
-}))
-
-export const draw: {
-  (draw: DrawOptions): (steps: Steps) => Steps
-  (steps: Steps, draw: DrawOptions): Steps
-} = Function.dual(2, (steps: Steps, draw: DrawOptions) => ({
-  [TypeId]: TypeId,
-  steps: [
-    ...steps.steps,
-    {
-      _tag: "Draw",
-      ...draw,
-    },
-  ],
-  pipe() {
-    return Pipeable.pipeArguments(this, arguments)
-  },
-}))
-
-export interface ProcessConfig {
-  readonly stream: ReadableStream<Uint8Array>
-  readonly inputOptions?: ImageInputOptions | undefined
-  readonly outputOptions: ImageOutputOptions
-}
-
-export const process: {
-  (config: ProcessConfig): (steps: Steps) => Effect.Effect<ImageTransformationResult, never, Images>
-  (steps: Steps, config: ProcessConfig): Effect.Effect<ImageTransformationResult, never, Images>
-} = Function.dual(
-  2,
-  Effect.fnUntraced(function* ({ steps }: Steps, { stream, inputOptions, outputOptions }: ProcessConfig) {
-    const images = yield* Images
-    let transformer = images.input(stream, inputOptions)
-    for (let i = 0; i < steps.length; i++) {
-      const step = steps[i]!
-      switch (step._tag) {
-        case "Draw": {
-          const { image, options } = step
-          transformer = transformer.draw(image, options)
-          break
-        }
-        case "Transform": {
-          const { transform } = step
-          transformer = transformer.transform(transform)
-          break
-        }
-      }
-    }
-    return yield* Effect.promise(() => transformer.output(outputOptions))
-  }),
-)