code simplified.

Author: syslogic

mobile/src/main/java/io/syslogic/socketio/Constants.java

@@ -1,9 +1,9 @@
 package io.syslogic.socketio;
 
 public class Constants {
-    public final static String REQUEST_KEY_LOGIN          = "login";
     public final static String REQUEST_KEY_CHAT_MESSAGE   = "chat message";
     public final static String REQUEST_KEY_DIRECT_MESSAGE = "direct message";
+    public final static String REQUEST_KEY_USER_LOGIN     = "user login";
     public final static String REQUEST_KEY_USER_ADD       = "user add";
     public final static String REQUEST_KEY_USER_JOINED    = "user joined";
     public final static String REQUEST_KEY_USER_LEFT      = "user left";

mobile/src/main/java/io/syslogic/socketio/dialog/SocketsDialogFragment.java

@@ -62,7 +62,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
             Log.d(LOG_TAG, usercount + " sockets active");
 
             // remove the "sockets" emitter again.
-            getSocket().off(Constants.REQUEST_KEY_LOGIN, this.onSockets);
+            getSocket().off(Constants.REQUEST_KEY_USER_LOGIN, this.onSockets);
 
             requireMainActivity().runOnUiThread(() -> {
                 this.getDataBinding().recyclerviewSockets.setAdapter(new SocketAdapter(items));

mobile/src/main/java/io/syslogic/socketio/fragment/ChatFragment.java

@@ -47,7 +47,7 @@ public class ChatFragment extends BaseFragment implements FragmentResultListener
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         MainActivity activity = requireMainActivity();
-        this.addFragmentResultListener(Constants.REQUEST_KEY_LOGIN, this, true);
+        this.addFragmentResultListener(Constants.REQUEST_KEY_USER_LOGIN, this, true);
         activity.addChatMenuProvider();
         if (savedInstanceState == null) {
             mSocket = activity.getSocket();

mobile/src/main/java/io/syslogic/socketio/fragment/LoginFragment.java

@@ -47,7 +47,7 @@ public void onCreate(Bundle savedInstanceState) {
                 mSocket.on(Socket.EVENT_CONNECT, this.onConnect);
                 mSocket.on(Socket.EVENT_DISCONNECT, this.onDisconnect);
                 mSocket.on(Socket.EVENT_CONNECT_ERROR, this.onConnectError);
-                mSocket.on(Constants.REQUEST_KEY_LOGIN, this.onLogin);
+                mSocket.on(Constants.REQUEST_KEY_USER_LOGIN, this.onLogin);
                 if (!mSocket.connected()) {mSocket.connect();}
             }
         }
@@ -86,7 +86,7 @@ public void onDestroy() {
         mSocket.off(Socket.EVENT_CONNECT, this.onConnect);
         mSocket.off(Socket.EVENT_DISCONNECT, this.onDisconnect);
         mSocket.off(Socket.EVENT_CONNECT_ERROR, this.onConnectError);
-        mSocket.off(Constants.REQUEST_KEY_LOGIN, this.onLogin);
+        mSocket.off(Constants.REQUEST_KEY_USER_LOGIN, this.onLogin);
         super.onDestroy();
     }
 
@@ -112,7 +112,7 @@ private void attemptLogin() {
         if (mSocket != null && mSocket.connected()) {
 
             // add the login emitter, before logging in.
-            mSocket.on(Constants.REQUEST_KEY_LOGIN, this.onLogin);
+            mSocket.on(Constants.REQUEST_KEY_USER_LOGIN, this.onLogin);
             mSocket.emit(Constants.REQUEST_KEY_USER_ADD, username);
 
         } else {
@@ -162,7 +162,7 @@ private void gotoChatFragment(String socketId, String username, int usercount) {
             Log.d(LOG_TAG, "room " + socketId + " has " + items.size() + " participants");
 
             // remove the emitter, else it will login endlessly.
-            mSocket.off(Constants.REQUEST_KEY_LOGIN, this.onLogin);
+            mSocket.off(Constants.REQUEST_KEY_USER_LOGIN, this.onLogin);
 
             this.gotoChatFragment(socketId, this.username, items.size());
 

server/modules/constants.js

@@ -2,10 +2,10 @@ module.exports = {
     CONNECTION:     "connection",
     DIRECT_MESSAGE: "direct message",
     CHAT_MESSAGE:   "chat message",
-    START_TYPING:   "typing",
-    STOP_TYPING:    "stop typing",
+    TYPING_START:   "typing start",
+    TYPING_STOP:    "typing stop",
     DISCONNECT:     "disconnect",
-    USER_LOGIN:     "login",
+    USER_LOGIN:     "user login",
     USER_JOINED:    "user joined",
     USER_LEFT:      "user left",
     USER_ADD:       "user add",

server/modules/typing.js

@@ -1,8 +1,8 @@
 const constants = require("./constants");
 module.exports = (io, socket) => {
 
-    // When the client emits 'typing'
-    const onStartTyping = () => {
+    // When the client emits 'typing start'.
+    const onTypingStart = () => {
 
         // broadcast globally that the client has started typing
         socket.broadcast.emit('typing', {
@@ -11,8 +11,8 @@ module.exports = (io, socket) => {
         });
     }
 
-    // When the client emits 'stop typing'
-    const onStopTyping = () => {
+    // When the client emits 'typing stop'.
+    const onTypingStop = () => {
 
         // broadcast globally that the client has stopped typing
         socket.broadcast.emit('stop typing', {
@@ -21,6 +21,6 @@ module.exports = (io, socket) => {
         });
     }
 
-    socket.on(constants.START_TYPING, onStartTyping);
-    socket.on(constants.STOP_TYPING, onStopTyping);
+    socket.on(constants.TYPING_START, onTypingStart);
+    socket.on(constants.TYPING_STOP, onTypingStop);
 }

server/modules/user.js

@@ -12,7 +12,7 @@ module.exports = (io, socket) => {
         return data;
     }
 
-    // When the client emits 'sockets'
+    // When the client emits 'sockets'.
     const onSockets = () => {
         let data = getSockets();
         socket.emit(constants.SOCKETS, {
@@ -21,30 +21,30 @@ module.exports = (io, socket) => {
         });
     };
 
-    // When the client connects
-    const onConnect = (username) => {
+    // When the client connects.
+    const onClientConnected = (username) => {
 
-        // store the username in the socket session for the client
+        // Store the username in the socket session for the client.
         socket.data.username = username;
 
         socket.emit(constants.USER_LOGIN, {
             socketId: socket.id,
             data: getSockets()
         });
 
-        // broadcast globally that the client has joined
+        // Broadcast globally that the client has joined.
         console.log('User %s has connected; socketId %s', socket.data.username, socket.id);
         socket.broadcast.emit(constants.USER_JOINED, {
             socketId: socket.id,
-            usercount: io.sockets.sockets.size,
-            username: socket.data.username
+            username: socket.data.username,
+            usercount: io.sockets.sockets.size
         });
     }
 
-    // when the client disconnects
+    // When the client disconnects.
     const onDisconnect = () => {
 
-        // broadcast globally that the client has disconnected
+        // Broadcast globally that the client has disconnected.
         console.log('User %s has disconnected; socketId %s', socket.data.username, socket.id);
         socket.broadcast.emit(constants.USER_LEFT, {
             socketId: socket.id,
@@ -53,7 +53,7 @@ module.exports = (io, socket) => {
         });
     }
 
-    socket.on(constants.SOCKETS, onSockets);
+    socket.on(constants.USER_ADD, onClientConnected);
     socket.on(constants.DISCONNECT, onDisconnect);
-    socket.on(constants.USER_ADD, onConnect);
+    socket.on(constants.SOCKETS, onSockets);
 }

server/public/main.js

@@ -179,15 +179,15 @@ $(function() {
     if (connected) {
       if (!typing) {
         typing = true;
-        socket.emit('typing');
+        socket.emit('typing start');
       }
       lastTypingTime = (new Date()).getTime();
 
       setTimeout(() => {
         const typingTimer = (new Date()).getTime();
         const timeDiff = typingTimer - lastTypingTime;
         if (timeDiff >= TYPING_TIMER_LENGTH && typing) {
-          socket.emit('stop typing');
+          socket.emit('typing stop');
           typing = false;
         }
       }, TYPING_TIMER_LENGTH);
@@ -224,7 +224,7 @@ $(function() {
     if (event.which === 13) {
       if (username) {
         sendMessage();
-        socket.emit('stop typing');
+        socket.emit('typing stop');
         typing = false;
       } else {
         setUsername();
@@ -250,8 +250,8 @@ $(function() {
 
   // Socket events
 
-  // Whenever the server emits 'login', log the login message
-  socket.on('login', (response) => {
+  // Whenever the server emits 'user login', log the login message
+  socket.on('user login', (response) => {
     connected = true;
     // Display the welcome message
     // var message = "Welcome to Socket.IO Chat – ";
@@ -290,13 +290,13 @@ $(function() {
     removeChatTyping(data);
   });
 
-  // Whenever the server emits 'typing', show the typing message
-  socket.on('start typing', (data) => {
+  // Whenever the server emits 'typing start', show the typing message
+  socket.on('typing start', (data) => {
     addChatTyping(data);
   });
 
-  // Whenever the server emits 'stop typing', kill the typing message
-  socket.on('stop typing', (data) => {
+  // Whenever the server emits 'typing stop', kill the typing message
+  socket.on('typing stop', (data) => {
     removeChatTyping(data);
   });