schreifuchs/schreifuchs.ch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: hidden pages
/ publish (push) Failing after 2m18s
Details

Browse Source
This commit is contained in:
schreifuchs
2026-01-21 18:54:29 +01:00
parent 86803dd181
commit c937be1274
11 changed files with 154 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/routes/assets/[...path]/+server.ts
+74 -58
View File
@@ -17,67 +17,83 @@ export const GET: RequestHandler = async ({ params, url }) => {
let buffer: ArrayBuffer;
let contentType: string;
if (width || height) {
// Use Nextcloud Preview API
const baseUrl = env.NEXTCLOUD_URL?.endsWith("/") ? env.NEXTCLOUD_URL : `${env.NEXTCLOUD_URL}/`;
let fullPath = path;
if (env.NEXTCLOUD_BASE_DIR) {
const baseDir = env.NEXTCLOUD_BASE_DIR.replace(/^\/+|\/+$/g, "");
fullPath = baseDir ? `${baseDir}/${path}` : path;
}
const previewUrl = new URL(`${baseUrl}index.php/core/preview`);
// Ensure leading slash for the file parameter
const fileParam = fullPath.startsWith('/') ? fullPath : `/${fullPath}`;
previewUrl.searchParams.set("file", fileParam);
if (width) previewUrl.searchParams.set("x", width);
if (height) previewUrl.searchParams.set("y", height);
previewUrl.searchParams.set("forceIcon", "0");
const auth = Buffer.from(`${env.NEXTCLOUD_USER}:${env.NEXTCLOUD_PASSWORD}`).toString("base64");
console.log(`Fetching preview: ${previewUrl.toString()} for file: ${fullPath}`);
try {
const response = await fetch(previewUrl.toString(), {
headers: {
"Authorization": `Basic ${auth}`
}
});
if (response.ok) {
buffer = await response.arrayBuffer();
contentType = response.headers.get("Content-Type") || "image/png";
return new Response(buffer, {
headers: {
"Content-Type": contentType,
"Cache-Control": "public, max-age=86400",
"Vary": "Accept-Encoding"
}
});
} else {
console.warn(`Nextcloud preview failed (${response.status} ${response.statusText}) for ${fullPath}. Falling back to original.`);
}
} catch (fetchError) {
console.error(`Fetch error during preview request for ${fullPath}:`, fetchError);
}
// Try both original path and hidden variant if applicable
const pathsToTry = [path];
if (!path.startsWith('_')) {
pathsToTry.push(`_${path}`);
}
// Fetch original via WebDAV (Fallback or no resize requested)
console.log(`Fetching original file via WebDAV: /${path}`);
const data = await client.getFileContents("/" + path);
buffer = data as ArrayBuffer;
contentType = mime.lookup(path) || "application/octet-stream";
return new Response(buffer, {
headers: {
"Content-Type": contentType,
"Cache-Control": "public, max-age=86400",
"Vary": "Accept-Encoding"
let response: Response | null = null;
let lastError: any = null;
for (const currentPath of pathsToTry) {
try {
if (width || height) {
// Use Nextcloud Preview API
const baseUrl = env.NEXTCLOUD_URL?.endsWith("/") ? env.NEXTCLOUD_URL : `${env.NEXTCLOUD_URL}/`;
let fullPath = currentPath;
if (env.NEXTCLOUD_BASE_DIR) {
const baseDir = env.NEXTCLOUD_BASE_DIR.replace(/^\/+|\/+$/g, "");
fullPath = baseDir ? `${baseDir}/${currentPath}` : currentPath;
}
const isJpg = fullPath.match(/\.(jpg|jpeg)$/i);
const previewExtension = isJpg ? 'jpg' : 'png';
const previewUrl = new URL(`${baseUrl}index.php/core/preview.${previewExtension}`);
// Ensure leading slash for the file parameter
const fileParam = fullPath.startsWith('/') ? fullPath : `/${fullPath}`;
previewUrl.searchParams.set("file", fileParam);
if (width) previewUrl.searchParams.set("x", width);
if (height) previewUrl.searchParams.set("y", height);
previewUrl.searchParams.set("forceIcon", "0");
const auth = Buffer.from(`${env.NEXTCLOUD_USER}:${env.NEXTCLOUD_PASSWORD}`).toString("base64");
console.log(`Fetching preview: ${previewUrl.toString()} for file: ${fullPath}`);
const ncResponse = await fetch(previewUrl.toString(), {
headers: {
"Authorization": `Basic ${auth}`
}
});
if (ncResponse.ok) {
buffer = await ncResponse.arrayBuffer();
contentType = ncResponse.headers.get("Content-Type") || "image/png";
return new Response(buffer, {
headers: {
"Content-Type": contentType,
"Cache-Control": "public, max-age=86400",
"Vary": "Accept-Encoding"
}
});
} else {
console.warn(`Nextcloud preview failed (${ncResponse.status}) for ${fullPath}.`);
}
}
// Fetch original via WebDAV (Fallback or no resize requested)
console.log(`Fetching original file via WebDAV: /${currentPath}`);
const data = await client.getFileContents("/" + currentPath);
buffer = data as ArrayBuffer;
contentType = mime.lookup(currentPath) || "application/octet-stream";
return new Response(buffer, {
headers: {
"Content-Type": contentType,
"Cache-Control": "public, max-age=86400",
"Vary": "Accept-Encoding"
}
});
} catch (e) {
lastError = e;
continue; // Try next path variant
}
});
}
throw lastError || new Error("Asset not found");
} catch (e) {
console.error(`Error fetching asset from Nextcloud: ${path}`, e);
throw error(404, "Asset not found");