V12/generic hub (#535)

* Add ability to pass hub url to signalR hub (making it a bit more generic) * Add obsolete marker to config changes for v13
KevinJump · Aug 23, 2023 · f61b4ea · f61b4ea
1 parent e826ede
commit f61b4ea
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/uSync.BackOffice/Configuration/uSyncSettings.cs b/uSync.BackOffice/Configuration/uSyncSettings.cs
@@ -96,6 +96,7 @@ public class uSyncSettings
         /// location of SignalR hub script
         /// </summary>
         [DefaultValue("")]
+        [Obsolete("Will remove the option to move the route in v13")]
         public string SignalRRoot { get; set; } = string.Empty;
 
         /// <summary>

diff --git a/uSync.BackOffice/Hubs/uSyncHubRoutes.cs b/uSync.BackOffice/Hubs/uSyncHubRoutes.cs
@@ -15,7 +15,7 @@
 namespace uSync.BackOffice.Hubs
 {
     /// <summary>
-    /// Handles SignlarR routes for uSync
+    /// Handles SignalR routes for uSync
     /// </summary>
     public class uSyncHubRoutes : IAreaRoutes
     {
@@ -33,6 +33,7 @@ public uSyncHubRoutes(
         {
             _runtimeState = runtimeState;
 
+#pragma warning disable CS0618 // Type or member is obsolete
             if (!string.IsNullOrWhiteSpace(uSyncSettings.Value?.SignalRRoot))
             {
                 _umbracoPathSegment = uSyncSettings.Value.SignalRRoot;
@@ -41,6 +42,7 @@ public uSyncHubRoutes(
             {
                 _umbracoPathSegment = globalSettings.Value.GetUmbracoMvcArea(hostingEnvironment);
             }
+#pragma warning restore CS0618 // Type or member is obsolete
         }
 
         /// <summary>

diff --git a/uSync.Backoffice.Assets/App_Plugins/uSync/usync.hub.js b/uSync.Backoffice.Assets/App_Plugins/uSync/usync.hub.js
@@ -18,6 +18,10 @@
         //////////////
 
         function initHub(callback) {
+            initializeHub(Umbraco.Sys.ServerVariables.uSync.signalRHub, callback);
+        }
+
+        function initializeHub(url, callback) { 
 
             callbacks.push(callback);
 
@@ -34,25 +38,25 @@
                         .then(function () {
                             while (callbacks.length) {
                                 var cb = callbacks.pop();
-                                hubSetup(cb);
+                                hubSetup(url, cb);
                             }
                             starting = false;
                         });
                 }
                 else {
                     while (callbacks.length) {
                         var cb = callbacks.pop();
-                        hubSetup(cb);
+                        hubSetup(url, cb);
                     }
                     starting = false;
                 }
             }
         }
 
-        function hubSetup(callback) {
+        function hubSetup(url, callback) {
 
             $.connection = new signalR.HubConnectionBuilder()
-                .withUrl(Umbraco.Sys.ServerVariables.uSync.signalRHub)
+                .withUrl(url)
                 .withAutomaticReconnect()
                 .configureLogging(signalR.LogLevel.Warning)
                 .build();