@jant/core 0.3.36 → 0.3.37

package/src/routes/api/__tests__/upload-multipart.test.ts

@@ -0,0 +1,534 @@
+import { describe, it, expect, beforeEach } from "vitest";
+import { Hono } from "hono";
+import type { Bindings } from "../../../types.js";
+import type { AppVariables } from "../../../types/app-context.js";
+import { createTestDatabase } from "../../../__tests__/helpers/db.js";
+import { createMediaService } from "../../../services/media.js";
+import { createSettingsService } from "../../../services/settings.js";
+import { createPostService } from "../../../services/post.js";
+import { createPathService } from "../../../services/path.js";
+import { createCustomUrlService } from "../../../services/custom-url.js";
+import { createCollectionService } from "../../../services/collection.js";
+import { createSearchService } from "../../../services/search.js";
+import { createNavItemService } from "../../../services/navigation.js";
+import { createAuthService } from "../../../services/auth.js";
+import { errorHandler } from "../../../middleware/error-handler.js";
+import { createI18n } from "../../../i18n/i18n.js";
+import { resolveConfig } from "../../../lib/resolve-config.js";
+import type { Database } from "../../../db/index.js";
+import type { StorageDriver, UploadedPart } from "../../../lib/storage.js";
+import { multipartUploadApiRoutes } from "../upload-multipart.js";
+import type BetterSqlite3 from "better-sqlite3";
+
+type Env = { Bindings: Bindings; Variables: AppVariables };
+
+/** Creates a mock storage driver that supports multipart uploads */
+function createMockMultipartStorage(): StorageDriver & {
+  uploads: Map<string, { key: string; parts: Map<number, ArrayBuffer> }>;
+  completed: Map<string, UploadedPart[]>;
+  aborted: Set<string>;
+  files: Map<string, { body: Uint8Array; contentType?: string }>;
+} {
+  const uploads = new Map<
+    string,
+    { key: string; parts: Map<number, ArrayBuffer> }
+  >();
+  const completed = new Map<string, UploadedPart[]>();
+  const aborted = new Set<string>();
+  const files = new Map<string, { body: Uint8Array; contentType?: string }>();
+  let uploadCounter = 0;
+
+  return {
+    uploads,
+    completed,
+    aborted,
+    files,
+
+    async put(key, body, opts) {
+      let bytes: Uint8Array;
+      if (body instanceof Uint8Array) {
+        bytes = body;
+      } else {
+        const reader = body.getReader();
+        const chunks: Uint8Array[] = [];
+        for (;;) {
+          const { done, value } = await reader.read();
+          if (done) break;
+          chunks.push(value);
+        }
+        let totalLength = 0;
+        for (const chunk of chunks) totalLength += chunk.length;
+        bytes = new Uint8Array(totalLength);
+        let offset = 0;
+        for (const chunk of chunks) {
+          bytes.set(chunk, offset);
+          offset += chunk.length;
+        }
+      }
+      files.set(key, { body: bytes, contentType: opts?.contentType });
+    },
+
+    async get(key) {
+      const file = files.get(key);
+      if (!file) return null;
+      const stream = new ReadableStream({
+        start(controller) {
+          controller.enqueue(file.body);
+          controller.close();
+        },
+      });
+      return { body: stream, contentType: file.contentType };
+    },
+
+    async delete(key) {
+      files.delete(key);
+    },
+
+    async createMultipartUpload(key, _opts) {
+      const uploadId = `upload-${++uploadCounter}`;
+      uploads.set(uploadId, { key, parts: new Map() });
+      return { uploadId, key };
+    },
+
+    async uploadPart(key, uploadId, partNumber, body) {
+      const upload = uploads.get(uploadId);
+      if (!upload) throw new Error(`No upload with id ${uploadId}`);
+      const buffer =
+        body instanceof ArrayBuffer
+          ? body
+          : body instanceof Uint8Array
+            ? body.buffer.slice(
+                body.byteOffset,
+                body.byteOffset + body.byteLength,
+              )
+            : await new Response(body as ReadableStream).arrayBuffer();
+      upload.parts.set(partNumber, buffer);
+      const etag = `etag-${key}-${partNumber}`;
+      return { partNumber, etag };
+    },
+
+    async completeMultipartUpload(_key, uploadId, parts) {
+      completed.set(uploadId, parts);
+      uploads.delete(uploadId);
+    },
+
+    async abortMultipartUpload(_key, uploadId) {
+      aborted.add(uploadId);
+      uploads.delete(uploadId);
+    },
+  };
+}
+
+function createMockD1(sqliteDb: BetterSqlite3.Database) {
+  return {
+    prepare(query: string) {
+      return {
+        bind(...params: unknown[]) {
+          return {
+            async all<T>() {
+              const stmt = sqliteDb.prepare(query);
+              const rows = stmt.all(...(params as never[])) as T[];
+              return { results: rows };
+            },
+          };
+        },
+      };
+    },
+  } as unknown as D1Database;
+}
+
+function createTestAppWithStorage(options: {
+  authenticated?: boolean;
+  storage: StorageDriver | null;
+}) {
+  const testDb = createTestDatabase();
+  const db = testDb.db as unknown as Database;
+  const sqlite = testDb.sqlite;
+  const mockD1 = createMockD1(sqlite);
+
+  const settingsService = createSettingsService(db);
+  const pathService = createPathService(db);
+  const services = {
+    paths: pathService,
+    posts: createPostService(db, { slugIdLength: 5 }, pathService),
+    settings: settingsService,
+    customUrls: createCustomUrlService(db, pathService),
+    media: createMediaService(db),
+    collections: createCollectionService(db, pathService),
+    search: createSearchService(mockD1),
+    navItems: createNavItemService(db),
+    auth: createAuthService(db, settingsService),
+  };
+
+  const app = new Hono<Env>();
+  app.onError(errorHandler);
+
+  app.use("*", async (c, next) => {
+    c.env = {
+      SITE_URL: "http://localhost:9020",
+    } as AppVariables["services"] extends never ? never : Bindings;
+
+    c.set("services", services as AppVariables["services"]);
+    const allSettings = await services.settings.getAll();
+    c.set("allSettings", allSettings);
+    c.set("appConfig", resolveConfig(c.env, allSettings));
+    c.set("storage", options.storage);
+
+    const i18n = createI18n("en");
+    c.set("lang", "en");
+    c.set("i18n", i18n);
+
+    if (options.authenticated) {
+      c.set("auth", {
+        api: {
+          getSession: async () => ({
+            user: { id: "test-user", email: "test@test.com", name: "Test" },
+            session: { id: "test-session" },
+          }),
+        },
+      } as AppVariables["auth"]);
+    } else {
+      c.set("auth", {
+        api: {
+          getSession: async () => null,
+        },
+      } as AppVariables["auth"]);
+    }
+
+    await next();
+  });
+
+  return { app, services, db, sqlite };
+}
+
+describe("multipart upload API routes", () => {
+  describe("auth", () => {
+    it("returns 401 when not authenticated", async () => {
+      const { app } = createTestAppWithStorage({
+        authenticated: false,
+        storage: createMockMultipartStorage(),
+      });
+      app.route("/api/upload/multipart", multipartUploadApiRoutes);
+
+      const res = await app.request("/api/upload/multipart", {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({
+          filename: "test.mp4",
+          contentType: "video/mp4",
+          size: 100_000_000,
+        }),
+      });
+
+      expect(res.status).toBe(401);
+    });
+  });
+
+  describe("storage support", () => {
+    it("returns 500 when storage is null", async () => {
+      const { app } = createTestAppWithStorage({
+        authenticated: true,
+        storage: null,
+      });
+      app.route("/api/upload/multipart", multipartUploadApiRoutes);
+
+      const res = await app.request("/api/upload/multipart", {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({
+          filename: "test.mp4",
+          contentType: "video/mp4",
+          size: 100_000_000,
+        }),
+      });
+
+      expect(res.status).toBe(500);
+      const data = await res.json();
+      expect(data.error).toContain("multipart");
+    });
+
+    it("returns 500 when storage lacks multipart methods", async () => {
+      const basicStorage: StorageDriver = {
+        async put() {},
+        async get() {
+          return null;
+        },
+        async delete() {},
+      };
+      const { app } = createTestAppWithStorage({
+        authenticated: true,
+        storage: basicStorage,
+      });
+      app.route("/api/upload/multipart", multipartUploadApiRoutes);
+
+      const res = await app.request("/api/upload/multipart", {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({
+          filename: "test.mp4",
+          contentType: "video/mp4",
+          size: 100_000_000,
+        }),
+      });
+
+      expect(res.status).toBe(500);
+    });
+  });
+
+  describe("initiate", () => {
+    it("accepts any file type", async () => {
+      const { app } = createTestAppWithStorage({
+        authenticated: true,
+        storage: createMockMultipartStorage(),
+      });
+      app.route("/api/upload/multipart", multipartUploadApiRoutes);
+
+      const res = await app.request("/api/upload/multipart", {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({
+          filename: "file.exe",
+          contentType: "application/x-msdownload",
+          size: 100_000_000,
+        }),
+      });
+
+      expect(res.status).toBe(200);
+    });
+
+    it("returns id, uploadId, storageKey, filename on success", async () => {
+      const { app } = createTestAppWithStorage({
+        authenticated: true,
+        storage: createMockMultipartStorage(),
+      });
+      app.route("/api/upload/multipart", multipartUploadApiRoutes);
+
+      const res = await app.request("/api/upload/multipart", {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({
+          filename: "big-video.mp4",
+          contentType: "video/mp4",
+          size: 100_000_000,
+        }),
+      });
+
+      expect(res.status).toBe(200);
+      const data = await res.json();
+      expect(data.id).toBeDefined();
+      expect(data.uploadId).toBeDefined();
+      expect(data.storageKey).toContain("media/");
+      expect(data.filename).toBeDefined();
+      expect(data.originalName).toBe("big-video.mp4");
+    });
+  });
+
+  describe("full flow", () => {
+    let app: ReturnType<typeof createTestAppWithStorage>["app"];
+    let services: ReturnType<typeof createTestAppWithStorage>["services"];
+    let storage: ReturnType<typeof createMockMultipartStorage>;
+
+    beforeEach(() => {
+      storage = createMockMultipartStorage();
+      const result = createTestAppWithStorage({
+        authenticated: true,
+        storage,
+      });
+      app = result.app;
+      services = result.services;
+      app.route("/api/upload/multipart", multipartUploadApiRoutes);
+    });
+
+    it("initiate → upload part → complete creates a DB record", async () => {
+      // Initiate
+      const initRes = await app.request("/api/upload/multipart", {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({
+          filename: "large-file.mp4",
+          contentType: "video/mp4",
+          size: 100_000_000,
+        }),
+      });
+      expect(initRes.status).toBe(200);
+      const { id, uploadId, storageKey, filename, originalName } =
+        (await initRes.json()) as {
+          id: string;
+          uploadId: string;
+          storageKey: string;
+          filename: string;
+          originalName: string;
+        };
+
+      // Upload a part
+      const partBody = new Uint8Array(1024).fill(0xaa);
+      const partRes = await app.request(
+        `/api/upload/multipart/${id}/part?partNumber=1&storageKey=${encodeURIComponent(storageKey)}&uploadId=${encodeURIComponent(uploadId)}`,
+        {
+          method: "PUT",
+          body: partBody,
+        },
+      );
+      expect(partRes.status).toBe(200);
+      const partData = (await partRes.json()) as {
+        partNumber: number;
+        etag: string;
+      };
+      expect(partData.partNumber).toBe(1);
+      expect(partData.etag).toBeDefined();
+
+      // Complete
+      const completeRes = await app.request(
+        `/api/upload/multipart/${id}/complete`,
+        {
+          method: "POST",
+          headers: { "Content-Type": "application/json" },
+          body: JSON.stringify({
+            storageKey,
+            uploadId,
+            parts: [{ partNumber: partData.partNumber, etag: partData.etag }],
+            filename,
+            originalName,
+            contentType: "video/mp4",
+            size: 100_000_000,
+            width: 1920,
+            height: 1080,
+          }),
+        },
+      );
+      expect(completeRes.status).toBe(200);
+      const result = (await completeRes.json()) as {
+        id: string;
+        filename: string;
+        mimeType: string;
+        size: number;
+      };
+      expect(result.id).toBe(id);
+      expect(result.mimeType).toBe("video/mp4");
+      expect(result.size).toBe(100_000_000);
+
+      // Verify DB record
+      const media = await services.media.getById(id);
+      expect(media).toMatchObject({
+        mimeType: "video/mp4",
+        width: 1920,
+        height: 1080,
+      });
+    });
+
+    it("abort cleans up R2", async () => {
+      // Initiate
+      const initRes = await app.request("/api/upload/multipart", {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({
+          filename: "cancelled.mp4",
+          contentType: "video/mp4",
+          size: 200_000_000,
+        }),
+      });
+      const { uploadId, storageKey } = (await initRes.json()) as {
+        id: string;
+        uploadId: string;
+        storageKey: string;
+      };
+
+      // Abort
+      const abortRes = await app.request(`/api/upload/multipart/unused/abort`, {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({ storageKey, uploadId }),
+      });
+      expect(abortRes.status).toBe(200);
+
+      // Verify R2 abort was called
+      expect(storage.aborted.size).toBe(1);
+    });
+
+    it("returns 400 for part upload with missing storageKey/uploadId", async () => {
+      const res = await app.request(
+        "/api/upload/multipart/some-id/part?partNumber=1",
+        {
+          method: "PUT",
+          body: new Uint8Array(10),
+        },
+      );
+      expect(res.status).toBe(400);
+    });
+
+    it("poster upload returns posterKey", async () => {
+      // Initiate
+      const initRes = await app.request("/api/upload/multipart", {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({
+          filename: "video-with-poster.mp4",
+          contentType: "video/mp4",
+          size: 100_000_000,
+        }),
+      });
+      const { id, uploadId, storageKey, filename, originalName } =
+        (await initRes.json()) as {
+          id: string;
+          uploadId: string;
+          storageKey: string;
+          filename: string;
+          originalName: string;
+        };
+
+      // Upload poster
+      const posterBlob = new Blob([new Uint8Array(100)], {
+        type: "image/webp",
+      });
+      const formData = new FormData();
+      formData.append("poster", posterBlob, "poster.webp");
+
+      const posterRes = await app.request(
+        `/api/upload/multipart/${id}/poster`,
+        {
+          method: "PUT",
+          body: formData,
+        },
+      );
+      expect(posterRes.status).toBe(200);
+      const posterData = (await posterRes.json()) as { posterKey: string };
+      expect(posterData.posterKey).toContain("poster.webp");
+
+      // Verify poster was stored
+      expect(storage.files.has(posterData.posterKey)).toBe(true);
+
+      // Upload a part and complete to verify posterKey is in the DB record
+      const partRes = await app.request(
+        `/api/upload/multipart/${id}/part?partNumber=1&storageKey=${encodeURIComponent(storageKey)}&uploadId=${encodeURIComponent(uploadId)}`,
+        {
+          method: "PUT",
+          body: new Uint8Array(1024),
+        },
+      );
+      const partData = (await partRes.json()) as {
+        partNumber: number;
+        etag: string;
+      };
+
+      await app.request(`/api/upload/multipart/${id}/complete`, {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({
+          storageKey,
+          uploadId,
+          parts: [{ partNumber: partData.partNumber, etag: partData.etag }],
+          filename,
+          originalName,
+          contentType: "video/mp4",
+          size: 100_000_000,
+          posterKey: posterData.posterKey,
+        }),
+      });
+
+      const media = await services.media.getById(id);
+      expect(media).not.toBeNull();
+      expect(media).toHaveProperty("posterKey");
+      expect(String(media?.posterKey)).toContain("poster.webp");
+    });
+  });
+});

