@poe-platform/safe-bash 0.1.842 → 0.1.843

package/dist/safe-bash-command-ffmpeg/index.js

@@ -1292,6 +1292,24 @@ function applyStreamDispositions(tracks, dispositions) {
   }
   return tracks;
 }
+function selectAutomaticAudio(documents) {
+  let selected;
+  let bestScore = -1;
+  for (const document of documents) {
+    for (const track of document.tracks) {
+      if (track.type !== "audio") continue;
+      const score = (track.enabled ? 1 << 22 : 0) + (track.decodedAudio?.channels ?? track.codecDescriptions[0]?.channels ?? 0);
+      if (score > bestScore) {
+        selected = track;
+        bestScore = score;
+      }
+    }
+  }
+  return documents.map((document) => ({
+    ...document,
+    tracks: document.tracks.filter((track) => track.type !== "audio" || track === selected)
+  }));
+}
 function evalSyncFfmpeg(inBytesOrArgs, maybeArgs, readFileSync, writeFileSync) {
   const inBytes = Array.isArray(inBytesOrArgs) ? void 0 : inBytesOrArgs;
   const args = Array.isArray(inBytesOrArgs) ? inBytesOrArgs : maybeArgs ?? [];
@@ -1441,6 +1459,7 @@ function evalSyncFfmpeg(inBytesOrArgs, maybeArgs, readFileSync, writeFileSync) {
       else outputTarget = arg;
     }
     if (inputs.length === 0 || !outputTarget) return void 0;
+    if (outputDuration === void 0 && outputTo !== void 0 && outputTo <= (outputSs ?? 0)) return void 0;
     const isNullMux = outputFormat === "null" || outputTarget === "/dev/null";
     if (!isNullMux && !writeFileSync) return void 0;
     if (noOverwrite && !isNullMux && (!readFileSync || readFileSync(outputTarget))) return void 0;
@@ -1467,9 +1486,9 @@ function evalSyncFfmpeg(inBytesOrArgs, maybeArgs, readFileSync, writeFileSync) {
       }
       loadedDocs.push(doc);
     }
-    let workingDoc = muxMp4(loadedDocs, { stripAudio, stripVideo, stripSubtitles, shortest, rotation });
+    let workingDoc = muxMp4(selectAutomaticAudio(loadedDocs), { stripAudio, stripVideo, stripSubtitles, shortest, rotation });
     if (outputSs !== void 0 || outputTo !== void 0 || outputDuration !== void 0) {
-      workingDoc = sliceMp4(workingDoc, { startSeconds: outputSs, endSeconds: outputTo, durationSeconds: outputDuration });
+      workingDoc = sliceMp4(workingDoc, { startSeconds: outputSs, endSeconds: outputDuration === void 0 ? outputTo : void 0, durationSeconds: outputDuration });
     }
     if (outputSize && videoCodec !== "copy") {
       const [w, h] = outputSize.toLowerCase().split("x");
@@ -1823,6 +1842,10 @@ function createFfmpegCommand(options = {}) {
         );
         return { exitCode: 1 };
       }
