github/aspnet-core-signalr-angular
1
1
Fork 0
mirror of https://github.com/chsakell/aspnet-core-signalr-angular.git synced 2025-12-22 17:27:48 +00:00
Code Issues 1 Packages Projects Releases Wiki Activity

set connection id on start

Browse Source
This commit is contained in:
chsakell
2016-10-05 12:54:45 +03:00
parent 8a8055d0ba
commit 69afcd0108
9 changed files with 35 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Hubs/Broadcaster.cs
View File

@@ -7,9 +7,11 @@ namespace LiveGameFeed.Hubs
{
public override Task OnConnected()
{
return Clients.All.userConnected("New connection " + Context.ConnectionId);
// Set connection id for just connected client only
return Clients.Client(Context.ConnectionId).setConnectionId(Context.ConnectionId);
}
// Server side methods called from client
public Task Subscribe(int matchId)
{
return Groups.Add(Context.ConnectionId, matchId.ToString());

3
Views/Home/Index.cshtml
View File

@@ -37,8 +37,7 @@
</div>
<div class="collapse navbar-collapse" id="myNavbar">
<ul class="nav navbar-nav">
<li class="active"><a href="#">Home</a></li>
<li><a href="https://github.com/chsakell" target="_blank"><span class="glyphicon glyphicon-sunglasses"></span> About</a></li>
<li class="active"><a href="https://github.com/chsakell" target="_blank"><span class="glyphicon glyphicon-sunglasses"></span> About</a></li>
<li><a href="https://github.com/chsakell" target="_blank"><span class="glyphicon glyphicon-save"></span> Source code</a></li>
</ul>
<ul class="nav navbar-nav navbar-right">

2
app/home/home.component.html
View File

@@ -3,6 +3,6 @@
<match [match]="match" (updateSubscription)="updateSubscription($event)"></match>
</div>
<div class="col-md-4">
<chat [matches]="matches"></chat>
<chat [matches]="matches" [connection]="connectionId"></chat>
</div>
</div>

17
app/home/home.component.ts
View File

@@ -12,6 +12,7 @@ import { SignalRConnectionStatus } from '../shared/interfaces';
export class HomeComponent implements OnInit {
matches: Match[];
connectionId: string;
error: any;
constructor(private dataService: DataService,
@@ -20,6 +21,8 @@ export class HomeComponent implements OnInit {
ngOnInit() {
let self = this;
self.listenForConnection();
self.feedService.connectionState
.subscribe(
connectionState => {
@@ -60,7 +63,6 @@ export class HomeComponent implements OnInit {
for (var i = 0; i < self.matches.length; i++) {
if (self.matches[i].Id === feed.MatchId) {
if (!self.matches[i].Feeds) {
console.log('initializing for match ' + self.matches[i].Id);
self.matches[i].Feeds = new Array<Feed>();
}
self.matches[i].Feeds.unshift(feed);
@@ -74,8 +76,19 @@ export class HomeComponent implements OnInit {
});
}
listenForConnection() {
let self = this;
// Listen for connected / disconnected events
self.feedService.setConnectionId.subscribe(
id => {
console.log(id);
self.connectionId = id;
}
);
}
updateSubscription(subscription: any) {
if(<boolean>subscription.subscribe === true)
if (<boolean>subscription.subscribe === true)
this.feedService.subscribeToFeed(<number>subscription.matchId);
else
this.feedService.unsubscribeFromFeed(<number>subscription.matchId);

5
app/shared/components/chat.component.html
View File

@@ -10,6 +10,11 @@
<td><span class="teamName">{{match.Id}}</span></td>
<td><span class="teamScore"> {{match.Host}} vs {{match.Guest}} </span></td>
</tr>
<tr>
<td colspan="2">
<span class="match-th">{{connection}}</span>
</td>
</tr>
<tr>
<td colspan="2">
<div class="chat-table">

1
app/shared/components/chat.component.ts
View File

@@ -10,6 +10,7 @@ import { FeedService } from '../services/feed.service';
export class ChatComponent implements OnInit {
@Input() matches: Match[];
@Input() connection: string;
messages: ChatMessage[];
constructor(private feedService: FeedService) { }

2
app/shared/interfaces.ts
View File

@@ -9,7 +9,7 @@ export interface FeedProxy {
}
export interface FeedClient {
userConnected: (user: any) => void;
setConnectionId: (id: string) => void;
userDisconnected: (id: string) => void;
updateMatch: (match: Match) => void;

12
app/shared/services/feed.service.ts
View File

@@ -13,14 +13,14 @@ export class FeedService {
currentState = SignalRConnectionStatus.Disconnected;
connectionState: Observable<SignalRConnectionStatus>;
userConnected: Observable<any>;
setConnectionId: Observable<string>;
updateMatch: Observable<Match>;
addFeed: Observable<Feed>;
addChatMessage: Observable<ChatMessage>;
private connectionStateSubject = new Subject<SignalRConnectionStatus>();
private userConnectedSubject = new Subject<any>();
private setConnectionIdSubject = new Subject<string>();
private updateMatchSubject = new Subject<Match>();
private addFeedSubject = new Subject<Feed>();
private addChatMessageSubject = new Subject<ChatMessage>();
@@ -30,7 +30,7 @@ export class FeedService {
constructor(private http: Http) {
this.connectionState = this.connectionStateSubject.asObservable();
this.userConnected = this.userConnectedSubject.asObservable();
this.setConnectionId = this.setConnectionIdSubject.asObservable();
this.updateMatch = this.updateMatchSubject.asObservable();
this.addFeed = this.addFeedSubject.asObservable();
this.addChatMessage = this.addChatMessageSubject.asObservable();
@@ -48,7 +48,7 @@ export class FeedService {
* @desc callback when a new user connect to the chat
* @param User user, the connected user
*/
feedHub.client.userConnected = user => this.onUserConnected(user);
feedHub.client.setConnectionId = id => this.onSetConnectionId(id);
/**
* @desc callback when match score is updated
@@ -77,8 +77,8 @@ export class FeedService {
}
// Client side methods
private onUserConnected(user: any) {
this.userConnectedSubject.next(user);
private onSetConnectionId(id: string) {
this.setConnectionIdSubject.next(id);
}
private onUpdateMatch(match: Match) {

2
wwwroot/css/site.css
View File

@@ -33,7 +33,7 @@ th, td {
}
.chat-table {
height: 240px;
height: 253px;
overflow: auto;
}