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>
229 lines
6.7 KiB
Rust
229 lines
6.7 KiB
Rust
// Code generated by ndpgen. DO NOT EDIT.
|
|
//
|
|
// This file contains client wrappers for the WebSocket host service.
|
|
// It is intended for use in Navidrome plugins built with extism-pdk.
|
|
|
|
use extism_pdk::*;
|
|
use serde::{Deserialize, Serialize};
|
|
use base64::Engine as _;
|
|
use base64::engine::general_purpose::STANDARD as BASE64;
|
|
|
|
mod base64_bytes {
|
|
use serde::{self, Deserialize, Deserializer, Serializer};
|
|
use base64::Engine as _;
|
|
use base64::engine::general_purpose::STANDARD as BASE64;
|
|
|
|
pub fn serialize<S>(bytes: &Vec<u8>, serializer: S) -> Result<S::Ok, S::Error>
|
|
where
|
|
S: Serializer,
|
|
{
|
|
serializer.serialize_str(&BASE64.encode(bytes))
|
|
}
|
|
|
|
pub fn deserialize<'de, D>(deserializer: D) -> Result<Vec<u8>, D::Error>
|
|
where
|
|
D: Deserializer<'de>,
|
|
{
|
|
let s = String::deserialize(deserializer)?;
|
|
BASE64.decode(&s).map_err(serde::de::Error::custom)
|
|
}
|
|
}
|
|
|
|
#[derive(Debug, Clone, Serialize)]
|
|
#[serde(rename_all = "camelCase")]
|
|
struct WebSocketConnectRequest {
|
|
url: String,
|
|
headers: std::collections::HashMap<String, String>,
|
|
connection_id: String,
|
|
}
|
|
|
|
#[derive(Debug, Clone, Deserialize)]
|
|
#[serde(rename_all = "camelCase")]
|
|
struct WebSocketConnectResponse {
|
|
#[serde(default)]
|
|
new_connection_id: String,
|
|
#[serde(default)]
|
|
error: Option<String>,
|
|
}
|
|
|
|
#[derive(Debug, Clone, Serialize)]
|
|
#[serde(rename_all = "camelCase")]
|
|
struct WebSocketSendTextRequest {
|
|
connection_id: String,
|
|
message: String,
|
|
}
|
|
|
|
#[derive(Debug, Clone, Deserialize)]
|
|
#[serde(rename_all = "camelCase")]
|
|
struct WebSocketSendTextResponse {
|
|
#[serde(default)]
|
|
error: Option<String>,
|
|
}
|
|
|
|
#[derive(Debug, Clone, Serialize)]
|
|
#[serde(rename_all = "camelCase")]
|
|
struct WebSocketSendBinaryRequest {
|
|
connection_id: String,
|
|
#[serde(with = "base64_bytes")]
|
|
data: Vec<u8>,
|
|
}
|
|
|
|
#[derive(Debug, Clone, Deserialize)]
|
|
#[serde(rename_all = "camelCase")]
|
|
struct WebSocketSendBinaryResponse {
|
|
#[serde(default)]
|
|
error: Option<String>,
|
|
}
|
|
|
|
#[derive(Debug, Clone, Serialize)]
|
|
#[serde(rename_all = "camelCase")]
|
|
struct WebSocketCloseConnectionRequest {
|
|
connection_id: String,
|
|
code: i32,
|
|
reason: String,
|
|
}
|
|
|
|
#[derive(Debug, Clone, Deserialize)]
|
|
#[serde(rename_all = "camelCase")]
|
|
struct WebSocketCloseConnectionResponse {
|
|
#[serde(default)]
|
|
error: Option<String>,
|
|
}
|
|
|
|
#[host_fn]
|
|
extern "ExtismHost" {
|
|
fn websocket_connect(input: Json<WebSocketConnectRequest>) -> Json<WebSocketConnectResponse>;
|
|
fn websocket_sendtext(input: Json<WebSocketSendTextRequest>) -> Json<WebSocketSendTextResponse>;
|
|
fn websocket_sendbinary(input: Json<WebSocketSendBinaryRequest>) -> Json<WebSocketSendBinaryResponse>;
|
|
fn websocket_closeconnection(input: Json<WebSocketCloseConnectionRequest>) -> Json<WebSocketCloseConnectionResponse>;
|
|
}
|
|
|
|
/// Connect establishes a WebSocket connection to the specified URL.
|
|
///
|
|
/// Plugins that use this function must also implement the WebSocketCallback capability
|
|
/// to receive incoming messages and connection events.
|
|
///
|
|
/// Parameters:
|
|
/// - url: The WebSocket URL to connect to (ws:// or wss://)
|
|
/// - headers: Optional HTTP headers to include in the handshake request
|
|
/// - connectionID: Optional unique identifier for the connection. If empty, one will be generated
|
|
///
|
|
/// Returns the connection ID that can be used to send messages or close the connection,
|
|
/// or an error if the connection fails.
|
|
///
|
|
/// # Arguments
|
|
/// * `url` - String parameter.
|
|
/// * `headers` - std::collections::HashMap<String, String> parameter.
|
|
/// * `connection_id` - String parameter.
|
|
///
|
|
/// # Returns
|
|
/// The new_connection_id value.
|
|
///
|
|
/// # Errors
|
|
/// Returns an error if the host function call fails.
|
|
pub fn connect(url: &str, headers: std::collections::HashMap<String, String>, connection_id: &str) -> Result<String, Error> {
|
|
let response = unsafe {
|
|
websocket_connect(Json(WebSocketConnectRequest {
|
|
url: url.to_owned(),
|
|
headers: headers,
|
|
connection_id: connection_id.to_owned(),
|
|
}))?
|
|
};
|
|
|
|
if let Some(err) = response.0.error {
|
|
return Err(Error::msg(err));
|
|
}
|
|
|
|
Ok(response.0.new_connection_id)
|
|
}
|
|
|
|
/// SendText sends a text message over an established WebSocket connection.
|
|
///
|
|
/// Parameters:
|
|
/// - connectionID: The connection identifier returned by Connect
|
|
/// - message: The text message to send
|
|
///
|
|
/// Returns an error if the connection is not found or if sending fails.
|
|
///
|
|
/// # Arguments
|
|
/// * `connection_id` - String parameter.
|
|
/// * `message` - String parameter.
|
|
///
|
|
/// # Errors
|
|
/// Returns an error if the host function call fails.
|
|
pub fn send_text(connection_id: &str, message: &str) -> Result<(), Error> {
|
|
let response = unsafe {
|
|
websocket_sendtext(Json(WebSocketSendTextRequest {
|
|
connection_id: connection_id.to_owned(),
|
|
message: message.to_owned(),
|
|
}))?
|
|
};
|
|
|
|
if let Some(err) = response.0.error {
|
|
return Err(Error::msg(err));
|
|
}
|
|
|
|
Ok(())
|
|
}
|
|
|
|
/// SendBinary sends binary data over an established WebSocket connection.
|
|
///
|
|
/// Parameters:
|
|
/// - connectionID: The connection identifier returned by Connect
|
|
/// - data: The binary data to send
|
|
///
|
|
/// Returns an error if the connection is not found or if sending fails.
|
|
///
|
|
/// # Arguments
|
|
/// * `connection_id` - String parameter.
|
|
/// * `data` - Vec<u8> parameter.
|
|
///
|
|
/// # Errors
|
|
/// Returns an error if the host function call fails.
|
|
pub fn send_binary(connection_id: &str, data: Vec<u8>) -> Result<(), Error> {
|
|
let response = unsafe {
|
|
websocket_sendbinary(Json(WebSocketSendBinaryRequest {
|
|
connection_id: connection_id.to_owned(),
|
|
data: data,
|
|
}))?
|
|
};
|
|
|
|
if let Some(err) = response.0.error {
|
|
return Err(Error::msg(err));
|
|
}
|
|
|
|
Ok(())
|
|
}
|
|
|
|
/// CloseConnection gracefully closes a WebSocket connection.
|
|
///
|
|
/// Parameters:
|
|
/// - connectionID: The connection identifier returned by Connect
|
|
/// - code: WebSocket close status code (e.g., 1000 for normal closure)
|
|
/// - reason: Optional human-readable reason for closing
|
|
///
|
|
/// Returns an error if the connection is not found or if closing fails.
|
|
///
|
|
/// # Arguments
|
|
/// * `connection_id` - String parameter.
|
|
/// * `code` - i32 parameter.
|
|
/// * `reason` - String parameter.
|
|
///
|
|
/// # Errors
|
|
/// Returns an error if the host function call fails.
|
|
pub fn close_connection(connection_id: &str, code: i32, reason: &str) -> Result<(), Error> {
|
|
let response = unsafe {
|
|
websocket_closeconnection(Json(WebSocketCloseConnectionRequest {
|
|
connection_id: connection_id.to_owned(),
|
|
code: code,
|
|
reason: reason.to_owned(),
|
|
}))?
|
|
};
|
|
|
|
if let Some(err) = response.0.error {
|
|
return Err(Error::msg(err));
|
|
}
|
|
|
|
Ok(())
|
|
}
|