+      if (outputDuration === void 0 && outputTo !== void 0 && outputTo <= (outputSs ?? 0)) {
+        await writeBytes(context.stderr, encodeUtf8("ffmpeg: -to value smaller than -ss; aborting.\n"), context.signal);
+        return { exitCode: 1 };
+      }
       try {
         if (!overwrite && !isStdout(outputTarget) && outputFormat !== "null") {
           const outFull = resolvePath(context.cwd, outputTarget);
@@ -2248,7 +2271,11 @@ function createFfmpegCommand(options = {}) {
             const [input, selector, ordinal] = clean.split(":");
             const inputIdx = Number(input);
             const srcDoc = loadedDocs[inputIdx];
-            if (!srcDoc) continue;
+            if (!srcDoc) {
+              await writeBytes(context.stderr, encodeUtf8(`ffmpeg: Invalid input file index: ${inputIdx}.
+`), context.signal);
+              return { exitCode: 234 };
+            }
             const type = selector === "v" ? "video" : selector === "a" ? "audio" : selector === "s" ? "subtitle" : void 0;
             let matches = type ? srcDoc.tracks.filter((t) => t.type === type) : srcDoc.tracks;
             const index = type ? ordinal : selector;
@@ -2268,7 +2295,7 @@ To ignore this, add a trailing '?' to the map.
           }
           const filteredTracks = selectedTracks.map((entry) => entry.track);
           if (!mapped) {
-            const tracks = loadedDocs.flatMap((doc) => doc.tracks);
+            const tracks = selectAutomaticAudio(loadedDocs).flatMap((doc) => doc.tracks);
             for (const type of ["video", "audio"]) {
               const track = tracks.find((track2) => track2.type === type);
               if (track) filteredTracks.push(track);
@@ -2280,7 +2307,7 @@ To ignore this, add a trailing '?' to the map.
             context.signal
           );
         } else {
-          workingDoc = await muxMp4Cooperatively(loadedDocs, {
+          workingDoc = await muxMp4Cooperatively(selectAutomaticAudio(loadedDocs), {
             stripAudio,
             stripVideo,
             stripSubtitles,
@@ -2291,7 +2318,7 @@ To ignore this, add a trailing '?' to the map.
         if (outputSs !== void 0 || outputTo !== void 0 || outputDuration !== void 0) {
           workingDoc = sliceMp4(workingDoc, {
             startSeconds: outputSs,
-            endSeconds: outputTo,
+            endSeconds: outputDuration === void 0 ? outputTo : void 0,
             durationSeconds: outputDuration
           });
         }

package/dist/safe-bash-command-imagemagick/index.js

@@ -3651,7 +3651,7 @@ import {
 } from "../safe-bash-contracts/command.js";
 import { readBytes as readBytes2, writeBytes as writeBytes2 } from "../safe-bash-contracts/io.js";
 import { createOutputOperation } from "../safe-bash-contracts/output.js";
-import { readImageMetadataFromSource as readImageMetadataFromSource3, decodeImageToStorage as decodeImageToStorage2, transformStoredImage as transformStoredImage2, UnsupportedStoredResource as UnsupportedStoredResource4, decodeImage as decodeImage3, decodePngToCanvas, FONT_5X7, encodeImage, readImageMetadata as readImageMetadata3, parseColor as baseParseColor, applyExifOrientationSteps, compositeImageSteps, computeImageStatsSteps as computeImageStatsSteps2, ensureAlphaImageSteps, extendImageSteps, extractChannelImageSteps, extractImageSteps as extractImageSteps2, flattenImageSteps, flipImageSteps, flopImageSteps, grayscaleImageSteps, removeAlphaImageSteps, resizeImageSteps, rotateImageSteps, thresholdImageSteps } from "../image-ast/portable.js";
+import { readImageMetadataFromSource as readImageMetadataFromSource3, decodeImageToStorage as decodeImageToStorage2, transformStoredImage as transformStoredImage2, UnsupportedStoredResource as UnsupportedStoredResource4, decodeImage as decodeImage3, decodePngToCanvas, FONT_5X7, encodeImage, readImageMetadata as readImageMetadata3, parseColor as baseParseColor, applyExifOrientationSteps, compositeImageSteps, computeImageStatsSteps as computeImageStatsSteps2, ensureAlphaImageSteps, extendImageSteps, extractChannelImageSteps, extractImageSteps as extractImageSteps2, flipImageSteps, flopImageSteps, grayscaleImageSteps, resizeImageSteps, rotateImageSteps, thresholdImageSteps } from "../image-ast/portable.js";
 var X11_NAMED_COLORS = {
   aliceblue: [240, 248, 255, 255],
   antiquewhite: [250, 235, 215, 255],
@@ -4805,11 +4805,10 @@ function* applyMagickSpliceSteps(img, geomStr, bg, gravity = "northwest", signal
   const g = parseMagickGeometry(geomStr);
   const sw = Math.max(0, Math.round(g.width ?? 0));
   const sh = Math.max(0, Math.round(g.height ?? 0));
-  const base = resolveGravityOffset(img.width, img.height, gravity);
-  const isEast = gravity === "east" || gravity === "northeast" || gravity === "southeast";
-  const isSouth = gravity === "south" || gravity === "southwest" || gravity === "southeast";
-  const sx = Math.max(0, Math.min(img.width, Math.round(base.left + (isEast ? -g.x : g.x))));
-  const sy = Math.max(0, Math.min(img.height, Math.round(base.top + (isSouth ? -g.y : g.y))));
+  const box = gravityAdjustBox(img.width, img.height, sw, sh, g.x, g.y, gravity);
+  const anchor = resolveGravityOffset(sw, sh, gravity);
+  const sx = Math.max(0, Math.min(img.width, box.x + anchor.left));
+  const sy = Math.max(0, Math.min(img.height, box.y + anchor.top));
   const outW = img.width + sw;
   const outH = img.height + sh;
   const out = new Uint8Array(new ArrayBuffer(outW * outH * 4 + outH), 0, outW * outH * 4);
@@ -8061,7 +8060,7 @@ function parseMagickPixelOperation(tokens, settings, start, signal) {
       return { ...metadata, data: out, space: "b-w", channels: image.hasAlpha ? 2 : 1 };
     };
   } else if (token === "-gamma") {
-    const gamma = Math.max(0.1, Number(tokens[++i] ?? 1));
+    const gamma = Math.max(0.1, parseFloat(tokens[++i] ?? "1"));
     const channels = state.channelExplicit ? state.channels : { r: true, g: true, b: true, a: true };
     const lookup = [channels.r, channels.g, channels.b, channels.a].map((active) => Uint8Array.from({ length: 256 }, (_, value) => active ? clampByteVal(255 * Math.pow(value / 255, 1 / gamma)) : value));
     apply = (image) => applyMagickLookup(image, lookup);
@@ -8069,7 +8068,19 @@ function parseMagickPixelOperation(tokens, settings, start, signal) {
     const mode = (tokens[++i] ?? "on").toLowerCase();
     if (mode === "remove") {
       apply = function* (im) {
-        return yield* removeAlphaImageSteps(yield* flattenImageSteps(im, state.background));
+        const out = new Uint8Array(im.data.length);
+        const background = [state.background.r, state.background.g, state.background.b];
+        for (let idx = 0; idx < out.length; idx += 4) {
+          if (idx % 65536 === 0) yield;
+          const alpha = im.data[idx + 3] / 255;
+          for (let channel = 0; channel < 3; channel++) {
+            const bg = background[im.channels === 2 ? 0 : channel];
+            out[idx + channel] = clampByteVal(im.data[idx + channel] * alpha + bg * (1 - alpha));
+          }
+          out[idx + 3] = 255;
+        }
+        const { data16: ignored, ...metadata } = im;
+        return { ...metadata, data: out, hasAlpha: false, channels: im.channels === 4 ? 3 : im.channels === 2 ? 1 : im.channels };
       };
     } else if (mode === "associate" || mode === "disassociate") {
       apply = function* (im) {
@@ -9267,6 +9278,8 @@ function* evaluatePipelineTokensSteps(tokens, files, state, parentStack = [], st
           if (composed !== overlay) detachRgbaBuffer(overlay.data);
         }
         stack = [composed, ...stack.slice(2)];
+      } else {
+        throw new Error("image sequence is required '-composite'");
       }
     } else {
       if (t.startsWith("-") && t !== "-" || t.startsWith("+")) throw new Error(`unrecognized option '${t}'`);
@@ -9513,11 +9526,10 @@ async function transformStoredMagickCoordinates(image, backend, token, geometry,
     ys = [{ source: h - dy, target: 0, length: dy }, { source: 0, target: dy, length: h - dy }];
   } else if (token === "-splice") {
     const sw = Math.max(0, Math.round(g.width ?? 0)), sh = Math.max(0, Math.round(g.height ?? 0));
-    const base = resolveGravityOffset(w, h, state.gravity);
-    const east = state.gravity === "east" || state.gravity === "northeast" || state.gravity === "southeast";
-    const south = state.gravity === "south" || state.gravity === "southwest" || state.gravity === "southeast";
-    const x = Math.max(0, Math.min(w, Math.round(base.left + (east ? -g.x : g.x))));
-    const y = Math.max(0, Math.min(h, Math.round(base.top + (south ? -g.y : g.y))));
+    const box = gravityAdjustBox(w, h, sw, sh, g.x, g.y, state.gravity);
+    const anchor = resolveGravityOffset(sw, sh, state.gravity);
+    const x = Math.max(0, Math.min(w, box.x + anchor.left));
+    const y = Math.max(0, Math.min(h, box.y + anchor.top));
     width += sw;
     height += sh;
     xs = [{ source: 0, target: 0, length: x }, { source: x, target: x + sw, length: w - x }];
@@ -9888,7 +9900,8 @@ async function tryConvertFilesResult(argv, input, stdinBytes, signal, analysis)
         if (token === "-layers") i++;
         const settings = { ...state };
         stackStep(async (stack, backend) => {
-          if (!stack.length || token === "-composite" && stack.length < 2) return stack;
+          if (token === "-composite" && stack.length < 2) throw new Error("image sequence is required '-composite'");
+          if (!stack.length) return stack;
           let result;
           if (token === "-composite") {
             const base = await stack.get(0);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@poe-platform/safe-bash",
-  "version": "0.1.842",
+  "version": "0.1.843",
   "description": "Extensible virtual shell with pluggable filesystems and streaming commands",
   "type": "module",
   "license": "MIT",
@@ -1415,7 +1415,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@poe-platform/safe-fs": "0.1.842",
+    "@poe-platform/safe-fs": "0.1.843",
     "pdf-lib": "1.17.1",
     "@types/node": "^25.2.2",
     "@formatjs/intl-numberformat": "9.4.0",