dsh-remote 0.8.66 → 0.8.70

package/lib/exec-job.js

@@ -111,6 +111,13 @@ export function startExecJob(registry, { pool, command, label, owner, jobDeadlin
       abort = ac
       const done = (async () => {
         let res
+        // Whether the backend actually streamed anything through the tap. A
+        // backend without an onData implementation (openssh before issue #80)
+        // leaves the ring EMPTY even though the command produced output — the
+        // only copy then lives in the return value below, which the callers of
+        // a job never see. Flush that copy into the ring at settle time, but
+        // ONLY when nothing streamed, or every line would arrive twice.
+        let sawStream = false
         try {
           res = await pool.exec(command, {
             // 0/undefined ⇒ no transport deadline: the job outlives the call.
@@ -124,12 +131,19 @@ export function startExecJob(registry, { pool, command, label, owner, jobDeadlin
             onData: (channel, chunk) => {
               const text = Buffer.isBuffer(chunk) ? chunk.toString('utf8') : String(chunk)
               if (!text) return
+              sawStream = true
               try { job.append(text, { channel }) } catch { /* settled: ring closed */ }
             },
           })
         } catch (err) {
           return { status: 'failed', detail: String((err && err.message) || err) }
         }
+        if (!sawStream) {
+          try {
+            if (res.stdout) job.append(String(res.stdout), { channel: 'stdout' })
+            if (res.stderr) job.append(String(res.stderr), { channel: 'stderr' })
+          } catch { /* settled: ring closed */ }
+        }
         if (res.signal === 'ABORTED' || cancelled) return { status: 'killed', detail: cancelled || 'cancelled' }
         if (res.signal === 'TIMEOUT') return { status: 'killed', detail: `timed out after ${jobDeadlineMs}ms` }
         const code = res.code