rivetkit 2.0.4 → 2.0.6

package/src/actor/router-endpoints.ts

@@ -15,6 +15,11 @@ import * as errors from "@/actor/errors";
 import type { AnyActorInstance } from "@/actor/instance";
 import type { InputData } from "@/actor/protocol/serde";
 import { type Encoding, EncodingSchema } from "@/actor/protocol/serde";
+import {
+	HEADER_ACTOR_QUERY,
+	HEADER_CONN_PARAMS,
+	HEADER_ENCODING,
+} from "@/common/actor-router-consts";
 import type { UpgradeWebSocketArgs } from "@/common/inline-websocket-adapter2";
 import { deconstructError, stringifyError } from "@/common/utils";
 import type { UniversalWebSocket } from "@/common/websocket-interface";
@@ -373,8 +378,13 @@ export async function handleSseConnect(
 			// Wait for close
 			const abortResolver = Promise.withResolvers();
 
+			// HACK: This is required so the abort handler below works
+			//
+			// See https://github.com/honojs/hono/issues/1770#issuecomment-2461966225
+			stream.onAbort(() => {});
+
 			// Handle stream abort (when client closes the connection)
-			stream.onAbort(async () => {
+			c.req.raw.signal.addEventListener("abort", async () => {
 				const rLog = actor?.rLog ?? loggerWithoutContext();
 				try {
 					rLog.debug("sse stream aborted");
@@ -639,38 +649,6 @@ export function getRequestQuery(c: HonoContext): unknown {
 	}
 }
 
-export const HEADER_ACTOR_QUERY = "X-RivetKit-Query";
-
-export const HEADER_ENCODING = "X-RivetKit-Encoding";
-
-// IMPORTANT: Params must be in headers or in an E2EE part of the request (i.e. NOT the URL or query string) in order to ensure that tokens can be securely passed in params.
-export const HEADER_CONN_PARAMS = "X-RivetKit-Conn-Params";
-
-// Internal header
-export const HEADER_AUTH_DATA = "X-RivetKit-Auth-Data";
-
-export const HEADER_ACTOR_ID = "X-RivetKit-Actor";
-
-export const HEADER_CONN_ID = "X-RivetKit-Conn";
-
-export const HEADER_CONN_TOKEN = "X-RivetKit-Conn-Token";
-
-/**
- * Headers that publics can send from public clients.
- *
- * Used for CORS.
- **/
-export const ALLOWED_PUBLIC_HEADERS = [
-	"Content-Type",
-	"User-Agent",
-	HEADER_ACTOR_QUERY,
-	HEADER_ENCODING,
-	HEADER_CONN_PARAMS,
-	HEADER_ACTOR_ID,
-	HEADER_CONN_ID,
-	HEADER_CONN_TOKEN,
-];
-
 // Helper to get connection parameters for the request
 export function getRequestConnParams(req: HonoRequest): unknown {
 	const paramsParam = req.header(HEADER_CONN_PARAMS);

package/src/actor/router.ts

@@ -10,17 +10,21 @@ import {
 	type ConnectWebSocketOpts,
 	type ConnectWebSocketOutput,
 	type ConnsMessageOpts,
-	HEADER_AUTH_DATA,
-	HEADER_CONN_ID,
-	HEADER_CONN_PARAMS,
-	HEADER_CONN_TOKEN,
-	HEADER_ENCODING,
 	handleAction,
 	handleConnectionMessage,
 	handleRawWebSocketHandler,
 	handleSseConnect,
 	handleWebSocketConnect,
 } from "@/actor/router-endpoints";
+import {
+	HEADER_AUTH_DATA,
+	HEADER_CONN_ID,
+	HEADER_CONN_PARAMS,
+	HEADER_CONN_TOKEN,
+	HEADER_ENCODING,
+	PATH_CONNECT_WEBSOCKET,
+	PATH_RAW_WEBSOCKET_PREFIX,
+} from "@/common/actor-router-consts";
 import {
 	handleRouteError,
 	handleRouteNotFound,
@@ -37,9 +41,6 @@ import type { ActorDriver } from "./driver";
 import { InternalError } from "./errors";
 import { loggerWithoutContext } from "./log";
 
-export const PATH_CONNECT_WEBSOCKET = "/connect/websocket";
-export const PATH_RAW_WEBSOCKET_PREFIX = "/raw/websocket/";
-
 export type {
 	ConnectWebSocketOpts,
 	ConnectWebSocketOutput,
@@ -175,7 +176,8 @@ export function createActorRouter(
 			method: c.req.method,
 			headers: c.req.raw.headers,
 			body: c.req.raw.body,
-		});
+			duplex: "half",
+		} as RequestInit);
 
 		loggerWithoutContext().debug({
 			msg: "rewriting http url",

package/src/client/actor-conn.ts

@@ -5,6 +5,13 @@ import type { CloseEvent } from "ws";
 import type { AnyActorDefinition } from "@/actor/definition";
 import { inputDataToBuffer } from "@/actor/protocol/old";
 import { type Encoding, jsonStringifyCompat } from "@/actor/protocol/serde";
+import {
+	HEADER_CONN_ID,
+	HEADER_CONN_PARAMS,
+	HEADER_CONN_TOKEN,
+	HEADER_ENCODING,
+	PATH_CONNECT_WEBSOCKET,
+} from "@/common/actor-router-consts";
 import { importEventSource } from "@/common/eventsource";
 import type {
 	UniversalErrorEvent,
@@ -12,15 +19,9 @@ import type {
 	UniversalMessageEvent,
 } from "@/common/eventsource-interface";
 import { assertUnreachable, stringifyError } from "@/common/utils";
-import {
-	HEADER_CONN_ID,
-	HEADER_CONN_PARAMS,
-	HEADER_CONN_TOKEN,
-	HEADER_ENCODING,
-	type ManagerDriver,
-} from "@/driver-helpers/mod";
+import type { UniversalWebSocket } from "@/common/websocket-interface";
+import type { ManagerDriver } from "@/driver-helpers/mod";
 import type { ActorQuery } from "@/manager/protocol/query";
-import { PATH_CONNECT_WEBSOCKET, type UniversalWebSocket } from "@/mod";
 import type * as protocol from "@/schemas/client-protocol/mod";
 import {
 	TO_CLIENT_VERSIONED,

package/src/client/actor-handle.ts

@@ -4,7 +4,6 @@ import type { AnyActorDefinition } from "@/actor/definition";
 import type { Encoding } from "@/actor/protocol/serde";
 import { assertUnreachable } from "@/actor/utils";
 import { deconstructError } from "@/common/utils";
-import { importWebSocket } from "@/common/websocket";
 import {
 	HEADER_CONN_PARAMS,
 	HEADER_ENCODING,

package/src/client/client.ts

@@ -3,7 +3,7 @@ import type { Transport } from "@/actor/protocol/old";
 import type { Encoding } from "@/actor/protocol/serde";
 import type { ManagerDriver } from "@/driver-helpers/mod";
 import type { ActorQuery } from "@/manager/protocol/query";
-import type { Registry } from "@/mod";
+import type { Registry } from "@/registry/mod";
 import type { ActorActionFunction } from "./actor-common";
 import {
 	type ActorConn,

package/src/client/mod.ts

@@ -50,7 +50,7 @@ export function createClient<A extends Registry<any>>(
 		endpointOrConfig === undefined
 			? {}
 			: typeof endpointOrConfig === "string"
-				? { engine: endpointOrConfig }
+				? { endpoint: endpointOrConfig }
 				: endpointOrConfig;
 	const config = ClientConfigSchema.parse(configInput);
 

package/src/client/raw-utils.ts

@@ -1,5 +1,5 @@
 import invariant from "invariant";
-import { PATH_RAW_WEBSOCKET_PREFIX } from "@/actor/router";
+import { PATH_RAW_WEBSOCKET_PREFIX } from "@/common/actor-router-consts";
 import { deconstructError } from "@/common/utils";
 import { HEADER_CONN_PARAMS, type ManagerDriver } from "@/driver-helpers/mod";
 import type { ActorQuery } from "@/manager/protocol/query";
@@ -79,7 +79,7 @@ export async function rawHttpFetch(
 
 		// Forward the request to the actor
 		const proxyRequest = new Request(url, {
-			...init,
+			...mergedInit,
 			headers: proxyRequestHeaders,
 		});
 

package/src/client/utils.ts

@@ -1,8 +1,8 @@
 import * as cbor from "cbor-x";
 import invariant from "invariant";
+import type { Encoding } from "@/actor/protocol/serde";
 import { assertUnreachable } from "@/common/utils";
 import type { VersionedDataHandler } from "@/common/versioned-data";
-import type { Encoding } from "@/mod";
 import type { HttpResponseError } from "@/schemas/client-protocol/mod";
 import { HTTP_RESPONSE_ERROR_VERSIONED } from "@/schemas/client-protocol/versioned";
 import {

package/src/common/actor-router-consts.ts

@@ -0,0 +1,38 @@
+// NOTE: This is in a separate file from the router since it needs to be shared between the client & the server. If this was in the router file, the client would end up importing the *entire* actor router and tree shaking would not work.
+
+// MARK: Paths
+export const PATH_CONNECT_WEBSOCKET = "/connect/websocket";
+export const PATH_RAW_WEBSOCKET_PREFIX = "/raw/websocket/";
+
+// MARK: Headers
+export const HEADER_ACTOR_QUERY = "X-RivetKit-Query";
+
+export const HEADER_ENCODING = "X-RivetKit-Encoding";
+
+// IMPORTANT: Params must be in headers or in an E2EE part of the request (i.e. NOT the URL or query string) in order to ensure that tokens can be securely passed in params.
+export const HEADER_CONN_PARAMS = "X-RivetKit-Conn-Params";
+
+// Internal header
+export const HEADER_AUTH_DATA = "X-RivetKit-Auth-Data";
+
+export const HEADER_ACTOR_ID = "X-RivetKit-Actor";
+
+export const HEADER_CONN_ID = "X-RivetKit-Conn";
+
+export const HEADER_CONN_TOKEN = "X-RivetKit-Conn-Token";
+
+/**
+ * Headers that publics can send from public clients.
+ *
+ * Used for CORS.
+ **/
+export const ALLOWED_PUBLIC_HEADERS = [
+	"Content-Type",
+	"User-Agent",
+	HEADER_ACTOR_QUERY,
+	HEADER_ENCODING,
+	HEADER_CONN_PARAMS,
+	HEADER_ACTOR_ID,
+	HEADER_CONN_ID,
+	HEADER_CONN_TOKEN,
+];

package/src/driver-helpers/mod.ts

@@ -8,7 +8,7 @@ export {
 	HEADER_CONN_PARAMS,
 	HEADER_CONN_TOKEN,
 	HEADER_ENCODING,
-} from "@/actor/router-endpoints";
+} from "@/common/actor-router-consts";
 export type {
 	ActorOutput,
 	CreateInput,

package/src/driver-test-suite/mod.ts

@@ -36,7 +36,7 @@ export interface SkipTests {
 
 export interface DriverTestConfig {
 	/** Deploys an registry and returns the connection endpoint. */
-	start(projectDir: string): Promise<DriverDeployOutput>;
+	start(): Promise<DriverDeployOutput>;
 
 	/**
 	 * If we're testing with an external system, we should use real timers