pyscript · antocuni · Oct 4, 2022 · Sep 29, 2022 · Sep 29, 2022 · Sep 29, 2022
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -66,7 +66,7 @@ repos:
         -   --py310-plus
 
 -   repo: https://github.com/pre-commit/mirrors-eslint
-    rev: v8.24.0
+    rev: v8.23.1
     hooks:
     -   id: eslint
         files: pyscriptjs/src/.*\.[jt]sx?$  # *.js, *.jsx, *.ts and *.tsx

diff --git a/pyscriptjs/src/components/pyconfig.ts b/pyscriptjs/src/components/pyconfig.ts
diff --git a/pyscriptjs/src/main.ts b/pyscriptjs/src/main.ts
@@ -1,31 +1,104 @@
 import './styles/pyscript_base.css';
 
+import { loadConfigFromElement } from './pyconfig';
+import type { AppConfig } from './pyconfig';
+import type { Runtime } from './runtime';
 import { PyScript } from './components/pyscript';
 import { PyEnv } from './components/pyenv';
 import { PyLoader } from './components/pyloader';
-import { PyConfig } from './components/pyconfig';
+import { PyodideRuntime } from './pyodide';
 import { getLogger } from './logger';
-import { globalLoader } from './stores';
+import { globalLoader, runtimeLoaded, addInitializer } from './stores';
+import { handleFetchError, globalExport } from './utils'
 
 const logger = getLogger('pyscript/main');
 
-/* eslint-disable @typescript-eslint/no-unused-vars */
-const xPyScript = customElements.define('py-script', PyScript);
-const xPyLoader = customElements.define('py-loader', PyLoader);
-const xPyConfig = customElements.define('py-config', PyConfig);
-const xPyEnv = customElements.define('py-env', PyEnv);
-/* eslint-disable @typescript-eslint/no-unused-vars */
-
-// As first thing, loop for application configs
-logger.info('checking for py-config');
-const config: PyConfig = document.querySelector('py-config');
-if (!config) {
-    const loader = document.createElement('py-config');
-    document.body.append(loader);
+// XXX this should be killed eventually
+let runtimeSpec: Runtime;
+runtimeLoaded.subscribe(value => {
+    runtimeSpec = value;
+});
+
+
+class PyScriptApp {
+
+    config: AppConfig;
+
+    main() {
+        this.loadConfig();
+        this.initialize();
+
+        /* eslint-disable @typescript-eslint/no-unused-vars */
+        const xPyScript = customElements.define('py-script', PyScript);
+        const xPyLoader = customElements.define('py-loader', PyLoader);
+        const xPyEnv = customElements.define('py-env', PyEnv);
+        /* eslint-disable @typescript-eslint/no-unused-vars */
+
+        // add loader to the page body
+        logger.info('add py-loader');
+        const loader = <PyLoader>document.createElement('py-loader');
+        document.body.append(loader);
+        globalLoader.set(loader);
+    }
+
+    loadConfig() {
+        // find the <py-config> tag. If not found, we get null which means
+        // "use the default config"
+        // XXX: we should actively complain if there are multiple <py-config>
+        // and show a big error. PRs welcome :)
+        logger.info('searching for <py-config>');
+        const el = document.querySelector('py-config');
+        this.config = loadConfigFromElement(el);
+        logger.info('config loaded:\n' + JSON.stringify(this.config, null, 2));
+    }
+
+    initialize() {
+        addInitializer(this.loadPackages);
+        addInitializer(this.loadPaths);
+        this.loadRuntimes();
+    }
+
+    loadPackages = async () => {
+        logger.info("Packages to install: ", this.config.packages);
+        await runtimeSpec.installPackage(this.config.packages);
+    }
+
+    loadPaths = async () => {
+        const paths = this.config.paths;
+        logger.info("Paths to load: ", paths)
+        for (const singleFile of paths) {
+            logger.info(`  loading path: ${singleFile}`);
+            try {
+                await runtimeSpec.loadFromFile(singleFile);
+            } catch (e) {
+                //Should we still export full error contents to console?
+                handleFetchError(<Error>e, singleFile);
+            }
+        }
+        logger.info("All paths loaded");
+    }
+
+    loadRuntimes() {
+        logger.info('Initializing runtimes');
+        for (const runtime of this.config.runtimes) {
+            const runtimeObj: Runtime = new PyodideRuntime(this.config, runtime.src,
+                                                           runtime.name, runtime.lang);
+            const script = document.createElement('script'); // create a script DOM node
+            script.src = runtimeObj.src; // set its src to the provided URL
+            script.addEventListener('load', () => {
+                void runtimeObj.initialize();
+            });
+            document.head.appendChild(script);
+        }
+    }
+
+}
+
+function pyscript_get_config() {
+    return globalApp.config;
 }
+globalExport('pyscript_get_config', pyscript_get_config);
 
-// add loader to the page body
-logger.info('add py-loader');
-const loader = <PyLoader>document.createElement('py-loader');
-document.body.append(loader);
-globalLoader.set(loader);
+// main entry point of execution
+const globalApp = new PyScriptApp();
+globalApp.main();