From c2f0db5daa79e63360ae39f87d7cd07b84664c74 Mon Sep 17 00:00:00 2001 From: Paul Schneider Date: Sat, 14 Sep 2019 13:59:53 +0100 Subject: [PATCH] cleaning and refactoring chat system and also fixing chat inputs validation. --- src/Yavsc/Hubs/.ChatHub.cs.swp | Bin 0 -> 28672 bytes src/Yavsc/Hubs/ChatHub.cs | 186 ++++++++---------- src/Yavsc/Hubs/HubInputValidator.cs | 14 +- src/Yavsc/Interfaces/IConnexionManager.cs | 7 +- src/Yavsc/Services/ChatHubConnexionManager.cs | 72 ++++--- src/Yavsc/Services/YavscMessageSender.cs | 3 +- src/Yavsc/wwwroot/js/chat.js | 44 ++--- src/Yavsc/wwwroot/js/chat.min.js | 6 +- 8 files changed, 167 insertions(+), 165 deletions(-) create mode 100644 src/Yavsc/Hubs/.ChatHub.cs.swp diff --git a/src/Yavsc/Hubs/.ChatHub.cs.swp b/src/Yavsc/Hubs/.ChatHub.cs.swp new file mode 100644 index 0000000000000000000000000000000000000000..50f18dce3b8e6abe0f0084a09bd665edba40afe2 GIT binary patch literal 28672 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. using System; -using System.Collections.Concurrent; using Microsoft.AspNet.SignalR; using Microsoft.Data.Entity; using Microsoft.Extensions.DependencyInjection; @@ -32,12 +31,9 @@ using Microsoft.Extensions.Localization; namespace Yavsc { - using System.Collections.Generic; - using System.ComponentModel.DataAnnotations; using Models; using Models.Chat; using Yavsc.Abstract.Chat; - using Yavsc.Attributes.Validation; using Yavsc.Services; public partial class ChatHub : Hub, IDisposable { @@ -46,7 +42,7 @@ namespace Yavsc private IStringLocalizer _localizer; ILogger _logger; - public HubInputValidator HubInputValidator { get; } + public HubInputValidator InputValidator { get; } public ChatHub() { @@ -64,74 +60,50 @@ namespace Yavsc NotifyUser(NotificationTypes.Error, context, error); }); _logger = loggerFactory.CreateLogger(); - HubInputValidator = new HubInputValidator { NotifyUser = this.NotifyUser }; + InputValidator = new HubInputValidator { NotifyUser = this.NotifyUser }; } void SetUserName(string cxId, string userName) { - _cxManager.SetUserName( cxId, userName); + _cxManager.SetUserName(cxId, userName); } public override async Task OnConnected() { - bool isAuth = false; + bool isAuth = (Context.User != null); bool isCop = false; string userName = setUserName(); - if (Context.User != null) + if (isAuth) { - isAuth = Context.User.Identity.IsAuthenticated; var group = isAuth ? ChatHubConstants.HubGroupAuthenticated : ChatHubConstants.HubGroupAnonymous; // Log ("Cx: " + group); await Groups.Add(Context.ConnectionId, group); - if (isAuth) - { - _logger.LogInformation(_localizer.GetString(ChatHubConstants.LabAuthChatUser)); - - var userId = _dbContext.Users.First(u => u.UserName == userName).Id; + _logger.LogInformation(_localizer.GetString(ChatHubConstants.LabAuthChatUser)); - var userHadConnections = _dbContext.ChatConnection.Any(accx => accx.ConnectionId == Context.ConnectionId); + var userId = _dbContext.Users.First(u => u.UserName == userName).Id; - if (userHadConnections) - { - var ccx = _dbContext.ChatConnection.First(c => c.ConnectionId == Context.ConnectionId); - ccx.Connected = true; - } - else - _dbContext.ChatConnection.Add(new ChatConnection - { - ApplicationUserId = userId, - ConnectionId = Context.ConnectionId, - UserAgent = Context.Request.Headers["User-Agent"], - Connected = true - }); - _dbContext.SaveChanges(); - Clients.Group(ChatHubConstants.HubGroupFollowingPrefix + userId).notifyUser(NotificationTypes.Connected, userName, null); - isCop = Context.User.IsInRole(Constants.AdminGroupName) ; - if (isCop) - { - await Groups.Add(Context.ConnectionId, ChatHubConstants.HubGroupCops); - } - - foreach (var uid in _dbContext.CircleMembers.Select(m => m.MemberId)) - { - await Groups.Add(Context.ConnectionId, ChatHubConstants.HubGroupFollowingPrefix + uid); - } + Clients.Group(ChatHubConstants.HubGroupFollowingPrefix + userId).notifyUser(NotificationTypes.Connected, userName, null); + isCop = Context.User.IsInRole(Constants.AdminGroupName) ; + if (isCop) + { + await Groups.Add(Context.ConnectionId, ChatHubConstants.HubGroupCops); } - else + + foreach (var uid in _dbContext.CircleMembers.Select(m => m.MemberId)) { - // this line isn't reached: Context.User != null <=> Context.User.Identity.IsAuthenticated - throw new NotSupportedException("Context.User != null && no auth"); + await Groups.Add(Context.ConnectionId, ChatHubConstants.HubGroupFollowingPrefix + uid); } } else { await Groups.Add(Context.ConnectionId, ChatHubConstants.HubGroupAnonymous); } - _cxManager.OnConnected(userName, isCop); + _cxManager.OnConnected(Context.ConnectionId, isCop); await base.OnConnected(); } + string setUserName() { if (Context.User != null) @@ -160,53 +132,27 @@ namespace Yavsc var userId = user.Id; Clients.Group(ChatHubConstants.HubGroupFollowingPrefix + userId).notifyUser(NotificationTypes.DisConnected, userName, null); - var cx = _dbContext.ChatConnection.SingleOrDefault(c => c.ConnectionId == Context.ConnectionId); - if (cx != null) - { - _dbContext.ChatConnection.Remove(cx); - _dbContext.SaveChanges(); - } - else - _logger.LogError($"Could not remove user cx {Context.ConnectionId}"); + _cxManager.OnDisctonnected(Context.ConnectionId); } - _cxManager.Abort(Context.ConnectionId); return base.OnDisconnected(stopCalled); } public override Task OnReconnected() { + + var isCop = Context.User?.IsInRole(Constants.AdminGroupName) ?? false; + var userName = setUserName(); if (Context.User != null) if (Context.User.Identity.IsAuthenticated) { - var userName = Context.User.Identity.Name; - var user = _dbContext.Users.FirstOrDefault(u => u.UserName == userName); - var userId = user.Id; - var userHadConnections = _dbContext.ChatConnection.Any(accx => accx.ConnectionId == Context.ConnectionId); - - if (userHadConnections) - { - var ccx = _dbContext.ChatConnection.First(c => c.ConnectionId == Context.ConnectionId); - ccx.Connected = true; - } - else - _dbContext.ChatConnection.Add(new ChatConnection - { - ApplicationUserId = userId, - ConnectionId = Context.ConnectionId, - UserAgent = Context.Request.Headers["User-Agent"], - Connected = true - }); - _dbContext.SaveChanges(); Clients.Group("authenticated").notifyUser(NotificationTypes.Reconnected, userName, "reconnected"); } + _cxManager.OnConnected(Context.ConnectionId, isCop); return base.OnReconnected(); } - - - public void Nick(string nickName) { - if (!HubInputValidator.ValidateUserName(nickName)) return; + if (!InputValidator.ValidateUserName(nickName)) return; var candidate = "?" + nickName; if (_cxManager.IsConnected(candidate)) @@ -227,7 +173,12 @@ namespace Yavsc public ChatRoomInfo Join(string roomName) { - if (!HubInputValidator.ValidateRoomName(roomName)) return null; + _logger.LogInformation($"Join:{roomName}"); + if (!InputValidator.ValidateRoomName(roomName)) + { + _logger.LogError("!InputValidator.ValidateRoomName(roomName)"); + return null; + } var roomGroupName = ChatHubConstants.HubGroupRomsPrefix + roomName; var user = _cxManager.GetUserName(Context.ConnectionId); @@ -235,22 +186,25 @@ namespace Yavsc ChatRoomInfo chanInfo; if (!_cxManager.IsPresent(roomName, user)) { - chanInfo = _cxManager.Join(roomName, user); + _logger.LogInformation($"Joining"); + chanInfo = _cxManager.Join(roomName, Context.ConnectionId); Clients.Group(roomGroupName).notifyRoom(NotificationTypes.UserJoin, roomName, user); } else{ + _logger.LogInformation($"already present"); // in case in an additional connection, // one only send info on room without // warning any other user. _cxManager.TryGetChanInfo(roomName, out chanInfo); } + _logger.LogInformation($"returning chan info"); return chanInfo; } [Authorize] public void Register(string room) { - if (!HubInputValidator.ValidateRoomName(room)) return ; + if (!InputValidator.ValidateRoomName(room)) return ; var existent = _dbContext.ChatRoom.Any(r => r.Name == room); if (existent) { @@ -276,9 +230,9 @@ namespace Yavsc [Authorize] public void KickBan(string roomName, string userName, string reason) { - if (!HubInputValidator.ValidateRoomName(roomName)) return ; - if (!HubInputValidator.ValidateUserName(userName)) return ; - if (!HubInputValidator.ValidateReason(reason)) return; + if (!InputValidator.ValidateRoomName(roomName)) return ; + if (!InputValidator.ValidateUserName(userName)) return ; + if (!InputValidator.ValidateReason(reason)) return; Kick(roomName, userName, reason); Ban(roomName, userName, reason); } @@ -286,9 +240,9 @@ namespace Yavsc [Authorize] public void Kick(string roomName, string userName, string reason) { - if (!HubInputValidator.ValidateRoomName(roomName)) return ; - if (!HubInputValidator.ValidateUserName(userName)) return ; - if (!HubInputValidator.ValidateReason(reason)) return; + if (!InputValidator.ValidateRoomName(roomName)) return ; + if (!InputValidator.ValidateUserName(userName)) return ; + if (!InputValidator.ValidateReason(reason)) return; ChatRoomInfo chanInfo; var roomGroupName = ChatHubConstants.HubGroupRomsPrefix + roomName; if (_cxManager.TryGetChanInfo(roomName, out chanInfo)) @@ -311,9 +265,9 @@ namespace Yavsc [Authorize] public void Ban(string roomName, string userName, string reason) { - if (!HubInputValidator.ValidateRoomName(roomName)) return ; - if (!HubInputValidator.ValidateUserName(userName)) return ; - if (!HubInputValidator.ValidateReason(reason)) return; + if (!InputValidator.ValidateRoomName(roomName)) return ; + if (!InputValidator.ValidateUserName(userName)) return ; + if (!InputValidator.ValidateReason(reason)) return; var cxIds = _cxManager.GetConnexionIds(userName); throw new NotImplementedException(); } @@ -321,15 +275,15 @@ namespace Yavsc [Authorize] public void Gline(string userName, string reason) { - if (!HubInputValidator.ValidateUserName(userName)) return ; - if (!HubInputValidator.ValidateReason(reason)) return; + if (!InputValidator.ValidateUserName(userName)) return ; + if (!InputValidator.ValidateReason(reason)) return; throw new NotImplementedException(); } public void Part(string roomName, string reason) { - if (!HubInputValidator.ValidateRoomName(roomName)) return ; - if (!HubInputValidator.ValidateReason(reason)) return; + if (!InputValidator.ValidateRoomName(roomName)) return ; + if (!InputValidator.ValidateReason(reason)) return; if (_cxManager.Part(Context.ConnectionId, roomName, reason)) { var roomGroupName = ChatHubConstants.HubGroupRomsPrefix + roomName; @@ -351,13 +305,20 @@ namespace Yavsc public void Send(string roomName, string message) { - if (!HubInputValidator.ValidateRoomName(roomName)) return ; - if (!HubInputValidator.ValidateMessage(message)) return ; - + _logger.LogInformation($"Send {roomName} {message}"); + if (!InputValidator.ValidateRoomName(roomName)) { + _logger.LogError($"Invalid roomName : {roomName}"); + return ; + } + if (!InputValidator.ValidateMessage(message)) { + _logger.LogError($"Invalid message : {message}"); + return ; + } var groupname = ChatHubConstants.HubGroupRomsPrefix + roomName; ChatRoomInfo chanInfo ; if (!_cxManager.TryGetChanInfo(roomName, out chanInfo)) { + _logger.LogError($"No such room : {roomName}"); var noChanMsg = _localizer.GetString(ChatHubConstants.LabNoSuchChan).ToString(); NotifyUserInRoom(NotificationTypes.Error, roomName, noChanMsg); return; @@ -365,14 +326,17 @@ namespace Yavsc var userName = _cxManager.GetUserName(Context.ConnectionId); if (!_cxManager.IsPresent(roomName, userName)) { + _logger.LogError($"{userName} Not present in room : {roomName}"); var notSentMsg = _localizer.GetString(ChatHubConstants.LabnoJoinNoSend).ToString(); NotifyUserInRoom(NotificationTypes.Error, roomName, notSentMsg); return; } Clients.Group(groupname).addMessage(userName, roomName, message); } + void NotifyUser(string type, string targetId, string message) { + _logger.LogInformation("notifying user {type} {targetId} : {message}"); Clients.Caller.notifyUser(type, targetId, message); } void NotifyUserInRoom(string type, string room, string message) @@ -383,8 +347,19 @@ namespace Yavsc [Authorize] public void SendPV(string userName, string message) { - if (!HubInputValidator.ValidateUserName(userName)) return ; - if (!HubInputValidator.ValidateMessage(message)) return ; + _logger.LogInformation($"Sending pv to {userName}"); + + if (!InputValidator.ValidateUserName(userName)) + { + _logger.LogError($"Invalid username : {userName}"); + return ; + } + if (!InputValidator.ValidateMessage(message)) + { + _logger.LogError($"Invalid message : {message}"); + return ; + } + _logger.LogInformation($"Message form is validated."); if (userName[0] != '?') if (!Context.User.IsInRole(Constants.AdminGroupName)) @@ -397,24 +372,33 @@ namespace Yavsc if (bl.Count() > 0) { + _logger.LogError($"Black listed : {Context.User.Identity.Name}"); NotifyUser(NotificationTypes.PrivateMessageDenied, userName, "you are black listed."); return; } + _logger.LogInformation("Sender is no black listed"); } + + _logger.LogInformation("getting cx id´s"); var cxIds = _cxManager.GetConnexionIds(userName); - if (cxIds!=null) - foreach (var connectionId in cxIds) + if (cxIds==null || cxIds.Count()==0) + _logger.LogError($"No such connected user : {userName}"); + else foreach (var connectionId in cxIds) { + _logger.LogInformation($"cx: {connectionId}"); var cli = Clients.Client(connectionId); + _logger.LogInformation($"cli: {cli.ToString()}"); cli.addPV(Context.User.Identity.Name, message); + _logger.LogInformation($"Sent pv to cx {connectionId}"); } + } [Authorize] public void SendStream(string connectionId, long streamId, string message) { - if (!HubInputValidator.ValidateMessage(message)) return; + if (!InputValidator.ValidateMessage(message)) return; var sender = Context.User.Identity.Name; var cli = Clients.Client(connectionId); cli.addStreamInfo(sender, streamId, message); diff --git a/src/Yavsc/Hubs/HubInputValidator.cs b/src/Yavsc/Hubs/HubInputValidator.cs index 2a29248a..19409fd1 100644 --- a/src/Yavsc/Hubs/HubInputValidator.cs +++ b/src/Yavsc/Hubs/HubInputValidator.cs @@ -36,14 +36,20 @@ namespace Yavsc } public bool ValidateUserName (string userName) { - bool valid = ValidateStringLength(userName, 1,12); - if (valid) valid = IsLetterOrDigit(userName); - NotifyUser(NotificationTypes.Error, "char:"+userName.First (c => !char.IsLetterOrDigit(c)), ChatHub.InvalidUserName); + bool valid = true; + + if (userName.Length<1 || userName[0] == '?' && userName.Length<2) valid = false; + if (valid) { + string suname = (userName[0] == '?') ? userName.Substring(1) : userName; + if (valid) valid = ValidateStringLength(suname, 1,12); + if (valid) valid = IsLetterOrDigit(userName); + } + if (!valid) NotifyUser(NotificationTypes.Error, "userName" , ChatHub.InvalidUserName); return valid; } public bool ValidateMessage (string message) { - if (!ValidateStringLength(message, 1,240)) + if (!ValidateStringLength(message, 1, 10240)) { NotifyUser(NotificationTypes.Error, "message", ChatHub.InvalidMessage); return false; diff --git a/src/Yavsc/Interfaces/IConnexionManager.cs b/src/Yavsc/Interfaces/IConnexionManager.cs index 4add5fc8..39795866 100644 --- a/src/Yavsc/Interfaces/IConnexionManager.cs +++ b/src/Yavsc/Interfaces/IConnexionManager.cs @@ -8,11 +8,13 @@ namespace Yavsc.Services void SetUserName(string cxId, string userName); string GetUserName (string cxId); - void OnConnected(string userName, bool isCop); + void OnConnected(string cxId, bool isCop); bool IsConnected(string candidate); + + void OnDisctonnected (string cxId); bool IsPresent(string roomName, string userName); - ChatRoomInfo Join(string roomName, string userName); + ChatRoomInfo Join(string roomName, string cxId); bool Part(string cxId, string roomName, string reason); @@ -25,7 +27,6 @@ namespace Yavsc.Services bool TryGetChanInfo(string room, out ChatRoomInfo chanInfo); IEnumerable GetConnexionIds(string userName); - void Abort(string connectionId); void SetErrorHandler(Action errorHandler); IEnumerable ListChannels(string pattern); diff --git a/src/Yavsc/Services/ChatHubConnexionManager.cs b/src/Yavsc/Services/ChatHubConnexionManager.cs index 712b1f0d..e6cf8c50 100644 --- a/src/Yavsc/Services/ChatHubConnexionManager.cs +++ b/src/Yavsc/Services/ChatHubConnexionManager.cs @@ -77,16 +77,19 @@ namespace Yavsc.Services } ChatUserNames[cxId] = userName; } - - public void OnConnected(string userName, bool isCop) + // Username must have been set before calling this method. + public void OnConnected(string cxId, bool isCop) { - ChatRoomPresence[userName] = new List(); - _isCop[userName] = isCop; + var username = ChatUserNames[cxId]; + if (!IsConnected(username)) + ChatRoomPresence[username] = new List(); + _isCop[username] = isCop; } public bool IsConnected(string candidate) { - return ChatRoomPresence[candidate] != null; + return ChatRoomPresence.ContainsKey(candidate) + && ChatRoomPresence[candidate] != null; } public bool IsPresent(string roomName, string userName) @@ -98,26 +101,27 @@ namespace Yavsc.Services { return _isCop[userName]; } - public void Abort(string connectionId) + + public void OnDisctonnected(string connectionId) { string uname; if (!ChatUserNames.TryRemove(connectionId, out uname)) - _logger.LogError($"Could not remove user name for cx {connectionId}"); + _logger.LogError($"Could not get removed user name for cx {connectionId}"); else { List cxIds; if (ChatCxIds.TryGetValue(uname, out cxIds)) { cxIds.Remove(connectionId); + foreach (var room in ChatRoomPresence[uname]) + { + Part(connectionId, room, "connexion aborted"); + } } else _logger.LogError($"Could not remove user cx {connectionId}"); - foreach (var room in ChatRoomPresence[uname]) - { - Part(connectionId, room, "connexion aborted"); - } ChatRoomPresence[uname] = null; } } @@ -128,12 +132,15 @@ namespace Yavsc.Services var userName = ChatUserNames[cxId]; if (Channels.TryGetValue(roomName, out chanInfo)) { - if (!chanInfo.Users.Contains(userName)) + if (!chanInfo.Users.Contains(cxId)) { // TODO NotifyErrorToCaller(roomName, "you didn't join."); return false; } - chanInfo.Users.Remove(userName); + // FIXME only remove cx, not username, + // as long as he might be connected + // from another device, to the same room + chanInfo.Users.Remove(cxId); if (chanInfo.Users.Count == 0) { ChatRoomInfo deadchanInfo; @@ -153,8 +160,10 @@ namespace Yavsc.Services } } - public ChatRoomInfo Join(string roomName, string userName) + public ChatRoomInfo Join(string roomName, string cxId) { + var userName = ChatUserNames[cxId]; + _logger.LogInformation($"Join: {userName}=>{roomName}"); ChatRoomInfo chanInfo; // if channel already is open @@ -172,13 +181,14 @@ namespace Yavsc.Services { if (isCop(userName)) { - chanInfo.Ops.Add(userName); + chanInfo.Ops.Add(cxId); } else{ - chanInfo.Users.Add(userName); + chanInfo.Users.Add(cxId); } _logger.LogInformation($"existing room joint: {userName}=>{roomName}"); - ChatRoomPresence[userName].Add(roomName); + if (!ChatRoomPresence[userName].Contains(roomName)) + ChatRoomPresence[userName].Add(roomName); return chanInfo; } } @@ -198,13 +208,13 @@ namespace Yavsc.Services { chanInfo.Topic = room.Topic; chanInfo.Name = room.Name; - chanInfo.Users.Add(userName); + chanInfo.Users.Add(cxId); } else { // a first join, we create it. chanInfo.Name = roomName; chanInfo.Topic = _localizer.GetString(ChatHubConstants.JustCreatedBy)+userName; - chanInfo.Ops.Add(userName); + chanInfo.Ops.Add(cxId); } if (Channels.TryAdd(roomName, chanInfo)) @@ -291,8 +301,8 @@ namespace Yavsc.Services } var kickerName = GetUserName(cxId); - if (!chanInfo.Ops.Contains(kickerName)) - if (!chanInfo.Hops.Contains(kickerName)) + if (!chanInfo.Ops.Contains(cxId)) + if (!chanInfo.Hops.Contains(cxId)) { _errorHandler(roomName, _localizer.GetString(ChatHubConstants.LabYouNotOp).ToString()); return false; @@ -303,8 +313,9 @@ namespace Yavsc.Services _errorHandler(roomName, _localizer.GetString(ChatHubConstants.LabNoSuchUser).ToString()); return false; } - if (chanInfo.Hops.Contains(kickerName)) - if (chanInfo.Ops.Contains(userName)) + var ucxs = GetConnexionIds(userName); + if (chanInfo.Hops.Contains(cxId)) + if (chanInfo.Ops.Any(c => ucxs.Contains(c))) { _errorHandler(roomName, _localizer.GetString(ChatHubConstants.HopWontKickOp).ToString()); return false; @@ -316,15 +327,16 @@ namespace Yavsc.Services } // all good, time to kick :-) - - if (chanInfo.Users.Contains(userName)) - chanInfo.Users.Remove(userName); + foreach (var ucx in ucxs) { + if (chanInfo.Users.Contains(ucx)) + chanInfo.Users.Remove(ucx); - else if (chanInfo.Ops.Contains(userName)) - chanInfo.Ops.Remove(userName); + else if (chanInfo.Ops.Contains(ucx)) + chanInfo.Ops.Remove(ucx); - else if (chanInfo.Hops.Contains(userName)) - chanInfo.Hops.Remove(userName); + else if (chanInfo.Hops.Contains(ucx)) + chanInfo.Hops.Remove(ucx); + } return true; diff --git a/src/Yavsc/Services/YavscMessageSender.cs b/src/Yavsc/Services/YavscMessageSender.cs index c1b9a9c0..21250042 100644 --- a/src/Yavsc/Services/YavscMessageSender.cs +++ b/src/Yavsc/Services/YavscMessageSender.cs @@ -125,8 +125,7 @@ namespace Yavsc.Services var hubClient = hubContext.Clients.User(cxid); var data = new Dictionary(); data["event"] = ev; - - hubClient.push(ev.Topic, data); + hubClient.push(ev.Topic, JsonConvert.SerializeObject(data)); } result.message_id = MimeKit.Utils.MimeUtils.GenerateMessageId( diff --git a/src/Yavsc/wwwroot/js/chat.js b/src/Yavsc/wwwroot/js/chat.js index 8ec4dac0..80fbc2d9 100644 --- a/src/Yavsc/wwwroot/js/chat.js +++ b/src/Yavsc/wwwroot/js/chat.js @@ -61,7 +61,7 @@ window.ChatHubHandler = (function ($) { // Create a function that the hub can call back to display messages. chat.client.addMessage = function (name, room, message) { // Add the message to the page. - var $userTag = $('' + htmlEncode(name) + '').click(function() { + var $userTag = $('' + htmlEncode(name) + '').click(function () { buildPv(name); }); var $li = $('
  • '); @@ -111,12 +111,12 @@ window.ChatHubHandler = (function ($) { chat.client.addPublicStream = function (pubStrInfo) { $('
  • ').append(pubStrInfo.sender + ': ') - .append('' + pubStrInfo.title + '').append('[' + pubStrInfo.mediaType + ']').addClass('streaminfo').appendTo(notifications); + .append('' + pubStrInfo.title + '').append('[' + pubStrInfo.mediaType + ']').addClass('streaminfo').appendTo(notifications); }; chat.client.push = function (what, data) { $('
  • ').append(what + ': ') - .append(data.event).addClass('event').appendTo(notifications); + .append(data).addClass('event').appendTo(notifications); }; var setChanInfo = function (chanInfo) { @@ -191,18 +191,17 @@ window.ChatHubHandler = (function ($) { .keydown(function (ev) { if (ev.which == 13) { if (this.value.length == 0) return; - sendCmd(chanName, this.value); - // chat.server.send(chanName, this.value); + sendCmd(chanName, this.value); this.value = ''; } }).appendTo(roomview); - if (chanType == 'r') chans.push(chanName); - else if (chanType == 'u' || chanType == 'a') userlist.push(chanName); + if (chanType == 'r') chans.push(chanName); + else if (chanType == 'u' || chanType == 'a') userlist.push(chanName); setActiveChan(chanId); }; var buildRoom = function (roomName) { - if (!chans.some(function(cname) { return cname == roomName; })) { + if (!chans.some(function (cname) { return cname == roomName; })) { buildChan('#', 'r', roomName, chat.server.send); } }; @@ -216,7 +215,7 @@ window.ChatHubHandler = (function ($) { } var buildPv = function (userName) { - if (!userlist.some(function(uname) { return uname == userName; })) { + if (!userlist.some(function (uname) { return uname == userName; })) { if (userName[0] == '?') buildChan('@?', 'a', userName.slice(1), chat.server.sendPV); else buildChan('@', 'u', userName, chat.server.sendPV); } @@ -238,8 +237,8 @@ window.ChatHubHandler = (function ($) { $view.removeClass('disabled'); setTimeout(function () { chans.forEach(function (chan) { - join(chan); - }); + join(chan); + }); }, 120); } @@ -256,10 +255,10 @@ window.ChatHubHandler = (function ($) { $.connection.hub.disconnected(function () { onDisCx(); setTimeout(function () { - $.connection.hub.start().done(function () { - onCx(); - }); - }, 30000); // Re-start connection after 30 seconds + $.connection.hub.start().done(function () { + onCx(); + }); + }, 30000); // Re-start connection after 30 seconds }); chanName.keydown(function (event) { @@ -272,7 +271,7 @@ window.ChatHubHandler = (function ($) { // else TODO showRoomInfo(this.value); }); - ptc.click(function() { + ptc.click(function () { DestroyRoom(); }); @@ -288,15 +287,16 @@ window.ChatHubHandler = (function ($) { var addChatUser = function (uname) { - $('#u_' + uname).remove(); - // ulist.remove("li.user[data='"+uname+"']"); + ulist.children('li').filter(function () { + return $(this).data('uname') == uname; + }).remove(); $('
  • ' + uname + '
    • ') - .prop('id', 'u_' + uname) + .data('uname', uname) .css('cursor', 'pointer') .click(function () { - buildPv(uname); - }) + buildPv(uname); + }) .appendTo(ulist); }; @@ -306,7 +306,7 @@ window.ChatHubHandler = (function ($) { return encodedValue; } - $(window).unload(function () { $.connection.hub.abort() }); + $(window).unload(function () { $.connection.hub.stop() }); }; diff --git a/src/Yavsc/wwwroot/js/chat.min.js b/src/Yavsc/wwwroot/js/chat.min.js index 21edb97f..8e317f66 100644 --- a/src/Yavsc/wwwroot/js/chat.min.js +++ b/src/Yavsc/wwwroot/js/chat.min.js @@ -2,9 +2,9 @@ window.ChatHubHandler=(function($){$.fn.filterByData=function(prop,val){return this.filter(function(){return $(this).data(prop)==val;});};var ChatView=function($view,full){if(!full)throw new Error('not implemented');var chans=[];var userlist=[];var frontChanId;var ulist=$('
      ').addClass('userlist');var notifications=$('
        ').addClass('notifs');ulist.appendTo($view);notifications.appendTo($view);var onUserDisconnected=function(uname){$('#u'+uname).remove();};var onUserConnected=function(username){addChatUser(username);};var chat=$.connection.chatHub;chat.client.addMessage=function(name,room,message){var $userTag=$(''+htmlEncode(name)+'').click(function(){buildPv(name);});var $li=$('
      • ');$userTag.appendTo($li);$li.append(' '+htmlEncode(message));$li.appendTo($('#r'+room));};chat.client.addPV=function(name,message){if(!$('#mute').prop('checked')){audio.play();} buildPv(name);$('#u'+name).append('
      • '+htmlEncode(name)+': '+htmlEncode(message)+'
        • ');};chat.client.notifyRoom=function(tag,targetid,message){if(tag==='connected'||tag==='reconnected'){onUserConnected(targetid,message);return;}else if(tag==='disconnected'){onUserDisconnected(targetid,message);return;} $('
      • ').addClass(tag).append(tag+': ').append(message).addClass(tag).appendTo($('#room_'+targetid));};chat.client.notifyUser=function(tag,targetid,message){if(tag==='connected'||tag==='reconnected'){onUserConnected(targetid,message);return;}else if(tag==='disconnected'){onUserDisconnected(targetid,message);return;} -$('
      • ').append(tag+': '+targetid+': ').append(message).addClass(tag).appendTo(notifications);};chat.client.notifyUserInRoom=function(tag,room,message){$('
      • ').append(tag+': ').append(message).addClass(tag).appendTo($('#room_'+room));};chat.client.addPublicStream=function(pubStrInfo){$('
      • ').append(pubStrInfo.sender+': ').append(''+pubStrInfo.title+'').append('['+pubStrInfo.mediaType+']').addClass('streaminfo').appendTo(notifications);};chat.client.push=function(what,data){$('
      • ').append(what+': ').append(data.event).addClass('event').appendTo(notifications);};var setChanInfo=function(chanInfo){if(chanInfo){var chanId='r'+chanInfo.Name;$('#tv_'+chanId).replaceWith(chanInfo.Topic);}};var setActiveChan=function(chanId){if(frontChanId!=chanId){if(frontChanId){$('#sel_'+frontChanId).addClass('btn-primary');$('#v'+frontChanId).addClass('hidden');} +$('
      • ').append(tag+': '+targetid+': ').append(message).addClass(tag).appendTo(notifications);};chat.client.notifyUserInRoom=function(tag,room,message){$('
      • ').append(tag+': ').append(message).addClass(tag).appendTo($('#room_'+room));};chat.client.addPublicStream=function(pubStrInfo){$('
      • ').append(pubStrInfo.sender+': ').append(''+pubStrInfo.title+'').append('['+pubStrInfo.mediaType+']').addClass('streaminfo').appendTo(notifications);};chat.client.push=function(what,data){$('
      • ').append(what+': ').append(data).addClass('event').appendTo(notifications);};var setChanInfo=function(chanInfo){if(chanInfo){var chanId='r'+chanInfo.Name;$('#tv_'+chanId).replaceWith(chanInfo.Topic);}};var setActiveChan=function(chanId){if(frontChanId!=chanId){if(frontChanId){$('#sel_'+frontChanId).addClass('btn-primary');$('#v'+frontChanId).addClass('hidden');} frontChanId=chanId;$('#sel_'+chanId).removeClass('btn-primary');$('#v'+chanId).removeClass('hidden');$('#inp_'+chanId).focus();}};var join=function(roomName){chat.server.join(roomName).done(function(chatInfo){if(chatInfo){setChanInfo(chatInfo);setActiveChan('r'+chatInfo.Name);}});};var chatbar=$('
        ');var roomjoin=$('
        ');var roomlist=$('
        ');roomlist.appendTo(chatbar);var ptc=$('').addClass('ptcroix');$('').appendTo(roomjoin);var chanName=$('');chanName.appendTo(roomjoin);ptc.appendTo(roomjoin);roomjoin.appendTo(chatbar);chatbar.appendTo($view);var chatlist=$('
        ');chatlist.appendTo($view);var buildChan=function(chdp,chanType,chanName,sendCmd){var chanId=chanType+chanName;var roomTag=$(''+chdp+chanName+'').addClass('btn');roomTag.prop('id','sel_'+chanId).click(function(){setActiveChan(chanId);$(this).removeClass('btn-primary');});roomTag.appendTo(roomlist);var roomview=$('
        ').addClass('container');roomview.appendTo(chatlist);roomview.prop('id','v'+chanId);$('
        ').prop('id','tv_'+chanId).appendTo(roomview);var msglist=$('
          ').addClass('mesglist');msglist.prop('id',chanId);msglist.appendTo(roomview);$('').prop('id','inp_'+chanId).prop('enable',false).prop('hint','hello').prop('title','send to '+chanName).addClass('form-control').keydown(function(ev){if(ev.which==13){if(this.value.length==0)return;sendCmd(chanName,this.value);this.value='';}}).appendTo(roomview);if(chanType=='r')chans.push(chanName);else if(chanType=='u'||chanType=='a')userlist.push(chanName);setActiveChan(chanId);};var buildRoom=function(roomName){if(!chans.some(function(cname){return cname==roomName;})){buildChan('#','r',roomName,chat.server.send);}};var DestroyRoom=function(){if(frontChanId){$('#v'+frontChanId).remove();$('#sel_'+frontChanId).remove();frontChanId=null;}} var buildPv=function(userName){if(!userlist.some(function(uname){return uname==userName;})){if(userName[0]=='?')buildChan('@?','a',userName.slice(1),chat.server.sendPV);else buildChan('@','u',userName,chat.server.sendPV);}};$view.data('chans').split(',').forEach(function(chan){buildRoom(chan);});function onCx(){$view.removeClass('disabled');setTimeout(function(){chans.forEach(function(chan){join(chan);});},120);} function onDisCx(){$view.addClass('disabled');} -$.connection.hub.start().done(function(){onCx();});$.connection.hub.disconnected(function(){onDisCx();setTimeout(function(){$.connection.hub.start().done(function(){onCx();});},30000);});chanName.keydown(function(event){if(event.which==13){if(this.value.length==0)return;buildRoom(this.value);join(this.value);this.value='';}});ptc.click(function(){DestroyRoom();});var audio=new Audio('/sounds/bell.mp3');$('#command').keydown(function(event){if(event.which==13){}});var addChatUser=function(uname){$('#u_'+uname).remove();$('
        • '+uname+'
          • ').prop('id','u_'+uname).css('cursor','pointer').click(function(){buildPv(uname);}).appendTo(ulist);};function htmlEncode(value){var encodedValue=$('
          ').text(value).html();return encodedValue;} -$(window).unload(function(){$.connection.hub.abort()});};$(document).ready(function($){ChatView($('#chatview'),true);});})(window.jQuery); \ No newline at end of file +$.connection.hub.start().done(function(){onCx();});$.connection.hub.disconnected(function(){onDisCx();setTimeout(function(){$.connection.hub.start().done(function(){onCx();});},30000);});chanName.keydown(function(event){if(event.which==13){if(this.value.length==0)return;buildRoom(this.value);join(this.value);this.value='';}});ptc.click(function(){DestroyRoom();});var audio=new Audio('/sounds/bell.mp3');$('#command').keydown(function(event){if(event.which==13){}});var addChatUser=function(uname){ulist.children('li').filter(function(){return $(this).data('uname')==uname;}).remove();$('
        • '+uname+'
          • ').data('uname',uname).css('cursor','pointer').click(function(){buildPv(uname);}).appendTo(ulist);};function htmlEncode(value){var encodedValue=$('
          ').text(value).html();return encodedValue;} +$(window).unload(function(){$.connection.hub.stop()});};$(document).ready(function($){ChatView($('#chatview'),true);});})(window.jQuery); \ No newline at end of file