summaryrefslogtreecommitdiff
path: root/packages/backend/src/server/file
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2022-09-18 03:27:08 +0900
committerGitHub <noreply@github.com>2022-09-18 03:27:08 +0900
commitb75184ec8e3436200bacdcd832e3324702553d20 (patch)
tree8b7e316f29e95df921db57289c8b8da476d18f07 /packages/backend/src/server/file
parentUpdate ROADMAP.md (diff)
downloadmisskey-b75184ec8e3436200bacdcd832e3324702553d20.tar.gz
misskey-b75184ec8e3436200bacdcd832e3324702553d20.tar.bz2
misskey-b75184ec8e3436200bacdcd832e3324702553d20.zip
なんかもうめっちゃ変えた
Diffstat (limited to 'packages/backend/src/server/file')
-rw-r--r--packages/backend/src/server/file/assets/bad-egg.pngbin1676 -> 0 bytes
-rw-r--r--packages/backend/src/server/file/assets/cache-expired.pngbin6048 -> 0 bytes
-rw-r--r--packages/backend/src/server/file/assets/dummy.pngbin6285 -> 0 bytes
-rw-r--r--packages/backend/src/server/file/assets/not-an-image.pngbin2780 -> 0 bytes
-rw-r--r--packages/backend/src/server/file/assets/thumbnail-not-available.pngbin5705 -> 0 bytes
-rw-r--r--packages/backend/src/server/file/assets/tombstone.pngbin5028 -> 0 bytes
-rw-r--r--packages/backend/src/server/file/index.ts40
-rw-r--r--packages/backend/src/server/file/send-drive-file.ts126
8 files changed, 0 insertions, 166 deletions
diff --git a/packages/backend/src/server/file/assets/bad-egg.png b/packages/backend/src/server/file/assets/bad-egg.png
deleted file mode 100644
index e96ba0dcc1..0000000000
--- a/packages/backend/src/server/file/assets/bad-egg.png
+++ /dev/null
Binary files differ
diff --git a/packages/backend/src/server/file/assets/cache-expired.png b/packages/backend/src/server/file/assets/cache-expired.png
deleted file mode 100644
index 5d988c502b..0000000000
--- a/packages/backend/src/server/file/assets/cache-expired.png
+++ /dev/null
Binary files differ
diff --git a/packages/backend/src/server/file/assets/dummy.png b/packages/backend/src/server/file/assets/dummy.png
deleted file mode 100644
index 39332b0c1b..0000000000
--- a/packages/backend/src/server/file/assets/dummy.png
+++ /dev/null
Binary files differ
diff --git a/packages/backend/src/server/file/assets/not-an-image.png b/packages/backend/src/server/file/assets/not-an-image.png
deleted file mode 100644
index 39e4aa0892..0000000000
--- a/packages/backend/src/server/file/assets/not-an-image.png
+++ /dev/null
Binary files differ
diff --git a/packages/backend/src/server/file/assets/thumbnail-not-available.png b/packages/backend/src/server/file/assets/thumbnail-not-available.png
deleted file mode 100644
index 07cad9919c..0000000000
--- a/packages/backend/src/server/file/assets/thumbnail-not-available.png
+++ /dev/null
Binary files differ
diff --git a/packages/backend/src/server/file/assets/tombstone.png b/packages/backend/src/server/file/assets/tombstone.png
deleted file mode 100644
index 83159d6b3c..0000000000
--- a/packages/backend/src/server/file/assets/tombstone.png
+++ /dev/null
Binary files differ
diff --git a/packages/backend/src/server/file/index.ts b/packages/backend/src/server/file/index.ts
deleted file mode 100644
index 07a493700a..0000000000
--- a/packages/backend/src/server/file/index.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * File Server
- */
-
-import * as fs from 'node:fs';
-import { fileURLToPath } from 'node:url';
-import { dirname } from 'node:path';
-import Koa from 'koa';
-import cors from '@koa/cors';
-import Router from '@koa/router';
-import sendDriveFile from './send-drive-file.js';
-
-const _filename = fileURLToPath(import.meta.url);
-const _dirname = dirname(_filename);
-
-// Init app
-const app = new Koa();
-app.use(cors());
-app.use(async (ctx, next) => {
- ctx.set('Content-Security-Policy', `default-src 'none'; img-src 'self'; media-src 'self'; style-src 'unsafe-inline'`);
- await next();
-});
-
-// Init router
-const router = new Router();
-
-router.get('/app-default.jpg', ctx => {
- const file = fs.createReadStream(`${_dirname}/assets/dummy.png`);
- ctx.body = file;
- ctx.set('Content-Type', 'image/jpeg');
- ctx.set('Cache-Control', 'max-age=31536000, immutable');
-});
-
-router.get('/:key', sendDriveFile);
-router.get('/:key/(.*)', sendDriveFile);
-
-// Register router
-app.use(router.routes());
-
-export default app;
diff --git a/packages/backend/src/server/file/send-drive-file.ts b/packages/backend/src/server/file/send-drive-file.ts
deleted file mode 100644
index c34e043145..0000000000
--- a/packages/backend/src/server/file/send-drive-file.ts
+++ /dev/null
@@ -1,126 +0,0 @@
-import * as fs from 'node:fs';
-import { fileURLToPath } from 'node:url';
-import { dirname } from 'node:path';
-import Koa from 'koa';
-import send from 'koa-send';
-import rename from 'rename';
-import { serverLogger } from '../index.js';
-import { contentDisposition } from '@/misc/content-disposition.js';
-import { DriveFiles } from '@/models/index.js';
-import { InternalStorage } from '@/services/drive/internal-storage.js';
-import { createTemp } from '@/misc/create-temp.js';
-import { downloadUrl } from '@/misc/download-url.js';
-import { detectType } from '@/misc/get-file-info.js';
-import { convertToWebp, convertToJpeg, convertToPng } from '@/services/drive/image-processor.js';
-import { GenerateVideoThumbnail } from '@/services/drive/generate-video-thumbnail.js';
-import { StatusError } from '@/misc/fetch.js';
-import { FILE_TYPE_BROWSERSAFE } from '@/const.js';
-
-const _filename = fileURLToPath(import.meta.url);
-const _dirname = dirname(_filename);
-
-const assets = `${_dirname}/../../server/file/assets/`;
-
-const commonReadableHandlerGenerator = (ctx: Koa.Context) => (e: Error): void => {
- serverLogger.error(e);
- ctx.status = 500;
- ctx.set('Cache-Control', 'max-age=300');
-};
-
-// eslint-disable-next-line import/no-default-export
-export default async function(ctx: Koa.Context) {
- const key = ctx.params.key;
-
- // Fetch drive file
- const file = await DriveFiles.createQueryBuilder('file')
- .where('file.accessKey = :accessKey', { accessKey: key })
- .orWhere('file.thumbnailAccessKey = :thumbnailAccessKey', { thumbnailAccessKey: key })
- .orWhere('file.webpublicAccessKey = :webpublicAccessKey', { webpublicAccessKey: key })
- .getOne();
-
- if (file == null) {
- ctx.status = 404;
- ctx.set('Cache-Control', 'max-age=86400');
- await send(ctx as any, '/dummy.png', { root: assets });
- return;
- }
-
- const isThumbnail = file.thumbnailAccessKey === key;
- const isWebpublic = file.webpublicAccessKey === key;
-
- if (!file.storedInternal) {
- if (file.isLink && file.uri) { // 期限切れリモートファイル
- const [path, cleanup] = await createTemp();
-
- try {
- await downloadUrl(file.uri, path);
-
- const { mime, ext } = await detectType(path);
-
- const convertFile = async () => {
- if (isThumbnail) {
- if (['image/jpeg', 'image/webp', 'image/png', 'image/svg+xml'].includes(mime)) {
- return await convertToWebp(path, 498, 280);
- } else if (mime.startsWith('video/')) {
- return await GenerateVideoThumbnail(path);
- }
- }
-
- if (isWebpublic) {
- if (['image/svg+xml'].includes(mime)) {
- return await convertToPng(path, 2048, 2048);
- }
- }
-
- return {
- data: fs.readFileSync(path),
- ext,
- type: mime,
- };
- };
-
- const image = await convertFile();
- ctx.body = image.data;
- ctx.set('Content-Type', FILE_TYPE_BROWSERSAFE.includes(image.type) ? image.type : 'application/octet-stream');
- ctx.set('Cache-Control', 'max-age=31536000, immutable');
- } catch (e) {
- serverLogger.error(`${e}`);
-
- if (e instanceof StatusError && e.isClientError) {
- ctx.status = e.statusCode;
- ctx.set('Cache-Control', 'max-age=86400');
- } else {
- ctx.status = 500;
- ctx.set('Cache-Control', 'max-age=300');
- }
- } finally {
- cleanup();
- }
- return;
- }
-
- ctx.status = 204;
- ctx.set('Cache-Control', 'max-age=86400');
- return;
- }
-
- if (isThumbnail || isWebpublic) {
- const { mime, ext } = await detectType(InternalStorage.resolvePath(key));
- const filename = rename(file.name, {
- suffix: isThumbnail ? '-thumb' : '-web',
- extname: ext ? `.${ext}` : undefined,
- }).toString();
-
- ctx.body = InternalStorage.read(key);
- ctx.set('Content-Type', FILE_TYPE_BROWSERSAFE.includes(mime) ? mime : 'application/octet-stream');
- ctx.set('Cache-Control', 'max-age=31536000, immutable');
- ctx.set('Content-Disposition', contentDisposition('inline', filename));
- } else {
- const readable = InternalStorage.read(file.accessKey!);
- readable.on('error', commonReadableHandlerGenerator(ctx));
- ctx.body = readable;
- ctx.set('Content-Type', FILE_TYPE_BROWSERSAFE.includes(file.type) ? file.type : 'application/octet-stream');
- ctx.set('Cache-Control', 'max-age=31536000, immutable');
- ctx.set('Content-Disposition', contentDisposition('inline', file.name));
- }
-}