@jcoder-stack/registry 0.2.1 → 0.3.0

package/auth/server-fns.ts

@@ -16,6 +16,7 @@ import { getRequestHeader, setResponseHeader } from "@tanstack/react-start/serve
 import { z } from "zod";
 import { authMiddleware } from "./middleware";
 import { getAuthRuntime } from "./runtime";
+import { unpackUpload } from "./upload-payload";
 
 /** SSR 一次取数喂两张嘴：config（AppConfigProvider）+ identity（SessionProvider）。 */
 export const getAppStateFn = createServerFn({ method: "GET" })
@@ -87,29 +88,49 @@ const abpRequestSchema = z.object({
   body: z.string().optional(),
 });
 
-/** 业务 API 的唯一请求边界：orval mutator → 此 server fn → 代理网关。 */
+/** 代理调用 + Set-Cookie 落地 + 响应归一，两个请求边界共用。 */
+async function forwardToAbp(
+  req: Parameters<typeof callAbpWithSession>[3],
+  context: { session: Parameters<typeof callAbpWithSession>[1]; cookieHeader: string | null },
+) {
+  const rt = getAuthRuntime();
+  let res: Awaited<ReturnType<typeof callAbpWithSession>>;
+  try {
+    res = await callAbpWithSession(rt, context.session, context.cookieHeader, req);
+  } catch (error) {
+    // 失败也要把过程中刷新出的会话 cookie 落到响应，否则轮换型 IdP 下用户被静默登出。
+    if (error instanceof AbpProxyError && error.setCookies.length > 0)
+      setResponseHeader("Set-Cookie", error.setCookies);
+    throw error;
+  }
+  if (res.setCookies.length > 0) setResponseHeader("Set-Cookie", res.setCookies);
+  return {
+    status: res.status,
+    contentType: res.headers.get("content-type"),
+    body: typeof res.body === "string" ? res.body : undefined,
+    bodyBase64: typeof res.body === "string" ? undefined : toBase64(res.body),
+  };
+}
+
+/** 业务 API 的文本请求边界：orval mutator → 此 server fn → 代理网关。 */
 export const abpRequestFn = createServerFn({ method: "POST" })
   .validator(abpRequestSchema)
   .middleware([authMiddleware])
