update to 2.2.9 version

update reply() to support quick operation
fix reload bug
fix reply() bug

src/ZM/Context/Context.php

@@ -104,25 +104,31 @@ class Context implements ContextInterface
      * @param $msg
      * @param bool $yield
      * @return mixed
-     * @noinspection PhpMissingBreakStatementInspection
      */
     public function reply($msg, $yield = false) {
-        switch ($this->getData()["message_type"]) {
-            case "group":
-                $operation["at_sender"] = false;
-                // no break
-            case "private":
-            case "discuss":
-                $this->setCache("has_reply", true);
-                $data = $this->getData();
-                $conn = $this->getConnection();
-                $operation["reply"] = $msg;
-                return (new ZMRobot($conn))->setCallback($yield)->callExtendedAPI(".handle_quick_operation", [
-                    "context" => $data,
-                    "operation" => $operation
-                ]);
+        $data = $this->getData();
+        $conn = $this->getConnection();
+        if (!is_array($msg)) {
+            switch ($this->getData()["message_type"]) {
+                case "group":
+                case "private":
+                case "discuss":
+                    $this->setCache("has_reply", true);
+                    $operation["reply"] = $msg;
+                    $operation["at_sender"] = false;
+                    return (new ZMRobot($conn))->setCallback($yield)->callExtendedAPI(".handle_quick_operation", [
+                        "context" => $data,
+                        "operation" => $operation
+                    ]);
+            }
+            return false;
+        } else {
+            $operation = $msg;
+            return (new ZMRobot($conn))->setCallback(false)->callExtendedAPI(".handle_quick_operation", [
+                "context" => $data,
+                "operation" => $operation
+            ]);
         }
-        return false;
     }
 
     public function finalReply($msg, $yield = false) {

src/ZM/Event/ServerEventHandler.php

@@ -80,11 +80,16 @@ class ServerEventHandler
             });
         }
         Process::signal(SIGINT, function () use ($r) {
-            echo "\r";
-            Console::warning("Server interrupted(SIGINT) on Master.");
-            if ((Framework::$server->inotify ?? null) !== null)
-                /** @noinspection PhpUndefinedFieldInspection */ Event::del(Framework::$server->inotify);
-            ZMUtil::stop();
+            if (zm_atomic("_int_is_reload")->get() === 1) {
+                zm_atomic("_int_is_reload")->set(0);
+                ZMUtil::reload();
+            } else {
+                echo "\r";
+                Console::warning("Server interrupted(SIGINT) on Master.");
+                if ((Framework::$server->inotify ?? null) !== null)
+                    /** @noinspection PhpUndefinedFieldInspection */ Event::del(Framework::$server->inotify);
+                ZMUtil::stop();
+            }
         });
         if (Framework::$argv["daemon"]) {
             $daemon_data = json_encode([

src/ZM/Framework.php

@@ -74,8 +74,7 @@ class Framework
             die($e->getMessage());
         }
         try {
-            self::$server = new Server(ZMConfig::get("global", "host"), ZMConfig::get("global", "port"));
-            $this->server_set = ZMConfig::get("global", "swoole");
+
             Console::init(
                 ZMConfig::get("global", "info_level") ?? 2,
                 self::$server,
@@ -86,16 +85,14 @@ class Framework
             $timezone = ZMConfig::get("global", "timezone") ?? "Asia/Shanghai";
             date_default_timezone_set($timezone);
 
+            $this->server_set = ZMConfig::get("global", "swoole");
             $this->parseCliArgs(self::$argv);
 
-
-            self::$server->set($this->server_set);
-
             // 打印初始信息
             $out["listen"] = ZMConfig::get("global", "host") . ":" . ZMConfig::get("global", "port");
             if (!isset(ZMConfig::get("global", "swoole")["worker_num"])) $out["worker"] = swoole_cpu_num() . " (auto)";
             else $out["worker"] = ZMConfig::get("global", "swoole")["worker_num"];
-            $out["env"] = $args["env"] === null ? "default" : $args["env"];
+            $out["environment"] = $args["env"] === null ? "default" : $args["env"];
             $out["log_level"] = Console::getLevel();
             $out["version"] = ZM_VERSION;
             if (APP_VERSION !== "unknown") $out["app_version"] = APP_VERSION;
@@ -117,6 +114,10 @@ class Framework
             $out["working_dir"] = DataProvider::getWorkingDir();
             self::printProps($out, $tty_width, $args["log-theme"] === null);
 
+            self::$server = new Server(ZMConfig::get("global", "host"), ZMConfig::get("global", "port"));
+
+            self::$server->set($this->server_set);
+
             self::printMotd($tty_width);
 
             global $asd;
@@ -170,6 +171,7 @@ class Framework
         } catch (Exception $e) {
             Console::error("Framework初始化出现错误，请检查！");
             Console::error($e->getMessage());
+            Console::debug($e);
             die;
         }
     }
@@ -350,6 +352,7 @@ class Framework
         $line_width = [];
         $line_data = [];
         foreach ($out as $k => $v) {
+            start:
             if (!isset($line_width[$current_line])) {
                 $line_width[$current_line] = $max_border - 2;
             }
@@ -363,11 +366,7 @@ class Framework
                     if (strlen($tmp_line) > $line_width[$current_line]) { // 地方不够，另起一行
                         $line_data[$current_line] = str_replace("|  ", "", $line_data[$current_line]);
                         ++$current_line;
-                        $line_data[$current_line] = " " . $k . ": ";
-                        if ($colorful) $line_data[$current_line] .= TermColor::color8(32);
-                        $line_data[$current_line] .= $v;
-                        if ($colorful) $line_data[$current_line] .= TermColor::RESET;
-                        ++$current_line;
+                        goto start;
                     } else { // 地方够，直接写到后面并另起一行
                         $line_data[$current_line] .= $k . ": ";
                         if ($colorful) $line_data[$current_line] .= TermColor::color8(32);

src/ZM/Store/ZMAtomic.php

@@ -28,6 +28,7 @@ class ZMAtomic
             self::$atomics[$k] = new Atomic($v);
         }
         self::$atomics["stop_signal"] = new Atomic(0);
+        self::$atomics["_int_is_reload"] = new Atomic(0);
         self::$atomics["wait_msg_id"] = new Atomic(0);
         self::$atomics["_event_id"] = new Atomic(0);
         for ($i = 0; $i < 10; ++$i) {

src/ZM/Utils/ZMUtil.php

@@ -11,13 +11,16 @@ use Swoole\Timer;
 use ZM\Console\Console;
 use ZM\Store\LightCache;
 use ZM\Store\LightCacheInside;
+use ZM\Store\Lock\SpinLock;
 use ZM\Store\ZMAtomic;
 use ZM\Store\ZMBuf;
 
 class ZMUtil
 {
     public static function stop() {
+        if (SpinLock::tryLock("_stop_signal") === false) return;
         Console::warning(Console::setColor("Stopping server...", "red"));
+        Console::trace();
         LightCache::savePersistence();
         if (ZMBuf::$terminal !== null)
             Event::del(ZMBuf::$terminal);
@@ -31,6 +34,12 @@ class ZMUtil
     }
 
     public static function reload($delay = 800) {
+        if (server()->worker_id !== -1) {
+            Console::info(server()->worker_id);
+            zm_atomic("_int_is_reload")->set(1);
+            system("kill -INT " . intval(server()->master_pid));
+            return;
+        }
         Console::info(Console::setColor("Reloading server...", "gold"));
         usleep($delay * 1000);
         foreach ((LightCacheInside::get("wait_api", "wait_api") ?? []) as $k => $v) {