@poe-platform/safe-bash 0.1.612 → 0.1.614

package/dist/safe-bash/core.browser.js

@@ -27406,9 +27406,13 @@ async function parse12(scope, limits) {
     for (const value2 of argumentsValue.values) text2(shellValueBytes(value2));
   }
   let archive;
+  let action = "add";
   let recursive = false;
   let quiet = false;
   let junkPaths = false;
+  let omitDirectories = false;
+  let storeLinks = false;
+  let test = false;
   let level = 6;
   let stdinNames = false;
   let literal = false;
@@ -27426,8 +27430,15 @@ async function parse12(scope, limits) {
       for (let offset = 1; offset < argument2.length; offset++) {
         const flag = argument2[offset];
         if (flag === "r") recursive = true;
-        else if (flag === "q") quiet = true;
+        else if (flag === "d" || flag === "u" || flag === "f") {
+          const next = flag === "d" ? "delete" : flag === "u" ? "update" : "freshen";
+          if (action !== "add" && action !== next) throw new ZipFailure(16, "Invalid command arguments", "specify just one action");
+          action = next;
+        } else if (flag === "q") quiet = true;
         else if (flag === "j") junkPaths = true;
+        else if (flag === "D") omitDirectories = true;
+        else if (flag === "y") storeLinks = true;
+        else if (flag === "T") test = true;
         else if (flag === "@") stdinNames = true;
         else if (flag !== void 0 && flag >= "0" && flag <= "9") level = Number(flag);
         else if (flag === "i" || flag === "x") {
@@ -27485,7 +27496,7 @@ async function parse12(scope, limits) {
       start = end + 1;
     }
   }
-  return { archive, recursive, quiet, junkPaths, includes, excludes, level, operands: [...names, ...operands], firstOperand };
+  return { action, archive, recursive, quiet, junkPaths, omitDirectories, storeLinks, test, includes, excludes, level, operands: [...names, ...operands], firstOperand };
 }
 function memberName(path, limits) {
   if (path.startsWith("//") && !path.startsWith("///")) fail("UNC source paths are unsupported");
@@ -27500,6 +27511,30 @@ function memberName(path, limits) {
 function unchanged4(before, after) {
   return before.type === after.type && before.size === after.size && before.mode === after.mode && before.mtimeMs === after.mtimeMs && before.ctimeMs === after.ctimeMs && before.nlink === after.nlink && (!hasIdentity(before) || sameIdentity2(before, after));
 }
+async function inspectSource(scope, path, storeLinks) {
+  const { fs, signal } = scope.context;
+  if (storeLinks) {
+    const stat2 = await scope.operation(() => fs.lstat(path, { signal }));
+    if (stat2.type === "symlink") {
+      const parent = await scope.operation(() => fs.realpath(dirname(path), { signal }));
+      const canonical2 = `${parent === "/" ? "" : parent}/${path.slice(path.lastIndexOf("/") + 1)}`;
+      return { canonical: canonical2, stat: stat2 };
+    }
+  }
+  const canonical = await scope.operation(() => fs.realpath(path, { signal }));
+  const stat = await scope.operation(() => fs.stat(path, { signal }));
+  return { canonical, stat };
+}
+async function filterName(name2, selection, includeCount) {
+  selection.matched.clear();
+  await selection.matches(name2);
+  let included = includeCount === 0;
+  for (const pattern of selection.matched) {
+    if (pattern >= includeCount) return false;
+    included = true;
+  }
+  return included;
+}
 async function prepare(scope, parsed, budget) {
   const context2 = scope.context;
   const limits = budget.limits;
@@ -27521,7 +27556,10 @@ async function prepare(scope, parsed, budget) {
     if (!current || !unchanged4(existing2, current)) fail("archive changed while reading");
   }
   const old = new Map(archive.entries.map((entry) => [entry.name, entry]));
+  if (!archive.entries.length && !parsed.quiet && (parsed.action === "update" || parsed.action === "freshen")) await budget.output(`	zip warning: ${parsed.archive} not found or empty
+`);
   const selected = /* @__PURE__ */ new Map();
+  const deleted = /* @__PURE__ */ new Set();
   const selection = new Selection([...parsed.includes, ...parsed.excludes], limits, context2.signal);
   const ancestors = [];
   let visits = 0;
@@ -27538,8 +27576,7 @@ async function prepare(scope, parsed, budget) {
     let canonical;
     let stat;
     try {
-      canonical = await scope.operation(() => context2.fs.realpath(path, { signal: context2.signal }));
-      stat = await scope.operation(() => context2.fs.stat(path, { signal: context2.signal }));
+      ({ canonical, stat } = await inspectSource(scope, path, parsed.storeLinks));
     } catch (error) {
       context2.signal.throwIfAborted();
       if (typeof error !== "object" || error === null || !("code" in error) || error.code !== "ENOENT") throw error;
@@ -27549,7 +27586,8 @@ async function prepare(scope, parsed, budget) {
     }
     checkPath(canonical, limits);
     if (canonical === output2 || existing2 && sameIdentity2(existing2, stat)) return;
-    if (stat.type !== "file" && stat.type !== "directory") {
+    const symlink = parsed.storeLinks && stat.type === "symlink";
+    if (stat.type !== "file" && stat.type !== "directory" && !symlink) {
       if (!parsed.quiet) await budget.output(`	zip warning: ignoring special file: ${source2}
 `);
       return;
@@ -27557,17 +27595,12 @@ async function prepare(scope, parsed, budget) {
     if (existing2 && !hasIdentity(stat)) fail("cannot exclude archive aliases when source backing identity is unknown");
     const directory2 = stat.type === "directory";
     if (directory2 && name2 && !name2.endsWith("/")) name2 += "/";
-    selection.matched.clear();
-    await selection.matches(name2);
-    let included = parsed.includes.length === 0;
-    let excluded = false;
-    for (const pattern of selection.matched) {
-      if (pattern < parsed.includes.length) included = true;
-      else excluded = true;
-    }
+    const included = await filterName(name2, selection, parsed.includes.length);
     const sourceName = name2;
     if (parsed.junkPaths) name2 = directory2 ? "" : name2.slice(name2.lastIndexOf("/") + 1);
-    if (name2 && included && !excluded) {
+    const prior = old.get(name2);
+    const eligible = parsed.action !== "update" && parsed.action !== "freshen" || (prior ? Math.floor(stat.mtimeMs / 1e3) > Math.floor(prior.modified.getTime() / 1e3) : parsed.action === "update");
+    if (name2 && included && eligible && !(directory2 && parsed.omitDirectories)) {
       checkPath(name2, limits);
       const previous = selected.get(name2);
       if (previous && previous.source !== source2) {
@@ -27579,14 +27612,19 @@ async function prepare(scope, parsed, budget) {
       }
       if (!previous) {
         await budget.member(directory2 ? 0 : stat.size);
-        const bytes4 = directory2 ? new Uint8Array() : await collectBytes(scope.input(path), { maxBytes: stat.size, signal: context2.signal });
+        let bytes4;
+        if (directory2) bytes4 = new Uint8Array();
+        else if (symlink) {
+          if (!context2.fs.readlink) fail("filesystem does not support reading symbolic links");
+          const target = await scope.operation(() => context2.fs.readlink(path, { signal: context2.signal }));
+          if (import_buffer.Buffer.byteLength(target) > stat.size) fail(`source changed while reading: ${source2}`);
+          bytes4 = import_buffer.Buffer.from(target);
+        } else bytes4 = await collectBytes(scope.input(path), { maxBytes: stat.size, signal: context2.signal });
         if (!directory2 && bytes4.length !== stat.size) fail(`source changed while reading: ${source2}`);
-        const current = await scope.operation(() => context2.fs.stat(path, { signal: context2.signal }));
-        const currentPath = await scope.operation(() => context2.fs.realpath(path, { signal: context2.signal }));
-        if (currentPath !== canonical || !unchanged4(stat, current)) fail(`source changed while reading: ${source2}`);
-        let entry = await makeZipEntry(name2, bytes4, { modified: new Date(stat.mtimeMs), mode: stat.mode, directory: directory2, symlink: false }, limits, context2.signal, parsed.level);
+        const current = await inspectSource(scope, path, parsed.storeLinks);
+        if (current.canonical !== canonical || !unchanged4(stat, current.stat)) fail(`source changed while reading: ${source2}`);
+        let entry = await makeZipEntry(name2, bytes4, { modified: new Date(stat.mtimeMs), mode: stat.mode, directory: directory2, symlink }, limits, context2.signal, parsed.level);
         if ([".z", ".zip", ".zoo", ".arc", ".lzh", ".arj"].some((suffix2) => name2.toLowerCase().endsWith(suffix2))) entry = { ...entry, method: 0, data: bytes4 };
-        const prior = old.get(name2);
         if (prior?.comment) entry = { ...entry, comment: prior.comment };
         if (entry.data.length > limits.maxArchiveBytes - compressedBytes) fail("archive byte limit exceeded");
         compressedBytes += entry.data.length;
@@ -27609,26 +27647,53 @@ async function prepare(scope, parsed, budget) {
       }
     }
   };
-  for (const operand of parsed.operands) await visit(operand, memberName(operand, limits), 0);
-  if (!selected.size && !parsed.includes.length) {
-    const detail = parsed.recursive && parsed.firstOperand >= 0 ? `try: zip ${context2.args.slice(0, parsed.firstOperand).join(" ")} . -i ${context2.args.slice(parsed.firstOperand).join(" ")}` : parsed.archive;
+  if (parsed.action === "delete") {
+    if (!parsed.quiet && parsed.recursive) await budget.output("	zip warning: invalid option(s) used with -d; ignored.\n");
+    if (!parsed.quiet && !archive.entries.length) await budget.output(`	zip warning: ${parsed.archive} not found or empty
+`);
+    const operands = new Selection(parsed.operands, limits, context2.signal);
+    if (parsed.operands.length) {
+      for (const entry of archive.entries) {
+        if (await operands.matches(entry.name) && await filterName(entry.name, selection, parsed.includes.length)) deleted.add(entry.name);
+      }
+    }
+    if (!parsed.quiet) {
+      for (const [index, operand] of parsed.operands.entries()) {
+        if (!operands.matched.has(index)) await budget.output(`	zip warning: name not matched: ${operand}
+`);
+      }
+    }
+  } else {
+    const operands = parsed.operands.length || parsed.action === "add" ? parsed.operands : archive.entries.map((entry) => entry.name);
+    for (const operand of operands) await visit(operand, memberName(operand, limits), 0);
+  }
+  if (!selected.size && (parsed.action === "freshen" || parsed.action === "update" && (existing2 || !parsed.includes.length))) return void 0;
+  if (!selected.size && !deleted.size && (parsed.action === "delete" || !parsed.includes.length)) {
+    const detail = parsed.action !== "delete" && parsed.recursive && parsed.firstOperand >= 0 ? `try: zip ${context2.args.slice(0, parsed.firstOperand).join(" ")} . -i ${context2.args.slice(parsed.firstOperand).join(" ")}` : parsed.archive;
     throw new ZipFailure(12, "Nothing to do!", detail);
   }
   const entries2 = [];
   const progress = [];
   let progressBytes = 0;
-  const append = (entry, update) => {
+  const queue = (message3) => {
     if (parsed.quiet) return;
-    const percentage = entry.size ? Math.trunc((Math.trunc(200 * (entry.size - entry.data.length) / entry.size) + 1) / 2) : 0;
-    const message3 = `${update ? "updating:" : "  adding:"} ${entry.name} (${entry.method === 8 ? `deflated ${percentage}%` : "stored 0%"})
-`;
     const size = import_buffer.Buffer.byteLength(message3);
     if (size > limits.maxTextBytes - budget.textBytes - progressBytes) fail("text output limit exceeded");
     progressBytes += size;
     progress.push(message3);
   };
+  const append = (entry, update) => {
+    const percentage = entry.size ? Math.trunc((Math.trunc(200 * (entry.size - entry.data.length) / entry.size) + 1) / 2) : 0;
+    queue(`${update ? parsed.action === "freshen" ? "freshening:" : "updating:" : "  adding:"} ${entry.name} (${entry.method === 8 ? `deflated ${percentage}%` : "stored 0%"})
+`);
+  };
   for (const entry of archive.entries) {
     if (++work > limits.maxPatternSteps) fail("archive work limit exceeded");
+    if (deleted.has(entry.name)) {
+      queue(`deleting: ${entry.name}
+`);
+      continue;
+    }
     const replacement = selected.get(entry.name);
     if (replacement) {
       entries2.push(replacement.entry);
@@ -27643,8 +27708,33 @@ async function prepare(scope, parsed, budget) {
     entries2.push(entry);
     append(entry, false);
   }
-  if (!entries2.length && !parsed.quiet) await budget.output("	zip warning: zip file empty\n");
+  if (!entries2.length) queue("	zip warning: zip file empty\n");
   const bytes3 = await writeZipArchive({ entries: entries2, comment: archive.comment }, limits, context2.signal);
+  if (parsed.test) {
+    for (const message3 of progress) await budget.output(message3);
+    progress.length = 0;
+    progressBytes = 0;
+    try {
+      const tested = await readZipArchive(bytes3, limits, context2.signal);
+      if (!tested.entries.length) fail("empty ZIP archive");
+      let decoded = 0;
+      for (const entry of tested.entries) {
+        for await (const chunk of decodeZipEntry(entry, limits, context2.signal)) {
+          if (chunk.length > limits.maxTotalBytes - decoded) fail("actual decompressed byte limit exceeded");
+          decoded += chunk.length;
+        }
+      }
+    } catch {
+      context2.signal.throwIfAborted();
+      if (!parsed.quiet) await budget.output(`test of ${parsed.archive} FAILED
+`);
+      throw new ZipFailure(8, "Zip file invalid, could not spawn unzip, or wrong unzip", "original files unmodified");
+    }
+    if (!parsed.quiet) {
+      queue(`test of ${parsed.archive} OK
+`);
+    }
+  }
   return { output: output2, parentName, parent, parentStat, existing: existing2, bytes: bytes3, progress };
 }
 function createZipCommand(options2 = {}) {
@@ -27657,6 +27747,7 @@ function createZipCommand(options2 = {}) {
     try {
       const parsed = await parse12(scope, limits);
       const prepared = await prepare(scope, parsed, budget);
+      if (!prepared) return { exitCode: 12 };
       await writeFileOutput(context2, prepared.bytes, () => scope.operation(() => publishZip(scope, prepared)));
       for (const message3 of prepared.progress) await budget.output(message3);
       return { exitCode: 0 };