chore: generate
This commit is contained in:
@@ -123,9 +123,7 @@ const instanceRoutes = Layer.mergeAll(rawInstanceRoutes, instanceApiRoutes).pipe
|
|||||||
|
|
||||||
const uiRoute = HttpRouter.add("*", "/*", (request) =>
|
const uiRoute = HttpRouter.add("*", "/*", (request) =>
|
||||||
serveUIEffect(request).pipe(Effect.provide(AppFileSystem.defaultLayer), Effect.provide(FetchHttpClient.layer)),
|
serveUIEffect(request).pipe(Effect.provide(AppFileSystem.defaultLayer), Effect.provide(FetchHttpClient.layer)),
|
||||||
).pipe(
|
).pipe(Layer.provide(authorizationRouterMiddleware.layer.pipe(Layer.provide(ServerAuthConfig.defaultLayer))))
|
||||||
Layer.provide(authorizationRouterMiddleware.layer.pipe(Layer.provide(ServerAuthConfig.defaultLayer))),
|
|
||||||
)
|
|
||||||
|
|
||||||
export const routes = Layer.mergeAll(rootApiRoutes, instanceRoutes, uiRoute).pipe(
|
export const routes = Layer.mergeAll(rootApiRoutes, instanceRoutes, uiRoute).pipe(
|
||||||
Layer.provide([
|
Layer.provide([
|
||||||
|
|||||||
@@ -22,19 +22,13 @@ const csp = (hash = "") =>
|
|||||||
`default-src 'self'; script-src 'self' 'wasm-unsafe-eval'${hash ? ` 'sha256-${hash}'` : ""}; style-src 'self' 'unsafe-inline'; img-src 'self' data: https:; font-src 'self' data:; media-src 'self' data:; connect-src 'self' data:`
|
`default-src 'self'; script-src 'self' 'wasm-unsafe-eval'${hash ? ` 'sha256-${hash}'` : ""}; style-src 'self' 'unsafe-inline'; img-src 'self' data: https:; font-src 'self' data:; media-src 'self' data:; connect-src 'self' data:`
|
||||||
|
|
||||||
function themePreloadHash(body: string) {
|
function themePreloadHash(body: string) {
|
||||||
return body.match(
|
return body.match(/<script\b(?![^>]*\bsrc\s*=)[^>]*\bid=(['"])oc-theme-preload-script\1[^>]*>([\s\S]*?)<\/script>/i)
|
||||||
/<script\b(?![^>]*\bsrc\s*=)[^>]*\bid=(['"])oc-theme-preload-script\1[^>]*>([\s\S]*?)<\/script>/i,
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function requestBody(request: HttpServerRequest.HttpServerRequest) {
|
function requestBody(request: HttpServerRequest.HttpServerRequest) {
|
||||||
if (request.method === "GET" || request.method === "HEAD") return HttpBody.empty
|
if (request.method === "GET" || request.method === "HEAD") return HttpBody.empty
|
||||||
const len = request.headers["content-length"]
|
const len = request.headers["content-length"]
|
||||||
return HttpBody.stream(
|
return HttpBody.stream(request.stream, request.headers["content-type"], len === undefined ? undefined : Number(len))
|
||||||
request.stream,
|
|
||||||
request.headers["content-type"],
|
|
||||||
len === undefined ? undefined : Number(len),
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function proxyResponseHeaders(headers: Record<string, string>) {
|
function proxyResponseHeaders(headers: Record<string, string>) {
|
||||||
@@ -116,10 +110,7 @@ export function serveUIEffect(request: HttpServerRequest.HttpServerRequest) {
|
|||||||
if (response.headers["content-type"]?.includes("text/html")) {
|
if (response.headers["content-type"]?.includes("text/html")) {
|
||||||
const body = yield* response.text
|
const body = yield* response.text
|
||||||
const match = themePreloadHash(body)
|
const match = themePreloadHash(body)
|
||||||
headers.set(
|
headers.set("Content-Security-Policy", csp(match ? createHash("sha256").update(match[2]).digest("base64") : ""))
|
||||||
"Content-Security-Policy",
|
|
||||||
csp(match ? createHash("sha256").update(match[2]).digest("base64") : ""),
|
|
||||||
)
|
|
||||||
return HttpServerResponse.text(body, { status: response.status, headers })
|
return HttpServerResponse.text(body, { status: response.status, headers })
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -12,7 +12,10 @@ import {
|
|||||||
HttpServerResponse,
|
HttpServerResponse,
|
||||||
} from "effect/unstable/http"
|
} from "effect/unstable/http"
|
||||||
import { AppFileSystem } from "@opencode-ai/core/filesystem"
|
import { AppFileSystem } from "@opencode-ai/core/filesystem"
|
||||||
import { ServerAuthConfig, authorizationRouterMiddleware } from "../../src/server/routes/instance/httpapi/middleware/authorization"
|
import {
|
||||||
|
ServerAuthConfig,
|
||||||
|
authorizationRouterMiddleware,
|
||||||
|
} from "../../src/server/routes/instance/httpapi/middleware/authorization"
|
||||||
import { ExperimentalHttpApiServer } from "../../src/server/routes/instance/httpapi/server"
|
import { ExperimentalHttpApiServer } from "../../src/server/routes/instance/httpapi/server"
|
||||||
import { serveUIEffect } from "../../src/server/routes/ui"
|
import { serveUIEffect } from "../../src/server/routes/ui"
|
||||||
import { Server } from "../../src/server/server"
|
import { Server } from "../../src/server/server"
|
||||||
@@ -69,11 +72,7 @@ function app(input?: { password?: string; username?: string }) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function uiApp(input?: {
|
function uiApp(input?: { password?: string; username?: string; client?: Layer.Layer<HttpClient.HttpClient> }) {
|
||||||
password?: string
|
|
||||||
username?: string
|
|
||||||
client?: Layer.Layer<HttpClient.HttpClient>
|
|
||||||
}) {
|
|
||||||
const handler = HttpRouter.toWebHandler(
|
const handler = HttpRouter.toWebHandler(
|
||||||
HttpRouter.add("*", "/*", (request) =>
|
HttpRouter.add("*", "/*", (request) =>
|
||||||
serveUIEffect(request).pipe(
|
serveUIEffect(request).pipe(
|
||||||
@@ -121,9 +120,12 @@ describe("HttpApi UI fallback", () => {
|
|||||||
let proxiedUrl: string | undefined
|
let proxiedUrl: string | undefined
|
||||||
|
|
||||||
const response = await uiApp({
|
const response = await uiApp({
|
||||||
client: httpClient(new Response("<html>opencode</html>", { headers: { "content-type": "text/html" } }), (request) => {
|
client: httpClient(
|
||||||
proxiedUrl = request.url
|
new Response("<html>opencode</html>", { headers: { "content-type": "text/html" } }),
|
||||||
}),
|
(request) => {
|
||||||
|
proxiedUrl = request.url
|
||||||
|
},
|
||||||
|
),
|
||||||
}).request("/")
|
}).request("/")
|
||||||
|
|
||||||
expect(response.status).toBe(200)
|
expect(response.status).toBe(200)
|
||||||
@@ -197,9 +199,7 @@ describe("HttpApi UI fallback", () => {
|
|||||||
password: "secret",
|
password: "secret",
|
||||||
username: "opencode",
|
username: "opencode",
|
||||||
client: httpClient(new Response("<html>opencode</html>", { headers: { "content-type": "text/html" } })),
|
client: httpClient(new Response("<html>opencode</html>", { headers: { "content-type": "text/html" } })),
|
||||||
}).request(
|
}).request(`/?auth_token=${btoa("opencode:secret")}`)
|
||||||
`/?auth_token=${btoa("opencode:secret")}`,
|
|
||||||
)
|
|
||||||
|
|
||||||
expect(response.status).toBe(200)
|
expect(response.status).toBe(200)
|
||||||
expect(await response.text()).toBe("<html>opencode</html>")
|
expect(await response.text()).toBe("<html>opencode</html>")
|
||||||
|
|||||||
Reference in New Issue
Block a user