add coin future private subscribe

zhouaini528 · Nov 4, 2020 · df75e0a · df75e0a
1 parent edc3b7d
commit df75e0a
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 11 deletions.
diff --git a/README_CN.md b/README_CN.md
@@ -571,7 +571,7 @@ $binance->getSubscribe([
 },true);
 ```
 
-获取私有频道订阅数据，
+获取私有频道订阅数据，私有频道默认全部返回
 ```php
 //The first way
 $binance->keysecret($key_secret);

diff --git a/src/Api/WebSocket/SocketClient.php b/src/Api/WebSocket/SocketClient.php
@@ -44,9 +44,6 @@ protected function init(){
 
     function keysecret(array $keysecret=[]){
         $this->keysecret=$keysecret;
-
-        $this->keysecretInit($this->keysecret);
-
         return $this;
     }
 

diff --git a/src/Api/WebSocket/SocketServer.php b/src/Api/WebSocket/SocketServer.php
@@ -105,8 +105,6 @@ private function onMessage($global){
                 return;
             }
 
-            //if($con->tag!='public')
-
             if(isset($data['e']) && $con->tag!='public') {
                 $table=$this->userKey($con->tag_keysecret,$data['e']);
 
@@ -116,6 +114,8 @@ private function onMessage($global){
                 return;
             }
 
+            if(isset($data['result']) && empty($data['result'])) return;
+
             $this->log($data);
         };
     }
@@ -166,6 +166,8 @@ private function other($con,$global){
 
             $this->account($con,$global);
 
+            $this->coinFutureSubscribe($con,$global);
+
             $this->log('listen '.$con->tag);
         });
     }
@@ -295,4 +297,23 @@ private function account($con,$global){
 
         }
     }
+
+    /**
+     * @param $con
+     * @param $global
+     */
+    private function coinFutureSubscribe($con,$global){
+        if($con->tag!='public' && $this->config['baseurl']=='ws://dstream.binance.com'){
+            $data=[
+                "method"=>"REQUEST",
+                'params'=>[
+                    '@account',
+                    '@balance',
+                    '@position',
+                ],
+                'id'=>$this->getId()
+            ];
+            $con->send(json_encode($data));
+        }
+    }
 }
diff --git a/tests/websocket/client_coin_future.php b/tests/websocket/client_coin_future.php
@@ -83,11 +83,8 @@
     case 10:{
         $binance->keysecret($key_secret[2]);
         //Subscribe to all private channels by default
-        $binance->subscribe([
-            '@account',
-            '@balance',
-            '@position',
-        ]);
+        $binance->subscribe();
+
         break;
     }