ruflo 3.10.35 → 3.10.37

package/src/ruvocal/src/lib/utils/loadAttachmentsFromUrls.ts

@@ -1,115 +1,115 @@
-import { base } from "$app/paths";
-import { pickSafeMime } from "$lib/utils/mime";
-
-export interface AttachmentLoadResult {
-	files: File[];
-	errors: string[];
-}
-
-/**
- * Parse attachment URLs from query parameters
- * Supports both comma-separated (?attachments=url1,url2) and multiple params (?attachments=url1&attachments=url2)
- */
-function parseAttachmentUrls(searchParams: URLSearchParams): string[] {
-	const urls: string[] = [];
-
-	// Get all 'attachments' parameters
-	const attachmentParams = searchParams.getAll("attachments");
-
-	for (const param of attachmentParams) {
-		// Split by comma in case multiple URLs are in one param
-		const splitUrls = param.split(",").map((url) => url.trim());
-		urls.push(...splitUrls);
-	}
-
-	// Filter out empty strings
-	return urls.filter((url) => url.length > 0);
-}
-
-/**
- * Extract filename from URL or Content-Disposition header
- */
-function extractFilename(url: string, contentDisposition?: string | null): string {
-	// Try to get filename from Content-Disposition header
-	if (contentDisposition) {
-		const filenameStar = contentDisposition.match(/filename\*=UTF-8''([^;]+)/i)?.[1];
-		if (filenameStar) {
-			const cleaned = filenameStar.trim().replace(/['"]/g, "");
-			try {
-				return decodeURIComponent(cleaned);
-			} catch {
-				return cleaned;
-			}
-		}
-
-		const match = contentDisposition.match(/filename[^;=\n]*=((['"]).*?\2|[^;\n]*)/);
-		if (match && match[1]) return match[1].replace(/['"]/g, "");
-	}
-
-	// Fallback: extract from URL
-	try {
-		const urlObj = new URL(url);
-		const pathname = urlObj.pathname;
-		const segments = pathname.split("/");
-		const lastSegment = segments[segments.length - 1];
-
-		if (lastSegment && lastSegment.length > 0) {
-			return decodeURIComponent(lastSegment);
-		}
-	} catch {
-		// Invalid URL, fall through to default
-	}
-
-	return "attachment";
-}
-
-/**
- * Load files from remote URLs via server-side proxy
- */
-export async function loadAttachmentsFromUrls(
-	searchParams: URLSearchParams
-): Promise<AttachmentLoadResult> {
-	const urls = parseAttachmentUrls(searchParams);
-
-	if (urls.length === 0) {
-		return { files: [], errors: [] };
-	}
-
-	const files: File[] = [];
-	const errors: string[] = [];
-
-	await Promise.all(
-		urls.map(async (url) => {
-			try {
-				// Fetch via our proxy endpoint to bypass CORS
-				const proxyUrl = `${base}/api/fetch-url?${new URLSearchParams({ url })}`;
-				const response = await fetch(proxyUrl);
-
-				if (!response.ok) {
-					const errorText = await response.text();
-					errors.push(`Failed to fetch ${url}: ${errorText}`);
-					return;
-				}
-
-				const forwardedType = response.headers.get("x-forwarded-content-type");
-				const blob = await response.blob();
-				const mimeType = pickSafeMime(forwardedType, blob.type, url);
-				const contentDisposition = response.headers.get("content-disposition");
-				const filename = extractFilename(url, contentDisposition);
-
-				// Create File object
-				const file = new File([blob], filename, {
-					type: mimeType,
-				});
-
-				files.push(file);
-			} catch (err) {
-				const message = err instanceof Error ? err.message : "Unknown error";
-				errors.push(`Failed to load ${url}: ${message}`);
-				console.error(`Error loading attachment from ${url}:`, err);
-			}
-		})
-	);
-
-	return { files, errors };
-}
+import { base } from "$app/paths";
+import { pickSafeMime } from "$lib/utils/mime";
+
+export interface AttachmentLoadResult {
+	files: File[];
+	errors: string[];
+}
+
+/**
+ * Parse attachment URLs from query parameters
+ * Supports both comma-separated (?attachments=url1,url2) and multiple params (?attachments=url1&attachments=url2)
+ */
+function parseAttachmentUrls(searchParams: URLSearchParams): string[] {
+	const urls: string[] = [];
+
+	// Get all 'attachments' parameters
+	const attachmentParams = searchParams.getAll("attachments");
+
+	for (const param of attachmentParams) {
+		// Split by comma in case multiple URLs are in one param
+		const splitUrls = param.split(",").map((url) => url.trim());
+		urls.push(...splitUrls);
+	}
+
+	// Filter out empty strings
+	return urls.filter((url) => url.length > 0);
+}
+
+/**
+ * Extract filename from URL or Content-Disposition header
+ */
+function extractFilename(url: string, contentDisposition?: string | null): string {
+	// Try to get filename from Content-Disposition header
+	if (contentDisposition) {
+		const filenameStar = contentDisposition.match(/filename\*=UTF-8''([^;]+)/i)?.[1];
+		if (filenameStar) {
+			const cleaned = filenameStar.trim().replace(/['"]/g, "");
+			try {
+				return decodeURIComponent(cleaned);
+			} catch {
+				return cleaned;
+			}
+		}
+
+		const match = contentDisposition.match(/filename[^;=\n]*=((['"]).*?\2|[^;\n]*)/);
+		if (match && match[1]) return match[1].replace(/['"]/g, "");
+	}
+
+	// Fallback: extract from URL
+	try {
+		const urlObj = new URL(url);
+		const pathname = urlObj.pathname;
+		const segments = pathname.split("/");
+		const lastSegment = segments[segments.length - 1];
+
+		if (lastSegment && lastSegment.length > 0) {
+			return decodeURIComponent(lastSegment);
+		}
+	} catch {
+		// Invalid URL, fall through to default
+	}
+
+	return "attachment";
+}
+
+/**
+ * Load files from remote URLs via server-side proxy
+ */
+export async function loadAttachmentsFromUrls(
+	searchParams: URLSearchParams
+): Promise<AttachmentLoadResult> {
+	const urls = parseAttachmentUrls(searchParams);
+
+	if (urls.length === 0) {
+		return { files: [], errors: [] };
+	}
+
+	const files: File[] = [];
+	const errors: string[] = [];
+
+	await Promise.all(
+		urls.map(async (url) => {
+			try {
+				// Fetch via our proxy endpoint to bypass CORS
+				const proxyUrl = `${base}/api/fetch-url?${new URLSearchParams({ url })}`;
+				const response = await fetch(proxyUrl);
+
+				if (!response.ok) {
+					const errorText = await response.text();
+					errors.push(`Failed to fetch ${url}: ${errorText}`);
+					return;
+				}
+
+				const forwardedType = response.headers.get("x-forwarded-content-type");
+				const blob = await response.blob();
+				const mimeType = pickSafeMime(forwardedType, blob.type, url);
+				const contentDisposition = response.headers.get("content-disposition");
+				const filename = extractFilename(url, contentDisposition);
+
+				// Create File object
+				const file = new File([blob], filename, {
+					type: mimeType,
+				});
+
+				files.push(file);
+			} catch (err) {
+				const message = err instanceof Error ? err.message : "Unknown error";
+				errors.push(`Failed to load ${url}: ${message}`);
+				console.error(`Error loading attachment from ${url}:`, err);
+			}
+		})
+	);
+
+	return { files, errors };
+}

package/src/ruvocal/src/lib/utils/marked.spec.ts

@@ -1,96 +1,96 @@
-import { describe, expect, test } from "vitest";
-import { processTokensSync } from "./marked";
-
-function renderHtml(md: string): string {
-	const tokens = processTokensSync(md, []);
-	const textToken = tokens.find((token) => token.type === "text");
-	if (!textToken || textToken.type !== "text") return "";
-	return typeof textToken.html === "string" ? textToken.html : "";
-}
-
-describe("marked basic rendering", () => {
-	test("renders bold text", () => {
-		const html = renderHtml("**bold**");
-		expect(html).toContain("<strong>bold</strong>");
-	});
-
-	test("renders links", () => {
-		const html = renderHtml("[link](https://example.com)");
-		expect(html).toContain('<a href="https://example.com"');
-		expect(html).toContain("link</a>");
-	});
-
-	test("renders paragraphs", () => {
-		const html = renderHtml("hello world");
-		expect(html).toContain("<p>hello world</p>");
-	});
-});
-
-describe("marked image renderer", () => {
-	test("renders video extensions as <video>", () => {
-		const html = renderHtml("![](https://example.com/clip.mp4)");
-		expect(html).toContain("<video controls");
-		expect(html).toContain('<source src="https://example.com/clip.mp4">');
-	});
-
-	test("renders audio extensions as <audio>", () => {
-		const html = renderHtml("![](https://example.com/clip.mp3)");
-		expect(html).toContain("<audio controls");
-		expect(html).toContain('<source src="https://example.com/clip.mp3">');
-	});
-
-	test("renders non-video images as <img>", () => {
-		const html = renderHtml("![](https://example.com/pic.png)");
-		expect(html).toContain('<img src="https://example.com/pic.png"');
-	});
-
-	test("renders video with query params", () => {
-		const html = renderHtml("![](https://example.com/clip.mp4?token=abc)");
-		expect(html).toContain("<video controls");
-		expect(html).toContain("clip.mp4?token=abc");
-	});
-});
-
-describe("marked html video tag support", () => {
-	test("allows raw <video> tags with controls", () => {
-		const html = renderHtml('<video controls src="https://example.com/video.mp4"></video>');
-		expect(html).toContain("<video");
-		expect(html).toContain("controls");
-		expect(html).toContain('src="https://example.com/video.mp4"');
-	});
-
-	test("allows <video> with nested <source> tags", () => {
-		const html = renderHtml(
-			'<video controls><source src="https://example.com/video.webm" type="video/webm"></video>'
-		);
-		expect(html).toContain("<video");
-		expect(html).toContain("<source");
-		expect(html).toContain('src="https://example.com/video.webm"');
-	});
-
-	test("strips disallowed attributes from video tags", () => {
-		const html = renderHtml('<video onclick="alert(1)" src="https://example.com/v.mp4"></video>');
-		expect(html).toContain("<video");
-		expect(html).not.toContain("onclick");
-	});
-
-	test("strips javascript: URLs from media sources", () => {
-		const html = renderHtml('<video controls src="javascript:alert(1)"></video>');
-		expect(html).not.toContain("javascript:");
-	});
-
-	test("escapes disallowed html tags", () => {
-		const html = renderHtml("<script>alert(1)</script>");
-		expect(html).not.toContain("<script>");
-		expect(html).toContain("&lt;script&gt;");
-	});
-
-	test("allows <audio> tags with controls", () => {
-		const html = renderHtml(
-			'<audio controls><source src="https://example.com/audio.mp3" type="audio/mpeg"></audio>'
-		);
-		expect(html).toContain("<audio");
-		expect(html).toContain("<source");
-		expect(html).toContain('type="audio/mpeg"');
-	});
-});
+import { describe, expect, test } from "vitest";
+import { processTokensSync } from "./marked";
+
+function renderHtml(md: string): string {
+	const tokens = processTokensSync(md, []);
+	const textToken = tokens.find((token) => token.type === "text");
+	if (!textToken || textToken.type !== "text") return "";
+	return typeof textToken.html === "string" ? textToken.html : "";
+}
+
+describe("marked basic rendering", () => {
+	test("renders bold text", () => {
+		const html = renderHtml("**bold**");
+		expect(html).toContain("<strong>bold</strong>");
+	});
+
+	test("renders links", () => {
+		const html = renderHtml("[link](https://example.com)");
+		expect(html).toContain('<a href="https://example.com"');
+		expect(html).toContain("link</a>");
+	});
+
+	test("renders paragraphs", () => {
+		const html = renderHtml("hello world");
+		expect(html).toContain("<p>hello world</p>");
+	});
+});
+
+describe("marked image renderer", () => {
+	test("renders video extensions as <video>", () => {
+		const html = renderHtml("![](https://example.com/clip.mp4)");
+		expect(html).toContain("<video controls");
+		expect(html).toContain('<source src="https://example.com/clip.mp4">');
+	});
+
+	test("renders audio extensions as <audio>", () => {
+		const html = renderHtml("![](https://example.com/clip.mp3)");
+		expect(html).toContain("<audio controls");
+		expect(html).toContain('<source src="https://example.com/clip.mp3">');
+	});
+
+	test("renders non-video images as <img>", () => {
+		const html = renderHtml("![](https://example.com/pic.png)");
+		expect(html).toContain('<img src="https://example.com/pic.png"');
+	});
+
+	test("renders video with query params", () => {
+		const html = renderHtml("![](https://example.com/clip.mp4?token=abc)");
+		expect(html).toContain("<video controls");
+		expect(html).toContain("clip.mp4?token=abc");
+	});
+});
+
+describe("marked html video tag support", () => {
+	test("allows raw <video> tags with controls", () => {
+		const html = renderHtml('<video controls src="https://example.com/video.mp4"></video>');
+		expect(html).toContain("<video");
+		expect(html).toContain("controls");
+		expect(html).toContain('src="https://example.com/video.mp4"');
+	});
+
+	test("allows <video> with nested <source> tags", () => {
+		const html = renderHtml(
+			'<video controls><source src="https://example.com/video.webm" type="video/webm"></video>'
+		);
+		expect(html).toContain("<video");
+		expect(html).toContain("<source");
+		expect(html).toContain('src="https://example.com/video.webm"');
+	});
+
+	test("strips disallowed attributes from video tags", () => {
+		const html = renderHtml('<video onclick="alert(1)" src="https://example.com/v.mp4"></video>');
+		expect(html).toContain("<video");
+		expect(html).not.toContain("onclick");
+	});
+
+	test("strips javascript: URLs from media sources", () => {
+		const html = renderHtml('<video controls src="javascript:alert(1)"></video>');
+		expect(html).not.toContain("javascript:");
+	});
+
+	test("escapes disallowed html tags", () => {
+		const html = renderHtml("<script>alert(1)</script>");
+		expect(html).not.toContain("<script>");
+		expect(html).toContain("&lt;script&gt;");
+	});
+
+	test("allows <audio> tags with controls", () => {
+		const html = renderHtml(
+			'<audio controls><source src="https://example.com/audio.mp3" type="audio/mpeg"></audio>'
+		);
+		expect(html).toContain("<audio");
+		expect(html).toContain("<source");
+		expect(html).toContain('type="audio/mpeg"');
+	});
+});