package/src/routes/api/collections.ts

@@ -12,7 +12,7 @@ import {
   SortOrderSchema,
   parseValidated,
 } from "../../lib/schemas.js";
-import { assertFound, parseIntParam, NotFoundError } from "../../lib/errors.js";
+import { assertFound, parseIdParam, NotFoundError } from "../../lib/errors.js";
 
 type Env = { Bindings: Bindings; Variables: AppVariables };
 
@@ -23,24 +23,22 @@ const UpdateCollectionSchema = CreateCollectionSchema.partial().extend({
   description: z.string().nullable().optional(),
   icon: z.string().nullable().optional(),
   sortOrder: SortOrderSchema.optional(),
-  position: z.number().int().min(0).optional(),
 });
 
-// Route-specific schemas (not shared domain schemas)
-const CollectionReorderSchema = z.object({
-  ids: z.array(z.number().int().positive()).optional(),
-  items: z.array(z.string().regex(/^[cd]-\d+$/)).optional(),
+const PostAssignSchema = z.object({
+  postId: z.string().min(1),
 });
 
-const PostAssignSchema = z.object({
-  postId: z.number().int().positive(),
+const MoveSchema = z.object({
+  after: z.string().nullable().optional(),
+  before: z.string().nullable().optional(),
 });
 
-// List collections (includes post counts and dividers)
+// List collections (includes post counts and sidebar items)
 collectionsApiRoutes.get("/", async (c) => {
-  const [collections, dividers, postCounts] = await Promise.all([
+  const [collections, sidebarItems, postCounts] = await Promise.all([
     c.var.services.collections.list(),
-    c.var.services.collections.listDividers(),
+    c.var.services.collections.listSidebarItems(),
     c.var.services.collections.getPostCounts(),
   ]);
 
@@ -49,26 +47,51 @@ collectionsApiRoutes.get("/", async (c) => {
       ...col,
       postCount: postCounts.get(col.id) ?? 0,
     })),
-    dividers,
+    sidebarItems,
   });
 });
 
-// Create divider (requires auth) — must be before /:id
-collectionsApiRoutes.post("/dividers", requireAuthApi(), async (c) => {
-  const divider = await c.var.services.collections.createDivider();
-  return c.json(divider, 201);
+// Create sidebar item (divider) — must be before /:id
+collectionsApiRoutes.post("/sidebar-items", requireAuthApi(), async (c) => {
+  const item = await c.var.services.collections.createSidebarItem("divider");
+  return c.json(item, 201);
 });
 
-// Delete divider (requires auth) — must be before /:id
-collectionsApiRoutes.delete("/dividers/:id", requireAuthApi(), async (c) => {
-  const id = parseIntParam(c.req.param("id"));
-  await c.var.services.collections.deleteDivider(id);
-  return c.json({ success: true });
-});
+// Move sidebar item — must be before /:id
+collectionsApiRoutes.put(
+  "/sidebar-items/:id/move",
+  requireAuthApi(),
+  async (c) => {
+    const id = parseIdParam(c.req.param("id"));
+    const body = parseValidated(MoveSchema, await c.req.json());
+
+    const item = assertFound(
+      await c.var.services.collections.moveSidebarItem(
+        id,
+        body.after ?? null,
+        body.before ?? null,
+      ),
+      "Sidebar item",
+    );
+
+    return c.json(item);
+  },
+);
+
+// Delete sidebar item — must be before /:id
+collectionsApiRoutes.delete(
+  "/sidebar-items/:id",
+  requireAuthApi(),
+  async (c) => {
+    const id = parseIdParam(c.req.param("id"));
+    await c.var.services.collections.deleteSidebarItem(id);
+    return c.json({ success: true });
+  },
+);
 
 // Get single collection
 collectionsApiRoutes.get("/:id", async (c) => {
-  const id = parseIntParam(c.req.param("id"));
+  const id = parseIdParam(c.req.param("id"));
   const collection = assertFound(
     await c.var.services.collections.getById(id),
     "Collection",
@@ -76,19 +99,6 @@ collectionsApiRoutes.get("/:id", async (c) => {
   return c.json(collection);
 });
 
-// Reorder collections (requires auth) — must be before /:id
-collectionsApiRoutes.put("/reorder", requireAuthApi(), async (c) => {
-  const body = parseValidated(CollectionReorderSchema, await c.req.json());
-
-  if (body.items) {
-    await c.var.services.collections.reorderAll(body.items);
-  } else if (body.ids) {
-    await c.var.services.collections.reorder(body.ids);
-  }
-  const collections = await c.var.services.collections.list();
-  return c.json({ collections });
-});
-
 // Create collection (requires auth)
 collectionsApiRoutes.post("/", requireAuthApi(), async (c) => {
   const body = parseValidated(CreateCollectionSchema, await c.req.json());
@@ -99,7 +109,6 @@ collectionsApiRoutes.post("/", requireAuthApi(), async (c) => {
     description: body.description,
     icon: body.icon,
     sortOrder: body.sortOrder as SortOrder | undefined,
-    position: body.position,
   });
 
   return c.json(collection, 201);
@@ -107,7 +116,7 @@ collectionsApiRoutes.post("/", requireAuthApi(), async (c) => {
 
 // Update collection (requires auth)
 collectionsApiRoutes.put("/:id", requireAuthApi(), async (c) => {
-  const id = parseIntParam(c.req.param("id"));
+  const id = parseIdParam(c.req.param("id"));
   const body = parseValidated(UpdateCollectionSchema, await c.req.json());
 
   const collection = assertFound(
@@ -120,7 +129,7 @@ collectionsApiRoutes.put("/:id", requireAuthApi(), async (c) => {
 
 // Delete collection (requires auth)
 collectionsApiRoutes.delete("/:id", requireAuthApi(), async (c) => {
-  const id = parseIntParam(c.req.param("id"));
+  const id = parseIdParam(c.req.param("id"));
 
   const success = await c.var.services.collections.delete(id);
   if (!success) throw new NotFoundError("Collection");
@@ -130,7 +139,7 @@ collectionsApiRoutes.delete("/:id", requireAuthApi(), async (c) => {
 
 // Add a post to a collection (requires auth)
 collectionsApiRoutes.post("/:id/posts", requireAuthApi(), async (c) => {
-  const id = parseIntParam(c.req.param("id"));
+  const id = parseIdParam(c.req.param("id"));
   assertFound(await c.var.services.collections.getById(id), "Collection");
 
   const body = parseValidated(PostAssignSchema, await c.req.json());
@@ -146,8 +155,8 @@ collectionsApiRoutes.delete(
   "/:id/posts/:postId",
   requireAuthApi(),
   async (c) => {
-    const id = parseIntParam(c.req.param("id"));
-    const postId = parseIntParam(c.req.param("postId"));
+    const id = parseIdParam(c.req.param("id"));
+    const postId = parseIdParam(c.req.param("postId"));
 
     await c.var.services.collections.removePost(id, postId);