-  .handler(async ({ data, context }) => {
-    const rt = getAuthRuntime();
-    let res: Awaited<ReturnType<typeof callAbpWithSession>>;
-    try {
-      res = await callAbpWithSession(rt, context.session, context.cookieHeader, data);
-    } catch (error) {
-      // 失败也要把过程中刷新出的会话 cookie 落到响应，否则轮换型 IdP 下用户被静默登出。
-      if (error instanceof AbpProxyError && error.setCookies.length > 0)
-        setResponseHeader("Set-Cookie", error.setCookies);
-      throw error;
-    }
-    if (res.setCookies.length > 0) setResponseHeader("Set-Cookie", res.setCookies);
-    return {
-      status: res.status,
-      contentType: res.headers.get("content-type"),
-      body: typeof res.body === "string" ? res.body : undefined,
-      bodyBase64: typeof res.body === "string" ? undefined : toBase64(res.body),
-    };
-  });
+  .handler(({ data, context }) => forwardToAbp(data, context));
+
+/** 二进制请求边界：multipart 上传与裸字节直传。
+ *
+ *  单独一个 server fn 而非让 `abpRequestFn` 双模：Start 只在**整个** payload 就是 FormData 时
+ *  才走原生 multipart（`data instanceof FormData`），混不进 JSON 对象里。分开还能让文本那条
+ *  路径的 zod schema 一个字不改——所有既有 CRUD 调用不受本次改动影响。
+ *
+ *  刻意不走 base64 塞进 JSON：seroval 对 typed array 的往返在 1MB 就会抛
+ *  `SerovalDeserializationError`，而 base64 成字符串虽能过，10MB 文件要变成 13.3MB 字符串
+ *  再经两端 JSON 解析。原生 multipart 让文件字节全程不进 JSON。 */
+export const abpUploadFn = createServerFn({ method: "POST" })
+  .validator((data: FormData) => data)
+  .middleware([authMiddleware])
+  .handler(async ({ data, context }) => forwardToAbp(await unpackUpload(data), context));
 
 // server fn 边界只序列化 JSON，二进制体转 base64 过桥，abpFetch 端解码还原字节。
 function toBase64(buffer: ArrayBuffer): string {

package/auth/upload-payload.ts

@@ -0,0 +1,76 @@
+import { z } from "zod";
+
+/** 元数据收在单个保留字段里。平铺成 `__path`/`__method`/`__headers` 会把撞名面扩成若干个
+ *  保留字——调用方的表单只要有一个同名字段就会被静默覆盖。 */
+const META_FIELD = "__abp";
+/** 裸字节的落点：multipart 只能承载字段，字节得先包成 Blob 才能过去。 */
+const BYTES_FIELD = "__abpBody";
+
+const metaSchema = z.object({
+  path: z.string(),
+  method: z.string().optional(),
+  headers: z.record(z.string(), z.string()).optional(),
+  kind: z.enum(["form", "bytes"]),
+});
+
+/** 可打包的字节形状。全部可重发——`ReadableStream` 刻意不在其中，它只能消费一次，
+ *  会让代理的 401 重放与幂等重试静默退化成「重放一个空正文」。 */
+export type UploadBytes = Blob | ArrayBuffer | ArrayBufferView;
+/** `packUpload` 收得下的正文形状。 */
+export type UploadPayloadBody = FormData | UploadBytes;
+/** 解包后交给代理的正文形状。 */
+export type UploadBody = FormData | Uint8Array;
+
+export interface UnpackedUpload {
+  path: string;
+  method?: string;
+  headers?: Record<string, string>;
+  body: UploadBody;
+}
+
+/**
+ * 把 path/method/headers 与正文打包成 server fn 能原生传输的 FormData。
+ *
+ * 与 `unpackUpload` 共享字段名约定，两者必须成对修改；单独存在一个模块里正是为了让这份约定
+ * 只有一处真相，且能脱离 TanStack Start 的运行时被测试直接 import。
+ */
+export function packUpload(
+  path: string,
+  method: string | undefined,
+  headers: Record<string, string> | undefined,
+  body: UploadPayloadBody,
+): FormData {
+  const packed = new FormData();
+  const kind = body instanceof FormData ? "form" : "bytes";
+  packed.set(META_FIELD, JSON.stringify({ path, method, headers, kind }));
+  if (body instanceof FormData) {
+    body.forEach((value, name) => {
+      packed.append(name, value);
+    });
+  } else {
+    // TS 5.7 起 ArrayBufferView 带上了 ArrayBufferLike 泛型参数（含 SharedArrayBuffer 背衬），
+    // 而 BlobPart 只认 ArrayBuffer 背衬那支。把泛型参数写进公开类型能消掉这次转换，代价是
+    // 拒掉调用方最常写的裸 `Uint8Array` 标注。与 proxy.ts 里那处同源。
+    packed.set(BYTES_FIELD, new Blob([body as BlobPart]));
+  }
+  return packed;
+}
+
+/** `packUpload` 的逆操作；元字段一律剔除，剩下的才是要发给上游的正文。 */
+export async function unpackUpload(packed: FormData): Promise<UnpackedUpload> {
+  const raw = packed.get(META_FIELD);
+  if (typeof raw !== "string") throw new Error("abp upload: missing meta field");
+  const meta = metaSchema.parse(JSON.parse(raw));
+  packed.delete(META_FIELD);
+  if (meta.kind === "form") {
+    return { path: meta.path, method: meta.method, headers: meta.headers, body: packed };
+  }
+  const blob = packed.get(BYTES_FIELD);
+  if (!(blob instanceof Blob)) throw new Error("abp upload: missing byte body");
+  return {
+    path: meta.path,
+    method: meta.method,
+    headers: meta.headers,
+    body: new Uint8Array(await blob.arrayBuffer()),
+  };
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@jcoder-stack/registry",
   "description": "Copy-in sources for the auth shell and shadcn blocks: login/callback/logout handlers, the callAbp proxy, route guards, and TanStack wiring",
-  "version": "0.2.1",
+  "version": "0.3.0",
   "type": "module",
   "files": [
     "auth",
@@ -14,7 +14,7 @@
     "postpack": "node ../scripts/restore-publish-config.mjs"
   },
   "dependencies": {
-    "@jcoder-stack/abp-react": "^0.2.1",
+    "@jcoder-stack/abp-react": "^0.3.0",
     "@tanstack/react-router": "^1.0.0",
     "@tanstack/react-start": "^1.0.0",
     "zod": "^4.0.0"

package/public/r/app-shell.json

@@ -99,7 +99,7 @@
     },
     {
       "path": "ui/blocks/app-shell/api/abp-fetch.ts",
-      "content": "import { configureAbpMutator } from \"@/api/mutator\";\nimport { abpRequestFn } from \"@/auth/server-fns\";\n\nconst NULL_BODY_STATUSES = new Set([204, 205, 304]);\n\n/** fetch 形状的封装：生成的 API 客户端 → abpRequestFn（服务端代理边界）。 */\nexport const abpFetch: typeof fetch = async (input, init) => {\n  const path =\n    typeof input === \"string\" ? input : input instanceof Request ? input.url : input.toString();\n  const headers =\n    init?.headers === undefined ? undefined : Object.fromEntries(new Headers(init.headers));\n  const body = typeof init?.body === \"string\" ? init.body : undefined;\n  const res = await abpRequestFn({ data: { path, method: init?.method, headers, body } });\n  const responseBody = NULL_BODY_STATUSES.has(res.status)\n    ? null\n    : res.bodyBase64 === undefined\n      ? (res.body ?? null)\n      : Uint8Array.from(atob(res.bodyBase64), (char) => char.charCodeAt(0));\n  return new Response(responseBody, {\n    status: res.status,\n    headers: res.contentType ? { \"Content-Type\": res.contentType } : {},\n  });\n};\n\nconfigureAbpMutator({ fetchFn: abpFetch });\n",
+      "content": "import { configureAbpMutator } from \"@/api/mutator\";\nimport { abpRequestFn, abpUploadFn } from \"@/auth/server-fns\";\nimport { packUpload, type UploadPayloadBody } from \"@/auth/upload-payload\";\n\nconst NULL_BODY_STATUSES = new Set([204, 205, 304]);\n\ninterface AbpResult {\n  status: number;\n  contentType: string | null;\n  body?: string;\n  bodyBase64?: string;\n}\n\n/** 文本类正文继续走 JSON 边界；其余（FormData、字节）改走原生 multipart 的 upload fn。\n *  `URLSearchParams` 归到文本：它就是 urlencoded 的字符串形态，序列化后无损。 */\nfunction textBodyOf(body: BodyInit | null | undefined): string | undefined {\n  if (typeof body === \"string\") return body;\n  if (body instanceof URLSearchParams) return body.toString();\n  return undefined;\n}\n\n/** 收窄成可打包的二进制正文；`null` 表示这个形状送不过去（目前只有流）。 */\nfunction binaryBodyOf(body: BodyInit): UploadPayloadBody | null {\n  if (body instanceof FormData || body instanceof Blob || body instanceof ArrayBuffer) return body;\n  return ArrayBuffer.isView(body) ? body : null;\n}\n\nfunction toResponse(res: AbpResult): Response {\n  const responseBody = NULL_BODY_STATUSES.has(res.status)\n    ? null\n    : res.bodyBase64 === undefined\n      ? (res.body ?? null)\n      : Uint8Array.from(atob(res.bodyBase64), (char) => char.charCodeAt(0));\n  return new Response(responseBody, {\n    status: res.status,\n    headers: res.contentType ? { \"Content-Type\": res.contentType } : {},\n  });\n}\n\n/** fetch 形状的封装：生成的 API 客户端 → abpRequestFn / abpUploadFn（服务端代理边界）。 */\nexport const abpFetch: typeof fetch = async (input, init) => {\n  const path =\n    typeof input === \"string\" ? input : input instanceof Request ? input.url : input.toString();\n  const headers =\n    init?.headers === undefined ? undefined : Object.fromEntries(new Headers(init.headers));\n  const body = init?.body;\n  const text = textBodyOf(body);\n  if (body === undefined || body === null || text !== undefined) {\n    return toResponse(await abpRequestFn({ data: { path, method: init?.method, headers, body: text } }));\n  }\n  const binary = binaryBodyOf(body);\n  if (binary === null) {\n    throw new TypeError(\n      \"abpFetch: a ReadableStream body cannot be replayed after a 401 refresh; buffer it into a Blob or bytes first\",\n    );\n  }\n  return toResponse(await abpUploadFn({ data: packUpload(path, init?.method, headers, binary) }));\n};\n\nconfigureAbpMutator({ fetchFn: abpFetch });\n",
       "type": "registry:file",
       "target": "src/api/abp-fetch.ts"
     },