saherelm/xPushService
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Hub Route issue on Registering ...

Browse Source
This commit is contained in:
saherelm
2025-07-03 15:07:33 +03:30
parent d862146642
commit c7cf0c4df1
1 changed files with 110 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DI/XDIHelperExtension.cs
+110 -85
View File
@@ -19,17 +19,20 @@ using xPushService.Interfaces;
using xPushService.Providers;
using xPushService.Store;
namespace xPushService.DI {
public static partial class XDIHelperExtension {
namespace xPushService.DI
{
public static partial class XDIHelperExtension
{
/// <summary>
/// Extract Module Configuration from provided IConfiguration
/// </summary>
/// <param name="config"></param>
/// <returns>an instance of XPushServiceConfiguration</returns>
public static XPushServiceConfiguration GetXPushServiceConfiguration (this IConfiguration config) {
public static XPushServiceConfiguration GetXPushServiceConfiguration(this IConfiguration config)
{
//
var xPushConfigSection = config.GetSection (XPushServiceConstants.XConfigurationNodes.XPushServiceConfiguration);
return xPushConfigSection.Get<XPushServiceConfiguration> ();
var xPushConfigSection = config.GetSection(XPushServiceConstants.XConfigurationNodes.XPushServiceConfiguration);
return xPushConfigSection.Get<XPushServiceConfiguration>();
}
/// <summary>
@@ -37,21 +40,23 @@ namespace xPushService.DI {
/// </summary>
/// <param name="services"></param>
/// <param name="helper"></param>
public static void AddXPushServiceHelper (
public static void AddXPushServiceHelper(
this IServiceCollection services,
XPushServiceHelper helper
) {
)
{
//
// Validate Args ...
if (helper.IsNull ()) {
if (helper.IsNull())
{
//
Log ("AddXPushServiceHelper failed, helper not provided ...");
throw XException.InvalidArgs.ToException ();
Log("AddXPushServiceHelper failed, helper not provided ...");
throw XException.InvalidArgs.ToException();
}
//
// Register Helper ...
services.AddSingleton (helper);
services.AddSingleton(helper);
}
/// <summary>
@@ -59,14 +64,15 @@ namespace xPushService.DI {
/// </summary>
/// <param name="services"></param>
/// <param name="config"></param>
public static void AddXPushService (
public static void AddXPushService(
this IServiceCollection services,
IConfiguration config,
ServiceLifetime lifeTime = ServiceLifetime.Singleton
) {
AddPushService (
)
{
AddPushService(
services,
config.GetXPushServiceConfiguration (),
config.GetXPushServiceConfiguration(),
lifeTime
);
}
@@ -76,12 +82,13 @@ namespace xPushService.DI {
/// </summary>
/// <param name="services"></param>
/// <param name="config"></param>
public static void AddXPushService (
public static void AddXPushService(
this IServiceCollection services,
XPushServiceConfiguration config,
ServiceLifetime lifeTime = ServiceLifetime.Singleton
) {
AddPushService (
)
{
AddPushService(
services,
config,
lifeTime
@@ -93,41 +100,46 @@ namespace xPushService.DI {
/// </summary>
/// <param name="app"></param>
/// <param name="helper"></param>
public static void UseXPushService (
public static void UseXPushService(
this IApplicationBuilder app,
XPushServiceHelper helper
) {
)
{
//
// Validate Args ...
var isHelperExists = !helper.IsNull ();
if (!isHelperExists) {
var isHelperExists = !helper.IsNull();
if (!isHelperExists)
{
//
Log ("AddXPushServiceHelper failed, helper not provided ...");
throw XException.InvalidArgs.ToException ();
Log("AddXPushServiceHelper failed, helper not provided ...");
throw XException.InvalidArgs.ToException();
}
//
// Create an Scope for Accessing Registered Services ...
using (var scope = app.ApplicationServices.CreateScope ()) {
using (var scope = app.ApplicationServices.CreateScope())
{
//
// try to Retrieve Configuration ....
var config = scope.ServiceProvider.GetService<XPushServiceConfiguration> ();
var config = scope.ServiceProvider.GetService<XPushServiceConfiguration>();
if (
config.IsNull () ||
config.BaseRoute.IsNullOrEmpty () ||
config.BaseRoute.Trim ().IsNullOrEmpty ()
) {
config.IsNull() ||
config.BaseRoute.IsNullOrEmpty() ||
config.BaseRoute.Trim().IsNullOrEmpty()
)
{
//
Log ("AddXPushServiceHelper failed, Configuration not provided ...");
throw XException.InvalidConfiguration.ToException ();
Log("AddXPushServiceHelper failed, Configuration not provided ...");
throw XException.InvalidConfiguration.ToException();
}
//
#region Normalize Routes ...
//
// Base Reoute ...
config.BaseRoute = config.BaseRoute.ToNormalString ();
if (!config.BaseRoute.StartsWith ("/")) {
config.BaseRoute = config.BaseRoute.ToNormalString();
if (!config.BaseRoute.StartsWith("/"))
{
config.BaseRoute = "/" + config.BaseRoute;
}
#endregion
@@ -135,36 +147,39 @@ namespace xPushService.DI {
//
// add XPushService Hub to Helper ...
//
var hubRoutes = new List<string> ();
var hubRoutes = new List<string>();
//
// Try to Register Hubs ...
//
// Use SignalR in App ...
app.UseSignalR (routes => {
app.UseSignalR(routes =>
{
//
helper.GetHubs ().ForEach (hubDescriptor => {
helper.GetHubs().ForEach(hubDescriptor =>
{
//
var hubRoute = Path.Combine (config.BaseRoute, hubDescriptor.Route);
hubRoutes.Add (hubRoute);
Console.WriteLine ($"XPushService HubRoute: {hubRoute}");
var hubRoute = config.BaseRoute + "/" + hubDescriptor.Route; // Path.Combine (config.BaseRoute, hubDescriptor.Route);
hubRoutes.Add(hubRoute);
Console.WriteLine($"XPushService HubRoute: {hubRoute}");
//
Type routesType = routes.GetType ();
Type routesType = routes.GetType();
MethodInfo mapHubMethod = routesType
.GetMethods ()
.SingleOrDefault (m =>
.GetMethods()
.SingleOrDefault(m =>
m.Name == "MapHub" &&
m.GetParameters ().Length == 1
m.GetParameters().Length == 1
);
if (mapHubMethod.IsNull ()) {
throw XException.ActionFailed.ToException ();
if (mapHubMethod.IsNull())
{
throw XException.ActionFailed.ToException();
}
//
object[] genericMapHubMethodArgs = { new PathString (hubRoute) };
MethodInfo genericMapHubMethod = mapHubMethod.MakeGenericMethod (hubDescriptor.Hub);
genericMapHubMethod.Invoke (routes, genericMapHubMethodArgs);
object[] genericMapHubMethodArgs = { new PathString(hubRoute) };
MethodInfo genericMapHubMethod = mapHubMethod.MakeGenericMethod(hubDescriptor.Hub);
genericMapHubMethod.Invoke(routes, genericMapHubMethodArgs);
});
});
}
@@ -181,8 +196,9 @@ namespace xPushService.DI {
/// print a log in Console ...
/// </summary>
/// <param name="message"></param>
private static void Log (string message) {
Console.WriteLine ($"{XLogTag} => {message}");
private static void Log(string message)
{
Console.WriteLine($"{XLogTag} => {message}");
}
/// <summary>
@@ -191,97 +207,106 @@ namespace xPushService.DI {
/// <param name="services"></param>
/// <param name="config"></param>
/// <param name="lifeTime"></param>
private static void AddPushService (
private static void AddPushService(
IServiceCollection services,
XPushServiceConfiguration config,
ServiceLifetime lifeTime
) {
)
{
//
#region Validate Args ...
//
var exception = XException.InvalidArgs.ToException ();;
var exception = XException.InvalidArgs.ToException(); ;
//
// Services ...
var isServicesExists = !services.IsNull ();
if (!isServicesExists) {
var isServicesExists = !services.IsNull();
if (!isServicesExists)
{
//
Log ("AddXPushServiceHelper failed, services not provided ...");
Log("AddXPushServiceHelper failed, services not provided ...");
throw exception;
}
//
// Config ...
var isConfigExists = !config.IsNull ();
if (!isConfigExists) {
var isConfigExists = !config.IsNull();
if (!isConfigExists)
{
//
Log ("AddXPushServiceHelper failed, configuration not provided ...");
Log("AddXPushServiceHelper failed, configuration not provided ...");
throw exception;
}
//
// Lifetime ...
var isLifetimeExists = !lifeTime.IsNull ();
if (!isLifetimeExists) {
var isLifetimeExists = !lifeTime.IsNull();
if (!isLifetimeExists)
{
//
Log ("AddXPushServiceHelper failed, lifetime not provided ...");
Log("AddXPushServiceHelper failed, lifetime not provided ...");
throw exception;
}
#endregion
//
// Register XPushService Configuration ...
services.AddSingleton<XPushServiceConfiguration> (config);
services.AddSingleton<XPushServiceConfiguration>(config);
//
#region Try to Register Stores ...
//
var groupStore = services.GetRegisteredService<IXPushGroupStore> ();
if (groupStore.IsNull ()) {
var groupStore = services.GetRegisteredService<IXPushGroupStore>();
if (groupStore.IsNull())
{
//
Log ($"there is no provided PushGroupStore, try to register XPushGroupInMemoryStore ...");
groupStore = new XPushGroupInMemoryStore ();
services.AddSingleton<IXPushGroupStore> (groupStore);
Log($"there is no provided PushGroupStore, try to register XPushGroupInMemoryStore ...");
groupStore = new XPushGroupInMemoryStore();
services.AddSingleton<IXPushGroupStore>(groupStore);
}
//
var connectionStore = services.GetRegisteredService<IXPushConnectionStore> ();
if (connectionStore.IsNull ()) {
var connectionStore = services.GetRegisteredService<IXPushConnectionStore>();
if (connectionStore.IsNull())
{
//
Log ($"there is no provided XPushConnectionStore, try to register XPushConnectionInMemoryStore ...");
connectionStore = new XPushConnectionInMemoryStore ();
services.AddSingleton<IXPushConnectionStore> (connectionStore);
Log($"there is no provided XPushConnectionStore, try to register XPushConnectionInMemoryStore ...");
connectionStore = new XPushConnectionInMemoryStore();
services.AddSingleton<IXPushConnectionStore>(connectionStore);
}
//
var webRtcConnectionStore = services.GetRegisteredService<IXWebRTCConnectionStore> ();
if (webRtcConnectionStore.IsNull ()) {
var webRtcConnectionStore = services.GetRegisteredService<IXWebRTCConnectionStore>();
if (webRtcConnectionStore.IsNull())
{
//
Log ($"there is no provided XWebRTCConnectionStore, try to register XWebRTCConnectionInMemoryStore ...");
webRtcConnectionStore = new XWebRTCConnectionInMemoryStore ();
services.AddSingleton<IXWebRTCConnectionStore> (webRtcConnectionStore);
Log($"there is no provided XWebRTCConnectionStore, try to register XWebRTCConnectionInMemoryStore ...");
webRtcConnectionStore = new XWebRTCConnectionInMemoryStore();
services.AddSingleton<IXWebRTCConnectionStore>(webRtcConnectionStore);
}
#endregion
//
// Register SignalR ...
var builder = services.AddSignalR ();
var builder = services.AddSignalR();
//
// Add NewtonSoftJson Protocol ...
builder.AddNewtonsoftJsonProtocol (x => {
builder.AddNewtonsoftJsonProtocol(x =>
{
x.PayloadSerializerSettings.ReferenceLoopHandling = ReferenceLoopHandling.Ignore;
x.PayloadSerializerSettings.ContractResolver = new CamelCasePropertyNamesContractResolver ();
x.PayloadSerializerSettings.ContractResolver = new CamelCasePropertyNamesContractResolver();
});
//
// Register XPushServiceUserNameProvider ...
services.AddSingleton<IUserIdProvider, XPushServiceUserNameProvider> ();
services.AddSingleton<IUserIdProvider, XPushServiceUserNameProvider>();
//
// add Message Protocol Support ...
if (config.AddSupportMessageProtocol) {
builder.AddMessagePackProtocol ();
if (config.AddSupportMessageProtocol)
{
builder.AddMessagePackProtocol();
}
}
#endregion