update to v2.4.0 (build 399)

add CheckConfigCommand.php
add config update record docs
adjust swoole version to 4.5.0
fix stop and reload bugs
add $_running_annotation
add remote terminal
update global config
add timer tick exception handler
add zm_xxx global functions
add isAtMe(), splitCommand(), matchCommand() function for MessageUtil
add workerAction(), sendActionToWorker(), resumeAllWorkerCoroutines() functions for ProcessManager
optimize CQCommand match function
add custom TerminalCommand annotation
add TuringAPI
add getReloadableFiles() function for ZMUtil

src/ZM/Framework.php

@@ -5,7 +5,9 @@ namespace ZM;
 
 
 use Doctrine\Common\Annotations\AnnotationReader;
+use Error;
 use Exception;
+use Swoole\Server\Port;
 use ZM\Annotation\Swoole\OnSetup;
 use ZM\Config\ZMConfig;
 use ZM\ConnectionManager\ManagerGM;
@@ -23,6 +25,7 @@ use Swoole\Runtime;
 use Swoole\WebSocket\Server;
 use ZM\Annotation\Swoole\SwooleHandler;
 use ZM\Console\Console;
+use ZM\Utils\Terminal;
 use ZM\Utils\ZMUtil;
 
 class Framework
@@ -35,11 +38,16 @@ class Framework
      * @var Server
      */
     public static $server;
+    /**
+     * @var string[]
+     */
+    public static $loaded_files = [];
     /**
      * @var array|bool|mixed|null
      */
     private $server_set;
 
