test(relay): observe control events before socket open

.github/workflows/deploy-relay.yml

@@ -27,6 +27,6 @@ jobs:
         run: npm run typecheck --workspace=@getpaseo/relay
 
       - name: Deploy worker
-        run: cd packages/relay && npx wrangler deploy
+        run: cd packages/relay && npx wrangler deploy -c wrangler.staging.toml
         env:
           CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}

packages/relay/src/cloudflare-adapter.ts

@@ -17,7 +17,6 @@
  * ```
  */
 
-import { createCutoverProxy } from "./cutover-proxy.js";
 import type { ConnectionRole, RelaySessionAttachment } from "./types.js";
 
 type RelayProtocolVersion = "1" | "2";
@@ -98,7 +97,6 @@ function getGlobalWebSocketPair(): (new () => WebSocketPair) | undefined {
 
 interface Env {
   RELAY: DurableObjectNamespace;
-  PASEO_RELAY_UPSTREAM?: string;
 }
 
 interface DurableObjectNamespace {
@@ -574,10 +572,6 @@ export class RelayDurableObject {
  */
 export default {
   async fetch(request: Request, env: Env): Promise<Response> {
-    if (env.PASEO_RELAY_UPSTREAM) {
-      return createCutoverProxy(env.PASEO_RELAY_UPSTREAM).fetch(request);
-    }
-
     const url = new URL(request.url);
 
     // Health check

packages/relay/src/cutover-proxy.test.ts

@@ -2,9 +2,7 @@ import { createServer, type IncomingMessage, type Server } from "node:http";
 import type { AddressInfo } from "node:net";
 import { afterEach, describe, expect, it } from "vitest";
 
-import relayWorker from "./cloudflare-adapter.js";
-
-type RelayEnv = Parameters<typeof relayWorker.fetch>[1];
+import { createCutoverProxy } from "./cutover-proxy.js";
 
 interface ReceivedRequest {
   method: string;
@@ -66,19 +64,19 @@ describe("cutover proxy", () => {
     const origin = new RecordingOrigin();
     origins.push(origin);
     const originUrl = await origin.start();
+    const proxy = createCutoverProxy(originUrl);
 
-    const response = await relayWorker.fetch(
-      new Request("https://relay.paseo.sh/ws?serverId=srv_prod&role=server&v=2", {
-        headers: { "x-relay-probe": "production" },
+    const response = await proxy.fetch(
+      new Request("https://relay-staging.example/ws?serverId=srv_stage&role=server&v=2", {
+        headers: { "x-relay-probe": "staging" },
       }),
-      { PASEO_RELAY_UPSTREAM: originUrl } as RelayEnv,
     );
 
     expect(origin.received()).toEqual([
       {
         method: "GET",
-        path: "/ws?serverId=srv_prod&role=server&v=2",
-        probe: "production",
+        path: "/ws?serverId=srv_stage&role=server&v=2",
+        probe: "staging",
       },
     ]);
     expect(response.status).toBe(202);

packages/relay/src/cutover-proxy.ts

@@ -15,3 +15,5 @@ export function createCutoverProxy(origin: string): CutoverProxy {
     },
   };
 }
+
+export default createCutoverProxy("https://paseo-relay-next.fly.dev");

packages/relay/wrangler.staging.toml

@@ -0,0 +1,8 @@
+name = "paseo-relay-cutover-staging"
+main = "src/cutover-proxy.ts"
+compatibility_date = "2024-12-01"
+workers_dev = true
+preview_urls = false
+
+[observability]
+enabled = true

packages/relay/wrangler.toml

@@ -8,9 +8,6 @@ routes = [{ pattern = "relay.paseo.sh", custom_domain = true }]
 [observability]
 enabled = true
 
-[vars]
-PASEO_RELAY_UPSTREAM = "https://paseo-relay-next.fly.dev"
-
 [[durable_objects.bindings]]
 name = "RELAY"
 class_name = "RelayDurableObject"