fix issue #15 at version 1.6.2

add fullMatch to CQCommand.php

composer.json

@@ -3,7 +3,7 @@
     "description": "High performance QQ robot and web server development framework",
     "minimum-stability": "stable",
     "license": "Apache-2.0",
-    "version": "1.5.7",
+    "version": "1.6.2",
     "authors": [
         {
             "name": "whale",

config/global.php

@@ -8,26 +8,27 @@ $config['host'] = '0.0.0.0';
 $config['port'] = 20001;
 
 /** 框架开到公网或外部的HTTP访问链接，通过 DataProvider::getFrameworkLink() 获取 */
-$config['http_reverse_link'] = "http://127.0.0.1:".$config['port'];
+$config['http_reverse_link'] = "http://127.0.0.1:" . $config['port'];
 
 /** 框架是否启动debug模式 */
 $config['debug_mode'] = false;
 
 /** 存放框架内文件数据的目录 */
-$config['zm_data'] = realpath(__DIR__ . "/../").'/zm_data/';
+$config['zm_data'] = realpath(__DIR__ . "/../") . '/zm_data/';
 
 /** 存放各个模块配置文件的目录 */
-$config['config_dir'] = $config['zm_data'].'config/';
+$config['config_dir'] = $config['zm_data'] . 'config/';
 
 /** 存放崩溃和运行日志的目录 */
-$config['crash_dir'] = $config['zm_data'].'crash/';
+$config['crash_dir'] = $config['zm_data'] . 'crash/';
 
 /** 对应swoole的server->set参数 */
 $config['swoole'] = [
-    'log_file' => $config['crash_dir'].'swoole_error.log',
+    'log_file' => $config['crash_dir'] . 'swoole_error.log',
     'worker_num' => 1,
     'dispatch_mode' => 2,
-    'task_worker_num' => 0
+    //'task_worker_num' => 1,
+    //'task_enable_coroutine' => true
 ];
 
 /** MySQL数据库连接信息，host留空则启动时不创建sql连接池 */
@@ -85,4 +86,9 @@ $config['static_file_server'] = [
     ]
 ];
 
+/** 注册 Swoole Server 事件注解的类列表 */
+$config['server_event_handler_class'] = [
+    \Framework\ServerEventHandler::class,
+];
+
 return $config;

src/Framework/FrameworkLoader.php

@@ -3,15 +3,13 @@
 
 namespace Framework;
 
-use Co;
-use Doctrine\Common\Annotations\AnnotationException;
-use Swoole\Http\Request;
+use Doctrine\Common\Annotations\AnnotationReader;
+use ReflectionClass;
+use ReflectionMethod;
 use Swoole\Runtime;
-use Swoole\WebSocket\Frame;
-use ZM\Event\EventHandler;
+use ZM\Annotation\Swoole\OnEvent;
 use Exception;
 use Swoole\WebSocket\Server;
-use ZM\Http\Response;
 
 /**
  * Class FrameworkLoader
@@ -37,10 +35,6 @@ class FrameworkLoader
     private $server;
 
     public function __construct($args = []) {
-        if (self::$instance !== null) die("Cannot run two FrameworkLoader in one process!");
-        self::$instance = $this;
-
-
         $this->requireGlobalFunctions();
         if (LOAD_MODE == 0) define("WORKING_DIR", getcwd());
         elseif (LOAD_MODE == 1) define("WORKING_DIR", realpath(__DIR__ . "/../../"));
@@ -48,6 +42,7 @@ class FrameworkLoader
         //$this->registerAutoloader('classLoader');
         require_once "DataProvider.php";
         if (file_exists(DataProvider::getWorkingDir() . "/vendor/autoload.php")) {
+            /** @noinspection PhpIncludeInspection */
             require_once DataProvider::getWorkingDir() . "/vendor/autoload.php";
         }
         if (LOAD_MODE == 2) {
@@ -81,24 +76,36 @@ class FrameworkLoader
                 self::$argv[] = "--disable-console-input";
             }
             $this->server->set($settings);
