This commit is contained in:
Timothy Jaeryang Baek
2026-03-24 16:20:29 -05:00
parent cb7154cedf
commit 5c4062c648
3 changed files with 74 additions and 22 deletions
@@ -2,7 +2,7 @@
import hljs from 'highlight.js'; import hljs from 'highlight.js';
import { toast } from 'svelte-sonner'; import { toast } from 'svelte-sonner';
import { getContext, onMount, tick, onDestroy } from 'svelte'; import { getContext, onMount, tick, onDestroy } from 'svelte';
import { config } from '$lib/stores'; import { config, pyodideWorker as pyodideWorkerStore } from '$lib/stores';
import PyodideWorker from '$lib/workers/pyodide.worker?worker'; import PyodideWorker from '$lib/workers/pyodide.worker?worker';
import { executeCode } from '$lib/apis/utils'; import { executeCode } from '$lib/apis/utils';
@@ -47,7 +47,7 @@
export let editorClassName = ''; export let editorClassName = '';
export let stickyButtonsClassName = 'top-0'; export let stickyButtonsClassName = 'top-0';
let pyodideWorker = null; let localPyodideWorker = null;
let _code = ''; let _code = '';
$: if (code) { $: if (code) {
@@ -237,27 +237,42 @@
console.log(packages); console.log(packages);
pyodideWorker = new PyodideWorker(); // Reuse the shared Pyodide worker when code interpreter is active,
// so files written here are immediately visible in PyodideFileNav.
// Otherwise fall back to a throwaway worker.
const sharedWorker = $pyodideWorkerStore;
const isShared = !!sharedWorker;
const worker = sharedWorker ?? new PyodideWorker();
pyodideWorker.postMessage({ if (!isShared) {
localPyodideWorker = worker;
}
worker.postMessage({
id: id, id: id,
code: code, code: code,
packages: packages packages: packages
}); });
setTimeout(() => { const timeoutId = setTimeout(() => {
if (executing) { if (executing) {
executing = false; executing = false;
stderr = 'Execution Time Limit Exceeded'; stderr = 'Execution Time Limit Exceeded';
pyodideWorker.terminate(); if (!isShared) {
worker.terminate();
localPyodideWorker = null;
}
} }
}, 60000); }, 60000);
pyodideWorker.onmessage = (event) => { const handler = (event) => {
console.log('pyodideWorker.onmessage', event); // Ignore messages from other requests on the shared worker
const { id, ...data } = event.data; if (event.data?.id !== id) return;
console.log(id, data); console.log('pyodideWorker.onmessage', event);
const { id: _id, ...data } = event.data;
console.log(_id, data);
if (data['stdout']) { if (data['stdout']) {
stdout = data['stdout']; stdout = data['stdout'];
@@ -320,11 +335,20 @@
data['stderr'] && (stderr = data['stderr']); data['stderr'] && (stderr = data['stderr']);
data['result'] && (result = data['result']); data['result'] && (result = data['result']);
clearTimeout(timeoutId);
worker.removeEventListener('message', handler);
executing = false; executing = false;
// Signal PyodideFileNav to auto-refresh after execution
window.dispatchEvent(new Event('pyodide:files'));
}; };
pyodideWorker.onerror = (event) => { worker.addEventListener('message', handler);
worker.onerror = (event) => {
console.log('pyodideWorker.onerror', event); console.log('pyodideWorker.onerror', event);
clearTimeout(timeoutId);
worker.removeEventListener('message', handler);
executing = false; executing = false;
}; };
}; };
@@ -412,8 +436,9 @@
}); });
onDestroy(() => { onDestroy(() => {
if (pyodideWorker) { if (localPyodideWorker) {
pyodideWorker.terminate(); localPyodideWorker.terminate();
localPyodideWorker = null;
} }
}); });
</script> </script>
+25 -9
View File
@@ -3,7 +3,7 @@
</script> </script>
<script lang="ts"> <script lang="ts">
import { getContext, onMount, tick } from 'svelte'; import { getContext, onMount, onDestroy, tick } from 'svelte';
import { pyodideWorker } from '$lib/stores'; import { pyodideWorker } from '$lib/stores';
import PyodideWorkerConstructor from '$lib/workers/pyodide.worker?worker'; import PyodideWorkerConstructor from '$lib/workers/pyodide.worker?worker';
import type { FileEntry } from '$lib/apis/terminal'; import type { FileEntry } from '$lib/apis/terminal';
@@ -282,9 +282,21 @@
// ── Lifecycle ───────────────────────────────────────────────────────── // ── Lifecycle ─────────────────────────────────────────────────────────
const onFilesChanged = async () => {
try {
await sendWorkerMessage({ type: 'fs:sync' });
} catch {}
loadDir(currentPath);
};
onMount(() => { onMount(() => {
ensureWorker(); ensureWorker();
loadDir(currentPath); loadDir(currentPath);
window.addEventListener('pyodide:files', onFilesChanged);
});
onDestroy(() => {
window.removeEventListener('pyodide:files', onFilesChanged);
}); });
</script> </script>
@@ -335,14 +347,18 @@
{selectedFile} {selectedFile}
{loading} {loading}
onNavigate={(path) => loadDir(path)} onNavigate={(path) => loadDir(path)}
onRefresh={() => { onRefresh={async () => {
if (selectedFile) { // Sync from IndexedDB first to pick up files written by code execution
const name = selectedFile.split('/').pop() ?? ''; try {
openEntry({ name, type: 'file', size: 0 }); await sendWorkerMessage({ type: 'fs:sync' });
} else { } catch {}
loadDir(currentPath); if (selectedFile) {
} const name = selectedFile.split('/').pop() ?? '';
}} openEntry({ name, type: 'file', size: 0 });
} else {
loadDir(currentPath);
}
}}
onNewFolder={startNewFolder} onNewFolder={startNewFolder}
onNewFile={startNewFile} onNewFile={startNewFile}
onUploadFiles={uploadFiles} onUploadFiles={uploadFiles}
+11
View File
@@ -305,6 +305,17 @@ self.onmessage = async (event) => {
break; break;
} }
case 'fs:sync': {
// Re-read from IndexedDB into memory to pick up externally written files
(self.pyodide.FS as any).syncfs(true, (err: Error | null) => {
if (err) {
console.error('Error syncing from IndexedDB:', err);
}
self.postMessage({ id, type: 'fs:sync', success: !err });
});
break;
}
default: default:
console.warn('Unknown message type:', type); console.warn('Unknown message type:', type);
} }