fix: add plugin context

Author: qubka

CMakeLists.txt

@@ -52,14 +52,12 @@ set(GOLM_PCH_FILE "src/pch.hpp")
 add_library(${PROJECT_NAME} SHARED ${GOLM_SOURCES})
 target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include)
 
-set(GOLM_LINK_LIBRARIES plugify::plugify plugify::plugify-assembly plugify::plugify-jit asmjit::asmjit  cpptrace::cpptrace)
+set(GOLM_LINK_LIBRARIES plugify::plugify plugify::plugify-assembly plugify::plugify-jit asmjit::asmjit cpptrace::cpptrace)
 
 if(NOT COMPILER_SUPPORTS_FORMAT)
     set(GOLM_LINK_LIBRARIES ${GOLM_LINK_LIBRARIES} fmt::fmt-header-only)
 endif()
 
-target_include_directories(${PROJECT_NAME} PRIVATE ${dyncall_SOURCE_DIR})
-
 target_link_libraries(${PROJECT_NAME} PRIVATE ${GOLM_LINK_LIBRARIES})
 target_precompile_headers(${PROJECT_NAME} PRIVATE ${GOLM_PCH_FILE})
 

src/module.cpp

@@ -86,7 +86,7 @@ LoadResult GoLanguageModule::OnPluginLoad(PluginHandle plugin) {
 	assemblyPath /= std::format("{}" GOLM_LIBRARY_SUFFIX, plugin.GetDescriptor().GetEntryPoint());
 
 	auto assembly = std::make_unique<Assembly>(assemblyPath, LoadFlag::Lazy | LoadFlag::Nodelete | LoadFlag::PinInMemory);
-	if (!assembly) {
+	if (!assembly->IsValid()) {
 		return ErrorData{ std::format("Failed to load assembly: {}", assembly->GetError()) };
 	}
 
@@ -103,6 +103,7 @@ LoadResult GoLanguageModule::OnPluginLoad(PluginHandle plugin) {
 	auto* const startFunc = assembly->GetFunctionByName("Plugify_PluginStart").RCast<StartFunc>();
 	auto* const updateFunc = assembly->GetFunctionByName("Plugify_PluginUpdate").RCast<UpdateFunc>();
 	auto* const endFunc = assembly->GetFunctionByName("Plugify_PluginEnd").RCast<EndFunc>();
+	auto* const contextFunc = assembly->GetFunctionByName("Plugify_PluginContext").RCast<ContextFunc>();
 
 	std::vector<std::string_view> funcErrors;
 
@@ -131,8 +132,10 @@ LoadResult GoLanguageModule::OnPluginLoad(PluginHandle plugin) {
 		return ErrorData{ std::format("Not supported plugin api {}, max supported {}", resultVersion, kApiVersion) };
 	}
 
-	auto data = _assemblies.emplace_back(std::make_unique<AssemblyHolder>(std::move(assembly), updateFunc, startFunc, endFunc, callFunc)).get();
-	return LoadResultData{ std::move(methods), data, { updateFunc != nullptr, startFunc != nullptr, endFunc != nullptr, !exportedMethods.empty() } };
+	auto [hasUpdate, hasStart, hasEnd, _] = contextFunc ? *(contextFunc()) : PluginContext{};
+
+	auto data = _assemblies.emplace_back(std::make_unique<AssemblyHolder>(std::move(assembly), updateFunc, startFunc, endFunc, contextFunc, callFunc)).get();
+	return LoadResultData{ std::move(methods), data, { hasUpdate, hasStart, hasEnd, !exportedMethods.empty() } };
 }
 
 void GoLanguageModule::OnPluginStart(PluginHandle plugin) {

src/module.hpp

@@ -45,16 +45,25 @@ namespace golm {
 
 	constexpr int kApiVersion = 1;
 
+	struct PluginContext {
+		bool hasUpdate{};
+		bool hasStart{};
+		bool hasEnd{};
+		bool hasPanic{};
+	};
+
 	using InitFunc = int (*)(GoSlice, int, const void*);
 	using StartFunc = void (*)();
 	using UpdateFunc = void (*)(float);
 	using EndFunc = void (*)();
+	using ContextFunc = PluginContext* (*)();
 
 	struct AssemblyHolder {
 		std::unique_ptr<plugify::Assembly> assembly;
 		UpdateFunc updateFunc;
 		StartFunc startFunc;
 		EndFunc endFunc;
+		ContextFunc contextFunc;
 		plugify::JitCallback::CallbackHandler callFunc;
 	};
 

test/cross_call_worker/cross_call_worker.dll

@@ -2,4 +2,4 @@ module plugify-plugin
 
 go 1.24.0
 
-require github.com/untrustedmodders/go-plugify v0.0.0-20250302220657-ee0cab0c0300
+require github.com/untrustedmodders/go-plugify v1.0.5

test/cross_call_worker/cross_call_worker.so

@@ -1,2 +1,10 @@
 github.com/untrustedmodders/go-plugify v0.0.0-20250302220657-ee0cab0c0300 h1:OuqOGtXXkka7HwdGyHboZDcao64kMSOApo+/UfJM/EQ=
 github.com/untrustedmodders/go-plugify v0.0.0-20250302220657-ee0cab0c0300/go.mod h1:uPlNwuLP2QQmFGr5JfoU43Kwu84kI6e7CT7pNx+0ulE=
+github.com/untrustedmodders/go-plugify v1.0.1 h1:UsGfEjCkvnig4lLBooiQX212MLHwgla3gE2TiU573zE=
+github.com/untrustedmodders/go-plugify v1.0.1/go.mod h1:oXbAbZFAOtp53D3d9z5MyZHQ9+cfeuENFiacO/l6AWk=
+github.com/untrustedmodders/go-plugify v1.0.3 h1:9Z6U1DmArMMuJv7fiCygLyYkrrKj+fXMvaHY7aAVQdY=
+github.com/untrustedmodders/go-plugify v1.0.3/go.mod h1:c5w+u1HBAOxLPJzBwT0OBpfokLuZxGvnjtNSTOmynWc=
+github.com/untrustedmodders/go-plugify v1.0.4 h1:qKf7QxjFSlnurnDVev7rzLgNgA5QrahDSlZMXVBrm0U=
+github.com/untrustedmodders/go-plugify v1.0.4/go.mod h1:c5w+u1HBAOxLPJzBwT0OBpfokLuZxGvnjtNSTOmynWc=
+github.com/untrustedmodders/go-plugify v1.0.5 h1:UCeww6Z2kTmouCRsqqkM3PYDcRL4HzqVWNmzXsz738I=
+github.com/untrustedmodders/go-plugify v1.0.5/go.mod h1:c5w+u1HBAOxLPJzBwT0OBpfokLuZxGvnjtNSTOmynWc=

test/cross_call_worker/go.mod

@@ -6,6 +6,7 @@ import (
 	"github.com/untrustedmodders/go-plugify"
 	"math"
 	"plugify-plugin/cross_call_master"
+	"runtime/debug"
 	"strconv"
 	"strings"
 	"unsafe"
@@ -106,6 +107,10 @@ func init() {
 	plugify.OnPluginEnd(func() {
 		fmt.Println("Go: OnPluginEnd")
 	})
+
+	plugify.OnPluginPanic(func() []byte {
+		return debug.Stack() // workaround for could not import runtime/debug inside plugify package
+	})
 }
 
 func NoParamReturnVoid() {