-            $this->server->on("WorkerStart", [$this, "onWorkerStart"]);
-            $this->server->on("message", function ($server, Frame $frame) {
-                Console::debug("Calling Swoole \"message\" from fd=" . $frame->fd);
-                EventHandler::callSwooleEvent("message", $server, $frame);
-            });
-            $this->server->on("request", function ($request, $response) {
-                $response = new Response($response);
-                Console::debug("Receiving Http request event, cid=" . Co::getCid());
-                EventHandler::callSwooleEvent("request", $request, $response);
-            });
-            $this->server->on("open", function ($server, Request $request) {
-                Console::debug("Calling Swoole \"open\" event from fd=" . $request->fd);
-                EventHandler::callSwooleEvent("open", $server, $request);
-            });
-            $this->server->on("close", function ($server, $fd) {
-                Console::debug("Calling Swoole \"close\" event from fd=" . $fd);
-                EventHandler::callSwooleEvent("close", $server, $fd);
-            });
+            $all_event_class = self::$settings->get("server_event_handler_class") ?? [];
+            if (!in_array(ServerEventHandler::class, $all_event_class)) {
+                $all_event_class[] = ServerEventHandler::class;
+            }
+            $event_list = [];
+            foreach ($all_event_class as $v) {
+                $reader = new AnnotationReader();
+                $reflection_class = new ReflectionClass($v);
+                $methods = $reflection_class->getMethods(ReflectionMethod::IS_PUBLIC);
+                foreach ($methods as $vs) {
+                    $method_annotations = $reader->getMethodAnnotations($vs);
+                    if ($method_annotations != []) {
+                        $annotation = $method_annotations[0];
+                        if ($annotation instanceof OnEvent) {
+                            $annotation->class = $v;
+                            $annotation->method = $vs->getName();
+                            $event_list[strtolower($annotation->event)] = $annotation;
+                        }
+                    }
+                }
+            }
+            foreach ($event_list as $k => $v) {
+                $this->server->on($k, function (...$param) use ($v) {
+                    $c = $v->class;
+                    //echo $c.PHP_EOL;
+                    $c = new $c();
+                    call_user_func_array([$c, $v->method], $param);
+                });
+            }
+
             ZMBuf::initAtomic();
             if (in_array("--remote-shell", $args)) RemoteShell::listen($this->server, "127.0.0.1");
             if (in_array("--log-error", $args)) ZMBuf::$atomics["info_level"]->set(0);
@@ -133,10 +140,6 @@ class FrameworkLoader
         require_once __DIR__ . '/global_functions.php';
     }
 
-    private function registerAutoloader(string $string) {
-        if (!spl_autoload_register($string)) die("Failed to register autoloader named \"$string\" !");
-    }
-
     private function defineProperties() {
         define("ZM_START_TIME", microtime(true));
         define("ZM_DATA", self::$settings->get("zm_data"));
@@ -168,17 +171,6 @@ class FrameworkLoader
         //if (!file_exists(CRASH_DIR . "last_error.log")) die("Can not find log file.\n");
         return true;
     }
-
-    /**
-     * @param \Swoole\Server $server
-     * @param $worker_id
-     * @throws AnnotationException
-     */
-    public function onWorkerStart(\Swoole\Server $server, $worker_id) {
-        self::$instance = $this;
-        self::$run_time = microtime(true);
-        EventHandler::callSwooleEvent("WorkerStart", $server, $worker_id);
-    }
 }
 
 global $motd;

src/Framework/ServerEventHandler.php

@@ -0,0 +1,84 @@
+<?php
+
+
+namespace Framework;
+
+
+use Co;
+use Doctrine\Common\Annotations\AnnotationException;
+use Swoole\Http\Request;
+use Swoole\Server;
+use Swoole\WebSocket\Frame;
+use ZM\Annotation\AnnotationParser;
+use ZM\Annotation\Swoole\OnEvent;
+use ZM\Connection\ConnectionManager;
+use ZM\Event\EventHandler;
+use ZM\Http\Response;
+
+class ServerEventHandler
+{
+    /**
+     * @OnEvent("WorkerStart")
+     * @param Server $server
+     * @param $worker_id
+     * @throws AnnotationException
+     * @throws \ReflectionException
+     */
+    public function onWorkerStart(Server $server, $worker_id) {
+        if ($server->taskworker === false) {
+            FrameworkLoader::$run_time = microtime(true);
+            EventHandler::callSwooleEvent("WorkerStart", $server, $worker_id);
+        } else {
+            ob_start();
+            AnnotationParser::registerMods();
+            //加载Custom目录下的自定义的内部类
+            ConnectionManager::registerCustomClass();
+            ob_get_clean();
+        }
+    }
+
+    /**
+     * @OnEvent("message")
+     * @param $server
+     * @param Frame $frame
+     * @throws AnnotationException
+     */
+    public function onMessage($server, Frame $frame) {
+        Console::debug("Calling Swoole \"message\" from fd=" . $frame->fd);
+        EventHandler::callSwooleEvent("message", $server, $frame);
+    }
+
+    /**
+     * @OnEvent("request")
+     * @param $request
+     * @param $response
+     * @throws AnnotationException
+     */
+    public function onRequest($request, $response) {
+        $response = new Response($response);
+        Console::debug("Receiving Http request event, cid=" . Co::getCid());
+        EventHandler::callSwooleEvent("request", $request, $response);
+    }
+
+    /**
+     * @OnEvent("open")
+     * @param $server
+     * @param Request $request
+     * @throws AnnotationException
+     */
+    public function onOpen($server, Request $request) {
+        Console::debug("Calling Swoole \"open\" event from fd=" . $request->fd);
+        EventHandler::callSwooleEvent("open", $server, $request);
+    }
+
+    /**
+     * @OnEvent("close")
+     * @param $server
+     * @param $fd
+     * @throws AnnotationException
+     */
+    public function onClose($server, $fd) {
+        Console::debug("Calling Swoole \"close\" event from fd=" . $fd);
+        EventHandler::callSwooleEvent("close", $server, $fd);
+    }
+}

