bdy 1.25.14-dev → 1.25.15-beta

package/distTs/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bdy",
   "preferGlobal": false,
-  "version": "1.25.14-dev",
+  "version": "1.25.15-beta",
   "type": "commonjs",
   "license": "MIT",
   "homepage": "https://buddy.works/docs/cli",

package/distTs/src/utils.js

@@ -69,6 +69,9 @@ const cliError_1 = __importStar(require("./cliError"));
 const node_fs_1 = __importStar(require("node:fs"));
 const texts_1 = require("./texts");
 const node_sea_1 = require("node:sea");
+const node_zlib_1 = __importDefault(require("node:zlib"));
+const node_stream_1 = require("node:stream");
+const promises_1 = require("node:stream/promises");
 const cliCommand_1 = __importDefault(require("./cliCommand"));
 const node_os_1 = __importStar(require("node:os"));
 const node_child_process_1 = require("node:child_process");
@@ -1344,56 +1347,45 @@ const OIDC_ISSUERS = new Set(APP_HOST_OIDC_ISSUERS.map(([, issuer]) => issuer));
 function isKnownOidcIssuer(issuer) {
     return OIDC_ISSUERS.has(issuer);
 }
-const addEntryToZip = (dirPath, zip, entry) => {
-    const fflate = require('fflate');
-    return new Promise((resolve, reject) => {
-        const isDir = entry.isDirectory();
-        // A zip entry name is always a relative POSIX path: on Windows path.join builds it with
-        // backslashes, and anything below the root keeps the separator the strip above left behind
-        let name = node_path_1.default
-            .join(entry.parentPath.replace(dirPath, ''), entry.name)
-            .split(node_path_1.default.sep)
-            .join('/')
-            .replace(/^\/+/, '');
-        if (isDir)
-            name += '/';
-        const file = new fflate.ZipDeflate(name, {
-            level: 3,
-        });
-        zip.add(file);
-        if (isDir) {
-            file.push(new Uint8Array(0), true);
-            resolve();
-            return;
-        }
-        const fullPath = node_path_1.default.join(entry.parentPath, entry.name);
-        const rs = node_fs_1.default.createReadStream(fullPath);
-        const finish = (err) => {
-            try {
-                rs.removeAllListeners();
-                rs.close();
-            }
-            catch {
-                // do nothing
-            }
-            if (err)
-                reject(err);
-            else
-                resolve();
-        };
-        rs.on('data', (chunk) => {
-            // Always a Buffer here - no encoding is set on the stream - but the event is typed for
-            // the ones that do set one, and a string would reach fflate as something it cannot zip
-            file.push(typeof chunk === 'string' ? Buffer.from(chunk) : chunk, false);
-        });
-        rs.on('error', (err) => {
-            finish(err);
-        });
-        rs.on('end', () => {
-            file.push(new Uint8Array(0), true);
-            finish();
-        });
-    });
+const addEntryToZip = async (dirPath, zip, entry) => {
+    const isDir = entry.isDirectory();
+    // A zip entry name is always a relative POSIX path: on Windows path.join builds it with
+    // backslashes, and anything below the root keeps the separator the strip above left behind
+    let name = node_path_1.default
+        .join(entry.parentPath.replace(dirPath, ''), entry.name)
+        .split(node_path_1.default.sep)
+        .join('/')
+        .replace(/^\/+/, '');
+    if (isDir)
+        name += '/';
+    // fflate only writes the zip framing here - the entry data is deflated by node's zlib. fflate's
+    // streaming Deflate (0.8.3, fflate#260 / fflate#282) emits back-references past the start of some
+    // inputs (font files, for one), and the file server then rejects the whole archive with
+    // "invalid distance too far back"
+    const file = {
+        filename: name,
+        size: 0,
+        crc: 0,
+        compression: isDir ? 0 : 8,
+    };
+    zip.add(file);
+    if (isDir) {
+        file.ondata(null, new Uint8Array(0), true);
+        return;
+    }
+    await (0, promises_1.pipeline)(node_fs_1.default.createReadStream(node_path_1.default.join(entry.parentPath, entry.name)), new node_stream_1.Transform({
+        transform(chunk, _encoding, callback) {
+            file.crc = node_zlib_1.default.crc32(chunk, file.crc);
+            file.size += chunk.length;
+            callback(null, chunk);
+        },
+    }), node_zlib_1.default.createDeflateRaw({ level: 3 }), new node_stream_1.Writable({
+        write(chunk, _encoding, callback) {
+            file.ondata(null, chunk, false);
+            callback();
+        },
+    }));
+    file.ondata(null, new Uint8Array(0), true);
 };
 const addEntriesToZip = async (dirPath, zip, entries, onEntry) => {
     for (let i = 0; i < entries.length; i += 1) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bdy",
   "preferGlobal": false,
-  "version": "1.25.14-dev",
+  "version": "1.25.15-beta",
   "type": "commonjs",
   "license": "MIT",
   "homepage": "https://buddy.works/docs/cli",