mirror of
https://github.com/pyscript/pyscript.git
synced 2025-12-21 11:15:36 -05:00
Provide Visible Error if <py-env> paths is used in a local HTML file (#311)
* Add onscreen error when using py-env paths in local HTTP files without file server * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Remove redundant code, fix error handling, add 404 error * Lint and Format * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * manage errors loading files * use handleFetchError for handling fetch errors in env Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Fabio Pliger <fabio.pliger@gmail.com>
This commit is contained in:
@@ -1,15 +1,24 @@
|
||||
import * as jsyaml from 'js-yaml';
|
||||
import { BaseEvalElement } from './base';
|
||||
import { initializers, loadedEnvironments, mode, postInitializers, pyodideLoaded, scriptsQueue, globalLoader, appConfig, Initializer } from '../stores';
|
||||
import {
|
||||
initializers,
|
||||
loadedEnvironments,
|
||||
mode,
|
||||
postInitializers,
|
||||
pyodideLoaded,
|
||||
scriptsQueue,
|
||||
globalLoader,
|
||||
appConfig,
|
||||
Initializer,
|
||||
} from '../stores';
|
||||
import { loadInterpreter } from '../interpreter';
|
||||
import type { PyScript } from './pyscript';
|
||||
|
||||
|
||||
const DEFAULT_RUNTIME = {
|
||||
src: "https://cdn.jsdelivr.net/pyodide/v0.20.0/full/pyodide.js",
|
||||
name: "pyodide-default",
|
||||
lang: "python"
|
||||
}
|
||||
src: 'https://cdn.jsdelivr.net/pyodide/v0.20.0/full/pyodide.js',
|
||||
name: 'pyodide-default',
|
||||
lang: 'python',
|
||||
};
|
||||
|
||||
export type Runtime = {
|
||||
src: string;
|
||||
@@ -28,107 +37,103 @@ let appConfig_: AppConfig = {
|
||||
autoclose_loader: true,
|
||||
};
|
||||
|
||||
appConfig.subscribe( (value:AppConfig) => {
|
||||
if (value){
|
||||
appConfig.subscribe((value: AppConfig) => {
|
||||
if (value) {
|
||||
appConfig_ = value;
|
||||
}
|
||||
console.log("config set!")
|
||||
console.log('config set!');
|
||||
});
|
||||
|
||||
let initializers_: Initializer[];
|
||||
initializers.subscribe( (value:Initializer[]) => {
|
||||
initializers.subscribe((value: Initializer[]) => {
|
||||
initializers_ = value;
|
||||
console.log("initializers set")
|
||||
console.log('initializers set');
|
||||
});
|
||||
|
||||
let postInitializers_: Initializer[];
|
||||
postInitializers.subscribe( (value:Initializer[]) => {
|
||||
postInitializers.subscribe((value: Initializer[]) => {
|
||||
postInitializers_ = value;
|
||||
console.log("post initializers set")
|
||||
console.log('post initializers set');
|
||||
});
|
||||
|
||||
let scriptsQueue_: PyScript[];
|
||||
scriptsQueue.subscribe( (value: PyScript[]) => {
|
||||
scriptsQueue.subscribe((value: PyScript[]) => {
|
||||
scriptsQueue_ = value;
|
||||
console.log("post initializers set")
|
||||
console.log('post initializers set');
|
||||
});
|
||||
|
||||
let mode_: string;
|
||||
mode.subscribe( (value:string) => {
|
||||
mode.subscribe((value: string) => {
|
||||
mode_ = value;
|
||||
console.log("post initializers set")
|
||||
console.log('post initializers set');
|
||||
});
|
||||
|
||||
|
||||
let pyodideReadyPromise;
|
||||
let loader;
|
||||
|
||||
|
||||
globalLoader.subscribe(value => {
|
||||
loader = value;
|
||||
});
|
||||
|
||||
|
||||
export class PyodideRuntime extends Object{
|
||||
export class PyodideRuntime extends Object {
|
||||
src: string;
|
||||
|
||||
constructor(url:string) {
|
||||
constructor(url: string) {
|
||||
super();
|
||||
this.src = url;
|
||||
}
|
||||
|
||||
async initialize(){
|
||||
loader.log("Loading runtime...")
|
||||
pyodideReadyPromise = loadInterpreter(this.src);
|
||||
const pyodide = await pyodideReadyPromise;
|
||||
const newEnv = {
|
||||
id: 'a',
|
||||
promise: pyodideReadyPromise,
|
||||
runtime: pyodide,
|
||||
state: 'loading',
|
||||
};
|
||||
pyodideLoaded.set(pyodide);
|
||||
async initialize() {
|
||||
loader.log('Loading runtime...');
|
||||
pyodideReadyPromise = loadInterpreter(this.src);
|
||||
const pyodide = await pyodideReadyPromise;
|
||||
const newEnv = {
|
||||
id: 'a',
|
||||
promise: pyodideReadyPromise,
|
||||
runtime: pyodide,
|
||||
state: 'loading',
|
||||
};
|
||||
pyodideLoaded.set(pyodide);
|
||||
|
||||
// Inject the loader into the runtime namespace
|
||||
pyodide.globals.set("pyscript_loader", loader);
|
||||
// Inject the loader into the runtime namespace
|
||||
pyodide.globals.set('pyscript_loader', loader);
|
||||
|
||||
loader.log("Runtime created...")
|
||||
loadedEnvironments.update((value: any): any => {
|
||||
value[newEnv['id']] = newEnv;
|
||||
});
|
||||
loader.log('Runtime created...');
|
||||
loadedEnvironments.update((value: any): any => {
|
||||
value[newEnv['id']] = newEnv;
|
||||
});
|
||||
|
||||
// now we call all initializers before we actually executed all page scripts
|
||||
loader.log("Initializing components...")
|
||||
for (const initializer of initializers_) {
|
||||
await initializer();
|
||||
}
|
||||
|
||||
// now we can actually execute the page scripts if we are in play mode
|
||||
loader.log("Initializing scripts...")
|
||||
if (mode_ == 'play') {
|
||||
for (const script of scriptsQueue_) {
|
||||
script.evaluate();
|
||||
// now we call all initializers before we actually executed all page scripts
|
||||
loader.log('Initializing components...');
|
||||
for (const initializer of initializers_) {
|
||||
await initializer();
|
||||
}
|
||||
scriptsQueue.set([]);
|
||||
}
|
||||
|
||||
// now we call all post initializers AFTER we actually executed all page scripts
|
||||
loader.log("Running post initializers...");
|
||||
|
||||
if (appConfig_ && appConfig_.autoclose_loader) {
|
||||
loader.close();
|
||||
console.log("------ loader closed ------");
|
||||
}
|
||||
|
||||
setTimeout(() => {
|
||||
for (const initializer of postInitializers_) {
|
||||
initializer();
|
||||
// now we can actually execute the page scripts if we are in play mode
|
||||
loader.log('Initializing scripts...');
|
||||
if (mode_ == 'play') {
|
||||
for (const script of scriptsQueue_) {
|
||||
script.evaluate();
|
||||
}
|
||||
scriptsQueue.set([]);
|
||||
}
|
||||
}, 3000);
|
||||
|
||||
// now we call all post initializers AFTER we actually executed all page scripts
|
||||
loader.log('Running post initializers...');
|
||||
|
||||
if (appConfig_ && appConfig_.autoclose_loader) {
|
||||
loader.close();
|
||||
console.log('------ loader closed ------');
|
||||
}
|
||||
|
||||
setTimeout(() => {
|
||||
for (const initializer of postInitializers_) {
|
||||
initializer();
|
||||
}
|
||||
}, 3000);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
export class PyConfig extends BaseEvalElement {
|
||||
shadow: ShadowRoot;
|
||||
wrapper: HTMLElement;
|
||||
@@ -149,23 +154,23 @@ export class PyConfig extends BaseEvalElement {
|
||||
this.innerHTML = '';
|
||||
|
||||
const loadedValues = jsyaml.load(this.code);
|
||||
if (loadedValues === undefined){
|
||||
if (loadedValues === undefined) {
|
||||
this.values = {
|
||||
autoclose_loader: true,
|
||||
};
|
||||
}else{
|
||||
} else {
|
||||
this.values = Object.assign({}, ...loadedValues);
|
||||
}
|
||||
if (this.values.runtimes === undefined){
|
||||
if (this.values.runtimes === undefined) {
|
||||
this.values.runtimes = [DEFAULT_RUNTIME];
|
||||
}
|
||||
appConfig.set(this.values);
|
||||
console.log("config set", this.values);
|
||||
console.log('config set', this.values);
|
||||
|
||||
this.loadRuntimes();
|
||||
}
|
||||
|
||||
log(msg: string){
|
||||
log(msg: string) {
|
||||
const newLog = document.createElement('p');
|
||||
newLog.innerText = msg;
|
||||
this.details.appendChild(newLog);
|
||||
@@ -175,10 +180,10 @@ export class PyConfig extends BaseEvalElement {
|
||||
this.remove();
|
||||
}
|
||||
|
||||
loadRuntimes(){
|
||||
console.log("Initializing runtimes...")
|
||||
loadRuntimes() {
|
||||
console.log('Initializing runtimes...');
|
||||
for (const runtime of this.values.runtimes) {
|
||||
const script = document.createElement("script"); // create a script DOM node
|
||||
const script = document.createElement('script'); // create a script DOM node
|
||||
const runtimeSpec = new PyodideRuntime(runtime.src);
|
||||
script.src = runtime.src; // set its src to the provided URL
|
||||
script.addEventListener('load', () => {
|
||||
|
||||
Reference in New Issue
Block a user