56 support demos in zst archive faceit (#68)

Author: sparkoo

.gitignore

@@ -7,3 +7,4 @@ assets/icons/shapes
 .secret/
 *.wasm
 web/public/wasm/
+testdemos/

cmd/wasm/wasm.go

@@ -2,63 +2,37 @@ package main
 
 import (
 	"bytes"
-	"compress/gzip"
-	"csgo-2d-demo-player/pkg/message"
 	"csgo-2d-demo-player/pkg/parser"
 	"fmt"
-	"io"
-	"log"
 	"syscall/js"
-	"time"
-
-	"github.com/markus-wa/demoinfocs-golang/v5/pkg/demoinfocs"
-	"google.golang.org/protobuf/proto"
 )
 
 func main() {
 	done := make(chan struct{}, 0)
 	fmt.Println("HEHEHEH")
-	js.Global().Set("testt", js.FuncOf(testt))
+	js.Global().Set("wasmParseDemo", js.FuncOf(wasmParseDemo))
 	<-done
 }
 
-func testt(this js.Value, args []js.Value) interface{} {
-	fmt.Printf("testt: +%v\n", args[0].Get("length"))
-	input := make([]byte, args[0].Get("length").Int())
-	js.CopyBytesToGo(input, args[0])
-
-	fmt.Println("fer")
-
-	parse(bytes.NewReader(input), args[1])
-
-	return js.ValueOf("2")
-}
+func wasmParseDemo(this js.Value, args []js.Value) interface{} {
+	fmt.Println("Herere")
+	filename := args[0].String()
+	fmt.Println("trying to parse a demo %s", &filename)
 
-func parse(input io.Reader, callback js.Value) {
-	fmt.Printf("callback? %+v\n", callback)
+	callback := args[2]
+	demoData := make([]byte, args[1].Get("length").Int())
+	js.CopyBytesToGo(demoData, args[1])
 
-	gzipReader, streamErr := gzip.NewReader(input)
-	if streamErr != nil {
-		log.Printf("Failed to create gzip reader from demo. %+v", streamErr)
-	}
-
-	startTime := time.Now().Local()
-	err := parser.Parse(gzipReader, func(msg *message.Message, state demoinfocs.GameState) {
-		fmt.Printf("message: %+v \n", msg.MsgType)
-
-		payload, protoErr := proto.Marshal(msg)
-		if protoErr != nil {
-			fmt.Printf("failed to marshall the message: %+v %+v\n", msg, protoErr)
-		}
+	err := parser.WasmParseDemo(filename, bytes.NewReader(demoData), func(payload []byte) {
 		arrayConstructor := js.Global().Get("Uint8Array")
 		dataJS := arrayConstructor.New(len(payload))
 		js.CopyBytesToJS(dataJS, payload)
 		callback.Invoke(dataJS)
 	})
-	fmt.Printf("parsing took: %s\n", time.Since(startTime))
 
 	if err != nil {
 		fmt.Printf("Failed to parse a demo: %+v \n", err)
 	}
-	fmt.Println("demo parsed?")
+
+	return js.ValueOf("2")
 }

go.mod

@@ -9,6 +9,7 @@ require (
 	github.com/alexflint/go-arg v1.5.1
 	github.com/golang/geo v0.0.0-20250813021530-247f39904721
 	github.com/gorilla/websocket v1.5.3
+	github.com/klauspost/compress v1.18.0
 	github.com/markus-wa/demoinfocs-golang/v5 v5.0.2
 	github.com/sparkoo/go-steam v0.0.0-20231112203532-968479d66868
 	github.com/stretchr/testify v1.10.0
@@ -44,6 +45,7 @@ require (
 	github.com/oklog/ulid/v2 v2.1.1 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/stretchr/objx v0.5.2 // indirect
 	go.opencensus.io v0.24.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect

go.sum

@@ -79,6 +79,8 @@ github.com/googleapis/gax-go/v2 v2.12.5 h1:8gw9KZK8TiVKB6q3zHY3SBzLnrGp6HQjyfYBY
 github.com/googleapis/gax-go/v2 v2.12.5/go.mod h1:BUDKcWo+RaKq5SC9vVYL0wLADa3VcfswbOMMRmB9H3E=
 github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
 github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
+github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
 github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=

pkg/parser/wasmparser.go

@@ -0,0 +1,42 @@
+package parser
+
+import (
+	"compress/gzip"
+	"csgo-2d-demo-player/pkg/message"
+	"fmt"
+	"io"
+	"strings"
+
+	"github.com/klauspost/compress/zstd"
+	"github.com/markus-wa/demoinfocs-golang/v5/pkg/demoinfocs"
+	"google.golang.org/protobuf/proto"
+)
+
+func WasmParseDemo(demoFilename string, demoFile io.Reader, callback func(payload []byte)) error {
+	decompressedDemo, decompressErr := decompress(demoFilename, demoFile)
+	if decompressErr != nil {
+		return decompressErr
+	}
+
+	return Parse(decompressedDemo, func(msg *message.Message, state demoinfocs.GameState) {
+		fmt.Printf("message: %+v \n", msg.MsgType)
+
+		payload, protoErr := proto.Marshal(msg)
+		if protoErr != nil {
+			fmt.Printf("failed to marshall the message: %+v %+v\n", msg, protoErr)
+		}
+		callback(payload)
+	})
+}
+
+func decompress(filename string, demoFile io.Reader) (io.Reader, error) {
+	if strings.HasSuffix(filename, ".gz") {
+		return gzip.NewReader(demoFile)
+	}
+
+	if strings.HasSuffix(filename, ".zst") {
+		return zstd.NewReader(demoFile)
+	}
+
+	return nil, fmt.Errorf("unsupported file format %s", filename)
+}

pkg/parser/wasmparser_test.go

@@ -0,0 +1,39 @@
+package parser
+
+import (
+	"os"
+	"testing"
+)
+
+var zstDemofileName = "1-cde451fd-6cd4-4c87-a432-d97d2235021a-1-1.dem.zst"
+var gzDemofileName = "1-cde451fd-6cd4-4c87-a432-d97d2235021a-1-1.dem.gz"
+var testDemosFolderPath = "../../testdemos"
+
+func TestParseZstDemoArchive(t *testing.T) {
+	demoFile, err := os.Open(testDemosFolderPath + "/" + zstDemofileName)
+	if err != nil {
+		t.Skip("failed to open the demo testfile. skipping for now as I have testdemos just locally")
+	}
+	parseErr := WasmParseDemo(zstDemofileName, demoFile, func(payload []byte) {})
+	if parseErr != nil {
+		t.Fatalf("failed to parse the demo: %v", parseErr)
+	}
+}
+
+func TestParseGzDemoArchive(t *testing.T) {
+	demoFile, err := os.Open(testDemosFolderPath + "/" + gzDemofileName)
+	if err != nil {
+		t.Skip("failed to open the demo testfile. skipping for now as I have testdemos just locally")
+	}
+	parseErr := WasmParseDemo(gzDemofileName, demoFile, func(payload []byte) {})
+	if parseErr != nil {
+		t.Fatalf("failed to parse the demo: %v", parseErr)
+	}
+}
+
+func TestParseUnsupportedDemoArchive(t *testing.T) {
+	parseErr := WasmParseDemo("not_supported.demo", nil, func(payload []byte) {})
+	if parseErr == nil {
+		t.Fatalf("parse should fail: %v", parseErr)
+	}
+}

web/public/worker.js

@@ -1,29 +1,39 @@
-const serverHost = globalThis.location.host.includes("localhost") ? "http://localhost:8080" : "";
+const serverHost = globalThis.location.host.includes("localhost")
+  ? "http://localhost:8080"
+  : "";
 
-importScripts('wasm/wasm_exec.js');
+importScripts("wasm/wasm_exec.js");
 
 onmessage = (event) => {
-  if (event.data instanceof Uint8Array) {
-    globalThis.testt(event.data, async function (data) {
+  console.log("received event: ", event);
+  var demoData = event.data.data;
+  var filename = event.data.filename;
+  console.log("file: ", filename);
+  if (demoData instanceof Uint8Array) {
+    globalThis.wasmParseDemo(filename, demoData, async function (data) {
       if (data instanceof Uint8Array) {
-        postMessage(data)
+        postMessage(data);
         // const msg = proto.Message.deserializeBinary(data).toObject()
         // messageBus.emit(msg)
       } else {
-        console.log("[message] text data received from server, this is weird. We're using protobufs ?!?!?", data);
-        postMessage(JSON.parse(data))
+        console.log(
+          "[message] text data received from server, this is weird. We're using protobufs ?!?!?",
+          data
+        );
+        postMessage(JSON.parse(data));
       }
-    })
+    });
   }
-}
+};
 
 async function loadWasm() {
-  console.log("hus", serverHost + "/wasm")
   const go = new globalThis.Go();
-  await WebAssembly.instantiateStreaming(fetch("/wasm/csdemoparser.wasm"), go.importObject)
-    .then((result) => {
-      go.run(result.instance);
-      console.log("should be loaded now")
-    });
+  await WebAssembly.instantiateStreaming(
+    fetch("/wasm/csdemoparser.wasm"),
+    go.importObject
+  ).then((result) => {
+    go.run(result.instance);
+    console.log("should be loaded now");
+  });
 }
 loadWasm();

web/src/Index/Uploader/Uploader.jsx

@@ -1,24 +1,23 @@
-import './Uploader.css';
-import { FileUpload } from 'primereact/fileupload';
-import { useLocation } from 'preact-iso';
-import { useContext } from 'react';
-import { DemoContext } from '../../context'
+import "./Uploader.css";
+import { FileUpload } from "primereact/fileupload";
+import { useLocation } from "preact-iso";
+import { useContext } from "react";
+import { DemoContext } from "../../context";
 
 const Uploader = () => {
   const demoData = useContext(DemoContext);
   const { route } = useLocation();
 
   const uploadHandler = function ({ files }) {
     const [file] = files;
-    console.log(file)
 
     const reader = new FileReader();
 
     reader.onload = function (e) {
       const arrayBuffer = e.target.result;
       const byteArray = new Uint8Array(arrayBuffer);
-      demoData.setDemoData(byteArray)
-      route("/player")
+      demoData.setDemoData({ filename: file.name, data: byteArray });
+      route("/player");
       // const uuid = crypto.randomUUID()
       // window.open("/player?platform=upload&uuid=" + uuid, '_blank').focus();
       // const channel = new BroadcastChannel(uuid);
@@ -27,7 +26,7 @@ const Uploader = () => {
       // }, 1000)
     };
     reader.readAsArrayBuffer(file);
-  }
+  };
 
   return (
     <div>
@@ -39,9 +38,10 @@ const Uploader = () => {
         // onProgress={onProgress}
         customUpload={true}
         uploadHandler={uploadHandler}
-        auto />
+        auto
+      />
     </div>
-  )
-}
+  );
+};
 
 export default Uploader;

web/src/Player/PlayerApp.jsx

@@ -5,10 +5,8 @@ import MessageBus from "./MessageBus.js";
 import Player from "./Player.js";
 import Map2d from "./map/Map2d.jsx";
 import InfoPanel from "./panel/InfoPanel.jsx";
-// import '../libs/wasm_exec.js';
 import './protos/Message_pb.js'
 import DemoContext from "../context.js"
-// import workerScript from "./worker.js";
 
 export function PlayerApp() {
   const demoData = useContext(DemoContext);
@@ -26,6 +24,7 @@ export function PlayerApp() {
   };
 
   useEffect(() => {
+    console.log("isWasmLoaded", isWasmLoaded)
     if (demoData.demoData) {
       setTimeout(() => worker.postMessage(demoData.demoData), 1000)
     }