BeamMP/BeamMP-Server
1
0
Fork 0
mirror of https://github.com/BeamMP/BeamMP-Server.git synced 2026-05-19 16:10:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,634 Commits 61 Branches 46 Tags
6ec4106ec7ec159bab157252f27f3c3591898850
Commit Graph

1634 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lucca Jiménez Könings 3609fd77ec Potential fix for compiler issues on Ubuntu 
Signed-off-by: Lucca Jiménez Könings <development@jimkoen.com>
 2024-05-15 13:15:54 +02:00
Lucca Jiménez Könings a5e3fc8fb9 Add Sync.h 
Signed-off-by: Lucca Jiménez Könings <development@jimkoen.com>
 2024-05-15 12:57:08 +02:00
Lucca Jiménez Könings bcd4b5a235 Fix Debug asserts on FreeBSD 
Signed-off-by: Lucca Jiménez Könings <development@jimkoen.com>
 2024-05-15 12:54:50 +02:00
Lucca Jiménez Könings 8c15b87628 Refactor all references to settings to use new Settings type 
Signed-off-by: Lucca Jiménez Könings <development@jimkoen.com>
 2024-05-15 12:52:09 +02:00
Lucca Jiménez Könings 13e641b3a3 Remove interfering legacy code (http,password,etc) 
Signed-off-by: Lucca Jiménez Könings <development@jimkoen.com>
 2024-05-15 12:45:19 +02:00
