diff --git a/README.md b/README.md index 2e65b21..b9fe09b 100644 --- a/README.md +++ b/README.md @@ -37,8 +37,7 @@ npm run dev - `BEDROCK_API_ORIGIN`:仅供 Next 服务端请求后端,默认 https://api.foundry.entroia.com。 - `NEXT_PUBLIC_BEDROCK_PROJECT`:项目标识,默认 endoleap。 -- 已部署的 `FOUNDRY_API_ORIGIN` 和 `NEXT_PUBLIC_FOUNDRY_PROJECT` 仍可使用,新名称优先。 -- 同源代理提供 `/api/bedrock/…`,兼容既有 `/api/foundry/…`。 +- 同源代理使用 `/api/bedrock/…`。部署时同步更新环境变量。 Slack Client Secret、Signing Secret、Verification Token、用户令牌与 app token 均不需要放入此前端。浏览器调用同源 Next API,由服务端转发到 Bedrock。Bedrock 会话保存在 HttpOnly / SameSite=Lax Cookie,生产 HTTPS 反向代理需传 X-Forwarded-Proto=https。不要将原始会话写入客户端存储。 diff --git a/headless/README.md b/headless/README.md index 970e3d7..1c832a0 100644 --- a/headless/README.md +++ b/headless/README.md @@ -1224,7 +1224,7 @@ not evidence for response-loss recovery. Its remote worker fixture replaces only generation output, not authenticated HTTP, PostgreSQL or service receipts. `createFoundryAssets` accepts a host `displayURL(id)` callback. Its default is -Endoleap's same-origin `/api/foundry/...` preview route; a Node or other host must +Endoleap's same-origin `/api/bedrock/...` preview route; a Node or other host must provide its own reachable preview route and arrange authentication there. This does not change `sourceURL`, canonical asset identity or the authority scope. Use `assets.authority.read` for original bytes and digest verification: a display diff --git a/src/app/api/bedrock/[...path]/route.ts b/src/app/api/bedrock/[...path]/route.ts index b803ec5..64870f4 100644 --- a/src/app/api/bedrock/[...path]/route.ts +++ b/src/app/api/bedrock/[...path]/route.ts @@ -1 +1,237 @@ -export { GET, POST, PATCH, DELETE, PUT, HEAD, OPTIONS } from "../../foundry/[...path]/route"; +/** + * Foundry的同源服务端代理。浏览器只持HttpOnly会话Cookie,代理转为上游Bearer; + * 限定可转发路径/查询/header,处理体积、超时、素材类型和会话续期。领域回执/模型校验仍由客户端服务适配器执行。 + * canonical文档和AI冻结写入保留原字节,模型/图片大响应流式转发,避免代理重编码破坏请求身份或额外缓存整份模型。 + */ +import { fetchCanvasResponse } from "@/lib/canvas-response"; +import { sessionCookie, sessionMaxAge, SESSION_EXPIRY_HEADER } from "@/lib/session-cookie"; +import { NextRequest, NextResponse } from "next/server"; + +/** 普通账户/工作区/material接口白名单;canvas与asset细分端点由下方独立表达式允许。 */ +const allowed = + /^(profile|auth\/(login|register|verify-email|exchange|me|logout)|workspaces(?:\/[a-zA-Z0-9_-]+(?:\/(?:materials(?:\/[a-zA-Z0-9_-]+(?:\/canvas)?)?|search))?)?)$/; +/** 明确列出旧canvas、新model增量/迁移、子图事务和AI端点,拒绝把代理变成任意上游路径通道。 */ +const canvasRoute = /^workspaces\/[a-zA-Z0-9_-]+\/materials\/[a-zA-Z0-9_-]+\/canvas(?:\/(?:model(?:\/(?:migrate|operations(?:\/[a-zA-Z0-9_-]+)?))?|operations(?:\/[a-zA-Z0-9_-]+)?|connections|capabilities|subgraphs(?:\/(?:migrate|[a-zA-Z0-9_-]+\/(?:members|dissolve)))?|transactions\/[a-zA-Z0-9_-]+\/undo|ai\/(?:models|operations\/[a-zA-Z0-9_-]+|runs(?:\/[a-zA-Z0-9_-]+(?:\/(?:cancel|apply))?)?)))?$/; +/** 素材上传/原件读取、操作回执和授权元数据是不同路径,后续按类别选择解析与响应方式。 */ +const assetRoute = /^workspaces\/[a-zA-Z0-9_-]+\/assets(?:\/(?:(?:operations|metadata)\/[a-zA-Z0-9_-]+|[a-zA-Z0-9_-]+))?$/; +/** 普通请求体上限1MiB;画布5MiB、multipart素材21MiB由handler显式覆盖。 */ +const bodyLimit = 1024 * 1024; + +// Route Handlers do not have the Pages Router bodyParser size limit. +/** 逐块计数后再组装请求体,超限取消reader,finally释放锁。 + * binary原样返回字节供冻结JSON/multipart转发,其它请求才解析JSON;这不是无限body缓冲。 */ +async function readBody(req: NextRequest, limit = bodyLimit, binary = false) { + const reader = req.body?.getReader(); + if (!reader) return {}; + const chunks: Uint8Array[] = []; + let size = 0; + try { + while (true) { + const { done, value } = await reader.read(); + if (done) break; + size += value.byteLength; + if (size > limit) { + await reader.cancel(); + throw new Error("body_too_large"); + } + chunks.push(value); + } + } finally { + reader.releaseLock(); + } + // 空body普通模式用空对象,binary模式保留空字节;无reader则早已返回空对象。 + if (!size) return binary ? new Uint8Array() : {}; + // chunks 与合并 Buffer 在此可能同时占内存;limit 约束载荷字节,不是整个请求处理的堆内存上限。 + const bytes = Buffer.concat(chunks); + return binary ? bytes : JSON.parse(bytes.toString("utf8")); +} + +/** 共用GET/POST/PATCH/DELETE处理器。params是当前Next版本的异步路由参数,先await再匹配路径。 + * 所有本代理响应默认no-store;HTTP成功/失败保持上游状态,上游调用/响应解析异常另转为502或超时504。 */ +async function handler( + req: NextRequest, + { params }: { params: Promise<{ path: string[] }> }, +) { + const requestStarted = performance.now(); + const requestStartedAt = new Date().toISOString(); + const responseHeaders = new Headers({ "Cache-Control": "no-store" }); + /** 复用当前响应头集合,JSON错误和普通结果都带相同缓存/续期/诊断头策略。 */ + const json = (body: unknown, status: number) => + NextResponse.json(body, { status, headers: responseHeaders }); + // 非GET且带Origin时比对host;缺Origin的请求在此不被拒绝,最终身份/权限仍由上游校验。 + const requestOrigin = req.headers.get("origin"); + if (req.method !== "GET" && requestOrigin) { + try { + if (new URL(requestOrigin).host !== req.headers.get("host")) + return json({ error: "invalid_origin" }, 403); + } catch { + return json({ error: "invalid_origin" }, 403); + } + } + // Origin 比对只使用 host(含端口),不要求 scheme 相同;也不在代理本地解析会话账户权限。 + const path = (await params).path.join("/"); + if (!allowed.test(path) && !canvasRoute.test(path) && !assetRoute.test(path)) return json({ error: "not_found" }, 404); + // operations/metadata返回JSON,不能被当成原图流,也不使用图片multipart请求体上限。 + const assetReceipt = assetRoute.test(path) && /\/assets\/operations\//.test(path); + const assetMetadata = assetRoute.test(path) && /\/assets\/metadata\//.test(path); + const asset = assetRoute.test(path) && !assetReceipt && !assetMetadata; + const canvas = canvasRoute.test(path); + const canonical = canvas && /\/canvas\/model(?:\/|$)/.test(path); + // frozenAI 仅匹配 ai/runs 分支,ai/operations 查询不由此标记;新文档 model 路径整体由 canonical 覆盖。 + const frozenAI = canvas && /\/canvas\/ai\/runs(?:\/|$)/.test(path); + let requestBody: unknown; + // 在网络转发前完成请求体限额:原始图片含multipart开销,新模型/AI写入保留原请求字节。 + if (req.method !== "GET") { + try { + requestBody = await readBody(req, asset ? 21 * 1024 * 1024 : canonical || path.endsWith("/canvas") || path.endsWith("/canvas/operations") ? 5 * 1024 * 1024 : bodyLimit, asset || canonical || frozenAI); + } catch (error) { + const tooLarge = error instanceof Error && error.message === "body_too_large"; + return json({ error: tooLarge ? "body_too_large" : "invalid_json" }, tooLarge ? 413 : 400); + } + } + const bodyReceived = performance.now(); + // 上游地址来自服务端环境,客户端path白名单不会让调用者自己指定任意目标源站。 + const origin = process.env.BEDROCK_API_ORIGIN || "https://api.foundry.entroia.com"; + const project = process.env.NEXT_PUBLIC_BEDROCK_PROJECT || "endoleap"; + // multipart沿用浏览器Content-Type和boundary,其余发JSON;不透传浏览器任意请求头。 + const headers: Record = { "Content-Type": asset ? (req.headers.get("content-type") || "application/octet-stream") : "application/json" }; + if (canvas) headers.Accept = "application/vnd.foundry.canvas+json;version=2"; + // 仅精确协商的canonical GET模型流改变Accept,普通canvas请求继续兼容v2表示。 + const modelStream = canonical && path.endsWith('/canvas/model') && req.method==='GET' && req.headers.get('accept')==='application/vnd.foundry.canvas-model+ndjson;version=1'; + if(modelStream)headers.Accept='application/vnd.foundry.canvas-model+ndjson;version=1'; + // Bearer从服务端读Cookie,禁止直接依赖客户端自行提供的Authorization冒充当前会话。 + const session = req.cookies.get("foundry_session")?.value; + if (session) headers.Authorization = "Bearer " + session; + // 明确允许OAuth交换、条件版本、幂等键、账户绑定和资源ID;这些值仍需上游验证。 + for (const h of ["x-foundry-code", "x-foundry-verifier", "if-match", "idempotency-key", "x-expected-account", "x-resource-id"]) { + const value = req.headers.get(h); + if (value !== null) headers[h] = value; + } + // 查询参数限定名单、单值且每值<300字符,重复值不选择性取第一项,避免前后端解释分歧。 + const query = new URLSearchParams(); + for (const key of ["kind", "sort", "q", "limit", "offset", "after_seq", "status", "include_descendants", "include_subgraphs", "cursor", "variant", "width"]) { + const values = req.nextUrl.searchParams.getAll(key); + // 不合规则的已知参数和名单外参数都静默不转发,不在这里返回 invalid_request。 + if (values.length === 1 && values[0].length < 300) query.set(key, values[0]); + } + const encodingStarted = performance.now(); + // Frozen document and AI requests cross the proxy byte-for-byte. + // binary Buffer直接转发,不JSON.parse/stringify;普通业务JSON才重编码,GET不带body。 + const outboundBody = req.method === "GET" ? undefined : asset || canonical || frozenAI ? requestBody as BodyInit : JSON.stringify(requestBody || {}); + const encodeMs = performance.now() - encodingStarted; + const started = performance.now(); + try { + // 模型/旧快照与图片读取使用分层超时流;其它请求组合15秒总超时和客户端取消。 + const snapshotRead = canvas && (path.endsWith("/canvas") || canonical) && req.method === "GET"; + // canonical GET 包括操作回执查询;只有这些 GET 使用分层流超时,写入仍用下方15秒总时限。 + const streamedRead = snapshotRead || asset && req.method === "GET"; + const snapshotWrite = canvas && path.endsWith("/canvas") && req.method === "PATCH"; + const traceId = streamedRead || snapshotWrite ? crypto.randomUUID() : ""; + /** 大响应只记录传输时序/字节数/资源路径,不把图像/模型内容或会话令牌写入trace。 */ + const requestUpstream = streamedRead ? (url: string, options: RequestInit) => fetchCanvasResponse(url, options, undefined, fetch, (trace) => { + console.info(snapshotRead ? "[canvas-transfer]" : "[asset-transfer]", JSON.stringify({ trace_id: traceId, resource: path, ...trace })); + }) : fetch; + if (streamedRead || snapshotWrite) responseHeaders.set("X-Canvas-Trace-Id", traceId); + // 禁止fetch缓存和自动跟随上游跳转;流读取继承请求取消,具体头/body/idle计时由fetchCanvasResponse管理。 + const upstream = await requestUpstream( + origin + "/projects/" + encodeURIComponent(project) + "/" + path + + (query.size ? "?" + query.toString() : ""), + { + method: req.method, + headers, + body: outboundBody, + signal: streamedRead ? req.signal : AbortSignal.any([AbortSignal.timeout(15000), req.signal]), + redirect: "manual", + cache: "no-store", + }, + ); + // 转发明确允许的重试、版本和schema提示,不能用代理自己的时间推算服务端写入版本。 + const retryAfter = upstream.headers.get("retry-after"); + if (retryAfter) responseHeaders.set("Retry-After", retryAfter); + const etag = upstream.headers.get("etag"); + if (etag) responseHeaders.set("ETag", etag); + const schema = upstream.headers.get("x-canvas-schema-version"); + if (schema) responseHeaders.set("X-Canvas-Schema-Version", schema); + // 既有会话仅在非401且上游给合法剩余秒数时续期;Secure还取决于生产环境及代理HTTPS头。 + const renewal = upstream.headers.get(SESSION_EXPIRY_HEADER); + if (session && upstream.status !== 401 && renewal !== null && /^\d+$/.test(renewal)) { + const secure = process.env.NODE_ENV === "production" && req.headers.get("x-forwarded-proto") === "https"; + // 纯数字也可能超出安全整数,sessionMaxAge 此时回退默认30天;续期不代表这里验证了账户资料。 + responseHeaders.set("Set-Cookie", sessionCookie(session, sessionMaxAge(renewal), secure)); + } + // 成功素材GET只透传允许的图片MIME并加nosniff;不是任意内容的同源文件托管。 + if (asset && upstream.ok && req.method === "GET") { + const type = upstream.headers.get("content-type") || ""; + if (!/^image\/(png|jpeg|webp|gif)(?:;|$)/i.test(type)) { await upstream.body?.cancel(); return json({ error: "invalid_asset" }, 502); } + // MIME 白名单只看响应头,不解码图片或核对实际字节类型;内容权威校验属于上游资源协议。 + responseHeaders.set("Content-Type", type); responseHeaders.set("X-Content-Type-Options", "nosniff"); + const variant = upstream.headers.get("x-asset-variant"); + if (variant === "original" || variant === "preview") responseHeaders.set("X-Asset-Variant", variant); + responseHeaders.set("Server-Timing", `upstream;dur=${(performance.now() - started).toFixed(1)}`); + return new NextResponse(upstream.body, { status: upstream.status, headers: responseHeaders }); + } + const headersReceived = performance.now(); + // Snapshots contain no login exchange payload. Forward them without buffering + // and parsing/re-encoding multi-megabyte inline image JSON in the proxy. + // canonical含错误回执也原流透传;旧snapshot只有成功GET走此路径。此处不读取/删除模型payload字段。 + if (canonical || canvas && path.endsWith("/canvas") && req.method === "GET" && upstream.ok) { + responseHeaders.set("Content-Type", modelStream && upstream.ok && upstream.headers.get('content-type')?.startsWith('application/vnd.foundry.canvas-model+ndjson;') ? upstream.headers.get('content-type')! : "application/json; charset=utf-8"); + responseHeaders.set("Server-Timing", `upstream;dur=${(headersReceived - started).toFixed(1)}, proxy_headers;dur=${(performance.now() - headersReceived).toFixed(1)}`); + return new NextResponse(upstream.body, { status: upstream.status, headers: responseHeaders }); + } + // 普通响应整体解JSON,因为登录/交换成功时须把access_token换成HttpOnly Cookie并从body移除。 + // 普通响应没有预解析字节上限;请求体 limit 不能用来证明上游 JSON 响应也受同样约束。 + const body = upstream.status === 204 ? null : await upstream.json(); + // 旧快照写入trace分出接收/重编码/上游/响应耗时,不输出请求正文;字节数仅对字符串body计算。 + if (snapshotWrite) console.info("[canvas-save]", JSON.stringify({ + trace_id: traceId, resource: path, status: upstream.status, started_at: requestStartedAt, finished_at: new Date().toISOString(), + client_body_ms: Math.round((bodyReceived - requestStarted) * 10) / 10, + encode_ms: Math.round(encodeMs * 10) / 10, + request_bytes: typeof outboundBody === "string" ? new TextEncoder().encode(outboundBody).length : 0, + upload_and_server_ms: Math.round((headersReceived - started) * 10) / 10, + response_body_ms: Math.round((performance.now() - headersReceived) * 10) / 10, + total_ms: Math.round((performance.now() - requestStarted) * 10) / 10, + })); + responseHeaders.set( + "Server-Timing", + `upstream;dur=${(headersReceived - started).toFixed(1)}, total;dur=${(performance.now() - started).toFixed(1)}`, + ); + const secure = process.env.NODE_ENV === "production" && req.headers.get("x-forwarded-proto") === "https"; + // 登录/交换令牌只进Set-Cookie,不回到浏览器可读JSON;其它会话响应按上游剩余时间更新。 + // 按字段存在处理,不仅限定 auth 路径/成功状态;原始流透传分支不进入此令牌移除逻辑。 + if (body?.access_token) { + responseHeaders.set("Set-Cookie", sessionCookie(body.access_token, sessionMaxAge(body.expires_in), secure)); + delete body.access_token; + } else if (session && upstream.status !== 401) { + const renewed = upstream.headers.get(SESSION_EXPIRY_HEADER); + if (renewed !== null && /^\d+$/.test(renewed)) responseHeaders.set("Set-Cookie", sessionCookie(session, sessionMaxAge(renewed), secure)); + } + // 401 不在这里主动清 Cookie;错误响应保持状态,客户端再决定登录/重试流程。 + // 仅上游确认登出成功后清Cookie,不把一次网络失败当成成功退出。 + if (path === "auth/logout" && upstream.ok) + responseHeaders.set( + "Set-Cookie", + "foundry_session=; HttpOnly; SameSite=Lax; Path=/; Max-Age=0", + ); + if (upstream.status === 204) + return new NextResponse(null, { status: 204, headers: responseHeaders }); + return json(body || { error: "upstream_unavailable" }, upstream.status); + // 这里只归一化代理传输/解析错误;成功开始转发后的流错误由流自身传播,不能补发第二个JSON响应。 + } catch (error) { + responseHeaders.set("Server-Timing", `total;dur=${(performance.now() - started).toFixed(1)}`); + const timeout = error instanceof Error && error.name === "TimeoutError"; + return json({ error: timeout ? "upstream_timeout" : "upstream_unavailable" }, timeout ? 504 : 502); + } +} + +/** 显式拒绝PUT/HEAD/OPTIONS并说明允许方法,不依赖框架自动推导另一套接口行为。 */ +function methodNotAllowed() { + return NextResponse.json({ error: "method_not_allowed" }, { + status: 405, + headers: { "Cache-Control": "no-store", Allow: "GET, POST, PATCH, DELETE" }, + }); +} + +// 同一白名单/体积/会话策略覆盖允许的四种方法;具体操作是否合法仍由服务端端点决定。 +export { handler as GET, handler as POST, handler as PATCH, handler as DELETE }; +export { methodNotAllowed as PUT, methodNotAllowed as HEAD, methodNotAllowed as OPTIONS }; diff --git a/src/app/api/foundry/[...path]/route.ts b/src/app/api/foundry/[...path]/route.ts deleted file mode 100644 index fa4f763..0000000 --- a/src/app/api/foundry/[...path]/route.ts +++ /dev/null @@ -1,237 +0,0 @@ -/** - * Foundry的同源服务端代理。浏览器只持HttpOnly会话Cookie,代理转为上游Bearer; - * 限定可转发路径/查询/header,处理体积、超时、素材类型和会话续期。领域回执/模型校验仍由客户端服务适配器执行。 - * canonical文档和AI冻结写入保留原字节,模型/图片大响应流式转发,避免代理重编码破坏请求身份或额外缓存整份模型。 - */ -import { fetchCanvasResponse } from "@/lib/canvas-response"; -import { sessionCookie, sessionMaxAge, SESSION_EXPIRY_HEADER } from "@/lib/session-cookie"; -import { NextRequest, NextResponse } from "next/server"; - -/** 普通账户/工作区/material接口白名单;canvas与asset细分端点由下方独立表达式允许。 */ -const allowed = - /^(profile|auth\/(login|register|verify-email|exchange|me|logout)|workspaces(?:\/[a-zA-Z0-9_-]+(?:\/(?:materials(?:\/[a-zA-Z0-9_-]+(?:\/canvas)?)?|search))?)?)$/; -/** 明确列出旧canvas、新model增量/迁移、子图事务和AI端点,拒绝把代理变成任意上游路径通道。 */ -const canvasRoute = /^workspaces\/[a-zA-Z0-9_-]+\/materials\/[a-zA-Z0-9_-]+\/canvas(?:\/(?:model(?:\/(?:migrate|operations(?:\/[a-zA-Z0-9_-]+)?))?|operations(?:\/[a-zA-Z0-9_-]+)?|connections|capabilities|subgraphs(?:\/(?:migrate|[a-zA-Z0-9_-]+\/(?:members|dissolve)))?|transactions\/[a-zA-Z0-9_-]+\/undo|ai\/(?:models|operations\/[a-zA-Z0-9_-]+|runs(?:\/[a-zA-Z0-9_-]+(?:\/(?:cancel|apply))?)?)))?$/; -/** 素材上传/原件读取、操作回执和授权元数据是不同路径,后续按类别选择解析与响应方式。 */ -const assetRoute = /^workspaces\/[a-zA-Z0-9_-]+\/assets(?:\/(?:(?:operations|metadata)\/[a-zA-Z0-9_-]+|[a-zA-Z0-9_-]+))?$/; -/** 普通请求体上限1MiB;画布5MiB、multipart素材21MiB由handler显式覆盖。 */ -const bodyLimit = 1024 * 1024; - -// Route Handlers do not have the Pages Router bodyParser size limit. -/** 逐块计数后再组装请求体,超限取消reader,finally释放锁。 - * binary原样返回字节供冻结JSON/multipart转发,其它请求才解析JSON;这不是无限body缓冲。 */ -async function readBody(req: NextRequest, limit = bodyLimit, binary = false) { - const reader = req.body?.getReader(); - if (!reader) return {}; - const chunks: Uint8Array[] = []; - let size = 0; - try { - while (true) { - const { done, value } = await reader.read(); - if (done) break; - size += value.byteLength; - if (size > limit) { - await reader.cancel(); - throw new Error("body_too_large"); - } - chunks.push(value); - } - } finally { - reader.releaseLock(); - } - // 空body普通模式用空对象,binary模式保留空字节;无reader则早已返回空对象。 - if (!size) return binary ? new Uint8Array() : {}; - // chunks 与合并 Buffer 在此可能同时占内存;limit 约束载荷字节,不是整个请求处理的堆内存上限。 - const bytes = Buffer.concat(chunks); - return binary ? bytes : JSON.parse(bytes.toString("utf8")); -} - -/** 共用GET/POST/PATCH/DELETE处理器。params是当前Next版本的异步路由参数,先await再匹配路径。 - * 所有本代理响应默认no-store;HTTP成功/失败保持上游状态,上游调用/响应解析异常另转为502或超时504。 */ -async function handler( - req: NextRequest, - { params }: { params: Promise<{ path: string[] }> }, -) { - const requestStarted = performance.now(); - const requestStartedAt = new Date().toISOString(); - const responseHeaders = new Headers({ "Cache-Control": "no-store" }); - /** 复用当前响应头集合,JSON错误和普通结果都带相同缓存/续期/诊断头策略。 */ - const json = (body: unknown, status: number) => - NextResponse.json(body, { status, headers: responseHeaders }); - // 非GET且带Origin时比对host;缺Origin的请求在此不被拒绝,最终身份/权限仍由上游校验。 - const requestOrigin = req.headers.get("origin"); - if (req.method !== "GET" && requestOrigin) { - try { - if (new URL(requestOrigin).host !== req.headers.get("host")) - return json({ error: "invalid_origin" }, 403); - } catch { - return json({ error: "invalid_origin" }, 403); - } - } - // Origin 比对只使用 host(含端口),不要求 scheme 相同;也不在代理本地解析会话账户权限。 - const path = (await params).path.join("/"); - if (!allowed.test(path) && !canvasRoute.test(path) && !assetRoute.test(path)) return json({ error: "not_found" }, 404); - // operations/metadata返回JSON,不能被当成原图流,也不使用图片multipart请求体上限。 - const assetReceipt = assetRoute.test(path) && /\/assets\/operations\//.test(path); - const assetMetadata = assetRoute.test(path) && /\/assets\/metadata\//.test(path); - const asset = assetRoute.test(path) && !assetReceipt && !assetMetadata; - const canvas = canvasRoute.test(path); - const canonical = canvas && /\/canvas\/model(?:\/|$)/.test(path); - // frozenAI 仅匹配 ai/runs 分支,ai/operations 查询不由此标记;新文档 model 路径整体由 canonical 覆盖。 - const frozenAI = canvas && /\/canvas\/ai\/runs(?:\/|$)/.test(path); - let requestBody: unknown; - // 在网络转发前完成请求体限额:原始图片含multipart开销,新模型/AI写入保留原请求字节。 - if (req.method !== "GET") { - try { - requestBody = await readBody(req, asset ? 21 * 1024 * 1024 : canonical || path.endsWith("/canvas") || path.endsWith("/canvas/operations") ? 5 * 1024 * 1024 : bodyLimit, asset || canonical || frozenAI); - } catch (error) { - const tooLarge = error instanceof Error && error.message === "body_too_large"; - return json({ error: tooLarge ? "body_too_large" : "invalid_json" }, tooLarge ? 413 : 400); - } - } - const bodyReceived = performance.now(); - // 上游地址来自服务端环境,客户端path白名单不会让调用者自己指定任意目标源站。 - const origin = process.env.BEDROCK_API_ORIGIN || process.env.FOUNDRY_API_ORIGIN || "https://api.foundry.entroia.com"; - const project = process.env.NEXT_PUBLIC_BEDROCK_PROJECT || process.env.NEXT_PUBLIC_FOUNDRY_PROJECT || "endoleap"; - // multipart沿用浏览器Content-Type和boundary,其余发JSON;不透传浏览器任意请求头。 - const headers: Record = { "Content-Type": asset ? (req.headers.get("content-type") || "application/octet-stream") : "application/json" }; - if (canvas) headers.Accept = "application/vnd.foundry.canvas+json;version=2"; - // 仅精确协商的canonical GET模型流改变Accept,普通canvas请求继续兼容v2表示。 - const modelStream = canonical && path.endsWith('/canvas/model') && req.method==='GET' && req.headers.get('accept')==='application/vnd.foundry.canvas-model+ndjson;version=1'; - if(modelStream)headers.Accept='application/vnd.foundry.canvas-model+ndjson;version=1'; - // Bearer从服务端读Cookie,禁止直接依赖客户端自行提供的Authorization冒充当前会话。 - const session = req.cookies.get("foundry_session")?.value; - if (session) headers.Authorization = "Bearer " + session; - // 明确允许OAuth交换、条件版本、幂等键、账户绑定和资源ID;这些值仍需上游验证。 - for (const h of ["x-foundry-code", "x-foundry-verifier", "if-match", "idempotency-key", "x-expected-account", "x-resource-id"]) { - const value = req.headers.get(h); - if (value !== null) headers[h] = value; - } - // 查询参数限定名单、单值且每值<300字符,重复值不选择性取第一项,避免前后端解释分歧。 - const query = new URLSearchParams(); - for (const key of ["kind", "sort", "q", "limit", "offset", "after_seq", "status", "include_descendants", "include_subgraphs", "cursor", "variant", "width"]) { - const values = req.nextUrl.searchParams.getAll(key); - // 不合规则的已知参数和名单外参数都静默不转发,不在这里返回 invalid_request。 - if (values.length === 1 && values[0].length < 300) query.set(key, values[0]); - } - const encodingStarted = performance.now(); - // Frozen document and AI requests cross the proxy byte-for-byte. - // binary Buffer直接转发,不JSON.parse/stringify;普通业务JSON才重编码,GET不带body。 - const outboundBody = req.method === "GET" ? undefined : asset || canonical || frozenAI ? requestBody as BodyInit : JSON.stringify(requestBody || {}); - const encodeMs = performance.now() - encodingStarted; - const started = performance.now(); - try { - // 模型/旧快照与图片读取使用分层超时流;其它请求组合15秒总超时和客户端取消。 - const snapshotRead = canvas && (path.endsWith("/canvas") || canonical) && req.method === "GET"; - // canonical GET 包括操作回执查询;只有这些 GET 使用分层流超时,写入仍用下方15秒总时限。 - const streamedRead = snapshotRead || asset && req.method === "GET"; - const snapshotWrite = canvas && path.endsWith("/canvas") && req.method === "PATCH"; - const traceId = streamedRead || snapshotWrite ? crypto.randomUUID() : ""; - /** 大响应只记录传输时序/字节数/资源路径,不把图像/模型内容或会话令牌写入trace。 */ - const requestUpstream = streamedRead ? (url: string, options: RequestInit) => fetchCanvasResponse(url, options, undefined, fetch, (trace) => { - console.info(snapshotRead ? "[canvas-transfer]" : "[asset-transfer]", JSON.stringify({ trace_id: traceId, resource: path, ...trace })); - }) : fetch; - if (streamedRead || snapshotWrite) responseHeaders.set("X-Canvas-Trace-Id", traceId); - // 禁止fetch缓存和自动跟随上游跳转;流读取继承请求取消,具体头/body/idle计时由fetchCanvasResponse管理。 - const upstream = await requestUpstream( - origin + "/projects/" + encodeURIComponent(project) + "/" + path + - (query.size ? "?" + query.toString() : ""), - { - method: req.method, - headers, - body: outboundBody, - signal: streamedRead ? req.signal : AbortSignal.any([AbortSignal.timeout(15000), req.signal]), - redirect: "manual", - cache: "no-store", - }, - ); - // 转发明确允许的重试、版本和schema提示,不能用代理自己的时间推算服务端写入版本。 - const retryAfter = upstream.headers.get("retry-after"); - if (retryAfter) responseHeaders.set("Retry-After", retryAfter); - const etag = upstream.headers.get("etag"); - if (etag) responseHeaders.set("ETag", etag); - const schema = upstream.headers.get("x-canvas-schema-version"); - if (schema) responseHeaders.set("X-Canvas-Schema-Version", schema); - // 既有会话仅在非401且上游给合法剩余秒数时续期;Secure还取决于生产环境及代理HTTPS头。 - const renewal = upstream.headers.get(SESSION_EXPIRY_HEADER); - if (session && upstream.status !== 401 && renewal !== null && /^\d+$/.test(renewal)) { - const secure = process.env.NODE_ENV === "production" && req.headers.get("x-forwarded-proto") === "https"; - // 纯数字也可能超出安全整数,sessionMaxAge 此时回退默认30天;续期不代表这里验证了账户资料。 - responseHeaders.set("Set-Cookie", sessionCookie(session, sessionMaxAge(renewal), secure)); - } - // 成功素材GET只透传允许的图片MIME并加nosniff;不是任意内容的同源文件托管。 - if (asset && upstream.ok && req.method === "GET") { - const type = upstream.headers.get("content-type") || ""; - if (!/^image\/(png|jpeg|webp|gif)(?:;|$)/i.test(type)) { await upstream.body?.cancel(); return json({ error: "invalid_asset" }, 502); } - // MIME 白名单只看响应头,不解码图片或核对实际字节类型;内容权威校验属于上游资源协议。 - responseHeaders.set("Content-Type", type); responseHeaders.set("X-Content-Type-Options", "nosniff"); - const variant = upstream.headers.get("x-asset-variant"); - if (variant === "original" || variant === "preview") responseHeaders.set("X-Asset-Variant", variant); - responseHeaders.set("Server-Timing", `upstream;dur=${(performance.now() - started).toFixed(1)}`); - return new NextResponse(upstream.body, { status: upstream.status, headers: responseHeaders }); - } - const headersReceived = performance.now(); - // Snapshots contain no login exchange payload. Forward them without buffering - // and parsing/re-encoding multi-megabyte inline image JSON in the proxy. - // canonical含错误回执也原流透传;旧snapshot只有成功GET走此路径。此处不读取/删除模型payload字段。 - if (canonical || canvas && path.endsWith("/canvas") && req.method === "GET" && upstream.ok) { - responseHeaders.set("Content-Type", modelStream && upstream.ok && upstream.headers.get('content-type')?.startsWith('application/vnd.foundry.canvas-model+ndjson;') ? upstream.headers.get('content-type')! : "application/json; charset=utf-8"); - responseHeaders.set("Server-Timing", `upstream;dur=${(headersReceived - started).toFixed(1)}, proxy_headers;dur=${(performance.now() - headersReceived).toFixed(1)}`); - return new NextResponse(upstream.body, { status: upstream.status, headers: responseHeaders }); - } - // 普通响应整体解JSON,因为登录/交换成功时须把access_token换成HttpOnly Cookie并从body移除。 - // 普通响应没有预解析字节上限;请求体 limit 不能用来证明上游 JSON 响应也受同样约束。 - const body = upstream.status === 204 ? null : await upstream.json(); - // 旧快照写入trace分出接收/重编码/上游/响应耗时,不输出请求正文;字节数仅对字符串body计算。 - if (snapshotWrite) console.info("[canvas-save]", JSON.stringify({ - trace_id: traceId, resource: path, status: upstream.status, started_at: requestStartedAt, finished_at: new Date().toISOString(), - client_body_ms: Math.round((bodyReceived - requestStarted) * 10) / 10, - encode_ms: Math.round(encodeMs * 10) / 10, - request_bytes: typeof outboundBody === "string" ? new TextEncoder().encode(outboundBody).length : 0, - upload_and_server_ms: Math.round((headersReceived - started) * 10) / 10, - response_body_ms: Math.round((performance.now() - headersReceived) * 10) / 10, - total_ms: Math.round((performance.now() - requestStarted) * 10) / 10, - })); - responseHeaders.set( - "Server-Timing", - `upstream;dur=${(headersReceived - started).toFixed(1)}, total;dur=${(performance.now() - started).toFixed(1)}`, - ); - const secure = process.env.NODE_ENV === "production" && req.headers.get("x-forwarded-proto") === "https"; - // 登录/交换令牌只进Set-Cookie,不回到浏览器可读JSON;其它会话响应按上游剩余时间更新。 - // 按字段存在处理,不仅限定 auth 路径/成功状态;原始流透传分支不进入此令牌移除逻辑。 - if (body?.access_token) { - responseHeaders.set("Set-Cookie", sessionCookie(body.access_token, sessionMaxAge(body.expires_in), secure)); - delete body.access_token; - } else if (session && upstream.status !== 401) { - const renewed = upstream.headers.get(SESSION_EXPIRY_HEADER); - if (renewed !== null && /^\d+$/.test(renewed)) responseHeaders.set("Set-Cookie", sessionCookie(session, sessionMaxAge(renewed), secure)); - } - // 401 不在这里主动清 Cookie;错误响应保持状态,客户端再决定登录/重试流程。 - // 仅上游确认登出成功后清Cookie,不把一次网络失败当成成功退出。 - if (path === "auth/logout" && upstream.ok) - responseHeaders.set( - "Set-Cookie", - "foundry_session=; HttpOnly; SameSite=Lax; Path=/; Max-Age=0", - ); - if (upstream.status === 204) - return new NextResponse(null, { status: 204, headers: responseHeaders }); - return json(body || { error: "upstream_unavailable" }, upstream.status); - // 这里只归一化代理传输/解析错误;成功开始转发后的流错误由流自身传播,不能补发第二个JSON响应。 - } catch (error) { - responseHeaders.set("Server-Timing", `total;dur=${(performance.now() - started).toFixed(1)}`); - const timeout = error instanceof Error && error.name === "TimeoutError"; - return json({ error: timeout ? "upstream_timeout" : "upstream_unavailable" }, timeout ? 504 : 502); - } -} - -/** 显式拒绝PUT/HEAD/OPTIONS并说明允许方法,不依赖框架自动推导另一套接口行为。 */ -function methodNotAllowed() { - return NextResponse.json({ error: "method_not_allowed" }, { - status: 405, - headers: { "Cache-Control": "no-store", Allow: "GET, POST, PATCH, DELETE" }, - }); -} - -// 同一白名单/体积/会话策略覆盖允许的四种方法;具体操作是否合法仍由服务端端点决定。 -export { handler as GET, handler as POST, handler as PATCH, handler as DELETE }; -export { methodNotAllowed as PUT, methodNotAllowed as HEAD, methodNotAllowed as OPTIONS }; diff --git a/src/app/api/oauth/[provider]/route.ts b/src/app/api/oauth/[provider]/route.ts index f6c22ce..da68a8f 100644 --- a/src/app/api/oauth/[provider]/route.ts +++ b/src/app/api/oauth/[provider]/route.ts @@ -21,8 +21,8 @@ export async function GET( ) return NextResponse.json({ error: "invalid_request" }, { status: 400 }); // 上游源站/项目由宿主环境装配,不让查询参数决定任意OAuth重定向目标。 - const origin = process.env.BEDROCK_API_ORIGIN || process.env.FOUNDRY_API_ORIGIN || "https://api.foundry.entroia.com"; - const project = process.env.NEXT_PUBLIC_BEDROCK_PROJECT || process.env.NEXT_PUBLIC_FOUNDRY_PROJECT || "endoleap"; + const origin = process.env.BEDROCK_API_ORIGIN || "https://api.foundry.entroia.com"; + const project = process.env.NEXT_PUBLIC_BEDROCK_PROJECT || "endoleap"; return NextResponse.redirect( origin + "/projects/" + encodeURIComponent(project) + "/auth/" + provider + "?challenge=" + challenge, { status: 302, headers: { "Cache-Control": "no-store" } }, diff --git a/src/app/page.tsx b/src/app/page.tsx index 18721b3..ecd2f73 100644 --- a/src/app/page.tsx +++ b/src/app/page.tsx @@ -11,8 +11,8 @@ export default async function Home() { const session = (await cookies()).get("foundry_session")?.value; let authenticated = false; if (session) { - const origin = process.env.BEDROCK_API_ORIGIN || process.env.FOUNDRY_API_ORIGIN || "https://api.foundry.entroia.com"; - const project = process.env.NEXT_PUBLIC_BEDROCK_PROJECT || process.env.NEXT_PUBLIC_FOUNDRY_PROJECT || "endoleap"; + const origin = process.env.BEDROCK_API_ORIGIN || "https://api.foundry.entroia.com"; + const project = process.env.NEXT_PUBLIC_BEDROCK_PROJECT || "endoleap"; try { const response = await fetch(`${origin}/projects/${encodeURIComponent(project)}/profile`, { headers: { Authorization: `Bearer ${session}` }, diff --git a/src/components/canvas/headless-resource-picker.tsx b/src/components/canvas/headless-resource-picker.tsx index 4340ece..a6556aa 100644 --- a/src/components/canvas/headless-resource-picker.tsx +++ b/src/components/canvas/headless-resource-picker.tsx @@ -81,7 +81,7 @@ export function HeadlessResourcePicker({engine,workspaceId,canvasId,position,clo return {if(!open)dismiss();}}> 从其它画布添加图片选择同一工作区已打开画布中的图片,无需再次上传。 {loading?

