multiple users subscribe to channels at the same time

zhouaini528 · Aug 4, 2021 · d68692a · d68692a
1 parent 6a1fdfd
commit d68692a
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 9 deletions.
diff --git a/src/Api/WebSocket/SocketClient.php b/src/Api/WebSocket/SocketClient.php
@@ -64,8 +64,10 @@ public function subscribe(array $sub=[]){
                 'connection'=>0,
             ]);
         }
-        //print_r($this->resub($sub));
-        $this->save('add_sub',$this->resub($sub));
+
+        $add_sub=$this->get('add_sub');
+        if(empty($add_sub)) $this->save('add_sub',$this->resub($sub));
+        else $this->save('add_sub',array_merge($this->resub($sub),$add_sub));
     }
 
     /**
@@ -193,9 +195,14 @@ protected function getData($global,$callback=null,$sub=[]){
      *
      * */
     function reconPrivate(string $key){
-        $this->client->debug=[
-            'private'=>[$key=>'close'],
-        ];
+        $debug=$this->client->debug;
+        if(empty($debug)){
+            $this->client->debug=[
+                'private'=>[$key=>$key],
+            ];
+        }else{
+            $this->client->debug=['private'=>array_merge($this->client->debug['private'],[$key=>$key])];
+        }
     }
 
     function reconPublic(){

diff --git a/src/Api/WebSocket/SocketFunction.php b/src/Api/WebSocket/SocketFunction.php
@@ -198,6 +198,8 @@ private function reconnection($global,$type='public',array $keysecret=[]){
             }
         }
 
-        $global->save('add_sub',$this->resub($temp));
+        $add_sub=$global->get('add_sub');
+        if(empty($add_sub)) $global->save('add_sub',$this->resub($temp));
+        else $global->save('add_sub',array_merge($this->resub($temp),$add_sub));
     }
 }
diff --git a/src/Api/WebSocket/SocketGlobal.php b/src/Api/WebSocket/SocketGlobal.php
@@ -111,6 +111,7 @@ protected function saveQueue($key,$value){
     }
 
     protected function addSubUpdate($data=[]){
+
         do{
             $old_value=$new_value=$this->client->add_sub;
 
@@ -121,7 +122,7 @@ protected function addSubUpdate($data=[]){
             }else{
                 foreach ($new_value as $k=>$v){
                     foreach ($data as $dk=>$dv){
-                        if($v[0]==$dv[0]){
+                        if($v[0]==$dv[0] && $v[1]['key']==$dv[1]['key']){
                             unset($data[$dk]);
                             unset($new_value[$k]);
                         }

diff --git a/src/Api/WebSocket/SocketServer.php b/src/Api/WebSocket/SocketServer.php
@@ -340,10 +340,10 @@ private function debug($con,$global){
             }
         }else{
             //private
-            if(isset($debug['private'][$con->tag_keysecret['key']]) && $debug['private'][$con->tag_keysecret['key']]=='close'){
+            if(isset($debug['private'][$con->tag_keysecret['key']]) && $debug['private'][$con->tag_keysecret['key']]==$con->tag_keysecret['key']){
                 $this->log($con->tag_keysecret['key'].' debug '.json_encode($debug));
 
-                $debug['private'][$con->tag_keysecret['key']]='recon';
+                unset($debug['private'][$con->tag_keysecret['key']]);
                 $global->save('debug',$debug);
 
                 //更改为掉线状态