Lion 5f9726f10f Use hard disconnect instead of ClientKick in timeout (#320) v3.4.1 2024-05-11 13:00:25 +02:00
Lion Kortlepel fcd408970b always initialize ping timer 2024-05-11 12:44:41 +02:00
Lion cf5ebcbd1a Fix lua number (int vs double) handling, add lua unit tests for json encode + decode, fix empty array or table serializing to null (#319) 2024-05-11 12:19:13 +02:00
Lion c9d926f9e3 Fix Lua assert error when adding values to tables (e.g. in event arguments) (#318) 
When adding elements to a table, the .add() function does not behave as
expected in various cases, making it really shit and difficult to use.
Instead, we keep our own index and just add one by one. It works, and
it's easy to understand.

This may lead to indices which are nil, i.e. non-fully-sequential
tables, but I can't be asked to worry about it because that shouldn't be
an issue when we use .set() everywhere.
 2024-05-11 12:18:56 +02:00
Lion Kortlepel 9f47978f0f use hard disconnect insteadof clientkick 2024-05-11 12:17:02 +02:00
Lion Kortlepel a0f649288e fix lua number handling, add lua unit tests for json encode + decode 2024-05-10 15:54:52 +02:00
Lion Kortlepel b995a222ff bump version 2024-05-10 14:57:22 +02:00
Lion Kortlepel c5dff8b913 fix lua assertion on event argument passing 
When adding elements to a table, the .add() function does not behave as
expected in various cases, making it really shit and difficult to use.
Instead, we keep our own index and just add one by one. It works, and
it's easy to understand.

This may lead to indices which are nil, i.e. non-fully-sequential
tables, but I can't be asked to worry about it because that shouldn't be
an issue when we use .set() everywhere.
 2024-05-10 14:45:06 +02:00
Lion 0c740ccedf bump version v3.4.0 2024-05-08 12:01:33 +02:00
Lion b0cf5c7838 Fix lua assertions crashing the server (#198) 
The server would crash on a Lua plugin ASSERT() - this now instead
prints an error. May still lead to weird behavior, but less weird than a
crash.
 2024-05-08 11:48:56 +02:00
Lion 586510041d fix TriggerGlobalEvent not passing event arguments correctly (#307) 
This is supposed to close #106 (The code is by @lionkor from
https://github.com/BeamMP/BeamMP-Server/commit/b068a9b48f21cc80c6aa2ae3580fc9a5e3d411e0)
 2024-05-08 11:47:23 +02:00
Lion 1794c3fe45 Add Lua execution profiler Util.DebugExecutionTime() (#267) 
Adds `Util.DebugExecutionTime()`, which returns a table of
`function_name: milliseconds`, in which each function's execution time
is averaged over all time.

You can call this function like so:
```lua
-- event to print the debug times
MP.RegisterEvent("printStuff", "printStuff")
-- prints the execution time of all event handlers
function printStuff()
	print(Util.DebugExecutionTime())
end
-- run every 5 seconds (or 10, or 60, whatever makes sense for you
MP.CreateEventTimer("printStuff", 5000)
```

Pretty print function:
```lua
function printDebugExecutionTime()
    local stats = Util.DebugExecutionTime()
    local pretty = "DebugExecutionTime:\n"
    local longest = 0
    for name, t in pairs(stats) do
        if #name > longest then
            longest = #name
        end
    end
    for name, t in pairs(stats) do
        pretty = pretty .. string.format("%" .. longest + 1 .. "s: %12f +/- %12f (min: %12f, max: %12f) (called %d time(s))\n", name, t.mean, t.stdev, t.min, t.max, t.n)
    end
    print(pretty)
end
```

`Util.DebugExecutionTime()` returns a table, where each key is an event
handler function name, and each value is a table consisting of `mean`
(simple average), `stddev` (standard deviation aka mean of the
variance), `min` and `max`, all in milliseconds, as well as `n` as the
number of samples taken.
 2024-05-08 11:46:02 +02:00
Lion ee599e970d Make Plugin load order deterministic (alphabetic) (#315) 
Add Feature / Fix: #306
 2024-05-08 11:31:34 +02:00
Lion Kortlepel 40158dc252 fix compile error 2024-05-08 11:31:12 +02:00
Neptnium 5ece60574a Make Plugin load order deterministic 
fix typo "mResourceServerPath" named "mFolder"

Fix typo number 2
 2024-05-08 11:31:05 +02:00
Lucca Jiménez Könings ff812429ed Fix settings set not accepting boolean literals 
Signed-off-by: Lucca Jiménez Könings <development@jimkoen.com>
 2024-05-07 18:16:06 +02:00
Lucca Jiménez Könings 639c46ad36 Remove additional debug calls 
Signed-off-by: Lucca Jiménez Könings <development@jimkoen.com>
 2024-05-07 18:16:06 +02:00
Lucca Jiménez Könings 158875a962 Remove debug code for new Settings implementation 
Signed-off-by: Lucca Jiménez Könings <development@jimkoen.com>
 2024-05-07 18:16:06 +02:00
Lucca Jiménez Könings c6dac55679 Wrap Settings into synchronization primitives 
Signed-off-by: Lucca Jiménez Könings <development@jimkoen.com>
 2024-05-07 18:16:06 +02:00
Lucca Jiménez Könings 37109ae3f1 Make 'General::Debug' setting r/w from runtime 
Signed-off-by: Lucca Jiménez Könings <development@jimkoen.com>
 2024-05-07 18:16:05 +02:00
Lucca Jiménez Könings d6b78b9683 Fix argument parsing at wrong index 
Signed-off-by: Lucca Jiménez Könings <development@jimkoen.com>
 2024-05-07 18:16:05 +02:00
Lucca Jiménez Könings f5e2f7425f Fix ComposedKey metadata not printing to console 
Make ComposedKey formattable by overloading fmt::format

Signed-off-by: Lucca Jiménez Könings <development@jimkoen.com>
 2024-05-07 18:16:05 +02:00
Lucca Jiménez Könings 8693b8a2b0 Add list argument to command settings 
Signed-off-by: Lucca Jiménez Könings <development@jimkoen.com>
 2024-05-07 18:16:05 +02:00
Lucca Jiménez Könings 3989961ff9 Add get and set to console command settings 
Signed-off-by: Lucca Jiménez Könings <development@jimkoen.com>
 2024-05-07 18:16:05 +02:00
Lucca Jiménez Könings a357ff8ca3 Add missing options to defaults 
Signed-off-by: Lucca Jiménez Könings <development@jimkoen.com>
 2024-05-07 18:16:05 +02:00
Lucca Jiménez Könings 86f0052e07 Add rudimentary access control to type Settings 
Signed-off-by: Lucca Jiménez Könings <development@jimkoen.com>
 2024-05-07 18:16:05 +02:00
Lucca Jiménez Könings 89034a64e0 Add logic for new Settings type 
Signed-off-by: Lucca Jiménez Könings <development@jimkoen.com>
 2024-05-07 18:16:05 +02:00
Lucca Jiménez Könings 55f5437618 Add new type Settings & refactor TSettings behavior 
into Settings by adding getters/setters

Signed-off-by: Lucca Jiménez Könings <development@jimkoen.com>
 2024-05-07 18:16:05 +02:00
Neptnium c605498a2d Merge branch 'BeamMP:minor' into minor 2024-05-07 08:26:44 +02:00
Lion 4d7967d5d9 bump version (#314) 2024-05-06 14:37:50 +02:00
Lion Kortlepel 5dd4c97ed1 bump version v3.3.0 2024-05-06 14:37:34 +02:00
Lion 13390c5388 Remove backup1, backup2 backend endpoints (#313) 2024-05-06 12:05:30 +02:00
Lion Kortlepel 2f995a71ae remove backup1, backup2 endpoints 2024-05-06 12:04:56 +02:00
Lion 3b5c6491a3 Fix timeout for synced players (#289) 
Fix: #275.

While I was at it, I also refactored the debug output so its more
appealing to read.

I dont see further ways to improve on this currently.
 2024-05-06 12:02:31 +02:00
sla-ppy db8719b5cd fix timeout for synced players 2024-05-06 12:02:16 +02:00
Lion a3c4b82a5d Allow provider to define server port ENV via BEAMMP_PROVIDER_PORT_ENV (#244) 2024-05-06 11:59:28 +02:00
Lion Kortlepel 3b0e49fb06 add /bigobj to fix compiling on windows 2024-05-06 11:56:26 +02:00
Lion Kortlepel cf8f10b949 add --port=value argument 2024-05-06 11:56:26 +02:00
Lion Kortlepel 6f50cad76b add BEAMMP_PROVIDER_PORT_ENV to allow provider to change which ENV 
variable the port is fetched from
 2024-05-06 11:56:26 +02:00
Lion 03d91b1f4d Disable server config generation via ENV variable BEAMMP_PROVIDER_DISABLE_CONFIG (#240) 2024-05-06 11:53:57 +02:00
Lion Kortlepel e407d246e2 update vcpkg 2024-05-06 11:47:00 +02:00
Lion Kortlepel 234bdf5877 add ENV variable to disable config generation and parsing 2024-05-06 11:46:21 +02:00
Lion c3b4528c89 Add lua Util.LogInfo(), Util.LogError(), etc. functions (#309) 
```lua
Util.LogInfo("Hello, World!")
Util.LogWarn("Cool warning")
Util.LogError("Oh no!")
Util.LogDebug("hi")
```
now produces

```
[19/04/24 11:06:50.142] [Test] [INFO] Hello, World!    
[19/04/24 11:06:50.142] [Test] [WARN] Cool warning    
[19/04/24 11:06:50.142] [Test] [ERROR] Oh no!
[19/04/24 11:06:50.142] [Test] [DEBUG] hi
```

where `Test` is the lua state id.
 2024-05-06 11:39:12 +02:00
Lion Kortlepel 5cf6d1d228 add Util.LogDebug 2024-04-20 20:16:57 +02:00
Lion Kortlepel 65017d0834 add lua log to test common 2024-04-19 11:35:39 +02:00