Merge pull request #153 from acjh/signalr

ismcagdas · web-flow · commit 605b4d49341f · 2017-12-21T16:43:11.000+03:00
ASP.NET Core SignalR 2.1.0 integration
diff --git a/angular/.angular-cli.json b/angular/.angular-cli.json
@@ -14,6 +14,11 @@
                     "glob": "abp.signalr.js",
                     "input": "../node_modules/abp-web-resources/Abp/Framework/scripts/libs/",
                     "output": "./assets/abp/"
+                },
+                {
+                    "glob": "abp.signalr-client.js",
+                    "input": "../node_modules/abp-web-resources/Abp/Framework/scripts/libs/",
+                    "output": "./assets/abp/"
                 }
             ],
             "index": "index.html",
@@ -43,6 +48,7 @@
                 "../node_modules/lodash/lodash.min.js",
                 "../node_modules/moment/min/moment.min.js",
                 "../node_modules/signalr/jquery.signalR.js",
+                "../node_modules/@aspnet/signalr-client/dist/browser/signalr-client.min.js",
                 "../node_modules/toastr/toastr.js",
                 "../node_modules/sweetalert/dist/sweetalert.min.js",
                 "../node_modules/block-ui/jquery.blockUI.js",
diff --git a/angular/.npmrc b/angular/.npmrc
@@ -0,0 +1 @@
+@aspnet:registry=https://dotnet.myget.org/f/aspnetcore-dev/npm/
diff --git a/angular/package.json b/angular/package.json
@@ -22,6 +22,7 @@
         "@angular/platform-browser": "^5.0.3",
         "@angular/platform-browser-dynamic": "^5.0.3",
         "@angular/router": "^5.0.3",
+        "@aspnet/signalr-client": "1.0.0-preview1-27815",
         "@types/bootstrap": "^3.3.33",
         "@types/jquery": "^3.2.12",
         "@types/jquery.blockui": "0.0.28",
@@ -32,7 +33,7 @@
         "@types/signalr": "^2.2.33",
         "@types/toastr": "^2.1.33",
         "abp-ng2-module": "^1.3.0",
-        "abp-web-resources": "^3.2.3",
+        "abp-web-resources": "^3.3.0",
         "animate.css": "^3.5.2",
         "block-ui": "^2.70.1",
         "bootstrap": "^3.3.7",
diff --git a/angular/src/app/app.component.ts b/angular/src/app/app.component.ts
@@ -3,6 +3,7 @@ import { AppConsts } from '@shared/AppConsts';
 import { AppComponentBase } from '@shared/app-component-base';
 
 import { SignalRHelper } from '@shared/helpers/SignalRHelper';
