AI-native knowledge base & Evernote/Obsidian alternative with instant sync & native MCP. Free on Cloudflare or self-hosted via Docker.
HTML ai-agentcloudflarecloudflare-d1cloudflare-r2cloudflare-workersdockerelectronevernoteevernote-alternativeknowledge-basemcpnote-takingobsidian-alternativeoffline-firstpersonal-knowledge-basepwaself-hostedsqlitetiptapweb-clipper
feat: add instance-level S3-compatible object storage
tianma-ifb94903fb524b
diff --git a/README.md b/README.mdindex 823b2a4a..64fc6ae2 100644--- a/README.md+++ b/README.md@@ -216,6 +216,12 @@ Image compression happens in the Web client before upload and is controlled by tEdgeEver avoids Worker-side image processing to reduce compute and image-processing quota usage. REST API and MCP upload paths store the file content provided by the client without additional server-side compression.+## Advanced Object Storage++The instance owner can open **Settings → Advanced → OSS object storage** to send new images and attachments to an S3-compatible service such as Alibaba Cloud OSS, Tencent COS, AWS S3, MinIO, or R2. Existing resources stay in their original store, so changing the default does not migrate or break historical attachments.++Before saving third-party credentials on a Cloudflare deployment, configure the `EDGE_EVER_STORAGE_ENCRYPTION_KEY` Worker Secret with a random value of at least 32 characters. EdgeEver uses this instance-level key to encrypt the access secret stored in D1. Keep the key stable and backed up; it is required to read resources that use the external store.+## MigrationIf you want to migrate notes from other platforms to EdgeEver, please refer to the following simple migration guides:diff --git a/README.zh-CN.md b/README.zh-CN.mdindex bafc6b71..5c257739 100644--- a/README.zh-CN.md+++ b/README.zh-CN.md@@ -227,6 +227,12 @@ https://你的域名/api/openapi.jsonCloudflare Worker 侧执行图片处理会消耗计算/图片处理额度,因此 EdgeEver 将图片压缩放在 Web 客户端完成;REST API 或 MCP 上传入口会按客户端提供的文件内容直接入库,不再由服务端自动压缩。+## 高级对象存储++实例 Owner 可以进入**设置 → 高级设置 → OSS 对象存储**,让后续上传的图片和附件写入兼容 S3 API 的阿里云 OSS、腾讯云 COS、AWS S3、MinIO 或 R2。已有资源继续保留在原存储中,因此切换默认存储不会迁移历史附件,也不会让历史附件失效。++在 Cloudflare 部署中保存第三方凭据前,需要先配置一个至少 32 个字符的随机 `EDGE_EVER_STORAGE_ENCRYPTION_KEY` Worker Secret。EdgeEver 会用这个实例级密钥加密保存在 D1 中的访问密钥。请保持该密钥稳定并妥善备份;读取外部存储中的资源时仍需要它。+## 导入与迁移 (Migration)如果你想从其他笔记软件迁移到 EdgeEver,请参考以下极简迁移指引:diff --git a/apps/api/src/api-context.ts b/apps/api/src/api-context.tsindex 52664220..6f89d524 100644--- a/apps/api/src/api-context.ts+++ b/apps/api/src/api-context.ts@@ -15,6 +15,7 @@ export type Bindings = CloudflareStorageBindings & {EDGE_EVER_AUTH_LOGIN_IP_MAX_ATTEMPTS?: string;EDGE_EVER_AUTH_LOGIN_IP_COOLDOWN_SECONDS?: string;EDGE_EVER_R2_BUCKET_NAME?: string;+ EDGE_EVER_STORAGE_ENCRYPTION_KEY?: string;EDGE_EVER_DEMO_MODE?: string;EDGE_EVER_LOCAL_DEMO_SEED?: string;EDGE_EVER_ALLOW_UNAUTHENTICATED?: string;diff --git a/apps/api/src/index.ts b/apps/api/src/index.tsindex 74d36396..5ebfd569 100644--- a/apps/api/src/index.ts+++ b/apps/api/src/index.ts@@ -28,6 +28,8 @@ import {RestoreJsonMemosSchema,RestoreJsonNotebooksSchema,ResourceUpdateSchema,+ ObjectStorageConnectionTestSchema,+ ObjectStorageSettingsUpdateSchema,type ApiToken,type CreatedApiToken,type MemoDetail,@@ -87,7 +89,6 @@ import {} from "./demo-attachments";import { createCloudflareStorageAdapter } from "./cloudflare-storage-adapter";import type {- BlobStoreAdapter,DatabaseAdapter,PreparedStatementAdapter,} from "./storage-contract";@@ -156,13 +157,24 @@ import {import { registerTagRoutes } from "./tag-routes";import { registerNotebookRoutes } from "./notebook-routes";import { registerMemoShareRoutes, registerPublicShareRoutes } from "./share-routes";+import { decryptSecret, encryptSecret } from "./secret-encryption";+import {+ BUILTIN_STORAGE_CONFIG_ID,+ S3_STORAGE_CONFIG_ID,+ deleteStoredObjects,+ getActiveObjectStorageConfig,+ getObjectStorageConfig,+ mapObjectStorageSettings,+ resolveObjectStorageEncryptionKey,+ resolveObjectStorage,+} from "./object-storage";+import { testWorkerS3Connection } from "./worker-s3-blob-store";// Compatibility aliases keep the existing SQL-heavy implementation small// while routing its dependency through the platform-neutral contract above.-// New code should use DatabaseAdapter/BlobStoreAdapter directly.+// New code should use DatabaseAdapter directly.type D1Database = DatabaseAdapter;type D1PreparedStatement = PreparedStatementAdapter;-type R2Bucket = BlobStoreAdapter;type MemoSummaryRow = {id: string;@@ -305,6 +317,7 @@ type ResourceRow = {original_memo_id: string | null;bucket_name: string;object_key: string;+ storage_config_id: string;kind: "image" | "attachment";mime_type: string | null;filename: string | null;@@ -903,6 +916,118 @@ app.use("/api/v1/*", async (c, next) => {await next();});+const getSubmittedObjectStorageSecret = async (+ c: AppContext,+ submittedSecret: string | undefined,+) => {+ if (submittedSecret) return submittedSecret;+ const existing = await getObjectStorageConfig(c.env.storage.db, S3_STORAGE_CONFIG_ID);+ const encryptionKey = resolveObjectStorageEncryptionKey(c.env.EDGE_EVER_STORAGE_ENCRYPTION_KEY);+ if (!existing?.secret_access_key_encrypted || !encryptionKey) {+ throw new AppError("object_storage_secret_required", "Secret Access Key is required.", 400);+ }+ return decryptSecret(existing.secret_access_key_encrypted, encryptionKey);+};++app.get("/api/v1/instance/object-storage", async (c) => {+ const denied = requireOwner(c);+ if (denied) return denied;++ const active = await getActiveObjectStorageConfig(c.env.storage.db);+ if (!active) return notFound(c, "Object storage configuration not found.");+ const external = await getObjectStorageConfig(c.env.storage.db, S3_STORAGE_CONFIG_ID);+ return c.json({+ settings: mapObjectStorageSettings(active, Boolean(resolveObjectStorageEncryptionKey(c.env.EDGE_EVER_STORAGE_ENCRYPTION_KEY))),+ externalSettings: external+ ? mapObjectStorageSettings(external, Boolean(resolveObjectStorageEncryptionKey(c.env.EDGE_EVER_STORAGE_ENCRYPTION_KEY)))+ : null,+ });+});++app.post("/api/v1/instance/object-storage/test", zValidator("json", ObjectStorageConnectionTestSchema), async (c) => {+ const denied = requireOwner(c);+ if (denied) return denied;+ const input = c.req.valid("json");++ try {+ await testWorkerS3Connection({+ endpoint: input.endpoint.replace(/\/+$/, ""),+ region: input.region,+ bucket: input.bucket,+ accessKeyId: input.accessKeyId,+ secretAccessKey: await getSubmittedObjectStorageSecret(c, input.secretAccessKey),+ forcePathStyle: input.forcePathStyle,+ objectPrefix: input.objectPrefix,+ });+ return c.json({ ok: true });+ } catch (error) {+ if (error instanceof AppError) return apiError(c, error.code, error.message, error.status);+ return apiError(c, "object_storage_connection_failed", error instanceof Error ? error.message : "Object storage connection failed.", 400);+ }+});++app.put("/api/v1/instance/object-storage", zValidator("json", ObjectStorageSettingsUpdateSchema), async (c) => {+ const denied = requireOwner(c);+ if (denied) return denied;+ if (isDemoMode(c.env)) return forbidden(c, "Object storage cannot be changed in demo mode.");+ const input = c.req.valid("json");+ const now = isoNow();++ if (input.provider === "builtin") {+ await c.env.storage.db.batch([+ c.env.storage.db.prepare(`UPDATE object_storage_configs SET is_active = 0, updated_at = ? WHERE is_active = 1`).bind(now),+ c.env.storage.db.prepare(`UPDATE object_storage_configs SET is_active = 1, updated_at = ? WHERE id = ?`).bind(now, BUILTIN_STORAGE_CONFIG_ID),+ auditStatement(c.env.storage.db, "user", c.get("auth").actorId, "instance.object_storage.update", "object_storage", BUILTIN_STORAGE_CONFIG_ID, { provider: "builtin" }),+ ]);+ } else {+ const encryptionKey = resolveObjectStorageEncryptionKey(c.env.EDGE_EVER_STORAGE_ENCRYPTION_KEY);+ if (!encryptionKey) {+ return apiError(c, "object_storage_encryption_key_missing", "Configure EDGE_EVER_STORAGE_ENCRYPTION_KEY before saving external credentials.", 400);+ }++ try {+ const secretAccessKey = await getSubmittedObjectStorageSecret(c, input.secretAccessKey);+ const endpoint = input.endpoint.replace(/\/+$/, "");+ await testWorkerS3Connection({ ...input, endpoint, secretAccessKey });+ const encryptedSecret = await encryptSecret(secretAccessKey, encryptionKey);+ await c.env.storage.db.batch([+ c.env.storage.db.prepare(`UPDATE object_storage_configs SET is_active = 0, updated_at = ? WHERE is_active = 1`).bind(now),+ c.env.storage.db.prepare(+ `INSERT INTO object_storage_configs (+ id, provider, display_name, endpoint, region, bucket, access_key_id,+ secret_access_key_encrypted, force_path_style, object_prefix, is_active, created_at, updated_at+ ) VALUES (?, 's3', ?, ?, ?, ?, ?, ?, ?, ?, 1, ?, ?)+ ON CONFLICT(id) DO UPDATE SET+ display_name = excluded.display_name, endpoint = excluded.endpoint, region = excluded.region,+ bucket = excluded.bucket, access_key_id = excluded.access_key_id,+ secret_access_key_encrypted = excluded.secret_access_key_encrypted,+ force_path_style = excluded.force_path_style, object_prefix = excluded.object_prefix,+ is_active = 1, updated_at = excluded.updated_at`+ ).bind(+ S3_STORAGE_CONFIG_ID,+ input.displayName,+ endpoint,+ input.region,+ input.bucket,+ input.accessKeyId,+ encryptedSecret,+ input.forcePathStyle ? 1 : 0,+ input.objectPrefix.replace(/^\/+|\/+$/g, ""),+ now,+ now,+ ),+ auditStatement(c.env.storage.db, "user", c.get("auth").actorId, "instance.object_storage.update", "object_storage", S3_STORAGE_CONFIG_ID, { provider: "s3", endpoint, bucket: input.bucket }),+ ]);+ } catch (error) {+ if (error instanceof AppError) return apiError(c, error.code, error.message, error.status);+ return apiError(c, "object_storage_connection_failed", error instanceof Error ? error.message : "Object storage connection failed.", 400);+ }+ }++ const active = await getActiveObjectStorageConfig(c.env.storage.db);+ return c.json({ settings: mapObjectStorageSettings(active!, Boolean(resolveObjectStorageEncryptionKey(c.env.EDGE_EVER_STORAGE_ENCRYPTION_KEY))) });+});+app.get("/api/v1/api-tokens", async (c) => {const userOnly = requireUser(c);@@ -1551,7 +1676,7 @@ app.post("/api/v1/memos/batch/delete", zValidator("json", DeleteMemosSchema), asconst actor = getAuditActor(c);try {- const deleted = await deleteMemosRecord(c.env.storage.db, c.env.storage.resources, getWorkspaceId(c), input.memoIds, Boolean(input.permanent), actor);+ const deleted = await deleteMemosRecord(c.env, getWorkspaceId(c), input.memoIds, Boolean(input.permanent), actor);return c.json({ ok: true, deleted });} catch (error) {if (error instanceof AppError) {@@ -1570,7 +1695,7 @@ app.delete("/api/v1/memos/trash/empty", async (c) => {}const actor = getAuditActor(c);- const deleted = await emptyTrashMemosRecord(c.env.storage.db, c.env.storage.resources, getWorkspaceId(c), actor);+ const deleted = await emptyTrashMemosRecord(c.env, getWorkspaceId(c), actor);return c.json({ ok: true, deleted });});@@ -1761,7 +1886,7 @@ app.get("/api/v1/exports/markdown", async (c) => {if (memoIds.length > 0) {const placeholders = memoIds.map(() => "?").join(", ");const resourceRows = await c.env.storage.db.prepare(- `SELECT r.id, r.memo_id, r.original_memo_id, r.bucket_name, r.object_key, r.kind, r.mime_type,+ `SELECT r.id, r.memo_id, r.original_memo_id, r.bucket_name, r.object_key, r.storage_config_id, r.kind, r.mime_type,r.filename, r.byte_size, r.sha256, r.width, r.height, r.created_at, r.updated_atFROM resourcesWHERE is_deleted = 0 AND memo_id IN (${placeholders})@@ -1816,7 +1941,7 @@ app.get("/api/v1/backups/json", async (c) => {const placeholders = memoIds.map(() => "?").join(", ");const [resourceRows, revisionRows] = await Promise.all([c.env.storage.db.prepare(- `SELECT id, memo_id, original_memo_id, bucket_name, object_key, kind, mime_type,+ `SELECT id, memo_id, original_memo_id, bucket_name, object_key, storage_config_id, kind, mime_type,filename, byte_size, sha256, width, height, created_at, updated_atFROM resourcesWHERE is_deleted = 0 AND memo_id IN (${placeholders})@@ -1917,13 +2042,14 @@ app.put("/api/v1/restores/json/resources/:id", async (c) => {return conflict(c, "cross_workspace_id_conflict", "Backup resource ID is already used by another user.");}const previous = await c.env.storage.db.prepare(- `SELECT r.object_key FROM resources r INNER JOIN memos m ON m.id = r.memo_id WHERE r.id = ? AND m.workspace_id = ?`- ).bind(metadata.id, getWorkspaceId(c)).first<{ object_key: string }>();+ `SELECT r.object_key, r.storage_config_id FROM resources r INNER JOIN memos m ON m.id = r.memo_id WHERE r.id = ? AND m.workspace_id = ?`+ ).bind(metadata.id, getWorkspaceId(c)).first<{ object_key: string; storage_config_id: string }>();const originalMemo = metadata.originalMemoId? await c.env.storage.db.prepare(`SELECT id FROM memos WHERE id = ? AND workspace_id = ?`).bind(metadata.originalMemoId, getWorkspaceId(c)).first<{ id: string }>(): null;- await c.env.storage.resources.put(objectKey, bytes, {+ const destination = await resolveObjectStorage(c.env);+ await destination.store.put(objectKey, bytes, {httpMetadata: { contentType: metadata.mimeType ?? file.type ?? "application/octet-stream" },customMetadata: { memoId: metadata.memoId, resourceId: metadata.id, restored: "true" },});@@ -1932,14 +2058,15 @@ app.put("/api/v1/restores/json/resources/:id", async (c) => {const now = isoNow();await c.env.storage.db.prepare(`INSERT INTO resources (- id, memo_id, original_memo_id, bucket_name, object_key, kind, mime_type, filename,+ id, memo_id, original_memo_id, bucket_name, object_key, storage_config_id, kind, mime_type, filename,byte_size, sha256, width, height, metadata_json, is_deleted, created_at, updated_at, deleted_at- ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 0, ?, ?, NULL)+ ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 0, ?, ?, NULL)ON CONFLICT(id) DO UPDATE SETmemo_id = excluded.memo_id,original_memo_id = excluded.original_memo_id,bucket_name = excluded.bucket_name,object_key = excluded.object_key,+ storage_config_id = excluded.storage_config_id,kind = excluded.kind,mime_type = excluded.mime_type,filename = excluded.filename,@@ -1955,8 +2082,9 @@ app.put("/api/v1/restores/json/resources/:id", async (c) => {metadata.id,metadata.memoId,originalMemo?.id ?? null,- c.env.EDGE_EVER_R2_BUCKET_NAME?.trim() || DEFAULT_R2_BUCKET_NAME,+ destination.bucketName,objectKey,+ destination.configId,metadata.kind,metadata.mimeType ?? file.type ?? null,filename,@@ -1969,12 +2097,13 @@ app.put("/api/v1/restores/json/resources/:id", async (c) => {now).run();} catch (error) {- await c.env.storage.resources.delete(objectKey);+ await destination.store.delete(objectKey);throw error;}if (previous?.object_key && previous.object_key !== objectKey) {- await c.env.storage.resources.delete(previous.object_key);+ const previousStorage = await resolveObjectStorage(c.env, previous.storage_config_id);+ await previousStorage.store.delete(previous.object_key);}return c.json({ ok: true });@@ -1990,7 +2119,7 @@ app.get("/api/v1/resources", async (c) => {const limit = clampNumber(Number(c.req.query("limit") ?? 500), 1, 500);const [rows, stats] = await Promise.all([c.env.storage.db.prepare(- `SELECT r.id, r.memo_id, r.original_memo_id, r.bucket_name, r.object_key, r.kind,+ `SELECT r.id, r.memo_id, r.original_memo_id, r.bucket_name, r.object_key, r.storage_config_id, r.kind,r.mime_type, r.filename, r.byte_size, r.sha256, r.width, r.height,r.created_at, r.updated_at, m.title AS memo_title, m.excerpt AS memo_excerpt,m.is_deleted AS memo_is_deleted@@ -2095,11 +2224,11 @@ const createImageResource = async (source: input.source,});const objectKey = `workspaces/${getWorkspaceId(c)}/memos/${input.memoId}/${resourceId}${inferImageExtension(processed.filename, processed.mimeType)}`;- const bucketName = c.env.EDGE_EVER_R2_BUCKET_NAME?.trim() || DEFAULT_R2_BUCKET_NAME;+ const destination = await resolveObjectStorage(c.env);const filename = normalizeFilename(processed.filename) || `${resourceId}${inferImageExtension(processed.filename, processed.mimeType)}`;const checksum = await sha256Bytes(processed.bytes);- await c.env.storage.resources.put(objectKey, processed.bytes, {+ await destination.store.put(objectKey, processed.bytes, {httpMetadata: {contentType: processed.mimeType,cacheControl: "private, max-age=3600",@@ -2115,14 +2244,15 @@ const createImageResource = async (await c.env.storage.db.batch([c.env.storage.db.prepare(`INSERT INTO resources (- id, memo_id, bucket_name, object_key, kind, mime_type, filename,+ id, memo_id, bucket_name, object_key, storage_config_id, kind, mime_type, filename,byte_size, sha256, width, height, metadata_json, created_at, updated_at- ) VALUES (?, ?, ?, ?, 'image', ?, ?, ?, ?, ?, ?, ?, ?, ?)`+ ) VALUES (?, ?, ?, ?, ?, 'image', ?, ?, ?, ?, ?, ?, ?, ?, ?)`).bind(resourceId,input.memoId,- bucketName,+ destination.bucketName,objectKey,+ destination.configId,processed.mimeType,filename,processed.bytes.byteLength,@@ -2141,7 +2271,7 @@ const createImageResource = async (}),]);} catch (error) {- await c.env.storage.resources.delete(objectKey);+ await destination.store.delete(objectKey);throw error;}@@ -2170,10 +2300,10 @@ const createAttachmentResource = async (const now = isoNow();const filename = normalizeFilename(input.filename) || resourceId;const objectKey = `workspaces/${getWorkspaceId(c)}/memos/${input.memoId}/${resourceId}`;- const bucketName = c.env.EDGE_EVER_R2_BUCKET_NAME?.trim() || DEFAULT_R2_BUCKET_NAME;+ const destination = await resolveObjectStorage(c.env);const checksum = await sha256Bytes(input.bytes);- await c.env.storage.resources.put(objectKey, input.bytes, {+ await destination.store.put(objectKey, input.bytes, {httpMetadata: {contentType: input.mimeType,cacheControl: "private, max-age=3600",@@ -2189,14 +2319,15 @@ const createAttachmentResource = async (await c.env.storage.db.batch([c.env.storage.db.prepare(`INSERT INTO resources (- id, memo_id, bucket_name, object_key, kind, mime_type, filename,+ id, memo_id, bucket_name, object_key, storage_config_id, kind, mime_type, filename,byte_size, sha256, width, height, metadata_json, created_at, updated_at- ) VALUES (?, ?, ?, ?, 'attachment', ?, ?, ?, ?, NULL, NULL, ?, ?, ?)`+ ) VALUES (?, ?, ?, ?, ?, 'attachment', ?, ?, ?, ?, NULL, NULL, ?, ?, ?)`).bind(resourceId,input.memoId,- bucketName,+ destination.bucketName,objectKey,+ destination.configId,input.mimeType,filename,input.bytes.byteLength,@@ -2212,7 +2343,7 @@ const createAttachmentResource = async (}),]);} catch (error) {- await c.env.storage.resources.delete(objectKey);+ await destination.store.delete(objectKey);throw error;}@@ -2285,7 +2416,8 @@ app.get("/api/v1/resources/:id/blob", async (c) => {return notFound(c, "Resource not found");}- const object = await c.env.storage.resources.get(resource.object_key);+ const source = await resolveObjectStorage(c.env, resource.storage_config_id);+ const object = await source.store.get(resource.object_key);if (!object) {return notFound(c, "Resource object not found");@@ -2373,7 +2505,8 @@ app.delete("/api/v1/resources/:id", async (c) => {byteSize: resource.byte_size,}),]);- await c.env.storage.resources.delete(resource.object_key);+ const source = await resolveObjectStorage(c.env, resource.storage_config_id);+ await source.store.delete(resource.object_key);return c.json({ ok: true });});@@ -2635,7 +2768,7 @@ app.delete("/api/v1/memos/:id", async (c) => {const resources = await getResourceRowsForMemo(c.env.storage.db, workspaceId, id);if (resources.length > 0) {- await c.env.storage.resources.delete(resources.map((resource) => resource.object_key));+ await deleteStoredObjects(c.env, resources);}await c.env.storage.db.batch([@@ -3093,7 +3226,7 @@ const callMcpTool = async (return { dryRun: true, memos: await getMemosForBulkAction(c.env.storage.db, auth.workspaceId, memoIds, 0) };}- const deleted = await deleteMemosRecord(c.env.storage.db, c.env.storage.resources, auth.workspaceId, memoIds, false, getAuditActor(c));+ const deleted = await deleteMemosRecord(c.env, auth.workspaceId, memoIds, false, getAuditActor(c));return { ok: true, deleted };}case "restore_memos": {@@ -4323,13 +4456,13 @@ const getMemoTemplate = async (db: D1Database, workspaceId: string, id: string):};const deleteMemosRecord = async (- db: D1Database,- resourcesBucket: R2Bucket,+ env: Bindings,workspaceId: string,memoIds: string[],permanent: boolean,actor: { actorType: "user" | "agent"; actorId: string | null }) => {+ const db = env.storage.db;const uniqueMemoIds = Array.from(new Set(memoIds));if (uniqueMemoIds.length === 0) {@@ -4361,16 +4494,15 @@ const deleteMemosRecord = async (if (permanent) {const resourceRows = await db.prepare(- `SELECT object_key+ `SELECT object_key, storage_config_idFROM resourcesWHERE memo_id IN (${placeholders})`).bind(...uniqueMemoIds)- .all<{ object_key: string }>();- const objectKeys = resourceRows.results.map((resource) => resource.object_key);+ .all<{ object_key: string; storage_config_id: string }>();- if (objectKeys.length > 0) {- await resourcesBucket.delete(objectKeys);+ if (resourceRows.results.length > 0) {+ await deleteStoredObjects(env, resourceRows.results);}statements.push(@@ -4527,11 +4659,11 @@ const restoreMemosRecord = async (};const emptyTrashMemosRecord = async (- db: D1Database,- resourcesBucket: R2Bucket,+ env: Bindings,workspaceId: string,actor: { actorType: "user" | "agent"; actorId: string | null }) => {+ const db = env.storage.db;const countRow = await db.prepare(`SELECT COUNT(*) AS count@@ -4547,16 +4679,15 @@ const emptyTrashMemosRecord = async (const resourceRows = await db.prepare(- `SELECT r.object_key+ `SELECT r.object_key, r.storage_config_idFROM resources rINNER JOIN memos m ON m.id = r.memo_idWHERE m.workspace_id = ? AND m.is_deleted = 1`)- .bind(workspaceId).all<{ object_key: string }>();- const objectKeys = resourceRows.results.map((resource) => resource.object_key);+ .bind(workspaceId).all<{ object_key: string; storage_config_id: string }>();- if (objectKeys.length > 0) {- await resourcesBucket.delete(objectKeys);+ if (resourceRows.results.length > 0) {+ await deleteStoredObjects(env, resourceRows.results);}await db.batch([@@ -4826,13 +4957,14 @@ const ensureDemoSeed = async (db.prepare(`INSERT INTO resources (- id, memo_id, bucket_name, object_key, kind, mime_type, filename,+ id, memo_id, bucket_name, object_key, storage_config_id, kind, mime_type, filename,byte_size, sha256, width, height, metadata_json, is_deleted, created_at, updated_at, deleted_at- ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 0, ?, ?, NULL)+ ) VALUES (?, ?, ?, ?, 'builtin', ?, ?, ?, ?, ?, ?, ?, ?, 0, ?, ?, NULL)ON CONFLICT(id) DO UPDATE SETmemo_id = excluded.memo_id,bucket_name = excluded.bucket_name,object_key = excluded.object_key,+ storage_config_id = excluded.storage_config_id,kind = excluded.kind,mime_type = excluded.mime_type,filename = excluded.filename,@@ -4882,12 +5014,8 @@ const resetDemoData = async (env.EDGE_EVER_AUTH_PASSWORD_HASH,hashPassword,);- const resourceRows = await db.prepare(`SELECT object_key FROM resources`).all<{ object_key: string }>();- const objectKeys = resourceRows.results.map((resource) => resource.object_key);-- for (let index = 0; index < objectKeys.length; index += 1000) {- await env.storage.resources.delete(objectKeys.slice(index, index + 1000));- }+ const resourceRows = await db.prepare(`SELECT object_key, storage_config_id FROM resources`).all<{ object_key: string; storage_config_id: string }>();+ await deleteStoredObjects(env, resourceRows.results);const resetStatements: D1PreparedStatement[] = [db.prepare(`DELETE FROM mobile_sync_changes`),@@ -5666,7 +5794,7 @@ const shouldSnapshotMemoRevision = async (const getResourceRow = async (db: D1Database, workspaceId: string, id: string): Promise<ResourceRow | null> =>db.prepare(- `SELECT r.id, r.memo_id, r.original_memo_id, r.bucket_name, r.object_key, r.kind, r.mime_type,+ `SELECT r.id, r.memo_id, r.original_memo_id, r.bucket_name, r.object_key, r.storage_config_id, r.kind, r.mime_type,r.filename, r.byte_size, r.sha256, r.width, r.height, r.created_at, r.updated_atFROM resources rINNER JOIN memos m ON m.id = r.memo_id@@ -5678,7 +5806,7 @@ const getResourceRow = async (db: D1Database, workspaceId: string, id: string):const getResourceRowsForMemo = async (db: D1Database, workspaceId: string, memoId: string): Promise<ResourceRow[]> => {const rows = await db.prepare(- `SELECT r.id, r.memo_id, r.original_memo_id, r.bucket_name, r.object_key, r.kind, r.mime_type,+ `SELECT r.id, r.memo_id, r.original_memo_id, r.bucket_name, r.object_key, r.storage_config_id, r.kind, r.mime_type,r.filename, r.byte_size, r.sha256, r.width, r.height, r.created_at, r.updated_atFROM resources rINNER JOIN memos m ON m.id = r.memo_id@@ -5693,7 +5821,7 @@ const getResourceRowsForMemo = async (db: D1Database, workspaceId: string, memoIconst listResourcesForMemo = async (db: D1Database, workspaceId: string, memoId: string): Promise<Resource[]> => {const rows = await db.prepare(- `SELECT r.id, r.memo_id, r.original_memo_id, r.bucket_name, r.object_key, r.kind, r.mime_type,+ `SELECT r.id, r.memo_id, r.original_memo_id, r.bucket_name, r.object_key, r.storage_config_id, r.kind, r.mime_type,r.filename, r.byte_size, r.sha256, r.width, r.height, r.created_at, r.updated_atFROM resources rINNER JOIN memos m ON m.id = r.memo_id@@ -5710,7 +5838,7 @@ const listResourcesForMcp = async (db: D1Database, workspaceId: string, limit: nconst [rows, stats] = await Promise.all([db.prepare(- `SELECT r.id, r.memo_id, r.original_memo_id, r.bucket_name, r.object_key, r.kind,+ `SELECT r.id, r.memo_id, r.original_memo_id, r.bucket_name, r.object_key, r.storage_config_id, r.kind,r.mime_type, r.filename, r.byte_size, r.sha256, r.width, r.height,r.created_at, r.updated_at, m.title AS memo_title, m.excerpt AS memo_excerpt,m.is_deleted AS memo_is_deleteddiff --git a/apps/api/src/object-storage.ts b/apps/api/src/object-storage.tsnew file mode 100644index 00000000..8a5e8929--- /dev/null+++ b/apps/api/src/object-storage.ts@@ -0,0 +1,124 @@+import type { ObjectStorageSettings } from "@edgeever/shared";+import { AppError } from "./app-error";+import { decryptSecret } from "./secret-encryption";+import type { BlobStoreAdapter, DatabaseAdapter } from "./storage-contract";+import { createWorkerS3BlobStore, type WorkerS3Config } from "./worker-s3-blob-store";++export const BUILTIN_STORAGE_CONFIG_ID = "builtin";+export const S3_STORAGE_CONFIG_ID = "instance-s3";++export const resolveObjectStorageEncryptionKey = (value: string | undefined) => {+ const key = value?.trim();+ return key && key.length >= 32 ? key : undefined;+};++export type ObjectStorageConfigRow = {+ id: string;+ provider: "builtin" | "s3";+ display_name: string;+ endpoint: string | null;+ region: string | null;+ bucket: string | null;+ access_key_id: string | null;+ secret_access_key_encrypted: string | null;+ force_path_style: number;+ object_prefix: string;+ is_active: number;+};++type ObjectStorageEnvironment = {+ storage: { db: DatabaseAdapter; resources: BlobStoreAdapter };+ EDGE_EVER_STORAGE_ENCRYPTION_KEY?: string;+ EDGE_EVER_R2_BUCKET_NAME?: string;+};++const selectConfigSql = `SELECT id, provider, display_name, endpoint, region, bucket, access_key_id,+ secret_access_key_encrypted, force_path_style, object_prefix, is_active FROM object_storage_configs`;++export const getActiveObjectStorageConfig = (db: DatabaseAdapter) =>+ db.prepare(`${selectConfigSql} WHERE is_active = 1 LIMIT 1`).first<ObjectStorageConfigRow>();++export const getObjectStorageConfig = (db: DatabaseAdapter, id: string) =>+ db.prepare(`${selectConfigSql} WHERE id = ?`).bind(id).first<ObjectStorageConfigRow>();++export const mapObjectStorageSettings = (+ row: ObjectStorageConfigRow,+ encryptionConfigured: boolean,+): ObjectStorageSettings => ({+ provider: row.provider,+ displayName: row.display_name,+ endpoint: row.endpoint,+ region: row.region,+ bucket: row.bucket,+ accessKeyId: row.access_key_id,+ hasSecretAccessKey: Boolean(row.secret_access_key_encrypted),+ forcePathStyle: Boolean(row.force_path_style),+ objectPrefix: row.object_prefix,+ encryptionConfigured,+});++const toWorkerS3Config = async (+ row: ObjectStorageConfigRow,+ encryptionKey: string | undefined,+): Promise<WorkerS3Config> => {+ if (!encryptionKey || !row.secret_access_key_encrypted) {+ throw new AppError(+ "object_storage_unavailable",+ "The external object storage credential cannot be decrypted. Configure EDGE_EVER_STORAGE_ENCRYPTION_KEY.",+ 503,+ );+ }+ if (!row.endpoint || !row.region || !row.bucket || !row.access_key_id) {+ throw new AppError("object_storage_unavailable", "The external object storage configuration is incomplete.", 503);+ }++ return {+ endpoint: row.endpoint,+ region: row.region,+ bucket: row.bucket,+ accessKeyId: row.access_key_id,+ secretAccessKey: await decryptSecret(row.secret_access_key_encrypted, encryptionKey),+ forcePathStyle: Boolean(row.force_path_style),+ objectPrefix: row.object_prefix,+ };+};++export const resolveObjectStorage = async (env: ObjectStorageEnvironment, configId?: string | null) => {+ const row = configId+ ? await getObjectStorageConfig(env.storage.db, configId)+ : await getActiveObjectStorageConfig(env.storage.db);++ if (!row && configId) {+ throw new AppError("object_storage_unavailable", "The resource's object storage configuration no longer exists.", 503);+ }++ if (!row || row.provider === "builtin") {+ return {+ configId: BUILTIN_STORAGE_CONFIG_ID,+ bucketName: env.EDGE_EVER_R2_BUCKET_NAME?.trim() || "edgeever-resources",+ store: env.storage.resources,+ };+ }++ return {+ configId: row.id,+ bucketName: row.bucket ?? "external-object-storage",+ store: createWorkerS3BlobStore(await toWorkerS3Config(row, resolveObjectStorageEncryptionKey(env.EDGE_EVER_STORAGE_ENCRYPTION_KEY))),+ };+};++export const deleteStoredObjects = async (+ env: ObjectStorageEnvironment,+ resources: Array<{ storage_config_id?: string | null; object_key: string }>,+) => {+ const groups = new Map<string, string[]>();+ for (const resource of resources) {+ const id = resource.storage_config_id || BUILTIN_STORAGE_CONFIG_ID;+ groups.set(id, [...(groups.get(id) ?? []), resource.object_key]);+ }++ for (const [configId, objectKeys] of groups) {+ const { store } = await resolveObjectStorage(env, configId);+ await store.delete(objectKeys);+ }+};diff --git a/apps/api/src/secret-encryption.test.mjs b/apps/api/src/secret-encryption.test.mjsnew file mode 100644index 00000000..96543bfb--- /dev/null+++ b/apps/api/src/secret-encryption.test.mjs@@ -0,0 +1,18 @@+import { describe, expect, test } from "bun:test";+import { decryptSecret, encryptSecret } from "./secret-encryption.ts";++describe("object storage secret encryption", () => {+ test("round-trips a secret without storing plaintext", async () => {+ const plaintext = "secret-access-key";+ const encrypted = await encryptSecret(plaintext, "instance-master-key");++ expect(encrypted).toStartWith("v1.");+ expect(encrypted).not.toContain(plaintext);+ expect(await decryptSecret(encrypted, "instance-master-key")).toBe(plaintext);+ });++ test("rejects a different master key", async () => {+ const encrypted = await encryptSecret("secret", "first-key");+ expect(decryptSecret(encrypted, "second-key")).rejects.toThrow();+ });+});diff --git a/apps/api/src/secret-encryption.ts b/apps/api/src/secret-encryption.tsnew file mode 100644index 00000000..4c065d67--- /dev/null+++ b/apps/api/src/secret-encryption.ts@@ -0,0 +1,40 @@+const encoder = new TextEncoder();+const decoder = new TextDecoder();++const toBase64 = (bytes: Uint8Array) => {+ let binary = "";+ for (const byte of bytes) binary += String.fromCharCode(byte);+ return btoa(binary);+};++const fromBase64 = (value: string) => {+ const binary = atob(value);+ return Uint8Array.from(binary, (character) => character.charCodeAt(0));+};++const importKey = async (masterKey: string, usage: KeyUsage) => {+ const digest = await crypto.subtle.digest("SHA-256", encoder.encode(masterKey));+ return crypto.subtle.importKey("raw", digest, { name: "AES-GCM" }, false, [usage]);+};++export const encryptSecret = async (value: string, masterKey: string) => {+ const iv = crypto.getRandomValues(new Uint8Array(12));+ const key = await importKey(masterKey, "encrypt");+ const encrypted = await crypto.subtle.encrypt({ name: "AES-GCM", iv }, key, encoder.encode(value));+ return `v1.${toBase64(iv)}.${toBase64(new Uint8Array(encrypted))}`;+};++export const decryptSecret = async (value: string, masterKey: string) => {+ const [version, ivValue, encryptedValue] = value.split(".");+ if (version !== "v1" || !ivValue || !encryptedValue) {+ throw new Error("Unsupported encrypted secret format.");+ }++ const key = await importKey(masterKey, "decrypt");+ const decrypted = await crypto.subtle.decrypt(+ { name: "AES-GCM", iv: fromBase64(ivValue) },+ key,+ fromBase64(encryptedValue),+ );+ return decoder.decode(decrypted);+};diff --git a/apps/api/src/share-routes.ts b/apps/api/src/share-routes.tsindex 2d2bf628..fcd52032 100644--- a/apps/api/src/share-routes.ts+++ b/apps/api/src/share-routes.ts@@ -5,6 +5,7 @@ import { audit } from "./audit";import { randomToken } from "./auth-crypto";import { createId, isoNow, parseJsonArray } from "./entity-utils";import { notFound } from "./http-errors";+import { resolveObjectStorage } from "./object-storage";import { getAuditActor, getWorkspaceId, requireUser } from "./request-auth";const SHARE_TOKEN_BYTES = 32;@@ -20,6 +21,7 @@ type PublicMemoShareRow = {};type SharedResourceRow = {object_key: string;+ storage_config_id: string;kind: "image" | "attachment";mime_type: string | null;filename: string | null;@@ -79,7 +81,7 @@ export const registerPublicShareRoutes = (app: Hono<AppEnv>) => {if (!token) return notFound(c, "Shared resource not found");const resource = await c.env.storage.db.prepare(- `SELECT r.object_key, r.kind, r.mime_type, r.filename+ `SELECT r.object_key, r.storage_config_id, r.kind, r.mime_type, r.filenameFROM memo_shares msINNER JOIN memos m ON m.id = ms.memo_id AND m.workspace_id = ms.workspace_idINNER JOIN resources r ON r.memo_id = m.id@@ -88,7 +90,8 @@ export const registerPublicShareRoutes = (app: Hono<AppEnv>) => {).bind(token, c.req.param("resourceId")).first<SharedResourceRow>();if (!resource) return notFound(c, "Shared resource not found");- const object = await c.env.storage.resources.get(resource.object_key);+ const source = await resolveObjectStorage(c.env, resource.storage_config_id);+ const object = await source.store.get(resource.object_key);if (!object) return notFound(c, "Shared resource not found");const headers = new Headers();diff --git a/apps/api/src/worker-s3-blob-store.test.mjs b/apps/api/src/worker-s3-blob-store.test.mjsnew file mode 100644index 00000000..f9c932af--- /dev/null+++ b/apps/api/src/worker-s3-blob-store.test.mjs@@ -0,0 +1,43 @@+import { afterEach, describe, expect, test } from "bun:test";+import { testWorkerS3Connection } from "./worker-s3-blob-store.ts";++const originalFetch = globalThis.fetch;+afterEach(() => { globalThis.fetch = originalFetch; });++describe("Worker S3-compatible blob store", () => {+ test("signs and verifies a path-style upload/read/delete probe", async () => {+ const objects = new Map();+ const requests = [];+ globalThis.fetch = async (request) => {+ requests.push(request);+ expect(request.headers.get("authorization")).toContain("AWS4-HMAC-SHA256");+ if (request.method === "PUT") {+ objects.set(request.url, new Uint8Array(await request.arrayBuffer()));+ return new Response(null, { status: 200 });+ }+ if (request.method === "GET") {+ const value = objects.get(request.url);+ return value ? new Response(value, { status: 200 }) : new Response(null, { status: 404 });+ }+ if (request.method === "DELETE") {+ objects.delete(request.url);+ return new Response(null, { status: 204 });+ }+ return new Response(null, { status: 405 });+ };++ await testWorkerS3Connection({+ endpoint: "https://objects.example.com",+ region: "us-east-1",+ bucket: "edgeever",+ accessKeyId: "access-key",+ secretAccessKey: "secret-key",+ forcePathStyle: true,+ objectPrefix: "notes",+ });++ expect(requests.map((request) => request.method)).toEqual(["PUT", "GET", "DELETE"]);+ expect(new URL(requests[0].url).pathname).toStartWith("/edgeever/notes/.edgeever-connection-test/");+ expect(objects.size).toBe(0);+ });+});diff --git a/apps/api/src/worker-s3-blob-store.ts b/apps/api/src/worker-s3-blob-store.tsnew file mode 100644index 00000000..a08d14ab--- /dev/null+++ b/apps/api/src/worker-s3-blob-store.ts@@ -0,0 +1,106 @@+import { AwsClient } from "aws4fetch";+import type { BlobObjectAdapter, BlobStoreAdapter } from "./storage-contract";++export type WorkerS3Config = {+ endpoint: string;+ region: string;+ bucket: string;+ accessKeyId: string;+ secretAccessKey: string;+ forcePathStyle: boolean;+ objectPrefix: string;+};++const encodePath = (value: string) => value.split("/").filter(Boolean).map(encodeURIComponent).join("/");++const fullObjectKey = (prefix: string, objectKey: string) =>+ [prefix.replace(/^\/+|\/+$/g, ""), objectKey.replace(/^\/+/, "")].filter(Boolean).join("/");++const createObjectUrl = (config: WorkerS3Config, objectKey: string) => {+ const url = new URL(config.endpoint);+ const encodedKey = encodePath(fullObjectKey(config.objectPrefix, objectKey));+ const endpointPath = url.pathname.replace(/\/$/, "");++ if (config.forcePathStyle) {+ url.pathname = `${endpointPath}/${encodeURIComponent(config.bucket)}/${encodedKey}`;+ } else {+ url.hostname = `${config.bucket}.${url.hostname}`;+ url.pathname = `${endpointPath}/${encodedKey}`;+ }++ return url;+};++const responseError = async (operation: string, response: Response) => {+ const detail = (await response.text()).replace(/\s+/g, " ").trim().slice(0, 300);+ return new Error(`${operation} failed (${response.status})${detail ? `: ${detail}` : ""}`);+};++export const createWorkerS3BlobStore = (config: WorkerS3Config): BlobStoreAdapter => {+ const client = new AwsClient({+ accessKeyId: config.accessKeyId,+ secretAccessKey: config.secretAccessKey,+ region: config.region,+ service: "s3",+ });++ return {+ async get(objectKey): Promise<BlobObjectAdapter | null> {+ const response = await client.fetch(createObjectUrl(config, objectKey).toString());+ if (response.status === 404) return null;+ if (!response.ok) throw await responseError("Object download", response);+ if (!response.body) throw new Error("Object download returned an empty body.");++ return {+ body: response.body,+ size: Number(response.headers.get("content-length") ?? 0),+ writeHttpMetadata: (headers) => {+ for (const name of ["content-type", "cache-control", "content-disposition", "etag", "last-modified"]) {+ const value = response.headers.get(name);+ if (value) headers.set(name, value);+ }+ },+ };+ },++ async put(objectKey, value, options) {+ const metadata = options as { httpMetadata?: Record<string, string> } | undefined;+ const httpMetadata = metadata?.httpMetadata ?? {};+ const headers = new Headers();+ if (httpMetadata.contentType) headers.set("content-type", httpMetadata.contentType);+ if (httpMetadata.cacheControl) headers.set("cache-control", httpMetadata.cacheControl);+ if (httpMetadata.contentDisposition) headers.set("content-disposition", httpMetadata.contentDisposition);+ const response = await client.fetch(createObjectUrl(config, objectKey).toString(), {+ method: "PUT",+ headers,+ body: value as BodyInit,+ });+ if (!response.ok) throw await responseError("Object upload", response);+ },++ async delete(objectKeys) {+ for (const objectKey of Array.isArray(objectKeys) ? objectKeys : [objectKeys]) {+ const response = await client.fetch(createObjectUrl(config, objectKey).toString(), { method: "DELETE" });+ if (!response.ok && response.status !== 404) throw await responseError("Object deletion", response);+ }+ },+ };+};++export const testWorkerS3Connection = async (config: WorkerS3Config) => {+ const store = createWorkerS3BlobStore(config);+ const objectKey = `.edgeever-connection-test/${crypto.randomUUID()}.txt`;+ const expected = `EdgeEver object storage test ${new Date().toISOString()}`;+ await store.put(objectKey, new TextEncoder().encode(expected), {+ httpMetadata: { contentType: "text/plain; charset=utf-8" },+ });++ try {+ const object = await store.get(objectKey);+ if (!object) throw new Error("The test object could not be read after upload.");+ const actual = await new Response(object.body).text();+ if (actual !== expected) throw new Error("The test object content did not match after upload.");+ } finally {+ await store.delete(objectKey);+ }+};diff --git a/apps/web/src/components/SettingsPane.tsx b/apps/web/src/components/SettingsPane.tsxindex 08cb36a6..6ebffd9b 100644--- a/apps/web/src/components/SettingsPane.tsx+++ b/apps/web/src/components/SettingsPane.tsx@@ -9,6 +9,7 @@ import {Sparkles,User,Users,+ Wrench,} from "lucide-react";import { useState, type ReactNode } from "react";import { useTranslation } from "react-i18next";@@ -29,6 +30,7 @@ import { PreferenceCard } from "./settings/PreferenceCard";import { PasswordCard } from "./settings/PasswordCard";import { SessionCard } from "./settings/SessionCard";import { UserManagementCard } from "./settings/UserManagementCard";+import { ObjectStorageCard } from "./settings/ObjectStorageCard";import { ThemeToggle } from "./ThemeToggle";import type { AuthUser } from "@edgeever/shared";import { contentEnterMotion } from "@/lib/motion";@@ -58,7 +60,7 @@ const SettingsGroup = ({ children }: { children: ReactNode }) => (</div>);-type TabKey = "general" | "users" | "data" | "ai" | "account";+type TabKey = "general" | "users" | "data" | "ai" | "advanced" | "account";interface TabItem {key: TabKey;@@ -130,6 +132,15 @@ export const SettingsPane = ({hoverColorClass: "hover:bg-emerald-50/40",iconColorClass: "text-emerald-600",},+ {+ key: "advanced" as const,+ label: t("settings.tabs.advanced"),+ icon: Wrench,+ colorClass: "text-emerald-700",+ bgColorClass: "bg-emerald-50/80",+ hoverColorClass: "hover:bg-emerald-50/40",+ iconColorClass: "text-emerald-600",+ },]: []),{@@ -211,6 +222,12 @@ export const SettingsPane = ({<McpConfigCard /></SettingsGroup>);+ case "advanced":+ return isOwner ? (+ <SettingsGroup>+ <ObjectStorageCard demoMode={demoMode} />+ </SettingsGroup>+ ) : null;case "account":return (<SettingsGroup>diff --git a/apps/web/src/components/settings/ObjectStorageCard.tsx b/apps/web/src/components/settings/ObjectStorageCard.tsxnew file mode 100644index 00000000..1031ea43--- /dev/null+++ b/apps/web/src/components/settings/ObjectStorageCard.tsx@@ -0,0 +1,156 @@+import { useEffect, useState, type FormEvent, type ReactNode } from "react";+import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";+import { CheckCircle2, Cloud, Database, Loader2, TriangleAlert } from "lucide-react";+import { useTranslation } from "react-i18next";+import { Button } from "@/components/ui/button";+import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card";+import { Input } from "@/components/ui/input";+import { Switch } from "@/components/ui/switch";+import { ApiRequestError, api } from "@/lib/api";+import { cn } from "@/lib/utils";++type Provider = "builtin" | "s3";++export const ObjectStorageCard = ({ demoMode }: { demoMode: boolean }) => {+ const { t } = useTranslation();+ const queryClient = useQueryClient();+ const settingsQuery = useQuery({ queryKey: ["instance-object-storage"], queryFn: api.getObjectStorageSettings });+ const [provider, setProvider] = useState<Provider>("builtin");+ const [displayName, setDisplayName] = useState("S3-compatible OSS");+ const [endpoint, setEndpoint] = useState("");+ const [region, setRegion] = useState("");+ const [bucket, setBucket] = useState("");+ const [accessKeyId, setAccessKeyId] = useState("");+ const [secretAccessKey, setSecretAccessKey] = useState("");+ const [forcePathStyle, setForcePathStyle] = useState(true);+ const [objectPrefix, setObjectPrefix] = useState("");++ useEffect(() => {+ if (!settingsQuery.data) return;+ const active = settingsQuery.data.settings;+ const savedExternal = settingsQuery.data.externalSettings ?? (active.provider === "s3" ? active : null);+ setProvider(active.provider);+ if (!savedExternal) return;+ setDisplayName(savedExternal.displayName);+ setEndpoint(savedExternal.endpoint ?? "");+ setRegion(savedExternal.region ?? "");+ setBucket(savedExternal.bucket ?? "");+ setAccessKeyId(savedExternal.accessKeyId ?? "");+ setForcePathStyle(savedExternal.forcePathStyle);+ setObjectPrefix(savedExternal.objectPrefix);+ }, [settingsQuery.data]);++ const s3Payload = () => ({+ endpoint,+ region,+ bucket,+ accessKeyId,+ ...(secretAccessKey ? { secretAccessKey } : {}),+ forcePathStyle,+ objectPrefix,+ });++ const testMutation = useMutation({ mutationFn: () => api.testObjectStorageConnection(s3Payload()) });+ const saveMutation = useMutation({+ mutationFn: () => provider === "builtin"+ ? api.updateObjectStorageSettings({ provider: "builtin" })+ : api.updateObjectStorageSettings({ provider: "s3", displayName, ...s3Payload() }),+ onSuccess: async () => {+ setSecretAccessKey("");+ await queryClient.invalidateQueries({ queryKey: ["instance-object-storage"] });+ },+ });++ const submit = (event: FormEvent) => {+ event.preventDefault();+ saveMutation.mutate();+ };++ const errorMessage = (error: unknown) => {+ if (error instanceof ApiRequestError && error.code === "object_storage_encryption_key_missing") {+ return t("objectStorage.encryptionKeyMissing");+ }+ return error instanceof Error ? error.message : t("objectStorage.failed");+ };++ const encryptionConfigured = settingsQuery.data?.settings.encryptionConfigured ?? false;+ const hasSavedSecret = settingsQuery.data?.externalSettings?.hasSecretAccessKey+ ?? (settingsQuery.data?.settings.provider === "s3" && settingsQuery.data.settings.hasSecretAccessKey);++ return (+ <Card className="w-full min-w-0 overflow-hidden shadow-none">+ <CardHeader className="p-4 sm:p-5">+ <CardTitle className="flex items-center gap-2 text-sm">+ <Cloud className="h-4 w-4 text-emerald-700" />+ {t("objectStorage.title")}+ </CardTitle>+ <CardDescription>{t("objectStorage.description")}</CardDescription>+ </CardHeader>+ <CardContent className="p-4 pt-0 sm:px-5 sm:pb-5">+ {settingsQuery.isLoading ? (+ <p className="flex items-center gap-2 text-sm text-slate-500"><Loader2 className="h-4 w-4 animate-spin" />{t("common.loading")}</p>+ ) : (+ <form className="grid gap-5" onSubmit={submit}>+ <div className="grid gap-2 sm:grid-cols-2">+ {(["builtin", "s3"] as Provider[]).map((item) => (+ <button+ key={item}+ type="button"+ onClick={() => { setProvider(item); testMutation.reset(); saveMutation.reset(); }}+ className={cn(+ "flex items-start gap-3 rounded-xl border p-3 text-left transition-colors",+ provider === item ? "border-emerald-500 bg-emerald-50/70" : "border-slate-200 hover:bg-slate-50",+ )}+ >+ {item === "builtin" ? <Database className="mt-0.5 h-4 w-4 text-emerald-700" /> : <Cloud className="mt-0.5 h-4 w-4 text-emerald-700" />}+ <span><span className="block text-sm font-semibold text-slate-800">{t(`objectStorage.providers.${item}.title`)}</span><span className="mt-0.5 block text-xs leading-5 text-slate-500">{t(`objectStorage.providers.${item}.description`)}</span></span>+ </button>+ ))}+ </div>++ {provider === "s3" ? (+ <div className="grid gap-4 rounded-xl border border-slate-200 bg-slate-50/50 p-4">+ {!encryptionConfigured ? (+ <p className="flex items-start gap-2 rounded-lg border border-amber-200 bg-amber-50 p-3 text-xs leading-5 text-amber-800">+ <TriangleAlert className="mt-0.5 h-4 w-4 shrink-0" />{t("objectStorage.encryptionKeyMissing")}+ </p>+ ) : null}+ <div className="grid gap-4 sm:grid-cols-2">+ <Field label={t("objectStorage.displayName")}><Input value={displayName} onChange={(event) => setDisplayName(event.target.value)} required maxLength={80} /></Field>+ <Field label={t("objectStorage.endpoint")}><Input value={endpoint} onChange={(event) => setEndpoint(event.target.value)} placeholder="https://s3.example.com" required inputMode="url" /></Field>+ <Field label={t("objectStorage.region")}><Input value={region} onChange={(event) => setRegion(event.target.value)} placeholder="us-east-1" required /></Field>+ <Field label={t("objectStorage.bucket")}><Input value={bucket} onChange={(event) => setBucket(event.target.value)} required /></Field>+ <Field label={t("objectStorage.accessKeyId")}><Input value={accessKeyId} onChange={(event) => setAccessKeyId(event.target.value)} required autoComplete="off" /></Field>+ <Field label={t("objectStorage.secretAccessKey")} hint={hasSavedSecret ? t("objectStorage.secretSavedHint") : undefined}><Input type="password" value={secretAccessKey} onChange={(event) => setSecretAccessKey(event.target.value)} required={!hasSavedSecret} autoComplete="new-password" placeholder={hasSavedSecret ? "••••••••••••" : ""} /></Field>+ <Field label={t("objectStorage.objectPrefix")} hint={t("objectStorage.objectPrefixHint")}><Input value={objectPrefix} onChange={(event) => setObjectPrefix(event.target.value)} placeholder="edgeever" /></Field>+ <label className="flex items-center justify-between gap-3 rounded-lg border border-slate-200 bg-white px-3 py-2.5 text-sm font-medium text-slate-700">+ <span><span className="block">{t("objectStorage.pathStyle")}</span><span className="mt-0.5 block text-xs font-normal text-slate-500">{t("objectStorage.pathStyleHint")}</span></span>+ <Switch checked={forcePathStyle} onCheckedChange={setForcePathStyle} />+ </label>+ </div>+ </div>+ ) : null}++ {(testMutation.isSuccess || saveMutation.isSuccess) ? <p className="flex items-center gap-1.5 text-xs font-medium text-emerald-700"><CheckCircle2 className="h-4 w-4" />{saveMutation.isSuccess ? t("objectStorage.saved") : t("objectStorage.testSucceeded")}</p> : null}+ {testMutation.isError ? <p className="text-xs font-medium text-rose-600" role="alert">{errorMessage(testMutation.error)}</p> : null}+ {saveMutation.isError ? <p className="text-xs font-medium text-rose-600" role="alert">{errorMessage(saveMutation.error)}</p> : null}++ <div className="flex flex-wrap justify-end gap-2">+ {provider === "s3" ? <Button type="button" variant="outline" disabled={testMutation.isPending || saveMutation.isPending} onClick={() => testMutation.mutate()}>{testMutation.isPending ? <Loader2 className="h-4 w-4 animate-spin" /> : null}{t("objectStorage.test")}</Button> : null}+ <Button type="submit" disabled={demoMode || saveMutation.isPending || (provider === "s3" && !encryptionConfigured)}>{saveMutation.isPending ? <Loader2 className="h-4 w-4 animate-spin" /> : null}{t("common.save")}</Button>+ </div>+ <p className="text-xs leading-5 text-slate-500">{demoMode ? t("objectStorage.demoDisabled") : t("objectStorage.switchHint")}</p>+ </form>+ )}+ </CardContent>+ </Card>+ );+};++const Field = ({ label, hint, children }: { label: string; hint?: string; children: ReactNode }) => (+ <label className="grid gap-1.5 text-sm font-medium text-slate-700">+ {label}+ {children}+ {hint ? <span className="text-xs font-normal leading-4 text-slate-500">{hint}</span> : null}+ </label>+);diff --git a/apps/web/src/lib/api.ts b/apps/web/src/lib/api.tsindex 99ed6977..d0b9896a 100644--- a/apps/web/src/lib/api.ts+++ b/apps/web/src/lib/api.ts@@ -17,6 +17,7 @@ import type {Resource,ResourceListItem,ResourceStorageSummary,+ ObjectStorageSettings,PublicMemoShare,TagSummary,TiptapDoc,@@ -58,6 +59,10 @@ type ListApiTokensResponse = {type ListUsersResponse = { users: InstanceUser[] };type UserResponse = { user: InstanceUser };type ListLoginDeviceSessionsResponse = { sessions: LoginDeviceSession[] };+type ObjectStorageSettingsResponse = {+ settings: ObjectStorageSettings;+ externalSettings?: ObjectStorageSettings | null;+};const WEB_DEVICE_ID_STORAGE_KEY = "edgeever.web.device-id";export const DESKTOP_API_BASE_URL_STORAGE_KEY = "edgeever.desktop.api-base-url";@@ -359,6 +364,39 @@ export const api = {body: JSON.stringify(payload),}),+ getObjectStorageSettings: () =>+ request<ObjectStorageSettingsResponse>("/api/v1/instance/object-storage"),++ testObjectStorageConnection: (payload: {+ endpoint: string;+ region: string;+ bucket: string;+ accessKeyId: string;+ secretAccessKey?: string;+ forcePathStyle: boolean;+ objectPrefix: string;+ }) => request<{ ok: true }>("/api/v1/instance/object-storage/test", {+ method: "POST",+ body: JSON.stringify(payload),+ }),++ updateObjectStorageSettings: (payload:+ | { provider: "builtin" }+ | {+ provider: "s3";+ displayName: string;+ endpoint: string;+ region: string;+ bucket: string;+ accessKeyId: string;+ secretAccessKey?: string;+ forcePathStyle: boolean;+ objectPrefix: string;+ }) => request<ObjectStorageSettingsResponse>("/api/v1/instance/object-storage", {+ method: "PUT",+ body: JSON.stringify(payload),+ }),+logout: () =>request<{ ok: true }>("/api/v1/auth/logout", {method: "POST",diff --git a/bun.lock b/bun.lockindex 42639e3f..ba9e7483 100644--- a/bun.lock+++ b/bun.lock@@ -25,6 +25,7 @@"@tiptap/extension-table": "3.27.1","@tiptap/react": "latest","@tiptap/starter-kit": "latest",+ "aws4fetch": "^1.0.20","class-variance-authority": "latest","clsx": "latest","cmdk": "^1.1.1",@@ -76,7 +77,7 @@},"apps/desktop": {"name": "@edgeever/desktop",- "version": "1.8.5",+ "version": "1.11.1","dependencies": {"electron-updater": "^6.6.2",},@@ -1530,6 +1531,8 @@"aws4": ["[email protected]", "", {}, "sha512-lHe62zvbTB5eEABUVi/AwVh0ZKY9rMMDhmm+eeyuuUQbQ3+J+fONVQOZyj+DdrvD4BY33uYniyRJ4UJIaSKAfw=="],+ "aws4fetch": ["[email protected]", "", {}, "sha512-/djoAN709iY65ETD6LKCtyyEI04XIBP5xVvfmNxsEP0uJB5tyaGBztSryRr4HqMStr9R06PisQE7m9zDTXKu6g=="],+"axobject-query": ["[email protected]", "", {}, "sha512-qIj0G9wZbMGNLjLmg1PT6v2mE9AH2zlnADJD/2tC6E00hgmhUOfEB6greHPAfLRSufHqROIUTkw6E+M3lH0PTQ=="],"babel-plugin-polyfill-corejs2": ["[email protected]", "", { "dependencies": { "@babel/compat-data": "^7.28.6", "@babel/helper-define-polyfill-provider": "^0.6.8", "semver": "^6.3.1" }, "peerDependencies": { "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0" } }, "sha512-aTyf30K/rqAsNwN76zYrdtx8obu0E4KoUME29B1xj+B3WxgvWkp943vYQ+z8Mv3lw9xHXMHpvSPOBxzAkIa94w=="],diff --git a/docs/manual-deploy.md b/docs/manual-deploy.mdindex 9eb51e9c..eee1f705 100644--- a/docs/manual-deploy.md+++ b/docs/manual-deploy.md@@ -58,6 +58,16 @@ bun run deploy:manualDo not commit `.env.local` or write passwords to D1.+## Enable third-party OSS settings++To configure an S3-compatible object store from **Settings → Advanced**, add a stable encryption secret to the deployed Worker:++```sh+bunx wrangler secret put EDGE_EVER_STORAGE_ENCRYPTION_KEY+```++Use a random value of at least 32 characters and keep a secure backup. EdgeEver encrypts the external Secret Access Key before storing it in D1. Losing or changing this encryption key makes previously saved external credentials unusable. After adding the secret, redeploy or restart the Worker, then use **Test connection** before saving the OSS configuration.+## Recovery- Database not ready: confirm the D1 binding is `DB`, then run `bun run deploy:manual`.diff --git a/docs/manual-deploy.zh-CN.md b/docs/manual-deploy.zh-CN.mdindex 5fbcec03..bbed5166 100644--- a/docs/manual-deploy.zh-CN.md+++ b/docs/manual-deploy.zh-CN.md@@ -58,6 +58,16 @@ bun run deploy:manual不要提交 `.env.local`,也不要把密码写入 D1。+## 启用第三方 OSS 设置++如需在**设置 → 高级设置**中配置兼容 S3 API 的对象存储,请先给已部署的 Worker 添加一个稳定的加密 Secret:++```sh+bunx wrangler secret put EDGE_EVER_STORAGE_ENCRYPTION_KEY+```++请使用至少 32 个字符的随机值并安全备份。EdgeEver 会先加密外部 Secret Access Key,再将其保存到 D1。丢失或更换这个加密密钥会导致之前保存的外部凭据无法使用。添加 Secret 后重新部署或重启 Worker,然后先使用“测试连接”,再保存 OSS 配置。+## 故障恢复- 数据库未就绪:确认 D1 binding 为 `DB`,然后运行 `bun run deploy:manual`。diff --git a/docs/openapi.json b/docs/openapi.jsonindex 87c6824c..7ab724cc 100644--- a/docs/openapi.json+++ b/docs/openapi.json@@ -322,6 +322,35 @@}}},+ "/api/v1/instance/object-storage": {+ "get": {+ "summary": "Read instance object storage settings (owner only)",+ "responses": {+ "200": { "description": "Active and saved external object storage settings", "content": { "application/json": { "schema": { "$ref": "#/components/schemas/ObjectStorageSettingsResponse" } } } },+ "403": { "$ref": "#/components/responses/Error" }+ }+ },+ "put": {+ "summary": "Test and update instance object storage settings (owner only)",+ "requestBody": { "required": true, "content": { "application/json": { "schema": { "$ref": "#/components/schemas/ObjectStorageSettingsUpdateInput" } } } },+ "responses": {+ "200": { "description": "Updated object storage settings", "content": { "application/json": { "schema": { "$ref": "#/components/schemas/ObjectStorageSettingsResponse" } } } },+ "400": { "$ref": "#/components/responses/Error" },+ "403": { "$ref": "#/components/responses/Error" }+ }+ }+ },+ "/api/v1/instance/object-storage/test": {+ "post": {+ "summary": "Test S3-compatible object storage with an upload/read/delete probe (owner only)",+ "requestBody": { "required": true, "content": { "application/json": { "schema": { "$ref": "#/components/schemas/ObjectStorageConnectionTestInput" } } } },+ "responses": {+ "200": { "$ref": "#/components/responses/Ok" },+ "400": { "$ref": "#/components/responses/Error" },+ "403": { "$ref": "#/components/responses/Error" }+ }+ }+ },"/api/v1/notebooks": {"get": {"summary": "List notebooks",@@ -1659,6 +1688,55 @@},"minProperties": 1},+ "ObjectStorageSettings": {+ "type": "object",+ "properties": {+ "provider": { "type": "string", "enum": ["builtin", "s3"] },+ "displayName": { "type": "string" },+ "endpoint": { "type": ["string", "null"] },+ "region": { "type": ["string", "null"] },+ "bucket": { "type": ["string", "null"] },+ "accessKeyId": { "type": ["string", "null"] },+ "hasSecretAccessKey": { "type": "boolean" },+ "forcePathStyle": { "type": "boolean" },+ "objectPrefix": { "type": "string" },+ "encryptionConfigured": { "type": "boolean" }+ },+ "required": ["provider", "displayName", "endpoint", "region", "bucket", "accessKeyId", "hasSecretAccessKey", "forcePathStyle", "objectPrefix", "encryptionConfigured"]+ },+ "ObjectStorageSettingsResponse": {+ "type": "object",+ "properties": {+ "settings": { "$ref": "#/components/schemas/ObjectStorageSettings" },+ "externalSettings": { "oneOf": [{ "$ref": "#/components/schemas/ObjectStorageSettings" }, { "type": "null" }] }+ },+ "required": ["settings"]+ },+ "ObjectStorageS3Input": {+ "type": "object",+ "properties": {+ "endpoint": { "type": "string", "format": "uri", "maxLength": 500 },+ "region": { "type": "string", "minLength": 1, "maxLength": 80 },+ "bucket": { "type": "string", "minLength": 1, "maxLength": 255 },+ "accessKeyId": { "type": "string", "minLength": 1, "maxLength": 256 },+ "secretAccessKey": { "type": "string", "minLength": 1, "maxLength": 1024 },+ "forcePathStyle": { "type": "boolean", "default": true },+ "objectPrefix": { "type": "string", "maxLength": 500, "default": "" }+ },+ "required": ["endpoint", "region", "bucket", "accessKeyId"]+ },+ "ObjectStorageConnectionTestInput": {+ "$ref": "#/components/schemas/ObjectStorageS3Input"+ },+ "ObjectStorageSettingsUpdateInput": {+ "oneOf": [+ { "type": "object", "properties": { "provider": { "const": "builtin" } }, "required": ["provider"] },+ { "allOf": [+ { "$ref": "#/components/schemas/ObjectStorageS3Input" },+ { "type": "object", "properties": { "provider": { "const": "s3" }, "displayName": { "type": "string", "minLength": 1, "maxLength": 80 } }, "required": ["provider", "displayName"] }+ ] }+ ]+ },"LoginInput": {"type": "object","properties": {diff --git a/docs/self-hosting-architecture.md b/docs/self-hosting-architecture.mdindex a605183b..44c35b48 100644--- a/docs/self-hosting-architecture.md+++ b/docs/self-hosting-architecture.md@@ -53,8 +53,10 @@ ambiguous.- Keep `/api/*`, `/mcp`, `/api/openapi.json`, and `/api/health` unchanged.- Keep the current migration files append-only; do not fork the schema forDocker.-- Store secrets in environment variables or Docker secrets, never in the- image or a mounted database.+- Keep root secrets such as `EDGE_EVER_STORAGE_ENCRYPTION_KEY` in environment+ variables or Docker secrets, never in the image or database. Credentials+ entered through the instance settings may be stored only as AES-GCM+ ciphertext protected by that deployment-level key.- Make `/data` the only required persistent application path so NAS users canback up one volume.- Support `EDGE_EVER_AUTH_USERNAME`, `EDGE_EVER_AUTH_PASSWORD`, and sessiondiff --git a/docs/self-hosting-architecture.zh-CN.md b/docs/self-hosting-architecture.zh-CN.mdindex 3e29e253..e19d1aee 100644--- a/docs/self-hosting-architecture.zh-CN.md+++ b/docs/self-hosting-architecture.zh-CN.md@@ -45,7 +45,7 @@ EdgeEver 容器- 保持 `/api/*`、`/mcp`、`/api/openapi.json` 和 `/api/health` 不变。- 继续追加 `migrations/*.sql`,禁止为 Docker 分叉数据库结构。-- 密钥必须通过环境变量或 Docker secrets 注入,不能写入镜像或数据库挂载卷。+- `EDGE_EVER_STORAGE_ENCRYPTION_KEY` 等根密钥必须通过环境变量或 Docker secrets 注入,不能写入镜像或数据库;从实例设置录入的凭据只能以该部署级密钥保护的 AES-GCM 密文形式保存。- 将 `/data` 作为唯一必需的应用持久化路径,方便 NAS 用户备份一个卷。- 容器入口需要支持 `EDGE_EVER_AUTH_USERNAME`、`EDGE_EVER_AUTH_PASSWORD` 和会话配置,同时不能把 Cloudflare 专有配置当作前置条件。diff --git a/migrations/0023_instance_object_storage.sql b/migrations/0023_instance_object_storage.sqlnew file mode 100644index 00000000..40f89ff5--- /dev/null+++ b/migrations/0023_instance_object_storage.sql@@ -0,0 +1,30 @@+PRAGMA foreign_keys = ON;++CREATE TABLE object_storage_configs (+ id TEXT PRIMARY KEY,+ provider TEXT NOT NULL CHECK (provider IN ('builtin', 's3')),+ display_name TEXT NOT NULL CHECK (length(trim(display_name)) > 0),+ endpoint TEXT,+ region TEXT,+ bucket TEXT,+ access_key_id TEXT,+ secret_access_key_encrypted TEXT,+ force_path_style INTEGER NOT NULL DEFAULT 1 CHECK (force_path_style IN (0, 1)),+ object_prefix TEXT NOT NULL DEFAULT '',+ is_active INTEGER NOT NULL DEFAULT 0 CHECK (is_active IN (0, 1)),+ created_at TEXT NOT NULL DEFAULT (strftime('%Y-%m-%dT%H:%M:%fZ', 'now')),+ updated_at TEXT NOT NULL DEFAULT (strftime('%Y-%m-%dT%H:%M:%fZ', 'now'))+);++CREATE UNIQUE INDEX idx_object_storage_single_active+ ON object_storage_configs(is_active)+ WHERE is_active = 1;++INSERT INTO object_storage_configs (id, provider, display_name, is_active)+VALUES ('builtin', 'builtin', 'Built-in object storage', 1);++ALTER TABLE resources+ ADD COLUMN storage_config_id TEXT NOT NULL DEFAULT 'builtin';++CREATE INDEX idx_resources_storage_config+ ON resources(storage_config_id, object_key);diff --git a/package.json b/package.jsonindex 1be7ac9c..c8b82c51 100644--- a/package.json+++ b/package.json@@ -85,6 +85,9 @@},"EDGE_EVER_AUTH_USERNAME": {"description": "管理员登录用户名,默认值为 admin;高级用户可以改成自定义用户名。"+ },+ "EDGE_EVER_STORAGE_ENCRYPTION_KEY": {+ "description": "可选。启用高级设置中的第三方 OSS 时必填,用于加密保存在 D1 中的对象存储访问密钥。"}}},@@ -109,6 +112,7 @@"@tiptap/extension-table": "3.27.1","@tiptap/react": "latest","@tiptap/starter-kit": "latest",+ "aws4fetch": "^1.0.20","class-variance-authority": "latest","clsx": "latest","cmdk": "^1.1.1",diff --git a/packages/shared/src/i18n/en-US.ts b/packages/shared/src/i18n/en-US.tsindex 588b1f8d..417389d8 100644--- a/packages/shared/src/i18n/en-US.ts+++ b/packages/shared/src/i18n/en-US.ts@@ -233,9 +233,36 @@ export const enUS = {general: "General",data: "Import & Export",ai: "AI Integrations",+ advanced: "Advanced",account: "Login Settings",},},+ objectStorage: {+ title: "OSS object storage",+ description: "Configure the object storage used for new images and attachments across this EdgeEver instance. Only the instance owner can make changes.",+ providers: {+ builtin: { title: "Built-in storage", description: "Use the Cloudflare R2 binding or the current runtime's default object store." },+ s3: { title: "Third-party OSS", description: "Connect an S3-compatible OSS, COS, S3, MinIO, or R2 service." },+ },+ displayName: "Configuration name",+ endpoint: "Endpoint",+ region: "Region",+ bucket: "Bucket",+ accessKeyId: "Access Key ID",+ secretAccessKey: "Secret Access Key",+ secretSavedHint: "The secret is encrypted. Leave this blank to keep it unchanged.",+ objectPrefix: "Object prefix",+ objectPrefixHint: "Optional. New objects are stored below this prefix.",+ pathStyle: "Path-style access",+ pathStyleHint: "Usually required by MinIO and custom endpoints.",+ test: "Test connection",+ testSucceeded: "Upload, read, and delete checks passed.",+ saved: "Object storage settings saved.",+ failed: "The object storage operation failed.",+ encryptionKeyMissing: "Configure an EDGE_EVER_STORAGE_ENCRYPTION_KEY Worker Secret of at least 32 characters before saving third-party credentials.",+ switchHint: "Switching only affects new uploads. Existing attachments remain in their original store and are not migrated automatically.",+ demoDisabled: "Object storage cannot be changed on the demo instance.",+ },accountInfo: {title: "Current account",description: "The account currently signed in on this device.",diff --git a/packages/shared/src/i18n/zh-CN.ts b/packages/shared/src/i18n/zh-CN.tsindex 43c43c07..62b38e18 100644--- a/packages/shared/src/i18n/zh-CN.ts+++ b/packages/shared/src/i18n/zh-CN.ts@@ -233,9 +233,36 @@ export const zhCN = {general: "常规设置",data: "导入导出",ai: "AI集成",+ advanced: "高级设置",account: "登录设置",},},+ objectStorage: {+ title: "OSS 对象存储",+ description: "配置整个 EdgeEver 实例用于新图片和附件的对象存储。仅实例 Owner 可以修改。",+ providers: {+ builtin: { title: "内置存储", description: "继续使用部署时绑定的 Cloudflare R2 或当前运行时默认存储。" },+ s3: { title: "第三方 OSS", description: "连接兼容 S3 API 的 OSS、COS、S3、MinIO 或 R2。" },+ },+ displayName: "配置名称",+ endpoint: "Endpoint",+ region: "Region",+ bucket: "Bucket",+ accessKeyId: "Access Key ID",+ secretAccessKey: "Secret Access Key",+ secretSavedHint: "密钥已加密保存;留空表示保持不变。",+ objectPrefix: "对象前缀",+ objectPrefixHint: "可选。所有新对象都会写入此前缀下。",+ pathStyle: "Path-style 访问",+ pathStyleHint: "MinIO 与多数自定义 Endpoint 通常需要开启。",+ test: "测试连接",+ testSucceeded: "上传、读取和删除测试均已通过。",+ saved: "对象存储设置已保存。",+ failed: "对象存储操作失败。",+ encryptionKeyMissing: "保存第三方密钥前,请先为 Worker 配置至少 32 个字符的 EDGE_EVER_STORAGE_ENCRYPTION_KEY Secret。",+ switchHint: "切换只影响后续上传;已有附件仍从原存储读取,不会自动迁移。",+ demoDisabled: "演示实例不允许修改对象存储。",+ },accountInfo: {title: "当前账户",description: "当前设备正在登录的账户信息。",diff --git a/packages/shared/src/schemas.ts b/packages/shared/src/schemas.tsindex cfae9ab4..a4be9e39 100644--- a/packages/shared/src/schemas.ts+++ b/packages/shared/src/schemas.ts@@ -123,6 +123,36 @@ export const ResourceUpdateSchema = z.object({filename: z.string().trim().min(1).max(160),});+const ObjectStorageEndpointSchema = z.string().trim().url().max(500).refine(+ (value) => value.startsWith("https://") || value.startsWith("http://"),+ "Object storage endpoint must use HTTP or HTTPS.",+);++export const ObjectStorageSettingsUpdateSchema = z.discriminatedUnion("provider", [+ z.object({ provider: z.literal("builtin") }),+ z.object({+ provider: z.literal("s3"),+ displayName: z.string().trim().min(1).max(80),+ endpoint: ObjectStorageEndpointSchema,+ region: z.string().trim().min(1).max(80),+ bucket: z.string().trim().min(1).max(255),+ accessKeyId: z.string().trim().min(1).max(256),+ secretAccessKey: z.string().min(1).max(1024).optional(),+ forcePathStyle: z.boolean().default(true),+ objectPrefix: z.string().trim().max(500).default(""),+ }),+]);++export const ObjectStorageConnectionTestSchema = z.object({+ endpoint: ObjectStorageEndpointSchema,+ region: z.string().trim().min(1).max(80),+ bucket: z.string().trim().min(1).max(255),+ accessKeyId: z.string().trim().min(1).max(256),+ secretAccessKey: z.string().min(1).max(1024).optional(),+ forcePathStyle: z.boolean().default(true),+ objectPrefix: z.string().trim().max(500).default(""),+});+export type NotebookCreateInput = z.infer<typeof NotebookCreateSchema>;export type NotebookUpdateInput = z.infer<typeof NotebookUpdateSchema>;export type MemoCreateInput = z.infer<typeof MemoCreateSchema>;@@ -140,3 +170,5 @@ export type UserUpdateInput = z.infer<typeof UserUpdateSchema>;export type ApiTokenCreateInput = z.infer<typeof ApiTokenCreateSchema>;export type TagRenameInput = z.infer<typeof TagRenameSchema>;export type ResourceUpdateInput = z.infer<typeof ResourceUpdateSchema>;+export type ObjectStorageSettingsUpdateInput = z.infer<typeof ObjectStorageSettingsUpdateSchema>;+export type ObjectStorageConnectionTestInput = z.infer<typeof ObjectStorageConnectionTestSchema>;diff --git a/packages/shared/src/types.ts b/packages/shared/src/types.tsindex fd4abdab..6ddd9310 100644--- a/packages/shared/src/types.ts+++ b/packages/shared/src/types.ts@@ -103,6 +103,19 @@ export type ResourceStorageSummary = {attachmentCount: number;};+export type ObjectStorageSettings = {+ provider: "builtin" | "s3";+ displayName: string;+ endpoint: string | null;+ region: string | null;+ bucket: string | null;+ accessKeyId: string | null;+ hasSecretAccessKey: boolean;+ forcePathStyle: boolean;+ objectPrefix: string;+ encryptionConfigured: boolean;+};+export type ApiToken = {id: string;name: string;diff --git a/scripts/self-hosted-server.mjs b/scripts/self-hosted-server.mjsindex 1867a69a..4d5bb67a 100644--- a/scripts/self-hosted-server.mjs+++ b/scripts/self-hosted-server.mjs@@ -76,6 +76,7 @@ const env = {EDGE_EVER_AUTH_LOGIN_USERNAME_COOLDOWN_SECONDS: process.env.EDGE_EVER_AUTH_LOGIN_USERNAME_COOLDOWN_SECONDS,EDGE_EVER_AUTH_LOGIN_IP_MAX_ATTEMPTS: process.env.EDGE_EVER_AUTH_LOGIN_IP_MAX_ATTEMPTS,EDGE_EVER_AUTH_LOGIN_IP_COOLDOWN_SECONDS: process.env.EDGE_EVER_AUTH_LOGIN_IP_COOLDOWN_SECONDS,+ EDGE_EVER_STORAGE_ENCRYPTION_KEY: process.env.EDGE_EVER_STORAGE_ENCRYPTION_KEY,EDGE_EVER_DEMO_MODE: process.env.EDGE_EVER_DEMO_MODE,EDGE_EVER_ALLOW_UNAUTHENTICATED: process.env.EDGE_EVER_ALLOW_UNAUTHENTICATED,};