jiawei/aiartstudio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 多功能更新

Browse Source
This commit is contained in:
Marcus
2026-04-26 00:39:28 +08:00
parent abd1b03529
commit e26e2f5491
26 changed files with 992 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/api/auth/login.post.ts
+44 -13
View File
@@ -1,8 +1,8 @@
// server/api/auth/login.post.ts
import { consola } from "consola";
import type { IUserLoginData, IUserLoginRequest } from "#shared/types";
import {
clearNewApiAuthCookies,
createApiLogger,
createErrorResponse,
createSuccessResponse,
createUpstreamErrorResponse,
@@ -10,6 +10,7 @@ import {
extractCookieValueFromSetCookie,
newApiFetchRaw,
setNewApiAuthCookies,
toSafeLogError,
upsertUserSnapshot
} from "~~/server/utils";
@@ -28,6 +29,7 @@ interface INewApiLoginUserData extends IUserLoginData {
/** NewAPI 登录结果如果返回额外字段，服务端会在返回前裁剪掉 */
[key: string]: unknown;
}
/**
* 允许从请求体透传给上游的字段列表。
* 只有在这里声明过的字段才会被转发，其余字段一律丢弃，防止参数污染。
@@ -40,11 +42,24 @@ const LOGIN_FIELDS = ["username", "password"] as const satisfies ReadonlyArray<
* POST /api/auth/login
*/
export default defineEventHandler(async (event) => {
const logger = createApiLogger("auth.login");
const requestBody = await readBody<Partial<IUserLoginRequest> | null>(event);
logger.info("开始", {
bodyType: requestBody === null ? "null" : typeof requestBody,
hasUsername: typeof requestBody?.username === "string",
hasPassword: typeof requestBody?.password === "string"
});
// 只接受 JSON 对象或 null，避免数组/字符串等无效 body 被透传到上游。
if (requestBody !== null && typeof requestBody !== "object") {
if (
requestBody !== null &&
(typeof requestBody !== "object" || Array.isArray(requestBody))
) {
clearNewApiAuthCookies(event);
logger.warn("请求体格式错误", {
bodyType: Array.isArray(requestBody) ? "array" : typeof requestBody
});
return createErrorResponse(400, "请求体必须是 JSON 对象");
}
@@ -70,19 +85,28 @@ export default defineEventHandler(async (event) => {
);
const normalized = normalizeLoginResponse(result._data);
const session = extractCookieValueFromSetCookie(result.headers, "session");
logger.info("上游登录返回", {
success: Boolean(normalized.user),
hasSession: Boolean(session)
});
if (!normalized.user) {
// 上游业务失败时同步清理本地旧登录态，避免继续携带坏 cookie。
clearNewApiAuthCookies(event);
logger.warn("登录业务失败", {
upstreamMessage: normalized.message
});
return createErrorResponse(1, normalized.message, result._data ?? null);
}
const session = extractCookieValueFromSetCookie(result.headers, "session");
if (!session) {
// 没有 session 就不能恢复 NewAPI 登录态，必须让前端明确感知失败。
clearNewApiAuthCookies(event);
consola.error(
"/api/auth/login 登录成功但未收到 NewAPI session，请稍后重试"
);
logger.error("登录成功但未收到 NewAPI session", {
userId: normalized.user.id
});
return createErrorResponse(500, "服务器错误，请稍后重试");
}
@@ -94,7 +118,16 @@ export default defineEventHandler(async (event) => {
);
upsertUserSnapshot(normalized.user).catch((error) => {
consola.error("/api/auth/login 保存用户快照失败", error);
logger.error("保存用户快照失败", {
userId: normalized.user?.id,
error: toSafeLogError(error)
});
});
logger.done("成功", {
userId: normalized.user.id,
role: normalized.user.role,
status: normalized.user.status
});
return createSuccessResponse<IUserLoginData>(
@@ -103,7 +136,9 @@ export default defineEventHandler(async (event) => {
);
} catch (error) {
clearNewApiAuthCookies(event);
consola.error("/api/auth/login 登录失败", error);
logger.error("失败", {
error: toSafeLogError(error)
});
return createUpstreamErrorResponse(error, "登录失败");
}
});
@@ -112,7 +147,6 @@ export default defineEventHandler(async (event) => {
const normalizeLoginResponse = (
response: NewApiLoginResponse | undefined
): { message: string; user: IUserLoginData | null } => {
consola.info("user data", response);
if (isUser(response)) {
return {
message: "登录成功",
@@ -121,7 +155,6 @@ const normalizeLoginResponse = (
}
if (!isRecord(response)) {
consola.error("/api/auth/login 登录失败：响应不是对象");
return {
message: "登录失败",
user: null
@@ -129,11 +162,9 @@ const normalizeLoginResponse = (
}
const wrapped = response as INewApiWrappedLoginResponse;
const message =
wrapped.message || (wrapped.success ? "登录成功" : "登录失败");
const message = wrapped.message || (wrapped.success ? "登录成功" : "登录失败");
if (wrapped.success !== true || !isUser(wrapped.data)) {
consola.error("/api/auth/login 登录失败：上游返回的数据格式不正确");
return {
message,
user: null
server/api/auth/logout.get.ts
+12 -2
View File
@@ -1,21 +1,31 @@
import type { IUserLogoutData } from "#shared/types";
import {
clearNewApiAuthCookies,
createApiLogger,
createSuccessResponse,
newApiAuthedFetch
newApiAuthedFetch,
toSafeLogError
} from "~~/server/utils";
export default defineEventHandler(async (event) => {
const logger = createApiLogger("auth.logout");
logger.info("开始");
try {
// 带上本站 httpOnly cookie 中的 NewAPI 登录态，请求上游销毁 session。
await newApiAuthedFetch<IUserLogoutData>(event, "/api/user/logout", {
method: "GET"
});
} catch {
logger.info("上游登出成功");
} catch (error) {
// 上游 session 可能已失效，本地仍然必须清理，避免残留坏登录态。
logger.warn("上游登出失败，继续清理本地登录态", {
error: toSafeLogError(error)
});
} finally {
clearNewApiAuthCookies(event);
}
logger.done("成功");
return createSuccessResponse<IUserLogoutData>(null, "登出成功");
});
server/api/auth/me.get.ts
+24 -2
View File
@@ -1,9 +1,11 @@
import type { IUserMeData } from "#shared/types";
import {
clearNewApiAuthCookies,
createApiLogger,
createErrorResponse,
createSuccessResponse,
newApiAuthedFetch,
toSafeLogError,
upsertUserSnapshot
} from "~~/server/utils";
@@ -24,6 +26,9 @@ interface INewApiSelfUserData extends IUserMeData {
}
export default defineEventHandler(async (event) => {
const logger = createApiLogger("auth.me");
logger.info("开始");
try {
// 从本站 httpOnly cookie 读取登录态，并转发给 NewAPI 查询当前用户。
const result = await newApiAuthedFetch<NewApiUserResponse>(
@@ -38,18 +43,35 @@ export default defineEventHandler(async (event) => {
if (!normalized.user) {
// 上游业务失败代表当前 cookie 不再可靠，清理后返回统一 401。
clearNewApiAuthCookies(event);
logger.warn("登录状态无效", {
upstreamMessage: normalized.message
});
return createErrorResponse(401, normalized.message);
}
upsertUserSnapshot(normalized.user).catch(() => {});
upsertUserSnapshot(normalized.user).catch((error) => {
logger.error("保存用户快照失败", {
userId: normalized.user?.id,
error: toSafeLogError(error)
});
});
logger.done("成功", {
userId: normalized.user.id,
role: normalized.user.role,
status: normalized.user.status
});
return createSuccessResponse<IUserMeData>(
normalized.user,
normalized.message
);
} catch {
} catch (error) {
// cookie 缺失或上游鉴权异常时统一视为未登录。
clearNewApiAuthCookies(event);
logger.warn("未登录或登录态失效", {
error: toSafeLogError(error)
});
return createErrorResponse(401, "未登录");
}
});
server/api/auth/ready.get.ts
+24 -1
View File
@@ -1,10 +1,27 @@
import type { IUserReadyData } from "#shared/types";
import { isUnauthorizedError } from "~~/server/utils";
import {
clearNewApiAuthCookies,
createApiLogger,
createErrorResponse,
createSuccessResponse,
createUpstreamErrorResponse,
ensureAiArtStudioToken,
isUnauthorizedError,
toSafeLogError
} from "~~/server/utils";
export default defineEventHandler(async (event) => {
const logger = createApiLogger("auth.ready");
logger.info("开始");
try {
const result = await ensureAiArtStudioToken(event);
logger.done("成功", {
ready: result.ready,
created: result.created
});
return createSuccessResponse<IUserReadyData>(
result,
result.created ? "环境初始化完成" : "环境已准备"
@@ -12,9 +29,15 @@ export default defineEventHandler(async (event) => {
} catch (error) {
if (isUnauthorizedError(error)) {
clearNewApiAuthCookies(event);
logger.warn("未登录或登录态失效", {
error: toSafeLogError(error)
});
return createErrorResponse(401, "未登录");
}
logger.error("失败", {
error: toSafeLogError(error)
});
return createUpstreamErrorResponse(error, "环境准备失败");
}
});
server/api/auth/register.post.ts
+29 -6
View File
@@ -1,13 +1,12 @@
// server/api/auth/register.post.ts
import type {
IUserRegisterData,
IUserRegisterRequest
} from "#shared/types";
import type { IUserRegisterData, IUserRegisterRequest } from "#shared/types";
import {
createApiLogger,
createErrorResponse,
createSuccessResponse,
createUpstreamErrorResponse,
newApiFetch
newApiFetch,
toSafeLogError
} from "~~/server/utils";
/**
@@ -26,11 +25,28 @@ const REGISTER_FIELDS = [
* POST /api/auth/register
*/
export default defineEventHandler(async (event) => {
const logger = createApiLogger("auth.register");
const requestBody = await readBody<Partial<IUserRegisterRequest> | null>(
event
);
if (requestBody !== null && typeof requestBody !== "object") {
logger.info("开始", {
bodyType: requestBody === null ? "null" : typeof requestBody,
hasUsername: typeof requestBody?.username === "string",
hasPassword: typeof requestBody?.password === "string",
hasEmail: typeof requestBody?.email === "string",
hasVerificationCode: typeof requestBody?.verification_code === "string",
hasAffCode: typeof requestBody?.aff_code === "string"
});
// 只接受 JSON 对象或 null，避免数组/字符串等无效 body 被透传到上游。
if (
requestBody !== null &&
(typeof requestBody !== "object" || Array.isArray(requestBody))
) {
logger.warn("请求体格式错误", {
bodyType: Array.isArray(requestBody) ? "array" : typeof requestBody
});
return createErrorResponse(400, "请求体必须是 JSON 对象");
}
@@ -51,8 +67,15 @@ export default defineEventHandler(async (event) => {
}
});
logger.done("成功", {
hasResult: Boolean(result)
});
return createSuccessResponse(result, "注册成功");
} catch (error) {
logger.error("失败", {
error: toSafeLogError(error)
});
return createUpstreamErrorResponse(error, "注册失败");
}
});