save

src/Detect.php

@@ -6,11 +6,15 @@ use WebSocket\Client;
 class Detect
 {
     var $dest='ws://172.83.153.167:2345';
-    public function getClassify(){
+    public function getClassify($type=null){
         if(!isset($this->classify)){
             $this->classify();
         }
-        return $this->classify;
+        if($type){
+            return $this->classify[$type];
+        }else{
+            return $this->classify;
+        }
     }
     public function classify(){
         if(!isset($this->ping)){
@@ -19,12 +23,17 @@ class Detect
         $classify = [];
         foreach($this->ping as $id=>$node){
             $isp = $node['nodeinfo']->nodename;
-            $isp=explode(' ',$isp);
+            $isp = preg_replace('/\(.*?\)/', '', $isp);
+
+            $isp=explode('-',$isp);
             if(in_array(end($isp),['电信','联通','移动','BGP'])){
                 $isp = '中国'.end($isp);
             }else{
                 $isp = $isp[0];
             }
+            if(!isset($classify[$isp])){
+                $classify[$isp]=[];
+            }
             array_push($classify[$isp],$node);
         }
         $this->classify=$classify;