Private and Public channel reconnect

zhouaini528 · Jul 13, 2021 · e4e6db5 · e4e6db5
1 parent f991d43
commit e4e6db5
Show file tree

Hide file tree

Showing 8 changed files with 71 additions and 33 deletions.
diff --git a/src/Api/WebSocketV3/SocketClient.php b/src/Api/WebSocketV3/SocketClient.php
@@ -172,6 +172,21 @@ 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'=>['public'=>'close'],
+        ];
+    }
+
     function test(){
         print_r($this->client->all_sub);
         print_r($this->client->add_sub);
@@ -188,19 +203,7 @@ function test2(){
         }
     }
 
-    function test_reconnection(){
-        $this->client->debug=[
-            'public'=>['public'=>'close'],
-        ];
-    }
-
     function test_reconnection2(){
         $this->client->debug2=1;
     }
-
-    function test_reconnection3($key){
-        $this->client->debug=[
-            'private'=>[$key=>'close'],
-        ];
-    }
 }
diff --git a/src/Api/WebSocketV3/SocketServer.php b/src/Api/WebSocketV3/SocketServer.php
@@ -338,7 +338,8 @@ private function subscribePrivate($con,$global){
         //**********判断是否已经登陆
         $client_keysecret=$global->get('keysecret');
         $keysecret=$con->tag_keysecret;
-        if($client_keysecret[$keysecret['key']]['login']!=1) {
+
+        if($client_keysecret[$keysecret['key']]['login']!=1 || $client_keysecret[$keysecret['key']]['key']!=$con->tag_keysecret['key']) {
             $this->log('subscribe private dont login return '.$keysecret['key']);
             return;
         }

diff --git a/src/Api/WebSocketV5/SocketClient.php b/src/Api/WebSocketV5/SocketClient.php
@@ -179,6 +179,21 @@ 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'=>['public'=>'close'],
+        ];
+    }
+
     function test(){
         echo 'all_sub'.PHP_EOL;
         print_r($this->client->all_sub);
@@ -200,19 +215,7 @@ function test2(){
         }
     }
 
-    function test_reconnection(){
-        $this->client->debug=[
-            'public'=>['public'=>'close'],
-        ];
-    }
-
     function test_reconnection2(){
         $this->client->debug2=1;
     }
-
-    function test_reconnection3($key){
-        $this->client->debug=[
-            'private'=>[$key=>'close'],
-        ];
-    }
 }
diff --git a/src/Api/WebSocketV5/SocketServer.php b/src/Api/WebSocketV5/SocketServer.php
@@ -329,7 +329,8 @@ private function subscribe($con,$global){
             //**********判断是否已经登陆
             $client_keysecret=$global->get('keysecret');
             $keysecret=$con->tag_keysecret;
-            if($client_keysecret[$keysecret['key']]['login']!=1) {
+
+            if($client_keysecret[$keysecret['key']]['login']!=1 || $client_keysecret[$keysecret['key']]['key']!=$con->tag_keysecret['key']) {
                 $this->log('subscribe private dont login return '.$keysecret['key']);
                 return;
             }

diff --git a/src/OkexWebSocket.php b/src/OkexWebSocket.php
@@ -83,4 +83,19 @@ public function getSubscribe(array $sub,$callback=null,$daemon=false){
     public function getSubscribes($callback=null,$daemon=false){
         return $this->client()->getSubscribes($callback,$daemon);
     }
+
+    /**
+     * Private channel reconnect
+     * @param string $key
+     */
+    public function reconPrivate(string $key){
+        $this->client()->reconPrivate($key);
+    }
+
+    /**
+     * Public channel reconnect
+     */
+    public function reconPublic(){
+        $this->client()->reconPublic();
+    }
 }
diff --git a/src/OkexWebSocketV5.php b/src/OkexWebSocketV5.php
@@ -83,4 +83,19 @@ public function getSubscribe(array $sub,$callback=null,$daemon=false){
     public function getSubscribes($callback=null,$daemon=false){
         return $this->client()->getSubscribes($callback,$daemon);
     }
+
+    /**
+     * Private channel reconnect
+     * @param string $key
+     */
+    public function reconPrivate(string $key){
+        $this->client()->reconPrivate($key);
+    }
+
+    /**
+     * Public channel reconnect
+     */
+    public function reconPublic(){
+        $this->client()->reconPublic();
+    }
 }
diff --git a/tests/websocket_v3/client.php b/tests/websocket_v3/client.php
@@ -24,7 +24,7 @@
     //'log'=>['filename'=>'okex'],
 
     //Daemons address and port,default 0.0.0.0:2207
-    'global'=>'127.0.0.1:22080',
+    //'global'=>'127.0.0.1:22080',
 
     //Heartbeat time,default 20 seconds
     //'ping_time'=>20,
@@ -70,9 +70,9 @@
     case 10:{
         $okex->keysecret($key_secret[0]);
         $okex->subscribe([
-            'spot/depth5:BCH-USDT',
+            /*'spot/depth5:BCH-USDT',
             'futures/depth5:BCH-USD-210924',
-            'swap/depth5:BCH-USD-SWAP',
+            'swap/depth5:BCH-USD-SWAP',*/
 
             'futures/position:BCH-USD-210924',
             'futures/account:BCH-USDT',
@@ -249,14 +249,14 @@
     }
 
     case 10006:{
-        $okex->client()->test_reconnection2();
+        $okex->reconPublic();
         break;
     }
 
     case 10007:{
         //private
         //print_r($key_secret[0]);
-        $okex->client()->test_reconnection3($key_secret[0]['key']);
+        $okex->reconPrivate($key_secret[0]['key']);
         break;
     }
 }

diff --git a/tests/websocket_v5/client.php b/tests/websocket_v5/client.php
@@ -255,14 +255,14 @@
     }
 
     case 10006:{
-        $okex->client()->test_reconnection2();
+        $okex->reconPublic();
         break;
     }
 
     case 10007:{
         //private
         //print_r($key_secret[0]);
-        $okex->client()->test_reconnection3($key_secret[0]['key']);
+        $okex->reconPrivate($key_secret[0]['key']);
         break;
     }
 }