Monorepo restructure: add DS app, migrate web to workspaces, and integrate signed DS storage for backups/shares

.gitignore

@@ -15,6 +15,8 @@
 
 # next.js
 /.next/
+/apps/web/.next/
+/apps/ds/.next/
 /out/
 
 # production
@@ -44,4 +46,4 @@ next-env.d.ts
 .turbo
 
 # generated locale map
-/lib/locales.ts
+/packages/i18n/src/locales.ts

README.md

@@ -3,9 +3,9 @@
 > A privacy-first, weekly-focused open-source calendar built for clarity and control.
 
 <picture>
-  <source media="(prefers-color-scheme: dark)" srcset="/public/Banner-dark.jpg">
-  <source media="(prefers-color-scheme: light)" srcset="/public/Banner.jpg">
-  <img src="/public/Banner.jpg" alt="Image">
+  <source media="(prefers-color-scheme: dark)" srcset="./apps/web/public/Banner-dark.jpg">
+  <source media="(prefers-color-scheme: light)" srcset="./apps/web/public/Banner.jpg">
+  <img src="./apps/web/public/Banner.jpg" alt="Image">
 </picture>
 
 - [Live Product](https://calendar.xyehr.cn)
@@ -96,6 +96,34 @@ This project is built for individuals and small teams who value clarity over com
 
 ## Getting Started
 
+## Monorepo Structure
+
+This repository uses a standard **Turborepo** layout:
+
+- `apps/web`: Next.js application
+- `apps/ds`: decentralized storage server (Next.js API + PostgreSQL)
+- `packages/config`: shared ts/postcss/tailwind config
+- `packages/ui`: shared shadcn ui components
+- `packages/i18n`: locales + i18n runtime helpers
+- `turbo.json`: task pipeline and cache settings
+
+Useful commands:
+
+```bash
+# run the web app through Turbo
+bun run dev
+
+# run decentralized storage server
+bun run dev:ds
+
+# build all workspaces
+bun run build
+
+# run a task only for web
+bun run generate:locales
+```
+
+
 ### Prerequisites
 
 Required Versions:
@@ -115,13 +143,15 @@ bun install
 
 # Start the app
 bun run dev
+# or run directly in the web workspace
+bun run --cwd apps/web dev
 ```
 
 Then visit `http://localhost:3000`
 
 ### Environment Variables
 
-Copy `.env.example` to `.env` and fill in.
+Copy `apps/web/.env.example` to `apps/web/.env` and fill in.
 
 Key variables:
 

apps/ds/app/api/blob/route.ts

@@ -0,0 +1,75 @@
+import { NextResponse } from "next/server";
+import { ensureTables, pool } from "@/lib/db";
+import { requireSignedRequest } from "@/lib/signature";
+
+function statusForError(error: unknown) {
+  const message = error instanceof Error ? error.message : "Unknown error";
+  if (
+    message.includes("Missing signature headers") ||
+    message.includes("Expired timestamp") ||
+    message.includes("Invalid signature") ||
+    message.includes("Failed to resolve DID") ||
+    message.includes("Missing DID public key")
+  ) {
+    return 401;
+  }
+  return 500;
+}
+
+export async function GET(request: Request) {
+  try {
+    await ensureTables();
+    const { did } = await requireSignedRequest(request);
+    const result = await pool.query(
+      "SELECT encrypted_data, iv, timestamp FROM calendar_backups WHERE user_id = $1 LIMIT 1",
+      [did],
+    );
+    return NextResponse.json({ data: result.rows[0] ?? null });
+  } catch (error) {
+    return NextResponse.json(
+      { error: (error as Error).message },
+      { status: statusForError(error) },
+    );
+  }
+}
+
+export async function POST(request: Request) {
+  const raw = await request.text();
+  try {
+    await ensureTables();
+    const { did } = await requireSignedRequest(request, raw);
+    const payload = JSON.parse(raw) as {
+      encrypted_data: string;
+      iv: string;
+      timestamp?: number;
+    };
+
+    await pool.query(
+      `INSERT INTO calendar_backups (user_id, encrypted_data, iv, timestamp)
+       VALUES ($1, $2, $3, $4)
+       ON CONFLICT (user_id) DO UPDATE SET encrypted_data = EXCLUDED.encrypted_data, iv = EXCLUDED.iv, timestamp = EXCLUDED.timestamp, updated_at = NOW()`,
+      [did, payload.encrypted_data, payload.iv, payload.timestamp ?? Date.now()],
+    );
+
+    return NextResponse.json({ success: true });
+  } catch (error) {
+    return NextResponse.json(
+      { error: (error as Error).message },
+      { status: statusForError(error) },
+    );
+  }
+}
+
+export async function DELETE(request: Request) {
+  try {
+    await ensureTables();
+    const { did } = await requireSignedRequest(request);
+    await pool.query("DELETE FROM calendar_backups WHERE user_id = $1", [did]);
+    return NextResponse.json({ success: true });
+  } catch (error) {
+    return NextResponse.json(
+      { error: (error as Error).message },
+      { status: statusForError(error) },
+    );
+  }
+}

apps/ds/app/api/migrate/cleanup/route.ts

@@ -0,0 +1,24 @@
+import { NextResponse } from "next/server";
+import { ensureTables, pool } from "@/lib/db";
+import { requireSignedRequest } from "@/lib/signature";
+
+export async function POST(request: Request) {
+  const raw = await request.text();
+  const client = await pool.connect();
+  try {
+    await ensureTables();
+    const { did } = await requireSignedRequest(request, raw);
+
+    await client.query("BEGIN");
+    await client.query("DELETE FROM shares WHERE user_id = $1", [did]);
+    await client.query("DELETE FROM calendar_backups WHERE user_id = $1", [did]);
+    await client.query("COMMIT");
+
+    return NextResponse.json({ success: true });
+  } catch (error) {
+    await client.query("ROLLBACK");
+    return NextResponse.json({ error: (error as Error).message }, { status: 401 });
+  } finally {
+    client.release();
+  }
+}

apps/ds/app/api/migrate/export/route.ts

@@ -0,0 +1,19 @@
+import { NextResponse } from "next/server";
+import { ensureTables, pool } from "@/lib/db";
+import { requireSignedRequest } from "@/lib/signature";
+
+export async function POST(request: Request) {
+  const raw = await request.text();
+  try {
+    await ensureTables();
+    const { did } = await requireSignedRequest(request, raw);
+    const [backups, shares] = await Promise.all([
+      pool.query("SELECT encrypted_data, iv, timestamp FROM calendar_backups WHERE user_id = $1", [did]),
+      pool.query("SELECT share_id, data, timestamp FROM shares WHERE user_id = $1", [did]),
+    ]);
+
+    return NextResponse.json({ did, backups: backups.rows, shares: shares.rows });
+  } catch (error) {
+    return NextResponse.json({ error: (error as Error).message }, { status: 401 });
+  }
+}

apps/ds/app/api/migrate/import/route.ts

@@ -0,0 +1,42 @@
+import { NextResponse } from "next/server";
+import { ensureTables, pool } from "@/lib/db";
+import { requireSignedRequest } from "@/lib/signature";
+
+export async function POST(request: Request) {
+  const raw = await request.text();
+  const client = await pool.connect();
+  try {
+    await ensureTables();
+    const { did } = await requireSignedRequest(request, raw);
+    const payload = JSON.parse(raw) as {
+      backups: Array<{ encrypted_data: string; iv: string; timestamp: number }>;
+      shares: Array<{ share_id: string; data: string; timestamp: number }>;
+    };
+
+    await client.query("BEGIN");
+    await client.query("DELETE FROM calendar_backups WHERE user_id = $1", [did]);
+    await client.query("DELETE FROM shares WHERE user_id = $1", [did]);
+
+    for (const row of payload.backups || []) {
+      await client.query(
+        "INSERT INTO calendar_backups (user_id, encrypted_data, iv, timestamp) VALUES ($1, $2, $3, $4)",
+        [did, row.encrypted_data, row.iv, row.timestamp],
+      );
+    }
+
+    for (const row of payload.shares || []) {
+      await client.query(
+        "INSERT INTO shares (user_id, share_id, data, timestamp) VALUES ($1, $2, $3, $4)",
+        [did, row.share_id, row.data, row.timestamp],
+      );
+    }
+
+    await client.query("COMMIT");
+    return NextResponse.json({ success: true });
+  } catch (error) {
+    await client.query("ROLLBACK");
+    return NextResponse.json({ error: (error as Error).message }, { status: 401 });
+  } finally {
+    client.release();
+  }
+}

apps/ds/app/api/share/[shareId]/route.ts

@@ -0,0 +1,16 @@
+import { NextResponse } from "next/server";
+import { ensureTables, pool } from "@/lib/db";
+
+export async function GET(request: Request, { params }: { params: Promise<{ shareId: string }> }) {
+  void request;
+  await ensureTables();
+  const { shareId } = await params;
+  const result = await pool.query(
+    "SELECT user_id, share_id, data, timestamp FROM shares WHERE share_id = $1 LIMIT 1",
+    [shareId],
+  );
+  if (result.rowCount === 0) {
+    return NextResponse.json({ error: "Not found" }, { status: 404 });
+  }
+  return NextResponse.json({ share: result.rows[0] });
+}