Compare commits
1 Commits
feat/front
...
chore/cont
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f276f0b55e |
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "mangalord"
|
name = "mangalord"
|
||||||
version = "0.35.0"
|
version = "0.34.0"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
default-run = "mangalord"
|
default-run = "mangalord"
|
||||||
|
|
||||||
|
|||||||
@@ -19,12 +19,49 @@ COPY migrations ./migrations
|
|||||||
RUN touch src/main.rs src/lib.rs && cargo build --locked --release
|
RUN touch src/main.rs src/lib.rs && cargo build --locked --release
|
||||||
|
|
||||||
FROM debian:bookworm-slim
|
FROM debian:bookworm-slim
|
||||||
|
# `curl` is for the container HEALTHCHECK; `ca-certificates` is for
|
||||||
|
# outbound HTTPS (crawler covers/pages).
|
||||||
RUN apt-get update \
|
RUN apt-get update \
|
||||||
&& apt-get install -y --no-install-recommends ca-certificates \
|
&& apt-get install -y --no-install-recommends ca-certificates curl \
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
|
# Non-root runtime user. The API binary doesn't need any root
|
||||||
|
# privilege; the crawler daemon's Chromium launcher uses --no-sandbox
|
||||||
|
# precisely because user-namespace sandboxing is fragile, so dropping
|
||||||
|
# privileges costs nothing operationally and shrinks the blast radius
|
||||||
|
# of any RCE.
|
||||||
|
ARG APP_UID=10001
|
||||||
|
ARG APP_GID=10001
|
||||||
|
RUN groupadd --system --gid ${APP_GID} app \
|
||||||
|
&& useradd --system --uid ${APP_UID} --gid app --home-dir /home/app --create-home --shell /usr/sbin/nologin app
|
||||||
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
COPY --from=builder /app/target/release/mangalord /usr/local/bin/mangalord
|
COPY --from=builder /app/target/release/mangalord /usr/local/bin/mangalord
|
||||||
COPY --from=builder /app/migrations /app/migrations
|
COPY --from=builder /app/migrations /app/migrations
|
||||||
|
|
||||||
ENV STORAGE_DIR=/var/lib/mangalord/storage
|
ENV STORAGE_DIR=/var/lib/mangalord/storage
|
||||||
|
# Pre-create the storage dir so the entrypoint doesn't need to
|
||||||
|
# mkdir-as-root and so the named volume mount inherits the right
|
||||||
|
# ownership.
|
||||||
|
#
|
||||||
|
# UPGRADE NOTE for operators: if you're moving from an older image
|
||||||
|
# that ran as root, the existing `storage-data` volume has files owned
|
||||||
|
# by UID 0 and the new UID-10001 user can't write them. Run once
|
||||||
|
# before the upgrade:
|
||||||
|
# docker compose run --rm --user 0 backend \
|
||||||
|
# chown -R 10001:10001 /var/lib/mangalord/storage
|
||||||
|
# (Postgres is unaffected — that image's `postgres` user UID hasn't
|
||||||
|
# changed.)
|
||||||
|
RUN mkdir -p ${STORAGE_DIR} \
|
||||||
|
&& chown -R app:app ${STORAGE_DIR} /app /home/app
|
||||||
|
|
||||||
|
USER app
|
||||||
EXPOSE 8080
|
EXPOSE 8080
|
||||||
|
|
||||||
|
# `--start-period` is generous because first boot runs sqlx::migrate
|
||||||
|
# against postgres which can take a few seconds; subsequent restarts
|
||||||
|
# are sub-second.
|
||||||
|
HEALTHCHECK --interval=30s --timeout=5s --start-period=20s --retries=3 \
|
||||||
|
CMD curl -fsS http://localhost:8080/api/v1/health > /dev/null || exit 1
|
||||||
|
|
||||||
CMD ["mangalord"]
|
CMD ["mangalord"]
|
||||||
|
|||||||
@@ -1,7 +1,11 @@
|
|||||||
FROM node:22-alpine AS builder
|
FROM node:22-alpine AS builder
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
COPY package.json package-lock.json* ./
|
COPY package.json package-lock.json* ./
|
||||||
RUN npm install
|
# `npm ci` installs the locked versions exactly; `npm install` would
|
||||||
|
# silently rewrite package-lock.json mid-build. CI (.gitea/workflows)
|
||||||
|
# also uses `npm ci`, so this keeps the image build deterministic and
|
||||||
|
# matches what the test job validated.
|
||||||
|
RUN npm ci
|
||||||
COPY . .
|
COPY . .
|
||||||
RUN npm run build
|
RUN npm run build
|
||||||
|
|
||||||
@@ -10,8 +14,20 @@ WORKDIR /app
|
|||||||
ENV NODE_ENV=production
|
ENV NODE_ENV=production
|
||||||
ENV HOST=0.0.0.0
|
ENV HOST=0.0.0.0
|
||||||
ENV PORT=3000
|
ENV PORT=3000
|
||||||
COPY --from=builder /app/build ./build
|
|
||||||
COPY --from=builder /app/node_modules ./node_modules
|
# node:22-alpine ships a `node` user (UID 1000); use it instead of
|
||||||
COPY --from=builder /app/package.json ./
|
# running the SvelteKit server as root.
|
||||||
|
COPY --from=builder --chown=node:node /app/build ./build
|
||||||
|
COPY --from=builder --chown=node:node /app/node_modules ./node_modules
|
||||||
|
COPY --from=builder --chown=node:node /app/package.json ./
|
||||||
|
|
||||||
|
USER node
|
||||||
EXPOSE 3000
|
EXPOSE 3000
|
||||||
|
|
||||||
|
# Alpine's busybox `wget` is the canonical lightweight HTTP probe.
|
||||||
|
# `--spider` doesn't follow redirects; `node build` serves a 200 on
|
||||||
|
# `/` for the homepage so this works without a dedicated /health.
|
||||||
|
HEALTHCHECK --interval=30s --timeout=5s --start-period=10s --retries=3 \
|
||||||
|
CMD wget -q --spider http://localhost:3000/ || exit 1
|
||||||
|
|
||||||
CMD ["node", "build"]
|
CMD ["node", "build"]
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "mangalord-frontend",
|
"name": "mangalord-frontend",
|
||||||
"version": "0.35.0",
|
"version": "0.34.0",
|
||||||
"private": true,
|
"private": true,
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { describe, it, expect, vi, beforeEach, afterEach, type MockInstance } from 'vitest';
|
import { describe, it, expect, vi, beforeEach, afterEach, type MockInstance } from 'vitest';
|
||||||
import { ApiError, request, setOn401Hook } from './client';
|
import { ApiError, request } from './client';
|
||||||
import { getManga } from './mangas';
|
import { getManga } from './mangas';
|
||||||
|
|
||||||
describe('request error envelope parsing', () => {
|
describe('request error envelope parsing', () => {
|
||||||
@@ -73,88 +73,3 @@ describe('request error envelope parsing', () => {
|
|||||||
expect(err.code).toBe('http_error');
|
expect(err.code).toBe('http_error');
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('on401 hook', () => {
|
|
||||||
let fetchSpy: MockInstance<typeof globalThis.fetch>;
|
|
||||||
|
|
||||||
beforeEach(() => {
|
|
||||||
fetchSpy = vi.spyOn(globalThis, 'fetch');
|
|
||||||
});
|
|
||||||
afterEach(() => {
|
|
||||||
vi.restoreAllMocks();
|
|
||||||
// Critical: reset the module-level hook between tests so a
|
|
||||||
// hook installed by one test doesn't leak into the next.
|
|
||||||
setOn401Hook(null);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('invokes the hook exactly once on a 401 response and re-throws', async () => {
|
|
||||||
const hook = vi.fn();
|
|
||||||
setOn401Hook(hook);
|
|
||||||
fetchSpy.mockResolvedValueOnce(
|
|
||||||
new Response(
|
|
||||||
JSON.stringify({ error: { code: 'unauthenticated', message: 'no auth' } }),
|
|
||||||
{ status: 401, headers: { 'content-type': 'application/json' } }
|
|
||||||
)
|
|
||||||
);
|
|
||||||
await expect(getManga('x')).rejects.toMatchObject({
|
|
||||||
status: 401,
|
|
||||||
code: 'unauthenticated'
|
|
||||||
});
|
|
||||||
expect(hook).toHaveBeenCalledTimes(1);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('does not invoke the hook on non-401 errors', async () => {
|
|
||||||
const hook = vi.fn();
|
|
||||||
setOn401Hook(hook);
|
|
||||||
fetchSpy.mockResolvedValueOnce(
|
|
||||||
new Response(
|
|
||||||
JSON.stringify({ error: { code: 'not_found', message: 'no' } }),
|
|
||||||
{ status: 404, headers: { 'content-type': 'application/json' } }
|
|
||||||
)
|
|
||||||
);
|
|
||||||
await expect(getManga('x')).rejects.toMatchObject({ status: 404 });
|
|
||||||
expect(hook).not.toHaveBeenCalled();
|
|
||||||
});
|
|
||||||
|
|
||||||
it('does not invoke the hook on successful responses', async () => {
|
|
||||||
const hook = vi.fn();
|
|
||||||
setOn401Hook(hook);
|
|
||||||
fetchSpy.mockResolvedValueOnce(
|
|
||||||
new Response(
|
|
||||||
JSON.stringify({
|
|
||||||
id: 'm1',
|
|
||||||
title: 't',
|
|
||||||
status: 'ongoing',
|
|
||||||
alt_titles: [],
|
|
||||||
description: null,
|
|
||||||
cover_image_path: null,
|
|
||||||
created_at: '2026-01-01T00:00:00Z',
|
|
||||||
updated_at: '2026-01-01T00:00:00Z',
|
|
||||||
authors: [],
|
|
||||||
genres: [],
|
|
||||||
tags: []
|
|
||||||
}),
|
|
||||||
{ status: 200, headers: { 'content-type': 'application/json' } }
|
|
||||||
)
|
|
||||||
);
|
|
||||||
await getManga('m1');
|
|
||||||
expect(hook).not.toHaveBeenCalled();
|
|
||||||
});
|
|
||||||
|
|
||||||
it('swallows hook exceptions so the original ApiError still propagates', async () => {
|
|
||||||
const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
|
|
||||||
setOn401Hook(() => {
|
|
||||||
throw new Error('hook boom');
|
|
||||||
});
|
|
||||||
fetchSpy.mockResolvedValueOnce(
|
|
||||||
new Response(
|
|
||||||
JSON.stringify({ error: { code: 'unauthenticated', message: 'x' } }),
|
|
||||||
{ status: 401, headers: { 'content-type': 'application/json' } }
|
|
||||||
)
|
|
||||||
);
|
|
||||||
await expect(getManga('x')).rejects.toMatchObject({ status: 401 });
|
|
||||||
// The original ApiError won — the hook's panic was logged but
|
|
||||||
// didn't replace the API error.
|
|
||||||
expect(consoleSpy).toHaveBeenCalled();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|||||||
@@ -25,21 +25,6 @@ export class ApiError extends Error {
|
|||||||
|
|
||||||
type ErrorEnvelope = { error?: { code?: unknown; message?: unknown } };
|
type ErrorEnvelope = { error?: { code?: unknown; message?: unknown } };
|
||||||
|
|
||||||
/**
|
|
||||||
* Optional hook fired the first moment `request()` observes a 401 on
|
|
||||||
* any endpoint. Used by the session store to clear the cached user
|
|
||||||
* when the server reports the session is no longer valid (expired
|
|
||||||
* cookie, rotated server-side, password changed on another device).
|
|
||||||
*
|
|
||||||
* Set to `null` (or `undefined`) to disable. Tests that don't want
|
|
||||||
* the side effect should leave it unset.
|
|
||||||
*/
|
|
||||||
let on401Hook: (() => void) | null = null;
|
|
||||||
|
|
||||||
export function setOn401Hook(handler: (() => void) | null): void {
|
|
||||||
on401Hook = handler;
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function request<T>(path: string, init?: RequestInit): Promise<T> {
|
export async function request<T>(path: string, init?: RequestInit): Promise<T> {
|
||||||
// Forward credentials (session cookie) explicitly so cross-origin
|
// Forward credentials (session cookie) explicitly so cross-origin
|
||||||
// deployments — those configured via CORS_ALLOWED_ORIGINS — keep
|
// deployments — those configured via CORS_ALLOWED_ORIGINS — keep
|
||||||
@@ -69,16 +54,6 @@ export async function request<T>(path: string, init?: RequestInit): Promise<T> {
|
|||||||
} catch {
|
} catch {
|
||||||
// Body wasn't parseable; keep the http_error fallback.
|
// Body wasn't parseable; keep the http_error fallback.
|
||||||
}
|
}
|
||||||
if (res.status === 401 && on401Hook) {
|
|
||||||
// Fire before throwing so the session store updates even
|
|
||||||
// if the caller swallows the ApiError (e.g. the *OrEmpty
|
|
||||||
// wrappers used by guest-rendering pages).
|
|
||||||
try {
|
|
||||||
on401Hook();
|
|
||||||
} catch (e) {
|
|
||||||
console.error('on401 hook threw:', e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
throw new ApiError(res.status, code, message);
|
throw new ApiError(res.status, code, message);
|
||||||
}
|
}
|
||||||
// Any empty body (not just 204) returns undefined — the manga-add
|
// Any empty body (not just 204) returns undefined — the manga-add
|
||||||
|
|||||||
@@ -3,17 +3,7 @@
|
|||||||
// Only mutated client-side (onMount / form submits) so the module-level
|
// Only mutated client-side (onMount / form submits) so the module-level
|
||||||
// instance can't leak across SSR requests — SSR always renders the
|
// instance can't leak across SSR requests — SSR always renders the
|
||||||
// `loaded === false` state, and the client refreshes after hydration.
|
// `loaded === false` state, and the client refreshes after hydration.
|
||||||
//
|
|
||||||
// IMPORTANT: do not call any `api/*` helper from `+page.server.ts` /
|
|
||||||
// `+layout.server.ts`. The `setOn401Hook` below is registered at
|
|
||||||
// module load (gated on `browser`, so it only fires in the client
|
|
||||||
// bundle), so a 401 from a server-side fetch would mutate this
|
|
||||||
// module-level `session.user` across SvelteKit requests — a real
|
|
||||||
// cross-request state leak. The `if (browser)` guard makes that
|
|
||||||
// failure mode mechanical rather than convention-based.
|
|
||||||
|
|
||||||
import { browser } from '$app/environment';
|
|
||||||
import { setOn401Hook } from './api/client';
|
|
||||||
import { me, type User } from './api/auth';
|
import { me, type User } from './api/auth';
|
||||||
|
|
||||||
class SessionStore {
|
class SessionStore {
|
||||||
@@ -41,16 +31,3 @@ class SessionStore {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export const session = new SessionStore();
|
export const session = new SessionStore();
|
||||||
|
|
||||||
// When any backend call returns 401, drop the cached user. Before this
|
|
||||||
// hook, the `*OrEmpty` wrappers silently returned empty pages on 401
|
|
||||||
// — so a mid-session expiry left the UI rendering as "logged in but
|
|
||||||
// no bookmarks/collections/etc." until the user manually reloaded.
|
|
||||||
// With the hook the session.user reactive store flips to null on the
|
|
||||||
// first 401, so the layout re-renders the login affordance.
|
|
||||||
//
|
|
||||||
// Gated on `browser` so it's only installed in the client bundle.
|
|
||||||
// See the module-level comment above for the SSR rationale.
|
|
||||||
if (browser) {
|
|
||||||
setOn401Hook(() => session.setUser(null));
|
|
||||||
}
|
|
||||||
|
|||||||
Reference in New Issue
Block a user