@rip-lang/swarm 1.2.3 → 1.2.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rip-lang/swarm",
-  "version": "1.2.3",
+  "version": "1.2.5",
   "description": "Parallel job runner with worker threads — setup once, swarm many",
   "type": "module",
   "main": "swarm.rip",

package/swarm.rip

@@ -94,19 +94,18 @@ bg = (rgb) -> if rgb then "\x1b[48;2;#{hex(rgb)}m" else "\x1b[49m"
 # Progress display
 # ==============================================================================
 
-_char = _wide = _len = null
+char = wide = len = null
 
 drawFrame = (workers) ->
-  _len = String(workers).length
+  len = String(workers).length
   write clear()
-  write go(2 + workers, _len + 3) + "╰" + "─".repeat(_wide + 2) + "╯"
-  write go(1,           _len + 3) + "╭" + "─".repeat(_wide + 2) + "╮"
+  write go(2 + workers, len + 3) + "╰" + "─".repeat(wide + 2) + "╯"
+  write go(1,           len + 3) + "╭" + "─".repeat(wide + 2) + "╮"
   for i in [0...workers]
     write go(i + 2, 1)
-    label = String(i + 1).padStart(_len)
-    write " #{label} │ " + " ".repeat(_wide) + " │"
-  # summary bar row
-  write go(workers + 3, _len + 3) + "│ " + " ".repeat(_wide) + " │"
+    label = String(i + 1).padStart(len)
+    write " #{label} │ " + " ".repeat(wide) + " │"
+  write go(workers + 3, len + 3) + "│ " + " ".repeat(wide) + " │"
 
 draw = (state) ->
   { live, done, died, jobs, workers, info } = state
@@ -117,27 +116,29 @@ draw = (state) ->
   # worker bars
   for slot, count of info
     tpct = count / most
-    cols = Math.floor(ppct * tpct * _wide)
-    write go(parseInt(slot) + 1, _len + 5) + bg("5383ec") + _char.repeat(cols) + bg()
+    cols = Math.floor(ppct * tpct * wide)
+    write go(parseInt(slot) + 1, len + 5) + fg("fff") + bg("5383ec") + char.repeat(cols) + fg() + bg()
 
   # summary bar
   dpct = done / jobs
   lpct = live / jobs
-  gcol = Math.floor(dpct * _wide)
-  ycol = Math.floor(lpct * _wide)
-  rcol = Math.max(0, _wide - gcol - ycol)
+  gcol = Math.floor(dpct * wide)
+  ycol = Math.floor(lpct * wide)
+  rcol = Math.max(0, wide - gcol - ycol)
   row  = workers + 3
 
-  write go(row, _len + 5)
-  write fg("fff")
-  write bg("58a65c") + _char.repeat(gcol)          # green  (done)
-  write bg("f1bf42") + _char.repeat(ycol)           # yellow (live)
-  write bg("d85140") + " ".repeat(rcol)             # red    (rest)
-  write go(row, _len + 5 + _wide + 3)
-  write bg("5383ec") + " #{(ppct * 100).toFixed(1)}% "
-  write bg() + " " + bg("58a65c") + " #{done}/#{jobs} done " if done > 0
-  write bg() + " " + bg("d85140") + " #{died} died "         if died > 0
-  write fg() + bg()
+  out = [
+    go(row, len + 5)
+    fg("fff")
+    bg("58a65c") + char.repeat(gcol)              # green  (done)
+    bg("f1bf42") + char.repeat(ycol)              # yellow (live)
+    bg("d85140") + " ".repeat(rcol)                # red    (rest)
+    go(row, len + 5 + wide + 3)
+    bg("5383ec") + " #{(ppct * 100).toFixed(1)}% " # blue   (pct)
+    if done > 0 then bg() + " " + bg("58a65c") + " #{done}/#{jobs} done "
+    if died > 0 then bg() + " " + bg("d85140") + " #{died} died "
+  ].filter(Boolean).join('') + fg() + bg()
+  write out
 
 # ==============================================================================
 # Worker orchestration
@@ -157,18 +158,16 @@ export swarm = (opts = {}) ->
   # parse CLI options
   args    = process.argv.slice(2)
   workers = parseInt(findArg(args, '-w', '--workers')) or opts.workers or cpus().length
-  barw    = parseInt(findArg(args, '-b', '--bar'))     or opts.bar    or 20
-  char    = findArg(args, '-c', '--char')              or opts.char   or '•'
+  wide    = parseInt(findArg(args, '-b', '--bar'))     or opts.bar    or 20
+  char    = (findArg(args, '-c', '--char')             or opts.char   or '•')[0]
   doreset = args.includes('-r') or args.includes('--reset')
   dosafe  = args.includes('-s') or args.includes('--safe')
+  quiet   = args.includes('-q') or args.includes('--quiet')
 
   if workers < 1
     console.error 'error: workers must be at least 1'
     process.exit(1)
 
-  _wide = barw
-  _char = char[0]
-
   if doreset
     rmSync(_dir, { recursive: true, force: true })
     console.log 'removed .swarm directory'
