update socket.io version and fixbug

README.md

@@ -105,6 +105,8 @@ file, the following options can be overridden:
 - `databaseConfig.redis.host`: `LARAVEL_ECHO_SERVER_REDIS_HOST`
 - `databaseConfig.redis.port`: `LARAVEL_ECHO_SERVER_REDIS_PORT`
 - `databaseConfig.redis.password`: `LARAVEL_ECHO_SERVER_REDIS_PASSWORD`
+- `databaseConfig.redis.db`: `LARAVEL_ECHO_SERVER_REDIS_DB`
+- `databaseConfig.redis.prefix`: `LARAVEL_ECHO_SERVER_REDIS_PREFIX`
 - `protocol`: `LARAVEL_ECHO_SERVER_PROTO`
 - `sslKeyPath`: `LARAVEL_ECHO_SERVER_SSL_KEY`
 - `sslCertPath`: `LARAVEL_ECHO_SERVER_SSL_CERT`

package.json

@@ -26,10 +26,10 @@
     "dotenv": "^8.2.0",
     "express": "^4.17.1",
     "inquirer": "^7.1.0",
-    "ioredis": "^4.16.0",
+    "ioredis": "^5.3.2",
     "lodash": "^4.17.15",
     "request": "^2.88.2",
-    "socket.io": "^2.3.0",
+    "socket.io": "^4.7.1",
     "yargs": "^15.3.1"
   },
   "devDependencies": {

src/channels/channel.ts

@@ -63,7 +63,7 @@ export class Channel {
             if (this.isClientEvent(data.event) &&
                 this.isPrivate(data.channel) &&
                 this.isInChannel(socket, data.channel)) {
-                this.io.sockets.connected[socket.id]
+                this.io.sockets.sockets.get(socket.id)
                     .broadcast.to(data.channel)
                     .emit(data.event, data.channel, data.data);
             }
@@ -109,7 +109,7 @@ export class Channel {
             socket.join(data.channel);
 
             if (this.isPresence(data.channel)) {
-                var member = res.channel_data;
+                let member = res.channel_data;
                 try {
                     member = JSON.parse(res.channel_data);
                 } catch (e) { }

src/channels/presence-channel.ts

@@ -56,16 +56,17 @@ export class PresenceChannel {
             this.io
                 .of("/")
                 .in(channel)
-                .clients((error, clients) => {
+                .allSockets()
+                .then((clients) => {
                     members = members || [];
                     members = members.filter((member) => {
-                        return clients.indexOf(member.socketId) >= 0;
+                        return clients.has(member.socketId);
                     });
 
                     this.db.set(channel + ":members", members);
 
                     resolve(members);
-                });
+                })
         });
     }
 
@@ -141,8 +142,8 @@ export class PresenceChannel {
      * On join event handler.
      */
     onJoin(socket: any, channel: string, member: any): void {
-        this.io.sockets.connected[socket.id].broadcast
-            .to(channel)
+        this.io.sockets.sockets.get(socket.id)
+            .broadcast.to(channel)
             .emit("presence:joining", channel, member);
     }
 

src/cli/cli.ts

@@ -34,6 +34,8 @@ export class Cli {
         LARAVEL_ECHO_SERVER_REDIS_HOST: "databaseConfig.redis.host",
         LARAVEL_ECHO_SERVER_REDIS_PORT: "databaseConfig.redis.port",
         LARAVEL_ECHO_SERVER_REDIS_PASSWORD: "databaseConfig.redis.password",
+        LARAVEL_ECHO_SERVER_REDIS_DB: "databaseConfig.redis.db",
+        LARAVEL_ECHO_SERVER_REDIS_PREFIX: "databaseConfig.redis.keyPrefix",
         LARAVEL_ECHO_SERVER_PROTO: "protocol",
         LARAVEL_ECHO_SERVER_SSL_CERT: "sslCertPath",
         LARAVEL_ECHO_SERVER_SSL_KEY: "sslKeyPath",

src/echo-server.ts

@@ -165,7 +165,7 @@ export class EchoServer {
      * Return a channel by its socket id.
      */
     find(socket_id: string): any {
-        return this.server.io.sockets.connected[socket_id];
+        return this.server.io.sockets.sockets.get(socket_id);
     }
 
     /**
@@ -234,7 +234,7 @@ export class EchoServer {
      */
     onDisconnecting(socket: any): void {
         socket.on('disconnecting', (reason) => {
-            Object.keys(socket.rooms).forEach(room => {
+            socket.rooms.forEach(room => {
                 if (room !== socket.id) {
                     this.channel.leave(socket, room, reason);
                 }