Donkey clear and reset now terminate when busy (#2225)

* Donkey clear and reset now terminate when busy

core/package-lock.json

@@ -1,12 +1,12 @@
 {
     "name": "@pyscript/core",
-    "version": "0.6.5",
+    "version": "0.6.6",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "@pyscript/core",
-            "version": "0.6.5",
+            "version": "0.6.6",
             "license": "APACHE-2.0",
             "dependencies": {
                 "@ungap/with-resolvers": "^0.1.0",

core/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@pyscript/core",
-    "version": "0.6.5",
+    "version": "0.6.6",
     "type": "module",
     "description": "PyScript",
     "module": "./index.js",

core/src/plugins/donkey.js

@@ -73,13 +73,22 @@ const utils = async (options) => {
 export default async (options = {}) => {
     let farmer = await utils(options);
     let working = false;
+    const kill = () => {
+        if (farmer) {
+            farmer.xworker.terminate();
+            farmer.terminal.dispose();
+            farmer = null;
+        }
+        working = false;
+    };
+    const reload = async () => {
+        kill();
+        farmer = await utils(options);
+    };
     const asyncTask = (method) => async (code) => {
         // race condition ... a new task has been
         // assigned while the previous one didn't finish
-        if (working) {
+        if (working) await reload();
-            kill();
-            farmer = await utils(options);
-        }
         working = true;
         try {
             return await farmer[method](dedent(code));
@@ -89,20 +98,16 @@ export default async (options = {}) => {
             working = false;
         }
     };
-    const kill = () => {
+    const asyncMethod = (method) => async () => {
-        if (farmer) {
+        if (working) await reload();
-            farmer.xworker.terminate();
+        else farmer?.terminal[method]();
-            farmer.terminal.dispose();
-            farmer = null;
-            working = false;
-        }
     };
     return {
         process: asyncTask("process"),
         execute: asyncTask("execute"),
         evaluate: asyncTask("evaluate"),
-        clear: () => farmer?.terminal.clear(),
+        clear: asyncMethod("clear"),
-        reset: () => farmer?.terminal.reset(),
+        reset: asyncMethod("reset"),
         kill,
     };
 };

core/tests/manual/donkey/index.js

@@ -12,13 +12,23 @@ const {
   kill,
 } = await donkey({ terminal: '#container' });
 
-clearButton.onclick = clear;
+clearButton.onclick = async () => {
-killButton.onclick = kill;
+  killButton.disabled = true;
+  clearButton.disabled = true;
+  await clear();
+  runButton.disabled = false;
+};
+killButton.onclick = () => {
+  killButton.disabled = true;
+  clearButton.disabled = true;
+  runButton.disabled = true;
+  kill();
+};
 
 runButton.disabled = false;
 runButton.onclick = async () => {
   killButton.disabled = false;
-  clearButton.disabled = true;
+  clearButton.disabled = false;
   runButton.disabled = true;
   // multiline code
   await execute(`
@@ -29,6 +39,5 @@ runButton.onclick = async () => {
   const name = await evaluate('input("what is your name? ")');
   alert(`Hello ${name}`);
   killButton.disabled = true;
-  clearButton.disabled = false;
   runButton.disabled = false;
 };

core/types/core.d.ts

@@ -2,8 +2,8 @@ export function donkey(options: any): Promise<{
     process: (code: any) => Promise<any>;
     execute: (code: any) => Promise<any>;
     evaluate: (code: any) => Promise<any>;
-    clear: () => any;
+    clear: () => Promise<void>;
-    reset: () => any;
+    reset: () => Promise<void>;
     kill: () => void;
 }>;
 export function offline_interpreter(config: any): string;

core/types/plugins/donkey.d.ts

@@ -2,8 +2,8 @@ declare function _default(options?: {}): Promise<{
     process: (code: any) => Promise<any>;
     execute: (code: any) => Promise<any>;
     evaluate: (code: any) => Promise<any>;
-    clear: () => any;
+    clear: () => Promise<void>;
-    reset: () => any;
+    reset: () => Promise<void>;
     kill: () => void;
 }>;
 export default _default;