private channel cannot be subscribed successfully

zhouaini528 · Jul 8, 2021 · d8ab0bc · d8ab0bc
1 parent 783b56f
commit d8ab0bc
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 7 deletions.
diff --git a/src/Api/WebSocket/SocketClient.php b/src/Api/WebSocket/SocketClient.php
@@ -189,6 +189,22 @@ protected function getData($global,$callback=null,$sub=[]){
         return $temp;
     }
 
+    /*
+     *
+     * */
+    function reconPrivate(string $key){
+        $this->client->debug=[
+            'private'=>[$key=>'close'],
+        ];
+    }
+
+    function reconPublic(){
+        $this->client->debug=[
+            'public'=>['market'=>'close','kline'=>'close'],
+        ];
+    }
+
+
     function test(){
         print_r($this->client->all_sub);
         print_r($this->client->add_sub);
@@ -207,14 +223,10 @@ function test2(){
     }
 
     function test_reconnection(){
-        $this->client->debug=[
-            'public'=>['market'=>'close','kline'=>'close'],
-        ];
+        $this->reconPublic();
     }
 
     function test_reconnection2($key){
-        $this->client->debug=[
-            'private'=>[$key=>'close'],
-        ];
+        $this->reconPrivate($key);
     }
 }
diff --git a/src/Api/WebSocket/SocketServer.php b/src/Api/WebSocket/SocketServer.php
@@ -346,6 +346,13 @@ private function debug($con,$global){
                 $debug['private'][$con->tag_keysecret['key']]='recon';
                 $global->save('debug',$debug);
 
+                //更改为掉线状态
+                $this->keysecretInit($con->tag_keysecret,[
+                    'connection'=>2,
+                    'connection_close'=>0,
+                    'auth'=>0,
+                ]);
+
                 $con->close();
             }
         }
@@ -402,7 +409,7 @@ private function subscribe($con,$global){
 
             $temp_sub=[];
             foreach ($temp['private'] as $v){
-                if($keysecret[$v[1]['key']]['auth']==0) continue;
+                if($keysecret[$v[1]['key']]['auth']!=1 || $keysecret[$v[1]['key']]['key']!=$con->tag_keysecret['key']) continue;
 
                 if($this->getPlatform()=='spot'){
                     $data=[
@@ -425,6 +432,7 @@ private function subscribe($con,$global){
                 $temp_sub[]=$v;
             }
 
+
             if(!empty($temp_sub)){
                 $global->addSubUpdate($temp_sub);
                 $global->allSubUpdate($temp_sub,'add');