Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .eslintrc-auto-import.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ export default {
"invalidateAll": true,
"navigating": true,
"onDestroy": true,
"onMount": true,
"page": true,
"preloadCode": true,
"preloadData": true,
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,16 +56,16 @@ jobs:
- name: 前端依赖漏洞扫描
run: pnpm run audit:deps

- name: 依赖方向基线(12 service + 1 middleware + 0 router)
- name: 依赖方向基线(middleware 与 router 不得 import repository)
working-directory: server
run: |
HITS=$(git grep -ln "MyBlog/internal/repository" -- internal/service internal/middleware internal/router \
HITS=$(git grep -ln "MyBlog/internal/repository" -- internal/middleware internal/router \
| grep -v '_test\.go$' || true)
COUNT=$(printf '%s' "$HITS" | grep -c . || true)
echo "依赖基线命中文件数: ${COUNT}"
echo "依赖基线命中文件清单:"
echo "违例边命中文件数: ${COUNT}"
echo "违例边命中文件清单:"
printf '%s\n' "$HITS"
test "$COUNT" -le 13
test "$COUNT" -eq 0

- name: 公共包单测与类型检查
run: pnpm run test:packages
Expand Down
24 changes: 13 additions & 11 deletions AGENTS.md

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -263,5 +263,6 @@ Domain Layer → 领域实体与请求/响应 DTO(全系统唯一类型语
- [x] 前台界面多语言(Header、Footer、通知铃铛、友链弹窗、错误页与 demo 页已接入 paraglide,其余页面待分批接入)
- [x] 契约金样本与类型锚定门禁、CI 质量流水线与依赖漏洞扫描
- [x] 部署配置和 Docker 支持(MySQL + 后端 + 前台 + Nginx + 备份单实例编排)
- [ ] 前端窄屏与响应式细节打磨(后台字典页工具栏窄屏遗留未完成,见 `docs/debt/frontend.md` 第 8 条)
- [ ] 扩容前置改造三项(令牌表持久化、限流器外置、补 `SetTrustedProxies`,见 `docs/architecture-rules.md` 第 7 节)
- [ ] 前端窄屏与响应式细节打磨(后台字典页工具栏窄屏遗留已按 `docs/debt/frontend.md` 第 8 条修复,其余页面按需跟进)
- [x] 部署形态定型为单实例终态(确定不扩容;令牌表持久化与限流器外置降为变更前提,见 `docs/architecture-rules.md` §7.2)
- [x] 代理信任链收敛(受信来源由 `security.trusted_proxies` 白名单决定,容器编排经环境变量注入网段,伪造转发头不再生效,见 `docs/debt/security-runtime.md` 第 4 条)
1 change: 1 addition & 0 deletions apps/admin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
"@milkdown/kit": "7.22.1",
"@myblog/api": "workspace:*",
"@myblog/auth": "workspace:*",
"@myblog/components": "workspace:*",
"@myblog/http": "workspace:*",
"@myblog/shared": "workspace:*",
"@myblog/ui": "workspace:*",
Expand Down
3 changes: 2 additions & 1 deletion apps/admin/src/app.css
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@
@import './styles/animations.css';
@import './styles/milkdown.css';

/* 纳入 packages/ui 源码,Tailwind v4 默认不扫描 node_modules 与仓库外目录。 */
/* 纳入 packages/ui 与 packages/components 源码,Tailwind v4 默认不扫描 node_modules 与仓库外目录。 */
/* packages/ui 源码变更后工具类未更新时,重启 dev server 可强制重新扫描。 */
@source '../../../packages/ui/src';
@source '../../../packages/components/src';

@custom-variant dark (&:is(.dark *));
2 changes: 1 addition & 1 deletion apps/admin/src/lib/components/admin/page-header.svelte
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script lang="ts">
import { ThemeToggle } from '@myblog/components/theme-toggle'
import { toAdminPath } from '$lib/utils/navigation'
import { ThemeToggle } from '$lib/components'
import * as Breadcrumb from '$ui/breadcrumb'
import * as Sidebar from '$ui/sidebar'

Expand Down
3 changes: 0 additions & 3 deletions apps/admin/src/lib/components/index.ts

This file was deleted.

45 changes: 0 additions & 45 deletions apps/admin/src/lib/components/theme-toggle.svelte

This file was deleted.

9 changes: 2 additions & 7 deletions apps/admin/src/lib/stores/auth.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
import { createAuthStore } from '@myblog/auth'
import { browser } from '$app/environment'

// 认证 store 实例:注入环境判定与登出接口,核心逻辑统一下沉至 @myblog/auth。
// 登出经动态导入调用,避免认证 store 与服务层形成循环依赖;
// 会话令牌经 Cookie 携带,登出由服务端撤销令牌并清除 Cookie。
export const authStore = createAuthStore({
isBrowser: () => browser,
logoutApi: async () => {
// 动态导入避免与服务层形成循环依赖。
// 会话令牌经 Cookie 携带,登出由服务端撤销令牌并清除 Cookie。
const { UserAPI } = await import('$lib/api')
await UserAPI.logout()
}
})

export type { AuthState } from '@myblog/auth'
2 changes: 1 addition & 1 deletion apps/admin/src/routes/(auth)/login/+page.svelte
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<script lang="ts">
import { ThemeToggle } from '@myblog/components/theme-toggle'
import { zod4Client } from 'sveltekit-superforms/adapters'
import { EyeOff, Eye, LogIn } from '@lucide/svelte'
import { superForm } from 'sveltekit-superforms'
import { authStore } from '$lib/stores/auth.ts'
import { ThemeToggle } from '$lib/components'
import { SITE_NAME_ZH } from '@myblog/shared'
import { goto } from '$lib/utils/navigation'
import type { PageProps } from './$types'
Expand Down
1 change: 1 addition & 0 deletions apps/admin/typings/auto-imports.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ declare global {
const derived: typeof import('svelte/store').derived
const dev: typeof import('$app/environment').dev
const get: typeof import('svelte/store').get
const goto: typeof import('$app/navigation').goto
const invalidate: typeof import('$app/navigation').invalidate
const invalidateAll: typeof import('$app/navigation').invalidateAll
const navigating: typeof import('$app/stores').navigating
Expand Down
4 changes: 2 additions & 2 deletions apps/admin/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ export default ({ mode }: ConfigEnv) => {
}
},
ssr: {
// ui 包以源码直连方式被引用,需参与 SSR 编译以支持 .svelte 组件。
noExternal: ['@myblog/ui']
// ui 与 components 包均以源码直连方式被引用,需参与 SSR 编译以支持 .svelte 组件。
noExternal: ['@myblog/ui', '@myblog/components']
}
})
}
1 change: 1 addition & 0 deletions apps/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
"@inlang/paraglide-js": "^2.24.1",
"@myblog/api": "workspace:*",
"@myblog/auth": "workspace:*",
"@myblog/components": "workspace:*",
"@myblog/http": "workspace:*",
"@myblog/shared": "workspace:*",
"@myblog/ui": "workspace:*",
Expand Down
3 changes: 2 additions & 1 deletion apps/web/src/app.css
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
@import './styles/markdown.css';
@import './styles/animations.css';

