Add Request Options

zhouaini528 · Aug 22, 2019 · 47f2bf1 · 47f2bf1
1 parent de25de5
commit 47f2bf1
Show file tree

Hide file tree

Showing 8 changed files with 128 additions and 96 deletions.
diff --git a/README.md b/README.md
@@ -29,13 +29,21 @@ Local development sets the proxy [More](https://github.com/zhouaini528/binance-p
 ```php
 $binance=new Binance($key,$secret);
 
-//If you are developing locally and need an agent, you can set this
-$binance->setProxy();
-
-//More flexible Settings
-$binance->setProxy([
-    'http'  => 'http://127.0.0.1:12333',
-    'https' => 'http://127.0.0.1:12333',
+$binance->setOptions([
+    //Set the request timeout to 60 seconds by default
+    'timeout'=>10,
+
+    //If you are developing locally and need an agent, you can set this
+    'proxy'=>true,
+    //More flexible Settings
+    'proxy'=>[
+     'http'  => 'http://127.0.0.1:12333',
+     'https' => 'http://127.0.0.1:12333',
+     'no'    =>  ['.cn']
+     ],
+
+    //Close the certificate
+    'verify'=>false,
 ]);
 ```
 

diff --git a/README_CN.md b/README_CN.md
@@ -31,13 +31,21 @@ composer require "linwj/binance dev-master"
 ```php
 $binance=new Binance($key,$secret);
 
-//If you are developing locally and need an agent, you can set this
-$binance->setProxy();
-
-//More flexible Settings
-$binance->setProxy([
-    'http'  => 'http://127.0.0.1:12333',
-    'https' => 'http://127.0.0.1:12333',
+$binance->setOptions([
+    //Set the request timeout to 60 seconds by default
+    'timeout'=>10,
+
+    //If you are developing locally and need an agent, you can set this
+    'proxy'=>true,
+    //More flexible Settings
+    'proxy'=>[
+     'http'  => 'http://127.0.0.1:12333',
+     'https' => 'http://127.0.0.1:12333',
+     'no'    =>  ['.cn']
+     ],
+
+    //Close the certificate
+    'verify'=>false,
 ]);
 ```
 

diff --git a/src/Binance.php b/src/Binance.php
@@ -16,8 +16,7 @@ class Binance
     protected $secret;
     protected $host;
 
-    protected $proxy=false;
-    protected $timeout=60;
+    protected $options=[];
 
     function __construct(string $key='',string $secret='',string $host='https://api.binance.com'){
         $this->key=$key;
@@ -33,58 +32,36 @@ private function init(){
             'key'=>$this->key,
             'secret'=>$this->secret,
             'host'=>$this->host,
-            'timeout'=>$this->timeout,
+
+            'options'=>$this->options,
         ];
     }
 
     /**
-     * Local development sets the proxy
-     * @param bool|array
-     * $proxy=false Default
-     * $proxy=true  Local proxy http://127.0.0.1:12333
-     *
-     * Manual proxy
-     * $proxy=[
-     'http'  => 'http://127.0.0.1:12333',
-     'https' => 'http://127.0.0.1:12333',
-     'no'    =>  ['.cn']
-     * ]
-     * */
-    function setProxy($proxy=true){
-        $this->proxy=$proxy;
-    }
-
-    /**
-     * Set the request timeout to 60 seconds by default
+     * 
      * */
-    function setTimeOut($timeout=60){
-        $this->timeout=$timeout;
+    function setOptions(array $options=[]){
+        $this->options=$options;
     }
 
     /**
      * 
      * */
     public function user(){
-        $user= new User($this->init());
-        $user->proxy($this->proxy);
-        return $user;
+        return new User($this->init());
     }
 
     /**
      *
      * */
     public function system(){
-        $system= new System($this->init());
-        $system->proxy($this->proxy);
-        return $system;
+        return new System($this->init());
     }
 
     /**
      *
      * */
     public function trade(){
-        $trade= new Trade($this->init());
-        $trade->proxy($this->proxy);
-        return $trade;
+        return new Trade($this->init());
     }
 }
diff --git a/src/Request.php b/src/Request.php
@@ -29,17 +29,15 @@ class Request
 
     protected $data=[];
 
-    protected $timeout=60;
-
-    protected $proxy=false;
+    protected $options=[];
 
     public function __construct(array $data)
     {
         $this->key=$data['key'] ?? '';
         $this->secret=$data['secret'] ?? '';
         $this->host=$data['host'] ?? 'https://api.binance.com';
 
-        $this->timeout=$data['timeout'] ?? 60;
+        $this->options=$data['options'] ?? [];
     }
 
     /**
@@ -51,6 +49,8 @@ protected function auth(){
         $this->signature();
 
         $this->headers();
+
+        $this->options();
     }
 
     /**
@@ -85,39 +85,32 @@ protected function headers(){
     }
 
     /**
-     * 代理端口设置
-     * @param bool|array
-     * false   默认
-     * true   设置本地代理
-     * array  手动设置代理
+     * 请求设置
      * */
-    function proxy($proxy=false){
-        $this->proxy=$proxy;
-    }
-
-    /**
-     * 发送http
-     * */
-    protected function send(){
-        $client = new \GuzzleHttp\Client();
-
-        $data=[
+    protected function options(){
+        $this->options=array_merge([
             'headers'=>$this->headers,
-            'timeout'=>$this->timeout
-        ];
+            //'verify'=>false   //关闭证书认证
+        ],$this->options);
 
-        //是否有代理设置
-        if(is_array($this->proxy)){
-            $data=array_merge($data,['proxy'=>$this->proxy]);
-        }else{
-            if($this->proxy) $data['proxy']=[
+        $this->options['timeout'] = $this->options['timeout'] ?? 60;
+
+        if($this->options['proxy']===true) {
+            $this->options['proxy']=[
                 'http'  => 'http://127.0.0.1:12333',
                 'https' => 'http://127.0.0.1:12333',
                 'no'    =>  ['.cn']
             ];
         }
-
-        $response = $client->request($this->type, $this->host.$this->path.'?'.$this->signature, $data);
+    }
+
+    /**
+     * 发送http
+     * */
+    protected function send(){
+        $client = new \GuzzleHttp\Client();
+
+        $response = $client->request($this->type, $this->host.$this->path.'?'.$this->signature, $this->options);
 
         $this->signature='';
 

diff --git a/tests/proxy.php b/tests/proxy.php
@@ -17,13 +17,20 @@
 
 $binance=new Binance($key,$secret);
 
-//If you are developing locally and need an agent, you can set this
-$binance->setProxy();
-
-//More flexible Settings
-$binance->setProxy([
-    'http'  => 'http://127.0.0.1:12333',
-    'https' => 'http://127.0.0.1:12333',
+$binance->setOptions([
+    //Set the request timeout to 60 seconds by default
+    'timeout'=>10,
+
+    //If you are developing locally and need an agent, you can set this
+    'proxy'=>true,
+    //More flexible Settings
+    /* 'proxy'=>[
+        'http'  => 'http://127.0.0.1:12333',
+        'https' => 'http://127.0.0.1:12333',
+        'no'    =>  ['.cn']
+    ], */
+    //Close the certificate
+    'verify'=>false,
 ]);
 
 //Get all account orders; active, canceled, or filled.

diff --git a/tests/system.php b/tests/system.php
@@ -17,8 +17,21 @@
 
 $binance=new Binance();
 
-//Set the request timeout to 60 seconds by default
-//$binance->setTimeOut(10);
+$binance->setOptions([
+    //Set the request timeout to 60 seconds by default
+    'timeout'=>10,
+
+    //If you are developing locally and need an agent, you can set this
+    'proxy'=>true,
+    //More flexible Settings
+    /* 'proxy'=>[
+     'http'  => 'http://127.0.0.1:12333',
+     'https' => 'http://127.0.0.1:12333',
+     'no'    =>  ['.cn']
+     ], */
+    //Close the certificate
+    'verify'=>false,
+]);
 
 //Order book
 try {

diff --git a/tests/trade.php b/tests/trade.php
@@ -17,17 +17,30 @@
 
 $binance=new Binance($key,$secret);
 
-//Set the request timeout to 60 seconds by default
-//$binance->setTimeOut(10);
+$binance->setOptions([
+    //Set the request timeout to 60 seconds by default
+    'timeout'=>10,
+
+    //If you are developing locally and need an agent, you can set this
+    'proxy'=>true,
+    //More flexible Settings
+    /* 'proxy'=>[
+     'http'  => 'http://127.0.0.1:12333',
+     'https' => 'http://127.0.0.1:12333',
+     'no'    =>  ['.cn']
+     ], */
+    //Close the certificate
+    'verify'=>false,
+]);
 
 //Send in a new order.
 try {
     $result=$binance->trade()->postOrder([
-        'symbol'=>'BTCUSDT',
-        'side'=>'BUY',
+        'symbol'=>'BCHABCUSDT',
+        'side'=>'SELL',
         'type'=>'LIMIT',
-        'quantity'=>'0.01',
-        'price'=>'2000',
+        'quantity'=>'0.1',
+        'price'=>'999',
         'timeInForce'=>'GTC',
     ]);
     print_r($result);
@@ -38,7 +51,7 @@
 //Check an order's status.
 try {
     $result=$binance->user()->getOrder([
-        'symbol'=>'BTCUSDT',
+        'symbol'=>'BCHABCUSDT',
         'orderId'=>$result['orderId'],
         'origClientOrderId'=>$result['clientOrderId'],
     ]);
@@ -50,7 +63,7 @@
 //Cancel an active order.
 try {
     $result=$binance->trade()->deleteOrder([
-        'symbol'=>'BTCUSDT',
+        'symbol'=>'BCHABCUSDT',
         'orderId'=>$result['orderId'],
         'origClientOrderId'=>$result['clientOrderId'],
     ]);

diff --git a/tests/user.php b/tests/user.php
@@ -17,13 +17,26 @@
 
 $binance=new Binance($key,$secret);
 
-//Set the request timeout to 60 seconds by default
-//$binance->setTimeOut(10);
+$binance->setOptions([
+    //Set the request timeout to 60 seconds by default
+    'timeout'=>10,
+
+    //If you are developing locally and need an agent, you can set this
+    'proxy'=>true,
+    //More flexible Settings
+    /* 'proxy'=>[
+     'http'  => 'http://127.0.0.1:12333',
+     'https' => 'http://127.0.0.1:12333',
+     'no'    =>  ['.cn']
+     ], */
+    //Close the certificate
+    'verify'=>false,
+]);
 
 //Get all account orders; active, canceled, or filled.
 try {
     $result=$binance->user()->getAllOrders([
-        'symbol'=>'BTCUSDT',
+        'symbol'=>'BCHABCUSDT',
         'limit'=>'20',
         //'orderId'=>'',
         //'startTime'=>'',
@@ -33,7 +46,7 @@
 }catch (\Exception $e){
     print_r(json_decode($e->getMessage(),true));
 }
-die();
+
 //Get current account information.
 try {
     $result=$binance->user()->getAccount();