正在查找图片…

:items.length===0?

暂无可复用的图片。先打开有已上传图片的画布,再回到这里。

:
{items.map(item=>)}
} {error&&

{error}

}
; diff --git a/src/components/canvas/loading-graph-canvas.tsx b/src/components/canvas/loading-graph-canvas.tsx index 203c24b..da599d4 100644 --- a/src/components/canvas/loading-graph-canvas.tsx +++ b/src/components/canvas/loading-graph-canvas.tsx @@ -43,7 +43,7 @@ export default function LoadingGraphCanvas({preview,canvasId,registry,renderers, // 每条边端点都追加描述,不按 handleId 去重;PreparingNode 使用临时索引 key,仅供预览定位。 const handles=new Map();for(const edge of value.edges)for(const type of ['source','target'] as const){const id=edge[type],rows=handles.get(id)??[];rows.push({type,id:edge[type==='source'?'sourceHandle':'targetHandle']??undefined});handles.set(id,rows);} // 节点禁用拖动/选择/焦点/连接及指针,边禁用选择/焦点;已知组件声明assetId资源字段才设置预览URL。 - return{nodes:value.nodes.map(node=>({...node,draggable:false,selectable:false,focusable:false,connectable:false,style:{...node.style,pointerEvents:'none' as const},data:{...node.data,__previewHandles:handles.get(node.id)??[],...(registry.resolve(preview.document.elements.get(node.id)!)==='known'&&typeof node.data.assetId==='string'&®istry.components.get(preview.document.elements.get(node.id)!.componentId)?.resourceFields?.includes('assetId')?{src:`/api/foundry/workspaces/${encodeURIComponent(workspaceId)}/assets/${encodeURIComponent(node.data.assetId)}?variant=preview`}:{})}})),edges:value.edges.map(edge=>({...edge,selectable:false,focusable:false}))}; + return{nodes:value.nodes.map(node=>({...node,draggable:false,selectable:false,focusable:false,connectable:false,style:{...node.style,pointerEvents:'none' as const},data:{...node.data,__previewHandles:handles.get(node.id)??[],...(registry.resolve(preview.document.elements.get(node.id)!)==='known'&&typeof node.data.assetId==='string'&®istry.components.get(preview.document.elements.get(node.id)!.componentId)?.resourceFields?.includes('assetId')?{src:`/api/bedrock/workspaces/${encodeURIComponent(workspaceId)}/assets/${encodeURIComponent(node.data.assetId)}?variant=preview`}:{})}})),edges:value.edges.map(edge=>({...edge,selectable:false,focusable:false}))}; },[preview.document,canvasId,workspaceId,registry,catalog]); // 普通rendererId优先使用专用preview,否则节点PreparingNode、边UnsupportedEdge;节点再套inert隔离内部控件。 const nodeTypes=useMemo(()=>{const result:NodeTypes={};for(const [id,Renderer]of Object.entries({...Object.fromEntries(Object.keys(renderers.nodeTypes).map(id=>[id,renderers.previewNodeTypes[id]??PreparingNode])),unsupported:UnsupportedNode}))result[id]=props=>
;return result;},[renderers]),edgeTypes=useMemo(()=>({...Object.fromEntries(Object.keys(renderers.edgeTypes).map(id=>[id,renderers.previewEdgeTypes[id]??UnsupportedEdge])),unsupported:UnsupportedEdge}),[renderers]); diff --git a/src/components/workspace/canvas-runtime-host.tsx b/src/components/workspace/canvas-runtime-host.tsx index a8858e8..093dda4 100644 --- a/src/components/workspace/canvas-runtime-host.tsx +++ b/src/components/workspace/canvas-runtime-host.tsx @@ -36,7 +36,7 @@ export function CanvasRuntimeHost({ children,extensions=[] }: { children: ReactN /** 一项目一组协议适配器;summary策略只压缩已协调回执,不改变网络请求或原始操作身份。 */ adapters(rootId, current) { const transport = createFoundryTransport({ accountId, isCurrentIdentity: current }); - return { runs: createFoundryRuns({ workspaceId, rootId, registry, transport }), persistence: createFoundryPersistence({ workspaceId, rootId, registry, transport, resolvedReceiptPolicy:'summary' }), assets: createFoundryAssets({ workspaceId, transport, project: process.env.NEXT_PUBLIC_BEDROCK_PROJECT || process.env.NEXT_PUBLIC_FOUNDRY_PROJECT || "endoleap", origin: process.env.NEXT_PUBLIC_BEDROCK_API_ORIGIN || process.env.NEXT_PUBLIC_FOUNDRY_API_ORIGIN }) }; + return { runs: createFoundryRuns({ workspaceId, rootId, registry, transport }), persistence: createFoundryPersistence({ workspaceId, rootId, registry, transport, resolvedReceiptPolicy:'summary' }), assets: createFoundryAssets({ workspaceId, transport, project: process.env.NEXT_PUBLIC_BEDROCK_PROJECT || "endoleap", origin: process.env.NEXT_PUBLIC_BEDROCK_API_ORIGIN }) }; }, // 同工作区错误用稳定通知id更新,不创建另一份任务状态;错误恢复仍须runtime明确操作。 onError: error => notify({ id: `canvas-runtime:${accountId}:${workspaceId}`, title: "画布同步需要处理", description: errorText(error), level: "error" }), diff --git a/src/lib/api.ts b/src/lib/api.ts index 5a9efde..29fccff 100644 --- a/src/lib/api.ts +++ b/src/lib/api.ts @@ -28,7 +28,7 @@ export async function api( options: RequestInit = {}, ): Promise { // fetch 本身拒绝(网络失败/发出前取消)时原异常直接传播;下面的 ApiError 包装只覆盖响应读取与 HTTP 错误。 - const res = await fetch("/api/foundry/" + path, { + const res = await fetch("/api/bedrock/" + path, { ...options, // FormData让浏览器生成boundary,其它请求默认JSON;这里只展开 headers 的自有可枚举字段。 // 普通对象可覆盖同名默认字段;Headers 实例/二元组数组不会在这里被规范化成对象键值。 @@ -55,7 +55,7 @@ export async function api( return body as T; } /** 公开项目标识,来自构建时NEXT_PUBLIC配置;不是密码或用户账户身份。 */ -export const PROJECT = process.env.NEXT_PUBLIC_BEDROCK_PROJECT || process.env.NEXT_PUBLIC_FOUNDRY_PROJECT || "endoleap"; +export const PROJECT = process.env.NEXT_PUBLIC_BEDROCK_PROJECT || "endoleap"; /** 创建PKCE verifier和SHA-256 challenge:verifier留在当前标签页sessionStorage, * 只把challenge带到同源OAuth入口,后续交换流程负责取回verifier。此处不直接取得令牌。 */ export async function startOAuth(provider: "google" | "slack") { diff --git a/src/lib/canvas-assets.ts b/src/lib/canvas-assets.ts index dd7d008..5893dc3 100644 --- a/src/lib/canvas-assets.ts +++ b/src/lib/canvas-assets.ts @@ -25,7 +25,7 @@ export async function uploadCanvasImage(request: Request, workspace: string, fil if (!asset || typeof asset.url !== "string") throw new Error("invalid_asset_response"); let url: URL; try { url = new URL(asset.url); } catch { throw new Error("invalid_asset_response"); } - if (!/^[a-f\d]{8}-[a-f\d]{4}-[a-f\d]{4}-[a-f\d]{4}-[a-f\d]{12}$/i.test(asset.id) || url.origin !== "https://api.foundry.entroia.com" || url.pathname !== `/projects/${process.env.NEXT_PUBLIC_BEDROCK_PROJECT || process.env.NEXT_PUBLIC_FOUNDRY_PROJECT || "endoleap"}/workspaces/${workspace}/assets/${asset.id}` || url.search || !Number.isFinite(asset.width) || asset.width < 1 || !Number.isFinite(asset.height) || asset.height < 1) throw new Error("invalid_asset_response"); + if (!/^[a-f\d]{8}-[a-f\d]{4}-[a-f\d]{4}-[a-f\d]{4}-[a-f\d]{12}$/i.test(asset.id) || url.origin !== "https://api.foundry.entroia.com" || url.pathname !== `/projects/${process.env.NEXT_PUBLIC_BEDROCK_PROJECT || "endoleap"}/workspaces/${workspace}/assets/${asset.id}` || url.search || !Number.isFinite(asset.width) || asset.width < 1 || !Number.isFinite(asset.height) || asset.height < 1) throw new Error("invalid_asset_response"); // bytes/mime_type 未在此逐项核验,URL hash/用户名密码也未另设拒绝条件;不能视为新版资源权威证明。 return asset; } diff --git a/src/lib/canvas-service/assets.ts b/src/lib/canvas-service/assets.ts index 912541a..cae3dab 100644 --- a/src/lib/canvas-service/assets.ts +++ b/src/lib/canvas-service/assets.ts @@ -88,7 +88,7 @@ export function createFoundryAssets(options: { workspaceId: Id; transport: Servi * resolve 返回冻结元数据,read 返回原字节响应;不在此重新哈希/解码,权限身份与字节预算还依赖 transport 合同。 */ const authority=Object.freeze({scope:`${origin.origin}/projects/${encodeURIComponent(options.project??'endoleap')}/${path}`,async resolve(id:Id,signal:AbortSignal){if(!uuid.test(id))throw fault('invalid_resource_id');const response=await options.transport({method:'GET',path:`${path}/metadata/${encodeURIComponent(id)}`,signal}),raw=object(response.body);if(response.status!==200)throw fault(typeof raw.error==='string'?raw.error:'asset_authorization_failed');if(raw.metadata_version!==1)throw fault('asset_metadata_interpreter_unavailable');const value={version:1 as const,authority:authority.scope,digest:raw.sha256 as string,asset:raw.asset as StoredAsset};validateSharedAsset(value);if(value.asset.id!==id||value.asset.url!==sourceURL(id))throw fault('asset_authorization_mismatch');return freeze(value);},async read(id:Id,signal:AbortSignal){if(!uuid.test(id))throw fault('invalid_resource_id');const response=await options.transport({method:'GET',path:`${path}/${encodeURIComponent(id)}`,signal,responseFormat:'asset-bytes-v1'});if(response.status!==200||!response.bytes)throw fault('asset_bytes_unavailable');return response.bytes;}}); // 默认显示地址走同源预览代理;upload/query只委托统一执行器,不复制另一套任务状态。 - return Object.freeze({ authority, sourceURL, displayURL: options.displayURL ?? ((id: Id) => `/api/foundry/${path}/${encodeURIComponent(id)}?variant=preview`), accept, + return Object.freeze({ authority, sourceURL, displayURL: options.displayURL ?? ((id: Id) => `/api/bedrock/${path}/${encodeURIComponent(id)}?variant=preview`), accept, upload: (request: FrozenRequest, bytes: Blob, signal: AbortSignal) => execute(request, bytes, signal), query: (request: FrozenRequest, signal: AbortSignal) => execute(request, undefined, signal), }); diff --git a/src/lib/canvas-service/foundry.ts b/src/lib/canvas-service/foundry.ts index 77084da..77068ff 100644 --- a/src/lib/canvas-service/foundry.ts +++ b/src/lib/canvas-service/foundry.ts @@ -47,7 +47,7 @@ export function createFoundryTransport(options: { accountId: Id; isCurrentIdenti if (!options.isCurrentIdentity()) throw fault('identity_changed'); if (input.expectedVersion !== undefined && (!Number.isSafeInteger(input.expectedVersion) || input.expectedVersion < 1)) throw fault('invalid_server_version'); // 禁止缓存和重定向,按表示设置 Accept;FormData 的 boundary 交给浏览器,不能强写 JSON Content-Type。 - const response = await requestFetch(`${options.basePath ?? '/api/foundry/'}${input.path}`, { method: input.method, body: input.body, signal: input.signal, credentials: 'same-origin', cache: 'no-store', redirect: 'error', headers: { + const response = await requestFetch(`${options.basePath ?? '/api/bedrock/'}${input.path}`, { method: input.method, body: input.body, signal: input.signal, credentials: 'same-origin', cache: 'no-store', redirect: 'error', headers: { Accept: input.responseFormat==='canvas-v2'?'application/vnd.foundry.canvas+json;version=2':input.responseFormat==='model-stream-v1'?modelStreamType:input.responseFormat==='asset-bytes-v1'?'image/*':'application/json', ...(input.body instanceof FormData ? {} : { 'Content-Type': 'application/json' }), ...(input.resourceId ? { 'X-Resource-Id': input.resourceId } : {}), 'X-Expected-Account': options.accountId, ...(input.requestId ? { 'Idempotency-Key': input.requestId } : {}), ...(input.expectedVersion !== undefined ? { 'If-Match': `"${input.expectedVersion}"` } : {}), } }); if (!options.isCurrentIdentity()) { await response.body?.cancel(); throw fault('identity_changed'); } diff --git a/src/lib/canvas-v2.ts b/src/lib/canvas-v2.ts index ff7bc41..77280c8 100644 --- a/src/lib/canvas-v2.ts +++ b/src/lib/canvas-v2.ts @@ -101,9 +101,9 @@ export function decodeNodeExtensions(data: Record, schema: numb * 内联、demo或其它地址原样返回,不把任意HTTPS资源都伪装成受管资源。 */ export function managedImageSource(src?: string, preview = false) { if (!src) return src; - // 此兼容路径固定项目名 endoleap,不读取 NEXT_PUBLIC_FOUNDRY_PROJECT;命中后舍弃原查询/片段。 + // 此兼容路径固定项目名 endoleap,不读取 NEXT_PUBLIC_BEDROCK_PROJECT;命中后舍弃原查询/片段。 try { const url = new URL(src); const match = url.pathname.match(/^\/projects\/endoleap\/(workspaces\/[A-Za-z0-9_-]+\/assets\/[A-Za-z0-9_-]+)$/); - if (url.origin === "https://api.foundry.entroia.com" && match) return "/api/foundry/" + match[1] + (preview ? "?variant=preview" : ""); + if (url.origin === "https://api.foundry.entroia.com" && match) return "/api/bedrock/" + match[1] + (preview ? "?variant=preview" : ""); } catch { /* inline and demo images are already browser-readable */ } return src; } diff --git a/tests/api-smoke.mjs b/tests/api-smoke.mjs index 9a0a02e..f7b2936 100644 --- a/tests/api-smoke.mjs +++ b/tests/api-smoke.mjs @@ -132,7 +132,7 @@ const app = spawn( ], { cwd: fileURLToPath(new URL("../", import.meta.url)), - env: { ...process.env, FOUNDRY_API_ORIGIN: "http://127.0.0.1:" + port }, + env: { ...process.env, BEDROCK_API_ORIGIN: "http://127.0.0.1:" + port }, stdio: ["ignore", "pipe", "pipe"], }, ); @@ -188,7 +188,7 @@ try { } assert.equal((await fetch(host + "/missing-page")).status, 404); // 登录代理必须去掉响应体 token,改设 HttpOnly/SameSite cookie,并报告上游计时。 - const res = await fetch(host + "/api/foundry/auth/login", { + const res = await fetch(host + "/api/bedrock/auth/login", { method: "POST", headers: { "Content-Type": "application/json", Origin: host }, body: "{}", @@ -207,7 +207,7 @@ try { // 2500ms 的 Promise.race 只限制 fetch 返回响应头,后面的 reader.read 不在该 deadline 内,不能据此声称首块也受同一计时约束。 let streamTimer; try { - const streamed = await Promise.race([fetch(host + "/api/foundry/workspaces/space/materials/stream-board/canvas", { headers: { Cookie: session } }), new Promise((_, reject) => { streamTimer = setTimeout(() => reject(new Error("Snapshot proxy buffered the body")), 2500); })]); + const streamed = await Promise.race([fetch(host + "/api/bedrock/workspaces/space/materials/stream-board/canvas", { headers: { Cookie: session } }), new Promise((_, reject) => { streamTimer = setTimeout(() => reject(new Error("Snapshot proxy buffered the body")), 2500); })]); assert.equal(streamed.headers.get("etag"), '\"1\"'); assert.equal(streamed.headers.get("x-canvas-schema-version"), "2"); assert.match(streamed.headers.get("server-timing"), /upstream;dur=.*proxy_headers;dur=/); assert.ok(streamed.headers.get("set-cookie")?.includes("HttpOnly")); @@ -217,27 +217,27 @@ try { assert.equal(JSON.parse(raw).document.schema_version, 2); } finally { clearTimeout(streamTimer); releaseStream(); } // 子命令循环只检查头透传;随后检查资源 variant、目录分页与 AI 查询参数白名单。 - const v2Base = host + "/api/foundry/workspaces/space/materials/foundry-generated-id/canvas"; + const v2Base = host + "/api/bedrock/workspaces/space/materials/foundry-generated-id/canvas"; const idem = "11111111-1111-4111-8111-111111111111"; for (const path of ["connections", "subgraphs", "subgraphs/migrate", "subgraphs/frame-1/members", "subgraphs/frame-1/dissolve", "transactions/tx-1/undo", "ai/runs", "ai/runs/run-1/cancel", "ai/runs/run-1/apply"]) { const response = await fetch(v2Base + "/" + path, { method: "POST", headers: { Cookie: session, Origin: host, "Content-Type": "application/json", "Idempotency-Key": idem, "If-Match": '\"7\"' }, body: "{}" }); assert.equal(response.status, 200, path); const echo = await response.json(); assert.equal(echo.key, idem); assert.equal(echo.version, '\"7\"'); assert.equal(echo.accept, "application/vnd.foundry.canvas+json;version=2"); } - const preview = await fetch(host + "/api/foundry/workspaces/space/assets/image?variant=preview", { headers: { Cookie: session } });assert.equal(preview.status,200);assert.equal(preview.headers.get("x-asset-variant"),"preview");await preview.arrayBuffer(); - const directoryResponse = await (await fetch(host + "/api/foundry/workspaces/space/materials?kind=board&sort=modified&include_subgraphs=true&limit=100&offset=100", { headers: { Cookie: session } })).json(); + const preview = await fetch(host + "/api/bedrock/workspaces/space/assets/image?variant=preview", { headers: { Cookie: session } });assert.equal(preview.status,200);assert.equal(preview.headers.get("x-asset-variant"),"preview");await preview.arrayBuffer(); + const directoryResponse = await (await fetch(host + "/api/bedrock/workspaces/space/materials?kind=board&sort=modified&include_subgraphs=true&limit=100&offset=100", { headers: { Cookie: session } })).json(); const directoryQuery = new URL(directoryResponse.url, "http://mock").searchParams; assert.equal(directoryQuery.get("include_subgraphs"), "true"); assert.equal(directoryQuery.get("offset"), "100"); const events = await (await fetch(v2Base + "/ai/runs/run-1?after_seq=12&limit=100&status=active&include_descendants=true&cursor=cursor&secret=drop", { headers: { Cookie: session } })).json(); const query = new URL(events.url, "http://mock").searchParams; assert.equal(query.get("after_seq"), "12"); assert.equal(query.get("include_descendants"), "true"); assert.equal(query.get("cursor"), "cursor"); assert.equal(query.get("secret"), null); // 验证慢 body 完整读取和 trace 标识,再检查资源认证、MIME 拒绝、nosniff 与 multipart 转发。 - const slowSnapshot = await fetch(host + "/api/foundry/workspaces/space/materials/slow-body-board/canvas", { headers: { Cookie: session } }); + const slowSnapshot = await fetch(host + "/api/bedrock/workspaces/space/materials/slow-body-board/canvas", { headers: { Cookie: session } }); assert.ok(slowSnapshot.headers.get("x-canvas-trace-id")); assert.equal((await slowSnapshot.json()).version, 210, "A valid body can finish after the old 15-second total deadline"); - const asset = await fetch(host + "/api/foundry/workspaces/space/assets/image-1", { headers: { Cookie: session } }); + const asset = await fetch(host + "/api/bedrock/workspaces/space/assets/image-1", { headers: { Cookie: session } }); assert.equal(asset.status, 200); assert.equal(asset.headers.get("content-type"), "image/png"); assert.equal(asset.headers.get("x-content-type-options"), "nosniff"); assert.ok(asset.headers.get("set-cookie")?.includes("HttpOnly")); assert.equal((await asset.arrayBuffer()).byteLength, 8); - assert.equal((await fetch(host + "/api/foundry/workspaces/space/assets/image-1")).status, 401); - assert.equal((await fetch(host + "/api/foundry/workspaces/space/assets/bad", { headers: { Cookie: session } })).status, 502); + assert.equal((await fetch(host + "/api/bedrock/workspaces/space/assets/image-1")).status, 401); + assert.equal((await fetch(host + "/api/bedrock/workspaces/space/assets/bad", { headers: { Cookie: session } })).status, 502); const form = new FormData(); form.set("image", new Blob([new Uint8Array([137,80,78,71])], { type: "image/png" }), "test.png"); - const upload = await (await fetch(host + "/api/foundry/workspaces/space/assets", { method: "POST", headers: { Cookie: session, Origin: host, "Idempotency-Key": idem }, body: form })).json(); + const upload = await (await fetch(host + "/api/bedrock/workspaces/space/assets", { method: "POST", headers: { Cookie: session, Origin: host, "Idempotency-Key": idem }, body: form })).json(); // 这里只核对 multipart Content-Type、image 字段标记及幂等键;未解析 multipart,也未逐字节比较上传文件内容。 assert.match(upload.type, /^multipart\/form-data; boundary=/); assert.equal(upload.key, idem); assert.ok(upload.multipart); // 有效会话首页重定向且不缓存私有结果;dashboard 初始 HTML 不应包含画布或 landing。 @@ -264,29 +264,29 @@ try { assert.equal( ( - await fetch(host + "/api/foundry/profile", { + await fetch(host + "/api/bedrock/profile", { headers: { Cookie: session }, }) ).status, 200, ); - assert.equal((await fetch(host + "/api/foundry/profile")).status, 401); + assert.equal((await fetch(host + "/api/bedrock/profile")).status, 401); // 续期只接受有效剩余秒数;非法上游值和无效会话不应产生新的 Set-Cookie。 mockSessionSeconds = "3600"; - const renewed = await fetch(host + "/api/foundry/profile", { headers: { Cookie: session } }); + const renewed = await fetch(host + "/api/bedrock/profile", { headers: { Cookie: session } }); assert.equal(renewed.status, 200); assert.match(renewed.headers.get("set-cookie") || "", /Max-Age=3600/); assert.match(renewed.headers.get("set-cookie") || "", /HttpOnly/); mockSessionSeconds = "garbage"; - const malformedRenewal = await fetch(host + "/api/foundry/profile", { headers: { Cookie: session } }); + const malformedRenewal = await fetch(host + "/api/bedrock/profile", { headers: { Cookie: session } }); assert.equal(malformedRenewal.headers.get("set-cookie"), null); mockSessionSeconds = "2592000"; - const expiredSession = await fetch(host + "/api/foundry/profile", { headers: { Cookie: "foundry_session=expired" } }); + const expiredSession = await fetch(host + "/api/bedrock/profile", { headers: { Cookie: "foundry_session=expired" } }); assert.equal(expiredSession.status, 401); assert.equal(expiredSession.headers.get("set-cookie"), null); // 读取头像再修改公开资料,确认未涉及的头像字段保持。 - const profile = await (await fetch(host + "/api/foundry/profile", { headers: { Cookie: session } })).json(); + const profile = await (await fetch(host + "/api/bedrock/profile", { headers: { Cookie: session } })).json(); assert.equal(profile.avatar_url, "https://lh3.googleusercontent.com/test-avatar=s96-c"); - const updated = await fetch(host + "/api/foundry/profile", { + const updated = await fetch(host + "/api/bedrock/profile", { method: "PATCH", headers: { "Content-Type": "application/json", Cookie: session, Origin: host }, body: JSON.stringify({ username: "test", display_name: "Updated name" }), @@ -297,7 +297,7 @@ try { assert.equal(updatedProfile.avatar_url, profile.avatar_url); // 经真实代理创建、读取和重命名内存图谱,检查服务分配身份、内容保留和元信息版本递增。 - const create = await fetch(host + "/api/foundry/workspaces/space/materials", { + const create = await fetch(host + "/api/bedrock/workspaces/space/materials", { method: "POST", headers: { "Content-Type": "application/json", Cookie: session, Origin: host }, body: JSON.stringify({ kind: "board", title: "未命名图谱", content: { schema_version: 1 } }), @@ -305,18 +305,18 @@ try { assert.equal(create.status, 201); const graph = await create.json(); assert.deepEqual(graph, { id: "foundry-generated-id", workspace_id: "space", kind: "board", version: 1 }); - const opened = await fetch(host + `/api/foundry/workspaces/${graph.workspace_id}/materials/${graph.id}`, { headers: { Cookie: session } }); + const opened = await fetch(host + `/api/bedrock/workspaces/${graph.workspace_id}/materials/${graph.id}`, { headers: { Cookie: session } }); assert.equal(opened.status, 200); const stored = await opened.json(); assert.equal(stored.title, "未命名图谱"); assert.equal(stored.workspace_id, "space"); assert.equal(stored.content.schema_version, 1); - const rename = await fetch(host + `/api/foundry/workspaces/${graph.workspace_id}/materials/${graph.id}`, { + const rename = await fetch(host + `/api/bedrock/workspaces/${graph.workspace_id}/materials/${graph.id}`, { method: "PATCH", headers: { "Content-Type": "application/json", Cookie: session, Origin: host, "If-Match": '"1"' }, body: JSON.stringify({ title: "改名后的图谱", description: "", content: stored.content }), }); assert.equal(rename.status, 204); - const renamed = await (await fetch(host + `/api/foundry/workspaces/${graph.workspace_id}/materials/${graph.id}`, { headers: { Cookie: session } })).json(); + const renamed = await (await fetch(host + `/api/bedrock/workspaces/${graph.workspace_id}/materials/${graph.id}`, { headers: { Cookie: session } })).json(); assert.equal(renamed.title, "改名后的图谱"); assert.equal(renamed.version, 2); assert.deepEqual(renamed.content, stored.content); @@ -324,14 +324,14 @@ try { // workspace/board 各自使用 ID 或 slug 的四种组合都应定位同一图谱和独立画布版本。 // 替身通过 canonical 字符串替换提供该映射;此处验证代理接受四种路径,不验证真实 Foundry 的 slug 解析实现。 for (const workspace of ["space", "creative-space"]) for (const board of ["foundry-generated-id", "my-board"]) { - const path = `/api/foundry/workspaces/${workspace}/materials/${board}`; + const path = `/api/bedrock/workspaces/${workspace}/materials/${board}`; const material = await (await fetch(host + path, { headers: { Cookie: session } })).json(); assert.equal(material.id, "foundry-generated-id"); assert.equal(material.slug, "my-board"); const snapshot = await fetch(host + path + "/canvas", { headers: { Cookie: session } }); assert.equal(snapshot.status, 200); assert.equal(snapshot.headers.get("etag"), '"1"'); assert.equal((await snapshot.json()).version, 1); } - const canvasPath = "/api/foundry/workspaces/creative-space/materials/my-board/canvas"; + const canvasPath = "/api/bedrock/workspaces/creative-space/materials/my-board/canvas"; // 生成超过 1 MiB 的完整快照经代理保存/恢复,再用旧版本重发检查 412;不是增量或大文件性能测试。 const largeDocument = { schema_version: 1, nodes: Array.from({ length: 15 }, (_, index) => ({ id: "text-" + index, type: "material", position: { x: index * 300, y: 100 }, width: 260, height: 200, data: { kind: "text", title: "保存测试", text: "x".repeat(90000), fontSize: 24, rotation: 30, textStyle: { bold: true, color: "#123456" } } })), edges: [], viewport: { x: 20, y: 40, zoom: 0.75 } }; const savedCanvas = await fetch(host + canvasPath, { method: "PATCH", headers: { Cookie: session, Origin: host, "Content-Type": "application/json", "If-Match": '"1"' }, body: JSON.stringify({ document: largeDocument }) }); @@ -354,7 +354,7 @@ try { assert.equal(restored.document.nodes[1].data.frameId, "frame-1"); } assert.equal((await fetch(host + canvasPath)).status, 401); - assert.equal((await fetch(host + "/api/foundry/workspaces/space/search/my-board/canvas")).status, 404); + assert.equal((await fetch(host + "/api/bedrock/workspaces/space/search/my-board/canvas")).status, 404); // 超过画布 body 上限的请求必须返回 413,不能转成成功保存。 const oversizedCanvas = await fetch(host + canvasPath, { method: "PATCH", headers: { Cookie: session, "Content-Type": "application/json" }, body: JSON.stringify({ document: "x".repeat(5 * 1024 * 1024) }) }); assert.equal(oversizedCanvas.status, 413); @@ -364,7 +364,7 @@ try { for (const origin of ["https://example.com", "null"]) assert.equal( ( - await fetch(host + "/api/foundry/auth/login", { + await fetch(host + "/api/bedrock/auth/login", { method: "POST", headers: { Origin: origin, "Content-Type": "application/json" }, body: "{}", @@ -372,27 +372,27 @@ try { ).status, 403, ); - assert.equal((await fetch(host + "/api/foundry/unlisted")).status, 404); + assert.equal((await fetch(host + "/api/bedrock/unlisted")).status, 404); assert.equal( (await fetch(host + "/api/oauth/slack?challenge=bad")).status, 400, ); assert.equal(res.headers.get("cache-control"), "no-store"); - const secure = await fetch(host + "/api/foundry/auth/login", { + const secure = await fetch(host + "/api/bedrock/auth/login", { method: "POST", headers: { "Content-Type": "application/json", "X-Forwarded-Proto": "https" }, body: "{}", }); assert.match(secure.headers.get("set-cookie"), /; Secure/); for (const [body, status] of [["{", 400], [JSON.stringify({ text: "x".repeat(1024 * 1024) }), 413]]) { - const invalid = await fetch(host + "/api/foundry/auth/login", { + const invalid = await fetch(host + "/api/bedrock/auth/login", { method: "POST", headers: { "Content-Type": "application/json" }, body, }); assert.equal(invalid.status, status); } - assert.equal((await fetch(host + "/api/foundry/profile", { method: "PUT" })).status, 405); + assert.equal((await fetch(host + "/api/bedrock/profile", { method: "PUT" })).status, 405); // 查询保留 kind/limit 而删除未许可 secret;此处使用替身回显观察最终上游路径。 - const materials = await fetch(host + "/api/foundry/workspaces/space/materials?kind=board&limit=100&secret=drop", { + const materials = await fetch(host + "/api/bedrock/workspaces/space/materials?kind=board&limit=100&secret=drop", { method: "PATCH", headers: { "Content-Type": "application/json" }, body: "{}", }); assert.deepEqual(await materials.json(), { @@ -405,7 +405,7 @@ try { assert.equal(redirect.headers.get("location"), `http://127.0.0.1:${port}/projects/endoleap/auth/${provider}?challenge=${"a".repeat(43)}`); } // 登出保持 204 空体并清除 cookie;下方 PASS 长文是摘要,实际覆盖以逐项断言为准。 - const logout = await fetch(host + "/api/foundry/auth/logout", { + const logout = await fetch(host + "/api/bedrock/auth/logout", { method: "POST", headers: { "Content-Type": "application/json", Cookie: session }, body: "{}", }); assert.equal(logout.status, 204); diff --git a/tests/canvas-assets.test.mjs b/tests/canvas-assets.test.mjs index 517b5a1..4a3d0da 100644 --- a/tests/canvas-assets.test.mjs +++ b/tests/canvas-assets.test.mjs @@ -35,6 +35,6 @@ test('uncertain upload retries the exact bytes with the same idempotency key',as // 受管原始 URL 转同源认证代理,preview 仅加显示变体参数;普通外部图片地址保持原样。 // 这里仅比对字符串,不请求代理,也不验证登录鉴权或预览图片内容。 test('preview URLs are renderer-only and do not replace original managed references',()=>{ - assert.equal(managedImageSource(asset.url),`/api/foundry/workspaces/w/assets/${id}`);assert.equal(managedImageSource(asset.url,true),`/api/foundry/workspaces/w/assets/${id}?variant=preview`); + assert.equal(managedImageSource(asset.url),`/api/bedrock/workspaces/w/assets/${id}`);assert.equal(managedImageSource(asset.url,true),`/api/bedrock/workspaces/w/assets/${id}?variant=preview`); assert.equal(managedImageSource('https://example.com/photo.png',true),'https://example.com/photo.png'); }); diff --git a/tests/canvas-ui-check.mjs b/tests/canvas-ui-check.mjs index 8f5ae84..5666b45 100644 --- a/tests/canvas-ui-check.mjs +++ b/tests/canvas-ui-check.mjs @@ -55,7 +55,7 @@ globalThis.ResizeObserver = window.ResizeObserver = class { let apiMock = null; const requests = []; globalThis.fetch = async (url, options) => { - if (apiMock && String(url).startsWith("/api/foundry/")) return apiMock(url, options); + if (apiMock && String(url).startsWith("/api/bedrock/")) return apiMock(url, options); requests.push(String(url)); assert.ok(String(url).startsWith("/canvas-icons/"), `Unexpected network request ${url}`); if (options?.signal?.aborted) throw new DOMException("Aborted", "AbortError"); diff --git a/tests/canvas-v2-scenario.mjs b/tests/canvas-v2-scenario.mjs index f944836..56eca5f 100644 --- a/tests/canvas-v2-scenario.mjs +++ b/tests/canvas-v2-scenario.mjs @@ -168,7 +168,7 @@ export async function canvasV2Scenario({root,act,h,GraphCanvas,window,makeCanvas assert.ok(document.querySelector('[aria-label="AI 模型"]').textContent.includes('测试图片模型'),'Sticky AI mode selects models for the newly selected image'); assert.ok(!document.querySelector('[aria-label="AI 模型"]').textContent.includes('测试文本模型')); await event(document.querySelector('[aria-label="执行 AI"]'),'click'); - await waitUntil(()=>document.querySelector('.react-flow__node[data-id="image-target"] img')?.getAttribute('src')==='/api/foundry/workspaces/w/assets/generated-image?variant=preview','managed AI image result'); + await waitUntil(()=>document.querySelector('.react-flow__node[data-id="image-target"] img')?.getAttribute('src')==='/api/bedrock/workspaces/w/assets/generated-image?variant=preview','managed AI image result'); const generated=records.get(parent).document.nodes.find(node=>node.id==='image-target');assert.equal(generated.width,image.width);assert.equal(generated.height,image.height);assert.equal(generated.data.title,'图片目标'); await waitUntil(()=>document.querySelector('[aria-label="执行 AI"]'),'image run terminal UI'); await event(document.querySelector('[aria-label="执行 AI"]'),'click'); diff --git a/tests/canvas-v2.test.mjs b/tests/canvas-v2.test.mjs index cf69732..7f4a0c1 100644 --- a/tests/canvas-v2.test.mjs +++ b/tests/canvas-v2.test.mjs @@ -70,7 +70,7 @@ test('eight-direction resize is free by default in resize mode and Shift locks t }); // 受管资产显示转认证同源代理,普通外部 URL 保留;这里只检查地址转换,不验证实际认证请求。 test('managed assets render through the authenticated same-origin proxy',()=>{ - assert.equal(managedImageSource('https://api.foundry.entroia.com/projects/endoleap/workspaces/w/assets/a'),'/api/foundry/workspaces/w/assets/a');assert.equal(managedImageSource('https://example.com/a.png'),'https://example.com/a.png'); + assert.equal(managedImageSource('https://api.foundry.entroia.com/projects/endoleap/workspaces/w/assets/a'),'/api/bedrock/workspaces/w/assets/a');assert.equal(managedImageSource('https://example.com/a.png'),'https://example.com/a.png'); }); // 连线持久 owner 是最低共同祖先,事务参与者恰为两条 owner 路径的并集;祖先本身不需要重复登记。 diff --git a/tests/headless/asset-service.test.mjs b/tests/headless/asset-service.test.mjs index 7b935a2..f76db43 100644 --- a/tests/headless/asset-service.test.mjs +++ b/tests/headless/asset-service.test.mjs @@ -41,7 +41,7 @@ test('asset adapter preserves byte identity and headers and validates the scoped test('a headless host supplies display URLs without changing canonical asset identity or authority',async()=>{ const options={workspaceId:id(4),transport:async()=>{throw Error('display routing must not make a request');}}; const browser=createFoundryAssets(options),host=createFoundryAssets({...options,displayURL:asset=>`https://host.example/preview/${encodeURIComponent(asset)}`}); - assert.equal(browser.displayURL(id(1)),`/api/foundry/workspaces/${id(4)}/assets/${id(1)}?variant=preview`); + assert.equal(browser.displayURL(id(1)),`/api/bedrock/workspaces/${id(4)}/assets/${id(1)}?variant=preview`); assert.equal(host.displayURL(id(1)),`https://host.example/preview/${id(1)}`); assert.equal(host.sourceURL(id(1)),browser.sourceURL(id(1)));assert.equal(host.authority.scope,browser.authority.scope); }); diff --git a/tests/headless/proxy.integration.mjs b/tests/headless/proxy.integration.mjs index c4f3719..faa635c 100644 --- a/tests/headless/proxy.integration.mjs +++ b/tests/headless/proxy.integration.mjs @@ -36,7 +36,7 @@ const reservation=createServer();await new Promise(resolve=>reservation.listen(0 let next,logs='',launchError; try{ // 复制实际 route 及它依赖的响应/会话模块;临时页面仅满足 Next 项目结构,不替换被测 route。 - for(const filename of ['package.json','tsconfig.json','src/app/api/foundry/[...path]/route.ts','src/app/api/bedrock/[...path]/route.ts','src/lib/canvas-response.ts','src/lib/session-cookie.ts']){ + for(const filename of ['package.json','tsconfig.json','src/app/api/bedrock/[...path]/route.ts','src/lib/canvas-response.ts','src/lib/session-cookie.ts']){ const target=join(directory,filename);await mkdir(resolve(target,'..'),{recursive:true});await copyFile(join(source,filename),target); } // 复用当前依赖树而不重新安装,临时项目的源码和编译目录与主项目分开。 @@ -44,62 +44,59 @@ try{ await writeFile(join(directory,'src/app/layout.tsx'),'export default function Layout({children}:{children:React.ReactNode}){return {children}}'); await writeFile(join(directory,'src/app/page.tsx'),'export default function Page(){return
Proxy verification fixture
}'); // 显式运行 webpack 开发服务器并指向本地上游,detached 便于 finally 按进程组清理。 - next=spawn(process.execPath,[join(source,'node_modules/next/dist/bin/next'),'dev','--webpack','--hostname','127.0.0.1','--port',String(port)],{cwd:directory,detached:true,env:{...process.env,NEXT_TELEMETRY_DISABLED:'1',FOUNDRY_API_ORIGIN:`http://127.0.0.1:${upstream.address().port}`,NEXT_PUBLIC_FOUNDRY_PROJECT:'legacy-fixture',NEXT_PUBLIC_BEDROCK_PROJECT:'fixture'},stdio:['ignore','pipe','pipe']}); + next=spawn(process.execPath,[join(source,'node_modules/next/dist/bin/next'),'dev','--webpack','--hostname','127.0.0.1','--port',String(port)],{cwd:directory,detached:true,env:{...process.env,NEXT_TELEMETRY_DISABLED:'1',BEDROCK_API_ORIGIN:`http://127.0.0.1:${upstream.address().port}`,NEXT_PUBLIC_BEDROCK_PROJECT:'fixture'},stdio:['ignore','pipe','pipe']}); // 只保留最后 12000 字符日志;启动失败和退出必须被 readiness 循环识别。 next.stdout.on('data',chunk=>{logs=(logs+chunk).slice(-12000)});next.stderr.on('data',chunk=>{logs=(logs+chunk).slice(-12000)});next.on('error',error=>{launchError=error}); // 最多 90 次探测,单次请求超时 1.5 秒、失败间隔 250 毫秒;只有实际代理返回 200 才开始断言。 let ready=false; for(let attempt=0;attempt<90;attempt++){ if(launchError)throw launchError;if(next.exitCode!==null)throw new Error('Next exited during startup:\n'+logs); - try{const response=await fetch(`http://127.0.0.1:${port}/api/foundry/profile`,{signal:AbortSignal.timeout(1500)});await response.text();if(response.status===200){ready=true;break}}catch{} + try{const response=await fetch(`http://127.0.0.1:${port}/api/bedrock/profile`,{signal:AbortSignal.timeout(1500)});await response.text();if(response.status===200){ready=true;break}}catch{} await pause(250); } if(!ready)throw new Error('Next did not become ready:\n'+logs); - const bedrockProfile=await fetch(`http://127.0.0.1:${port}/api/bedrock/profile`,{signal:AbortSignal.timeout(15000)}); - assert.equal(bedrockProfile.status,200); - assert.deepEqual(await bedrockProfile.json(),{id:'fixture'}); - assert.deepEqual(received.slice(-2).map(request=>request.path),['/projects/fixture/profile','/projects/fixture/profile']); + assert.equal(received.at(-1)?.path,'/projects/fixture/profile'); // 规范文档操作路径使用固定 workspace/material,后续从它推导资产及 AI 路由。 const path='workspaces/10000000-0000-4000-8000-000000000003/materials/10000000-0000-4000-8000-000000000001/canvas/model/operations'; // 1.1 MB 请求超过通用 1 MiB 上限但低于规范文档专用 5 MiB 上限,专门覆盖该路由的体积策略。 const body=' {\n "protocol_version":2,"request_id":"'+key+'","fixture":"'+ 'x'.repeat(1100000)+'"\n} '; // 发送超过通用限制但低于文档专用限制的原始 body,核对上游状态码及终态回执字节不变。 - const response=await fetch(`http://127.0.0.1:${port}/api/foundry/${path}`,{method:'POST',body,headers:{'Content-Type':'application/json','Idempotency-Key':key,'X-Expected-Account':account,Cookie:'foundry_session=fixture-session',Origin:`http://127.0.0.1:${port}`},signal:AbortSignal.timeout(20000)}); + const response=await fetch(`http://127.0.0.1:${port}/api/bedrock/${path}`,{method:'POST',body,headers:{'Content-Type':'application/json','Idempotency-Key':key,'X-Expected-Account':account,Cookie:'foundry_session=fixture-session',Origin:`http://127.0.0.1:${port}`},signal:AbortSignal.timeout(20000)}); assert.equal(response.status,409);assert.equal(await response.text(),responseBytes); // 从上游记录检查 body、幂等键、预期账户,以及 session cookie 转成 Bearer 的实际结果。 const request=received.find(item=>item.path.endsWith('/model/operations')); assert.ok(request);assert.equal(request.body.toString(),body);assert.equal(request.headers['idempotency-key'],key);assert.equal(request.headers['x-expected-account'],account);assert.equal(request.headers.authorization,'Bearer fixture-session'); // 资产回执和元数据是 JSON 路径;元数据还检查身份传递与 no-store,避免误走图片 body 验证。 const receiptPath=`workspaces/10000000-0000-4000-8000-000000000003/assets/operations/${key}`; - const assetReceipt=await fetch(`http://127.0.0.1:${port}/api/foundry/${receiptPath}`);assert.equal(assetReceipt.status,200);assert.deepEqual(await assetReceipt.json(),{id:'fixture'}); - const metadata=await fetch(`http://127.0.0.1:${port}/api/foundry/${receiptPath.replace('/operations/','/metadata/')}`,{headers:{'X-Expected-Account':account,Cookie:'foundry_session=fixture-session'}});assert.equal(metadata.status,200);assert.deepEqual(await metadata.json(),{id:'fixture'});assert.match(metadata.headers.get('cache-control'),/no-store/);const metadataRequest=received.find(item=>item.path.includes('/assets/metadata/'));assert.equal(metadataRequest.headers['x-expected-account'],account);assert.equal(metadataRequest.headers.authorization,'Bearer fixture-session'); + const assetReceipt=await fetch(`http://127.0.0.1:${port}/api/bedrock/${receiptPath}`);assert.equal(assetReceipt.status,200);assert.deepEqual(await assetReceipt.json(),{id:'fixture'}); + const metadata=await fetch(`http://127.0.0.1:${port}/api/bedrock/${receiptPath.replace('/operations/','/metadata/')}`,{headers:{'X-Expected-Account':account,Cookie:'foundry_session=fixture-session'}});assert.equal(metadata.status,200);assert.deepEqual(await metadata.json(),{id:'fixture'});assert.match(metadata.headers.get('cache-control'),/no-store/);const metadataRequest=received.find(item=>item.path.includes('/assets/metadata/'));assert.equal(metadataRequest.headers['x-expected-account'],account);assert.equal(metadataRequest.headers.authorization,'Bearer fixture-session'); console.log('PASS asset metadata JSON uses the actual authenticated Next proxy without image-body validation or caching'); // FormData 自带 boundary;下面核对文件内容片段、Content-Type 和资源/幂等身份头,未逐字节比较整份 multipart 包。 const multipart=new FormData();multipart.append('image',new Blob(['immutable file'],{type:'image/png'}),'fixture.png'); const assetPath=receiptPath.split('/operations/')[0],resourceId='10000000-0000-4000-8000-000000000006'; - const uploaded=await fetch(`http://127.0.0.1:${port}/api/foundry/${assetPath}`,{method:'POST',body:multipart,headers:{'X-Resource-Id':resourceId,'Idempotency-Key':key,'X-Expected-Account':account}});await uploaded.text();assert.equal(uploaded.status,200); + const uploaded=await fetch(`http://127.0.0.1:${port}/api/bedrock/${assetPath}`,{method:'POST',body:multipart,headers:{'X-Resource-Id':resourceId,'Idempotency-Key':key,'X-Expected-Account':account}});await uploaded.text();assert.equal(uploaded.status,200); const upload=received.find(item=>item.path.endsWith('/assets'));assert.equal(upload.headers['x-resource-id'],resourceId);assert.equal(upload.headers['idempotency-key'],key);assert.match(upload.body.toString(),/immutable file/);assert.match(upload.headers['content-type'],/^multipart\/form-data; boundary=/); console.log('PASS asset receipt JSON and multipart resource identity cross the actual Next proxy'); // AI 受理同样保留冻结 JSON 空白、幂等键和 If-Match,并协商 canvas v2;查询回执与事件游标单独检查。 const aiPath=path.replace('/model/operations','/ai/runs'); const frozenAI=' {\n "protocol_version":2,"request_id":"'+key+'","prompt":"保留请求字节" } '; - const aiResponse=await fetch(`http://127.0.0.1:${port}/api/foundry/${aiPath}`,{method:'POST',body:frozenAI,headers:{'Content-Type':'application/json','Idempotency-Key':key,'If-Match':'"7"','X-Expected-Account':account,Cookie:'foundry_session=fixture-session'}}); + const aiResponse=await fetch(`http://127.0.0.1:${port}/api/bedrock/${aiPath}`,{method:'POST',body:frozenAI,headers:{'Content-Type':'application/json','Idempotency-Key':key,'If-Match':'"7"','X-Expected-Account':account,Cookie:'foundry_session=fixture-session'}}); await aiResponse.text();assert.equal(aiResponse.status,200); const ai=received.find(item=>item.path.endsWith('/ai/runs')); assert.equal(ai.body.toString(),frozenAI);assert.equal(ai.headers['if-match'],'"7"');assert.equal(ai.headers['idempotency-key'],key);assert.equal(ai.headers['x-expected-account'],account);assert.equal(ai.headers.authorization,'Bearer fixture-session');assert.equal(ai.headers.accept,'application/vnd.foundry.canvas+json;version=2'); - const aiReceipt=await fetch(`http://127.0.0.1:${port}/api/foundry/${aiPath.replace('/runs','/operations')}/${key}`);await aiReceipt.text();assert.equal(aiReceipt.status,200); + const aiReceipt=await fetch(`http://127.0.0.1:${port}/api/bedrock/${aiPath.replace('/runs','/operations')}/${key}`);await aiReceipt.text();assert.equal(aiReceipt.status,200); assert.ok(received.some(item=>item.path.endsWith('/ai/operations/'+key))); - const aiEvents=await fetch(`http://127.0.0.1:${port}/api/foundry/${aiPath}/${key}?after_seq=41&limit=100`);await aiEvents.text();assert.equal(aiEvents.status,200); + const aiEvents=await fetch(`http://127.0.0.1:${port}/api/bedrock/${aiPath}/${key}?after_seq=41&limit=100`);await aiEvents.text();assert.equal(aiEvents.status,200); assert.ok(received.some(item=>item.path.endsWith('/ai/runs/'+key+'?limit=100&after_seq=41'))); console.log('PASS frozen AI bytes, identity, version header, admission receipt and event cursor cross the actual Next proxy'); // 上游尾部仍挂起时读取第一块,随后释放并核对余下字节,验证端到端增量转发。 - const streamed=await fetch(`http://127.0.0.1:${port}/api/foundry/${path.replace('/operations','')}`,{headers:{Accept:'application/vnd.foundry.canvas-model+ndjson;version=1'}}); + const streamed=await fetch(`http://127.0.0.1:${port}/api/bedrock/${path.replace('/operations','')}`,{headers:{Accept:'application/vnd.foundry.canvas-model+ndjson;version=1'}}); assert.equal(streamed.headers.get('content-type'),'application/vnd.foundry.canvas-model+ndjson;version=1'); // 尾部 gate 尚未放开就等待首块,才能区分增量转发和整条缓冲;随后放开并排空剩余 body。 const reader=streamed.body.getReader(),first=await reader.read();assert.equal(new TextDecoder().decode(first.value),streamPrefix);streamRelease();let rest='';while(true){const next=await reader.read();if(next.done)break;rest+=new TextDecoder().decode(next.value);}assert.equal(rest,streamTail);reader.releaseLock(); console.log('PASS negotiated canonical NDJSON and first chunk cross the actual Next proxy before the gated tail'); // 多余路径段应在代理 allowlist 被拒绝,不能发到上游再依赖上游返回错误。 - const before=received.length,invalid=await fetch(`http://127.0.0.1:${port}/api/foundry/${path}/unexpected/extra`,{signal:AbortSignal.timeout(10000)});await invalid.text();assert.equal(invalid.status,404);assert.equal(received.length,before); + const before=received.length,invalid=await fetch(`http://127.0.0.1:${port}/api/bedrock/${path}/unexpected/extra`,{signal:AbortSignal.timeout(10000)});await invalid.text();assert.equal(invalid.status,404);assert.equal(received.length,before); console.log('PASS actual Next proxy preserves frozen request bytes/key/account and raw terminal receipt above 1 MiB'); console.log('PASS canonical route allowlist rejects unexpected paths without contacting the upstream'); }finally{ diff --git a/tests/headless/renderer.integration.mjs b/tests/headless/renderer.integration.mjs index 7b9f649..6fe58a0 100644 --- a/tests/headless/renderer.integration.mjs +++ b/tests/headless/renderer.integration.mjs @@ -216,7 +216,7 @@ module.exports=function(source){return nativeTransform.call(this,source).replace await symlink(join(source, 'node_modules'), join(directory, 'node_modules')); // 统一 Next 子进程启动和日志尾部收集;独立进程组供 finally 一并终止,API origin 指向本次上游。 const launchNext=args=>{ - const child=spawn(process.execPath,[join(source,'node_modules/next/dist/bin/next'),...args],{cwd:directory,detached:true,env:{...process.env,NEXT_TELEMETRY_DISABLED:'1',FOUNDRY_API_ORIGIN:`http://127.0.0.1:${upstream.address().port}`,NEXT_PUBLIC_FOUNDRY_PROJECT:'endoleap'},stdio:['ignore','pipe','pipe']}); + const child=spawn(process.execPath,[join(source,'node_modules/next/dist/bin/next'),...args],{cwd:directory,detached:true,env:{...process.env,NEXT_TELEMETRY_DISABLED:'1',BEDROCK_API_ORIGIN:`http://127.0.0.1:${upstream.address().port}`,NEXT_PUBLIC_BEDROCK_PROJECT:'endoleap'},stdio:['ignore','pipe','pipe']}); child.stdout.on('data',chunk=>{logs=(logs+chunk).slice(-16000);});child.stderr.on('data',chunk=>{logs=(logs+chunk).slice(-16000);});return child; }; let buildMs; @@ -229,7 +229,7 @@ module.exports=function(source){return nativeTransform.call(this,source).replace next=launchNext([productionMode?'start':'dev',...productionMode?[]:[`--${bundler}`],'--hostname','127.0.0.1','--port',String(port)]); // 有界探测真实代理 profile,并检查 Next 提前退出;后续页面等待还会验证应用是否实际可用。 // 循环结束后未另设 ready 断言;120 次都未成功时仍进入浏览器阶段,由后续导航/页面等待暴露未就绪。 - for (let i = 0; i < 120; i++) { if (next.exitCode !== null) throw new Error(logs); try { const r = await fetch(`http://127.0.0.1:${port}/api/foundry/profile`, { signal: AbortSignal.timeout(1000) }); if (r.ok) break; } catch {} await pause(250); } + for (let i = 0; i < 120; i++) { if (next.exitCode !== null) throw new Error(logs); try { const r = await fetch(`http://127.0.0.1:${port}/api/bedrock/profile`, { signal: AbortSignal.timeout(1000) }); if (r.ok) break; } catch {} await pause(250); } // 只保留本次隔离 Chrome 的日志尾部,CHROME_BIN 可覆盖可执行路径,不连接日常 profile。 let browserLogs=''; chrome = spawn(process.env.CHROME_BIN ?? '/Applications/Google Chrome.app/Contents/MacOS/Google Chrome', ['--headless=new', '--no-first-run', '--disable-background-networking', '--disable-component-update', '--remote-debugging-port=0', `--user-data-dir=${profile}`, 'about:blank'], { stdio: ['ignore','ignore','pipe'] });