/* 纳入 packages/ui 源码,Tailwind v4 默认不扫描 node_modules 与仓库外目录。 */
/* 纳入 packages/ui 与 packages/components 源码,Tailwind v4 默认不扫描 node_modules 与仓库外目录。 */
@source '../../../packages/ui/src';
@source '../../../packages/components/src';

@custom-variant dark (&:is(.dark *));
2 changes: 0 additions & 2 deletions apps/web/src/lib/components/index.ts

This file was deleted.

2 changes: 1 addition & 1 deletion apps/web/src/lib/components/layout/Header.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import type { FriendlyLinkPublic } from '@myblog/api/modules/friendlyLink/types'
import NotificationBell from '$lib/components/layout/NotificationBell.svelte'
import type { User as UserType } from '@myblog/api/modules/user/types'
import GithubIcon from '$lib/components/icons/github-icon.svelte'
import ThemeToggle from '$lib/components/theme-toggle.svelte'
import { ThemeToggle } from '@myblog/components/theme-toggle'
import { setLocale, getLocale } from '$lib/paraglide/runtime'
import * as DropdownMenu from '$ui/dropdown-menu'
import { authStore } from '$lib/stores/auth'
Expand Down
45 changes: 0 additions & 45 deletions apps/web/src/lib/components/theme-toggle.svelte

