initial 2.0.0-a3 commit

2026-07-22 16:15:34 +08:00 · 2020-10-03 23:00:18 +08:00
parent f91d24aaaa
commit da584e0542
28 changed files with 580 additions and 225 deletions
--- a/src/ZM/Event/CQ/MessageEvent.php
+++ b/src/ZM/Event/CQ/MessageEvent.php
@@ -85,7 +85,6 @@ class MessageEvent
    }

    /**
-     * @throws AnnotationException
     * @noinspection PhpRedundantCatchClauseInspection
     */
    public function onActivate() {
@@ -122,7 +121,7 @@ class MessageEvent
                EventDispatcher::interrupt();
            });
            $r = $dispatcher->dispatchEvents($word);
-            if ($r === false) return;
+            if ($r === null) return;

            //分发CQMessage事件
            $msg_dispatcher = new EventDispatcher(CQMessage::class);
--- a/src/ZM/Event/EventDispatcher.php
+++ b/src/ZM/Event/EventDispatcher.php
@@ -7,7 +7,6 @@ namespace ZM\Event;
 use Doctrine\Common\Annotations\AnnotationException;
 use Exception;
 use ZM\Annotation\AnnotationBase;
-use ZM\Annotation\Interfaces\Rule;
 use ZM\Exception\InterruptException;
 use ZM\Utils\ZMUtil;

@@ -20,6 +19,9 @@ class EventDispatcher
    /** @var null|callable */
    private $return_func = null;

+    /**
+     * @throws InterruptException
+     */
    public static function interrupt() {
        throw new InterruptException('interrupt');
    }
@@ -46,12 +48,20 @@ class EventDispatcher
            }
            return true;
        } catch (InterruptException $e) {
-            return false;
+            return null;
        } catch (AnnotationException $e) {
            return false;
        }
    }

+    /**
+     * @param AnnotationBase|null $v
+     * @param null $rule_func
+     * @param mixed ...$params
+     * @return bool
+     * @throws AnnotationException
+     * @throws InterruptException
+     */
    public function dispatchEvent(?AnnotationBase $v, $rule_func = null, ...$params) {
        $q_c = $v->class;
        $q_f = $v->method;
--- a/src/ZM/Event/EventHandler.php
+++ b/src/ZM/Event/EventHandler.php
@@ -22,6 +22,7 @@ use ZM\Annotation\Http\MiddlewareClass;
 use ZM\Context\Context;
 use ZM\Http\MiddlewareInterface;
 use ZM\Http\Response;
+use ZM\Store\LightCache;
 use ZM\Store\ZMBuf;
 use ZM\Utils\ZMUtil;

@@ -158,8 +159,8 @@ class EventHandler
        $status = $req["status"];
        $retcode = $req["retcode"];
        $data = $req["data"];
-        if (isset($req["echo"]) && ZMBuf::array_key_exists("sent_api", $req["echo"])) {
-            $origin = ZMBuf::get("sent_api")[$req["echo"]];
+        if (isset($req["echo"]) && LightCache::isset("sent_api_" . $req["echo"])) {
+            $origin = LightCache::get("sent_api_" . $req["echo"]);
            $self_id = $origin["self_id"];
            $response = [
                "status" => $status,
@@ -188,12 +189,12 @@ class EventHandler
            if (($origin["func"] ?? null) !== null) {
                call_user_func($origin["func"], $response, $origin["data"]);
            } elseif (($origin["coroutine"] ?? false) !== false) {
-                $p = ZMBuf::get("sent_api");
-                $p[$req["echo"]]["result"] = $response;
-                ZMBuf::set("sent_api", $p);
+                $r = LightCache::get("sent_api_" . $req["echo"]);
+                $r["result"] = $response;
+                LightCache::set("sent_api_" . $req["echo"], $r);
                Co::resume($origin['coroutine']);
            }
-            ZMBuf::unsetByValue("sent_api", $req["echo"]);
+            LightCache::unset("sent_api_" . $req["echo"]);
        }
    }

--- a/src/ZM/Event/ServerEventHandler.php
+++ b/src/ZM/Event/ServerEventHandler.php
@@ -16,7 +16,7 @@ use Swoole\Process;
 use Swoole\Timer;
 use ZM\Annotation\AnnotationParser;
 use ZM\Annotation\Http\RequestMapping;
-use ZM\Annotation\Swoole\OnStart;
+use ZM\Annotation\Swoole\OnWorkerStart;
 use ZM\Annotation\Swoole\SwooleEvent;
 use ZM\Config\ZMConfig;
 use ZM\ConnectionManager\ManagerGM;
@@ -54,21 +54,23 @@ class ServerEventHandler
                try {
                    Terminal::executeCommand($var, $r);
                } catch (Exception $e) {
-                    Console::error("Uncaught exception ".get_class($e).": ".$e->getMessage()." at ".$e->getFile()."(".$e->getLine().")");
+                    Console::error("Uncaught exception " . get_class($e) . ": " . $e->getMessage() . " at " . $e->getFile() . "(" . $e->getLine() . ")");
                } catch (Error $e) {
-                    Console::error("Uncaught error ".get_class($e).": ".$e->getMessage()." at ".$e->getFile()."(".$e->getLine().")");
+                    Console::error("Uncaught error " . get_class($e) . ": " . $e->getMessage() . " at " . $e->getFile() . "(" . $e->getLine() . ")");
                }
            });
        }
        Process::signal(SIGINT, function () use ($r) {
+            echo "\r";
            Console::warning("Server interrupted by keyboard on Master.");
            if ((Framework::$server->inotify ?? null) !== null)
                /** @noinspection PhpUndefinedFieldInspection */ Event::del(Framework::$server->inotify);
            ZMUtil::stop();
        });
