update to 1.5.5 version

switch spl_autoload to psr-4 autoload

README.md

@@ -84,6 +84,6 @@ Pages托管：[https://framework.zhamao.xin/](https://framework.zhamao.xin/)
 
 欢迎随时在 HTTP-API 插件群里提问，当然更好的话可以加作者 QQ（627577391）或提交 Issue 进行疑难解答。
 
-本项目在更行内容时，请及时关注 GitHub 动态，更新前请将自己的模块代码做好备份。
+本项目在更新内容时，请及时关注 GitHub 动态，更新前请将自己的模块代码做好备份。
 
 项目框架采用 Apache-2.0 协议开源，在分发或重写修改等操作时需遵守协议。项目模块部分(`Module` 文件夹) 在非借鉴框架内代码时可不遵守 Apache-2.0 协议进行分发和修改(声明版权)。

bin/start

@@ -40,6 +40,71 @@ switch ($argv[1] ?? '') {
         array_shift($argv);
         require_once 'systemd';
         break;
+    case 'init':
+        array_shift($argv);
+        if (LOAD_MODE != 1) {
+            echo "initialization must be started with composer-project mode!\n";
+            exit(1);
+        }
+        $cwd = LOAD_MODE_COMPOSER_PATH;
+        echo "Copying default module file ...";
+        @mkdir($cwd . "/config");
+        @mkdir($cwd . "/src");
+        @mkdir($cwd . "/src/Custom");
+        @mkdir($cwd . "/src/Module");
+        @mkdir($cwd . "/src/Module/Example");
+        @mkdir($cwd . "/src/Module/Middleware");
+        $ls = [
+            "/config/global.php",
+            "/.gitignore",
+            "/config/file_header.json",
+            "/config/motd.txt",
+            "/src/Module/Example/Hello.php",
+            "/src/Module/Middleware/TimerMiddleware.php",
+            "/src/Custom/global_function.php"
+        ];
+        foreach($ls as $v) {
+            if(!file_exists($cwd.$v)) {
+                echo "Copying ".$v.PHP_EOL;
+                copy($cwd."/vendor/zhamao/framework".$v, $cwd.$v);
+            }
+        }
+        $autoload = [
+            "psr-4" => [
+                "Module\\" => "src/Module",
+                "Custom\\" => "src/Custom"
+            ],
+            "files" => [
+                "src/Custom/global_function.php"
+            ]
+        ];
+        $scripts = [
+            "server" => "vendor/bin/start server",
+            "server:log-debug" => "vendor/bin/start server --log-debug",
+            "server:log-verbose" => "vendor/bin/start server --log-verbose",
+            "server:log-info" => "vendor/bin/start server --log-info",
+            "server:log-warning" => "vendor/bin/start server --log-warning",
+            "server:debug-mode" => "vendor/bin/start server --debug-mode",
+            "systemd" => "vendor/bin/start systemd"
+        ];
+        echo PHP_EOL;
+        if (file_exists($cwd . "/composer.json")) {
+            echo "Updating composer.json ...";
+            $composer = json_decode(file_get_contents($cwd . "/composer.json"), true);
+            if (!isset($composer["autoload"])) {
+                $composer["autoload"] = $autoload;
+            }
+            if (!isset($composer["scripts"])) {
+                $composer["scripts"] = $scripts;
+            }
+            file_put_contents($cwd . "/composer.json", json_encode($composer, 64 | 128 | 256));
+            echo PHP_EOL;
+        } else {
+            echo("Error occurred. Please check your updates.\n");
+            exit(1);
+        }
+        echo "success!\n";
+        break;
     case '':
     case 'framework':
     case 'server':
@@ -60,6 +125,7 @@ switch ($argv[1] ?? '') {
         echo "\n\n  -h, --help\t\tShow this help menu";
         echo "\n  framework, server\tstart main framework, this is default option";
         echo "\n  phar-build\t\tbuild a new phar archive";
+        echo "\n  init\t\t\tinitialize framework structure in this directory";
         echo "\n  systemd\t\tgenerate a new systemd \".service\" file to use\n\n";
         break;
     default:

composer.json

@@ -1,9 +1,9 @@
 {
     "name": "zhamao/framework",
-    "description": "high-performance intelligent assistant",
+    "description": "High performance QQ robot and web server development framework",
     "minimum-stability": "stable",
     "license": "Apache-2.0",
-    "version": "1.5",
+    "version": "1.5.5",
     "authors": [
         {
             "name": "whale",
@@ -23,11 +23,19 @@
         "swoole/ide-helper": "@dev",
         "ext-mbstring": "*",
         "swlib/saber": "^1.0",
-        "doctrine/annotations": "<1.10.2",
+        "doctrine/annotations": "~1.10",
         "ext-json": "*",
         "ext-posix": "*",
         "ext-ctype": "*",
         "ext-pdo": "*",
         "psy/psysh": "@stable"
+    },
+    "autoload": {
+        "psr-4": {
+            "Custom\\": "src/Custom",
+            "Framework\\": "src/Framework",
+            "ZM\\": "src/ZM",
+            "Module\\": "src/Module"
+        }
     }
 }

config/global.php

@@ -38,7 +38,12 @@ $config['sql_config'] = [
     'sql_database' => 'db_name',
     'sql_password' => '',
     'sql_enable_cache' => true,
-    'sql_reset_cache' => '0300'
+    'sql_reset_cache' => '0300',
+    'sql_options' => [
+        PDO::ATTR_STRINGIFY_FETCHES => false,
+        PDO::ATTR_EMULATE_PREPARES => false
+    ],
+    'sql_no_exception' => false
 ];
 
 /** CQHTTP连接约定的token */

src/Custom/global_function.php

@@ -1,7 +1,3 @@
 <?php
 
 //这里写你的全局函数
-
-function phptest(){
-    echo "Nothing.\n";
-}

src/Framework/Console.php

@@ -184,7 +184,7 @@ class Console
         $vss->callback = function(?WSConnection $conn) use ($terminal_id){
             $req = ctx()->getRequest();
             if($conn->getType() != "terminal") return false;
-            if(($req->header["x-terminal-id"] ?? "") != $terminal_id || ($req->header["x-pid"] ?? "") != posix_getpid()) {
+            if(($req->header["x-terminal-id"] ?? "") != $terminal_id) {
                 $conn->close();
                 return false;
             }

src/Framework/FrameworkLoader.php

@@ -43,9 +43,19 @@ class FrameworkLoader
 
         $this->requireGlobalFunctions();
         if (LOAD_MODE == 0) define("WORKING_DIR", getcwd());
-        elseif(LOAD_MODE == 1) define("WORKING_DIR", realpath(__DIR__ . "/../../"));
+        elseif (LOAD_MODE == 1) define("WORKING_DIR", realpath(__DIR__ . "/../../"));
         elseif (LOAD_MODE == 2) echo "Phar mode: " . WORKING_DIR . PHP_EOL;
-        $this->registerAutoloader('classLoader');
+        //$this->registerAutoloader('classLoader');
+        require_once "DataProvider.php";
+        if (file_exists(DataProvider::getWorkingDir() . "/vendor/autoload.php")) {
+            require_once DataProvider::getWorkingDir() . "/vendor/autoload.php";
+        }
+        if (LOAD_MODE == 2) {
+            require_once FRAMEWORK_DIR . "/vendor/autoload.php";
+            spl_autoload_register('phar_classloader');
+        }
+
+
         self::$settings = new GlobalConfig();
         if (self::$settings->get("debug_mode") === true) {
             $args[] = "--debug-mode";
@@ -100,7 +110,7 @@ class FrameworkLoader
                 "host: " . self::$settings->get("host") .
                 ", port: " . self::$settings->get("port") .
                 ", log_level: " . ZMBuf::$atomics["info_level"]->get() .
-                ", version: " . json_decode(file_get_contents(WORKING_DIR . "/composer.json"), true)["version"] .
+                ", version: " . ZM_VERSION .
                 "\nworking_dir: " . DataProvider::getWorkingDir()
             );
             global $motd;
@@ -130,6 +140,7 @@ class FrameworkLoader
     private function defineProperties() {
         define("ZM_START_TIME", microtime(true));
         define("ZM_DATA", self::$settings->get("zm_data"));
+        define("ZM_VERSION", json_decode(file_get_contents(__DIR__ . "/../../composer.json"), true)["version"] ?? "unknown");
         define("CONFIG_DIR", self::$settings->get("config_dir"));
         define("CRASH_DIR", self::$settings->get("crash_dir"));
         @mkdir(ZM_DATA);

src/Framework/global_functions.php

@@ -8,11 +8,12 @@ use ZM\Context\ContextInterface;
 use ZM\Utils\ZMUtil;
 
 
-function classLoader($p) {
+function phar_classloader($p){
     $filepath = getClassPath($p);
-    if ($filepath === null)
-        echo "F:Warning: get class path wrongs.$p\n";
-    //else echo "F:DBG: Found " . $p . "\n";
+    if($filepath === null) {
+        Console::debug("F:Warning: get class path wrongs.$p");
+        return;
+    }
     try {
         require_once $filepath;
     } catch (Exception $e) {
@@ -222,3 +223,5 @@ function zm_timer_tick($ms, callable $callable) {
 }
 
 
+
+

src/Module/Example/Hello.php

@@ -10,7 +10,6 @@ use ZM\Annotation\Http\Middleware;
 use ZM\Annotation\Http\RequestMapping;
 use ZM\Annotation\Swoole\SwooleEventAt;
 use ZM\Connection\CQConnection;
-use ZM\ModBase;
 use ZM\Utils\ZMUtil;
 
 /**
@@ -18,7 +17,7 @@ use ZM\Utils\ZMUtil;
  * @package Module\Example
  * @since 1.0
  */
-class Hello extends ModBase
+class Hello
 {
     /**
      * 在机器人连接后向终端输出信息
@@ -29,9 +28,18 @@ class Hello extends ModBase
         Console::info("机器人 " . $conn->getQQ() . " 已连接！");
     }
 
+    /**
+     * 在机器人连接后向终端输出信息
+     * @SwooleEventAt("close",rule="connectType:qq")
+     */
+    public function onDisconnect() {
+        $conn = ctx()->getConnection();
+        Console::info("机器人 " . $conn->getQQ() . " 已断开连接！");
+    }
+
     /**
      * 向机器人发送"你好"，即可回复这句话
-     * @CQCommand("你好")
+     * @CQCommand(match="你好",alias={"你好啊","你是谁"})
      */
     public function hello() {
         return "你好啊，我是由炸毛框架构建的机器人！";
@@ -67,7 +75,6 @@ class Hello extends ModBase
      * @Middleware("timer")
      */
     public function timer() {
-        eval(ZM_BREAKPOINT);
         return "This page is used as testing TimerMiddleware! Do not use it in production.";
     }
 

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 $alias = [];
     /** @var int */
     public $level = 20;
 
@@ -32,4 +34,4 @@ class CQCommand extends AnnotationBase implements Level
      */
     public function setLevel(int $level) { $this->level = $level; }
 
-}
+}

src/ZM/DB/WhereBody.php

@@ -9,7 +9,7 @@ trait WhereBody
     protected $where_thing = [];
 
     public function where($column, $operation_or_value, $value = null) {
-        if (!in_array($operation_or_value, ['=', '!='])) $this->where_thing['='][$column] = $operation_or_value;
+        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;
         else $this->where_thing['='][$column] = $operation_or_value;
         return $this;

src/ZM/Event/CQ/MessageEvent.php

@@ -38,9 +38,9 @@ class MessageEvent
      * @throws AnnotationException
      */
     public function onBefore() {
-        $obj_list = ZMBuf::$events[CQBefore::class]["message"];
+        $obj_list = ZMBuf::$events[CQBefore::class]["message"] ?? [];
         foreach ($obj_list as $v) {
-            if($v->level < 200) break;
+            if ($v->level < 200) break;
             EventHandler::callWithMiddleware(
                 $v->class,
                 $v->method,
@@ -65,7 +65,7 @@ class MessageEvent
             }
         }
         foreach (ZMBuf::$events[CQBefore::class]["message"] ?? [] as $v) {
-            if($v->level >= 200) continue;
+            if ($v->level >= 200) continue;
             $c = $v->class;
             if (ctx()->getCache("level") != 0) continue;
             EventHandler::callWithMiddleware(
@@ -117,6 +117,13 @@ class MessageEvent
                             return true;
                         });
                         return;
+                    } elseif (in_array($word[0], $v->alias)) {
+                        Console::debug("Calling $c -> {$v->method}");
+                        $this->function_call = EventHandler::callWithMiddleware($obj[$c], $v->method, $class_construct, [$word], function ($r) {
+                            if (is_string($r)) context()->reply($r);
+                            return true;
+                        });
+                        return;
                     } elseif ($v->regexMatch != "" && ($args = matchArgs($v->regexMatch, context()->getMessage())) !== false) {
                         Console::debug("Calling $c -> {$v->method}");
                         $this->function_call = EventHandler::callWithMiddleware($obj[$c], $v->method, $class_construct, [$args], function ($r) {

src/ZM/Event/EventHandler.php

@@ -85,7 +85,7 @@ class EventHandler
                         " [" . $param1->getStatusCode() . "] " . $param0->server["request_uri"]
                     );
                     if (!$param1->isEnd()) $param1->end("Internal server error: " . $e->getMessage());
-                    Console::error("Internal server error (500), caused by uncaught exception.");
+                    Console::error("Internal server exception (500), caused by ".get_class($e));
                     Console::log($e->getTraceAsString(), "gray");
                 } catch (Error $e) {
                     /** @var Response $param1 */

src/ZM/Event/Swoole/RequestEvent.php

@@ -42,7 +42,7 @@ class RequestEvent implements SwooleEvent
             $this->response->setHeader($k, $v);
         }
         $uri = $this->request->server["request_uri"];
-        Console::verbose($this->request->server["remote_addr"]." request ".$uri);
+        Console::verbose($this->request->server["remote_addr"] . " request " . $uri);
         $uri = explode("/", $uri);
         $uri = array_diff($uri, ["..", "", "."]);
         $node = ZMBuf::$req_mapping;

src/ZM/Event/Swoole/WSCloseEvent.php

@@ -4,6 +4,7 @@
 namespace ZM\Event\Swoole;
 
 
+use Closure;
 use Doctrine\Common\Annotations\AnnotationException;
 use Framework\ZMBuf;
 use Swoole\Server;
@@ -11,8 +12,6 @@ use ZM\Annotation\Swoole\SwooleEventAfter;
 use ZM\Annotation\Swoole\SwooleEventAt;
 use ZM\Connection\ConnectionManager;
 use ZM\Event\EventHandler;
-use ZM\ModBase;
-use ZM\ModHandleType;
 use ZM\Utils\ZMUtil;
 
 class WSCloseEvent implements SwooleEvent
@@ -32,8 +31,7 @@ class WSCloseEvent implements SwooleEvent
      */
     public function onActivate() {
         ZMUtil::checkWait();
-        ConnectionManager::close($this->fd);
-        set_coroutine_params(["server" => $this->server, "fd" => $this->fd]);
+        set_coroutine_params(["server" => $this->server, "fd" => $this->fd, "connection" => ConnectionManager::get($this->fd)]);
         foreach(ZMBuf::$events[SwooleEventAt::class] ?? [] as $v) {
             if(strtolower($v->type) == "close" && $this->parseSwooleRule($v)) {
                 $c = $v->class;
@@ -41,6 +39,7 @@ class WSCloseEvent implements SwooleEvent
                 if(context()->getCache("block_continue") === true) break;
             }
         }
+        ConnectionManager::close($this->fd);
         return $this;
     }
 
@@ -60,6 +59,11 @@ class WSCloseEvent implements SwooleEvent
     }
 
     private function parseSwooleRule($v) {
+        switch (explode(":", $v->rule)[0]) {
+            case "connectType": //websocket连接类型
+                if ($v->callback instanceof Closure) return call_user_func($v->callback, ConnectionManager::get($this->fd));
+                break;
+        }
         return true;
     }
 }

src/ZM/Event/Swoole/WorkerStartEvent.php

@@ -102,7 +102,7 @@ class WorkerStartEvent implements SwooleEvent
                 ->withCharset('utf8mb4')
                 ->withUsername($sql["sql_username"])
                 ->withPassword($sql["sql_password"])
-                ->withOptions([PDO::ATTR_STRINGIFY_FETCHES => false])
+                ->withOptions($sql["sql_options"] ?? [PDO::ATTR_STRINGIFY_FETCHES => false])
             );
             DB::initTableList();
         }
@@ -176,13 +176,8 @@ class WorkerStartEvent implements SwooleEvent
                 }
             }
         }
-
         //加载composer类
-        Console::info("加载composer资源中");
-        if (file_exists(DataProvider::getWorkingDir() . "/vendor/autoload.php")) {
-            require_once DataProvider::getWorkingDir() . "/vendor/autoload.php";
-        }
-        if (LOAD_MODE == 2) require_once FRAMEWORK_DIR . "/vendor/autoload.php";
+        //remove stupid duplicate code
 
         //加载各个模块的注解类，以及反射
         Console::info("检索Module中");

src/ZM/Utils/ZMRequest.php

@@ -27,6 +27,7 @@ class ZMRequest
             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);
@@ -60,6 +61,7 @@ class ZMRequest
             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->set($set == [] ? ['timeout' => 15.0] : $set);
@@ -94,4 +96,34 @@ class ZMRequest
     public static function session($option) {
         return Saber::session($option);
     }
+
+    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));
+        $cli->set($attribute["set"] ?? ["timeout" => 15.0]);
+        $cli->setMethod($attribute["method"] ?? "GET");
+        $cli->setHeaders($attribute["headers"] ?? []);
+        if(isset($attribute["data"])) $cli->setData($attribute["data"]);
+        if(isset($attribute["file"])) {
+            foreach($attribute["file"] as $k => $v) {
+                $cli->addFile($v["path"], $v["name"], $v["mime_type"] ?? null, $v["filename"] ?? null, $v["offset"] ?? 0, $v["length"] ?? 0);
+            }
+        }
+        $cli->execute($parse["path"] . (isset($parse["query"]) ? "?" . $parse["query"] : ""));
+        if ($return_body) {
+            if ($cli->errCode != 0 || $cli->statusCode != 200) return false;
+            $a = $cli->body;
+            $cli->close();
+            return $a;
+        } else {
+            $cli->close();
+            return $cli;
+        }
+    }
 }

