fix: Byte me! >:3

src/lib/datasources/Datasource.ts

@@ -3,7 +3,7 @@ import { Readable } from 'stream';
 export abstract class Datasource {
   public name: string;
 
-  public abstract save(file: string, data: Buffer, options?: { type: string; size: number }): Promise<void>;
+  public abstract save(file: string, data: Buffer, options?: { type: string }): Promise<void>;
   public abstract delete(file: string): Promise<void>;
   public abstract clear(): Promise<void>;
   public abstract size(file: string): Promise<number | null>;

src/lib/datasources/S3.ts

@@ -20,12 +20,12 @@ export class S3 extends Datasource {
     });
   }
 
-  public async save(file: string, data: Buffer, options?: { type: string; size: number }): Promise<void> {
+  public async save(file: string, data: Buffer, options?: { type: string }): Promise<void> {
     await this.s3.putObject(
       this.config.bucket,
       file,
       new PassThrough().end(data),
-      options.size,
+      data.byteLength,
       options ? { 'Content-Type': options.type } : undefined,
     );
   }

src/pages/api/upload.ts

@@ -317,12 +317,12 @@ async function handler(req: NextApiReq, res: NextApiRes) {
 
     if (compressionUsed) {
       const buffer = await sharp(file.buffer).jpeg({ quality: imageCompressionPercent }).toBuffer();
-      await datasource.save(fileUpload.name, buffer, { type: 'image/jpeg', size: buffer.byteLength });
+      await datasource.save(fileUpload.name, buffer, { type: 'image/jpeg' });
       logger.info(
         `User ${user.username} (${user.id}) compressed image from ${file.buffer.length} -> ${buffer.length} bytes`,
       );
     } else {
-      await datasource.save(fileUpload.name, file.buffer, { type: file.mimetype, size: file.size });
+      await datasource.save(fileUpload.name, file.buffer, { type: file.mimetype });
     }
 
     logger.info(`User ${user.username} (${user.id}) uploaded ${fileUpload.name} (${fileUpload.id})`);

src/scripts/import-dir.ts

@@ -57,7 +57,6 @@ async function main() {
       fb = await readFile(join(directory, file));
     await datasource.save(file, fb, {
       type: data[i]?.mimetype ?? 'application/octet-stream',
-      size: fb.byteLength,
     });
   }
   console.log(`Finished copying files to ${config.datasource.type} storage.`);

src/worker/thumbnail.ts

@@ -150,7 +150,7 @@ async function start() {
       },
     });
 
-    await datasource.save(thumb.name, thumbnail, { type: 'image/jpeg', size: thumbnail.byteLength });
+    await datasource.save(thumb.name, thumbnail, { type: 'image/jpeg' });
 
     logger.info(`thumbnail saved - ${thumb.name}`);
     logger.debug(`thumbnail ${JSON.stringify(thumb)}`);

src/worker/upload.ts

@@ -123,7 +123,6 @@ async function start() {
     logger.debug('writing file to datasource');
     await datasource.save(file.filename, Buffer.from(fd as Uint8Array), {
       type: file.mimetype ?? 'application/octet-stream',
-      size: file.totalBytes,
     });
   }