v3: api/ gets one layout rule and keeps to it, and whatever crosses the wire is defined once, in shared/ — api/model/interfaces.ts and src/model.ts declared the same 40 types by hand and had drifted: the error envelope, email required on one side and optional on the other, Invitee/InviteTreeEntry and LinkPreview/UrlPreviewResponse for one shape each. The validation limits, the role permissions, the chat length cap, the @mention pattern and the Bandcamp and YouTube player responses were copied too, behind "keep in sync" comments. shared/ now holds them once, one file per domain (api, category, chat, comment, dump, follow, mention, notification, permissions, player, playlist, search, user, validation, ws), and imports nothing from either half. The server sends Dates; the client reads Wire<T>, the same type with every Date an ISO string, and turns it back with src/utils/shared/deserialize.ts. APIErrorCode becomes a const object, since the frontend's erasableSyntaxOnly rejects an enum. The shared types showed two real gaps: the avatar upload and GET /api/users/me return the full self user and the frontend read them as public users, and a stored session may predate media tokens, so the client keeps it as its own Session type. The backend rule: each folder holds one kind of module, each file is named after its domain. routes/ parse and answer; services/ hold the logic and every SQL query (lib/auth.ts's token check moves to user-service); remote/ is the only place that fetches from other sites — the guarded fetch and the HTML scraping out of rich-content-service, public-address, the Bandcamp and YouTube resolvers, the link providers, the image proxy (fetch, checks and cache, out of routes/preview.ts) and the Twemoji glyphs (out of lib/site-icons.ts). model/ holds per table a row type, its guard and its mappers; validators/ the request guards; db/connection.ts the handle and transaction(), db/startup.ts the purges and default admin that db.ts ran on import, called at the same moment. Tests mirror the source one file per module, test/<layer>/<module>.test.ts, with shared/'s under shared/test/ (deno task test runs both); the test that covered the bandcamp and soundcloud providers together is two now, and the backend can() has its own, so 202 tests. deno lint src/ is clean too: window.* becomes globalThis.*, and test bodies and act() callbacks that never awaited lose their async. The README states the rule. No behaviour changes; the catalogues only move their source references.
All checks were successful
Build and Publish Docker Image / build-and-push (push) Successful in 50s
All checks were successful
Build and Publish Docker Image / build-and-push (push) Successful in 50s
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -1,30 +1,17 @@
|
||||
import { Router } from "@oak/oak";
|
||||
import {
|
||||
fetchWithTimeout,
|
||||
isValidHttpUrl,
|
||||
tryFetchRichContent,
|
||||
} from "../services/rich-content-service.ts";
|
||||
import { isValidHttpUrl } from "../remote/fetch.ts";
|
||||
import { fetchProxiedImage } from "../remote/image-proxy.ts";
|
||||
import { tryFetchRichContent } from "../services/rich-content-service.ts";
|
||||
import {
|
||||
APIErrorCode,
|
||||
type APIFailure,
|
||||
type APIResponse,
|
||||
type LinkPreview,
|
||||
} from "../model/interfaces.ts";
|
||||
} from "../../shared/api.ts";
|
||||
import type { LinkPreview } from "../../shared/dump.ts";
|
||||
import { authMiddleware } from "../middleware/auth.ts";
|
||||
|
||||
const previewRouter = new Router();
|
||||
|
||||
const PROXYABLE_IMAGE_TYPES = new Set([
|
||||
"image/jpeg",
|
||||
"image/png",
|
||||
"image/gif",
|
||||
"image/webp",
|
||||
"image/avif",
|
||||
"image/bmp",
|
||||
"image/x-icon",
|
||||
"image/vnd.microsoft.icon",
|
||||
]);
|
||||
|
||||
// Signed-in only: it's the create form's preview, and an open one lets anyone
|
||||
// use the server to fetch pages for them.
|
||||
previewRouter.get("/api/preview", authMiddleware, async (ctx) => {
|
||||
@@ -50,59 +37,6 @@ previewRouter.get("/api/preview", authMiddleware, async (ctx) => {
|
||||
ctx.response.body = responseBody;
|
||||
});
|
||||
|
||||
// Proxied images, by URL: every viewer of a feed asks for the same
|
||||
// thumbnails, which were fetched from their hosts again for each one. Bounded
|
||||
// by total size; the least recently used go first.
|
||||
const IMAGE_CACHE_TTL_MS = 24 * 60 * 60 * 1000;
|
||||
const IMAGE_CACHE_MAX_BYTES = 32 * 1024 * 1024;
|
||||
const imageCache = new Map<
|
||||
string,
|
||||
{ bytes: Uint8Array; contentType: string; at: number }
|
||||
>();
|
||||
let imageCacheBytes = 0;
|
||||
|
||||
function readImageCache(
|
||||
url: string,
|
||||
): { bytes: Uint8Array; contentType: string } | undefined {
|
||||
const hit = imageCache.get(url);
|
||||
if (!hit) return undefined;
|
||||
imageCache.delete(url);
|
||||
if (Date.now() - hit.at > IMAGE_CACHE_TTL_MS) {
|
||||
imageCacheBytes -= hit.bytes.byteLength;
|
||||
return undefined;
|
||||
}
|
||||
imageCache.set(url, hit); // most recently used
|
||||
return hit;
|
||||
}
|
||||
|
||||
function writeImageCache(
|
||||
url: string,
|
||||
bytes: Uint8Array,
|
||||
contentType: string,
|
||||
): void {
|
||||
const old = imageCache.get(url);
|
||||
if (old) {
|
||||
imageCache.delete(url);
|
||||
imageCacheBytes -= old.bytes.byteLength;
|
||||
}
|
||||
while (
|
||||
imageCacheBytes + bytes.byteLength > IMAGE_CACHE_MAX_BYTES &&
|
||||
imageCache.size > 0
|
||||
) {
|
||||
const [oldestUrl, oldest] = imageCache.entries().next().value!;
|
||||
imageCache.delete(oldestUrl);
|
||||
imageCacheBytes -= oldest.bytes.byteLength;
|
||||
}
|
||||
imageCache.set(url, { bytes, contentType, at: Date.now() });
|
||||
imageCacheBytes += bytes.byteLength;
|
||||
}
|
||||
|
||||
/** Forget every proxied image (tests). */
|
||||
export function clearImageCache(): void {
|
||||
imageCache.clear();
|
||||
imageCacheBytes = 0;
|
||||
}
|
||||
|
||||
function sendImage(
|
||||
ctx: { response: { headers: Headers; body?: unknown } },
|
||||
bytes: Uint8Array,
|
||||
@@ -129,41 +63,13 @@ previewRouter.get("/api/proxy-image", async (ctx) => {
|
||||
return;
|
||||
}
|
||||
|
||||
const cached = readImageCache(url);
|
||||
if (cached) {
|
||||
sendImage(ctx, cached.bytes, cached.contentType);
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
const res = await fetchWithTimeout(url, 8000);
|
||||
// Raster formats only. The bytes go out under this site's origin, so an
|
||||
// SVG (which can carry script) or anything else a browser might execute
|
||||
// would run with the app's origin if opened directly.
|
||||
const contentType = (res.headers.get("content-type") ?? "")
|
||||
.split(";")[0].trim().toLowerCase();
|
||||
if (!PROXYABLE_IMAGE_TYPES.has(contentType)) {
|
||||
await res.body?.cancel();
|
||||
const image = await fetchProxiedImage(url);
|
||||
if (!image) {
|
||||
ctx.response.status = 400;
|
||||
return;
|
||||
}
|
||||
|
||||
const MAX_SIZE = 5 * 1024 * 1024; // 5 MB
|
||||
const contentLength = Number(res.headers.get("content-length") ?? "0");
|
||||
if (contentLength > MAX_SIZE) {
|
||||
await res.body?.cancel();
|
||||
ctx.response.status = 400;
|
||||
return;
|
||||
}
|
||||
|
||||
const bytes = new Uint8Array(await res.arrayBuffer());
|
||||
if (bytes.length > MAX_SIZE) {
|
||||
ctx.response.status = 400;
|
||||
return;
|
||||
}
|
||||
|
||||
writeImageCache(url, bytes, contentType);
|
||||
sendImage(ctx, bytes, contentType);
|
||||
sendImage(ctx, image.bytes, image.contentType);
|
||||
} catch {
|
||||
ctx.response.status = 502;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user