Update webasm blobs v0.9.209

Increase go version to 1.16.
Embed webasm blobs in the binary.
Change CWD to binary dir, to allow launching the binary from any dir.

generate_archives.py

@@ -63,8 +63,8 @@
   if os.path.exists('ppl-utils.exe'):
     shutil.move('ppl-utils.exe', directory_name)
 
-  # Copy the other content
-  shutil.copytree('content', os.path.join(directory_name, 'content'))
+  # Copy the level
+  shutil.copytree('levels', os.path.join(directory_name, 'levels'))
 
   # Remove all .DS_Store from the directory
   for root, dirs, files in os.walk(directory_name):
@@ -74,7 +74,7 @@
         os.remove(path)
 
   # Remove all levels that do not start with 'sample_'
-  level_dir_path = os.path.join(directory_name, 'content', 'levels')
+  level_dir_path = os.path.join(directory_name, 'levels')
   for dir in os.listdir(level_dir_path):
     if not dir.startswith('sample_'):
       path = os.path.join(level_dir_path, dir)

go.mod

@@ -1,3 +1,3 @@
 module github.com/jyaif/ppl-utils
 
-go 1.14
+go 1.16

level_helpers.go

@@ -36,7 +36,7 @@ type LevelManifest struct {
 	HasScoreLeaderboard bool   `json:"has_score_leaderboard"`
 }
 
-// GetDir returns the path to the content directory.
+// GetDir returns the path to the levels directory.
 func GetDir() string {
 	cwd, err := os.Getwd()
 	if err != nil {
@@ -47,7 +47,7 @@ func GetDir() string {
 	if err != nil {
 		panic(err)
 	}
-	dir = dir + string(os.PathSeparator) + "content"
+	dir = dir + string(os.PathSeparator) + "levels"
 	return dir
 }
 
@@ -69,7 +69,7 @@ func ListLevels(dir string) []LevelJSON {
 				return stat_err
 			}
 
-			log.Print("path: " + path + ", file_info.Mode():" + file_info.Mode().String())
+			// log.Print("path: " + path + ", file_info.Mode():" + file_info.Mode().String())
 
 			fileIsASymLink := file_info.Mode()&os.ModeSymlink != 0
 			// If the file is a symlink, recursively walk it.

server.go

@@ -1,14 +1,21 @@
 package main
 
 import (
+	"embed"
 	"encoding/json"
 	"errors"
 	"fmt"
+	"io/fs"
 	"log"
 	"net/http"
 	"os"
+	"path/filepath"
 )
 
+//go:embed webasm/pewpew.*
+//go:embed webasm/pewpewlive.*
+var webasmFS embed.FS
+
 func setHeaders(w http.ResponseWriter, _ *http.Request) {
 	w.Header().Set("Access-Control-Allow-Origin", "*")
 	w.Header().Set("Access-Control-Allow-Headers", "*")
@@ -76,10 +83,31 @@ func getLevelManifest(w http.ResponseWriter, r *http.Request) {
 }
 
 func main() {
-	// Serves the static files
-	fs := cacheControlWrapper(http.FileServer(http.Dir(GetDir())))
-	http.Handle("/", fs)
+	// Change the current working directory to the directory of the executable
+	// Necessary to serve the levels if the binary is launched from an
+	// arbitrary directory.
+	executablePath, err := os.Executable()
+	if err != nil {
+		log.Print("Error getting executable path:", err)
+		return
+	}
+	executableDir := filepath.Dir(executablePath)
+	err = os.Chdir(executableDir)
+	if err != nil {
+		log.Print("Error changing directory:", err)
+		return
+	}
+
+	// Serve the static files
+	trimmedFS, trimmErr := fs.Sub(webasmFS, "webasm")
+	if trimmErr != nil {
+		log.Print("Error trimming directory:", trimmErr)
+		return
+	}
+	fsHandler := cacheControlWrapper(http.FileServerFS(trimmedFS))
+	http.Handle("/", fsHandler)
 
+	// Serve the levels
 	http.HandleFunc("/custom_levels/get_public_levels", list)
 	http.HandleFunc("/custom_levels/get_level", getLevel)
 	http.HandleFunc("/custom_levels/get_level_manifest", getLevelManifest)