support for Laravel 9

package.json

@@ -28,6 +28,7 @@
     "inquirer": "^7.1.0",
     "ioredis": "^4.16.0",
     "lodash": "^4.17.15",
+    "randexp": "^0.5.3",
     "request": "^2.88.2",
     "socket.io": "^2.3.0",
     "yargs": "^15.3.1"

src/channels/presence-channel.ts

@@ -119,19 +119,26 @@ export class PresenceChannel {
         this.getMembers(channel).then(
             (members) => {
                 members = members || [];
-                let member = members.find(
-                    (member) => member.socketId == socket.id
-                );
-                members = members.filter((m) => m.socketId != member.socketId);
+                let member;
+                members = members.filter((m) => {
+                    if (m.socketId == socket.id) {
+                        member = m;
+                        return false;   
+                    }
+                    return true
+                });
 
                 this.db.set(channel + ":members", members);
+
+                if (member) {
 
-                this.isMember(channel, member).then((is_member) => {
-                    if (!is_member) {
-                        delete member.socketId;
-                        this.onLeave(channel, member);
-                    }
-                });
+                    this.isMember(channel, member).then((is_member) => {
+                        if (!is_member) {
+                            delete member.socketId;
+                            this.onLeave(channel, member);
+                        }
+                    });
+                }
             },
             (error) => Log.error(error)
         );

src/channels/private-channel.ts

@@ -22,7 +22,7 @@ export class PrivateChannel {
     authenticate(socket: any, data: any): Promise<any> {
         let options = {
             url: this.authHost(socket) + this.options.authEndpoint,
-            form: { channel_name: data.channel },
+            form: { channel_name: data.channel, socket_id: socket.id },
             headers: (data.auth && data.auth.headers) ? data.auth.headers : {},
             rejectUnauthorized: false
         };

src/server.ts

@@ -4,6 +4,8 @@ var https = require('https');
 var express = require('express');
 var url = require('url');
 var io = require('socket.io');
+var RandExp = require('randexp').randexp;
+
 import { Log } from './log';
 
 export class Server {
@@ -34,10 +36,14 @@ export class Server {
     init(): Promise<any> {
         return new Promise((resolve, reject) => {
             this.serverProtocol().then(() => {
-                let host = this.options.host || 'localhost';
+                let options = this.options
+                let host = options.host || 'localhost';
                 Log.success(`Running at ${host} on port ${this.getPort()}`);
-
                 resolve(this.io);
+                this.io.eio.generateId = function () {
+                    var socketIdSpec = options.socketIdSpec || '([a-zA-Z0-9]{15})';
+                    return RandExp(socketIdSpec);
+                };
             }, error => reject(error));
         });
     }