@@ -225,17 +224,19 @@ export swarm = (opts = {}) ->
 
   # signal handlers
   process.on 'SIGINT', ->
-    cursor(true)
-    write go(workers + 5, 1) + "\n"
+    cursor(true) unless quiet
+    write go(workers + 5, 1) + "\n" unless quiet
     process.exit(1)
-  process.on 'SIGWINCH', ->
-    drawFrame(workers)
-    draw({ live, done, died, jobs, workers, info })
+  unless quiet
+    process.on 'SIGWINCH', ->
+      drawFrame(workers)
+      draw({ live, done, died, jobs, workers, info })
 
   # draw initial frame
   startTime = Date.now()
-  cursor(false)
-  drawFrame(workers)
+  unless quiet
+    cursor(false)
+    drawFrame(workers)
 
   # create workers and dispatch tasks
   allWorkers = []
@@ -256,8 +257,9 @@ export swarm = (opts = {}) ->
         taskPath = tasks[taskIdx++]
         inflight[slot] = taskPath
         live++
-        write go(slot + 1, _len + 5 + _wide + 3) + " " + taskPath.split('/').pop() + clear(true)
-        draw({ live, done, died, jobs, workers, info })
+        unless quiet
+          write go(slot + 1, len + 5 + wide + 3) + " " + taskPath.split('/').pop() + clear(true)
+          draw({ live, done, died, jobs, workers, info })
         worker.postMessage { type: 'task', taskPath }
       else
         inflight[slot] = null
@@ -284,7 +286,7 @@ export swarm = (opts = {}) ->
             live--
             done++
             info[slot]++
-            draw({ live, done, died, jobs, workers, info })
+            draw({ live, done, died, jobs, workers, info }) unless quiet
             dispatchNext(w, slot)
           when 'failed'
             move(msg.taskPath, _died)
@@ -294,7 +296,7 @@ export swarm = (opts = {}) ->
             live--
             died++
             info[slot]++
-            draw({ live, done, died, jobs, workers, info })
+            draw({ live, done, died, jobs, workers, info }) unless quiet
             dispatchNext(w, slot)
 
       w.on 'error', (err) ->
@@ -309,7 +311,7 @@ export swarm = (opts = {}) ->
           live--
           died++
           info[slot]++
-          draw({ live, done, died, jobs, workers, info })
+          draw({ live, done, died, jobs, workers, info }) unless quiet
         # respawn if there's still work to do
         if done + died < jobs
           spawnWorker(slot)
@@ -321,23 +323,24 @@ export swarm = (opts = {}) ->
     for slot in [1..count]
       spawnWorker(slot)
 
-  # final redraw — fill all worker bars and show per-worker stats
-  secs = (Date.now() - startTime) / 1000
-  for slot of info
-    s = parseInt(slot)
-    n = info[slot]
-    rate = if secs > 0 then (n / secs).toFixed(1) else '—'
-    write go(s + 1, _len + 5) + bg("5383ec") + _char.repeat(_wide) + bg() + " │ #{n} jobs @ #{rate}/sec" + clear(true)
-  draw({ live: 0, done, died, jobs, workers, info })
-
   # summary
-  cursor(true)
-  write go(workers + 5, 1)
-  write "#{secs.toFixed(2)} secs"
-  write " for #{jobs} jobs"
-  write " by #{workers} workers"
-  write " @ #{(jobs / secs).toFixed(2)} jobs/sec" if secs > 0
-  write "\n\n"
+  secs = (Date.now() - startTime) / 1000
+  if quiet
+    p "#{secs.toFixed(2)} secs for #{jobs} jobs by #{workers} workers" + (if secs > 0 then " @ #{(jobs / secs).toFixed(2)} jobs/sec" else "")
+  else
+    for slot of info
+      s = parseInt(slot)
+      n = info[slot]
+      rate = if secs > 0 then (n / secs).toFixed(1) else '—'
+      write go(s + 1, len + 5) + fg("fff") + bg("5383ec") + char.repeat(wide) + fg() + bg() + " │ #{n} jobs @ #{rate}/sec" + clear(true)
+    draw({ live: 0, done, died, jobs, workers, info })
+    cursor(true)
+    write go(workers + 5, 1)
+    write "#{secs.toFixed(2)} secs"
+    write " for #{jobs} jobs"
+    write " by #{workers} workers"
+    write " @ #{(jobs / secs).toFixed(2)} jobs/sec" if secs > 0
+    write "\n\n"
 
 # ==============================================================================
 # CLI helpers
@@ -346,7 +349,7 @@ export swarm = (opts = {}) ->
 # flags that swarm consumes (with value)
 _flagsWithValue = ['-w', '--workers', '-b', '--bar', '-c', '--char']
 # flags that swarm consumes (standalone)
-_flagsAlone     = ['-r', '--reset', '-s', '--safe', '-h', '--help', '-v', '--version']
+_flagsAlone     = ['-r', '--reset', '-s', '--safe', '-q', '--quiet', '-h', '--help', '-v', '--version']
 
 findArg = (args, short, long) ->
   for arg, i in args