mirror of
https://github.com/storytold/effectcraft.git
synced 2026-11-06 02:20:50 +00:00
* G8: plug-in library Community Plug-in Library for WebAssembly effect plug-ins (#376): one reviewed catalog (index.json), install / update / remove from Settings > Plug-in Library (also Effect > Plug-in Library...), library.* commands, start-up loading of installed packages with SHA-256 checks. Downloads go through the system curl (https, GitHub hosts), as trained models do. Preview before installing (library.preview): the release is downloaded, checked like an install, and rendered in the sandbox on a built-in sample frame at default settings (2 s at 12 fps) with a Before/After split, plus the effect's parameters, "Open on GitHub" and an optional author video link (catalog field preview.video). Authors need to do nothing for it. Hardening: a module that fails to load leaves the installed copy alone, Update All updates every package in one job, minApp also applies to an explicit version, curl ignores ~/.curlrc and URL globbing, unique temp files, percent-decoded file URLs. Plug-in effect slots grow from 64 to 256 with a clearer overflow error. Docs: plugins.md "Plug-in Library", publishing-plugins.md (author guide from zero to listed), gaps.md; examples/plugin-catalog is the starting content of the catalog repository (schema, validation workflow). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * contributors: credit iseemhlyfta * G8: plug-in library: doc comments on the library's functions Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * G8: plug-in catalog check: require one object with schema 1 and a packages array An empty file or several JSON values passed jq empty, and with SKIP_SCHEMA=1 nothing else checked the catalog's shape. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * G8: plug-in library: one preview texture set; catalog schema requires effects The preview kept a texture set per package version previewed (about 6 MB each) for the whole session; it now keeps one, replaced when another package is previewed. Releases in the catalog schema must list at least one effect id, as the author guide says. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * G8: plug-in catalog schema: effect ids follow the manifest's id rules Letters, digits, '.', '_' and '-', and not the reserved 'ec.' prefix, so library.missing can match them. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * G8: refuse Plug-in Library jobs while automation file access is confined Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * G8: split the Plug-in Library page into toolbar, card, links and actions Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * G8: show Plug-in Library toasts without a Roto job; cache preview frame checks Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * G8: log Plug-in Library packages that fail to load at start-up Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * G8: check an update before replacing a loaded package; Update All past failures - An update to a package that is already loaded is now compiled and its manifest checked (through the previewer, without registering it) before the new file is written and the old version's folder deleted. Before, a release with the right SHA-256 that didn't load replaced the working version and failed at the next start. - Package ids that differ only in case, or end in a dot, would share one folder on Windows and macOS: the catalog keeps the first of them, and ids can't end in a dot (schema too). - Update All: a package that can't be picked or installed no longer stops the others; the result names what was updated and what wasn't. - Downloads: at most 5 redirects, and one that ends off GitHub's hosts is refused, as the module docs say. - A job that panics no longer leaves the library busy; poisoned status locks are used, not dropped. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * G8: rustfmt the update test Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: FredApps <153173854+FredApps@users.noreply.github.com>
166 lines
8.2 KiB
Rust
166 lines
8.2 KiB
Rust
//! Effect plug-ins in a full session: a Rust plug-in registered through the trait and the
|
|
//! example WebAssembly plug-in (examples/plugins/posterize-bands) loaded with
|
|
//! `effect.plugins.load`, both applied by id like built-ins and rendered.
|
|
|
|
use std::sync::Arc;
|
|
|
|
use effectcraft_engine::Session;
|
|
use effectcraft_engine::effects::plugin::{EffectPlugin, PluginFrame, PluginManifest, PluginParam, PluginParamKind, PluginParams, register_plugin};
|
|
use effectcraft_engine::time::Tick;
|
|
use serde_json::json;
|
|
|
|
struct Swap {
|
|
m: PluginManifest,
|
|
}
|
|
|
|
impl EffectPlugin for Swap {
|
|
fn manifest(&self) -> &PluginManifest {
|
|
&self.m
|
|
}
|
|
fn render(&self, frame: &mut PluginFrame, params: &PluginParams, _time: f64) -> Result<(), String> {
|
|
if params.b("on") {
|
|
for p in frame.pixels.iter_mut() {
|
|
p.swap(0, 2);
|
|
}
|
|
}
|
|
Ok(())
|
|
}
|
|
}
|
|
|
|
fn setup() -> (Session, u64) {
|
|
let mut s = effectcraft_host::session();
|
|
s.execute("comp.new", json!({"name": "P", "width": 40, "height": 20, "duration": 1})).unwrap();
|
|
let l = s.execute("layer.newSolid", json!({"color": [1.0, 0.5, 0.0], "width": 40, "height": 20})).unwrap()["layer"].as_u64().unwrap();
|
|
(s, l)
|
|
}
|
|
|
|
fn px(s: &Session) -> [f32; 4] {
|
|
let cid = s.active_comp_id().unwrap();
|
|
s.render(cid, Tick::ZERO, Default::default()).get(20, 10)
|
|
}
|
|
|
|
#[test]
|
|
fn rust_plugins_apply_by_id() {
|
|
let m = PluginManifest {
|
|
api: 1,
|
|
id: "org.test.swap".into(),
|
|
name: "Swap Red Blue".into(),
|
|
category: "Channel".into(),
|
|
version: "1".into(),
|
|
author: String::new(),
|
|
description: String::new(),
|
|
params: vec![PluginParam { id: "on".into(), name: "On".into(), kind: PluginParamKind::Checkbox { default: true } }],
|
|
};
|
|
register_plugin(Arc::new(Swap { m })).unwrap();
|
|
let (mut s, l) = setup();
|
|
s.execute("effect.apply", json!({"layer": l, "effect": "org.test.swap"})).unwrap();
|
|
let p = px(&s);
|
|
assert!(p[0] < 0.01 && (p[1] - 0.5).abs() < 0.01 && p[2] > 0.99, "{p:?}");
|
|
// Its parameters are ordinary properties: set (and animate) them like any effect's.
|
|
s.execute("prop.set", json!({"layer": l, "path": "effects/#1/on", "value": false})).unwrap();
|
|
let p = px(&s);
|
|
assert!(p[0] > 0.99 && p[2] < 0.01, "{p:?}");
|
|
let list = s.execute("effect.plugins.list", json!({})).unwrap();
|
|
assert!(list["plugins"].as_array().unwrap().iter().any(|p| p["id"] == "org.test.swap" && p["category"] == "Channel"));
|
|
assert_eq!(list["api"], 1);
|
|
assert!(s.execute("effect.list", json!({"filter": "swap red"})).unwrap().as_array().unwrap().len() == 1);
|
|
}
|
|
|
|
/// Build the example plug-in (skipped when the wasm32 target isn't installed).
|
|
fn build_example() -> Option<std::path::PathBuf> {
|
|
let root = std::path::Path::new(env!("CARGO_MANIFEST_DIR")).join("../../examples/plugins/posterize-bands");
|
|
let workspace = std::path::Path::new(env!("CARGO_MANIFEST_DIR")).join("../..");
|
|
let assigned = std::env::var_os("CARGO_TARGET_DIR");
|
|
let target = assigned.as_ref().map(std::path::PathBuf::from).unwrap_or_else(|| workspace.join("target"));
|
|
let target = if target.is_absolute() { target } else { workspace.join(target) };
|
|
// The plug-in is part of this test's build. Inherit the assigned target and
|
|
// compiler guards rather than creating a second target at its root.
|
|
let mut command = std::process::Command::new(env!("CARGO"));
|
|
command.current_dir(&workspace).args(["build", "--release", "--target", "wasm32-unknown-unknown", "--manifest-path"]).arg(root.join("Cargo.toml"));
|
|
if assigned.is_none() {
|
|
command.env("CARGO_TARGET_DIR", &target);
|
|
}
|
|
let st = command.status().ok()?;
|
|
if !st.success() {
|
|
eprintln!("skipping: the example plug-in didn't build (rustup target add wasm32-unknown-unknown)");
|
|
return None;
|
|
}
|
|
Some(target.join("wasm32-unknown-unknown/release/posterize_bands.wasm"))
|
|
}
|
|
|
|
#[test]
|
|
fn example_wasm_plugin_loads_and_renders() {
|
|
let Some(wasm) = build_example() else { return };
|
|
let (mut s, l) = setup();
|
|
let r = s.execute("effect.plugins.load", json!({"path": wasm.to_string_lossy()})).unwrap();
|
|
assert_eq!(r["loaded"][0]["id"], "org.effectcraft.example.posterize-bands", "{r}");
|
|
s.execute("effect.apply", json!({"layer": l, "effect": "Posterize Bands"})).unwrap();
|
|
s.execute("prop.set", json!({"layer": l, "path": "effects/#1/mix", "value": 0})).unwrap();
|
|
s.execute("prop.set", json!({"layer": l, "path": "effects/#1/levels", "value": 2})).unwrap();
|
|
// Luminance of (1, .5, 0) is ~0.57: with 2 levels it bands to 1, scaling the colour by 1/y
|
|
// (8 bpc: red clips at 1).
|
|
let p = px(&s);
|
|
let y = 0.2126 + 0.7152 * 0.5;
|
|
assert!((p[1] - 0.5 / y as f32).abs() < 0.01 && p[0] > 0.99 && p[2] < 0.01, "{p:?}");
|
|
// Invert: band 0.
|
|
s.execute("prop.set", json!({"layer": l, "path": "effects/#1/invert", "value": true})).unwrap();
|
|
assert_eq!(px(&s)[..3], [0.0, 0.0, 0.0]);
|
|
let list = s.execute("effect.plugins.list", json!({})).unwrap();
|
|
assert!(list["plugins"].as_array().unwrap().iter().any(|p| p["source"].as_str().unwrap_or("").ends_with(".wasm")));
|
|
}
|
|
|
|
/// A parameterless plug-in module (WebAssembly text): `render` is `ec_render`'s body.
|
|
pub(super) fn wat_plugin(id: &str, api: i32, render: &str) -> String {
|
|
let manifest = format!(r#"{{"api":1,"id":"{id}","name":"Host {id}","category":"Test Plug-ins","version":"1","params":[]}}"#);
|
|
let len = manifest.len();
|
|
let escaped = manifest.replace('"', "\\\"");
|
|
format!(
|
|
r#"(module
|
|
(memory (export "memory") 2)
|
|
(data (i32.const 16) "{escaped}")
|
|
(func (export "ec_api_version") (result i32) i32.const {api})
|
|
(func (export "ec_manifest_ptr") (result i32) i32.const 16)
|
|
(func (export "ec_manifest_len") (result i32) i32.const {len})
|
|
(func (export "ec_alloc") (param i32) (result i32) i32.const 1024)
|
|
(func (export "ec_render") (param i32 i32 i32 i32 i32 f64 f64) (result i32) {render}))"#
|
|
)
|
|
}
|
|
|
|
#[test]
|
|
fn plugin_loading_reports_bad_modules_and_survives_failing_renders() {
|
|
let dir = std::env::temp_dir().join(format!("effectcraft-host-plugins-{}", std::process::id()));
|
|
std::fs::create_dir_all(&dir).unwrap();
|
|
let files = [
|
|
("a-good.wasm", wat_plugin("org.test.host.good", 1, "i32.const 0").into_bytes()),
|
|
("b-garbage.wasm", b"\0asm\x01\0\0\0garbage".to_vec()),
|
|
("c-v2.wasm", wat_plugin("org.test.host.v2", 2, "i32.const 0").into_bytes()),
|
|
("d-empty.wasm", vec![]),
|
|
("e-trap.wasm", wat_plugin("org.test.host.trap", 1, "unreachable").into_bytes()),
|
|
("notes.txt", b"not a plug-in".to_vec()),
|
|
];
|
|
for (name, bytes) in &files {
|
|
std::fs::write(dir.join(name), bytes).unwrap();
|
|
}
|
|
let (mut s, l) = setup();
|
|
let r = s.execute("effect.plugins.load", json!({"folder": dir.to_string_lossy()})).unwrap();
|
|
let ids: Vec<&str> = r["loaded"].as_array().unwrap().iter().filter_map(|v| v["id"].as_str()).collect();
|
|
assert_eq!(ids, ["org.test.host.good", "org.test.host.trap"], "{r}");
|
|
let errs: Vec<String> = r["errors"].as_array().unwrap().iter().map(|e| e["path"].as_str().unwrap().to_string()).collect();
|
|
assert_eq!(errs.len(), 3, "{r}");
|
|
assert!(errs.iter().all(|p| !p.ends_with(".txt")));
|
|
assert!(r["errors"].to_string().contains("API 2"), "{r}");
|
|
// A single file: errors come back as command errors; loading twice is refused.
|
|
let good = dir.join("a-good.wasm").to_string_lossy().to_string();
|
|
assert!(s.execute("effect.plugins.load", json!({"path": good})).unwrap_err().to_string().contains("already registered"));
|
|
assert!(s.execute("effect.plugins.load", json!({"path": dir.join("missing.wasm").to_string_lossy()})).is_err());
|
|
assert!(s.execute("effect.plugins.load", json!({"folder": dir.join("missing").to_string_lossy()})).is_err());
|
|
assert!(s.execute("effect.plugins.load", json!({})).is_err());
|
|
// A plug-in that traps on every frame leaves the layer as it was.
|
|
let before = px(&s);
|
|
s.execute("effect.apply", json!({"layer": l, "effect": "org.test.host.trap"})).unwrap();
|
|
assert_eq!(px(&s), before);
|
|
s.execute("effect.apply", json!({"layer": l, "effect": "org.test.host.good"})).unwrap();
|
|
assert_eq!(px(&s), before);
|
|
let _ = std::fs::remove_dir_all(&dir);
|
|
}
|