From 3f249fcc89ba37be1eadfa1e808db1f03656ebe9 Mon Sep 17 00:00:00 2001
From: KernelDeimos <eric.alex.dube@gmail.com>
Date: Fri, 19 Apr 2024 23:31:23 -0400
Subject: [PATCH] Fix pipes

---
 packages/phoenix/src/ansi-shell/pipeline/Coupler.js  |  4 +---
 packages/phoenix/src/ansi-shell/pipeline/Pipeline.js | 12 +++++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/phoenix/src/ansi-shell/pipeline/Coupler.js b/packages/phoenix/src/ansi-shell/pipeline/Coupler.js
index d7679d496..bb0efe68a 100644
--- a/packages/phoenix/src/ansi-shell/pipeline/Coupler.js
+++ b/packages/phoenix/src/ansi-shell/pipeline/Coupler.js
@@ -61,9 +61,7 @@ export class Coupler {
             console.log('result?', which, result);
             const { value, done } = result;
             if ( done ) {
-                if ( which === 'closed' ) {
-                    cancel();
-                }
+                cancel();
                 this.source = null;
                 this.target = null;
                 this.active = false;
diff --git a/packages/phoenix/src/ansi-shell/pipeline/Pipeline.js b/packages/phoenix/src/ansi-shell/pipeline/Pipeline.js
index b67dec868..910108e4a 100644
--- a/packages/phoenix/src/ansi-shell/pipeline/Pipeline.js
+++ b/packages/phoenix/src/ansi-shell/pipeline/Pipeline.js
@@ -187,10 +187,6 @@ export class PreparedCommand {
             in_ = new MemReader(response);
         }
 
-        const internal_input_pipe = new Pipe();
-        const valve = new Coupler(in_, internal_input_pipe.in);
-        in_ = internal_input_pipe.out;
-
         // simple naive implementation for now
         const sig = {
             listeners_: [],
@@ -288,7 +284,6 @@ export class PreparedCommand {
             console.log(`awaiting execute for ${command.name}`)
             await execute(ctx);
             console.log(`DONE execute for ${command.name}`)
-            valve.close();
         } catch (e) {
             if ( e instanceof Exit ) {
                 exit_code = e.code;
@@ -353,6 +348,11 @@ export class Pipeline {
         let nextIn = ctx.externs.in;
         let lastPipe = null;
 
+        // Create valve to close input pipe when done
+        const pipeline_input_pipe = new Pipe();
+        const valve = new Coupler(nextIn, pipeline_input_pipe.in);
+        nextIn = pipeline_input_pipe.out;
+
         // TOOD: this will eventually defer piping of certain
         //       sub-pipelines to the Puter Shell.
 
@@ -392,5 +392,7 @@ export class Pipeline {
         console.log('|AWAIT COUPLER');
         await coupler.isDone;
         console.log('|DONE AWAIT COUPLER');
+
+        valve.close();
     }
 }
\ No newline at end of file