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 self-hosted storage adapter
tianma-if9838c20fef39
diff --git a/.env.local.example b/.env.local.exampleindex d23380c2..274d9626 100644--- a/.env.local.example+++ b/.env.local.example@@ -43,6 +43,13 @@ EDGE_EVER_ROUTE_PATTERN=# Local frontendVITE_API_BASE_URL=http://127.0.0.1:8787+# Self-hosted Bun runtime (used by `bun run start:self-hosted`).+# The data directory should be mounted as the persistent Docker/NAS volume.+EDGE_EVER_DATA_DIR=.edgeever-data+EDGE_EVER_SQLITE_FILE=.edgeever-data/edgeever.sqlite+EDGE_EVER_RESOURCES_DIR=.edgeever-data/resources+EDGE_EVER_PORT=8787+# Multi-instance deployments# Select remote instances per command, for example:# EDGE_EVER_INSTANCE=prod bun run dev:remotediff --git a/README.md b/README.mdindex 860d4435..83fcc3dc 100644--- a/README.md+++ b/README.md@@ -214,7 +214,7 @@ If you want to migrate notes from other platforms to EdgeEver, please refer to t## Docker Deployment Roadmap-> 🐳 Docker-based self-hosting for VPS, NAS, and home servers is on the roadmap and will follow once the core features are stable. It is not yet available in current releases.+> 🐳 Docker-based self-hosting for VPS, NAS, and home servers is planned but is not yet available in current releases. The API now reserves a storage adapter boundary so a future SQLite + local/S3-compatible deployment can reuse the existing routes, REST API, MCP endpoint, schema, and migration history. See [Self-hosting and Docker architecture](docs/self-hosting-architecture.md).## Acknowledgementsdiff --git a/README.zh-CN.md b/README.zh-CN.mdindex dac2f191..76eba66e 100644--- a/README.zh-CN.md+++ b/README.zh-CN.md@@ -228,7 +228,7 @@ Cloudflare Worker 侧执行图片处理会消耗计算/图片处理额度,因## Docker 部署规划-> 🐳 面向 VPS、NAS 和家庭服务器的 Docker 私有化部署已纳入规划,待核心功能稳定后提供;当前版本尚不支持。+> 🐳 面向 VPS、NAS 和家庭服务器的 Docker 私有化部署已纳入规划,但当前版本尚不支持。API 已预留存储适配器边界,未来可在复用现有路由、REST API、MCP 接口、数据库结构和迁移历史的前提下接入 SQLite + 本地文件/S3 兼容存储。详见[自托管与 Docker 架构预留](docs/self-hosting-architecture.zh-CN.md)。## 致谢diff --git a/apps/api/src/cloudflare-storage-adapter.ts b/apps/api/src/cloudflare-storage-adapter.tsnew file mode 100644index 00000000..e12c21bb--- /dev/null+++ b/apps/api/src/cloudflare-storage-adapter.ts@@ -0,0 +1,15 @@+import type {+ CloudflareStorageBindings,+ StorageAdapter,+} from "./storage-contract";++/**+ * Adapts native Cloudflare bindings to the storage surface consumed by the+ * application. No route or service should construct this shape directly.+ */+export const createCloudflareStorageAdapter = (+ bindings: CloudflareStorageBindings,+): StorageAdapter => ({+ db: bindings.DB,+ resources: bindings.RESOURCES,+});diff --git a/apps/api/src/index.ts b/apps/api/src/index.tsindex 7cbef659..0beec336 100644--- a/apps/api/src/index.ts+++ b/apps/api/src/index.ts@@ -79,11 +79,27 @@ import {DEMO_ATTACHMENT_MARKDOWN_ZH,DEMO_ATTACHMENT_RESOURCES,} from "./demo-attachments";--type Bindings = {- DB: D1Database;- RESOURCES: R2Bucket;+import { createCloudflareStorageAdapter } from "./cloudflare-storage-adapter";+import type {+ BlobStoreAdapter,+ CloudflareStorageBindings,+ DatabaseAdapter,+ PreparedStatementAdapter,+ StorageAdapter,+} from "./storage-contract";++// 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.+type D1Database = DatabaseAdapter;+type D1PreparedStatement = PreparedStatementAdapter;+type R2Bucket = BlobStoreAdapter;++type Bindings = CloudflareStorageBindings & {+ /** The only persistence dependency exposed to application code. */+ storage: StorageAdapter;EDGE_EVER_AUTH_USERNAME?: string;+ EDGE_EVER_RUNTIME?: string;EDGE_EVER_AUTH_PASSWORD?: string;EDGE_EVER_AUTH_PASSWORD_HASH?: string;EDGE_EVER_SESSION_TTL_DAYS?: string;@@ -93,6 +109,8 @@ type Bindings = {EDGE_EVER_ALLOW_UNAUTHENTICATED?: string;};+type WorkerBindings = Omit<Bindings, "storage">;+type AuthContext = {kind: "user" | "agent";actorType: "user" | "agent";@@ -435,7 +453,7 @@ app.get("/api/health", async (c) => {return c.json({ok: true,name: "edgeever",- runtime: "cloudflare-workers",+ runtime: c.env.EDGE_EVER_RUNTIME ?? "cloudflare-workers",authMode,});});@@ -489,7 +507,7 @@ app.get("/api/v1/auth/sessions", async (c) => {}const now = isoNow();- const rows = await c.env.DB.prepare(+ const rows = await c.env.storage.db.prepare(`SELECT id, device_id, user_agent, expires_at, created_at, last_seen_atFROM sessionsWHERE user_id = ?@@ -514,13 +532,13 @@ app.delete("/api/v1/auth/sessions", async (c) => {}const now = isoNow();- await c.env.DB.batch([- c.env.DB.prepare(+ await c.env.storage.db.batch([+ c.env.storage.db.prepare(`UPDATE sessionsSET revoked_at = ?WHERE user_id = ? AND id != ? AND revoked_at IS NULL AND expires_at > ?`).bind(now, auth.actorId, auth.sessionId, now),- auditStatement(c.env.DB, "user", auth.actorId, "auth.sessions_revoke_others", "session", auth.sessionId, {}),+ auditStatement(c.env.storage.db, "user", auth.actorId, "auth.sessions_revoke_others", "session", auth.sessionId, {}),]);return c.json({ ok: true });@@ -539,7 +557,7 @@ app.delete("/api/v1/auth/sessions/:sessionId", async (c) => {}const now = isoNow();- const session = await c.env.DB.prepare(+ const session = await c.env.storage.db.prepare(`SELECT id, device_id FROM sessionsWHERE id = ? AND user_id = ? AND revoked_at IS NULL AND expires_at > ?`)@@ -550,7 +568,7 @@ app.delete("/api/v1/auth/sessions/:sessionId", async (c) => {return notFound(c, "Login session not found.");}- const currentSession = await c.env.DB.prepare(`SELECT device_id FROM sessions WHERE id = ? AND user_id = ?`)+ const currentSession = await c.env.storage.db.prepare(`SELECT device_id FROM sessions WHERE id = ? AND user_id = ?`).bind(auth.sessionId, auth.actorId).first<{ device_id: string | null }>();@@ -558,14 +576,14 @@ app.delete("/api/v1/auth/sessions/:sessionId", async (c) => {return apiError(c, "current_session_cannot_be_revoked", "The current device cannot be revoked here.", 400);}- await c.env.DB.batch([+ await c.env.storage.db.batch([session.device_id- ? c.env.DB.prepare(+ ? c.env.storage.db.prepare(`UPDATE sessions SET revoked_at = ?WHERE user_id = ? AND device_id = ? AND revoked_at IS NULL`).bind(now, auth.actorId, session.device_id)- : c.env.DB.prepare(`UPDATE sessions SET revoked_at = ? WHERE id = ? AND revoked_at IS NULL`).bind(now, session.id),- auditStatement(c.env.DB, "user", auth.actorId, "auth.session_revoke", "session", session.id, {}),+ : c.env.storage.db.prepare(`UPDATE sessions SET revoked_at = ? WHERE id = ? AND revoked_at IS NULL`).bind(now, session.id),+ auditStatement(c.env.storage.db, "user", auth.actorId, "auth.session_revoke", "session", session.id, {}),]);return c.json({ ok: true });@@ -584,17 +602,17 @@ app.post("/api/v1/auth/login", zValidator("json", LoginSchema), async (c) => {return unauthorized(c, "Username or password is incorrect.");}- const workspace = await ensureUserWorkspace(c.env.DB, user.id, user.username);+ const workspace = await ensureUserWorkspace(c.env.storage.db, user.id, user.username);const session = await createSession(c, user, input.deviceId);setSessionCookie(c, session.token, session.maxAge);- await c.env.DB.batch([- c.env.DB.prepare(`UPDATE users SET last_login_at = ?, updated_at = ? WHERE id = ?`).bind(+ await c.env.storage.db.batch([+ c.env.storage.db.prepare(`UPDATE users SET last_login_at = ?, updated_at = ? WHERE id = ?`).bind(isoNow(),isoNow(),user.id),- auditStatement(c.env.DB, "user", user.id, "auth.login", "session", session.id, {+ auditStatement(c.env.storage.db, "user", user.id, "auth.login", "session", session.id, {username: user.username,}),]);@@ -625,7 +643,7 @@ app.post("/api/v1/auth/change-password", zValidator("json", ChangePasswordSchema}const input = c.req.valid("json");- const user = await c.env.DB.prepare(+ const user = await c.env.storage.db.prepare(`SELECT id, username, password_hash, display_name, is_disabledFROM usersWHERE id = ? AND is_disabled = 0`@@ -640,17 +658,17 @@ app.post("/api/v1/auth/change-password", zValidator("json", ChangePasswordSchemaconst now = isoNow();const passwordHash = await hashPassword(input.newPassword);- await c.env.DB.batch([- c.env.DB.prepare(`UPDATE users SET password_hash = ?, updated_at = ? WHERE id = ?`).bind(+ await c.env.storage.db.batch([+ c.env.storage.db.prepare(`UPDATE users SET password_hash = ?, updated_at = ? WHERE id = ?`).bind(passwordHash,now,user.id),- c.env.DB.prepare(+ c.env.storage.db.prepare(`UPDATE sessions SET revoked_at = ?WHERE user_id = ? AND id != ? AND revoked_at IS NULL`).bind(now, user.id, auth.sessionId),- auditStatement(c.env.DB, "user", user.id, "auth.password_change", "user", user.id, {}),+ auditStatement(c.env.storage.db, "user", user.id, "auth.password_change", "user", user.id, {}),]);return c.json({ ok: true });@@ -663,7 +681,7 @@ app.get("/api/v1/users", async (c) => {const denied = requireOwner(c);if (denied) return denied;- const rows = await c.env.DB.prepare(+ const rows = await c.env.storage.db.prepare(`SELECT u.id, u.username, u.password_hash, u.display_name, u.is_disabled,u.last_login_at, u.created_at, wm.roleFROM users u@@ -682,7 +700,7 @@ app.post("/api/v1/users", zValidator("json", UserCreateSchema), async (c) => {if (denied) return denied;const input = c.req.valid("json");- const existing = await c.env.DB.prepare(`SELECT id FROM users WHERE username = ?`).bind(input.username).first();+ const existing = await c.env.storage.db.prepare(`SELECT id FROM users WHERE username = ?`).bind(input.username).first();if (existing) return conflict(c, "username_exists", "Username already exists.");const userId = createId("usr");@@ -691,23 +709,23 @@ app.post("/api/v1/users", zValidator("json", UserCreateSchema), async (c) => {const passwordHash = await hashPassword(input.password);const notebooks = createDefaultNotebookRows(workspaceId, now);const statements = [- c.env.DB.prepare(+ c.env.storage.db.prepare(`INSERT INTO users (id, username, password_hash, display_name, created_at, updated_at)VALUES (?, ?, ?, ?, ?, ?)`).bind(userId, input.username, passwordHash, input.displayName ?? input.username, now, now),- c.env.DB.prepare(`INSERT INTO workspaces (id, name, is_personal, created_at, updated_at) VALUES (?, ?, 1, ?, ?)`)+ c.env.storage.db.prepare(`INSERT INTO workspaces (id, name, is_personal, created_at, updated_at) VALUES (?, ?, 1, ?, ?)`).bind(workspaceId, `${input.displayName ?? input.username}'s workspace`, now, now),- c.env.DB.prepare(`INSERT INTO workspace_members (workspace_id, user_id, role, created_at) VALUES (?, ?, 'member', ?)`)+ c.env.storage.db.prepare(`INSERT INTO workspace_members (workspace_id, user_id, role, created_at) VALUES (?, ?, 'member', ?)`).bind(workspaceId, userId, now),- ...notebooks.map((notebook) => c.env.DB.prepare(+ ...notebooks.map((notebook) => c.env.storage.db.prepare(`INSERT INTO notebooks (id, workspace_id, parent_id, name, slug, icon, color, sort_order, created_at, updated_at)VALUES (?, ?, NULL, ?, ?, 'notebook', ?, ?, ?, ?)`).bind(notebook.id, workspaceId, notebook.name, notebook.slug, notebook.color, notebook.sortOrder, now, now)),- auditStatement(c.env.DB, "user", c.get("auth").actorId, "user.create", "user", userId, { username: input.username }),+ auditStatement(c.env.storage.db, "user", c.get("auth").actorId, "user.create", "user", userId, { username: input.username }),];- await c.env.DB.batch(statements);+ await c.env.storage.db.batch(statements);- const user = await getInstanceUser(c.env.DB, userId);+ const user = await getInstanceUser(c.env.storage.db, userId);return c.json({ user: user ? mapInstanceUser(user) : null }, 201);});@@ -720,7 +738,7 @@ app.patch("/api/v1/users/:id", zValidator("json", UserUpdateSchema), async (c) =const userId = c.req.param("id");const input = c.req.valid("json");- const current = await getInstanceUser(c.env.DB, userId);+ const current = await getInstanceUser(c.env.storage.db, userId);if (!current) return notFound(c, "User not found");if (isProtectedDemoAccount(c.env.EDGE_EVER_DEMO_MODE, c.env.EDGE_EVER_AUTH_USERNAME, current.username)@@ -750,18 +768,18 @@ app.patch("/api/v1/users/:id", zValidator("json", UserUpdateSchema), async (c) =binds.push(isoNow(), userId);const statements = [- c.env.DB.prepare(`UPDATE users SET ${updates.join(", ")} WHERE id = ?`).bind(...binds),- auditStatement(c.env.DB, "user", c.get("auth").actorId, "user.update", "user", userId, {+ c.env.storage.db.prepare(`UPDATE users SET ${updates.join(", ")} WHERE id = ?`).bind(...binds),+ auditStatement(c.env.storage.db, "user", c.get("auth").actorId, "user.update", "user", userId, {passwordReset: input.password !== undefined,isDisabled: input.isDisabled,}),];if (input.password !== undefined || input.isDisabled === true) {- statements.push(c.env.DB.prepare(`UPDATE sessions SET revoked_at = ? WHERE user_id = ? AND revoked_at IS NULL`).bind(isoNow(), userId));+ statements.push(c.env.storage.db.prepare(`UPDATE sessions SET revoked_at = ? WHERE user_id = ? AND revoked_at IS NULL`).bind(isoNow(), userId));}- await c.env.DB.batch(statements);+ await c.env.storage.db.batch(statements);- const user = await getInstanceUser(c.env.DB, userId);+ const user = await getInstanceUser(c.env.storage.db, userId);return c.json({ user: user ? mapInstanceUser(user) : null });});@@ -769,7 +787,7 @@ app.post("/api/v1/auth/logout", async (c) => {const token = getCookie(c, SESSION_COOKIE) ?? getBearerToken(c);if (token) {- await revokeSession(c.env.DB, token);+ await revokeSession(c.env.storage.db, token);}deleteCookie(c, SESSION_COOKIE, { path: "/" });@@ -820,7 +838,7 @@ app.get("/api/v1/api-tokens", async (c) => {return userOnly;}- const rows = await c.env.DB.prepare(+ const rows = await c.env.storage.db.prepare(`SELECT id, name, token_value, scopes_json, last_used_at, expires_at, is_revoked, created_at, workspace_idFROM api_tokensWHERE workspace_id = ?@@ -853,19 +871,19 @@ app.post("/api/v1/api-tokens", zValidator("json", ApiTokenCreateSchema), async (const now = isoNow();const actor = getAuditActor(c);- await c.env.DB.batch([- c.env.DB.prepare(+ await c.env.storage.db.batch([+ c.env.storage.db.prepare(`INSERT INTO api_tokens (id, workspace_id, name, token_hash, token_value, scopes_json, expires_at, created_at)VALUES (?, ?, ?, ?, ?, ?, ?, ?)`).bind(id, getWorkspaceId(c), input.name, await sha256(token), token, JSON.stringify(scopes), input.expiresAt ?? null, now),- auditStatement(c.env.DB, actor.actorType, actor.actorId, "api_token.create", "api_token", id, {+ auditStatement(c.env.storage.db, actor.actorType, actor.actorId, "api_token.create", "api_token", id, {name: input.name,scopes,expiresAt: input.expiresAt ?? null,}),]);- const row = await getApiTokenRow(c.env.DB, id, getWorkspaceId(c));+ const row = await getApiTokenRow(c.env.storage.db, id, getWorkspaceId(c));if (!row) {return notFound(c, "API token not found");@@ -884,9 +902,9 @@ app.delete("/api/v1/api-tokens/:id", async (c) => {const id = c.req.param("id");const actor = getAuditActor(c);- await c.env.DB.batch([- c.env.DB.prepare(`DELETE FROM api_tokens WHERE id = ? AND workspace_id = ?`).bind(id, getWorkspaceId(c)),- auditStatement(c.env.DB, actor.actorType, actor.actorId, "api_token.delete", "api_token", id, {}),+ await c.env.storage.db.batch([+ c.env.storage.db.prepare(`DELETE FROM api_tokens WHERE id = ? AND workspace_id = ?`).bind(id, getWorkspaceId(c)),+ auditStatement(c.env.storage.db, actor.actorType, actor.actorId, "api_token.delete", "api_token", id, {}),]);return c.json({ ok: true });@@ -903,7 +921,7 @@ app.get("/api/v1/notebooks", async (c) => {await ensureDemoSeed(c.env);}- const rows = await c.env.DB.prepare(+ const rows = await c.env.storage.db.prepare(notebookSelectSql(`WHERE n.workspace_id = ? AND n.is_deleted = 0GROUP BY n.id, n.parent_id, n.name, n.slug, n.icon, n.color, n.sort_order, n.created_at, n.updated_at@@ -925,7 +943,7 @@ app.get("/api/v1/sync/bootstrap", async (c) => {const limit = clampNumber(Number(c.req.query("limit") ?? 100), 1, 200);const afterId = c.req.query("afterId")?.trim() ?? "";const [notebookRows, memoRows, totalRow, cursorRow] = await Promise.all([- c.env.DB.prepare(+ c.env.storage.db.prepare(`SELECT n.id, n.parent_id, n.name, n.slug, n.icon, n.color, n.sort_order,n.created_at, n.updated_at, COUNT(m.id) AS memo_count, MAX(m.updated_at) AS last_memo_updated_atFROM notebooks n@@ -934,7 +952,7 @@ app.get("/api/v1/sync/bootstrap", async (c) => {GROUP BY n.id, n.parent_id, n.name, n.slug, n.icon, n.color, n.sort_order, n.created_at, n.updated_atORDER BY n.sort_order ASC, n.name ASC`).bind(workspaceId).all<NotebookRow>(),- c.env.DB.prepare(+ c.env.storage.db.prepare(`SELECT m.id, m.notebook_id, m.title, m.excerpt, m.tags_json, m.is_pinned,m.is_archived, m.is_deleted, m.created_at, m.updated_at, m.deleted_at, mc.revision,mc.content_json, mc.content_markdown, mc.content_text, mc.content_hash,@@ -945,8 +963,8 @@ app.get("/api/v1/sync/bootstrap", async (c) => {ORDER BY m.id ASCLIMIT ?`).bind(workspaceId, afterId, limit + 1).all<MemoDetailRow>(),- c.env.DB.prepare(`SELECT COUNT(*) AS count FROM memos WHERE workspace_id = ?`).bind(workspaceId).first<{ count: number }>(),- c.env.DB.prepare(+ c.env.storage.db.prepare(`SELECT COUNT(*) AS count FROM memos WHERE workspace_id = ?`).bind(workspaceId).first<{ count: number }>(),+ c.env.storage.db.prepare(`SELECT w.created_at AS sync_identity, COALESCE(MAX(c.id), 0) AS cursorFROM workspaces wLEFT JOIN mobile_sync_changes c ON c.workspace_id = w.id@@ -979,14 +997,14 @@ app.get("/api/v1/sync/changes", async (c) => {const cursor = clampNumber(Number(c.req.query("cursor") ?? 0), 0, Number.MAX_SAFE_INTEGER);const limit = clampNumber(Number(c.req.query("limit") ?? 100), 1, 200);const [rows, cursorRow] = await Promise.all([- c.env.DB.prepare(+ c.env.storage.db.prepare(`SELECT id, entity_type, entity_id, operationFROM mobile_sync_changesWHERE workspace_id = ? AND id > ?ORDER BY id ASCLIMIT ?`).bind(workspaceId, cursor, limit + 1).all<MobileSyncChangeRow>(),- c.env.DB.prepare(+ c.env.storage.db.prepare(`SELECT w.created_at AS sync_identity, COALESCE(MAX(c.id), 0) AS cursorFROM workspaces wLEFT JOIN mobile_sync_changes c ON c.workspace_id = w.id@@ -1001,7 +1019,7 @@ app.get("/api/v1/sync/changes", async (c) => {const notebookPlaceholders = notebookIds.map(() => "?").join(", ");const [memoRows, notebookRows] = await Promise.all([memoIds.length > 0- ? c.env.DB.prepare(+ ? c.env.storage.db.prepare(`SELECT m.id, m.notebook_id, m.title, m.excerpt, m.tags_json, m.is_pinned,m.is_archived, m.is_deleted, m.created_at, m.updated_at, m.deleted_at, mc.revision,mc.content_json, mc.content_markdown, mc.content_text, mc.content_hash,@@ -1012,7 +1030,7 @@ app.get("/api/v1/sync/changes", async (c) => {).bind(workspaceId, ...memoIds).all<MemoDetailRow>(): Promise.resolve({ results: [] as MemoDetailRow[] }),notebookIds.length > 0- ? c.env.DB.prepare(+ ? c.env.storage.db.prepare(`SELECT n.id, n.parent_id, n.name, n.slug, n.icon, n.color, n.sort_order,n.created_at, n.updated_at, COUNT(m.id) AS memo_count, MAX(m.updated_at) AS last_memo_updated_atFROM notebooks n@@ -1054,7 +1072,7 @@ app.post("/api/v1/notebooks", zValidator("json", NotebookCreateSchema), async (cconst actor = getAuditActor(c);try {- const notebook = await createNotebookRecord(c.env.DB, getWorkspaceId(c), input, actor);+ const notebook = await createNotebookRecord(c.env.storage.db, getWorkspaceId(c), input, actor);return c.json({ notebook }, 201);} catch (error) {if (error instanceof AppError) {@@ -1077,7 +1095,7 @@ app.patch("/api/v1/notebooks/:id", zValidator("json", NotebookUpdateSchema), asyconst actor = getAuditActor(c);try {- const notebook = await updateNotebookRecord(c.env.DB, getWorkspaceId(c), id, input, actor);+ const notebook = await updateNotebookRecord(c.env.storage.db, getWorkspaceId(c), id, input, actor);return c.json({ notebook });} catch (error) {if (error instanceof AppError) {@@ -1099,7 +1117,7 @@ app.delete("/api/v1/notebooks/:id", async (c) => {const actor = getAuditActor(c);const now = isoNow();const workspaceId = getWorkspaceId(c);- const current = await getNotebook(c.env.DB, workspaceId, id);+ const current = await getNotebook(c.env.storage.db, workspaceId, id);if (!current) {return notFound(c, "Notebook not found");@@ -1110,10 +1128,10 @@ app.delete("/api/v1/notebooks/:id", async (c) => {}const [childCount, memoCount] = await Promise.all([- c.env.DB.prepare(`SELECT COUNT(*) AS count FROM notebooks WHERE workspace_id = ? AND parent_id = ? AND is_deleted = 0`)+ c.env.storage.db.prepare(`SELECT COUNT(*) AS count FROM notebooks WHERE workspace_id = ? AND parent_id = ? AND is_deleted = 0`).bind(workspaceId, id).first<{ count: number }>(),- c.env.DB.prepare(`SELECT COUNT(*) AS count FROM memos WHERE workspace_id = ? AND notebook_id = ? AND is_deleted = 0`)+ c.env.storage.db.prepare(`SELECT COUNT(*) AS count FROM memos WHERE workspace_id = ? AND notebook_id = ? AND is_deleted = 0`).bind(workspaceId, id).first<{ count: number }>(),]);@@ -1122,7 +1140,7 @@ app.delete("/api/v1/notebooks/:id", async (c) => {return conflict(c, "notebook_not_empty", "Move or delete child notebooks and memos before deleting this notebook.");}- await c.env.DB.prepare(+ await c.env.storage.db.prepare(`UPDATE notebooksSET is_deleted = 1, deleted_at = ?, updated_at = ?WHERE id = ? AND workspace_id = ? AND slug <> 'inbox'`@@ -1130,7 +1148,7 @@ app.delete("/api/v1/notebooks/:id", async (c) => {.bind(now, now, id, workspaceId).run();- await audit(c.env.DB, actor.actorType, actor.actorId, "notebook.delete", "notebook", id, {});+ await audit(c.env.storage.db, actor.actorType, actor.actorId, "notebook.delete", "notebook", id, {});return c.json({ ok: true });});@@ -1141,7 +1159,7 @@ app.get("/api/v1/tags", async (c) => {return denied;}- return c.json({ tags: await listTagSummaries(c.env.DB, getWorkspaceId(c)) });+ return c.json({ tags: await listTagSummaries(c.env.storage.db, getWorkspaceId(c)) });});app.patch("/api/v1/tags/:tag", zValidator("json", TagRenameSchema), async (c) => {@@ -1155,7 +1173,7 @@ app.patch("/api/v1/tags/:tag", zValidator("json", TagRenameSchema), async (c) =>const input = c.req.valid("json");const actor = getAuditActor(c);const actorLabel = getActorLabel(c);- const updated = await updateTagAcrossMemos(c.env.DB, getWorkspaceId(c), oldTag, input.name, actor, actorLabel);+ const updated = await updateTagAcrossMemos(c.env.storage.db, getWorkspaceId(c), oldTag, input.name, actor, actorLabel);return c.json({ ok: true, updated });});@@ -1170,13 +1188,13 @@ app.delete("/api/v1/tags/:tag", async (c) => {const tag = decodeTagParam(c.req.param("tag"));const actor = getAuditActor(c);const actorLabel = getActorLabel(c);- const updated = await updateTagAcrossMemos(c.env.DB, getWorkspaceId(c), tag, null, actor, actorLabel);+ const updated = await updateTagAcrossMemos(c.env.storage.db, getWorkspaceId(c), tag, null, actor, actorLabel);return c.json({ ok: true, updated });});app.get("/api/v1/templates", async (c) => {- const rows = await c.env.DB.prepare(+ const rows = await c.env.storage.db.prepare(`SELECT id, name, description, title, content_json, content_markdown, tags_json, created_at, updated_atFROM memo_templatesWHERE workspace_id = ?@@ -1189,7 +1207,7 @@ app.get("/api/v1/templates", async (c) => {app.post("/api/v1/templates", zValidator("json", TemplateCreateSchema), async (c) => {const input = c.req.valid("json");const workspaceId = getWorkspaceId(c);- const memo = input.memoId ? await getMemoDetail(c.env.DB, workspaceId, input.memoId) : null;+ const memo = input.memoId ? await getMemoDetail(c.env.storage.db, workspaceId, input.memoId) : null;if (input.memoId && !memo) {return notFound(c, "Memo not found");}@@ -1200,7 +1218,7 @@ app.post("/api/v1/templates", zValidator("json", TemplateCreateSchema), async (cconst contentMarkdown = memo?.contentMarkdown ?? input.contentMarkdown ?? "";const tags = memo?.tags ?? input.tags ?? [];const contentJson = memo?.contentJson ?? markdownToDoc(contentMarkdown);- await c.env.DB.prepare(+ await c.env.storage.db.prepare(`INSERT INTO memo_templates (id, workspace_id, name, description, title, content_json, content_markdown, tags_json, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`@@ -1217,9 +1235,9 @@ app.post("/api/v1/templates", zValidator("json", TemplateCreateSchema), async (cnow,).run();- const template = await getMemoTemplate(c.env.DB, workspaceId, id);+ const template = await getMemoTemplate(c.env.storage.db, workspaceId, id);const actor = getAuditActor(c);- await audit(c.env.DB, actor.actorType, actor.actorId, "template.create", "template", id, { memoId: input.memoId ?? null });+ await audit(c.env.storage.db, actor.actorType, actor.actorId, "template.create", "template", id, { memoId: input.memoId ?? null });return c.json({ template }, 201);});@@ -1227,7 +1245,7 @@ app.patch("/api/v1/templates/:id", zValidator("json", TemplateUpdateSchema), asyconst id = c.req.param("id");const input = c.req.valid("json");const workspaceId = getWorkspaceId(c);- const current = await getMemoTemplateRow(c.env.DB, workspaceId, id);+ const current = await getMemoTemplateRow(c.env.storage.db, workspaceId, id);if (!current) {return notFound(c, "Template not found");}@@ -1238,7 +1256,7 @@ app.patch("/api/v1/templates/:id", zValidator("json", TemplateUpdateSchema), asy: JSON.parse(current.content_json);const tags = input.tags ?? parseJsonArray(current.tags_json);const now = new Date().toISOString();- await c.env.DB.prepare(+ await c.env.storage.db.prepare(`UPDATE memo_templatesSET name = ?, description = ?, title = ?, content_json = ?, content_markdown = ?, tags_json = ?, updated_at = ?WHERE id = ? AND workspace_id = ?`@@ -1254,9 +1272,9 @@ app.patch("/api/v1/templates/:id", zValidator("json", TemplateUpdateSchema), asyworkspaceId,).run();- const template = await getMemoTemplate(c.env.DB, workspaceId, id);+ const template = await getMemoTemplate(c.env.storage.db, workspaceId, id);const actor = getAuditActor(c);- await audit(c.env.DB, actor.actorType, actor.actorId, "template.update", "template", id, {});+ await audit(c.env.storage.db, actor.actorType, actor.actorId, "template.update", "template", id, {});return c.json({ template });});@@ -1264,33 +1282,33 @@ app.post("/api/v1/templates/:id/use", zValidator("json", TemplateUseSchema), asyconst id = c.req.param("id");const input = c.req.valid("json");const workspaceId = getWorkspaceId(c);- const template = await getMemoTemplate(c.env.DB, workspaceId, id);+ const template = await getMemoTemplate(c.env.storage.db, workspaceId, id);if (!template) {return notFound(c, "Template not found");}- const memo = await createMemoRecord(c.env.DB, workspaceId, {+ const memo = await createMemoRecord(c.env.storage.db, workspaceId, {notebookId: input.notebookId,title: template.title ?? undefined,contentMarkdown: template.contentMarkdown,tags: template.tags,}, getAuditActor(c), getActorLabel(c));const actor = getAuditActor(c);- await audit(c.env.DB, actor.actorType, actor.actorId, "template.use", "template", id, { memoId: memo.id });+ await audit(c.env.storage.db, actor.actorType, actor.actorId, "template.use", "template", id, { memoId: memo.id });return c.json({ memo });});app.delete("/api/v1/templates/:id", async (c) => {const id = c.req.param("id");const workspaceId = getWorkspaceId(c);- const current = await getMemoTemplateRow(c.env.DB, workspaceId, id);+ const current = await getMemoTemplateRow(c.env.storage.db, workspaceId, id);if (!current) {return notFound(c, "Template not found");}- await c.env.DB.prepare(`DELETE FROM memo_templates WHERE id = ? AND workspace_id = ?`).bind(id, workspaceId).run();+ await c.env.storage.db.prepare(`DELETE FROM memo_templates WHERE id = ? AND workspace_id = ?`).bind(id, workspaceId).run();const actor = getAuditActor(c);- await audit(c.env.DB, actor.actorType, actor.actorId, "template.delete", "template", id, {});+ await audit(c.env.storage.db, actor.actorType, actor.actorId, "template.delete", "template", id, {});return c.json({ ok: true });});@@ -1394,7 +1412,7 @@ app.get("/api/v1/memos", async (c) => {if (ftsQuery) {const searchPrefix = [ftsQuery, likeQuery, likeQuery, likeQuery];const [rows, totalRow] = await Promise.all([- c.env.DB.prepare(+ c.env.storage.db.prepare(`WITH raw_matches(memo_id, rank) AS (SELECT memo_id, bm25(memos_fts)FROM memos_fts@@ -1426,7 +1444,7 @@ app.get("/api/v1/memos", async (c) => {).bind(...searchPrefix, ...cursorBinds, pageLimit).all<MemoSummaryRow>(),- c.env.DB.prepare(+ c.env.storage.db.prepare(`WITH raw_matches(memo_id) AS (SELECT memo_idFROM memos_fts@@ -1466,7 +1484,7 @@ app.get("/api/v1/memos", async (c) => {const searchCursorConditions = [...cursorConditions, "(m.title LIKE ? ESCAPE '\\' OR mc.content_text LIKE ? ESCAPE '\\' OR m.tags_json LIKE ? ESCAPE '\\')"];const searchCursorBinds = [...cursorBinds, likeQuery, likeQuery, likeQuery];const [rows, totalRow] = await Promise.all([- c.env.DB.prepare(+ c.env.storage.db.prepare(`SELECT m.id, m.notebook_id, m.title, m.excerpt, m.tags_json, m.is_pinned,m.is_archived, m.is_deleted, m.created_at, m.updated_at, m.deleted_at, mc.revision,mc.content_text@@ -1478,7 +1496,7 @@ app.get("/api/v1/memos", async (c) => {).bind(...searchCursorBinds, pageLimit).all<MemoSummaryRow>(),- c.env.DB.prepare(+ c.env.storage.db.prepare(`SELECT COUNT(*) AS countFROM memos mINNER JOIN memo_contents mc ON mc.memo_id = m.id@@ -1495,7 +1513,7 @@ app.get("/api/v1/memos", async (c) => {}const [rows, totalRow] = await Promise.all([- c.env.DB.prepare(+ c.env.storage.db.prepare(`SELECT m.id, m.notebook_id, m.title, m.excerpt, m.tags_json, m.is_pinned,m.is_archived, m.is_deleted, m.created_at, m.updated_at, m.deleted_at, mc.revision,mc.content_text@@ -1507,7 +1525,7 @@ app.get("/api/v1/memos", async (c) => {).bind(...cursorBinds, pageLimit).all<MemoSummaryRow>(),- c.env.DB.prepare(+ c.env.storage.db.prepare(`SELECT COUNT(*) AS countFROM memos mWHERE ${baseConditions.join(" AND ")}`@@ -1544,27 +1562,27 @@ app.post("/api/v1/memos", zValidator("json", MemoCreateSchema), async (c) => {const createdAt = input.createdAt ?? now;const updatedAt = input.updatedAt ?? now;- await c.env.DB.batch([- c.env.DB.prepare(+ await c.env.storage.db.batch([+ c.env.storage.db.prepare(`INSERT INTO memos (id, workspace_id, notebook_id, title, excerpt, tags_json, created_by, updated_by, created_at, updated_at) SELECT ?, ?, id, ?, ?, ?, ?, ?, ?, ? FROM notebooks WHERE id = ? AND workspace_id = ? AND is_deleted = 0`).bind(id, getWorkspaceId(c), title, excerpt, JSON.stringify(tags), actorLabel, actorLabel, createdAt, updatedAt, input.notebookId, getWorkspaceId(c)),- c.env.DB.prepare(+ c.env.storage.db.prepare(`INSERT INTO memo_contents (memo_id, content_json, content_markdown, content_text, content_hash, revision, created_at, updated_at) VALUES (?, ?, ?, ?, ?, 0, ?, ?)`).bind(id, JSON.stringify(contentJson), contentMarkdown, contentText, contentHash, createdAt, updatedAt),- c.env.DB.prepare(+ c.env.storage.db.prepare(`INSERT INTO memos_fts (memo_id, title, content_text, tags)VALUES (?, ?, ?, ?)`).bind(id, title, contentText, tags.join(" ")),- auditStatement(c.env.DB, actor.actorType, actor.actorId, "memo.create", "memo", id, {+ auditStatement(c.env.storage.db, actor.actorType, actor.actorId, "memo.create", "memo", id, {notebookId: input.notebookId,}),]);- return c.json({ memo: await getMemoDetail(c.env.DB, getWorkspaceId(c), id) }, 201);+ return c.json({ memo: await getMemoDetail(c.env.storage.db, getWorkspaceId(c), id) }, 201);});app.post("/api/v1/memos/batch/move", zValidator("json", MoveMemosSchema), async (c) => {@@ -1575,7 +1593,7 @@ app.post("/api/v1/memos/batch/move", zValidator("json", MoveMemosSchema), async}const input = c.req.valid("json");- const target = await getNotebook(c.env.DB, getWorkspaceId(c), input.notebookId);+ const target = await getNotebook(c.env.storage.db, getWorkspaceId(c), input.notebookId);if (!target) {return notFound(c, "Target notebook not found");@@ -1585,7 +1603,7 @@ app.post("/api/v1/memos/batch/move", zValidator("json", MoveMemosSchema), asyncconst actorLabel = getActorLabel(c);try {- const moved = await moveMemosToNotebook(c.env.DB, getWorkspaceId(c), input.memoIds, input.notebookId, actor, actorLabel);+ const moved = await moveMemosToNotebook(c.env.storage.db, getWorkspaceId(c), input.memoIds, input.notebookId, actor, actorLabel);return c.json({ ok: true, moved });} catch (error) {@@ -1608,7 +1626,7 @@ app.post("/api/v1/memos/batch/delete", zValidator("json", DeleteMemosSchema), asconst actor = getAuditActor(c);try {- const deleted = await deleteMemosRecord(c.env.DB, c.env.RESOURCES, getWorkspaceId(c), input.memoIds, Boolean(input.permanent), actor);+ const deleted = await deleteMemosRecord(c.env.storage.db, c.env.storage.resources, getWorkspaceId(c), input.memoIds, Boolean(input.permanent), actor);return c.json({ ok: true, deleted });} catch (error) {if (error instanceof AppError) {@@ -1627,7 +1645,7 @@ app.delete("/api/v1/memos/trash/empty", async (c) => {}const actor = getAuditActor(c);- const deleted = await emptyTrashMemosRecord(c.env.DB, c.env.RESOURCES, getWorkspaceId(c), actor);+ const deleted = await emptyTrashMemosRecord(c.env.storage.db, c.env.storage.resources, getWorkspaceId(c), actor);return c.json({ ok: true, deleted });});@@ -1640,7 +1658,7 @@ app.get("/api/v1/memos/:id", async (c) => {}const includeDeleted = c.req.query("includeDeleted") === "1";- const memo = await getMemoDetail(c.env.DB, getWorkspaceId(c), c.req.param("id"), includeDeleted);+ const memo = await getMemoDetail(c.env.storage.db, getWorkspaceId(c), c.req.param("id"), includeDeleted);if (!memo) {return notFound(c, "Memo not found");@@ -1657,7 +1675,7 @@ app.post("/api/v1/memos/:id/edit-sessions", async (c) => {}const memoId = c.req.param("id");- const current = await getMemoDetailRow(c.env.DB, getWorkspaceId(c), memoId);+ const current = await getMemoDetailRow(c.env.storage.db, getWorkspaceId(c), memoId);if (!current) {return notFound(c, "Memo not found");@@ -1673,9 +1691,9 @@ app.post("/api/v1/memos/:id/edit-sessions", async (c) => {expiresAt: new Date(Date.now() + 30 * 24 * 60 * 60_000).toISOString(),};- await c.env.DB.batch([- c.env.DB.prepare(`DELETE FROM memo_edit_sessions WHERE expires_at <= ?`).bind(now),- c.env.DB.prepare(+ await c.env.storage.db.batch([+ c.env.storage.db.prepare(`DELETE FROM memo_edit_sessions WHERE expires_at <= ?`).bind(now),+ c.env.storage.db.prepare(`INSERT INTO memo_edit_sessions (id, memo_id, actor_type, actor_id, base_revision, base_content_hash,expires_at, created_at, updated_at@@ -1704,14 +1722,14 @@ app.get("/api/v1/memos/:id/revisions", async (c) => {}const memoId = c.req.param("id");- const memo = await getMemoDetail(c.env.DB, getWorkspaceId(c), memoId);+ const memo = await getMemoDetail(c.env.storage.db, getWorkspaceId(c), memoId);if (!memo) {return notFound(c, "Memo not found");}const limit = clampNumber(Number(c.req.query("limit") ?? 50), 1, 100);- const rows = await c.env.DB.prepare(+ const rows = await c.env.storage.db.prepare(`SELECT id, memo_id, revision, title, tags_json, content_json, content_markdown,content_text, content_hash, created_by, created_atFROM memo_revisions@@ -1736,13 +1754,13 @@ app.post("/api/v1/memos/:id/revisions/:revisionId/restore", async (c) => {const revisionId = c.req.param("revisionId");const actor = getAuditActor(c);const actorLabel = getActorLabel(c);- const current = await getMemoDetailRow(c.env.DB, getWorkspaceId(c), memoId);+ const current = await getMemoDetailRow(c.env.storage.db, getWorkspaceId(c), memoId);if (!current) {return notFound(c, "Memo not found");}- const revision = await getMemoRevisionRow(c.env.DB, getWorkspaceId(c), memoId, revisionId);+ const revision = await getMemoRevisionRow(c.env.storage.db, getWorkspaceId(c), memoId, revisionId);if (!revision) {return notFound(c, "Memo revision not found");@@ -1758,32 +1776,32 @@ app.post("/api/v1/memos/:id/revisions/:revisionId/restore", async (c) => {const nextRevision = current.revision + 1;const now = isoNow();- await c.env.DB.batch([- createMemoRevisionStatement(c.env.DB, current, actorLabel, now),- c.env.DB.prepare(+ await c.env.storage.db.batch([+ createMemoRevisionStatement(c.env.storage.db, current, actorLabel, now),+ c.env.storage.db.prepare(`UPDATE memosSET title = ?, excerpt = ?, tags_json = ?, updated_by = ?, updated_at = ?WHERE id = ? AND is_deleted = 0`).bind(title, excerpt, JSON.stringify(tags), actorLabel, now, memoId),- c.env.DB.prepare(+ c.env.storage.db.prepare(`UPDATE memo_contentsSET content_json = ?, content_markdown = ?, content_text = ?, content_hash = ?,revision = ?, updated_at = ?WHERE memo_id = ?`).bind(JSON.stringify(contentJson), contentMarkdown, contentText, contentHash, nextRevision, now, memoId),- c.env.DB.prepare(`DELETE FROM memos_fts WHERE memo_id = ?`).bind(memoId),- c.env.DB.prepare(+ c.env.storage.db.prepare(`DELETE FROM memos_fts WHERE memo_id = ?`).bind(memoId),+ c.env.storage.db.prepare(`INSERT INTO memos_fts (memo_id, title, content_text, tags)VALUES (?, ?, ?, ?)`).bind(memoId, title, contentText, tags.join(" ")),- auditStatement(c.env.DB, actor.actorType, actor.actorId, "memo.revision_restore", "memo", memoId, {+ auditStatement(c.env.storage.db, actor.actorType, actor.actorId, "memo.revision_restore", "memo", memoId, {revisionId,restoredRevision: revision.revision,revision: nextRevision,}),]);- return c.json({ memo: await getMemoDetail(c.env.DB, getWorkspaceId(c), memoId) });+ return c.json({ memo: await getMemoDetail(c.env.storage.db, getWorkspaceId(c), memoId) });});app.get("/api/v1/exports/markdown", async (c) => {@@ -1796,7 +1814,7 @@ app.get("/api/v1/exports/markdown", async (c) => {const limit = clampNumber(Number(c.req.query("limit") ?? 50), 1, 100);const offset = clampNumber(Number(c.req.query("offset") ?? 0), 0, 1_000_000);const [memoRows, totalRow] = await Promise.all([- c.env.DB.prepare(+ c.env.storage.db.prepare(`SELECT m.id, m.notebook_id, m.title, m.excerpt, m.tags_json, m.is_pinned,m.is_archived, m.is_deleted, m.created_at, m.updated_at, m.deleted_at, mc.revision,mc.content_json, mc.content_markdown, mc.content_text, mc.content_hash,@@ -1809,7 +1827,7 @@ app.get("/api/v1/exports/markdown", async (c) => {).bind(getWorkspaceId(c), limit, offset).all<MemoDetailRow>(),- c.env.DB.prepare(`SELECT COUNT(*) AS count FROM memos WHERE workspace_id = ? AND is_deleted = 0`).bind(getWorkspaceId(c)).first<{ count: number }>(),+ c.env.storage.db.prepare(`SELECT COUNT(*) AS count FROM memos WHERE workspace_id = ? AND is_deleted = 0`).bind(getWorkspaceId(c)).first<{ count: number }>(),]);const memoIds = memoRows.results.map((row) => row.id);@@ -1817,7 +1835,7 @@ app.get("/api/v1/exports/markdown", async (c) => {if (memoIds.length > 0) {const placeholders = memoIds.map(() => "?").join(", ");- const resourceRows = await c.env.DB.prepare(+ 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,r.filename, r.byte_size, r.sha256, r.width, r.height, r.created_at, r.updated_atFROM resources@@ -1850,7 +1868,7 @@ app.get("/api/v1/backups/json", async (c) => {const limit = clampNumber(Number(c.req.query("limit") ?? 25), 1, 50);const offset = clampNumber(Number(c.req.query("offset") ?? 0), 0, 1_000_000);const [memoRows, totalRow] = await Promise.all([- c.env.DB.prepare(+ c.env.storage.db.prepare(`SELECT m.id, m.notebook_id, m.title, m.excerpt, m.tags_json, m.is_pinned,m.is_archived, m.is_deleted, m.created_at, m.updated_at, m.deleted_at, mc.revision,mc.content_json, mc.content_markdown, mc.content_text, mc.content_hash,@@ -1863,7 +1881,7 @@ app.get("/api/v1/backups/json", async (c) => {).bind(getWorkspaceId(c), limit, offset).all<MemoDetailRow>(),- c.env.DB.prepare(`SELECT COUNT(*) AS count FROM memos WHERE workspace_id = ? AND is_deleted = 0`).bind(getWorkspaceId(c)).first<{ count: number }>(),+ c.env.storage.db.prepare(`SELECT COUNT(*) AS count FROM memos WHERE workspace_id = ? AND is_deleted = 0`).bind(getWorkspaceId(c)).first<{ count: number }>(),]);const memoIds = memoRows.results.map((row) => row.id);let resources: Resource[] = [];@@ -1872,7 +1890,7 @@ app.get("/api/v1/backups/json", async (c) => {if (memoIds.length > 0) {const placeholders = memoIds.map(() => "?").join(", ");const [resourceRows, revisionRows] = await Promise.all([- c.env.DB.prepare(+ c.env.storage.db.prepare(`SELECT id, memo_id, original_memo_id, bucket_name, object_key, kind, mime_type,filename, byte_size, sha256, width, height, created_at, updated_atFROM resources@@ -1881,7 +1899,7 @@ app.get("/api/v1/backups/json", async (c) => {).bind(...memoIds).all<ResourceRow>(),- c.env.DB.prepare(+ c.env.storage.db.prepare(`SELECT id, memo_id, revision, title, tags_json, content_json, content_markdown,content_text, content_hash, created_by, created_atFROM memo_revisions@@ -1913,7 +1931,7 @@ app.post("/api/v1/restores/json/notebooks", zValidator("json", RestoreJsonNoteboreturn userOnly;}- await restoreJsonNotebooks(c.env.DB, getWorkspaceId(c), c.req.valid("json").notebooks as JsonBackupNotebook[]);+ await restoreJsonNotebooks(c.env.storage.db, getWorkspaceId(c), c.req.valid("json").notebooks as JsonBackupNotebook[]);return c.json({ ok: true });});@@ -1923,7 +1941,7 @@ app.post("/api/v1/restores/json/memos", zValidator("json", RestoreJsonMemosSchemreturn userOnly;}- await restoreJsonMemos(c.env.DB, getWorkspaceId(c), c.req.valid("json").memos as JsonBackupMemo[]);+ await restoreJsonMemos(c.env.storage.db, getWorkspaceId(c), c.req.valid("json").memos as JsonBackupMemo[]);return c.json({ ok: true });});@@ -1953,7 +1971,7 @@ app.put("/api/v1/restores/json/resources/:id", async (c) => {}const metadata = parsed.data as JsonBackupResource;- const memo = await getMemoDetail(c.env.DB, getWorkspaceId(c), metadata.memoId);+ const memo = await getMemoDetail(c.env.storage.db, getWorkspaceId(c), metadata.memoId);if (!memo) {return notFound(c, "Restore target memo not found.");}@@ -1966,28 +1984,28 @@ app.put("/api/v1/restores/json/resources/:id", async (c) => {const filename = normalizeFilename(metadata.filename || file.name) || `${metadata.kind}-${metadata.id}`;const objectKey = `workspaces/${getWorkspaceId(c)}/restores/${metadata.memoId}/${metadata.id}/${Date.now()}-${filename}`;const bytes = new Uint8Array(await file.arrayBuffer());- const foreignResource = await c.env.DB.prepare(+ const foreignResource = await c.env.storage.db.prepare(`SELECT r.id FROM resources r INNER JOIN memos m ON m.id = r.memo_idWHERE r.id = ? AND m.workspace_id <> ? LIMIT 1`).bind(metadata.id, getWorkspaceId(c)).first<{ id: string }>();if (foreignResource) {return conflict(c, "cross_workspace_id_conflict", "Backup resource ID is already used by another user.");}- const previous = await c.env.DB.prepare(+ 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 }>();const originalMemo = metadata.originalMemoId- ? await c.env.DB.prepare(`SELECT id FROM memos WHERE id = ? AND workspace_id = ?`).bind(metadata.originalMemoId, getWorkspaceId(c)).first<{ id: string }>()+ ? 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.RESOURCES.put(objectKey, bytes, {+ await c.env.storage.resources.put(objectKey, bytes, {httpMetadata: { contentType: metadata.mimeType ?? file.type ?? "application/octet-stream" },customMetadata: { memoId: metadata.memoId, resourceId: metadata.id, restored: "true" },});try {const now = isoNow();- await c.env.DB.prepare(+ await c.env.storage.db.prepare(`INSERT INTO resources (id, memo_id, original_memo_id, bucket_name, object_key, kind, mime_type, filename,byte_size, sha256, width, height, metadata_json, is_deleted, created_at, updated_at, deleted_at@@ -2026,12 +2044,12 @@ app.put("/api/v1/restores/json/resources/:id", async (c) => {now).run();} catch (error) {- await c.env.RESOURCES.delete(objectKey);+ await c.env.storage.resources.delete(objectKey);throw error;}if (previous?.object_key && previous.object_key !== objectKey) {- await c.env.RESOURCES.delete(previous.object_key);+ await c.env.storage.resources.delete(previous.object_key);}return c.json({ ok: true });@@ -2046,7 +2064,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.DB.prepare(+ 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, 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,@@ -2059,7 +2077,7 @@ app.get("/api/v1/resources", async (c) => {).bind(getWorkspaceId(c), limit).all<ResourceListRow>(),- c.env.DB.prepare(+ c.env.storage.db.prepare(`SELECT COUNT(*) AS total_count,COALESCE(SUM(byte_size), 0) AS total_bytes,COALESCE(SUM(CASE WHEN kind = 'image' THEN 1 ELSE 0 END), 0) AS image_count,@@ -2084,7 +2102,7 @@ app.post("/api/v1/memos/:id/resources", async (c) => {}const memoId = c.req.param("id");- const memo = await getMemoDetail(c.env.DB, getWorkspaceId(c), memoId);+ const memo = await getMemoDetail(c.env.storage.db, getWorkspaceId(c), memoId);if (!memo) {return notFound(c, "Memo not found");@@ -2156,7 +2174,7 @@ const createImageResource = async (const filename = normalizeFilename(processed.filename) || `${resourceId}${inferImageExtension(processed.filename, processed.mimeType)}`;const checksum = await sha256Bytes(processed.bytes);- await c.env.RESOURCES.put(objectKey, processed.bytes, {+ await c.env.storage.resources.put(objectKey, processed.bytes, {httpMetadata: {contentType: processed.mimeType,cacheControl: "private, max-age=3600",@@ -2169,8 +2187,8 @@ const createImageResource = async (});try {- await c.env.DB.batch([- c.env.DB.prepare(+ 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,byte_size, sha256, width, height, metadata_json, created_at, updated_at@@ -2190,7 +2208,7 @@ const createImageResource = async (now,now),- auditStatement(c.env.DB, input.actor.actorType, input.actor.actorId, "resource.create", "resource", resourceId, {+ auditStatement(c.env.storage.db, input.actor.actorType, input.actor.actorId, "resource.create", "resource", resourceId, {memoId: input.memoId,mimeType: processed.mimeType,byteSize: processed.bytes.byteLength,@@ -2198,11 +2216,11 @@ const createImageResource = async (}),]);} catch (error) {- await c.env.RESOURCES.delete(objectKey);+ await c.env.storage.resources.delete(objectKey);throw error;}- const resource = await getResourceRow(c.env.DB, getWorkspaceId(c), resourceId);+ const resource = await getResourceRow(c.env.storage.db, getWorkspaceId(c), resourceId);if (!resource) {throw new AppError("not_found", "Resource not found", 404);@@ -2230,7 +2248,7 @@ const createAttachmentResource = async (const bucketName = c.env.EDGE_EVER_R2_BUCKET_NAME?.trim() || DEFAULT_R2_BUCKET_NAME;const checksum = await sha256Bytes(input.bytes);- await c.env.RESOURCES.put(objectKey, input.bytes, {+ await c.env.storage.resources.put(objectKey, input.bytes, {httpMetadata: {contentType: input.mimeType,cacheControl: "private, max-age=3600",@@ -2243,8 +2261,8 @@ const createAttachmentResource = async (});try {- await c.env.DB.batch([- c.env.DB.prepare(+ 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,byte_size, sha256, width, height, metadata_json, created_at, updated_at@@ -2262,18 +2280,18 @@ const createAttachmentResource = async (now,now),- auditStatement(c.env.DB, input.actor.actorType, input.actor.actorId, "resource.create", "resource", resourceId, {+ auditStatement(c.env.storage.db, input.actor.actorType, input.actor.actorId, "resource.create", "resource", resourceId, {memoId: input.memoId,mimeType: input.mimeType,byteSize: input.bytes.byteLength,}),]);} catch (error) {- await c.env.RESOURCES.delete(objectKey);+ await c.env.storage.resources.delete(objectKey);throw error;}- const resource = await getResourceRow(c.env.DB, getWorkspaceId(c), resourceId);+ const resource = await getResourceRow(c.env.storage.db, getWorkspaceId(c), resourceId);if (!resource) {throw new AppError("not_found", "Resource not found", 404);@@ -2336,13 +2354,13 @@ app.get("/api/v1/resources/:id/blob", async (c) => {return denied;}- const resource = await getResourceRow(c.env.DB, getWorkspaceId(c), c.req.param("id"));+ const resource = await getResourceRow(c.env.storage.db, getWorkspaceId(c), c.req.param("id"));if (!resource) {return notFound(c, "Resource not found");}- const object = await c.env.RESOURCES.get(resource.object_key);+ const object = await c.env.storage.resources.get(resource.object_key);if (!object) {return notFound(c, "Resource object not found");@@ -2408,7 +2426,7 @@ const updateMemoFromInput = async (c: AppContext, id: string, input: MemoUpdateIconst actor = getAuditActor(c);const actorLabel = getActorLabel(c);const workspaceId = getWorkspaceId(c);- const current = await getMemoDetailRow(c.env.DB, workspaceId, id);+ const current = await getMemoDetailRow(c.env.storage.db, workspaceId, id);if (!current) {return notFound(c, "Memo not found");@@ -2448,7 +2466,7 @@ const updateMemoFromInput = async (c: AppContext, id: string, input: MemoUpdateI);}- editSession = await c.env.DB.prepare(+ editSession = await c.env.storage.db.prepare(`SELECT id, memo_id, actor_type, actor_id, base_revision, base_content_hash, expires_atFROM memo_edit_sessionsWHERE id = ? AND memo_id = ? AND actor_type = ? AND actor_id IS ? AND expires_at > ?`@@ -2495,19 +2513,19 @@ const updateMemoFromInput = async (c: AppContext, id: string, input: MemoUpdateIif (!hasContentUpdate) {if (input.isPinned === undefined || isPinned === Boolean(current.is_pinned)) {- return c.json({ memo: await getMemoDetail(c.env.DB, workspaceId, id) });+ return c.json({ memo: await getMemoDetail(c.env.storage.db, workspaceId, id) });}- await c.env.DB.batch([- c.env.DB.prepare(+ await c.env.storage.db.batch([+ c.env.storage.db.prepare(`UPDATE memosSET is_pinned = ?, updated_by = ?, updated_at = ?, created_at = COALESCE(?, created_at)WHERE id = ? AND is_deleted = 0`).bind(isPinned ? 1 : 0, actorLabel, updatedAt, input.createdAt ?? null, id),- auditStatement(c.env.DB, actor.actorType, actor.actorId, isPinned ? "memo.pin" : "memo.unpin", "memo", id, {}),+ auditStatement(c.env.storage.db, actor.actorType, actor.actorId, isPinned ? "memo.pin" : "memo.unpin", "memo", id, {}),]);- return c.json({ memo: await getMemoDetail(c.env.DB, workspaceId, id) });+ return c.json({ memo: await getMemoDetail(c.env.storage.db, workspaceId, id) });}const currentContentJson = JSON.parse(current.content_json) as TiptapDoc;@@ -2540,19 +2558,19 @@ const updateMemoFromInput = async (c: AppContext, id: string, input: MemoUpdateIconst notebookId = input.notebookId ?? current.notebook_id;const nextRevision = current.revision + 1;const contentHash = await sha256(contentMarkdown + JSON.stringify(contentJson));- const revisionStatements = (await shouldSnapshotMemoRevision(c.env.DB, current, title, JSON.stringify(tags), contentHash, updatedAt))- ? [createMemoRevisionStatement(c.env.DB, current, actorLabel, updatedAt)]+ const revisionStatements = (await shouldSnapshotMemoRevision(c.env.storage.db, current, title, JSON.stringify(tags), contentHash, updatedAt))+ ? [createMemoRevisionStatement(c.env.storage.db, current, actorLabel, updatedAt)]: [];const editSessionStatements = editSession? [- c.env.DB.prepare(+ c.env.storage.db.prepare(`UPDATE memo_edit_sessionsSET base_revision = ?, base_content_hash = ?, updated_at = ?WHERE id = ? AND memo_id = ? AND base_revision = ? AND base_content_hash = ?`).bind(nextRevision, contentHash, updatedAt, editSession.id, id, current.revision, current.content_hash),]: [- c.env.DB.prepare(+ c.env.storage.db.prepare(`UPDATE memo_edit_sessionsSET base_revision = ?, base_content_hash = ?, updated_at = ?WHERE memo_id = ? AND actor_type = ? AND actor_id IS ?@@ -2570,32 +2588,32 @@ const updateMemoFromInput = async (c: AppContext, id: string, input: MemoUpdateI),];- await c.env.DB.batch([+ await c.env.storage.db.batch([...revisionStatements,- c.env.DB.prepare(+ c.env.storage.db.prepare(`UPDATE memosSET notebook_id = ?, title = ?, excerpt = ?, tags_json = ?, is_pinned = ?, updated_by = ?, updated_at = ?, created_at = COALESCE(?, created_at)WHERE id = ? AND workspace_id = ? AND is_deleted = 0AND EXISTS (SELECT 1 FROM notebooks n WHERE n.id = ? AND n.workspace_id = ? AND n.is_deleted = 0)`).bind(notebookId, title, excerpt, JSON.stringify(tags), isPinned ? 1 : 0, actorLabel, updatedAt, input.createdAt ?? null, id, workspaceId, notebookId, workspaceId),- c.env.DB.prepare(+ c.env.storage.db.prepare(`UPDATE memo_contentsSET content_json = ?, content_markdown = ?, content_text = ?, content_hash = ?,revision = ?, updated_at = ?, created_at = COALESCE(?, created_at)WHERE memo_id = ?`).bind(JSON.stringify(contentJson), contentMarkdown, contentText, contentHash, nextRevision, updatedAt, input.createdAt ?? null, id),- c.env.DB.prepare(`DELETE FROM memos_fts WHERE memo_id = ?`).bind(id),- c.env.DB.prepare(+ c.env.storage.db.prepare(`DELETE FROM memos_fts WHERE memo_id = ?`).bind(id),+ c.env.storage.db.prepare(`INSERT INTO memos_fts (memo_id, title, content_text, tags)VALUES (?, ?, ?, ?)`).bind(id, title, contentText, tags.join(" ")),...editSessionStatements,- auditStatement(c.env.DB, actor.actorType, actor.actorId, "memo.update", "memo", id, {+ auditStatement(c.env.storage.db, actor.actorType, actor.actorId, "memo.update", "memo", id, {revision: nextRevision,}),]);- return c.json({ memo: await getMemoDetail(c.env.DB, workspaceId, id) });+ return c.json({ memo: await getMemoDetail(c.env.storage.db, workspaceId, id) });};app.delete("/api/v1/memos/:id", async (c) => {@@ -2612,43 +2630,43 @@ app.delete("/api/v1/memos/:id", async (c) => {const workspaceId = getWorkspaceId(c);if (permanent) {- const current = await getMemoDetailRow(c.env.DB, workspaceId, id, true);+ const current = await getMemoDetailRow(c.env.storage.db, workspaceId, id, true);if (!current || current.is_deleted === 0) {return notFound(c, "Memo not found in trash");}- const resources = await getResourceRowsForMemo(c.env.DB, workspaceId, id);+ const resources = await getResourceRowsForMemo(c.env.storage.db, workspaceId, id);if (resources.length > 0) {- await c.env.RESOURCES.delete(resources.map((resource) => resource.object_key));+ await c.env.storage.resources.delete(resources.map((resource) => resource.object_key));}- await c.env.DB.batch([- c.env.DB.prepare(`DELETE FROM memos_fts WHERE memo_id = ?`).bind(id),- c.env.DB.prepare(`DELETE FROM resources WHERE memo_id = ?`).bind(id),- c.env.DB.prepare(`DELETE FROM memo_revisions WHERE memo_id = ?`).bind(id),- c.env.DB.prepare(`DELETE FROM memo_contents WHERE memo_id = ?`).bind(id),- c.env.DB.prepare(`DELETE FROM memos WHERE id = ? AND workspace_id = ? AND is_deleted = 1`).bind(id, workspaceId),- auditStatement(c.env.DB, actor.actorType, actor.actorId, "memo.delete_permanent", "memo", id, {}),+ await c.env.storage.db.batch([+ c.env.storage.db.prepare(`DELETE FROM memos_fts WHERE memo_id = ?`).bind(id),+ c.env.storage.db.prepare(`DELETE FROM resources WHERE memo_id = ?`).bind(id),+ c.env.storage.db.prepare(`DELETE FROM memo_revisions WHERE memo_id = ?`).bind(id),+ c.env.storage.db.prepare(`DELETE FROM memo_contents WHERE memo_id = ?`).bind(id),+ c.env.storage.db.prepare(`DELETE FROM memos WHERE id = ? AND workspace_id = ? AND is_deleted = 1`).bind(id, workspaceId),+ auditStatement(c.env.storage.db, actor.actorType, actor.actorId, "memo.delete_permanent", "memo", id, {}),]);return c.json({ ok: true });}- await c.env.DB.batch([- c.env.DB.prepare(+ await c.env.storage.db.batch([+ c.env.storage.db.prepare(`UPDATE memosSET is_deleted = 1, deleted_at = ?, updated_at = ?WHERE id = ? AND workspace_id = ? AND is_deleted = 0`).bind(now, now, id, workspaceId),- c.env.DB.prepare(+ c.env.storage.db.prepare(`UPDATE resourcesSET is_deleted = 1, deleted_at = ?, updated_at = ?WHERE memo_id = ? AND is_deleted = 0`).bind(now, now, id),- c.env.DB.prepare(`DELETE FROM memos_fts WHERE memo_id = ?`).bind(id),- auditStatement(c.env.DB, actor.actorType, actor.actorId, "memo.delete", "memo", id, {}),+ c.env.storage.db.prepare(`DELETE FROM memos_fts WHERE memo_id = ?`).bind(id),+ auditStatement(c.env.storage.db, actor.actorType, actor.actorId, "memo.delete", "memo", id, {}),]);return c.json({ ok: true });@@ -2664,7 +2682,7 @@ app.post("/api/v1/memos/:id/restore", async (c) => {const id = c.req.param("id");const actor = getAuditActor(c);const workspaceId = getWorkspaceId(c);- const current = await getMemoDetailRow(c.env.DB, workspaceId, id, true);+ const current = await getMemoDetailRow(c.env.storage.db, workspaceId, id, true);if (!current || current.is_deleted === 0) {return notFound(c, "Memo not found in trash");@@ -2672,37 +2690,37 @@ app.post("/api/v1/memos/:id/restore", async (c) => {const tags = parseJsonArray(current.tags_json);const now = isoNow();- const originalNotebook = await getNotebook(c.env.DB, workspaceId, current.notebook_id);- const inbox = await c.env.DB.prepare(`SELECT id FROM notebooks WHERE workspace_id = ? AND slug = 'inbox' AND is_deleted = 0 LIMIT 1`).bind(workspaceId).first<{ id: string }>();+ const originalNotebook = await getNotebook(c.env.storage.db, workspaceId, current.notebook_id);+ const inbox = await c.env.storage.db.prepare(`SELECT id FROM notebooks WHERE workspace_id = ? AND slug = 'inbox' AND is_deleted = 0 LIMIT 1`).bind(workspaceId).first<{ id: string }>();const restoreNotebookId = originalNotebook ? current.notebook_id : inbox?.id;if (!restoreNotebookId) {return conflict(c, "restore_notebook_missing", "Original notebook was deleted and the default inbox is unavailable.");}- await c.env.DB.batch([- c.env.DB.prepare(+ await c.env.storage.db.batch([+ c.env.storage.db.prepare(`UPDATE memosSET notebook_id = ?, is_deleted = 0, deleted_at = NULL, updated_at = ?WHERE id = ? AND workspace_id = ? AND is_deleted = 1`).bind(restoreNotebookId, now, id, workspaceId),- c.env.DB.prepare(+ c.env.storage.db.prepare(`UPDATE resourcesSET is_deleted = 0, deleted_at = NULL, updated_at = ?WHERE memo_id = ? AND is_deleted = 1`).bind(now, id),- c.env.DB.prepare(`DELETE FROM memos_fts WHERE memo_id = ?`).bind(id),- c.env.DB.prepare(+ c.env.storage.db.prepare(`DELETE FROM memos_fts WHERE memo_id = ?`).bind(id),+ c.env.storage.db.prepare(`INSERT INTO memos_fts (memo_id, title, content_text, tags)VALUES (?, ?, ?, ?)`).bind(id, current.title, current.content_text, tags.join(" ")),- auditStatement(c.env.DB, actor.actorType, actor.actorId, "memo.restore", "memo", id, {+ auditStatement(c.env.storage.db, actor.actorType, actor.actorId, "memo.restore", "memo", id, {fromNotebookId: current.notebook_id,toNotebookId: restoreNotebookId,}),]);- return c.json({ memo: await getMemoDetail(c.env.DB, workspaceId, id) });+ return c.json({ memo: await getMemoDetail(c.env.storage.db, workspaceId, id) });});app.post("/api/v1/memos/merge", zValidator("json", MergeMemosSchema), async (c) => {@@ -2717,7 +2735,7 @@ app.post("/api/v1/memos/merge", zValidator("json", MergeMemosSchema), async (c)const actorLabel = getActorLabel(c);try {- const memo = await mergeMemosRecord(c.env.DB, getWorkspaceId(c), input, actor, actorLabel);+ const memo = await mergeMemosRecord(c.env.storage.db, getWorkspaceId(c), input, actor, actorLabel);return c.json({ memo }, 201);} catch (error) {if (error instanceof AppError) {@@ -2773,19 +2791,29 @@ app.post("/mcp", async (c) => {});const worker = {- async fetch(request: Request, env: Bindings, ctx: ExecutionContext) {- if (isLocalDemoSeedEnabled(env)) {- await ensureLocalDemoSeed(env);+ async fetch(request: Request, env: WorkerBindings, ctx: ExecutionContext) {+ const runtimeEnv = {+ ...env,+ storage: createCloudflareStorageAdapter(env),+ } as Bindings;++ if (isLocalDemoSeedEnabled(runtimeEnv)) {+ await ensureLocalDemoSeed(runtimeEnv);}- return app.fetch(request, env, ctx);+ return app.fetch(request, runtimeEnv, ctx);},- async scheduled(controller: ScheduledController, env: Bindings, ctx: ExecutionContext) {- if (!isDemoMode(env)) {+ async scheduled(controller: ScheduledController, env: WorkerBindings, ctx: ExecutionContext) {+ const runtimeEnv = {+ ...env,+ storage: createCloudflareStorageAdapter(env),+ } as Bindings;++ if (!isDemoMode(runtimeEnv)) {return;}- ctx.waitUntil(resetDemoData(env, controller.scheduledTime, { resetCredentials: true }));+ ctx.waitUntil(resetDemoData(runtimeEnv, controller.scheduledTime, { resetCredentials: true }));},};@@ -3312,7 +3340,7 @@ const callMcpTool = async (case "search_memos": {assertScope(auth, "read:memos");return {- memos: await searchMemoSummaries(c.env.DB, {+ memos: await searchMemoSummaries(c.env.storage.db, {workspaceId: auth.workspaceId,query: getOptionalString(args.query),notebookId: getOptionalString(args.notebookId),@@ -3329,7 +3357,7 @@ const callMcpTool = async (}case "list_memos": {assertScope(auth, "read:memos");- return await listMemosForMcp(c.env.DB, {+ return await listMemosForMcp(c.env.storage.db, {workspaceId: auth.workspaceId,notebookId: getOptionalString(args.notebookId),limit: clampNumber(Number(args.limit ?? 50), 1, 100),@@ -3341,7 +3369,7 @@ const callMcpTool = async (case "get_memo": {assertScope(auth, "read:memos");const memoId = getRequiredString(args.memoId, "memoId");- const memo = await getMemoDetail(c.env.DB, auth.workspaceId, memoId, args.includeDeleted === true);+ const memo = await getMemoDetail(c.env.storage.db, auth.workspaceId, memoId, args.includeDeleted === true);if (!memo) {throw new Error("Memo not found");@@ -3354,7 +3382,7 @@ const callMcpTool = async (const notebookId = getRequiredString(args.notebookId, "notebookId");const actor = getAuditActor(c);const actorLabel = getActorLabel(c);- const memo = await createMemoRecord(c.env.DB, auth.workspaceId, {+ const memo = await createMemoRecord(c.env.storage.db, auth.workspaceId, {notebookId,title: getOptionalString(args.title) ?? undefined,contentMarkdown: getOptionalString(args.contentMarkdown) ?? "",@@ -3371,7 +3399,7 @@ const callMcpTool = async (const actor = getAuditActor(c);const actorLabel = getActorLabel(c);const result = await updateMemoRecord(- c.env.DB,+ c.env.storage.db,auth.workspaceId,memoId,{@@ -3402,10 +3430,10 @@ const callMcpTool = async (const memoIds = getRequiredStringArray(args.memoIds, "memoIds");if (args.dryRun === true) {- return { dryRun: true, memos: await getMemosForBulkAction(c.env.DB, auth.workspaceId, memoIds, 0) };+ return { dryRun: true, memos: await getMemosForBulkAction(c.env.storage.db, auth.workspaceId, memoIds, 0) };}- const deleted = await deleteMemosRecord(c.env.DB, c.env.RESOURCES, auth.workspaceId, memoIds, false, getAuditActor(c));+ const deleted = await deleteMemosRecord(c.env.storage.db, c.env.storage.resources, auth.workspaceId, memoIds, false, getAuditActor(c));return { ok: true, deleted };}case "restore_memos": {@@ -3413,16 +3441,16 @@ const callMcpTool = async (const memoIds = getRequiredStringArray(args.memoIds, "memoIds");if (args.dryRun === true) {- return { dryRun: true, memos: await getMemosForBulkAction(c.env.DB, auth.workspaceId, memoIds, 1) };+ return { dryRun: true, memos: await getMemosForBulkAction(c.env.storage.db, auth.workspaceId, memoIds, 1) };}- const restored = await restoreMemosRecord(c.env.DB, auth.workspaceId, memoIds, getAuditActor(c));+ const restored = await restoreMemosRecord(c.env.storage.db, auth.workspaceId, memoIds, getAuditActor(c));return { ok: true, restored };}case "upload_memo_image": {assertScope(auth, "write:resources");const memoId = getRequiredString(args.memoId, "memoId");- const memo = await getMemoDetail(c.env.DB, auth.workspaceId, memoId);+ const memo = await getMemoDetail(c.env.storage.db, auth.workspaceId, memoId);if (!memo) {throw new AppError("not_found", "Memo not found", 404);@@ -3450,25 +3478,25 @@ const callMcpTool = async (assertScope(auth, "write:memos");const notebookId = getRequiredString(args.notebookId, "notebookId");const memoIds = getRequiredStringArray(args.memoIds, "memoIds");- const target = await getNotebook(c.env.DB, auth.workspaceId, notebookId);+ const target = await getNotebook(c.env.storage.db, auth.workspaceId, notebookId);if (!target) {throw new AppError("not_found", "Target notebook not found", 404);}if (args.dryRun === true) {- return { dryRun: true, targetNotebook: target, memos: await getMemosForBulkAction(c.env.DB, auth.workspaceId, memoIds, 0) };+ return { dryRun: true, targetNotebook: target, memos: await getMemosForBulkAction(c.env.storage.db, auth.workspaceId, memoIds, 0) };}const actor = getAuditActor(c);const actorLabel = getActorLabel(c);- const moved = await moveMemosToNotebook(c.env.DB, auth.workspaceId, memoIds, notebookId, actor, actorLabel);+ const moved = await moveMemosToNotebook(c.env.storage.db, auth.workspaceId, memoIds, notebookId, actor, actorLabel);return { ok: true, moved };}case "add_tags_to_memos": {assertScope(auth, "write:tags");- return await updateTagsForMemos(c.env.DB, {+ return await updateTagsForMemos(c.env.storage.db, {workspaceId: auth.workspaceId,memoIds: getRequiredStringArray(args.memoIds, "memoIds"),tags: getRequiredStringArray(args.tags, "tags"),@@ -3480,7 +3508,7 @@ const callMcpTool = async (}case "remove_tags_from_memos": {assertScope(auth, "write:tags");- return await updateTagsForMemos(c.env.DB, {+ return await updateTagsForMemos(c.env.storage.db, {workspaceId: auth.workspaceId,memoIds: getRequiredStringArray(args.memoIds, "memoIds"),tags: getRequiredStringArray(args.tags, "tags"),@@ -3496,10 +3524,10 @@ const callMcpTool = async (const to = getRequiredString(args.to, "to");if (args.dryRun === true) {- return await previewTagRename(c.env.DB, auth.workspaceId, from, to);+ return await previewTagRename(c.env.storage.db, auth.workspaceId, from, to);}- const updated = await updateTagAcrossMemos(c.env.DB, auth.workspaceId, from, to, getAuditActor(c), getActorLabel(c));+ const updated = await updateTagAcrossMemos(c.env.storage.db, auth.workspaceId, from, to, getAuditActor(c), getActorLabel(c));return { ok: true, updated };}case "delete_tag": {@@ -3507,10 +3535,10 @@ const callMcpTool = async (const tag = getRequiredString(args.tag, "tag");if (args.dryRun === true) {- return await previewTagRename(c.env.DB, auth.workspaceId, tag, null);+ return await previewTagRename(c.env.storage.db, auth.workspaceId, tag, null);}- const updated = await updateTagAcrossMemos(c.env.DB, auth.workspaceId, tag, null, getAuditActor(c), getActorLabel(c));+ const updated = await updateTagAcrossMemos(c.env.storage.db, auth.workspaceId, tag, null, getAuditActor(c), getActorLabel(c));return { ok: true, updated };}case "merge_memos": {@@ -3518,7 +3546,7 @@ const callMcpTool = async (const actor = getAuditActor(c);const actorLabel = getActorLabel(c);const memo = await mergeMemosRecord(- c.env.DB,+ c.env.storage.db,auth.workspaceId,{memoIds: getRequiredStringArray(args.memoIds, "memoIds"),@@ -3534,7 +3562,7 @@ const callMcpTool = async (case "upload_memo_attachment": {assertScope(auth, "write:resources");const memoId = getRequiredString(args.memoId, "memoId");- const memo = await getMemoDetail(c.env.DB, auth.workspaceId, memoId);+ const memo = await getMemoDetail(c.env.storage.db, auth.workspaceId, memoId);if (!memo) {throw new AppError("not_found", "Memo not found", 404);@@ -3559,23 +3587,23 @@ const callMcpTool = async (case "list_memo_resources": {assertScope(auth, "read:resources");const memoId = getRequiredString(args.memoId, "memoId");- const memo = await getMemoDetail(c.env.DB, auth.workspaceId, memoId, true);+ const memo = await getMemoDetail(c.env.storage.db, auth.workspaceId, memoId, true);if (!memo) {throw new AppError("not_found", "Memo not found", 404);}- return { resources: await listResourcesForMemo(c.env.DB, auth.workspaceId, memoId) };+ return { resources: await listResourcesForMemo(c.env.storage.db, auth.workspaceId, memoId) };}case "list_resources": {assertScope(auth, "read:resources");- return await listResourcesForMcp(c.env.DB, auth.workspaceId, clampNumber(Number(args.limit ?? 100), 1, 500));+ return await listResourcesForMcp(c.env.storage.db, auth.workspaceId, clampNumber(Number(args.limit ?? 100), 1, 500));}case "list_memo_revisions": {assertScope(auth, "read:memos");return {revisions: await listMemoRevisions(- c.env.DB,+ c.env.storage.db,auth.workspaceId,getRequiredString(args.memoId, "memoId"),clampNumber(Number(args.limit ?? 50), 1, 100)@@ -3586,7 +3614,7 @@ const callMcpTool = async (assertScope(auth, "write:memos");const memoId = getRequiredString(args.memoId, "memoId");const revisionId = getRequiredString(args.revisionId, "revisionId");- const revision = await getMemoRevisionRow(c.env.DB, auth.workspaceId, memoId, revisionId);+ const revision = await getMemoRevisionRow(c.env.storage.db, auth.workspaceId, memoId, revisionId);if (!revision) {throw new AppError("not_found", "Memo revision not found", 404);@@ -3596,13 +3624,13 @@ const callMcpTool = async (return { dryRun: true, revision: mapMemoRevision(revision) };}- return { memo: await restoreMemoRevisionRecord(c.env.DB, auth.workspaceId, memoId, revisionId, getAuditActor(c), getActorLabel(c)) };+ return { memo: await restoreMemoRevisionRecord(c.env.storage.db, auth.workspaceId, memoId, revisionId, getAuditActor(c), getActorLabel(c)) };}case "move_notebook": {assertScope(auth, "write:notebooks");const actor = getAuditActor(c);const notebook = await updateNotebookRecord(- c.env.DB,+ c.env.storage.db,auth.workspaceId,getRequiredString(args.notebookId, "notebookId"),{@@ -3624,7 +3652,7 @@ const callMcpTool = async (}const notebook = await createNotebookRecord(- c.env.DB,+ c.env.storage.db,auth.workspaceId,{name,@@ -3638,15 +3666,15 @@ const callMcpTool = async (}case "list_notebooks": {assertScope(auth, "read:notebooks");- return { notebooks: await listNotebooks(c.env.DB, auth.workspaceId) };+ return { notebooks: await listNotebooks(c.env.storage.db, auth.workspaceId) };}case "list_tags": {assertScope(auth, "read:tags");- return { tags: await listTagSummaries(c.env.DB, auth.workspaceId) };+ return { tags: await listTagSummaries(c.env.storage.db, auth.workspaceId) };}case "get_workspace_stats": {assertScope(auth, "read:memos");- return await getWorkspaceStats(c.env.DB, auth.workspaceId);+ return await getWorkspaceStats(c.env.storage.db, auth.workspaceId);}default:throw new Error(`Unknown tool: ${name}`);@@ -3729,7 +3757,7 @@ const escapeMarkdownImageAlt = (value: string) => value.replace(/[\\[\]]/g, "\\$const escapeMarkdownLinkLabel = (value: string) => value.replace(/[\\[\]]/g, "\\$&");const getInstanceAuthMode = async (env: Bindings): Promise<InstanceAuthMode> => {- if (!env.DB || typeof env.DB.prepare !== "function") {+ if (!env.storage.db || typeof env.storage.db.prepare !== "function") {throw new AppError("database_not_ready","Database is not ready. Bind the D1 database as DB and apply the remote migrations.",@@ -3739,7 +3767,7 @@ const getInstanceAuthMode = async (env: Bindings): Promise<InstanceAuthMode> =>let user: { id: string } | null;try {- user = await env.DB.prepare(`SELECT id FROM users WHERE is_disabled = 0 LIMIT 1`).first<{ id: string }>();+ user = await env.storage.db.prepare(`SELECT id FROM users WHERE is_disabled = 0 LIMIT 1`).first<{ id: string }>();} catch (error) {if (isDatabaseNotReadyError(error)) {throw new AppError(@@ -3763,7 +3791,7 @@ const getInstanceAuthMode = async (env: Bindings): Promise<InstanceAuthMode> =>const verifyLogin = async (env: Bindings, username: string, password: string): Promise<UserRow | null> => {const normalizedUsername = username.trim();- const existingUser = await getUserByUsername(env.DB, normalizedUsername);+ const existingUser = await getUserByUsername(env.storage.db, normalizedUsername);if (existingUser) {if (await verifyPassword(password, existingUser.password_hash)) {@@ -3809,17 +3837,17 @@ const verifyLogin = async (env: Bindings, username: string, password: string): Pconst userId = createId("usr");const passwordHash = await hashPassword(password);- await env.DB.prepare(+ await env.storage.db.prepare(`INSERT OR IGNORE INTO users (id, username, password_hash, display_name, created_at, updated_at)VALUES (?, ?, ?, ?, ?, ?)`).bind(userId, normalizedUsername, passwordHash, normalizedUsername, now, now).run();- return getUserByUsername(env.DB, normalizedUsername);+ return getUserByUsername(env.storage.db, normalizedUsername);};-const getUserByUsername = async (db: D1Database, username: string) =>+const getUserByUsername = async (db: DatabaseAdapter, username: string) =>db.prepare(`SELECT id, username, password_hash, display_name, is_disabled@@ -3933,12 +3961,12 @@ const createSession = async (c: AppContext, user: UserRow, requestedDeviceId?: sconst ip = c.req.header("CF-Connecting-IP");const ipHash = ip ? await sha256(ip) : null;- await c.env.DB.batch([- c.env.DB.prepare(+ await c.env.storage.db.batch([+ c.env.storage.db.prepare(`UPDATE sessions SET revoked_at = ?WHERE user_id = ? AND device_id = ? AND revoked_at IS NULL`).bind(now, user.id, deviceId),- c.env.DB.prepare(+ c.env.storage.db.prepare(`INSERT INTO sessions (id, user_id, token_hash, device_id, user_agent, ip_hash, expires_at, created_at, last_seen_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`@@ -3988,7 +4016,7 @@ const authenticateBearerToken = async (c: AppContext, touch: boolean): Promise<Areturn sessionAuth;}- const row = await c.env.DB.prepare(+ const row = await c.env.storage.db.prepare(`SELECT id, name, token_value, scopes_json, last_used_at, expires_at, is_revoked, created_at, workspace_idFROM api_tokensWHERE token_hash = ?@@ -4003,7 +4031,7 @@ const authenticateBearerToken = async (c: AppContext, touch: boolean): Promise<A}if (touch) {- await c.env.DB.prepare(`UPDATE api_tokens SET last_used_at = ? WHERE id = ?`).bind(isoNow(), row.id).run();+ await c.env.storage.db.prepare(`UPDATE api_tokens SET last_used_at = ? WHERE id = ?`).bind(isoNow(), row.id).run();}return {@@ -4020,7 +4048,7 @@ const authenticateBearerToken = async (c: AppContext, touch: boolean): Promise<A};const authenticateSessionToken = async (c: AppContext, token: string, touch: boolean): Promise<AuthContext | null> => {- const row = await c.env.DB.prepare(+ const row = await c.env.storage.db.prepare(`SELECT s.id, s.user_id, u.username, u.display_name, s.expires_atFROM sessions sINNER JOIN users u ON u.id = s.user_id@@ -4037,10 +4065,10 @@ const authenticateSessionToken = async (c: AppContext, token: string, touch: boo}if (touch) {- await c.env.DB.prepare(`UPDATE sessions SET last_seen_at = ? WHERE id = ?`).bind(isoNow(), row.id).run();+ await c.env.storage.db.prepare(`UPDATE sessions SET last_seen_at = ? WHERE id = ?`).bind(isoNow(), row.id).run();}- const workspace = await ensureUserWorkspace(c.env.DB, row.user_id, row.username);+ const workspace = await ensureUserWorkspace(c.env.storage.db, row.user_id, row.username);return {kind: "user",@@ -5466,17 +5494,17 @@ let localDemoSeedPromise: Promise<void> | null = null;const ensureLocalDemoSeed = (env: Bindings) => {localDemoSeedPromise ??= (async () => {const memoPlaceholders = DEMO_SEED_MEMO_IDS.map(() => "?").join(", ");- await env.DB.batch([- env.DB.prepare(`DELETE FROM mobile_sync_changes`),- env.DB.prepare(`DELETE FROM memos_fts`),- env.DB.prepare(`DELETE FROM resources`),- env.DB.prepare(`DELETE FROM memo_revisions`),- env.DB.prepare(`DELETE FROM memo_contents WHERE memo_id NOT IN (${memoPlaceholders})`).bind(...DEMO_SEED_MEMO_IDS),- env.DB.prepare(`DELETE FROM memos WHERE id NOT IN (${memoPlaceholders})`).bind(...DEMO_SEED_MEMO_IDS),+ await env.storage.db.batch([+ env.storage.db.prepare(`DELETE FROM mobile_sync_changes`),+ env.storage.db.prepare(`DELETE FROM memos_fts`),+ env.storage.db.prepare(`DELETE FROM resources`),+ env.storage.db.prepare(`DELETE FROM memo_revisions`),+ env.storage.db.prepare(`DELETE FROM memo_contents WHERE memo_id NOT IN (${memoPlaceholders})`).bind(...DEMO_SEED_MEMO_IDS),+ env.storage.db.prepare(`DELETE FROM memos WHERE id NOT IN (${memoPlaceholders})`).bind(...DEMO_SEED_MEMO_IDS),]);await ensureDemoSeed(env, { overwriteExisting: true, refreshResources: true });- await audit(env.DB, "system", null, "demo.local_seed", "demo", "edgeever-local", {+ await audit(env.storage.db, "system", null, "demo.local_seed", "demo", "edgeever-local", {seedMemoCount: DEMO_SEED_MEMOS.length,mode: "sync-seed",});@@ -5492,7 +5520,7 @@ const ensureDemoSeed = async (env: Bindings,options: { overwriteExisting?: boolean; refreshResources?: boolean } = {},) => {- const db = env.DB;+ const db = env.storage.db;const now = isoNow();const statements: D1PreparedStatement[] = [];const bucketName = env.EDGE_EVER_R2_BUCKET_NAME?.trim() || DEFAULT_R2_BUCKET_NAME;@@ -5693,7 +5721,7 @@ const ensureDemoSeed = async (const objectKey = `demo/${resource.memoId}/${resource.id}.${extension}`;if (options.refreshResources || !existingResourceIds.has(resource.id)) {- await env.RESOURCES.put(objectKey, bytes, {+ await env.storage.resources.put(objectKey, bytes, {httpMetadata: {contentType: resource.mimeType,cacheControl: "private, max-age=3600",@@ -5759,7 +5787,7 @@ const resetDemoData = async (scheduledTime: number,options: { resetCredentials?: boolean } = {}) => {- const db = env.DB;+ const db = env.storage.db;const now = isoNow();const demoUsername = env.EDGE_EVER_AUTH_USERNAME?.trim() || "admin";const demoPasswordHash = await resolveDemoPasswordHash(@@ -5771,7 +5799,7 @@ const resetDemoData = async (const objectKeys = resourceRows.results.map((resource) => resource.object_key);for (let index = 0; index < objectKeys.length; index += 1000) {- await env.RESOURCES.delete(objectKeys.slice(index, index + 1000));+ await env.storage.resources.delete(objectKeys.slice(index, index + 1000));}const resetStatements: D1PreparedStatement[] = [diff --git a/apps/api/src/self-hosted-storage-adapter.ts b/apps/api/src/self-hosted-storage-adapter.tsnew file mode 100644index 00000000..0a4fc16d--- /dev/null+++ b/apps/api/src/self-hosted-storage-adapter.ts@@ -0,0 +1,146 @@+import { mkdir, readFile, unlink, writeFile } from "node:fs/promises";+import { dirname, resolve, sep } from "node:path";+import type {+ BlobObjectAdapter,+ BlobStoreAdapter,+ DatabaseAdapter,+ StorageAdapter,+} from "./storage-contract";++/** Small subset of Bun's SQLite API needed by the D1-compatible adapter. */+export type SqliteDatabaseLike = {+ query: (sql: string) => {+ all: (...bindings: unknown[]) => unknown[];+ get: (...bindings: unknown[]) => unknown;+ run: (...bindings: unknown[]) => unknown;+ };+ transaction: (callback: () => void) => () => unknown;+};++class SqlitePreparedStatement {+ constructor(+ private readonly sqlite: SqliteDatabaseLike,+ readonly sql: string,+ readonly bindings: unknown[] = [],+ ) {}++ bind(...bindings: unknown[]) {+ return new SqlitePreparedStatement(this.sqlite, this.sql, bindings);+ }++ async all() {+ return {+ results: this.sqlite.query(this.sql).all(...this.bindings),+ success: true,+ meta: {},+ };+ }++ async first<T = Record<string, unknown>>() {+ return (this.sqlite.query(this.sql).get(...this.bindings) as T | null | undefined) ?? null;+ }++ async run() {+ this.sqlite.query(this.sql).run(...this.bindings);+ return { success: true, meta: {} };+ }+}++class SqliteDatabaseAdapter {+ constructor(private readonly sqlite: SqliteDatabaseLike) {}++ prepare(sql: string) {+ return new SqlitePreparedStatement(this.sqlite, sql);+ }++ async batch(statements: SqlitePreparedStatement[]) {+ const results: unknown[] = [];+ this.sqlite.transaction(() => {+ for (const statement of statements) {+ results.push(this.sqlite.query(statement.sql).run(...statement.bindings));+ }+ })();+ return results;+ }+}++const safeObjectPath = (rootDirectory: string, objectKey: string) => {+ const root = resolve(rootDirectory);+ const target = resolve(root, objectKey);++ if (target !== root && !target.startsWith(`${root}${sep}`)) {+ throw new Error("Invalid resource object key");+ }++ return target;+};++const createLocalBlobStore = (rootDirectory: string): BlobStoreAdapter => ({+ async get(objectKey): Promise<BlobObjectAdapter | null> {+ const target = safeObjectPath(rootDirectory, objectKey);++ try {+ const bytes = await readFile(target);+ return {+ body: new Response(bytes).body as ReadableStream<Uint8Array>,+ size: bytes.byteLength,+ writeHttpMetadata: (headers) => {+ headers.set("Content-Length", String(bytes.byteLength));+ },+ };+ } catch (error) {+ if ((error as NodeJS.ErrnoException).code === "ENOENT") {+ return null;+ }+ throw error;+ }+ },++ async put(objectKey, value) {+ const target = safeObjectPath(rootDirectory, objectKey);+ await mkdir(dirname(target), { recursive: true });++ if (value instanceof Uint8Array) {+ await writeFile(target, value);+ return;+ }++ if (value instanceof ArrayBuffer) {+ await writeFile(target, new Uint8Array(value));+ return;+ }++ if (value instanceof Blob) {+ await writeFile(target, new Uint8Array(await value.arrayBuffer()));+ return;+ }++ throw new Error("Unsupported local resource payload");+ },++ async delete(objectKeys) {+ const keys = Array.isArray(objectKeys) ? objectKeys : [objectKeys];+ await Promise.all(keys.map(async (objectKey) => {+ try {+ await unlink(safeObjectPath(rootDirectory, objectKey));+ } catch (error) {+ if ((error as NodeJS.ErrnoException).code !== "ENOENT") {+ throw error;+ }+ }+ }));+ },+});++/**+ * Creates the first self-hosted adapter: SQLite-compatible database plus a+ * filesystem-backed attachment store. The caller owns SQLite initialization+ * and migration execution so Bun is not imported into the Worker bundle.+ */+export const createSelfHostedStorageAdapter = (+ sqlite: SqliteDatabaseLike,+ resourcesDirectory: string,+): StorageAdapter => ({+ db: new SqliteDatabaseAdapter(sqlite) as unknown as DatabaseAdapter,+ resources: createLocalBlobStore(resourcesDirectory),+});diff --git a/apps/api/src/storage-contract.ts b/apps/api/src/storage-contract.tsnew file mode 100644index 00000000..55ec86a9--- /dev/null+++ b/apps/api/src/storage-contract.ts@@ -0,0 +1,51 @@+/**+ * Platform-neutral storage seams used by the API layer.+ *+ * The current production adapter is Cloudflare D1/R2, so these contracts are+ * intentionally compatible with the Workers runtime types. A future+ * self-hosted adapter can implement the same operations with SQLite and a+ * filesystem or S3-compatible object store without changing route logic.+ */+import type { D1Database, D1PreparedStatement } from "@cloudflare/workers-types";++export type DatabaseAdapter = Pick<D1Database, "prepare" | "batch">;+export type PreparedStatementAdapter = D1PreparedStatement;++/** The subset of an object store response needed by the HTTP resource route. */+export type BlobObjectAdapter = {+ body: ReadableStream<Uint8Array>;+ size: number;+ writeHttpMetadata: (headers: Headers) => void;+};++/**+ * Deliberately uses unknown for provider-specific upload metadata. The API+ * passes through metadata such as content type and cache control, while a+ * self-hosted adapter can map it to filesystem sidecars or S3 metadata.+ */+export type BlobStoreAdapter = {+ get: (key: string) => Promise<BlobObjectAdapter | null>;+ put: (key: string, value: unknown, options?: unknown) => Promise<unknown>;+ delete: (keys: string | string[]) => Promise<void>;+};++/** The complete persistence surface consumed by the API. */+export type StorageAdapter = {+ db: DatabaseAdapter;+ resources: BlobStoreAdapter;+};++/** Cloudflare's native Worker bindings, used only by the platform adapter. */+export type CloudflareStorageBindings = {+ DB: DatabaseAdapter;+ RESOURCES: BlobStoreAdapter;+};++export type StorageAdapterKind = "cloudflare" | "self_hosted";++/** Configuration shared by the future SQLite/filesystem implementation. */+export type SelfHostedStorageConfig = {+ dataDirectory: string;+ databaseFile: string;+ resourcesDirectory: string;+};diff --git a/docs/self-hosting-architecture.md b/docs/self-hosting-architecture.mdnew file mode 100644index 00000000..dd9a7039--- /dev/null+++ b/docs/self-hosting-architecture.md@@ -0,0 +1,67 @@+# Self-hosting and Docker architecture++Docker-based self-hosting is planned for VPS, NAS, and home servers. It is not+available as a supported release yet.++## Current boundary++The API's business and route logic must depend on the storage contracts in+`apps/api/src/storage-contract.ts`, not on a Cloudflare SDK type directly. The+current concrete implementation lives in+`apps/api/src/cloudflare-storage-adapter.ts`:++- `DatabaseAdapter`: SQL statements and batches.+- `BlobStoreAdapter`: attachment `get`, `put`, and `delete` operations.++Cloudflare D1 and R2 remain the production adapter today. This keeps the+existing Worker deployment unchanged while reserving a stable replacement+point for a self-hosted adapter.++The shared self-hosted configuration shape is also defined as+`SelfHostedStorageConfig`, with one application data directory, one SQLite+database file, and one attachment directory.++## Intended Docker shape++The first supported container deployment should be a single application+container with two persistent mounts:++```text+EdgeEver container+├── SQLite database -> /data/edgeever.sqlite+└── attachment store -> /data/resources+```++The initial self-hosted adapter should preserve the existing SQLite schema and+`migrations/*.sql` files. Attachments should be addressed by the same opaque+object keys currently stored in `resources.object_key`; the implementation may+use a local filesystem first and add an S3-compatible backend later.++## Compatibility requirements++- Keep `/api/*`, `/mcp`, `/api/openapi.json`, and `/api/health` unchanged.+- Keep the current migration files append-only; do not fork the schema for+ Docker.+- Store secrets in environment variables or Docker secrets, never in the+ image or a mounted database.+- Make `/data` the only required persistent application path so NAS users can+ back up one volume.+- Support `EDGE_EVER_AUTH_USERNAME`, `EDGE_EVER_AUTH_PASSWORD`, and session+ settings without Cloudflare-specific naming assumptions in the container+ entrypoint.+- Expose a health check that distinguishes process availability from database+ readiness and attachment-store readiness.++This document is an architecture reservation, not a Docker deployment guide.+Until a self-hosted adapter and backup/upgrade procedure are tested, the+Cloudflare deployment remains the only supported production deployment.++An experimental local runtime is available for adapter development:++```sh+bun run build:web+EDGE_EVER_AUTH_PASSWORD='<strong-password>' bun run start:self-hosted+```++Set `EDGE_EVER_DATA_DIR` to the directory that should be persisted by Docker+or a NAS volume. This runtime is not yet a supported release artifact.diff --git a/docs/self-hosting-architecture.zh-CN.md b/docs/self-hosting-architecture.zh-CN.mdnew file mode 100644index 00000000..553b9259--- /dev/null+++ b/docs/self-hosting-architecture.zh-CN.md@@ -0,0 +1,57 @@+# 自托管与 Docker 架构预留++EdgeEver 计划支持 VPS、NAS 和家庭服务器上的 Docker 自托管,但当前版本+还没有提供受支持的 Docker 发行版。++## 当前边界++API 的业务逻辑和路由逻辑应依赖+`apps/api/src/storage-contract.ts` 中的存储契约,而不是直接依赖+Cloudflare SDK 类型。目前的具体实现位于+`apps/api/src/cloudflare-storage-adapter.ts`:++- `DatabaseAdapter`:SQL 语句与批处理。+- `BlobStoreAdapter`:附件的 `get`、`put` 和 `delete` 操作。++目前生产环境仍使用 Cloudflare D1 和 R2,现有 Worker 部署方式不变;未来+自托管适配器可以在这个边界上替换,而不需要整体重写业务层。++共享的自托管配置结构也已定义为 `SelfHostedStorageConfig`,包含统一的应用+数据目录、SQLite 数据库文件和附件目录。++## 计划中的 Docker 形态++第一版正式支持的容器部署应为单容器应用,并挂载两个持久化目录:++```text+EdgeEver 容器+├── SQLite 数据库 -> /data/edgeever.sqlite+└── 附件存储 -> /data/resources+```++自托管适配器应继续复用现有 SQLite 结构和 `migrations/*.sql`;附件继续使用+`resources.object_key` 中保存的不透明对象键,初版可以使用本地文件系统,+后续再增加 S3 兼容存储。++## 兼容性要求++- 保持 `/api/*`、`/mcp`、`/api/openapi.json` 和 `/api/health` 不变。+- 继续追加 `migrations/*.sql`,禁止为 Docker 分叉数据库结构。+- 密钥必须通过环境变量或 Docker secrets 注入,不能写入镜像或数据库挂载卷。+- 将 `/data` 作为唯一必需的应用持久化路径,方便 NAS 用户备份一个卷。+- 容器入口需要支持 `EDGE_EVER_AUTH_USERNAME`、`EDGE_EVER_AUTH_PASSWORD` 和+ 会话配置,同时不能把 Cloudflare 专有配置当作前置条件。+- 健康检查应区分进程可用、数据库就绪和附件存储就绪。++本文档用于预留架构边界,不是 Docker 部署指南。在自托管适配器以及备份、+升级流程经过实际验证前,Cloudflare 部署仍是唯一受支持的生产部署方式。++当前已提供用于开发适配器的实验性本地运行入口:++```sh+bun run build:web+EDGE_EVER_AUTH_PASSWORD='<强密码>' bun run start:self-hosted+```++可通过 `EDGE_EVER_DATA_DIR` 指定需要由 Docker 或 NAS 卷持久化的目录。该入口+目前仍不是正式支持的发行物。diff --git a/package.json b/package.jsonindex 87f2f119..e5a70a08 100644--- a/package.json+++ b/package.json@@ -12,6 +12,8 @@"dev:api": "bun run dev:api:local","dev:local": "bun run db:migrate:local && concurrently -k -n api,web -c cyan,magenta \"bun run dev:api:local\" \"bun run dev:web\"","dev:api:local": "EDGE_EVER_INSTANCE= EDGE_EVER_LOCAL_DEMO_SEED=true bun scripts/run-wrangler.mjs dev --local --port 8787",+ "dev:self-hosted": "bun --watch scripts/self-hosted-server.mjs",+ "start:self-hosted": "bun scripts/self-hosted-server.mjs","dev:remote": "concurrently -k -n api,web -c cyan,magenta \"bun run dev:api:remote\" \"bun run dev:web\"","dev:api:remote": "bun scripts/run-wrangler.mjs dev --remote --port 8787","dev:web": "vite --config apps/web/vite.config.ts --host 127.0.0.1 --port 5173",diff --git a/scripts/self-hosted-server.mjs b/scripts/self-hosted-server.mjsnew file mode 100644index 00000000..ff831298--- /dev/null+++ b/scripts/self-hosted-server.mjs@@ -0,0 +1,112 @@+import { Database } from "bun:sqlite";+import { mkdir, readdir, readFile } from "node:fs/promises";+import { dirname, extname, join, normalize, relative, resolve } from "node:path";+import { fileURLToPath } from "node:url";+import worker from "../apps/api/src/index.ts";+import { createSelfHostedStorageAdapter } from "../apps/api/src/self-hosted-storage-adapter.ts";++const projectRoot = resolve(dirname(fileURLToPath(import.meta.url)), "..");+const dataDirectory = resolve(process.env.EDGE_EVER_DATA_DIR ?? join(projectRoot, ".edgeever-data"));+const databaseFile = resolve(process.env.EDGE_EVER_SQLITE_FILE ?? join(dataDirectory, "edgeever.sqlite"));+const resourcesDirectory = resolve(process.env.EDGE_EVER_RESOURCES_DIR ?? join(dataDirectory, "resources"));+const webDirectory = resolve(process.env.EDGE_EVER_WEB_DIR ?? join(projectRoot, "apps/web/dist"));+const port = Number(process.env.PORT ?? process.env.EDGE_EVER_PORT ?? 8787);++await mkdir(dataDirectory, { recursive: true });+await mkdir(resourcesDirectory, { recursive: true });+const sqlite = new Database(databaseFile, { create: true });+sqlite.exec("PRAGMA foreign_keys = ON; PRAGMA journal_mode = WAL;");++const migrationFiles = (await readdir(join(projectRoot, "migrations")))+ .filter((name) => name.endsWith(".sql"))+ .sort();++sqlite.exec(`+ CREATE TABLE IF NOT EXISTS _edgeever_migrations (+ name TEXT PRIMARY KEY,+ applied_at TEXT NOT NULL+ )+`);++const appliedMigrations = new Set(+ sqlite.query("SELECT name FROM _edgeever_migrations").all().map((row) => row.name),+);++for (const name of migrationFiles) {+ if (appliedMigrations.has(name)) {+ continue;+ }++ const sql = await readFile(join(projectRoot, "migrations", name), "utf8");+ sqlite.transaction(() => {+ sqlite.exec(sql);+ sqlite.query("INSERT INTO _edgeever_migrations (name, applied_at) VALUES (?, ?)").run(name, new Date().toISOString());+ })();+ console.log(`[self-hosted] applied migration ${name}`);+}++const storage = createSelfHostedStorageAdapter(sqlite, resourcesDirectory);+const env = {+ DB: storage.db,+ RESOURCES: storage.resources,+ EDGE_EVER_AUTH_USERNAME: process.env.EDGE_EVER_AUTH_USERNAME ?? "admin",+ EDGE_EVER_RUNTIME: "self-hosted-bun",+ EDGE_EVER_AUTH_PASSWORD: process.env.EDGE_EVER_AUTH_PASSWORD,+ EDGE_EVER_AUTH_PASSWORD_HASH: process.env.EDGE_EVER_AUTH_PASSWORD_HASH,+ EDGE_EVER_SESSION_TTL_DAYS: process.env.EDGE_EVER_SESSION_TTL_DAYS ?? "400",+ EDGE_EVER_DEMO_MODE: process.env.EDGE_EVER_DEMO_MODE,+ EDGE_EVER_ALLOW_UNAUTHENTICATED: process.env.EDGE_EVER_ALLOW_UNAUTHENTICATED,+};++const executionContext = {+ waitUntil: (promise) => Promise.resolve(promise).catch((error) => console.error("[self-hosted] background task failed", error)),+ passThroughOnException: () => undefined,+};++const contentTypes = {+ ".css": "text/css; charset=utf-8",+ ".html": "text/html; charset=utf-8",+ ".js": "text/javascript; charset=utf-8",+ ".json": "application/json; charset=utf-8",+ ".png": "image/png",+ ".svg": "image/svg+xml",+ ".webp": "image/webp",+ ".woff2": "font/woff2",+};++const serveStatic = async (request) => {+ const url = new URL(request.url);+ const requestedPath = normalize(url.pathname === "/" ? "/index.html" : url.pathname);+ const candidate = resolve(webDirectory, `.${requestedPath}`);+ const relativeCandidate = relative(webDirectory, candidate);++ if (relativeCandidate.startsWith("..") || relativeCandidate.includes(".." + "/")) {+ return new Response("Not Found", { status: 404 });+ }++ const file = Bun.file(candidate);+ if (await file.exists()) {+ return new Response(file, {+ headers: { "Content-Type": contentTypes[extname(candidate)] ?? "application/octet-stream" },+ });+ }++ const index = Bun.file(join(webDirectory, "index.html"));+ return (await index.exists())+ ? new Response(index, { headers: { "Content-Type": "text/html; charset=utf-8" } })+ : new Response("Web build not found. Run bun run build:web first.", { status: 503 });+};++const server = Bun.serve({+ port,+ async fetch(request) {+ const pathname = new URL(request.url).pathname;+ if (pathname.startsWith("/api/") || pathname === "/mcp" || pathname.startsWith("/mcp/")) {+ return worker.fetch(request, env, executionContext);+ }+ return serveStatic(request);+ },+});++console.log(`[self-hosted] listening on ${server.url}`);+console.log(`[self-hosted] data directory: ${dataDirectory}`);diff --git a/tests/storage-adapter.test.ts b/tests/storage-adapter.test.tsnew file mode 100644index 00000000..dccc50bf--- /dev/null+++ b/tests/storage-adapter.test.ts@@ -0,0 +1,53 @@+import { describe, expect, test } from "bun:test";+import { mkdtemp, readFile, rm } from "node:fs/promises";+import { tmpdir } from "node:os";+import { createCloudflareStorageAdapter } from "../apps/api/src/cloudflare-storage-adapter";+import { createSelfHostedStorageAdapter } from "../apps/api/src/self-hosted-storage-adapter";++describe("storage adapter", () => {+ test("wraps Cloudflare bindings without changing their identity", () => {+ const db = { prepare: () => undefined, batch: () => undefined };+ const resources = { get: async () => null, put: async () => undefined, delete: async () => undefined };+ const adapter = createCloudflareStorageAdapter({ DB: db, RESOURCES: resources } as never);++ expect(adapter.db).toBe(db);+ expect(adapter.resources).toBe(resources);+ });++ test("stores attachments in a persistent filesystem directory", async () => {+ const directory = await mkdtemp(`${tmpdir()}/edgeever-storage-`);+ const sqlite = {+ query: () => ({ all: () => [], get: () => null, run: () => undefined }),+ transaction: (callback: () => void) => () => callback(),+ };++ try {+ const adapter = createSelfHostedStorageAdapter(sqlite, directory);+ await adapter.resources.put("workspace/memo/image.bin", new Uint8Array([1, 2, 3]));++ expect(await readFile(`${directory}/workspace/memo/image.bin`)).toEqual(new Uint8Array([1, 2, 3]));+ expect(await adapter.resources.get("workspace/memo/image.bin")).not.toBeNull();+ await adapter.resources.delete("workspace/memo/image.bin");+ expect(await adapter.resources.get("workspace/memo/image.bin")).toBeNull();+ } finally {+ await rm(directory, { recursive: true, force: true });+ }+ });++ test("rejects attachment path traversal", async () => {+ const directory = await mkdtemp(`${tmpdir()}/edgeever-storage-`);+ const sqlite = {+ query: () => ({ all: () => [], get: () => null, run: () => undefined }),+ transaction: (callback: () => void) => () => callback(),+ };++ try {+ const adapter = createSelfHostedStorageAdapter(sqlite, directory);+ await expect(adapter.resources.put("../outside", new Uint8Array([1]))).rejects.toThrow(+ "Invalid resource object key",+ );+ } finally {+ await rm(directory, { recursive: true, force: true });+ }+ });+});