+import { SignalRAspNetCoreHelper } from '@shared/helpers/SignalRAspNetCoreHelper';
 
 @Component({
   templateUrl: './app.component.html'
@@ -19,7 +20,11 @@ export class AppComponent extends AppComponentBase implements OnInit, AfterViewI
 
   ngOnInit(): void {
     if (this.appSession.application.features['SignalR']) {
-      SignalRHelper.initSignalR();
+      if (this.appSession.application.features['SignalR.AspNetCore']) {
+        SignalRAspNetCoreHelper.initSignalR();
+      } else {
+        SignalRHelper.initSignalR();
+      }
     }
 
     abp.event.on('abp.notifications.received', userNotification => {
diff --git a/angular/src/shared/helpers/SignalRAspNetCoreHelper.ts b/angular/src/shared/helpers/SignalRAspNetCoreHelper.ts
@@ -0,0 +1,19 @@
+import { AppConsts } from '@shared/AppConsts';
+import { UtilsService } from '@abp/utils/utils.service';
+
+export class SignalRAspNetCoreHelper {
+    static initSignalR(): void {
+
+        var encryptedAuthToken = new UtilsService().getCookieValue(AppConsts.authorization.encrptedAuthTokenName);
+
+        abp.signalr = {
+            autoConnect: true,
+            connect: undefined,
+            hubs: undefined,
+            qs: AppConsts.authorization.encrptedAuthTokenName + "=" + encodeURIComponent(encryptedAuthToken),
+            url: AppConsts.remoteServiceBaseUrl + '/signalr'
+        };
+
+        jQuery.getScript(AppConsts.appBaseUrl + '/assets/abp/abp.signalr-client.js');
+    }
+}
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Application/AbpCompanyName.AbpProjectName.Application.csproj b/aspnet-core/src/AbpCompanyName.AbpProjectName.Application/AbpCompanyName.AbpProjectName.Application.csproj
@@ -11,6 +11,14 @@
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
     <RootNamespace>AbpCompanyName.AbpProjectName</RootNamespace>
   </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net461' ">
+    <DefineConstants>FEATURE_SIGNALR</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
+    <DefineConstants>FEATURE_SIGNALR;FEATURE_SIGNALR_ASPNETCORE</DefineConstants>
+  </PropertyGroup>
   
   <ItemGroup>
     <ProjectReference Include="..\AbpCompanyName.AbpProjectName.Core\AbpCompanyName.AbpProjectName.Core.csproj" />
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Application/Sessions/SessionAppService.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Application/Sessions/SessionAppService.cs
@@ -19,7 +19,8 @@ public async Task<GetCurrentLoginInformationsOutput> GetCurrentLoginInformations
                     ReleaseDate = AppVersionHelper.ReleaseDate,
                     Features = new Dictionary<string, bool>
                     {
-                        { "SignalR", SignalRFeature.IsAvailable }
+                        { "SignalR", SignalRFeature.IsAvailable },
+                        { "SignalR.AspNetCore", SignalRFeature.IsAspNetCore }
                     }
                 }
             };
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Application/SignalR/SignalRFeature.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Application/SignalR/SignalRFeature.cs
@@ -10,6 +10,18 @@ public static bool IsAvailable
                 return true;
 #else
                 return false;
+#endif
+            }
+        }
+
+        public static bool IsAspNetCore
+        {
+            get
+            {
+#if FEATURE_SIGNALR_ASPNETCORE
+                return true;
+#else
+                return false;
 #endif
             }
         }
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/AbpCompanyName.AbpProjectName.Web.Core.csproj b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/AbpCompanyName.AbpProjectName.Web.Core.csproj
@@ -18,6 +18,10 @@
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'net461' ">
+    <DefineConstants>FEATURE_SIGNALR;FEATURE_SIGNALR_OWIN</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
     <DefineConstants>FEATURE_SIGNALR</DefineConstants>
   </PropertyGroup>
 
@@ -44,4 +48,8 @@
     <PackageReference Include="Abp.Owin" Version="3.2.4" />
   </ItemGroup>
 
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
+    <PackageReference Include="Abp.Web.SignalR.AspNetCore" Version="3.3.0" />
+  </ItemGroup>
+
 </Project>
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/Owin/BuilderExtensions.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/Owin/BuilderExtensions.cs
@@ -1,4 +1,4 @@
-﻿#if FEATURE_SIGNALR 
+﻿#if FEATURE_SIGNALR_OWIN
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/AbpCompanyName.AbpProjectName.Web.Host.csproj b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/AbpCompanyName.AbpProjectName.Web.Host.csproj
@@ -11,7 +11,11 @@
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'net461' ">
-    <DefineConstants>FEATURE_SIGNALR</DefineConstants>
+    <DefineConstants>FEATURE_SIGNALR;FEATURE_SIGNALR_OWIN</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
+    <DefineConstants>FEATURE_SIGNALR;FEATURE_SIGNALR_ASPNETCORE</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/Startup/Startup.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/Startup/Startup.cs
@@ -15,14 +15,18 @@
 using AbpCompanyName.AbpProjectName.Configuration;
 using AbpCompanyName.AbpProjectName.Identity;
 
-#if FEATURE_SIGNALR
+#if FEATURE_SIGNALR_OWIN
 using Microsoft.AspNet.SignalR;
 using Microsoft.Owin.Cors;
 using Owin;
 using Abp.Owin;
 using AbpCompanyName.AbpProjectName.Owin;
 #endif
 
+#if FEATURE_SIGNALR_ASPNETCORE
+using Abp.Web.SignalR.Hubs;
+#endif
+
 namespace AbpCompanyName.AbpProjectName.Web.Host.Startup
 {
     public class Startup
@@ -46,6 +50,10 @@ public IServiceProvider ConfigureServices(IServiceCollection services)
             IdentityRegistrar.Register(services);
             AuthConfigurer.Configure(services, _appConfiguration);
 
+#if FEATURE_SIGNALR_ASPNETCORE
+            services.AddSignalR();
+#endif
+
             // Configure CORS for angular2 UI
             services.AddCors(
                 options => options.AddPolicy(
@@ -104,11 +112,18 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
 
             app.UseAbpRequestLocalization();
 
-#if FEATURE_SIGNALR
+#if FEATURE_SIGNALR_OWIN
             // Integrate with OWIN
             app.UseAppBuilder(ConfigureOwinServices);
 #endif
 
+#if FEATURE_SIGNALR_ASPNETCORE
+            app.UseSignalR(routes =>
+            {
+                routes.MapHub<AbpCommonHub>("/signalr");
+            });
+#endif
+
             app.UseMvc(routes =>
             {
                 routes.MapRoute(
@@ -131,7 +146,7 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
             }); // URL: /swagger
         }
 
-#if FEATURE_SIGNALR
+#if FEATURE_SIGNALR_OWIN
         private static void ConfigureOwinServices(IAppBuilder app)
         {
             app.Properties["host.AppName"] = "AbpProjectName";
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/AbpCompanyName.AbpProjectName.Web.Mvc.csproj b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/AbpCompanyName.AbpProjectName.Web.Mvc.csproj
@@ -12,7 +12,11 @@
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'net461' ">
-    <DefineConstants>FEATURE_SIGNALR</DefineConstants>
+    <DefineConstants>FEATURE_SIGNALR;FEATURE_SIGNALR_OWIN</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
+    <DefineConstants>FEATURE_SIGNALR;FEATURE_SIGNALR_ASPNETCORE</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Startup/Startup.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Startup/Startup.cs
@@ -13,12 +13,16 @@
 using AbpCompanyName.AbpProjectName.Identity;
 using AbpCompanyName.AbpProjectName.Web.Resources;
 
-#if FEATURE_SIGNALR
+#if FEATURE_SIGNALR_OWIN
 using Owin;
 using Abp.Owin;
 using AbpCompanyName.AbpProjectName.Owin;
 #endif
 
+#if FEATURE_SIGNALR_ASPNETCORE
+using Abp.Web.SignalR.Hubs;
+#endif
+
 namespace AbpCompanyName.AbpProjectName.Web.Startup
 {
     public class Startup
@@ -42,6 +46,10 @@ public IServiceProvider ConfigureServices(IServiceCollection services)
 
             services.AddScoped<IWebResourceManager, WebResourceManager>();
 
+#if FEATURE_SIGNALR_ASPNETCORE
+            services.AddSignalR();
+#endif
+
             // Configure Abp and Dependency Injection
             return services.AddAbp<AbpProjectNameWebMvcModule>(
                 // Configure Log4Net logging
@@ -70,11 +78,18 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
 
             app.UseJwtTokenMiddleware();
 
-#if FEATURE_SIGNALR
+#if FEATURE_SIGNALR_OWIN
             // Integrate with OWIN
             app.UseAppBuilder(ConfigureOwinServices);
 #endif
 
+#if FEATURE_SIGNALR_ASPNETCORE
+            app.UseSignalR(routes =>
+            {
+                routes.MapHub<AbpCommonHub>("/signalr");
+            });
+#endif
+
             app.UseMvc(routes =>
             {
                 routes.MapRoute(
@@ -87,7 +102,7 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
             });
         }
 
-#if FEATURE_SIGNALR
+#if FEATURE_SIGNALR_OWIN
         private static void ConfigureOwinServices(IAppBuilder app)
         {
             app.Properties["host.AppName"] = "AbpProjectName";
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Shared/_Layout.cshtml b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Shared/_Layout.cshtml
@@ -173,7 +173,7 @@
         <script src="~/js/main.js" asp-append-version="true"></script>
         <script src="~/view-resources/Views/Shared/_Layout.js" asp-append-version="true"></script>
         
-        @if (SignalRFeature.IsAvailable)
+        @if (SignalRFeature.IsAvailable && !SignalRFeature.IsAspNetCore)
         {
             <script src="~/lib/signalr/jquery.signalR.js" asp-append-version="true"></script>
         }
@@ -195,8 +195,16 @@
     @if (SignalRFeature.IsAvailable)
     {
         <!-- SignalR scripts -->
-        <script src="~/signalr/hubs"></script>
-        <script src="~/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.signalr.js" type="text/javascript"></script>
+        if (SignalRFeature.IsAspNetCore)
+        {
+            <script src="~/lib/signalr-client/signalr-client.min.js" asp-append-version="true"></script>
+            <script src="~/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.signalr-client.js" asp-append-version="true"></script>
+        }
+        else
+        {
+            <script src="~/signalr/hubs"></script>
+            <script src="~/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.signalr.js" type="text/javascript"></script>
+        }
     }
 
     @WebResourceManager.RenderScripts();
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.signalr-client.js b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.signalr-client.js
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/lib/signalr-client/signalr-client.min.js b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/lib/signalr-client/signalr-client.min.js

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+@aspnet:registry=https://dotnet.myget.org/f/aspnetcore-dev/npm/`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,8 @@ public async Task<GetCurrentLoginInformationsOutput> GetCurrentLoginInformations`
`19`	`19`	`ReleaseDate = AppVersionHelper.ReleaseDate,`
`20`	`20`	`Features = new Dictionary<string, bool>`
`21`	`21`	`{`
`22`		`- { "SignalR", SignalRFeature.IsAvailable }`
	`22`	`+ { "SignalR", SignalRFeature.IsAvailable },`
	`23`	`+ { "SignalR.AspNetCore", SignalRFeature.IsAspNetCore }`
`23`	`24`	`}`
`24`	`25`	`}`
`25`	`26`	`};`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#if FEATURE_SIGNALR`
	`1`	`+#if FEATURE_SIGNALR_OWIN`
`2`	`2`	`using System;`
`3`	`3`	`using System.Collections.Generic;`
`4`	`4`	`using System.Threading.Tasks;`