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>
145 lines
4.0 KiB
Cheetah
145 lines
4.0 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 extism-pdk.
|
|
|
|
use extism_pdk::*;
|
|
use serde::{Deserialize, Serialize};
|
|
{{- if .Service.HasByteFields}}{{template "base64_bytes_module" .}}{{- end}}
|
|
{{- /* Generate struct definitions */ -}}
|
|
{{- range .Service.Structs}}
|
|
{{if .Doc}}
|
|
{{rustDocComment .Doc}}
|
|
{{else}}
|
|
{{end}}#[derive(Debug, Clone, Serialize, Deserialize)]
|
|
#[serde(rename_all = "camelCase")]
|
|
pub struct {{.Name}} {
|
|
{{- range .Fields}}
|
|
{{- if .NeedsDefault}}
|
|
#[serde(default)]
|
|
{{- end}}
|
|
{{- if .IsByteSlice}}
|
|
#[serde(with = "base64_bytes")]
|
|
{{- end}}
|
|
pub {{.RustName}}: {{fieldRustType .}},
|
|
{{- end}}
|
|
}
|
|
{{- end}}
|
|
{{- /* Generate request/response types */ -}}
|
|
{{- range .Service.Methods}}
|
|
{{- if .HasParams}}
|
|
|
|
#[derive(Debug, Clone, Serialize)]
|
|
#[serde(rename_all = "camelCase")]
|
|
struct {{requestType .}} {
|
|
{{- range .Params}}
|
|
{{- if .IsByteSlice}}
|
|
#[serde(with = "base64_bytes")]
|
|
{{- end}}
|
|
{{.RustName}}: {{rustType .}},
|
|
{{- end}}
|
|
}
|
|
{{- end}}
|
|
|
|
#[derive(Debug, Clone, Deserialize)]
|
|
#[serde(rename_all = "camelCase")]
|
|
struct {{responseType .}} {
|
|
{{- range .Returns}}
|
|
#[serde(default)]
|
|
{{- if .IsByteSlice}}
|
|
#[serde(with = "base64_bytes")]
|
|
{{- end}}
|
|
{{.RustName}}: {{rustType .}},
|
|
{{- end}}
|
|
{{- if .HasError}}
|
|
#[serde(default)]
|
|
error: Option<String>,
|
|
{{- end}}
|
|
}
|
|
{{- end}}
|
|
|
|
#[host_fn]
|
|
extern "ExtismHost" {
|
|
{{- range .Service.Methods}}
|
|
fn {{exportName .}}(input: Json<{{if .HasParams}}{{requestType .}}{{else}}serde_json::Value{{end}}>) -> Json<{{responseType .}}>;
|
|
{{- end}}
|
|
}
|
|
|
|
{{- /* Generate wrapper functions */ -}}
|
|
{{range .Service.Methods}}
|
|
|
|
{{if .Doc}}{{rustDocComment .Doc}}{{else}}/// Calls the {{exportName .}} host function.{{end}}
|
|
{{- if .HasParams}}
|
|
///
|
|
/// # Arguments
|
|
{{- range .Params}}
|
|
/// * `{{.RustName}}` - {{rustType .}} parameter.
|
|
{{- end}}
|
|
{{- end}}
|
|
{{- if .HasReturns}}
|
|
///
|
|
/// # Returns
|
|
{{- if .IsOptionPattern}}
|
|
/// `Some({{(index .Returns 0).RustName}})` if found, `None` otherwise.
|
|
{{- else if eq (len .Returns) 1}}
|
|
/// The {{(index .Returns 0).RustName}} value.
|
|
{{- else}}
|
|
/// A tuple of ({{range $i, $r := .Returns}}{{if $i}}, {{end}}{{$r.RustName}}{{end}}).
|
|
{{- end}}
|
|
{{- end}}
|
|
///
|
|
/// # Errors
|
|
/// Returns an error if the host function call fails.
|
|
{{- if .IsOptionPattern}}
|
|
pub fn {{rustFunc .}}({{range $i, $p := .Params}}{{if $i}}, {{end}}{{$p.RustName}}: {{rustParamType $p}}{{end}}) -> Result<Option<{{rustType (index .Returns 0)}}>, Error> {
|
|
let response = unsafe {
|
|
{{- if .HasParams}}
|
|
{{exportName .}}(Json({{requestType .}} {
|
|
{{- range .Params}}
|
|
{{.RustName}}: {{.RustName}}{{if .NeedsToOwned}}.to_owned(){{end}},
|
|
{{- end}}
|
|
}))?
|
|
{{- else}}
|
|
{{exportName .}}(Json(serde_json::json!({})))?
|
|
{{- end}}
|
|
};
|
|
{{if .HasError}}
|
|
if let Some(err) = response.0.error {
|
|
return Err(Error::msg(err));
|
|
}
|
|
{{end}}
|
|
if response.0.{{(index .Returns 1).RustName}} {
|
|
Ok(Some(response.0.{{(index .Returns 0).RustName}}))
|
|
} else {
|
|
Ok(None)
|
|
}
|
|
}
|
|
{{- else}}
|
|
pub fn {{rustFunc .}}({{range $i, $p := .Params}}{{if $i}}, {{end}}{{$p.RustName}}: {{rustParamType $p}}{{end}}) -> Result<{{if eq (len .Returns) 0}}(){{else if eq (len .Returns) 1}}{{rustType (index .Returns 0)}}{{else}}({{range $i, $r := .Returns}}{{if $i}}, {{end}}{{rustType $r}}{{end}}){{end}}, Error> {
|
|
let response = unsafe {
|
|
{{- if .HasParams}}
|
|
{{exportName .}}(Json({{requestType .}} {
|
|
{{- range .Params}}
|
|
{{.RustName}}: {{.RustName}}{{if .NeedsToOwned}}.to_owned(){{end}},
|
|
{{- end}}
|
|
}))?
|
|
{{- else}}
|
|
{{exportName .}}(Json(serde_json::json!({})))?
|
|
{{- end}}
|
|
};
|
|
{{if .HasError}}
|
|
if let Some(err) = response.0.error {
|
|
return Err(Error::msg(err));
|
|
}
|
|
{{end}}
|
|
{{- if eq (len .Returns) 0}}
|
|
Ok(())
|
|
{{- else if eq (len .Returns) 1}}
|
|
Ok(response.0.{{(index .Returns 0).RustName}})
|
|
{{- else}}
|
|
Ok(({{range $i, $r := .Returns}}{{if $i}}, {{end}}response.0.{{$r.RustName}}{{end}}))
|
|
{{- end}}
|
|
}
|
|
{{- end}}
|
|
{{- end}}
|