MadHouse-Labs/file-uploader
2
0
Fork 0
Code Issues Pull requests Packages Activity Actions

fix crash when request is closed #11

Merged
cirroskais merged 1 commit from development into master 2024-10-04 09:11:28 +00:00
Conversation 0 Commits 1 Files changed 3 +14 -8
3 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 6bb97f460d - Show all commits

5
src/routes/api/v1/thumbnail/[id]/+server.ts
View file

@ -19,7 +19,10 @@ export const GET = async ({ request, locals, params }) => {
const metadata = await minio.statObject(BUCKET, upload.thumbnail.fileName);
const ac = new AbortController();
ac.signal.onabort = () => object.destroy;
ac.signal.onabort = () => {
object.destroy();
object.removeAllListeners();
};
const stream = new ReadableStream({
start(controller) {

12
src/routes/download/[id]/+server.ts
View file

@ -1,6 +1,7 @@
import { getUpload } from '$lib/server/database.js';
import minio, { BUCKET } from '$lib/server/minio';
import { error } from '@sveltejs/kit';
import { setTimeout } from 'node:timers/promises';
export const GET = async ({ params, locals }) => {
let id: any = params.id.split('.');
@ -17,7 +18,10 @@ export const GET = async ({ params, locals }) => {
const metadata = await minio.statObject(BUCKET, `${file.uploader.id}/${file.internalName}`);
const ac = new AbortController();
ac.signal.onabort = () => object.destroy;
ac.signal.onabort = () => {
object.destroy();
object.removeAllListeners();
};
const stream = new ReadableStream({
start(controller) {
@ -25,11 +29,7 @@ export const GET = async ({ params, locals }) => {
controller.enqueue(chunk);
});
object.on('end', () => {
try {
controller.close();
} catch (e) {
console.log('Tried to close closed stream', id);
}
controller.close();
});
},
cancel() {

5
src/routes/download/[id]/[ticket]/+server.ts
View file

@ -27,7 +27,10 @@ export const GET = async ({ params, locals }) => {
const metadata = await minio.statObject(BUCKET, `${file.uploader.id}/${file.internalName}`);
const ac = new AbortController();
ac.signal.onabort = () => object.destroy;
ac.signal.onabort = () => {
object.destroy();
object.removeAllListeners();
};
const stream = new ReadableStream({
start(controller) {