@allbluecn/web-app 0.23.5 → 0.23.7

package/src/routes/api/sync/snapshot.ts

@@ -10,6 +10,7 @@ import { getRequest } from "@tanstack/react-start/server"
 import { z } from "zod"
 import { getPrisma } from "@allbluecn/database/get-prisma"
 import { requireAuth } from "@/server/auth-helpers"
+import { mapSyncAuthError } from "@/server/sync/http-errors"
 import { resolveSyncScopes } from "@/server/sync/scopes"
 import { SYNC_TABLE_MAP } from "@allbluecn/sync-core/registrations"
 
@@ -25,79 +26,83 @@ export const Route = createFileRoute("/api/sync/snapshot")({
   server: {
     handlers: {
       GET: async ({ request }) => {
-        const session = await requireAuth(getRequest())
-        const userId = session.user.id
-        const url = new URL(request.url)
-        const body = snapshotSchema.parse({
-          table: url.searchParams.get("table") ?? undefined,
-          cursor: url.searchParams.get("cursor") ?? undefined,
-          limit: url.searchParams.get("limit") ? Number(url.searchParams.get("limit")) : undefined,
-        })
+        try {
+          const session = await requireAuth(getRequest())
+          const userId = session.user.id
+          const url = new URL(request.url)
+          const body = snapshotSchema.parse({
+            table: url.searchParams.get("table") ?? undefined,
+            cursor: url.searchParams.get("cursor") ?? undefined,
+            limit: url.searchParams.get("limit") ? Number(url.searchParams.get("limit")) : undefined,
+          })
 
-        const reg = SYNC_TABLE_MAP.get(body.table)
-        if (!reg) {
-          return Response.json({ error: "unknown table" }, { status: 400 })
-        }
-        const prisma = await getPrisma()
-        const scopes = await resolveSyncScopes(prisma, userId)
-        const scopeColumn = reg.scope.kind === "self" ? reg.scope.column ?? "id" : reg.scope.column!
+          const reg = SYNC_TABLE_MAP.get(body.table)
+          if (!reg) {
+            return Response.json({ error: "unknown table" }, { status: 400 })
+          }
+          const prisma = await getPrisma()
+          const scopes = await resolveSyncScopes(prisma, userId)
+          const scopeColumn = reg.scope.kind === "self" ? reg.scope.column ?? "id" : reg.scope.column!
 
-        // 行级 scope 过滤 + (pk) 序分页；参数化拼接（列名来自注册表白名单）
-        const params: unknown[] = []
-        const where: string[] = []
-        if (reg.scope.kind !== "self") {
-          params.push(scopes.map((s) => s.replace(/^(ws|proj):/, "")))
-          where.push(`"${reg.scope.column!}" = ANY($${params.length})`)
-        }
-        if (body.cursor) {
-          const cursorKeys = JSON.parse(body.cursor) as Record<string, string>
-          // (pk) > (cursor) 行比较——单列与复合分别构造
-          if (reg.pkColumns.length === 1) {
-            params.push(cursorKeys[reg.pkColumns[0]])
-            where.push(`"${reg.pkColumns[0]}" > $${params.length}`)
-          } else {
-            const tuples = reg.pkColumns
-              .map((k) => {
-                params.push(cursorKeys[k])
-                return `$${params.length}`
-              })
-              .join(", ")
-            const cols = reg.pkColumns.map((k) => `"${k}"`).join(", ")
-            where.push(`(${cols}) > (${tuples})`)
+          // 行级 scope 过滤 + (pk) 序分页；参数化拼接（列名来自注册表白名单）
+          const params: unknown[] = []
+          const where: string[] = []
+          if (reg.scope.kind !== "self") {
+            params.push(scopes.map((s) => s.replace(/^(ws|proj):/, "")))
+            where.push(`"${reg.scope.column!}" = ANY($${params.length})`)
           }
-        }
-        const limit = Math.min(body.limit ?? PAGE_LIMIT, PAGE_LIMIT)
-        const orderBy = [...reg.pkColumns].map((k) => `"${k}" ASC`).join(", ")
+          if (body.cursor) {
+            const cursorKeys = JSON.parse(body.cursor) as Record<string, string>
+            // (pk) > (cursor) 行比较——单列与复合分别构造
+            if (reg.pkColumns.length === 1) {
+              params.push(cursorKeys[reg.pkColumns[0]])
+              where.push(`"${reg.pkColumns[0]}" > $${params.length}`)
+            } else {
+              const tuples = reg.pkColumns
+                .map((k) => {
+                  params.push(cursorKeys[k])
+                  return `$${params.length}`
+                })
+                .join(", ")
+              const cols = reg.pkColumns.map((k) => `"${k}"`).join(", ")
+              where.push(`(${cols}) > (${tuples})`)
+            }
+          }
+          const limit = Math.min(body.limit ?? PAGE_LIMIT, PAGE_LIMIT)
+          const orderBy = [...reg.pkColumns].map((k) => `"${k}" ASC`).join(", ")
 
-        const rows = await prisma.$queryRawUnsafe<Record<string, unknown>[]>(
-          `SELECT ${reg.columns.map((c) => `"${c}"`).join(", ")}, sync_version FROM ${reg.table}
+          const rows = await prisma.$queryRawUnsafe<Record<string, unknown>[]>(
+            `SELECT ${reg.columns.map((c) => `"${c}"`).join(", ")}, sync_version FROM ${reg.table}
 ${where.length ? `WHERE ${where.join(" AND ")}` : ""}
 ORDER BY ${orderBy}
 LIMIT ${limit + 1}`,
-          ...params,
-        )
-        const hasMore = rows.length > limit
-        const page = hasMore ? rows.slice(0, limit) : rows
-        const items = page.map((r) => {
-          const payload: Record<string, unknown> = {}
-          for (const c of reg.columns) payload[c] = r[c] ?? null
-          const pk =
-            reg.pkColumns.length === 1
-              ? String(r[reg.pkColumns[0]])
-              : JSON.stringify(Object.fromEntries(reg.pkColumns.map((k) => [k, String(r[k])])))
-          return { pk, payload, syncVersion: Number((r as { sync_version?: number }).sync_version ?? 1) }
-        })
-        const nextCursor = page.length
-          ? reg.pkColumns.length === 1
-            ? String(page[page.length - 1][reg.pkColumns[0]])
-            : JSON.stringify(Object.fromEntries(reg.pkColumns.map((k) => [k, String(page[page.length - 1][k])])))
-          : null
-        // nextCursor 包 JSON 时以 base64 走 query 参数（复合键含花括号引号）
-        return Response.json({
-          rows: items,
-          nextCursor: nextCursor === null ? null : reg.pkColumns.length === 1 ? nextCursor : Buffer.from(nextCursor).toString("base64"),
-          hasMore,
-        })
+            ...params,
+          )
+          const hasMore = rows.length > limit
+          const page = hasMore ? rows.slice(0, limit) : rows
+          const items = page.map((r) => {
+            const payload: Record<string, unknown> = {}
+            for (const c of reg.columns) payload[c] = r[c] ?? null
+            const pk =
+              reg.pkColumns.length === 1
+                ? String(r[reg.pkColumns[0]])
+                : JSON.stringify(Object.fromEntries(reg.pkColumns.map((k) => [k, String(r[k])])))
+            return { pk, payload, syncVersion: Number((r as { sync_version?: number }).sync_version ?? 1) }
+          })
+          const nextCursor = page.length
+            ? reg.pkColumns.length === 1
+              ? String(page[page.length - 1][reg.pkColumns[0]])
+              : JSON.stringify(Object.fromEntries(reg.pkColumns.map((k) => [k, String(page[page.length - 1][k])])))
+            : null
+          // nextCursor 包 JSON 时以 base64 走 query 参数（复合键含花括号引号）
+          return Response.json({
+            rows: items,
+            nextCursor: nextCursor === null ? null : reg.pkColumns.length === 1 ? nextCursor : Buffer.from(nextCursor).toString("base64"),
+            hasMore,
+          })
+        } catch (e) {
+          return mapSyncAuthError(e)
+        }
       },
     },
   },

package/src/server/desktop-guest.ts

@@ -38,5 +38,9 @@ export function buildGuestSession(): Session {
 }
 
 export function isDesktopServer(): boolean {
-  return process.env.DEPLOY_TARGET === 'desktop'
+  // 本模块被路由模块（如 _nav/route.tsx 的 beforeLoad）在客户端一并加载：
+  // 浏览器 bundle 无 Node process（或 env 被静态替换为空对象）时必须安全
+  // 返回 false——客户端侧的桌面判定走 lib/desktop-env.ts 的 isDesktopClient()
+  // （desktopBridge 运行时事实），两者在 beforeLoad 里合并使用。
+  return typeof process !== 'undefined' && process.env?.DEPLOY_TARGET === 'desktop'
 }

package/src/server/serverFns/auth/session.ts

@@ -22,7 +22,7 @@ import type { FeatureKey } from '@allbluecn/kernel'
 import { getPrisma } from '@allbluecn/database/get-prisma'
 import { getCurrentSession } from '@/lib/session'
 import { resetProfileCache } from '@/lib/auth/auth.config'
-import { buildGuestSession, isDesktopServer } from '@/server/desktop-guest'
+import { buildGuestSession, isDesktopServer, isGuestSession } from '@/server/desktop-guest'
 import { ensureLocalShadowUser } from '@/server/desktop-bootstrap'
 import { ensureCloudIdentity } from '@/server/desktop-cloud-identity'
 import { readRemoteAuth, writeRemoteAuth, writeRemoteSession, clearRemoteAuth } from '@/server/remote-auth'
@@ -53,22 +53,31 @@ const saasProfileSchema = z.object({
 // getCurrentSession 桌面回落需复用同一组装，且 lib/session 不得 import
 // serverFns/**（循环依赖），组装点移至 server 域纯模块。
 
+/** 桌面 guest 懒 seed 影子用户：失败仅 warn 不阻断会话发放（首启体验优先，规格 §3.1） */
+async function ensureGuestSeeded(): Promise<void> {
+  try {
+    await ensureLocalShadowUser()
+  } catch (err) {
+    console.warn('[getSessionFn] 本地影子用户落库失败（不阻断 guest 会话）:', err)
+  }
+}
+
 export const getSessionFn = createServerFn({ method: 'GET' })
   .handler(async () => {
     const request = getRequest()
     const session = await getCurrentSession(request)
-    if (session?.user?.id) return session
+    if (session?.user?.id) {
+      // getCurrentSession 已含桌面 guest 回落（鉴权单点）：guest 首启仍需懒 seed
+      // 本地影子用户（本地优先 P1），使 assertOwned/requireUserInDb/FK 全链可写。
+      // 失败仅 warn 不阻断会话发放——首启体验优先（规格 §3.1），下一请求再重试。
+      if (isGuestSession(session)) await ensureGuestSeeded()
+      return session
+    }
     if (!isDesktopServer()) return null
     const remoteAuth = await readRemoteAuth()
     if (remoteAuth) return buildRemoteSession(remoteAuth)
-    // 桌面 guest 分支懒 seed 影子用户（本地优先 P1）：首启为 local-guest 落库，
-    // 使 assertOwned/requireUserInDb/FK 全链可写。失败仅 warn 不阻断会话发放
-    // ——首启体验优先（规格 §3.1），下一请求再重试。
-    try {
-      await ensureLocalShadowUser()
-    } catch (err) {
-      console.warn('[getSessionFn] 本地影子用户落库失败（不阻断 guest 会话）:', err)
-    }
+    // 兜底分支（getCurrentSession 已覆盖 guest，此处防御未来改动）：保持旧行为
+    await ensureGuestSeeded()
     return buildGuestSession()
   })
 

package/src/server/sync/http-errors.ts

@@ -0,0 +1,43 @@
+// SPDX-License-Identifier: AGPL-3.0-or-later
+// AllBlue - 理想之海
+// Copyright (C) 2026 AllBlue Contributors
+
+// sync 族 HTTP 路由（server.handlers）未登录错误的**单一映射来源**。
+//
+// 背景：server.handlers 不走 serverFn 的 authContextMiddleware 链，requireAuth 抛的
+// UnauthorizedError 若在 handler 内未捕获会直上抛 → 框架统一回 500。同族的
+// account-status 与 attachments/content 已把未登录映射为 401，而 push/pull/
+// bootstrap/snapshot 长期裸调 requireAuth（族内状态码不一致），客户端会把
+// 「会话过期」误判为服务端故障并在同步循环里反复重试。
+//
+// 判定含 message 兜底：跨模块实例（双份 module / 测试 mock 的 UnauthorizedError）
+// 与裸 `new Error('UNAUTHORIZED')` 抛点都不满足 instanceof，但语义相同——与
+// account-status / attachments content 的判定口径逐字一致。
+import { UnauthorizedError } from "@/server/auth-helpers"
+
+/** 是否「未登录」错误（instanceof 优先，UNAUTHORIZED 消息兜底防实例不一致漏判） */
+export function isUnauthorizedError(e: unknown): boolean {
+  return (
+    e instanceof UnauthorizedError ||
+    (e instanceof Error && e.message === "UNAUTHORIZED")
+  )
+}
+
+/** 未登录统一响应：401 + JSON 信封 `{ error: 'unauthorized' }` */
+export function unauthorizedResponse(): Response {
+  return Response.json({ error: "unauthorized" }, { status: 401 })
+}
+
+/**
+ * sync 路由错误收口：未登录 → 401 响应；**其余异常原样上抛**（不吞、不降级为
+ * 500 响应，保留原始堆栈交由框架/上层日志处理）。
+ *
+ * 用法（handler 体整段包住，深层抛出的 UnauthorizedError 同样被映射）：
+ * ```ts
+ * try { ... } catch (e) { return mapSyncAuthError(e) }
+ * ```
+ */
+export function mapSyncAuthError(e: unknown): Response {
+  if (isUnauthorizedError(e)) return unauthorizedResponse()
+  throw e
+}