修复：Windows 上打包和读取 zip 时中文文件名出错（master 的 Windows CI 失败） (#311)

Windows' bsdtar fallback (no zip on the Actions Windows runners) now writes UTF-8 entry names (zip:hdrcharset=UTF-8), and the update tool's zip reader also takes Info-ZIP's Unicode Path extra field for names stored in the system code page. Test and maintainer-tool change only; nothing shipped changes.

tools/package-update.mjs

@@ -8,7 +8,8 @@
 // every later 0.2.x given as a base); `removed` lists the files some base shipped that the new version does not, with
 // the bytes each base had (the player's copy is deleted only when it still holds them). A removed path that differs
 // from a new one only in case is the same file on Windows / macOS: it is left out of `removed` (`caseOnly`).
-// The zip reader handles what tools/package.mjs and GitHub hand out: stored and deflated entries, zip64, UTF-8 names.
+// The zip reader handles what tools/package.mjs and GitHub hand out: stored and deflated entries, zip64, UTF-8 names —
+// also a name zip on Windows (Info-ZIP) stored in the system code page, through its Unicode Path extra field.
 
 import crypto from 'node:crypto';
 import fs from 'node:fs';
@@ -31,6 +32,28 @@ function readAt(fd, pos, len) {
 const SIG = { eocd: 0x06054b50, loc64: 0x07064b50, eocd64: 0x06064b50, central: 0x02014b50, local: 0x04034b50 };
 const U32 = 0xffffffff;
 
+/**
+ * The name of the central-directory entry at `p`: the header bytes when flag bit 11 marks them UTF-8; otherwise the
+ * Info-ZIP Unicode Path extra field (0x7075, APPNOTE 4.6.9) when its CRC matches the header name — Info-ZIP's zip on
+ * Windows stores a non-ASCII name in the system code page and the UTF-8 name only there; without that field the header
+ * bytes, read as UTF-8 (an ASCII name).
+ */
+function entryName(cd, p, flags, nameLen, extraLen) {
+  const raw = cd.subarray(p + 46, p + 46 + nameLen);
+  if (!(flags & 0x800)) {
+    for (let q = p + 46 + nameLen, end = q + extraLen; q + 4 <= end;) {
+      const id = cd.readUInt16LE(q);
+      const len = cd.readUInt16LE(q + 2);
+      if (id === 0x7075 && len >= 5 && cd[q + 4] === 1 && q + 4 + len <= end
+        && (typeof zlib.crc32 !== 'function' || (zlib.crc32(raw) >>> 0) === cd.readUInt32LE(q + 5))) {
+        return cd.toString('utf8', q + 9, q + 4 + len);
+      }
+      q += 4 + len;
+    }
+  }
+  return raw.toString('utf8');
+}
+
 /**
  * Call `onFile(name, data)` for every file entry of a zip (directories skipped), in central-directory order.
  * @param {string} zipPath
@@ -73,7 +96,7 @@ export function readZip(zipPath, onFile) {
       const commentLen = cd.readUInt16LE(p + 32);
       const external = cd.readUInt32LE(p + 38);
       let offset = cd.readUInt32LE(p + 42);
-      const name = cd.toString('utf8', p + 46, p + 46 + nameLen);
+      const name = entryName(cd, p, flags, nameLen, extraLen);
       if (packedSize === U32 || rawSize === U32 || offset === U32) {
         // the zip64 extra field carries the values the header marks 0xFFFFFFFF, in this order
         for (let q = p + 46 + nameLen, end = q + extraLen; q + 4 <= end;) {

tools/package.mjs

@@ -423,11 +423,16 @@ export function packageOutIsUnsafe(out, root = REPO) {
   return inside(r, o) || inside(o, r);
 }
 
-function zipFolder(cwd, zipPath) {
+/**
+ * Zip `cwd`/FOLDER into `zipPath`: Info-ZIP `zip`, else a bsdtar `tar --format zip` (Windows 10+, macOS). bsdtar writes
+ * the names in UTF-8 (flag bit 11) only when told: its default is the system code page, which loses a name it cannot
+ * spell (卫戍 becomes ?? on Windows code page 1252) and leaves no UTF-8 copy for a reader.
+ */
+export function zipFolder(cwd, zipPath) {
   // deflate everything: storing PNG / MP3 as they are made the full zip 8.5 MB larger and saved no real time
   const z = spawnSync('zip', ['-q', '-r', '-X', zipPath, FOLDER], { cwd, stdio: 'inherit' });
   if (!z.error && z.status === 0) return;
-  const t = spawnSync('tar', ['-c', '--format', 'zip', '-f', zipPath, FOLDER], { cwd, stdio: 'inherit' }); // bsdtar (Windows 10+, macOS)
+  const t = spawnSync('tar', ['-c', '--format', 'zip', '--options', 'zip:hdrcharset=UTF-8', '-f', zipPath, FOLDER], { cwd, stdio: 'inherit' });
   if (t.error || t.status !== 0 || !isFile(zipPath)) throw new Error('zipping failed: install `zip` (or a bsdtar `tar`)');
 }