-
Notifications
You must be signed in to change notification settings - Fork 76
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(sdks/actor/manager): fix manager builds with new workspaces
- Loading branch information
1 parent
ce7f441
commit ed15ca8
Showing
6 changed files
with
144 additions
and
161 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,10 @@ | ||
| { | ||
| "name": "@rivet-gg/actor-manager", | ||
| "version": "24.6.2-rc.1", | ||
| "private": true | ||
| "private": true, | ||
| "dependencies": { | ||
| "@rivet-gg/actor-common": "workspace:*", | ||
| "@rivet-gg/manager-protocol": "workspace:*", | ||
| "hono": "^4.6.17" | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,143 +1,124 @@ | ||
| import type { ActorContext } from "@rivet-gg/actor-core"; | ||
| import { RivetClient } from "@rivet-gg/api"; | ||
| import { assertExists } from "@std/assert/exists"; | ||
| import { Hono, type Context as HonoContext } from "hono"; | ||
| import { cors } from "hono/cors"; | ||
| import { setupLogging } from "../../common/src/log.ts"; | ||
| import { PORT_NAME } from "../../common/src/network.ts"; | ||
| import { | ||
| type RivetEnvironment, | ||
| assertUnreachable, | ||
| } from "../../common/src/utils.ts"; | ||
| import { | ||
| ActorsRequestSchema, | ||
| type ActorsResponse, | ||
| type RivetConfigResponse, | ||
| } from "../../manager-protocol/src/mod.ts"; | ||
| import { logger } from "./log.ts"; | ||
| import { queryActor } from "./query_exec.ts"; | ||
|
|
||
| export default class Manager { | ||
| private readonly endpoint: string; | ||
| private readonly rivetClient: RivetClient; | ||
| private readonly environment: RivetEnvironment; | ||
|
|
||
| constructor(private readonly ctx: ActorContext) { | ||
| const endpoint = Deno.env.get("RIVET_API_ENDPOINT"); | ||
| assertExists(endpoint, "missing RIVET_API_ENDPOINT"); | ||
| const token = Deno.env.get("RIVET_SERVICE_TOKEN"); | ||
| assertExists(token, "missing RIVET_SERVICE_TOKEN"); | ||
|
|
||
| this.endpoint = endpoint; | ||
|
|
||
| this.rivetClient = new RivetClient({ | ||
| environment: endpoint, | ||
| token, | ||
| }); | ||
|
|
||
| this.environment = { | ||
| project: this.ctx.metadata.project.slug, | ||
| environment: this.ctx.metadata.environment.slug, | ||
| }; | ||
| } | ||
|
|
||
| static async start(ctx: ActorContext) { | ||
| setupLogging(); | ||
|
|
||
| // biome-ignore lint/complexity/noThisInStatic: Must be used for default actor entrypoint | ||
| const manager = new this(ctx); | ||
| await manager.#run(); | ||
| } | ||
|
|
||
| async #run() { | ||
| const portStr = Deno.env.get("PORT_HTTP"); | ||
| if (!portStr) throw "Missing port"; | ||
| const port = Number.parseInt(portStr); | ||
| if (!Number.isFinite(port)) throw "Invalid port"; | ||
|
|
||
| const app = new Hono(); | ||
|
|
||
| app.use( | ||
| "/*", | ||
| cors({ | ||
| origin: (origin) => { | ||
| return origin.includes("localhost"); | ||
| }, | ||
| }), | ||
| ); | ||
|
|
||
| app.get("/rivet/config", (c: HonoContext) => { | ||
| return c.json({ | ||
| // HACK(RVT-4376): Replace DNS address used for local dev envs with public address | ||
| endpoint: this.endpoint.replace("rivet-server", "127.0.0.1"), | ||
| project: this.environment.project, | ||
| environment: this.environment.environment, | ||
| } satisfies RivetConfigResponse); | ||
| }); | ||
|
|
||
| app.post("/actors", async (c: HonoContext) => { | ||
| // Get actor | ||
| const body = ActorsRequestSchema.parse(await c.req.json()); | ||
| const actor = await queryActor( | ||
| this.rivetClient, | ||
| this.environment, | ||
| body.query, | ||
| ); | ||
|
|
||
| // Fetch port | ||
| const httpPort = actor.network.ports[PORT_NAME]; | ||
| assertExists(httpPort, "missing port"); | ||
| const hostname = httpPort.hostname; | ||
| assertExists(hostname); | ||
| const port = httpPort.port; | ||
| assertExists(port); | ||
|
|
||
| let isTls = false; | ||
| switch (httpPort.protocol) { | ||
| case "https": | ||
| isTls = true; | ||
| break; | ||
| case "http": | ||
| case "tcp": | ||
| isTls = false; | ||
| break; | ||
| case "tcp_tls": | ||
| case "udp": | ||
| throw new Error(`Invalid protocol ${httpPort.protocol}`); | ||
| default: | ||
| assertUnreachable(httpPort.protocol); | ||
| } | ||
|
|
||
| const path = httpPort.path ?? ""; | ||
|
|
||
| const endpoint = `${ | ||
| isTls ? "https" : "http" | ||
| }://${hostname}:${port}${path}`; | ||
|
|
||
| return c.json({ endpoint } satisfies ActorsResponse); | ||
| }); | ||
|
|
||
| app.all("*", (c) => { | ||
| return c.text("Not Found", 404); | ||
| }); | ||
|
|
||
| logger().info("server running", { port }); | ||
| const server = Deno.serve( | ||
| { | ||
| port, | ||
| hostname: "0.0.0.0", | ||
| // Remove "Listening on ..." message | ||
| onListen() {}, | ||
| }, | ||
| app.fetch, | ||
| ); | ||
|
|
||
| logger().debug("rivet endpoint", { | ||
| endpoint: this.endpoint, | ||
| project: this.ctx.metadata.project.slug, | ||
| environment: this.ctx.metadata.environment.slug, | ||
| }); | ||
|
|
||
| await server.finished; | ||
| } | ||
| } | ||
| //export default class Manager { | ||
| // private readonly endpoint: string; | ||
| // private readonly rivetClient: RivetClient; | ||
| // private readonly environment: RivetEnvironment; | ||
| // | ||
| // constructor(private readonly ctx: ActorContext) { | ||
| // const endpoint = Deno.env.get("RIVET_API_ENDPOINT"); | ||
| // assertExists(endpoint, "missing RIVET_API_ENDPOINT"); | ||
| // const token = Deno.env.get("RIVET_SERVICE_TOKEN"); | ||
| // assertExists(token, "missing RIVET_SERVICE_TOKEN"); | ||
| // | ||
| // this.endpoint = endpoint; | ||
| // | ||
| // this.rivetClient = new RivetClient({ | ||
| // environment: endpoint, | ||
| // token, | ||
| // }); | ||
| // | ||
| // this.environment = { | ||
| // project: this.ctx.metadata.project.slug, | ||
| // environment: this.ctx.metadata.environment.slug, | ||
| // }; | ||
| // } | ||
| // | ||
| // static async start(ctx: ActorContext) { | ||
| // setupLogging(); | ||
| // | ||
| // // biome-ignore lint/complexity/noThisInStatic: Must be used for default actor entrypoint | ||
| // const manager = new this(ctx); | ||
| // await manager.#run(); | ||
| // } | ||
| // | ||
| // async #run() { | ||
| // const portStr = Deno.env.get("PORT_HTTP"); | ||
| // if (!portStr) throw "Missing port"; | ||
| // const port = Number.parseInt(portStr); | ||
| // if (!Number.isFinite(port)) throw "Invalid port"; | ||
| // | ||
| // const app = new Hono(); | ||
| // | ||
| // app.use( | ||
| // "/*", | ||
| // cors({ | ||
| // origin: (origin) => { | ||
| // return origin.includes("localhost"); | ||
| // }, | ||
| // }), | ||
| // ); | ||
| // | ||
| // app.get("/rivet/config", (c: HonoContext) => { | ||
| // return c.json({ | ||
| // // HACK(RVT-4376): Replace DNS address used for local dev envs with public address | ||
| // endpoint: this.endpoint.replace("rivet-server", "127.0.0.1"), | ||
| // project: this.environment.project, | ||
| // environment: this.environment.environment, | ||
| // } satisfies RivetConfigResponse); | ||
| // }); | ||
| // | ||
| // app.post("/actors", async (c: HonoContext) => { | ||
| // // Get actor | ||
| // const body = ActorsRequestSchema.parse(await c.req.json()); | ||
| // const actor = await queryActor( | ||
| // this.rivetClient, | ||
| // this.environment, | ||
| // body.query, | ||
| // ); | ||
| // | ||
| // // Fetch port | ||
| // const httpPort = actor.network.ports[PORT_NAME]; | ||
| // assertExists(httpPort, "missing port"); | ||
| // const hostname = httpPort.hostname; | ||
| // assertExists(hostname); | ||
| // const port = httpPort.port; | ||
| // assertExists(port); | ||
| // | ||
| // let isTls = false; | ||
| // switch (httpPort.protocol) { | ||
| // case "https": | ||
| // isTls = true; | ||
| // break; | ||
| // case "http": | ||
| // case "tcp": | ||
| // isTls = false; | ||
| // break; | ||
| // case "tcp_tls": | ||
| // case "udp": | ||
| // throw new Error(`Invalid protocol ${httpPort.protocol}`); | ||
| // default: | ||
| // assertUnreachable(httpPort.protocol); | ||
| // } | ||
| // | ||
| // const path = httpPort.path ?? ""; | ||
| // | ||
| // const endpoint = `${ | ||
| // isTls ? "https" : "http" | ||
| // }://${hostname}:${port}${path}`; | ||
| // | ||
| // return c.json({ endpoint } satisfies ActorsResponse); | ||
| // }); | ||
| // | ||
| // app.all("*", (c) => { | ||
| // return c.text("Not Found", 404); | ||
| // }); | ||
| // | ||
| // logger().info("server running", { port }); | ||
| // const server = Deno.serve( | ||
| // { | ||
| // port, | ||
| // hostname: "0.0.0.0", | ||
| // // Remove "Listening on ..." message | ||
| // onListen() {}, | ||
| // }, | ||
| // app.fetch, | ||
| // ); | ||
| // | ||
| // logger().debug("rivet endpoint", { | ||
| // endpoint: this.endpoint, | ||
| // project: this.ctx.metadata.project.slug, | ||
| // environment: this.ctx.metadata.environment.slug, | ||
| // }); | ||
| // | ||
| // await server.finished; | ||
| // } | ||
| //} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters