feat: switch metadata remover

Author: diced

package.json

@@ -49,7 +49,6 @@
     "@prisma/migrate": "^6.9.0",
     "@smithy/node-http-handler": "^4.0.6",
     "@tabler/icons-react": "^3.34.0",
-    "@xoi/gps-metadata-remover": "^2.0.0",
     "argon2": "^0.43.0",
     "bytes": "^3.1.2",
     "clsx": "^2.1.1",
@@ -58,6 +57,7 @@
     "cross-env": "^7.0.3",
     "dayjs": "^1.11.13",
     "dotenv": "^16.5.0",
+    "exif-be-gone": "^1.5.1",
     "fast-glob": "^3.3.3",
     "fastify": "^5.3.3",
     "fastify-plugin": "^5.0.1",
@@ -89,7 +89,6 @@
     "@eslint/eslintrc": "^3.3.1",
     "@eslint/js": "^9.28.0",
     "@types/bytes": "^3.1.5",
-    "@types/express": "^5.0.2",
     "@types/fluent-ffmpeg": "^2.1.27",
     "@types/katex": "^0.16.7",
     "@types/ms": "^2.1.0",

pnpm-lock.yaml

@@ -110,11 +110,17 @@ export async function handleFile({
   }
 
   let removedGps = false;
+
   if (mimetype.startsWith('image/') && config.files.removeGpsMetadata) {
-    removedGps = await removeGps(file.buffer);
+    file.buffer = await removeGps(file.buffer);
+
+    if (file.buffer.length < file.file.bytesRead) {
+      logger.c('gps').debug(`removed gps metadata from ${file.filename}`, {
+        nsize: bytes(file.buffer.length),
+        osize: bytes(file.file.bytesRead),
+      });
 
-    if (removedGps) {
-      logger.c('gps').debug(`removed gps metadata from ${file.filename}`);
+      removedGps = true;
     }
   }
 

src/lib/api/upload/upload.ts

@@ -1,21 +1,27 @@
-// @ts-ignore
-import * as gmr from '@xoi/gps-metadata-remover';
+import ExifTransformer from 'exif-be-gone';
+import { PassThrough } from 'stream';
 
-export const removeLocation = gmr.removeLocation as (
-  photoUri: string,
-  read: ReadFunction,
-  write: WriteFunction,
-) => Promise<boolean>;
+export async function removeGps(buffer: Buffer): Promise<Buffer> {
+  return new Promise<Buffer>((resolve, reject) => {
+    const input = new PassThrough();
+    input.end(buffer);
 
-export type ReadFunction = (size: number, offset: number) => Promise<Buffer>;
-export type WriteFunction = (writeValue: string, entryOffset: number, encoding: string) => Promise<void>;
+    const transformer = new ExifTransformer();
 
-export async function removeGps(buffer: Buffer): Promise<boolean> {
-  const read = (size: number, offset: number) => Promise.resolve(buffer.subarray(offset, offset + size));
-  const write = (writeValue: string, entryOffset: number, encoding: string) => {
-    buffer.write(writeValue, entryOffset, encoding as BufferEncoding);
-    return Promise.resolve();
-  };
+    const chunks: Buffer[] = [];
+    transformer.on('data', (chunk: Buffer) => {
+      chunks.push(chunk);
+    });
 
-  return removeLocation('', read, write);
+    transformer.once('error', (err: Error) => {
+      reject(err);
+    });
+
+    transformer.once('end', () => {
+      const stripped = Buffer.concat(chunks);
+      resolve(stripped);
+    });
+
+    input.pipe(transformer);
+  });
 }