etc/Sharkey
0
0
Fork 0
mirror of https://activitypub.software/TransFem-org/Sharkey synced 2024-12-30 03:21:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into feature/2024.10

Browse source 
# Conflicts:
#	packages/frontend/src/pages/admin/index.vue
This commit is contained in:
Hazelnoot 2024-12-08 08:07:55 -05:00
commit 3864d1dacf
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
packages/backend/src/boot/common.ts
View file

@ -12,6 +12,7 @@ import { QueueStatsService } from '@/daemons/QueueStatsService.js';
import { ServerStatsService } from '@/daemons/ServerStatsService.js'; import { ServerStatsService } from '@/daemons/ServerStatsService.js';
import { ServerService } from '@/server/ServerService.js'; import { ServerService } from '@/server/ServerService.js';
import { MainModule } from '@/MainModule.js'; import { MainModule } from '@/MainModule.js';
import { envOption } from '@/env.js';
export async function server() { export async function server() {
const app = await NestFactory.createApplicationContext(MainModule, { const app = await NestFactory.createApplicationContext(MainModule, {
@ -23,6 +24,8 @@ export async function server() {
if (process.env.NODE_ENV !== 'test') { if (process.env.NODE_ENV !== 'test') {
app.get(ChartManagementService).start(); app.get(ChartManagementService).start();
}
if (!envOption.noDaemons) {
app.get(QueueStatsService).start(); app.get(QueueStatsService).start();
app.get(ServerStatsService).start(); app.get(ServerStatsService).start();
} }

4
packages/backend/src/server/FileServerService.ts
View file

@ -192,6 +192,9 @@ export class FileServerService {
} }
} }
// set Content-Length before we chunk, so it can properly override when chunking.
reply.header('Content-Length', file.file.size);
if (!image) { if (!image) {
if (request.headers.range && file.file.size > 0) { if (request.headers.range && file.file.size > 0) {
const range = request.headers.range as string; const range = request.headers.range as string;
@ -235,7 +238,6 @@ export class FileServerService {
} }
reply.header('Content-Type', FILE_TYPE_BROWSERSAFE.includes(image.type) ? image.type : 'application/octet-stream'); reply.header('Content-Type', FILE_TYPE_BROWSERSAFE.includes(image.type) ? image.type : 'application/octet-stream');
reply.header('Content-Length', file.file.size);
reply.header('Cache-Control', 'max-age=31536000, immutable'); reply.header('Cache-Control', 'max-age=31536000, immutable');
reply.header('Content-Disposition', reply.header('Content-Disposition',
contentDisposition( contentDisposition(