+    /** @noinspection PhpUnusedParameterInspection */
     public function __construct($args = []) {
         $tty_width = $this->getTtyWidth();
 
@@ -54,7 +62,6 @@ class Framework
         //定义常量
         include_once "global_defines.php";
 
-        ZMAtomic::init();
         try {
             $sw = ZMConfig::get("global");
             if (!is_dir($sw["zm_data"])) mkdir($sw["zm_data"]);
@@ -86,18 +93,23 @@ class Framework
             date_default_timezone_set($timezone);
 
             $this->server_set = ZMConfig::get("global", "swoole");
-            $this->parseCliArgs(self::$argv);
+            $this->server_set["log_level"] = SWOOLE_LOG_DEBUG;
+            $add_port = ZMConfig::get("global", "remote_terminal")["status"] ?? false;
 
+            $this->parseCliArgs(self::$argv, $add_port);
+            $worker = $this->server_set["worker_num"] ?? swoole_cpu_num();
+            define("ZM_WORKER_NUM", $worker);
+            ZMAtomic::init();
             // 打印初始信息
             $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"];
+            if (!isset($this->server_set["worker_num"])) $out["worker"] = swoole_cpu_num() . " (auto)";
+            else $out["worker"] = $this->server_set["worker_num"];
             $out["environment"] = $args["env"] === null ? "default" : $args["env"];
             $out["log_level"] = Console::getLevel();
             $out["version"] = ZM_VERSION . (LOAD_MODE == 0 ? (" (build " . ZM_VERSION_ID . ")") : "");
             if (APP_VERSION !== "unknown") $out["app_version"] = APP_VERSION;
-            if (isset(ZMConfig::get("global", "swoole")["task_worker_num"])) {
-                $out["task_worker"] = ZMConfig::get("global", "swoole")["task_worker_num"];
+            if (isset($this->server_set["task_worker_num"])) {
+                $out["task_worker"] = $this->server_set["task_worker_num"];
             }
             if (ZMConfig::get("global", "sql_config")["sql_host"] !== "") {
                 $conf = ZMConfig::get("global", "sql_config");
@@ -114,12 +126,88 @@ class Framework
                 $out["php_version"] = PHP_VERSION;
                 $out["swoole_version"] = SWOOLE_VERSION;
             }
+            if ($add_port) {
+                $conf = ZMConfig::get("global", "remote_terminal");
+                $out["terminal"] = $conf["host"] . ":" . $conf["port"];
+            }
 
             $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"));
 
+            if ($add_port) {
+                $conf = ZMConfig::get("global", "remote_terminal") ?? [
+                        'status' => true,
+                        'host' => '127.0.0.1',
+                        'port' => 20002,
+                        'token' => ''
+                    ];
+                $welcome_msg = Console::setColor("Welcome! You can use `help` for usage.", "green");
+                /** @var Port $port */
+                $port = self::$server->listen($conf["host"], $conf["port"], SWOOLE_SOCK_TCP);
+                $port->set([
+                    'open_http_protocol' => false
+                ]);
+                $port->on('connect', function (?\Swoole\Server $serv, $fd) use ($port, $welcome_msg, $conf) {
+                    ManagerGM::pushConnect($fd, "terminal");
+                    $serv->send($fd, file_get_contents(working_dir() . "/config/motd.txt"));
+                    if (!empty($conf["token"])) {
+                        $serv->send($fd, "Please input token: ");
+                    } else {
+                        $serv->send($fd, $welcome_msg . "\n>>> ");
+                    }
+                });
+
+                $port->on('receive', function ($serv, $fd, $reactor_id, $data) use ($welcome_msg, $conf) {
+                    ob_start();
+                    try {
+                        $arr = LightCacheInside::get("light_array", "input_token") ?? [];
+                        if (empty($arr[$fd] ?? '')) {
+                            if ($conf["token"] != '') {
+                                $token = trim($data);
+                                if ($token === $conf["token"]) {
+                                    SpinLock::transaction("input_token", function () use ($fd, $token) {
+                                        $arr = LightCacheInside::get("light_array", "input_token");
+                                        $arr[$fd] = $token;
+                                        LightCacheInside::set("light_array", "input_token", $arr);
+                                    });
+                                    $serv->send($fd, Console::setColor("Auth success!!\n", "green"));
+                                    $serv->send($fd, $welcome_msg . "\n>>> ");
+                                } else {
+                                    $serv->send($fd, Console::setColor("Auth failed!!\n", "red"));
+                                    $serv->close($fd);
+                                }
+                                return;
+                            }
+                        }
+                        if (trim($data) == "exit" || trim($data) == "q") {
+                            $serv->send($fd, Console::setColor("Bye!\n", "blue"));
+                            $serv->close($fd);
+                            return;
+                        }
+                        Terminal::executeCommand(trim($data));
+                    } catch (Exception $e) {
+                        $error_msg = $e->getMessage() . " at " . $e->getFile() . "(" . $e->getLine() . ")";
+                        Console::error("Uncaught exception " . get_class($e) . " when calling \"open\": " . $error_msg);
+                        Console::trace();
+                    } catch (Error $e) {
+                        $error_msg = $e->getMessage() . " at " . $e->getFile() . "(" . $e->getLine() . ")";
+                        Console::error("Uncaught " . get_class($e) . " when calling \"open\": " . $error_msg);
+                        Console::trace();
+                    }
+
+                    $r = ob_get_clean();
+                    if (!empty($r)) $serv->send($fd, $r);
+                    if (!in_array(trim($data), ['r', 'reload', 'stop'])) $serv->send($fd, ">>> ");
+                });
+
+                $port->on('close', function ($serv, $fd) {
+                    ManagerGM::popConnect($fd);
+                    //echo "Client: Close.\n";
+                });
+            }
+
             self::$server->set($this->server_set);
             Console::setServer(self::$server);
             self::printMotd($tty_width);
@@ -195,9 +283,9 @@ class Framework
     }
 
     public function start() {
+        self::$loaded_files = get_included_files();
         self::$server->start();
         zm_atomic("server_is_stopped")->set(1);
-        Console::setLevel(0);
     }
 
     /**
@@ -243,14 +331,29 @@ class Framework
     /**
      * 解析命令行的 $argv 参数们
      * @param $args
-     * @throws Exception
+     * @param $add_port
      */
-    private function parseCliArgs($args) {
+    private function parseCliArgs($args, &$add_port) {
         $coroutine_mode = true;
         global $terminal_id;
         $terminal_id = uuidgen();
         foreach ($args as $x => $y) {
             switch ($x) {
+                case 'worker-num':
+                    if (intval($y) >= 1 && intval($y) <= 1024) {
+                        $this->server_set["worker_num"] = intval($y);
+                    } else {
+                        Console::warning("Invalid worker num! Turn to default value (".($this->server_set["worker_num"] ?? swoole_cpu_num()).")");
+                    }
+                    break;
+                case 'task-worker-num':
+                    if (intval($y) >= 1 && intval($y) <= 1024) {
+                        $this->server_set["task_worker_num"] = intval($y);
+                        $this->server_set["task_enable_coroutine"] = true;
+                    } else {
+                        Console::warning("Invalid worker num! Turn to default value (0)");
+                    }
+                    break;
                 case 'disable-coroutine':
                     if ($y) {
                         $coroutine_mode = false;
@@ -296,6 +399,9 @@ class Framework
                         Console::$theme = $y;
                     }
                     break;
+                case 'remote-terminal':
+                    $add_port = true;
+                    break;
                 case 'show-php-ver':
                 default:
                     //Console::info("Calculating ".$x);
@@ -304,6 +410,7 @@ class Framework
             }
         }
         if ($coroutine_mode) Runtime::enableCoroutine(true, SWOOLE_HOOK_ALL);
+        else Runtime::enableCoroutine(false, SWOOLE_HOOK_ALL);
     }
 
     private static function writeNoDouble($k, $v, &$line_data, &$line_width, &$current_line, $colorful, $max_border) {