Add async and Optimize code structure

src/Api/Exchange/Market.php

@@ -39,18 +39,6 @@ public function getDepth(array $data=[]){
         return $this->exec();
     }
 
-    /**
-     * @param array $data
-     * @param string|null $functionName
-     * @return array|bool
-     */
-    public function getDepthRequestParams(array $data,string $functionName){
-        $this->type='GET';
-        $this->path='/market/depth';
-        $this->data=$data;
-        return $this->getRequestParam($functionName);
-    }
-
     /**
      *GET https://api.coinex.com/v1/market/deals?market=BCHBTC
      * */

src/Api/Exchange/Trading.php

@@ -22,18 +22,6 @@ public function postLimit(array $data=[]){
         return $this->exec();
     }
 
-    /**
-     * @param array $data
-     * @param string $functionName
-     * @return array
-     */
-    public function postLimitRequestParams(array $data,string $functionName)
-    {
-        $this->type='POST';
-        $this->path='/order/limit';
-        $this->data=$data;
-        return $this->getRequestParam($functionName);
-    }
     /**
      *POST https://api.coinex.com/v1/order/limit/batch
      * */

src/Api/Perpetual/Market.php

@@ -60,18 +60,6 @@ public function getDepth(array $data=[]){
         return $this->exec();
     }
 
-    /**
-     * @param array $data
-     * @param string $functionName
-     * @return array
-     */
-    public function getDepthRequestParams(array $data,string $functionName){
-        $this->type='GET';
-        $this->path='/market/depth';
-        $this->data=$data;
-        return $this->getRequestParam($functionName);
-    }
-
     /**
      *GET https://api.coinex.com/perpetual/v1/market/deals
      * */

src/Api/Perpetual/Order.php

@@ -22,19 +22,6 @@ public function postPutLimit(array $data=[]){
         return $this->exec();
     }
 
-    /**
-     * @param array $data
-     * @param string $functionName
-     * @return array
-     */
-    public function postPutLimitRequestParams(array $data,string $functionName)
-    {
-        $this->type='POST';
-        $this->path='/order/put_limit';
-        $this->data=$data;
-        return $this->getRequestParam($functionName);
-    }
-
     /**
      *POST https://api.coinex.com/perpetual/v1/order/put_market
      * */

src/CoinexExchange.php

