util: implement basics for future version checking

Author: RaphaelIT7

ghostinj-dll/source/dll.cpp

@@ -52,46 +52,35 @@
 #include <dlfcn.h>
 #endif
 
+#ifdef ARCHITECTURE_X86
+#define PLATFORM_EXTENSION "linux"
+#else
+#define PLATFORM_EXTENSION "linux64"
+#endif
+
+void UpdateHolyLib()
+{
+	if ( std::filesystem::exists( "garrysmod/lua/bin/gmsv_holylib_" PLATFORM_EXTENSION "_updated.so" ) )
+	{
+		printf( "Found a updated holylib version.\n" );
+		std::filesystem::rename( "garrysmod/lua/bin/gmsv_holylib_" PLATFORM_EXTENSION ".so", "garrysmod/lua/bin/gmsv_holylib_" PLATFORM_EXTENSION "_previous.so" );
+		std::filesystem::rename( "garrysmod/lua/bin/gmsv_holylib_" PLATFORM_EXTENSION "_updated.so", "garrysmod/lua/bin/gmsv_holylib_" PLATFORM_EXTENSION ".so" );
+		printf( "Updated HolyLib\n" );
+	}
+}
+
 void* ghostinj2 = NULL;
 void* holylib = NULL;
 typedef void ( *plugin_main )();
 void Load()
 {
 	printf( "--- HolyLib-GhostInj Loading ---\n" );
 
-#ifdef ARCHITECTURE_X86
-	if ( std::filesystem::exists( "garrysmod/lua/bin/gmsv_holylib_linux_updated.so" ) )
-	{
-		printf( "Found a updated holylib version.\n" );
-		if ( std::filesystem::remove( "garrysmod/lua/bin/gmsv_holylib_linux.so" ) )
-		{
-			std::filesystem::rename( "garrysmod/lua/bin/gmsv_holylib_linux_updated.so", "garrysmod/lua/bin/gmsv_holylib_linux.so" );
-			printf( "Updated HolyLib\n" );
-		} else {
-			printf( "Failed to delete old HolyLib version!\n" );
-		}
-	}
+	UpdateHolyLib();
 
 	holylib = dlopen( "garrysmod/lua/bin/gmsv_holylib_linux.so", RTLD_NOW );
 	if ( !holylib )
 		printf( "Failed to open gmsv_holylib_linux.so (%s)\n", dlerror() );
-#else
-	if ( std::filesystem::exists( "garrysmod/lua/bin/gmsv_holylib_linux64_updated.so" ) )
-	{
-		printf( "Found a updated holylib version.\n" );
-		if ( std::filesystem::remove( "garrysmod/lua/bin/gmsv_holylib_linux64.so" ) )
-		{
-			std::filesystem::rename( "garrysmod/lua/bin/gmsv_holylib_linux64_updated.so", "garrysmod/lua/bin/gmsv_holylib_linux64.so" );
-			printf( "Updated HolyLib\n" );
-		} else {
-			printf( "Failed to delete old HolyLib version!\n" );
-		}
-	}
-
-	holylib = dlopen( "garrysmod/lua/bin/gmsv_holylib_linux64.so", RTLD_NOW );
-	if ( !holylib )
-		printf( "Failed to open gmsv_holylib_linux64.so (%s)\n", dlerror() );
-#endif
 
 	plugin_main plugin = reinterpret_cast< plugin_main >( dlsym( holylib, "HolyLib_PreLoad" ) );
 	if ( !plugin ) {

source/_prebuildtools/_compilefiles.lua

@@ -76,9 +76,13 @@ local function CompileVerionFile()
 	--local additional = file and file:read("*l") or "0"
 
 	local versionFile = [[
-// This is a generated file! & This will change on every run so don't include it unless you want cache misses & compiles to take ages.
+// This is a generated file! & This will change on every run and don't include it unless you want cache misses & compiles to take ages.
 #pragma once
 
+#ifndef _ALLOWVERSIONFILE
+#error "Idiot, you included the wrong file! Use versioninfo.h, not _versioninfo.h!"
+#endif
+
 #define HOLYLIB_BUILD_BRANCH "]] .. branch .. [["
 #define HOLYLIB_BUILD_RUN_NUMBER "]] .. run_number .. [["
 ]]

source/_versioninfo.cpp

@@ -1,4 +1,6 @@
+#define _ALLOWVERSIONFILE
 #include "_versioninfo.h"
+#undef _ALLOWVERSIONFILE
 
 // This file will always have a cache miss, so we make this as simple as possible to not become a slow down in the compile.
 
@@ -11,6 +13,11 @@ const char* HolyLib_GetPluginDescription()
 #endif
 }
 
+const char* HolyLib_GetVersion()
+{
+	return "0.8";
+}
+
 const char* HolyLib_GetRunNumber()
 {
 	return HOLYLIB_BUILD_RUN_NUMBER;

source/holylib.cpp

@@ -2,6 +2,7 @@
 #include "module.h"
 #include "util.h"
 #include "plugin.h"
+#include "versioninfo.h"
 
 // memdbgon must be the last include file in a .cpp file!!!
 #include "tier0/memdbgon.h"
@@ -45,6 +46,26 @@ class CHolyLib : public IHolyLib
 	{
 		return g_pHolyUtil;
 	}
+
+	virtual const char* GetPluginDescription()
+	{
+		return HolyLib_GetPluginDescription();
+	}
+
+	virtual const char* GetVersion()
+	{
+		return HolyLib_GetVersion();
+	}
+
+	virtual const char* GetBranch()
+	{
+		return HolyLib_GetBranch();
+	}
+
+	virtual const char* GetRunNumber()
+	{
+		return HolyLib_GetRunNumber();
+	}
 };
 
 static CHolyLib s_HolyLib;

source/plugin.cpp

@@ -11,6 +11,7 @@
 #include "vprof.h"
 #include "server.h"
 #include "holylua.h"
+#include "versioninfo.h"
 
 struct edict_t;
 #include "playerinfomanager.h"
@@ -206,7 +207,6 @@ void CServerPlugin::UnPause(void)
 //---------------------------------------------------------------------------------
 // Purpose: the name of this plugin, returned in "plugin_print" command
 //---------------------------------------------------------------------------------
-extern const char* HolyLib_GetPluginDescription();
 const char* CServerPlugin::GetPluginDescription(void)
 {
 	return HolyLib_GetPluginDescription();
@@ -256,7 +256,6 @@ void CServerPlugin::ServerActivate(edict_t *pEdictList, int edictCount, int clie
 
 	Lua::ServerInit();
 	g_pModuleManager.ServerActivate(pEdictList, edictCount, clientMax);
-	Util::CheckVersion();
 }
 
 //---------------------------------------------------------------------------------
@@ -372,7 +371,6 @@ GMOD_MODULE_OPEN()
 	else
 		g_pModuleManager.SetModuleRealm(Module_Realm::MENU);
 
-	Util::CheckVersion();
 	g_pModuleManager.MarkAsBinaryModule();
 	Lua::SetManualShutdown();
 	g_HolyLibServerPlugin.Load(NULL, NULL); // Yes. I don't like it but I can't get thoes fancy interfaces.

source/public/iholylib.h

@@ -34,6 +34,12 @@ class IHolyLib
 
 	// For thoes who don't want to get it by the interface
 	virtual IHolyUtil* GetHolyUtil() = 0;
+
+	// Information about the plugin like version, branch & description
+	virtual const char* GetPluginDescription() = 0;
+	virtual const char* GetVersion() = 0;
+	virtual const char* GetRunNumber() = 0;
+	virtual const char* GetBranch() = 0;
 };
 
 #define INTERFACEVERSION_HOLYLIB "IHOLYLIB001"

source/util.cpp

@@ -1,3 +1,4 @@
+#include "httplib.h"
 #include "util.h"
 #include "GarrysMod/Lua/LuaObject.h"
 #include <string>
@@ -11,6 +12,7 @@
 #include "toolframework/itoolentity.h"
 #include "GarrysMod/IGet.h"
 #include <lua.h>
+#include "versioninfo.h"
 
 // memdbgon must be the last include file in a .cpp file!!!
 #include "tier0/memdbgon.h"
@@ -561,9 +563,22 @@ bool Util::ShouldLoad()
 	return true;
 }
 
