Basic stdout/stderr handling

pyscript · JeffersGlass · Mar 23, 2023 · Jan 11, 2023 · Jan 11, 2023 · Jan 11, 2023
commit 62c15959830925a79421b731c268470c021c0320
diff --git a/pyscriptjs/src/components/pyrepl.ts b/pyscriptjs/src/components/pyrepl.ts
@@ -11,6 +11,7 @@ import { pyExec, pyDisplay } from '../pyexec';
 import { getLogger } from '../logger';
 import { InterpreterClient } from '../interpreter_client';
 import type { PyScriptApp } from '../main';
+import { Stdio } from '../stdio';
 
 const logger = getLogger('py-repl');
 const RUNBUTTON = `<svg style="height:20px;width:20px;vertical-align:-.125em;transform-origin:center;overflow:visible;color:green" viewBox="0 0 384 512" aria-hidden="true" role="img" xmlns="http://www.w3.org/2000/svg"><g transform="translate(192 256)" transform-origin="96 0"><g transform="translate(0,0) scale(1,1)"><path d="M361 215C375.3 223.8 384 239.3 384 256C384 272.7 375.3 288.2 361 296.1L73.03 472.1C58.21 482 39.66 482.4 24.52 473.9C9.377 465.4 0 449.4 0 432V80C0 62.64 9.377 46.63 24.52 38.13C39.66 29.64 58.21 29.99 73.03 39.04L361 215z" fill="currentColor" transform="translate(-192 -256)"></path></g></g></svg>`;
@@ -32,6 +33,8 @@ export function make_PyRepl(interpreter: InterpreterClient, app: PyScriptApp)  {
         shadow: ShadowRoot;
         outDiv: HTMLElement;
         editor: EditorView;
+        stdout_manager: Stdio | null;
+        stderr_manager: Stdio | null;
 
         constructor() {
             super();
@@ -167,8 +170,9 @@ export function make_PyRepl(interpreter: InterpreterClient, app: PyScriptApp)  {
             outEl.innerHTML = '';
 
             // execute the python code
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+            app.plugins.beforePyReplExec(interpreter, pySrc, outEl, this);
             const pyResult = (await pyExec(interpreter, pySrc, outEl)).result;
+            app.plugins.afterPyReplExec(interpreter, pySrc, outEl, this, pyResult);
 
             // display the value of the last evaluated expression (REPL-style)
             if (pyResult !== undefined) {
@@ -207,27 +211,21 @@ export function make_PyRepl(interpreter: InterpreterClient, app: PyScriptApp)  {
                 const nextExecId = parseInt(lastExecId) + 1;
 
                 const newPyRepl = document.createElement('py-repl');
-                newPyRepl.setAttribute('root', this.getAttribute('root'));
-                newPyRepl.id = this.getAttribute('root') + '-' + nextExecId.toString();
-
-                if (this.hasAttribute('auto-generate')) {
-                    newPyRepl.setAttribute('auto-generate', '');
-                    this.removeAttribute('auto-generate');
-                }
-
-                const outputMode = getAttribute(this, 'output-mode');
-                if (outputMode) {
-                    newPyRepl.setAttribute('output-mode', outputMode);
-                }
 
-                const addReplAttribute = (attribute: string) => {
+                //Attributes to be copied from old REPL to auto-generated REPL
+                for (const attribute of ['root', 'output-mode', 'output', 'stderr']){
                     const attr = getAttribute(this, attribute);
                     if (attr) {
                         newPyRepl.setAttribute(attribute, attr);
                     }
-                };
+                }
+
+                newPyRepl.id = this.getAttribute('root') + '-' + nextExecId.toString();
 
-                addReplAttribute('output');
+                if (this.hasAttribute('auto-generate')) {
+                    newPyRepl.setAttribute('auto-generate', '');
+                    this.removeAttribute('auto-generate');
+                }
 
                 newPyRepl.setAttribute('exec-id', nextExecId.toString());
                 if (this.parentElement) {

diff --git a/pyscriptjs/src/plugins/stdiodirector.ts b/pyscriptjs/src/plugins/stdiodirector.ts
@@ -58,4 +58,36 @@ export class StdioDirector extends Plugin {
             options.pyScriptTag.stderr_manager = null;
         }
     }
+
+    beforePyReplExec(runtime: any, src: any, outEl: any, pyReplTag: any): void {
+        let output_targeted_io;
+        if (pyReplTag.hasAttribute("output")){
+            output_targeted_io = new TargetedStdio(pyReplTag, "output", true, true);
+        }
+        else {
+            output_targeted_io = new TargetedStdio(pyReplTag.outDiv, "id", true, true);
+        }
+
+        pyReplTag.stdout_manager = output_targeted_io;
+        this._stdioMultiplexer.addListener(output_targeted_io);
+
+
+        if (pyReplTag.hasAttribute("stderr")){
+            const stderr_targeted_io = new TargetedStdio(pyReplTag, "stderr", false, true);
+            pyReplTag.stderr_manager = stderr_targeted_io;
+            this._stdioMultiplexer.addListener(stderr_targeted_io);
+        }
+
+    }
+
+    afterPyReplExec(runtime: any, src: any, outEl: any, pyReplTag: any, result: any): void {
+        if (pyReplTag.stdout_manager != null){
+            this._stdioMultiplexer.removeListener(pyReplTag.stdout_manager)
+            pyReplTag.stdout_manager = null
+        }
+        if (pyReplTag.stderr_manager != null){
+            this._stdioMultiplexer.removeListener(pyReplTag.stderr_manager)
+            pyReplTag.stderr_manager = null
+        }
+    }
 }