Try apache commons compress

Author: Brutus5000

apps/faf-legacy-deployment/scripts/CoopDeployer.kt

@@ -1,3 +1,6 @@
+import org.apache.commons.compress.archivers.zip.Zip64Mode
+import org.apache.commons.compress.archivers.zip.ZipArchiveEntry
+import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream
 import org.eclipse.jgit.api.Git
 import org.slf4j.LoggerFactory
 import java.io.IOException
@@ -9,11 +12,13 @@ import java.nio.file.Files
 import java.nio.file.Path
 import java.nio.file.Paths
 import java.nio.file.StandardCopyOption
+import java.nio.file.attribute.FileTime
 import java.nio.file.attribute.PosixFilePermission
 import java.security.MessageDigest
 import java.sql.Connection
 import java.sql.DriverManager
 import java.time.Duration
+import java.util.zip.CRC32
 import java.util.zip.ZipEntry
 import java.util.zip.ZipOutputStream
 import kotlin.io.path.inputStream
@@ -227,6 +232,9 @@ data class FafDatabase(
     }
 }
 
+private const val MINIMUM_ZIP_DATE = 315532800000L // 1980-01-01
+private val MINIMUM_ZIP_FILE_TIME = FileTime.fromMillis(MINIMUM_ZIP_DATE)
+
 class Patcher(
     val patchVersion: Int,
     val targetDir: Path,
@@ -355,7 +363,11 @@ class Patcher(
 
     private fun zipPreserveStructure(sources: List<Path>, outputFile: Path, base: Path) {
         Files.createDirectories(outputFile.parent)
-        ZipOutputStream(Files.newOutputStream(outputFile)).use { zos ->
+
+        // Never pass a stream here; this will cause extended local headers to be used, making it incompatible to FA!
+        ZipArchiveOutputStream(outputFile.toFile()).use { zos ->
+            zos.setMethod(ZipArchiveEntry.DEFLATED)
+
             for (src in sources) {
                 if (!Files.exists(src)) {
                     // skip
@@ -375,28 +387,23 @@ class Patcher(
         }
     }
 
-    private fun ZipOutputStream.pushNormalizedFile(base: Path, path: Path) {
+    private fun ZipArchiveOutputStream.pushNormalizedFile(base: Path, path: Path) {
         require(Files.isRegularFile(path)) { "Path $path is not a regular file" }
 
         val archiveName = base.relativize(path).toString().replace("\\", "/")
 
-
-        // Read file fully (FA requires sizes & CRC up front otherwise can't read the zip file)
-        val bytes = Files.readAllBytes(path)
-        val crc = java.util.zip.CRC32().apply { update(bytes) }
-
-        val entry = ZipEntry(archiveName).apply {
-            method = ZipEntry.DEFLATED
-            size = bytes.size.toLong()
-            compressedSize = -1 // let deflater handle, still no descriptor
-            this.crc = crc.value
-            // fix timestamp for determinism (not strictly necessary)
-            time = 315532800000L // 1980-01-01
+        // Use the same constructor as the FAF API:
+        val entry = ZipArchiveEntry(path.toFile(), archiveName).apply {
+            // Ensure deterministic times
+            setTime(MINIMUM_ZIP_FILE_TIME)
+            setCreationTime(MINIMUM_ZIP_FILE_TIME)
+            setLastModifiedTime(MINIMUM_ZIP_FILE_TIME)
+            setLastAccessTime(MINIMUM_ZIP_FILE_TIME)
         }
 
-        this.putNextEntry(entry)
-        this.write(bytes)
-        this.closeEntry()
+        this.putArchiveEntry(entry)
+        Files.newInputStream(path).use { inp -> inp.copyTo(this) }
+        this.closeArchiveEntry()
     }
 
 }

apps/faf-legacy-deployment/scripts/build.gradle.kts

@@ -10,6 +10,7 @@ repositories {
 dependencies {
     implementation("org.mariadb.jdbc:mariadb-java-client:3.5.7")
     implementation("org.eclipse.jgit:org.eclipse.jgit:7.5.0.202512021534-r")
+    implementation("org.apache.commons:commons-compress:1.28.0")
     implementation("org.slf4j:slf4j-api:2.0.13")
     runtimeOnly("ch.qos.logback:logback-classic:1.5.23")
 }