Skip to content

Bugfix/unregister callbacks #29

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.

Sign up for GitHub

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

Open
beorosz wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Bugfix/unregister callbacks #29

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e6c7151
unregisterCallbacks method added to template (#22)
beorosz Oct 21, 2019
ba1915d
Merge branch 'master' of https://github.com/RicoSuter/SigSpec
beorosz Feb 14, 2020
66a6a04
HubConnection unregister bugfix
beorosz Feb 14, 2020
db19490
Updating README
beorosz Feb 14, 2020
45cb161
Resolving PR comments
beorosz Feb 21, 2020
63e341e
Merge remote-tracking branch 'upstream/master'
May 12, 2020
ed51b51
Merged from master
May 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,9 +173,12 @@ Generated spec:
Generated TypeScript code:

```typescript
import { HubConnection, IStreamResult } from "@aspnet/signalr"
import { HubConnection, IStreamResult } from '@aspnet/signalr'

export class ChatHub {
callbackForWelcome: () => void;
callbackForSend: (message: string) => void;

constructor(private connection: HubConnection) {
}

Expand All @@ -192,13 +195,15 @@ export class ChatHub {
}

registerCallbacks(implementation: IChatHubCallbacks) {
this.connection.on('Welcome', () => implementation.welcome());
this.connection.on('Send', (message) => implementation.send(message));
this.callbackForWelcome = () => implementation.welcome();
this.connection.on('Welcome', this.callbackForWelcome);
this.callbackForSend = (message) => implementation.send(message);
this.connection.on('Send', this.callbackForSend);
}

unregisterCallbacks(implementation: IChatHubCallbacks) {
this.connection.off('Welcome', () => implementation.welcome());
this.connection.off('Send', (message) => implementation.send(message));
this.connection.off('Welcome', this.callbackForWelcome);
this.connection.off('Send', this.callbackForSend);
}
}

Expand Down
15 changes: 15 additions & 0 deletions src/HelloSignalR/Startup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,29 @@ namespace HelloSignalR
{
public class Startup
{
readonly string AllowAllPolicy = "AllowAllPolicy";

public void ConfigureServices(IServiceCollection services)
{
services.AddCors(options =>
{
options.AddPolicy(AllowAllPolicy,
builder =>
{
builder
.AllowAnyMethod()
.AllowAnyHeader()
.AllowAnyOrigin()
.AllowCredentials();
});
});
services.AddSignalR();
}

public void Configure(IApplicationBuilder app, IHostingEnvironment env)
{
app.UseStaticFiles();
app.UseCors(AllowAllPolicy);
app.UseSignalR(routes =>
{
routes.MapHub<ChatHub>("/chat");
Expand Down
2 changes: 2 additions & 0 deletions src/HelloSignalR/start_server.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
SET ASPNETCORE_URLS=http://localhost:61327
dotnet run --no-launch-profile
2 changes: 1 addition & 1 deletion src/SigSpec.CodeGeneration.TypeScript/Templates/File.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { HubConnection, IStreamResult } from "@aspnet/signalr"
import { HubConnection, IStreamResult } from '@aspnet/signalr'
{% for hub in Hubs -%}

{{ hub }}
Expand Down
9 changes: 7 additions & 2 deletions src/SigSpec.CodeGeneration.TypeScript/Templates/Hub.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
export class {{ Name }}Hub {
{% for operation in Callbacks -%}
callbackFor{{ operation.Name }}: ({% for parameter in operation.Parameters %}{{ parameter.Name }}: {{ parameter.Type }}{% if forloop.last == false %}, {% endif %}{% endfor %}) => void;
Copy link
Copy Markdown
Owner

@RicoSuter RicoSuter Feb 20, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add private?

Copy link
Copy Markdown
Owner

@RicoSuter RicoSuter Feb 20, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To be safe this should be an array of registrations so if multiple impls are registered all callbacks are unregistered, not only the last one. But we can also leave it as is as this is an edge case.

Copy link
Copy Markdown
Contributor Author

@beorosz beorosz Feb 21, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Modifications were made following your comments. Please check.

{% endfor -%}

constructor(private connection: HubConnection) {
}
{% for operation in Operations -%}
Expand All @@ -20,13 +24,14 @@

registerCallbacks(implementation: I{{ Name }}HubCallbacks) {
{% for operation in Callbacks -%}
this.connection.on('{{ operation.Name }}', ({% for parameter in operation.Parameters %}{{ parameter.Name }}{% if forloop.last == false %}, {% endif %}{% endfor %}) => implementation.{{operation.MethodName}}({% for parameter in operation.Parameters %}{{ parameter.Name }}{% if forloop.last == false %}, {% endif %}{% endfor %}));
this.callbackFor{{ operation.Name }} = ({% for parameter in operation.Parameters %}{{ parameter.Name }}{% if forloop.last == false %}, {% endif %}{% endfor %}) => implementation.{{operation.MethodName}}({% for parameter in operation.Parameters %}{{ parameter.Name }}{% if forloop.last == false %}, {% endif %}{% endfor %});
this.connection.on('{{ operation.Name }}', this.callbackFor{{ operation.Name }});
{% endfor -%}
}

unregisterCallbacks(implementation: I{{ Name }}HubCallbacks) {
{% for operation in Callbacks -%}
this.connection.off('{{ operation.Name }}', ({% for parameter in operation.Parameters %}{{ parameter.Name }}{% if forloop.last == false %}, {% endif %}{% endfor %}) => implementation.{{operation.MethodName}}({% for parameter in operation.Parameters %}{{ parameter.Name }}{% if forloop.last == false %}, {% endif %}{% endfor %}));
this.connection.off('{{ operation.Name }}', this.callbackFor{{ operation.Name }});
{% endfor -%}
}
}
Expand Down