@gjermundgaraba/effect-actions-cloudflare 0.21.0 → 0.23.0

package/examples/chat-rooms/src/worker.ts

@@ -3,7 +3,7 @@ import { Effect, Layer, Schema } from "effect";
 import { HttpRouter, HttpServer } from "effect/http";
 
 import { Activity } from "./chat/activity.js";
-import { RoomName } from "./chat/Chat.js";
+import { DemoRoomName } from "./chat/Chat.js";
 import { Room } from "./chat/room.js";
 import { MessageStore } from "./chat/store.js";
 import { layerKvPreviews } from "./platform/kv-previews.js";
@@ -21,22 +21,10 @@ import {
   workerRoutes,
 } from "./routes.js";
 
-// The rooms for another Worker, over a service binding: a named entrypoint of this one.
 export { RoomsEntrypoint } from "./rooms-entrypoint.js";
 
-// Entrypoint, Wrangler's `main`: the composition root of the Worker and of every object. It
-// chooses the stores, the room and the stubs, and routes each request.
+const decodeRoom = Schema.decodeUnknownEffect(DemoRoomName);
 
-const decodeRoom = Schema.decodeUnknownEffect(RoomName);
-
-// A room's Durable Object, bound as CHAT_ROOM in wrangler.jsonc under this export's name. Each
-// instance builds its services, the store, the room and its activity, then its routes, as it is
-// constructed, again after every eviction. The room is the name the Worker reached the object by,
-// `getByName(room)`, decoded once there: `ActionDurableObject.name` dies for an object reached by
-// an id, and the build fails for a name `RoomName` does not list, each a bug in the Worker. Given
-// `rooms`, it refuses a call or a watch whose input names another room. Its `lobby` task tells
-// the lobby of each change, on the alarm until the lobby hears. The alarm expires old messages
-// and tells the lobby, as an expired message can be the room's latest.
 export class ChatRoom extends ActionDurableObject.make({
   placed: rooms,
   services: () =>
@@ -53,18 +41,12 @@ export class ChatRoom extends ActionDurableObject.make({
     ),
 }) {}
 
-// The lobby's Durable Object, bound as CHAT_LOBBY: one for the Worker, named `lobby`, keeping
-// every room's preview, which each room tells it of and its pages follow.
 export class ChatLobby extends ActionDurableObject.make({
   services: () => layerKvPreviews,
   routes: lobbyRoutes,
   calls: lobbyCalls,
 }) {}
 
-// The Worker's own handler, built once, when the module loads, which keeps the lobby's client
-// from stranding as `ActionDurableObject.layerStubClient`'s gotchas say: building it does no I/O,
-// which a Worker refuses outside a request. `toWebHandler` reads no `MaxBodySize`, so the
-// platform limits request bodies.
 const served = HttpRouter.toWebHandler(
   workerRoutes.pipe(
     Layer.provide(layerLobbyHost),
@@ -72,11 +54,8 @@ const served = HttpRouter.toWebHandler(
   )
 );
 
-const isRoomName = Schema.is(RoomName);
+const isRoomName = Schema.is(DemoRoomName);
 
-// A page's socket, `/rooms/<room>/rpc` or `/lobby/rpc`, is its object's `/rpc`: forwarding the
-// request forwards its upgrade, and the object answers it. Everything else is the Worker's own,
-// the rooms' calls among them, which it sends on to each room's object itself.
 export default {
   async fetch(request: Request, env: Cloudflare.Env) {
     const url = new URL(request.url);

package/examples/chat-rooms/test/platform/sql-store.test.ts

@@ -12,8 +12,6 @@ const day = 24 * 60 * 60 * 1000;
 
 let objects = 0;
 
-// The adapter against a room's real SQLite database, inside a fresh object of its own: what it
-// reaches is the Workers runtime, so the runtime is its stand-in.
 const inObject = <A, E>(
   use: (
     store: MessageStore["Service"],
@@ -39,9 +37,6 @@ const inObject = <A, E>(
     );
   });
 
-// A clock a millisecond later at each read, which never yields: posts running at once read
-// times of their own, where at one shared time the oldest message and the latest would set the
-// same alarm. Effect's TestClock moves on through a semaphore, which lets each post finish first.
 const tickingFrom = (start: number): Clock.Clock => {
   let now = start;
   const tick = () => (now += 1);

package/examples/chat-rooms/test/support/socket.ts

@@ -6,14 +6,6 @@ import { Socket } from "effect/socket";
 
 import { protocolVersion, unsupportedProtocol } from "../../src/Rpc.js";
 
-// A page's socket to an object, `<at>/rpc` upgraded through the Worker as a browser's would be,
-// naming the version of the rpcs as `connection(url)` does. A test has no network to open one by
-// its URL, so it hands the upgraded socket to Effect's client protocol, the protocol
-// `connection(url)` builds over a URL, its reconnection included, and keeps the socket, which a
-// test listens on for what the object sent. The socket is accepted as Effect's client listens to
-// it, as a browser's socket is constructed with its listeners: accepted before, a close the
-// object sent at once could go unheard. `connects` counts the client's attempts: each after the
-// first would be another upgrade in a browser.
 export const pageSocket = (
   at: string,
   headers: Record<string, string> = {},
@@ -62,7 +54,6 @@ export const pageSocket = (
     return { socket, protocol, connects: () => connects };
   });
 
-// A page's socket to a room.
 export const roomSocket = (
   room: string,
   headers: Record<string, string> = {},

package/examples/chat-rooms/test/worker.test.ts

@@ -7,24 +7,22 @@ import * as ActionRpc from "@gjermundgaraba/effect-actions/ActionRpc";
 import { evictDurableObject, runInDurableObject } from "cloudflare:test";
 import { env, exports } from "cloudflare:workers";
 import type { Schema } from "effect";
-import { Effect, Schedule, Stream } from "effect";
+import { DateTime, Effect, Schedule, Stream } from "effect";
 import { HttpClient, HttpClientRequest } from "effect/http";
 import { TestClock } from "effect/testing";
 
 import { LobbyHttp, RoomHttp } from "../src/Api.js";
 import { followLobby, openRoom } from "../src/browser.js";
 import { MessagePosted, PostMessage } from "../src/chat/Chat.js";
-import type { RoomName } from "../src/chat/Chat.js";
+import type { DemoRoomName } from "../src/chat/Chat.js";
 import { Login } from "../src/identity/Identity.js";
 import { RoomRpc, unsupportedProtocol } from "../src/Rpc.js";
 import { pageSocket, roomSocket } from "./support/socket.js";
 
 const day = 24 * 60 * 60 * 1000;
 
-// Every request goes through the Worker's own `fetch`, as a deployed one would get it.
 const worker = ActionDurableObject.layerHttpClient(exports.default);
 
-// The rooms' JSON routes, the Worker's: each call names its room.
 const jsonAs = (token?: string) =>
   ActionHttp.client(RoomHttp, {
     baseUrl: "https://chat.example",
@@ -37,7 +35,6 @@ const jsonAs = (token?: string) =>
         }),
   });
 
-// An agent's one connection to the Worker's MCP endpoint, reaching every room.
 const agentAs = (token: string) =>
   ActionMcp.client([PostMessage, MessagePosted], {
     url: "https://chat.example/mcp",
@@ -47,8 +44,6 @@ const agentAs = (token: string) =>
     ),
   });
 
-// What the runtime does after a call answers, such as a room's alarm, is waited for in real time:
-// a test using this runs under `it.live`, as under the test clock its sleeps never pass.
 const eventually = <A, E>(
   check: Effect.Effect<A, E>,
   until: (value: A) => boolean
@@ -65,7 +60,7 @@ const arrivedIn = (received: readonly unknown[]) => (count: number) =>
   );
 
 const pageIn = (
-  room: RoomName,
+  room: DemoRoomName,
   token: string,
   headers: Record<string, string> = {}
 ) =>
@@ -92,10 +87,7 @@ const status = (path: string, body: Schema.Json = {}) =>
 
 const readAll = (room: string) => ({ room, after: 0 });
 
-// First in the file, whose Worker module is its own: no request has reached the lobby before, so
-// a first request ending without I/O is the one that would strand a client built inside it, as
-// `ActionDurableObject.layerStubClient`'s gotchas say.
-describe("the Worker's handler, built as the module loads", () => {
+describe("the Worker's handler, built as the module loads, before any other test of this file reaches the lobby", () => {
   it.effect(
     "answers a first request ending without I/O, then a call reaching the lobby",
     () =>
@@ -300,7 +292,7 @@ describe("the Worker and its rooms", () => {
           text: "Polled in design.",
         });
 
-        const polled = (room: RoomName, after: number) =>
+        const polled = (room: DemoRoomName, after: number) =>
           ada
             .watch(
               MessagePosted,
@@ -409,8 +401,6 @@ describe("the Worker and its rooms", () => {
           baseUrl: "https://chat.example",
         });
 
-        // The room tells the lobby from its `lobby` task, which the room's alarm runs once the
-        // post has answered: the lobby hears of it a moment later, not as the post returns.
         const { previews } = yield* eventually(lobby.previews(), (answer) =>
           answer.previews.some(
             ({ room, latestAt }) => room === "design" && latestAt === posted.at
@@ -487,7 +477,6 @@ describe("the Worker and its rooms", () => {
           )
         );
 
-        // The lobby hears of the post from the room's `lobby` task, a moment after it answered.
         const latestAt = yield* eventually(
           Effect.promise(
             async () => await exports.RoomsEntrypoint.latestAt("general")
@@ -536,21 +525,25 @@ describe("the Worker and its rooms", () => {
           text: "From yesterday.",
         });
 
+        const recent = yield* json.postMessage({
+          room: "design",
+          text: "From today.",
+        });
+
         yield* Effect.promise(async () => {
-          await runInDurableObject(stub, (_, state) => {
+          await runInDurableObject(stub, async (room, state) => {
             state.storage.sql.exec(
               "UPDATE messages SET at = at - ? WHERE id = ?",
               day,
               old.id
             );
-          });
-        });
 
-        // The next post sets the alarm for the day-old message's expiry, already past, so the
-        // runtime runs it at once: the test waits until it has set the next, for the recent one's.
-        const recent = yield* json.postMessage({
-          room: "design",
-          text: "From today.",
+            await room.run(
+              ActionDurableObject.Alarm.use((alarm) =>
+                alarm.set(DateTime.makeUnsafe(old.at))
+              )
+            );
+          });
         });
 
         yield* eventually(

package/examples/chat-rooms/vite.config.ts

@@ -1,7 +1,6 @@
 import { cloudflareTest } from "@cloudflare/vitest-plugin";
 import { defineConfig } from "vite-plus";
 
-// Its tests run inside the Workers runtime, on the Worker wrangler.jsonc describes.
 export default defineConfig({
   plugins: [
     cloudflareTest({
@@ -10,10 +9,6 @@ export default defineConfig({
   ],
   test: {
     include: ["test/**/*.test.ts"],
-    // Why: under @cloudflare/vitest-plugin 1.4.4, the warm-module response for a later file in a
-    // pool slot can exceed what the runner's control socket accepts, 41 MB in 709 entries
-    // measured on chat-rooms, which closes it with 1009 and loses the file as "Worker exited
-    // unexpectedly"; two small files alone did not trigger it.
     fsModuleCache: false,
   },
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gjermundgaraba/effect-actions-cloudflare",
-  "version": "0.21.0",
+  "version": "0.23.0",
   "description": "Serve effect-actions from Cloudflare Durable Objects, with Effect RPC over hibernating WebSockets.",
   "keywords": [
     "cloudflare",
@@ -39,11 +39,11 @@
     "@cloudflare/vitest-plugin": "1.4.7",
     "@cloudflare/workers-types": "5.20261025.1",
     "@effect/vitest": "4.0.6",
-    "@gjermundgaraba/effect-actions": "0.21.0",
+    "@gjermundgaraba/effect-actions": "0.23.0",
     "effect": "4.0.6"
   },
   "peerDependencies": {
-    "@gjermundgaraba/effect-actions": "^0.21.0",
+    "@gjermundgaraba/effect-actions": "^0.23.0",
     "effect": "~4.0.5"
   },
   "scripts": {

package/examples/chat-rooms/node_modules/.vite/vitest/CACHEDIR.TAG

@@ -1,3 +0,0 @@
-Signature: 8a477f597d28d172789f06886806bc55
-# This file is a cache directory tag created by Vitest.
-# For information about cache directory tags see https://bford.info/cachedir/

package/examples/chat-rooms/node_modules/.vite/vitest/da39a3ee5e6b4b0d3255bfef95601890afd80709/results.json

@@ -1 +0,0 @@
-{"version":1,"projects":{"":{"files":{"test/worker.test.ts":{"failed":false,"duration":3218,"lastRun":1793050877213},"test/platform/sql-store.test.ts":{"failed":false,"duration":405,"lastRun":1793050877213}}}}}