v0.0.23

Fix https://github.com/misskey-dev/media-proxy/issues/6

.eslintrc.cjs

@@ -1,32 +0,0 @@
-module.exports = {
-	parserOptions: {
-		tsconfigRootDir: __dirname,
-		project: ['./tsconfig.json'],
-	},
-	extends: [
-		'../shared/.eslintrc.js',
-	],
-	rules: {
-		'import/order': ['warn', {
-			'groups': ['builtin', 'external', 'internal', 'parent', 'sibling', 'index', 'object', 'type'],
-			'pathGroups': [
-				{
-					'pattern': '@/**',
-					'group': 'external',
-					'position': 'after'
-				}
-			],
-		}],
-		'no-restricted-globals': [
-			'error',
-			{
-				'name': '__dirname',
-				'message': 'Not in ESModule. Use `import.meta.url` instead.'
-			},
-			{
-				'name': '__filename',
-				'message': 'Not in ESModule. Use `import.meta.url` instead.'
-			}
-	]
-	},
-};

README.md

@@ -4,14 +4,14 @@
 
 Misskeyの/proxyが単体で動作します（Misskeyのコードがほぼそのまま移植されています）。
 
-/proxyは画像ではないと403を返しますが、Media Proxyではそのまま内容を送信します。
-
 **Fastifyプラグインとして動作する気がします。**  
 `pnpm start`は[fastify-cli](https://github.com/fastify/fastify-cli)が動作します。
 
 一応AWS Lambdaで動かす実装を用意しましたが、全くおすすめしません。
 https://github.com/tamaina/media-proxy-lambda
 
+Sharp.jsを使っているため、メモリアロケータにjemallocを指定することをお勧めします。
+
 ## Fastifyプラグインとして動作させる
 ### npm install
 
@@ -38,6 +38,13 @@ git clone https://github.com/misskey-dev/media-proxy.git
 cd media-proxy
 ```
 
+### jemallocをインストール
+Debian/Ubuntuのaptの場合
+
+```
+sudo apt install libjemalloc2
+```
+
 ### pnpm install
 ```
 NODE_ENV=production pnpm install
@@ -78,14 +85,17 @@ export default {
 適当にサーバーを公開してください。  
 （ここではmediaproxy.example.comで公開するものとします。）
 
-メモ書き程度にsystemdでの開始方法を残しますが、もしかしたらAWS Lambdaとかで動かしたほうが楽かもしれません。  
+メモ書き程度にsystemdでの開始方法を残します。  
 （サーバーレスだとsharp.jsが動かない可能性が高いため、そこはなんとかしてください）
 
 systemdサービスのファイルを作成…
 
 /etc/systemd/system/misskey-proxy.service
 
-エディタで開き、以下のコードを貼り付けて保存（ユーザーやポートは適宜変更すること）:
+エディタで開き、以下のコードを貼り付けて保存
+
+ユーザーやポートは適宜変更すること。  
+また、arm64の場合`Environment="LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libjemalloc.so.2"`のx86_64をaarch64に変更する必要がある。jemallocのパスはディストリビューションによって変わる可能性がある。
 
 ```systemd
 [Unit]
@@ -96,6 +106,7 @@ Type=simple
 User=misskey
 ExecStart=/usr/bin/npm start
 WorkingDirectory=/home/misskey/media-proxy
+Environment="LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libjemalloc.so.2"
 Environment="NODE_ENV=production"
 Environment="PORT=3000"
 TimeoutSec=60

SPECIFICATION.md

@@ -26,6 +26,7 @@ Acceptヘッダーは無視される。
 Cache-Controlは、正常なレスポンスの場合`max-age=31536000, immutable`、エラーレスポンスの場合`max-age=300`である。  
 Content-Typeは、ファイルの内容について適切なものが挿入される。
 Content-Security-Policyは、`default-src 'none'; img-src 'self'; media-src 'self'; style-src 'unsafe-inline'`となっている。
+Content-Dispositionは、filenameは元画像のContent-Disposition.filenameもしくはファイル名に基づいて挿入される。拡張子は適宜変更され、octet-streamの場合は拡張子として.unknownが付加される。inlineが指定される。
 
 ### クエリの一覧
 #### url (必須)
@@ -51,6 +52,9 @@ https://www.google.com/images/errors/robot.png をプロキシする場合:
 変換形式が指定されていなかった場合は、画像ファイルもしくは許可されたファイル（FILE_TYPE_BROWSERSAFE）である場合のみプロキシ（ファイルの再配信）が行われる。  
 ただし、svgは、webpに変換される（最大サイズ2048x2048）。
 
+#### 変換クエリ付加時の挙動
+一方、以下の変換クエリが指定されているが、元ファイルがsharp.jsで変換できない形式の場合、404が返される。
+
 #### emoji
 存在すると、高さ128px以下のwebpが応答される。  
 ただし、sharp.jsの都合により、元画像がapngの場合は無変換で応答される。
@@ -68,7 +72,7 @@ https://www.google.com/images/errors/robot.png をプロキシする場合:
 #### static
 存在すると、アニメーション画像では最初のフレームのみの静止画のwebpが応答される。
 
-emojiまたはavatarとstaticが同時に指定された場合は、それぞれに応じた高さが、指定されていない場合は幅498px・高さ280pxに収まるサイズ以下に縮小される。  
+emojiまたはavatarとstaticが同時に指定された場合は、それぞれに応じた高さが、指定されていない場合は幅498px・高さ422pxに収まるサイズ以下に縮小される。
 
 #### preview
 存在すると、幅200px・高さ200pxに収まるサイズ以下のwebpが応答される。

built/const.js

@@ -30,6 +30,10 @@ export const FILE_TYPE_BROWSERSAFE = [
     'video/webm',
     'audio/webm',
     'audio/aac',
+    // see https://github.com/misskey-dev/misskey/pull/10686
+    'audio/flac',
+    'audio/wav',
+    // backward compatibility
     'audio/x-flac',
     'audio/vnd.wave',
 ];

built/download.d.ts

@@ -1,5 +1,5 @@
-/// <reference types="node" />
+/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" />
+/// <reference types="node" resolution-mode="require"/>
 import * as http from 'node:http';
 import * as https from 'node:https';
 export type DownloadConfig = {
@@ -19,4 +19,6 @@ export declare const defaultDownloadConfig: {
     maxSize: number;
     proxy: boolean;
 };
-export declare function downloadUrl(url: string, path: string, settings?: DownloadConfig): Promise<void>;
+export declare function downloadUrl(url: string, path: string, settings?: DownloadConfig): Promise<{
+    filename: string;
+}>;

built/download.js

@@ -1,11 +1,11 @@
 import * as fs from 'node:fs';
 import * as stream from 'node:stream';
 import * as util from 'node:util';
+import ipaddr from 'ipaddr.js';
 import got, * as Got from 'got';
-import IPCIDR from 'ip-cidr';
-import PrivateIp from 'private-ip';
 import { StatusError } from './status-error.js';
 import { getAgents } from './http.js';
+import { parse } from 'content-disposition';
 const pipeline = util.promisify(stream.pipeline);
 export const defaultDownloadConfig = {
     userAgent: `MisskeyMediaProxy/0.0.0`,
@@ -19,6 +19,8 @@ export async function downloadUrl(url, path, settings = defaultDownloadConfig) {
         console.log(`Downloading ${url} to ${path} ...`);
     const timeout = 30 * 1000;
     const operationTimeout = 60 * 1000;
+    const urlObj = new URL(url);
+    let filename = urlObj.pathname.split('/').pop() ?? 'unknown';
     const req = got.stream(url, {
         headers: {
             'User-Agent': settings.userAgent,
@@ -56,6 +58,18 @@ export async function downloadUrl(url, path, settings = defaultDownloadConfig) {
                 req.destroy();
             }
         }
+        const contentDisposition = res.headers['content-disposition'];
+        if (contentDisposition != null) {
+            try {
+                const parsed = parse(contentDisposition);
+                if (parsed.parameters.filename) {
+                    filename = parsed.parameters.filename;
+                }
+            }
+            catch (e) {
+                console.log(`Failed to parse content-disposition: ${contentDisposition}\n${e}`);
+            }
+        }
     }).on('downloadProgress', (progress) => {
         if (progress.transferred > settings.maxSize) {
             console.log(`maxSize exceeded (${progress.transferred} > ${settings.maxSize}) on downloadProgress`);
@@ -75,13 +89,16 @@ export async function downloadUrl(url, path, settings = defaultDownloadConfig) {
     }
     if (process.env.NODE_ENV !== 'production')
         console.log(`Download finished: ${url}`);
+    return {
+        filename,
+    };
 }
 function isPrivateIp(ip, allowedPrivateNetworks) {
+    const parsedIp = ipaddr.parse(ip);
     for (const net of allowedPrivateNetworks ?? []) {
-        const cidr = new IPCIDR(net);
+        if (parsedIp.match(ipaddr.parseCIDR(net))) {
-        if (cidr.contains(ip)) {
             return false;
         }
     }
-    return PrivateIp(ip) ?? false;
+    return parsedIp.range() !== 'unicast';
 }

built/file-info.js

@@ -30,7 +30,7 @@ export async function detectType(path) {
             return TYPE_OCTET_STREAM;
         }
         return {
-            mime: type.mime,
+            mime: fixMime(type.mime),
             ext: type.ext,
         };
     }
@@ -46,7 +46,7 @@ async function checkSvg(path) {
         const size = await getFileSize(path);
         if (size > 1 * 1024 * 1024)
             return false;
-        return isSvg(fs.readFileSync(path));
+        return isSvg(fs.readFileSync(path, { encoding: 'utf-8' }));
     }
     catch {
         return false;
@@ -55,7 +55,17 @@ async function checkSvg(path) {
 import { FILE_TYPE_BROWSERSAFE } from './const.js';
 const dictionary = {
     'safe-file': FILE_TYPE_BROWSERSAFE,
-    'sharp-convertible-image': ['image/jpeg', 'image/png', 'image/gif', 'image/apng', 'image/vnd.mozilla.apng', 'image/webp', 'image/avif', 'image/svg+xml'],
+    'sharp-convertible-image': ['image/jpeg', 'image/png', 'image/gif', 'image/apng', 'image/vnd.mozilla.apng', 'image/webp', 'image/avif', 'image/svg+xml', 'image/x-icon', 'image/bmp'],
-    'sharp-animation-convertible-image': ['image/jpeg', 'image/png', 'image/gif', 'image/webp', 'image/avif', 'image/svg+xml'],
+    'sharp-animation-convertible-image': ['image/jpeg', 'image/png', 'image/gif', 'image/webp', 'image/avif', 'image/svg+xml', 'image/x-icon', 'image/bmp'],
 };
 export const isMimeImage = (mime, type) => dictionary[type].includes(mime);
+function fixMime(mime) {
+    // see https://github.com/misskey-dev/misskey/pull/10686
+    if (mime === "audio/x-flac") {
+        return "audio/flac";
+    }
+    if (mime === "audio/vnd.wave") {
+        return "audio/wav";
+    }
+    return mime;
+}

built/http.d.ts

@@ -1,5 +1,5 @@
-/// <reference types="node" />
+/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" />
+/// <reference types="node" resolution-mode="require"/>
 import * as http from 'node:http';
 import * as https from 'node:https';
 export declare function getAgents(proxy?: string): {

built/image-processor.d.ts

@@ -1,5 +1,5 @@
-/// <reference types="node" />
+/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" />
+/// <reference types="node" resolution-mode="require"/>
 import sharp from 'sharp';
 import { Readable } from 'node:stream';
 export type IImage = {

built/image-processor.js

@@ -1,11 +1,12 @@
 import sharp from 'sharp';
 export const webpDefault = {
-    quality: 85,
+    quality: 77,
     alphaQuality: 95,
     lossless: false,
     nearLossless: false,
     smartSubsample: true,
     mixed: true,
+    effort: 2,
 };
 export function convertToWebpStream(path, width, height, options = webpDefault) {
     return convertSharpToWebpStream(sharp(path), width, height, options);

built/index.d.ts

@@ -1,5 +1,5 @@
-/// <reference types="node" />
+/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" />
+/// <reference types="node" resolution-mode="require"/>
 import * as http from 'node:http';
 import * as https from 'node:https';
 import type { FastifyInstance } from 'fastify';

built/index.js

@@ -4,12 +4,14 @@ import { dirname } from 'node:path';
 import fastifyStatic from '@fastify/static';
 import { createTemp } from './create-temp.js';
 import { FILE_TYPE_BROWSERSAFE } from './const.js';
-import { convertToWebpStream, webpDefault } from './image-processor.js';
+import { convertToWebpStream, webpDefault, convertSharpToWebpStream } from './image-processor.js';
 import { detectType, isMimeImage } from './file-info.js';
 import sharp from 'sharp';
+import { sharpBmp } from 'sharp-read-bmp';
 import { StatusError } from './status-error.js';
 import { defaultDownloadConfig, downloadUrl } from './download.js';
 import { getAgents } from './http.js';
+import _contentDisposition from 'content-disposition';
 const _filename = fileURLToPath(import.meta.url);
 const _dirname = dirname(_filename);
 const assets = `${_dirname}/../assets/`;
@@ -106,7 +108,7 @@ async function proxyHandler(request, reply) {
                 };
             }
             else {
-                const data = sharp(file.path, { animated: !('static' in request.query) })
+                const data = (await sharpBmp(file.path, file.mime, { animated: !('static' in request.query) }))
                     .resize({
                     height: 'emoji' in request.query ? 128 : 320,
                     withoutEnlargement: true,
@@ -120,15 +122,16 @@ async function proxyHandler(request, reply) {
             }
         }
         else if ('static' in request.query) {
-            image = convertToWebpStream(file.path, 498, 280);
+            image = convertSharpToWebpStream(await sharpBmp(file.path, file.mime), 498, 422);
         }
         else if ('preview' in request.query) {
-            image = convertToWebpStream(file.path, 200, 200);
+            image = convertSharpToWebpStream(await sharpBmp(file.path, file.mime), 200, 200);
         }
         else if ('badge' in request.query) {
-            const mask = sharp(file.path)
+            const mask = (await sharpBmp(file.path, file.mime))
                 .resize(96, 96, {
-                fit: 'inside',
+                fit: 'contain',
+                position: 'centre',
                 withoutEnlargement: false,
             })
                 .greyscale()
@@ -182,6 +185,7 @@ async function proxyHandler(request, reply) {
         }
         reply.header('Content-Type', image.type);
         reply.header('Cache-Control', 'max-age=31536000, immutable');
+        reply.header('Content-Disposition', contentDisposition('inline', correctFilename(file.filename, image.ext)));
         return reply.send(image.data);
     }
     catch (e) {
@@ -193,12 +197,13 @@ async function proxyHandler(request, reply) {
 async function downloadAndDetectTypeFromUrl(url) {
     const [path, cleanup] = await createTemp();
     try {
-        await downloadUrl(url, path, config);
+        const { filename } = await downloadUrl(url, path, config);
         const { mime, ext } = await detectType(path);
         return {
             state: 'remote',
             mime, ext,
             path, cleanup,
+            filename: correctFilename(filename, ext),
         };
     }
     catch (e) {
@@ -206,3 +211,20 @@ async function downloadAndDetectTypeFromUrl(url) {
         throw e;
     }
 }
+function correctFilename(filename, ext) {
+    const dotExt = ext ? `.${ext}` : '.unknown';
+    if (filename.endsWith(dotExt)) {
+        return filename;
+    }
+    if (ext === 'jpg' && filename.endsWith('.jpeg')) {
+        return filename;
+    }
+    if (ext === 'tif' && filename.endsWith('.tiff')) {
+        return filename;
+    }
+    return `${filename}${dotExt}`;
+}
+function contentDisposition(type, filename) {
+    const fallback = filename.replace(/[^\w.-]/g, '_');
+    return _contentDisposition(filename, { type, fallback });
+}

package.json

@@ -1,9 +1,9 @@
 {
   "name": "misskey-media-proxy",
-  "version": "0.0.13",
+  "version": "0.0.23",
   "description": "The Media Proxy for Misskey",
   "main": "built/index.js",
-  "packageManager": "pnpm@7.26.0",
+  "packageManager": "pnpm@8.7.5",
   "type": "module",
   "files": [
     "built",
@@ -26,25 +26,28 @@
   },
   "homepage": "https://github.com/misskey-dev/media-proxy#readme",
   "devDependencies": {
-    "@swc/cli": "^0.1.61",
+    "@swc/cli": "^0.1.62",
-    "@swc/core": "^1.3.32",
+    "@swc/core": "^1.3.86",
-    "@types/node": "^18.11.19",
+    "@types/content-disposition": "^0.5.6",
-    "@types/sharp": "^0.31.1",
+    "@types/node": "^20.6.3",
-    "@types/tmp": "^0.2.3",
+    "@types/tmp": "^0.2.4",
-    "typescript": "^4.9.5"
+    "typescript": "^5.2.2"
   },
   "dependencies": {
-    "@fastify/static": "^6.8.0",
+    "@fastify/static": "^6.11.2",
     "cacheable-lookup": "^7.0.0",
-    "fastify": "^4.12.0",
+    "content-disposition": "^0.5.4",
-    "fastify-cli": "^5.7.1",
+    "fastify": "^4.23.2",
-    "file-type": "^18.2.0",
+    "fastify-cli": "^5.8.0",
-    "got": "^12.5.3",
+    "file-type": "^18.5.0",
+    "got": "^13.0.0",
     "hpagent": "^1.2.0",
     "ip-cidr": "^3.1.0",
-    "is-svg": "^4.3.2",
+    "ipaddr.js": "^2.1.0",
-    "private-ip": "^3.0.0",
+    "is-svg": "^5.0.0",
-    "sharp": "^0.31.3",
+    "private-ip": "^3.0.1",
+    "sharp": "^0.32.6",
+    "sharp-read-bmp": "github:misskey-dev/sharp-read-bmp",
     "tmp": "^0.2.1"
   }
 }

src/const.ts

@@ -36,6 +36,11 @@ export const FILE_TYPE_BROWSERSAFE = [
 	'audio/webm',
 
 	'audio/aac',
+
+	// see https://github.com/misskey-dev/misskey/pull/10686
+	'audio/flac',
+	'audio/wav',
+	// backward compatibility
 	'audio/x-flac',
 	'audio/vnd.wave',
 ];

src/download.ts

@@ -3,11 +3,11 @@ import * as stream from 'node:stream';
 import * as util from 'node:util';
 import * as http from 'node:http';
 import * as https from 'node:https';
+import ipaddr from 'ipaddr.js';
 import got, * as Got from 'got';
-import IPCIDR from 'ip-cidr';
-import PrivateIp from 'private-ip';
 import { StatusError } from './status-error.js';
 import { getAgents } from './http.js';
+import { parse } from 'content-disposition';
 
 const pipeline = util.promisify(stream.pipeline);
 
@@ -29,12 +29,17 @@ export const defaultDownloadConfig = {
     ...getAgents()
 }
 
-export async function downloadUrl(url: string, path: string, settings:DownloadConfig = defaultDownloadConfig): Promise<void> {
+export async function downloadUrl(url: string, path: string, settings:DownloadConfig = defaultDownloadConfig): Promise<{
+    filename: string;
+}> {
     if (process.env.NODE_ENV !== 'production') console.log(`Downloading ${url} to ${path} ...`);
 
     const timeout = 30 * 1000;
     const operationTimeout = 60 * 1000;
 
+    const urlObj = new URL(url);
+    let filename = urlObj.pathname.split('/').pop() ?? 'unknown';
+
     const req = got.stream(url, {
         headers: {
             'User-Agent': settings.userAgent,
@@ -73,6 +78,18 @@ export async function downloadUrl(url: string, path: string, settings:DownloadCo
                 req.destroy();
             }
         }
+
+        const contentDisposition = res.headers['content-disposition'];
+        if (contentDisposition != null) {
+            try {
+                const parsed = parse(contentDisposition);
+                if (parsed.parameters.filename) {
+                    filename = parsed.parameters.filename;
+                }
+            } catch (e) {
+                console.log(`Failed to parse content-disposition: ${contentDisposition}\n${e}`);
+            }
+        }
     }).on('downloadProgress', (progress: Got.Progress) => {
         if (progress.transferred > settings.maxSize) {
             console.log(`maxSize exceeded (${progress.transferred} > ${settings.maxSize}) on downloadProgress`);
@@ -91,15 +108,20 @@ export async function downloadUrl(url: string, path: string, settings:DownloadCo
     }
 
     if (process.env.NODE_ENV !== 'production') console.log(`Download finished: ${url}`);
+
+    return {
+        filename,
+    }
 }
 
 function isPrivateIp(ip: string, allowedPrivateNetworks: string[]): boolean {
+    const parsedIp = ipaddr.parse(ip);
+
     for (const net of allowedPrivateNetworks ?? []) {
-        const cidr = new IPCIDR(net);
+        if (parsedIp.match(ipaddr.parseCIDR(net))) {
-        if (cidr.contains(ip)) {
             return false;
         }
     }
 
-    return PrivateIp(ip) ?? false;
+    return parsedIp.range() !== 'unicast';
 }

src/file-info.ts

@@ -1,5 +1,6 @@
 import fs from 'node:fs';
 import { fileTypeFromFile } from 'file-type';
+import type { MimeType } from 'file-type';
 import isSvg from 'is-svg';
 import { promisify } from 'node:util';
 
@@ -39,7 +40,7 @@ export async function detectType(path: string): Promise<{
         }
 
         return {
-            mime: type.mime,
+            mime: fixMime(type.mime),
             ext: type.ext,
         };
     }
@@ -56,7 +57,7 @@ async function checkSvg(path: string) {
     try {
         const size = await getFileSize(path);
         if (size > 1 * 1024 * 1024) return false;
-        return isSvg(fs.readFileSync(path));
+        return isSvg(fs.readFileSync(path, { encoding: 'utf-8' }));
     } catch {
         return false;
     }
@@ -66,8 +67,20 @@ import { FILE_TYPE_BROWSERSAFE } from './const.js';
 
 const dictionary = {
     'safe-file': FILE_TYPE_BROWSERSAFE,
-    'sharp-convertible-image': ['image/jpeg', 'image/png', 'image/gif', 'image/apng', 'image/vnd.mozilla.apng', 'image/webp', 'image/avif', 'image/svg+xml'],
+    'sharp-convertible-image': ['image/jpeg', 'image/png', 'image/gif', 'image/apng', 'image/vnd.mozilla.apng', 'image/webp', 'image/avif', 'image/svg+xml', 'image/x-icon', 'image/bmp'],
-    'sharp-animation-convertible-image': ['image/jpeg', 'image/png', 'image/gif', 'image/webp', 'image/avif', 'image/svg+xml'],
+    'sharp-animation-convertible-image': ['image/jpeg', 'image/png', 'image/gif', 'image/webp', 'image/avif', 'image/svg+xml', 'image/x-icon', 'image/bmp'],
 };
 
 export const isMimeImage = (mime: string, type: keyof typeof dictionary): boolean => dictionary[type].includes(mime);
+
+function fixMime(mime: string | MimeType): string {
+    // see https://github.com/misskey-dev/misskey/pull/10686
+    if (mime === "audio/x-flac") {
+        return "audio/flac";
+    }
+    if (mime === "audio/vnd.wave") {
+        return "audio/wav";
+    }
+
+    return mime;
+}

src/http.ts

@@ -2,6 +2,7 @@ import * as http from 'node:http';
 import * as https from 'node:https';
 import CacheableLookup from 'cacheable-lookup';
 import { HttpProxyAgent, HttpsProxyAgent } from 'hpagent';
+import { LookupFunction } from 'node:net';
 
 const cache = new CacheableLookup({
     maxTtl: 3600,	// 1hours
@@ -12,13 +13,13 @@ const cache = new CacheableLookup({
 const _http = new http.Agent({
     keepAlive: true,
     keepAliveMsecs: 30 * 1000,
-    lookup: cache.lookup,
+    lookup: cache.lookup as unknown as LookupFunction,
 } as http.AgentOptions);
 
 const _https = new https.Agent({
     keepAlive: true,
     keepAliveMsecs: 30 * 1000,
-    lookup: cache.lookup,
+    lookup: cache.lookup as unknown as LookupFunction,
 } as https.AgentOptions);
 
 export function getAgents(proxy?: string) {

src/image-processor.ts

@@ -16,12 +16,13 @@ export type IImageStream = {
 export type IImageStreamable = IImage | IImageStream;
 
 export const webpDefault: sharp.WebpOptions = {
-    quality: 85,
+    quality: 77,
     alphaQuality: 95,
     lossless: false,
     nearLossless: false,
     smartSubsample: true,
     mixed: true,
+    effort: 2,
 };
 
 export function convertToWebpStream(path: string, width: number, height: number, options: sharp.WebpOptions = webpDefault): IImageStream {

src/index.ts

@@ -6,13 +6,15 @@ import { dirname } from 'node:path';
 import fastifyStatic from '@fastify/static';
 import { createTemp } from './create-temp.js';
 import { FILE_TYPE_BROWSERSAFE } from './const.js';
-import { IImageStreamable, convertToWebpStream, webpDefault } from './image-processor.js';
+import { IImageStreamable, convertToWebpStream, webpDefault, convertSharpToWebpStream } from './image-processor.js';
 import type { FastifyInstance, FastifyRequest, FastifyReply, FastifyPluginOptions } from 'fastify';
 import { detectType, isMimeImage } from './file-info.js';
 import sharp from 'sharp';
+import { sharpBmp } from 'sharp-read-bmp';
 import { StatusError } from './status-error.js';
 import { DownloadConfig, defaultDownloadConfig, downloadUrl } from './download.js';
 import { getAgents } from './http.js';
+import _contentDisposition from 'content-disposition';
 
 const _filename = fileURLToPath(import.meta.url);
 const _dirname = dirname(_filename);
@@ -152,12 +154,12 @@ async function proxyHandler(request: FastifyRequest<{ Params: { url: string; };
                     type: file.mime,
                 };
             } else {
-                const data = sharp(file.path, { animated: !('static' in request.query) })
+                const data = (await sharpBmp(file.path, file.mime, { animated: !('static' in request.query) }))
-                        .resize({
+                    .resize({
-                            height: 'emoji' in request.query ? 128 : 320,
+                        height: 'emoji' in request.query ? 128 : 320,
-                            withoutEnlargement: true,
+                        withoutEnlargement: true,
-                        })
+                    })
-                        .webp(webpDefault);
+                    .webp(webpDefault);
 
                 image = {
                     data,
@@ -166,13 +168,14 @@ async function proxyHandler(request: FastifyRequest<{ Params: { url: string; };
                 };
             }
         } else if ('static' in request.query) {
-            image = convertToWebpStream(file.path, 498, 280);
+            image = convertSharpToWebpStream(await sharpBmp(file.path, file.mime), 498, 422);
         } else if ('preview' in request.query) {
-            image = convertToWebpStream(file.path, 200, 200);
+            image = convertSharpToWebpStream(await sharpBmp(file.path, file.mime), 200, 200);
         } else if ('badge' in request.query) {
-            const mask = sharp(file.path)
+            const mask = (await sharpBmp(file.path, file.mime))
                 .resize(96, 96, {
-                    fit: 'inside',
+                    fit: 'contain',
+                    position: 'centre',
                     withoutEnlargement: false,
                 })
                 .greyscale()
@@ -230,6 +233,12 @@ async function proxyHandler(request: FastifyRequest<{ Params: { url: string; };
 
         reply.header('Content-Type', image.type);
         reply.header('Cache-Control', 'max-age=31536000, immutable');
+        reply.header('Content-Disposition',
+            contentDisposition(
+                'inline',
+                correctFilename(file.filename, image.ext)
+            )
+        );
         return reply.send(image.data);
     } catch (e) {
         if ('cleanup' in file) file.cleanup();
@@ -238,11 +247,11 @@ async function proxyHandler(request: FastifyRequest<{ Params: { url: string; };
 }
 
 async function downloadAndDetectTypeFromUrl(url: string): Promise<
-    { state: 'remote'; mime: string; ext: string | null; path: string; cleanup: () => void; }
+    { state: 'remote'; mime: string; ext: string | null; path: string; cleanup: () => void; filename: string; }
 > {
     const [path, cleanup] = await createTemp();
     try {
-        await downloadUrl(url, path, config);
+        const { filename } = await downloadUrl(url, path, config);
 
         const { mime, ext } = await detectType(path);
 
@@ -250,9 +259,29 @@ async function downloadAndDetectTypeFromUrl(url: string): Promise<
             state: 'remote',
             mime, ext,
             path, cleanup,
+            filename: correctFilename(filename, ext),
         }
     } catch (e) {
         cleanup();
         throw e;
     }
 }
+
+function correctFilename(filename: string, ext: string | null) {
+    const dotExt = ext ? `.${ext}` : '.unknown';
+    if (filename.endsWith(dotExt)) {
+        return filename;
+    }
+    if (ext === 'jpg' && filename.endsWith('.jpeg')) {
+        return filename;
+    }
+    if (ext === 'tif' && filename.endsWith('.tiff')) {
+        return filename;
+    }
+    return `${filename}${dotExt}`;
+}
+
+function contentDisposition(type: 'inline' | 'attachment', filename: string): string {
+	const fallback = filename.replace(/[^\w.-]/g, '_');
+	return _contentDisposition(filename, { type, fallback });
+}

tsconfig.json

@@ -10,8 +10,8 @@
 		"declaration": true,
 		"sourceMap": false,
 		"target": "es2021",
-		"module": "esnext",
+		"module": "nodenext",
-		"moduleResolution": "node",
+		"moduleResolution": "nodenext",
 		"allowSyntheticDefaultImports": true,
 		"removeComments": false,
 		"noLib": false,
@@ -36,6 +36,7 @@
 		],
 		"typeRoots": [
 			"./node_modules/@types",
+			"./node_modules",
 			"./src/@types"
 		],
 		"lib": [