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 inline PDF preview workflow
tianma-ifd6a39addf2c7
diff --git a/apps/api/src/byte-range.test.mjs b/apps/api/src/byte-range.test.mjsnew file mode 100644index 00000000..f4b5f6ce--- /dev/null+++ b/apps/api/src/byte-range.test.mjs@@ -0,0 +1,27 @@+import { describe, expect, test } from "bun:test";+import { parseByteRange } from "./byte-range.ts";++describe("HTTP byte range parsing", () => {+ test("supports bounded, open-ended, and suffix ranges", () => {+ expect(parseByteRange("bytes=2-5", 10)).toEqual({+ kind: "range",+ range: { offset: 2, length: 4 },+ end: 5,+ });+ expect(parseByteRange("bytes=7-", 10)).toMatchObject({+ kind: "range",+ range: { offset: 7, length: 3 },+ });+ expect(parseByteRange("bytes=-4", 10)).toMatchObject({+ kind: "range",+ range: { offset: 6, length: 4 },+ });+ });++ test("rejects malformed, multipart, and unsatisfiable ranges", () => {+ expect(parseByteRange("items=0-1", 10)).toEqual({ kind: "invalid" });+ expect(parseByteRange("bytes=0-1,4-5", 10)).toEqual({ kind: "invalid" });+ expect(parseByteRange("bytes=10-", 10)).toEqual({ kind: "invalid" });+ expect(parseByteRange("bytes=8-2", 10)).toEqual({ kind: "invalid" });+ });+});diff --git a/apps/api/src/byte-range.ts b/apps/api/src/byte-range.tsnew file mode 100644index 00000000..b4725f89--- /dev/null+++ b/apps/api/src/byte-range.ts@@ -0,0 +1,46 @@+import type { BlobRange } from "./storage-contract";++export type ByteRangeResult =+ | { kind: "none" }+ | { kind: "invalid" }+ | { kind: "range"; range: BlobRange; end: number };++/** Parses one RFC 9110 byte range. Multipart ranges are intentionally unsupported. */+export const parseByteRange = (header: string | undefined, totalSize: number): ByteRangeResult => {+ if (!header) return { kind: "none" };+ if (!Number.isSafeInteger(totalSize) || totalSize <= 0) return { kind: "invalid" };++ const match = /^bytes=(\d*)-(\d*)$/i.exec(header.trim());+ if (!match || (!match[1] && !match[2])) return { kind: "invalid" };++ if (!match[1]) {+ const suffixLength = Number(match[2]);+ if (!Number.isSafeInteger(suffixLength) || suffixLength <= 0) return { kind: "invalid" };+ const length = Math.min(suffixLength, totalSize);+ const offset = totalSize - length;+ return { kind: "range", range: { offset, length }, end: totalSize - 1 };+ }++ const offset = Number(match[1]);+ const requestedEnd = match[2] ? Number(match[2]) : totalSize - 1;+ if (+ !Number.isSafeInteger(offset)+ || !Number.isSafeInteger(requestedEnd)+ || offset < 0+ || requestedEnd < offset+ || offset >= totalSize+ ) {+ return { kind: "invalid" };+ }++ const end = Math.min(requestedEnd, totalSize - 1);+ return { kind: "range", range: { offset, length: end - offset + 1 }, end };+};++export const rangeNotSatisfiable = (totalSize: number) => new Response(null, {+ status: 416,+ headers: {+ "Accept-Ranges": "bytes",+ "Content-Range": `bytes */${totalSize}`,+ },+});diff --git a/apps/api/src/resource-routes.test.mjs b/apps/api/src/resource-routes.test.mjsindex 8d4a0715..63ed2f47 100644--- a/apps/api/src/resource-routes.test.mjs+++ b/apps/api/src/resource-routes.test.mjs@@ -38,6 +38,7 @@ const createEnvironment = () => ({storage: {db: {prepare: (sql) => ({+ first: async () => null,bind: () => ({all: async () => ({ results: sql.includes("ORDER BY r.created_at") ? [resourceRow] : [] }),first: async () => sql.includes("COUNT(*)") ? {@@ -54,7 +55,7 @@ const createEnvironment = () => ({},});-const createApp = (auth = agentAuth) => {+const createApp = (auth = agentAuth, getResourceRow = async () => null) => {const app = new Hono();app.use("/api/v1/*", async (context, next) => {context.set("auth", auth);@@ -65,7 +66,7 @@ const createApp = (auth = agentAuth) => {createAttachmentResource: async () => { throw new Error("Unexpected upload"); },createImageResource: async () => { throw new Error("Unexpected upload"); },getMemoDetail: async () => null,- getResourceRow: async () => null,+ getResourceRow,});return app;};@@ -105,4 +106,67 @@ describe("resource route contracts", () => {expect(response.status).toBe(403);expect(await response.json()).toMatchObject({ error: { code: "forbidden" } });});++ test("serves PDF attachments inline while preserving their filename", async () => {+ const environment = createEnvironment();+ environment.storage.resources = {+ get: async () => ({+ body: new Blob([new Uint8Array(256)]).stream(),+ size: 256,+ writeHttpMetadata: () => {},+ }),+ };+ const response = await createApp(agentAuth, async () => ({ ...resourceRow, storage_config_id: null })).request(+ "/api/v1/resources/res_1/blob",+ {},+ environment,+ );++ expect(response.status).toBe(200);+ expect(response.headers.get("Content-Type")).toBe("application/pdf");+ expect(response.headers.get("Content-Disposition")).toStartWith("inline;");+ expect(response.headers.get("Accept-Ranges")).toBe("bytes");+ });++ test("serves a validated PDF byte range without reading the whole object", async () => {+ const environment = createEnvironment();+ let requestedOptions;+ environment.storage.resources = {+ get: async (_key, options) => {+ requestedOptions = options;+ return {+ body: new Blob([new TextEncoder().encode("2345")]).stream(),+ size: 256,+ range: { offset: 2, length: 4 },+ writeHttpMetadata: () => {},+ };+ },+ };+ const response = await createApp(agentAuth, async () => ({ ...resourceRow, storage_config_id: null })).request(+ "/api/v1/resources/res_1/blob",+ { headers: { Range: "bytes=2-5" } },+ environment,+ );++ expect(requestedOptions).toEqual({ range: { offset: 2, length: 4 } });+ expect(response.status).toBe(206);+ expect(response.headers.get("Content-Range")).toBe("bytes 2-5/256");+ expect(response.headers.get("Content-Length")).toBe("4");+ expect(await response.text()).toBe("2345");+ });++ test("rejects unsatisfiable ranges before object storage is read", async () => {+ const environment = createEnvironment();+ let reads = 0;+ environment.storage.resources = { get: async () => { reads += 1; return null; } };+ const response = await createApp(agentAuth, async () => ({ ...resourceRow, storage_config_id: null })).request(+ "/api/v1/resources/res_1/blob",+ { headers: { Range: "bytes=999-" } },+ environment,+ );++ expect(response.status).toBe(416);+ expect(response.headers.get("Content-Range")).toBe("bytes */256");+ expect(reads).toBe(0);+ });});diff --git a/apps/api/src/resource-routes.ts b/apps/api/src/resource-routes.tsindex 42001206..b1e99f2b 100644--- a/apps/api/src/resource-routes.ts+++ b/apps/api/src/resource-routes.ts@@ -1,9 +1,10 @@-import { ResourceUpdateSchema, type MemoDetail, type Resource } from "@edgeever/shared";+import { isPdfAttachment, ResourceUpdateSchema, type MemoDetail, type Resource } from "@edgeever/shared";import { zValidator } from "@hono/zod-validator";import type { Hono } from "hono";import { auditStatement } from "./audit";import type { AppContext, AppEnv, AuditActor } from "./api-context";import { AppError } from "./app-error";+import { parseByteRange, rangeNotSatisfiable } from "./byte-range";import { isoNow } from "./entity-utils";import { apiError, badRequest, notFound } from "./http-errors";import { resolveObjectStorage } from "./object-storage";@@ -141,23 +142,44 @@ export const registerResourceRoutes = ();if (!resource) return notFound(context, "Resource not found");+ const byteRange = parseByteRange(context.req.header("Range"), resource.byte_size);+ if (byteRange.kind === "invalid") return rangeNotSatisfiable(resource.byte_size);+const source = await resolveObjectStorage(context.env, resource.storage_config_id);- const object = await source.store.get(resource.object_key);+ const object = await source.store.get(+ resource.object_key,+ byteRange.kind === "range" ? { range: byteRange.range } : undefined,+ );if (!object) return notFound(context, "Resource object not found");const headers = new Headers();object.writeHttpMetadata(headers);- headers.set("Content-Type", resource.mime_type ?? headers.get("Content-Type") ?? "application/octet-stream");+ headers.set(+ "Content-Type",+ isPdfAttachment(resource.mime_type, resource.filename)+ ? "application/pdf"+ : resource.mime_type ?? headers.get("Content-Type") ?? "application/octet-stream",+ );headers.set("Cache-Control", headers.get("Cache-Control") ?? "private, max-age=3600");- headers.set("Content-Length", String(object.size));+ headers.set("Accept-Ranges", "bytes");+ if (byteRange.kind === "range") {+ const length = object.range?.length ?? byteRange.range.length;+ headers.set("Content-Length", String(length));+ headers.set(+ "Content-Range",+ `bytes ${byteRange.range.offset}-${byteRange.range.offset + length - 1}/${resource.byte_size}`,+ );+ } else {+ headers.set("Content-Length", String(resource.byte_size));+ }headers.set("Content-Disposition",- resource.kind === "image"+ resource.kind === "image" || isPdfAttachment(resource.mime_type, resource.filename)? contentDispositionInline(resource.filename): contentDispositionAttachment(resource.filename),);headers.set("X-Content-Type-Options", "nosniff");- return new Response(object.body, { headers });+ return new Response(object.body, { headers, status: byteRange.kind === "range" ? 206 : 200 });});app.patch(diff --git a/apps/api/src/s3-compatible-storage-adapter.ts b/apps/api/src/s3-compatible-storage-adapter.tsindex 2702d4d1..4bac236a 100644--- a/apps/api/src/s3-compatible-storage-adapter.ts+++ b/apps/api/src/s3-compatible-storage-adapter.ts@@ -56,6 +56,11 @@ const isMissingObjectError = (error: unknown) => {|| candidate.$metadata?.httpStatusCode === 404;};+const totalSizeFromContentRange = (contentRange: string | undefined) => {+ const match = /\/(\d+)$/.exec(contentRange ?? "");+ return match ? Number(match[1]) : null;+};+const createS3BlobStore = (config: S3CompatibleStorageConfig,client = new S3Client({@@ -67,9 +72,14 @@ const createS3BlobStore = (: undefined,}),): BlobStoreAdapter => ({- async get(objectKey): Promise<BlobObjectAdapter | null> {+ async get(objectKey, options): Promise<BlobObjectAdapter | null> {try {- const result = await client.send(new GetObjectCommand({ Bucket: config.bucket, Key: objectKey }));+ const range = options?.range;+ const result = await client.send(new GetObjectCommand({+ Bucket: config.bucket,+ Key: objectKey,+ Range: range ? `bytes=${range.offset}-${range.offset + range.length - 1}` : undefined,+ }));if (!result.Body) {return null;}@@ -77,7 +87,8 @@ const createS3BlobStore = (const body = await toWebStream(result.Body);return {body,- size: result.ContentLength ?? 0,+ size: totalSizeFromContentRange(result.ContentRange) ?? result.ContentLength ?? 0,+ range: range ? { offset: range.offset, length: result.ContentLength ?? range.length } : undefined,writeHttpMetadata: (headers) => {if (result.ContentType) headers.set("Content-Type", result.ContentType);if (result.CacheControl) headers.set("Cache-Control", result.CacheControl);diff --git a/apps/api/src/self-hosted-storage-adapter.ts b/apps/api/src/self-hosted-storage-adapter.tsindex 04ac1304..cdadef23 100644--- a/apps/api/src/self-hosted-storage-adapter.ts+++ b/apps/api/src/self-hosted-storage-adapter.ts@@ -1,4 +1,4 @@-import { mkdir, readFile, unlink, writeFile } from "node:fs/promises";+import { mkdir, open, readFile, unlink, writeFile } from "node:fs/promises";import { dirname, resolve, sep } from "node:path";import type {BlobObjectAdapter,@@ -79,10 +79,30 @@ const safeObjectPath = (rootDirectory: string, objectKey: string) => {};const createLocalBlobStore = (rootDirectory: string): BlobStoreAdapter => ({- async get(objectKey): Promise<BlobObjectAdapter | null> {+ async get(objectKey, options): Promise<BlobObjectAdapter | null> {const target = safeObjectPath(rootDirectory, objectKey);try {+ if (options?.range) {+ const handle = await open(target, "r");+ try {+ const { size } = await handle.stat();+ const bytes = new Uint8Array(options.range.length);+ const { bytesRead } = await handle.read(bytes, 0, bytes.byteLength, options.range.offset);+ const bodyBytes = bytes.subarray(0, bytesRead);+ return {+ body: new Response(bodyBytes).body as ReadableStream<Uint8Array>,+ size,+ range: { offset: options.range.offset, length: bytesRead },+ writeHttpMetadata: (headers) => {+ headers.set("Content-Length", String(bytesRead));+ },+ };+ } finally {+ await handle.close();+ }+ }+const bytes = await readFile(target);return {body: new Response(bytes).body as ReadableStream<Uint8Array>,diff --git a/apps/api/src/share-routes.test.mjs b/apps/api/src/share-routes.test.mjsindex abd00228..41738095 100644--- a/apps/api/src/share-routes.test.mjs+++ b/apps/api/src/share-routes.test.mjs@@ -102,4 +102,39 @@ describe("public memo shares", () => {});sqlite.close();});++ test("serves shared PDF byte ranges with public-share cache controls", async () => {+ const { sqlite, environment } = createDatabaseEnvironment();+ sqlite.query(+ `INSERT INTO resources (id, memo_id, object_key, kind, mime_type, filename, byte_size)+ VALUES (?, ?, ?, 'attachment', 'application/pdf', 'shared.pdf', 10)`,+ ).run("res_shared", "memo_source", "shared-key");+ let requestedOptions;+ environment.storage.resources = {+ get: async (_key, options) => {+ requestedOptions = options;+ return {+ body: new Blob([new TextEncoder().encode("2345")]).stream(),+ size: 10,+ range: { offset: 2, length: 4 },+ writeHttpMetadata: () => {},+ };+ },+ };+ const app = new Hono();+ registerPublicShareRoutes(app);++ const response = await app.request(+ `/api/public/shares/${sourceToken}/resources/res_shared/blob`,+ { headers: { Range: "bytes=2-5" } },+ environment,+ );++ expect(requestedOptions).toEqual({ range: { offset: 2, length: 4 } });+ expect(response.status).toBe(206);+ expect(response.headers.get("Content-Range")).toBe("bytes 2-5/10");+ expect(response.headers.get("Cache-Control")).toBe("private, no-store");+ expect(await response.text()).toBe("2345");+ sqlite.close();+ });});diff --git a/apps/api/src/share-routes.ts b/apps/api/src/share-routes.tsindex cf2f0835..b8321fae 100644--- a/apps/api/src/share-routes.ts+++ b/apps/api/src/share-routes.ts@@ -1,8 +1,9 @@-import { collectMemoLinkIds, resolveMemoContentDoc, type MemoShare, type PublicMemoShare, type TiptapDoc } from "@edgeever/shared";+import { collectMemoLinkIds, isPdfAttachment, resolveMemoContentDoc, type MemoShare, type PublicMemoShare, type TiptapDoc } from "@edgeever/shared";import type { Hono } from "hono";import type { AppEnv } from "./api-context";import { audit } from "./audit";import { randomToken } from "./auth-crypto";+import { parseByteRange, rangeNotSatisfiable } from "./byte-range";import { createId, isoNow, parseJsonArray } from "./entity-utils";import { notFound } from "./http-errors";import { resolveObjectStorage } from "./object-storage";@@ -27,6 +28,7 @@ type SharedResourceRow = {kind: "image" | "attachment";mime_type: string | null;filename: string | null;+ byte_size: number;};const mapMemoShare = (row: MemoShareRow): MemoShare => ({@@ -39,10 +41,11 @@ const mapMemoShare = (row: MemoShareRow): MemoShare => ({const normalizeFilename = (filename: string) =>filename.trim().replace(/[\\/]/g, "-").replace(/[\u0000-\u001f\u007f]/g, "").slice(0, 160);-const contentDisposition = (kind: SharedResourceRow["kind"], filename: string | null) => {- if (!filename) return kind === "image" ? "inline" : "attachment";+const contentDisposition = (kind: SharedResourceRow["kind"], mimeType: string | null, filename: string | null) => {+ const inline = kind === "image" || isPdfAttachment(mimeType, filename);+ if (!filename) return inline ? "inline" : "attachment";const fallback = normalizeFilename(filename).replace(/"/g, "'");- const disposition = kind === "image" ? "inline" : "attachment";+ const disposition = inline ? "inline" : "attachment";return `${disposition}; filename="${fallback}"; filename*=UTF-8''${encodeURIComponent(filename)}`;};@@ -101,7 +104,7 @@ export const registerPublicShareRoutes = (app: Hono<AppEnv>) => {if (!token) return notFound(c, "Shared resource not found");const resource = await c.env.storage.db.prepare(- `SELECT r.object_key, r.storage_config_id, r.kind, r.mime_type, r.filename+ `SELECT r.object_key, r.storage_config_id, r.kind, r.mime_type, r.filename, r.byte_sizeFROM memo_shares msINNER JOIN memos m ON m.id = ms.memo_id AND m.workspace_id = ms.workspace_idINNER JOIN resources r ON r.memo_id = m.id@@ -110,19 +113,45 @@ export const registerPublicShareRoutes = (app: Hono<AppEnv>) => {).bind(token, c.req.param("resourceId")).first<SharedResourceRow>();if (!resource) return notFound(c, "Shared resource not found");+ const byteRange = parseByteRange(c.req.header("Range"), resource.byte_size);+ if (byteRange.kind === "invalid") {+ const response = rangeNotSatisfiable(resource.byte_size);+ response.headers.set("Cache-Control", "private, no-store");+ response.headers.set("X-Robots-Tag", "noindex, nofollow, noarchive");+ return response;+ }+const source = await resolveObjectStorage(c.env, resource.storage_config_id);- const object = await source.store.get(resource.object_key);+ const object = await source.store.get(+ resource.object_key,+ byteRange.kind === "range" ? { range: byteRange.range } : undefined,+ );if (!object) return notFound(c, "Shared resource not found");const headers = new Headers();object.writeHttpMetadata(headers);- headers.set("Content-Type", resource.mime_type ?? headers.get("Content-Type") ?? "application/octet-stream");- headers.set("Content-Length", String(object.size));- headers.set("Content-Disposition", contentDisposition(resource.kind, resource.filename));+ headers.set(+ "Content-Type",+ isPdfAttachment(resource.mime_type, resource.filename)+ ? "application/pdf"+ : resource.mime_type ?? headers.get("Content-Type") ?? "application/octet-stream",+ );+ headers.set("Accept-Ranges", "bytes");+ if (byteRange.kind === "range") {+ const length = object.range?.length ?? byteRange.range.length;+ headers.set("Content-Length", String(length));+ headers.set(+ "Content-Range",+ `bytes ${byteRange.range.offset}-${byteRange.range.offset + length - 1}/${resource.byte_size}`,+ );+ } else {+ headers.set("Content-Length", String(resource.byte_size));+ }+ headers.set("Content-Disposition", contentDisposition(resource.kind, resource.mime_type, resource.filename));headers.set("Cache-Control", "private, no-store");headers.set("X-Content-Type-Options", "nosniff");headers.set("X-Robots-Tag", "noindex, nofollow, noarchive");- return new Response(object.body, { headers });+ return new Response(object.body, { headers, status: byteRange.kind === "range" ? 206 : 200 });});};diff --git a/apps/api/src/storage-contract.ts b/apps/api/src/storage-contract.tsindex 65e770b3..8c29f366 100644--- a/apps/api/src/storage-contract.ts+++ b/apps/api/src/storage-contract.ts@@ -11,10 +11,21 @@ import type { D1Database, D1PreparedStatement } from "@cloudflare/workers-types"export type DatabaseAdapter = Pick<D1Database, "prepare" | "batch">;export type PreparedStatementAdapter = D1PreparedStatement;+export type BlobRange = {+ offset: number;+ length: number;+};++export type BlobGetOptions = {+ range?: BlobRange;+};+/** The subset of an object store response needed by the HTTP resource route. */export type BlobObjectAdapter = {body: ReadableStream<Uint8Array>;+ /** Total object size, even when body contains only a requested range. */size: number;+ range?: BlobRange;writeHttpMetadata: (headers: Headers) => void;};@@ -24,7 +35,7 @@ export type BlobObjectAdapter = {* self-hosted adapter can map it to filesystem sidecars or S3 metadata.*/export type BlobStoreAdapter = {- get: (key: string) => Promise<BlobObjectAdapter | null>;+ get: (key: string, options?: BlobGetOptions) => Promise<BlobObjectAdapter | null>;put: (key: string, value: unknown, options?: unknown) => Promise<unknown>;delete: (keys: string | string[]) => Promise<void>;};diff --git a/apps/api/src/worker-s3-blob-store.test.mjs b/apps/api/src/worker-s3-blob-store.test.mjsindex f9c932af..72580e30 100644--- a/apps/api/src/worker-s3-blob-store.test.mjs+++ b/apps/api/src/worker-s3-blob-store.test.mjs@@ -1,5 +1,5 @@import { afterEach, describe, expect, test } from "bun:test";-import { testWorkerS3Connection } from "./worker-s3-blob-store.ts";+import { createWorkerS3BlobStore, testWorkerS3Connection } from "./worker-s3-blob-store.ts";const originalFetch = globalThis.fetch;afterEach(() => { globalThis.fetch = originalFetch; });@@ -40,4 +40,34 @@ describe("Worker S3-compatible blob store", () => {expect(new URL(requests[0].url).pathname).toStartWith("/edgeever/notes/.edgeever-connection-test/");expect(objects.size).toBe(0);});++ test("forwards byte ranges and preserves the total object size", async () => {+ let observedRange = null;+ globalThis.fetch = async (request) => {+ observedRange = request.headers.get("range");+ return new Response("2345", {+ status: 206,+ headers: {+ "Content-Length": "4",+ "Content-Range": "bytes 2-5/10",+ },+ });+ };+ const store = createWorkerS3BlobStore({+ endpoint: "https://objects.example.com",+ region: "us-east-1",+ bucket: "edgeever",+ accessKeyId: "access-key",+ secretAccessKey: "secret-key",+ forcePathStyle: true,+ objectPrefix: "notes",+ });++ const object = await store.get("report.pdf", { range: { offset: 2, length: 4 } });++ expect(observedRange).toBe("bytes=2-5");+ expect(object?.size).toBe(10);+ expect(object?.range).toEqual({ offset: 2, length: 4 });+ expect(await new Response(object?.body).text()).toBe("2345");+ });});diff --git a/apps/api/src/worker-s3-blob-store.ts b/apps/api/src/worker-s3-blob-store.tsindex a08d14ab..c2907588 100644--- a/apps/api/src/worker-s3-blob-store.ts+++ b/apps/api/src/worker-s3-blob-store.ts@@ -36,6 +36,11 @@ const responseError = async (operation: string, response: Response) => {return new Error(`${operation} failed (${response.status})${detail ? `: ${detail}` : ""}`);};+const totalSizeFromResponse = (response: Response) => {+ const match = /\/(\d+)$/.exec(response.headers.get("content-range") ?? "");+ return match ? Number(match[1]) : Number(response.headers.get("content-length") ?? 0);+};+export const createWorkerS3BlobStore = (config: WorkerS3Config): BlobStoreAdapter => {const client = new AwsClient({accessKeyId: config.accessKeyId,@@ -45,15 +50,21 @@ export const createWorkerS3BlobStore = (config: WorkerS3Config): BlobStoreAdapte});return {- async get(objectKey): Promise<BlobObjectAdapter | null> {- const response = await client.fetch(createObjectUrl(config, objectKey).toString());+ async get(objectKey, options): Promise<BlobObjectAdapter | null> {+ const headers = new Headers();+ const range = options?.range;+ if (range) headers.set("range", `bytes=${range.offset}-${range.offset + range.length - 1}`);+ const response = await client.fetch(createObjectUrl(config, objectKey).toString(), { headers });if (response.status === 404) return null;if (!response.ok) throw await responseError("Object download", response);if (!response.body) throw new Error("Object download returned an empty body.");return {body: response.body,- size: Number(response.headers.get("content-length") ?? 0),+ size: totalSizeFromResponse(response),+ range: range+ ? { offset: range.offset, length: Number(response.headers.get("content-length") ?? range.length) }+ : undefined,writeHttpMetadata: (headers) => {for (const name of ["content-type", "cache-control", "content-disposition", "etag", "last-modified"]) {const value = response.headers.get(name);diff --git a/apps/desktop/src/main/index.mjs b/apps/desktop/src/main/index.mjsindex 82b25e42..1426e565 100644--- a/apps/desktop/src/main/index.mjs+++ b/apps/desktop/src/main/index.mjs@@ -7,7 +7,7 @@ import { fileURLToPath } from "node:url";import { release as operatingSystemRelease } from "node:os";import { SidecarRpcClient } from "./rpc.mjs";import { resourceRequestHeaders } from "./resource-request.mjs";-import { isSafeResourceId, resourceIdFromRequest } from "./resource-url.mjs";+import { cachedResourceResponse, isSafeResourceId, resourceIdFromRequest } from "./resource-url.mjs";import { isSupportedAssociatedFile } from "./file-association.mjs";import { accountDataDirectory, accountScopeKey } from "./account-scope.mjs";import { rotateDiagnosticLog } from "./diagnostic-log.mjs";@@ -454,7 +454,7 @@ const registerResourceProtocol = () => {const bytes = await readFile(bytesPath);let metadata = {};try { metadata = JSON.parse(await readFile(metadataPath, "utf8")); } catch {}- return new Response(bytes, { headers: { "Content-Type": metadata.contentType || "application/octet-stream", "Cache-Control": "no-store" } });+ return cachedResourceResponse(bytes, metadata.contentType, request.headers.get("range"));} catch {// Fall through to the instance while online, then persist the response.}@@ -464,16 +464,30 @@ const registerResourceProtocol = () => {try {const cookies = await session.defaultSession.cookies.get({ url: sourceUrl });const headers = resourceRequestHeaders({ cookies, sessionToken: desktopSessionToken });+ const rangeHeader = request.headers.get("range");+ if (rangeHeader) headers.set("range", rangeHeader);const response = await net.fetch(sourceUrl, { headers });if (!response.ok) return new Response("Resource request failed", { status: response.status });const body = Buffer.from(await response.arrayBuffer());+ if (response.status === 206) {+ const responseHeaders = new Headers({+ "Accept-Ranges": response.headers.get("accept-ranges") || "bytes",+ "Cache-Control": "no-store",+ "Content-Type": response.headers.get("content-type") || "application/octet-stream",+ });+ for (const name of ["content-length", "content-range", "etag", "last-modified"]) {+ const value = response.headers.get(name);+ if (value) responseHeaders.set(name, value);+ }+ return new Response(body, { status: 206, headers: responseHeaders });+ }await mkdir(directory, { recursive: true });await restrictDirectory(directory);await writeFile(bytesPath, body, { mode: 0o600 });await writeFile(metadataPath, JSON.stringify({ contentType: response.headers.get("content-type") || "application/octet-stream" }), { mode: 0o600 });await restrictFile(bytesPath);await restrictFile(metadataPath);- return new Response(body, { headers: { "Content-Type": response.headers.get("content-type") || "application/octet-stream", "Cache-Control": "no-store" } });+ return cachedResourceResponse(body, response.headers.get("content-type"), null);} catch (error) {void writeDiagnostic("resource.cache-failed", { resourceId, message: error.message });return new Response("Resource unavailable", { status: 504 });diff --git a/apps/desktop/src/main/resource-url.mjs b/apps/desktop/src/main/resource-url.mjsindex 1949b059..a16eff2e 100644--- a/apps/desktop/src/main/resource-url.mjs+++ b/apps/desktop/src/main/resource-url.mjs@@ -11,3 +11,52 @@ export const resourceIdFromRequest = (requestUrl) => {return null;}};++export const parseByteRangeHeader = (header, totalSize) => {+ if (!header) return { kind: "none" };+ if (!Number.isSafeInteger(totalSize) || totalSize <= 0) return { kind: "invalid" };+ const match = /^bytes=(\d*)-(\d*)$/i.exec(header.trim());+ if (!match || (!match[1] && !match[2])) return { kind: "invalid" };++ if (!match[1]) {+ const suffixLength = Number(match[2]);+ if (!Number.isSafeInteger(suffixLength) || suffixLength <= 0) return { kind: "invalid" };+ const length = Math.min(suffixLength, totalSize);+ return { kind: "range", offset: totalSize - length, length };+ }++ const offset = Number(match[1]);+ const requestedEnd = match[2] ? Number(match[2]) : totalSize - 1;+ if (+ !Number.isSafeInteger(offset)+ || !Number.isSafeInteger(requestedEnd)+ || requestedEnd < offset+ || offset >= totalSize+ ) return { kind: "invalid" };++ const end = Math.min(requestedEnd, totalSize - 1);+ return { kind: "range", offset, length: end - offset + 1 };+};++export const cachedResourceResponse = (bytes, contentType, rangeHeader) => {+ const range = parseByteRangeHeader(rangeHeader, bytes.byteLength);+ const headers = new Headers({+ "Accept-Ranges": "bytes",+ "Cache-Control": "no-store",+ "Content-Type": contentType || "application/octet-stream",+ });++ if (range.kind === "invalid") {+ headers.set("Content-Range", `bytes */${bytes.byteLength}`);+ return new Response(null, { status: 416, headers });+ }+ if (range.kind === "range") {+ const end = range.offset + range.length - 1;+ headers.set("Content-Length", String(range.length));+ headers.set("Content-Range", `bytes ${range.offset}-${end}/${bytes.byteLength}`);+ return new Response(bytes.subarray(range.offset, end + 1), { status: 206, headers });+ }++ headers.set("Content-Length", String(bytes.byteLength));+ return new Response(bytes, { status: 200, headers });+};diff --git a/apps/desktop/src/main/resource-url.test.mjs b/apps/desktop/src/main/resource-url.test.mjsindex df151a8b..5a9e7c45 100644--- a/apps/desktop/src/main/resource-url.test.mjs+++ b/apps/desktop/src/main/resource-url.test.mjs@@ -1,5 +1,10 @@import { expect, test } from "bun:test";-import { isSafeResourceId, resourceIdFromRequest } from "./resource-url.mjs";+import {+ cachedResourceResponse,+ isSafeResourceId,+ parseByteRangeHeader,+ resourceIdFromRequest,+} from "./resource-url.mjs";test("desktop resource URL parsing accepts safe resource and staged IDs", () => {expect(resourceIdFromRequest("edgeever-resource://resource/resource_123")).toBe("resource_123");@@ -16,3 +21,24 @@ test("desktop staged resource IPC IDs reject path traversal", () => {expect(isSafeResourceId("stage/123")).toBe(false);expect(isSafeResourceId("..")).toBe(false);});++test("desktop resource range parser supports bounded, open, and suffix ranges", () => {+ expect(parseByteRangeHeader("bytes=2-5", 10)).toEqual({ kind: "range", offset: 2, length: 4 });+ expect(parseByteRangeHeader("bytes=7-", 10)).toEqual({ kind: "range", offset: 7, length: 3 });+ expect(parseByteRangeHeader("bytes=-4", 10)).toEqual({ kind: "range", offset: 6, length: 4 });+ expect(parseByteRangeHeader("bytes=10-", 10)).toEqual({ kind: "invalid" });+ expect(parseByteRangeHeader("bytes=0-1,4-5", 10)).toEqual({ kind: "invalid" });+});++test("desktop cached resources return 206 slices and 416 for invalid ranges", async () => {+ const bytes = new TextEncoder().encode("0123456789");+ const partial = cachedResourceResponse(bytes, "application/pdf", "bytes=2-5");+ expect(partial.status).toBe(206);+ expect(partial.headers.get("content-range")).toBe("bytes 2-5/10");+ expect(partial.headers.get("accept-ranges")).toBe("bytes");+ expect(await partial.text()).toBe("2345");++ const invalid = cachedResourceResponse(bytes, "application/pdf", "bytes=20-");+ expect(invalid.status).toBe(416);+ expect(invalid.headers.get("content-range")).toBe("bytes */10");+});diff --git a/apps/web/src/components/AssetsPane.tsx b/apps/web/src/components/AssetsPane.tsxindex 7c14b6fe..e4a8c363 100644--- a/apps/web/src/components/AssetsPane.tsx+++ b/apps/web/src/components/AssetsPane.tsx@@ -1,4 +1,4 @@-import { useState, useMemo } from "react";+import { useCallback, useMemo, useState } from "react";import { useQuery } from "@tanstack/react-query";import { useTranslation } from "react-i18next";import Lightbox from "yet-another-react-lightbox";@@ -32,6 +32,8 @@ import { ButtonTooltip } from "@/components/ui/button-tooltip";import { formatDateTime } from "@/lib/utils";import { WORKSPACE_PAGE_TITLE_CLASSNAME } from "@/lib/workspace-ui";import type { EdgeEverRepository } from "@/lib/repository";+import { isPdfAttachment, type ResourceListItem } from "@edgeever/shared";+import { PdfViewer } from "@/components/pdf/PdfViewer";export const formatBytes = (bytes: number) => {if (!Number.isFinite(bytes) || bytes <= 0) {@@ -124,6 +126,7 @@ export const AssetsPane = ({ onClose, repository }: AssetsPaneProps) => {return (localStorage.getItem("assets_layout_mode") as "grid" | "list") || "grid";});const [lightboxIndex, setLightboxIndex] = useState<number | null>(null);+ const [pdfPreview, setPdfPreview] = useState<ResourceListItem | null>(null);// Query resourcesconst resourcesQuery = useQuery({@@ -166,6 +169,11 @@ export const AssetsPane = ({ onClose, repository }: AssetsPaneProps) => {return filteredResources.filter((r) => r.kind === "image");}, [filteredResources]);+ const pdfResources = useMemo(+ () => filteredResources.filter((resource) => isPdfAttachment(resource.mimeType, resource.filename)),+ [filteredResources],+ );+const slides = useMemo(() => {return imageResources.map((r) => ({src: r.url,@@ -181,6 +189,35 @@ export const AssetsPane = ({ onClose, repository }: AssetsPaneProps) => {}};+ const handleResourceOpen = (resource: ResourceListItem) => {+ if (resource.kind === "image") {+ handleImageClick(resource.id);+ } else if (isPdfAttachment(resource.mimeType, resource.filename)) {+ setPdfPreview(resource);+ } else {+ window.open(resource.url, "_blank", "noopener,noreferrer");+ }+ };++ const showAdjacentPdf = useCallback((direction: -1 | 1) => {+ setPdfPreview((current) => {+ if (!current || pdfResources.length === 0) return current;+ const currentIndex = pdfResources.findIndex((resource) => resource.id === current.id);+ if (currentIndex === -1) return pdfResources[0] ?? current;+ const nextIndex = (currentIndex + direction + pdfResources.length) % pdfResources.length;+ return pdfResources[nextIndex] ?? current;+ });+ }, [pdfResources]);+ const showPreviousPdf = useCallback(() => showAdjacentPdf(-1), [showAdjacentPdf]);+ const showNextPdf = useCallback(() => showAdjacentPdf(1), [showAdjacentPdf]);++ const getResourceOpenLabel = (resource: ResourceListItem) =>+ isPdfAttachment(resource.mimeType, resource.filename)+ ? t("assets.previewPdf", { filename: resource.filename || resource.id })+ : resource.kind === "image"+ ? t("assets.previewImage")+ : t("assets.downloadOpen");+const getResourceMemoSource = (resource: { memoDeleted: boolean; memoTitle: string | null; memoExcerpt: string | null; memoId: string }) =>resource.memoDeleted ? t("assets.deletedMemo") : resource.memoTitle || resource.memoExcerpt || resource.memoId;@@ -190,16 +227,17 @@ export const AssetsPane = ({ onClose, repository }: AssetsPaneProps) => {{/* Header */}<header className="flex h-[calc(4rem+env(safe-area-inset-top))] shrink-0 items-end justify-between border-b border-slate-200 px-6 pb-3 pt-[env(safe-area-inset-top)] lg:h-16 lg:items-center lg:pb-0 lg:pt-0"><div className="flex items-center gap-3">- <Button- size="icon"- variant="ghost"- title={t("common.back")}- aria-label={t("common.back")}- onClick={onClose}- className="flex h-9 w-9 items-center justify-center rounded-lg hover:bg-slate-100"- >- <ChevronLeft className="h-5 w-5 text-slate-500" />- </Button>+ <ButtonTooltip title={t("common.back")}>+ <Button+ size="icon"+ variant="ghost"+ aria-label={t("common.back")}+ onClick={onClose}+ className="flex h-9 w-9 items-center justify-center rounded-lg hover:bg-slate-100"+ >+ <ChevronLeft className="h-5 w-5 text-slate-500" />+ </Button>+ </ButtonTooltip><div className="min-w-0"><h1 className={`flex items-center gap-2 ${WORKSPACE_PAGE_TITLE_CLASSNAME}`}><Archive className="h-4.5 w-4.5 text-emerald-700" />@@ -323,11 +361,14 @@ export const AssetsPane = ({ onClose, repository }: AssetsPaneProps) => {>{/* Thumbnail area */}<div- onClick={() => {- if (resource.kind === "image") {- handleImageClick(resource.id);- } else {- window.open(resource.url, "_blank", "noreferrer");+ role="button"+ tabIndex={0}+ aria-label={getResourceOpenLabel(resource)}+ onClick={() => handleResourceOpen(resource)}+ onKeyDown={(event) => {+ if (event.key === "Enter" || event.key === " ") {+ event.preventDefault();+ handleResourceOpen(resource);}}}className="relative aspect-square w-full cursor-pointer overflow-hidden bg-slate-50 flex items-center justify-center border-b border-slate-100"@@ -350,7 +391,11 @@ export const AssetsPane = ({ onClose, repository }: AssetsPaneProps) => {{/* Hover detail overlay */}<div className="absolute inset-0 bg-slate-900/40 opacity-0 transition-opacity duration-200 group-hover:opacity-100 flex items-center justify-center"><span className="rounded bg-white/90 px-2.5 py-1.5 text-[11px] font-semibold text-slate-800 shadow flex items-center gap-1">- {resource.kind === "image" ? t("assets.previewImage") : t("assets.downloadOpen")}+ {resource.kind === "image"+ ? t("assets.previewImage")+ : isPdfAttachment(resource.mimeType, resource.filename)+ ? t("pdfViewer.fullscreen")+ : t("assets.downloadOpen")}<ExternalLink className="h-3 w-3" /></span></div>@@ -358,26 +403,24 @@ export const AssetsPane = ({ onClose, repository }: AssetsPaneProps) => {{/* Metadata area */}<div className="flex flex-col p-3 min-w-0">- <span- title={resource.filename || resource.id}- className="truncate text-xs font-bold text-slate-800 leading-snug group-hover:text-emerald-700 transition-colors"- >- {resource.filename || resource.id}- </span>+ <ButtonTooltip title={resource.filename || resource.id}>+ <span className="truncate text-xs font-bold text-slate-800 leading-snug group-hover:text-emerald-700 transition-colors">+ {resource.filename || resource.id}+ </span>+ </ButtonTooltip><span className="mt-1 flex items-center justify-between text-[10px] font-medium text-slate-400"><span>{formatBytes(resource.byteSize)}</span><span>{(resource.mimeType?.split("/")[1] || resource.kind).toUpperCase()}</span></span>- <span- title={- resource.memoDeleted- ? t("assets.deletedMemo")- : t("assets.fromMemo", { source: resource.memoTitle || resource.memoExcerpt || resource.memoId })- }- className="mt-1.5 truncate text-[9px] text-slate-400 border-t border-slate-50 pt-1"- >- 📄 {resource.memoDeleted ? t("assets.deletedMemo") : resource.memoTitle || resource.memoExcerpt || t("assets.unnamedMemo")}- </span>+ <ButtonTooltip title={+ resource.memoDeleted+ ? t("assets.deletedMemo")+ : t("assets.fromMemo", { source: resource.memoTitle || resource.memoExcerpt || resource.memoId })+ }>+ <span className="mt-1.5 truncate text-[9px] text-slate-400 border-t border-slate-50 pt-1">+ 📄 {resource.memoDeleted ? t("assets.deletedMemo") : resource.memoTitle || resource.memoExcerpt || t("assets.unnamedMemo")}+ </span>+ </ButtonTooltip></div></div>))}@@ -392,11 +435,14 @@ export const AssetsPane = ({ onClose, repository }: AssetsPaneProps) => {>{/* Left Icon/Thumbnail */}<div- onClick={() => {- if (resource.kind === "image") {- handleImageClick(resource.id);- } else {- window.open(resource.url, "_blank", "noreferrer");+ role="button"+ tabIndex={0}+ aria-label={getResourceOpenLabel(resource)}+ onClick={() => handleResourceOpen(resource)}+ onKeyDown={(event) => {+ if (event.key === "Enter" || event.key === " ") {+ event.preventDefault();+ handleResourceOpen(resource);}}}className="relative flex h-12 w-12 shrink-0 cursor-pointer items-center justify-center overflow-hidden rounded-lg border border-slate-100 bg-slate-50/50"@@ -428,15 +474,17 @@ export const AssetsPane = ({ onClose, repository }: AssetsPaneProps) => {</div>{/* Right Actions */}- <a- href={resource.url}- target="_blank"- rel="noreferrer"- title={t("assets.openInNewWindow")}- className="flex h-8 w-8 items-center justify-center rounded-lg text-slate-350 hover:bg-slate-50 hover:text-emerald-600 opacity-0 group-hover:opacity-100 transition-all duration-150"- >- <ExternalLink className="h-4 w-4" />- </a>+ <ButtonTooltip title={t("assets.openInNewWindow")}>+ <a+ href={resource.url}+ target="_blank"+ rel="noreferrer"+ aria-label={t("assets.openInNewWindow")}+ className="flex h-8 w-8 items-center justify-center rounded-lg text-slate-350 hover:bg-slate-50 hover:text-emerald-600 opacity-0 group-hover:opacity-100 focus:opacity-100 transition-all duration-150"+ >+ <ExternalLink className="h-4 w-4" />+ </a>+ </ButtonTooltip></div>))}</div>@@ -454,6 +502,17 @@ export const AssetsPane = ({ onClose, repository }: AssetsPaneProps) => {plugins={[Zoom, Thumbnails]}/>)}+ {pdfPreview ? (+ <PdfViewer+ key={pdfPreview.id}+ url={pdfPreview.url}+ label={pdfPreview.filename || pdfPreview.id}+ fullscreen+ onRequestClose={() => setPdfPreview(null)}+ onPrevious={pdfResources.length > 1 ? showPreviousPdf : undefined}+ onNext={pdfResources.length > 1 ? showNextPdf : undefined}+ />+ ) : null}</div>);};diff --git a/apps/web/src/components/EditorPane.tsx b/apps/web/src/components/EditorPane.tsxindex 72b7795e..344eca00 100644--- a/apps/web/src/components/EditorPane.tsx+++ b/apps/web/src/components/EditorPane.tsx@@ -117,6 +117,7 @@ import {MEMO_CONTENT_STYLE,markdownToDoc,MergeDivider,+ isPdfAttachment,resolveMemoContentDoc,type Notebook,type MemoDetail,@@ -209,6 +210,7 @@ import {type ImagePreviewRequestDetail,} from "./editor/ResizableImage";import { ImageViewer } from "./editor/ImageViewer";+import { PdfAttachment } from "./editor/PdfAttachment";import {createNoteSearchHighlightPlugin,formatNoteSearchMatchLabel,@@ -1239,29 +1241,43 @@ const RichEditorPane = ({return;}- const content = successfulResults.map(({ file, value: resource }) =>- resource.kind === "image"- ? {- type: "image",+ const content = successfulResults.map(({ file, value: resource }) => {+ const filename = resource.filename || file.name;+ if (resource.kind === "image") {+ return {+ type: "image",+ attrs: {+ src: resource.url,+ alt: file.name,+ title: file.name,+ width: DEFAULT_IMAGE_WIDTH_PERCENT,+ },+ };+ }+ if (isPdfAttachment(file.type, filename)) {+ return {+ type: "paragraph",+ content: [{+ type: "edgeeverPdfAttachment",attrs: {- src: resource.url,- alt: file.name,- title: file.name,- width: DEFAULT_IMAGE_WIDTH_PERCENT,+ url: resource.url,+ label: t("editor.attachmentLabel", { filename }),},- }- : {- type: "paragraph",- content: [{- type: "text",- text: t("editor.attachmentLabel", { filename: resource.filename || file.name }),- marks: [{- type: "link",- attrs: { href: resource.url, target: "_blank", class: "edgeever-attachment-link" },- }],- }],- }- );+ }],+ };+ }+ return {+ type: "paragraph",+ content: [{+ type: "text",+ text: t("editor.attachmentLabel", { filename }),+ marks: [{+ type: "link",+ attrs: { href: resource.url, target: "_blank", class: "edgeever-attachment-link" },+ }],+ }],+ };+ });if (content.length > 0) {activeEditor.chain().focus().insertContent(content).run();@@ -1286,6 +1302,7 @@ const RichEditorPane = ({TaskItem.configure({ nested: true }),EdgeEverCodeBlock.configure({ lowlight: codeBlockLowlight, defaultLanguage: "plaintext" }),MergeDivider,+ PdfAttachment,...createEdgeEverMathematics(),ThemeBlock,ResizableImage.configure({diff --git a/apps/web/src/components/MobileStandaloneTiptapEditor.tsx b/apps/web/src/components/MobileStandaloneTiptapEditor.tsxindex 5b328c15..c2826402 100644--- a/apps/web/src/components/MobileStandaloneTiptapEditor.tsx+++ b/apps/web/src/components/MobileStandaloneTiptapEditor.tsx@@ -3,6 +3,7 @@ import { useCallback, useEffect, useMemo, useRef, useState } from "react";import { useTranslation } from "react-i18next";import { EditorContent, useEditor } from "@tiptap/react";import StarterKit from "@tiptap/starter-kit";+import { PdfAttachment } from "@/components/editor/PdfAttachment";import Image from "@tiptap/extension-image";import { TaskItem, TaskList } from "@tiptap/extension-list";import { mergeAttributes } from "@tiptap/core";@@ -195,6 +196,7 @@ export const MobileStandaloneTiptapEditor = ({const editor = useEditor({extensions: [StarterKit,+ PdfAttachment,TaskList,TaskItem.configure({ nested: true }),MergeDivider,diff --git a/apps/web/src/components/PublicSharePage.tsx b/apps/web/src/components/PublicSharePage.tsxindex 30325b77..ef75a274 100644--- a/apps/web/src/components/PublicSharePage.tsx+++ b/apps/web/src/components/PublicSharePage.tsx@@ -22,6 +22,7 @@ import {type PublicMemoShare,} from "@edgeever/shared";import { createEdgeEverMathematics } from "@edgeever/shared/mathematics";+import { PdfAttachment } from "@/components/editor/PdfAttachment";const SharedImage = Image.extend({addAttributes() {@@ -89,6 +90,7 @@ const SharedDocument = ({ share, token }: { share: PublicMemoShare; token: strinTaskItem.configure({ nested: true }),EdgeEverCodeBlock.configure({ lowlight: codeBlockLowlight, defaultLanguage: "plaintext" }),MergeDivider,+ PdfAttachment,...createEdgeEverMathematics(),SharedThemeBlock,SharedImage.configure({ allowBase64: false, inline: false }),diff --git a/apps/web/src/components/editor/PdfAttachment.tsx b/apps/web/src/components/editor/PdfAttachment.tsxnew file mode 100644index 00000000..169cc417--- /dev/null+++ b/apps/web/src/components/editor/PdfAttachment.tsx@@ -0,0 +1,50 @@+import { PdfAttachment as BasePdfAttachment } from "@edgeever/shared";+import { NodeViewWrapper, ReactNodeViewRenderer, type NodeViewProps } from "@tiptap/react";+import { useEffect, useState } from "react";+import { PdfViewer } from "@/components/pdf/PdfViewer";+import {+ PDF_PREVIEW_CHANGED_EVENT,+ PDF_PREVIEW_STORAGE_KEY,+ readPdfPreviewPreference,+ type PdfPreviewPreference,+} from "@/lib/pdf-preview-preference";++const PdfAttachmentNodeView = ({ node }: NodeViewProps) => {+ const url = typeof node.attrs.url === "string" ? node.attrs.url : "";+ const label = typeof node.attrs.label === "string" ? node.attrs.label : "PDF";+ const [preference, setPreference] = useState<PdfPreviewPreference>(readPdfPreviewPreference);++ useEffect(() => {+ const syncPreference = () => setPreference(readPdfPreviewPreference());+ const onPreferenceChanged = (event: Event) => {+ const detail = (event as CustomEvent<PdfPreviewPreference>).detail;+ setPreference(detail === "collapsed" ? "collapsed" : "expanded");+ };+ const onStorage = (event: StorageEvent) => {+ if (!event.key || event.key === PDF_PREVIEW_STORAGE_KEY) syncPreference();+ };+ window.addEventListener(PDF_PREVIEW_CHANGED_EVENT, onPreferenceChanged);+ window.addEventListener("storage", onStorage);+ return () => {+ window.removeEventListener(PDF_PREVIEW_CHANGED_EVENT, onPreferenceChanged);+ window.removeEventListener("storage", onStorage);+ };+ }, []);++ return (+ <NodeViewWrapper as="span" className="edgeever-pdf-attachment-node" contentEditable={false}>+ <PdfViewer+ key={preference}+ url={url}+ label={label}+ defaultExpanded={preference === "expanded"}+ />+ </NodeViewWrapper>+ );+};++export const PdfAttachment = BasePdfAttachment.extend({+ addNodeView() {+ return ReactNodeViewRenderer(PdfAttachmentNodeView);+ },+});diff --git a/apps/web/src/components/pdf/PdfViewer.tsx b/apps/web/src/components/pdf/PdfViewer.tsxnew file mode 100644index 00000000..1a20a508--- /dev/null+++ b/apps/web/src/components/pdf/PdfViewer.tsx@@ -0,0 +1,322 @@+import type { PDFDocumentProxy, PDFPageProxy } from "pdfjs-dist";+import pdfWorkerUrl from "pdfjs-dist/build/pdf.worker.min.mjs?url";+import {+ ChevronDown,+ ChevronLeft,+ ChevronRight,+ ChevronUp,+ Download,+ ExternalLink,+ FileText,+ Loader2,+ Maximize2,+ Minimize2,+ RotateCcw,+ ZoomIn,+ ZoomOut,+} from "lucide-react";+import { useCallback, useEffect, useRef, useState } from "react";+import { createPortal } from "react-dom";+import { useTranslation } from "react-i18next";+import { ButtonTooltip } from "@/components/ui/button-tooltip";+import { cn } from "@/lib/utils";++const MIN_ZOOM = 0.5;+const MAX_ZOOM = 2.5;+const ZOOM_STEP = 0.25;++type PdfPageProps = {+ document: PDFDocumentProxy;+ pageNumber: number;+ fitWidth: boolean;+ zoom: number;+};++const PdfPage = ({ document, pageNumber, fitWidth, zoom }: PdfPageProps) => {+ const hostRef = useRef<HTMLDivElement | null>(null);+ const canvasRef = useRef<HTMLCanvasElement | null>(null);+ const [visible, setVisible] = useState(false);+ const [hostWidth, setHostWidth] = useState(0);+ const [page, setPage] = useState<PDFPageProxy | null>(null);++ useEffect(() => {+ const host = hostRef.current;+ if (!host) return;+ const observer = new IntersectionObserver(([entry]) => {+ if (entry?.isIntersecting) setVisible(true);+ }, { rootMargin: "600px 0px" });+ observer.observe(host);+ return () => observer.disconnect();+ }, []);++ useEffect(() => {+ if (!visible) return;+ let cancelled = false;+ void document.getPage(pageNumber).then((loadedPage) => {+ if (!cancelled) setPage(loadedPage);+ });+ return () => {+ cancelled = true;+ setPage(null);+ };+ }, [document, pageNumber, visible]);++ useEffect(() => {+ const host = hostRef.current;+ if (!host) return;+ const observer = new ResizeObserver(([entry]) => setHostWidth(entry?.contentRect.width ?? 0));+ observer.observe(host);+ return () => observer.disconnect();+ }, []);++ useEffect(() => {+ const canvas = canvasRef.current;+ if (!visible || !page || !canvas || hostWidth <= 0) return;+ const baseViewport = page.getViewport({ scale: 1 });+ const cssScale = fitWidth ? Math.max(0.1, (hostWidth - 16) / baseViewport.width) : zoom;+ const outputScale = Math.min(window.devicePixelRatio || 1, 2);+ const viewport = page.getViewport({ scale: cssScale * outputScale });+ const context = canvas.getContext("2d", { alpha: false });+ if (!context) return;++ canvas.width = Math.floor(viewport.width);+ canvas.height = Math.floor(viewport.height);+ canvas.style.width = `${Math.floor(viewport.width / outputScale)}px`;+ canvas.style.height = `${Math.floor(viewport.height / outputScale)}px`;+ const task = page.render({ canvas, canvasContext: context, viewport });+ return () => task.cancel();+ }, [fitWidth, hostWidth, page, visible, zoom]);++ const placeholderHeight = 640;++ return (+ <span ref={hostRef} className="flex w-full justify-center" style={{ minHeight: visible && page ? undefined : placeholderHeight }}>+ <canvas ref={canvasRef} className="max-w-none bg-white shadow-sm" aria-label={`PDF page ${pageNumber}`} />+ </span>+ );+};++type PdfDocumentProps = {+ url: string;+ active: boolean;+ fitWidth: boolean;+ zoom: number;+ onError: () => void;+};++const PdfDocument = ({ url, active, fitWidth, zoom, onError }: PdfDocumentProps) => {+ const { t } = useTranslation();+ const [document, setDocument] = useState<PDFDocumentProxy | null>(null);++ useEffect(() => {+ if (!active) return;+ setDocument(null);+ let cancelled = false;+ let loadingTask: ReturnType<(typeof import("pdfjs-dist"))["getDocument"]> | null = null;++ void import("pdfjs-dist").then(async (pdfjs) => {+ if (cancelled) return;+ pdfjs.GlobalWorkerOptions.workerSrc = pdfWorkerUrl;+ loadingTask = pdfjs.getDocument({ url });+ const loadedDocument = await loadingTask.promise;+ if (cancelled) return;+ setDocument(loadedDocument);+ }).catch(() => {+ if (!cancelled) onError();+ });++ return () => {+ cancelled = true;+ void loadingTask?.destroy();+ };+ }, [active, onError, url]);++ if (!document) {+ return (+ <span className="flex min-h-72 items-center justify-center gap-2 text-sm text-slate-500">+ <Loader2 className="h-5 w-5 animate-spin text-emerald-600" aria-hidden="true" />+ {t("pdfViewer.loading")}+ </span>+ );+ }++ return (+ <span className="flex flex-col items-center gap-3 p-3">+ {Array.from({ length: document.numPages }, (_, index) => (+ <PdfPage key={index + 1} document={document} pageNumber={index + 1} fitWidth={fitWidth} zoom={zoom} />+ ))}+ </span>+ );+};++export type PdfViewerProps = {+ url: string;+ label: string;+ className?: string;+ defaultExpanded?: boolean;+ fullscreen?: boolean;+ onRequestClose?: () => void;+ onPrevious?: () => void;+ onNext?: () => void;+};++export const PdfViewer = ({+ url,+ label,+ className,+ defaultExpanded = true,+ fullscreen = false,+ onRequestClose,+ onPrevious,+ onNext,+}: PdfViewerProps) => {+ const { t } = useTranslation();+ const rootRef = useRef<HTMLDivElement | null>(null);+ const [expanded, setExpanded] = useState(defaultExpanded || fullscreen);+ const [nearViewport, setNearViewport] = useState(fullscreen);+ const [fitWidth, setFitWidth] = useState(true);+ const [zoom, setZoom] = useState(1);+ const [failed, setFailed] = useState(false);+ const [internalFullscreen, setInternalFullscreen] = useState(false);+ const isFullscreen = fullscreen || internalFullscreen;++ useEffect(() => {+ const root = rootRef.current;+ if (!root || fullscreen) return;+ const observer = new IntersectionObserver(([entry]) => {+ if (entry?.isIntersecting) setNearViewport(true);+ }, { rootMargin: "500px 0px" });+ observer.observe(root);+ return () => observer.disconnect();+ }, [fullscreen]);++ useEffect(() => {+ if (!isFullscreen) return;+ const previousOverflow = document.body.style.overflow;+ document.body.style.overflow = "hidden";+ const handleKeyDown = (event: KeyboardEvent) => {+ const target = event.target as HTMLElement | null;+ const isEditable = target?.isContentEditable || ["INPUT", "TEXTAREA", "SELECT"].includes(target?.tagName ?? "");+ if (event.key === "Escape") {+ if (fullscreen) onRequestClose?.();+ else setInternalFullscreen(false);+ return;+ }+ if (isEditable || event.metaKey || event.ctrlKey || event.altKey) return;+ if (event.key === "ArrowLeft" && onPrevious) {+ event.preventDefault();+ onPrevious();+ } else if (event.key === "ArrowRight" && onNext) {+ event.preventDefault();+ onNext();+ }+ };+ window.addEventListener("keydown", handleKeyDown);+ return () => {+ document.body.style.overflow = previousOverflow;+ window.removeEventListener("keydown", handleKeyDown);+ };+ }, [fullscreen, isFullscreen, onNext, onPrevious, onRequestClose]);++ const handleError = useCallback(() => setFailed(true), []);+ const closeFullscreen = () => fullscreen ? onRequestClose?.() : setInternalFullscreen(false);+ const active = expanded && nearViewport && !failed;++ const viewer = (+ <span+ ref={rootRef}+ className={cn(+ "edgeever-pdf-viewer block w-full overflow-hidden rounded-xl border border-slate-200 bg-white shadow-sm",+ isFullscreen && "fixed inset-0 z-[120] flex rounded-none border-0 bg-slate-950/95 p-3 sm:p-5",+ className,+ )}+ role={isFullscreen ? "dialog" : undefined}+ aria-modal={isFullscreen ? true : undefined}+ aria-label={isFullscreen ? t("pdfViewer.fullscreenLabel", { filename: label }) : undefined}+ >+ <span className={cn("flex min-w-0 flex-col", isFullscreen && "mx-auto h-full w-full max-w-6xl overflow-hidden rounded-xl bg-white shadow-2xl")}>+ <span className="flex min-h-12 shrink-0 items-center gap-2 overflow-x-auto border-b border-slate-200 bg-white px-3">+ <FileText className="h-4 w-4 shrink-0 text-rose-600" aria-hidden="true" />+ {isFullscreen && onPrevious ? (+ <ButtonTooltip title={t("pdfViewer.previous")}>+ <button type="button" className="pdf-viewer-action" aria-label={t("pdfViewer.previous")} onClick={onPrevious}>+ <ChevronLeft aria-hidden="true" />+ </button>+ </ButtonTooltip>+ ) : null}+ {isFullscreen && onNext ? (+ <ButtonTooltip title={t("pdfViewer.next")}>+ <button type="button" className="pdf-viewer-action" aria-label={t("pdfViewer.next")} onClick={onNext}>+ <ChevronRight aria-hidden="true" />+ </button>+ </ButtonTooltip>+ ) : null}+ <a+ href={url}+ target="_blank"+ rel="noreferrer"+ className="edgeever-attachment-link min-w-0 flex-1 truncate text-sm font-semibold text-slate-800"+ >+ {label}+ </a>+ {expanded && !failed ? (+ <>+ <ButtonTooltip title={t("pdfViewer.zoomOut")}>+ <button type="button" className="pdf-viewer-action" aria-label={t("pdfViewer.zoomOut")} disabled={fitWidth || zoom <= MIN_ZOOM} onClick={() => setZoom((value) => Math.max(MIN_ZOOM, value - ZOOM_STEP))}>+ <ZoomOut aria-hidden="true" />+ </button>+ </ButtonTooltip>+ <ButtonTooltip title={t("pdfViewer.zoomIn")}>+ <button type="button" className="pdf-viewer-action" aria-label={t("pdfViewer.zoomIn")} disabled={fitWidth || zoom >= MAX_ZOOM} onClick={() => setZoom((value) => Math.min(MAX_ZOOM, value + ZOOM_STEP))}>+ <ZoomIn aria-hidden="true" />+ </button>+ </ButtonTooltip>+ <ButtonTooltip title={t("pdfViewer.fitWidth")}>+ <button type="button" className={cn("pdf-viewer-action", fitWidth && "is-active")} aria-label={t("pdfViewer.fitWidth")} aria-pressed={fitWidth} onClick={() => setFitWidth((value) => !value)}>+ <RotateCcw aria-hidden="true" />+ </button>+ </ButtonTooltip>+ </>+ ) : null}+ <ButtonTooltip title={t("pdfViewer.download")}>+ <a className="pdf-viewer-action" href={url} download={label} aria-label={t("pdfViewer.download")}><Download aria-hidden="true" /></a>+ </ButtonTooltip>+ <ButtonTooltip title={t("pdfViewer.openExternal")}>+ <a className="pdf-viewer-action" href={url} target="_blank" rel="noreferrer" aria-label={t("pdfViewer.openExternal")}><ExternalLink aria-hidden="true" /></a>+ </ButtonTooltip>+ {isFullscreen || (expanded && !failed) ? (+ <ButtonTooltip title={isFullscreen ? t("pdfViewer.exitFullscreen") : t("pdfViewer.fullscreen")}>+ <button type="button" className="pdf-viewer-action" aria-label={isFullscreen ? t("pdfViewer.exitFullscreen") : t("pdfViewer.fullscreen")} onClick={() => {+ if (isFullscreen) closeFullscreen();+ else {+ setNearViewport(true);+ setInternalFullscreen(true);+ }+ }}>+ {isFullscreen ? <Minimize2 aria-hidden="true" /> : <Maximize2 aria-hidden="true" />}+ </button>+ </ButtonTooltip>+ ) : null}+ {!isFullscreen ? (+ <ButtonTooltip title={expanded ? t("pdfViewer.collapse") : t("pdfViewer.expand")}>+ <button type="button" className="pdf-viewer-action" aria-label={expanded ? t("pdfViewer.collapse") : t("pdfViewer.expand")} aria-expanded={expanded} onClick={() => setExpanded((value) => !value)}>+ {expanded ? <ChevronUp aria-hidden="true" /> : <ChevronDown aria-hidden="true" />}+ </button>+ </ButtonTooltip>+ ) : null}+ </span>+ {failed ? (+ <span className="flex min-h-24 items-center justify-center px-4 text-center text-sm text-slate-500">+ {t("pdfViewer.unavailable")}+ </span>+ ) : expanded ? (+ <span className={cn("block overflow-auto bg-slate-100", isFullscreen ? "min-h-0 flex-1" : "h-[min(72vh,52rem)]")}>+ <PdfDocument url={url} active={active} fitWidth={fitWidth} zoom={zoom} onError={handleError} />+ </span>+ ) : null}+ </span>+ </span>+ );++ return isFullscreen ? createPortal(viewer, document.body) : viewer;+};diff --git a/apps/web/src/components/settings/PreferenceCard.tsx b/apps/web/src/components/settings/PreferenceCard.tsxindex c768154a..a7deb0c0 100644--- a/apps/web/src/components/settings/PreferenceCard.tsx+++ b/apps/web/src/components/settings/PreferenceCard.tsx@@ -1,4 +1,4 @@-import { AlignHorizontalJustifyCenter, ChartNoAxesCombined, FileCode2, Image, Keyboard, Languages, MousePointerClick, Palette, RefreshCw, Sparkles } from "lucide-react";+import { AlignHorizontalJustifyCenter, ChartNoAxesCombined, FileCode2, FileText, Image, Keyboard, Languages, MousePointerClick, Palette, RefreshCw, Sparkles } from "lucide-react";import { useState, useEffect } from "react";import { useTranslation } from "react-i18next";import { writeSyncIntervalPreference, type EditorContentAlignment, type ShortcutSettings, type SyncIntervalPreference } from "@/lib/app-helpers";@@ -18,6 +18,13 @@ import {readAiSpaceShortcutPreference,writeAiSpaceShortcutPreference,} from "@/lib/ai-space-shortcut-preference";+import {+ PDF_PREVIEW_CHANGED_EVENT,+ PDF_PREVIEW_STORAGE_KEY,+ readPdfPreviewPreference,+ writePdfPreviewPreference,+ type PdfPreviewPreference,+} from "@/lib/pdf-preview-preference";import { Button } from "@/components/ui/button";import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";@@ -79,6 +86,7 @@ export const PreferenceCard = ({const [linkOpenMode, setLinkOpenMode] = useState<EditorLinkOpenMode>(() => getStoredEditorLinkOpenMode());const [aiSelectionMenuEnabled, setAiSelectionMenuEnabled] = useState(readAiSelectionMenuPreference);const [aiSpaceShortcutEnabled, setAiSpaceShortcutEnabled] = useState(readAiSpaceShortcutPreference);+ const [pdfPreviewPreference, setPdfPreviewPreference] = useState<PdfPreviewPreference>(readPdfPreviewPreference);useEffect(() => {const mediaQuery = window.matchMedia("(max-width: 640px)");@@ -88,6 +96,23 @@ export const PreferenceCard = ({return () => mediaQuery.removeEventListener("change", handler);}, []);+ useEffect(() => {+ const syncPreference = () => setPdfPreviewPreference(readPdfPreviewPreference());+ const onPreferenceChanged = (event: Event) => {+ const detail = (event as CustomEvent<PdfPreviewPreference>).detail;+ setPdfPreviewPreference(detail === "collapsed" ? "collapsed" : "expanded");+ };+ const onStorage = (event: StorageEvent) => {+ if (!event.key || event.key === PDF_PREVIEW_STORAGE_KEY) syncPreference();+ };+ window.addEventListener(PDF_PREVIEW_CHANGED_EVENT, onPreferenceChanged);+ window.addEventListener("storage", onStorage);+ return () => {+ window.removeEventListener(PDF_PREVIEW_CHANGED_EVENT, onPreferenceChanged);+ window.removeEventListener("storage", onStorage);+ };+ }, []);+useEffect(() => {const syncPreference = () => setAiSpaceShortcutEnabled(readAiSpaceShortcutPreference());const onPreferenceChanged = (event: Event) => {@@ -408,6 +433,27 @@ export const PreferenceCard = ({</div></div>+ <div className="flex min-h-16 flex-col items-start gap-3 px-4 py-3 sm:flex-row sm:items-center sm:justify-between sm:gap-4">+ <div className="flex min-w-0 items-start gap-3">+ <FileText className="mt-0.5 h-4 w-4 shrink-0 text-emerald-700" />+ <div className="min-w-0">+ <div className="text-sm font-semibold text-slate-900">{t("settings.pdfPreviewDefaultTitle")}</div>+ <div className="mt-0.5 text-xs leading-4 text-slate-500">{t("settings.pdfPreviewDefaultDescription")}</div>+ </div>+ </div>+ <div className="flex w-full shrink-0 justify-start sm:w-44 sm:justify-end">+ <Switch+ checked={pdfPreviewPreference === "expanded"}+ onCheckedChange={(enabled) => {+ const nextPreference = enabled ? "expanded" : "collapsed";+ writePdfPreviewPreference(nextPreference);+ setPdfPreviewPreference(nextPreference);+ }}+ aria-label={t("settings.pdfPreviewDefaultAria")}+ />+ </div>+ </div>+<div className="flex min-h-16 flex-col items-start gap-3 px-4 py-3 sm:flex-row sm:items-center sm:justify-between sm:gap-4"><div className="flex min-w-0 items-start gap-3"><Sparkles className="mt-0.5 h-4 w-4 shrink-0 text-emerald-700" />diff --git a/apps/web/src/lib/pdf-preview-preference.test.mjs b/apps/web/src/lib/pdf-preview-preference.test.mjsnew file mode 100644index 00000000..f81f10b7--- /dev/null+++ b/apps/web/src/lib/pdf-preview-preference.test.mjs@@ -0,0 +1,11 @@+import { describe, expect, test } from "bun:test";+import { resolvePdfPreviewPreference } from "./pdf-preview-preference.ts";++describe("PDF preview preference", () => {+ test("defaults to expanded and accepts the explicit collapsed mode", () => {+ expect(resolvePdfPreviewPreference(null)).toBe("expanded");+ expect(resolvePdfPreviewPreference("expanded")).toBe("expanded");+ expect(resolvePdfPreviewPreference("unexpected")).toBe("expanded");+ expect(resolvePdfPreviewPreference("collapsed")).toBe("collapsed");+ });+});diff --git a/apps/web/src/lib/pdf-preview-preference.ts b/apps/web/src/lib/pdf-preview-preference.tsnew file mode 100644index 00000000..3b19a58d--- /dev/null+++ b/apps/web/src/lib/pdf-preview-preference.ts@@ -0,0 +1,26 @@+export type PdfPreviewPreference = "expanded" | "collapsed";++export const PDF_PREVIEW_STORAGE_KEY = "edgeever.pdfPreviewMode.v1";+export const PDF_PREVIEW_CHANGED_EVENT = "edgeever:pdf-preview-preference-changed";++export const resolvePdfPreviewPreference = (value: string | null): PdfPreviewPreference =>+ value === "collapsed" ? "collapsed" : "expanded";++export const readPdfPreviewPreference = (): PdfPreviewPreference => {+ try {+ return resolvePdfPreviewPreference(+ typeof window === "undefined" ? null : window.localStorage.getItem(PDF_PREVIEW_STORAGE_KEY),+ );+ } catch {+ return "expanded";+ }+};++export const writePdfPreviewPreference = (preference: PdfPreviewPreference) => {+ try {+ window.localStorage.setItem(PDF_PREVIEW_STORAGE_KEY, preference);+ } catch {+ // Local storage can be unavailable in private or restricted browser contexts.+ }+ window.dispatchEvent(new CustomEvent(PDF_PREVIEW_CHANGED_EVENT, { detail: preference }));+};diff --git a/apps/web/src/styles/globals.css b/apps/web/src/styles/globals.cssindex 73a8e4c8..3957abba 100644--- a/apps/web/src/styles/globals.css+++ b/apps/web/src/styles/globals.css@@ -706,6 +706,39 @@ textarea {transition: border-color 160ms ease, background 160ms ease, box-shadow 160ms ease;}+.edgeever-pdf-attachment-node {+ display: block;+ margin: 0.75rem 0 1rem;+}++.pdf-viewer-action {+ display: inline-flex;+ width: 2rem;+ height: 2rem;+ flex: 0 0 auto;+ align-items: center;+ justify-content: center;+ border-radius: 0.45rem;+ color: rgb(var(--slate-500-rgb));+ transition: color 150ms ease, background 150ms ease;+}++.pdf-viewer-action:hover:not(:disabled),+.pdf-viewer-action.is-active {+ background: var(--brand-green-soft);+ color: var(--brand-green-text);+}++.pdf-viewer-action:disabled {+ cursor: not-allowed;+ opacity: 0.35;+}++.pdf-viewer-action svg {+ width: 1rem;+ height: 1rem;+}+.ProseMirror li:has(> p > a[href*="/api/v1/resources/"]) {margin-bottom: 0.25rem;}@@ -731,6 +764,26 @@ textarea {color: rgb(var(--slate-800-rgb));}+.ProseMirror .edgeever-pdf-viewer a.edgeever-attachment-link,+.ProseMirror .edgeever-pdf-viewer a[href*="/api/v1/resources/"] {+ max-width: none;+ padding: 0;+ border: 0;+ background: transparent;+ box-shadow: none;+ font-size: inherit;+}++.ProseMirror .edgeever-pdf-viewer a.edgeever-attachment-link::before,+.ProseMirror .edgeever-pdf-viewer a[href*="/api/v1/resources/"]::before {+ content: none;+}++.ProseMirror .edgeever-pdf-viewer a.pdf-viewer-action:hover {+ background: var(--brand-green-soft);+ color: var(--brand-green-text);+}+.ProseMirror ul,.ProseMirror ol {padding-left: 1.5rem;diff --git a/bun.lock b/bun.lockindex 94ea4c5e..46ff85df 100644--- a/bun.lock+++ b/bun.lock@@ -44,6 +44,7 @@"katex": "0.16.22","lucide-react": "latest","marked": "^18.0.5",+ "pdfjs-dist": "^6.2.108","react": "latest","react-dom": "latest","react-dropzone": "^15.0.0",@@ -88,7 +89,7 @@},"apps/desktop": {"name": "@edgeever/desktop",- "version": "1.41.0",+ "version": "1.42.1","dependencies": {"electron-updater": "^6.6.2",},@@ -952,6 +953,30 @@"@mozilla/readability": ["@mozilla/[email protected]", "", {}, "sha512-juG5VWh4qAivzTAeMzvY9xs9HY5rAcr2E4I7tiSSCokRFi7XIZCAu92ZkSTsIj1OPceCifL3cpfteP3pDT9/QQ=="],+ "@napi-rs/canvas": ["@napi-rs/[email protected]", "", { "optionalDependencies": { "@napi-rs/canvas-android-arm64": "1.0.8", "@napi-rs/canvas-darwin-arm64": "1.0.8", "@napi-rs/canvas-darwin-x64": "1.0.8", "@napi-rs/canvas-linux-arm-gnueabihf": "1.0.8", "@napi-rs/canvas-linux-arm64-gnu": "1.0.8", "@napi-rs/canvas-linux-arm64-musl": "1.0.8", "@napi-rs/canvas-linux-riscv64-gnu": "1.0.8", "@napi-rs/canvas-linux-x64-gnu": "1.0.8", "@napi-rs/canvas-linux-x64-musl": "1.0.8", "@napi-rs/canvas-win32-arm64-msvc": "1.0.8", "@napi-rs/canvas-win32-x64-msvc": "1.0.8" } }, "sha512-/SaLcvlqGWdm0HSCWMgHu7cjJiQXfP8/mOY+6dUyV9flQz7sPBBZ+ed2zYtoukojPmxOaL7bm+d/G4GeWWoN7g=="],++ "@napi-rs/canvas-android-arm64": ["@napi-rs/[email protected]", "", { "os": "android", "cpu": "arm64" }, "sha512-5+nkh8i3gt6lqS/d2jTZ1xAn6tdgtB4Lf1mW6T0Qm5/rXNwBuV1sAEyLEWan5o9gJPU/GuvHR3rvSeZ+FaGrbw=="],++ "@napi-rs/canvas-darwin-arm64": ["@napi-rs/[email protected]", "", { "os": "darwin", "cpu": "arm64" }, "sha512-7jQ47gi+fZ7KJmfc/5rNyy1CYw/cu4kZ0KPIYbo9UUgSdW0bKQJpt+WihEor6s4Lyp7+xc3a+3HeyXmAEbbnPg=="],++ "@napi-rs/canvas-darwin-x64": ["@napi-rs/[email protected]", "", { "os": "darwin", "cpu": "x64" }, "sha512-rRjDMZs9pIRKGxgijwezplKc1RnJsqUokrA9h88bbTkqQ+7ePj0ZN4ZnZDy8Vu0tXs7KRlI2tQLaK4mx9QlxHg=="],++ "@napi-rs/canvas-linux-arm-gnueabihf": ["@napi-rs/[email protected]", "", { "os": "linux", "cpu": "arm" }, "sha512-jGcCd+8ra6Q61xKqZeiItujTpp9a9eRLcQ0jW6qYNku+WpupqOPFPY0SrsuSnXFviJwkpKYT9p7QrB4lsf3LNQ=="],++ "@napi-rs/canvas-linux-arm64-gnu": ["@napi-rs/[email protected]", "", { "os": "linux", "cpu": "arm64" }, "sha512-od6I2Y7kU7i1SwZYG2EKW8rWz6JiedtPpko4WEe1DDsiikrfaotVBCRaUTM5/yeZKaZ92EatoAS+5xG+6uJlYA=="],++ "@napi-rs/canvas-linux-arm64-musl": ["@napi-rs/[email protected]", "", { "os": "linux", "cpu": "arm64" }, "sha512-yYkPbJDJiWj6N0gASA3CAvRypZmVpJnxU0DQg3aBhneLDQde9TPLKADsQkobNoJUtTT/lj46aWpzT48PDb3Qcg=="],++ "@napi-rs/canvas-linux-riscv64-gnu": ["@napi-rs/[email protected]", "", { "os": "linux", "cpu": "none" }, "sha512-PB00MSKAp4VwK/xwe6duKxRKmH8UH4GIl1pqHSbxng0jnU9Dr7FwaDypDiqwNFZ774N+8G7mJLGuLtg9NTcQsg=="],++ "@napi-rs/canvas-linux-x64-gnu": ["@napi-rs/[email protected]", "", { "os": "linux", "cpu": "x64" }, "sha512-TWM2XWJoitLiIPCvgJh7SriC+L/T9qkYCVzC66AidsZy0QP1hkKzBzVwshCdcA3q6fIn3yE0ISbq4lMJSy8jFw=="],++ "@napi-rs/canvas-linux-x64-musl": ["@napi-rs/[email protected]", "", { "os": "linux", "cpu": "x64" }, "sha512-hb20MxKXXb5IB7AAwN8UHz9WRsa2HmdZfjsDCzjElwJoeV1aotVEwFU4FrFQcYQVzsJQLeaCc/2Qdt/0Q72mMg=="],++ "@napi-rs/canvas-win32-arm64-msvc": ["@napi-rs/[email protected]", "", { "os": "win32", "cpu": "arm64" }, "sha512-WwPN08IXE4SkL+FhJyPz/iFnycMAUkbphFIT4cmKLlvbSU0Zfn1R7BGJ3Hqky1S89QUYc0Q4IOScXb/42Re9wQ=="],++ "@napi-rs/canvas-win32-x64-msvc": ["@napi-rs/[email protected]", "", { "os": "win32", "cpu": "x64" }, "sha512-XkrVqKb+pxyba7kjy2LJvABFVBTE0DNpEl7MrG4OYUmaWarrXH+t54z/Czj2YxCKtizYTV4mg6phNm3x24qjhQ=="],+"@napi-rs/wasm-runtime": ["@napi-rs/[email protected]", "", { "dependencies": { "@tybys/wasm-util": "^0.10.3" }, "peerDependencies": { "@emnapi/core": "^1.7.1", "@emnapi/runtime": "^1.7.1" } }, "sha512-ZLv/JdUfkvOy9eCnnBaGfiO+XimbjebAeO+MRQqD/B+FR1tnRN0tpKSJHRbE8sFfS6aqsXZ67TQjfwfsxULVbg=="],"@noble/hashes": ["@noble/[email protected]", "", {}, "sha512-IYqDGiTXab6FniAgnSdZwgWbomxpy9FtYvLKs7wCUs2a8RkITG+DFGO1DM9cr+E3/RgADRpFjrKVaJ1z6sjtEg=="],@@ -3240,6 +3265,8 @@"pathe": ["[email protected]", "", {}, "sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w=="],+ "pdfjs-dist": ["[email protected]", "", { "optionalDependencies": { "@napi-rs/canvas": "^1.0.0" } }, "sha512-YxFb+SQcodN2rnX9Tn3dHYlqfb7NjlzzfONPpJd+AKoKtUjEdevTfbC07d5TcczzOK6261auRkP/M8OBHs9vFQ=="],+"pe-library": ["[email protected]", "", {}, "sha512-eRWB5LBz7PpDu4PUlwT0PhnQfTQJlDDdPa35urV4Osrm0t0AqQFGn+UIkU3klZvwJ8KPO3VbBFsXquA6p6kqZw=="],"pend": ["[email protected]", "", {}, "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg=="],diff --git a/package.json b/package.jsonindex fc6b3dff..349c8e9f 100644--- a/package.json+++ b/package.json@@ -149,6 +149,7 @@"katex": "0.16.22","lucide-react": "latest","marked": "^18.0.5",+ "pdfjs-dist": "^6.2.108","react": "latest","react-dom": "latest","react-dropzone": "^15.0.0",diff --git a/packages/shared/src/content.test.mjs b/packages/shared/src/content.test.mjsindex d12c2c0d..6852ff66 100644--- a/packages/shared/src/content.test.mjs+++ b/packages/shared/src/content.test.mjs@@ -6,6 +6,7 @@ import {markdownToDoc,MERGE_DIVIDER_MARKDOWN_MARKER,MERGE_DIVIDER_NODE_TYPE,+ PDF_ATTACHMENT_NODE_TYPE,mergeMemoDocs,resolveMemoContentDoc,resolveMemoContentMarkdown,@@ -26,6 +27,43 @@ describe("merged memo title", () => {});});+describe("PDF attachment Markdown compatibility", () => {+ test("parses a standalone PDF link as a viewer node and preserves the link on export", () => {+ const markdown = "[Attachment: report.pdf](/api/v1/resources/res_pdf/blob)";+ const doc = markdownToDoc(markdown);++ expect(doc.content[0]).toMatchObject({+ type: "paragraph",+ content: [{+ type: PDF_ATTACHMENT_NODE_TYPE,+ attrs: { label: "Attachment: report.pdf", url: "/api/v1/resources/res_pdf/blob" },+ }],+ });+ expect(docToMarkdown(doc)).toBe(markdown);+ });++ test("upgrades a legacy standalone PDF link paragraph", () => {+ const legacyDoc = {+ type: "doc",+ content: [{+ type: "paragraph",+ content: [{+ type: "text",+ text: "Attachment: archive.pdf",+ marks: [{ type: "link", attrs: { href: "/api/v1/resources/res_archive/blob" } }],+ }],+ }],+ };++ expect(resolveMemoContentDoc(legacyDoc, "").content[0]?.content?.[0]?.type).toBe(PDF_ATTACHMENT_NODE_TYPE);+ });++ test("renders PDF links nested in Markdown lists", () => {+ const doc = markdownToDoc("- [Product brief.pdf](/api/v1/resources/res_pdf/blob)");+ expect(doc.content[0]?.content?.[0]?.content?.[0]?.content?.[0]?.type).toBe(PDF_ATTACHMENT_NODE_TYPE);+ });+});+describe("memo character count", () => {test("counts punctuation while excluding whitespace and formatting", () => {const doc = markdownToDoc("你好, **EdgeEver**!\n\n下一行");diff --git a/packages/shared/src/content.ts b/packages/shared/src/content.tsindex 5335de3c..8c6d8789 100644--- a/packages/shared/src/content.ts+++ b/packages/shared/src/content.ts@@ -4,6 +4,7 @@ import { TableKit } from "@tiptap/extension-table";import { Markdown, MarkdownManager } from "@tiptap/markdown";import StarterKit from "@tiptap/starter-kit";import { MergeDivider, MERGE_DIVIDER_NODE_TYPE } from "./merge-divider";+import { PdfAttachment, PDF_ATTACHMENT_NODE_TYPE, upgradeStandalonePdfLinks } from "./pdf-attachment";import {BLOCK_MATH_NODE_TYPE,createEdgeEverMarkdownMathematics,@@ -23,6 +24,13 @@ export {createMergeDividerNode,} from "./merge-divider";+export {+ PdfAttachment,+ PDF_ATTACHMENT_NODE_TYPE,+ isPdfAttachment,+ upgradeStandalonePdfLinks,+} from "./pdf-attachment";+export type TiptapTextNode = {type: "text";text: string;@@ -75,6 +83,7 @@ const markdownManager = new MarkdownManager({TaskItem.configure({ nested: true }),TableKit,Image,+ PdfAttachment,MergeDivider,...createEdgeEverMarkdownMathematics(),Markdown.configure({@@ -110,7 +119,7 @@ export const resolveMemoContentDoc = (contentMarkdown: string | null | undefined): TiptapDoc => {const currentDoc = contentJson && Array.isArray(contentJson.content)- ? upgradeLegacyAttachmentLinks(contentJson)+ ? upgradeStandalonePdfLinks(upgradeLegacyAttachmentLinks(contentJson)): emptyDoc();if (!contentMarkdown?.trim() ||@@ -120,6 +129,7 @@ export const resolveMemoContentDoc = (docContainsNodeType(currentDoc, MERGE_DIVIDER_NODE_TYPE) ||docContainsNodeType(currentDoc, BLOCK_MATH_NODE_TYPE) ||docContainsNodeType(currentDoc, INLINE_MATH_NODE_TYPE)+ || docContainsNodeType(currentDoc, PDF_ATTACHMENT_NODE_TYPE)) {return currentDoc;}@@ -205,6 +215,11 @@ export const docToText = (doc: unknown): string => {}}+ if (current.type === PDF_ATTACHMENT_NODE_TYPE) {+ const label = getStringAttr(current.attrs, "label");+ if (label) pieces.push(label);+ }+if (current.type === BLOCK_MATH_NODE_TYPE || current.type === INLINE_MATH_NODE_TYPE) {const latex = getStringAttr(current.attrs, "latex");if (latex) {@@ -250,12 +265,17 @@ export const countMemoCharacters = (doc: unknown): number => {return;}- const current = node as { text?: unknown; content?: unknown };+ const current = node as { type?: unknown; text?: unknown; attrs?: Record<string, unknown>; content?: unknown };if (typeof current.text === "string") {pieces.push(current.text);}+ if (current.type === PDF_ATTACHMENT_NODE_TYPE) {+ const label = getStringAttr(current.attrs, "label");+ if (label) pieces.push(label);+ }+if (Array.isArray(current.content)) {for (const child of current.content) {walk(child);diff --git a/packages/shared/src/i18n/en-US.ts b/packages/shared/src/i18n/en-US.tsindex 6ae94f48..1603ee61 100644--- a/packages/shared/src/i18n/en-US.ts+++ b/packages/shared/src/i18n/en-US.ts@@ -182,6 +182,9 @@ export const enUS = {imageCompressionTitle: "Compress note images",imageCompressionDescription: "Compress large images locally before upload to reduce storage use.",imageCompressionAria: "Compress note images",+ pdfPreviewDefaultTitle: "Expand PDF previews by default",+ pdfPreviewDefaultDescription: "Show PDF contents inline by default, or turn this off for compact cards. Saved in this browser.",+ pdfPreviewDefaultAria: "Expand note PDF previews by default",aiStreamingTitle: "Stream AI responses",aiStreamingDescription: "Turn on to watch AI content generation in real time; turn off for greater stability.",aiStreamingAria: "Stream AI responses",@@ -927,6 +930,7 @@ export const enUS = {noMatchesDescription: "Try changing the search term or category filter",emptyDescription: "Images and attachments added to notes will appear here",previewImage: "Preview image",+ previewPdf: "Preview PDF {{filename}}",downloadOpen: "Download/open",deletedMemo: "Deleted note",fromMemo: "From: {{source}}",@@ -965,6 +969,22 @@ export const enUS = {restoreConfirmDescription: "The current content will be replaced by this historical version, and a new revision will still be created.",restoreConfirmLabel: "Restore",},+ pdfViewer: {+ loading: "Loading PDF…",+ unavailable: "This PDF cannot be previewed. You can still download it or open it externally.",+ fullscreenLabel: "PDF viewer: {{filename}}",+ zoomIn: "Zoom in",+ zoomOut: "Zoom out",+ fitWidth: "Fit to width",+ fullscreen: "Enter fullscreen",+ exitFullscreen: "Exit fullscreen",+ download: "Download PDF",+ openExternal: "Open externally",+ collapse: "Collapse preview",+ expand: "Expand preview",+ previous: "Previous PDF",+ next: "Next PDF",+ },editor: {imageScale: "Image scale",scaleTo: "Scale to {{percent}}%",diff --git a/packages/shared/src/i18n/zh-CN.ts b/packages/shared/src/i18n/zh-CN.tsindex 155a83e8..c7ff99e6 100644--- a/packages/shared/src/i18n/zh-CN.ts+++ b/packages/shared/src/i18n/zh-CN.ts@@ -182,6 +182,9 @@ export const zhCN = {imageCompressionTitle: "压缩笔记内图片",imageCompressionDescription: "上传大图时在本地压缩,节省资源占用。",imageCompressionAria: "是否压缩笔记内图片",+ pdfPreviewDefaultTitle: "默认展开 PDF 预览",+ pdfPreviewDefaultDescription: "开启后,笔记内 PDF 默认直接显示内容;关闭后默认显示紧凑卡片。偏好保存在当前浏览器中。",+ pdfPreviewDefaultAria: "笔记内 PDF 是否默认展开预览",aiStreamingTitle: "流式返回 AI 结果",aiStreamingDescription: "开启后实时展示 AI 内容生成过程;关闭可获得更高稳定性。",aiStreamingAria: "是否流式返回 AI 结果",@@ -927,6 +930,7 @@ export const zhCN = {noMatchesDescription: "请尝试更改搜索词或分类过滤器",emptyDescription: "在笔记中添加的图片和附件会显示在这里",previewImage: "大图预览",+ previewPdf: "预览 PDF {{filename}}",downloadOpen: "下载/打开",deletedMemo: "已删除笔记",fromMemo: "来自:{{source}}",@@ -965,6 +969,22 @@ export const zhCN = {restoreConfirmDescription: "当前内容会被这个历史版本替换,恢复后仍会产生新的历史记录。",restoreConfirmLabel: "恢复",},+ pdfViewer: {+ loading: "正在加载 PDF…",+ unavailable: "无法预览此 PDF,你仍可下载或在外部打开。",+ fullscreenLabel: "PDF 查看器:{{filename}}",+ zoomIn: "放大",+ zoomOut: "缩小",+ fitWidth: "适合宽度",+ fullscreen: "进入全屏",+ exitFullscreen: "退出全屏",+ download: "下载 PDF",+ openExternal: "在外部打开",+ collapse: "收起预览",+ expand: "展开预览",+ previous: "上一个 PDF",+ next: "下一个 PDF",+ },editor: {imageScale: "图片缩放",scaleTo: "缩放到 {{percent}}%",diff --git a/packages/shared/src/index.ts b/packages/shared/src/index.tsindex 3b800131..ea79287f 100644--- a/packages/shared/src/index.ts+++ b/packages/shared/src/index.ts@@ -22,4 +22,5 @@ export * from "./sharing";export * from "./sync";export * from "./desktop-rpc";export * from "./note-image-card";+export * from "./pdf-attachment";export * from "./types";diff --git a/packages/shared/src/pdf-attachment.ts b/packages/shared/src/pdf-attachment.tsnew file mode 100644index 00000000..875bc1a1--- /dev/null+++ b/packages/shared/src/pdf-attachment.ts@@ -0,0 +1,110 @@+import { mergeAttributes, Node } from "@tiptap/core";+import type { TiptapDoc, TiptapMark, TiptapNode, TiptapTextNode } from "./content";++export const PDF_ATTACHMENT_NODE_TYPE = "edgeeverPdfAttachment" as const;++const PDF_LINK_PATTERN = /^\[([^\]]+)\]\(([^\s)]+)(?:\s+"[^"]*")?\)/;++export const isPdfAttachment = (mimeType: string | null | undefined, filename: string | null | undefined) =>+ mimeType?.toLowerCase() === "application/pdf" || filename?.trim().toLowerCase().endsWith(".pdf") === true;++const escapeMarkdownLabel = (value: string) =>+ value.replace(/\\/g, "\\\\").replace(/\[/g, "\\[").replace(/\]/g, "\\]");++export const PdfAttachment = Node.create({+ name: PDF_ATTACHMENT_NODE_TYPE,+ group: "inline",+ inline: true,+ atom: true,+ selectable: true,+ draggable: true,++ addAttributes() {+ return {+ url: {+ default: "",+ parseHTML: (element) => element.getAttribute("data-pdf-url") || "",+ renderHTML: (attributes) => ({ "data-pdf-url": attributes.url || "" }),+ },+ label: {+ default: "PDF",+ parseHTML: (element) => element.getAttribute("data-pdf-label") || "PDF",+ renderHTML: (attributes) => ({ "data-pdf-label": attributes.label || "PDF" }),+ },+ };+ },++ parseHTML() {+ return [{ tag: 'span[data-type="edgeever-pdf-attachment"]' }];+ },++ renderHTML({ HTMLAttributes }) {+ return [+ "span",+ mergeAttributes(HTMLAttributes, {+ "data-type": "edgeever-pdf-attachment",+ class: "edgeever-pdf-attachment",+ }),+ ];+ },++ parseMarkdown: (token) => ({+ type: PDF_ATTACHMENT_NODE_TYPE,+ attrs: { url: token.url || "", label: token.label || "PDF" },+ }),++ renderMarkdown: (node) => `[${escapeMarkdownLabel(String(node.attrs?.label || "PDF"))}](${String(node.attrs?.url || "")})`,++ markdownTokenizer: {+ name: PDF_ATTACHMENT_NODE_TYPE,+ level: "inline",+ start(source: string) {+ const linkStart = source.indexOf("[");+ return linkStart;+ },+ tokenize(source: string) {+ const match = PDF_LINK_PATTERN.exec(source);+ if (!match || !isPdfAttachment(null, match[1]) && !isPdfAttachment(null, match[2])) {+ return undefined;+ }+ return {+ type: PDF_ATTACHMENT_NODE_TYPE,+ raw: match[0],+ label: match[1],+ url: match[2],+ };+ },+ },+});++const getLinkMark = (node: TiptapTextNode): TiptapMark | undefined =>+ node.marks?.find((mark) => mark.type === "link" && typeof mark.attrs?.href === "string");++/** Upgrade legacy standalone PDF link paragraphs without changing their Markdown representation. */+export const upgradeStandalonePdfLinks = (doc: TiptapDoc): TiptapDoc => {+ let changed = false;+ const visit = (node: TiptapNode): TiptapNode => {+ if (node.type === "paragraph" && node.content?.length === 1) {+ const child = node.content[0];+ if (child.type === "text" && "text" in child) {+ const link = getLinkMark(child);+ const href = link?.attrs?.href;+ if (typeof href === "string" && (isPdfAttachment(null, child.text) || isPdfAttachment(null, href))) {+ changed = true;+ return {+ ...node,+ content: [{+ type: PDF_ATTACHMENT_NODE_TYPE,+ attrs: { url: href, label: child.text },+ }],+ };+ }+ }+ }+ return node.content+ ? { ...node, content: node.content.map((child) => child.type === "text" ? child : visit(child)) }+ : node;+ };+ const content = doc.content.map(visit);+ return changed ? { ...doc, content } : doc;+};