diff --git a/rivetkit-typescript/packages/rivetkit/src/actor/router.ts b/rivetkit-typescript/packages/rivetkit/src/actor/router.ts index f85a93f9de..a8c409dc9b 100644 --- a/rivetkit-typescript/packages/rivetkit/src/actor/router.ts +++ b/rivetkit-typescript/packages/rivetkit/src/actor/router.ts @@ -20,11 +20,10 @@ import { } from "@/common/router"; import { noopNext } from "@/common/utils"; import { inspectorLogger } from "@/inspector/log"; -import { timingSafeEqual } from "@/utils/crypto"; -import { getNodeEnv } from "@/utils/env-vars"; - import type { RegistryConfig } from "@/registry/config"; import { type GetUpgradeWebSocket, VERSION } from "@/utils"; +import { timingSafeEqual } from "@/utils/crypto"; +import { isDev } from "@/utils/env-vars"; import { CONN_DRIVER_SYMBOL } from "./conn/mod"; import type { ActorDriver } from "./driver"; import { loggerWithoutContext } from "./log"; @@ -167,14 +166,16 @@ export function createActorRouter( if (config.inspector.enabled) { // Auth middleware for inspector routes const inspectorAuth = async (c: any): Promise => { - if (getNodeEnv() === "development" && !config.inspector.token()) { + if (isDev() && !config.inspector.token()) { inspectorLogger().warn({ msg: "RIVET_INSPECTOR_TOKEN is not set, skipping inspector auth in development mode", }); return undefined; } - const userToken = c.req.header("Authorization")?.replace("Bearer ", ""); + const userToken = c.req + .header("Authorization") + ?.replace("Bearer ", ""); if (!userToken) { return c.text("Unauthorized", 401); } @@ -197,7 +198,9 @@ export function createActorRouter( const actor = await actorDriver.loadActor(c.env.actorId); const isStateEnabled = actor.inspector.isStateEnabled(); - const state = isStateEnabled ? actor.inspector.getStateJson() : undefined; + const state = isStateEnabled + ? actor.inspector.getStateJson() + : undefined; return c.json({ state, isStateEnabled }); }); diff --git a/rivetkit-typescript/packages/rivetkit/src/manager/router.ts b/rivetkit-typescript/packages/rivetkit/src/manager/router.ts index 887bf1ff7c..9ef0bd75e3 100644 --- a/rivetkit-typescript/packages/rivetkit/src/manager/router.ts +++ b/rivetkit-typescript/packages/rivetkit/src/manager/router.ts @@ -40,7 +40,7 @@ import { import { buildActorNames, type RegistryConfig } from "@/registry/config"; import type { GetUpgradeWebSocket } from "@/utils"; import { timingSafeEqual } from "@/utils/crypto"; -import { getNodeEnv } from "@/utils/env-vars"; +import { isDev } from "@/utils/env-vars"; import { buildOpenApiRequestBody, buildOpenApiResponses, @@ -319,13 +319,13 @@ export function buildManagerRouter( }); router.openapi(route, async (c) => { - if (getNodeEnv() === "development" && !config.token) { + if (isDev() && !config.token) { logger().warn({ msg: "RIVET_TOKEN is not set, skipping KV store access checks in development mode. This endpoint will be disabled in production, unless you set the token.", }); } - if (getNodeEnv() !== "development") { + if (!isDev()) { if (!config.token) { throw new RestrictedFeature("KV store access"); }