freestyle-sync 0.1.7 → 0.1.8

package/dist/src/main.js

@@ -22,7 +22,7 @@ const execFileAsync = promisify(execFile);
 const CLI_NAME = "freestyle-sync";
 const CACHE_VERSION = 1;
 const PLUGIN_PREFERENCES_VERSION = 1;
-const ARCHIVE_CHUNK_CHARS = 1024 * 1024;
+const ARCHIVE_CHUNK_BYTES = 1024 * 1024;
 const MS_PER_SECOND = 1000;
 const DEFAULT_FREESTYLE_API_URL = "https://api.freestyle.sh";
 const DEFAULT_STACK_API_URL = "https://api.stack-auth.com";
@@ -1392,20 +1392,18 @@ async function createTar(args) {
     });
 }
 async function uploadArchiveInChunks(vm, vmId, archivePath, remoteArchivePath, label) {
-    const archive = await readFile(archivePath);
-    const encoded = archive.toString("base64");
-    const chunkCount = Math.max(1, Math.ceil(encoded.length / ARCHIVE_CHUNK_CHARS));
+    const archiveSize = (await stat(archivePath)).size;
+    const chunkCount = Math.max(1, Math.ceil(archiveSize / ARCHIVE_CHUNK_BYTES));
     const chunkDir = `/tmp/freestyle-sync-${label}-${Date.now()}.chunks`;
-    console.log(`VM ${vmId}: streaming ${formatBytes(archive.length)} ${label} archive in ${chunkCount} chunk${chunkCount === 1 ? "" : "s"}...`);
+    console.log(`VM ${vmId}: streaming ${formatBytes(archiveSize)} ${label} archive in ${chunkCount} chunk${chunkCount === 1 ? "" : "s"}...`);
     await checkedExec(vm, `rm -rf ${shellQuote(chunkDir)} && mkdir -p ${shellQuote(chunkDir)}`);
     const width = String(chunkCount - 1).length;
     const canRenderInlineProgress = process.stdout.isTTY;
     const logEvery = Math.max(1, Math.ceil(chunkCount / 4));
-    for (let index = 0; index < chunkCount; index += 1) {
-        const start = index * ARCHIVE_CHUNK_CHARS;
-        const chunk = encoded.slice(start, start + ARCHIVE_CHUNK_CHARS);
-        const chunkName = `${String(index).padStart(width, "0")}.b64`;
-        await vm.fs.writeTextFile(`${chunkDir}/${chunkName}`, chunk);
+    let index = 0;
+    for await (const chunk of createReadStream(archivePath, { highWaterMark: ARCHIVE_CHUNK_BYTES })) {
+        const chunkName = `${String(index).padStart(width, "0")}.chunk`;
+        await vm.fs.writeFile(`${chunkDir}/${chunkName}`, Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk));
         const uploadedChunks = index + 1;
         if (chunkCount > 1) {
             const progressMessage = `VM ${vmId}: uploaded ${uploadedChunks}/${chunkCount} ${label} archive chunks`;
@@ -1419,8 +1417,11 @@ async function uploadArchiveInChunks(vm, vmId, archivePath, remoteArchivePath, l
                 console.log(progressMessage);
             }
         }
+        index += 1;
     }
-    await checkedExec(vm, `cat ${shellQuote(chunkDir)}/*.b64 | base64 -d > ${shellQuote(remoteArchivePath)} && rm -rf ${shellQuote(chunkDir)}`);
+    await checkedExec(vm, archiveSize === 0
+        ? `: > ${shellQuote(remoteArchivePath)} && rm -rf ${shellQuote(chunkDir)}`
+        : `cat ${shellQuote(chunkDir)}/*.chunk > ${shellQuote(remoteArchivePath)} && rm -rf ${shellQuote(chunkDir)}`);
 }
 async function mkdirRemote(vm, directories) {
     for (const chunk of chunkArray(directories, 50)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "freestyle-sync",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "type": "module",
   "main": "dist/src/main.js",
   "exports": {