solve the websocket blocking problem

zhouaini528 · Jun 18, 2021 · f991d43 · f991d43
1 parent f1ec28c
commit f991d43
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 7 deletions.
diff --git a/src/Api/WebSocketV3/SocketClient.php b/src/Api/WebSocketV3/SocketClient.php
@@ -40,6 +40,8 @@ protected function init(){
 
         $this->add('keysecret',[]);//目前总共key
 
+        $this->add('global_local',[]);//临时存储数据
+
         $this->add('debug',[]);
     }
 
@@ -117,6 +119,7 @@ protected function getData($global,$callback=null,$sub=[]){
         $all_sub=$global->get('all_sub');
         if(empty($all_sub)) return [];
 
+        $global_local=$global->get('global_local');
         $temp=[];
 
         //默认返回所有数据
@@ -129,8 +132,10 @@ protected function getData($global,$callback=null,$sub=[]){
                     $data=$global->getQueue(strtolower($table));
                     $temp[strtolower($table)]=$data;
                 }else{
-                    $data=$global->get(strtolower($v));
-                    $temp[strtolower($v)]=$data;
+                    //$data=$global->get(strtolower($v));
+                    //$temp[strtolower($v)]=$data;
+                    $k_strtolower=strtolower($v);
+                    $temp[$k_strtolower]=$global_local['public'][$k_strtolower];
                 }
             }
         }else{
@@ -145,7 +150,8 @@ protected function getData($global,$callback=null,$sub=[]){
             foreach ($sub as $k=>$v){
                 if(count($v)==1) {
                     $table=$v[0];
-                    $data=$global->get(strtolower($table));
+                    //$data=$global->get(strtolower($table));
+                    $data=$global_local['public'][strtolower($table)];
                 } else {
                     //判断私有数据是否需要走队列数据
                     //$temp_v=explode(self::$USER_DELIMITER,$v);

diff --git a/src/Api/WebSocketV3/SocketServer.php b/src/Api/WebSocketV3/SocketServer.php
@@ -22,6 +22,8 @@ class SocketServer
     private $connectionIndex=0;
     private $config=[];
 
+    private $local_global=['public'=>[],'private'=>[]];
+
     function __construct(array $config=[])
     {
         $this->config=$config;
@@ -110,7 +112,8 @@ private function onMessage($global){
                     $table=$this->userKey($con->tag_keysecret,$table);
                     $global->saveQueue($table,$data);
                 }else{
-                    $global->save($table,$data);
+                    //$global->save($table,$data);
+                    $this->local_global['public'][$table]=$data;
 
                     //最后数据更新时间
                     $con->tag_data_time=time();
@@ -223,6 +226,11 @@ private function other($con,$global){
                 //private
             }
         });
+
+        //异步保存数据，不然会有阻塞问题。 0.2秒保存一次
+        Timer::add(0.2, function() use($global) {
+            $global->save('global_local',$this->local_global);
+        });
     }
 
     /**

diff --git a/src/Api/WebSocketV5/SocketClient.php b/src/Api/WebSocketV5/SocketClient.php
@@ -40,6 +40,8 @@ protected function init(){
 
         $this->add('keysecret',[]);//目前总共key
 
+        $this->add('global_local',[]);//临时存储数据
+
         $this->add('debug',[]);
     }
 
@@ -117,6 +119,7 @@ protected function getData($global,$callback=null,$sub=[]){
         $all_sub=$global->get('all_sub');
         if(empty($all_sub)) return [];
 
+        $global_local=$global->get('global_local');
         $temp=[];
 
         //默认返回所有数据
@@ -143,7 +146,8 @@ protected function getData($global,$callback=null,$sub=[]){
                                     [instId] => BTC-USDT
                     )*/
 
-                    $data=$global->get($k);
+                    //$data=$global->get($k);
+                    $data=$global_local['public'][$k];
                     $temp[$k]=$data;
                 }
             }
@@ -152,7 +156,8 @@ protected function getData($global,$callback=null,$sub=[]){
             foreach ($sub as $k=>$v){
                 if(!array_key_exists('key',$v)){
                     $table=json_encode($v);
-                    $data=$global->get($table);
+                    //$data=$global->get($table);
+                    $data=$global_local['public'][$table];
                 } else {
                     $keysecret=[
                         'key'=>$v['key'],

diff --git a/src/Api/WebSocketV5/SocketServer.php b/src/Api/WebSocketV5/SocketServer.php
@@ -21,6 +21,7 @@ class SocketServer
     private $connection=[];
     private $connectionIndex=0;
     private $config=[];
+    private $local_global=['public'=>[],'private'=>[]];
 
     function __construct(array $config=[])
     {
@@ -132,7 +133,8 @@ private function onMessage($global){
                     $table=$this->userKey($con->tag_keysecret,$table);
                     $global->saveQueue($table,$data);
                 }else{
-                    $global->save($table,$data);
+                    //$global->save($table,$data);
+                    $this->local_global['public'][$table]=$data;
 
                     //最后数据更新时间
                     $con->tag_data_time=time();
@@ -244,6 +246,11 @@ private function other($con,$global){
                 //private
             }
         });
+
+        //异步保存数据，不然会有阻塞问题。 0.2秒保存一次
+        Timer::add(0.2, function() use($global) {
+            $global->save('global_local',$this->local_global);
+        });
     }
 
     /**