-        if(Framework::$argv["watch"]) {
+        if (Framework::$argv["watch"]) {
            if (extension_loaded('inotify')) {
                Console::warning("Enabled File watcher, do not use in production.");
+                /** @noinspection PhpUndefinedFieldInspection */
                Framework::$server->inotify = $fd = inotify_init();
                $this->addWatcher(DataProvider::getWorkingDir() . "/src", $fd);
                Event::add($fd, function () use ($fd) {
@@ -117,7 +119,7 @@ class ServerEventHandler
                    if ($error["type"] != 0) {
                        Console::error("Internal fatal error: " . $error["message"] . " at " . $error["file"] . "({$error["line"]})");
                    }
-                    DataProvider::saveBuffer();
+                    //DataProvider::saveBuffer();
                    /** @var Server $server */
                    if (server() === null) $server->shutdown();
                    else server()->shutdown();
@@ -125,7 +127,7 @@ class ServerEventHandler

                Console::info("Worker #{$server->worker_id} 启动中");
                Framework::$server = $server;
-                ZMBuf::resetCache(); //清空变量缓存
+                //ZMBuf::resetCache(); //清空变量缓存
                //ZMBuf::set("wait_start", []); //添加队列，在workerStart运行完成前先让其他协程等待执行
                foreach ($server->connections as $v) {
                    $server->close($v);
@@ -193,12 +195,12 @@ class ServerEventHandler
                EventManager::registerTimerTick(); //启动计时器
                //ZMBuf::unsetCache("wait_start");
                set_coroutine_params(["server" => $server, "worker_id" => $worker_id]);
-                $dispatcher = new EventDispatcher(OnStart::class);
+                $dispatcher = new EventDispatcher(OnWorkerStart::class);
                $dispatcher->setRuleFunction(function ($v) {
                    return server()->worker_id === $v->worker_id || $v->worker_id === -1;
                });
                $dispatcher->dispatchEvents($server, $worker_id);
-                Console::debug("@OnStart 执行完毕");
+                Console::debug("@OnWorkerStart 执行完毕");
            } catch (Exception $e) {
                Console::error("Worker加载出错！停止服务！");
                Console::error($e->getMessage() . "\n" . $e->getTraceAsString());
@@ -289,9 +291,9 @@ class ServerEventHandler

        try {
            $no_interrupt = $dis->dispatchEvents($request, $response);
-            if (!$no_interrupt) {
+            if ($no_interrupt !== null) {
                $result = HttpUtil::parseUri($request, $response, $request->server["request_uri"], $node, $params);
-                if (!$result) {
+                if ($result === true) {
                    ctx()->setCache("params", $params);
                    $dispatcher = new EventDispatcher(RequestMapping::class);
                    $div = new RequestMapping();
@@ -300,11 +302,13 @@ class ServerEventHandler
                    $div->method = $node["method"];
                    $div->request_method = $node["request_method"];
                    $div->class = $node["class"];
+                    //Console::success("正在执行路由：".$node["method"]);
                    $r = $dispatcher->dispatchEvent($div, null, $params, $request, $response);
                    if (is_string($r) && !$response->isEnd()) $response->end($r);
                }
            }
            if (!$response->isEnd()) {
+                //Console::warning('返回了404');
                HttpUtil::responseCodePage($response, 404);
            }
        } catch (Exception $e) {
@@ -380,9 +384,10 @@ class ServerEventHandler
     * @param $fd
     */
    public function onClose($server, $fd) {
-        Console::debug("Calling Swoole \"close\" event from fd=" . $fd);
        unset(Context::$context[Co::getCid()]);
        $conn = ManagerGM::get($fd);
+        if ($conn === null) return;
+        Console::debug("Calling Swoole \"close\" event from fd=" . $fd);
        set_coroutine_params(["server" => $server, "connection" => $conn, "fd" => $fd]);
        $dispatcher = new EventDispatcher(SwooleEvent::class);
        $dispatcher->setRuleFunction(function ($v) {