durable-actors 0.8.0 → 0.8.1

package/dist/host/protocol.js

@@ -19,38 +19,36 @@ function parseActorSessionServerMessage(document) {
 function failedReply(code, message) {
     return { type: "failed", code, message };
 }
-const sqliteStateSchema = z.object({
-    txid: z.number().int().positive().max(Number.MAX_SAFE_INTEGER),
-    path: z.string().optional()
-});
+const databaseValueSchema = z.discriminatedUnion("type", [
+    z.object({ type: z.literal("null") }),
+    z.object({ type: z.literal("integer"), value: z.string().regex(/^-?\d+$/) }),
+    z.object({ type: z.literal("real"), value: z.number() }),
+    z.object({ type: z.literal("text"), value: z.string() }),
+    z.object({ type: z.literal("blob"), value: z.base64() })
+]);
+const databaseResultSchema = z.discriminatedUnion("type", [
+    z.object({ type: z.literal("rows"), columns: z.array(z.string()), rows: z.array(z.array(databaseValueSchema)) }),
+    z.object({ type: z.literal("fields"), fields: z.record(z.string(), jsonValueSchema) }),
+    z.object({
+        type: z.literal("alarm"),
+        timestamp_ms: z.number().int().safe().nullable()
+    }),
+    z.object({ type: z.literal("done") })
+]);
 const invokeCommandSchema = z.object({
     type: z.literal("invoke"),
     request_id: actorComponentSchema,
-    actor: actorIdentitySchema,
     method: actorComponentSchema,
-    args: z.array(jsonValueSchema),
-    sqlite: sqliteStateSchema.optional(),
-    resident_only: z.boolean().optional()
+    args: z.array(jsonValueSchema)
 });
 const websocketEventCommandSchema = z.object({
     type: z.literal("websocket_event"),
     request_id: actorComponentSchema,
-    actor: actorIdentitySchema,
     event: socketEventSchema,
-    connections: z.array(socketConnectionSchema),
-    sqlite: sqliteStateSchema.optional(),
-    resident_only: z.boolean().optional()
-});
-const evictCommandSchema = z.object({
-    type: z.literal("evict"),
-    actor: actorIdentitySchema
-});
-const hydrateCommandSchema = z.object({
-    type: z.literal("hydrate"),
-    actor: actorIdentitySchema,
-    sqlite: sqliteStateSchema.optional(),
-    resident_only: z.boolean().optional()
+    connections: z.array(socketConnectionSchema)
 });
+const evictCommandSchema = z.object({ type: z.literal("evict"), graceful: z.boolean() });
+const hydrateCommandSchema = z.object({ type: z.literal("hydrate") });
 const executorCommandSchema = z.discriminatedUnion("type", [
     invokeCommandSchema,
     websocketEventCommandSchema,
@@ -58,13 +56,15 @@ const executorCommandSchema = z.discriminatedUnion("type", [
     hydrateCommandSchema
 ]);
 const actorSessionServerMessageSchema = z.discriminatedUnion("type", [
-    z.object({
-        type: z.literal("sqlite_committed"),
-        message_id: z.number().int().nonnegative(),
-        txid: z.number().int().positive().max(Number.MAX_SAFE_INTEGER).optional(),
+    z
+        .object({
+        type: z.literal("database_result"),
+        message_id: z.number().int().nonnegative().max(Number.MAX_SAFE_INTEGER),
+        result: databaseResultSchema.optional(),
         error: z.string().optional()
-    }),
-    z.object({ type: z.literal("attached"), protocol: z.literal(24), supports_residency: z.boolean().optional() }),
+    })
+        .refine(message => (message.result === undefined) !== (message.error === undefined)),
+    z.object({ type: z.literal("attached"), protocol: z.literal(28), actor: actorIdentitySchema }),
     z.object({
         type: z.literal("socket_connections"),
         message_id: z.number().int().nonnegative(),

package/dist/host/protocol.js.map

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

package/dist/host/types.d.ts

@@ -1,7 +1,6 @@
-import type { ActorIdentity } from "../actor/identity.js";
 import type { SocketEffect, SocketSource } from "../actor/socketProtocol.js";
-import type { ActorExecutorCommand, ActorExecutorReply, ActorWorkerData, HydrateCommand, InvokeCommand, WebSocketEventCommand } from "./protocol.js";
-import type { SqliteCommitter } from "./sqlite.js";
+import type { DatabaseCall, DatabaseResult } from "./database.js";
+import type { ActorExecutorReply, ActorWorkerCommand, ActorWorkerData } from "./protocol.js";
 import type { ActorWorkerSupervisor } from "./worker-supervisor.js";
 interface ActorHostSettings {
     readonly socketPath: string;
@@ -9,16 +8,16 @@ interface ActorHostSettings {
     readonly startupTimeoutMs: number;
 }
 type SocketPublisher = (effects: readonly SocketEffect[]) => Promise<void>;
-type ActorCommandHandler = (command: ActorExecutorCommand, allowNextInvocation: () => void, commit: SqliteCommitter, publish?: SocketPublisher, connections?: SocketSource) => Promise<ActorExecutorReply>;
-type ActorWorkerSupervisorFactory = (options: ActorWorkerSupervisorOptions) => Pick<ActorWorkerSupervisor, "ready" | "handle" | "close" | "activeActors" | "onActiveActorsChange">;
+type DatabaseRequester = (call: DatabaseCall) => Promise<DatabaseResult>;
+type ActorSessionSupervisor = Pick<ActorWorkerSupervisor, "assign" | "handle" | "isResident" | "onResidencyChange">;
+type ActorWorkerSupervisorFactory = (options: ActorWorkerSupervisorOptions) => ActorSessionSupervisor & Pick<ActorWorkerSupervisor, "ready" | "close">;
 interface ActorWorkerSupervisorOptions {
     readonly actorEntrypointUrl: string;
     readonly createWorker?: ActorWorkerFactory;
 }
 interface ResidentActorWorkerOptions {
-    readonly identity: ActorIdentity;
     readonly sequenceBase: number;
-    readonly onActiveActorsChange: () => void;
+    readonly onResidencyChange: () => void;
     readonly moduleUrl: string;
     readonly worker?: ActorWorkerHandle;
     readonly createWorker: ActorWorkerFactory;
@@ -27,9 +26,9 @@ type ActorWorkerState = "starting" | "ready" | "stopping" | "stopped";
 interface ActorWorkerHandle {
     readonly state: ActorWorkerState;
     ready(): Promise<readonly string[]>;
-    execute(command: InvokeCommand | WebSocketEventCommand | HydrateCommand, allowNextInvocation: () => void, commit: SqliteCommitter, publish?: SocketPublisher, connections?: SocketSource): Promise<ActorExecutorReply>;
+    execute(command: ActorWorkerCommand, allowNextInvocation: () => void, database: DatabaseRequester, publish?: SocketPublisher, connections?: SocketSource): Promise<ActorExecutorReply>;
     terminate(reason: string): void;
 }
 type ActorWorkerFactory = (data: ActorWorkerData, onStateChange: () => void) => ActorWorkerHandle;
-export type { ActorCommandHandler, ActorHostSettings, ActorWorkerFactory, ActorWorkerHandle, ActorWorkerState, ActorWorkerSupervisorFactory, ActorWorkerSupervisorOptions, ResidentActorWorkerOptions, SocketPublisher, SocketSource };
+export type { ActorHostSettings, ActorSessionSupervisor, ActorWorkerFactory, ActorWorkerHandle, ActorWorkerState, ActorWorkerSupervisorFactory, ActorWorkerSupervisorOptions, DatabaseRequester, ResidentActorWorkerOptions, SocketPublisher, SocketSource };
 //# sourceMappingURL=types.d.ts.map

package/dist/host/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/host/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAA;AACzD,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAA;AAE5E,OAAO,KAAK,EACR,oBAAoB,EACpB,kBAAkB,EAClB,eAAe,EACf,cAAc,EACd,aAAa,EACb,qBAAqB,EACxB,MAAM,eAAe,CAAA;AACtB,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAClD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAA;AAEnE,UAAU,iBAAiB;IACvB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAA;IAC3B,QAAQ,CAAC,eAAe,EAAE,MAAM,GAAG,SAAS,CAAA;IAC5C,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAA;CACpC;AAED,KAAK,eAAe,GAAG,CAAC,OAAO,EAAE,SAAS,YAAY,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;AAE1E,KAAK,mBAAmB,GAAG,CACvB,OAAO,EAAE,oBAAoB,EAC7B,mBAAmB,EAAE,MAAM,IAAI,EAC/B,MAAM,EAAE,eAAe,EACvB,OAAO,CAAC,EAAE,eAAe,EACzB,WAAW,CAAC,EAAE,YAAY,KACzB,OAAO,CAAC,kBAAkB,CAAC,CAAA;AAEhC,KAAK,4BAA4B,GAAG,CAChC,OAAO,EAAE,4BAA4B,KACpC,IAAI,CAAC,qBAAqB,EAAE,OAAO,GAAG,QAAQ,GAAG,OAAO,GAAG,cAAc,GAAG,sBAAsB,CAAC,CAAA;AAExG,UAAU,4BAA4B;IAClC,QAAQ,CAAC,kBAAkB,EAAE,MAAM,CAAA;IACnC,QAAQ,CAAC,YAAY,CAAC,EAAE,kBAAkB,CAAA;CAC7C;AAED,UAAU,0BAA0B;IAChC,QAAQ,CAAC,QAAQ,EAAE,aAAa,CAAA;IAChC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAA;IAC7B,QAAQ,CAAC,oBAAoB,EAAE,MAAM,IAAI,CAAA;IACzC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;IAC1B,QAAQ,CAAC,MAAM,CAAC,EAAE,iBAAiB,CAAA;IACnC,QAAQ,CAAC,YAAY,EAAE,kBAAkB,CAAA;CAC5C;AAED,KAAK,gBAAgB,GAAG,UAAU,GAAG,OAAO,GAAG,UAAU,GAAG,SAAS,CAAA;AAErE,UAAU,iBAAiB;IACvB,QAAQ,CAAC,KAAK,EAAE,gBAAgB,CAAA;IAChC,KAAK,IAAI,OAAO,CAAC,SAAS,MAAM,EAAE,CAAC,CAAA;IACnC,OAAO,CACH,OAAO,EAAE,aAAa,GAAG,qBAAqB,GAAG,cAAc,EAC/D,mBAAmB,EAAE,MAAM,IAAI,EAC/B,MAAM,EAAE,eAAe,EACvB,OAAO,CAAC,EAAE,eAAe,EACzB,WAAW,CAAC,EAAE,YAAY,GAC3B,OAAO,CAAC,kBAAkB,CAAC,CAAA;IAC9B,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;CAClC;AAED,KAAK,kBAAkB,GAAG,CAAC,IAAI,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,IAAI,KAAK,iBAAiB,CAAA;AAEjG,YAAY,EACR,mBAAmB,EACnB,iBAAiB,EACjB,kBAAkB,EAClB,iBAAiB,EACjB,gBAAgB,EAChB,4BAA4B,EAC5B,4BAA4B,EAC5B,0BAA0B,EAC1B,eAAe,EACf,YAAY,EACf,CAAA"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/host/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAA;AAE5E,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,eAAe,CAAA;AACjE,OAAO,KAAK,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,eAAe,CAAA;AAC5F,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAA;AAEnE,UAAU,iBAAiB;IACvB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAA;IAC3B,QAAQ,CAAC,eAAe,EAAE,MAAM,GAAG,SAAS,CAAA;IAC5C,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAA;CACpC;AAED,KAAK,eAAe,GAAG,CAAC,OAAO,EAAE,SAAS,YAAY,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;AAE1E,KAAK,iBAAiB,GAAG,CAAC,IAAI,EAAE,YAAY,KAAK,OAAO,CAAC,cAAc,CAAC,CAAA;AAExE,KAAK,sBAAsB,GAAG,IAAI,CAAC,qBAAqB,EAAE,QAAQ,GAAG,QAAQ,GAAG,YAAY,GAAG,mBAAmB,CAAC,CAAA;AAEnH,KAAK,4BAA4B,GAAG,CAChC,OAAO,EAAE,4BAA4B,KACpC,sBAAsB,GAAG,IAAI,CAAC,qBAAqB,EAAE,OAAO,GAAG,OAAO,CAAC,CAAA;AAE5E,UAAU,4BAA4B;IAClC,QAAQ,CAAC,kBAAkB,EAAE,MAAM,CAAA;IACnC,QAAQ,CAAC,YAAY,CAAC,EAAE,kBAAkB,CAAA;CAC7C;AAED,UAAU,0BAA0B;IAChC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAA;IAC7B,QAAQ,CAAC,iBAAiB,EAAE,MAAM,IAAI,CAAA;IACtC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;IAC1B,QAAQ,CAAC,MAAM,CAAC,EAAE,iBAAiB,CAAA;IACnC,QAAQ,CAAC,YAAY,EAAE,kBAAkB,CAAA;CAC5C;AAED,KAAK,gBAAgB,GAAG,UAAU,GAAG,OAAO,GAAG,UAAU,GAAG,SAAS,CAAA;AAErE,UAAU,iBAAiB;IACvB,QAAQ,CAAC,KAAK,EAAE,gBAAgB,CAAA;IAChC,KAAK,IAAI,OAAO,CAAC,SAAS,MAAM,EAAE,CAAC,CAAA;IACnC,OAAO,CACH,OAAO,EAAE,kBAAkB,EAC3B,mBAAmB,EAAE,MAAM,IAAI,EAC/B,QAAQ,EAAE,iBAAiB,EAC3B,OAAO,CAAC,EAAE,eAAe,EACzB,WAAW,CAAC,EAAE,YAAY,GAC3B,OAAO,CAAC,kBAAkB,CAAC,CAAA;IAC9B,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;CAClC;AAED,KAAK,kBAAkB,GAAG,CAAC,IAAI,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,IAAI,KAAK,iBAAiB,CAAA;AAEjG,YAAY,EACR,iBAAiB,EACjB,sBAAsB,EACtB,kBAAkB,EAClB,iBAAiB,EACjB,gBAAgB,EAChB,4BAA4B,EAC5B,4BAA4B,EAC5B,iBAAiB,EACjB,0BAA0B,EAC1B,eAAe,EACf,YAAY,EACf,CAAA"}

package/dist/host/worker-supervisor.d.ts

@@ -1,31 +1,6 @@
 import type { ActorIdentity } from "../actor/identity.js";
-import type { ActorExecutorCommand, ActorExecutorReply, ActorWorkerData, HydrateCommand, InvokeCommand, WebSocketEventCommand } from "./protocol.js";
-import type { SqliteCommitter } from "./sqlite.js";
-import type { ActorWorkerHandle, ActorWorkerState, ActorWorkerSupervisorOptions, SocketPublisher, SocketSource } from "./types.js";
-declare class ActorWorkerSupervisor {
-    private readonly actorEntrypointUrl;
-    private readonly createWorker;
-    private resident;
-    private lastActiveActors;
-    private readonly activeActorListeners;
-    private speculativeWorker;
-    private identity;
-    private closed;
-    private actorNames;
-    private lastSequence;
-    constructor(options: ActorWorkerSupervisorOptions);
-    ready(): Promise<readonly string[]>;
-    handle(command: ActorExecutorCommand, allowNextInvocation: () => void, commit: SqliteCommitter, publish?: SocketPublisher, connections?: SocketSource): Promise<ActorExecutorReply>;
-    onActiveActorsChange(listener: () => void): () => void;
-    private notifyActiveActorsChange;
-    activeActors(): readonly ActorIdentity[];
-    close(): void;
-    private preload;
-    private discardPreload;
-    private execute;
-    private evict;
-    private takeSpeculativeWorker;
-}
+import type { ActorExecutorCommand, ActorExecutorReply, ActorWorkerCommand, ActorWorkerData } from "./protocol.js";
+import type { ActorWorkerHandle, ActorWorkerState, ActorWorkerSupervisorOptions, DatabaseRequester, SocketPublisher, SocketSource } from "./types.js";
 declare class ActorWorker implements ActorWorkerHandle {
     private onStateChange;
     private readonly worker;
@@ -33,6 +8,7 @@ declare class ActorWorker implements ActorWorkerHandle {
     private readyResolve;
     private readyReject;
     private readonly pending;
+    private readonly databaseCalls;
     private nextMessageId;
     private lifecycleState;
     private terminalError;
@@ -41,14 +17,14 @@ declare class ActorWorker implements ActorWorkerHandle {
     private warmReject;
     private assigned;
     constructor(data?: ActorWorkerData, onStateChange?: () => void);
+    private receive;
     warm(): Promise<void>;
     load(data: ActorWorkerData, onStateChange: () => void): void;
     get state(): ActorWorkerState;
     ready(): Promise<readonly string[]>;
-    execute(command: InvokeCommand | WebSocketEventCommand | HydrateCommand, allowNextInvocation: () => void, commit: SqliteCommitter, publish?: SocketPublisher, connections?: SocketSource): Promise<ActorExecutorReply>;
+    execute(command: ActorWorkerCommand, allowNextInvocation: () => void, database: DatabaseRequester, publish?: SocketPublisher, connections?: SocketSource): Promise<ActorExecutorReply>;
     terminate(reason: string): void;
-    private receive;
-    private commitSqlite;
+    private callDatabase;
     private publishEffects;
     private loadConnections;
     private reply;
@@ -57,5 +33,31 @@ declare class ActorWorker implements ActorWorkerHandle {
     private exited;
     private fail;
 }
+declare class ActorWorkerSupervisor {
+    private readonly actorEntrypointUrl;
+    private readonly createWorker;
+    private resident;
+    private lastResident;
+    private readonly residencyListeners;
+    private speculativeWorker;
+    private identity;
+    private closed;
+    private actorNames;
+    private lastSequence;
+    constructor(options: ActorWorkerSupervisorOptions);
+    ready(): Promise<readonly string[]>;
+    assign(actor: ActorIdentity): void;
+    handle(command: ActorExecutorCommand, allowNextInvocation: () => void, database: DatabaseRequester, publish?: SocketPublisher, connections?: SocketSource): Promise<ActorExecutorReply>;
+    onResidencyChange(listener: () => void): () => void;
+    private notifyResidencyChange;
+    isResident(): boolean;
+    close(): void;
+    private preload;
+    private discardPreload;
+    private execute;
+    private evict;
+    private workerCommand;
+    private takeSpeculativeWorker;
+}
 export { ActorWorker, ActorWorkerSupervisor };
 //# sourceMappingURL=worker-supervisor.d.ts.map

package/dist/host/worker-supervisor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"worker-supervisor.d.ts","sourceRoot":"","sources":["../../src/host/worker-supervisor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"worker-supervisor.d.ts","sourceRoot":"","sources":["../../src/host/worker-supervisor.ts"],"names":[],"mappings":"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"}