Common - Improve PBO checking

addons/common/XEH_PREP.hpp

@@ -29,6 +29,7 @@ PREP(changeProjectileDirection);
 PREP(checkFiles);
 PREP(checkFiles_diagnoseACE);
 PREP(checkPBOs);
+PREP(checkVersionNumber);
 PREP(claim);
 PREP(claimSafeServer);
 PREP(codeToString);

addons/common/XEH_postInit.sqf

@@ -251,6 +251,35 @@ if (_currentVersion != _previousVersion) then {
 
 call FUNC(checkFiles);
 
+// Let the server know that we have ACE loaded
+missionNamespace setVariable [QGVAR(aceLoaded_) + getPlayerUID player, true, 2];
+
+// This handles clients joining that do not have ACE loaded
+if (isServer) then {
+    addMissionEventHandler ["PlayerConnected", {
+        [{
+            params ["", "_uid", "", "", "_owner"];
+
+            // If ACE is not loaded, kick unit
+            if !(missionNamespace getVariable [QGVAR(aceLoaded_) + _uid, false]) then {
+                // Send function to client
+                _owner publicVariableClient QFUNC(errorMessage);
+
+                // Wait for function to broadcast, then kick client
+                [{
+                    ["[ACE] ERROR", "ACE is not present", {findDisplay 46 closeDisplay 0}, {findDisplay 46 closeDisplay 0}, nil, [true, false]] remoteExecCall [QFUNC(errorMessage), _this];
+                }, _owner, 0.5] call CBA_fnc_waitAndExecute;
+            };
+        }, _this, 3] call CBA_fnc_waitAndExecute;
+    }];
+
+    addMissionEventHandler ["PlayerDisconnected", {
+        params ["", "_uid"];
+
+        // Reset variable
+        missionNamespace setVariable [QGVAR(aceLoaded_) + _uid, nil];
+    }];
+};
 
 //////////////////////////////////////////////////
 // Set up ace_settingsInitialized eventhandler

addons/common/functions/fnc_checkFiles.sqf

@@ -16,44 +16,54 @@
  */
 
 ///////////////
-// check addons
+// Check addons
 ///////////////
-private _mainVersion = getText (configFile >> "CfgPatches" >> "ace_main" >> "versionStr");
+private _cfgPatches = configFile >> "CfgPatches";
+private _mainVersion = getText (_cfgPatches >> "ace_main" >> "versionStr");
 
-//CBA Versioning check - close main display if using incompatible version
-private _cbaVersionAr = getArray (configFile >> "CfgPatches" >> "cba_main" >> "versionAr");
+// CBA Versioning check - close main display if using incompatible version
+private _cbaVersionAr = getArray (_cfgPatches >> "cba_main" >> "versionAr");
 private _cbaRequiredAr = getArray (configFile >> "CfgSettings" >> "CBA" >> "Versioning" >> "ACE" >> "dependencies" >> "CBA") select 1;
 
 private _cbaVersionStr = _cbaVersionAr joinString ".";
 private _cbaRequiredStr = _cbaRequiredAr joinString ".";
 
 INFO_3("ACE is version %1 - CBA is version %2 (min required %3)",_mainVersion,_cbaVersionStr,_cbaRequiredStr);
 
-if ([_cbaRequiredAr, _cbaVersionAr] call cba_versioning_fnc_version_compare) then {
+if ([_cbaRequiredAr, _cbaVersionAr] call CBA_versioning_fnc_version_compare) then {
     private _errorMsg = format ["CBA version %1 is outdated (required %2)", _cbaVersionStr, _cbaRequiredStr];
     ERROR(_errorMsg);
+
     if (hasInterface) then {
-        ["[ACE] ERROR", _errorMsg, {findDisplay 46 closeDisplay 0}] call FUNC(errorMessage);
+        ["[ACE] ERROR", _errorMsg, {findDisplay 46 closeDisplay 0}, {findDisplay 46 closeDisplay 0}, nil, [true, false]] call FUNC(errorMessage);
     };
 };
 
-//private _addons = activatedAddons; // broken with High-Command module, see #2134
-private _addons = (cba_common_addons select {(_x select [0,4]) == "ace_"}) apply {toLower _x};
+//private _addons = activatedAddons; // Broken with High-Command module, see #2134
+private _addons = (CBA_common_addons select {(_x select [0, 4]) == "ace_"}) apply {toLower _x};
+
+private _addonCfg = configNull;
+private _addonVersion = "";
+private _addonSource = "";
+
 private _oldAddons = [];
 private _oldSources = [];
 private _oldCompats = [];
+
 {
-    private _addonCfg = configFile >> "CfgPatches" >> _x;
-    private _addonVersion = getText (_addonCfg >> "versionStr");
+    _addonCfg = configFile >> "CfgPatches" >> _x;
+    _addonVersion = getText (_addonCfg >> "versionStr");
+
     if (_addonVersion != _mainVersion) then {
-        private _addonSource = configSourceMod _addonCfg;
+        _addonSource = configSourceMod _addonCfg;
+
         _oldSources pushBackUnique _addonSource;
+
+        // Check ACE install
         call FUNC(checkFiles_diagnoseACE);
 
         if ((_x select [0, 10]) != "ace_compat") then {
-            if (hasInterface) then {
-                _oldAddons pushBack _x;
-            };
+            _oldAddons pushBack _x;
         } else {
             _oldCompats pushBack [_x, _addonVersion];  // Don't block game if it's just an old compat pbo
         };
@@ -62,45 +72,57 @@ private _oldCompats = [];
 
 if (_oldAddons isNotEqualTo []) then {
     _oldAddons = _oldAddons apply {"%1.pbo", _x};
-    private _errorMsg = "";
-    if (count _oldAddons > 3) then {
-        _errorMsg = format ["The following files are outdated: %1, and %2 more.<br/>ACE Main version is %3.<br/>Loaded mods with outdated ACE files: %4", (_oldAddons select [0, 3]) joinString ", ", (count _oldAddons) -3, _mainVersion, (_oldSources joinString ", ")];
+
+    private _errorMsg = if (count _oldAddons > 3) then {
+        format ["The following files are outdated: %1, and %2 more.<br/>ACE Main version is %3.<br/>Loaded mods with outdated ACE files: %4", (_oldAddons select [0, 3]) joinString ", ", (count _oldAddons) - 3, _mainVersion, _oldSources joinString ", "];
     } else {
-        _errorMsg = format ["The following files are outdated: %1.<br/>ACE Main version is %2.<br/>Loaded mods with outdated ACE files: %3", (_oldAddons) joinString ", ", _mainVersion, (_oldSources) joinString ", "];
+        format ["The following files are outdated: %1.<br/>ACE Main version is %2.<br/>Loaded mods with outdated ACE files: %3", _oldAddons joinString ", ", _mainVersion, _oldSources joinString ", "];
     };
+
     if (hasInterface) then {
-        ["[ACE] ERROR", _errorMsg, {findDisplay 46 closeDisplay 0}] call FUNC(errorMessage);
+        ["[ACE] ERROR", _errorMsg, {findDisplay 46 closeDisplay 0}, {findDisplay 46 closeDisplay 0}, nil, [true, false]] call FUNC(errorMessage);
     };
+
     ERROR(_errorMsg);
 };
 
 if (_oldCompats isNotEqualTo []) then {
     _oldCompats = _oldCompats apply {format ["%1 (%2, source: %3)", _x select 0, _x select 1]};
+
     [{
         // Lasts for ~10 seconds
         ERROR_WITH_TITLE_2("The following ACE compatiblity PBOs are outdated", "%1. ACE Main version is %2",_this select 0,_this select 1);
     }, [_oldCompats, _mainVersion], 1] call CBA_fnc_waitAndExecute;
 };
 
 ///////////////
-// check extensions
+// Check extensions
 ///////////////
 private _platform = toLower (productVersion select 6);
+
 if (!isServer && {_platform in ["linux", "osx"]}) then {
     // Linux and OSX client ports do not support extensions at all
     INFO("Operating system does not support extensions");
 } else {
+    private _extension = "";
+    private _isWindows = false;
+    private _isLinux = false;
+    private _isClient = false;
+    private _isServer = false;
+
     {
-        private _extension = configName _x;
-        private _isWindows = _platform == "windows" && {getNumber (_x >> "windows") == 1};
-        private _isLinux = _platform == "linux" && {getNumber (_x >> "linux") == 1};
-        private _isClient = hasInterface && {getNumber (_x >> "client") == 1};
-        private _isServer = !hasInterface && {getNumber (_x >> "server") == 1};
+        _extension = configName _x;
+        _isWindows = _platform == "windows" && {getNumber (_x >> "windows") == 1};
+        _isLinux = _platform == "linux" && {getNumber (_x >> "linux") == 1};
+        _isClient = hasInterface && {getNumber (_x >> "client") == 1};
+        _isServer = !hasInterface && {getNumber (_x >> "server") == 1};
 
         if ((_isWindows || _isLinux) && {_isClient || _isServer}) then {
             private _versionEx = _extension callExtension "version";
+
             if (_versionEx == "") then {
                 private _extensionFile = _extension;
+
                 if (productVersion select 7 == "x64") then {
                     _extensionFile = format ["%1_x64", _extensionFile];
                 };
@@ -112,7 +134,7 @@ if (!isServer && {_platform in ["linux", "osx"]}) then {
                 ERROR(_errorMsg);
 
                 if (hasInterface) then {
-                    ["[ACE] ERROR", _errorMsg, {findDisplay 46 closeDisplay 0}] call FUNC(errorMessage);
+                    ["[ACE] ERROR", _errorMsg, {findDisplay 46 closeDisplay 0}, {findDisplay 46 closeDisplay 0}, nil, [true, false]] call FUNC(errorMessage);
                 };
             } else {
                 // Print the current extension version
@@ -121,54 +143,61 @@ if (!isServer && {_platform in ["linux", "osx"]}) then {
         };
     } forEach ("true" configClasses (configFile >> "ACE_Extensions"));
 };
+
 if (isArray (configFile >> "ACE_Extensions" >> "extensions")) then {
     WARNING("extensions[] array no longer supported");
 };
 
 ///////////////
-// check server version/addons
+// Check server version/addons
 ///////////////
 if (isMultiplayer) then {
-    // don't check optional addons
-    _addons = _addons select {getNumber (configFile >> "CfgPatches" >> _x >> "ACE_isOptional") != 1};
+    // Don't check optional addons
+    _addons = _addons select {getNumber (_cfgPatches >> _x >> "ACE_isOptional") != 1};
 
     if (isServer) then {
-        // send servers version of ACE to all clients
+        // Send server's version of ACE to all clients
         GVAR(ServerVersion) = _mainVersion;
         GVAR(ServerAddons) = _addons;
         publicVariable QGVAR(ServerVersion);
         publicVariable QGVAR(ServerAddons);
     } else {
-        // clients have to wait for the variables
-        [{
-            if (isNil QGVAR(ServerVersion) || isNil QGVAR(ServerAddons)) exitWith {};
+        GVAR(ClientVersion) = _version;
+        GVAR(ClientAddons) = _addons;
 
-            (_this select 0) params ["_mainVersion", "_addons"];
-
-            if (_mainVersion != GVAR(ServerVersion)) then {
-                private _errorMsg = format ["Client/Server Version Mismatch. Server: %1, Client: %2.", GVAR(ServerVersion), _mainVersion];
+        private _fnc_check = {
+            if (GVAR(ClientVersion) != GVAR(ServerVersion)) then {
+                private _errorMsg = format ["Client/Server Version Mismatch. Server: %1, Client: %2.", GVAR(ServerVersion), GVAR(ClientVersion)];
 
+                // Check ACE install
                 call FUNC(checkFiles_diagnoseACE);
                 ERROR(_errorMsg);
 
                 if (hasInterface) then {
-                    ["[ACE] ERROR", _errorMsg, {findDisplay 46 closeDisplay 0}] call FUNC(errorMessage);
+                    ["[ACE] ERROR", _errorMsg, {findDisplay 46 closeDisplay 0}, {findDisplay 46 closeDisplay 0}, nil, [true, false]] call FUNC(errorMessage);
                 };
             };
 
-            _addons = _addons - GVAR(ServerAddons);
+            private _addons = GVAR(ClientAddons) - GVAR(ServerAddons);
+
             if (_addons isNotEqualTo []) then {
-                private _errorMsg = format ["Client/Server Addon Mismatch. Client has extra addons: %1.",_addons];
+                private _errorMsg = format ["Client/Server Addon Mismatch. Client has extra addons: %1.", _addons];
 
+                // Check ACE install
                 call FUNC(checkFiles_diagnoseACE);
                 ERROR(_errorMsg);
 
                 if (hasInterface) then {
-                    ["[ACE] ERROR", _errorMsg, {findDisplay 46 closeDisplay 0}] call FUNC(errorMessage);
+                    ["[ACE] ERROR", _errorMsg, {findDisplay 46 closeDisplay 0}, {findDisplay 46 closeDisplay 0}, nil, [true, false]] call FUNC(errorMessage);
                 };
             };
+        };
 
-            [_this select 1] call CBA_fnc_removePerFrameHandler;
-        }, 1, [_mainVersion,_addons]] call CBA_fnc_addPerFrameHandler;
+        // Clients have to wait for the variables
+        if (isNil QGVAR(ServerVersion) || isNil QGVAR(ServerAddons)) then {
+            GVAR(ServerVersion) addPublicVariableEventHandler _fnc_check;
+        } else {
+            call _fnc_check;
+        };
     };
 };

addons/common/functions/fnc_checkPBOs.sqf

@@ -1,6 +1,6 @@
 #include "..\script_component.hpp"
 /*
- * Author: commy2
+ * Author: commy2, johnb43
  * Used to execute the checkPBOs module without placing the module. Don't use this together with the module.
  * Checks PBO versions and compares to the one running on server.
  *
@@ -24,83 +24,82 @@
 params ["_mode", ["_checkAll", false], ["_whitelist", "", [""]]];
 TRACE_3("params",_mode,_checkAll,_whitelist);
 
-//lowercase and convert whiteList String into array of strings:
+// Lowercase and convert whiteList string into array of strings:
 _whitelist = toLower _whitelist;
 _whitelist = _whitelist splitString "[,""']";
 TRACE_1("Array",_whitelist);
 
 ACE_Version_CheckAll = _checkAll;
 ACE_Version_Whitelist = _whitelist;
 
-if (!_checkAll) exitWith {}; //ACE is checked by FUNC(checkFiles)
+// ACE is checked by FUNC(checkFiles)
+if (!_checkAll) exitWith {};
 
 if (!isServer) then {
-    [{
-        if (isNil "ACE_Version_ClientErrors") exitWith {};
+    ["ace_versioning_clientCheckDone", {
+        // Don't let this event get triggered again
+        [_thisType, _thisId] call CBA_fnc_removeEventHandler;
 
-        ACE_Version_ClientErrors params ["_missingAddon", "_missingAddonServer", "_oldVersionClient", "_oldVersionServer"];
+        params ["_clientErrors"];
+        _clientErrors params ["_missingAddon", "_missingAddonServer", "_oldVersionClient", "_oldVersionServer"];
+        _thisArgs params ["_mode"];
 
-        (_this select 0) params ["_mode", "_checkAll", "_whitelist"];
-
-        // Display error message.
+        // Display error message(s)
         if (_missingAddon || {_missingAddonServer} || {_oldVersionClient} || {_oldVersionServer}) then {
-            private _text = "[ACE] Version mismatch:<br/><br/>";
+            private _errorMsg = "[ACE] Version mismatch:<br/><br/>";
             private _error = format ["ACE version mismatch: %1: ", profileName];
 
             if (_missingAddon) then {
-                _text = _text + "Detected missing addon on client<br/>";
+                _errorMsg = _errorMsg + "Detected missing addon on client<br/>";
                 _error = _error + "Missing file(s); ";
             };
+
             if (_missingAddonServer) then {
-                _text = _text + "Detected missing addon on server<br/>";
+                _errorMsg = _errorMsg + "Detected missing addon on server<br/>";
                 _error = _error + "Additional file(s); ";
             };
+
             if (_oldVersionClient) then {
-                _text = _text + "Detected old client version<br/>";
+                _errorMsg = _errorMsg + "Detected old client version<br/>";
                 _error = _error + "Older version; ";
             };
+
             if (_oldVersionServer) then {
-                _text = _text + "Detected old server version<br/>";
+                _errorMsg = _errorMsg + "Detected old server version<br/>";
                 _error = _error + "Newer version; ";
             };
 
-            //[QGVAR(systemChatGlobal), _error] call CBA_fnc_globalEvent;
-
             ERROR(_error);
 
+            // Warn
             if (_mode < 2) then {
-                _text = composeText [lineBreak, parseText format ["<t align='center'>%1</t>", _text]];
+                _errorMsg = composeText [lineBreak, parseText format ["<t align='center'>%1</t>", _errorMsg]];
 
                 private _rscLayer = "ACE_RscErrorHint" call BIS_fnc_rscLayer;
                 _rscLayer cutRsc ["ACE_RscErrorHint", "PLAIN", 0, true];
 
                 disableSerialization;
+
                 private _ctrlHint = uiNamespace getVariable "ACE_ctrlErrorHint";
-                _ctrlHint ctrlSetStructuredText _text;
+                _ctrlHint ctrlSetStructuredText _errorMsg;
 
                 if (_mode == 0) then {
                     [{
-                        params ["_rscLayer"];
-                        TRACE_2("Hiding Error message after 10 seconds",time,_rscLayer);
-                        _rscLayer cutFadeOut 0.2;
-                    }, [_rscLayer], 10] call CBA_fnc_waitAndExecute;
+                        TRACE_2("Hiding Error message after 10 seconds",time,_this);
+                        _this cutFadeOut 0.2;
+                    }, _rscLayer, 10] call CBA_fnc_waitAndExecute;
                 };
-            };
-
-            if (_mode == 2) then {
-                [{alive player}, { // To be able to show list if using checkAll
-                    params ["_text"];
-                    TRACE_2("Player is alive, showing msg and exiting",time,_text);
-                    _text = composeText [parseText format ["<t align='center'>%1</t>", _text]];
-                    ["[ACE] ERROR", _text, {findDisplay 46 closeDisplay 0}] call FUNC(errorMessage);
-                }, [_text]] call CBA_fnc_waitUntilAndExecute;
+            } else {
+                // Kick
+                [{alive player}, {
+                    TRACE_2("Player is alive, showing msg and exiting",time,_this);
+                    private _errorMsg = composeText [parseText format ["<t align='center'>%1</t>", _this]];
+                    ["[ACE] ERROR", _errorMsg, {findDisplay 46 closeDisplay 0}, {findDisplay 46 closeDisplay 0}, nil, [true, false]] call FUNC(errorMessage);
+                }, _errorMsg] call CBA_fnc_waitUntilAndExecute;
             };
         };
-
-        [_this select 1] call CBA_fnc_removePerFrameHandler;
-    }, 1, [_mode, _checkAll, _whitelist]] call CBA_fnc_addPerFrameHandler;
+    }, [_mode]] call CBA_fnc_addEventHandlerArgs;
 };
 
-if (_checkAll) then {
-    0 spawn COMPILE_FILE(scripts\checkVersionNumber); // @todo
-};
+// Check file version numbers
+[_whitelist] call FUNC(checkVersionNumber);