src/ZM/Utils/ZMWebSocket.php

@@ -29,6 +29,7 @@ class ZMWebSocket
             Console::warning("ZMRequest: url must contains scheme such as \"ws(s)://\"");
             return;
         }
+        if (!isset($this->parse["path"])) $this->parse["path"] = "/";
         $port = $this->parse["port"] ?? (($this->parse["scheme"] ?? "ws") == "wss" ? 443 : 80);
         $this->client = new Client($this->parse["host"], $port, (($this->parse["scheme"] ?? "ws") == "wss" ? true : false));
         $this->client->set($set);
@@ -85,18 +86,18 @@ class ZMWebSocket
     }
 }
 
-if(!debug_backtrace()) {
+if (!debug_backtrace()) {
     go(function () {
         require_once __DIR__ . "/../../Framework/Console.php";
         $cli = new ZMWebSocket("ws://127.0.0.1:20001/");
         if (!$cli->is_available) die("Error!\n");
-        $cli->onMessage(function ($frame){
+        $cli->onMessage(function (Frame $frame) {
             var_dump($frame);
         });
-        $cli->onClose(function($client){
+        $cli->onClose(function () {
             echo "Connection closed.\n";
         });
-        if($cli->upgrade()){
+        if ($cli->upgrade()) {
             echo "成功连接！\n";
         } else {
             echo "连接失败！\n";