usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

clean up

This commit is contained in:
tamaina 2023-01-24 00:51:08 +00:00
parent b83b2f5d01
commit df50304208
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
packages/backend/src/server/FileServerService.ts
View File

@ -20,7 +20,7 @@ import { FileInfoService, TYPE_SVG } from '@/core/FileInfoService.js';
import { LoggerService } from '@/core/LoggerService.js'; import { LoggerService } from '@/core/LoggerService.js';
import { bindThis } from '@/decorators.js'; import { bindThis } from '@/decorators.js';
import type { FastifyInstance, FastifyRequest, FastifyReply, FastifyPluginOptions } from 'fastify'; import type { FastifyInstance, FastifyRequest, FastifyReply, FastifyPluginOptions } from 'fastify';
import { PassThrough, Readable, pipeline } from 'node:stream'; import { Readable, pipeline } from 'node:stream';
import { isMimeImage } from '@/misc/is-mime-image.js'; import { isMimeImage } from '@/misc/is-mime-image.js';
import sharp from 'sharp'; import sharp from 'sharp';
@ -81,17 +81,20 @@ export class FileServerService {
}); });
fastify.get<{ Params: { key: string; } }>('/files/:key', async (request, reply) => { fastify.get<{ Params: { key: string; } }>('/files/:key', async (request, reply) => {
await this.sendDriveFile(request, reply).catch(err => this.errorHandler(request, reply, err)); return await this.sendDriveFile(request, reply)
.catch(err => this.errorHandler(request, reply, err));
}); });
fastify.get<{ Params: { key: string; } }>('/files/:key/*', async (request, reply) => { fastify.get<{ Params: { key: string; } }>('/files/:key/*', async (request, reply) => {
await this.sendDriveFile(request, reply).catch(err => this.errorHandler(request, reply, err)); return await this.sendDriveFile(request, reply)
.catch(err => this.errorHandler(request, reply, err));
}); });
fastify.get<{ fastify.get<{
Params: { url: string; }; Params: { url: string; };
Querystring: { url?: string; }; Querystring: { url?: string; };
}>('/proxy/:url*', async (request, reply) => { }>('/proxy/:url*', async (request, reply) => {
await this.proxyHandler(request, reply).catch(err => this.errorHandler(request, reply, err)); return await this.proxyHandler(request, reply)
.catch(err => this.errorHandler(request, reply, err));
}); });
done(); done();
@ -118,7 +121,7 @@ export class FileServerService {
private async sendDriveFile(request: FastifyRequest<{ Params: { key: string; } }>, reply: FastifyReply) { private async sendDriveFile(request: FastifyRequest<{ Params: { key: string; } }>, reply: FastifyReply) {
const key = request.params.key; const key = request.params.key;
const file = await this.getFileFromKey(key).then(); const file = await this.getFileFromKey(key).then();
console.log(file);
if (file === '404') { if (file === '404') {
reply.code(404); reply.code(404);
reply.header('Cache-Control', 'max-age=86400'); reply.header('Cache-Control', 'max-age=86400');
@ -208,7 +211,6 @@ export class FileServerService {
// Create temp file // Create temp file
const file = await this.getStreamAndTypeFromUrl(url); const file = await this.getStreamAndTypeFromUrl(url);
console.log(file)
if (file === '404') { if (file === '404') {
reply.code(404); reply.code(404);
reply.header('Cache-Control', 'max-age=86400'); reply.header('Cache-Control', 'max-age=86400');
@ -356,7 +358,7 @@ export class FileServerService {
return { return {
state: 'remote', state: 'remote',
stream: Readable.fromWeb(response.body).pipe(new PassThrough()), stream: Readable.fromWeb(response.body),
mime, ext, mime, ext,
path, cleanup, path, cleanup,
fileSaving, fileSaving,