bd8032b327
* fix(plugins): add base64 handling for []byte and remove raw=true Go's json.Marshal automatically base64-encodes []byte fields, but Rust's serde_json serializes Vec<u8> as a JSON array and Python's json.dumps raises TypeError on bytes. This fixes both directions of plugin communication by adding proper base64 encoding/decoding in generated client code. For Rust templates (client and capability): adds a base64_bytes serde helper module with #[serde(with = "base64_bytes")] on all Vec<u8> fields, and adds base64 as a dependency. For Python templates: wraps bytes params with base64.b64encode() and responses with base64.b64decode(). Also removes the raw=true binary framing protocol from all templates, the parser, and the Method type. The raw mechanism added complexity that is no longer needed once []byte works properly over JSON. * fix(plugins): update production code and tests for base64 migration Remove raw=true annotation from SubsonicAPI.CallRaw, delete all raw test fixtures, remove raw-related test cases from parser, generator, and integration tests, and add new test cases validating base64 handling for Rust and Python templates. * fix(plugins): update golden files and regenerate production code Update golden test fixtures for codec and comprehensive services to include base64 handling for []byte fields. Regenerate all production PDK code (Go, Rust, Python) and host wrappers to use standard JSON with base64-encoded byte fields instead of binary framing protocol. * refactor: remove base64 helper duplication from rust template Signed-off-by: Deluan <deluan@navidrome.org> * fix(plugins): add base64 dependency to capabilities' Cargo.toml Signed-off-by: Deluan <deluan@navidrome.org> --------- Signed-off-by: Deluan <deluan@navidrome.org>
130 lines
3.2 KiB
Cheetah
130 lines
3.2 KiB
Cheetah
// Code generated by ndpgen. DO NOT EDIT.
|
|
//
|
|
// This file contains client wrappers for the {{.Service.Name}} host service.
|
|
// It is intended for use in Navidrome plugins built with TinyGo.
|
|
//
|
|
//go:build wasip1
|
|
|
|
package {{.Package}}
|
|
|
|
import (
|
|
"encoding/json"
|
|
{{- if .Service.HasErrors}}
|
|
"errors"
|
|
{{- end}}
|
|
|
|
"github.com/navidrome/navidrome/plugins/pdk/go/pdk"
|
|
)
|
|
|
|
{{- /* Generate struct definitions */ -}}
|
|
{{- range .Service.Structs}}
|
|
|
|
// {{.Name}} represents the {{.Name}} data structure.
|
|
{{- if .Doc}}
|
|
{{formatDoc .Doc}}
|
|
{{- end}}
|
|
type {{.Name}} struct {
|
|
{{- range .Fields}}
|
|
{{.Name}} {{.Type}} `json:"{{.JSONTag}}"`
|
|
{{- end}}
|
|
}
|
|
{{- end}}
|
|
|
|
{{- /* Generate wasmimport declarations for each method */ -}}
|
|
{{range .Service.Methods}}
|
|
|
|
// {{exportName .}} is the host function provided by Navidrome.
|
|
//
|
|
//go:wasmimport extism:host/user {{exportName .}}
|
|
func {{exportName .}}(uint64) uint64
|
|
{{- end}}
|
|
|
|
{{- /* Generate request/response types for all methods (private) */ -}}
|
|
{{range .Service.Methods}}
|
|
{{- if .HasParams}}
|
|
|
|
type {{requestType .}} struct {
|
|
{{- range .Params}}
|
|
{{title .Name}} {{.Type}} `json:"{{.JSONName}}"`
|
|
{{- end}}
|
|
}
|
|
{{- end}}
|
|
{{- if not .IsErrorOnly}}
|
|
|
|
type {{responseType .}} struct {
|
|
{{- range .Returns}}
|
|
{{title .Name}} {{.Type}} `json:"{{.JSONName}},omitempty"`
|
|
{{- end}}
|
|
{{- if .HasError}}
|
|
Error string `json:"error,omitempty"`
|
|
{{- end}}
|
|
}
|
|
{{- end}}
|
|
{{- end}}
|
|
|
|
{{- /* Generate wrapper functions */ -}}
|
|
{{range .Service.Methods}}
|
|
|
|
// {{$.Service.Name}}{{.Name}} calls the {{exportName .}} host function.
|
|
{{- if .Doc}}
|
|
{{formatDoc .Doc}}
|
|
{{- end}}
|
|
func {{$.Service.Name}}{{.Name}}({{range $i, $p := .Params}}{{if $i}}, {{end}}{{$p.Name}} {{$p.Type}}{{end}}) {{.ReturnSignature}} {
|
|
{{- if .HasParams}}
|
|
// Marshal request to JSON
|
|
req := {{requestType .}}{
|
|
{{- range .Params}}
|
|
{{title .Name}}: {{.Name}},
|
|
{{- end}}
|
|
}
|
|
reqBytes, err := json.Marshal(req)
|
|
if err != nil {
|
|
return {{if .HasReturns}}{{.ZeroValues}}{{end}}{{if and .HasReturns .HasError}}, {{end}}{{if .HasError}}err{{end}}
|
|
}
|
|
reqMem := pdk.AllocateBytes(reqBytes)
|
|
defer reqMem.Free()
|
|
{{- else}}
|
|
// No parameters - allocate empty JSON object
|
|
reqMem := pdk.AllocateBytes([]byte("{}"))
|
|
defer reqMem.Free()
|
|
{{- end}}
|
|
|
|
// Call the host function
|
|
responsePtr := {{exportName .}}(reqMem.Offset())
|
|
|
|
// Read the response from memory
|
|
responseMem := pdk.FindMemory(responsePtr)
|
|
responseBytes := responseMem.ReadBytes()
|
|
{{- if .IsErrorOnly}}
|
|
|
|
// Parse error-only response
|
|
var response struct {
|
|
Error string `json:"error,omitempty"`
|
|
}
|
|
if err := json.Unmarshal(responseBytes, &response); err != nil {
|
|
return err
|
|
}
|
|
if response.Error != "" {
|
|
return errors.New(response.Error)
|
|
}
|
|
return nil
|
|
{{- else}}
|
|
|
|
// Parse the response
|
|
var response {{responseType .}}
|
|
if err := json.Unmarshal(responseBytes, &response); err != nil {
|
|
return {{if .HasReturns}}{{.ZeroValues}}{{end}}{{if and .HasReturns .HasError}}, {{end}}{{if .HasError}}err{{end}}
|
|
}
|
|
{{- if .HasError}}
|
|
|
|
// Convert Error field to Go error
|
|
if response.Error != "" {
|
|
return {{if .HasReturns}}{{.ZeroValues}}, {{end}}errors.New(response.Error)
|
|
}
|
|
{{- end}}
|
|
|
|
return {{range $i, $r := .Returns}}{{if $i}}, {{end}}response.{{title $r.Name}}{{end}}{{if and .HasReturns .HasError}}, {{end}}{{if .HasError}}nil{{end}}
|
|
{{- end}}
|
|
}
|
|
{{- end}}
|