Skip to content

Kill previous worker if another eval/execute is asked to the donkey #2217

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

Kill previous worker if another eval/execute is asked to the donkey #2217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5f52649
Provide an xworker to PyEditors (#2216)
WebReflection Oct 9, 2024
3e55024
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Oct 10, 2024
a41b332
Merge branch 'main' into better-donkey
WebReflection Oct 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 44 additions & 10 deletions core/src/plugins/donkey.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { assign, dedent } from "polyscript/exports";

const invoke = (name, args) => `${name}(code, ${args.join(", ")})`;

export default (options = {}) => {
const donkey = (options = {}) => {
const type = options.type || "py";
const args = options.persistent
? ["globals()", "__locals__"]
Expand Down Expand Up @@ -44,21 +44,55 @@ export default (options = {}) => {
script.addEventListener(`${type}:done`, (event) => {
event.stopPropagation();
URL.revokeObjectURL(src);
let executed = true;
let evaluated = true;
const { xworker, process, terminal } = script;
const { execute, evaluate } = xworker.sync;
script.remove();
resolve({
const kill = () => {
xworker.terminate();
terminal.dispose();
};
const farmer = {
process,
execute: (code) => execute(dedent(code)),
evaluate: (code) => evaluate(dedent(code)),
execute: async (code) => {
if (!executed) {
kill();
assign(farmer, await donkey(options));
return farmer.execute(code);
}
executed = false;
try {
const result = await execute(dedent(code));
executed = true;
return result;
} catch (e) {
console.error(e);
}
},
evaluate: async (code) => {
if (!evaluated) {
kill();
assign(farmer, await donkey(options));
return farmer.evaluate(code);
}
evaluated = false;
try {
const result = await evaluate(dedent(code));
evaluated = true;
return result;
} catch (e) {
console.error(e);
}
},
clear: () => terminal.clear(),
reset: () => terminal.reset(),
kill: () => {
xworker.terminate();
terminal.dispose();
},
});
kill,
};
resolve(farmer);
script.remove();
});
document.body.append(script);
});
};

export default donkey;
4 changes: 2 additions & 2 deletions core/types/plugins/donkey.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
declare function _default(options?: {}): Promise<any>;
export default _default;
export default donkey;
declare function donkey(options?: {}): Promise<any>;