perf: disk-cache grid thumbnails and document 2026-07-09 fixes
Cache resized thumbs under .cache/photo-thumbnails (360px) so repeat grid loads skip Sharp. Document ticket/infra fixes; drop unused SVGs.
This commit is contained in:
parent
ffddeca268
commit
3769c897b0
51
docs/FIXES_2026-07-09.md
Normal file
51
docs/FIXES_2026-07-09.md
Normal file
@ -0,0 +1,51 @@
|
||||
# PunimTag fixes — 2026-07-09
|
||||
|
||||
Branch: `fix/open-issues-triage` · PR: https://git.levkin.ca/ilia/punimtag/pulls/51
|
||||
Dev URLs: https://punimtagdev.levkin.ca · https://punimtagadmindev.levkin.ca
|
||||
(`punimtag.levkin.ca` is **not** live — no DNS.)
|
||||
|
||||
## Infra (homelab)
|
||||
|
||||
| Item | Detail |
|
||||
|------|--------|
|
||||
| Outage | App `.env` pointed at dead Postgres `10.0.10.181` |
|
||||
| Fix | Retarget to live `postgresQA` **`10.0.10.179`** (pve201 VM 109) |
|
||||
| Hosts | LXC **9101** `punimTagFE-dev` @ `10.0.10.121` |
|
||||
|
||||
Ansible inventory/docs updated in the ansible repo (`main.yml`, `vault.example.yml`, `host-list.md`).
|
||||
|
||||
## Ticket fixes (code)
|
||||
|
||||
| Issue | Status | Change |
|
||||
|-------|--------|--------|
|
||||
| **#45** Recursive scan checkbox | Closed | Keep directory handle; re-read files when checkbox toggles (`Scan.tsx`) |
|
||||
| **#46** Person search wrong people | Closed | Selected people use exact `person_ids`; free-text `"First Last"` uses AND (`Search.tsx`, `search_service.py`) |
|
||||
| **#47** Identify Next/Prev blank image | Closed | Clear loading when crop is already browser-cached (`Identify.tsx`) |
|
||||
| **#21** SharePoint/network scan hang | Open (needs QA) | Stop blocking API on full folder walk before enqueue; 2h job timeout (`photos.py`) |
|
||||
| **#26** Slow main-page images | Open (needs QA) | Grid requests `?thumbnail=true`; API resizes + **disk-caches** thumbs under `.cache/photo-thumbnails/` |
|
||||
| **#30/#31/#33** Auto-match false positives | Open (needs QA) | Re-enable small-face / tiny-reference filters (`face_service.py`) |
|
||||
|
||||
## Still blocked on client
|
||||
|
||||
| Issue | Need |
|
||||
|-------|------|
|
||||
| **#44** JRCC watermark | SVG/PNG + placement/opacity |
|
||||
| **#43** Tag without account | Product rules (approval, PII, ToS) |
|
||||
| **#21** path confirm | Exact SharePoint/network path Noam used + mount status on LXC |
|
||||
|
||||
## Performance notes (#26)
|
||||
|
||||
**Why it felt slow (before deploy):** grid loaded **full-resolution** photos (and watermarked them for guests). Thumbnail resize existed only on the PR branch until deploy.
|
||||
|
||||
**What we do now:**
|
||||
1. Grid always requests `?thumbnail=true`
|
||||
2. Server resizes to max **360px** JPEG (~quality 68)
|
||||
3. Writes result to `.cache/photo-thumbnails/` keyed by photo id + mtime (first hit slow, later hits fast)
|
||||
4. Long browser cache (`max-age=604800`)
|
||||
5. Fewer `priority` images above the fold (4 instead of 9)
|
||||
|
||||
**Further options (not done):** pre-generate thumbs at Process time; CDN; reduce SSR face payload on `page.tsx`.
|
||||
|
||||
## Cleanup
|
||||
|
||||
Removed unused viewer assets: default Next SVGs, unused `jam-watermark.svg`, `test-image-detection.ts`.
|
||||
@ -3,7 +3,7 @@ import { fastApiV1Url } from '@/lib/server/fastapi-backend';
|
||||
import { prisma } from '@/lib/db';
|
||||
import { readFile } from 'fs/promises';
|
||||
import { createReadStream } from 'fs';
|
||||
import { existsSync, statSync } from 'fs';
|
||||
import { existsSync, statSync, mkdirSync, writeFileSync, readFileSync } from 'fs';
|
||||
import path from 'path';
|
||||
|
||||
// Conditionally import sharp - handle case where libvips is not installed
|
||||
@ -18,6 +18,21 @@ try {
|
||||
const WATERMARK_BUCKET_SIZE = 200;
|
||||
const watermarkCache = new Map<string, Buffer>();
|
||||
|
||||
const THUMB_CACHE_DIR = path.join(process.cwd(), '.cache', 'photo-thumbnails');
|
||||
const THUMB_MAX = 360; // grid cells are small; keep bytes down (#26)
|
||||
|
||||
function ensureThumbCacheDir() {
|
||||
if (!existsSync(THUMB_CACHE_DIR)) {
|
||||
mkdirSync(THUMB_CACHE_DIR, { recursive: true });
|
||||
}
|
||||
}
|
||||
|
||||
function thumbCachePath(photoId: number, watermark: boolean, mtimeMs: number) {
|
||||
const tag = watermark ? 'wm' : 'plain';
|
||||
return path.join(THUMB_CACHE_DIR, `${photoId}-${tag}-${THUMB_MAX}-${mtimeMs}.jpg`);
|
||||
}
|
||||
|
||||
|
||||
async function getWatermarkOverlay(baseWidth: number, baseHeight: number) {
|
||||
if (!sharp) {
|
||||
throw new Error('Sharp library not available');
|
||||
@ -260,30 +275,50 @@ export async function GET(
|
||||
},
|
||||
});
|
||||
|
||||
// Grid thumbnails: resize photos (videos handled above) — #26
|
||||
// Grid thumbnails: resize + disk cache (videos handled above) — #26
|
||||
if (thumbnail && sharp) {
|
||||
try {
|
||||
ensureThumbCacheDir();
|
||||
const mtimeMs = statSync(filePath).mtimeMs;
|
||||
const cacheFile = thumbCachePath(photoId, watermark, mtimeMs);
|
||||
if (existsSync(cacheFile)) {
|
||||
const cached = readFileSync(cacheFile);
|
||||
return new NextResponse(cached, {
|
||||
headers: {
|
||||
'Content-Type': 'image/jpeg',
|
||||
'Cache-Control': 'public, max-age=604800, immutable',
|
||||
'X-Thumb-Cache': 'HIT',
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
let pipeline = sharp(imageBuffer).rotate().resize({
|
||||
width: 480,
|
||||
height: 480,
|
||||
width: THUMB_MAX,
|
||||
height: THUMB_MAX,
|
||||
fit: 'inside',
|
||||
withoutEnlargement: true,
|
||||
});
|
||||
if (watermark) {
|
||||
const metadata = await pipeline.metadata();
|
||||
const baseWidth = metadata.width ?? 480;
|
||||
const baseHeight = metadata.height ?? 480;
|
||||
const baseWidth = metadata.width ?? THUMB_MAX;
|
||||
const baseHeight = metadata.height ?? THUMB_MAX;
|
||||
const overlayBuffer = await getWatermarkOverlay(baseWidth, baseHeight);
|
||||
pipeline = sharp(imageBuffer)
|
||||
.rotate()
|
||||
.resize({ width: 480, height: 480, fit: 'inside', withoutEnlargement: true })
|
||||
.resize({ width: THUMB_MAX, height: THUMB_MAX, fit: 'inside', withoutEnlargement: true })
|
||||
.composite([{ input: overlayBuffer, gravity: 'center', blend: 'hard-light' }]);
|
||||
}
|
||||
const result = await pipeline.jpeg({ quality: 75 }).toBuffer();
|
||||
const result = await pipeline.jpeg({ quality: 68, mozjpeg: true }).toBuffer();
|
||||
try {
|
||||
writeFileSync(cacheFile, result);
|
||||
} catch (e) {
|
||||
console.warn('thumb cache write failed', e);
|
||||
}
|
||||
return new NextResponse(result as unknown as BodyInit, {
|
||||
headers: {
|
||||
'Content-Type': 'image/jpeg',
|
||||
'Cache-Control': 'public, max-age=86400',
|
||||
'Cache-Control': 'public, max-age=604800, immutable',
|
||||
'X-Thumb-Cache': 'MISS',
|
||||
},
|
||||
});
|
||||
} catch (error) {
|
||||
|
||||
@ -625,7 +625,7 @@ export function PhotoGrid({
|
||||
fill
|
||||
className="object-contain bg-black/5 transition-transform duration-300 group-hover:scale-105"
|
||||
sizes="(max-width: 640px) 50vw, (max-width: 1024px) 33vw, 20vw"
|
||||
priority={index < 9}
|
||||
priority={index < 4}
|
||||
unoptimized={!isUrl(photo.path)}
|
||||
onLoad={(e) => !isVideoPhoto && handleImageLoad(photo.id, e.currentTarget)}
|
||||
/>
|
||||
|
||||
@ -1 +0,0 @@
|
||||
<svg fill="none" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"><path d="M14.5 13.5V5.41a1 1 0 0 0-.3-.7L9.8.29A1 1 0 0 0 9.08 0H1.5v13.5A2.5 2.5 0 0 0 4 16h8a2.5 2.5 0 0 0 2.5-2.5m-1.5 0v-7H8v-5H3v12a1 1 0 0 0 1 1h8a1 1 0 0 0 1-1M9.5 5V2.12L12.38 5zM5.13 5h-.62v1.25h2.12V5zm-.62 3h7.12v1.25H4.5zm.62 3h-.62v1.25h7.12V11z" clip-rule="evenodd" fill="#666" fill-rule="evenodd"/></svg>
|
||||
|
Before Width: | Height: | Size: 391 B |
@ -1 +0,0 @@
|
||||
<svg fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><g clip-path="url(#a)"><path fill-rule="evenodd" clip-rule="evenodd" d="M10.27 14.1a6.5 6.5 0 0 0 3.67-3.45q-1.24.21-2.7.34-.31 1.83-.97 3.1M8 16A8 8 0 1 0 8 0a8 8 0 0 0 0 16m.48-1.52a7 7 0 0 1-.96 0H7.5a4 4 0 0 1-.84-1.32q-.38-.89-.63-2.08a40 40 0 0 0 3.92 0q-.25 1.2-.63 2.08a4 4 0 0 1-.84 1.31zm2.94-4.76q1.66-.15 2.95-.43a7 7 0 0 0 0-2.58q-1.3-.27-2.95-.43a18 18 0 0 1 0 3.44m-1.27-3.54a17 17 0 0 1 0 3.64 39 39 0 0 1-4.3 0 17 17 0 0 1 0-3.64 39 39 0 0 1 4.3 0m1.1-1.17q1.45.13 2.69.34a6.5 6.5 0 0 0-3.67-3.44q.65 1.26.98 3.1M8.48 1.5l.01.02q.41.37.84 1.31.38.89.63 2.08a40 40 0 0 0-3.92 0q.25-1.2.63-2.08a4 4 0 0 1 .85-1.32 7 7 0 0 1 .96 0m-2.75.4a6.5 6.5 0 0 0-3.67 3.44 29 29 0 0 1 2.7-.34q.31-1.83.97-3.1M4.58 6.28q-1.66.16-2.95.43a7 7 0 0 0 0 2.58q1.3.27 2.95.43a18 18 0 0 1 0-3.44m.17 4.71q-1.45-.12-2.69-.34a6.5 6.5 0 0 0 3.67 3.44q-.65-1.27-.98-3.1" fill="#666"/></g><defs><clipPath id="a"><path fill="#fff" d="M0 0h16v16H0z"/></clipPath></defs></svg>
|
||||
|
Before Width: | Height: | Size: 1.0 KiB |
@ -1,27 +0,0 @@
|
||||
<svg width="360" height="120" viewBox="0 0 360 120" xmlns="http://www.w3.org/2000/svg" role="img" aria-labelledby="title desc">
|
||||
<title id="title">JAM Jewish and Modern watermark</title>
|
||||
<desc id="desc">Stylized JAM logo with Star of David and the words Jewish and Modern</desc>
|
||||
<defs>
|
||||
<linearGradient id="watermarkGradient" x1="0%" y1="0%" x2="0%" y2="100%">
|
||||
<stop offset="0%" stop-color="#154592" />
|
||||
<stop offset="100%" stop-color="#0d2b54" />
|
||||
</linearGradient>
|
||||
</defs>
|
||||
<rect width="360" height="120" fill="url(#watermarkGradient)" rx="12" ry="12" opacity="0.92" />
|
||||
<g fill="#ffffff">
|
||||
<text x="30" y="82" font-family="'Inter', 'Segoe UI', sans-serif" font-size="72" font-weight="700">J</text>
|
||||
<text x="144" y="82" font-family="'Inter', 'Segoe UI', sans-serif" font-size="72" font-weight="700">M</text>
|
||||
<g transform="translate(80,20) scale(0.7)">
|
||||
<polygon points="60,0 80,35 120,35 90,57 100,95 60,75 20,95 30,57 0,35 40,35" fill="none" stroke="#ffffff" stroke-width="12" stroke-linejoin="round" />
|
||||
</g>
|
||||
<text x="214" y="50" font-family="'Inter', 'Segoe UI', sans-serif" font-size="24" font-weight="600">Jewish</text>
|
||||
<text x="214" y="78" font-family="'Inter', 'Segoe UI', sans-serif" font-size="24" font-weight="600">and Modern</text>
|
||||
</g>
|
||||
</svg>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
Before Width: | Height: | Size: 1.3 KiB |
@ -1 +0,0 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 394 80"><path fill="#000" d="M262 0h68.5v12.7h-27.2v66.6h-13.6V12.7H262V0ZM149 0v12.7H94v20.4h44.3v12.6H94v21h55v12.6H80.5V0h68.7zm34.3 0h-17.8l63.8 79.4h17.9l-32-39.7 32-39.6h-17.9l-23 28.6-23-28.6zm18.3 56.7-9-11-27.1 33.7h17.8l18.3-22.7z"/><path fill="#000" d="M81 79.3 17 0H0v79.3h13.6V17l50.2 62.3H81Zm252.6-.4c-1 0-1.8-.4-2.5-1s-1.1-1.6-1.1-2.6.3-1.8 1-2.5 1.6-1 2.6-1 1.8.3 2.5 1a3.4 3.4 0 0 1 .6 4.3 3.7 3.7 0 0 1-3 1.8zm23.2-33.5h6v23.3c0 2.1-.4 4-1.3 5.5a9.1 9.1 0 0 1-3.8 3.5c-1.6.8-3.5 1.3-5.7 1.3-2 0-3.7-.4-5.3-1s-2.8-1.8-3.7-3.2c-.9-1.3-1.4-3-1.4-5h6c.1.8.3 1.6.7 2.2s1 1.2 1.6 1.5c.7.4 1.5.5 2.4.5 1 0 1.8-.2 2.4-.6a4 4 0 0 0 1.6-1.8c.3-.8.5-1.8.5-3V45.5zm30.9 9.1a4.4 4.4 0 0 0-2-3.3 7.5 7.5 0 0 0-4.3-1.1c-1.3 0-2.4.2-3.3.5-.9.4-1.6 1-2 1.6a3.5 3.5 0 0 0-.3 4c.3.5.7.9 1.3 1.2l1.8 1 2 .5 3.2.8c1.3.3 2.5.7 3.7 1.2a13 13 0 0 1 3.2 1.8 8.1 8.1 0 0 1 3 6.5c0 2-.5 3.7-1.5 5.1a10 10 0 0 1-4.4 3.5c-1.8.8-4.1 1.2-6.8 1.2-2.6 0-4.9-.4-6.8-1.2-2-.8-3.4-2-4.5-3.5a10 10 0 0 1-1.7-5.6h6a5 5 0 0 0 3.5 4.6c1 .4 2.2.6 3.4.6 1.3 0 2.5-.2 3.5-.6 1-.4 1.8-1 2.4-1.7a4 4 0 0 0 .8-2.4c0-.9-.2-1.6-.7-2.2a11 11 0 0 0-2.1-1.4l-3.2-1-3.8-1c-2.8-.7-5-1.7-6.6-3.2a7.2 7.2 0 0 1-2.4-5.7 8 8 0 0 1 1.7-5 10 10 0 0 1 4.3-3.5c2-.8 4-1.2 6.4-1.2 2.3 0 4.4.4 6.2 1.2 1.8.8 3.2 2 4.3 3.4 1 1.4 1.5 3 1.5 5h-5.8z"/></svg>
|
||||
|
Before Width: | Height: | Size: 1.3 KiB |
@ -1 +0,0 @@
|
||||
<svg fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1155 1000"><path d="m577.3 0 577.4 1000H0z" fill="#fff"/></svg>
|
||||
|
Before Width: | Height: | Size: 128 B |
@ -1 +0,0 @@
|
||||
<svg fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path fill-rule="evenodd" clip-rule="evenodd" d="M1.5 2.5h13v10a1 1 0 0 1-1 1h-11a1 1 0 0 1-1-1zM0 1h16v11.5a2.5 2.5 0 0 1-2.5 2.5h-11A2.5 2.5 0 0 1 0 12.5zm3.75 4.5a.75.75 0 1 0 0-1.5.75.75 0 0 0 0 1.5M7 4.75a.75.75 0 1 1-1.5 0 .75.75 0 0 1 1.5 0m1.75.75a.75.75 0 1 0 0-1.5.75.75 0 0 0 0 1.5" fill="#666"/></svg>
|
||||
|
Before Width: | Height: | Size: 385 B |
@ -1,102 +0,0 @@
|
||||
/**
|
||||
* Test script to verify image source detection logic
|
||||
* Run with: npx tsx test-image-detection.ts
|
||||
*/
|
||||
|
||||
/**
|
||||
* Determines if a path is a URL (http/https) or a file system path
|
||||
*/
|
||||
function isUrl(path: string): boolean {
|
||||
return path.startsWith('http://') || path.startsWith('https://');
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the appropriate image source URL
|
||||
*/
|
||||
function getImageSrc(photoId: number, path: string): string {
|
||||
if (isUrl(path)) {
|
||||
return path; // Direct access
|
||||
} else {
|
||||
return `/api/photos/${photoId}/image`; // API proxy
|
||||
}
|
||||
}
|
||||
|
||||
// Test cases
|
||||
const testCases = [
|
||||
{
|
||||
id: 1,
|
||||
path: 'https://picsum.photos/800/600',
|
||||
expected: 'direct',
|
||||
description: 'HTTPS URL (SharePoint, CDN)',
|
||||
},
|
||||
{
|
||||
id: 2,
|
||||
path: 'http://example.com/image.jpg',
|
||||
expected: 'direct',
|
||||
description: 'HTTP URL',
|
||||
},
|
||||
{
|
||||
id: 3,
|
||||
path: '/path/to/photos/image.jpg',
|
||||
expected: 'proxy',
|
||||
description: 'Unix file system path',
|
||||
},
|
||||
{
|
||||
id: 4,
|
||||
path: 'C:\\Photos\\image.jpg',
|
||||
expected: 'proxy',
|
||||
description: 'Windows file system path',
|
||||
},
|
||||
{
|
||||
id: 5,
|
||||
path: 'https://yourcompany.sharepoint.com/sites/Photos/image.jpg',
|
||||
expected: 'direct',
|
||||
description: 'SharePoint Online URL',
|
||||
},
|
||||
{
|
||||
id: 6,
|
||||
path: 'https://sharepoint.company.com/sites/Photos/image.jpg',
|
||||
expected: 'direct',
|
||||
description: 'SharePoint Server URL',
|
||||
},
|
||||
];
|
||||
|
||||
console.log('🧪 Testing Image Source Detection Logic\n');
|
||||
console.log('=' .repeat(60));
|
||||
|
||||
let passed = 0;
|
||||
let failed = 0;
|
||||
|
||||
testCases.forEach((testCase) => {
|
||||
const result = getImageSrc(testCase.id, testCase.path);
|
||||
const isDirect = isUrl(testCase.path);
|
||||
const actual = isDirect ? 'direct' : 'proxy';
|
||||
const success = actual === testCase.expected;
|
||||
|
||||
if (success) {
|
||||
passed++;
|
||||
console.log(`✅ Test ${testCase.id}: PASSED`);
|
||||
} else {
|
||||
failed++;
|
||||
console.log(`❌ Test ${testCase.id}: FAILED`);
|
||||
}
|
||||
|
||||
console.log(` Description: ${testCase.description}`);
|
||||
console.log(` Path: ${testCase.path}`);
|
||||
console.log(` Detected as: ${actual} (expected: ${testCase.expected})`);
|
||||
console.log(` Image src: ${result}`);
|
||||
console.log('');
|
||||
});
|
||||
|
||||
console.log('=' .repeat(60));
|
||||
console.log(`Results: ${passed} passed, ${failed} failed`);
|
||||
|
||||
if (failed === 0) {
|
||||
console.log('🎉 All tests passed!');
|
||||
process.exit(0);
|
||||
} else {
|
||||
console.log('⚠️ Some tests failed');
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user