From 6b3d9bd96dbc08c2679d4cdb3d878e4ef6bd5da1 Mon Sep 17 00:00:00 2001
From: David Fowler <davidfowl@gmail.com>
Date: Fri, 4 Nov 2016 01:28:49 -0700
Subject: [PATCH] Added group messaging to the sample - Clean up some boiler
 plate - Renamed Add/Remove on GroupManager to AddAsync and RemoveAsync

---
 samples/SocketsSample/Hubs/Chat.cs            |  19 +++
 samples/SocketsSample/wwwroot/hubs.html       | 151 ++++++++++++------
 .../IGroupManager.cs                          |   4 +-
 src/Microsoft.AspNetCore.SignalR/Proxies.cs   |   4 +-
 4 files changed, 126 insertions(+), 52 deletions(-)

diff --git a/samples/SocketsSample/Hubs/Chat.cs b/samples/SocketsSample/Hubs/Chat.cs
index 253d661596..0d05dcde30 100644
--- a/samples/SocketsSample/Hubs/Chat.cs
+++ b/samples/SocketsSample/Hubs/Chat.cs
@@ -20,5 +20,24 @@ namespace SocketsSample.Hubs
         {
             return Clients.All.InvokeAsync("Send", Context.ConnectionId + ": " + message);
         }
+
+        public Task SendToGroup(string groupName, string message)
+        {
+            return Clients.Group(groupName).InvokeAsync("Send", Context.ConnectionId + ": " + message);
+        }
+
+        public async Task JoinGroup(string groupName)
+        {
+            await Clients.Group(groupName).InvokeAsync("Send", Context.Connection.ConnectionId + " joined " + groupName);
+
+            await Groups.AddAsync(groupName);
+        }
+
+        public async Task LeaveGroup(string groupName)
+        {
+            await Groups.RemoveAsync(groupName);
+
+            await Clients.Group(groupName).InvokeAsync("Send", Context.Connection.ConnectionId + " left " + groupName);
+        }
     }
 }
diff --git a/samples/SocketsSample/wwwroot/hubs.html b/samples/SocketsSample/wwwroot/hubs.html
index 313c1004f0..a26c706274 100644
--- a/samples/SocketsSample/wwwroot/hubs.html
+++ b/samples/SocketsSample/wwwroot/hubs.html
@@ -5,6 +5,7 @@
     <title></title>
     <script src="js/signalr-client.js"></script>
     <script>
