From 556eb2cb8ebf03fcd64fb0c25ba0915d62f1ee11 Mon Sep 17 00:00:00 2001 From: Ari Sulistiono Date: Wed, 11 Nov 2026 10:35:24 +0700 Subject: [PATCH] M4: centralize built-in FX host identity and mailbox sequence validation --- src/Main.cpp | 129 +++++++------------- src/NativeFxControlRequest.h | 54 ++++++++ tests/native_fx_registry_extension_test.cpp | 50 ++++++++ 3 files changed, 149 insertions(+), 84 deletions(-) create mode 100644 src/NativeFxControlRequest.h diff --git a/src/Main.cpp b/src/Main.cpp index 7c086f64e..c0c69ca55 100644 --- a/src/Main.cpp +++ b/src/Main.cpp @@ -41,6 +41,7 @@ #include "NativeLogicalMixerControl.h" #include "NativeHotkeyRegistry.h" #include "NativeFxParameterHotkey.h" +#include "NativeFxControlRequest.h" #include "NativeDeviceApplyCoordinator.h" #include #include @@ -3889,20 +3890,16 @@ class ConsoleWindow final : public juce::DocumentWindow, private juce::Timer, pr // Exact native instance lease; queued != audio-applied. if(action=="nativeHarmonySnapshot"||action=="nativeHarmonySetSettings") { - const auto rawChannel=args.getProperty("channelId",{}); - const auto rawEpoch=args.getProperty("deviceEpoch",{}); - const auto rawRevision=args.getProperty("graphRevision",{}); - const auto rawInstance=args.getProperty("instanceId",{}); - const auto request=args.getProperty("requestId",{}).toString(); - const int slot=static_cast(args.getProperty("slot",-1)); - std::uint64_t ch=0,ep=0,rev=0; - const bool valid=armix::console::approvedNativeId(rawChannel,ch)&& - armix::console::approvedNativeId(rawEpoch,ep)&& - armix::console::approvedNativeId(rawRevision,rev)&& - rawInstance.isString()&&rawInstance.toString().isNotEmpty()&& - slot>=0&&slot0&&processor->queueAccepted(settings,numeric); if(queued && !unbound) { pendingNativeHarmony_.owner=owner; @@ -4006,20 +3998,16 @@ class ConsoleWindow final : public juce::DocumentWindow, private juce::Timer, pr // Real built-in rack node, not a GUI-only pre-VST channel EQ. // All identity fields are validated by the accepted native lease. if(action=="nativeEqSnapshot"||action=="nativeEqSetBand") { - const auto rawChannel=args.getProperty("channelId",{}); - const auto rawEpoch=args.getProperty("deviceEpoch",{}); - const auto rawRevision=args.getProperty("graphRevision",{}); - const auto rawInstance=args.getProperty("instanceId",{}); - const auto request=args.getProperty("requestId",{}).toString(); - const int eqSlot=static_cast(args.getProperty("slot",-1)); - std::uint64_t ch=0,ep=0,rev=0; - const bool valid=armix::console::approvedNativeId(rawChannel,ch)&& - armix::console::approvedNativeId(rawEpoch,ep)&& - armix::console::approvedNativeId(rawRevision,rev)&& - rawInstance.isString()&&rawInstance.toString().isNotEmpty()&& - eqSlot>=0&&eqSlot(quality); b.slope=static_cast(slope)==24? armix::builtin_fx::Slope::db24:armix::builtin_fx::Slope::db12; - // Id strings are decimal after "eq-", unlike canonical - // ChannelIds; never convert 64-bit ChannelId to JS Number. - const auto wire=request.substring(3).toStdString(); - std::uint64_t numeric=0; - if(!wire.empty()&&wire.size()<=19&& - wire.find_first_not_of("0123456789")==std::string::npos) { - try{numeric=std::stoull(wire);}catch(...){numeric=0;} - } + const auto numeric=fxRequest.sequence("eq-"); queued=numeric>0&&processor->queueBand( static_cast(index),b,numeric); if(queued && !unbound) { @@ -4101,20 +4082,16 @@ class ConsoleWindow final : public juce::DocumentWindow, private juce::Timer, pr // Each accepted compressor edit stays on this ChannelId's ordered // native insert. No GUI mutation until callback ACK + graph readback. if(action=="nativeCompSnapshot"||action=="nativeCompSet") { - const auto rawChannel=args.getProperty("channelId",{}); - const auto rawEpoch=args.getProperty("deviceEpoch",{}); - const auto rawRevision=args.getProperty("graphRevision",{}); - const auto rawInstance=args.getProperty("instanceId",{}); - const auto request=args.getProperty("requestId",{}).toString(); - const int compSlot=static_cast(args.getProperty("slot",-1)); - std::uint64_t ch=0,ep=0,rev=0; - const bool valid=armix::console::approvedNativeId(rawChannel,ch)&& - armix::console::approvedNativeId(rawEpoch,ep)&& - armix::console::approvedNativeId(rawRevision,rev)&& - rawInstance.isString()&&rawInstance.toString().isNotEmpty()&& - compSlot>=0&&compSlot(n); return std::isfinite(out); }; - const auto wire=request.startsWith("comp-")? - request.substring(5).toStdString():std::string(); - std::uint64_t numeric=0; - if(!wire.empty()&&wire.size()<=19&& - wire.find_first_not_of("0123456789")==std::string::npos) { - try{numeric=std::stoull(wire);}catch(...){numeric=0;} - } + const auto numeric=fxRequest.sequence("comp-"); const bool parameters=values.isObject()&& number("thresholdDb",settings.thresholdDb)&& number("ratio",settings.ratio)&& @@ -4187,20 +4158,16 @@ class ConsoleWindow final : public juce::DocumentWindow, private juce::Timer, pr // ChannelId + device epoch + graph revision + insert instance. if(action=="nativeThrowSnapshot"||action=="nativeThrowSet"|| action=="nativeThrowTrigger"||action=="nativeThrowTempoSource") { - const auto rawChannel=args.getProperty("channelId",{}); - const auto rawEpoch=args.getProperty("deviceEpoch",{}); - const auto rawRevision=args.getProperty("graphRevision",{}); - const auto rawInstance=args.getProperty("instanceId",{}); - const auto request=args.getProperty("requestId",{}).toString(); - const int throwSlot=static_cast(args.getProperty("slot",-1)); - std::uint64_t ch=0,ep=0,rev=0; - const bool valid=armix::console::approvedNativeId(rawChannel,ch)&& - armix::console::approvedNativeId(rawEpoch,ep)&& - armix::console::approvedNativeId(rawRevision,rev)&& - rawInstance.isString()&&rawInstance.toString().isNotEmpty()&& - throwSlot>=0&&throwSlot + +// Message/CONTROL-thread-only identity policy for built-in FX commands. +// EQ, Compressor, Harmonice and Vocal Throw must all validate the SAME exact +// ChannelId, device epoch, graph revision, insert lease and request envelope. +// No plugin construction, editor, callback, graph or PCM authority lives here. +namespace armix::builtin_fx { +struct NativeFxControlRequest final { + juce::var rawChannel,rawEpoch,rawRevision,rawInstance; + juce::String request; + int slot=-1; + std::uint64_t channel=0,epoch=0,revision=0; + bool valid=false,unbound=false; + + static NativeFxControlRequest parse(const juce::var& args,int maximumSlots) { + NativeFxControlRequest result; + result.rawChannel=args.getProperty("channelId",{}); + result.rawEpoch=args.getProperty("deviceEpoch",{}); + result.rawRevision=args.getProperty("graphRevision",{}); + result.rawInstance=args.getProperty("instanceId",{}); + result.request=args.getProperty("requestId",{}).toString(); + result.slot=static_cast(args.getProperty("slot",-1)); + result.unbound=args.getProperty("workspaceToken","").toString().isNotEmpty(); + result.valid=armix::console::approvedNativeId(result.rawChannel,result.channel) && + armix::console::approvedNativeId(result.rawEpoch,result.epoch) && + armix::console::approvedNativeId(result.rawRevision,result.revision) && + result.rawInstance.isString() && + result.rawInstance.toString().isNotEmpty() && + result.slot>=0 && result.slot19)return 0; + std::uint64_t value=0; + for(auto c:digits) { + if(c<'0'||c>'9')return 0; + value=value*10u+static_cast(c-'0'); + } + return value; + } +}; +} // namespace armix::builtin_fx diff --git a/tests/native_fx_registry_extension_test.cpp b/tests/native_fx_registry_extension_test.cpp index 30e099d1e..144e58057 100644 --- a/tests/native_fx_registry_extension_test.cpp +++ b/tests/native_fx_registry_extension_test.cpp @@ -3,6 +3,7 @@ #undef NDEBUG #endif #include "../src/NativeBuiltInFx.h" +#include "../src/NativeFxControlRequest.h" #include #include #include @@ -74,7 +75,56 @@ static_assert(!validNativeBuiltInFxCatalog(duplicate)); static_assert(validNativeBuiltInFxCatalog(armix::builtin_fx::nativeBuiltInFx)); static_assert(std::is_same_v>); +static void verifySharedNativeFxControlRequest() { + // Same lease/epoch/revision envelope across all four built-in FX editors. + auto request=std::make_unique(); + request->setProperty("channelId","9007199254740993"); // exact >JS-safe uint64 + request->setProperty("deviceEpoch","12"); + request->setProperty("graphRevision","19"); + request->setProperty("instanceId","g5c-707"); + request->setProperty("slot",3); + request->setProperty("requestId","comp-1844674407370955161"); + juce::var source(request.release()); + using Target=armix::builtin_fx::NativeFxControlRequest; + const auto good=Target::parse(source,8); + assert(good.valid && !good.unbound && good.channel==9007199254740993ULL); + assert(good.epoch==12 && good.revision==19 && good.slot==3); + assert(good.sequence("comp-")==1844674407370955161ULL); + assert(good.sequence("harm-")==0 && good.sequence("throw-")==0); + auto alter=[](const juce::var& before,const char* name,juce::var value) { + auto copy=juce::JSON::parse(juce::JSON::toString(before)); + copy.getDynamicObject()->setProperty(name,value); + return copy; + }; + assert(!Target::parse(alter(source,"channelId",juce::var(9007199254740993.0)),8).valid); + assert(!Target::parse(alter(source,"channelId",juce::var("00")),8).valid); + assert(!Target::parse(alter(source,"deviceEpoch",juce::var("0")),8).valid); + assert(!Target::parse(alter(source,"graphRevision",juce::var("18446744073709551616")),8).valid); + assert(!Target::parse(alter(source,"instanceId",juce::var("")),8).valid); + assert(!Target::parse(alter(source,"instanceId",juce::var(1)),8).valid); + assert(!Target::parse(alter(source,"slot",juce::var(8)),8).valid); + assert(!Target::parse(alter(source,"slot",juce::var(-1)),8).valid); + assert(!Target::parse(alter(source,"requestId",juce::var("")),8).valid); + assert(!Target::parse(alter(source,"requestId",juce::var(juce::String::repeatedString("a",73))),8).valid); + const auto logical=Target::parse(alter(source,"workspaceToken",juce::var("persisted-mixer")),8); + assert(logical.valid && logical.unbound && logical.sequence("comp-")==good.sequence("comp-")); + for(const auto& id:{"eq-1","harm-17","throw-99","comp-0008"}) { + const auto candidate=Target::parse(alter(source,"requestId",juce::var(id)),8); + assert(candidate.valid); + assert(candidate.sequence(juce::String(id).upToFirstOccurrenceOf("-",true,false).toRawUTF8())>0); + } + for(const auto& id:{"comp-","comp--1","comp-1x","comp-1.0", + "comp-12345678901234567890","comp-0000000000000000000"}) { + const auto candidate=Target::parse(alter(source,"requestId",juce::var(id)),8); + assert(candidate.sequence("comp-")==0); + } + const auto max19=Target::parse(alter(source,"requestId", + juce::var("comp-9999999999999999999")),8); + assert(max19.valid && max19.sequence("comp-")==9999999999999999999ULL); +} + int main() { + verifySharedNativeFxControlRequest(); const auto* found=findNativeBuiltInFxIn(injected,"armix.test.fixture-gain.v1"); assert(found==&injected[0]); assert(!findNativeBuiltInFxIn(injected,""));