Skip to content

Commit 87ecf5e

Browse files
tsebringtsebring
committed
Tweaks
- Updated ragnarok map. - Display address configuration setting (per server). - Savegame extraction max degree of parallelism compatibility setting. - UI change for server details table in web app.
1 parent b1851de commit 87ecf5e

19 files changed

+87
-9
lines changed

‎ArkBot/Ark/ArkServerContext.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ public TimeSpan? ApproxTimeUntilNextUpdate
130130
}
131131
}
132132

133-
public ArkServerContext(ServerConfigSection config, ArkClusterContext clusterContext, ISavedState savedState, ILifetimeScope scope) : base(config?.SaveFilePath, clusterContext)
133+
public ArkServerContext(IConfig fullconfig, ServerConfigSection config, ArkClusterContext clusterContext, ISavedState savedState, ILifetimeScope scope) : base(config?.SaveFilePath, clusterContext, fullconfig.SavegameExtractionMaxDegreeOfParallelism)
134134
{
135135
Config = config;
136136
_clusterContext = clusterContext;

‎ArkBot/Config.cs‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,10 @@ public Config()
143143
[Description("Configure Web App and WebAPI to use SSL with a free certificate from Lets Encrypt")]
144144
public SslConfigSection Ssl { get; set; }
145145

146+
[JsonProperty(PropertyName = "savegameExtractionMaxDegreeOfParallelism")]
147+
[Description("Max degree of parallelism to use for savegame extraction. Change only if experiencing out of memory exceptions.")]
148+
public int? SavegameExtractionMaxDegreeOfParallelism { get; set; }
149+
146150
[JsonProperty(PropertyName = "servers")]
147151
[Description("Server instance configurations.")]
148152
public ServerConfigSection[] Servers { get; set; }
@@ -232,6 +236,10 @@ public ServerConfigSection()
232236
[Description("Absolute file path of the .ark save file to monitor/extract data from.")]
233237
public string SaveFilePath { get; set; }
234238

239+
[JsonProperty(PropertyName = "displayAddress")]
240+
[Description("Public server address visible to players.")]
241+
public string DisplayAddress { get; set; }
242+
235243
[JsonProperty(PropertyName = "ip")]
236244
[Description("The IP address used to connect to this server instance.")]
237245
public string Ip { get; set; }

‎ArkBot/IConfig.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ public interface IConfig
3434
string PowershellFilePath { get; set; }
3535
bool UseCompatibilityChangeWatcher { get; set; }
3636
SslConfigSection Ssl { get; set; }
37+
int? SavegameExtractionMaxDegreeOfParallelism { get; set; }
3738

3839
ServerConfigSection[] Servers { get; set; }
3940
ClusterConfigSection[] Clusters { get; set; }

‎ArkBot/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,5 +44,5 @@
4444
// You can specify all the values or you can default the Build and Revision Numbers
4545
// by using the '*' as shown below:
4646
// [assembly: AssemblyVersion("1.0.*")]
47-
[assembly: AssemblyVersion("1.68.*")]
48-
[assembly: AssemblyFileVersion("1.68.0.0")]
47+
[assembly: AssemblyVersion("1.69.*")]
48+
[assembly: AssemblyFileVersion("1.69.0.0")]

‎ArkBot/WebApi/Controllers/ServersController.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public async Task<ServerStatusAllViewModel> Get()
8181
{
8282
Key = context.Config.Key,
8383
Name = name,
84-
Address = info.Address,
84+
Address = context.Config.DisplayAddress ?? info.Address,
8585
Version = version.ToString(),
8686
OnlinePlayerCount = info.Players,
8787
OnlinePlayerMax = info.MaxPlayers,

‎ArkBot/WebApp/dist/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@
1818
<h3 class="w3-text-grey">Loading...</h3>
1919
</div>
2020
</section>
21-
<script type="text/javascript" src="inline.74145aa1c20526b1076b.bundle.js"></script><script type="text/javascript" src="polyfills.6fd0ea22f809f9a8e008.bundle.js"></script><script type="text/javascript" src="scripts.38ac096be18638d631af.bundle.js"></script><script type="text/javascript" src="vendor.2482fd314c69b93cb185.bundle.js"></script><script type="text/javascript" src="main.42b9c3f649df6178e9d3.bundle.js"></script></body>
21+
<script type="text/javascript" src="inline.15f9b23399410a66a629.bundle.js"></script><script type="text/javascript" src="polyfills.6fd0ea22f809f9a8e008.bundle.js"></script><script type="text/javascript" src="scripts.38ac096be18638d631af.bundle.js"></script><script type="text/javascript" src="vendor.2482fd314c69b93cb185.bundle.js"></script><script type="text/javascript" src="main.c165d2b3e5a64cc3d8f5.bundle.js"></script></body>
2222
</html>

‎ArkBot/WebApp/dist/inline.15f9b23399410a66a629.bundle.js‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ArkBot/WebApp/dist/inline.74145aa1c20526b1076b.bundle.js‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

ArkBot/WebApp/dist/main.42b9c3f649df6178e9d3.bundle.js renamed to ArkBot/WebApp/dist/main.c165d2b3e5a64cc3d8f5.bundle.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ArkBot/WebApp/src/app/server-list/server-list.component.html‎

Lines changed: 68 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,73 @@ <h3 class="theme-text-d1">Online <span class="w3-tag w3-large theme-d1">{{online
5656
</section>
5757
<ng-container *ngFor="let server of dataService.Servers?.Servers">
5858
<section *ngIf="isMenuActive(server.Key) &amp;&amp; dataService.Servers != undefined &amp;&amp; dataService.hasFeatureAccess('home', 'serverdetails')" class="w3-container">
59-
<h3 class="theme-text-d1"><a *ngIf="dataService.hasFeatureAccess('pages', 'server'); else serverdetails_no_link" [routerLink]="'/server/' + server.Key" style="text-decoration: none;">{{server.Name}}</a><ng-template #serverdetails_no_link>{{server.Name}}</ng-template></h3>
59+
<div class="w3-card-4 w3-responsive w3-margin-bottom">
60+
<header class="w3-container theme-d1">
61+
<h3><a *ngIf="dataService.hasFeatureAccess('pages', 'server'); else serverdetails_no_link" [routerLink]="'/server/' + server.Key" style="text-decoration: none;">{{server.Name}}</a><ng-template #serverdetails_no_link>{{server.Name}}</ng-template></h3>
62+
</header>
63+
<div class="w3-container theme-l1">
64+
<table class="w3-table w3-bordered w3-small border-theme serverdetails">
65+
<tr>
66+
<th class="theme-text-d1">Address</th>
67+
<td style="width: max-content;">{{server.Address}}</td>
68+
</tr>
69+
<tr>
70+
<th class="theme-text-d1">Version</th>
71+
<td>{{server.Version}}</td>
72+
</tr>
73+
<tr>
74+
<th class="theme-text-d1">Player Slots</th>
75+
<td>{{server.OnlinePlayerMax}}</td>
76+
</tr>
77+
<tr>
78+
<th class="theme-text-d1">Map</th>
79+
<td>{{server.MapName}}</td>
80+
</tr>
81+
<tr>
82+
<th class="theme-text-d1">In-Game Day</th>
83+
<td>{{server.InGameTime}}</td>
84+
</tr>
85+
<tr>
86+
<th class="theme-text-d1">Tamed Creatures</th>
87+
<td>{{server.TamedCreatureCount | number}}</td>
88+
</tr>
89+
<tr>
90+
<th class="theme-text-d1">Cloud Creatures</th>
91+
<td>{{server.CloudCreatureCount | number}}</td>
92+
</tr>
93+
<tr>
94+
<th class="theme-text-d1">Wild Creatures</th>
95+
<td>{{server.WildCreatureCount | number}}</td>
96+
</tr>
97+
<tr>
98+
<th class="theme-text-d1">Structures</th>
99+
<td>{{server.StructureCount | number}}</td>
100+
</tr>
101+
<tr>
102+
<th class="theme-text-d1">Players</th>
103+
<td>{{server.PlayerCount | number}}</td>
104+
</tr>
105+
<tr>
106+
<th class="theme-text-d1">Tribes</th>
107+
<td>{{server.TribeCount | number}}</td>
108+
</tr>
109+
<tr>
110+
<th class="theme-text-d1">Last Update</th>
111+
<td>{{server.LastUpdate}}</td>
112+
</tr>
113+
<tr>
114+
<th class="theme-text-d1">Next Update</th>
115+
<td>{{server.NextUpdate}}</td>
116+
</tr>
117+
<tr style="border-bottom: none;">
118+
<th class="theme-text-d1">Uptime</th>
119+
<td>{{server.ServerStarted ? toRelativeDate(server.ServerStarted) : '-'}}</td>
120+
</tr>
121+
</table>
122+
</div>
123+
</div>
124+
125+
<!--<h3 class="theme-text-d1"><a *ngIf="dataService.hasFeatureAccess('pages', 'server'); else serverdetails_no_link" [routerLink]="'/server/' + server.Key" style="text-decoration: none;">{{server.Name}}</a><ng-template #serverdetails_no_link>{{server.Name}}</ng-template></h3>
60126
<div class="w3-responsive w3-margin-bottom">
61127
<table class="w3-table w3-bordered w3-small border-theme serverdetails">
62128
<tr>
@@ -116,7 +182,7 @@ <h3 class="theme-text-d1"><a *ngIf="dataService.hasFeatureAccess('pages', 'serve
116182
<td>{{server.ServerStarted ? toRelativeDate(server.ServerStarted) : '-'}}</td>
117183
</tr>
118184
</table>
119-
</div>
185+
</div>-->
120186
<ng-container *ngIf="dataService.hasFeatureAccess('home', 'online')">
121187
<h3 class="theme-text-d1">Online <span class="w3-tag w3-large theme-d1">{{server.OnlinePlayerCount}}</span></h3>
122188
<div *ngIf="server.OnlinePlayerCount == 0; else server_online_players_list">There are no players online...</div>

0 commit comments

Comments
 (0)