mirror of
https://github.com/mauriceboe/TREK.git
synced 2026-10-19 05:26:47 +00:00
b3a085df3f
The process-state ports were meant to let a store shared between processes replace the in-memory one, but they could not. The readers outside the container (the broadcast functions, the backup restore's permissions-cache flush, the pending-code sweep, hand-built consumers) went straight to the module-level in-memory instances, so an overridden provider was used by the gateway and the services while the broadcasts and the restore flush kept using the old store. And every port was synchronous, while a store in the database or on the network is async, so plugging one in would have changed every signature anyway. RateLimitStore, PendingCodeStore, OidcFlowStore and PermissionsCacheStore now return promises, and RateLimitService, OauthService, OidcService, PermissionsService and their callers await them. The in-memory stores still decide synchronously, so who gets a 429, a code or a cached level is unchanged. RoomRegistry stays synchronous: membership holds live sockets and broadcast() is a synchronous call every domain makes, so several processes need a fan-out in front of broadcast(), not a different place for the sets. The process-wide ports get a ProcessStoreSlot. PermissionsModule, OauthModule and RealtimeGatewayModule install the store the container resolved and release it on shutdown, and the free functions, the sweep and hand-built consumers read the slot, so overriding the provider changes every reader. Tests provide fake stores and check that the broadcasts, the restore flush and the sweep use them. Two callers needed more than an await. The transit MCP tools counted in a RateLimitService of their own that no provider could reach; they now take the one RateLimitModule provides (their mcp_transit_* buckets never overlap the REST ones). The link preview claimed its in-flight slot only after the budget check, which now yields, so simultaneous askers would each have been charged; it now claims the slot first, and an asker that joined someone out of budget asks again on its own budget. The unused putPendingCode/takePendingCode helpers are gone.
139 lines
5.7 KiB
TypeScript
139 lines
5.7 KiB
TypeScript
/**
|
|
* Collections upload integration tests (COLL-P01…P05).
|
|
*
|
|
* Cover + place-image upload parity, written BEFORE the storage-upload swap:
|
|
* statuses, bodies, on-disk layout — including the cover filter's plain-Error
|
|
* 500 quirk (shared with the trip cover config) and the place-image filter's
|
|
* statusCode-400 contract.
|
|
*/
|
|
import { describe, it, expect, vi, beforeAll, beforeEach, afterAll } from 'vitest';
|
|
import request from 'supertest';
|
|
import type { Application } from 'express';
|
|
import type { INestApplication } from '@nestjs/common';
|
|
import path from 'path';
|
|
import fs from 'fs';
|
|
|
|
vi.mock('../../src/db/database', async () => {
|
|
const { createSnapshotTestDb, buildDbMock } = await import('../helpers/db-mock');
|
|
return buildDbMock(createSnapshotTestDb());
|
|
});
|
|
vi.mock('../../src/config', () => ({
|
|
JWT_SECRET: 'test-jwt-secret-for-trek-testing-only',
|
|
ENCRYPTION_KEY: 'a1b2c3d4e5f6a7b8c9d0e1f2a3b4c5d6a7b8c9d0e1f2a3b4c5d6a7b8c9d0e1f2',
|
|
updateJwtSecret: () => {},
|
|
SESSION_DURATION: '24h',
|
|
SESSION_DURATION_MS: 86400000,
|
|
SESSION_DURATION_SECONDS: 86400,
|
|
DEFAULT_LANGUAGE: 'en',
|
|
}));
|
|
vi.mock('../../src/websocket', () => ({ broadcast: vi.fn(), broadcastToUser: vi.fn(), getOnlineUserIds: vi.fn(() => []) }));
|
|
|
|
import { db as testDb } from '../../src/db/database';
|
|
import { buildApp } from '../../src/bootstrap';
|
|
import { resetTestDb, resetRateLimits } from '../helpers/test-db';
|
|
import { createUser } from '../helpers/factories';
|
|
import { authCookie } from '../helpers/auth';
|
|
|
|
let nestApp: INestApplication;
|
|
let app: Application;
|
|
const FIXTURE_IMG = path.join(__dirname, '../fixtures/small-image.jpg');
|
|
const coversDir = path.join(__dirname, '../../uploads/covers');
|
|
const placesDir = path.join(__dirname, '../../uploads/places');
|
|
|
|
function createCollection(ownerId: number): number {
|
|
return Number(testDb.prepare("INSERT INTO collections (owner_id, name) VALUES (?, 'C')").run(ownerId).lastInsertRowid);
|
|
}
|
|
|
|
function createCollectionPlace(collectionId: number, ownerId: number): number {
|
|
return Number(testDb.prepare("INSERT INTO collection_places (collection_id, owner_id, name) VALUES (?, ?, 'P')").run(collectionId, ownerId).lastInsertRowid);
|
|
}
|
|
|
|
beforeAll(async () => {
|
|
nestApp = await buildApp();
|
|
app = nestApp.getHttpAdapter().getInstance();
|
|
});
|
|
|
|
beforeEach(async () => {
|
|
resetTestDb(testDb);
|
|
await resetRateLimits(nestApp);
|
|
// Enable the collections addon (the controller sits behind AddonGuard).
|
|
testDb.prepare(
|
|
"INSERT OR REPLACE INTO addons (id, name, description, type, icon, enabled, sort_order) VALUES ('collections', 'Collections', 'Saved places', 'global', 'Bookmark', 1, 40)"
|
|
).run();
|
|
});
|
|
|
|
afterAll(async () => {
|
|
await nestApp.close();
|
|
testDb.close();
|
|
fs.rmSync(coversDir, { recursive: true, force: true });
|
|
fs.rmSync(placesDir, { recursive: true, force: true });
|
|
});
|
|
|
|
describe('Collection cover upload', () => {
|
|
it('COLL-P01 — cover upload stores /uploads/covers/<uuid> and writes the file', async () => {
|
|
const { user } = createUser(testDb);
|
|
const collectionId = createCollection(user.id);
|
|
|
|
const res = await request(app)
|
|
.post(`/api/addons/collections/${collectionId}/cover`)
|
|
.set('Cookie', authCookie(user.id))
|
|
.attach('cover', FIXTURE_IMG, 'cover.png');
|
|
expect(res.status).toBe(201);
|
|
expect(res.body.cover_image).toMatch(/^\/uploads\/covers\/[0-9a-f-]{36}\.png$/);
|
|
const diskName = res.body.cover_image.replace('/uploads/covers/', '');
|
|
expect(fs.existsSync(path.join(coversDir, diskName))).toBe(true);
|
|
});
|
|
|
|
it('COLL-P02 — no file → 400 "No image uploaded"', async () => {
|
|
const { user } = createUser(testDb);
|
|
const collectionId = createCollection(user.id);
|
|
|
|
const res = await request(app)
|
|
.post(`/api/addons/collections/${collectionId}/cover`)
|
|
.set('Cookie', authCookie(user.id));
|
|
expect(res.status).toBe(400);
|
|
expect(res.body.error).toBe('No image uploaded');
|
|
});
|
|
|
|
it('COLL-P03 — non-image cover is 500 (plain-Error filter quirk — pinned, do not "fix")', async () => {
|
|
const { user } = createUser(testDb);
|
|
const collectionId = createCollection(user.id);
|
|
|
|
const res = await request(app)
|
|
.post(`/api/addons/collections/${collectionId}/cover`)
|
|
.set('Cookie', authCookie(user.id))
|
|
.attach('cover', Buffer.from('plain text'), { filename: 'doc.txt', contentType: 'text/plain' });
|
|
expect(res.status).toBe(500);
|
|
});
|
|
});
|
|
|
|
describe('Collection place image upload', () => {
|
|
it('COLL-P04 — place image upload stores /uploads/places/<uuid> and writes the file', async () => {
|
|
const { user } = createUser(testDb);
|
|
const collectionId = createCollection(user.id);
|
|
const placeId = createCollectionPlace(collectionId, user.id);
|
|
|
|
const res = await request(app)
|
|
.post(`/api/addons/collections/places/${placeId}/image`)
|
|
.set('Cookie', authCookie(user.id))
|
|
.attach('image', FIXTURE_IMG, 'photo.jpg');
|
|
expect(res.status).toBe(200);
|
|
expect(res.body.image_url).toMatch(/^\/uploads\/places\/[0-9a-f-]{36}\.jpg$/);
|
|
const diskName = res.body.image_url.replace('/uploads/places/', '');
|
|
expect(fs.existsSync(path.join(placesDir, diskName))).toBe(true);
|
|
});
|
|
|
|
it('COLL-P05 — non-image place upload is 400 with the bespoke message', async () => {
|
|
const { user } = createUser(testDb);
|
|
const collectionId = createCollection(user.id);
|
|
const placeId = createCollectionPlace(collectionId, user.id);
|
|
|
|
const res = await request(app)
|
|
.post(`/api/addons/collections/places/${placeId}/image`)
|
|
.set('Cookie', authCookie(user.id))
|
|
.attach('image', Buffer.from('%PDF-1.4'), { filename: 'doc.pdf', contentType: 'application/pdf' });
|
|
expect(res.status).toBe(400);
|
|
expect(res.body.error).toBe('Only jpg, png, gif, webp images allowed');
|
|
});
|
|
});
|