-void Util::CheckVersion()
+void Util::CheckVersion() // This is called only when holylib is initially loaded! (ToDo: Allow people to disable this!)
 {
 	// ToDo: Implement this someday
+	httplib::Client pClient("http://holylib.raphaelit7.com");
+
+	httplib::Headers headers = {
+		{ "HolyLib_Branch", HolyLib_GetBranch() },
+		{ "HolyLib_RunNumber", HolyLib_GetRunNumber() },
+		{ "HolyLib_Version", HolyLib_GetVersion() }
+	};
+
+	auto res = pClient.Get("/api/check_version");
+	if (res->status == 200)
+	{
+		Msg(PROJECT_NAME ": %s", res->body.c_str());
+	}
 }
 
 static bool g_bUtilInit = false;
@@ -573,6 +588,7 @@ void Util::Load()
 		return;
 
 	g_bUtilInit = true;
+	Util::CheckVersion();
 	IConfig* pConVarConfig = g_pConfigSystem->LoadConfig("garrysmod/holylib/cfg/convars.json");
 	if (pConVarConfig)
 	{

source/versioninfo.h

@@ -0,0 +1,7 @@
+// You should use this file instead of the _versioninfo.h since this one won't be generated on each run ensuring no cache misses!
+#pragma once
+
+extern const char* HolyLib_GetPluginDescription();
+extern const char* HolyLib_GetVersion();
+extern const char* HolyLib_GetRunNumber();
+extern const char* HolyLib_GetBranch();