This file was deleted.

9 changes: 2 additions & 7 deletions apps/web/src/lib/stores/auth.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
import { createAuthStore } from '@myblog/auth'
import { browser } from '$app/environment'

// 认证 store 实例:注入环境判定与登出接口,核心逻辑统一下沉至 @myblog/auth。
// 登出经动态导入调用,避免认证 store 与服务层形成循环依赖;
// 会话令牌经 Cookie 携带,登出由服务端撤销令牌并清除 Cookie。
export const authStore = createAuthStore({
isBrowser: () => browser,
logoutApi: async () => {
// 动态导入避免与服务层形成循环依赖。
// 会话令牌经 Cookie 携带,登出由服务端撤销令牌并清除 Cookie。
const { UserAPI } = await import('$lib/api')
await UserAPI.logout()
}
})

export type { AuthState } from '@myblog/auth'
4 changes: 2 additions & 2 deletions apps/web/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ export default ({ mode }: ConfigEnv) => {
}
},
ssr: {
// ui 包以源码直连方式被引用,需参与 SSR 编译以支持 .svelte 组件。
noExternal: ['@myblog/ui']
// ui 与 components 包均以源码直连方式被引用,需参与 SSR 编译以支持 .svelte 组件。
noExternal: ['@myblog/ui', '@myblog/components']
},
resolve: {
alias: {
Expand Down
6 changes: 3 additions & 3 deletions contracts/auth-protocol.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
- 令牌自身不承载用户标识与有效期,身份与生命周期登记在服务端令牌表;`ValidateAccessToken` 与 `ValidateRefreshToken` 以查表结果为唯一依据。
- 校验同时核对令牌类型,访问令牌与刷新令牌不可互换使用。
- 令牌不可由调用方构造:任何未经服务端签发的串都会因查表失败被拒绝,不存在依据请求内容现算凭证的路径。
- 服务重启会清空令牌表,多实例部署前必须将令牌表迁至共享存储(单实例约束与扩容前置改造见 `docs/architecture-rules.md` §7)。
- 服务重启会清空令牌表;本项目为单实例终态、确定不扩容,故令牌表不迁移;若未来改变该决定,扩容前必须迁至共享存储(见 `docs/architecture-rules.md` §7.2)。

## 3. 刷新协议与 Cookie 会话

Expand Down Expand Up @@ -79,13 +79,13 @@
- Header 通道:请求头 `Authorization: Bearer <access token>`,请求体可选提交 `{ "refreshToken": "<refresh token>" }`,提交后访问与刷新令牌一并撤销。
- Cookie 通道:会话 Cookie 存在时访问与刷新令牌一并撤销,响应以 `Max-Age=-1` 指示浏览器清除两个会话 Cookie。
- 修改密码成功后服务端撤销该用户当前全部既有令牌,客户端须清除本地状态并引导重新登录。
- 撤销即从服务端令牌表移除记录,过期记录随签发惰性清理(内存实现,仅单实例生效)。
- 撤销即从服务端令牌表移除记录,过期记录随签发惰性清理(内存实现,在单实例终态下即为唯一权威)。

## 7. 已知限制(登记)

| 限制 | 影响 | 计划 |
|---|---|---|
| 令牌表为内存 map(已加互斥锁,过期记录随签发惰性清理) | 服务重启或发布导致全体用户登出;多实例部署即失效 | 单实例前提与扩容前置改造见 `docs/architecture-rules.md` §7 |
| 令牌表为内存 map(已加互斥锁,过期记录随签发惰性清理) | 服务重启或发布导致全体用户登出;多实例部署即失效 | 单实例为终态故不迁移;变更前提见 `docs/architecture-rules.md` §7.2 |
| 登录失败(密码错误)同样返回 code 401 | 前端已排除登录端点与 `/auth/session` 自身,二者均不触发自动续期 | 已在 `packages/http/src/client.ts` 固化 |
| 跨标签页对齐依赖 `storage` 事件送达时机 | 事件送达前本页仍展示已失效的登录态,直到首个请求返回 code 401 被纠正 | 登录态无本地令牌可误用,服务端会话 Cookie 为唯一裁决方 |
| 并发 401 各自发起续期 | 续期即旋转,后到的请求会携带已被撤销的旧 Cookie 而失败 | 续期经 `refreshSingleFlight` 单飞,并发请求共享同一次续期 |
7 changes: 4 additions & 3 deletions deploy/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@

- 编排中无副本声明与故障转移(`git grep -n "replicas" -- docker-compose.yml` 应为空),应用进程、MySQL、网关各一份,**不支持按多副本假设做设计与承诺**。
- 会话令牌表与请求限流计数均为进程内存结构,`server` 容器重启或重新部署将导致**全体用户登出**,发布窗口需提前预告;任一组件故障即停站,恢复依赖人工介入,无 RTO 承诺,RPO 为 24 小时(`docs/operations/backup-restore.md`)。
- 扩容前置改造三项见 `docs/architecture-rules.md` §7.2。
- 单实例为**终态**,本项目确定不扩容;若未来改变该决定,扩容前须先完成令牌表持久化与限流器外置两项改造(见 `docs/architecture-rules.md` §7.2)。
- 代理信任链已收敛:仅 `MYBLOG_SECURITY_TRUSTED_PROXIES` 列出的来源所携带的 `X-Forwarded-For` 参与客户端 IP 解析,编排默认注入 `172.16.0.0/12`;自定义 Docker 地址池时须同步修改,漏改会让客户端 IP 退化为 nginx 容器地址,见 `docs/debt/security-runtime.md` 第 4 条。

### 健康探针

Expand All @@ -45,8 +46,8 @@

`server` 容器的其余参数经 `MYBLOG_*` 前缀环境变量注入:`MYBLOG_SERVER_MODE=release`、
`MYBLOG_SERVER_HOST=0.0.0.0`、`MYBLOG_DATABASE_HOST=mysql`、`MYBLOG_DATABASE_PORT=3306`、
`MYBLOG_DATABASE_USERNAME=root`。变量名由 `MYBLOG_` 加配置键的大写下划线形式构成,
列表与映射类配置无法经环境变量表达,见 `server/internal/config/config.go`。
`MYBLOG_DATABASE_USERNAME=root`、`MYBLOG_SECURITY_TRUSTED_PROXIES=172.16.0.0/12`。变量名由 `MYBLOG_` 加配置键的大写下划线形式构成,
列表与映射类配置无法经环境变量表达(代理信任链按逗号分隔的专用通道除外),见 `server/internal/config/config.go`。

### 数据卷

Expand Down
3 changes: 3 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@ services:
# 指标监听绑定容器网卡,仅同 compose 网络的抓取端可访问,不发布到宿主机端口。
MYBLOG_METRICS_ENABLED: 'true'
MYBLOG_METRICS_ADDR: 0.0.0.0:9090
# 代理信任链:nginx 是唯一入口且 server 未发布端口,仅容器网络可达后端,
# 故信任 Docker 私有网段;自定义地址池时须同步改为实际网段,多项以逗号分隔。
MYBLOG_SECURITY_TRUSTED_PROXIES: 172.16.0.0/12

volumes:
- uploads:/app/uploads
Expand Down
Loading
Loading