chore(core): migrate to BARE

Author: NathanFlurry

.gitignore

@@ -184,3 +184,4 @@ Cargo.lock
 **/.wrangler
 **/.DS_Store
 .aider*
+/packages/core/dist/schemas/

packages/core/package.json

@@ -150,16 +150,19 @@
   "scripts": {
     "dev": "pnpm build --watch",
     "build": "tsup src/mod.ts src/client/mod.ts src/common/log.ts src/common/websocket.ts src/actor/errors.ts src/topologies/coordinate/mod.ts src/topologies/partition/mod.ts src/utils.ts src/driver-helpers/mod.ts src/driver-test-suite/mod.ts src/test/mod.ts src/inspector/mod.ts",
+    "build:schema": "node ../../packages/misc/bare-compiler/dist/cli.js compile schemas/client-protocol/v1.bare -o dist/schemas/client-protocol/v1.ts && node ../../packages/misc/bare-compiler/dist/cli.js compile schemas/file-system-driver/v1.bare -o dist/schemas/file-system-driver/v1.ts ",
     "check-types": "tsc --noEmit",
     "boop": "tsc --outDir dist/test -d",
     "test": "vitest run",
     "test:watch": "vitest",
     "dump-openapi": "tsx scripts/dump-openapi.ts"
   },
   "dependencies": {
+    "@bare-ts/lib": "~0.3.0",
     "@hono/standard-validator": "^0.1.3",
     "@hono/zod-openapi": "^0.19.10",
     "@rivetkit/fast-json-patch": "^3.1.2",
+    "@rivetkit/versioned-data-util": "workspace:*",
     "cbor-x": "^1.6.0",
     "hono": "^4.7.0",
     "invariant": "^2.2.4",
@@ -173,6 +176,7 @@
     "@hono/node-server": "^1.18.2",
     "@hono/node-ws": "^1.1.1",
     "@rivet-gg/actor-core": "^25.1.0",
+    "@rivetkit/bare-compiler": "workspace:*",
     "@types/invariant": "^2",
     "@types/node": "^22.13.1",
     "@types/ws": "^8",

packages/core/schemas/client-protocol/v1.bare

@@ -0,0 +1,82 @@
+# MARK: Message To Client
+type Init struct {
+	actorId: str
+	connectionId: str
+	connectionToken: str
+}
+
+type Error struct {
+	code: str
+	message: str
+	metadata: optional<data>
+	actionId: optional<uint>
+}
+
+type ActionResponse struct {
+	id: uint
+	output: data
+}
+
+type Event struct {
+	name: str
+	# CBOR array
+	args: data
+}
+
+type ToClientBody union {
+	Init |
+	Error |
+	ActionResponse |
+	Event
+}
+
+type ToClient struct {
+	body: ToClientBody
+}
+
+# MARK: Message To Server
+type ActionRequest struct {
+	id: uint
+	name: str
+	# CBOR array
+	args: data
+}
+
+type SubscriptionRequest struct {
+	eventName: str
+	subscribe: bool
+}
+
+type ToServerBody union {
+	ActionRequest |
+	SubscriptionRequest
+}
+
+type ToServer struct {
+	body: ToServerBody
+}
+
+# MARK: HTTP Action
+type HttpActionRequest struct {
+	# CBOR array
+	args: data
+}
+
+type HttpActionResponse struct {
+	output: data
+}
+
+# MARK: HTTP Error
+type HttpResponseError struct {
+	code: str
+	message: str
+	metadata: optional<data>
+}
+
+# MARK: HTTP Resolve
+type HttpResolveRequest void
+
+type HttpResolveResponse struct {
+	actorId: str
+}
+

packages/core/schemas/file-system-driver/v1.bare

@@ -0,0 +1,20 @@
+# File System Driver Schema (v1)
+
+# MARK: Actor State
+# Represents the persisted state for an actor on disk.
+# Note: createdAt is not persisted; it is derived from the file's birthtime.
+type ActorState struct {
+  id: str
+  name: str
+  key: list<str>
+  persistedData: data
+}
+
+# MARK: Actor Alarm
+# Represents a scheduled alarm for an actor.
+# Stored per-actor; the actor id is implied by the filename.
+# The timestamp is milliseconds since epoch.
+type ActorAlarm struct {
+  timestamp: uint
+}
+

packages/core/src/actor/connection.ts

@@ -1,5 +1,6 @@
-import type * as messageToClient from "@/actor/protocol/message/to-client";
-import type * as wsToClient from "@/actor/protocol/message/to-client";
+import * as cbor from "cbor-x";
+import type * as protocol from "@/schemas/client-protocol/mod";
+import { TO_CLIENT_VERSIONED } from "@/schemas/client-protocol/versioned";
 import type { AnyDatabaseProvider } from "./database";
 import { type ConnDriver, ConnectionReadyState } from "./driver";
 import * as errors from "./errors";
@@ -162,7 +163,7 @@ export class Conn<S, CP, CS, V, I, AD, DB extends AnyDatabaseProvider> {
 	 *
 	 * @protected
 	 */
-	public _sendMessage(message: CachedSerializer<messageToClient.ToClient>) {
+	public _sendMessage(message: CachedSerializer<protocol.ToClient>) {
 		this.#driver.sendMessage?.(this.#actor, this, this.__persist.ds, message);
 	}
 
@@ -181,14 +182,18 @@ export class Conn<S, CP, CS, V, I, AD, DB extends AnyDatabaseProvider> {
 			connId: this.id,
 		});
 		this._sendMessage(
-			new CachedSerializer<wsToClient.ToClient>({
-				b: {
-					ev: {
-						n: eventName,
-						a: args,
+			new CachedSerializer<protocol.ToClient>(
+				{
+					body: {
+						tag: "Event",
+						val: {
+							name: eventName,
+							args: cbor.encode(args).buffer.slice() as ArrayBuffer,
+						},
 					},
 				},
-			}),
+				TO_CLIENT_VERSIONED,
+			),
 		);
 	}
 

packages/core/src/actor/driver.ts

@@ -1,9 +1,9 @@
-import type * as messageToClient from "@/actor/protocol/message/to-client";
 import type { CachedSerializer } from "@/actor/protocol/serde";
 import type { AnyClient } from "@/client/client";
 import type { ManagerDriver } from "@/manager/driver";
 import type { RegistryConfig } from "@/registry/config";
 import type { RunConfig } from "@/registry/run-config";
+import type * as protocol from "@/schemas/client-protocol/mod";
 import type { AnyConn, ConnectionDriver } from "./connection";
 import type { GenericConnGlobalState } from "./generic-conn-driver";
 import type { AnyActorInstance } from "./instance";
@@ -60,7 +60,7 @@ export interface ConnDriver<ConnDriverState = unknown> {
 		actor: AnyActorInstance,
 		conn: AnyConn,
 		state: ConnDriverState,
-		message: CachedSerializer<messageToClient.ToClient>,
+		message: CachedSerializer<protocol.ToClient>,
 	): void;
 
 	/**

packages/core/src/actor/generic-conn-driver.ts

@@ -13,9 +13,9 @@ import {
 	ConnectionReadyState,
 } from "@/actor/driver";
 import type { AnyActorInstance } from "@/actor/instance";
-import type * as messageToClient from "@/actor/protocol/message/to-client";
 import type { CachedSerializer, Encoding } from "@/actor/protocol/serde";
 import { encodeDataToString } from "@/actor/protocol/serde";
+import type * as protocol from "@/schemas/client-protocol/mod";
 import { logger } from "./log";
 
 // This state is different than `PersistedConn` state since the connection-specific state is persisted & must be serializable. This is also part of the connection driver, not part of the core actor.
@@ -54,7 +54,7 @@ export function createGenericWebSocketDriver(
 			actor: AnyActorInstance,
 			conn: AnyConn,
 			state: GenericWebSocketDriverState,
-			message: CachedSerializer<messageToClient.ToClient>,
+			message: CachedSerializer<protocol.ToClient>,
 		) => {
 			const ws = globalState.websockets.get(conn.id);
 			if (!ws) {
@@ -168,7 +168,7 @@ export function createGenericSseDriver(
 			_actor: AnyActorInstance,
 			conn: AnyConn,
 			state: GenericSseDriverState,
-			message: CachedSerializer<messageToClient.ToClient>,
+			message: CachedSerializer<protocol.ToClient>,
 		) => {
 			const stream = globalState.sseStreams.get(conn.id);
 			if (!stream) {
@@ -223,7 +223,7 @@ export type GenericHttpDriverState = Record<never, never>;
 
 export function createGenericHttpDriver(): ConnDriver<GenericHttpDriverState> {
 	return {
-		getConnectionReadyState(_actor, conn) {
+		getConnectionReadyState(_actor, _conn) {
 			// TODO: This might not be the correct logic
 			return ConnectionReadyState.OPEN;
 		},

packages/core/src/actor/instance.ts

@@ -2,14 +2,14 @@ import * as cbor from "cbor-x";
 import invariant from "invariant";
 import onChange from "on-change";
 import type { ActorKey } from "@/actor/mod";
-import type * as wsToClient from "@/actor/protocol/message/to-client";
-import type * as wsToServer from "@/actor/protocol/message/to-server";
 import type { Client } from "@/client/client";
 import type { Logger } from "@/common/log";
 import { isCborSerializable, stringifyError } from "@/common/utils";
 import type { UniversalWebSocket } from "@/common/websocket-interface";
 import { ActorInspector } from "@/inspector/actor";
 import type { Registry } from "@/mod";
+import type * as protocol from "@/schemas/client-protocol/mod";
+import { TO_CLIENT_VERSIONED } from "@/schemas/client-protocol/versioned";
 import { SinglePromiseQueue } from "@/utils";
 import type { ActionContext } from "./action";
 import type { ActorConfig, OnConnectOptions } from "./config";
@@ -28,9 +28,8 @@ import type {
 	PersistedActor,
 	PersistedConn,
 	PersistedScheduleEvent,
-	PersistedScheduleEventKind,
 } from "./persisted";
-import { processMessage } from "./protocol/message/mod";
+import { processMessage } from "./protocol/old";
 import { CachedSerializer } from "./protocol/serde";
 import { Schedule } from "./schedule";
 import { DeadlineError, deadline } from "./utils";
@@ -945,23 +944,27 @@ export class ActorInstance<
 
 		// Send init message
 		conn._sendMessage(
-			new CachedSerializer<wsToClient.ToClient>({
-				b: {
-					i: {
-						ai: this.id,
-						ci: conn.id,
-						ct: conn._token,
+			new CachedSerializer<protocol.ToClient>(
+				{
+					body: {
+						tag: "Init",
+						val: {
+							actorId: this.id,
+							connectionId: conn.id,
+							connectionToken: conn._token,
+						},
 					},
 				},
-			}),
+				TO_CLIENT_VERSIONED,
+			),
 		);
 
 		return conn;
 	}
 
 	// MARK: Messages
 	async processMessage(
-		message: wsToServer.ToServer,
+		message: protocol.ToServer,
 		conn: Conn<S, CP, CS, V, I, AD, DB>,
 	) {
 		await processMessage(message, this, conn, {
@@ -1428,14 +1431,18 @@ export class ActorInstance<
 		const subscriptions = this.#subscriptionIndex.get(name);
 		if (!subscriptions) return;
 
-		const toClientSerializer = new CachedSerializer<wsToClient.ToClient>({
-			b: {
-				ev: {
-					n: name,
-					a: args,
+		const toClientSerializer = new CachedSerializer<protocol.ToClient>(
+			{
+				body: {
+					tag: "Event",
+					val: {
+						name,
+						args: cbor.encode(args).buffer.slice() as ArrayBuffer,
+					},
 				},
 			},
-		});
+			TO_CLIENT_VERSIONED,
+		);
 
 		// Send message to clients
 		for (const connection of subscriptions) {