chillcog/SPT-Server-Build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

small refactor to routers and added notifier stuff

Browse Source
This commit is contained in:
Alex
2025-02-09 18:31:07 +00:00
parent a3bc7eea23
commit 88893ac7be
30 changed files with 245 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Libraries/Core/Callbacks/NotifierCallbacks.cs
+34 -1
View File
@@ -1,7 +1,9 @@
using Core.Controllers;
using Core.Helpers;
using Core.Models.Eft.Common;
using Core.Models.Eft.Common.Request;
using Core.Models.Eft.Notifier;
using Core.Models.Utils;
using Core.Utils;
using SptCommon.Annotations;
@@ -10,9 +12,40 @@ namespace Core.Callbacks;
[Injectable(InjectableTypeOverride = typeof(NotifierCallbacks))]
public class NotifierCallbacks(
HttpResponseUtil _httpResponseUtil,
NotifierController _notifierController
NotifierController _notifierController,
JsonUtil jsonUtil,
HttpServerHelper httpServerHelper
)
{
/**
* If we don't have anything to send, it's ok to not send anything back
* because notification requests can be long-polling. In fact, we SHOULD wait
* until we actually have something to send because otherwise we'd spam the client
* and the client would abort the connection due to spam.
*/
public void SendNotification(string sessionID, HttpRequest req, HttpResponse resp, object data)
{
var splittedUrl = req.Path.Value.Split("/");
var tmpSessionID = splittedUrl[^1].Split("?last_id")[0];
/*
* Take our array of JSON message objects and cast them to JSON strings, so that they can then
* be sent to client as NEWLINE separated strings... yup.
*/
_notifierController.NotifyAsync(tmpSessionID)
.ContinueWith(messages => messages.Result.Select(message => string.Join("\n", jsonUtil.Serialize(message))))
.ContinueWith(text => httpServerHelper.SendTextJson(resp, text.Result));
}
/** Handle push/notifier/get */
/** Handle push/notifier/getwebsocket */
// TODO: removed from client?
public string GetNotifier(string url, IRequestData info, string sessionID)
{
return _httpResponseUtil.EmptyArrayResponse();
}
/// <summary>
/// Handle client/notifier/channel/create
/// </summary>
Libraries/Core/Controllers/NotifierController.cs
+27 -40
View File
@@ -1,5 +1,7 @@
using Core.Helpers;
using Core.Models.Eft.Notifier;
using Core.Models.Eft.Ws;
using Core.Services;
using SptCommon.Annotations;
namespace Core.Controllers;
@@ -7,9 +9,13 @@ namespace Core.Controllers;
[Injectable]
public class NotifierController(
HttpServerHelper _httpServerHelper,
NotifierHelper _notifierHelper
NotifierHelper _notifierHelper,
NotificationService notificationService
)
{
protected const int PollInterval = 300;
protected const int Timeout = 15000;
/// <summary>
/// Resolve an array of session notifications.
/// If no notifications are currently queued then intermittently check for new notifications until either
@@ -17,49 +23,30 @@ public class NotifierController(
/// If no notifications are available after the timeout, use a default message.
/// </summary>
/// <param name="sessionId"></param>
public async Task NotifyAsync(string sessionId)
public Task<List<WsNotificationEvent>> NotifyAsync(string sessionId)
{
// TODO: Finish implementation of the NotifyAsync method
//
//return new Promise((resolve) => {
// // keep track of our timeout
// let counter = 0;
return Task.Factory.StartNew(() => {
// keep track of our timeout
var counter = 0;
// /**
// * Check for notifications, resolve if any, otherwise poll
// * intermittently for a period of time.
// */
// var checkNotifications = () => {
// /**
// * If there are no pending messages we should either check again later
// * or timeout now with a default response.
// */
// if (!_notificationService.Has(sessionID)) {
// // have we exceeded timeout? if so reply with default ping message
// if (counter > _timeout) {
// return resolve([_notifierHelper.getDefaultNotification()]);
// }
while (counter < Timeout)
{
if (!notificationService.Has(sessionId))
{
counter += PollInterval;
Thread.Sleep(PollInterval);
}
else
{
var messages = notificationService.Get(sessionId);
// // check again
// setTimeout(checkNotifications, _pollInterval);
notificationService.UpdateMessageOnQueue(sessionId, []);
return messages;
}
}
// // update our timeout counter
// counter += _pollInterval;
// return;
// }
// /**
// * Maintaining array reference is not necessary, so we can just copy and reinitialize
// */
// var messages = _notificationService.Get(sessionID);
// _notificationService.UpdateMessageOnQueue(sessionID, []);
// resolve(messages);
//};
// immediately check
// checkNotifications();
//});
return [_notifierHelper.GetDefaultNotification()];
});
}
/// <summary>
Libraries/Core/Routers/Dynamic/BotDynamicRouter.cs
+5 -8
View File
@@ -9,8 +9,6 @@ namespace Core.Routers.Dynamic;
[Injectable(InjectableTypeOverride = typeof(DynamicRouter))]
public class BotDynamicRouter : DynamicRouter
{
protected static BotCallbacks _botCallbacks;
public BotDynamicRouter(
JsonUtil jsonUtil,
BotCallbacks botCallbacks
@@ -24,7 +22,7 @@ public class BotDynamicRouter : DynamicRouter
info,
sessionID,
output
) => _botCallbacks.GetBotLimit(url, info as EmptyRequestData, sessionID)
) => botCallbacks.GetBotLimit(url, info as EmptyRequestData, sessionID)
),
new RouteAction(
"/singleplayer/settings/bot/difficulty/",
@@ -33,7 +31,7 @@ public class BotDynamicRouter : DynamicRouter
info,
sessionID,
output
) => _botCallbacks.GetBotDifficulty(url, info as EmptyRequestData, sessionID)
) => botCallbacks.GetBotDifficulty(url, info as EmptyRequestData, sessionID)
),
new RouteAction(
"/singleplayer/settings/bot/difficulties",
@@ -42,7 +40,7 @@ public class BotDynamicRouter : DynamicRouter
info,
sessionID,
output
) => _botCallbacks.GetAllBotDifficulties(url, info as EmptyRequestData, sessionID)
) => botCallbacks.GetAllBotDifficulties(url, info as EmptyRequestData, sessionID)
),
new RouteAction(
"/singleplayer/settings/bot/maxCap",
@@ -51,7 +49,7 @@ public class BotDynamicRouter : DynamicRouter
info,
sessionID,
output
) => _botCallbacks.GetBotCap(url, info as EmptyRequestData, sessionID)
) => botCallbacks.GetBotCap(url, info as EmptyRequestData, sessionID)
),
new RouteAction(
"/singleplayer/settings/bot/getBotBehaviours/",
@@ -60,11 +58,10 @@ public class BotDynamicRouter : DynamicRouter
info,
sessionID,
output
) => _botCallbacks.GetBotBehaviours()
) => botCallbacks.GetBotBehaviours()
)
]
)
{
_botCallbacks = botCallbacks;
}
}
Libraries/Core/Routers/Dynamic/BundleDynamicRouter.cs
+1 -4
View File
@@ -9,8 +9,6 @@ namespace Core.Routers.Dynamic;
[Injectable(InjectableTypeOverride = typeof(DynamicRouter))]
public class BundleDynamicRouter : DynamicRouter
{
protected static BundleCallbacks _bundleCallbacks;
public BundleDynamicRouter(
JsonUtil jsonUtil,
BundleCallbacks bundleCallbacks
@@ -24,11 +22,10 @@ public class BundleDynamicRouter : DynamicRouter
info,
sessionID,
output
) => _bundleCallbacks.GetBundle(url, info as EmptyRequestData, sessionID)
) => bundleCallbacks.GetBundle(url, info as EmptyRequestData, sessionID)
)
]
)
{
_bundleCallbacks = bundleCallbacks;
}
}
Libraries/Core/Routers/Dynamic/CustomizationDynamicRouter.cs
+1 -4
View File
@@ -9,8 +9,6 @@ namespace Core.Routers.Dynamic;
[Injectable(InjectableTypeOverride = typeof(DynamicRouter))]
public class CustomizationDynamicRouter : DynamicRouter
{
protected static CustomizationCallbacks _customizationCallbacks;
public CustomizationDynamicRouter(
JsonUtil jsonUtil,
CustomizationCallbacks customizationCallbacks
@@ -24,11 +22,10 @@ public class CustomizationDynamicRouter : DynamicRouter
info,
sessionID,
output
) => _customizationCallbacks.GetTraderSuits(url, info as EmptyRequestData, sessionID)
) => customizationCallbacks.GetTraderSuits(url, info as EmptyRequestData, sessionID)
)
]
)
{
_customizationCallbacks = customizationCallbacks;
}
}
Libraries/Core/Routers/Dynamic/DataDynamicRouter.cs
+3 -5
View File
@@ -9,7 +9,6 @@ namespace Core.Routers.Dynamic;
[Injectable(InjectableTypeOverride = typeof(DynamicRouter))]
public class DataDynamicRouter : DynamicRouter
{
protected static DataCallbacks _dataCallbacks;
public DataDynamicRouter(
JsonUtil jsonUtil,
@@ -24,7 +23,7 @@ public class DataDynamicRouter : DynamicRouter
info,
sessionID,
output
) => _dataCallbacks.GetLocalesMenu(url, info as EmptyRequestData, sessionID)
) => dataCallbacks.GetLocalesMenu(url, info as EmptyRequestData, sessionID)
),
new RouteAction(
"/client/locale/",
@@ -33,7 +32,7 @@ public class DataDynamicRouter : DynamicRouter
info,
sessionID,
output
) => _dataCallbacks.GetLocalesGlobal(url, info as EmptyRequestData, sessionID)
) => dataCallbacks.GetLocalesGlobal(url, info as EmptyRequestData, sessionID)
),
new RouteAction(
"/client/items/prices/",
@@ -42,11 +41,10 @@ public class DataDynamicRouter : DynamicRouter
info,
sessionID,
output
) => _dataCallbacks.GetItemPrices(url, info as EmptyRequestData, sessionID)
) => dataCallbacks.GetItemPrices(url, info as EmptyRequestData, sessionID)
)
]
)
{
_dataCallbacks = dataCallbacks;
}
}
Libraries/Core/Routers/Dynamic/InraidDynamicRouter.cs
+1 -4
View File
@@ -9,8 +9,6 @@ namespace Core.Routers.Dynamic;
[Injectable(InjectableTypeOverride = typeof(DynamicRouter))]
public class InraidDynamicRouter : DynamicRouter
{
protected static InraidCallbacks _inraidCallbacks;
public InraidDynamicRouter(
JsonUtil jsonUtil,
InraidCallbacks inraidCallbacks
@@ -24,13 +22,12 @@ public class InraidDynamicRouter : DynamicRouter
info,
sessionID,
output
) => _inraidCallbacks.RegisterPlayer(url, info as RegisterPlayerRequestData, sessionID),
) => inraidCallbacks.RegisterPlayer(url, info as RegisterPlayerRequestData, sessionID),
typeof(RegisterPlayerRequestData)
)
]
)
{
_inraidCallbacks = inraidCallbacks;
}
public override string GetTopLevelRoute()
Libraries/Core/Routers/Dynamic/NotifierDynamicRouter.cs
+22 -7
View File
@@ -8,8 +8,6 @@ namespace Core.Routers.Dynamic;
[Injectable(InjectableTypeOverride = typeof(DynamicRouter))]
public class NotifierDynamicRouter : DynamicRouter
{
protected static NotifierCallbacks _notifierCallbacks;
public NotifierDynamicRouter(
JsonUtil jsonUtil,
NotifierCallbacks notifierCallbacks
@@ -22,8 +20,8 @@ public class NotifierDynamicRouter : DynamicRouter
url,
info,
sessionID,
output
) => _notifierCallbacks.Notify(url, info, sessionID)
_
) => notifierCallbacks.Notify(url, info, sessionID)
),
new RouteAction(
"/notifierServer",
@@ -31,12 +29,29 @@ public class NotifierDynamicRouter : DynamicRouter
url,
info,
sessionID,
output
) => _notifierCallbacks.Notify(url, info, sessionID)
_
) => notifierCallbacks.Notify(url, info, sessionID)
),
new RouteAction(
"/push/notifier/get/",
(
url,
info,
sessionID,
_
) => notifierCallbacks.GetNotifier(url, info, sessionID)
),
new RouteAction(
"/push/notifier/get/",
(
url,
info,
sessionID,
_
) => notifierCallbacks.GetNotifier(url, info, sessionID)
)
]
)
{
_notifierCallbacks = notifierCallbacks;
}
}
Libraries/Core/Routers/Dynamic/TraderDynamicRouter.cs
+2 -5
View File
@@ -9,8 +9,6 @@ namespace Core.Routers.Dynamic;
[Injectable(InjectableTypeOverride = typeof(DynamicRouter))]
public class TraderDynamicRouter : DynamicRouter
{
protected static TraderCallbacks _traderCallbacks;
public TraderDynamicRouter(
JsonUtil jsonUtil,
TraderCallbacks traderCallbacks
@@ -24,7 +22,7 @@ public class TraderDynamicRouter : DynamicRouter
info,
sessionID,
output
) => _traderCallbacks.GetTrader(url, info as EmptyRequestData, sessionID)
) => traderCallbacks.GetTrader(url, info as EmptyRequestData, sessionID)
),
new RouteAction(
"/client/trading/api/getTraderAssort/",
@@ -33,11 +31,10 @@ public class TraderDynamicRouter : DynamicRouter
info,
sessionID,
output
) => _traderCallbacks.GetAssort(url, info as EmptyRequestData, sessionID)
) => traderCallbacks.GetAssort(url, info as EmptyRequestData, sessionID)
)
]
)
{
_traderCallbacks = traderCallbacks;
}
}
Libraries/Core/Routers/Serializers/NotifySerializer.cs
+31 -2
View File
@@ -1,5 +1,34 @@
namespace Core.Routers.Serializers;
using Core.Controllers;
using Core.DI;
using Core.Helpers;
using Core.Utils;
using SptCommon.Annotations;
public class NotifySerializer
namespace Core.Routers.Serializers;
[Injectable]
public class NotifySerializer(
NotifierController notifierController,
JsonUtil jsonUtil,
HttpServerHelper httpServerHelper
) : ISerializer
{
public void Serialize(string sessionID, HttpRequest req, HttpResponse resp, object? body)
{
var splittedUrl = req.Path.Value.Split("/");
var tmpSessionID = splittedUrl[^1].Split("?last_id")[0];
/*
* Take our array of JSON message objects and cast them to JSON strings, so that they can then
* be sent to client as NEWLINE separated strings... yup.
*/
notifierController.NotifyAsync(tmpSessionID)
.ContinueWith(messages => messages.Result.Select(message => string.Join("\n", jsonUtil.Serialize(message))))
.ContinueWith(text => httpServerHelper.SendTextJson(resp, text));
}
public bool CanHandle(string route)
{
return route.ToUpper() == "NOTIFY";
}
}
Libraries/Core/Routers/Static/AchievementStaticRouter.cs
+2 -5
View File
@@ -9,8 +9,6 @@ namespace Core.Routers.Static;
[Injectable(InjectableTypeOverride = typeof(StaticRouter))]
public class AchievementStaticRouter : StaticRouter
{
private static AchievementCallbacks? _achievementCallbacks;
public AchievementStaticRouter(
JsonUtil jsonUtil,
AchievementCallbacks achievementCallbacks
@@ -24,7 +22,7 @@ public class AchievementStaticRouter : StaticRouter
info,
sessionID,
output
) => _achievementCallbacks?.GetAchievements(url, info as EmptyRequestData, sessionID)
) => achievementCallbacks.GetAchievements(url, info as EmptyRequestData, sessionID)
),
new RouteAction(
"/client/achievement/statistic",
@@ -33,11 +31,10 @@ public class AchievementStaticRouter : StaticRouter
info,
sessionID,
output
) => _achievementCallbacks?.Statistic(url, info as EmptyRequestData, sessionID)
) => achievementCallbacks.Statistic(url, info as EmptyRequestData, sessionID)
)
]
)
{
_achievementCallbacks = achievementCallbacks;
}
}
Libraries/Core/Routers/Static/BotStaticRouter.cs
+1 -4
View File
@@ -9,8 +9,6 @@ namespace Core.Routers.Static;
[Injectable(InjectableTypeOverride = typeof(StaticRouter))]
public class BotStaticRouter : StaticRouter
{
protected static BotCallbacks _botCallbacks;
public BotStaticRouter(
JsonUtil jsonUtil,
BotCallbacks botCallbacks
@@ -24,12 +22,11 @@ public class BotStaticRouter : StaticRouter
info,
sessionID,
outout
) => _botCallbacks.GenerateBots(url, info as GenerateBotsRequestData, sessionID),
) => botCallbacks.GenerateBots(url, info as GenerateBotsRequestData, sessionID),
typeof(GenerateBotsRequestData)
)
]
)
{
_botCallbacks = botCallbacks;
}
}
Libraries/Core/Routers/Static/BuildStaticRouter.cs
+5 -8
View File
@@ -11,8 +11,6 @@ namespace Core.Routers.Static;
[Injectable(InjectableTypeOverride = typeof(StaticRouter))]
public class BuildStaticRouter : StaticRouter
{
protected static BuildsCallbacks _buildsCallbacks;
public BuildStaticRouter(
JsonUtil jsonUtil,
BuildsCallbacks buildsCallbacks
@@ -26,7 +24,7 @@ public class BuildStaticRouter : StaticRouter
info,
sessionID,
output
) => _buildsCallbacks.GetBuilds(url, info as EmptyRequestData, sessionID)
) => buildsCallbacks.GetBuilds(url, info as EmptyRequestData, sessionID)
),
new RouteAction(
"/client/builds/magazine/save",
@@ -35,7 +33,7 @@ public class BuildStaticRouter : StaticRouter
info,
sessionID,
output
) => _buildsCallbacks.CreateMagazineTemplate(url, info as SetMagazineRequest, sessionID),
) => buildsCallbacks.CreateMagazineTemplate(url, info as SetMagazineRequest, sessionID),
typeof(SetMagazineRequest)
),
new RouteAction(
@@ -45,7 +43,7 @@ public class BuildStaticRouter : StaticRouter
info,
sessionID,
output
) => _buildsCallbacks.SetWeapon(url, info as PresetBuildActionRequestData, sessionID),
) => buildsCallbacks.SetWeapon(url, info as PresetBuildActionRequestData, sessionID),
typeof(PresetBuildActionRequestData)
),
new RouteAction(
@@ -55,7 +53,7 @@ public class BuildStaticRouter : StaticRouter
info,
sessionID,
output
) => _buildsCallbacks.SetEquipment(url, info as PresetBuildActionRequestData, sessionID),
) => buildsCallbacks.SetEquipment(url, info as PresetBuildActionRequestData, sessionID),
typeof(PresetBuildActionRequestData)
),
new RouteAction(
@@ -65,12 +63,11 @@ public class BuildStaticRouter : StaticRouter
info,
sessionID,
output
) => _buildsCallbacks.DeleteBuild(url, info as RemoveBuildRequestData, sessionID),
) => buildsCallbacks.DeleteBuild(url, info as RemoveBuildRequestData, sessionID),
typeof(RemoveBuildRequestData)
)
]
)
{
_buildsCallbacks = buildsCallbacks;
}
}
Libraries/Core/Routers/Static/BundleStaticRouter.cs
+1 -4
View File
@@ -9,8 +9,6 @@ namespace Core.Routers.Static;
[Injectable(InjectableTypeOverride = typeof(StaticRouter))]
public class BundleStaticRouter : StaticRouter
{
protected static BundleCallbacks _bundleCallbacks;
public BundleStaticRouter(
JsonUtil jsonUtil,
BundleCallbacks bundleCallbacks
@@ -24,11 +22,10 @@ public class BundleStaticRouter : StaticRouter
info,
sessionID,
output
) => _bundleCallbacks.GetBundles(url, info as EmptyRequestData, sessionID)
) => bundleCallbacks.GetBundles(url, info as EmptyRequestData, sessionID)
)
]
)
{
_bundleCallbacks = bundleCallbacks;
}
}
Libraries/Core/Routers/Static/ClientLogStaticRouter.cs
+3 -6
View File
@@ -9,8 +9,6 @@ namespace Core.Routers.Static;
[Injectable(InjectableTypeOverride = typeof(StaticRouter))]
public class ClientLogStaticRouter : StaticRouter
{
protected static ClientLogCallbacks _clientLogCallbacks;
public ClientLogStaticRouter(
JsonUtil jsonUtil,
ClientLogCallbacks clientLogCallbacks
@@ -24,7 +22,7 @@ public class ClientLogStaticRouter : StaticRouter
info,
sessionID,
output
) => _clientLogCallbacks.ClientLog(url, info as ClientLogRequest, sessionID),
) => clientLogCallbacks.ClientLog(url, info as ClientLogRequest, sessionID),
typeof(ClientLogRequest)
),
new RouteAction(
@@ -34,7 +32,7 @@ public class ClientLogStaticRouter : StaticRouter
info,
sessionID,
output
) => _clientLogCallbacks.ReleaseNotes()
) => clientLogCallbacks.ReleaseNotes()
),
new RouteAction(
"/singleplayer/enableBSGlogging",
@@ -43,11 +41,10 @@ public class ClientLogStaticRouter : StaticRouter
info,
sessionID,
output
) => _clientLogCallbacks.BsgLogging()
) => clientLogCallbacks.BsgLogging()
)
]
)
{
_clientLogCallbacks = clientLogCallbacks;
}
}
Libraries/Core/Routers/Static/CustomizationStaticRouter.cs
+3 -6
View File
@@ -9,8 +9,6 @@ namespace Core.Routers.Static;
[Injectable(InjectableTypeOverride = typeof(StaticRouter))]
public class CustomizationStaticRouter : StaticRouter
{
protected static CustomizationCallbacks _customizationCallbacks;
public CustomizationStaticRouter(
JsonUtil jsonUtil,
CustomizationCallbacks customizationCallbacks
@@ -24,7 +22,7 @@ public class CustomizationStaticRouter : StaticRouter
info,
sessionID,
output
) => _customizationCallbacks.GetCustomisationUnlocks(url, info as EmptyRequestData, sessionID)
) => customizationCallbacks.GetCustomisationUnlocks(url, info as EmptyRequestData, sessionID)
),
new RouteAction(
"/client/hideout/customization/offer/list",
@@ -33,7 +31,7 @@ public class CustomizationStaticRouter : StaticRouter
info,
sessionID,
output
) => _customizationCallbacks.GetHideoutCustomisation(url, info as EmptyRequestData, sessionID)
) => customizationCallbacks.GetHideoutCustomisation(url, info as EmptyRequestData, sessionID)
),
new RouteAction(
"/client/customization/storage",
@@ -42,11 +40,10 @@ public class CustomizationStaticRouter : StaticRouter
info,
sessionID,
output
) => _customizationCallbacks.GetStorage(url, info as EmptyRequestData, sessionID)
) => customizationCallbacks.GetStorage(url, info as EmptyRequestData, sessionID)
)
]
)
{
_customizationCallbacks = customizationCallbacks;
}
}
Libraries/Core/Routers/Static/DataStaticRouter.cs
+11 -14
View File
@@ -9,8 +9,6 @@ namespace Core.Routers.Static;
[Injectable(InjectableTypeOverride = typeof(StaticRouter))]
public class DataStaticRouter : StaticRouter
{
protected static DataCallbacks _dataCallbacks;
public DataStaticRouter(
JsonUtil jsonUtil,
DataCallbacks dataCallbacks
@@ -24,7 +22,7 @@ public class DataStaticRouter : StaticRouter
info,
sessionID,
output
) => _dataCallbacks.GetSettings(url, info as EmptyRequestData, sessionID)
) => dataCallbacks.GetSettings(url, info as EmptyRequestData, sessionID)
),
new RouteAction(
"/client/globals",
@@ -33,7 +31,7 @@ public class DataStaticRouter : StaticRouter
info,
sessionID,
output
) => _dataCallbacks.GetGlobals(url, info as EmptyRequestData, sessionID)
) => dataCallbacks.GetGlobals(url, info as EmptyRequestData, sessionID)
),
new RouteAction(
"/client/items",
@@ -42,7 +40,7 @@ public class DataStaticRouter : StaticRouter
info,
sessionID,
output
) => _dataCallbacks.GetTemplateItems(url, info as EmptyRequestData, sessionID)
) => dataCallbacks.GetTemplateItems(url, info as EmptyRequestData, sessionID)
),
new RouteAction(
"/client/handbook/templates",
@@ -51,7 +49,7 @@ public class DataStaticRouter : StaticRouter
info,
sessionID,
output
) => _dataCallbacks.GetTemplateHandbook(url, info as EmptyRequestData, sessionID)
) => dataCallbacks.GetTemplateHandbook(url, info as EmptyRequestData, sessionID)
),
new RouteAction(
"/client/customization",
@@ -60,7 +58,7 @@ public class DataStaticRouter : StaticRouter
info,
sessionID,
output
) => _dataCallbacks.GetTemplateSuits(url, info as EmptyRequestData, sessionID)
) => dataCallbacks.GetTemplateSuits(url, info as EmptyRequestData, sessionID)
),
new RouteAction(
"/client/account/customization",
@@ -69,7 +67,7 @@ public class DataStaticRouter : StaticRouter
info,
sessionID,
output
) => _dataCallbacks.GetTemplateCharacter(url, info as EmptyRequestData, sessionID)
) => dataCallbacks.GetTemplateCharacter(url, info as EmptyRequestData, sessionID)
),
new RouteAction(
"/client/hideout/production/recipes",
@@ -78,7 +76,7 @@ public class DataStaticRouter : StaticRouter
info,
sessionID,
output
) => _dataCallbacks.GetHideoutProduction(url, info as EmptyRequestData, sessionID)
) => dataCallbacks.GetHideoutProduction(url, info as EmptyRequestData, sessionID)
),
new RouteAction(
"/client/hideout/settings",
@@ -87,7 +85,7 @@ public class DataStaticRouter : StaticRouter
info,
sessionID,
output
) => _dataCallbacks.GetHideoutSettings(url, info as EmptyRequestData, sessionID)
) => dataCallbacks.GetHideoutSettings(url, info as EmptyRequestData, sessionID)
),
new RouteAction(
"/client/hideout/areas",
@@ -96,7 +94,7 @@ public class DataStaticRouter : StaticRouter
info,
sessionID,
output
) => _dataCallbacks.GetHideoutAreas(url, info as EmptyRequestData, sessionID)
) => dataCallbacks.GetHideoutAreas(url, info as EmptyRequestData, sessionID)
),
new RouteAction(
"/client/languages",
@@ -105,7 +103,7 @@ public class DataStaticRouter : StaticRouter
info,
sessionID,
output
) => _dataCallbacks.GetLocalesLanguages(url, info as EmptyRequestData, sessionID)
) => dataCallbacks.GetLocalesLanguages(url, info as EmptyRequestData, sessionID)
),
new RouteAction(
"/client/hideout/qte/list",
@@ -114,11 +112,10 @@ public class DataStaticRouter : StaticRouter
info,
sessionID,
output
) => _dataCallbacks.GetQteList(url, info as EmptyRequestData, sessionID)
) => dataCallbacks.GetQteList(url, info as EmptyRequestData, sessionID)
)
]
)
{
_dataCallbacks = dataCallbacks;
}
}
Libraries/Core/Routers/Static/DialogStaticRouter.cs
+26 -29
View File
@@ -11,8 +11,6 @@ namespace Core.Routers.Static;
[Injectable(InjectableTypeOverride = typeof(StaticRouter))]
public class DialogStaticRouter : StaticRouter
{
protected static DialogueCallbacks _dialogueCallbacks;
public DialogStaticRouter(
JsonUtil jsonUtil,
DialogueCallbacks dialogueCallbacks
@@ -26,7 +24,7 @@ public class DialogStaticRouter : StaticRouter
info,
sessionID,
output
) => _dialogueCallbacks.GetChatServerList(url, info as GetChatServerListRequestData, sessionID),
) => dialogueCallbacks.GetChatServerList(url, info as GetChatServerListRequestData, sessionID),
typeof(GetChatServerListRequestData)
),
new RouteAction(
@@ -36,7 +34,7 @@ public class DialogStaticRouter : StaticRouter
info,
sessionID,
output
) => _dialogueCallbacks.GetMailDialogList(url, info as GetMailDialogListRequestData, sessionID),
) => dialogueCallbacks.GetMailDialogList(url, info as GetMailDialogListRequestData, sessionID),
typeof(GetMailDialogListRequestData)
),
new RouteAction(
@@ -46,7 +44,7 @@ public class DialogStaticRouter : StaticRouter
info,
sessionID,
output
) => _dialogueCallbacks.GetMailDialogView(url, info as GetMailDialogViewRequestData, sessionID),
) => dialogueCallbacks.GetMailDialogView(url, info as GetMailDialogViewRequestData, sessionID),
typeof(GetMailDialogViewRequestData)
),
new RouteAction(
@@ -56,7 +54,7 @@ public class DialogStaticRouter : StaticRouter
info,
sessionID,
output
) => _dialogueCallbacks.GetMailDialogInfo(url, info as GetMailDialogInfoRequestData, sessionID),
) => dialogueCallbacks.GetMailDialogInfo(url, info as GetMailDialogInfoRequestData, sessionID),
typeof(GetMailDialogInfoRequestData)
),
new RouteAction(
@@ -66,7 +64,7 @@ public class DialogStaticRouter : StaticRouter
info,
sessionID,
output
) => _dialogueCallbacks.RemoveDialog(url, info as RemoveDialogRequestData, sessionID),
) => dialogueCallbacks.RemoveDialog(url, info as RemoveDialogRequestData, sessionID),
typeof(RemoveDialogRequestData)
),
new RouteAction(
@@ -76,7 +74,7 @@ public class DialogStaticRouter : StaticRouter
info,
sessionID,
output
) => _dialogueCallbacks.PinDialog(url, info as PinDialogRequestData, sessionID),
) => dialogueCallbacks.PinDialog(url, info as PinDialogRequestData, sessionID),
typeof(PinDialogRequestData)
),
new RouteAction(
@@ -86,7 +84,7 @@ public class DialogStaticRouter : StaticRouter
info,
sessionID,
output
) => _dialogueCallbacks.UnpinDialog(url, info as PinDialogRequestData, sessionID),
) => dialogueCallbacks.UnpinDialog(url, info as PinDialogRequestData, sessionID),
typeof(PinDialogRequestData)
),
new RouteAction(
@@ -96,7 +94,7 @@ public class DialogStaticRouter : StaticRouter
info,
sessionID,
output
) => _dialogueCallbacks.SetRead(url, info as SetDialogReadRequestData, sessionID),
) => dialogueCallbacks.SetRead(url, info as SetDialogReadRequestData, sessionID),
typeof(SetDialogReadRequestData)
),
new RouteAction(
@@ -106,7 +104,7 @@ public class DialogStaticRouter : StaticRouter
info,
sessionID,
output
) => _dialogueCallbacks.GetAllAttachments(url, info as GetAllAttachmentsRequestData, sessionID),
) => dialogueCallbacks.GetAllAttachments(url, info as GetAllAttachmentsRequestData, sessionID),
typeof(GetAllAttachmentsRequestData)
),
new RouteAction(
@@ -116,7 +114,7 @@ public class DialogStaticRouter : StaticRouter
info,
sessionID,
output
) => _dialogueCallbacks.SendMessage(url, info as SendMessageRequest, sessionID),
) => dialogueCallbacks.SendMessage(url, info as SendMessageRequest, sessionID),
typeof(SendMessageRequest)
),
new RouteAction(
@@ -126,7 +124,7 @@ public class DialogStaticRouter : StaticRouter
info,
sessionID,
output
) => _dialogueCallbacks.ClearMail(url, info as ClearMailMessageRequest, sessionID),
) => dialogueCallbacks.ClearMail(url, info as ClearMailMessageRequest, sessionID),
typeof(ClearMailMessageRequest)
),
new RouteAction(
@@ -136,7 +134,7 @@ public class DialogStaticRouter : StaticRouter
info,
sessionID,
output
) => _dialogueCallbacks.CreateGroupMail(url, info as CreateGroupMailRequest, sessionID),
) => dialogueCallbacks.CreateGroupMail(url, info as CreateGroupMailRequest, sessionID),
typeof(CreateGroupMailRequest)
),
new RouteAction(
@@ -146,7 +144,7 @@ public class DialogStaticRouter : StaticRouter
info,
sessionID,
output
) => _dialogueCallbacks.ChangeMailGroupOwner(url, info as ChangeGroupMailOwnerRequest, sessionID),
) => dialogueCallbacks.ChangeMailGroupOwner(url, info as ChangeGroupMailOwnerRequest, sessionID),
typeof(ChangeGroupMailOwnerRequest)
),
new RouteAction(
@@ -156,7 +154,7 @@ public class DialogStaticRouter : StaticRouter
info,
sessionID,
output
) => _dialogueCallbacks.AddUserToMail(url, info as AddUserGroupMailRequest, sessionID),
) => dialogueCallbacks.AddUserToMail(url, info as AddUserGroupMailRequest, sessionID),
typeof(AddUserGroupMailRequest)
),
new RouteAction(
@@ -166,7 +164,7 @@ public class DialogStaticRouter : StaticRouter
info,
sessionID,
output
) => _dialogueCallbacks.RemoveUserFromMail(url, info as RemoveUserGroupMailRequest, sessionID),
) => dialogueCallbacks.RemoveUserFromMail(url, info as RemoveUserGroupMailRequest, sessionID),
typeof(RemoveUserGroupMailRequest)
),
new RouteAction(
@@ -176,7 +174,7 @@ public class DialogStaticRouter : StaticRouter
info,
sessionID,
output
) => _dialogueCallbacks.GetFriendList(url, info as EmptyRequestData, sessionID)
) => dialogueCallbacks.GetFriendList(url, info as EmptyRequestData, sessionID)
),
new RouteAction(
"/client/friend/request/list/outbox",
@@ -185,7 +183,7 @@ public class DialogStaticRouter : StaticRouter
info,
sessionID,
output
) => _dialogueCallbacks.ListOutbox(url, info as EmptyRequestData, sessionID)
) => dialogueCallbacks.ListOutbox(url, info as EmptyRequestData, sessionID)
),
new RouteAction(
"/client/friend/request/list/inbox",
@@ -194,7 +192,7 @@ public class DialogStaticRouter : StaticRouter
info,
sessionID,
output
) => _dialogueCallbacks.ListInbox(url, info as EmptyRequestData, sessionID)
) => dialogueCallbacks.ListInbox(url, info as EmptyRequestData, sessionID)
),
new RouteAction(
"/client/friend/request/send",
@@ -203,7 +201,7 @@ public class DialogStaticRouter : StaticRouter
info,
sessionID,
output
) => _dialogueCallbacks.SendFriendRequest(url, info as FriendRequestData, sessionID),
) => dialogueCallbacks.SendFriendRequest(url, info as FriendRequestData, sessionID),
typeof(FriendRequestData)
),
new RouteAction(
@@ -213,7 +211,7 @@ public class DialogStaticRouter : StaticRouter
info,
sessionID,
output
) => _dialogueCallbacks.AcceptAllFriendRequests(url, info as EmptyRequestData, sessionID)
) => dialogueCallbacks.AcceptAllFriendRequests(url, info as EmptyRequestData, sessionID)
),
new RouteAction(
"/client/friend/request/accept",
@@ -222,7 +220,7 @@ public class DialogStaticRouter : StaticRouter
info,
sessionID,
output
) => _dialogueCallbacks.AcceptFriendRequest(url, info as AcceptFriendRequestData, sessionID),
) => dialogueCallbacks.AcceptFriendRequest(url, info as AcceptFriendRequestData, sessionID),
typeof(AcceptFriendRequestData)
),
new RouteAction(
@@ -232,7 +230,7 @@ public class DialogStaticRouter : StaticRouter
info,
sessionID,
output
) => _dialogueCallbacks.DeclineFriendRequest(url, info as DeclineFriendRequestData, sessionID),
) => dialogueCallbacks.DeclineFriendRequest(url, info as DeclineFriendRequestData, sessionID),
typeof(DeclineFriendRequestData)
),
new RouteAction(
@@ -242,7 +240,7 @@ public class DialogStaticRouter : StaticRouter
info,
sessionID,
output
) => _dialogueCallbacks.CancelFriendRequest(url, info as CancelFriendRequestData, sessionID),
) => dialogueCallbacks.CancelFriendRequest(url, info as CancelFriendRequestData, sessionID),
typeof(CancelFriendRequestData)
),
new RouteAction(
@@ -252,7 +250,7 @@ public class DialogStaticRouter : StaticRouter
info,
sessionID,
output
) => _dialogueCallbacks.DeleteFriend(url, info as DeleteFriendRequest, sessionID),
) => dialogueCallbacks.DeleteFriend(url, info as DeleteFriendRequest, sessionID),
typeof(DeleteFriendRequest)
),
new RouteAction(
@@ -262,7 +260,7 @@ public class DialogStaticRouter : StaticRouter
info,
sessionID,
output
) => _dialogueCallbacks.IgnoreFriend(url, info as UIDRequestData, sessionID),
) => dialogueCallbacks.IgnoreFriend(url, info as UIDRequestData, sessionID),
typeof(UIDRequestData)
),
new RouteAction(
@@ -272,12 +270,11 @@ public class DialogStaticRouter : StaticRouter
info,
sessionID,
output
) => _dialogueCallbacks.UnIgnoreFriend(url, info as UIDRequestData, sessionID),
) => dialogueCallbacks.UnIgnoreFriend(url, info as UIDRequestData, sessionID),
typeof(UIDRequestData)
)
]
)
{
_dialogueCallbacks = dialogueCallbacks;
}
}
Libraries/Core/Routers/Static/GameStaticRouter.cs
+16 -19
View File
@@ -11,8 +11,6 @@ namespace Core.Routers.Static;
[Injectable(InjectableTypeOverride = typeof(StaticRouter))]
public class GameStaticRouter : StaticRouter
{
protected static GameCallbacks _gameCallbacks;
public GameStaticRouter(
JsonUtil jsonUtil,
GameCallbacks gameCallbacks
@@ -26,7 +24,7 @@ public class GameStaticRouter : StaticRouter
info,
sessionID,
output
) => _gameCallbacks.GetGameConfig(url, info as GameEmptyCrcRequestData, sessionID),
) => gameCallbacks.GetGameConfig(url, info as GameEmptyCrcRequestData, sessionID),
typeof(GameEmptyCrcRequestData)
),
new RouteAction(
@@ -36,7 +34,7 @@ public class GameStaticRouter : StaticRouter
info,
sessionID,
output
) => _gameCallbacks.GetGameMode(url, info as GameModeRequestData, sessionID),
) => gameCallbacks.GetGameMode(url, info as GameModeRequestData, sessionID),
typeof(GameModeRequestData)
),
new RouteAction(
@@ -46,7 +44,7 @@ public class GameStaticRouter : StaticRouter
info,
sessionID,
output
) => _gameCallbacks.GetServer(url, info as EmptyRequestData, sessionID)
) => gameCallbacks.GetServer(url, info as EmptyRequestData, sessionID)
),
new RouteAction(
"/client/match/group/current",
@@ -55,7 +53,7 @@ public class GameStaticRouter : StaticRouter
info,
sessionID,
output
) => _gameCallbacks.GetCurrentGroup(url, info as EmptyRequestData, sessionID),
) => gameCallbacks.GetCurrentGroup(url, info as EmptyRequestData, sessionID),
typeof(GameModeRequestData)
),
new RouteAction(
@@ -65,7 +63,7 @@ public class GameStaticRouter : StaticRouter
info,
sessionID,
output
) => _gameCallbacks.VersionValidate(url, info as VersionValidateRequestData, sessionID),
) => gameCallbacks.VersionValidate(url, info as VersionValidateRequestData, sessionID),
typeof(VersionValidateRequestData)
),
new RouteAction(
@@ -75,7 +73,7 @@ public class GameStaticRouter : StaticRouter
info,
sessionID,
output
) => _gameCallbacks.GameStart(url, info as EmptyRequestData, sessionID)
) => gameCallbacks.GameStart(url, info as EmptyRequestData, sessionID)
),
new RouteAction(
"/client/game/logout",
@@ -84,7 +82,7 @@ public class GameStaticRouter : StaticRouter
info,
sessionID,
output
) => _gameCallbacks.GameLogout(url, info as EmptyRequestData, sessionID)
) => gameCallbacks.GameLogout(url, info as EmptyRequestData, sessionID)
),
new RouteAction(
"/client/checkVersion",
@@ -93,7 +91,7 @@ public class GameStaticRouter : StaticRouter
info,
sessionID,
output
) => _gameCallbacks.ValidateGameVersion(url, info as EmptyRequestData, sessionID)
) => gameCallbacks.ValidateGameVersion(url, info as EmptyRequestData, sessionID)
),
new RouteAction(
"/client/game/keepalive",
@@ -102,7 +100,7 @@ public class GameStaticRouter : StaticRouter
info,
sessionID,
output
) => _gameCallbacks.GameKeepalive(url, info as EmptyRequestData, sessionID)
) => gameCallbacks.GameKeepalive(url, info as EmptyRequestData, sessionID)
),
new RouteAction(
"/singleplayer/settings/version",
@@ -111,7 +109,7 @@ public class GameStaticRouter : StaticRouter
info,
sessionID,
output
) => _gameCallbacks.GetVersion(url, info as EmptyRequestData, sessionID)
) => gameCallbacks.GetVersion(url, info as EmptyRequestData, sessionID)
),
new RouteAction(
"/client/reports/lobby/send",
@@ -120,7 +118,7 @@ public class GameStaticRouter : StaticRouter
info,
sessionID,
output
) => _gameCallbacks.ReportNickname(url, info as UIDRequestData, sessionID),
) => gameCallbacks.ReportNickname(url, info as UIDRequestData, sessionID),
typeof(UIDRequestData)
),
new RouteAction(
@@ -130,7 +128,7 @@ public class GameStaticRouter : StaticRouter
info,
sessionID,
output
) => _gameCallbacks.ReportNickname(url, info as UIDRequestData, sessionID),
) => gameCallbacks.ReportNickname(url, info as UIDRequestData, sessionID),
typeof(GameModeRequestData)
),
new RouteAction(
@@ -140,7 +138,7 @@ public class GameStaticRouter : StaticRouter
info,
sessionID,
output
) => _gameCallbacks.GetRaidTime(url, info as GetRaidTimeRequest, sessionID),
) => gameCallbacks.GetRaidTime(url, info as GetRaidTimeRequest, sessionID),
typeof(GetRaidTimeRequest)
),
new RouteAction(
@@ -150,7 +148,7 @@ public class GameStaticRouter : StaticRouter
info,
sessionID,
output
) => _gameCallbacks.GetSurvey(url, info as EmptyRequestData, sessionID)
) => gameCallbacks.GetSurvey(url, info as EmptyRequestData, sessionID)
),
new RouteAction(
"/client/survey/view",
@@ -159,7 +157,7 @@ public class GameStaticRouter : StaticRouter
info,
sessionID,
output
) => _gameCallbacks.GetSurveyView(url, info as SendSurveyOpinionRequest, sessionID),
) => gameCallbacks.GetSurveyView(url, info as SendSurveyOpinionRequest, sessionID),
typeof(SendSurveyOpinionRequest)
),
new RouteAction(
@@ -169,12 +167,11 @@ public class GameStaticRouter : StaticRouter
info,
sessionID,
output
) => _gameCallbacks.SendSurveyOpinion(url, info as SendSurveyOpinionRequest, sessionID),
) => gameCallbacks.SendSurveyOpinion(url, info as SendSurveyOpinionRequest, sessionID),
typeof(SendSurveyOpinionRequest)
)
]
)
{
_gameCallbacks = gameCallbacks;
}
}
Libraries/Core/Routers/Static/HealthStaticRouter.cs
+1 -4
View File
@@ -9,8 +9,6 @@ namespace Core.Routers.Static;
[Injectable(InjectableTypeOverride = typeof(StaticRouter))]
public class HealthStaticRouter : StaticRouter
{
protected static HealthCallbacks _healthCallbacks;
public HealthStaticRouter(
JsonUtil jsonUtil,
HealthCallbacks healthCallbacks
@@ -24,12 +22,11 @@ public class HealthStaticRouter : StaticRouter
info,
sessionID,
output
) => _healthCallbacks.HandleWorkoutEffects(url, info as WorkoutData, sessionID),
) => healthCallbacks.HandleWorkoutEffects(url, info as WorkoutData, sessionID),
typeof(WorkoutData)
)
]
)
{
_healthCallbacks = healthCallbacks;
}
}
Libraries/Core/Routers/Static/InsuranceStaticRouter.cs
+1 -4
View File
@@ -9,8 +9,6 @@ namespace Core.Routers.Static;
[Injectable(InjectableTypeOverride = typeof(StaticRouter))]
public class InsuranceStaticRouter : StaticRouter
{
protected static InsuranceCallbacks _insuranceCallbacks;
public InsuranceStaticRouter(
JsonUtil jsonUtil,
InsuranceCallbacks insuranceCallbacks
@@ -24,12 +22,11 @@ public class InsuranceStaticRouter : StaticRouter
info,
sessionID,
output
) => _insuranceCallbacks.GetInsuranceCost(url, info as GetInsuranceCostRequestData, sessionID),
) => insuranceCallbacks.GetInsuranceCost(url, info as GetInsuranceCostRequestData, sessionID),
typeof(GetInsuranceCostRequestData)
)
]
)
{
_insuranceCallbacks = insuranceCallbacks;
}
}
Libraries/Core/Routers/Static/ItemEventStaticRouter.cs
+1 -4
View File
@@ -9,8 +9,6 @@ namespace Core.Routers.Static;
[Injectable(InjectableTypeOverride = typeof(StaticRouter))]
public class ItemEventStaticRouter : StaticRouter
{
protected static ItemEventCallbacks _itemEventCallbacks;
public ItemEventStaticRouter(
JsonUtil jsonUtil,
ItemEventCallbacks itemEventCallbacks
@@ -24,12 +22,11 @@ public class ItemEventStaticRouter : StaticRouter
info,
sessionID,
output
) => _itemEventCallbacks.HandleEvents(url, info as ItemEventRouterRequest, sessionID),
) => itemEventCallbacks.HandleEvents(url, info as ItemEventRouterRequest, sessionID),
typeof(ItemEventRouterRequest)
)
]
)
{
_itemEventCallbacks = itemEventCallbacks;
}
}
Libraries/Core/Routers/Static/LocationStaticRouter.cs
+2 -5
View File
@@ -10,8 +10,6 @@ namespace Core.Routers.Static;
[Injectable(InjectableTypeOverride = typeof(StaticRouter))]
public class LocationStaticRouter : StaticRouter
{
protected static LocationCallbacks _locationCallbacks;
public LocationStaticRouter(
JsonUtil jsonUtil,
LocationCallbacks locationCallbacks
@@ -25,7 +23,7 @@ public class LocationStaticRouter : StaticRouter
info,
sessionID,
output
) => _locationCallbacks.GetLocationData(url, info as EmptyRequestData, sessionID)
) => locationCallbacks.GetLocationData(url, info as EmptyRequestData, sessionID)
),
new RouteAction(
"/client/airdrop/loot",
@@ -34,12 +32,11 @@ public class LocationStaticRouter : StaticRouter
info,
sessionID,
output
) => _locationCallbacks.GetAirdropLoot(url, info as GetAirdropLootRequest, sessionID),
) => locationCallbacks.GetAirdropLoot(url, info as GetAirdropLootRequest, sessionID),
typeof(GetAirdropLootRequest)
)
]
)
{
_locationCallbacks = locationCallbacks;
}
}
Libraries/Core/Routers/Static/MatchStaticRouter.cs
+28 -31
View File
@@ -11,8 +11,6 @@ namespace Core.Routers.Static;
[Injectable(InjectableTypeOverride = typeof(StaticRouter))]
public class MatchStaticRouter : StaticRouter
{
protected static MatchCallbacks _matchCallbacks;
public MatchStaticRouter(
JsonUtil jsonUtil,
MatchCallbacks matchCallbacks
@@ -26,7 +24,7 @@ public class MatchStaticRouter : StaticRouter
info,
sessionID,
output
) => _matchCallbacks.ServerAvailable(url, info as EmptyRequestData, sessionID)
) => matchCallbacks.ServerAvailable(url, info as EmptyRequestData, sessionID)
),
new RouteAction(
"/client/match/updatePing",
@@ -35,7 +33,7 @@ public class MatchStaticRouter : StaticRouter
info,
sessionID,
output
) => _matchCallbacks.UpdatePing(url, info as UpdatePingRequestData, sessionID),
) => matchCallbacks.UpdatePing(url, info as UpdatePingRequestData, sessionID),
typeof(UpdatePingRequestData)
),
new RouteAction(
@@ -45,7 +43,7 @@ public class MatchStaticRouter : StaticRouter
info,
sessionID,
output
) => _matchCallbacks.JoinMatch(url, info as MatchGroupStartGameRequest, sessionID),
) => matchCallbacks.JoinMatch(url, info as MatchGroupStartGameRequest, sessionID),
typeof(MatchGroupStartGameRequest)
),
new RouteAction(
@@ -55,7 +53,7 @@ public class MatchStaticRouter : StaticRouter
info,
sessionID,
output
) => _matchCallbacks.ExitMatch(url, info as EmptyRequestData, sessionID)
) => matchCallbacks.ExitMatch(url, info as EmptyRequestData, sessionID)
),
new RouteAction(
"/client/match/group/delete",
@@ -64,7 +62,7 @@ public class MatchStaticRouter : StaticRouter
info,
sessionID,
output
) => _matchCallbacks.DeleteGroup(url, info as DeleteGroupRequest, sessionID)
) => matchCallbacks.DeleteGroup(url, info as DeleteGroupRequest, sessionID)
),
new RouteAction(
"/client/match/group/leave",
@@ -73,7 +71,7 @@ public class MatchStaticRouter : StaticRouter
info,
sessionID,
output
) => _matchCallbacks.LeaveGroup(url, info as EmptyRequestData, sessionID)
) => matchCallbacks.LeaveGroup(url, info as EmptyRequestData, sessionID)
),
new RouteAction(
"/client/match/group/status",
@@ -82,7 +80,7 @@ public class MatchStaticRouter : StaticRouter
info,
sessionID,
output
) => _matchCallbacks.GetGroupStatus(url, info as MatchGroupStatusRequest, sessionID),
) => matchCallbacks.GetGroupStatus(url, info as MatchGroupStatusRequest, sessionID),
typeof(MatchGroupStatusRequest)
),
new RouteAction(
@@ -92,7 +90,7 @@ public class MatchStaticRouter : StaticRouter
info,
sessionID,
output
) => _matchCallbacks.JoinMatch(url, info as MatchGroupStartGameRequest, sessionID),
) => matchCallbacks.JoinMatch(url, info as MatchGroupStartGameRequest, sessionID),
typeof(MatchGroupStartGameRequest)
),
new RouteAction(
@@ -102,7 +100,7 @@ public class MatchStaticRouter : StaticRouter
info,
sessionID,
output
) => _matchCallbacks.ExitFromMenu(url, info as EmptyRequestData, sessionID)
) => matchCallbacks.ExitFromMenu(url, info as EmptyRequestData, sessionID)
),
new RouteAction(
"/client/match/group/current",
@@ -111,7 +109,7 @@ public class MatchStaticRouter : StaticRouter
info,
sessionID,
output
) => _matchCallbacks.GroupCurrent(url, info as EmptyRequestData, sessionID)
) => matchCallbacks.GroupCurrent(url, info as EmptyRequestData, sessionID)
),
new RouteAction(
"/client/match/group/looking/start",
@@ -120,7 +118,7 @@ public class MatchStaticRouter : StaticRouter
info,
sessionID,
output
) => _matchCallbacks.StartGroupSearch(url, info as EmptyRequestData, sessionID)
) => matchCallbacks.StartGroupSearch(url, info as EmptyRequestData, sessionID)
),
new RouteAction(
"/client/match/group/looking/stop",
@@ -129,7 +127,7 @@ public class MatchStaticRouter : StaticRouter
info,
sessionID,
output
) => _matchCallbacks.StopGroupSearch(url, info as EmptyRequestData, sessionID)
) => matchCallbacks.StopGroupSearch(url, info as EmptyRequestData, sessionID)
),
new RouteAction(
"/client/match/group/invite/send",
@@ -138,7 +136,7 @@ public class MatchStaticRouter : StaticRouter
info,
sessionID,
output
) => _matchCallbacks.SendGroupInvite(url, info as MatchGroupInviteSendRequest, sessionID),
) => matchCallbacks.SendGroupInvite(url, info as MatchGroupInviteSendRequest, sessionID),
typeof(MatchGroupInviteSendRequest)
),
new RouteAction(
@@ -148,7 +146,7 @@ public class MatchStaticRouter : StaticRouter
info,
sessionID,
output
) => _matchCallbacks.AcceptGroupInvite(url, info as RequestIdRequest, sessionID),
) => matchCallbacks.AcceptGroupInvite(url, info as RequestIdRequest, sessionID),
typeof(RequestIdRequest)
),
new RouteAction(
@@ -158,7 +156,7 @@ public class MatchStaticRouter : StaticRouter
info,
sessionID,
output
) => _matchCallbacks.DeclineGroupInvite(url, info as RequestIdRequest, sessionID),
) => matchCallbacks.DeclineGroupInvite(url, info as RequestIdRequest, sessionID),
typeof(RequestIdRequest)
),
new RouteAction(
@@ -168,7 +166,7 @@ public class MatchStaticRouter : StaticRouter
info,
sessionID,
output
) => _matchCallbacks.CancelGroupInvite(url, info as RequestIdRequest, sessionID),
) => matchCallbacks.CancelGroupInvite(url, info as RequestIdRequest, sessionID),
typeof(RequestIdRequest)
),
new RouteAction(
@@ -178,7 +176,7 @@ public class MatchStaticRouter : StaticRouter
info,
sessionID,
output
) => _matchCallbacks.CancelAllGroupInvite(url, info as EmptyRequestData, sessionID)
) => matchCallbacks.CancelAllGroupInvite(url, info as EmptyRequestData, sessionID)
),
new RouteAction(
"/client/match/group/transfer",
@@ -187,7 +185,7 @@ public class MatchStaticRouter : StaticRouter
info,
sessionID,
output
) => _matchCallbacks.TransferGroup(url, info as MatchGroupTransferRequest, sessionID),
) => matchCallbacks.TransferGroup(url, info as MatchGroupTransferRequest, sessionID),
typeof(MatchGroupTransferRequest)
),
new RouteAction(
@@ -197,7 +195,7 @@ public class MatchStaticRouter : StaticRouter
info,
sessionID,
output
) => _matchCallbacks.RaidReady(url, info as EmptyRequestData, sessionID)
) => matchCallbacks.RaidReady(url, info as EmptyRequestData, sessionID)
),
new RouteAction(
"/client/match/group/raid/not-ready",
@@ -206,7 +204,7 @@ public class MatchStaticRouter : StaticRouter
info,
sessionID,
output
) => _matchCallbacks.NotRaidReady(url, info as EmptyRequestData, sessionID)
) => matchCallbacks.NotRaidReady(url, info as EmptyRequestData, sessionID)
),
new RouteAction(
"/client/putMetrics",
@@ -215,7 +213,7 @@ public class MatchStaticRouter : StaticRouter
info,
sessionID,
output
) => _matchCallbacks.PutMetrics(url, info as PutMetricsRequestData, sessionID),
) => matchCallbacks.PutMetrics(url, info as PutMetricsRequestData, sessionID),
typeof(PutMetricsRequestData)
),
new RouteAction(
@@ -225,7 +223,7 @@ public class MatchStaticRouter : StaticRouter
info,
sessionID,
output
) => _matchCallbacks.EventDisconnect(url, info as PutMetricsRequestData, sessionID),
) => matchCallbacks.EventDisconnect(url, info as PutMetricsRequestData, sessionID),
typeof(PutMetricsRequestData)
),
new RouteAction(
@@ -235,7 +233,7 @@ public class MatchStaticRouter : StaticRouter
info,
sessionID,
output
) => _matchCallbacks.GetMetrics(url, info as EmptyRequestData, sessionID)
) => matchCallbacks.GetMetrics(url, info as EmptyRequestData, sessionID)
),
new RouteAction(
"/client/raid/configuration",
@@ -244,7 +242,7 @@ public class MatchStaticRouter : StaticRouter
info,
sessionID,
output
) => _matchCallbacks.GetRaidConfiguration(url, info as GetRaidConfigurationRequestData, sessionID),
) => matchCallbacks.GetRaidConfiguration(url, info as GetRaidConfigurationRequestData, sessionID),
typeof(GetRaidConfigurationRequestData)
),
new RouteAction(
@@ -254,7 +252,7 @@ public class MatchStaticRouter : StaticRouter
info,
sessionID,
output
) => _matchCallbacks.GetConfigurationByProfile(url, info as GetRaidConfigurationRequestData, sessionID),
) => matchCallbacks.GetConfigurationByProfile(url, info as GetRaidConfigurationRequestData, sessionID),
typeof(GetRaidConfigurationRequestData)
),
new RouteAction(
@@ -264,7 +262,7 @@ public class MatchStaticRouter : StaticRouter
info,
sessionID,
output
) => _matchCallbacks.RemovePlayerFromGroup(url, info as MatchGroupPlayerRemoveRequest, sessionID),
) => matchCallbacks.RemovePlayerFromGroup(url, info as MatchGroupPlayerRemoveRequest, sessionID),
typeof(MatchGroupPlayerRemoveRequest)
),
new RouteAction(
@@ -274,7 +272,7 @@ public class MatchStaticRouter : StaticRouter
info,
sessionID,
output
) => _matchCallbacks.StartLocalRaid(url, info as StartLocalRaidRequestData, sessionID),
) => matchCallbacks.StartLocalRaid(url, info as StartLocalRaidRequestData, sessionID),
typeof(StartLocalRaidRequestData)
),
new RouteAction(
@@ -284,12 +282,11 @@ public class MatchStaticRouter : StaticRouter
info,
sessionID,
output
) => _matchCallbacks.EndLocalRaid(url, info as EndLocalRaidRequestData, sessionID),
) => matchCallbacks.EndLocalRaid(url, info as EndLocalRaidRequestData, sessionID),
typeof(EndLocalRaidRequestData)
)
]
)
{
_matchCallbacks = matchCallbacks;
}
}
Libraries/Core/Routers/Static/NotifierStaticRouter.cs
+2 -5
View File
@@ -10,8 +10,6 @@ namespace Core.Routers.Static;
[Injectable(InjectableTypeOverride = typeof(StaticRouter))]
public class NotifierStaticRouter : StaticRouter
{
protected static NotifierCallbacks _notifierCallbacks;
public NotifierStaticRouter(
JsonUtil jsonUtil,
NotifierCallbacks notifierCallbacks
@@ -25,7 +23,7 @@ public class NotifierStaticRouter : StaticRouter
info,
sessionID,
output
) => _notifierCallbacks.CreateNotifierChannel(url, info as EmptyRequestData, sessionID)
) => notifierCallbacks.CreateNotifierChannel(url, info as EmptyRequestData, sessionID)
),
new RouteAction(
"/client/game/profile/select",
@@ -34,12 +32,11 @@ public class NotifierStaticRouter : StaticRouter
info,
sessionID,
output
) => _notifierCallbacks.SelectProfile(url, info as UIDRequestData, sessionID),
) => notifierCallbacks.SelectProfile(url, info as UIDRequestData, sessionID),
typeof(UIDRequestData)
)
]
)
{
_notifierCallbacks = notifierCallbacks;
}
}
Libraries/Core/Routers/Static/PrestigeStaticRouter.cs
+2 -5
View File
@@ -10,8 +10,6 @@ namespace Core.Routers.Static;
[Injectable(InjectableTypeOverride = typeof(StaticRouter))]
public class PrestigeStaticRouter : StaticRouter
{
protected static PrestigeCallbacks _presetCallbacks;
public PrestigeStaticRouter(
JsonUtil jsonUtil,
PrestigeCallbacks prestigeCallbacks
@@ -25,7 +23,7 @@ public class PrestigeStaticRouter : StaticRouter
info,
sessionID,
output
) => _presetCallbacks.GetPrestige(url, info as EmptyRequestData, sessionID)
) => prestigeCallbacks.GetPrestige(url, info as EmptyRequestData, sessionID)
),
new RouteAction(
"/client/prestige/obtain",
@@ -34,12 +32,11 @@ public class PrestigeStaticRouter : StaticRouter
info,
sessionID,
output
) => _presetCallbacks.ObtainPrestige(url, info as ObtainPrestigeRequestList, sessionID),
) => prestigeCallbacks.ObtainPrestige(url, info as ObtainPrestigeRequestList, sessionID),
typeof(ObtainPrestigeRequestList)
)
]
)
{
_presetCallbacks = prestigeCallbacks;
}
}
Libraries/Core/Routers/Static/QuestStaticRouter.cs
+2 -5
View File
@@ -10,8 +10,6 @@ namespace Core.Routers.Static;
[Injectable(InjectableTypeOverride = typeof(StaticRouter))]
public class QuestStaticRouter : StaticRouter
{
protected static QuestCallbacks _questCallbacks;
public QuestStaticRouter(
JsonUtil jsonUtil,
QuestCallbacks questCallbacks
@@ -25,7 +23,7 @@ public class QuestStaticRouter : StaticRouter
info,
sessionID,
output
) => _questCallbacks.ListQuests(url, info as ListQuestsRequestData, sessionID),
) => questCallbacks.ListQuests(url, info as ListQuestsRequestData, sessionID),
typeof(ListQuestsRequestData)
),
new RouteAction(
@@ -35,11 +33,10 @@ public class QuestStaticRouter : StaticRouter
info,
sessionID,
output
) => _questCallbacks.ActivityPeriods(url, info as EmptyRequestData, sessionID)
) => questCallbacks.ActivityPeriods(url, info as EmptyRequestData, sessionID)
)
]
)
{
_questCallbacks = questCallbacks;
}
}
Libraries/Core/Routers/Static/RagfairStaticRouter.cs
+7 -10
View File
@@ -10,8 +10,6 @@ namespace Core.Routers.Static;
[Injectable(InjectableTypeOverride = typeof(StaticRouter))]
public class RagfairStaticRouter : StaticRouter
{
protected static RagfairCallbacks _ragfairCallbacks;
public RagfairStaticRouter(
JsonUtil jsonUtil,
RagfairCallbacks ragfairCallbacks
@@ -25,7 +23,7 @@ public class RagfairStaticRouter : StaticRouter
info,
sessionID,
output
) => _ragfairCallbacks.Search(url, info as SearchRequestData, sessionID),
) => ragfairCallbacks.Search(url, info as SearchRequestData, sessionID),
typeof(SearchRequestData)
),
new RouteAction(
@@ -35,7 +33,7 @@ public class RagfairStaticRouter : StaticRouter
info,
sessionID,
output
) => _ragfairCallbacks.Search(url, info as SearchRequestData, sessionID),
) => ragfairCallbacks.Search(url, info as SearchRequestData, sessionID),
typeof(SearchRequestData)
),
new RouteAction(
@@ -45,7 +43,7 @@ public class RagfairStaticRouter : StaticRouter
info,
sessionID,
output
) => _ragfairCallbacks.GetMarketPrice(url, info as GetMarketPriceRequestData, sessionID),
) => ragfairCallbacks.GetMarketPrice(url, info as GetMarketPriceRequestData, sessionID),
typeof(GetMarketPriceRequestData)
),
new RouteAction(
@@ -55,7 +53,7 @@ public class RagfairStaticRouter : StaticRouter
info,
sessionID,
output
) => _ragfairCallbacks.StorePlayerOfferTaxAmount(url, info as StorePlayerOfferTaxAmountRequestData, sessionID),
) => ragfairCallbacks.StorePlayerOfferTaxAmount(url, info as StorePlayerOfferTaxAmountRequestData, sessionID),
typeof(StorePlayerOfferTaxAmountRequestData)
),
new RouteAction(
@@ -65,7 +63,7 @@ public class RagfairStaticRouter : StaticRouter
info,
sessionID,
output
) => _ragfairCallbacks.SendReport(url, info as SendRagfairReportRequestData, sessionID),
) => ragfairCallbacks.SendReport(url, info as SendRagfairReportRequestData, sessionID),
typeof(SendRagfairReportRequestData)
),
new RouteAction(
@@ -75,7 +73,7 @@ public class RagfairStaticRouter : StaticRouter
info,
sessionID,
output
) => _ragfairCallbacks.GetFleaPrices(url, info as EmptyRequestData, sessionID)
) => ragfairCallbacks.GetFleaPrices(url, info as EmptyRequestData, sessionID)
),
new RouteAction(
"/client/ragfair/offer/findbyid",
@@ -84,12 +82,11 @@ public class RagfairStaticRouter : StaticRouter
info,
sessionID,
output
) => _ragfairCallbacks.GetFleaOfferById(url, info as GetRagfairOfferByIdRequest, sessionID),
) => ragfairCallbacks.GetFleaOfferById(url, info as GetRagfairOfferByIdRequest, sessionID),
typeof(GetRagfairOfferByIdRequest)
)
]
)
{
_ragfairCallbacks = ragfairCallbacks;
}
}
Libraries/Core/Routers/Static/TraderStaticRouter.cs
+2 -5
View File
@@ -9,8 +9,6 @@ namespace Core.Routers.Static;
[Injectable(InjectableTypeOverride = typeof(StaticRouter))]
public class TraderStaticRouter : StaticRouter
{
protected static TraderCallbacks _traderCallbacks;
public TraderStaticRouter(
JsonUtil jsonUtil,
TraderCallbacks traderCallbacks
@@ -24,7 +22,7 @@ public class TraderStaticRouter : StaticRouter
info,
sessionID,
output
) => _traderCallbacks.GetTraderSettings(url, info as EmptyRequestData, sessionID)
) => traderCallbacks.GetTraderSettings(url, info as EmptyRequestData, sessionID)
),
new RouteAction(
"/singleplayer/moddedTraders",
@@ -33,11 +31,10 @@ public class TraderStaticRouter : StaticRouter
info,
sessionID,
output
) => _traderCallbacks.GetModdedTraderData(url, info as EmptyRequestData, sessionID)
) => traderCallbacks.GetModdedTraderData(url, info as EmptyRequestData, sessionID)
)
]
)
{
_traderCallbacks = traderCallbacks;
}
}
Libraries/Core/Routers/Static/WeatherStaticRouter.cs
+2 -5
View File
@@ -9,8 +9,6 @@ namespace Core.Routers.Static;
[Injectable(InjectableTypeOverride = typeof(StaticRouter))]
public class WeatherStaticRouter : StaticRouter
{
protected static WeatherCallbacks _weatherCallbacks;
public WeatherStaticRouter(
JsonUtil jsonUtil,
WeatherCallbacks weatherCallbacks
@@ -24,7 +22,7 @@ public class WeatherStaticRouter : StaticRouter
info,
sessionID,
output
) => _weatherCallbacks.GetWeather(url, info as EmptyRequestData, sessionID)
) => weatherCallbacks.GetWeather(url, info as EmptyRequestData, sessionID)
),
new RouteAction(
"/client/localGame/weather",
@@ -33,11 +31,10 @@ public class WeatherStaticRouter : StaticRouter
info,
sessionID,
output
) => _weatherCallbacks.GetLocalWeather(url, info as EmptyRequestData, sessionID)
) => weatherCallbacks.GetLocalWeather(url, info as EmptyRequestData, sessionID)
)
]
)
{
_weatherCallbacks = weatherCallbacks;
}
}