server: fix stupid esm mime dependency

koush · Jan 13, 2024 · f0357d4 · f0357d4
1 parent bd7c7de
commit f0357d4
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 29 deletions.
diff --git a/server/package-lock.json b/server/package-lock.json
diff --git a/server/package.json b/server/package.json
@@ -19,13 +19,14 @@
     "linkfs": "^2.1.0",
     "lodash": "^4.17.21",
     "memfs": "^4.6.0",
-    "mime": "^3.0.0",
+    "mime-db": "^1.52.0",
     "nan": "^2.18.0",
     "node-dijkstra": "^2.5.0",
     "node-forge": "^1.3.1",
     "node-gyp": "^10.0.1",
     "router": "^1.3.8",
     "semver": "^7.5.4",
+    "send": "^0.18.0",
     "sharp": "^0.33.2",
     "source-map-support": "^0.5.21",
     "tar": "^6.2.0",
@@ -43,7 +44,7 @@
     "@types/http-auth": "^4.1.4",
     "@types/ip": "^1.1.3",
     "@types/lodash": "^4.14.202",
-    "@types/mime": "^3.0.4",
+    "@types/mime-db": "^1.43.5",
     "@types/node-dijkstra": "^2.5.6",
     "@types/node-forge": "^1.3.11",
     "@types/pem": "^1.14.4",

diff --git a/server/src/http-interfaces.ts b/server/src/http-interfaces.ts
@@ -5,7 +5,6 @@ import net from 'net';
 import { join as pathJoin } from 'path';
 import { RpcPeer } from "./rpc";
 
-const mime = require('mime/lite');
 export class HttpResponseImpl implements HttpResponse {
     constructor(public res: Response, public unzippedDir: string, public filesPath: string) {
     }
@@ -49,13 +48,6 @@ export class HttpResponseImpl implements HttpResponse {
             this.res.status(options.code);
         this.#setHeaders(options);
 
-        if (!this.res.getHeader('Content-Type')) {
-            const type = mime.getType(path);
-            if (type) {
-                this.res.contentType(mime.getExtension(type));
-            }
-        }
-
         let filePath = pathJoin(this.unzippedDir, 'fs', path);
         if (!fs.existsSync(filePath)) {
             filePath = pathJoin(this.filesPath, path);

diff --git a/server/src/plugin/media.ts b/server/src/plugin/media.ts
@@ -2,13 +2,13 @@ import { BufferConverter, DeviceManager, FFmpegInput, MediaManager, MediaObject
 import pathToFfmpeg from 'ffmpeg-static';
 import fs from 'fs';
 import https from 'https';
-import mimeType from 'mime';
 import Graph from 'node-dijkstra';
 import os from 'os';
 import path from 'path';
 import MimeType from 'whatwg-mimetype';
 import { MediaObject } from "./mediaobject";
 import { MediaObjectRemote } from "./plugin-api";
+import send from 'send';
 
 function typeMatches(target: string, candidate: string): boolean {
     // candidate will accept anything
@@ -78,7 +78,7 @@ export abstract class MediaManagerBase implements MediaManager {
                 }
 
                 const ab = await fs.promises.readFile(filename);
-                const mt = mimeType.getType(data.toString());
+                const mt = send.mime.lookup(filename);
                 const mo = this.createMediaObject(ab, mt);
                 return mo;
             }
@@ -231,7 +231,7 @@ export abstract class MediaManagerBase implements MediaManager {
 
     ensureMediaObjectRemote(mediaObject: string | MediaObjectInterface): MediaObjectRemote {
         if (typeof mediaObject === 'string') {
-            const mime = mimeType.getType(mediaObject);
+            const mime = send.mime.lookup(mediaObject);
             return this.createMediaObjectRemote(mediaObject, mime);
         }
         return mediaObject as MediaObjectRemote;