Skip to content

Commit c1615b1

Browse files
authored
refactor(console): call inference through a service binding (#55103)
1 parent 4ffede4 commit c1615b1

2 files changed

Lines changed: 11 additions & 4 deletions

File tree

‎infra/console.ts‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ new sst.cloudflare.x.SolidStart("Console", {
4848
SALESFORCE_CLIENT_ID,
4949
SALESFORCE_CLIENT_SECRET,
5050
SALESFORCE_INSTANCE_URL,
51-
new sst.Secret("CLOUDFLARE_ACCESS_CLIENT_ID"),
5251
],
5352
environment: {
5453
//VITE_DOCS_URL: web.url.apply((url) => url!),
@@ -64,6 +63,12 @@ new sst.cloudflare.x.SolidStart("Console", {
6463
...(flags ?? []),
6564
"global_fetch_strictly_public",
6665
])
66+
// Same-zone fetch to inference re-enters as a public request and loses the client IP.
67+
if (migrationDomain)
68+
args.bindings = $resolve(args.bindings).apply((bindings) => [
69+
...(bindings ?? []),
70+
{ type: "service", name: "INFERENCE", service: `opencode-inference-${$app.stage}` },
71+
])
6772
args.tailConsumers = [{ service: logProcessor.nodes.worker.scriptName }]
6873
},
6974
},

‎packages/console/app/src/lib/inference-proxy.ts‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ export async function proxyInference(request: Request) {
4141
"x-zen",
4242
"x-zen-model",
4343
"x-zen-ip",
44+
"x-real-ip",
4445
"cf-access-client-id",
4546
"cf-access-client-secret",
4647
"host",
@@ -51,13 +52,14 @@ export async function proxyInference(request: Request) {
5152
const anonymous = !key || key === "public"
5253
if (anonymous) for (const name of ["authorization", "x-api-key", "x-goog-api-key"]) forwarded.headers.delete(name)
5354
if (!anonymous) forwarded.headers.set("authorization", `Bearer ${key}`)
54-
forwarded.headers.set("CF-Access-Client-Id", Resource.CLOUDFLARE_ACCESS_CLIENT_ID.value)
5555
const ip = request.headers.get("cf-connecting-ip")
56-
if (ip) forwarded.headers.set("x-zen-ip", ip)
56+
if (ip) forwarded.headers.set("x-real-ip", ip)
5757
const requestID = request.headers.get("x-opencode-request-id") ?? request.headers.get("x-opencode-request")
5858
if (requestID) forwarded.headers.set("x-opencode-request-id", requestID)
5959

60-
const response = await fetch(forwarded, { redirect: "manual" }).catch(() => undefined)
60+
const response = await (Resource.INFERENCE as { fetch: typeof fetch })
61+
.fetch(forwarded, { redirect: "manual" })
62+
.catch(() => undefined)
6163
if (!response)
6264
return Response.json(
6365
{ error: { type: "api_error", message: "Inference routing is unavailable. Please retry later." } },

0 commit comments

Comments
 (0)