Skip to content

fix(rivetkit): preserve engine bind defaults #5643

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
eersnington wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(rivetkit): preserve engine bind defaults #5643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions rivetkit-typescript/packages/rivetkit/src/registry/config/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ export const RegistryConfigSchema = z
engineHost: z
.string()
.optional()
.default(() => getRivetRunEngineHost() ?? ENGINE_HOST),
.transform((value) => value ?? getRivetRunEngineHost()),
/**
* @experimental
*
Expand All @@ -237,7 +237,7 @@ export const RegistryConfigSchema = z
.min(1)
.max(65_535)
.optional()
.default(() => getRivetRunEnginePort() ?? ENGINE_PORT),
.transform((value) => value ?? getRivetRunEnginePort()),
/** @experimental */
engineVersion: z
.string()
Expand Down Expand Up @@ -347,8 +347,8 @@ export const RegistryConfigSchema = z

// Flatten the endpoint and apply defaults for namespace/token.
const localEngineEndpoint = buildEngineEndpoint(
config.engineHost,
config.enginePort,
config.engineHost ?? ENGINE_HOST,
config.enginePort ?? ENGINE_PORT,
);
const endpoint = config.startEngine
? localEngineEndpoint
Expand Down
18 changes: 18 additions & 0 deletions rivetkit-typescript/packages/rivetkit/tests/registry-constructor.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,24 @@ describe("Registry constructor", () => {
expect(config.publicEndpoint).toBe("http://127.0.0.1:7655");
});

test("does not override the bind address for an explicit engine endpoint", async () => {
const config = RegistryConfigSchema.parse({
use: {
test: testActor,
},
startEngine: false,
endpoint: "http://127.0.0.1:7656",
});

const serveConfig = await buildServeConfig(config);

expect(new URL(serveConfig.endpoint).origin).toBe(
"http://127.0.0.1:7656",
);
expect(serveConfig.engineHost).toBeUndefined();
expect(serveConfig.enginePort).toBeUndefined();
});

test("keeps endpoint separate from spawned local engine config", () => {
const result = RegistryConfigSchema.safeParse({
use: {
Expand Down