fix

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

@@ -76,6 +76,10 @@ class Bucket {
     this.files.push(file);
     this.size += file.file.stats.size;
   }
+
+  canFit(file: FileWithHash, limit: number): boolean {
+    return this.size + file.file.stats.size <= limit;
+  }
 }
 
 @Injectable()
@@ -145,6 +149,31 @@ export class PackagerService extends ConsoleLogger {
       // 整包
       new ArchiveTask(ArchiveType.Full, filesWithHash, await fs.promises.readdir(root)).addToTask(archiveTasks);
 
+      if (files.length > 1) {
+        // 整包（512M 一包）
+        const cloudflareLimit = 450 * 1024 ** 2; // Cloudflare 的限制是 512M，留点余地
+        const totalFileSize = filesWithHash.reduce((sum, f) => sum + f.file.stats.size, 0);
+        if (totalFileSize > cloudflareLimit) {
+          this.log(`Total file size is ${totalFileSize}, which is larger than ${cloudflareLimit}. Will create fulls archives.`);
+          const sortedFiles = _.sortBy(filesWithHash, (f) => -f.file.stats.size); // 按照文件大小降序排序，优先打包大文件
+          // create multiple fulls archives, with each archive containing files up to cloudflareLimit
+          const buckets: Bucket[] = [];
+          for (const file of sortedFiles) {
+            const useBucket = buckets.find((b) => b.canFit(file, cloudflareLimit));
+            if (useBucket) {
+              useBucket.addFile(file);
+            } else {
+              const newBucket = new Bucket();
+              newBucket.addFile(file);
+              buckets.push(newBucket);
+            }
+          }
+          for (const bucket of buckets) {
+            new ArchiveTask(ArchiveType.Fulls, bucket.files).addToTask(archiveTasks);
+          }
+          this.log(`Created ${buckets.length} fulls archives.`);
+        }
+
         // 更新包
         for (const lastChecksum of lastBuildChecksums) {
           const changedFiles = filesWithHash.filter((f) => !lastChecksum[f.file.path] || lastChecksum[f.file.path] !== f.hash);
@@ -152,6 +181,7 @@ export class PackagerService extends ConsoleLogger {
             new ArchiveTask(ArchiveType.Update, changedFiles).addToTask(archiveTasks);
           }
         }
+      }
 
       const pendingPartTasks: ArchiveTask[] = [];
 
@@ -162,7 +192,7 @@ export class PackagerService extends ConsoleLogger {
         if (file.file.stats.size < this.bucket_enter && !this.noGatherExts.has(extname)) {
           buckets[extname] ??= new Bucket();
           const bucket = buckets[extname];
-          if (bucket.size + file.file.stats.size >= this.bucket_max) {
+          if (!bucket.canFit(file, this.bucket_max)) {
             new ArchiveTask(ArchiveType.Part, bucket.files).addToTask(pendingPartTasks, true);
             bucket.empty();
           }

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

@@ -161,7 +161,7 @@ export class UpdateService extends ConsoleLogger {
   async getFullPackageMetalink(id: string, depotDto: DepotDto, version: string, ip: string) {
     const tryRole = (role: ArchiveType) =>
       this.getArchives(id, depotDto, version, (qb) =>
-        qb.select(['archive.hash', 'archive.path', 'archive.size']).andWhere('archive.role = :fullRole', { fullRole: ArchiveType.Full })
+        qb.select(['archive.hash', 'archive.path', 'archive.size']).andWhere('archive.role = :role', { role })
       );
     let archives = await tryRole(ArchiveType.Fulls);
     if (!archives.length) {