fix leak part package

console-api/src/packager/packager.service.ts

@@ -18,12 +18,12 @@ import PQueue from 'p-queue';
 import { LockService } from 'src/lock/lock.service';
 import { InjectRedis, Redis } from '@nestjs-modules/ioredis';
 
-export interface FileWithHash {
+interface FileWithHash {
   file: readdirp.EntryInfo;
   hash: string;
 }
 
-export class ArchiveTask {
+class ArchiveTask {
   readonly path: string;
   constructor(public readonly role: ArchiveType, public readonly files: FileWithHash[], public readonly altFiles?: string[]) {
     this.path = createHash('sha512')
@@ -60,6 +60,21 @@ export class ArchiveTask {
   }
 }
 
+class Bucket {
+  files: FileWithHash[] = [];
+  size = 0;
+
+  empty() {
+    this.files = [];
+    this.size = 0;
+  }
+
+  addFile(file: FileWithHash) {
+    this.files.push(file);
+    this.size += file.file.stats.size;
+  }
+}
+
 @Injectable()
 export class PackagerService extends ConsoleLogger {
   bucket_max = 10 * 1024 ** 2;
@@ -122,7 +137,7 @@ export class PackagerService extends ConsoleLogger {
       );
       const archiveTasks: ArchiveTask[] = [];
 
-      const filesWithHash: FileWithHash[] = files.map((f) => ({ file: f, hash: checksum[f.path] }));
+      const filesWithHash: FileWithHash[] = files.map((file) => ({ file, hash: checksum[file.path] }));
 
       // 整包
       new ArchiveTask(ArchiveType.Full, filesWithHash, await fs.promises.readdir(root)).addToTask(archiveTasks);
@@ -138,27 +153,24 @@ export class PackagerService extends ConsoleLogger {
       const pendingPartTasks: ArchiveTask[] = [];
 
       // 散包
-      const buckets: Record<string, [FileWithHash[], number]> = {};
+      const buckets: Record<string, Bucket> = {};
       for (const file of filesWithHash) {
         const extname = path.extname(file.file.basename);
         if (file.file.stats.size < this.bucket_enter && !this.noGatherExts.has(extname)) {
-          buckets[extname] ??= [[], 0];
+          buckets[extname] ??= new Bucket();
           const bucket = buckets[extname];
-          if (bucket[1] + file.file.stats.size >= this.bucket_max) {
-            new ArchiveTask(ArchiveType.Part, bucket[0]).addToTask(pendingPartTasks, true);
-            bucket[0] = [];
-            bucket[1] = 0;
-          } else {
-            bucket[0].push(file);
-            bucket[1] += file.file.stats.size;
+          if (bucket.size + file.file.stats.size >= this.bucket_max) {
+            new ArchiveTask(ArchiveType.Part, bucket.files).addToTask(pendingPartTasks, true);
+            bucket.empty();
           }
+          bucket.addFile(file);
         } else {
           new ArchiveTask(ArchiveType.Part, [file]).addToTask(pendingPartTasks, true);
         }
       }
       for (const bucket of Object.values(buckets)) {
-        if (bucket[0].length) {
-          new ArchiveTask(ArchiveType.Part, bucket[0]).addToTask(pendingPartTasks, true);
+        if (bucket.files.length) {
+          new ArchiveTask(ArchiveType.Part, bucket.files).addToTask(pendingPartTasks, true);
         }
       }