+        var isConnected = false;
         function getParameterByName(name, url) {
             if (!url) {
                 url = window.location.href;
@@ -17,52 +18,19 @@
             return decodeURIComponent(results[2].replace(/\+/g, " "));
         }
 
-        document.addEventListener('DOMContentLoaded', () => {
-            var transports = getParameterByName('transport');
-            if (transports != null) {
-                transports = transports.split(',')
-            }
-
-            document.getElementById('head1').innerHTML = transports ? transports.join(', ') : "auto (WebSockets)";
-
-            let connection = new RpcConnection(`http://${document.location.host}/hubs`, 'formatType=json&format=text');
-            connection.on('Send', msg => {
-                addLine(msg); });
-            connection.connectionClosed = e => {
-                if (e) {
-                    addLine('Connection closed with error: ' + e, 'red');
-                }
-                else {
-                    addLine('Disconnected', 'green');
-                }
-            }
-
-            let isConnected = false;
-            let connectButton = document.getElementById('connect');
-            connectButton.addEventListener('click', event => {
-                connection.start(transports)
-                .then(() => {
-                    isConnected = true;
-                    addLine('Connected successfully', 'green');
-                })
-                .catch(err => {
-                    addLine(err, 'red');
-                });
-
+        function click(id, callback) {
+            document.getElementById(id).addEventListener('click', event => {
+                callback(event);
                 event.preventDefault();
             });
+        }
 
-            let disconnectButton = document.getElementById('disconnect');
-            disconnectButton.addEventListener('click', () => {
-                connection.stop();
-                isConnected = false;
-            });
-
-            document.getElementById('sendmessage').addEventListener('submit', event => {
-                let data = document.getElementById('data').value;
-
-                if (isConnected) {
-                    connection.invoke('SocketsSample.Hubs.Chat.Send', data)
+        function invoke(connection, method, ...args) {
+            if (!isConnected) {
+                return;
+            }
+            var argsArray = Array.prototype.slice.call(arguments);
+            connection.invoke.apply(connection, argsArray.slice(1))
                     .then(result => {
                         console.log("invocation completed successfully: " + (result === null ? '(null)' : result));
 
@@ -73,9 +41,69 @@
                     .catch(err => {
                         addLine(err, 'red');
                     });
-                }
+        }
 
-                event.preventDefault();
+        function getText(id) {
+            return document.getElementById(id).value;
+        }
+
+        document.addEventListener('DOMContentLoaded', () => {
+            var transports = getParameterByName('transport');
+            if (transports != null) {
+                transports = transports.split(',')
+            }
+
+            document.getElementById('head1').innerHTML = transports ? transports.join(', ') : "auto (WebSockets)";
+
+            let connection = new RpcConnection(`http://${document.location.host}/hubs`, 'formatType=json&format=text');
+            connection.on('Send', msg => {
+                addLine(msg);
+            });
+
+            connection.connectionClosed = e => {
+                if (e) {
+                    addLine('Connection closed with error: ' + e, 'red');
+                }
+                else {
+                    addLine('Disconnected', 'green');
+                }
+            }
+
+            click('connect', event => {
+                connection.start(transports)
+                    .then(() => {
+                        isConnected = true;
+                        addLine('Connected successfully', 'green');
+                    })
+                .catch(err => {
+                    addLine(err, 'red');
+                });
+            });
+
+            click('disconnect', event => {
+                connection.stop();
+                isConnected = false;
+            });
+
+            click('broadcast', event => {
+                let data = getText('msg');
+                invoke(connection, 'SocketsSample.Hubs.Chat.Send', data);
+            });
+
+            click('join-group', event => {
+                let groupName = getText('msg');
+                invoke(connection, 'SocketsSample.Hubs.Chat.JoinGroup', groupName);
+            });
+
+            click('leave-group', event => {
+                let groupName = getText('msg');
+                invoke(connection, 'SocketsSample.Hubs.Chat.LeaveGroup', groupName);
+            });
+
+            click('groupmsg', event => {
+                let groupName = getText('target');
+                let message = getText('message');
+                invoke(connection, 'SocketsSample.Hubs.Chat.SendToGroup', groupName, message);
             });
         });
 
@@ -101,9 +129,36 @@
         <input type="button" id="disconnect" value="Disconnect" />
     </div>
 
-    <form id="sendmessage">
-      <input type="text" id="data" />
-      <input type="submit" value="Send" />
+
+    <h4>To Everybody</h4>
+    <form class="form-inline">
+        <div class="input-append">
+            <input type="text" id="msg" placeholder="Type a message, name or group" />
+            <input type="button" id="broadcast" class="btn" value="Broadcast" />
+            <input type="button" id="broadcast-exceptme" class="btn" value="Broadcast (All Except Me)" />
+            <input type="button" id="join" class="btn" value="Enter Name" />
+            <input type="button" id="join-group" class="btn" value="Join Group" />
+            <input type="button" id="leave-group" class="btn" value="Leave Group" />
+        </div>
+    </form>
+
+    <h4>To Me</h4>
+    <form class="form-inline">
+        <div class="input-append">
+            <input type="text" id="me" placeholder="Type a message" />
+            <input type="button" id="send" class="btn" value="Send to me" />
+        </div>
+    </form>
+
+    <h4>Private Message</h4>
+    <form class="form-inline">
+        <div class="input-prepend input-append">
+            <input type="text" name="message" id="message" placeholder="Type a message" />
+            <input type="text" name="user" id="target" placeholder="Type a user or group name" />
+
+            <input type="button" id="privatemsg" class="btn" value="Send to user" />
+            <input type="button" id="groupmsg" class="btn" value="Send to group" />
+        </div>
     </form>
 
     <ul id="messages"></ul>
diff --git a/src/Microsoft.AspNetCore.SignalR/IGroupManager.cs b/src/Microsoft.AspNetCore.SignalR/IGroupManager.cs
index b3f783f06e..e89e409619 100644
--- a/src/Microsoft.AspNetCore.SignalR/IGroupManager.cs
+++ b/src/Microsoft.AspNetCore.SignalR/IGroupManager.cs
@@ -4,7 +4,7 @@ namespace Microsoft.AspNetCore.SignalR
 {
     public interface IGroupManager
     {
-        Task Add(string groupName);
-        Task Remove(string groupName);
+        Task AddAsync(string groupName);
+        Task RemoveAsync(string groupName);
     }
 }
diff --git a/src/Microsoft.AspNetCore.SignalR/Proxies.cs b/src/Microsoft.AspNetCore.SignalR/Proxies.cs
index 7c7d48cf09..00350c8af8 100644
--- a/src/Microsoft.AspNetCore.SignalR/Proxies.cs
+++ b/src/Microsoft.AspNetCore.SignalR/Proxies.cs
@@ -83,12 +83,12 @@ namespace Microsoft.AspNetCore.SignalR
             _lifetimeManager = lifetimeManager;
         }
 
-        public Task Add(string groupName)
+        public Task AddAsync(string groupName)
         {
             return _lifetimeManager.AddGroupAsync(_connection, groupName);
         }
 
-        public Task Remove(string groupName)
+        public Task RemoveAsync(string groupName)
         {
             return _lifetimeManager.RemoveGroupAsync(_connection, groupName);
         }