@zip.js/zip.js 2.5.14 → 2.5.15

package/cli-deno/mc-zip.js

@@ -7,7 +7,7 @@ import { fromFileUrl, normalize as normalizePath, resolve as resolvePath, extnam
 import { configure, ZipWriter, ReadableStreamReader, WritableStreamWriter, terminateWorkers } from "../index.js";
 
 const args = parseArgs(Deno.args);
-const stdout = getStdout(Deno.stdout);
+const stdout = getTextWriter(Deno.stdout);
 main();
 
 async function main() {
@@ -57,32 +57,28 @@ async function runCommand(zipfile, list, options) {
 	list = await Promise.all(list.map(getFileInfo));
 	list = await Promise.all(list.map(file => addDirectories(file)));
 	list = list.flat();
+	zipfile = await Deno.open(zipfile, { create: true, write: true });
 	configure(options);
-	const targetFile = await Deno.open(zipfile, { create: true, write: true });
-	const zipWriter = new ZipWriter(new WritableStreamWriter(targetFile.writable), options);
+	const zipWriter = new ZipWriter(new WritableStreamWriter(zipfile.writable), options);
 	try {
-		await Promise.all(list.map(async file => {
-			try {
-				const readable = await getReadable(file);
-				if (readable) {
-					await zipWriter.add(file.name, new ReadableStreamReader(readable), {
-						onstart: () => stdout.write("  adding: " + file.name + "\n")
-					});
-				}
-			} catch (error) {
-				await stdout.write("  error: " + error.message + ", file: " + file.url + "\n");
-			}
-		}));
+		await Promise.all(list.map(file => addFile(zipWriter, file)));
 		await zipWriter.close();
 	} finally {
 		terminateWorkers();
 	}
 }
 
-function getStdout(stdout) {
-	const textEncoderStream = new TextEncoderStream();
-	textEncoderStream.readable.pipeTo(stdout.writable);
-	return textEncoderStream.writable.getWriter();
+async function addFile(zipWriter, file) {
+	try {
+		const readable = await getReadable(file);
+		if (readable) {
+			await zipWriter.add(file.name, new ReadableStreamReader(readable), {
+				onstart: () => stdout.write("  adding: " + file.name + "\n")
+			});
+		}
+	} catch (error) {
+		await stdout.write("  error: " + error.message + ", file: " + file.url + "\n");
+	}
 }
 
 async function getFileInfo(file) {
@@ -140,6 +136,12 @@ function isRemote(path) {
 	return path.startsWith("http:") || path.startsWith("https:");
 }
 
+function getTextWriter(stdout) {
+	const textEncoderStream = new TextEncoderStream();
+	textEncoderStream.readable.pipeTo(stdout.writable);
+	return textEncoderStream.writable.getWriter();
+}
+
 function trimSlashes(url) {
 	const match = url.match(/^(?:\/|\\)?(.*?)(?:\/|\\)?$/);
 	if (match) {

package/dist/zip-fs-full.js

@@ -7172,6 +7172,7 @@
 			workerData.worker.addEventListener(MESSAGE_EVENT_TYPE, onMessage, false);
 			workerData.interface = {
 				abort() {
+					workerData.interface.aborted = true;
 					sendMessage({ type: MESSAGE_ABORT });
 					workerData.writer.releaseLock();
 					workerData.onTaskFinished();
@@ -7254,7 +7255,7 @@
 			}
 
 			function close(error, result) {
-				if (error) {
+				if (error && !workerData.interface.aborted) {
 					rejectResult(error);
 				} else {
 					resolveResult(result);