src/Framework/ZMBuf.php

@@ -52,6 +52,7 @@ class ZMBuf
     public static $context = [];
     public static $instance = [];
     public static $context_class = [];
+    public static $server_events = [];
 
     static function get($name, $default = null) {
         return self::$cache[$name] ?? $default;

src/ZM/Annotation/AnnotationParser.php

@@ -56,7 +56,7 @@ class AnnotationParser
             $class_prefix = '';
             $methods = $reflection_class->getMethods(ReflectionMethod::IS_PUBLIC);
             $class_annotations = $reader->getClassAnnotations($reflection_class);
-            $middleware_addon = null;
+            $middleware_addon = [];
             foreach ($class_annotations as $vs) {
                 if ($vs instanceof Closed) {
                     continue 2;
@@ -98,19 +98,24 @@ class AnnotationParser
                     ZMBuf::$events[MiddlewareClass::class][$result["name"]] = $result;
                     continue 2;
                 } elseif ($vs instanceof Middleware) {
-                    $middleware_addon = $vs;
+                    $middleware_addon[] = $vs;
+                } elseif ($vs instanceof CustomAnnotation) {
+                    $vs->class = $reflection_class->getName();
+                    ZMBuf::$events[get_class($vs)][] = $vs;
                 }
             }
             foreach ($methods as $vs) {
-                if ($middleware_addon !== null) {
-                    Console::debug("Added middleware " . $middleware_addon->middleware . " to $v -> " . $vs->getName());
-                    ZMBuf::$events[MiddlewareInterface::class][$v][$vs->getName()][] = $middleware_addon->middleware;
+                if ($middleware_addon !== []) {
+                    foreach($middleware_addon as $value){
+                        Console::debug("Added middleware " . $value->middleware . " to $v -> " . $vs->getName());
+                        ZMBuf::$events[MiddlewareInterface::class][$v][$vs->getName()][] = $value->middleware;
+                    }
                 }
                 $method_annotations = $reader->getMethodAnnotations($vs);
                 foreach ($method_annotations as $vss) {
                     if ($vss instanceof Rule) $vss = self::registerRuleEvent($vss, $vs, $reflection_class);
                     else $vss = self::registerMethod($vss, $vs, $reflection_class);
-                    Console::debug("寻找 ".$vs->getName() ." -> ".get_class($vss));
+                    Console::debug("寻找 " . $vs->getName() . " -> " . get_class($vss));
 
                     if ($vss instanceof SwooleEventAt) ZMBuf::$events[SwooleEventAt::class][] = $vss;
                     elseif ($vss instanceof SwooleEventAfter) ZMBuf::$events[SwooleEventAfter::class][] = $vss;
@@ -169,7 +174,7 @@ class AnnotationParser
             switch ($asp_name) {
                 case "connectType": //websocket连接类型
                     $func = function (?WSConnection $connection) use ($rest) {
-                        if($connection === null) return false;
+                        if ($connection === null) return false;
                         return $connection->getType() == $rest ? true : false;
                     };
                     break;
@@ -327,7 +332,7 @@ class AnnotationParser
         $class = getAllClasses(DataProvider::getWorkingDir() . "/src/Custom/Annotation/", "Custom\\Annotation");
         foreach ($class as $v) {
             $s = DataProvider::getWorkingDir() . '/src/' . str_replace("\\", "/", $v) . ".php";
-            Console::debug("Requiring custom annotation ".$s);
+            Console::debug("Requiring custom annotation " . $s);
             require_once $s;
         }
     }

src/ZM/Annotation/CQ/CQCommand.php

@@ -19,6 +19,8 @@ class CQCommand extends AnnotationBase implements Level
     public $match = "";
     /** @var string */
     public $regexMatch = "";
+    /** @var string */
+    public $fullMatch = "";
     /** @var string[] */
     public $alias = [];
     /** @var string */

src/ZM/Annotation/Swoole/OnEvent.php

@@ -0,0 +1,24 @@
+<?php
+
+
+namespace ZM\Annotation\Swoole;
+
+
+use Doctrine\Common\Annotations\Annotation\Required;
+use Doctrine\Common\Annotations\Annotation\Target;
+use ZM\Annotation\AnnotationBase;
+
+/**
+ * Class OnEvent
+ * @package ZM\Annotation\Swoole
+ * @Annotation
+ * @Target("METHOD")
+ */
+class OnEvent extends AnnotationBase
+{
+    /**
+     * @var string
+     * @Required()
+     */
+    public $event;
+}

src/ZM/Annotation/Swoole/OnTaskWorkerStart.php

@@ -0,0 +1,15 @@
+<?php
+
+
+namespace ZM\Annotation\Swoole;
+
+/**
+ * Class OnTaskWorkerStart
+ * @package ZM\Annotation\Swoole
+ * @Annotation
+ * @Target("METHOD")
+ */
+class OnTaskWorkerStart
+{
+
+}

src/ZM/DB/WhereBody.php

@@ -9,8 +9,8 @@ trait WhereBody
     protected $where_thing = [];
 
     public function where($column, $operation_or_value, $value = null) {
-        if (!in_array($operation_or_value, ['=', '!=', '>', '<', '>=', '<=', 'IN', 'in'])) $this->where_thing['='][$column] = $operation_or_value;
-        elseif ($value !== null) $this->where_thing[$operation_or_value][$column] = $value;
+        if ($value !== null) $this->where_thing[$operation_or_value][$column] = $value;
+        elseif (!in_array($operation_or_value, ['=', '!=', '>', '<', '>=', '<=', 'IN', 'in'])) $this->where_thing['='][$column] = $operation_or_value;
         else $this->where_thing['='][$column] = $operation_or_value;
         return $this;
     }

src/ZM/Event/CQ/MessageEvent.php

@@ -100,7 +100,7 @@ class MessageEvent
             $obj = [];
             foreach (ZMBuf::$events[CQCommand::class] ?? [] as $v) {
                 /** @var CQCommand $v */
-                if ($v->match == "" && $v->regexMatch == "") continue;
+                if ($v->match == "" && $v->regexMatch == "" && $v->fullMatch == "") continue;
                 elseif (($v->user_id == 0 || ($v->user_id != 0 && $v->user_id == context()->getData()["user_id"])) &&
                     ($v->group_id == 0 || ($v->group_id != 0 && $v->group_id == (context()->getData()["group_id"] ?? 0))) &&
                     ($v->discuss_id == 0 || ($v->discuss_id != 0 && $v->discuss_id == (context()->getData()["discuss_id"] ?? 0))) &&
@@ -135,6 +135,14 @@ class MessageEvent
                             return true;
                         });
                         return;
+                    } elseif ($v->fullMatch != "" && (preg_match("/".$v->fullMatch."/u", ctx()->getMessage(), $args)) != 0) {
+                        Console::debug("Calling $c -> {$v->method}");
+                        array_shift($args);
+                        $this->function_call = EventHandler::callWithMiddleware($obj[$c], $v->method, $class_construct, [$args], function ($r) {
+                            if (is_string($r)) context()->reply($r);
+                            return true;
+                        });
+                        return;
                     }
                 }
             }

src/ZM/Utils/ZMRequest.php

@@ -22,16 +22,11 @@ class ZMRequest
      * 如果请求失败或返回状态不是200，则返回 false
      */
     public static function get($url, $headers = [], $set = [], $return_body = true) {
-        $parse = parse_url($url);
-        if (!isset($parse["host"])) {
-            Console::warning("ZMRequest: url must contains scheme such as \"http(s)\"");
-            return false;
-        }
-        if(!isset($parse["path"])) $parse["path"] = "/";
-        $port = $parse["port"] ?? (($parse["scheme"] ?? "http") == "https" ? 443 : 80);
-        $cli = new Client($parse["host"], $port, (($parse["scheme"] ?? "http") == "https" ? true : false));
-        $cli->setHeaders($headers);
+        /** @var Client $cli */
+        list($cli, $parse) = self::getNewClient($url);
+        if($cli === null) return false;
         $cli->set($set == [] ? ['timeout' => 15.0] : $set);
+        $cli->setHeaders($headers);
         $cli->get($parse["path"] . (isset($parse["query"]) ? "?" . $parse["query"] : ""));
         if ($return_body) {
             if ($cli->errCode != 0 || $cli->statusCode != 200) return false;
@@ -56,14 +51,9 @@ class ZMRequest
      * @return bool|string|Client
      */
     public static function post($url, array $header, $data, $set = [], $return_body = true) {
-        $parse = parse_url($url);
-        if (!isset($parse["host"])) {
-            Console::warning("ZMRequest: url must contains scheme such as \"http(s)://\"");
-            return false;
-        }
-        if(!isset($parse["path"])) $parse["path"] = "/";
-        $port = $parse["port"] ?? (($parse["scheme"] ?? "http") == "https" ? 443 : 80);
-        $cli = new Client($parse["host"], $port, (($parse["scheme"] ?? "http") == "https" ? true : false));
+        /** @var Client $cli */
+        list($cli, $parse) = self::getNewClient($url);
+        if($cli === null) return false;
         $cli->set($set == [] ? ['timeout' => 15.0] : $set);
         $cli->setHeaders($header);
         $cli->post($parse["path"] . (isset($parse["query"]) ? ("?" . $parse["query"]) : ""), $data);
@@ -97,15 +87,16 @@ class ZMRequest
         return Saber::session($option);
     }
 
+    /**
+     * @param $url
+     * @param array $attribute
+     * @param bool $return_body
+     * @return bool|string|Client
+     */
     public static function request($url, $attribute = [], $return_body = true) {
-        $parse = parse_url($url);
-        if (!isset($parse["host"])) {
-            Console::warning("ZMRequest: url must contains scheme such as \"http(s)://\"");
-            return false;
-        }
-        if(!isset($parse["path"])) $parse["path"] = "/";
-        $port = $parse["port"] ?? (($parse["scheme"] ?? "http") == "https" ? 443 : 80);
-        $cli = new Client($parse["host"], $port, (($parse["scheme"] ?? "http") == "https" ? true : false));
+        /** @var Client $cli */
+        list($cli, $parse) = self::getNewClient($url);
+        if($cli === null) return false;
         $cli->set($attribute["set"] ?? ["timeout" => 15.0]);
         $cli->setMethod($attribute["method"] ?? "GET");
         $cli->setHeaders($attribute["headers"] ?? []);
@@ -126,4 +117,37 @@ class ZMRequest
             return $cli;
         }
     }
+
+    /**
+     * @param $url
+     * @param null|bool $dst
+     * @return bool
+     */
+    public static function downloadFile($url, $dst = null) {
+        /** @var Client $cli */
+        list($cli, $parse) = self::getNewClient($url);
+        if($cli === null) return false;
+        $cli->set(["timeout" => 60.0]);
+        $save_path = $dst === null ? "/tmp/_zm_".mt_rand(1000000, 9999999) : $dst;
+        $result = $cli->download($parse["path"] . (isset($parse["query"]) ? "?" . $parse["query"] : ""), $save_path);
+        if($result === false) return false;
+        elseif ($dst === null) return $save_path;
+        else return true;
+    }
+
+    /**
+     * @param $url
+     * @return bool|array
+     */
+    private static function getNewClient($url) {
+        $parse = parse_url($url);
+        if (!isset($parse["host"])) {
+            Console::warning("ZMRequest: url must contains scheme such as \"http(s)://\"");
+            return false;
+        }
+        if(!isset($parse["path"])) $parse["path"] = "/";
+        $port = $parse["port"] ?? (($parse["scheme"] ?? "http") == "https" ? 443 : 80);
+        $cli = new Client($parse["host"], $port, ($parse["scheme"] ?? "http") == "https");
+        return [$cli, $parse];
+    }
 }