Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
 O96u
|
901fefb3f5 | ||
|
O96u
|
acc64751ef |
No files matched your search
+31
-1
@@ -2,6 +2,33 @@
|
|||||||
|
|
||||||
本仓库自 **v1.0.0** 起作为正式版维护；此前历史提交已归档重置。
|
本仓库自 **v1.0.0** 起作为正式版维护；此前历史提交已归档重置。
|
||||||
|
|
||||||
|
## [1.1.1] - 2026-08-26
|
||||||
|
|
||||||
|
### 修复
|
||||||
|
|
||||||
|
- 移除启动时自动创建的空白「S3 兼容存储」占位；升级后自动清理旧占位记录
|
||||||
|
- 修复管理页切换路由时反复闪现「正在验证登录状态」
|
||||||
|
- 修复静默会话校验后设置 / 统计 / API 页不加载数据
|
||||||
|
|
||||||
|
### 改进
|
||||||
|
|
||||||
|
- Docker 日志：4xx/5xx 分级输出，记录错误原因与堆栈；上传/启动任务失败写入详细错误
|
||||||
|
|
||||||
|
## [1.1.0] - 2026-08-26
|
||||||
|
|
||||||
|
### 新增
|
||||||
|
|
||||||
|
- S3 兼容对象存储后端（R2 / AWS S3 / 腾讯云 COS / 阿里云 OSS）
|
||||||
|
- `storage_backends` + `images` 索引表，列表/搜索/统计改查 SQLite
|
||||||
|
- 混合直链：`proxy`（默认，PicHost 代理）与 `public`（302 到 CDN）
|
||||||
|
- 管理员 `/storage` 存储管理页：多后端卡片、用量条、添加/编辑/删除云存储实例
|
||||||
|
- 可选环境变量覆盖存储配置（`STORAGE_BACKEND`、`S3_*`）
|
||||||
|
|
||||||
|
### 改进
|
||||||
|
|
||||||
|
- 启动时自动将本地磁盘图片扫描迁入 `images` 索引（幂等）
|
||||||
|
- 上传/删除/直链/auto-delete 按 `backend_id` 路由到对应后端
|
||||||
|
|
||||||
## [1.0.4] - 2026-08-25
|
## [1.0.4] - 2026-08-25
|
||||||
|
|
||||||
### 新增
|
### 新增
|
||||||
@@ -68,8 +95,11 @@
|
|||||||
|
|
||||||
### 路线图
|
### 路线图
|
||||||
|
|
||||||
- **v1.1.0**（计划中）：S3、Cloudflare R2 及更多对象存储后端
|
- **v1.1.1**（当前 `main`）：会话校验与存储占位修复、Docker 日志增强
|
||||||
|
|
||||||
|
[1.1.1]: https://github.com/O96u/PicHost/releases/tag/v1.1.1
|
||||||
|
[1.1.0]: https://github.com/O96u/PicHost/releases/tag/v1.1.0
|
||||||
|
[1.0.4]: https://github.com/O96u/PicHost/releases/tag/v1.0.4
|
||||||
[1.0.3]: https://github.com/O96u/PicHost/releases/tag/v1.0.3
|
[1.0.3]: https://github.com/O96u/PicHost/releases/tag/v1.0.3
|
||||||
[1.0.2]: https://github.com/O96u/PicHost/releases/tag/v1.0.2
|
[1.0.2]: https://github.com/O96u/PicHost/releases/tag/v1.0.2
|
||||||
[1.0.1]: https://github.com/O96u/PicHost/releases/tag/v1.0.1
|
[1.0.1]: https://github.com/O96u/PicHost/releases/tag/v1.0.1
|
||||||
|
|||||||
+38
-37
@@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
<p align="center"><strong>Lightweight personal image hosting</strong> · Simple uploads, clean management</p>
|
<p align="center"><strong>Lightweight personal image hosting</strong> · Simple uploads, clean management</p>
|
||||||
|
|
||||||
<p align="center">Self-hosted / Multi-user / Docker / API / Twikoo · Zero-config setup</p>
|
<p align="center">Self-hosted / Multi-user / Docker / API / Twikoo · Local disk or object storage</p>
|
||||||
|
|
||||||
<p align="center">
|
<p align="center">
|
||||||
<a href="https://github.com/O96u/PicHost/blob/main/package.json"><img src="https://img.shields.io/github/package-json/v/O96u/PicHost?style=flat-square&color=22c55e" alt="version" /></a>
|
<a href="https://github.com/O96u/PicHost/blob/main/package.json"><img src="https://img.shields.io/github/package-json/v/O96u/PicHost?style=flat-square&color=22c55e" alt="version" /></a>
|
||||||
@@ -17,6 +17,7 @@
|
|||||||
</p>
|
</p>
|
||||||
|
|
||||||
<p align="center">
|
<p align="center">
|
||||||
|
<a href="#branches">Branches</a> ·
|
||||||
<a href="#quick-start">Quick Start</a> ·
|
<a href="#quick-start">Quick Start</a> ·
|
||||||
<a href="#screenshots">Screenshots</a> ·
|
<a href="#screenshots">Screenshots</a> ·
|
||||||
<a href="#features">Features</a> ·
|
<a href="#features">Features</a> ·
|
||||||
@@ -27,26 +28,43 @@
|
|||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
## Branches
|
||||||
|
|
||||||
|
| Branch | Notes |
|
||||||
|
| ------ | ----- |
|
||||||
|
| [**main**](https://github.com/O96u/PicHost/tree/main) (default) | **v1.1.1** — local disk + multi-backend object storage (R2 / COS / OSS / AWS), [`/storage`](docs/README.md) UI, hybrid URLs |
|
||||||
|
| [**cloudflare**](https://github.com/O96u/PicHost/tree/cloudflare) | **Cloudflare R2–only line** — streamlined for deployments that use R2 exclusively |
|
||||||
|
|
||||||
|
Use **main** for the full product and multiple cloud backends.
|
||||||
|
|
||||||
|
If you **only use Cloudflare R2**, check out the dedicated branch:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
git clone https://github.com/O96u/PicHost.git
|
||||||
|
cd PicHost
|
||||||
|
git checkout cloudflare
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
## Screenshots
|
## Screenshots
|
||||||
|
|
||||||
| Login | Upload |
|
| Upload | Storage |
|
||||||
| :----------------------------------: | :------------------------------------: |
|
| :------------------------------------: | :--------------------------------: |
|
||||||
|  |  |
|
|  |  |
|
||||||
|
|
||||||
| Upload preferences | Stats & gallery |
|
| Stats & gallery | Settings |
|
||||||
| :----------------------------------------------: | :----------------------------------: |
|
| :----------------------------------: | :--------------------------------: |
|
||||||
|  |  |
|
|  |  |
|
||||||
|
|
||||||
| Settings | |
|
|
||||||
| :----------------------------------------: | :-: |
|
|
||||||
|  | |
|
|
||||||
|
|
||||||
## Features
|
## Features
|
||||||
|
|
||||||
- **Drag, click, or Ctrl+V paste** to upload; admins can use custom `folder` paths
|
- **Drag, click, or Ctrl+V paste** to upload; admins can use custom `folder` paths
|
||||||
- **Server-side WebP** (sharp), Referer hotlink protection, configurable public base URL
|
- **Server-side WebP** (sharp), Referer hotlink protection, configurable public base URL
|
||||||
- **Multi-user** — username/password login; optional registration; users see only their images
|
- **Multi-user** — username/password login; optional registration; users see only their images
|
||||||
- **Upload preferences** (card flip UI): client-side compression, auto-copy links, per-user auto-delete
|
- **Upload preferences** (home card flip): client-side compression, auto-copy links, per-user auto-delete
|
||||||
|
- **Multi-backend storage**: local disk + S3-compatible (Cloudflare R2 / Tencent COS / Alibaba OSS / AWS S3); admins manage backends at **Storage** (`/storage`)
|
||||||
|
- **Hybrid URLs**: `proxy` (same-origin via PicHost) or `public` (302 to CDN / bucket URL)
|
||||||
- **Gallery** — browse, search, batch delete; admin sees uploader badges
|
- **Gallery** — browse, search, batch delete; admin sees uploader badges
|
||||||
- **Stats** — upload/delete metrics, folder breakdown; admin sees registered user count
|
- **Stats** — upload/delete metrics, folder breakdown; admin sees registered user count
|
||||||
- **API** — global token (admin) + per-user tokens; in-app cURL snippets
|
- **API** — global token (admin) + per-user tokens; in-app cURL snippets
|
||||||
@@ -89,10 +107,6 @@ npm run dev
|
|||||||
|
|
||||||
Open `http://localhost:3000/setup` to create the admin account. Data defaults to `./data`.
|
Open `http://localhost:3000/setup` to create the admin account. Data defaults to `./data`.
|
||||||
|
|
||||||
### Legacy migration
|
|
||||||
|
|
||||||
If you only had `ADMIN_SECRET` and no user table, log in with the secret once and follow the migration wizard.
|
|
||||||
|
|
||||||
## Tech Stack
|
## Tech Stack
|
||||||
|
|
||||||
| Layer | Technology |
|
| Layer | Technology |
|
||||||
@@ -101,25 +115,10 @@ If you only had `ADMIN_SECRET` and no user table, log in with the secret once an
|
|||||||
| Backend | Nitro (Node.js), SQLite |
|
| Backend | Nitro (Node.js), SQLite |
|
||||||
| Images | sharp (WebP transcoding & compression) |
|
| Images | sharp (WebP transcoding & compression) |
|
||||||
| Auth | Session cookie, scrypt password hashing, API tokens |
|
| Auth | Session cookie, scrypt password hashing, API tokens |
|
||||||
| Storage | Local disk (`DATA_DIR`) |
|
| Storage | Local disk + S3-compatible backends (R2 / COS / OSS / AWS); `images` index in SQLite |
|
||||||
| Deploy | Docker (amd64 / arm64), docker compose |
|
| Deploy | Docker (amd64 / arm64), docker compose |
|
||||||
| Tests | Vitest |
|
| Tests | Vitest |
|
||||||
|
|
||||||
## Environment variables
|
|
||||||
|
|
||||||
| Variable | Description |
|
|
||||||
| ----------------------- | --------------------------------------------------------------------------- |
|
|
||||||
| `API_UPLOAD_TOKEN` | Global upload token (`Auth-Token` header); can be generated in the API page |
|
|
||||||
| `ALLOWED_REFERER_HOSTS` | Hotlink allowlist (comma-separated hostnames) |
|
|
||||||
| `IMAGE_BASE_URL` | Public base URL for image links |
|
|
||||||
| `WEBP_QUALITY` | Server WebP quality 1–100, default 80 |
|
|
||||||
| `AUTO_DELETE_DAYS` | Global auto-delete days (0 = off); admin + orphan images only |
|
|
||||||
| `DATA_DIR` | Data directory, default `/data` (container) or `./data` (local) |
|
|
||||||
| `ADMIN_SECRET` | Legacy v1.0 migration only |
|
|
||||||
| `DEV_BYPASS_ACCESS` | Dev only — bypass auth (never in production) |
|
|
||||||
|
|
||||||
Environment variables override database settings. See [`.env.example`](.env.example).
|
|
||||||
|
|
||||||
## Users & permissions
|
## Users & permissions
|
||||||
|
|
||||||
| Scenario | Auth | Ownership / visibility |
|
| Scenario | Auth | Ownership / visibility |
|
||||||
@@ -137,13 +136,13 @@ Regular users are limited to the `images/` folder; custom `folder` requires admi
|
|||||||
|
|
||||||
```
|
```
|
||||||
/data
|
/data
|
||||||
├── pichost.db # SQLite: users, sessions, settings, logs
|
├── pichost.db # SQLite: users, sessions, settings, storage_backends, images index
|
||||||
├── images/ # Default upload folder
|
├── images/ # Default upload folder (when using local backend)
|
||||||
├── blog/ # Example custom folder
|
├── blog/ # Example custom folder
|
||||||
└── twikoo/ # Twikoo comment images
|
└── twikoo/ # Twikoo comment images
|
||||||
```
|
```
|
||||||
|
|
||||||
Pattern: `folder/YYYY/MM/randomId.webp` + `.meta.json`. Back up the entire `/data` directory.
|
Pattern: `folder/YYYY/MM/randomId.webp` + `.meta.json`. With cloud backends, blobs live in the bucket; SQLite `images` tracks `backend_id` and `key`. Back up all of `/data` plus bucket data.
|
||||||
|
|
||||||
## API overview
|
## API overview
|
||||||
|
|
||||||
@@ -194,11 +193,13 @@ npm test # Unit tests
|
|||||||
|
|
||||||
| Version | Plan |
|
| Version | Plan |
|
||||||
| ---------- | -------------------------------------------------------------- |
|
| ---------- | -------------------------------------------------------------- |
|
||||||
| **v1.0.3** | CI and Docker multi-arch build fixes (current) |
|
| **v1.1.1** | Session check fixes, storage placeholder cleanup, Docker logging (current `main`) |
|
||||||
|
| **v1.1.0** | Multi-backend object storage, hybrid URLs, storage UI |
|
||||||
|
| **v1.0.4** | Password visibility toggle, legacy ADMIN_SECRET migration |
|
||||||
|
| **v1.0.3** | CI and Docker multi-arch build fixes |
|
||||||
| **v1.0.2** | i18n, mobile menus, stats/upload UI, Docker password reset |
|
| **v1.0.2** | i18n, mobile menus, stats/upload UI, Docker password reset |
|
||||||
| **v1.0.1** | Settings version display, mobile upload preferences layout fix |
|
| **v1.0.1** | Settings version display, mobile upload preferences layout fix |
|
||||||
| **v1.0.0** | Local storage, multi-user, API, Twikoo |
|
| **v1.0.0** | Local storage, multi-user, API, Twikoo |
|
||||||
| **v1.1.0** | S3, Cloudflare R2, and more object storage backends |
|
|
||||||
|
|
||||||
## License
|
## License
|
||||||
|
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
<p align="center"><strong>个人轻量图床</strong> · 图片放好，管理也要顺手</p>
|
<p align="center"><strong>个人轻量图床</strong> · 图片放好，管理也要顺手</p>
|
||||||
|
|
||||||
<p align="center">自托管图床 / 多用户 / Docker / API / Twikoo · 零配置引导</p>
|
<p align="center">自托管图床 / 多用户 / Docker / API / Twikoo · 本地磁盘或对象存储</p>
|
||||||
|
|
||||||
<p align="center">
|
<p align="center">
|
||||||
<a href="https://github.com/O96u/PicHost/blob/main/package.json"><img src="https://img.shields.io/github/package-json/v/O96u/PicHost?style=flat-square&color=22c55e" alt="version" /></a>
|
<a href="https://github.com/O96u/PicHost/blob/main/package.json"><img src="https://img.shields.io/github/package-json/v/O96u/PicHost?style=flat-square&color=22c55e" alt="version" /></a>
|
||||||
@@ -17,6 +17,7 @@
|
|||||||
</p>
|
</p>
|
||||||
|
|
||||||
<p align="center">
|
<p align="center">
|
||||||
|
<a href="#分支">分支</a> ·
|
||||||
<a href="#快速开始">快速开始</a> ·
|
<a href="#快速开始">快速开始</a> ·
|
||||||
<a href="#界面预览">预览</a> ·
|
<a href="#界面预览">预览</a> ·
|
||||||
<a href="#特性">特性</a> ·
|
<a href="#特性">特性</a> ·
|
||||||
@@ -27,26 +28,43 @@
|
|||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
## 分支
|
||||||
|
|
||||||
|
| 分支 | 说明 |
|
||||||
|
| ---- | ---- |
|
||||||
|
| [**main**](https://github.com/O96u/PicHost/tree/main)（默认） | **v1.1.1** 主线：本地磁盘 + 多对象存储后端（R2 / COS / OSS / AWS）、[`/storage`](docs/README.md) 存储管理、混合直链 |
|
||||||
|
| [**cloudflare**](https://github.com/O96u/PicHost/tree/cloudflare) | **Cloudflare R2 专用线**：面向「只用 R2」的部署，预设与配置更聚焦 R2 |
|
||||||
|
|
||||||
|
日常使用、需要管理多种存储后端，请直接用 **main**。
|
||||||
|
|
||||||
|
若图床**只接 Cloudflare R2**、希望更简化的 R2 专用版本，可切换分支：
|
||||||
|
|
||||||
|
```bash
|
||||||
|
git clone https://github.com/O96u/PicHost.git
|
||||||
|
cd PicHost
|
||||||
|
git checkout cloudflare
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
## 界面预览
|
## 界面预览
|
||||||
|
|
||||||
| 登录 | 上传 |
|
| 上传 | 存储管理 |
|
||||||
| :---------------------------------: | :----------------------------------: |
|
| :-----------------------------------: | :-------------------------------------: |
|
||||||
|  |  |
|
|  |  |
|
||||||
|
|
||||||
| 上传偏好 | 统计与图库 |
|
| 统计与图库 | 系统设置 |
|
||||||
| :-------------------------------------------: | :---------------------------------: |
|
| :---------------------------------: | :-------------------------------------: |
|
||||||
|  |  |
|
|  |  |
|
||||||
|
|
||||||
| 系统设置 | |
|
|
||||||
| :------------------------------------: | :-: |
|
|
||||||
|  | |
|
|
||||||
|
|
||||||
## 特性
|
## 特性
|
||||||
|
|
||||||
- **拖拽 / 点击 / Ctrl+V 粘贴**上传；管理员可自定义 `folder` 目录
|
- **拖拽 / 点击 / Ctrl+V 粘贴**上传；管理员可自定义 `folder` 目录
|
||||||
- **服务端 WebP 压缩**（sharp）、Referer 防盗链、可配置访问域名
|
- **服务端 WebP 压缩**（sharp）、Referer 防盗链、可配置访问域名
|
||||||
- **多用户**：账号密码登录；管理员可开放注册；普通用户仅见自己的图片
|
- **多用户**：账号密码登录；管理员可开放注册；普通用户仅见自己的图片
|
||||||
- **上传偏好**（卡片翻转设置）：客户端预压缩、自动复制链接、按用户自动删除
|
- **上传偏好**（首页卡片翻转）：客户端预压缩、自动复制链接、按用户自动删除
|
||||||
|
- **多后端存储**：本地磁盘 + S3 兼容（Cloudflare R2 / 腾讯云 COS / 阿里云 OSS / AWS S3）；管理员在 **存储**（`/storage`）页管理，新上传写入默认后端
|
||||||
|
- **混合直链**：`proxy`（PicHost 同源代理）或 `public`（302 到 CDN / 桶公网地址）
|
||||||
- **图库**：浏览、搜索、批量删除；管理员可查看上传者标签
|
- **图库**：浏览、搜索、批量删除；管理员可查看上传者标签
|
||||||
- **统计**：上传/删除趋势、目录分布；管理员额外显示注册用户数量
|
- **统计**：上传/删除趋势、目录分布；管理员额外显示注册用户数量
|
||||||
- **API**：全局 Token（管理员）+ 每用户个人 Token；后台可复制 cURL
|
- **API**：全局 Token（管理员）+ 每用户个人 Token；后台可复制 cURL
|
||||||
@@ -94,10 +112,6 @@ npm run dev
|
|||||||
|
|
||||||
访问 `http://localhost:3000/setup` 创建管理员；数据目录默认 `./data`。
|
访问 `http://localhost:3000/setup` 创建管理员；数据目录默认 `./data`。
|
||||||
|
|
||||||
### 遗留部署迁移
|
|
||||||
|
|
||||||
若旧版仅配置了 `ADMIN_SECRET`、尚无用户表，可用密钥登录一次，Web 引导迁移为账号密码。
|
|
||||||
|
|
||||||
## 技术栈
|
## 技术栈
|
||||||
|
|
||||||
| 层级 | 技术 |
|
| 层级 | 技术 |
|
||||||
@@ -106,25 +120,10 @@ npm run dev
|
|||||||
| 后端 | Nitro（Node.js）、SQLite |
|
| 后端 | Nitro（Node.js）、SQLite |
|
||||||
| 图片处理 | sharp（WebP 转码与压缩） |
|
| 图片处理 | sharp（WebP 转码与压缩） |
|
||||||
| 鉴权 | Session Cookie、scrypt 密码哈希、API Token |
|
| 鉴权 | Session Cookie、scrypt 密码哈希、API Token |
|
||||||
| 存储 | 本地磁盘（`DATA_DIR`） |
|
| 存储 | 本地磁盘 + S3 兼容后端（R2 / COS / OSS / AWS）；`images` 索引在 SQLite |
|
||||||
| 部署 | Docker（amd64 / arm64）、docker compose |
|
| 部署 | Docker（amd64 / arm64）、docker compose |
|
||||||
| 测试 | Vitest |
|
| 测试 | Vitest |
|
||||||
|
|
||||||
## 环境变量
|
|
||||||
|
|
||||||
| 变量 | 说明 |
|
|
||||||
| ----------------------- | ------------------------------------------------------------ |
|
|
||||||
| `API_UPLOAD_TOKEN` | 全局上传 Token（`Auth-Token` 头）；未配置可在后台 API 页生成 |
|
|
||||||
| `ALLOWED_REFERER_HOSTS` | 防盗链白名单（逗号分隔 hostname） |
|
|
||||||
| `IMAGE_BASE_URL` | 图片直链公网域名（反代时建议填写） |
|
|
||||||
| `WEBP_QUALITY` | 服务端 WebP 质量 1–100，默认 80 |
|
|
||||||
| `AUTO_DELETE_DAYS` | 全局自动删除天数（0 关闭）；仅影响管理员及无归属历史图 |
|
|
||||||
| `DATA_DIR` | 数据目录，默认 `/data`（容器）或 `./data`（本地） |
|
|
||||||
| `ADMIN_SECRET` | 仅遗留 v1.0 迁移，新安装不需要 |
|
|
||||||
| `DEV_BYPASS_ACCESS` | 开发用，跳过登录（生产勿开） |
|
|
||||||
|
|
||||||
环境变量优先级高于后台设置。详见 [`.env.example`](.env.example)。
|
|
||||||
|
|
||||||
## 用户与权限
|
## 用户与权限
|
||||||
|
|
||||||
| 场景 | 鉴权 | 图片归属 / 可见范围 |
|
| 场景 | 鉴权 | 图片归属 / 可见范围 |
|
||||||
@@ -142,13 +141,13 @@ npm run dev
|
|||||||
|
|
||||||
```
|
```
|
||||||
/data
|
/data
|
||||||
├── pichost.db # SQLite：用户、会话、设置、操作日志
|
├── pichost.db # SQLite：用户、会话、设置、storage_backends、images 索引
|
||||||
├── images/ # 默认上传目录
|
├── images/ # 默认上传目录（本地后端时）
|
||||||
├── blog/ # 管理员自定义 folder 示例
|
├── blog/ # 管理员自定义 folder 示例
|
||||||
└── twikoo/ # Twikoo 评论图片
|
└── twikoo/ # Twikoo 评论图片
|
||||||
```
|
```
|
||||||
|
|
||||||
路径规则：`目录/年/月/随机ID.webp` + 同名 `.meta.json`。备份整个 `/data` 即可。
|
路径规则：`目录/年/月/随机ID.webp` + 同名 `.meta.json`。云存储时文件在对应桶内，SQLite `images` 表记录 `backend_id` 与 `key`。备份请包含整个 `/data` 与云桶数据。
|
||||||
|
|
||||||
## API 概览
|
## API 概览
|
||||||
|
|
||||||
@@ -197,13 +196,15 @@ npm test # 单元测试
|
|||||||
|
|
||||||
## 路线图
|
## 路线图
|
||||||
|
|
||||||
| 版本 | 计划 |
|
| 版本 | 说明 |
|
||||||
| ---------- | ------------------------------------------------- |
|
| ---------- | ------------------------------------------------- |
|
||||||
| **v1.0.3** | CI 与 Docker 多架构构建修复（当前） |
|
| **v1.1.1** | 会话校验与存储占位修复、Docker 日志增强（当前 main） |
|
||||||
|
| **v1.1.0** | S3 / R2 多后端对象存储、混合直链、存储管理页 |
|
||||||
|
| **v1.0.4** | 密码显示切换、遗留 ADMIN_SECRET 迁移对齐 |
|
||||||
|
| **v1.0.3** | CI 与 Docker 多架构构建修复 |
|
||||||
| **v1.0.2** | 中英文、移动端菜单、统计/上传 UI、Docker 重置密码 |
|
| **v1.0.2** | 中英文、移动端菜单、统计/上传 UI、Docker 重置密码 |
|
||||||
| **v1.0.1** | 设置页版本展示、移动端上传偏好布局修复 |
|
| **v1.0.1** | 设置页版本展示、移动端上传偏好布局修复 |
|
||||||
| **v1.0.0** | 本地存储、多用户、API、Twikoo |
|
| **v1.0.0** | 本地存储、多用户、API、Twikoo |
|
||||||
| **v1.1.0** | S3、Cloudflare R2 等对象存储后端 |
|
|
||||||
|
|
||||||
## License
|
## License
|
||||||
|
|
||||||
|
|||||||
+13
-22
@@ -16,44 +16,35 @@ const navItems = computed(() => {
|
|||||||
{ label: t('nav.stats'), to: '/stats', icon: 'i-lucide-chart-column' }
|
{ label: t('nav.stats'), to: '/stats', icon: 'i-lucide-chart-column' }
|
||||||
]
|
]
|
||||||
if (isAdmin.value) {
|
if (isAdmin.value) {
|
||||||
|
items.push({ label: t('nav.storage'), to: '/storage', icon: 'i-lucide-hard-drive' })
|
||||||
items.push({ label: t('nav.settings'), to: '/settings', icon: 'i-lucide-settings' })
|
items.push({ label: t('nav.settings'), to: '/settings', icon: 'i-lucide-settings' })
|
||||||
}
|
}
|
||||||
return items
|
return items
|
||||||
})
|
})
|
||||||
|
|
||||||
const accountMenuItems = computed<DropdownMenuItem[]>(() => {
|
const accountMenuItems = computed<DropdownMenuItem[]>(() => [
|
||||||
const items: DropdownMenuItem[] = [
|
{
|
||||||
{
|
label: t('nav.changePassword'),
|
||||||
label: t('nav.changePassword'),
|
icon: 'i-lucide-key-round',
|
||||||
icon: 'i-lucide-key-round',
|
to: '/account/password'
|
||||||
to: '/account/password'
|
},
|
||||||
}
|
{
|
||||||
]
|
|
||||||
|
|
||||||
if (isAdmin.value) {
|
|
||||||
items.push({
|
|
||||||
label: t('nav.systemSettings'),
|
|
||||||
icon: 'i-lucide-settings',
|
|
||||||
to: '/settings'
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
items.push({
|
|
||||||
label: t('nav.logout'),
|
label: t('nav.logout'),
|
||||||
icon: 'i-lucide-log-out',
|
icon: 'i-lucide-log-out',
|
||||||
onSelect() {
|
onSelect() {
|
||||||
void handleLogout()
|
void handleLogout()
|
||||||
}
|
}
|
||||||
})
|
}
|
||||||
|
])
|
||||||
return items
|
|
||||||
})
|
|
||||||
|
|
||||||
const desktopUserMenuItems = computed<DropdownMenuItem[][]>(() => [
|
const desktopUserMenuItems = computed<DropdownMenuItem[][]>(() => [
|
||||||
accountMenuItems.value
|
accountMenuItems.value
|
||||||
])
|
])
|
||||||
|
|
||||||
function isNavActive(to: string) {
|
function isNavActive(to: string) {
|
||||||
|
if (to === '/settings') {
|
||||||
|
return route.path === '/settings'
|
||||||
|
}
|
||||||
return route.path.startsWith(to)
|
return route.path.startsWith(to)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
const open = defineModel<boolean>('open', { default: false })
|
const open = defineModel<boolean>('open', { default: false })
|
||||||
|
|
||||||
const { logout, isAdmin } = useAuth()
|
const { logout } = useAuth()
|
||||||
const { t, locale } = useI18n()
|
const { t, locale } = useI18n()
|
||||||
const colorMode = useColorMode()
|
const colorMode = useColorMode()
|
||||||
const {
|
const {
|
||||||
@@ -154,25 +154,6 @@ function toggleOpen() {
|
|||||||
/>
|
/>
|
||||||
</NuxtLink>
|
</NuxtLink>
|
||||||
|
|
||||||
<NuxtLink
|
|
||||||
v-if="isAdmin"
|
|
||||||
to="/settings"
|
|
||||||
class="flex items-center justify-between rounded-lg border border-default px-3.5 py-2.5 text-sm text-highlighted transition-colors hover:bg-elevated"
|
|
||||||
@click="open = false"
|
|
||||||
>
|
|
||||||
<span class="flex items-center gap-2.5">
|
|
||||||
<UIcon
|
|
||||||
name="i-lucide-settings"
|
|
||||||
class="size-4 opacity-70"
|
|
||||||
/>
|
|
||||||
{{ t('nav.systemSettings') }}
|
|
||||||
</span>
|
|
||||||
<UIcon
|
|
||||||
name="i-lucide-chevron-right"
|
|
||||||
class="size-4 text-muted"
|
|
||||||
/>
|
|
||||||
</NuxtLink>
|
|
||||||
|
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
class="flex w-full items-center justify-between rounded-lg border border-default px-3.5 py-2.5 text-sm text-error transition-colors hover:bg-error/5"
|
class="flex w-full items-center justify-between rounded-lg border border-default px-3.5 py-2.5 text-sm text-error transition-colors hover:bg-error/5"
|
||||||
|
|||||||
@@ -0,0 +1,215 @@
|
|||||||
|
<script setup lang="ts">
|
||||||
|
import type { StorageBackendItem } from '~/types/storage'
|
||||||
|
|
||||||
|
type CardAction = {
|
||||||
|
key: string
|
||||||
|
icon: string
|
||||||
|
label: string
|
||||||
|
shortLabel: string
|
||||||
|
danger?: boolean
|
||||||
|
disabled?: boolean
|
||||||
|
onClick: () => void
|
||||||
|
}
|
||||||
|
|
||||||
|
const props = defineProps<{
|
||||||
|
backend: StorageBackendItem
|
||||||
|
envOverride?: boolean
|
||||||
|
busy?: boolean
|
||||||
|
}>()
|
||||||
|
|
||||||
|
const emit = defineEmits<{
|
||||||
|
setDefault: []
|
||||||
|
edit: []
|
||||||
|
test: []
|
||||||
|
toggleEnabled: []
|
||||||
|
delete: []
|
||||||
|
}>()
|
||||||
|
|
||||||
|
const { t } = useI18n()
|
||||||
|
|
||||||
|
const typeIcon = computed(() =>
|
||||||
|
props.backend.type === 'local' ? 'i-lucide-hard-drive' : 'i-lucide-cloud'
|
||||||
|
)
|
||||||
|
|
||||||
|
const typeLabel = computed(() =>
|
||||||
|
props.backend.type === 'local' ? t('storage.backendLocal') : t('storage.backendCloud')
|
||||||
|
)
|
||||||
|
|
||||||
|
const servingLabel = computed(() =>
|
||||||
|
props.backend.servingMode === 'public'
|
||||||
|
? t('storage.servingPublic')
|
||||||
|
: t('storage.servingProxy')
|
||||||
|
)
|
||||||
|
|
||||||
|
const bucketLine = computed(() => {
|
||||||
|
if (props.backend.type !== 's3') return null
|
||||||
|
return props.backend.config.bucket || t('storage.notConfigured')
|
||||||
|
})
|
||||||
|
|
||||||
|
const actionsDisabled = computed(() => props.envOverride || props.busy)
|
||||||
|
|
||||||
|
const actions = computed<CardAction[]>(() => {
|
||||||
|
const isLocal = props.backend.type === 'local'
|
||||||
|
const items: CardAction[] = []
|
||||||
|
|
||||||
|
if (!props.backend.isDefault && props.backend.enabled) {
|
||||||
|
items.push({
|
||||||
|
key: 'default',
|
||||||
|
icon: 'i-lucide-star',
|
||||||
|
label: t('storage.setDefault'),
|
||||||
|
shortLabel: isLocal ? t('storage.setDefault') : t('storage.actionSetDefault'),
|
||||||
|
onClick: () => emit('setDefault')
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
if (props.backend.type === 's3') {
|
||||||
|
items.push({
|
||||||
|
key: 'edit',
|
||||||
|
icon: 'i-lucide-pencil',
|
||||||
|
label: t('common.edit'),
|
||||||
|
shortLabel: t('common.edit'),
|
||||||
|
onClick: () => emit('edit')
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
items.push({
|
||||||
|
key: 'test',
|
||||||
|
icon: 'i-lucide-plug-zap',
|
||||||
|
label: t('storage.testConnection'),
|
||||||
|
shortLabel: isLocal ? t('storage.testConnection') : t('storage.actionTest'),
|
||||||
|
onClick: () => emit('test')
|
||||||
|
})
|
||||||
|
|
||||||
|
if (props.backend.type !== 'local') {
|
||||||
|
items.push({
|
||||||
|
key: 'toggle',
|
||||||
|
icon: props.backend.enabled ? 'i-lucide-pause' : 'i-lucide-play',
|
||||||
|
label: props.backend.enabled ? t('storage.disable') : t('storage.enable'),
|
||||||
|
shortLabel: props.backend.enabled ? t('storage.disable') : t('storage.enable'),
|
||||||
|
disabled: props.backend.isDefault && props.backend.enabled,
|
||||||
|
onClick: () => emit('toggleEnabled')
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
if (props.backend.type !== 'local' && !props.backend.isDefault) {
|
||||||
|
items.push({
|
||||||
|
key: 'delete',
|
||||||
|
icon: 'i-lucide-trash-2',
|
||||||
|
label: t('common.delete'),
|
||||||
|
shortLabel: t('common.delete'),
|
||||||
|
danger: true,
|
||||||
|
onClick: () => emit('delete')
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
return items
|
||||||
|
})
|
||||||
|
|
||||||
|
const actionGridClass = computed(() => {
|
||||||
|
switch (actions.value.length) {
|
||||||
|
case 1: return 'grid-cols-1'
|
||||||
|
case 2: return 'grid-cols-2'
|
||||||
|
case 3: return 'grid-cols-3'
|
||||||
|
case 4: return 'grid-cols-4'
|
||||||
|
default: return 'grid-cols-5'
|
||||||
|
}
|
||||||
|
})
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<article
|
||||||
|
class="flex h-full flex-col rounded-2xl border border-default bg-elevated p-4 shadow-sm"
|
||||||
|
:class="{
|
||||||
|
'ring-2 ring-primary/30': backend.isDefault,
|
||||||
|
'opacity-75': !backend.enabled
|
||||||
|
}"
|
||||||
|
>
|
||||||
|
<div class="mb-3 flex items-start justify-between gap-2">
|
||||||
|
<div class="flex min-w-0 items-start gap-2.5">
|
||||||
|
<div
|
||||||
|
class="flex size-9 shrink-0 items-center justify-center rounded-lg bg-primary/10 text-primary"
|
||||||
|
>
|
||||||
|
<UIcon
|
||||||
|
:name="typeIcon"
|
||||||
|
class="size-4.5"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<div class="min-w-0">
|
||||||
|
<h3 class="truncate text-sm font-semibold">
|
||||||
|
{{ backend.name }}
|
||||||
|
</h3>
|
||||||
|
<p class="mt-0.5 text-xs text-muted">
|
||||||
|
{{ typeLabel }}
|
||||||
|
<template v-if="bucketLine">
|
||||||
|
· {{ bucketLine }}
|
||||||
|
</template>
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="flex shrink-0 flex-wrap justify-end gap-1">
|
||||||
|
<UBadge
|
||||||
|
v-if="backend.enabled"
|
||||||
|
color="success"
|
||||||
|
variant="subtle"
|
||||||
|
size="xs"
|
||||||
|
>
|
||||||
|
{{ t('storage.badgeEnabled') }}
|
||||||
|
</UBadge>
|
||||||
|
<UBadge
|
||||||
|
v-if="backend.isDefault"
|
||||||
|
color="primary"
|
||||||
|
variant="subtle"
|
||||||
|
size="xs"
|
||||||
|
>
|
||||||
|
{{ t('storage.badgeDefault') }}
|
||||||
|
</UBadge>
|
||||||
|
<UBadge
|
||||||
|
v-if="!backend.enabled"
|
||||||
|
color="warning"
|
||||||
|
variant="subtle"
|
||||||
|
size="xs"
|
||||||
|
>
|
||||||
|
{{ t('storage.badgeDisabled') }}
|
||||||
|
</UBadge>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<StorageUsageBar
|
||||||
|
:capacity="backend.capacity"
|
||||||
|
:index-bytes="backend.usage.bytes"
|
||||||
|
/>
|
||||||
|
|
||||||
|
<p class="mt-3 text-xs text-muted">
|
||||||
|
{{ t('storage.servingMode') }}: {{ servingLabel }}
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<div class="mt-4 border-t border-default pt-4">
|
||||||
|
<div
|
||||||
|
class="grid gap-1.5"
|
||||||
|
:class="actionGridClass"
|
||||||
|
>
|
||||||
|
<button
|
||||||
|
v-for="action in actions"
|
||||||
|
:key="action.key"
|
||||||
|
type="button"
|
||||||
|
class="flex flex-col items-center justify-center gap-1 rounded-lg border px-1 py-2 transition disabled:cursor-not-allowed disabled:opacity-40"
|
||||||
|
:class="action.danger
|
||||||
|
? 'border-error/30 text-error hover:bg-error/5'
|
||||||
|
: 'border-default text-muted hover:bg-muted/40 hover:text-highlighted'"
|
||||||
|
:title="action.label"
|
||||||
|
:aria-label="action.label"
|
||||||
|
:disabled="actionsDisabled || action.disabled"
|
||||||
|
@click="action.onClick"
|
||||||
|
>
|
||||||
|
<UIcon
|
||||||
|
:name="action.icon"
|
||||||
|
class="size-4 shrink-0"
|
||||||
|
/>
|
||||||
|
<span class="w-full truncate text-center text-[11px] leading-none">
|
||||||
|
{{ action.shortLabel }}
|
||||||
|
</span>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</article>
|
||||||
|
</template>
|
||||||
@@ -0,0 +1,330 @@
|
|||||||
|
<script setup lang="ts">
|
||||||
|
import type { QuotaUnit } from '~/composables/useFileSize'
|
||||||
|
import type { StorageBackendItem } from '~/types/storage'
|
||||||
|
|
||||||
|
type StorageProvider = 'r2' | 'cos' | 'oss' | 'aws' | 'custom'
|
||||||
|
|
||||||
|
export interface StorageFormPayload {
|
||||||
|
name: string
|
||||||
|
config: {
|
||||||
|
endpoint: string
|
||||||
|
region: string
|
||||||
|
bucket: string
|
||||||
|
prefix?: string
|
||||||
|
forcePathStyle: boolean
|
||||||
|
}
|
||||||
|
secrets: {
|
||||||
|
accessKeyId: string
|
||||||
|
secretAccessKey: string
|
||||||
|
}
|
||||||
|
servingMode: 'proxy' | 'public'
|
||||||
|
publicUrl: string
|
||||||
|
quotaValue: string
|
||||||
|
quotaUnit: QuotaUnit
|
||||||
|
}
|
||||||
|
|
||||||
|
const props = defineProps<{
|
||||||
|
backend?: StorageBackendItem | null
|
||||||
|
createMode?: boolean
|
||||||
|
saving?: boolean
|
||||||
|
}>()
|
||||||
|
|
||||||
|
const emit = defineEmits<{
|
||||||
|
submit: [payload: StorageFormPayload]
|
||||||
|
cancel: []
|
||||||
|
}>()
|
||||||
|
|
||||||
|
const { t } = useI18n()
|
||||||
|
const { bytesToQuotaInput, QUOTA_UNITS } = useFileSize()
|
||||||
|
|
||||||
|
const name = ref('')
|
||||||
|
const provider = ref<StorageProvider>('r2')
|
||||||
|
const endpoint = ref('')
|
||||||
|
const region = ref('auto')
|
||||||
|
const bucket = ref('')
|
||||||
|
const prefix = ref('')
|
||||||
|
const forcePathStyle = ref(false)
|
||||||
|
const accessKeyId = ref('')
|
||||||
|
const secretAccessKey = ref('')
|
||||||
|
const servingMode = ref<'proxy' | 'public'>('proxy')
|
||||||
|
const publicUrl = ref('')
|
||||||
|
const quotaValue = ref('')
|
||||||
|
const quotaUnit = ref<QuotaUnit>('GB')
|
||||||
|
|
||||||
|
const quotaUnitOptions = computed(() =>
|
||||||
|
QUOTA_UNITS.map(unit => ({ label: unit, value: unit }))
|
||||||
|
)
|
||||||
|
|
||||||
|
const providerOptions = computed(() => [
|
||||||
|
{ label: t('storage.providerR2'), value: 'r2' as const },
|
||||||
|
{ label: t('storage.providerCos'), value: 'cos' as const },
|
||||||
|
{ label: t('storage.providerOss'), value: 'oss' as const },
|
||||||
|
{ label: t('storage.providerAws'), value: 'aws' as const },
|
||||||
|
{ label: t('storage.providerCustom'), value: 'custom' as const }
|
||||||
|
])
|
||||||
|
|
||||||
|
const servingModeOptions = computed(() => [
|
||||||
|
{ label: t('storage.servingProxy'), value: 'proxy' },
|
||||||
|
{ label: t('storage.servingPublic'), value: 'public' }
|
||||||
|
])
|
||||||
|
|
||||||
|
function providerLabel(value: StorageProvider): string {
|
||||||
|
return providerOptions.value.find(option => option.value === value)?.label
|
||||||
|
?? t('storage.backendCloud')
|
||||||
|
}
|
||||||
|
|
||||||
|
function applyProviderTemplate(value: StorageProvider) {
|
||||||
|
if (!props.createMode && props.backend) return
|
||||||
|
if (props.createMode) {
|
||||||
|
name.value = providerLabel(value)
|
||||||
|
}
|
||||||
|
switch (value) {
|
||||||
|
case 'r2':
|
||||||
|
endpoint.value = 'https://{account_id}.r2.cloudflarestorage.com'
|
||||||
|
region.value = 'auto'
|
||||||
|
forcePathStyle.value = false
|
||||||
|
break
|
||||||
|
case 'cos':
|
||||||
|
endpoint.value = 'https://cos.{region}.myqcloud.com'
|
||||||
|
region.value = 'ap-guangzhou'
|
||||||
|
forcePathStyle.value = true
|
||||||
|
break
|
||||||
|
case 'oss':
|
||||||
|
endpoint.value = 'https://oss-{region}.aliyuncs.com'
|
||||||
|
region.value = 'cn-hangzhou'
|
||||||
|
forcePathStyle.value = false
|
||||||
|
break
|
||||||
|
case 'aws':
|
||||||
|
endpoint.value = 'https://s3.{region}.amazonaws.com'
|
||||||
|
region.value = 'us-east-1'
|
||||||
|
forcePathStyle.value = false
|
||||||
|
break
|
||||||
|
default:
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function detectProvider(config: StorageBackendItem['config']): StorageProvider {
|
||||||
|
const ep = config.endpoint ?? ''
|
||||||
|
if (ep.includes('r2.cloudflarestorage.com')) return 'r2'
|
||||||
|
if (ep.includes('myqcloud.com')) return 'cos'
|
||||||
|
if (ep.includes('aliyuncs.com')) return 'oss'
|
||||||
|
if (ep.includes('amazonaws.com')) return 'aws'
|
||||||
|
return 'custom'
|
||||||
|
}
|
||||||
|
|
||||||
|
function loadBackend(backend: StorageBackendItem | null | undefined) {
|
||||||
|
if (!backend || backend.type !== 's3') {
|
||||||
|
if (props.createMode) {
|
||||||
|
name.value = ''
|
||||||
|
provider.value = 'r2'
|
||||||
|
applyProviderTemplate('r2')
|
||||||
|
bucket.value = ''
|
||||||
|
prefix.value = ''
|
||||||
|
accessKeyId.value = ''
|
||||||
|
secretAccessKey.value = ''
|
||||||
|
servingMode.value = 'proxy'
|
||||||
|
publicUrl.value = ''
|
||||||
|
quotaValue.value = ''
|
||||||
|
quotaUnit.value = 'GB'
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
name.value = backend.name
|
||||||
|
provider.value = detectProvider(backend.config)
|
||||||
|
endpoint.value = backend.config.endpoint ?? ''
|
||||||
|
region.value = backend.config.region ?? 'auto'
|
||||||
|
bucket.value = backend.config.bucket ?? ''
|
||||||
|
prefix.value = backend.config.prefix ?? ''
|
||||||
|
forcePathStyle.value = backend.config.forcePathStyle ?? false
|
||||||
|
servingMode.value = backend.servingMode
|
||||||
|
publicUrl.value = backend.publicUrl
|
||||||
|
const quota = bytesToQuotaInput(backend.quotaBytes)
|
||||||
|
quotaValue.value = quota.value
|
||||||
|
quotaUnit.value = quota.unit
|
||||||
|
accessKeyId.value = ''
|
||||||
|
secretAccessKey.value = ''
|
||||||
|
}
|
||||||
|
|
||||||
|
watch(() => props.backend, loadBackend, { immediate: true })
|
||||||
|
|
||||||
|
watch(provider, (value) => {
|
||||||
|
if (props.createMode) {
|
||||||
|
applyProviderTemplate(value)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
function handleSubmit() {
|
||||||
|
emit('submit', {
|
||||||
|
name: name.value.trim() || providerLabel(provider.value),
|
||||||
|
config: {
|
||||||
|
endpoint: endpoint.value.trim(),
|
||||||
|
region: region.value.trim() || 'auto',
|
||||||
|
bucket: bucket.value.trim(),
|
||||||
|
prefix: prefix.value.trim() || undefined,
|
||||||
|
forcePathStyle: forcePathStyle.value
|
||||||
|
},
|
||||||
|
secrets: {
|
||||||
|
accessKeyId: accessKeyId.value.trim(),
|
||||||
|
secretAccessKey: secretAccessKey.value.trim()
|
||||||
|
},
|
||||||
|
servingMode: servingMode.value,
|
||||||
|
publicUrl: publicUrl.value.trim(),
|
||||||
|
quotaValue: String(quotaValue.value ?? '').trim(),
|
||||||
|
quotaUnit: quotaUnit.value
|
||||||
|
})
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<form
|
||||||
|
class="space-y-4"
|
||||||
|
@submit.prevent="handleSubmit"
|
||||||
|
>
|
||||||
|
<div class="space-y-2">
|
||||||
|
<label class="text-sm">{{ t('storage.provider') }}</label>
|
||||||
|
<USelect
|
||||||
|
v-model="provider"
|
||||||
|
:items="providerOptions"
|
||||||
|
class="w-full"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="space-y-2">
|
||||||
|
<label class="text-sm">{{ t('storage.backendName') }}</label>
|
||||||
|
<UInput
|
||||||
|
v-model="name"
|
||||||
|
class="w-full"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="space-y-2">
|
||||||
|
<label class="text-sm">{{ t('storage.endpoint') }}</label>
|
||||||
|
<UInput
|
||||||
|
v-model="endpoint"
|
||||||
|
class="w-full font-mono text-sm"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="grid gap-3 sm:grid-cols-2">
|
||||||
|
<div class="space-y-2">
|
||||||
|
<label class="text-sm">{{ t('storage.region') }}</label>
|
||||||
|
<UInput
|
||||||
|
v-model="region"
|
||||||
|
class="w-full font-mono text-sm"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<div class="space-y-2">
|
||||||
|
<label class="text-sm">{{ t('storage.bucket') }}</label>
|
||||||
|
<UInput
|
||||||
|
v-model="bucket"
|
||||||
|
class="w-full font-mono text-sm"
|
||||||
|
required
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="space-y-2">
|
||||||
|
<label class="text-sm">{{ t('storage.prefix') }}</label>
|
||||||
|
<UInput
|
||||||
|
v-model="prefix"
|
||||||
|
:placeholder="t('storage.prefixPlaceholder')"
|
||||||
|
class="w-full font-mono text-sm"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<label class="flex cursor-pointer items-center gap-2">
|
||||||
|
<UCheckbox v-model="forcePathStyle" />
|
||||||
|
<span class="text-sm">{{ t('storage.forcePathStyle') }}</span>
|
||||||
|
</label>
|
||||||
|
|
||||||
|
<div class="grid gap-3 sm:grid-cols-2">
|
||||||
|
<div class="space-y-2">
|
||||||
|
<label class="text-sm">{{ t('storage.accessKey') }}</label>
|
||||||
|
<UInput
|
||||||
|
v-model="accessKeyId"
|
||||||
|
:placeholder="backend?.secretsMasked.accessKeyId || ''"
|
||||||
|
class="w-full font-mono text-sm"
|
||||||
|
:required="createMode"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<div class="space-y-2">
|
||||||
|
<label class="text-sm">{{ t('storage.secretKey') }}</label>
|
||||||
|
<UInput
|
||||||
|
v-model="secretAccessKey"
|
||||||
|
type="password"
|
||||||
|
:placeholder="backend?.secretsMasked.secretAccessKey || ''"
|
||||||
|
class="w-full font-mono text-sm"
|
||||||
|
:required="createMode"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="space-y-2">
|
||||||
|
<label class="text-sm">{{ t('storage.servingMode') }}</label>
|
||||||
|
<URadioGroup
|
||||||
|
v-model="servingMode"
|
||||||
|
:items="servingModeOptions"
|
||||||
|
/>
|
||||||
|
<p class="text-xs text-muted">
|
||||||
|
{{ t('storage.servingHint') }}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div
|
||||||
|
v-if="servingMode === 'public'"
|
||||||
|
class="space-y-2"
|
||||||
|
>
|
||||||
|
<label class="text-sm">{{ t('storage.publicUrl') }}</label>
|
||||||
|
<UInput
|
||||||
|
v-model="publicUrl"
|
||||||
|
:placeholder="t('storage.publicUrlPlaceholder')"
|
||||||
|
class="w-full font-mono text-sm"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="space-y-2">
|
||||||
|
<label class="text-sm">
|
||||||
|
{{ t('storage.quotaTotal') }}
|
||||||
|
<span class="text-error">*</span>
|
||||||
|
</label>
|
||||||
|
<div class="flex gap-2">
|
||||||
|
<UInput
|
||||||
|
:model-value="String(quotaValue)"
|
||||||
|
type="number"
|
||||||
|
min="0"
|
||||||
|
step="any"
|
||||||
|
required
|
||||||
|
:placeholder="t('storage.quotaPlaceholder')"
|
||||||
|
class="min-w-0 flex-1"
|
||||||
|
@update:model-value="quotaValue = String($event ?? '')"
|
||||||
|
/>
|
||||||
|
<USelect
|
||||||
|
v-model="quotaUnit"
|
||||||
|
:items="quotaUnitOptions"
|
||||||
|
class="w-24 shrink-0"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<p class="text-xs text-muted">
|
||||||
|
{{ t('storage.quotaHint') }}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="flex justify-end gap-2 pt-2">
|
||||||
|
<UButton
|
||||||
|
type="button"
|
||||||
|
:label="t('common.cancel')"
|
||||||
|
variant="outline"
|
||||||
|
color="neutral"
|
||||||
|
@click="emit('cancel')"
|
||||||
|
/>
|
||||||
|
<UButton
|
||||||
|
type="submit"
|
||||||
|
:label="t('common.save')"
|
||||||
|
icon="i-lucide-save"
|
||||||
|
:loading="saving"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
</template>
|
||||||
@@ -0,0 +1,91 @@
|
|||||||
|
<script setup lang="ts">
|
||||||
|
import type { StorageCapacity } from '~/types/storage'
|
||||||
|
|
||||||
|
const props = defineProps<{
|
||||||
|
capacity: StorageCapacity
|
||||||
|
indexBytes: number
|
||||||
|
}>()
|
||||||
|
|
||||||
|
const { formatFileSize } = useFileSize()
|
||||||
|
|
||||||
|
const displayUsedBytes = computed(() =>
|
||||||
|
props.capacity.source === 'disk' ? props.capacity.usedBytes : props.indexBytes
|
||||||
|
)
|
||||||
|
|
||||||
|
const hasBar = computed(() =>
|
||||||
|
props.capacity.totalBytes != null && props.capacity.totalBytes > 0
|
||||||
|
)
|
||||||
|
|
||||||
|
const displayPercent = computed(() => props.capacity.percent ?? 0)
|
||||||
|
|
||||||
|
const overQuota = computed(() =>
|
||||||
|
props.capacity.source === 'quota' && displayPercent.value > 100
|
||||||
|
)
|
||||||
|
|
||||||
|
const barWidth = computed(() => {
|
||||||
|
if (!hasBar.value) return 0
|
||||||
|
const percent = Math.min(displayPercent.value, 100)
|
||||||
|
return Math.max(percent, displayUsedBytes.value > 0 ? 4 : 0)
|
||||||
|
})
|
||||||
|
|
||||||
|
function formatOptional(bytes: number | null): string {
|
||||||
|
if (bytes == null) return '—'
|
||||||
|
return formatFileSize(bytes)
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<div class="space-y-3">
|
||||||
|
<div class="grid grid-cols-3 gap-2 text-center text-xs">
|
||||||
|
<div class="rounded-lg bg-muted/30 px-2 py-2">
|
||||||
|
<p class="text-muted">
|
||||||
|
{{ $t('storage.statTotal') }}
|
||||||
|
</p>
|
||||||
|
<p class="mt-1 font-medium tabular-nums text-highlighted">
|
||||||
|
{{ formatOptional(capacity.totalBytes) }}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<div class="rounded-lg bg-muted/30 px-2 py-2">
|
||||||
|
<p class="text-muted">
|
||||||
|
{{ $t('storage.statUsed') }}
|
||||||
|
</p>
|
||||||
|
<p class="mt-1 font-medium tabular-nums text-highlighted">
|
||||||
|
{{ formatFileSize(displayUsedBytes) }}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<div class="rounded-lg bg-muted/30 px-2 py-2">
|
||||||
|
<p class="text-muted">
|
||||||
|
{{ $t('storage.statFree') }}
|
||||||
|
</p>
|
||||||
|
<p
|
||||||
|
class="mt-1 font-medium tabular-nums"
|
||||||
|
:class="overQuota ? 'text-error' : 'text-highlighted'"
|
||||||
|
>
|
||||||
|
{{ formatOptional(capacity.freeBytes) }}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div
|
||||||
|
v-if="hasBar"
|
||||||
|
class="space-y-1"
|
||||||
|
>
|
||||||
|
<div class="flex items-center justify-between text-xs">
|
||||||
|
<span class="text-muted">{{ $t('storage.usageRate') }}</span>
|
||||||
|
<span
|
||||||
|
class="tabular-nums font-medium"
|
||||||
|
:class="overQuota ? 'text-error' : ''"
|
||||||
|
>
|
||||||
|
{{ displayPercent }}%
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
<div class="h-1.5 overflow-hidden rounded-full bg-muted/50">
|
||||||
|
<div
|
||||||
|
class="h-full rounded-full transition-all"
|
||||||
|
:class="overQuota ? 'bg-error/80' : 'bg-primary/70'"
|
||||||
|
:style="{ width: `${barWidth}%` }"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
@@ -71,8 +71,10 @@ export function useAuth() {
|
|||||||
const status = useState<AuthStatus>('auth-status', () => 'checking')
|
const status = useState<AuthStatus>('auth-status', () => 'checking')
|
||||||
const user = useState<AuthUser | null>('auth-user', () => null)
|
const user = useState<AuthUser | null>('auth-user', () => null)
|
||||||
const authStatus = useState<AuthStatusResponse | null>('auth-status-response', () => null)
|
const authStatus = useState<AuthStatusResponse | null>('auth-status-response', () => null)
|
||||||
|
/** 是否已完成至少一次会话校验（用于避免路由切换时反复全屏 loading） */
|
||||||
|
const hasValidatedOnce = useState('auth-validated-once', () => false)
|
||||||
|
|
||||||
const isChecking = computed(() => status.value === 'checking')
|
const isChecking = computed(() => status.value === 'checking' && !hasValidatedOnce.value)
|
||||||
const isAuthenticated = computed(() => status.value === 'authenticated')
|
const isAuthenticated = computed(() => status.value === 'authenticated')
|
||||||
const isAdmin = computed(() => user.value?.role === 'admin')
|
const isAdmin = computed(() => user.value?.role === 'admin')
|
||||||
|
|
||||||
@@ -84,10 +86,14 @@ export function useAuth() {
|
|||||||
return data
|
return data
|
||||||
}
|
}
|
||||||
|
|
||||||
async function checkSession() {
|
async function checkSession(options?: { force?: boolean }) {
|
||||||
status.value = 'checking'
|
const silent = !options?.force && hasValidatedOnce.value
|
||||||
|
if (!silent) {
|
||||||
|
status.value = 'checking'
|
||||||
|
}
|
||||||
try {
|
try {
|
||||||
const data = await fetchStatus()
|
const data = await fetchStatus()
|
||||||
|
hasValidatedOnce.value = true
|
||||||
if (data.user) {
|
if (data.user) {
|
||||||
user.value = data.user
|
user.value = data.user
|
||||||
status.value = 'authenticated'
|
status.value = 'authenticated'
|
||||||
@@ -97,6 +103,7 @@ export function useAuth() {
|
|||||||
status.value = 'unauthenticated'
|
status.value = 'unauthenticated'
|
||||||
return false
|
return false
|
||||||
} catch {
|
} catch {
|
||||||
|
hasValidatedOnce.value = true
|
||||||
user.value = null
|
user.value = null
|
||||||
status.value = 'unauthenticated'
|
status.value = 'unauthenticated'
|
||||||
return false
|
return false
|
||||||
@@ -129,6 +136,7 @@ export function useAuth() {
|
|||||||
user.value = result.user
|
user.value = result.user
|
||||||
}
|
}
|
||||||
status.value = 'authenticated'
|
status.value = 'authenticated'
|
||||||
|
hasValidatedOnce.value = true
|
||||||
await fetchStatus()
|
await fetchStatus()
|
||||||
return { ok: true }
|
return { ok: true }
|
||||||
} catch (error: unknown) {
|
} catch (error: unknown) {
|
||||||
@@ -159,6 +167,7 @@ export function useAuth() {
|
|||||||
)
|
)
|
||||||
user.value = result.user
|
user.value = result.user
|
||||||
status.value = 'authenticated'
|
status.value = 'authenticated'
|
||||||
|
hasValidatedOnce.value = true
|
||||||
await fetchStatus()
|
await fetchStatus()
|
||||||
return { ok: true }
|
return { ok: true }
|
||||||
} catch (error: unknown) {
|
} catch (error: unknown) {
|
||||||
@@ -194,6 +203,7 @@ export function useAuth() {
|
|||||||
)
|
)
|
||||||
user.value = result.user
|
user.value = result.user
|
||||||
status.value = 'authenticated'
|
status.value = 'authenticated'
|
||||||
|
hasValidatedOnce.value = true
|
||||||
await fetchStatus()
|
await fetchStatus()
|
||||||
return { ok: true }
|
return { ok: true }
|
||||||
} catch (error: unknown) {
|
} catch (error: unknown) {
|
||||||
@@ -229,6 +239,7 @@ export function useAuth() {
|
|||||||
)
|
)
|
||||||
user.value = result.user
|
user.value = result.user
|
||||||
status.value = 'authenticated'
|
status.value = 'authenticated'
|
||||||
|
hasValidatedOnce.value = true
|
||||||
await fetchStatus()
|
await fetchStatus()
|
||||||
return { ok: true }
|
return { ok: true }
|
||||||
} catch (error: unknown) {
|
} catch (error: unknown) {
|
||||||
@@ -271,6 +282,7 @@ export function useAuth() {
|
|||||||
status.value = 'unauthenticated'
|
status.value = 'unauthenticated'
|
||||||
user.value = null
|
user.value = null
|
||||||
authStatus.value = null
|
authStatus.value = null
|
||||||
|
hasValidatedOnce.value = true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,10 +1,55 @@
|
|||||||
export function useFileSize() {
|
export const QUOTA_UNITS = ['KB', 'MB', 'GB', 'TB'] as const
|
||||||
function formatFileSize(bytes: number): string {
|
export type QuotaUnit = typeof QUOTA_UNITS[number]
|
||||||
if (!Number.isFinite(bytes) || bytes < 0) return '-'
|
|
||||||
if (bytes < 1024) return `${bytes} B`
|
export function formatFileSize(bytes: number): string {
|
||||||
if (bytes < 1024 * 1024) return `${(bytes / 1024).toFixed(1)} KB`
|
if (!Number.isFinite(bytes) || bytes < 0) return '-'
|
||||||
return `${(bytes / (1024 * 1024)).toFixed(2)} MB`
|
if (bytes === 0) return '0 B'
|
||||||
|
if (bytes < 1024) return `${bytes} B`
|
||||||
|
|
||||||
|
const units = ['KB', 'MB', 'GB', 'TB'] as const
|
||||||
|
let value = bytes / 1024
|
||||||
|
let unitIndex = 0
|
||||||
|
|
||||||
|
while (unitIndex < units.length - 1 && value >= 1024) {
|
||||||
|
value /= 1024
|
||||||
|
unitIndex++
|
||||||
}
|
}
|
||||||
|
|
||||||
return { formatFileSize }
|
const decimals = value >= 100 ? 0 : value >= 10 ? 1 : 2
|
||||||
|
return `${value.toFixed(decimals)} ${units[unitIndex]}`
|
||||||
|
}
|
||||||
|
|
||||||
|
export function bytesToQuotaInput(bytes: number | null): { value: string, unit: QuotaUnit } {
|
||||||
|
if (!bytes || bytes <= 0) {
|
||||||
|
return { value: '', unit: 'GB' }
|
||||||
|
}
|
||||||
|
|
||||||
|
let value = bytes / 1024
|
||||||
|
let unitIndex = 0
|
||||||
|
|
||||||
|
while (unitIndex < QUOTA_UNITS.length - 1 && value >= 1024) {
|
||||||
|
value /= 1024
|
||||||
|
unitIndex++
|
||||||
|
}
|
||||||
|
|
||||||
|
const decimals = value >= 100 ? 0 : value >= 10 ? 1 : 2
|
||||||
|
const rounded = Number(value.toFixed(decimals))
|
||||||
|
const unit: QuotaUnit = QUOTA_UNITS[unitIndex] ?? 'GB'
|
||||||
|
return { value: String(rounded), unit }
|
||||||
|
}
|
||||||
|
|
||||||
|
export function quotaToBytes(value: string | number, unit: QuotaUnit): number | null {
|
||||||
|
const trimmed = String(value ?? '').trim()
|
||||||
|
if (!trimmed) return null
|
||||||
|
const amount = Number(trimmed)
|
||||||
|
if (!Number.isFinite(amount) || amount <= 0) return null
|
||||||
|
|
||||||
|
const unitIndex = QUOTA_UNITS.indexOf(unit)
|
||||||
|
if (unitIndex < 0) return null
|
||||||
|
|
||||||
|
return Math.round(amount * 1024 ** (unitIndex + 1))
|
||||||
|
}
|
||||||
|
|
||||||
|
export function useFileSize() {
|
||||||
|
return { formatFileSize, bytesToQuotaInput, quotaToBytes, QUOTA_UNITS }
|
||||||
}
|
}
|
||||||
+5
-2
@@ -240,10 +240,13 @@ onMounted(async () => {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
await checkSession()
|
await checkSession()
|
||||||
|
if (isAuthenticated.value) {
|
||||||
|
await loadSettings()
|
||||||
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
watch(isAuthenticated, async (authed) => {
|
watch(isAuthenticated, async (authed, prev) => {
|
||||||
if (authed) {
|
if (authed && prev === false) {
|
||||||
await nextTick()
|
await nextTick()
|
||||||
await loadSettings()
|
await loadSettings()
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -161,11 +161,15 @@ onMounted(async () => {
|
|||||||
await checkSession()
|
await checkSession()
|
||||||
if (isAuthenticated.value && !isAdmin.value) {
|
if (isAuthenticated.value && !isAdmin.value) {
|
||||||
await navigateTo('/')
|
await navigateTo('/')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if (isAuthenticated.value && isAdmin.value) {
|
||||||
|
await loadPage()
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
watch(isAuthenticated, async (authed) => {
|
watch(isAuthenticated, async (authed, prev) => {
|
||||||
if (authed) {
|
if (authed && prev === false) {
|
||||||
if (!isAdmin.value) {
|
if (!isAdmin.value) {
|
||||||
await navigateTo('/')
|
await navigateTo('/')
|
||||||
return
|
return
|
||||||
@@ -316,6 +316,9 @@ onMounted(async () => {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
await checkSession()
|
await checkSession()
|
||||||
|
if (isAuthenticated.value) {
|
||||||
|
await refreshAll()
|
||||||
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
onUnmounted(() => {
|
onUnmounted(() => {
|
||||||
|
|||||||
@@ -0,0 +1,349 @@
|
|||||||
|
<script setup lang="ts">
|
||||||
|
import type { StorageFormPayload } from '~/components/storage/StorageBackendForm.vue'
|
||||||
|
import type { StorageBackendItem, StorageListResponse } from '~/types/storage'
|
||||||
|
|
||||||
|
const { isChecking, isAuthenticated, checkSession, handleAuthError, fetchStatus, isAdmin } = useAuth()
|
||||||
|
const toast = useToast()
|
||||||
|
const { t } = useI18n()
|
||||||
|
|
||||||
|
const loading = ref(true)
|
||||||
|
const busyId = ref<string | null>(null)
|
||||||
|
const storageData = ref<StorageListResponse | null>(null)
|
||||||
|
|
||||||
|
const formOpen = ref(false)
|
||||||
|
const formMode = ref<'create' | 'edit'>('create')
|
||||||
|
const editingBackend = ref<StorageBackendItem | null>(null)
|
||||||
|
const formInstanceKey = ref('create')
|
||||||
|
const savingForm = ref(false)
|
||||||
|
|
||||||
|
const deleteOpen = ref(false)
|
||||||
|
const deleteTarget = ref<StorageBackendItem | null>(null)
|
||||||
|
const deleting = ref(false)
|
||||||
|
|
||||||
|
async function loadStorage() {
|
||||||
|
loading.value = true
|
||||||
|
try {
|
||||||
|
storageData.value = await $fetch<StorageListResponse>('/api/admin/storage', {
|
||||||
|
credentials: 'include'
|
||||||
|
})
|
||||||
|
} catch (error: unknown) {
|
||||||
|
handleAuthError(error)
|
||||||
|
if (isAuthenticated.value) {
|
||||||
|
toast.add({ title: t('storage.loadFailed'), color: 'error' })
|
||||||
|
}
|
||||||
|
} finally {
|
||||||
|
loading.value = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const { quotaToBytes } = useFileSize()
|
||||||
|
|
||||||
|
function buildPatchBody(payload: StorageFormPayload) {
|
||||||
|
const quotaBytes = quotaToBytes(payload.quotaValue, payload.quotaUnit)
|
||||||
|
const body: Record<string, unknown> = {
|
||||||
|
name: payload.name,
|
||||||
|
servingMode: payload.servingMode,
|
||||||
|
publicUrl: payload.publicUrl,
|
||||||
|
quotaBytes,
|
||||||
|
config: payload.config
|
||||||
|
}
|
||||||
|
if (payload.secrets.accessKeyId || payload.secrets.secretAccessKey) {
|
||||||
|
body.secrets = payload.secrets
|
||||||
|
}
|
||||||
|
return body
|
||||||
|
}
|
||||||
|
|
||||||
|
function openCreate() {
|
||||||
|
formMode.value = 'create'
|
||||||
|
editingBackend.value = null
|
||||||
|
formInstanceKey.value = `create-${Date.now()}`
|
||||||
|
formOpen.value = true
|
||||||
|
}
|
||||||
|
|
||||||
|
function openEdit(backend: StorageBackendItem) {
|
||||||
|
formMode.value = 'edit'
|
||||||
|
editingBackend.value = backend
|
||||||
|
formInstanceKey.value = backend.id
|
||||||
|
formOpen.value = true
|
||||||
|
}
|
||||||
|
|
||||||
|
async function onFormSubmit(payload: StorageFormPayload) {
|
||||||
|
if (!quotaToBytes(payload.quotaValue, payload.quotaUnit)) {
|
||||||
|
toast.add({ title: t('storage.quotaRequired'), color: 'warning' })
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if (formMode.value === 'create') {
|
||||||
|
if (!payload.secrets.accessKeyId || !payload.secrets.secretAccessKey) {
|
||||||
|
toast.add({ title: t('storage.secretsRequired'), color: 'warning' })
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
savingForm.value = true
|
||||||
|
try {
|
||||||
|
const body = buildPatchBody(payload)
|
||||||
|
if (formMode.value === 'create') {
|
||||||
|
await $fetch('/api/admin/storage', {
|
||||||
|
method: 'POST',
|
||||||
|
credentials: 'include',
|
||||||
|
body
|
||||||
|
})
|
||||||
|
toast.add({ title: t('storage.created'), color: 'success' })
|
||||||
|
} else if (editingBackend.value) {
|
||||||
|
await $fetch(`/api/admin/storage/${editingBackend.value.id}`, {
|
||||||
|
method: 'PATCH',
|
||||||
|
credentials: 'include',
|
||||||
|
body
|
||||||
|
})
|
||||||
|
toast.add({ title: t('storage.saved'), color: 'success' })
|
||||||
|
}
|
||||||
|
formOpen.value = false
|
||||||
|
await loadStorage()
|
||||||
|
} catch {
|
||||||
|
toast.add({ title: t('storage.saveFailed'), color: 'error' })
|
||||||
|
} finally {
|
||||||
|
savingForm.value = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function setDefault(backend: StorageBackendItem) {
|
||||||
|
busyId.value = backend.id
|
||||||
|
try {
|
||||||
|
await $fetch(`/api/admin/storage/${backend.id}`, {
|
||||||
|
method: 'PATCH',
|
||||||
|
credentials: 'include',
|
||||||
|
body: { isDefault: true, enabled: true }
|
||||||
|
})
|
||||||
|
toast.add({ title: t('storage.defaultUpdated'), color: 'success' })
|
||||||
|
await loadStorage()
|
||||||
|
} catch {
|
||||||
|
toast.add({ title: t('storage.saveFailed'), color: 'error' })
|
||||||
|
} finally {
|
||||||
|
busyId.value = null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function testBackend(backend: StorageBackendItem) {
|
||||||
|
busyId.value = backend.id
|
||||||
|
try {
|
||||||
|
const result = await $fetch<{ ok: boolean, message: string }>(
|
||||||
|
`/api/admin/storage/${backend.id}/test`,
|
||||||
|
{ method: 'POST', credentials: 'include' }
|
||||||
|
)
|
||||||
|
toast.add({
|
||||||
|
title: result.ok ? t('storage.testSuccess') : t('storage.testFailed'),
|
||||||
|
description: result.message,
|
||||||
|
color: result.ok ? 'success' : 'error'
|
||||||
|
})
|
||||||
|
} catch {
|
||||||
|
toast.add({ title: t('storage.testFailed'), color: 'error' })
|
||||||
|
} finally {
|
||||||
|
busyId.value = null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function toggleEnabled(backend: StorageBackendItem) {
|
||||||
|
busyId.value = backend.id
|
||||||
|
try {
|
||||||
|
await $fetch(`/api/admin/storage/${backend.id}`, {
|
||||||
|
method: 'PATCH',
|
||||||
|
credentials: 'include',
|
||||||
|
body: { enabled: !backend.enabled }
|
||||||
|
})
|
||||||
|
await loadStorage()
|
||||||
|
} catch {
|
||||||
|
toast.add({ title: t('storage.saveFailed'), color: 'error' })
|
||||||
|
} finally {
|
||||||
|
busyId.value = null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function confirmDelete(backend: StorageBackendItem) {
|
||||||
|
if (backend.usage.count > 0) {
|
||||||
|
toast.add({ title: t('storage.deleteBlockedImages'), color: 'warning' })
|
||||||
|
return
|
||||||
|
}
|
||||||
|
deleteTarget.value = backend
|
||||||
|
deleteOpen.value = true
|
||||||
|
}
|
||||||
|
|
||||||
|
async function executeDelete() {
|
||||||
|
if (!deleteTarget.value) return
|
||||||
|
deleting.value = true
|
||||||
|
try {
|
||||||
|
await $fetch(`/api/admin/storage/${deleteTarget.value.id}`, {
|
||||||
|
method: 'DELETE',
|
||||||
|
credentials: 'include'
|
||||||
|
})
|
||||||
|
toast.add({ title: t('storage.deleted'), color: 'success' })
|
||||||
|
deleteOpen.value = false
|
||||||
|
deleteTarget.value = null
|
||||||
|
await loadStorage()
|
||||||
|
} catch (error: unknown) {
|
||||||
|
const message = typeof error === 'object' && error !== null && 'data' in error
|
||||||
|
? String((error as { data?: { message?: string } }).data?.message ?? '')
|
||||||
|
: ''
|
||||||
|
toast.add({
|
||||||
|
title: message || t('storage.deleteFailed'),
|
||||||
|
color: 'error'
|
||||||
|
})
|
||||||
|
} finally {
|
||||||
|
deleting.value = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
onMounted(async () => {
|
||||||
|
const status = await fetchStatus()
|
||||||
|
if (!status.initialized && !status.legacyMode) {
|
||||||
|
await navigateTo('/setup')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
await checkSession()
|
||||||
|
if (!isAuthenticated.value || !isAdmin.value) {
|
||||||
|
await navigateTo('/')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
await loadStorage()
|
||||||
|
})
|
||||||
|
|
||||||
|
watch(isAuthenticated, async (authed) => {
|
||||||
|
if (authed && isAdmin.value) {
|
||||||
|
await loadStorage()
|
||||||
|
}
|
||||||
|
})
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<div class="min-h-screen">
|
||||||
|
<div
|
||||||
|
v-if="isChecking"
|
||||||
|
class="flex min-h-screen items-center justify-center"
|
||||||
|
>
|
||||||
|
<UIcon
|
||||||
|
name="i-lucide-loader-circle"
|
||||||
|
class="size-8 animate-spin text-muted"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<AdminLoginGate v-else-if="!isAuthenticated" />
|
||||||
|
|
||||||
|
<AppShell v-else-if="isAdmin">
|
||||||
|
<section class="overflow-hidden rounded-2xl border border-default bg-elevated shadow-sm">
|
||||||
|
<div class="flex flex-wrap items-start justify-between gap-3 border-b border-default px-5 py-4 sm:px-6">
|
||||||
|
<div class="flex items-start gap-2">
|
||||||
|
<UIcon
|
||||||
|
name="i-lucide-hard-drive"
|
||||||
|
class="mt-0.5 size-5 shrink-0 text-primary"
|
||||||
|
/>
|
||||||
|
<div>
|
||||||
|
<h1 class="text-base font-semibold">
|
||||||
|
{{ t('storage.pageTitle') }}
|
||||||
|
</h1>
|
||||||
|
<p class="mt-0.5 text-xs text-muted">
|
||||||
|
{{ t('storage.pageSubtitle') }}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<UButton
|
||||||
|
:label="t('storage.addBackend')"
|
||||||
|
icon="i-lucide-plus"
|
||||||
|
size="sm"
|
||||||
|
:disabled="storageData?.envOverride"
|
||||||
|
@click="openCreate"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="p-5 sm:p-6">
|
||||||
|
<UAlert
|
||||||
|
v-if="storageData?.envOverride"
|
||||||
|
color="warning"
|
||||||
|
variant="subtle"
|
||||||
|
class="mb-5"
|
||||||
|
:title="t('storage.envOverride')"
|
||||||
|
icon="i-lucide-triangle-alert"
|
||||||
|
/>
|
||||||
|
|
||||||
|
<p class="mb-5 text-xs text-muted">
|
||||||
|
{{ t('storage.switchHint') }}
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<div
|
||||||
|
v-if="loading"
|
||||||
|
class="flex justify-center py-16"
|
||||||
|
>
|
||||||
|
<UIcon
|
||||||
|
name="i-lucide-loader-circle"
|
||||||
|
class="size-6 animate-spin text-muted"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div
|
||||||
|
v-else-if="storageData"
|
||||||
|
class="grid grid-cols-1 gap-4 md:grid-cols-2 xl:grid-cols-3"
|
||||||
|
>
|
||||||
|
<StorageBackendCard
|
||||||
|
v-for="backend in storageData.backends"
|
||||||
|
:key="backend.id"
|
||||||
|
:backend="backend"
|
||||||
|
:env-override="storageData.envOverride"
|
||||||
|
:busy="busyId === backend.id"
|
||||||
|
@set-default="setDefault(backend)"
|
||||||
|
@edit="openEdit(backend)"
|
||||||
|
@test="testBackend(backend)"
|
||||||
|
@toggle-enabled="toggleEnabled(backend)"
|
||||||
|
@delete="confirmDelete(backend)"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
</AppShell>
|
||||||
|
|
||||||
|
<UModal v-model:open="formOpen">
|
||||||
|
<template #content>
|
||||||
|
<div class="p-5 sm:p-6">
|
||||||
|
<h2 class="mb-4 text-base font-semibold">
|
||||||
|
{{ formMode === 'create' ? t('storage.addBackend') : t('storage.editBackend') }}
|
||||||
|
</h2>
|
||||||
|
<div class="max-h-[75vh] overflow-y-auto pr-1">
|
||||||
|
<StorageBackendForm
|
||||||
|
:key="formInstanceKey"
|
||||||
|
:backend="editingBackend"
|
||||||
|
:create-mode="formMode === 'create'"
|
||||||
|
:saving="savingForm"
|
||||||
|
@submit="onFormSubmit"
|
||||||
|
@cancel="formOpen = false"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
</UModal>
|
||||||
|
|
||||||
|
<UModal v-model:open="deleteOpen">
|
||||||
|
<template #content>
|
||||||
|
<div class="p-5 sm:p-6">
|
||||||
|
<h2 class="text-base font-semibold">
|
||||||
|
{{ t('storage.deleteConfirmTitle') }}
|
||||||
|
</h2>
|
||||||
|
<p class="mt-2 text-sm text-muted">
|
||||||
|
{{ t('storage.deleteConfirmBody', { name: deleteTarget?.name ?? '' }) }}
|
||||||
|
</p>
|
||||||
|
<div class="mt-5 flex justify-end gap-2">
|
||||||
|
<UButton
|
||||||
|
:label="t('common.cancel')"
|
||||||
|
variant="outline"
|
||||||
|
color="neutral"
|
||||||
|
@click="() => { deleteOpen = false }"
|
||||||
|
/>
|
||||||
|
<UButton
|
||||||
|
:label="t('common.delete')"
|
||||||
|
color="error"
|
||||||
|
:loading="deleting"
|
||||||
|
@click="executeDelete"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
</UModal>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
@@ -0,0 +1,39 @@
|
|||||||
|
export type ServingMode = 'proxy' | 'public'
|
||||||
|
|
||||||
|
export interface StorageCapacity {
|
||||||
|
totalBytes: number | null
|
||||||
|
usedBytes: number
|
||||||
|
freeBytes: number | null
|
||||||
|
percent: number | null
|
||||||
|
source: 'disk' | 'quota'
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface StorageBackendItem {
|
||||||
|
id: string
|
||||||
|
name: string
|
||||||
|
type: 'local' | 's3'
|
||||||
|
config: {
|
||||||
|
endpoint?: string
|
||||||
|
region?: string
|
||||||
|
bucket?: string
|
||||||
|
prefix?: string
|
||||||
|
forcePathStyle?: boolean
|
||||||
|
}
|
||||||
|
secretsMasked: {
|
||||||
|
accessKeyId?: string
|
||||||
|
secretAccessKey?: string
|
||||||
|
}
|
||||||
|
servingMode: ServingMode
|
||||||
|
publicUrl: string
|
||||||
|
quotaBytes: number | null
|
||||||
|
enabled: boolean
|
||||||
|
isDefault: boolean
|
||||||
|
usage: { count: number, bytes: number }
|
||||||
|
capacity: StorageCapacity
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface StorageListResponse {
|
||||||
|
backends: StorageBackendItem[]
|
||||||
|
activeBackendId: string
|
||||||
|
envOverride: boolean
|
||||||
|
}
|
||||||
@@ -0,0 +1,53 @@
|
|||||||
|
# PicHost 文档资源
|
||||||
|
|
||||||
|
本目录主要存放 README 引用的界面截图与分支说明。
|
||||||
|
|
||||||
|
## 分支
|
||||||
|
|
||||||
|
| 分支 | 说明 |
|
||||||
|
| ---- | ---- |
|
||||||
|
| [**main**](https://github.com/O96u/PicHost/tree/main)（默认） | **v1.1.0** 主线：本地磁盘 + 多对象存储（R2 / COS / OSS / AWS）、`/storage` 管理页、混合直链 |
|
||||||
|
| [**cloudflare**](https://github.com/O96u/PicHost/tree/cloudflare) | **Cloudflare R2 专用线**：面向「只用 R2」的部署场景，配置更聚焦 R2 |
|
||||||
|
|
||||||
|
- 需要多种云存储或完整管理界面 → 使用 **main**
|
||||||
|
- 图床只接 **Cloudflare R2** → 可选用 **`cloudflare`** 分支
|
||||||
|
|
||||||
|
## 截图一览
|
||||||
|
|
||||||
|
以下为 **main（v1.1.0）** 界面截图。
|
||||||
|
|
||||||
|
| 文件 | 说明 |
|
||||||
|
| ---- | ---- |
|
||||||
|
| `screenshots/upload.png` | 首页上传区（顶栏含 API / 统计 / 存储 / 设置） |
|
||||||
|
| `screenshots/storage.png` | 存储管理（`/storage`）：多后端卡片、用量、设默认 |
|
||||||
|
| `screenshots/stats.png` | 统计与图库 |
|
||||||
|
| `screenshots/settings.png` | 系统设置（上传偏好 + 系统设置） |
|
||||||
|
| `screenshots/preferences.png` | 首页上传卡片翻转后的上传偏好 |
|
||||||
|
| `screenshots/login.png` | 登录页 |
|
||||||
|
|
||||||
|
## 相关页面路由（main / v1.1.0）
|
||||||
|
|
||||||
|
| 路由 | 权限 | 说明 |
|
||||||
|
| ---- | ---- | ---- |
|
||||||
|
| `/` | 登录用户 | 上传与图库入口 |
|
||||||
|
| `/storage` | 管理员 | 存储后端管理 |
|
||||||
|
| `/settings` | 管理员 | 系统设置 |
|
||||||
|
| `/stats` | 登录用户 | 统计 |
|
||||||
|
| `/api` | 登录用户 | API 文档与 Token |
|
||||||
|
|
||||||
|
管理员顶栏：**API** · **统计** · **存储** · **设置**。用户下拉菜单仅 **修改密码**、**退出登录**。
|
||||||
|
|
||||||
|
## Cloudflare R2 配置对照
|
||||||
|
|
||||||
|
**main**：后台 **存储 → 添加存储 → Cloudflare R2** 预设。
|
||||||
|
|
||||||
|
**cloudflare 分支**（R2 专用）：通常以环境变量为主：
|
||||||
|
|
||||||
|
| 配置项 | 值 |
|
||||||
|
| ------ | -- |
|
||||||
|
| `STORAGE_BACKEND` | `s3` |
|
||||||
|
| `S3_ENDPOINT` | `https://<account_id>.r2.cloudflarestorage.com` |
|
||||||
|
| `S3_REGION` | `auto` |
|
||||||
|
| `S3_BUCKET` | 桶名 |
|
||||||
|
| `S3_ACCESS_KEY` / `S3_SECRET_KEY` | R2 API Token |
|
||||||
|
| 直链 | 默认 PicHost 代理；桶绑域名后可改公开 URL |
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 60 KiB After Width: | Height: | Size: 75 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 52 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 24 KiB After Width: | Height: | Size: 37 KiB |
+84
-1
@@ -10,6 +10,7 @@
|
|||||||
"cancel": "Cancel",
|
"cancel": "Cancel",
|
||||||
"copy": "Copy",
|
"copy": "Copy",
|
||||||
"delete": "Delete",
|
"delete": "Delete",
|
||||||
|
"edit": "Edit",
|
||||||
"search": "Search",
|
"search": "Search",
|
||||||
"refresh": "Refresh",
|
"refresh": "Refresh",
|
||||||
"back": "Back",
|
"back": "Back",
|
||||||
@@ -17,12 +18,14 @@
|
|||||||
"notConfigured": "(not configured)",
|
"notConfigured": "(not configured)",
|
||||||
"countImages": "{count} images",
|
"countImages": "{count} images",
|
||||||
"itemsUnit": "items",
|
"itemsUnit": "items",
|
||||||
"imagesUnit": "images"
|
"imagesUnit": "images",
|
||||||
|
"more": "More"
|
||||||
},
|
},
|
||||||
"nav": {
|
"nav": {
|
||||||
"api": "API",
|
"api": "API",
|
||||||
"stats": "Stats",
|
"stats": "Stats",
|
||||||
"settings": "Settings",
|
"settings": "Settings",
|
||||||
|
"storage": "Storage",
|
||||||
"menu": "Menu",
|
"menu": "Menu",
|
||||||
"language": "Language",
|
"language": "Language",
|
||||||
"appearance": "Appearance",
|
"appearance": "Appearance",
|
||||||
@@ -191,6 +194,86 @@
|
|||||||
"saveFailed": "Failed to save settings",
|
"saveFailed": "Failed to save settings",
|
||||||
"loadFailed": "Failed to load settings"
|
"loadFailed": "Failed to load settings"
|
||||||
},
|
},
|
||||||
|
"storage": {
|
||||||
|
"title": "Storage",
|
||||||
|
"subtitle": "New uploads go to the active backend; existing images keep their backend",
|
||||||
|
"activeBackend": "Active backend",
|
||||||
|
"backendLocal": "Local disk",
|
||||||
|
"backendCloud": "Cloud storage",
|
||||||
|
"backendS3": "Cloud storage",
|
||||||
|
"switchHint": "Switching only affects new uploads",
|
||||||
|
"provider": "Preset",
|
||||||
|
"providerR2": "Cloudflare R2",
|
||||||
|
"providerCos": "Tencent COS",
|
||||||
|
"providerOss": "Alibaba OSS",
|
||||||
|
"providerAws": "AWS S3",
|
||||||
|
"providerCustom": "Custom",
|
||||||
|
"endpoint": "Endpoint",
|
||||||
|
"region": "Region",
|
||||||
|
"bucket": "Bucket",
|
||||||
|
"prefix": "Key prefix (optional)",
|
||||||
|
"prefixPlaceholder": "e.g. pichost",
|
||||||
|
"forcePathStyle": "Force path-style access",
|
||||||
|
"accessKey": "Access Key",
|
||||||
|
"secretKey": "Secret Key",
|
||||||
|
"servingMode": "Serving mode",
|
||||||
|
"servingProxy": "Proxy (same origin)",
|
||||||
|
"servingPublic": "Public URL (302 to CDN)",
|
||||||
|
"servingHint": "In public mode, configure referer protection on CDN/bucket",
|
||||||
|
"publicUrl": "Public base URL",
|
||||||
|
"publicUrlPlaceholder": "https://cdn.example.com",
|
||||||
|
"testConnection": "Test connection",
|
||||||
|
"testSuccess": "Connection successful",
|
||||||
|
"testFailed": "Connection failed",
|
||||||
|
"saved": "Storage settings saved",
|
||||||
|
"saveFailed": "Failed to save storage settings",
|
||||||
|
"loadFailed": "Failed to load storage settings",
|
||||||
|
"envOverride": "Storage is overridden by environment variables",
|
||||||
|
"pageTitle": "Storage management",
|
||||||
|
"pageSubtitle": "Manage backends; new uploads go to the default backend",
|
||||||
|
"addBackend": "Add storage",
|
||||||
|
"editBackend": "Edit storage",
|
||||||
|
"formCreateHint": "Configure cloud storage; set as default after saving to receive new uploads",
|
||||||
|
"formEditHint": "Update connection settings; leave keys blank to keep existing secrets",
|
||||||
|
"sectionBasic": "Basic",
|
||||||
|
"sectionConnection": "Connection",
|
||||||
|
"sectionCredentials": "Credentials",
|
||||||
|
"sectionAccess": "Access",
|
||||||
|
"sectionQuota": "Quota",
|
||||||
|
"advancedOptions": "Advanced",
|
||||||
|
"servingProxyShort": "Proxy",
|
||||||
|
"servingPublicShort": "Public",
|
||||||
|
"backendName": "Display name",
|
||||||
|
"badgeDefault": "Default",
|
||||||
|
"badgeDisabled": "Disabled",
|
||||||
|
"badgeEnabled": "Enabled",
|
||||||
|
"statTotal": "Total",
|
||||||
|
"statUsed": "Used",
|
||||||
|
"statFree": "Free",
|
||||||
|
"usageRate": "Usage",
|
||||||
|
"indexImages": "PicHost images {count} · {size}",
|
||||||
|
"setDefault": "Set as default",
|
||||||
|
"actionSetDefault": "Default",
|
||||||
|
"actionTest": "Test",
|
||||||
|
"disable": "Disable",
|
||||||
|
"enable": "Enable",
|
||||||
|
"usageCount": "{count} images",
|
||||||
|
"quotaTotal": "Plan size",
|
||||||
|
"quotaPlaceholder": "e.g. 10",
|
||||||
|
"quotaHint": "Enter your cloud plan size; used space is calculated from PicHost image index",
|
||||||
|
"quotaRequired": "Enter a valid plan size",
|
||||||
|
"notConfigured": "Not configured",
|
||||||
|
"created": "Storage backend added",
|
||||||
|
"deleted": "Storage backend deleted",
|
||||||
|
"deleteFailed": "Delete failed",
|
||||||
|
"deleteBlockedImages": "This backend still has images. Move or delete them before removing the backend.",
|
||||||
|
"defaultUpdated": "Default backend updated",
|
||||||
|
"deleteConfirmTitle": "Delete storage",
|
||||||
|
"deleteConfirmBody": "Delete “{name}”? This cannot be undone.",
|
||||||
|
"secretsRequired": "Access Key and Secret Key are required for new storage",
|
||||||
|
"manageStorage": "Manage object storage",
|
||||||
|
"manageStorageHint": "Configure R2 / S3 / COS backends and URL serving"
|
||||||
|
},
|
||||||
"stats": {
|
"stats": {
|
||||||
"title": "Statistics",
|
"title": "Statistics",
|
||||||
"subtitle": "Overview and gallery",
|
"subtitle": "Overview and gallery",
|
||||||
|
|||||||
+84
-1
@@ -10,6 +10,7 @@
|
|||||||
"cancel": "取消",
|
"cancel": "取消",
|
||||||
"copy": "复制",
|
"copy": "复制",
|
||||||
"delete": "删除",
|
"delete": "删除",
|
||||||
|
"edit": "编辑",
|
||||||
"search": "搜索",
|
"search": "搜索",
|
||||||
"refresh": "刷新",
|
"refresh": "刷新",
|
||||||
"back": "返回",
|
"back": "返回",
|
||||||
@@ -17,12 +18,14 @@
|
|||||||
"notConfigured": "（未配置）",
|
"notConfigured": "（未配置）",
|
||||||
"countImages": "{count} 张",
|
"countImages": "{count} 张",
|
||||||
"itemsUnit": "条",
|
"itemsUnit": "条",
|
||||||
"imagesUnit": "张"
|
"imagesUnit": "张",
|
||||||
|
"more": "更多"
|
||||||
},
|
},
|
||||||
"nav": {
|
"nav": {
|
||||||
"api": "API",
|
"api": "API",
|
||||||
"stats": "统计",
|
"stats": "统计",
|
||||||
"settings": "设置",
|
"settings": "设置",
|
||||||
|
"storage": "存储",
|
||||||
"menu": "菜单",
|
"menu": "菜单",
|
||||||
"language": "语言",
|
"language": "语言",
|
||||||
"appearance": "外观",
|
"appearance": "外观",
|
||||||
@@ -191,6 +194,86 @@
|
|||||||
"saveFailed": "保存服务器配置失败",
|
"saveFailed": "保存服务器配置失败",
|
||||||
"loadFailed": "加载设置失败"
|
"loadFailed": "加载设置失败"
|
||||||
},
|
},
|
||||||
|
"storage": {
|
||||||
|
"title": "存储设置",
|
||||||
|
"subtitle": "新上传写入活动后端；已有图片仍按原后端读取",
|
||||||
|
"activeBackend": "活动后端",
|
||||||
|
"backendLocal": "本地磁盘",
|
||||||
|
"backendCloud": "云存储",
|
||||||
|
"backendS3": "云存储",
|
||||||
|
"switchHint": "切换仅影响新上传，已有图片不受影响",
|
||||||
|
"provider": "预设",
|
||||||
|
"providerR2": "Cloudflare R2",
|
||||||
|
"providerCos": "腾讯云 COS",
|
||||||
|
"providerOss": "阿里云 OSS",
|
||||||
|
"providerAws": "AWS S3",
|
||||||
|
"providerCustom": "自定义",
|
||||||
|
"endpoint": "Endpoint",
|
||||||
|
"region": "Region",
|
||||||
|
"bucket": "Bucket",
|
||||||
|
"prefix": "对象前缀（可选）",
|
||||||
|
"prefixPlaceholder": "例如 pichost",
|
||||||
|
"forcePathStyle": "强制 Path-Style 访问",
|
||||||
|
"accessKey": "Access Key",
|
||||||
|
"secretKey": "Secret Key",
|
||||||
|
"servingMode": "访问方式",
|
||||||
|
"servingProxy": "代理（PicHost 同源）",
|
||||||
|
"servingPublic": "公开 URL（302 到 CDN）",
|
||||||
|
"servingHint": "公开模式下 Referer 防盗链需在 CDN/桶策略侧配置",
|
||||||
|
"publicUrl": "公开访问 URL",
|
||||||
|
"publicUrlPlaceholder": "https://cdn.example.com",
|
||||||
|
"testConnection": "测试连接",
|
||||||
|
"testSuccess": "连接成功",
|
||||||
|
"testFailed": "连接失败",
|
||||||
|
"saved": "存储配置已保存",
|
||||||
|
"saveFailed": "保存存储配置失败",
|
||||||
|
"loadFailed": "加载存储配置失败",
|
||||||
|
"envOverride": "存储配置已由环境变量覆盖，无法在后台修改",
|
||||||
|
"pageTitle": "存储管理",
|
||||||
|
"pageSubtitle": "管理多个存储后端，新上传写入默认后端",
|
||||||
|
"addBackend": "添加存储",
|
||||||
|
"editBackend": "编辑存储",
|
||||||
|
"formCreateHint": "配置云存储连接，保存后可设为默认写入目标",
|
||||||
|
"formEditHint": "修改连接信息；留空密钥则保持原值",
|
||||||
|
"sectionBasic": "基本信息",
|
||||||
|
"sectionConnection": "连接配置",
|
||||||
|
"sectionCredentials": "访问凭证",
|
||||||
|
"sectionAccess": "访问方式",
|
||||||
|
"sectionQuota": "容量配额",
|
||||||
|
"advancedOptions": "高级选项",
|
||||||
|
"servingProxyShort": "代理",
|
||||||
|
"servingPublicShort": "公开",
|
||||||
|
"backendName": "显示名称",
|
||||||
|
"badgeDefault": "默认",
|
||||||
|
"badgeDisabled": "已停用",
|
||||||
|
"badgeEnabled": "已启用",
|
||||||
|
"statTotal": "总量",
|
||||||
|
"statUsed": "已用",
|
||||||
|
"statFree": "剩余",
|
||||||
|
"usageRate": "使用率",
|
||||||
|
"indexImages": "PicHost 图片 {count} 张 · {size}",
|
||||||
|
"setDefault": "设为默认",
|
||||||
|
"actionSetDefault": "设默认",
|
||||||
|
"actionTest": "测试",
|
||||||
|
"disable": "停用",
|
||||||
|
"enable": "启用",
|
||||||
|
"usageCount": "{count} 张图片",
|
||||||
|
"quotaTotal": "套餐总量",
|
||||||
|
"quotaPlaceholder": "例如 10",
|
||||||
|
"quotaHint": "填写云存储套餐总量；已用按 PicHost 图片索引自动统计",
|
||||||
|
"quotaRequired": "请填写有效的套餐总量",
|
||||||
|
"notConfigured": "未配置",
|
||||||
|
"created": "存储后端已添加",
|
||||||
|
"deleted": "存储后端已删除",
|
||||||
|
"deleteFailed": "删除失败",
|
||||||
|
"deleteBlockedImages": "该后端仍有图片，请先迁移或删除图片后再删除",
|
||||||
|
"defaultUpdated": "默认后端已更新",
|
||||||
|
"deleteConfirmTitle": "删除存储",
|
||||||
|
"deleteConfirmBody": "确定删除「{name}」？此操作不可撤销。",
|
||||||
|
"secretsRequired": "新建存储需填写 Access Key 与 Secret Key",
|
||||||
|
"manageStorage": "管理对象存储",
|
||||||
|
"manageStorageHint": "配置 R2 / S3 / COS 等多后端与直链策略"
|
||||||
|
},
|
||||||
"stats": {
|
"stats": {
|
||||||
"title": "统计",
|
"title": "统计",
|
||||||
"subtitle": "数据概览与图库记录",
|
"subtitle": "数据概览与图库记录",
|
||||||
|
|||||||
Generated
+398
-2
@@ -1,15 +1,16 @@
|
|||||||
{
|
{
|
||||||
"name": "pichost",
|
"name": "pichost",
|
||||||
"version": "1.0.4",
|
"version": "1.1.1",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "pichost",
|
"name": "pichost",
|
||||||
"version": "1.0.4",
|
"version": "1.1.1",
|
||||||
"hasInstallScript": true,
|
"hasInstallScript": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
"@aws-sdk/client-s3": "^3.876.0",
|
||||||
"@iconify-json/lucide": "^1.2.114",
|
"@iconify-json/lucide": "^1.2.114",
|
||||||
"@nuxt/ui": "^4.9.0",
|
"@nuxt/ui": "^4.9.0",
|
||||||
"@nuxtjs/i18n": "^10.6.0",
|
"@nuxtjs/i18n": "^10.6.0",
|
||||||
@@ -70,6 +71,314 @@
|
|||||||
"@types/json-schema": "^7.0.15"
|
"@types/json-schema": "^7.0.15"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/@aws-sdk/checksums": {
|
||||||
|
"version": "3.1000.29",
|
||||||
|
"resolved": "https://registry.npmmirror.com/@aws-sdk/checksums/-/checksums-3.1000.29.tgz",
|
||||||
|
"integrity": "sha512-Dtu0gr4dnATZAPwEYbpCsG+MpLM7OAliy2gTepEFQwl1vZ6DL3QMH2FveMa3HLvPsOdhJsPRB3KtxVhph9T75A==",
|
||||||
|
"license": "Apache-2.0",
|
||||||
|
"dependencies": {
|
||||||
|
"@aws-sdk/core": "^3.977.9",
|
||||||
|
"@aws-sdk/types": "^3.974.5",
|
||||||
|
"@smithy/core": "^3.33.3",
|
||||||
|
"@smithy/types": "^4.17.2",
|
||||||
|
"tslib": "^2.6.2"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">=20.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@aws-sdk/client-s3": {
|
||||||
|
"version": "3.1118.0",
|
||||||
|
"resolved": "https://registry.npmmirror.com/@aws-sdk/client-s3/-/client-s3-3.1118.0.tgz",
|
||||||
|
"integrity": "sha512-nh46pLKeRNFvTOZAJMfYR7kZ/KzhSqzhXVIJSwl4jJ/b2D+KOXL2jeOCryOvGgwpUQo9YNWFUg63cm2qr5MX9g==",
|
||||||
|
"license": "Apache-2.0",
|
||||||
|
"dependencies": {
|
||||||
|
"@aws-sdk/checksums": "^3.1000.29",
|
||||||
|
"@aws-sdk/core": "^3.977.9",
|
||||||
|
"@aws-sdk/credential-provider-node": "^3.972.81",
|
||||||
|
"@aws-sdk/middleware-sdk-s3": "^3.972.75",
|
||||||
|
"@aws-sdk/signature-v4-multi-region": "^3.996.46",
|
||||||
|
"@aws-sdk/types": "^3.974.5",
|
||||||
|
"@smithy/core": "^3.33.3",
|
||||||
|
"@smithy/fetch-http-handler": "^5.7.2",
|
||||||
|
"@smithy/node-http-handler": "^4.11.3",
|
||||||
|
"@smithy/types": "^4.17.2",
|
||||||
|
"tslib": "^2.6.2"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">=20.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@aws-sdk/core": {
|
||||||
|
"version": "3.977.9",
|
||||||
|
"resolved": "https://registry.npmmirror.com/@aws-sdk/core/-/core-3.977.9.tgz",
|
||||||
|
"integrity": "sha512-reqPFEQrZxDZpeGj4PFMepBeR5LGYHRqq/L0motTzgFkCRBA4rFdaVXDSLYyGHhxVz7sT2PDnPN9CluGSfgyJA==",
|
||||||
|
"license": "Apache-2.0",
|
||||||
|
"dependencies": {
|
||||||
|
"@aws-sdk/types": "^3.974.5",
|
||||||
|
"@aws-sdk/xml-builder": "^3.972.40",
|
||||||
|
"@aws/lambda-invoke-store": "^0.3.0",
|
||||||
|
"@smithy/core": "^3.33.3",
|
||||||
|
"@smithy/signature-v4": "^5.6.12",
|
||||||
|
"@smithy/types": "^4.17.2",
|
||||||
|
"bowser": "^2.11.0",
|
||||||
|
"tslib": "^2.6.2"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">=20.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@aws-sdk/credential-provider-env": {
|
||||||
|
"version": "3.972.70",
|
||||||
|
"resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-env/-/credential-provider-env-3.972.70.tgz",
|
||||||
|
"integrity": "sha512-H404B7dJl2mCrBqahDEYsanB0xhdDp6tXnXcTUnXmmpy2Q3J0Ho0bUajZ2jr/RdwzCyS59Gi8xXIFwPLGBl6Uw==",
|
||||||
|
"license": "Apache-2.0",
|
||||||
|
"dependencies": {
|
||||||
|
"@aws-sdk/core": "^3.977.9",
|
||||||
|
"@aws-sdk/types": "^3.974.5",
|
||||||
|
"@smithy/core": "^3.33.3",
|
||||||
|
"@smithy/types": "^4.17.2",
|
||||||
|
"tslib": "^2.6.2"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">=20.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@aws-sdk/credential-provider-http": {
|
||||||
|
"version": "3.972.72",
|
||||||
|
"resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-http/-/credential-provider-http-3.972.72.tgz",
|
||||||
|
"integrity": "sha512-X98zYOrVOeuosCX+6ktf29FC2N2GHPLia7qv6mzPzTc+RPAuHWCDS++Z6JK7eGYqb/v6uaW7bAXaOvDBfol+0w==",
|
||||||
|
"license": "Apache-2.0",
|
||||||
|
"dependencies": {
|
||||||
|
"@aws-sdk/core": "^3.977.9",
|
||||||
|
"@aws-sdk/types": "^3.974.5",
|
||||||
|
"@smithy/core": "^3.33.3",
|
||||||
|
"@smithy/fetch-http-handler": "^5.7.2",
|
||||||
|
"@smithy/node-http-handler": "^4.11.3",
|
||||||
|
"@smithy/types": "^4.17.2",
|
||||||
|
"tslib": "^2.6.2"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">=20.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@aws-sdk/credential-provider-ini": {
|
||||||
|
"version": "3.973.15",
|
||||||
|
"resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.973.15.tgz",
|
||||||
|
"integrity": "sha512-Rykg6s5ceBuynMOGWgoowO4N+27JfnqXAnVaSunZl0hOO1XodSrxGNz6sCEbnmS0lAfQZDKyb3fbr46gSuv6Sg==",
|
||||||
|
"license": "Apache-2.0",
|
||||||
|
"dependencies": {
|
||||||
|
"@aws-sdk/core": "^3.977.9",
|
||||||
|
"@aws-sdk/credential-provider-env": "^3.972.70",
|
||||||
|
"@aws-sdk/credential-provider-http": "^3.972.72",
|
||||||
|
"@aws-sdk/credential-provider-login": "^3.972.77",
|
||||||
|
"@aws-sdk/credential-provider-process": "^3.972.70",
|
||||||
|
"@aws-sdk/credential-provider-sso": "^3.973.14",
|
||||||
|
"@aws-sdk/credential-provider-web-identity": "^3.972.76",
|
||||||
|
"@aws-sdk/nested-clients": "^3.997.44",
|
||||||
|
"@aws-sdk/types": "^3.974.5",
|
||||||
|
"@smithy/core": "^3.33.3",
|
||||||
|
"@smithy/credential-provider-imds": "^4.4.16",
|
||||||
|
"@smithy/types": "^4.17.2",
|
||||||
|
"tslib": "^2.6.2"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">=20.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@aws-sdk/credential-provider-login": {
|
||||||
|
"version": "3.972.77",
|
||||||
|
"resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-login/-/credential-provider-login-3.972.77.tgz",
|
||||||
|
"integrity": "sha512-Jb59xfEISoN5mmbnA+HYqdtrSX3CgCtJoof+V5D8/TgUI56W63GEEd5Y58WijU3Ou6+WEgaLD1feVzaRXV5IDQ==",
|
||||||
|
"license": "Apache-2.0",
|
||||||
|
"dependencies": {
|
||||||
|
"@aws-sdk/core": "^3.977.9",
|
||||||
|
"@aws-sdk/nested-clients": "^3.997.44",
|
||||||
|
"@aws-sdk/types": "^3.974.5",
|
||||||
|
"@smithy/core": "^3.33.3",
|
||||||
|
"@smithy/types": "^4.17.2",
|
||||||
|
"tslib": "^2.6.2"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">=20.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@aws-sdk/credential-provider-node": {
|
||||||
|
"version": "3.972.81",
|
||||||
|
"resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.972.81.tgz",
|
||||||
|
"integrity": "sha512-Rml+WitoFvXmv6JZ18U/xGdGDGGvB/mOin0ya0lTnTrdC0Z1lrVxTYh7iNklZBcvcRMrs4DoEf6xy1KWyrLQQw==",
|
||||||
|
"license": "Apache-2.0",
|
||||||
|
"dependencies": {
|
||||||
|
"@aws-sdk/credential-provider-env": "^3.972.70",
|
||||||
|
"@aws-sdk/credential-provider-http": "^3.972.72",
|
||||||
|
"@aws-sdk/credential-provider-ini": "^3.973.15",
|
||||||
|
"@aws-sdk/credential-provider-process": "^3.972.70",
|
||||||
|
"@aws-sdk/credential-provider-sso": "^3.973.14",
|
||||||
|
"@aws-sdk/credential-provider-web-identity": "^3.972.76",
|
||||||
|
"@aws-sdk/types": "^3.974.5",
|
||||||
|
"@smithy/core": "^3.33.3",
|
||||||
|
"@smithy/credential-provider-imds": "^4.4.16",
|
||||||
|
"@smithy/types": "^4.17.2",
|
||||||
|
"tslib": "^2.6.2"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">=20.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@aws-sdk/credential-provider-process": {
|
||||||
|
"version": "3.972.70",
|
||||||
|
"resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-process/-/credential-provider-process-3.972.70.tgz",
|
||||||
|
"integrity": "sha512-2ry03fGRJr4sV3jI+ocjj5JqALnFD6ymM5KiNCDZMvq8bX2GSbE0vji4aM43TVCl2nXqqLRZaUxdq/KeWRAY4Q==",
|
||||||
|
"license": "Apache-2.0",
|
||||||
|
"dependencies": {
|
||||||
|
"@aws-sdk/core": "^3.977.9",
|
||||||
|
"@aws-sdk/types": "^3.974.5",
|
||||||
|
"@smithy/core": "^3.33.3",
|
||||||
|
"@smithy/types": "^4.17.2",
|
||||||
|
"tslib": "^2.6.2"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">=20.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@aws-sdk/credential-provider-sso": {
|
||||||
|
"version": "3.973.14",
|
||||||
|
"resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.973.14.tgz",
|
||||||
|
"integrity": "sha512-jkhg/8ocAAoc0RFyLMhCw+/zZh7gystQgd4F4hznNa8P4Cc501PQmxd+jGLiMHodPJ+7Zv/3znM62gZojyasmA==",
|
||||||
|
"license": "Apache-2.0",
|
||||||
|
"dependencies": {
|
||||||
|
"@aws-sdk/core": "^3.977.9",
|
||||||
|
"@aws-sdk/nested-clients": "^3.997.44",
|
||||||
|
"@aws-sdk/token-providers": "3.1116.0",
|
||||||
|
"@aws-sdk/types": "^3.974.5",
|
||||||
|
"@smithy/core": "^3.33.3",
|
||||||
|
"@smithy/types": "^4.17.2",
|
||||||
|
"tslib": "^2.6.2"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">=20.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@aws-sdk/credential-provider-web-identity": {
|
||||||
|
"version": "3.972.76",
|
||||||
|
"resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.972.76.tgz",
|
||||||
|
"integrity": "sha512-d3AGyVu759PGr35mEB2s22xxlNEA5rpdxtSPJthfPFJvoQ8dt357iVPECqWfUxXp1toJAvKmbtcIYVGigaGsCA==",
|
||||||
|
"license": "Apache-2.0",
|
||||||
|
"dependencies": {
|
||||||
|
"@aws-sdk/core": "^3.977.9",
|
||||||
|
"@aws-sdk/nested-clients": "^3.997.44",
|
||||||
|
"@aws-sdk/types": "^3.974.5",
|
||||||
|
"@smithy/core": "^3.33.3",
|
||||||
|
"@smithy/types": "^4.17.2",
|
||||||
|
"tslib": "^2.6.2"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">=20.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@aws-sdk/middleware-sdk-s3": {
|
||||||
|
"version": "3.972.75",
|
||||||
|
"resolved": "https://registry.npmmirror.com/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.972.75.tgz",
|
||||||
|
"integrity": "sha512-wMIsNumRVKaNMKhvU/s9VrdEwE8S6gSzXp4RygFG5BEMnGkkXf8cjh8zf7cKJBpUDpqTWqwbz5isEgp9rH6Lng==",
|
||||||
|
"license": "Apache-2.0",
|
||||||
|
"dependencies": {
|
||||||
|
"@aws-sdk/core": "^3.977.9",
|
||||||
|
"@aws-sdk/signature-v4-multi-region": "^3.996.46",
|
||||||
|
"@aws-sdk/types": "^3.974.5",
|
||||||
|
"@smithy/core": "^3.33.3",
|
||||||
|
"@smithy/types": "^4.17.2",
|
||||||
|
"tslib": "^2.6.2"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">=20.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@aws-sdk/nested-clients": {
|
||||||
|
"version": "3.997.44",
|
||||||
|
"resolved": "https://registry.npmmirror.com/@aws-sdk/nested-clients/-/nested-clients-3.997.44.tgz",
|
||||||
|
"integrity": "sha512-NhEgryjlBF9w38ZXqGymQV28IhkYa1mKhlbYnqIis57AYwWGVYfUPgg/qC2rLRqOUfblxx++irvju10kVTa8Vw==",
|
||||||
|
"license": "Apache-2.0",
|
||||||
|
"dependencies": {
|
||||||
|
"@aws-sdk/core": "^3.977.9",
|
||||||
|
"@aws-sdk/signature-v4-multi-region": "^3.996.46",
|
||||||
|
"@aws-sdk/types": "^3.974.5",
|
||||||
|
"@smithy/core": "^3.33.3",
|
||||||
|
"@smithy/fetch-http-handler": "^5.7.2",
|
||||||
|
"@smithy/node-http-handler": "^4.11.3",
|
||||||
|
"@smithy/types": "^4.17.2",
|
||||||
|
"tslib": "^2.6.2"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">=20.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@aws-sdk/signature-v4-multi-region": {
|
||||||
|
"version": "3.996.46",
|
||||||
|
"resolved": "https://registry.npmmirror.com/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.996.46.tgz",
|
||||||
|
"integrity": "sha512-L+2xZTye/2T96f3lwCws0Zw6GG2JHZW9e8FpVgGBeeExSKyeoZ6CWRpBml/7DNiK/O26jrgPM9F+Ay8VkgzUWQ==",
|
||||||
|
"license": "Apache-2.0",
|
||||||
|
"dependencies": {
|
||||||
|
"@aws-sdk/types": "^3.974.5",
|
||||||
|
"@smithy/signature-v4": "^5.6.12",
|
||||||
|
"@smithy/types": "^4.17.2",
|
||||||
|
"tslib": "^2.6.2"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">=20.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@aws-sdk/token-providers": {
|
||||||
|
"version": "3.1116.0",
|
||||||
|
"resolved": "https://registry.npmmirror.com/@aws-sdk/token-providers/-/token-providers-3.1116.0.tgz",
|
||||||
|
"integrity": "sha512-ygIivKqh8aHzNkucOCXHyIBgBpLPfrSI0mCqXF+vLBsPTUKqj0VSqAY0GFPe7lQl4HntjOcQ+KSyS7oUV2C54Q==",
|
||||||
|
"license": "Apache-2.0",
|
||||||
|
"dependencies": {
|
||||||
|
"@aws-sdk/core": "^3.977.9",
|
||||||
|
"@aws-sdk/nested-clients": "^3.997.44",
|
||||||
|
"@aws-sdk/types": "^3.974.5",
|
||||||
|
"@smithy/core": "^3.33.3",
|
||||||
|
"@smithy/types": "^4.17.2",
|
||||||
|
"tslib": "^2.6.2"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">=20.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@aws-sdk/types": {
|
||||||
|
"version": "3.974.5",
|
||||||
|
"resolved": "https://registry.npmmirror.com/@aws-sdk/types/-/types-3.974.5.tgz",
|
||||||
|
"integrity": "sha512-LkwLL2BLbC6wNNm4JaH9mbEqBMdOZCct6VAYqhdN4U1xrWM+fUJQEfbHwQgDypapOWTRtlk25akb5afM0P8CIQ==",
|
||||||
|
"license": "Apache-2.0",
|
||||||
|
"dependencies": {
|
||||||
|
"@smithy/types": "^4.17.2",
|
||||||
|
"tslib": "^2.6.2"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">=20.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@aws-sdk/xml-builder": {
|
||||||
|
"version": "3.972.40",
|
||||||
|
"resolved": "https://registry.npmmirror.com/@aws-sdk/xml-builder/-/xml-builder-3.972.40.tgz",
|
||||||
|
"integrity": "sha512-wlFmCIGUlwF4zx/kncw+bmxTQh1HeSJq4mYV/V5cZUSJadDP3kXvGW8Rn21cimj/7y9ju+47oYWXi97vF7czaA==",
|
||||||
|
"license": "Apache-2.0",
|
||||||
|
"dependencies": {
|
||||||
|
"@smithy/types": "^4.17.2",
|
||||||
|
"tslib": "^2.6.2"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">=20.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@aws/lambda-invoke-store": {
|
||||||
|
"version": "0.3.0",
|
||||||
|
"resolved": "https://registry.npmmirror.com/@aws/lambda-invoke-store/-/lambda-invoke-store-0.3.0.tgz",
|
||||||
|
"integrity": "sha512-sl4Bm6yiMNYrZKkqqDFWN0UfnWhlS8ivKxrYl+6t0gCLrqr8y3B2IqZZbFRkfaVVp7C/baApyh71P+LeE1A2sQ==",
|
||||||
|
"license": "Apache-2.0",
|
||||||
|
"engines": {
|
||||||
|
"node": ">=18.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/@babel/code-frame": {
|
"node_modules/@babel/code-frame": {
|
||||||
"version": "7.29.7",
|
"version": "7.29.7",
|
||||||
"resolved": "https://registry.npmmirror.com/@babel/code-frame/-/code-frame-7.29.7.tgz",
|
"resolved": "https://registry.npmmirror.com/@babel/code-frame/-/code-frame-7.29.7.tgz",
|
||||||
@@ -6508,6 +6817,87 @@
|
|||||||
"url": "https://github.com/sponsors/sindresorhus"
|
"url": "https://github.com/sponsors/sindresorhus"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/@smithy/core": {
|
||||||
|
"version": "3.33.3",
|
||||||
|
"resolved": "https://registry.npmmirror.com/@smithy/core/-/core-3.33.3.tgz",
|
||||||
|
"integrity": "sha512-CsOeKq/9kA3y6VJHt+/+VTCtBaxJ4OTFpgrjIUhPpDIKxBci1k2bJaQASF2h/ELWrulGp+t97DZ0mevfAD8idg==",
|
||||||
|
"license": "Apache-2.0",
|
||||||
|
"dependencies": {
|
||||||
|
"@smithy/types": "^4.17.2",
|
||||||
|
"tslib": "^2.6.2"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">=18.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@smithy/credential-provider-imds": {
|
||||||
|
"version": "4.5.2",
|
||||||
|
"resolved": "https://registry.npmmirror.com/@smithy/credential-provider-imds/-/credential-provider-imds-4.5.2.tgz",
|
||||||
|
"integrity": "sha512-A9uSdn72ozbRUSit0eib0TW7nXuNPlaeM0zcGkJ+nE6tFcSDbnmtwoxbTCFBukVQcszDAyvsd7+rTduPTXpygg==",
|
||||||
|
"license": "Apache-2.0",
|
||||||
|
"dependencies": {
|
||||||
|
"@smithy/core": "^3.33.2",
|
||||||
|
"@smithy/types": "^4.17.2",
|
||||||
|
"tslib": "^2.6.2"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">=18.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@smithy/fetch-http-handler": {
|
||||||
|
"version": "5.7.2",
|
||||||
|
"resolved": "https://registry.npmmirror.com/@smithy/fetch-http-handler/-/fetch-http-handler-5.7.2.tgz",
|
||||||
|
"integrity": "sha512-nZyWTmSpJEXl6VtWVMBJve/7x12DZu6sIX1z1a+ZMaHlQQRs9Zpu6NbTe/gmxYXVRpkjxyDYpZ5gx2IM6f/Wkw==",
|
||||||
|
"license": "Apache-2.0",
|
||||||
|
"dependencies": {
|
||||||
|
"@smithy/core": "^3.33.2",
|
||||||
|
"@smithy/types": "^4.17.2",
|
||||||
|
"tslib": "^2.6.2"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">=18.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@smithy/node-http-handler": {
|
||||||
|
"version": "4.11.3",
|
||||||
|
"resolved": "https://registry.npmmirror.com/@smithy/node-http-handler/-/node-http-handler-4.11.3.tgz",
|
||||||
|
"integrity": "sha512-2jY1tSpERfPfWqyBV2pH+iGFaghVsIJszJNsT7hxtQYhVJpWDyc0LqOWI+nXOxOAHaEfZ4PXXtp1wW1TGpHhkA==",
|
||||||
|
"license": "Apache-2.0",
|
||||||
|
"dependencies": {
|
||||||
|
"@smithy/core": "^3.33.3",
|
||||||
|
"@smithy/types": "^4.17.2",
|
||||||
|
"tslib": "^2.6.2"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">=18.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@smithy/signature-v4": {
|
||||||
|
"version": "5.7.3",
|
||||||
|
"resolved": "https://registry.npmmirror.com/@smithy/signature-v4/-/signature-v4-5.7.3.tgz",
|
||||||
|
"integrity": "sha512-7ImGm+FkHRLcBaRttIAMZ6bzJZWb2cJGoYjq46F2UjycujWzrL9GEN9h4w7eQyXJYnltrUhxbbieBAIRrdqpow==",
|
||||||
|
"license": "Apache-2.0",
|
||||||
|
"dependencies": {
|
||||||
|
"@smithy/core": "^3.33.3",
|
||||||
|
"@smithy/types": "^4.17.2",
|
||||||
|
"tslib": "^2.6.2"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">=18.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@smithy/types": {
|
||||||
|
"version": "4.17.2",
|
||||||
|
"resolved": "https://registry.npmmirror.com/@smithy/types/-/types-4.17.2.tgz",
|
||||||
|
"integrity": "sha512-FOKpVZob9MPTn2znRzGrnsMHv7BOsKVw3XiP/cOyYLDVZ9qKp4nifIiSCuUU/fIj5Vu0UOAxCFr+qRAtG0NUkA==",
|
||||||
|
"license": "Apache-2.0",
|
||||||
|
"dependencies": {
|
||||||
|
"tslib": "^2.6.2"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">=18.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/@speed-highlight/core": {
|
"node_modules/@speed-highlight/core": {
|
||||||
"version": "1.2.17",
|
"version": "1.2.17",
|
||||||
"resolved": "https://registry.npmmirror.com/@speed-highlight/core/-/core-1.2.17.tgz",
|
"resolved": "https://registry.npmmirror.com/@speed-highlight/core/-/core-1.2.17.tgz",
|
||||||
@@ -9263,6 +9653,12 @@
|
|||||||
"integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==",
|
"integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==",
|
||||||
"license": "ISC"
|
"license": "ISC"
|
||||||
},
|
},
|
||||||
|
"node_modules/bowser": {
|
||||||
|
"version": "2.14.1",
|
||||||
|
"resolved": "https://registry.npmmirror.com/bowser/-/bowser-2.14.1.tgz",
|
||||||
|
"integrity": "sha512-tzPjzCxygAKWFOJP011oxFHs57HzIhOEracIgAePE4pqB3LikALKnSzUyU4MGs9/iCEUuHlAJTjTc5M+u7YEGg==",
|
||||||
|
"license": "MIT"
|
||||||
|
},
|
||||||
"node_modules/brace-expansion": {
|
"node_modules/brace-expansion": {
|
||||||
"version": "5.0.7",
|
"version": "5.0.7",
|
||||||
"resolved": "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-5.0.7.tgz",
|
"resolved": "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-5.0.7.tgz",
|
||||||
|
|||||||
+3
-2
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "pichost",
|
"name": "pichost",
|
||||||
"version": "1.0.4",
|
"version": "1.1.1",
|
||||||
"description": "Self-hosted image hosting for your NAS / home server — Nuxt admin UI, local disk storage, server-side WebP compression, referer protection, Twikoo/EasyImage compatible.",
|
"description": "Self-hosted image hosting for your NAS / home server — Nuxt admin UI, local disk or S3-compatible storage, server-side WebP compression, referer protection, Twikoo/EasyImage compatible.",
|
||||||
"homepage": "https://github.com/O96u/PicHost#readme",
|
"homepage": "https://github.com/O96u/PicHost#readme",
|
||||||
"repository": {
|
"repository": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
@@ -36,6 +36,7 @@
|
|||||||
"reset-password": "node server/cli/reset-password.mjs"
|
"reset-password": "node server/cli/reset-password.mjs"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
"@aws-sdk/client-s3": "^3.876.0",
|
||||||
"@iconify-json/lucide": "^1.2.114",
|
"@iconify-json/lucide": "^1.2.114",
|
||||||
"@nuxt/ui": "^4.9.0",
|
"@nuxt/ui": "^4.9.0",
|
||||||
"@nuxtjs/i18n": "^10.6.0",
|
"@nuxtjs/i18n": "^10.6.0",
|
||||||
|
|||||||
@@ -0,0 +1,146 @@
|
|||||||
|
#Requires -Version 5.1
|
||||||
|
<#
|
||||||
|
.SYNOPSIS
|
||||||
|
Assign userId to image .meta.json files that are missing it (shows as 系统/API).
|
||||||
|
|
||||||
|
.PARAMETER DataDir
|
||||||
|
PicHost data directory (contains images/, twikoo/, pichost.db). Default: ./data
|
||||||
|
|
||||||
|
.PARAMETER UserId
|
||||||
|
Target user id. If omitted, uses the first admin from pichost.db.
|
||||||
|
|
||||||
|
.PARAMETER Apply
|
||||||
|
Actually write files. Without this flag, only prints what would change (dry-run).
|
||||||
|
|
||||||
|
.EXAMPLE
|
||||||
|
cd D:\Ou\PicHost
|
||||||
|
.\scripts\assign-image-owner.ps1
|
||||||
|
|
||||||
|
.EXAMPLE
|
||||||
|
.\scripts\assign-image-owner.ps1 -DataDir D:\pic-host\data -Apply
|
||||||
|
|
||||||
|
.EXAMPLE
|
||||||
|
.\scripts\assign-image-owner.ps1 -UserId 1 -Apply
|
||||||
|
#>
|
||||||
|
[CmdletBinding()]
|
||||||
|
param(
|
||||||
|
[string] $DataDir = (Join-Path (Get-Location) 'data'),
|
||||||
|
[int] $UserId = 0,
|
||||||
|
[switch] $Apply
|
||||||
|
)
|
||||||
|
|
||||||
|
$ErrorActionPreference = 'Stop'
|
||||||
|
|
||||||
|
function Resolve-AdminUserId {
|
||||||
|
param([string] $DbPath)
|
||||||
|
|
||||||
|
if (-not (Test-Path -LiteralPath $DbPath)) {
|
||||||
|
Write-Warning "pichost.db not found at $DbPath; using UserId = 1"
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
|
||||||
|
$repoRoot = Split-Path -Parent $PSScriptRoot
|
||||||
|
$nodeFile = Join-Path $env:TEMP "pichost-read-admin-$PID.mjs"
|
||||||
|
@'
|
||||||
|
import { DatabaseSync } from "node:sqlite";
|
||||||
|
const db = new DatabaseSync(process.argv[2]);
|
||||||
|
const row = db.prepare("SELECT id FROM users WHERE role = 'admin' ORDER BY id ASC LIMIT 1").get();
|
||||||
|
if (!row) process.exit(2);
|
||||||
|
process.stdout.write(String(row.id));
|
||||||
|
db.close();
|
||||||
|
'@ | Set-Content -LiteralPath $nodeFile -Encoding utf8
|
||||||
|
|
||||||
|
Push-Location $repoRoot
|
||||||
|
try {
|
||||||
|
$output = & node $nodeFile $DbPath 2>&1
|
||||||
|
if ($LASTEXITCODE -eq 2) {
|
||||||
|
throw "No admin user in database. Run /setup first or pass -UserId explicitly."
|
||||||
|
}
|
||||||
|
if ($LASTEXITCODE -ne 0) {
|
||||||
|
throw "Failed to read admin from database: $output"
|
||||||
|
}
|
||||||
|
return [int]$output
|
||||||
|
}
|
||||||
|
finally {
|
||||||
|
Pop-Location
|
||||||
|
Remove-Item -LiteralPath $nodeFile -ErrorAction SilentlyContinue
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function Read-MetaJson {
|
||||||
|
param([string] $Path)
|
||||||
|
$raw = [System.IO.File]::ReadAllText($Path, [System.Text.UTF8Encoding]::new($false))
|
||||||
|
return $raw | ConvertFrom-Json
|
||||||
|
}
|
||||||
|
|
||||||
|
function Write-MetaJson {
|
||||||
|
param(
|
||||||
|
[string] $Path,
|
||||||
|
[object] $Meta
|
||||||
|
)
|
||||||
|
# Compact single-line JSON, same style as PicHost putImage()
|
||||||
|
$json = $Meta | ConvertTo-Json -Compress -Depth 10
|
||||||
|
$utf8 = [System.Text.UTF8Encoding]::new($false)
|
||||||
|
[System.IO.File]::WriteAllText($Path, $json, $utf8)
|
||||||
|
}
|
||||||
|
|
||||||
|
if (-not (Test-Path -LiteralPath $DataDir)) {
|
||||||
|
throw "DataDir not found: $DataDir"
|
||||||
|
}
|
||||||
|
|
||||||
|
$resolved = Resolve-Path -LiteralPath $DataDir
|
||||||
|
$DataDir = if ($resolved.ProviderPath) { $resolved.ProviderPath } else { $resolved.Path }
|
||||||
|
|
||||||
|
if ($UserId -le 0) {
|
||||||
|
$UserId = Resolve-AdminUserId -DbPath (Join-Path $DataDir 'pichost.db')
|
||||||
|
}
|
||||||
|
|
||||||
|
Write-Host "DataDir : $DataDir"
|
||||||
|
Write-Host "UserId : $UserId"
|
||||||
|
Write-Host "Mode : $(if ($Apply) { 'APPLY (will modify files)' } else { 'DRY-RUN (pass -Apply to write)' })"
|
||||||
|
Write-Host ''
|
||||||
|
|
||||||
|
$metaFiles = Get-ChildItem -LiteralPath $DataDir -Recurse -File -Filter '*.meta.json' |
|
||||||
|
Where-Object { $_.Name -notlike 'pichost.db*' }
|
||||||
|
|
||||||
|
if (-not $metaFiles) {
|
||||||
|
Write-Host 'No .meta.json files found under DataDir.'
|
||||||
|
exit 0
|
||||||
|
}
|
||||||
|
|
||||||
|
$patched = 0
|
||||||
|
$skipped = 0
|
||||||
|
$errors = 0
|
||||||
|
|
||||||
|
foreach ($file in $metaFiles) {
|
||||||
|
try {
|
||||||
|
$meta = Read-MetaJson -Path $file.FullName
|
||||||
|
$current = $meta.PSObject.Properties['userId']
|
||||||
|
$hasUserId = $null -ne $current -and $null -ne $current.Value
|
||||||
|
|
||||||
|
if ($hasUserId) {
|
||||||
|
$skipped++
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
$relative = [System.IO.Path]::GetRelativePath($DataDir, $file.FullName)
|
||||||
|
Write-Host "[patch] $relative -> userId $UserId"
|
||||||
|
|
||||||
|
if ($Apply) {
|
||||||
|
$meta | Add-Member -NotePropertyName userId -NotePropertyValue $UserId -Force
|
||||||
|
Write-MetaJson -Path $file.FullName -Meta $meta
|
||||||
|
}
|
||||||
|
|
||||||
|
$patched++
|
||||||
|
}
|
||||||
|
catch {
|
||||||
|
$errors++
|
||||||
|
Write-Warning "Failed: $($file.FullName) — $_"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Write-Host ''
|
||||||
|
Write-Host "Done. patched=$patched skipped(already had userId)=$skipped errors=$errors"
|
||||||
|
if (-not $Apply -and $patched -gt 0) {
|
||||||
|
Write-Host 'Re-run with -Apply to write changes.'
|
||||||
|
}
|
||||||
@@ -0,0 +1,39 @@
|
|||||||
|
import { requireAdminAuth } from '../../../utils/access'
|
||||||
|
import { createApiError } from '../../../utils/api-error'
|
||||||
|
import {
|
||||||
|
deleteStorageBackend,
|
||||||
|
isStorageEnvConfigured,
|
||||||
|
LOCAL_BACKEND_ID
|
||||||
|
} from '../../../utils/storage-backends'
|
||||||
|
|
||||||
|
export default defineEventHandler(async (event) => {
|
||||||
|
await requireAdminAuth(event)
|
||||||
|
|
||||||
|
if (isStorageEnvConfigured()) {
|
||||||
|
createApiError(event, 'FORBIDDEN', '存储配置已由环境变量覆盖，无法在后台修改', 409)
|
||||||
|
}
|
||||||
|
|
||||||
|
const id = getRouterParam(event, 'id')
|
||||||
|
if (!id) {
|
||||||
|
createApiError(event, 'INVALID_REQUEST', '缺少存储后端 ID', 400)
|
||||||
|
}
|
||||||
|
|
||||||
|
if (id === LOCAL_BACKEND_ID) {
|
||||||
|
createApiError(event, 'INVALID_REQUEST', '本地磁盘后端不可删除', 400)
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
deleteStorageBackend(id)
|
||||||
|
} catch (error) {
|
||||||
|
const message = error instanceof Error ? error.message : '删除失败'
|
||||||
|
if (message.includes('stored images')) {
|
||||||
|
createApiError(event, 'INVALID_REQUEST', '该后端仍有图片，无法删除', 400)
|
||||||
|
}
|
||||||
|
if (message.includes('default backend')) {
|
||||||
|
createApiError(event, 'INVALID_REQUEST', '请先切换默认后端后再删除', 400)
|
||||||
|
}
|
||||||
|
createApiError(event, 'INVALID_REQUEST', message, 400)
|
||||||
|
}
|
||||||
|
|
||||||
|
return { success: true }
|
||||||
|
})
|
||||||
@@ -0,0 +1,129 @@
|
|||||||
|
import { requireAdminAuth } from '../../../utils/access'
|
||||||
|
import { createApiError } from '../../../utils/api-error'
|
||||||
|
import {
|
||||||
|
isStorageEnvConfigured,
|
||||||
|
LOCAL_BACKEND_ID,
|
||||||
|
updateStorageBackend,
|
||||||
|
getStorageBackendRow,
|
||||||
|
setDefaultBackend,
|
||||||
|
type StorageBackendPatch
|
||||||
|
} from '../../../utils/storage-backends'
|
||||||
|
import { parseS3Config, validateS3Config } from '../../../utils/storage/s3'
|
||||||
|
import { parseQuotaBytes } from '../../../utils/storage-capacity'
|
||||||
|
import type { ServingMode } from '../../../utils/storage/types'
|
||||||
|
|
||||||
|
interface StoragePatchBody {
|
||||||
|
name?: string
|
||||||
|
config?: {
|
||||||
|
endpoint?: string
|
||||||
|
region?: string
|
||||||
|
bucket?: string
|
||||||
|
prefix?: string
|
||||||
|
forcePathStyle?: boolean
|
||||||
|
}
|
||||||
|
secrets?: {
|
||||||
|
accessKeyId?: string
|
||||||
|
secretAccessKey?: string
|
||||||
|
}
|
||||||
|
servingMode?: ServingMode
|
||||||
|
publicUrl?: string
|
||||||
|
quotaBytes?: number | null
|
||||||
|
enabled?: boolean
|
||||||
|
isDefault?: boolean
|
||||||
|
}
|
||||||
|
|
||||||
|
export default defineEventHandler(async (event) => {
|
||||||
|
await requireAdminAuth(event)
|
||||||
|
|
||||||
|
if (isStorageEnvConfigured()) {
|
||||||
|
createApiError(event, 'FORBIDDEN', '存储配置已由环境变量覆盖，无法在后台修改', 409)
|
||||||
|
}
|
||||||
|
|
||||||
|
const id = getRouterParam(event, 'id')
|
||||||
|
if (!id) {
|
||||||
|
createApiError(event, 'INVALID_REQUEST', '缺少存储后端 ID', 400)
|
||||||
|
}
|
||||||
|
|
||||||
|
const row = getStorageBackendRow(id)
|
||||||
|
if (!row) {
|
||||||
|
createApiError(event, 'INVALID_REQUEST', '存储后端不存在', 404)
|
||||||
|
}
|
||||||
|
|
||||||
|
const body = await readBody<StoragePatchBody>(event).catch(
|
||||||
|
(): StoragePatchBody => ({})
|
||||||
|
)
|
||||||
|
|
||||||
|
if (id === LOCAL_BACKEND_ID && body.isDefault === false) {
|
||||||
|
createApiError(event, 'INVALID_REQUEST', '必须保留一个默认存储后端', 400)
|
||||||
|
}
|
||||||
|
|
||||||
|
const patch: StorageBackendPatch = {}
|
||||||
|
|
||||||
|
if (body.name !== undefined) {
|
||||||
|
patch.name = body.name.trim() || row.name
|
||||||
|
}
|
||||||
|
|
||||||
|
if (body.config !== undefined && row.type === 's3') {
|
||||||
|
const current = parseS3Config(row.config_json) ?? {
|
||||||
|
endpoint: '',
|
||||||
|
region: 'auto',
|
||||||
|
bucket: ''
|
||||||
|
}
|
||||||
|
const next = {
|
||||||
|
endpoint: body.config.endpoint?.trim() ?? current.endpoint,
|
||||||
|
region: body.config.region?.trim() ?? current.region,
|
||||||
|
bucket: body.config.bucket?.trim() ?? current.bucket,
|
||||||
|
prefix: body.config.prefix?.trim() || undefined,
|
||||||
|
forcePathStyle: body.config.forcePathStyle ?? current.forcePathStyle
|
||||||
|
}
|
||||||
|
const error = validateS3Config(next)
|
||||||
|
if (error) {
|
||||||
|
createApiError(event, 'INVALID_REQUEST', error, 400)
|
||||||
|
}
|
||||||
|
patch.config = next
|
||||||
|
}
|
||||||
|
|
||||||
|
if (body.secrets !== undefined && row.type === 's3') {
|
||||||
|
patch.secrets = body.secrets
|
||||||
|
}
|
||||||
|
|
||||||
|
if (body.servingMode !== undefined) {
|
||||||
|
if (body.servingMode !== 'proxy' && body.servingMode !== 'public') {
|
||||||
|
createApiError(event, 'INVALID_REQUEST', '访问方式无效', 400)
|
||||||
|
}
|
||||||
|
patch.servingMode = body.servingMode
|
||||||
|
}
|
||||||
|
|
||||||
|
if (body.publicUrl !== undefined) {
|
||||||
|
patch.publicUrl = body.publicUrl.trim()
|
||||||
|
}
|
||||||
|
|
||||||
|
if (body.quotaBytes !== undefined) {
|
||||||
|
if (row.type === 's3') {
|
||||||
|
const quotaBytes = parseQuotaBytes(body.quotaBytes)
|
||||||
|
if (!quotaBytes) {
|
||||||
|
createApiError(event, 'INVALID_REQUEST', '请填写有效的存储套餐总量', 400)
|
||||||
|
}
|
||||||
|
patch.quotaBytes = quotaBytes
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (body.enabled !== undefined) {
|
||||||
|
if (id === LOCAL_BACKEND_ID && !body.enabled) {
|
||||||
|
createApiError(event, 'INVALID_REQUEST', '本地磁盘后端不可停用', 400)
|
||||||
|
}
|
||||||
|
patch.enabled = body.enabled
|
||||||
|
}
|
||||||
|
|
||||||
|
if (body.isDefault !== undefined) {
|
||||||
|
patch.isDefault = body.isDefault
|
||||||
|
}
|
||||||
|
|
||||||
|
updateStorageBackend(id, patch)
|
||||||
|
|
||||||
|
if (body.isDefault) {
|
||||||
|
setDefaultBackend(id)
|
||||||
|
}
|
||||||
|
|
||||||
|
return { success: true }
|
||||||
|
})
|
||||||
@@ -0,0 +1,34 @@
|
|||||||
|
import { requireAdminAuth } from '../../../../utils/access'
|
||||||
|
import { createApiError } from '../../../../utils/api-error'
|
||||||
|
import {
|
||||||
|
createBackendInstance,
|
||||||
|
getStorageBackendRow,
|
||||||
|
isStorageEnvConfigured
|
||||||
|
} from '../../../../utils/storage-backends'
|
||||||
|
|
||||||
|
export default defineEventHandler(async (event) => {
|
||||||
|
await requireAdminAuth(event)
|
||||||
|
|
||||||
|
if (isStorageEnvConfigured()) {
|
||||||
|
createApiError(event, 'FORBIDDEN', '存储配置已由环境变量覆盖，无法在后台测试', 409)
|
||||||
|
}
|
||||||
|
|
||||||
|
const id = getRouterParam(event, 'id')
|
||||||
|
if (!id) {
|
||||||
|
createApiError(event, 'INVALID_REQUEST', '缺少存储后端 ID', 400)
|
||||||
|
}
|
||||||
|
|
||||||
|
const row = getStorageBackendRow(id)
|
||||||
|
if (!row) {
|
||||||
|
createApiError(event, 'INVALID_REQUEST', '存储后端不存在', 404)
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
const backend = createBackendInstance(row)
|
||||||
|
const result = await backend.testConnection()
|
||||||
|
return result
|
||||||
|
} catch (error) {
|
||||||
|
const message = error instanceof Error ? error.message : '连接失败'
|
||||||
|
return { ok: false, message }
|
||||||
|
}
|
||||||
|
})
|
||||||
@@ -0,0 +1,39 @@
|
|||||||
|
import { requireAdminAuth } from '../../../utils/access'
|
||||||
|
import {
|
||||||
|
getBackendUsageStats,
|
||||||
|
isStorageEnvConfigured,
|
||||||
|
listStorageBackends
|
||||||
|
} from '../../../utils/storage-backends'
|
||||||
|
import { buildBackendCapacity } from '../../../utils/storage-capacity'
|
||||||
|
import { getActiveBackendRow } from '../../../utils/storage/resolver'
|
||||||
|
import type { StorageBackendInfo } from '../../../utils/storage/types'
|
||||||
|
|
||||||
|
export default defineEventHandler(async (event) => {
|
||||||
|
await requireAdminAuth(event)
|
||||||
|
|
||||||
|
const rows = listStorageBackends()
|
||||||
|
const backends = await Promise.all(rows.map(async (backend: StorageBackendInfo & {
|
||||||
|
secretsMasked: Record<string, string>
|
||||||
|
}) => {
|
||||||
|
const usage = getBackendUsageStats(backend.id)
|
||||||
|
const capacity = await buildBackendCapacity(
|
||||||
|
backend.id,
|
||||||
|
backend.type,
|
||||||
|
usage.bytes,
|
||||||
|
backend.quotaBytes
|
||||||
|
)
|
||||||
|
return {
|
||||||
|
...backend,
|
||||||
|
usage,
|
||||||
|
capacity
|
||||||
|
}
|
||||||
|
}))
|
||||||
|
|
||||||
|
const activeBackend = getActiveBackendRow()
|
||||||
|
|
||||||
|
return {
|
||||||
|
backends,
|
||||||
|
activeBackendId: activeBackend?.id ?? 'local',
|
||||||
|
envOverride: isStorageEnvConfigured()
|
||||||
|
}
|
||||||
|
})
|
||||||
@@ -0,0 +1,83 @@
|
|||||||
|
import { requireAdminAuth } from '../../../utils/access'
|
||||||
|
import { createApiError } from '../../../utils/api-error'
|
||||||
|
import {
|
||||||
|
insertStorageBackend,
|
||||||
|
isStorageEnvConfigured
|
||||||
|
} from '../../../utils/storage-backends'
|
||||||
|
import { validateS3Config } from '../../../utils/storage/s3'
|
||||||
|
import { parseQuotaBytes } from '../../../utils/storage-capacity'
|
||||||
|
import type { ServingMode } from '../../../utils/storage/types'
|
||||||
|
|
||||||
|
interface StorageCreateBody {
|
||||||
|
name?: string
|
||||||
|
config?: {
|
||||||
|
endpoint?: string
|
||||||
|
region?: string
|
||||||
|
bucket?: string
|
||||||
|
prefix?: string
|
||||||
|
forcePathStyle?: boolean
|
||||||
|
}
|
||||||
|
secrets?: {
|
||||||
|
accessKeyId?: string
|
||||||
|
secretAccessKey?: string
|
||||||
|
}
|
||||||
|
servingMode?: ServingMode
|
||||||
|
publicUrl?: string
|
||||||
|
quotaBytes?: number | null
|
||||||
|
enabled?: boolean
|
||||||
|
isDefault?: boolean
|
||||||
|
}
|
||||||
|
|
||||||
|
export default defineEventHandler(async (event) => {
|
||||||
|
await requireAdminAuth(event)
|
||||||
|
|
||||||
|
if (isStorageEnvConfigured()) {
|
||||||
|
createApiError(event, 'FORBIDDEN', '存储配置已由环境变量覆盖，无法在后台修改', 409)
|
||||||
|
}
|
||||||
|
|
||||||
|
const body = await readBody<StorageCreateBody>(event).catch(
|
||||||
|
(): StorageCreateBody => ({})
|
||||||
|
)
|
||||||
|
|
||||||
|
const name = body.name?.trim() || 'S3 兼容存储'
|
||||||
|
const config = {
|
||||||
|
endpoint: body.config?.endpoint?.trim() ?? '',
|
||||||
|
region: body.config?.region?.trim() || 'auto',
|
||||||
|
bucket: body.config?.bucket?.trim() ?? '',
|
||||||
|
prefix: body.config?.prefix?.trim() || undefined,
|
||||||
|
forcePathStyle: body.config?.forcePathStyle ?? false
|
||||||
|
}
|
||||||
|
|
||||||
|
const error = validateS3Config(config)
|
||||||
|
if (error) {
|
||||||
|
createApiError(event, 'INVALID_REQUEST', error, 400)
|
||||||
|
}
|
||||||
|
|
||||||
|
const accessKeyId = body.secrets?.accessKeyId?.trim() ?? ''
|
||||||
|
const secretAccessKey = body.secrets?.secretAccessKey?.trim() ?? ''
|
||||||
|
if (!accessKeyId || !secretAccessKey) {
|
||||||
|
createApiError(event, 'INVALID_REQUEST', 'Access Key 与 Secret Key 不能为空', 400)
|
||||||
|
}
|
||||||
|
|
||||||
|
if (body.servingMode && body.servingMode !== 'proxy' && body.servingMode !== 'public') {
|
||||||
|
createApiError(event, 'INVALID_REQUEST', '访问方式无效', 400)
|
||||||
|
}
|
||||||
|
|
||||||
|
const quotaBytes = parseQuotaBytes(body.quotaBytes)
|
||||||
|
if (!quotaBytes) {
|
||||||
|
createApiError(event, 'INVALID_REQUEST', '请填写有效的存储套餐总量', 400)
|
||||||
|
}
|
||||||
|
|
||||||
|
const id = insertStorageBackend({
|
||||||
|
name,
|
||||||
|
config,
|
||||||
|
secrets: { accessKeyId, secretAccessKey },
|
||||||
|
servingMode: body.servingMode,
|
||||||
|
publicUrl: body.publicUrl?.trim(),
|
||||||
|
quotaBytes,
|
||||||
|
enabled: body.enabled,
|
||||||
|
isDefault: body.isDefault
|
||||||
|
})
|
||||||
|
|
||||||
|
return { success: true, id }
|
||||||
|
})
|
||||||
@@ -1,5 +1,6 @@
|
|||||||
import { requireAdminAuth } from '../../utils/access'
|
import { requireAdminAuth } from '../../utils/access'
|
||||||
import { createApiError } from '../../utils/api-error'
|
import { createApiError } from '../../utils/api-error'
|
||||||
|
import { logException } from '../../utils/logger'
|
||||||
import {
|
import {
|
||||||
listActivityLogs,
|
listActivityLogs,
|
||||||
type LogAction,
|
type LogAction,
|
||||||
@@ -58,7 +59,7 @@ export default defineEventHandler(async (event) => {
|
|||||||
totalPages: result.totalPages
|
totalPages: result.totalPages
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('[logs] list failed', error)
|
logException('activity logs list failed', error)
|
||||||
createApiError(event, 'INVALID_REQUEST', '读取操作记录失败', 500)
|
createApiError(event, 'INVALID_REQUEST', '读取操作记录失败', 500)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
@@ -1,5 +1,6 @@
|
|||||||
import { getImageUserFilter, requireUserAuth } from '../utils/access'
|
import { getImageUserFilter, requireUserAuth } from '../utils/access'
|
||||||
import { createApiError } from '../utils/api-error'
|
import { createApiError } from '../utils/api-error'
|
||||||
|
import { logException } from '../utils/logger'
|
||||||
import { countUsers, getActivityStats } from '../utils/db'
|
import { countUsers, getActivityStats } from '../utils/db'
|
||||||
import {
|
import {
|
||||||
countImages,
|
countImages,
|
||||||
@@ -46,7 +47,7 @@ export default defineEventHandler(async (event) => {
|
|||||||
byFolder: scoped.byFolder
|
byFolder: scoped.byFolder
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('[stats] failed', error)
|
logException('stats failed', error)
|
||||||
createApiError(event, 'INVALID_REQUEST', '读取统计失败', 500)
|
createApiError(event, 'INVALID_REQUEST', '读取统计失败', 500)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
@@ -0,0 +1,43 @@
|
|||||||
|
import { clientIp, logError, logException, logWarn, serializeError } from '../utils/logger'
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 记录未捕获的 H3/Nitro 错误（含 createApiError 抛出的 4xx/5xx）。
|
||||||
|
*/
|
||||||
|
export default defineNitroPlugin((nitroApp) => {
|
||||||
|
nitroApp.hooks.hook('error', (error, { event }) => {
|
||||||
|
const serialized = serializeError(error)
|
||||||
|
const status = typeof serialized.statusCode === 'number'
|
||||||
|
? serialized.statusCode
|
||||||
|
: 500
|
||||||
|
|
||||||
|
if (!event) {
|
||||||
|
logError('unhandled error', serialized)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
const path = getRequestURL(event).pathname
|
||||||
|
const method = getMethod(event)
|
||||||
|
const base = {
|
||||||
|
method,
|
||||||
|
path,
|
||||||
|
status,
|
||||||
|
ip: clientIp(event),
|
||||||
|
message: serialized.message,
|
||||||
|
...(serialized.statusMessage ? { reason: serialized.statusMessage } : {}),
|
||||||
|
...(serialized.data ? { data: serialized.data } : {})
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!path.startsWith('/api/')) {
|
||||||
|
if (status >= 500) {
|
||||||
|
logException(`${method} ${path}`, error, base)
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if (status >= 500) {
|
||||||
|
logException('API error', error, base)
|
||||||
|
} else if (status >= 400) {
|
||||||
|
logWarn('API rejected', base)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
})
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
import { clientIp, logInfo } from '../utils/logger'
|
import { clientIp, logError, logInfo, logWarn } from '../utils/logger'
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 只记录 /api/*，避免 /images、/twikoo 直链刷屏。
|
* 只记录 /api/*，避免 /images、/twikoo 直链刷屏。
|
||||||
@@ -19,11 +19,24 @@ export default defineNitroPlugin((nitroApp) => {
|
|||||||
const status = getResponseStatus(event)
|
const status = getResponseStatus(event)
|
||||||
const started = event.context._reqStartedAt as number | undefined
|
const started = event.context._reqStartedAt as number | undefined
|
||||||
const ms = started ? Date.now() - started : undefined
|
const ms = started ? Date.now() - started : undefined
|
||||||
|
const reason = status >= 400 ? getResponseStatusText(event) : undefined
|
||||||
|
|
||||||
logInfo(`${method} ${path}`, {
|
const detail: Record<string, unknown> = {
|
||||||
status,
|
status,
|
||||||
ms,
|
ms,
|
||||||
ip: clientIp(event)
|
ip: clientIp(event)
|
||||||
})
|
}
|
||||||
|
if (reason && reason !== String(status)) {
|
||||||
|
detail.reason = reason
|
||||||
|
}
|
||||||
|
|
||||||
|
const line = `${method} ${path}`
|
||||||
|
if (status >= 500) {
|
||||||
|
logError(line, detail)
|
||||||
|
} else if (status >= 400) {
|
||||||
|
logWarn(line, detail)
|
||||||
|
} else {
|
||||||
|
logInfo(line, detail)
|
||||||
|
}
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
@@ -1,6 +1,8 @@
|
|||||||
import { getDataDir } from '../utils/storage'
|
import { getDataDir } from '../utils/data-dir'
|
||||||
import { runAutoDeleteCleanup } from '../utils/auto-delete'
|
import { runAutoDeleteCleanup } from '../utils/auto-delete'
|
||||||
import { logInfo } from '../utils/logger'
|
import { migrateLocalImagesToIndex } from '../utils/image-index'
|
||||||
|
import { ensureDefaultBackends } from '../utils/storage-backends'
|
||||||
|
import { logException, logInfo } from '../utils/logger'
|
||||||
|
|
||||||
export default defineNitroPlugin(() => {
|
export default defineNitroPlugin(() => {
|
||||||
const port = process.env.NITRO_PORT || process.env.PORT || '6892'
|
const port = process.env.NITRO_PORT || process.env.PORT || '6892'
|
||||||
@@ -9,12 +11,24 @@ export default defineNitroPlugin(() => {
|
|||||||
dataDir: getDataDir(),
|
dataDir: getDataDir(),
|
||||||
nodeEnv: process.env.NODE_ENV || 'development',
|
nodeEnv: process.env.NODE_ENV || 'development',
|
||||||
imageBaseUrl: process.env.IMAGE_BASE_URL || '(request origin)',
|
imageBaseUrl: process.env.IMAGE_BASE_URL || '(request origin)',
|
||||||
|
storageBackend: process.env.STORAGE_BACKEND || 'db',
|
||||||
logLevel: process.env.LOG_LEVEL || 'info'
|
logLevel: process.env.LOG_LEVEL || 'info'
|
||||||
})
|
})
|
||||||
|
|
||||||
|
ensureDefaultBackends()
|
||||||
|
void migrateLocalImagesToIndex().then((count) => {
|
||||||
|
if (count > 0) {
|
||||||
|
logInfo('migrated local images to index', { count })
|
||||||
|
}
|
||||||
|
}).catch((error) => {
|
||||||
|
logException('migrate local images to index failed', error)
|
||||||
|
})
|
||||||
|
|
||||||
void runAutoDeleteCleanup().then((result) => {
|
void runAutoDeleteCleanup().then((result) => {
|
||||||
if (!result.skipped && (result.deleted > 0 || result.failed > 0)) {
|
if (!result.skipped && (result.deleted > 0 || result.failed > 0)) {
|
||||||
logInfo('startup auto-delete', { ...result })
|
logInfo('startup auto-delete', { ...result })
|
||||||
}
|
}
|
||||||
|
}).catch((error) => {
|
||||||
|
logException('startup auto-delete failed', error)
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
@@ -1,7 +1,8 @@
|
|||||||
import { insertActivityLog, listAdminUserIds, listUserAutoDeletePolicies, type AutoDeletePolicy } from './db'
|
import { insertActivityLog, listAdminUserIds, listUserAutoDeletePolicies, type AutoDeletePolicy } from './db'
|
||||||
import { getGlobalAutoDeletePolicy } from './env'
|
import { getGlobalAutoDeletePolicy } from './env'
|
||||||
import { deleteImage, headImage, listImageKeys, type StoredImage } from './storage'
|
import { deleteImage, type StoredImage } from './storage'
|
||||||
import { logInfo, logWarn } from './logger'
|
import { listImageKeysForAutoDelete } from './image-index'
|
||||||
|
import { logInfo, logWarn, serializeError } from './logger'
|
||||||
|
|
||||||
export interface AutoDeleteResult {
|
export interface AutoDeleteResult {
|
||||||
deleted: number
|
deleted: number
|
||||||
@@ -73,23 +74,20 @@ export async function runAutoDeleteCleanup(): Promise<AutoDeleteResult> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const nowMs = Date.now()
|
const nowMs = Date.now()
|
||||||
const keys = await listImageKeys()
|
const images = await listImageKeysForAutoDelete()
|
||||||
let deleted = 0
|
let deleted = 0
|
||||||
let failed = 0
|
let failed = 0
|
||||||
|
|
||||||
for (const key of keys) {
|
for (const image of images) {
|
||||||
const image = await headImage(key)
|
|
||||||
if (!image) continue
|
|
||||||
|
|
||||||
if (!shouldAutoDeleteImage(image, globalPolicy, adminUserIds, userPolicies, nowMs)) {
|
if (!shouldAutoDeleteImage(image, globalPolicy, adminUserIds, userPolicies, nowMs)) {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
await deleteImage(key)
|
await deleteImage(image.key)
|
||||||
insertActivityLog({
|
insertActivityLog({
|
||||||
action: 'delete',
|
action: 'delete',
|
||||||
key,
|
key: image.key,
|
||||||
originalName: image.originalName,
|
originalName: image.originalName,
|
||||||
size: image.size,
|
size: image.size,
|
||||||
contentType: image.contentType,
|
contentType: image.contentType,
|
||||||
@@ -97,7 +95,7 @@ export async function runAutoDeleteCleanup(): Promise<AutoDeleteResult> {
|
|||||||
})
|
})
|
||||||
deleted++
|
deleted++
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
logWarn('auto-delete failed', { key, error })
|
logWarn('auto-delete failed', { key: image.key, error: serializeError(error) })
|
||||||
failed++
|
failed++
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,5 @@
|
|||||||
|
import { join } from 'node:path'
|
||||||
|
|
||||||
|
export function getDataDir(): string {
|
||||||
|
return process.env.DATA_DIR || join(process.cwd(), 'data')
|
||||||
|
}
|
||||||
+7
-3
@@ -1,7 +1,8 @@
|
|||||||
import { DatabaseSync } from 'node:sqlite'
|
import { DatabaseSync } from 'node:sqlite'
|
||||||
import { mkdirSync } from 'node:fs'
|
import { mkdirSync } from 'node:fs'
|
||||||
import { join } from 'node:path'
|
import { join } from 'node:path'
|
||||||
import { getDataDir } from './storage'
|
import { getDataDir } from './data-dir'
|
||||||
|
import { logException } from './logger'
|
||||||
|
|
||||||
export type LogAction = 'upload' | 'delete'
|
export type LogAction = 'upload' | 'delete'
|
||||||
export type LogSource = 'web' | 'api' | 'twikoo'
|
export type LogSource = 'web' | 'api' | 'twikoo'
|
||||||
@@ -29,7 +30,7 @@ export interface ActivityLogInput {
|
|||||||
|
|
||||||
let db: DatabaseSync | null = null
|
let db: DatabaseSync | null = null
|
||||||
|
|
||||||
function getDb(): DatabaseSync {
|
export function getDb(): DatabaseSync {
|
||||||
if (db) return db
|
if (db) return db
|
||||||
|
|
||||||
const dataDir = getDataDir()
|
const dataDir = getDataDir()
|
||||||
@@ -404,7 +405,10 @@ export function insertActivityLog(input: ActivityLogInput): void {
|
|||||||
createdAt
|
createdAt
|
||||||
)
|
)
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('[activity-log] insert failed', error)
|
logException('activity-log insert failed', error, {
|
||||||
|
action: input.action,
|
||||||
|
key: input.key
|
||||||
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,14 @@
|
|||||||
|
import { describe, expect, it } from 'vitest'
|
||||||
|
import { validateImageKey } from './image-key'
|
||||||
|
|
||||||
|
describe('image index key validation', () => {
|
||||||
|
it('accepts standard image keys used in index', () => {
|
||||||
|
expect(validateImageKey('images/2026/03/abc.webp')).toBe(true)
|
||||||
|
expect(validateImageKey('twikoo/2026/03/abc.webp')).toBe(true)
|
||||||
|
})
|
||||||
|
|
||||||
|
it('rejects path traversal keys', () => {
|
||||||
|
expect(validateImageKey('../secret')).toBe(false)
|
||||||
|
expect(validateImageKey('images/../../etc/passwd')).toBe(false)
|
||||||
|
})
|
||||||
|
})
|
||||||
@@ -0,0 +1,418 @@
|
|||||||
|
import { promises as fs } from 'node:fs'
|
||||||
|
import { join } from 'node:path'
|
||||||
|
import { getDb } from './db'
|
||||||
|
import { getDataDir } from './data-dir'
|
||||||
|
import { isValidFolderName, validateImageKey, DEFAULT_FOLDER } from './image-key'
|
||||||
|
import {
|
||||||
|
ensureDefaultBackends,
|
||||||
|
ensureStorageSchema,
|
||||||
|
LOCAL_BACKEND_ID
|
||||||
|
} from './storage-backends'
|
||||||
|
import type { PaginatedResult, StoredImage, StoredImageMeta } from './storage/types'
|
||||||
|
|
||||||
|
const META_SUFFIX = '.meta.json'
|
||||||
|
|
||||||
|
export interface ImageIndexRow {
|
||||||
|
key: string
|
||||||
|
backend_id: string
|
||||||
|
user_id: number | null
|
||||||
|
folder: string
|
||||||
|
original_name: string
|
||||||
|
content_type: string
|
||||||
|
size: number
|
||||||
|
uploaded_at: string
|
||||||
|
}
|
||||||
|
|
||||||
|
function keyToFilePath(key: string): string {
|
||||||
|
return join(getDataDir(), ...key.split('/'))
|
||||||
|
}
|
||||||
|
|
||||||
|
async function readLocalMeta(key: string): Promise<Partial<StoredImageMeta>> {
|
||||||
|
try {
|
||||||
|
const raw = await fs.readFile(keyToFilePath(key) + META_SUFFIX, 'utf8')
|
||||||
|
return JSON.parse(raw) as Partial<StoredImageMeta>
|
||||||
|
} catch {
|
||||||
|
return {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function rowToStoredImage(row: ImageIndexRow): StoredImage {
|
||||||
|
const uploadedMs = new Date(row.uploaded_at).getTime()
|
||||||
|
return {
|
||||||
|
key: row.key,
|
||||||
|
backendId: row.backend_id,
|
||||||
|
originalName: row.original_name,
|
||||||
|
uploadedAt: row.uploaded_at,
|
||||||
|
contentType: row.content_type,
|
||||||
|
size: row.size,
|
||||||
|
userId: row.user_id,
|
||||||
|
mtimeMs: Number.isFinite(uploadedMs) ? uploadedMs : Date.now()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function buildUserFilterSql(
|
||||||
|
userFilter: number | 'admin' | undefined,
|
||||||
|
params: Array<string | number>
|
||||||
|
): string {
|
||||||
|
if (userFilter === undefined || userFilter === 'admin') return ''
|
||||||
|
params.push(userFilter)
|
||||||
|
return ' AND user_id = ?'
|
||||||
|
}
|
||||||
|
|
||||||
|
export function insertImageIndex(input: {
|
||||||
|
key: string
|
||||||
|
backendId: string
|
||||||
|
userId?: number | null
|
||||||
|
originalName: string
|
||||||
|
contentType: string
|
||||||
|
size: number
|
||||||
|
uploadedAt: string
|
||||||
|
}): void {
|
||||||
|
ensureStorageSchema()
|
||||||
|
const folder = input.key.split('/')[0] ?? DEFAULT_FOLDER
|
||||||
|
getDb().prepare(`
|
||||||
|
INSERT INTO images
|
||||||
|
(key, backend_id, user_id, folder, original_name, content_type, size, uploaded_at)
|
||||||
|
VALUES (?, ?, ?, ?, ?, ?, ?, ?)
|
||||||
|
ON CONFLICT(key) DO UPDATE SET
|
||||||
|
backend_id = excluded.backend_id,
|
||||||
|
user_id = excluded.user_id,
|
||||||
|
folder = excluded.folder,
|
||||||
|
original_name = excluded.original_name,
|
||||||
|
content_type = excluded.content_type,
|
||||||
|
size = excluded.size,
|
||||||
|
uploaded_at = excluded.uploaded_at
|
||||||
|
`).run(
|
||||||
|
input.key,
|
||||||
|
input.backendId,
|
||||||
|
input.userId ?? null,
|
||||||
|
folder,
|
||||||
|
input.originalName,
|
||||||
|
input.contentType,
|
||||||
|
input.size,
|
||||||
|
input.uploadedAt
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
export function deleteImageIndex(key: string): void {
|
||||||
|
ensureStorageSchema()
|
||||||
|
getDb().prepare('DELETE FROM images WHERE key = ?').run(key)
|
||||||
|
}
|
||||||
|
|
||||||
|
export function getImageIndexRow(key: string): ImageIndexRow | null {
|
||||||
|
ensureStorageSchema()
|
||||||
|
const row = getDb().prepare(`
|
||||||
|
SELECT key, backend_id, user_id, folder, original_name, content_type, size, uploaded_at
|
||||||
|
FROM images
|
||||||
|
WHERE key = ?
|
||||||
|
`).get(key) as ImageIndexRow | undefined
|
||||||
|
return row ?? null
|
||||||
|
}
|
||||||
|
|
||||||
|
export function getImageIndexAsStored(key: string): StoredImage | null {
|
||||||
|
const row = getImageIndexRow(key)
|
||||||
|
return row ? rowToStoredImage(row) : null
|
||||||
|
}
|
||||||
|
|
||||||
|
async function readDirNames(path: string): Promise<string[]> {
|
||||||
|
try {
|
||||||
|
const entries = await fs.readdir(path, { withFileTypes: true })
|
||||||
|
return entries.filter(e => e.isDirectory()).map(e => e.name)
|
||||||
|
} catch {
|
||||||
|
return []
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function readFileNames(path: string): Promise<string[]> {
|
||||||
|
try {
|
||||||
|
const entries = await fs.readdir(path, { withFileTypes: true })
|
||||||
|
return entries.filter(e => e.isFile()).map(e => e.name)
|
||||||
|
} catch {
|
||||||
|
return []
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function listLocalImageKeys(): Promise<string[]> {
|
||||||
|
const keys: string[] = []
|
||||||
|
const dataDir = getDataDir()
|
||||||
|
const prefixes = await readDirNames(dataDir)
|
||||||
|
|
||||||
|
for (const prefix of prefixes) {
|
||||||
|
if (!isValidFolderName(prefix)) continue
|
||||||
|
const root = join(dataDir, prefix)
|
||||||
|
const years = await readDirNames(root)
|
||||||
|
for (const year of years) {
|
||||||
|
const months = await readDirNames(join(root, year))
|
||||||
|
for (const month of months) {
|
||||||
|
const files = await readFileNames(join(root, year, month))
|
||||||
|
for (const file of files) {
|
||||||
|
if (file.endsWith(META_SUFFIX)) continue
|
||||||
|
const key = `${prefix}/${year}/${month}/${file}`
|
||||||
|
if (validateImageKey(key)) keys.push(key)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return keys
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function migrateLocalImagesToIndex(): Promise<number> {
|
||||||
|
ensureDefaultBackends()
|
||||||
|
const keys = await listLocalImageKeys()
|
||||||
|
let inserted = 0
|
||||||
|
|
||||||
|
for (const key of keys) {
|
||||||
|
const existing = getImageIndexRow(key)
|
||||||
|
if (existing) continue
|
||||||
|
|
||||||
|
let stat
|
||||||
|
try {
|
||||||
|
stat = await fs.stat(keyToFilePath(key))
|
||||||
|
} catch {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
const meta = await readLocalMeta(key)
|
||||||
|
const uploadedAt = meta.uploadedAt ?? stat.mtime.toISOString()
|
||||||
|
|
||||||
|
insertImageIndex({
|
||||||
|
key,
|
||||||
|
backendId: LOCAL_BACKEND_ID,
|
||||||
|
userId: meta.userId ?? null,
|
||||||
|
originalName: meta.originalName ?? key.split('/').pop() ?? 'image',
|
||||||
|
contentType: meta.contentType ?? 'application/octet-stream',
|
||||||
|
size: stat.size,
|
||||||
|
uploadedAt
|
||||||
|
})
|
||||||
|
inserted++
|
||||||
|
}
|
||||||
|
|
||||||
|
return inserted
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function listFolders(): Promise<string[]> {
|
||||||
|
ensureStorageSchema()
|
||||||
|
const rows = getDb().prepare(`
|
||||||
|
SELECT DISTINCT folder FROM images ORDER BY folder ASC
|
||||||
|
`).all() as Array<{ folder: string }>
|
||||||
|
|
||||||
|
const folders = rows.map(row => row.folder).filter(isValidFolderName)
|
||||||
|
if (!folders.includes(DEFAULT_FOLDER)) {
|
||||||
|
folders.push(DEFAULT_FOLDER)
|
||||||
|
}
|
||||||
|
return folders.sort((a, b) => a.localeCompare(b))
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function listFoldersForUser(
|
||||||
|
userFilter?: number | 'admin'
|
||||||
|
): Promise<string[]> {
|
||||||
|
ensureStorageSchema()
|
||||||
|
const params: Array<string | number> = []
|
||||||
|
const userSql = buildUserFilterSql(userFilter, params)
|
||||||
|
|
||||||
|
const rows = getDb().prepare(`
|
||||||
|
SELECT DISTINCT folder FROM images WHERE 1=1${userSql} ORDER BY folder ASC
|
||||||
|
`).all(...params) as Array<{ folder: string }>
|
||||||
|
|
||||||
|
const folders = rows.map(row => row.folder).filter(isValidFolderName)
|
||||||
|
if (!folders.length) {
|
||||||
|
folders.push(DEFAULT_FOLDER)
|
||||||
|
}
|
||||||
|
return folders.sort((a, b) => a.localeCompare(b))
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function countImages(
|
||||||
|
folder?: string,
|
||||||
|
userFilter?: number | 'admin'
|
||||||
|
): Promise<number> {
|
||||||
|
ensureStorageSchema()
|
||||||
|
const params: Array<string | number> = []
|
||||||
|
const clauses: string[] = ['1=1']
|
||||||
|
|
||||||
|
if (folder && isValidFolderName(folder)) {
|
||||||
|
clauses.push('folder = ?')
|
||||||
|
params.push(folder)
|
||||||
|
}
|
||||||
|
|
||||||
|
const userSql = buildUserFilterSql(userFilter, params)
|
||||||
|
const row = getDb().prepare(`
|
||||||
|
SELECT COUNT(*) AS count FROM images WHERE ${clauses.join(' AND ')}${userSql}
|
||||||
|
`).get(...params) as { count: number }
|
||||||
|
|
||||||
|
return row.count
|
||||||
|
}
|
||||||
|
|
||||||
|
function paginateSlice<T>(
|
||||||
|
all: T[],
|
||||||
|
limit: number,
|
||||||
|
page?: number
|
||||||
|
): PaginatedResult<T> {
|
||||||
|
const total = all.length
|
||||||
|
const pageSize = limit
|
||||||
|
const totalPages = Math.max(1, Math.ceil(total / pageSize) || 1)
|
||||||
|
const requestedPage = Math.max(1, page ?? 1)
|
||||||
|
const safePage = Math.min(requestedPage, totalPages)
|
||||||
|
const start = (safePage - 1) * pageSize
|
||||||
|
const items = all.slice(start, start + pageSize)
|
||||||
|
|
||||||
|
return { items, total, page: safePage, pageSize, totalPages }
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function listImages(options: {
|
||||||
|
limit: number
|
||||||
|
page?: number
|
||||||
|
folder?: string
|
||||||
|
userFilter?: number | 'admin'
|
||||||
|
}): Promise<PaginatedResult<StoredImage>> {
|
||||||
|
ensureStorageSchema()
|
||||||
|
const params: Array<string | number> = []
|
||||||
|
const clauses: string[] = ['1=1']
|
||||||
|
|
||||||
|
if (options.folder && isValidFolderName(options.folder)) {
|
||||||
|
clauses.push('folder = ?')
|
||||||
|
params.push(options.folder)
|
||||||
|
}
|
||||||
|
|
||||||
|
const userSql = buildUserFilterSql(options.userFilter, params)
|
||||||
|
const rows = getDb().prepare(`
|
||||||
|
SELECT key, backend_id, user_id, folder, original_name, content_type, size, uploaded_at
|
||||||
|
FROM images
|
||||||
|
WHERE ${clauses.join(' AND ')}${userSql}
|
||||||
|
ORDER BY uploaded_at DESC, key DESC
|
||||||
|
`).all(...params) as unknown as ImageIndexRow[]
|
||||||
|
|
||||||
|
const sliced = paginateSlice(rows, options.limit, options.page)
|
||||||
|
return {
|
||||||
|
...sliced,
|
||||||
|
items: sliced.items.map(rowToStoredImage)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function searchImages(options: {
|
||||||
|
query: string
|
||||||
|
limit: number
|
||||||
|
page?: number
|
||||||
|
folder?: string
|
||||||
|
userFilter?: number | 'admin'
|
||||||
|
}): Promise<PaginatedResult<StoredImage>> {
|
||||||
|
ensureStorageSchema()
|
||||||
|
const needle = options.query.trim().toLowerCase()
|
||||||
|
const params: Array<string | number> = []
|
||||||
|
const clauses: string[] = ['1=1']
|
||||||
|
|
||||||
|
if (options.folder && isValidFolderName(options.folder)) {
|
||||||
|
clauses.push('folder = ?')
|
||||||
|
params.push(options.folder)
|
||||||
|
}
|
||||||
|
|
||||||
|
const userSql = buildUserFilterSql(options.userFilter, params)
|
||||||
|
const rows = getDb().prepare(`
|
||||||
|
SELECT key, backend_id, user_id, folder, original_name, content_type, size, uploaded_at
|
||||||
|
FROM images
|
||||||
|
WHERE ${clauses.join(' AND ')}${userSql}
|
||||||
|
ORDER BY uploaded_at DESC, key DESC
|
||||||
|
`).all(...params) as unknown as ImageIndexRow[]
|
||||||
|
|
||||||
|
const matches = rows.filter((row) => {
|
||||||
|
if (!needle) return true
|
||||||
|
return row.key.toLowerCase().includes(needle)
|
||||||
|
|| row.original_name.toLowerCase().includes(needle)
|
||||||
|
})
|
||||||
|
|
||||||
|
const sliced = paginateSlice(matches, options.limit, options.page)
|
||||||
|
return {
|
||||||
|
...sliced,
|
||||||
|
items: sliced.items.map(rowToStoredImage)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function getFolderStorageStats(
|
||||||
|
userFilter?: number | 'admin'
|
||||||
|
): Promise<Array<{ folder: string, count: number, bytes: number }>> {
|
||||||
|
ensureStorageSchema()
|
||||||
|
const params: Array<string | number> = []
|
||||||
|
const userSql = buildUserFilterSql(userFilter, params)
|
||||||
|
|
||||||
|
const rows = getDb().prepare(`
|
||||||
|
SELECT folder, COUNT(*) AS count, COALESCE(SUM(size), 0) AS bytes
|
||||||
|
FROM images
|
||||||
|
WHERE 1=1${userSql}
|
||||||
|
GROUP BY folder
|
||||||
|
ORDER BY bytes DESC, folder ASC
|
||||||
|
`).all(...params) as Array<{ folder: string, count: number, bytes: number }>
|
||||||
|
|
||||||
|
return rows
|
||||||
|
}
|
||||||
|
|
||||||
|
function startOfDayIsoInShanghai(now = new Date()): string {
|
||||||
|
const shifted = new Date(now.getTime() + 8 * 60 * 60 * 1000)
|
||||||
|
const y = shifted.getUTCFullYear()
|
||||||
|
const m = shifted.getUTCMonth()
|
||||||
|
const d = shifted.getUTCDate()
|
||||||
|
return new Date(Date.UTC(y, m, d) - 8 * 60 * 60 * 1000).toISOString()
|
||||||
|
}
|
||||||
|
|
||||||
|
function startOfMonthIsoInShanghai(now = new Date()): string {
|
||||||
|
const shifted = new Date(now.getTime() + 8 * 60 * 60 * 1000)
|
||||||
|
const y = shifted.getUTCFullYear()
|
||||||
|
const m = shifted.getUTCMonth()
|
||||||
|
return new Date(Date.UTC(y, m, 1) - 8 * 60 * 60 * 1000).toISOString()
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function getUserScopedStorageStats(userId: number): Promise<{
|
||||||
|
storedCount: number
|
||||||
|
uploadBytesTotal: number
|
||||||
|
uploadToday: number
|
||||||
|
uploadMonth: number
|
||||||
|
byFolder: Array<{ folder: string, count: number, bytes: number }>
|
||||||
|
}> {
|
||||||
|
ensureStorageSchema()
|
||||||
|
const startOfDay = startOfDayIsoInShanghai()
|
||||||
|
const startOfMonth = startOfMonthIsoInShanghai()
|
||||||
|
|
||||||
|
const rows = getDb().prepare(`
|
||||||
|
SELECT folder, size, uploaded_at
|
||||||
|
FROM images
|
||||||
|
WHERE user_id = ?
|
||||||
|
`).all(userId) as Array<{ folder: string, size: number, uploaded_at: string }>
|
||||||
|
|
||||||
|
const map = new Map<string, { count: number, bytes: number }>()
|
||||||
|
let uploadBytesTotal = 0
|
||||||
|
let uploadToday = 0
|
||||||
|
let uploadMonth = 0
|
||||||
|
|
||||||
|
for (const row of rows) {
|
||||||
|
uploadBytesTotal += row.size
|
||||||
|
if (row.uploaded_at >= startOfDay) uploadToday += 1
|
||||||
|
if (row.uploaded_at >= startOfMonth) uploadMonth += 1
|
||||||
|
|
||||||
|
const current = map.get(row.folder) ?? { count: 0, bytes: 0 }
|
||||||
|
current.count += 1
|
||||||
|
current.bytes += row.size
|
||||||
|
map.set(row.folder, current)
|
||||||
|
}
|
||||||
|
|
||||||
|
const byFolder = [...map.entries()]
|
||||||
|
.map(([folder, stat]) => ({ folder, ...stat }))
|
||||||
|
.sort((a, b) => b.bytes - a.bytes || a.folder.localeCompare(b.folder))
|
||||||
|
|
||||||
|
return {
|
||||||
|
storedCount: rows.length,
|
||||||
|
uploadBytesTotal,
|
||||||
|
uploadToday,
|
||||||
|
uploadMonth,
|
||||||
|
byFolder
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function listImageKeysForAutoDelete(): Promise<StoredImage[]> {
|
||||||
|
ensureStorageSchema()
|
||||||
|
const rows = getDb().prepare(`
|
||||||
|
SELECT key, backend_id, user_id, folder, original_name, content_type, size, uploaded_at
|
||||||
|
FROM images
|
||||||
|
ORDER BY uploaded_at ASC
|
||||||
|
`).all() as unknown as ImageIndexRow[]
|
||||||
|
|
||||||
|
return rows.map(rowToStoredImage)
|
||||||
|
}
|
||||||
@@ -3,6 +3,10 @@ import type { ImageItem } from '~/types/image'
|
|||||||
import type { AllowedMimeType } from './constants'
|
import type { AllowedMimeType } from './constants'
|
||||||
import type { StoredImage } from './storage'
|
import type { StoredImage } from './storage'
|
||||||
import { getImageBaseUrl } from './env'
|
import { getImageBaseUrl } from './env'
|
||||||
|
import { getActiveBackendRow } from './storage/resolver'
|
||||||
|
import { getStorageBackendRow, getStorageBackendFromEnv } from './storage-backends'
|
||||||
|
import { buildObjectKey, parseS3Config } from './storage/s3'
|
||||||
|
import type { StorageBackendRow } from './storage/types'
|
||||||
|
|
||||||
export function resolveImageOwner(
|
export function resolveImageOwner(
|
||||||
userId: number | null | undefined,
|
userId: number | null | undefined,
|
||||||
@@ -27,7 +31,8 @@ export function mapStoredImageToItem(
|
|||||||
): ImageItem {
|
): ImageItem {
|
||||||
const item = buildImageItem({
|
const item = buildImageItem({
|
||||||
key: stored.key,
|
key: stored.key,
|
||||||
baseUrl: getImageBaseUrl(event),
|
event,
|
||||||
|
backendId: stored.backendId,
|
||||||
originalName: stored.originalName,
|
originalName: stored.originalName,
|
||||||
contentType: stored.contentType,
|
contentType: stored.contentType,
|
||||||
size: stored.size,
|
size: stored.size,
|
||||||
@@ -47,6 +52,42 @@ export function buildImageUrl(baseUrl: string, key: string): string {
|
|||||||
return `${normalizedBase}/${key}`
|
return `${normalizedBase}/${key}`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function buildPublicImageUrl(backendRow: StorageBackendRow, key: string): string {
|
||||||
|
const base = backendRow.public_url.replace(/\/$/, '')
|
||||||
|
if (backendRow.type === 's3') {
|
||||||
|
const config = parseS3Config(backendRow.config_json)
|
||||||
|
const objectKey = buildObjectKey(config?.prefix, key)
|
||||||
|
return `${base}/${objectKey}`
|
||||||
|
}
|
||||||
|
return `${base}/${key}`
|
||||||
|
}
|
||||||
|
|
||||||
|
export function resolveImageUrl(
|
||||||
|
event: H3Event,
|
||||||
|
key: string,
|
||||||
|
backendId?: string
|
||||||
|
): string {
|
||||||
|
const envConfig = getStorageBackendFromEnv()
|
||||||
|
if (envConfig && (!backendId || backendId === 's3-primary')) {
|
||||||
|
if (envConfig.servingMode === 'public' && envConfig.publicUrl) {
|
||||||
|
const prefix = envConfig.config.prefix as string | undefined
|
||||||
|
const objectKey = buildObjectKey(prefix, key)
|
||||||
|
return `${envConfig.publicUrl.replace(/\/$/, '')}/${objectKey}`
|
||||||
|
}
|
||||||
|
return buildImageUrl(getImageBaseUrl(event), key)
|
||||||
|
}
|
||||||
|
|
||||||
|
const backendRow = backendId
|
||||||
|
? getStorageBackendRow(backendId)
|
||||||
|
: getActiveBackendRow()
|
||||||
|
|
||||||
|
if (backendRow?.serving_mode === 'public' && backendRow.public_url) {
|
||||||
|
return buildPublicImageUrl(backendRow, key)
|
||||||
|
}
|
||||||
|
|
||||||
|
return buildImageUrl(getImageBaseUrl(event), key)
|
||||||
|
}
|
||||||
|
|
||||||
export function buildMarkdown(url: string, alt: string): string {
|
export function buildMarkdown(url: string, alt: string): string {
|
||||||
const safeAlt = alt.replace(/[[\]]/g, '')
|
const safeAlt = alt.replace(/[[\]]/g, '')
|
||||||
return ``
|
return ``
|
||||||
@@ -68,13 +109,17 @@ function escapeHtml(value: string): string {
|
|||||||
|
|
||||||
export function buildImageItem(input: {
|
export function buildImageItem(input: {
|
||||||
key: string
|
key: string
|
||||||
baseUrl: string
|
baseUrl?: string
|
||||||
|
event?: H3Event
|
||||||
|
backendId?: string
|
||||||
originalName: string
|
originalName: string
|
||||||
contentType: AllowedMimeType | string
|
contentType: AllowedMimeType | string
|
||||||
size: number
|
size: number
|
||||||
uploadedAt: string
|
uploadedAt: string
|
||||||
}) {
|
}) {
|
||||||
const url = buildImageUrl(input.baseUrl, input.key)
|
const url = input.event
|
||||||
|
? resolveImageUrl(input.event, input.key, input.backendId)
|
||||||
|
: buildImageUrl(input.baseUrl ?? '', input.key)
|
||||||
const alt = sanitizeOriginalName(input.originalName)
|
const alt = sanitizeOriginalName(input.originalName)
|
||||||
|
|
||||||
return {
|
return {
|
||||||
|
|||||||
@@ -0,0 +1,32 @@
|
|||||||
|
import { describe, expect, it } from 'vitest'
|
||||||
|
import { serializeError } from './logger'
|
||||||
|
|
||||||
|
describe('serializeError', () => {
|
||||||
|
it('extracts message and status from H3-like errors', () => {
|
||||||
|
const error = new Error('bucket not found') as Error & {
|
||||||
|
statusCode: number
|
||||||
|
statusMessage: string
|
||||||
|
data: { error: { code: string } }
|
||||||
|
}
|
||||||
|
error.statusCode = 404
|
||||||
|
error.statusMessage = '存储桶不存在'
|
||||||
|
error.data = { error: { code: 'NOT_FOUND' } }
|
||||||
|
|
||||||
|
expect(serializeError(error)).toMatchObject({
|
||||||
|
name: 'Error',
|
||||||
|
message: 'bucket not found',
|
||||||
|
statusCode: 404,
|
||||||
|
statusMessage: '存储桶不存在',
|
||||||
|
data: { error: { code: 'NOT_FOUND' } }
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
it('includes stack for 5xx errors at info log level', () => {
|
||||||
|
const error = new Error('db locked') as Error & { statusCode: number }
|
||||||
|
error.statusCode = 500
|
||||||
|
error.stack = 'Error: db locked\n at test'
|
||||||
|
|
||||||
|
const serialized = serializeError(error)
|
||||||
|
expect(serialized.stack).toBe(error.stack)
|
||||||
|
})
|
||||||
|
})
|
||||||
@@ -7,6 +7,12 @@ const LEVEL_ORDER: Record<LogLevel, number> = {
|
|||||||
error: 40
|
error: 40
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type H3LikeError = Error & {
|
||||||
|
statusCode?: number
|
||||||
|
statusMessage?: string
|
||||||
|
data?: unknown
|
||||||
|
}
|
||||||
|
|
||||||
function currentLevel(): LogLevel {
|
function currentLevel(): LogLevel {
|
||||||
const raw = (process.env.LOG_LEVEL || 'info').toLowerCase()
|
const raw = (process.env.LOG_LEVEL || 'info').toLowerCase()
|
||||||
if (raw === 'debug' || raw === 'info' || raw === 'warn' || raw === 'error') {
|
if (raw === 'debug' || raw === 'info' || raw === 'warn' || raw === 'error') {
|
||||||
@@ -27,6 +33,35 @@ function formatLine(level: LogLevel, message: string, extra?: Record<string, unk
|
|||||||
return `[${time}] [${level.toUpperCase()}] ${message}${payload}`
|
return `[${time}] [${level.toUpperCase()}] ${message}${payload}`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** 将 unknown / Error / H3Error 转为可 JSON 输出的字段，便于 Docker 日志排查 */
|
||||||
|
export function serializeError(error: unknown): Record<string, unknown> {
|
||||||
|
if (error instanceof Error) {
|
||||||
|
const h3 = error as H3LikeError
|
||||||
|
const out: Record<string, unknown> = {
|
||||||
|
name: error.name,
|
||||||
|
message: error.message
|
||||||
|
}
|
||||||
|
if (h3.statusCode !== undefined) out.statusCode = h3.statusCode
|
||||||
|
if (h3.statusMessage) out.statusMessage = h3.statusMessage
|
||||||
|
if (h3.data !== undefined) out.data = h3.data
|
||||||
|
if (error.stack && shouldLog('debug')) out.stack = error.stack
|
||||||
|
else if (error.stack && (h3.statusCode ?? 500) >= 500) out.stack = error.stack
|
||||||
|
if ('cause' in error && error.cause !== undefined) {
|
||||||
|
out.cause = serializeError(error.cause)
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
if (typeof error === 'string') return { message: error }
|
||||||
|
if (error && typeof error === 'object') {
|
||||||
|
try {
|
||||||
|
return { detail: JSON.parse(JSON.stringify(error)) }
|
||||||
|
} catch {
|
||||||
|
return { message: String(error) }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return { message: String(error) }
|
||||||
|
}
|
||||||
|
|
||||||
export function logDebug(message: string, extra?: Record<string, unknown>) {
|
export function logDebug(message: string, extra?: Record<string, unknown>) {
|
||||||
if (!shouldLog('debug')) return
|
if (!shouldLog('debug')) return
|
||||||
console.debug(formatLine('debug', message, extra))
|
console.debug(formatLine('debug', message, extra))
|
||||||
@@ -47,6 +82,11 @@ export function logError(message: string, extra?: Record<string, unknown>) {
|
|||||||
console.error(formatLine('error', message, extra))
|
console.error(formatLine('error', message, extra))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** message + 原始 error 对象（自动 serialize） */
|
||||||
|
export function logException(message: string, error: unknown, extra?: Record<string, unknown>) {
|
||||||
|
logError(message, { ...extra, error: serializeError(error) })
|
||||||
|
}
|
||||||
|
|
||||||
export function clientIp(event: Parameters<typeof getRequestIP>[0]): string {
|
export function clientIp(event: Parameters<typeof getRequestIP>[0]): string {
|
||||||
return getRequestIP(event, { xForwardedFor: true }) || '-'
|
return getRequestIP(event, { xForwardedFor: true }) || '-'
|
||||||
}
|
}
|
||||||
@@ -14,10 +14,10 @@ import {
|
|||||||
import type { LogSource } from './db'
|
import type { LogSource } from './db'
|
||||||
import { generateImageKey } from './image-key'
|
import { generateImageKey } from './image-key'
|
||||||
import { buildImageItem, sanitizeOriginalName } from './image-response'
|
import { buildImageItem, sanitizeOriginalName } from './image-response'
|
||||||
import { getImageBaseUrl, getWebpQuality } from './env'
|
import { getWebpQuality } from './env'
|
||||||
import { insertActivityLog } from './db'
|
import { insertActivityLog } from './db'
|
||||||
import { putImage } from './storage'
|
import { putImage } from './storage'
|
||||||
import { logInfo, logWarn } from './logger'
|
import { logInfo, logException } from './logger'
|
||||||
|
|
||||||
/** 可转 WebP 的位图格式；SVG（矢量）、ICO、已是 WebP 的原样存储 */
|
/** 可转 WebP 的位图格式；SVG（矢量）、ICO、已是 WebP 的原样存储 */
|
||||||
const WEBP_CONVERTIBLE: readonly AllowedMimeType[] = [
|
const WEBP_CONVERTIBLE: readonly AllowedMimeType[] = [
|
||||||
@@ -121,7 +121,6 @@ export async function processSingleImageUpload(
|
|||||||
|
|
||||||
const compressed = await compressToWebp(bytes, detectedMime, getWebpQuality(event))
|
const compressed = await compressToWebp(bytes, detectedMime, getWebpQuality(event))
|
||||||
|
|
||||||
const imageBaseUrl = getImageBaseUrl(event)
|
|
||||||
const uploadedAt = new Date().toISOString()
|
const uploadedAt = new Date().toISOString()
|
||||||
const key = generateImageKey(
|
const key = generateImageKey(
|
||||||
compressed.mime,
|
compressed.mime,
|
||||||
@@ -137,8 +136,8 @@ export async function processSingleImageUpload(
|
|||||||
size: compressed.bytes.byteLength,
|
size: compressed.bytes.byteLength,
|
||||||
userId: input.userId ?? null
|
userId: input.userId ?? null
|
||||||
})
|
})
|
||||||
} catch {
|
} catch (error) {
|
||||||
logWarn('upload failed: storage error', {
|
logException('upload failed: storage error', error, {
|
||||||
name: originalName,
|
name: originalName,
|
||||||
source: input.source ?? 'web'
|
source: input.source ?? 'web'
|
||||||
})
|
})
|
||||||
@@ -173,7 +172,7 @@ export async function processSingleImageUpload(
|
|||||||
return {
|
return {
|
||||||
item: buildImageItem({
|
item: buildImageItem({
|
||||||
key,
|
key,
|
||||||
baseUrl: imageBaseUrl,
|
event,
|
||||||
originalName,
|
originalName,
|
||||||
contentType: compressed.mime,
|
contentType: compressed.mime,
|
||||||
size: compressed.bytes.byteLength,
|
size: compressed.bytes.byteLength,
|
||||||
|
|||||||
@@ -2,7 +2,9 @@ import type { H3Event } from 'h3'
|
|||||||
import { IMAGE_CACHE_CONTROL } from './constants'
|
import { IMAGE_CACHE_CONTROL } from './constants'
|
||||||
import { getAllowedRefererHostsRaw } from './env'
|
import { getAllowedRefererHostsRaw } from './env'
|
||||||
import { validateImageKey } from './image-key'
|
import { validateImageKey } from './image-key'
|
||||||
|
import { buildPublicImageUrl } from './image-response'
|
||||||
import { createImageStream, headImage } from './storage'
|
import { createImageStream, headImage } from './storage'
|
||||||
|
import { getBackendRowForKey } from './storage/resolver'
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 图片直链处理（/{type}/YYYY/MM/file）
|
* 图片直链处理（/{type}/YYYY/MM/file）
|
||||||
@@ -82,6 +84,12 @@ export async function serveImageByKey(event: H3Event, key: string) {
|
|||||||
throw createError({ statusCode: 404, statusMessage: 'Not Found' })
|
throw createError({ statusCode: 404, statusMessage: 'Not Found' })
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const backendRow = await getBackendRowForKey(key)
|
||||||
|
if (backendRow.serving_mode === 'public' && backendRow.public_url) {
|
||||||
|
const publicUrl = buildPublicImageUrl(backendRow, key)
|
||||||
|
return sendRedirect(event, publicUrl, 302)
|
||||||
|
}
|
||||||
|
|
||||||
const etag = `"${stored.size}-${Math.round(stored.mtimeMs)}"`
|
const etag = `"${stored.size}-${Math.round(stored.mtimeMs)}"`
|
||||||
|
|
||||||
setHeader(event, 'ETag', etag)
|
setHeader(event, 'ETag', etag)
|
||||||
@@ -116,9 +124,9 @@ export async function serveImageByKey(event: H3Event, key: string) {
|
|||||||
setResponseStatus(event, 206)
|
setResponseStatus(event, 206)
|
||||||
setHeader(event, 'Content-Range', `bytes ${range.start}-${range.end}/${stored.size}`)
|
setHeader(event, 'Content-Range', `bytes ${range.start}-${range.end}/${stored.size}`)
|
||||||
setHeader(event, 'Content-Length', range.end - range.start + 1)
|
setHeader(event, 'Content-Length', range.end - range.start + 1)
|
||||||
return sendStream(event, createImageStream(key, range))
|
return sendStream(event, await createImageStream(key, range))
|
||||||
}
|
}
|
||||||
|
|
||||||
setHeader(event, 'Content-Length', stored.size)
|
setHeader(event, 'Content-Length', stored.size)
|
||||||
return sendStream(event, createImageStream(key))
|
return sendStream(event, await createImageStream(key))
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,425 @@
|
|||||||
|
import type { DatabaseSync } from 'node:sqlite'
|
||||||
|
import { getDb } from './db'
|
||||||
|
import { LocalStorageBackend } from './storage/local'
|
||||||
|
import {
|
||||||
|
parseS3Config,
|
||||||
|
parseS3Secrets,
|
||||||
|
S3StorageBackend
|
||||||
|
} from './storage/s3'
|
||||||
|
import type {
|
||||||
|
S3BackendConfig,
|
||||||
|
ServingMode,
|
||||||
|
StorageBackendInfo,
|
||||||
|
StorageBackendRow,
|
||||||
|
StorageBackendType
|
||||||
|
} from './storage/types'
|
||||||
|
|
||||||
|
export const LOCAL_BACKEND_ID = 'local'
|
||||||
|
export const S3_BACKEND_ID = 's3-primary'
|
||||||
|
|
||||||
|
function migrateStorageTables(database: DatabaseSync): void {
|
||||||
|
database.exec(`
|
||||||
|
CREATE TABLE IF NOT EXISTS storage_backends (
|
||||||
|
id TEXT PRIMARY KEY,
|
||||||
|
name TEXT NOT NULL,
|
||||||
|
type TEXT NOT NULL CHECK(type IN ('local', 's3')),
|
||||||
|
config_json TEXT NOT NULL DEFAULT '{}',
|
||||||
|
secret_json TEXT NOT NULL DEFAULT '{}',
|
||||||
|
serving_mode TEXT NOT NULL DEFAULT 'proxy' CHECK(serving_mode IN ('proxy', 'public')),
|
||||||
|
public_url TEXT NOT NULL DEFAULT '',
|
||||||
|
quota_bytes INTEGER,
|
||||||
|
enabled INTEGER NOT NULL DEFAULT 1,
|
||||||
|
is_default INTEGER NOT NULL DEFAULT 0,
|
||||||
|
sort_order INTEGER NOT NULL DEFAULT 0
|
||||||
|
);
|
||||||
|
CREATE TABLE IF NOT EXISTS images (
|
||||||
|
key TEXT PRIMARY KEY,
|
||||||
|
backend_id TEXT NOT NULL,
|
||||||
|
user_id INTEGER,
|
||||||
|
folder TEXT NOT NULL,
|
||||||
|
original_name TEXT NOT NULL,
|
||||||
|
content_type TEXT NOT NULL,
|
||||||
|
size INTEGER NOT NULL,
|
||||||
|
uploaded_at TEXT NOT NULL,
|
||||||
|
FOREIGN KEY (backend_id) REFERENCES storage_backends(id)
|
||||||
|
);
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_images_uploaded_at ON images(uploaded_at DESC);
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_images_backend_id ON images(backend_id);
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_images_user_id ON images(user_id);
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_images_folder ON images(folder);
|
||||||
|
`)
|
||||||
|
}
|
||||||
|
|
||||||
|
export function ensureStorageSchema(): void {
|
||||||
|
migrateStorageTables(getDb())
|
||||||
|
}
|
||||||
|
|
||||||
|
export function ensureDefaultBackends(): void {
|
||||||
|
ensureStorageSchema()
|
||||||
|
const db = getDb()
|
||||||
|
|
||||||
|
const local = db.prepare(`
|
||||||
|
SELECT id FROM storage_backends WHERE id = ?
|
||||||
|
`).get(LOCAL_BACKEND_ID)
|
||||||
|
|
||||||
|
if (!local) {
|
||||||
|
db.prepare(`
|
||||||
|
INSERT INTO storage_backends
|
||||||
|
(id, name, type, config_json, secret_json, serving_mode, public_url,
|
||||||
|
quota_bytes, enabled, is_default, sort_order)
|
||||||
|
VALUES (?, ?, 'local', '{}', '{}', 'proxy', '', NULL, 1, 1, 0)
|
||||||
|
`).run(LOCAL_BACKEND_ID, '本地磁盘')
|
||||||
|
}
|
||||||
|
|
||||||
|
cleanupPlaceholderS3Backend(db)
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 移除早期版本自动种下的空 S3 占位（未配置、未启用、非默认、无图片） */
|
||||||
|
function cleanupPlaceholderS3Backend(db: DatabaseSync): void {
|
||||||
|
const row = db.prepare(`
|
||||||
|
SELECT * FROM storage_backends WHERE id = ?
|
||||||
|
`).get(S3_BACKEND_ID) as StorageBackendRow | undefined
|
||||||
|
|
||||||
|
if (!row || row.type !== 's3' || row.is_default === 1) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
const config = parseS3Config(row.config_json)
|
||||||
|
const secrets = parseS3Secrets(row.secret_json)
|
||||||
|
const configured = Boolean(
|
||||||
|
config?.bucket?.trim()
|
||||||
|
|| config?.endpoint?.trim()
|
||||||
|
|| secrets?.accessKeyId?.trim()
|
||||||
|
|| secrets?.secretAccessKey?.trim()
|
||||||
|
)
|
||||||
|
if (configured) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
const usage = getBackendUsageStats(S3_BACKEND_ID)
|
||||||
|
if (usage.count > 0) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
db.prepare('DELETE FROM storage_backends WHERE id = ?').run(S3_BACKEND_ID)
|
||||||
|
}
|
||||||
|
|
||||||
|
function rowToInfo(row: StorageBackendRow, _maskSecrets = true): StorageBackendInfo & {
|
||||||
|
secretsMasked: Record<string, string>
|
||||||
|
} {
|
||||||
|
const config = row.type === 's3'
|
||||||
|
? (parseS3Config(row.config_json) ?? {})
|
||||||
|
: {}
|
||||||
|
let secretsMasked: Record<string, string> = {}
|
||||||
|
if (row.type === 's3') {
|
||||||
|
const secrets = parseS3Secrets(row.secret_json)
|
||||||
|
secretsMasked = {
|
||||||
|
accessKeyId: secrets?.accessKeyId
|
||||||
|
? maskSecret(secrets.accessKeyId)
|
||||||
|
: '',
|
||||||
|
secretAccessKey: secrets?.secretAccessKey
|
||||||
|
? maskSecret(secrets.secretAccessKey)
|
||||||
|
: ''
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
id: row.id,
|
||||||
|
name: row.name,
|
||||||
|
type: row.type,
|
||||||
|
config,
|
||||||
|
servingMode: row.serving_mode,
|
||||||
|
publicUrl: row.public_url,
|
||||||
|
quotaBytes: row.quota_bytes,
|
||||||
|
enabled: row.enabled === 1,
|
||||||
|
isDefault: row.is_default === 1,
|
||||||
|
sortOrder: row.sort_order,
|
||||||
|
secretsMasked
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function maskSecret(value: string): string {
|
||||||
|
if (value.length <= 4) return '****'
|
||||||
|
return `${value.slice(0, 4)}${'*'.repeat(Math.min(8, value.length - 4))}`
|
||||||
|
}
|
||||||
|
|
||||||
|
export function listStorageBackendRows(): StorageBackendRow[] {
|
||||||
|
ensureDefaultBackends()
|
||||||
|
return getDb().prepare(`
|
||||||
|
SELECT id, name, type, config_json, secret_json, serving_mode, public_url,
|
||||||
|
quota_bytes, enabled, is_default, sort_order
|
||||||
|
FROM storage_backends
|
||||||
|
ORDER BY sort_order ASC, id ASC
|
||||||
|
`).all() as unknown as StorageBackendRow[]
|
||||||
|
}
|
||||||
|
|
||||||
|
export function listStorageBackends(maskSecrets = true): Array<StorageBackendInfo & {
|
||||||
|
secretsMasked: Record<string, string>
|
||||||
|
}> {
|
||||||
|
return listStorageBackendRows().map(row => rowToInfo(row, maskSecrets))
|
||||||
|
}
|
||||||
|
|
||||||
|
export function getStorageBackendRow(id: string): StorageBackendRow | null {
|
||||||
|
ensureDefaultBackends()
|
||||||
|
const row = getDb().prepare(`
|
||||||
|
SELECT id, name, type, config_json, secret_json, serving_mode, public_url,
|
||||||
|
quota_bytes, enabled, is_default, sort_order
|
||||||
|
FROM storage_backends
|
||||||
|
WHERE id = ?
|
||||||
|
`).get(id) as StorageBackendRow | undefined
|
||||||
|
return row ?? null
|
||||||
|
}
|
||||||
|
|
||||||
|
export function getDefaultBackendRow(): StorageBackendRow | null {
|
||||||
|
ensureDefaultBackends()
|
||||||
|
const row = getDb().prepare(`
|
||||||
|
SELECT id, name, type, config_json, secret_json, serving_mode, public_url,
|
||||||
|
quota_bytes, enabled, is_default, sort_order
|
||||||
|
FROM storage_backends
|
||||||
|
WHERE is_default = 1 AND enabled = 1
|
||||||
|
LIMIT 1
|
||||||
|
`).get() as StorageBackendRow | undefined
|
||||||
|
return row ?? null
|
||||||
|
}
|
||||||
|
|
||||||
|
export function getBackendIdForKey(key: string): string | null {
|
||||||
|
ensureStorageSchema()
|
||||||
|
const row = getDb().prepare(`
|
||||||
|
SELECT backend_id FROM images WHERE key = ?
|
||||||
|
`).get(key) as { backend_id: string } | undefined
|
||||||
|
return row?.backend_id ?? null
|
||||||
|
}
|
||||||
|
|
||||||
|
export function setDefaultBackend(id: string): void {
|
||||||
|
const db = getDb()
|
||||||
|
db.exec('UPDATE storage_backends SET is_default = 0')
|
||||||
|
db.prepare(`
|
||||||
|
UPDATE storage_backends SET is_default = 1, enabled = 1 WHERE id = ?
|
||||||
|
`).run(id)
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface StorageBackendPatch {
|
||||||
|
name?: string
|
||||||
|
config?: Record<string, unknown>
|
||||||
|
secrets?: { accessKeyId?: string, secretAccessKey?: string }
|
||||||
|
servingMode?: ServingMode
|
||||||
|
publicUrl?: string
|
||||||
|
quotaBytes?: number | null
|
||||||
|
enabled?: boolean
|
||||||
|
isDefault?: boolean
|
||||||
|
}
|
||||||
|
|
||||||
|
export function updateStorageBackend(id: string, patch: StorageBackendPatch): void {
|
||||||
|
const row = getStorageBackendRow(id)
|
||||||
|
if (!row) {
|
||||||
|
throw new Error(`Storage backend not found: ${id}`)
|
||||||
|
}
|
||||||
|
|
||||||
|
const name = patch.name ?? row.name
|
||||||
|
let configJson = row.config_json
|
||||||
|
let secretJson = row.secret_json
|
||||||
|
|
||||||
|
if (patch.config !== undefined) {
|
||||||
|
const current = row.type === 's3'
|
||||||
|
? (parseS3Config(row.config_json) ?? {})
|
||||||
|
: {}
|
||||||
|
configJson = JSON.stringify({ ...current, ...patch.config })
|
||||||
|
}
|
||||||
|
|
||||||
|
if (patch.secrets !== undefined && row.type === 's3') {
|
||||||
|
const current = parseS3Secrets(row.secret_json) ?? {
|
||||||
|
accessKeyId: '',
|
||||||
|
secretAccessKey: ''
|
||||||
|
}
|
||||||
|
const next = {
|
||||||
|
accessKeyId: patch.secrets.accessKeyId?.trim()
|
||||||
|
? patch.secrets.accessKeyId.trim()
|
||||||
|
: current.accessKeyId,
|
||||||
|
secretAccessKey: patch.secrets.secretAccessKey?.trim()
|
||||||
|
? patch.secrets.secretAccessKey.trim()
|
||||||
|
: current.secretAccessKey
|
||||||
|
}
|
||||||
|
secretJson = JSON.stringify(next)
|
||||||
|
}
|
||||||
|
|
||||||
|
const servingMode = patch.servingMode ?? row.serving_mode
|
||||||
|
const publicUrl = patch.publicUrl ?? row.public_url
|
||||||
|
const quotaBytes = patch.quotaBytes !== undefined
|
||||||
|
? patch.quotaBytes
|
||||||
|
: row.quota_bytes
|
||||||
|
const enabled = patch.enabled !== undefined
|
||||||
|
? (patch.enabled ? 1 : 0)
|
||||||
|
: row.enabled
|
||||||
|
|
||||||
|
getDb().prepare(`
|
||||||
|
UPDATE storage_backends
|
||||||
|
SET name = ?, config_json = ?, secret_json = ?, serving_mode = ?,
|
||||||
|
public_url = ?, quota_bytes = ?, enabled = ?
|
||||||
|
WHERE id = ?
|
||||||
|
`).run(name, configJson, secretJson, servingMode, publicUrl, quotaBytes, enabled, id)
|
||||||
|
|
||||||
|
if (patch.isDefault) {
|
||||||
|
setDefaultBackend(id)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export function isStorageEnvConfigured(): boolean {
|
||||||
|
return getStorageBackendFromEnv() !== null
|
||||||
|
}
|
||||||
|
|
||||||
|
export function getStorageBackendFromEnv(): {
|
||||||
|
type: StorageBackendType
|
||||||
|
config: Record<string, unknown>
|
||||||
|
secrets: { accessKeyId: string, secretAccessKey: string }
|
||||||
|
servingMode: ServingMode
|
||||||
|
publicUrl: string
|
||||||
|
} | null {
|
||||||
|
const backendType = process.env.STORAGE_BACKEND?.trim()
|
||||||
|
if (backendType !== 's3') return null
|
||||||
|
|
||||||
|
const endpoint = process.env.S3_ENDPOINT?.trim() ?? ''
|
||||||
|
const region = process.env.S3_REGION?.trim() ?? ''
|
||||||
|
const bucket = process.env.S3_BUCKET?.trim() ?? ''
|
||||||
|
const accessKeyId = process.env.S3_ACCESS_KEY?.trim() ?? ''
|
||||||
|
const secretAccessKey = process.env.S3_SECRET_KEY?.trim() ?? ''
|
||||||
|
|
||||||
|
if (!endpoint || !bucket || !accessKeyId || !secretAccessKey) {
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
type: 's3',
|
||||||
|
config: {
|
||||||
|
endpoint,
|
||||||
|
region: region || 'auto',
|
||||||
|
bucket,
|
||||||
|
prefix: process.env.S3_PREFIX?.trim() || undefined,
|
||||||
|
forcePathStyle: process.env.S3_FORCE_PATH_STYLE === 'true'
|
||||||
|
},
|
||||||
|
secrets: { accessKeyId, secretAccessKey },
|
||||||
|
servingMode: process.env.S3_PUBLIC_URL?.trim() ? 'public' : 'proxy',
|
||||||
|
publicUrl: process.env.S3_PUBLIC_URL?.trim() ?? ''
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export function createBackendInstance(row: StorageBackendRow) {
|
||||||
|
if (row.type === 'local') {
|
||||||
|
return new LocalStorageBackend(
|
||||||
|
row.id,
|
||||||
|
row.serving_mode,
|
||||||
|
row.public_url
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
const config = parseS3Config(row.config_json)
|
||||||
|
const secrets = parseS3Secrets(row.secret_json)
|
||||||
|
if (!config || !secrets) {
|
||||||
|
throw new Error(`Invalid S3 configuration for backend ${row.id}`)
|
||||||
|
}
|
||||||
|
|
||||||
|
return new S3StorageBackend(
|
||||||
|
row.id,
|
||||||
|
config,
|
||||||
|
secrets,
|
||||||
|
row.serving_mode,
|
||||||
|
row.public_url
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
export function createBackendFromEnv() {
|
||||||
|
const env = getStorageBackendFromEnv()
|
||||||
|
if (!env) return null
|
||||||
|
|
||||||
|
return new S3StorageBackend(
|
||||||
|
S3_BACKEND_ID,
|
||||||
|
env.config as unknown as S3BackendConfig,
|
||||||
|
env.secrets,
|
||||||
|
env.servingMode,
|
||||||
|
env.publicUrl
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
export function getBackendUsageStats(backendId: string): { count: number, bytes: number } {
|
||||||
|
ensureStorageSchema()
|
||||||
|
const row = getDb().prepare(`
|
||||||
|
SELECT COUNT(*) AS count, COALESCE(SUM(size), 0) AS bytes
|
||||||
|
FROM images
|
||||||
|
WHERE backend_id = ?
|
||||||
|
`).get(backendId) as { count: number, bytes: number }
|
||||||
|
return { count: row.count, bytes: row.bytes }
|
||||||
|
}
|
||||||
|
|
||||||
|
function getNextSortOrder(): number {
|
||||||
|
const row = getDb().prepare(`
|
||||||
|
SELECT COALESCE(MAX(sort_order), 0) AS max_order FROM storage_backends
|
||||||
|
`).get() as { max_order: number }
|
||||||
|
return row.max_order + 1
|
||||||
|
}
|
||||||
|
|
||||||
|
export function generateStorageBackendId(): string {
|
||||||
|
const bytes = new Uint8Array(4)
|
||||||
|
crypto.getRandomValues(bytes)
|
||||||
|
const suffix = Array.from(bytes, b => b.toString(16).padStart(2, '0')).join('')
|
||||||
|
return `s3-${suffix}`
|
||||||
|
}
|
||||||
|
|
||||||
|
export function insertStorageBackend(input: {
|
||||||
|
id?: string
|
||||||
|
name: string
|
||||||
|
config: S3BackendConfig
|
||||||
|
secrets: { accessKeyId: string, secretAccessKey: string }
|
||||||
|
servingMode?: ServingMode
|
||||||
|
publicUrl?: string
|
||||||
|
quotaBytes?: number | null
|
||||||
|
enabled?: boolean
|
||||||
|
isDefault?: boolean
|
||||||
|
}): string {
|
||||||
|
ensureDefaultBackends()
|
||||||
|
const id = input.id ?? generateStorageBackendId()
|
||||||
|
const sortOrder = getNextSortOrder()
|
||||||
|
|
||||||
|
getDb().prepare(`
|
||||||
|
INSERT INTO storage_backends
|
||||||
|
(id, name, type, config_json, secret_json, serving_mode, public_url,
|
||||||
|
quota_bytes, enabled, is_default, sort_order)
|
||||||
|
VALUES (?, ?, 's3', ?, ?, ?, ?, ?, ?, 0, ?)
|
||||||
|
`).run(
|
||||||
|
id,
|
||||||
|
input.name,
|
||||||
|
JSON.stringify(input.config),
|
||||||
|
JSON.stringify(input.secrets),
|
||||||
|
input.servingMode ?? 'proxy',
|
||||||
|
input.publicUrl ?? '',
|
||||||
|
input.quotaBytes ?? null,
|
||||||
|
input.enabled === false ? 0 : 1,
|
||||||
|
sortOrder
|
||||||
|
)
|
||||||
|
|
||||||
|
if (input.isDefault) {
|
||||||
|
setDefaultBackend(id)
|
||||||
|
}
|
||||||
|
|
||||||
|
return id
|
||||||
|
}
|
||||||
|
|
||||||
|
export function deleteStorageBackend(id: string): void {
|
||||||
|
if (id === LOCAL_BACKEND_ID) {
|
||||||
|
throw new Error('Cannot delete local backend')
|
||||||
|
}
|
||||||
|
|
||||||
|
const usage = getBackendUsageStats(id)
|
||||||
|
if (usage.count > 0) {
|
||||||
|
throw new Error('Cannot delete backend with stored images')
|
||||||
|
}
|
||||||
|
|
||||||
|
const row = getStorageBackendRow(id)
|
||||||
|
if (!row) {
|
||||||
|
throw new Error(`Storage backend not found: ${id}`)
|
||||||
|
}
|
||||||
|
|
||||||
|
if (row.is_default) {
|
||||||
|
throw new Error('Cannot delete the default backend')
|
||||||
|
}
|
||||||
|
|
||||||
|
getDb().prepare('DELETE FROM storage_backends WHERE id = ?').run(id)
|
||||||
|
}
|
||||||
@@ -0,0 +1,32 @@
|
|||||||
|
import { describe, expect, it } from 'vitest'
|
||||||
|
import { buildBackendCapacity } from './storage-capacity'
|
||||||
|
|
||||||
|
describe('buildBackendCapacity', () => {
|
||||||
|
it('calculates quota-based capacity for s3 backends', async () => {
|
||||||
|
const quotaBytes = 10 * 1024 ** 3
|
||||||
|
const capacity = await buildBackendCapacity('s3-test', 's3', 72_390, quotaBytes)
|
||||||
|
expect(capacity.source).toBe('quota')
|
||||||
|
expect(capacity.totalBytes).toBe(quotaBytes)
|
||||||
|
expect(capacity.usedBytes).toBe(72_390)
|
||||||
|
expect(capacity.freeBytes).toBe(quotaBytes - 72_390)
|
||||||
|
expect(capacity.percent).toBeGreaterThanOrEqual(0)
|
||||||
|
})
|
||||||
|
|
||||||
|
it('allows usage percent to exceed 100 when over quota', async () => {
|
||||||
|
const quotaBytes = 1024
|
||||||
|
const capacity = await buildBackendCapacity('s3-test', 's3', 2048, quotaBytes)
|
||||||
|
expect(capacity.percent).toBe(200)
|
||||||
|
expect(capacity.freeBytes).toBe(0)
|
||||||
|
})
|
||||||
|
|
||||||
|
it('reads disk stats for local backend when available', async () => {
|
||||||
|
const capacity = await buildBackendCapacity('local', 'local', 1024, null)
|
||||||
|
if (capacity.source === 'disk') {
|
||||||
|
expect(capacity.totalBytes).toBeGreaterThan(0)
|
||||||
|
expect(capacity.freeBytes).not.toBeNull()
|
||||||
|
expect(capacity.percent).not.toBeNull()
|
||||||
|
} else {
|
||||||
|
expect(capacity.usedBytes).toBe(1024)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
})
|
||||||
@@ -0,0 +1,92 @@
|
|||||||
|
import { statfs } from 'node:fs/promises'
|
||||||
|
import { getDataDir } from './data-dir'
|
||||||
|
import { LOCAL_BACKEND_ID } from './storage-backends'
|
||||||
|
|
||||||
|
export interface StorageCapacity {
|
||||||
|
totalBytes: number | null
|
||||||
|
usedBytes: number
|
||||||
|
freeBytes: number | null
|
||||||
|
percent: number | null
|
||||||
|
source: 'disk' | 'quota'
|
||||||
|
}
|
||||||
|
|
||||||
|
export function parseQuotaBytes(raw: unknown): number | null {
|
||||||
|
const value = Number(raw)
|
||||||
|
if (!Number.isFinite(value) || value <= 0) return null
|
||||||
|
return Math.round(value)
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function getLocalVolumeStats(): Promise<{
|
||||||
|
totalBytes: number
|
||||||
|
freeBytes: number
|
||||||
|
usedBytes: number
|
||||||
|
} | null> {
|
||||||
|
try {
|
||||||
|
const stats = await statfs(getDataDir())
|
||||||
|
const totalBytes = Number(stats.bsize) * Number(stats.blocks)
|
||||||
|
const freeBytes = Number(stats.bsize) * Number(stats.bavail)
|
||||||
|
if (!Number.isFinite(totalBytes) || totalBytes <= 0) return null
|
||||||
|
return {
|
||||||
|
totalBytes,
|
||||||
|
freeBytes: Math.max(0, freeBytes),
|
||||||
|
usedBytes: Math.max(0, totalBytes - freeBytes)
|
||||||
|
}
|
||||||
|
} catch {
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function buildQuotaCapacity(quotaBytes: number, indexBytes: number): StorageCapacity {
|
||||||
|
const usedBytes = indexBytes
|
||||||
|
const freeBytes = Math.max(0, quotaBytes - usedBytes)
|
||||||
|
const percent = Math.round((usedBytes / quotaBytes) * 1000) / 10
|
||||||
|
return {
|
||||||
|
totalBytes: quotaBytes,
|
||||||
|
usedBytes,
|
||||||
|
freeBytes,
|
||||||
|
percent,
|
||||||
|
source: 'quota'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function buildBackendCapacity(
|
||||||
|
backendId: string,
|
||||||
|
backendType: 'local' | 's3',
|
||||||
|
indexBytes: number,
|
||||||
|
quotaBytes: number | null
|
||||||
|
): Promise<StorageCapacity> {
|
||||||
|
if (backendType === 's3') {
|
||||||
|
if (quotaBytes && quotaBytes > 0) {
|
||||||
|
return buildQuotaCapacity(quotaBytes, indexBytes)
|
||||||
|
}
|
||||||
|
return {
|
||||||
|
totalBytes: null,
|
||||||
|
usedBytes: indexBytes,
|
||||||
|
freeBytes: null,
|
||||||
|
percent: null,
|
||||||
|
source: 'quota'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (backendId === LOCAL_BACKEND_ID || backendType === 'local') {
|
||||||
|
const volume = await getLocalVolumeStats()
|
||||||
|
if (volume) {
|
||||||
|
const percent = Math.round((volume.usedBytes / volume.totalBytes) * 1000) / 10
|
||||||
|
return {
|
||||||
|
totalBytes: volume.totalBytes,
|
||||||
|
usedBytes: volume.usedBytes,
|
||||||
|
freeBytes: volume.freeBytes,
|
||||||
|
percent,
|
||||||
|
source: 'disk'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
totalBytes: null,
|
||||||
|
usedBytes: indexBytes,
|
||||||
|
freeBytes: null,
|
||||||
|
percent: null,
|
||||||
|
source: 'disk'
|
||||||
|
}
|
||||||
|
}
|
||||||
+75
-329
@@ -1,314 +1,119 @@
|
|||||||
import { createReadStream, promises as fs } from 'node:fs'
|
|
||||||
import type { ReadStream } from 'node:fs'
|
import type { ReadStream } from 'node:fs'
|
||||||
import { dirname, join } from 'node:path'
|
import type { Readable } from 'node:stream'
|
||||||
import { isValidFolderName, validateImageKey, DEFAULT_FOLDER } from './image-key'
|
import {
|
||||||
|
countImages as countImagesFromIndex,
|
||||||
|
deleteImageIndex,
|
||||||
|
getFolderStorageStats as getFolderStorageStatsFromIndex,
|
||||||
|
getImageIndexAsStored,
|
||||||
|
getUserScopedStorageStats as getUserScopedStorageStatsFromIndex,
|
||||||
|
insertImageIndex,
|
||||||
|
listFolders as listFoldersFromIndex,
|
||||||
|
listFoldersForUser as listFoldersForUserFromIndex,
|
||||||
|
listImageKeysForAutoDelete,
|
||||||
|
listImages as listImagesFromIndex,
|
||||||
|
searchImages as searchImagesFromIndex
|
||||||
|
} from './image-index'
|
||||||
|
import {
|
||||||
|
getActiveBackend,
|
||||||
|
getBackendForKey
|
||||||
|
} from './storage/resolver'
|
||||||
|
import type {
|
||||||
|
FolderStorageStat,
|
||||||
|
PaginatedResult,
|
||||||
|
StoredImage,
|
||||||
|
StoredImageMeta
|
||||||
|
} from './storage/types'
|
||||||
|
|
||||||
/**
|
export type {
|
||||||
* 本地文件系统存储层
|
FolderStorageStat,
|
||||||
*
|
PaginatedResult,
|
||||||
* 目录布局（DATA_DIR 默认 ./data，容器内挂载 /data）：
|
StoredImage,
|
||||||
* <DATA_DIR>/<type>/YYYY/MM/<随机ID>.webp 按上传 type 分目录（默认 images）
|
StoredImageMeta
|
||||||
* <DATA_DIR>/twikoo/YYYY/MM/<随机ID>.webp twikoo 评论图片
|
} from './storage/types'
|
||||||
* <DATA_DIR>/<type>/YYYY/MM/<随机ID>.webp.meta.json 元数据（原始文件名等）
|
|
||||||
*
|
|
||||||
* 列表按日期降序（新月份在前），meta 缺失时回退到文件属性。
|
|
||||||
*/
|
|
||||||
|
|
||||||
export interface StoredImageMeta {
|
export { getDataDir } from './data-dir'
|
||||||
originalName: string
|
|
||||||
uploadedAt: string
|
|
||||||
contentType: string
|
|
||||||
size: number
|
|
||||||
userId?: number | null
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface StoredImage extends StoredImageMeta {
|
|
||||||
key: string
|
|
||||||
mtimeMs: number
|
|
||||||
}
|
|
||||||
|
|
||||||
const META_SUFFIX = '.meta.json'
|
|
||||||
|
|
||||||
export function getDataDir(): string {
|
|
||||||
return process.env.DATA_DIR || join(process.cwd(), 'data')
|
|
||||||
}
|
|
||||||
|
|
||||||
function keyToFilePath(key: string): string {
|
|
||||||
// key 均已通过 validateImageKey 校验，不存在路径穿越
|
|
||||||
return join(getDataDir(), ...key.split('/'))
|
|
||||||
}
|
|
||||||
|
|
||||||
function contentTypeFromKey(key: string): string {
|
|
||||||
const ext = key.split('.').pop()?.toLowerCase()
|
|
||||||
switch (ext) {
|
|
||||||
case 'jpg':
|
|
||||||
case 'jpeg':
|
|
||||||
return 'image/jpeg'
|
|
||||||
case 'png':
|
|
||||||
return 'image/png'
|
|
||||||
case 'gif':
|
|
||||||
return 'image/gif'
|
|
||||||
case 'webp':
|
|
||||||
return 'image/webp'
|
|
||||||
case 'svg':
|
|
||||||
return 'image/svg+xml'
|
|
||||||
case 'ico':
|
|
||||||
return 'image/x-icon'
|
|
||||||
default:
|
|
||||||
return 'application/octet-stream'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function readMeta(key: string): Promise<Partial<StoredImageMeta>> {
|
|
||||||
try {
|
|
||||||
const raw = await fs.readFile(keyToFilePath(key) + META_SUFFIX, 'utf8')
|
|
||||||
return JSON.parse(raw) as Partial<StoredImageMeta>
|
|
||||||
} catch {
|
|
||||||
return {}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function putImage(
|
export async function putImage(
|
||||||
key: string,
|
key: string,
|
||||||
bytes: Uint8Array,
|
bytes: Uint8Array,
|
||||||
meta: StoredImageMeta
|
meta: StoredImageMeta
|
||||||
): Promise<void> {
|
): Promise<void> {
|
||||||
const filePath = keyToFilePath(key)
|
const backend = await getActiveBackend()
|
||||||
await fs.mkdir(dirname(filePath), { recursive: true })
|
await backend.put(key, bytes, meta)
|
||||||
await fs.writeFile(filePath, bytes)
|
insertImageIndex({
|
||||||
await fs.writeFile(filePath + META_SUFFIX, JSON.stringify(meta))
|
key,
|
||||||
|
backendId: backend.id,
|
||||||
|
userId: meta.userId,
|
||||||
|
originalName: meta.originalName,
|
||||||
|
contentType: meta.contentType,
|
||||||
|
size: meta.size,
|
||||||
|
uploadedAt: meta.uploadedAt
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function headImage(key: string): Promise<StoredImage | null> {
|
export async function headImage(key: string): Promise<StoredImage | null> {
|
||||||
if (!validateImageKey(key)) return null
|
const indexed = getImageIndexAsStored(key)
|
||||||
|
if (indexed) return indexed
|
||||||
|
|
||||||
let stat
|
const backend = await getBackendForKey(key)
|
||||||
try {
|
const stored = await backend.head(key)
|
||||||
stat = await fs.stat(keyToFilePath(key))
|
if (!stored) return null
|
||||||
} catch {
|
|
||||||
return null
|
|
||||||
}
|
|
||||||
if (!stat.isFile()) return null
|
|
||||||
|
|
||||||
const meta = await readMeta(key)
|
insertImageIndex({
|
||||||
return {
|
key: stored.key,
|
||||||
key,
|
backendId: backend.id,
|
||||||
size: stat.size,
|
userId: stored.userId,
|
||||||
mtimeMs: stat.mtimeMs,
|
originalName: stored.originalName,
|
||||||
contentType: meta.contentType ?? contentTypeFromKey(key),
|
contentType: stored.contentType,
|
||||||
originalName: meta.originalName ?? key.split('/').pop() ?? 'image',
|
size: stored.size,
|
||||||
uploadedAt: meta.uploadedAt ?? stat.mtime.toISOString(),
|
uploadedAt: stored.uploadedAt
|
||||||
userId: meta.userId ?? null
|
})
|
||||||
}
|
|
||||||
|
return { ...stored, backendId: backend.id }
|
||||||
}
|
}
|
||||||
|
|
||||||
export function createImageStream(
|
export async function createImageStream(
|
||||||
key: string,
|
key: string,
|
||||||
range?: { start: number, end: number }
|
range?: { start: number, end: number }
|
||||||
): ReadStream {
|
): Promise<ReadStream | Readable> {
|
||||||
return createReadStream(keyToFilePath(key), range)
|
const backend = await getBackendForKey(key)
|
||||||
|
return backend.createStream(key, range)
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function deleteImage(key: string): Promise<void> {
|
export async function deleteImage(key: string): Promise<void> {
|
||||||
const filePath = keyToFilePath(key)
|
const backend = await getBackendForKey(key)
|
||||||
await fs.unlink(filePath)
|
await backend.delete(key)
|
||||||
await fs.unlink(filePath + META_SUFFIX).catch(() => {
|
deleteImageIndex(key)
|
||||||
// meta 文件可能不存在（外部导入的历史图片）
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface PaginatedResult<T> {
|
|
||||||
items: T[]
|
|
||||||
total: number
|
|
||||||
page: number
|
|
||||||
pageSize: number
|
|
||||||
totalPages: number
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function listFolders(): Promise<string[]> {
|
export async function listFolders(): Promise<string[]> {
|
||||||
const names = await readDirNames(getDataDir())
|
return listFoldersFromIndex()
|
||||||
const folders = names.filter(isValidFolderName)
|
|
||||||
if (!folders.includes(DEFAULT_FOLDER)) {
|
|
||||||
folders.push(DEFAULT_FOLDER)
|
|
||||||
}
|
|
||||||
return folders.sort((a, b) => a.localeCompare(b))
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/** 遍历各 type 目录下的 YYYY/MM，返回按日期降序的 key 列表（新月份在前） */
|
export async function listImageKeys(): Promise<string[]> {
|
||||||
export async function listImageKeys(folder?: string): Promise<string[]> {
|
const images = await listImageKeysForAutoDelete()
|
||||||
const keys: string[] = []
|
return images.map(image => image.key)
|
||||||
const prefixes = folder && isValidFolderName(folder)
|
|
||||||
? [folder]
|
|
||||||
: await listFolders()
|
|
||||||
|
|
||||||
for (const prefix of prefixes) {
|
|
||||||
const root = join(getDataDir(), prefix)
|
|
||||||
const years = await readDirNames(root)
|
|
||||||
for (const year of years) {
|
|
||||||
const months = await readDirNames(join(root, year))
|
|
||||||
for (const month of months) {
|
|
||||||
const files = await readFileNames(join(root, year, month))
|
|
||||||
for (const file of files) {
|
|
||||||
if (file.endsWith(META_SUFFIX)) continue
|
|
||||||
const key = `${prefix}/${year}/${month}/${file}`
|
|
||||||
if (validateImageKey(key)) keys.push(key)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// 按 YYYY/MM/文件名 降序排，使不同 type 按时间交错而不是分块
|
|
||||||
return keys.sort((a, b) => {
|
|
||||||
const aDate = a.slice(a.indexOf('/') + 1)
|
|
||||||
const bDate = b.slice(b.indexOf('/') + 1)
|
|
||||||
return bDate.localeCompare(aDate) || b.localeCompare(a)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
async function readDirNames(path: string): Promise<string[]> {
|
|
||||||
try {
|
|
||||||
const entries = await fs.readdir(path, { withFileTypes: true })
|
|
||||||
return entries.filter(e => e.isDirectory()).map(e => e.name)
|
|
||||||
} catch {
|
|
||||||
return []
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function matchesUserFilter(
|
|
||||||
meta: StoredImageMeta,
|
|
||||||
userFilter: number | 'admin'
|
|
||||||
): boolean {
|
|
||||||
if (userFilter === 'admin') return true
|
|
||||||
const ownerId = meta.userId ?? null
|
|
||||||
if (ownerId === null) return false
|
|
||||||
return ownerId === userFilter
|
|
||||||
}
|
|
||||||
|
|
||||||
async function filterKeysByUser(
|
|
||||||
keys: string[],
|
|
||||||
userFilter?: number | 'admin'
|
|
||||||
): Promise<string[]> {
|
|
||||||
if (userFilter === undefined || userFilter === 'admin') {
|
|
||||||
return keys
|
|
||||||
}
|
|
||||||
|
|
||||||
const filtered: string[] = []
|
|
||||||
for (const key of keys) {
|
|
||||||
const meta = await readMeta(key)
|
|
||||||
if (matchesUserFilter(meta as StoredImageMeta, userFilter)) {
|
|
||||||
filtered.push(key)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return filtered
|
|
||||||
}
|
|
||||||
|
|
||||||
async function readFileNames(path: string): Promise<string[]> {
|
|
||||||
try {
|
|
||||||
const entries = await fs.readdir(path, { withFileTypes: true })
|
|
||||||
return entries.filter(e => e.isFile()).map(e => e.name)
|
|
||||||
} catch {
|
|
||||||
return []
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function paginateSlice<T>(
|
|
||||||
all: T[],
|
|
||||||
limit: number,
|
|
||||||
page?: number
|
|
||||||
): PaginatedResult<T> {
|
|
||||||
const total = all.length
|
|
||||||
const pageSize = limit
|
|
||||||
const totalPages = Math.max(1, Math.ceil(total / pageSize) || 1)
|
|
||||||
const requestedPage = Math.max(1, page ?? 1)
|
|
||||||
const safePage = Math.min(requestedPage, totalPages)
|
|
||||||
const start = (safePage - 1) * pageSize
|
|
||||||
const items = all.slice(start, start + pageSize)
|
|
||||||
|
|
||||||
return {
|
|
||||||
items,
|
|
||||||
total,
|
|
||||||
page: safePage,
|
|
||||||
pageSize,
|
|
||||||
totalPages
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function countImages(
|
export async function countImages(
|
||||||
folder?: string,
|
folder?: string,
|
||||||
userFilter?: number | 'admin'
|
userFilter?: number | 'admin'
|
||||||
): Promise<number> {
|
): Promise<number> {
|
||||||
let keys = await listImageKeys(folder)
|
return countImagesFromIndex(folder, userFilter)
|
||||||
keys = await filterKeysByUser(keys, userFilter)
|
|
||||||
return keys.length
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface FolderStorageStat {
|
|
||||||
folder: string
|
|
||||||
count: number
|
|
||||||
bytes: number
|
|
||||||
}
|
|
||||||
|
|
||||||
/** 按顶层目录统计当前磁盘上的图片数量与体积 */
|
|
||||||
export async function getFolderStorageStats(
|
export async function getFolderStorageStats(
|
||||||
userFilter?: number | 'admin'
|
userFilter?: number | 'admin'
|
||||||
): Promise<FolderStorageStat[]> {
|
): Promise<FolderStorageStat[]> {
|
||||||
let keys = await listImageKeys()
|
return getFolderStorageStatsFromIndex(userFilter)
|
||||||
keys = await filterKeysByUser(keys, userFilter)
|
|
||||||
const map = new Map<string, { count: number, bytes: number }>()
|
|
||||||
|
|
||||||
for (const key of keys) {
|
|
||||||
const folder = key.split('/')[0] ?? 'unknown'
|
|
||||||
const meta = await headImage(key)
|
|
||||||
if (!meta) continue
|
|
||||||
const current = map.get(folder) ?? { count: 0, bytes: 0 }
|
|
||||||
current.count += 1
|
|
||||||
current.bytes += meta.size
|
|
||||||
map.set(folder, current)
|
|
||||||
}
|
|
||||||
|
|
||||||
return [...map.entries()]
|
|
||||||
.map(([folder, stat]) => ({ folder, ...stat }))
|
|
||||||
.sort((a, b) => b.bytes - a.bytes || a.folder.localeCompare(b.folder))
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function listFoldersForUser(
|
export async function listFoldersForUser(
|
||||||
userFilter?: number | 'admin'
|
userFilter?: number | 'admin'
|
||||||
): Promise<string[]> {
|
): Promise<string[]> {
|
||||||
if (userFilter === undefined || userFilter === 'admin') {
|
return listFoldersForUserFromIndex(userFilter)
|
||||||
return listFolders()
|
|
||||||
}
|
|
||||||
|
|
||||||
let keys = await listImageKeys()
|
|
||||||
keys = await filterKeysByUser(keys, userFilter)
|
|
||||||
const folders = new Set<string>()
|
|
||||||
for (const key of keys) {
|
|
||||||
const folder = key.split('/')[0]
|
|
||||||
if (folder && isValidFolderName(folder)) {
|
|
||||||
folders.add(folder)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (!folders.size) {
|
|
||||||
folders.add(DEFAULT_FOLDER)
|
|
||||||
}
|
|
||||||
return [...folders].sort((a, b) => a.localeCompare(b))
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function startOfDayIsoInShanghai(now = new Date()): string {
|
|
||||||
const shifted = new Date(now.getTime() + 8 * 60 * 60 * 1000)
|
|
||||||
const y = shifted.getUTCFullYear()
|
|
||||||
const m = shifted.getUTCMonth()
|
|
||||||
const d = shifted.getUTCDate()
|
|
||||||
return new Date(Date.UTC(y, m, d) - 8 * 60 * 60 * 1000).toISOString()
|
|
||||||
}
|
|
||||||
|
|
||||||
function startOfMonthIsoInShanghai(now = new Date()): string {
|
|
||||||
const shifted = new Date(now.getTime() + 8 * 60 * 60 * 1000)
|
|
||||||
const y = shifted.getUTCFullYear()
|
|
||||||
const m = shifted.getUTCMonth()
|
|
||||||
return new Date(Date.UTC(y, m, 1) - 8 * 60 * 60 * 1000).toISOString()
|
|
||||||
}
|
|
||||||
|
|
||||||
/** 普通用户统计：基于本人图片 meta，不依赖全局 activity_logs */
|
|
||||||
export async function getUserScopedStorageStats(userId: number): Promise<{
|
export async function getUserScopedStorageStats(userId: number): Promise<{
|
||||||
storedCount: number
|
storedCount: number
|
||||||
uploadBytesTotal: number
|
uploadBytesTotal: number
|
||||||
@@ -316,42 +121,7 @@ export async function getUserScopedStorageStats(userId: number): Promise<{
|
|||||||
uploadMonth: number
|
uploadMonth: number
|
||||||
byFolder: FolderStorageStat[]
|
byFolder: FolderStorageStat[]
|
||||||
}> {
|
}> {
|
||||||
let keys = await listImageKeys()
|
return getUserScopedStorageStatsFromIndex(userId)
|
||||||
keys = await filterKeysByUser(keys, userId)
|
|
||||||
|
|
||||||
const startOfDay = startOfDayIsoInShanghai()
|
|
||||||
const startOfMonth = startOfMonthIsoInShanghai()
|
|
||||||
const map = new Map<string, { count: number, bytes: number }>()
|
|
||||||
let uploadBytesTotal = 0
|
|
||||||
let uploadToday = 0
|
|
||||||
let uploadMonth = 0
|
|
||||||
|
|
||||||
for (const key of keys) {
|
|
||||||
const meta = await headImage(key)
|
|
||||||
if (!meta) continue
|
|
||||||
|
|
||||||
uploadBytesTotal += meta.size
|
|
||||||
if (meta.uploadedAt >= startOfDay) uploadToday += 1
|
|
||||||
if (meta.uploadedAt >= startOfMonth) uploadMonth += 1
|
|
||||||
|
|
||||||
const folder = key.split('/')[0] ?? 'unknown'
|
|
||||||
const current = map.get(folder) ?? { count: 0, bytes: 0 }
|
|
||||||
current.count += 1
|
|
||||||
current.bytes += meta.size
|
|
||||||
map.set(folder, current)
|
|
||||||
}
|
|
||||||
|
|
||||||
const byFolder = [...map.entries()]
|
|
||||||
.map(([folder, stat]) => ({ folder, ...stat }))
|
|
||||||
.sort((a, b) => b.bytes - a.bytes || a.folder.localeCompare(b.folder))
|
|
||||||
|
|
||||||
return {
|
|
||||||
storedCount: keys.length,
|
|
||||||
uploadBytesTotal,
|
|
||||||
uploadToday,
|
|
||||||
uploadMonth,
|
|
||||||
byFolder
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function listImages(options: {
|
export async function listImages(options: {
|
||||||
@@ -360,16 +130,7 @@ export async function listImages(options: {
|
|||||||
folder?: string
|
folder?: string
|
||||||
userFilter?: number | 'admin'
|
userFilter?: number | 'admin'
|
||||||
}): Promise<PaginatedResult<StoredImage>> {
|
}): Promise<PaginatedResult<StoredImage>> {
|
||||||
let keys = await listImageKeys(options.folder)
|
return listImagesFromIndex(options)
|
||||||
keys = await filterKeysByUser(keys, options.userFilter)
|
|
||||||
const sliced = paginateSlice(keys, options.limit, options.page)
|
|
||||||
const items = (await Promise.all(sliced.items.map(headImage)))
|
|
||||||
.filter((item): item is StoredImage => item !== null)
|
|
||||||
|
|
||||||
return {
|
|
||||||
...sliced,
|
|
||||||
items
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function searchImages(options: {
|
export async function searchImages(options: {
|
||||||
@@ -379,20 +140,5 @@ export async function searchImages(options: {
|
|||||||
folder?: string
|
folder?: string
|
||||||
userFilter?: number | 'admin'
|
userFilter?: number | 'admin'
|
||||||
}): Promise<PaginatedResult<StoredImage>> {
|
}): Promise<PaginatedResult<StoredImage>> {
|
||||||
const needle = options.query.trim().toLowerCase()
|
return searchImagesFromIndex(options)
|
||||||
let keys = await listImageKeys(options.folder)
|
|
||||||
keys = await filterKeysByUser(keys, options.userFilter)
|
|
||||||
const matches: StoredImage[] = []
|
|
||||||
|
|
||||||
for (const key of keys) {
|
|
||||||
const keyMatches = key.toLowerCase().includes(needle)
|
|
||||||
const item = await headImage(key)
|
|
||||||
if (!item) continue
|
|
||||||
|
|
||||||
if (keyMatches || item.originalName.toLowerCase().includes(needle)) {
|
|
||||||
matches.push(item)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return paginateSlice(matches, options.limit, options.page)
|
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
export { getActiveBackend, getBackendForKey, getActiveBackendRow, getBackendRowForKey } from './resolver'
|
||||||
|
export { LocalStorageBackend } from './local'
|
||||||
|
export { S3StorageBackend, buildObjectKey, parseS3Config, validateS3Config } from './s3'
|
||||||
@@ -0,0 +1,116 @@
|
|||||||
|
import { createReadStream, promises as fs } from 'node:fs'
|
||||||
|
import type { ReadStream } from 'node:fs'
|
||||||
|
import { dirname, join } from 'node:path'
|
||||||
|
import { getDataDir } from '../data-dir'
|
||||||
|
import { validateImageKey } from '../image-key'
|
||||||
|
import type { StoredImage, StoredImageMeta, StorageBackend } from './types'
|
||||||
|
|
||||||
|
const META_SUFFIX = '.meta.json'
|
||||||
|
|
||||||
|
function keyToFilePath(key: string): string {
|
||||||
|
return join(getDataDir(), ...key.split('/'))
|
||||||
|
}
|
||||||
|
|
||||||
|
function contentTypeFromKey(key: string): string {
|
||||||
|
const ext = key.split('.').pop()?.toLowerCase()
|
||||||
|
switch (ext) {
|
||||||
|
case 'jpg':
|
||||||
|
case 'jpeg':
|
||||||
|
return 'image/jpeg'
|
||||||
|
case 'png':
|
||||||
|
return 'image/png'
|
||||||
|
case 'gif':
|
||||||
|
return 'image/gif'
|
||||||
|
case 'webp':
|
||||||
|
return 'image/webp'
|
||||||
|
case 'svg':
|
||||||
|
return 'image/svg+xml'
|
||||||
|
case 'ico':
|
||||||
|
return 'image/x-icon'
|
||||||
|
default:
|
||||||
|
return 'application/octet-stream'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function readMeta(key: string): Promise<Partial<StoredImageMeta>> {
|
||||||
|
try {
|
||||||
|
const raw = await fs.readFile(keyToFilePath(key) + META_SUFFIX, 'utf8')
|
||||||
|
return JSON.parse(raw) as Partial<StoredImageMeta>
|
||||||
|
} catch {
|
||||||
|
return {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export class LocalStorageBackend implements StorageBackend {
|
||||||
|
readonly id: string
|
||||||
|
readonly type = 'local' as const
|
||||||
|
readonly servingMode: 'proxy' | 'public'
|
||||||
|
readonly publicUrl: string
|
||||||
|
|
||||||
|
constructor(
|
||||||
|
id = 'local',
|
||||||
|
servingMode: 'proxy' | 'public' = 'proxy',
|
||||||
|
publicUrl = ''
|
||||||
|
) {
|
||||||
|
this.id = id
|
||||||
|
this.servingMode = servingMode
|
||||||
|
this.publicUrl = publicUrl
|
||||||
|
}
|
||||||
|
|
||||||
|
async put(key: string, bytes: Uint8Array, meta: StoredImageMeta): Promise<void> {
|
||||||
|
const filePath = keyToFilePath(key)
|
||||||
|
await fs.mkdir(dirname(filePath), { recursive: true })
|
||||||
|
await fs.writeFile(filePath, bytes)
|
||||||
|
await fs.writeFile(filePath + META_SUFFIX, JSON.stringify(meta))
|
||||||
|
}
|
||||||
|
|
||||||
|
async head(key: string): Promise<StoredImage | null> {
|
||||||
|
if (!validateImageKey(key)) return null
|
||||||
|
|
||||||
|
let stat
|
||||||
|
try {
|
||||||
|
stat = await fs.stat(keyToFilePath(key))
|
||||||
|
} catch {
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
if (!stat.isFile()) return null
|
||||||
|
|
||||||
|
const meta = await readMeta(key)
|
||||||
|
return {
|
||||||
|
key,
|
||||||
|
size: stat.size,
|
||||||
|
mtimeMs: stat.mtimeMs,
|
||||||
|
contentType: meta.contentType ?? contentTypeFromKey(key),
|
||||||
|
originalName: meta.originalName ?? key.split('/').pop() ?? 'image',
|
||||||
|
uploadedAt: meta.uploadedAt ?? stat.mtime.toISOString(),
|
||||||
|
userId: meta.userId ?? null,
|
||||||
|
backendId: this.id
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async delete(key: string): Promise<void> {
|
||||||
|
const filePath = keyToFilePath(key)
|
||||||
|
await fs.unlink(filePath)
|
||||||
|
await fs.unlink(filePath + META_SUFFIX).catch(() => {})
|
||||||
|
}
|
||||||
|
|
||||||
|
async createStream(
|
||||||
|
key: string,
|
||||||
|
range?: { start: number, end: number }
|
||||||
|
): Promise<ReadStream> {
|
||||||
|
return createReadStream(keyToFilePath(key), range)
|
||||||
|
}
|
||||||
|
|
||||||
|
async testConnection(): Promise<{ ok: boolean, message: string }> {
|
||||||
|
try {
|
||||||
|
await fs.access(getDataDir())
|
||||||
|
return { ok: true, message: '本地磁盘可访问' }
|
||||||
|
} catch {
|
||||||
|
return { ok: false, message: '无法访问数据目录' }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async getUsageStats(): Promise<{ count: number, bytes: number }> {
|
||||||
|
return { count: 0, bytes: 0 }
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
import { describe, expect, it } from 'vitest'
|
||||||
|
import { LOCAL_BACKEND_ID } from '../storage-backends'
|
||||||
|
|
||||||
|
describe('storage resolver constants', () => {
|
||||||
|
it('uses stable local backend id', () => {
|
||||||
|
expect(LOCAL_BACKEND_ID).toBe('local')
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
describe('default backend routing', () => {
|
||||||
|
it('returns local when no env override and local is default', async () => {
|
||||||
|
const original = process.env.STORAGE_BACKEND
|
||||||
|
delete process.env.STORAGE_BACKEND
|
||||||
|
|
||||||
|
const { setDefaultBackend, LOCAL_BACKEND_ID } = await import('../storage-backends')
|
||||||
|
setDefaultBackend(LOCAL_BACKEND_ID)
|
||||||
|
|
||||||
|
const { getActiveBackend } = await import('./resolver')
|
||||||
|
const backend = await getActiveBackend()
|
||||||
|
expect(backend.type).toBe('local')
|
||||||
|
|
||||||
|
if (original !== undefined) {
|
||||||
|
process.env.STORAGE_BACKEND = original
|
||||||
|
}
|
||||||
|
})
|
||||||
|
})
|
||||||
@@ -0,0 +1,115 @@
|
|||||||
|
import {
|
||||||
|
createBackendFromEnv,
|
||||||
|
createBackendInstance,
|
||||||
|
getBackendIdForKey,
|
||||||
|
getDefaultBackendRow,
|
||||||
|
getStorageBackendRow,
|
||||||
|
LOCAL_BACKEND_ID,
|
||||||
|
ensureDefaultBackends
|
||||||
|
} from '../storage-backends'
|
||||||
|
import type { StorageBackend, StorageBackendRow } from './types'
|
||||||
|
|
||||||
|
export async function getActiveBackend(): Promise<StorageBackend> {
|
||||||
|
const fromEnv = createBackendFromEnv()
|
||||||
|
if (fromEnv) return fromEnv
|
||||||
|
|
||||||
|
ensureDefaultBackends()
|
||||||
|
const row = getDefaultBackendRow()
|
||||||
|
if (!row) {
|
||||||
|
return createBackendInstance({
|
||||||
|
id: LOCAL_BACKEND_ID,
|
||||||
|
name: '本地磁盘',
|
||||||
|
type: 'local',
|
||||||
|
config_json: '{}',
|
||||||
|
secret_json: '{}',
|
||||||
|
serving_mode: 'proxy',
|
||||||
|
public_url: '',
|
||||||
|
quota_bytes: null,
|
||||||
|
enabled: 1,
|
||||||
|
is_default: 1,
|
||||||
|
sort_order: 0
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
return createBackendInstance(row)
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function getBackendForKey(key: string): Promise<StorageBackend> {
|
||||||
|
const fromEnv = createBackendFromEnv()
|
||||||
|
if (fromEnv) return fromEnv
|
||||||
|
|
||||||
|
ensureDefaultBackends()
|
||||||
|
const backendId = getBackendIdForKey(key) ?? LOCAL_BACKEND_ID
|
||||||
|
const row = getStorageBackendRow(backendId)
|
||||||
|
|
||||||
|
if (!row || !row.enabled) {
|
||||||
|
return createBackendInstance(fallbackLocalRow())
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
return createBackendInstance(row)
|
||||||
|
} catch {
|
||||||
|
return createBackendInstance(fallbackLocalRow())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export function getActiveBackendRow(): StorageBackendRow | null {
|
||||||
|
const fromEnv = createBackendFromEnv()
|
||||||
|
if (fromEnv) {
|
||||||
|
return {
|
||||||
|
id: fromEnv.id,
|
||||||
|
name: 'S3 (环境变量)',
|
||||||
|
type: 's3',
|
||||||
|
config_json: '{}',
|
||||||
|
secret_json: '{}',
|
||||||
|
serving_mode: fromEnv.servingMode,
|
||||||
|
public_url: fromEnv.publicUrl,
|
||||||
|
quota_bytes: null,
|
||||||
|
enabled: 1,
|
||||||
|
is_default: 1,
|
||||||
|
sort_order: 0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ensureDefaultBackends()
|
||||||
|
return getDefaultBackendRow()
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function getBackendRowForKey(key: string): Promise<StorageBackendRow> {
|
||||||
|
const fromEnv = createBackendFromEnv()
|
||||||
|
if (fromEnv) {
|
||||||
|
return {
|
||||||
|
id: fromEnv.id,
|
||||||
|
name: 'S3 (环境变量)',
|
||||||
|
type: 's3',
|
||||||
|
config_json: '{}',
|
||||||
|
secret_json: '{}',
|
||||||
|
serving_mode: fromEnv.servingMode,
|
||||||
|
public_url: fromEnv.publicUrl,
|
||||||
|
quota_bytes: null,
|
||||||
|
enabled: 1,
|
||||||
|
is_default: 1,
|
||||||
|
sort_order: 0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ensureDefaultBackends()
|
||||||
|
const backendId = getBackendIdForKey(key) ?? LOCAL_BACKEND_ID
|
||||||
|
return getStorageBackendRow(backendId) ?? fallbackLocalRow()
|
||||||
|
}
|
||||||
|
|
||||||
|
function fallbackLocalRow(): StorageBackendRow {
|
||||||
|
return {
|
||||||
|
id: LOCAL_BACKEND_ID,
|
||||||
|
name: '本地磁盘',
|
||||||
|
type: 'local',
|
||||||
|
config_json: '{}',
|
||||||
|
secret_json: '{}',
|
||||||
|
serving_mode: 'proxy',
|
||||||
|
public_url: '',
|
||||||
|
quota_bytes: null,
|
||||||
|
enabled: 1,
|
||||||
|
is_default: 1,
|
||||||
|
sort_order: 0
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,45 @@
|
|||||||
|
import { describe, expect, it } from 'vitest'
|
||||||
|
import { buildObjectKey, parseS3Config, validateS3Config } from './s3'
|
||||||
|
|
||||||
|
describe('S3 backend helpers', () => {
|
||||||
|
it('buildObjectKey joins prefix and key', () => {
|
||||||
|
expect(buildObjectKey('pichost', 'images/2026/01/a.webp')).toBe(
|
||||||
|
'pichost/images/2026/01/a.webp'
|
||||||
|
)
|
||||||
|
expect(buildObjectKey(undefined, 'images/a.webp')).toBe('images/a.webp')
|
||||||
|
expect(buildObjectKey('/pichost/', 'images/a.webp')).toBe('pichost/images/a.webp')
|
||||||
|
})
|
||||||
|
|
||||||
|
it('parseS3Config requires endpoint, region and bucket', () => {
|
||||||
|
expect(parseS3Config('{}')).toBeNull()
|
||||||
|
expect(parseS3Config(JSON.stringify({
|
||||||
|
endpoint: 'https://example.r2.cloudflarestorage.com',
|
||||||
|
region: 'auto',
|
||||||
|
bucket: 'pics'
|
||||||
|
}))).toEqual({
|
||||||
|
endpoint: 'https://example.r2.cloudflarestorage.com',
|
||||||
|
region: 'auto',
|
||||||
|
bucket: 'pics',
|
||||||
|
prefix: undefined,
|
||||||
|
forcePathStyle: false
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
it('validateS3Config rejects invalid endpoint', () => {
|
||||||
|
expect(validateS3Config({
|
||||||
|
endpoint: 'not-a-url',
|
||||||
|
region: 'auto',
|
||||||
|
bucket: 'pics'
|
||||||
|
})).toBeTruthy()
|
||||||
|
expect(validateS3Config({
|
||||||
|
endpoint: 'https://example.com',
|
||||||
|
region: 'auto',
|
||||||
|
bucket: ''
|
||||||
|
})).toBeTruthy()
|
||||||
|
expect(validateS3Config({
|
||||||
|
endpoint: 'https://example.com',
|
||||||
|
region: 'auto',
|
||||||
|
bucket: 'pics'
|
||||||
|
})).toBeNull()
|
||||||
|
})
|
||||||
|
})
|
||||||
@@ -0,0 +1,218 @@
|
|||||||
|
import {
|
||||||
|
DeleteObjectCommand,
|
||||||
|
GetObjectCommand,
|
||||||
|
HeadBucketCommand,
|
||||||
|
HeadObjectCommand,
|
||||||
|
PutObjectCommand,
|
||||||
|
S3Client
|
||||||
|
} from '@aws-sdk/client-s3'
|
||||||
|
import type { Readable } from 'node:stream'
|
||||||
|
import { validateImageKey } from '../image-key'
|
||||||
|
import type {
|
||||||
|
S3BackendConfig,
|
||||||
|
S3BackendSecrets,
|
||||||
|
ServingMode,
|
||||||
|
StoredImage,
|
||||||
|
StoredImageMeta,
|
||||||
|
StorageBackend
|
||||||
|
} from './types'
|
||||||
|
|
||||||
|
function contentTypeFromKey(key: string): string {
|
||||||
|
const ext = key.split('.').pop()?.toLowerCase()
|
||||||
|
switch (ext) {
|
||||||
|
case 'jpg':
|
||||||
|
case 'jpeg':
|
||||||
|
return 'image/jpeg'
|
||||||
|
case 'png':
|
||||||
|
return 'image/png'
|
||||||
|
case 'gif':
|
||||||
|
return 'image/gif'
|
||||||
|
case 'webp':
|
||||||
|
return 'image/webp'
|
||||||
|
case 'svg':
|
||||||
|
return 'image/svg+xml'
|
||||||
|
case 'ico':
|
||||||
|
return 'image/x-icon'
|
||||||
|
default:
|
||||||
|
return 'application/octet-stream'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export function buildObjectKey(prefix: string | undefined, key: string): string {
|
||||||
|
const trimmed = prefix?.replace(/^\/+|\/+$/g, '') ?? ''
|
||||||
|
return trimmed ? `${trimmed}/${key}` : key
|
||||||
|
}
|
||||||
|
|
||||||
|
export function parseS3Config(raw: string): S3BackendConfig | null {
|
||||||
|
try {
|
||||||
|
const parsed = JSON.parse(raw) as Partial<S3BackendConfig>
|
||||||
|
if (!parsed.endpoint || !parsed.region || !parsed.bucket) return null
|
||||||
|
return {
|
||||||
|
endpoint: parsed.endpoint,
|
||||||
|
region: parsed.region,
|
||||||
|
bucket: parsed.bucket,
|
||||||
|
prefix: parsed.prefix,
|
||||||
|
forcePathStyle: parsed.forcePathStyle ?? false
|
||||||
|
}
|
||||||
|
} catch {
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export function parseS3Secrets(raw: string): S3BackendSecrets | null {
|
||||||
|
try {
|
||||||
|
const parsed = JSON.parse(raw) as Partial<S3BackendSecrets>
|
||||||
|
if (!parsed.accessKeyId || !parsed.secretAccessKey) return null
|
||||||
|
return {
|
||||||
|
accessKeyId: parsed.accessKeyId,
|
||||||
|
secretAccessKey: parsed.secretAccessKey
|
||||||
|
}
|
||||||
|
} catch {
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export function validateS3Config(config: S3BackendConfig): string | null {
|
||||||
|
if (!config.endpoint.startsWith('http')) {
|
||||||
|
return 'Endpoint 需为 http(s) 地址'
|
||||||
|
}
|
||||||
|
if (!config.bucket.trim()) {
|
||||||
|
return 'Bucket 不能为空'
|
||||||
|
}
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
|
||||||
|
export class S3StorageBackend implements StorageBackend {
|
||||||
|
readonly id: string
|
||||||
|
readonly type = 's3' as const
|
||||||
|
readonly servingMode: ServingMode
|
||||||
|
readonly publicUrl: string
|
||||||
|
private readonly client: S3Client
|
||||||
|
private readonly bucket: string
|
||||||
|
private readonly prefix: string | undefined
|
||||||
|
|
||||||
|
constructor(
|
||||||
|
id: string,
|
||||||
|
config: S3BackendConfig,
|
||||||
|
secrets: S3BackendSecrets,
|
||||||
|
servingMode: ServingMode = 'proxy',
|
||||||
|
publicUrl = ''
|
||||||
|
) {
|
||||||
|
this.id = id
|
||||||
|
this.servingMode = servingMode
|
||||||
|
this.publicUrl = publicUrl
|
||||||
|
this.bucket = config.bucket
|
||||||
|
this.prefix = config.prefix
|
||||||
|
this.client = new S3Client({
|
||||||
|
endpoint: config.endpoint,
|
||||||
|
region: config.region,
|
||||||
|
credentials: {
|
||||||
|
accessKeyId: secrets.accessKeyId,
|
||||||
|
secretAccessKey: secrets.secretAccessKey
|
||||||
|
},
|
||||||
|
forcePathStyle: config.forcePathStyle ?? false
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
private objectKey(key: string): string {
|
||||||
|
return buildObjectKey(this.prefix, key)
|
||||||
|
}
|
||||||
|
|
||||||
|
async put(key: string, bytes: Uint8Array, meta: StoredImageMeta): Promise<void> {
|
||||||
|
await this.client.send(new PutObjectCommand({
|
||||||
|
Bucket: this.bucket,
|
||||||
|
Key: this.objectKey(key),
|
||||||
|
Body: bytes,
|
||||||
|
ContentType: meta.contentType,
|
||||||
|
Metadata: {
|
||||||
|
originalName: meta.originalName,
|
||||||
|
uploadedAt: meta.uploadedAt,
|
||||||
|
userId: meta.userId != null ? String(meta.userId) : ''
|
||||||
|
}
|
||||||
|
}))
|
||||||
|
}
|
||||||
|
|
||||||
|
async head(key: string): Promise<StoredImage | null> {
|
||||||
|
if (!validateImageKey(key)) return null
|
||||||
|
|
||||||
|
try {
|
||||||
|
const response = await this.client.send(new HeadObjectCommand({
|
||||||
|
Bucket: this.bucket,
|
||||||
|
Key: this.objectKey(key)
|
||||||
|
}))
|
||||||
|
|
||||||
|
const uploadedAt = response.Metadata?.uploadedat
|
||||||
|
?? response.LastModified?.toISOString()
|
||||||
|
?? new Date().toISOString()
|
||||||
|
const originalName = response.Metadata?.originalname
|
||||||
|
?? key.split('/').pop()
|
||||||
|
?? 'image'
|
||||||
|
const userIdRaw = response.Metadata?.userid
|
||||||
|
const userId = userIdRaw ? Number(userIdRaw) : null
|
||||||
|
|
||||||
|
return {
|
||||||
|
key,
|
||||||
|
size: response.ContentLength ?? 0,
|
||||||
|
mtimeMs: response.LastModified?.getTime() ?? Date.now(),
|
||||||
|
contentType: response.ContentType ?? contentTypeFromKey(key),
|
||||||
|
originalName,
|
||||||
|
uploadedAt,
|
||||||
|
userId: Number.isFinite(userId) ? userId : null,
|
||||||
|
backendId: this.id
|
||||||
|
}
|
||||||
|
} catch {
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async delete(key: string): Promise<void> {
|
||||||
|
await this.client.send(new DeleteObjectCommand({
|
||||||
|
Bucket: this.bucket,
|
||||||
|
Key: this.objectKey(key)
|
||||||
|
}))
|
||||||
|
}
|
||||||
|
|
||||||
|
async createStream(
|
||||||
|
key: string,
|
||||||
|
range?: { start: number, end: number }
|
||||||
|
): Promise<Readable> {
|
||||||
|
const response = await this.client.send(new GetObjectCommand({
|
||||||
|
Bucket: this.bucket,
|
||||||
|
Key: this.objectKey(key),
|
||||||
|
Range: range ? `bytes=${range.start}-${range.end}` : undefined
|
||||||
|
}))
|
||||||
|
|
||||||
|
if (!response.Body) {
|
||||||
|
throw new Error('Empty S3 response body')
|
||||||
|
}
|
||||||
|
|
||||||
|
return response.Body as Readable
|
||||||
|
}
|
||||||
|
|
||||||
|
async testConnection(): Promise<{ ok: boolean, message: string }> {
|
||||||
|
const probeKey = `__pichost-probe-${Date.now()}.txt`
|
||||||
|
const probeBytes = new TextEncoder().encode('pichost-probe')
|
||||||
|
|
||||||
|
try {
|
||||||
|
await this.client.send(new HeadBucketCommand({ Bucket: this.bucket }))
|
||||||
|
await this.client.send(new PutObjectCommand({
|
||||||
|
Bucket: this.bucket,
|
||||||
|
Key: buildObjectKey(this.prefix, probeKey),
|
||||||
|
Body: probeBytes,
|
||||||
|
ContentType: 'text/plain'
|
||||||
|
}))
|
||||||
|
await this.client.send(new DeleteObjectCommand({
|
||||||
|
Bucket: this.bucket,
|
||||||
|
Key: buildObjectKey(this.prefix, probeKey)
|
||||||
|
}))
|
||||||
|
return { ok: true, message: '连接成功' }
|
||||||
|
} catch (error) {
|
||||||
|
const message = error instanceof Error ? error.message : '连接失败'
|
||||||
|
return { ok: false, message }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async getUsageStats(): Promise<{ count: number, bytes: number }> {
|
||||||
|
return { count: 0, bytes: 0 }
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,85 @@
|
|||||||
|
import type { Readable } from 'node:stream'
|
||||||
|
|
||||||
|
export interface StoredImageMeta {
|
||||||
|
originalName: string
|
||||||
|
uploadedAt: string
|
||||||
|
contentType: string
|
||||||
|
size: number
|
||||||
|
userId?: number | null
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface StoredImage extends StoredImageMeta {
|
||||||
|
key: string
|
||||||
|
mtimeMs: number
|
||||||
|
backendId?: string
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface PaginatedResult<T> {
|
||||||
|
items: T[]
|
||||||
|
total: number
|
||||||
|
page: number
|
||||||
|
pageSize: number
|
||||||
|
totalPages: number
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface FolderStorageStat {
|
||||||
|
folder: string
|
||||||
|
count: number
|
||||||
|
bytes: number
|
||||||
|
}
|
||||||
|
|
||||||
|
export type StorageBackendType = 'local' | 's3'
|
||||||
|
export type ServingMode = 'proxy' | 'public'
|
||||||
|
|
||||||
|
export interface S3BackendConfig {
|
||||||
|
endpoint: string
|
||||||
|
region: string
|
||||||
|
bucket: string
|
||||||
|
prefix?: string
|
||||||
|
forcePathStyle?: boolean
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface S3BackendSecrets {
|
||||||
|
accessKeyId: string
|
||||||
|
secretAccessKey: string
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface StorageBackendRow {
|
||||||
|
id: string
|
||||||
|
name: string
|
||||||
|
type: StorageBackendType
|
||||||
|
config_json: string
|
||||||
|
secret_json: string
|
||||||
|
serving_mode: ServingMode
|
||||||
|
public_url: string
|
||||||
|
quota_bytes: number | null
|
||||||
|
enabled: number
|
||||||
|
is_default: number
|
||||||
|
sort_order: number
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface StorageBackendInfo {
|
||||||
|
id: string
|
||||||
|
name: string
|
||||||
|
type: StorageBackendType
|
||||||
|
config: S3BackendConfig | Record<string, never>
|
||||||
|
servingMode: ServingMode
|
||||||
|
publicUrl: string
|
||||||
|
quotaBytes: number | null
|
||||||
|
enabled: boolean
|
||||||
|
isDefault: boolean
|
||||||
|
sortOrder: number
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface StorageBackend {
|
||||||
|
readonly id: string
|
||||||
|
readonly type: StorageBackendType
|
||||||
|
readonly servingMode: ServingMode
|
||||||
|
readonly publicUrl: string
|
||||||
|
put(key: string, bytes: Uint8Array, meta: StoredImageMeta): Promise<void>
|
||||||
|
head(key: string): Promise<StoredImage | null>
|
||||||
|
delete(key: string): Promise<void>
|
||||||
|
createStream(key: string, range?: { start: number, end: number }): Promise<Readable>
|
||||||
|
testConnection(): Promise<{ ok: boolean, message: string }>
|
||||||
|
getUsageStats(): Promise<{ count: number, bytes: number }>
|
||||||
|
}
|
||||||
Reference in new issue
Block a user