.gitignore

@@ -5,6 +5,6 @@
 __debug_bin
 *.tar.gz
 transpile
+mothd
 winmoth.*.zip
-/mothd
+*.exe
-/*.exe

cmd/mothd/main.go

@@ -6,7 +6,6 @@ import (
 	"log"
 	"mime"
 	"os"
-	"path/filepath"
 	"time"
 
 	"github.com/spf13/afero"
@@ -55,38 +54,21 @@ func main() {
 	)
 	flag.Parse()
 
-	var theme *Theme
 	osfs := afero.NewOsFs()
-	if p, err := filepath.Abs(*themePath); err != nil {
+	theme := NewTheme(afero.NewBasePathFs(osfs, *themePath))
-		log.Fatal(err)
-	} else {
-		theme = NewTheme(afero.NewBasePathFs(osfs, p))
-	}
 
 	config := Configuration{}
 
 	var provider PuzzleProvider
-	if p, err := filepath.Abs(*mothballPath); err != nil {
+	provider = NewMothballs(afero.NewBasePathFs(osfs, *mothballPath))
-		log.Fatal(err)
-	} else {
-		provider = NewMothballs(afero.NewBasePathFs(osfs, p))
-	}
 	if *puzzlePath != "" {
-		if p, err := filepath.Abs(*puzzlePath); err != nil {
+		provider = NewTranspilerProvider(afero.NewBasePathFs(osfs, *puzzlePath))
-			log.Fatal(err)
-		} else {
-			provider = NewTranspilerProvider(afero.NewBasePathFs(osfs, p))
-		}
 		config.Devel = true
 		log.Println("-=- You are in development mode, champ! -=-")
 	}
 
 	var state StateProvider
-	if p, err := filepath.Abs(*statePath); err != nil {
+	state = NewState(afero.NewBasePathFs(osfs, *statePath))
-		log.Fatal(err)
-	} else {
-		state = NewState(afero.NewBasePathFs(osfs, p))
-	}
 	if config.Devel {
 		state = NewDevelState(state)
 	}

theme/config.json

@@ -5,6 +5,7 @@
         "": 0
     },
     "Puzzle": {
+        "SyntaxHighlighting": true,
         "": 0
     },
     "Scoreboard": {

theme/workspace/python.mjs

@@ -1,4 +1,4 @@
-import * as pyodide from "https://cdn.jsdelivr.net/npm/pyodide@0.25.1/pyodide.mjs" // v0.16.1 known good
+const pyodidePromise = import("https://cdn.jsdelivr.net/npm/pyodide@0.25.1/pyodide.mjs")
 
 const HOME = "/home/web_user"
 

theme/workspace/workspace.mjs

@@ -1,11 +1,21 @@
 import {Toast} from "../common.mjs"
-//import "https://cdnjs.cloudflare.com/ajax/libs/prism/1.29.0/prism.min.js"
+import "https://cdnjs.cloudflare.com/ajax/libs/prism/1.29.0/prism.min.js"
-import "https://cdnjs.cloudflare.com/ajax/libs/prism/1.29.0/components/prism-core.min.js"
-import "https://cdnjs.cloudflare.com/ajax/libs/prism/1.29.0/plugins/autoloader/prism-autoloader.min.js"
 import * as CodeJar from "https://cdn.jsdelivr.net/npm/codejar@4.2.0"
 
-Prism.plugins.autoloader.languages_path = "https://cdnjs.cloudflare.com/ajax/libs/prism/1.29.0/components/"
+var workers = {}
-const prismCssUrl = "https://cdnjs.cloudflare.com/ajax/libs/prism/1.29.0/themes/prism.min.css"
+
+// loadWorker returns an existing worker if one exists, otherwise, it starts a new worker
+function loadWorker(language) {
+    let worker = workers[language]
+    if (!worker) {
+        let url = new URL(language + ".mjs", import.meta.url)
+        worker = new Worker(url, {
+            type: "module",
+        })
+        workers[language] = worker
+    }
+    return worker
+}
 
 export class Workspace {
     /**
@@ -75,7 +85,7 @@ export class Workspace {
         .then(() => {
             codeBlock.parentElement.replaceWith(this.element)
         })
-        .catch(err => console.warn(`Unable to load interpreter: `, this.language))
+        .catch(err => console.warn(`Unable to load ${this.language} interpreter`))
         .finally(() => {
             loadingElement.remove()
         })
@@ -222,16 +232,3 @@ export class Workspace {
         this.element.classList.toggle("fixed")
     }
 }
-
-
-function init() {
-    let link = document.head.appendChild(document.createElement("link"))
-    link.rel = "stylesheet"
-    link.href = prismCssUrl
-}
-
-if (document.readyState === "loading") {
-    document.addEventListener("DOMContentLoaded", init)
-} else {
-    init()
-}