8c64bfe4a9
All checks were successful
Build / Build (push) Successful in 30s
This commit enhances debugging capabilities and addresses issues related to NetId handling within the DragonflyDB system. Key changes: * **Improved Debugging:** Added more detailed logging in `Utils.cs` to track data chunks and strings, improving the ability to diagnose issues. * **NetId Handling Fix:** Modified `fnc_handler.sqf` to correctly handle NetIds, including a fallback mechanism if the target object is null. This ensures that remote execution attempts don't fail silently. * **Function Examples:** Updated examples in `fnc_hashSetIdBulk.sqf` and `fnc_hashSetBulk.sqf` to correctly use array syntax for function calls. * **Simplified fetch.sqf:** Removed unecessary conversion of the _call variable. * **Binary Updates:** Updated the compiled DLL and SO files.
77 lines
2.5 KiB
Plaintext
77 lines
2.5 KiB
Plaintext
#include "..\script_component.hpp"
|
|
|
|
/*
|
|
* Function: dragonfly_db_fnc_handler
|
|
* Author: Creedcoder, J.Schmidt
|
|
* Edit: 07.15.2024
|
|
* Copyright © 2024 Creedcoder, J.Schmidt, All rights reserved
|
|
*
|
|
* Do not edit without permission!
|
|
*
|
|
* This work is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License.
|
|
* To view a copy of this license, vist https://creativecommons.org/licenses/by-nc-sa/4.0/ or send a letter to Creative Commons,
|
|
* PO Box 1866, Mountain View, CA 94042
|
|
*
|
|
* [Description]
|
|
* Handle data from DB.
|
|
*
|
|
* Arguments:
|
|
* 0: UniqueID for data chunk <STRING> (default: "")
|
|
* 1: Name of function to return data <STRING> (default: "")
|
|
* 2: Unscheduled environment <BOOL> (default: false)
|
|
* 3: Data from key [<ARRAY|STRING|NUMBER|BOOL>] (default: [])
|
|
* 4: NetID of target to return data to from function <STRING> (default: nil)
|
|
*
|
|
* Return Value:
|
|
* [uniqueID, function, call, data, object] <ARRAY>
|
|
*
|
|
* Examples:
|
|
* ["0123456789", "dragonfly_db_fnc_test", false, ["Hello World!"]] call dragonfly_db_fnc_handler (Server or Singleplayer Only)
|
|
* ["0123456789", "dragonfly_db_fnc_test", false, ["Hello World!"], netId player] remoteExecCall ["dragonfly_db_fnc_handler", 2, false] (Multiplayer Only)
|
|
*
|
|
* Public: Yes
|
|
*/
|
|
|
|
params [["_uniqueID", "", [""]], ["_function", "", [""]], ["_call", false, [false]], ["_data", [], [[]]], ["_netId", "", [""]]];
|
|
|
|
#ifdef __A3__DEBUG__
|
|
diag_log text format ["ArmaDragonflyClient: 'dragonfly_db_fnc_handler' UniqueID: '%1', Function: '%2', Call: '%3', Data: '%4', NetId: '%5'", _uniqueID, _function, _call, _data, _netId];
|
|
#endif
|
|
|
|
if (_function == "" || count _data == 0) exitWith {
|
|
diag_log text format ["ArmaDragonflyClient: 'dragonfly_db_fnc_handler' Invalid Input for Function '%1' or Data '%2'", _function, _data];
|
|
};
|
|
|
|
private _func = call compile format ["%1", _function];
|
|
|
|
if (_netId != "") then {
|
|
private _target = objectFromNetId _netId;
|
|
|
|
if (!isNull _target) then {
|
|
#ifdef __A3__DEBUG__
|
|
diag_log text format ["ArmaDragonflyClient: 'dragonfly_db_fnc_handler' Using NetId: '%1'", _netId];
|
|
#endif
|
|
|
|
if (_call) then {
|
|
_data remoteExecCall [_function, _target, false];
|
|
} else {
|
|
_data remoteExec [_function, _target, false];
|
|
};
|
|
} else {
|
|
#ifdef __A3__DEBUG__
|
|
diag_log text format ["ArmaDragonflyClient: 'dragonfly_db_fnc_handler' NetId '%1' resolved to null object, using local execution", _netId];
|
|
#endif
|
|
|
|
if (_call) then {
|
|
_data call _func;
|
|
} else {
|
|
_data spawn _func;
|
|
};
|
|
};
|
|
} else {
|
|
if (_call) then {
|
|
_data call _func;
|
|
} else {
|
|
_data spawn _func;
|
|
};
|
|
}; |