diff --git a/bonk/cmd/bonk-wasm/main_wasm.go b/bonk/cmd/bonk-wasm/main_wasm.go index 6c71b26..8f7d00d 100644 --- a/bonk/cmd/bonk-wasm/main_wasm.go +++ b/bonk/cmd/bonk-wasm/main_wasm.go @@ -3,7 +3,11 @@ package main import ( "syscall/js" + "forgejo.perny.dev/perny/hudkit/bonk/pkg/bonk" + "forgejo.perny.dev/perny/hudkit/bonk/pkg/bonk/bonkcode/compiler" + "forgejo.perny.dev/perny/hudkit/bonk/pkg/bonk/bonkcode/interpreter" "forgejo.perny.dev/perny/hudkit/bonk/pkg/bonk/processor" + "github.com/vmihailenco/msgpack/v5" ) func main() { @@ -16,59 +20,51 @@ func bonkCompile(this js.Value, args []js.Value) interface{} { if len(args) < 1 { return js.ValueOf(nil) } - input := args[0] + var data []byte if input.Type() == js.TypeString { - xmlStr := input.String() - p, err := processor.NewProcessor([]byte(xmlStr)) - if err != nil { - return js.ValueOf(nil) - } - - buf, err := p.Process() - if err != nil { + data = []byte(input.String()) + } else { + if !input.InstanceOf(js.Global().Get("Uint8Array")) || input.Get("length").Int() <= 0 { return js.ValueOf(nil) } + data = make([]byte, input.Get("length").Int()) + js.CopyBytesToGo(data, input) + } - result := buf.Bytes() - resultLen := len(result) - - resultArr := js.Global().Get("Uint8Array").New(resultLen) - js.CopyBytesToJS(resultArr, result) + return processBytes(data) +} - return resultArr +func processBytes(data []byte) interface{} { + doc, err := bonk.LoadHudDoc(data) + if err != nil { + return js.ValueOf(nil) } - length := input.Get("length").Int() - if length <= 0 { + m, err := processor.CreateIsolates(doc) + if err != nil { return js.ValueOf(nil) } - uint8Array := js.Global().Get("Uint8Array") - if !input.InstanceOf(uint8Array) { + bf, _, err := compiler.CompileBonk(*doc, m) + if err != nil { return js.ValueOf(nil) } - goSlice := make([]byte, length) - js.CopyBytesToGo(goSlice, input) - - p, err := processor.NewProcessor(goSlice) + vm, err := interpreter.NewVM(bf, &interpreter.BonkDomainOpsImpl{}) if err != nil { return js.ValueOf(nil) } - buf, err := p.Process() + err = vm.Run() if err != nil { return js.ValueOf(nil) } - result := buf.Bytes() - resultLen := len(result) - - resultArr := js.Global().Get("Uint8Array").New(resultLen) - js.CopyBytesToJS(resultArr, result) + bytes, _ := msgpack.Marshal(vm.Stdout()) - return resultArr + arr := js.Global().Get("Uint8Array").New(len(bytes)) + js.CopyBytesToJS(arr, bytes) + return arr } - diff --git a/bonk/go.mod b/bonk/go.mod index 3e1326c..450062e 100644 --- a/bonk/go.mod +++ b/bonk/go.mod @@ -42,7 +42,9 @@ require ( github.com/quic-go/quic-go v0.54.0 // indirect github.com/rivo/uniseg v0.4.7 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect - github.com/ugorji/go/codec v1.3.0 // indirect + github.com/ugorji/go/codec v1.3.1 // indirect + github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect + github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect go.uber.org/mock v0.5.0 // indirect golang.org/x/arch v0.20.0 // indirect diff --git a/bonk/go.sum b/bonk/go.sum index fd47f33..408012e 100644 --- a/bonk/go.sum +++ b/bonk/go.sum @@ -92,6 +92,12 @@ github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= github.com/ugorji/go/codec v1.3.0 h1:Qd2W2sQawAfG8XSvzwhBeoGq71zXOC/Q1E9y/wUcsUA= github.com/ugorji/go/codec v1.3.0/go.mod h1:pRBVtBSKl77K30Bv8R2P+cLSGaTtex6fsA2Wjqmfxj4= +github.com/ugorji/go/codec v1.3.1 h1:waO7eEiFDwidsBN6agj1vJQ4AG7lh2yqXyOXqhgQuyY= +github.com/ugorji/go/codec v1.3.1/go.mod h1:pRBVtBSKl77K30Bv8R2P+cLSGaTtex6fsA2Wjqmfxj4= +github.com/vmihailenco/msgpack/v5 v5.4.1 h1:cQriyiUvjTwOHg8QZaPihLWeRAAVoCpE00IUPn0Bjt8= +github.com/vmihailenco/msgpack/v5 v5.4.1/go.mod h1:GaZTsDaehaPpQVyxrf5mtQlH+pc21PIudVV/E3rRQok= +github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g= +github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds= github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no= github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM= go.uber.org/mock v0.5.0 h1:KAMbZvZPyBPWgD14IrIQ38QCyjwpvVVV6K/bHl1IwQU= diff --git a/bonk/pkg/bonk/bonkcode/compiler/compiler.go b/bonk/pkg/bonk/bonkcode/compiler/compiler.go index 5647bb3..b6a9938 100644 --- a/bonk/pkg/bonk/bonkcode/compiler/compiler.go +++ b/bonk/pkg/bonk/bonkcode/compiler/compiler.go @@ -21,20 +21,20 @@ func NewBonkCompiler() *BonkCompiler { } } -func CompileBonk(document bonk.HudDoc, isolateMap isolate.IsolateMap) (*bytes.Buffer, error) { +func CompileBonk(document bonk.HudDoc, isolateMap isolate.IsolateMap) (*bonkcode.BonkFile, *bytes.Buffer, error) { compiler := NewBonkCompiler() layout := document.Document.FindElement("/hud/layout") if layout == nil { - return nil, fmt.Errorf("no layout") + return nil, nil, fmt.Errorf("no layout") } if err := traverseChildren(compiler, layout, isolateMap); err != nil { - return nil, err + return nil, nil, err } compiler.file.END() buf, comments := compiler.file.Encode() debugDisasm(buf, comments) - return buf, nil + return compiler.file, buf, nil } func handleChild(compiler *BonkCompiler, element *etree.Element, isolateMap isolate.IsolateMap) error { diff --git a/bonk/pkg/bonk/bonkcode/interpreter/components/types.go b/bonk/pkg/bonk/bonkcode/interpreter/components/types.go index 33437c6..98cd3dc 100644 --- a/bonk/pkg/bonk/bonkcode/interpreter/components/types.go +++ b/bonk/pkg/bonk/bonkcode/interpreter/components/types.go @@ -1,27 +1,27 @@ package components type TextStyle struct { - Color string `json:"color,omitempty"` - Bold bool `json:"bold,omitempty"` - Italic bool `json:"italic,omitempty"` - Underlined bool `json:"underlined,omitempty"` - Strikethrough bool `json:"strikethrough,omitempty"` - Obfuscated bool `json:"obfuscated,omitempty"` - Font string `json:"font,omitempty"` - Shadow bool `json:"shadow,omitempty"` + Color string `json:"color,omitempty" minimessage:"color,omitempty"` + Bold bool `json:"bold,omitempty" minimessage:"bold,omitempty"` + Italic bool `json:"italic,omitempty" minimessage:"italic,omitempty"` + Underlined bool `json:"underlined,omitempty" minimessage:"underlined,omitempty"` + Strikethrough bool `json:"strikethrough,omitempty" minimessage:"strikethrough,omitempty"` + Obfuscated bool `json:"obfuscated,omitempty" minimessage:"obfuscated,omitempty"` + Font string `json:"font,omitempty" minimessage:"font,omitempty"` + Shadow bool `json:"shadow,omitempty" minimessage:"shadow,omitempty"` } type TextComponent struct { - Text string `json:"text,omitempty"` - Translate string `json:"translate,omitempty"` - With []TextComponent `json:"with,omitempty"` - Extra []TextComponent `json:"extra,omitempty"` - Color string `json:"color,omitempty"` - Bold *bool `json:"bold,omitempty"` - Italic *bool `json:"italic,omitempty"` - Underlined *bool `json:"underlined,omitempty"` - Strikethrough *bool `json:"strikethrough,omitempty"` - Obfuscated *bool `json:"obfuscated,omitempty"` - Font string `json:"font,omitempty"` - ID string `json:"id,omitempty"` // used for libmojangles bbox + Text string `json:"text,omitempty" minimessage:"text,omitempty"` + Translate string `json:"translate,omitempty" minimessage:"translate,omitempty"` + With []TextComponent `json:"with,omitempty" minimessage:"with,omitempty"` + Extra []TextComponent `json:"extra,omitempty" minimessage:"extra,omitempty"` + Color string `json:"color,omitempty" minimessage:"color,omitempty"` + Bold *bool `json:"bold,omitempty" minimessage:"bold,omitempty"` + Italic *bool `json:"italic,omitempty" minimessage:"italic,omitempty"` + Underlined *bool `json:"underlined,omitempty" minimessage:"underlined,omitempty"` + Strikethrough *bool `json:"strikethrough,omitempty" minimessage:"strikethrough,omitempty"` + Obfuscated *bool `json:"obfuscated,omitempty" minimessage:"obfuscated,omitempty"` + Font string `json:"font,omitempty" minimessage:"font,omitempty"` + ID string `json:"id,omitempty" minimessage:"id,omitempty"` } diff --git a/bonk/pkg/bonk/bonkcode/interpreter/domain-ops.go b/bonk/pkg/bonk/bonkcode/interpreter/domain-ops.go index c687811..de3c2fc 100644 --- a/bonk/pkg/bonk/bonkcode/interpreter/domain-ops.go +++ b/bonk/pkg/bonk/bonkcode/interpreter/domain-ops.go @@ -1,6 +1,11 @@ package interpreter import ( + "bytes" + "encoding/json" + "fmt" + "net/http" + "forgejo.perny.dev/perny/hudkit/bonk/pkg/bonk/bonkcode/interpreter/components" ) @@ -10,20 +15,75 @@ type BonkDomainOps interface { EMIT(component components.TextComponent) EMIT_SPACE(amount int) WCALC(component components.TextComponent) int + + Stdout() components.TextComponent } -type BonkDomainOpsImpl struct{} +var minimessageCache = map[string]components.TextComponent{} + +type BonkDomainOpsImpl struct { + stdout []components.TextComponent // Since this is a Minecraft VM.... STDOUT = text components! +} + +type parseRequest struct { + MiniMessage string `json:"miniMessage"` +} func (b *BonkDomainOpsImpl) PARSE(in string) components.TextComponent { - return components.TextComponent{} + v, ok := minimessageCache[in] + if ok { + return v + } + + url := "https://mm.hudkit.net" + data := parseRequest{ + MiniMessage: in, + } + body, err := json.Marshal(data) + if err != nil { + fmt.Errorf("failed to marshal json for parsing: %s", err.Error()) + return components.TextComponent{} + } + + req, err := http.NewRequest("POST", url, bytes.NewReader(body)) + if err != nil { + fmt.Errorf("failed to create http request: %s", err.Error()) + return components.TextComponent{} + } + + resp, err := http.DefaultClient.Do(req) + if err != nil { + fmt.Errorf("failed to send http request: %s", err.Error()) + return components.TextComponent{} + } + + var component components.TextComponent + err = json.NewDecoder(resp.Body).Decode(&component) + if err != nil { + fmt.Errorf("failed to decode json: %s", err.Error()) + return components.TextComponent{} + } + + minimessageCache[in] = component + + return component } func (b *BonkDomainOpsImpl) EMIT(component components.TextComponent) { + b.stdout = append(b.stdout, component) } func (b *BonkDomainOpsImpl) EMIT_SPACE(amount int) { + // TODO: Add this } func (b *BonkDomainOpsImpl) WCALC(component components.TextComponent) int { return 0 } + +func (b *BonkDomainOpsImpl) Stdout() components.TextComponent { + return components.TextComponent{ + Text: "", + Extra: b.stdout, + } +} diff --git a/bonk/pkg/bonk/bonkcode/interpreter/vm.go b/bonk/pkg/bonk/bonkcode/interpreter/vm.go index e9b0fd8..3ec6088 100644 --- a/bonk/pkg/bonk/bonkcode/interpreter/vm.go +++ b/bonk/pkg/bonk/bonkcode/interpreter/vm.go @@ -24,14 +24,18 @@ type VM struct { err error } +func (vm *VM) Stdout() components.TextComponent { + return vm.domainOps.Stdout() +} + func NewVM(bf *bonkcode.BonkFile, domainOps BonkDomainOps) (*VM, error) { data, _ := bf.Encode() return &VM{ bf: bf, domainOps: domainOps, - numRegs: make([]float64, 256), - strRegs: make([]string, 256), - compRegs: make([]components.TextComponent, 256), + numRegs: make([]float64, 1024), + strRegs: make([]string, 1024), + compRegs: make([]components.TextComponent, 1024), stringTable: bf.StringTable, bytecode: data.Bytes(), }, nil @@ -244,19 +248,54 @@ func (vm *VM) execLOADSTR() { func (vm *VM) execSPRINTF() { out := bonkcode.StringRegister(vm.readU16()) - _ = vm.readU16() + ptr := bonkcode.StringTablePointer(vm.readU16()) + template := vm.getStringTable(ptr) count := int(vm.readU8()) args := make([]float64, count) for i := range count { reg := bonkcode.NumericRegister(vm.readU16()) args[i] = vm.getNumReg(reg) } - vm.setStrReg(out, vm.sprintf(args)) + vm.setStrReg(out, vm.sprintf(template, args)) } -func (vm *VM) sprintf(args []float64) string { - // TODO: implement - return "" +func (vm *VM) sprintf(template string, args []float64) string { + var result []rune + argIdx := 0 + rs := []rune(template) + + for i := 0; i < len(rs); i++ { + if rs[i] == '%' && i+1 < len(rs) { + next := rs[i+1] + if next == '%' { + result = append(result, '%') + i++ + continue + } + if argIdx >= len(args) { + result = append(result, rs[i]) + i++ + continue + } + i++ + switch next { + case 'h': + result = append(result, []rune(fmt.Sprintf("%02x", int(args[argIdx])))...) + case 's': + strArg := vm.getStrReg(bonkcode.StringRegister(int(args[argIdx]))) + result = append(result, []rune(strArg)...) + case 'd': + result = append(result, []rune(fmt.Sprintf("%d", int(args[argIdx])))...) + default: + result = append(result, '%') + result = append(result, next) + } + argIdx++ + continue + } + result = append(result, rs[i]) + } + return string(result) } func (vm *VM) execPARSE() { @@ -296,8 +335,9 @@ func (vm *VM) execIF() { } func (vm *VM) execGOTO() { - offset := int(vm.readI16()) - vm.ip = vm.resolveJump(offset) + offset := int16(binary.BigEndian.Uint16(vm.bytecode[vm.ip : vm.ip+2])) + vm.ip += 2 + vm.ip = vm.resolveJump(int(offset)) } func (vm *VM) resolveJump(relOffset int) int { @@ -312,13 +352,16 @@ func (vm *VM) resolveJump(relOffset int) int { for pos < len(vm.bytecode) { if pos == targetByte { + pos++ return pos } opcode := bonkcode.BonkOpcode(vm.bytecode[pos]) pos++ switch opcode { case bonkcode.BonkOpcodeEND: + break case bonkcode.BonkOpcodePOINT, bonkcode.BonkOpcodeENDIF: + break case bonkcode.BonkOpcodeIF: pos += 4 case bonkcode.BonkOpcodeGOTO: diff --git a/bonk/pkg/bonk/bonkcode/interpreter/vm_test.go b/bonk/pkg/bonk/bonkcode/interpreter/vm_test.go index a5e9c80..75ffd0d 100644 --- a/bonk/pkg/bonk/bonkcode/interpreter/vm_test.go +++ b/bonk/pkg/bonk/bonkcode/interpreter/vm_test.go @@ -28,6 +28,10 @@ func (m *mockDomainOps) WCALC(component components.TextComponent) int { return len(component.Text) } +func (m *mockDomainOps) Stdout() components.TextComponent { + return components.TextComponent{} +} + func newTestVM(bf *bonkcode.BonkFile) (*VM, *mockDomainOps) { mock := &mockDomainOps{} vm, err := NewVM(bf, mock) @@ -462,3 +466,202 @@ func TestMultipleSumArgs(t *testing.T) { t.Errorf("expected r4=6, got %v", vm.getNumReg(r4)) } } + +func TestPARSE(t *testing.T) { + bf := bonkcode.NewBonkFile() + r1 := bf.Register() + + bf.LOADSTR(bonkcode.StringRegister(r1), "test") + bf.PARSE(bonkcode.ComponentRegister(r1), bonkcode.StringRegister(r1)) + bf.END() + + realOps := &BonkDomainOpsImpl{} + vm, err := NewVM(bf, realOps) + if err != nil { + t.Fatal(err) + } + + if err := vm.Run(); err != nil { + t.Fatal(err) + } + + comp := vm.getCompReg(bonkcode.ComponentRegister(r1)) + if comp.Color != "red" || comp.Text != "test" { + t.Errorf("expected {Color: red, Text: test}, got %+v", comp) + } +} + +func TestSprintfHex(t *testing.T) { + bf := bonkcode.NewBonkFile() + r1 := bf.Register() + r2 := bf.Register() + r3 := bf.Register() + out := bonkcode.StringRegister(bf.Register()) + + bf.SET(r1, uint16(255)) + bf.SET(r2, uint16(0)) + bf.SET(r3, uint16(255)) + bf.SPRINTF(out, "#%h%h%h", r1, r2, r3) + bf.END() + + vm, _ := newTestVM(bf) + if err := vm.Run(); err != nil { + t.Fatal(err) + } + + if vm.getStrReg(out) != "#ff00ff" { + t.Errorf("expected #ff00ff, got %q", vm.getStrReg(out)) + } +} + +func TestSprintfHexColor(t *testing.T) { + bf := bonkcode.NewBonkFile() + rR := bf.Register() + rG := bf.Register() + rB := bf.Register() + out := bonkcode.StringRegister(bf.Register()) + + bf.SET(rR, uint16(220)) + bf.SET(rG, uint16(20)) + bf.SET(rB, uint16(60)) + bf.SPRINTF(out, "text", rR, rG, rB) + bf.END() + + vm, _ := newTestVM(bf) + if err := vm.Run(); err != nil { + t.Fatal(err) + } + + if vm.getStrReg(out) != "text" { + t.Errorf("expected text, got %q", vm.getStrReg(out)) + } +} + +func TestSprintfDecimal(t *testing.T) { + bf := bonkcode.NewBonkFile() + r1 := bf.Register() + out := bonkcode.StringRegister(bf.Register()) + + bf.SET(r1, uint16(42)) + bf.SPRINTF(out, "value: %d", r1) + bf.END() + + vm, _ := newTestVM(bf) + if err := vm.Run(); err != nil { + t.Fatal(err) + } + + if vm.getStrReg(out) != "value: 42" { + t.Errorf("expected 'value: 42', got %q", vm.getStrReg(out)) + } +} + +func TestSprintfString(t *testing.T) { + bf := bonkcode.NewBonkFile() + r1 := bf.Register() + strArg := bonkcode.StringRegister(bf.Register()) + out := bonkcode.StringRegister(bf.Register()) + + bf.LOADSTR(strArg, "world") + bf.SET(r1, float64(strArg)) + bf.SPRINTF(out, "hello %s", r1) + bf.END() + + vm, _ := newTestVM(bf) + if err := vm.Run(); err != nil { + t.Fatal(err) + } + + if vm.getStrReg(out) != "hello world" { + t.Errorf("expected 'hello world', got %q", vm.getStrReg(out)) + } +} + +func TestSprintfEscape(t *testing.T) { + bf := bonkcode.NewBonkFile() + r1 := bf.Register() + out := bonkcode.StringRegister(bf.Register()) + + bf.SET(r1, uint16(100)) + bf.SPRINTF(out, "100%% is the answer", r1) + bf.END() + + vm, _ := newTestVM(bf) + if err := vm.Run(); err != nil { + t.Fatal(err) + } + + if vm.getStrReg(out) != "100% is the answer" { + t.Errorf("expected '100%% is the answer', got %q", vm.getStrReg(out)) + } +} + +func TestSprintfNoArgs(t *testing.T) { + bf := bonkcode.NewBonkFile() + out := bonkcode.StringRegister(bf.Register()) + + bf.SPRINTF(out, "no args here") + bf.END() + + vm, _ := newTestVM(bf) + if err := vm.Run(); err != nil { + t.Fatal(err) + } + + if vm.getStrReg(out) != "no args here" { + t.Errorf("expected 'no args here', got %q", vm.getStrReg(out)) + } +} + +func TestSprintfMixed(t *testing.T) { + bf := bonkcode.NewBonkFile() + r1 := bf.Register() + r2 := bf.Register() + r3 := bf.Register() + strArg := bonkcode.StringRegister(bf.Register()) + out := bonkcode.StringRegister(bf.Register()) + + bf.SET(r1, uint16(255)) + bf.SET(r2, uint16(10)) + bf.LOADSTR(strArg, "item") + bf.SET(r3, float64(strArg)) + bf.SPRINTF(out, "#%h %s at %d", r1, r3, r2) + bf.END() + + vm, _ := newTestVM(bf) + if err := vm.Run(); err != nil { + t.Fatal(err) + } + + if vm.getStrReg(out) != "#ff item at 10" { + t.Errorf("expected '#ff item at 10', got %q", vm.getStrReg(out)) + } +} + +func TestParseAndEmitToStdout(t *testing.T) { + bf := bonkcode.NewBonkFile() + r1 := bf.Register() + + bf.LOADSTR(bonkcode.StringRegister(r1), "hello") + bf.PARSE(bonkcode.ComponentRegister(r1), bonkcode.StringRegister(r1)) + bf.EMIT(bonkcode.ComponentRegister(r1)) + bf.END() + + realOps := &BonkDomainOpsImpl{} + vm, err := NewVM(bf, realOps) + if err != nil { + t.Fatal(err) + } + + if err := vm.Run(); err != nil { + t.Fatal(err) + } + + stdout := vm.Stdout() + if len(stdout.Extra) != 1 { + t.Fatalf("expected 1 component in stdout, got %d", len(stdout.Extra)) + } + if stdout.Extra[0].Text != "hello" || stdout.Extra[0].Color != "red" { + t.Errorf("expected {Text: hello, Color: red}, got %+v", stdout.Extra[0]) + } +} diff --git a/bonk/pkg/bonk/processor/process.go b/bonk/pkg/bonk/processor/process.go index 89f4221..5a6fb92 100644 --- a/bonk/pkg/bonk/processor/process.go +++ b/bonk/pkg/bonk/processor/process.go @@ -2,7 +2,6 @@ package processor import ( "bytes" - "fmt" "forgejo.perny.dev/perny/hudkit/bonk/pkg/bonk" "forgejo.perny.dev/perny/hudkit/bonk/pkg/bonk/bonkcode/compiler" @@ -24,13 +23,12 @@ func NewProcessor(xml []byte) (*Processor, error) { } func (p *Processor) Process() (*bytes.Buffer, error) { - fmt.Println("processing document") m, err := CreateIsolates(p.Document) if err != nil { return nil, err } - buf, err := compiler.CompileBonk(*p.Document, m) + _, buf, err := compiler.CompileBonk(*p.Document, m) if err != nil { return nil, err } diff --git a/studio/ui/src/app.html b/studio/ui/src/app.html index 2eb373f..8859f2e 100644 --- a/studio/ui/src/app.html +++ b/studio/ui/src/app.html @@ -2,6 +2,7 @@ + %sveltekit.head% diff --git a/studio/ui/src/lib/bonk-wasm.ts b/studio/ui/src/lib/bonk-wasm.ts index 991a353..082e9ed 100644 --- a/studio/ui/src/lib/bonk-wasm.ts +++ b/studio/ui/src/lib/bonk-wasm.ts @@ -1,65 +1,36 @@ -let instance: WebAssembly.Instance | null = null; +declare global { + const Go: new () => { + importObject: WebAssembly.Imports; + run(instance: WebAssembly.Instance): void; + }; + let bonkReady: boolean | undefined; + function bonkCompile(xml: string): Uint8Array | null; +} + let initPromise: Promise | null = null; export async function initBonkWasm(): Promise { - if (instance) return; - if (!initPromise) { initPromise = (async () => { - const wasmResponse = await fetch('/wasm_exec.js'); - const wasmText = await wasmResponse.text(); - - const blob = new Blob([wasmText], { type: 'application/javascript' }); - const wasmUrl = URL.createObjectURL(blob); - - await new Promise((resolve, reject) => { - const script = document.createElement('script'); - script.src = wasmUrl; - script.onload = () => { - URL.revokeObjectURL(wasmUrl); - resolve(); - }; - script.onerror = () => { - URL.revokeObjectURL(wasmUrl); - reject(new Error('Failed to load wasm_exec.js')); - }; - document.head.appendChild(script); - }); - - const Go = (globalThis as any).Go; const go = new Go(); - const bonkResponse = await fetch('/bonk.wasm'); - const bonkBuffer = await bonkResponse.arrayBuffer(); - const bonkModule = await WebAssembly.compile(bonkBuffer); - const importObject = (go as any).importObject; - instance = await WebAssembly.instantiate(bonkModule, importObject); - + const buffer = await fetch('/bonk.wasm').then((r) => r.arrayBuffer()); + const instance = await WebAssembly.instantiate( + await WebAssembly.compile(buffer), + go.importObject + ); go.run(instance); + await new Promise((resolve) => { + const check = () => (bonkReady ? resolve() : setTimeout(check, 10)); + check(); + }); })(); } - - await initPromise; - await new Promise(resolve => setTimeout(resolve, 500)); + return initPromise; } export async function bonkCompile(xml: string): Promise { - if (!instance) { - await initBonkWasm(); - } - - const encoder = new TextEncoder(); - const xmlBytes = encoder.encode(xml); - - const bonkCompileFn = (globalThis as any).bonkCompile; - if (!bonkCompileFn) { - throw new Error('bonkCompile not found on globalThis'); - } - - const result = bonkCompileFn(xmlBytes); - - if (!result || result.length === 0) { - throw new Error('Bonk compilation failed or returned empty'); - } - + await initBonkWasm(); + const result = globalThis.bonkCompile(xml); + if (!result?.length) throw new Error('Bonk compilation failed or returned empty'); return result; -} \ No newline at end of file +} diff --git a/studio/ui/src/lib/components/canvas-background.svelte b/studio/ui/src/lib/components/canvas-background.svelte deleted file mode 100644 index 01d0ef9..0000000 --- a/studio/ui/src/lib/components/canvas-background.svelte +++ /dev/null @@ -1,95 +0,0 @@ - - -{#if needsClipPath} - - - - - - - - -
-{:else if hasRounding} - -
-{:else} - -
-{/if} diff --git a/studio/ui/src/lib/components/canvas-element.svelte b/studio/ui/src/lib/components/canvas-element.svelte deleted file mode 100644 index 8f199d2..0000000 --- a/studio/ui/src/lib/components/canvas-element.svelte +++ /dev/null @@ -1,382 +0,0 @@ - - - - -
{ - if (isChildSelected) return; - project.selected = element; - }} -> -
- {#if (x !== 0 || y !== 0) && project.canvasEditorUI} - - {/if} - -
- {#if hasBackground} - {@const colorHex = backgroundColor.slice(0, 7)} - {@const alphaHex = backgroundColor.length === 9 ? backgroundColor.slice(7, 9) : 'FF'} - {@const opacity = parseInt(alphaHex, 16) / 255} - {@const bgWidth = elementWidth * PIXEL_SCALE + backgroundExpandX * 2 * PIXEL_SCALE} - {@const bgHeight = elementHeight * PIXEL_SCALE + backgroundExpandY * 2 * PIXEL_SCALE} -
- -
- {/if} - - {#each visibleChildren as node (node)} - {#if node.tagName.toLowerCase() === 'image'} - - {:else if node.tagName.toLowerCase() === 'rectangle'} - - {:else} - - {/if} - {/each} -
-
-
diff --git a/studio/ui/src/lib/components/canvas-media.svelte b/studio/ui/src/lib/components/canvas-media.svelte deleted file mode 100644 index 6b50901..0000000 --- a/studio/ui/src/lib/components/canvas-media.svelte +++ /dev/null @@ -1,210 +0,0 @@ - - - diff --git a/studio/ui/src/lib/components/canvas-rectangle.svelte b/studio/ui/src/lib/components/canvas-rectangle.svelte deleted file mode 100644 index 4064fc1..0000000 --- a/studio/ui/src/lib/components/canvas-rectangle.svelte +++ /dev/null @@ -1,228 +0,0 @@ - - - diff --git a/studio/ui/src/lib/components/canvas.svelte b/studio/ui/src/lib/components/canvas.svelte deleted file mode 100644 index b9d2b84..0000000 --- a/studio/ui/src/lib/components/canvas.svelte +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - {#key project.version} - {#each project.doc?.querySelectorAll('element') || [] as element, index (index)} - - {/each} - {/key} - - - diff --git a/studio/ui/src/lib/components/canvas/canvas.svelte b/studio/ui/src/lib/components/canvas/canvas.svelte new file mode 100644 index 0000000..17c06dd --- /dev/null +++ b/studio/ui/src/lib/components/canvas/canvas.svelte @@ -0,0 +1,66 @@ + + + + + {#if c.isCanvasLoading} +
+ +

Opening the huud

+ Did you know? You can use PlaceholderAPI inside text! +
+ {/if} + + + + + + + + +
+ +
+ +
+ +
+
+ + diff --git a/studio/ui/src/lib/components/canvas/canvas.svelte.ts b/studio/ui/src/lib/components/canvas/canvas.svelte.ts new file mode 100644 index 0000000..f48cb24 --- /dev/null +++ b/studio/ui/src/lib/components/canvas/canvas.svelte.ts @@ -0,0 +1,116 @@ +import { project } from '$lib/project.svelte'; +import { + createLibmojangles, + ResourcePackZIP, + type DrawTextResult, + type Libmojangles +} from 'libmojangles'; +import { tick } from 'svelte'; + +class Canvas { + private lib: Libmojangles | null = null; + private canvas: HTMLCanvasElement | null = null; + private overlayCanvas: HTMLCanvasElement | null = null; + private fontLoaded = false; + + private drawResult: DrawTextResult | null = null; + + size = $state({ width: 0, height: 0, dprWidth: 0, dprHeight: 0 }); + isCanvasLoading = $state(true); + + setCanvas(canvas: HTMLCanvasElement) { + this.canvas = canvas; + + this.createMojangles(); + this.addResourcepack().then(() => this.init()); + } + + init() { + if ( + !this.canvas || + !this.overlayCanvas || + !this.lib || + !this.isCanvasLoading || + !this.fontLoaded + ) + return; + this.isCanvasLoading = false; + this.render(); + } + + setOverlayCanvas(canvas: HTMLCanvasElement) { + console.log('setOverlayCanvas ', canvas); + this.overlayCanvas = canvas; + this.init(); + } + + createMojangles() { + if (!this.canvas) throw new Error('Canvas must be set before initializing mojangles'); + this.lib = createLibmojangles({ canvas: this.canvas }); + } + + resize(w: number, h: number, dw: number, dh: number) { + this.size = { width: w, height: h, dprWidth: dw, dprHeight: dh }; + this._resize(); + } + + private _resize() { + this.lib?.resize(this.size.width, this.size.height); + tick().then(() => this.render()); + } + + async addResourcepack() { + if (!this.lib) throw new Error('Mojangles must be initialized before adding resourcepack'); + const zipData = await fetch('/vanilla-resourcepack.zip').then((r) => r.arrayBuffer()); + const pack = await ResourcePackZIP.fromZip(zipData, 'vanilla'); + this.lib.addResourcePack(pack); + await this.lib.loadFont({ namespace: 'minecraft', path: 'default' }); + this.fontLoaded = true; + this._resize(); + } + + render() { + if (this.isCanvasLoading) return; + if (!this.lib || !this.canvas || !this.overlayCanvas) + throw new Error('Mojangles and canvas must be initialized before rendering'); + this._render(this.lib); + console.log(this.drawResult); + this.overlayRender(this.overlayCanvas); + } + + private drawText(lib: Libmojangles) { + lib.renderer.beginFrame(); + const result = lib.drawText('Hudkit time!', 100, 100, { + scale: project.scale, + generatePicking: true, + cachePicking: true + }); + if (result) this.drawResult = result; + lib.renderer.endFrame(); + } + + private _render(lib: Libmojangles) { + this.drawText(lib); + } + + private overlayRender(canvas: HTMLCanvasElement) { + const context = canvas.getContext('2d'); + if (!context) throw new Error('No context for overlay canvas'); + context.reset(); + if (!this.drawResult) return; + const bbox = this.drawResult.components[0].bbox; + + const width = 2; + context.lineWidth = width; + context.strokeStyle = '#e78a53'; + context.strokeRect( + bbox.min[0] - width, + canvas.height - bbox.max[1] - width, + bbox.max[0] - bbox.min[0] + width, + bbox.max[1] - bbox.min[1] + width + ); + console.log('drew'); + } +} + +export const c = $state(new Canvas()); diff --git a/studio/ui/src/lib/components/canvas/libmojangles.svelte b/studio/ui/src/lib/components/canvas/libmojangles.svelte new file mode 100644 index 0000000..1008b52 --- /dev/null +++ b/studio/ui/src/lib/components/canvas/libmojangles.svelte @@ -0,0 +1,62 @@ + + +
+ +
+ +{#if error} +

{error}

+{/if} diff --git a/studio/ui/src/lib/components/libmojangles-canvas.svelte b/studio/ui/src/lib/components/libmojangles-canvas.svelte deleted file mode 100644 index d5df051..0000000 --- a/studio/ui/src/lib/components/libmojangles-canvas.svelte +++ /dev/null @@ -1,84 +0,0 @@ - - - - -{#if error} -

{error}

-{/if} diff --git a/studio/ui/src/routes/app/project/[slug]/+page.svelte b/studio/ui/src/routes/app/project/[slug]/+page.svelte index ecccc69..05e9493 100644 --- a/studio/ui/src/routes/app/project/[slug]/+page.svelte +++ b/studio/ui/src/routes/app/project/[slug]/+page.svelte @@ -11,8 +11,8 @@ import MalformedXmlDialog from '$lib/components/malformed-xml-dialog.svelte'; import { onMount } from 'svelte'; import { project } from '$lib/project.svelte'; - import LibmojanglesCanvas from '$lib/components/libmojangles-canvas.svelte'; import { bonkCompile, initBonkWasm } from '$lib/bonk-wasm'; + import Canvas from '$lib/components/canvas/canvas.svelte'; let fileTreePane: Resizable.ResizablePane; let inspectPane: Resizable.ResizablePane; @@ -76,7 +76,7 @@ - + diff --git a/studio/ui/src/routes/minimessage/+page.svelte b/studio/ui/src/routes/minimessage/+page.svelte deleted file mode 100644 index 0e4b165..0000000 --- a/studio/ui/src/routes/minimessage/+page.svelte +++ /dev/null @@ -1,361 +0,0 @@ - - - - MiniMessage Demo - Hudkit - - -
-
-

MiniMessage Demo

-

- Test the MiniMessage parser with support for colors, decorations, gradients, rainbow effects, - and more! -

-
- -
- -
-

Editor

- -
- - -
-

Live Preview

-
-
- {@html parseResult.renderedHtml} -
-
- - {#if parseResult.errors.length > 0} -
-

Parse Errors

-
- {#each parseResult.errors as error} -
- {error.severity} - {error.message} - @ {error.position} -
- {/each} -
-
- {/if} -
- - -
-

Examples

-
- - - - - - - - -
-
- - -
-

Supported Tags

-
-
-

Colors

- <red>, <blue>, <green> - <color:#RRGGBB> -
-
-

Decorations

- <bold>, <italic>, <underlined> - <strikethrough>, <obfuscated> -
-
-

Effects

- <gradient:color1:color2:...> - <rainbow>, <transition> -
-
-

Other

- <shadow:color:alpha> - <reset> -
-
-
-
-
- -