-
Notifications
You must be signed in to change notification settings - Fork 159
SignalR Hub Example Update to 7 plus add Hub Client Results #138
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Draft
wadepickett
wants to merge
4
commits into
main
Choose a base branch
from
wadepickett/27996ClientResultsHub
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
f69f9a1
SignalR Hub Example Update Client Return
wadepickett 0c00183
Adding 2 client result hub classes
wadepickett c4aee8f
Removed dupe inline IClient from ChatHubClientResultsStronglyTyped
wadepickett 624a6aa
Moving IClient interface in ChatHubClientResultsStrongyTyped.cs
wadepickett File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
11 changes: 11 additions & 0 deletions
11
signalr/hubs/samples/7.x/SignalRHubsSample/Hubs/ChatHub.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
using Microsoft.AspNetCore.SignalR; | ||
|
||
namespace SignalRHubsSample.Hubs; | ||
|
||
// <snippet_Class> | ||
public class ChatHub : Hub | ||
{ | ||
public async Task SendMessage(string user, string message) | ||
=> await Clients.All.SendAsync("ReceiveMessage", user, message); | ||
} | ||
// </snippet_Class> |
26 changes: 26 additions & 0 deletions
26
signalr/hubs/samples/7.x/SignalRHubsSample/Pages/Error.cshtml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
@page | ||
@model ErrorModel | ||
@{ | ||
ViewData["Title"] = "Error"; | ||
} | ||
|
||
<h1 class="text-danger">Error.</h1> | ||
<h2 class="text-danger">An error occurred while processing your request.</h2> | ||
|
||
@if (Model.ShowRequestId) | ||
{ | ||
<p> | ||
<strong>Request ID:</strong> <code>@Model.RequestId</code> | ||
</p> | ||
} | ||
|
||
<h3>Development Mode</h3> | ||
<p> | ||
Swapping to the <strong>Development</strong> environment displays detailed information about the error that occurred. | ||
</p> | ||
<p> | ||
<strong>The Development environment shouldn't be enabled for deployed applications.</strong> | ||
It can result in displaying sensitive information from exceptions to end users. | ||
For local debugging, enable the <strong>Development</strong> environment by setting the <strong>ASPNETCORE_ENVIRONMENT</strong> environment variable to <strong>Development</strong> | ||
and restarting the app. | ||
</p> |
27 changes: 27 additions & 0 deletions
27
signalr/hubs/samples/7.x/SignalRHubsSample/Pages/Error.cshtml.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
using Microsoft.AspNetCore.Mvc; | ||
using Microsoft.AspNetCore.Mvc.RazorPages; | ||
using System.Diagnostics; | ||
|
||
namespace SignalRHubsSample.Pages | ||
{ | ||
[ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)] | ||
[IgnoreAntiforgeryToken] | ||
public class ErrorModel : PageModel | ||
{ | ||
public string? RequestId { get; set; } | ||
|
||
public bool ShowRequestId => !string.IsNullOrEmpty(RequestId); | ||
|
||
private readonly ILogger<ErrorModel> _logger; | ||
|
||
public ErrorModel(ILogger<ErrorModel> logger) | ||
{ | ||
_logger = logger; | ||
} | ||
|
||
public void OnGet() | ||
{ | ||
RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier; | ||
} | ||
} | ||
} |
32 changes: 32 additions & 0 deletions
32
signalr/hubs/samples/7.x/SignalRHubsSample/Pages/Index.cshtml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
@page | ||
@model IndexModel | ||
|
||
@{ | ||
ViewData["Title"] = "Home"; | ||
} | ||
|
||
<div class="form-group row"> | ||
<label for="userInput" class="col-2 col-form-label">User</label> | ||
<div class="col col-sm-6"> | ||
<input id="userInput" class="form-control" /> | ||
</div> | ||
</div> | ||
|
||
<div class="form-group row"> | ||
<label for="message" class="col-2 col-form-label">Message</label> | ||
<div class="col col-sm-6"> | ||
<input id="messageInput" class="form-control" /> | ||
</div> | ||
</div> | ||
|
||
<button id="send" type="button" class="btn btn-primary">Send Message</button> | ||
|
||
<hr> | ||
|
||
<ul id="messageList"></ul> | ||
|
||
@section Scripts | ||
{ | ||
<script src="~/js/signalr/dist/browser/signalr.js"></script> | ||
<script src="~/js/chat.js"></script> | ||
} |
20 changes: 20 additions & 0 deletions
20
signalr/hubs/samples/7.x/SignalRHubsSample/Pages/Index.cshtml.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
using Microsoft.AspNetCore.Mvc; | ||
using Microsoft.AspNetCore.Mvc.RazorPages; | ||
|
||
namespace SignalRHubsSample.Pages | ||
{ | ||
public class IndexModel : PageModel | ||
{ | ||
private readonly ILogger<IndexModel> _logger; | ||
|
||
public IndexModel(ILogger<IndexModel> logger) | ||
{ | ||
_logger = logger; | ||
} | ||
|
||
public void OnGet() | ||
{ | ||
|
||
} | ||
} | ||
} |
8 changes: 8 additions & 0 deletions
8
signalr/hubs/samples/7.x/SignalRHubsSample/Pages/Privacy.cshtml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
@page | ||
@model PrivacyModel | ||
@{ | ||
ViewData["Title"] = "Privacy Policy"; | ||
} | ||
<h1>@ViewData["Title"]</h1> | ||
|
||
<p>Use this page to detail your site's privacy policy.</p> |
19 changes: 19 additions & 0 deletions
19
signalr/hubs/samples/7.x/SignalRHubsSample/Pages/Privacy.cshtml.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
using Microsoft.AspNetCore.Mvc; | ||
using Microsoft.AspNetCore.Mvc.RazorPages; | ||
|
||
namespace SignalRHubsSample.Pages | ||
{ | ||
public class PrivacyModel : PageModel | ||
{ | ||
private readonly ILogger<PrivacyModel> _logger; | ||
|
||
public PrivacyModel(ILogger<PrivacyModel> logger) | ||
{ | ||
_logger = logger; | ||
} | ||
|
||
public void OnGet() | ||
{ | ||
} | ||
} | ||
} |
51 changes: 51 additions & 0 deletions
51
signalr/hubs/samples/7.x/SignalRHubsSample/Pages/Shared/_Layout.cshtml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,51 @@ | ||
<!DOCTYPE html> | ||
<html lang="en"> | ||
<head> | ||
<meta charset="utf-8" /> | ||
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> | ||
<title>@ViewData["Title"] - SignalRHubsSample</title> | ||
<link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.min.css" /> | ||
<link rel="stylesheet" href="~/css/site.css" asp-append-version="true" /> | ||
<link rel="stylesheet" href="~/SignalRHubsSample.styles.css" asp-append-version="true" /> | ||
</head> | ||
<body> | ||
<header> | ||
<nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-light bg-white border-bottom box-shadow mb-3"> | ||
<div class="container"> | ||
<a class="navbar-brand" asp-area="" asp-page="/Index">SignalRHubsSample</a> | ||
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target=".navbar-collapse" aria-controls="navbarSupportedContent" | ||
aria-expanded="false" aria-label="Toggle navigation"> | ||
<span class="navbar-toggler-icon"></span> | ||
</button> | ||
<div class="navbar-collapse collapse d-sm-inline-flex justify-content-between"> | ||
<ul class="navbar-nav flex-grow-1"> | ||
<li class="nav-item"> | ||
<a class="nav-link text-dark" asp-area="" asp-page="/Index">Home</a> | ||
</li> | ||
<li class="nav-item"> | ||
<a class="nav-link text-dark" asp-area="" asp-page="/Privacy">Privacy</a> | ||
</li> | ||
</ul> | ||
</div> | ||
</div> | ||
</nav> | ||
</header> | ||
<div class="container"> | ||
<main role="main" class="pb-3"> | ||
@RenderBody() | ||
</main> | ||
</div> | ||
|
||
<footer class="border-top footer text-muted"> | ||
<div class="container"> | ||
© 2023 - SignalRHubsSample - <a asp-area="" asp-page="/Privacy">Privacy</a> | ||
</div> | ||
</footer> | ||
|
||
<script src="~/lib/jquery/dist/jquery.min.js"></script> | ||
<script src="~/lib/bootstrap/dist/js/bootstrap.bundle.min.js"></script> | ||
<script src="~/js/site.js" asp-append-version="true"></script> | ||
|
||
@await RenderSectionAsync("Scripts", required: false) | ||
</body> | ||
</html> |
48 changes: 48 additions & 0 deletions
48
signalr/hubs/samples/7.x/SignalRHubsSample/Pages/Shared/_Layout.cshtml.css
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
/* Please see documentation at https://docs.microsoft.com/aspnet/core/client-side/bundling-and-minification | ||
for details on configuring this project to bundle and minify static web assets. */ | ||
|
||
a.navbar-brand { | ||
white-space: normal; | ||
text-align: center; | ||
word-break: break-all; | ||
} | ||
|
||
a { | ||
color: #0077cc; | ||
} | ||
|
||
.btn-primary { | ||
color: #fff; | ||
background-color: #1b6ec2; | ||
border-color: #1861ac; | ||
} | ||
|
||
.nav-pills .nav-link.active, .nav-pills .show > .nav-link { | ||
color: #fff; | ||
background-color: #1b6ec2; | ||
border-color: #1861ac; | ||
} | ||
|
||
.border-top { | ||
border-top: 1px solid #e5e5e5; | ||
} | ||
.border-bottom { | ||
border-bottom: 1px solid #e5e5e5; | ||
} | ||
|
||
.box-shadow { | ||
box-shadow: 0 .25rem .75rem rgba(0, 0, 0, .05); | ||
} | ||
|
||
button.accept-policy { | ||
font-size: 1rem; | ||
line-height: inherit; | ||
} | ||
|
||
.footer { | ||
position: absolute; | ||
bottom: 0; | ||
width: 100%; | ||
white-space: nowrap; | ||
line-height: 60px; | ||
} |
2 changes: 2 additions & 0 deletions
2
signalr/hubs/samples/7.x/SignalRHubsSample/Pages/Shared/_ValidationScriptsPartial.cshtml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
<script src="~/lib/jquery-validation/dist/jquery.validate.min.js"></script> | ||
<script src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js"></script> |
3 changes: 3 additions & 0 deletions
3
signalr/hubs/samples/7.x/SignalRHubsSample/Pages/_ViewImports.cshtml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
@using SignalRHubsSample | ||
@namespace SignalRHubsSample.Pages | ||
@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers |
3 changes: 3 additions & 0 deletions
3
signalr/hubs/samples/7.x/SignalRHubsSample/Pages/_ViewStart.cshtml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
@{ | ||
Layout = "_Layout"; | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
using SignalRHubsSample.Hubs; | ||
|
||
// <snippet_AddSignalR> | ||
var builder = WebApplication.CreateBuilder(args); | ||
|
||
builder.Services.AddRazorPages(); | ||
builder.Services.AddSignalR(); | ||
// </snippet_AddSignalR> | ||
|
||
var app = builder.Build(); | ||
|
||
if (!app.Environment.IsDevelopment()) | ||
{ | ||
app.UseExceptionHandler("/Error"); | ||
app.UseHsts(); | ||
} | ||
|
||
app.UseHttpsRedirection(); | ||
app.UseStaticFiles(); | ||
|
||
app.UseRouting(); | ||
|
||
app.UseAuthorization(); | ||
|
||
// <snippet_MapHub> | ||
app.MapRazorPages(); | ||
app.MapHub<ChatHub>("/Chat"); | ||
|
||
app.Run(); | ||
// </snippet_MapHub> |
9 changes: 9 additions & 0 deletions
9
signalr/hubs/samples/7.x/SignalRHubsSample/SignalRHubsSample.csproj
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
<Project Sdk="Microsoft.NET.Sdk.Web"> | ||
|
||
<PropertyGroup> | ||
<TargetFramework>net7.0</TargetFramework> | ||
<Nullable>enable</Nullable> | ||
<ImplicitUsings>enable</ImplicitUsings> | ||
</PropertyGroup> | ||
|
||
</Project> |
43 changes: 43 additions & 0 deletions
43
signalr/hubs/samples/7.x/SignalRHubsSample/Snippets/Hubs/ChatHub.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
using Microsoft.AspNetCore.SignalR; | ||
|
||
namespace SignalRHubsSample.Snippets.Hubs; | ||
|
||
public class ChatHub : Hub | ||
{ | ||
// <snippet_OnConnectedAsync> | ||
public override async Task OnConnectedAsync() | ||
{ | ||
await Groups.AddToGroupAsync(Context.ConnectionId, "SignalR Users"); | ||
await base.OnConnectedAsync(); | ||
} | ||
// </snippet_OnConnectedAsync> | ||
|
||
// <snippet_OnDisconnectedAsync> | ||
public override async Task OnDisconnectedAsync(Exception? exception) | ||
{ | ||
await base.OnDisconnectedAsync(exception); | ||
} | ||
// </snippet_OnDisconnectedAsync> | ||
|
||
// <snippet_Clients> | ||
public async Task SendMessage(string user, string message) | ||
=> await Clients.All.SendAsync("ReceiveMessage", user, message); | ||
|
||
public async Task SendMessageToCaller(string user, string message) | ||
=> await Clients.Caller.SendAsync("ReceiveMessage", user, message); | ||
|
||
public async Task SendMessageToGroup(string user, string message) | ||
=> await Clients.Group("SignalR Users").SendAsync("ReceiveMessage", user, message); | ||
// </snippet_Clients> | ||
|
||
// <snippet_HubMethodName> | ||
[HubMethodName("SendMessageToUser")] | ||
public async Task DirectMessage(string user, string message) | ||
=> await Clients.User(user).SendAsync("ReceiveMessage", user, message); | ||
// </snippet_HubMethodName> | ||
|
||
// <snippet_ThrowException> | ||
public Task ThrowException() | ||
=> throw new HubException("This error will be sent to the client!"); | ||
// </snippet_ThrowException> | ||
} |
28 changes: 28 additions & 0 deletions
28
signalr/hubs/samples/7.x/SignalRHubsSample/Snippets/Hubs/ChatHubClientResults.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
using Microsoft.AspNetCore.SignalR; | ||
using static System.Runtime.InteropServices.JavaScript.JSType; | ||
|
||
namespace SignalRHubsSample.Hubs; | ||
// <snippet_HubClientReturn> | ||
public class ChatHubClientReturn : Hub | ||
{ | ||
public async Task<string> WaitForMessage(string connectionId) | ||
{ | ||
using var cts = new CancellationTokenSource(TimeSpan.FromSeconds(30)); | ||
try | ||
{ | ||
var message = await Clients.Client(connectionId).InvokeAsync<string>( | ||
"GetMessage", cts.Token); | ||
return message; | ||
} | ||
catch (OperationCanceledException ex) | ||
{ | ||
// timeout occurred | ||
return "Timed out waiting for client input"; | ||
} | ||
catch (Exception ex) | ||
{ | ||
return "Error waiting for client result"; | ||
} | ||
} | ||
// </snippet_HubClientReturn> | ||
} |
14 changes: 14 additions & 0 deletions
14
signalr/hubs/samples/7.x/SignalRHubsSample/Snippets/Hubs/ChatHubClientResultsContext.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
using Microsoft.AspNetCore.SignalR; | ||
using static System.Runtime.InteropServices.JavaScript.JSType; | ||
|
||
namespace SignalRHubsSample.Hubs; | ||
// <snippet_HubClientReturnContext> | ||
public class ChatHubClientResultsContext : Hub | ||
{ | ||
async Task SomeMethod(IHubContext<ChatHubClientResultsContext> context) | ||
{ | ||
string result = await context.Clients.Client(connectionID).InvokeAsync<string>( | ||
"GetMessage"); | ||
} | ||
// </snippet_HubClientReturnContext> | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is an odd way to use
IHubContext
. It's probably better from a controller or minimal api:https://learn.microsoft.com/aspnet/core/signalr/hubcontext?view=aspnetcore-7.0#inject-an-instance-of-ihubcontext-in-a-controller