npm - @shaztech/video-pipeline - Versions diffs - 1.2.0 → 1.4.0 - Mend

@shaztech/video-pipeline 1.2.0 → 1.4.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (10) hide show

package/README.md +10 -4
package/dist/editor/assets/{index-Df9WKIy8.css → index-CUxLpKni.css} +1 -1
package/dist/editor/assets/index-DK9i7gno.js +71 -0
package/dist/editor/index.html +2 -2
package/package.json +1 -1
package/src/executor/nodeHandlers/imageAnnotate.js +32 -4
package/src/executor/nodeHandlers/video-stitcher.js +13 -2
package/src/server/routes.js +35 -15
package/src/spec/schema.js +0 -10
package/dist/editor/assets/index-Dqr1wx5V.js +0 -71

package/dist/editor/index.html CHANGED Viewed

@@ -9,8 +9,8 @@
       html, body, #root { height: 100%; width: 100%; overflow: hidden; }
       body { font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif; background: #1a1a2e; color: #e0e0e0; }
     </style>
-    <script type="module" crossorigin src="./assets/index-Dqr1wx5V.js"></script>
-    <link rel="stylesheet" crossorigin href="./assets/index-Df9WKIy8.css">
+    <script type="module" crossorigin src="./assets/index-DK9i7gno.js"></script>
+    <link rel="stylesheet" crossorigin href="./assets/index-CUxLpKni.css">
   </head>
   <body>
     <div id="root"></div>

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@shaztech/video-pipeline",
-  "version": "1.2.0",
+  "version": "1.4.0",
   "description": "Visual node-based video processing pipeline CLI",
   "license": "Apache-2.0",
   "repository": {

package/src/executor/nodeHandlers/imageAnnotate.js CHANGED Viewed

@@ -30,6 +30,14 @@ function escapeFilterPath(p) {
   return p.replace(/\\/g, '\\\\').replace(/:/g, '\\:').replace(/'/g, "\\'")
 }
+function computePositionXY({ position = 'bottom-right', padding = 20, customX = 0, customY = 0 }) {
+  if (position === 'custom') return { x: String(customX), y: String(customY) }
+  const H = { left: String(padding), center: '(w-tw)/2', right: `w-tw-${padding}` }
+  const V = { top: String(padding), center: '(h-th)/2', bottom: `h-th-${padding}` }
+  const parts = position.split('-')
+  return { x: H[parts[1] ?? 'center'], y: V[parts[0]] }
+}
 /**
  * Validates fontFile and composes the drawtext filter string and sidecar text file path.
  * Shared by both image and video annotation helpers.
@@ -42,9 +50,15 @@ function buildDrawtextArgs(srcLabel, {
   fontFile,
   fontSize = 48,
   fontColor = 'white',
+  borderColor,
+  borderWidth,
   box = false,
   boxColor = 'black@0.5',
   padding = 20,
+  position = 'bottom-right',
+  customX = 0,
+  customY = 0,
+  startAt = 0,
   destPath,
   dryRun = false,
 }) {
@@ -67,8 +81,7 @@ function buildDrawtextArgs(srcLabel, {
   const escapedFontFile = escapeFilterPath(fontFile)
   const escapedTextFile = escapeFilterPath(textFile)
-  const x = `w-tw-${padding}`
-  const y = `h-th-${padding}`
+  const { x, y } = computePositionXY({ position, padding, customX, customY })
   let filterStr =
     `drawtext=fontfile=${escapedFontFile}` +
@@ -78,10 +91,19 @@ function buildDrawtextArgs(srcLabel, {
     `:x=${x}` +
     `:y=${y}`
+  if (borderWidth != null && borderWidth > 0) {
+    filterStr += `:borderw=${borderWidth}`
+    if (borderColor) filterStr += `:bordercolor=${borderColor}`
+  }
   if (box) {
     filterStr += `:box=1:boxcolor=${boxColor}:boxborderw=8`
   }
+  if (startAt > 0) {
+    filterStr += `:enable=gte(t\\,${startAt})`
+  }
   return { text, textFile, filterStr }
 }
@@ -97,17 +119,23 @@ function buildDrawtextArgs(srcLabel, {
  * @param {string}  opts.fontFile  - path to a .ttf/.otf/.ttc font file (required)
  * @param {number}  [opts.fontSize=48]
  * @param {string}  [opts.fontColor='white']
+ * @param {string}  [opts.borderColor]        - color of text stroke/outline (e.g. 'black')
+ * @param {number}  [opts.borderWidth]        - width of text stroke in pixels (0 = off)
  * @param {boolean} [opts.box=false]          - draw a semi-transparent background box
  * @param {string}  [opts.boxColor='black@0.5']
- * @param {number}  [opts.padding=20]         - px distance from right & bottom edges
+ * @param {number}  [opts.padding=20]         - px distance from edges (used by presets)
+ * @param {string}  [opts.position='bottom-right'] - one of the 9 presets or 'custom'
+ * @param {number}  [opts.customX=0]          - x pixel offset (only when position='custom')
+ * @param {number}  [opts.customY=0]          - y pixel offset (only when position='custom')
  * @param {number}  [opts.totalOffset=0]      - integer added to the denominator
+ * @param {number}  [opts.startAt=0]          - (video only) seconds before label appears; ignored for images
  * @param {string}  opts.destPath  - absolute path to write the annotated image
  * @param {string}  [opts.label]   - display label for the run() spinner
  * @param {boolean} [opts.dryRun=false]
  */
 export async function annotateImageWithSequence(srcPath, opts) {
   const { destPath, label, dryRun = false, index, total } = opts
-  const { text, textFile, filterStr } = buildDrawtextArgs(srcPath, opts)
+  const { text, textFile, filterStr } = buildDrawtextArgs(srcPath, { ...opts, startAt: 0 })
   console.log(
     chalk.dim(`  [seq-label] Annotating ${path.basename(srcPath)} `) +

package/src/executor/nodeHandlers/video-stitcher.js CHANGED Viewed

@@ -188,10 +188,10 @@ export async function handleVideoStitcher(node, context, tempRoot, incomingEdges
     if (videoSl?.enabled && !opts.dryRun) mkdirSync(path.dirname(stitchTarget), { recursive: true })
     // Pre-process any fixed image inputs that have sequenceLabel.enabled.
-    // Skip if whole-video label is active (mutual exclusion enforced at runtime).
+    // Per-image and whole-video labels can both be active — per-image annotations
+    // get baked into frames and the whole-video pass then draws on top.
     const resolvedInputs = await Promise.all(
       inputs.map(async (input) => {
-        if (videoSl?.enabled) return input
         const sl = input.sequenceLabel
         if (!sl?.enabled || !isImage(input.value)) return input
@@ -209,10 +209,15 @@ export async function handleVideoStitcher(node, context, tempRoot, incomingEdges
           fontFile: sl.fontFile,
           fontSize: sl.fontSize,
           fontColor: sl.fontColor,
+          borderColor: sl.borderColor,
+          borderWidth: sl.borderWidth,
           box: sl.box,
           boxColor: sl.boxColor,
           padding: sl.padding,
           totalOffset: sl.totalOffset,
+          position: sl.position,
+          customX: sl.customX,
+          customY: sl.customY,
           destPath,
           label: `${node.label ?? node.id} [annotate ${runIdx + 1}/${runCount}]`,
           dryRun: opts.dryRun,
@@ -248,10 +253,16 @@ export async function handleVideoStitcher(node, context, tempRoot, incomingEdges
         fontFile: videoSl.fontFile,
         fontSize: videoSl.fontSize,
         fontColor: videoSl.fontColor,
+        borderColor: videoSl.borderColor,
+        borderWidth: videoSl.borderWidth,
         box: videoSl.box,
         boxColor: videoSl.boxColor,
         padding: videoSl.padding,
         totalOffset: videoSl.totalOffset,
+        position: videoSl.position,
+        customX: videoSl.customX,
+        customY: videoSl.customY,
+        startAt: videoSl.startAt,
         destPath: outputFile,
         label: `${node.label ?? node.id} [label ${runIdx + 1}/${runCount}]`,
         dryRun: opts.dryRun,

package/src/server/routes.js CHANGED Viewed

@@ -14,27 +14,40 @@
  * limitations under the License.
  */
-import { readFileSync, writeFileSync, renameSync } from 'fs'
+import { readFileSync, writeFileSync, renameSync, existsSync, statSync } from 'fs'
 import { execFile } from 'child_process'
 import path from 'path'
 import { Router } from 'express'
-function nativeBrowse() {
+function resolveStartFolder(from) {
+  if (!from || typeof from !== 'string') return null
+  try {
+    if (!existsSync(from)) return null
+    return statSync(from).isDirectory() ? from : path.dirname(from)
+  } catch { return null }
+}
+function nativeBrowse(from) {
+  const start = resolveStartFolder(from)
   return new Promise((resolve) => {
     const { platform } = process
     if (platform === 'darwin') {
-      execFile('osascript', ['-e', 'POSIX path of (choose file)'], (err, stdout) => {
+      const loc = start ? ` default location (POSIX file "${start.replace(/\\/g, '\\\\').replace(/"/g, '\\"')}")` : ''
+      execFile('osascript', ['-e', `POSIX path of (choose file${loc})`], (err, stdout) => {
         resolve(err ? null : stdout.trim())
       })
     } else if (platform === 'linux') {
-      execFile('zenity', ['--file-selection'], (err, stdout) => {
+      const args = ['--file-selection']
+      if (start) args.push(`--filename=${start.endsWith('/') ? start : start + '/'}`)
+      execFile('zenity', args, (err, stdout) => {
         if (!err) return resolve(stdout.trim())
-        execFile('kdialog', ['--getopenfilename', '.'], (err2, stdout2) => {
+        execFile('kdialog', ['--getopenfilename', start || '.'], (err2, stdout2) => {
           resolve(err2 ? null : stdout2.trim())
         })
       })
     } else if (platform === 'win32') {
-      const ps = `Add-Type -AssemblyName System.Windows.Forms; $d = New-Object System.Windows.Forms.OpenFileDialog; if ($d.ShowDialog() -eq 'OK') { $d.FileName }`
+      const initLine = start ? `$d.InitialDirectory = '${start.replace(/'/g, "''")}'; ` : ''
+      const ps = `Add-Type -AssemblyName System.Windows.Forms; $d = New-Object System.Windows.Forms.OpenFileDialog; ${initLine}if ($d.ShowDialog() -eq 'OK') { $d.FileName }`
       execFile('powershell', ['-Command', ps], (err, stdout) => {
         resolve(err ? null : stdout.trim())
       })
@@ -44,22 +57,27 @@ function nativeBrowse() {
   })
 }
-function nativeBrowseFolder() {
+function nativeBrowseFolder(from) {
+  const start = resolveStartFolder(from)
   return new Promise((resolve) => {
     const { platform } = process
     if (platform === 'darwin') {
-      execFile('osascript', ['-e', 'POSIX path of (choose folder)'], (err, stdout) => {
+      const loc = start ? ` default location (POSIX file "${start.replace(/\\/g, '\\\\').replace(/"/g, '\\"')}")` : ''
+      execFile('osascript', ['-e', `POSIX path of (choose folder${loc})`], (err, stdout) => {
         resolve(err ? null : stdout.trim())
       })
     } else if (platform === 'linux') {
-      execFile('zenity', ['--file-selection', '--directory'], (err, stdout) => {
+      const args = ['--file-selection', '--directory']
+      if (start) args.push(`--filename=${start.endsWith('/') ? start : start + '/'}`)
+      execFile('zenity', args, (err, stdout) => {
         if (!err) return resolve(stdout.trim())
-        execFile('kdialog', ['--getexistingdirectory', '.'], (err2, stdout2) => {
+        execFile('kdialog', ['--getexistingdirectory', start || '.'], (err2, stdout2) => {
           resolve(err2 ? null : stdout2.trim())
         })
       })
     } else if (platform === 'win32') {
-      const ps = `Add-Type -AssemblyName System.Windows.Forms; $d = New-Object System.Windows.Forms.FolderBrowserDialog; if ($d.ShowDialog() -eq 'OK') { $d.SelectedPath }`
+      const initLine = start ? `$d.SelectedPath = '${start.replace(/'/g, "''")}'; ` : ''
+      const ps = `Add-Type -AssemblyName System.Windows.Forms; $d = New-Object System.Windows.Forms.FolderBrowserDialog; ${initLine}if ($d.ShowDialog() -eq 'OK') { $d.SelectedPath }`
       execFile('powershell', ['-Command', ps], (err, stdout) => {
         resolve(err ? null : stdout.trim())
       })
@@ -89,14 +107,16 @@ export function createRoutes(specPath, broadcast) {
   })
   // GET /api/browse — open a native OS file picker, return full path
-  router.get('/api/browse', async (_req, res) => {
-    const filePath = await nativeBrowse()
+  // Optional ?from=<path> opens the picker at that path's parent folder
+  router.get('/api/browse', async (req, res) => {
+    const filePath = await nativeBrowse(typeof req.query.from === 'string' ? req.query.from : null)
     res.json({ path: filePath })
   })
   // GET /api/browse-folder — open a native OS folder picker, return full path
-  router.get('/api/browse-folder', async (_req, res) => {
-    const folderPath = await nativeBrowseFolder()
+  // Optional ?from=<path> opens the picker at that path (or its parent if a file)
+  router.get('/api/browse-folder', async (req, res) => {
+    const folderPath = await nativeBrowseFolder(typeof req.query.from === 'string' ? req.query.from : null)
     res.json({ path: folderPath })
   })

package/src/spec/schema.js CHANGED Viewed

@@ -64,16 +64,6 @@ export function validateSpec(spec) {
     if (!node.config || typeof node.config !== 'object') {
       errors.push(`Node "${node.id}" missing config object`)
     }
-    if (node.type === 'video-stitcher' && node.config) {
-      const videoSlEnabled = node.config.sequenceLabel?.enabled === true
-      const imageSlEnabled = (node.config.inputOrder ?? []).some((i) => i.sequenceLabel?.enabled === true)
-      if (videoSlEnabled && imageSlEnabled) {
-        errors.push(
-          `Node "${node.id}" (video-stitcher): config.sequenceLabel.enabled and per-image sequenceLabel.enabled are mutually exclusive`
-        )
-      }
-    }
   }
   for (const edge of spec.edges) {