@@ -53,42 +53,49 @@ function setOptions(array $options=[]){
     /**
      *
      * */
-    function account(){
-        return new Account($this->init());
+    function account(array $options=[]){
+        return new Account(array_merge($this->init(),$options));
     }
 
     /**
      *
      * */
-    function common(){
-        return new Common($this->init());
+    function common(array $options=[]){
+        return new Common(array_merge($this->init(),$options));
     }
 
     /**
      *
      * */
-    function cntract(){
-        return new Contract($this->init());
+    function cntract(array $options=[]){
+        return new Contract(array_merge($this->init(),$options));
     }
 
     /**
      *
      * */
-    function margin(){
-        return new Margin($this->init());
+    function margin(array $options=[]){
+        return new Margin(array_merge($this->init(),$options));
     }
 
     /**
      *
      * */
-    function market(){
-        return new Market($this->init());
+    function market(array $options=[]){
+        return new Market(array_merge($this->init(),$options));
     }
 
     /**
      *
      * */
-    function trading(){
-        return new Trading($this->init());
+    function trading(array $options=[]){
+        return new Trading(array_merge($this->init(),$options));
+    }
+
+    /**
+     * @return array
+     * */
+    function sendAsync(array $options=[]){
+        return (new Request($this->init()))->exec(['async'=>$options]);
     }
 }

src/CoinexPerpetual.php

@@ -52,35 +52,42 @@ function setOptions(array $options=[]){
     /**
      *
      * */
-    function asset(){
-        return new Asset($this->init());
+    function asset(array $options=[]){
+        return new Asset(array_merge($this->init(),$options));
     }
 
     /**
      *
      * */
-    function market(){
-        return new Market($this->init());
+    function market(array $options=[]){
+        return new Market(array_merge($this->init(),$options));
     }
 
     /**
      *
      * */
-    function order(){
-        return new Order($this->init());
+    function order(array $options=[]){
+        return new Order(array_merge($this->init(),$options));
     }
 
     /**
      *
      * */
-    function position(){
-        return new Position($this->init());
+    function position(array $options=[]){
+        return new Position(array_merge($this->init(),$options));
     }
 
     /**
      *
      * */
-    function system(){
-        return new System($this->init());
+    function system(array $options=[]){
+        return new System(array_merge($this->init(),$options));
+    }
+
+    /**
+     * @return array
+     * */
+    function sendAsync(array $options=[]){
+        return (new Request($this->init()))->exec(['async'=>$options]);
     }
 }

src/Request.php

@@ -39,6 +39,8 @@ class Request
 
     protected $version='';
 
+    protected $async='';
+
     public function __construct(array $data)
     {
         $this->key=$data['key'] ?? '';
@@ -49,6 +51,8 @@ public function __construct(array $data)
 
         $this->platform=$data['platform'] ?? [];
         $this->version=$data['version'] ?? [];
+
+        $this->async=$data['async'] ?? '';
     }
 
     /**
@@ -168,7 +172,7 @@ protected function sort($param)
     }
 
     /**
-     *
+     *@return mixed string|GuzzleHttp\Promise
      * */
     protected function send(){
         $client = new Client();
@@ -189,90 +193,40 @@ protected function send(){
             }
         }
 
-        $response = $client->request($this->type, $url, $this->options);
-
-        return $response->getBody()->getContents();
-    }
-
-    /**
-     * @param string $functionName
-     * @return array
-     */
-    protected function getRequestParam(string $functionName){
-        $this->auth();
+        /*echo $this->type.PHP_EOL.$url.PHP_EOL;
+        print_r($this->options);*/
 
-        $url=$this->host.$this->path;
-
-        if($this->type!='POST') $url.= empty($this->data) ? '' : '?'.http_build_query($this->data);
-        else {
-            switch ($this->platform){
-                case 'exchange':{
-                    $this->options['body']=json_encode($this->data);
-                    break;
-                }
-                case 'perpetual':{
-                    $this->options['form_params']=$this->data;
-                    break;
-                }
-            }
+        if(!empty($this->async)) {
+            return [$this->async=>$client->requestAsync($this->type, $url, $this->options)];
+        } else {
+            $response = $client->request($this->type, $url, $this->options);
+            return $response->getBody()->getContents();
         }
-
-        $requestParam = [
-            'type' => $this->type,
-            'url' => $url,
-            'option' => $this->options,
-            'functionName' => $functionName,
-        ];
-
-        return $requestParam;
     }
 
     /**
-     * @param array $requestParams
-     * @return array
-     * @throws Exception
-     * @throws \Throwable
-     */
-    protected function execAsync(array $requestParams=[]){
-
-        $client = new Client();
-
-        $promises = [];
-        $responses = [];
-        foreach ($requestParams as $v) {
-            $promises[$v['functionName']] = $client->requestAsync($v['type'], $v['url'], $v['option']);
-        }
-        // Wait for the requests to complete; throws a ConnectException
-        // if any of the requests fail
+     *
+     * */
+    public function exec(array $param=[]){
         try {
-            return Promise\Utils::unwrap($promises);
-        } catch (RequestException $e) {
-            if(method_exists($e->getResponse(),'getBody')){
-                $contents=$e->getResponse()->getBody()->getContents();
-
-                $temp=json_decode($contents,true);
-                if(!empty($temp)) {
-                    $temp['_method']=$this->type;
-                    $temp['_url']=$this->host.$this->path;
-                }else{
-                    $temp['_message']=$e->getMessage();
+            if(isset($param['async']) && !empty($param['async'])){
+                $async=[];
+                foreach ($param['async'] as $k=>$v) {
+                    if(is_object(current($v))) $async[key($v)]=current($v);
+                    else throw new Exception('Is not an async type');
                 }
-            }else{
-                $temp['_message']=$e->getMessage();
+
+                $temp=[];
+                $unwarp=Promise\Utils::unwrap($async);
+                foreach ($unwarp as $k=>$v) $temp[$k]=json_decode($v->getBody()->getContents(),true);
+
+                return $temp;
             }
 
-            $temp['_httpcode']=$e->getCode();
+            $this->auth();
 
-            throw new Exception(json_encode($temp));
-        }
-    }
-    /*
-     *
-     * */
-    protected function exec(){
-        $this->auth();
+            if(!empty($this->async)) return $this->send();
 
-        try {
             return json_decode($this->send(),true);
         }catch (RequestException $e){
             if(method_exists($e->getResponse(),'getBody')){