cleanup code, update some features

add Hitokoto API
add Closure for access_token
add working_dir() global function
adjust reply() method to .handle_quick_operation

src/Module/Example/Hello.php

@@ -11,6 +11,7 @@ use ZM\Console\Console;
 use ZM\Annotation\CQ\CQCommand;
 use ZM\Annotation\Http\RequestMapping;
 use ZM\Event\EventDispatcher;
+use ZM\Requests\ZMRequest;
 use ZM\Utils\ZMUtil;
 
 /**
@@ -45,6 +46,18 @@ class Hello
         return "你好啊，我是由炸毛框架构建的机器人！";
     }
 
+    /**
+     * 一个最基本的第三方 API 接口使用示例
+     * @CQCommand("一言")
+     */
+    public function hitokoto() {
+        $api_result = ZMRequest::get("https://v1.hitokoto.cn/");
+        if ($api_result === false) return "接口请求出错，请稍后再试！";
+        $obj = json_decode($api_result, true);
+        if ($obj === null) return "接口解析出错！可能返回了非法数据！";
+        return $obj["hitokoto"] . "\n----「" . $obj["from"] . "」";
+    }
+
     /**
      * 一个简单随机数的功能demo
      * 问法1：随机数 1 20
@@ -89,7 +102,7 @@ class Hello
      * @return string
      */
     public function paramGet($param) {
-        return "Hello, ".$param["name"];
+        return "Hello, " . $param["name"];
     }
 
     /**

src/ZM/ConsoleApplication.php

@@ -99,12 +99,7 @@ class ConsoleApplication extends Application
     private function selfCheck() {
         if (!extension_loaded("swoole")) die("Can not find swoole extension.\nSee: https://github.com/zhamao-robot/zhamao-framework/issues/19");
         if (version_compare(SWOOLE_VERSION, "4.4.13") == -1) die("You must install swoole version >= 4.4.13 !");
-        //if (!extension_loaded("gd")) die("Can not find gd extension.\n");
-        //if (!extension_loaded("sockets")) die("Can not find sockets extension.\n");
-        if (substr(PHP_VERSION, 0, 1) < "7") die("PHP >=7 required.\n");
-        //if (!function_exists("curl_exec")) die("Can not find curl extension.\n");
-        //if (!class_exists("ZipArchive")) die("Can not find Zip extension.\n");
-        //if (!file_exists(CRASH_DIR . "last_error.log")) die("Can not find log file.\n");
+        if (version_compare(PHP_VERSION, "7.2") == -1) die("PHP >= 7.2 required.");
         return true;
     }
 }

src/ZM/Context/Context.php

@@ -12,6 +12,7 @@ use swoole_server;
 use ZM\ConnectionManager\ConnectionObject;
 use ZM\ConnectionManager\ManagerGM;
 use ZM\Console\Console;
+use ZM\Event\EventDispatcher;
 use ZM\Exception\InvalidArgumentException;
 use ZM\Exception\WaitTimeoutException;
 use ZM\Http\Response;
@@ -112,21 +113,20 @@ class Context implements ContextInterface
                 $this->setCache("has_reply", true);
                 $data = $this->getData();
                 $conn = $this->getConnection();
-                switch ($data["message_type"]) {
-                    case "group":
-                        return (new ZMRobot($conn))->setCallback($yield)->sendGroupMsg($data["group_id"], $msg);
-                    case "private":
-                        return (new ZMRobot($conn))->setCallback($yield)->sendPrivateMsg($data["user_id"], $msg);
-                }
-                return null;
+                return (new ZMRobot($conn))->setCallback($yield)->callExtendedAPI(".handle_quick_operation", [
+                    "context" => $data,
+                    "operation" => [
+                        "reply" => $msg
+                    ]
+                ]);
         }
         return false;
     }
 
     public function finalReply($msg, $yield = false) {
         self::$context[$this->cid]["cache"]["block_continue"] = true;
-        if ($msg == "") return true;
-        return $this->reply($msg, $yield);
+        if ($msg != "") $this->reply($msg, $yield);
+        EventDispatcher::interrupt();
     }
 
     /**

src/ZM/Event/ServerEventHandler.php

@@ -6,6 +6,7 @@
 namespace ZM\Event;
 
 
+use Closure;
 use Co;
 use Error;
 use Exception;
@@ -410,9 +411,15 @@ class ServerEventHandler
         Console::debug("Calling Swoole \"open\" event from fd=" . $request->fd);
         unset(Context::$context[Co::getCid()]);
         $type = strtolower($request->header["x-client-role"] ?? $request->get["type"] ?? "");
-        $access_token = explode(" ", $request->header["authorization"] ?? $request->get["token"] ?? "")[1] ?? "";
-        if (($a = ZMConfig::get("global", "access_token")) != "") {
-            if ($access_token !== $a) {
+        $access_token = explode(" ", $request->header["authorization"] ?? "")[1] ?? $request->get["token"] ?? "";
+        $token = ZMConfig::get("global", "access_token");
+        if ($token instanceof Closure) {
+            if (!$token($access_token)) {
+                $server->close($request->fd);
+                Console::warning("Unauthorized access_token: " . $access_token);
+            }
+        } elseif (is_string($token)) {
+            if ($access_token !== $token) {
                 $server->close($request->fd);
                 Console::warning("Unauthorized access_token: " . $access_token);
                 return;

src/ZM/global_functions.php

@@ -329,4 +329,11 @@ function uuidgen($uppercase = false) {
     $data[8] = chr(ord($data[8]) & 0x3f | 0x80);
     return $uppercase ? strtoupper(vsprintf('%s%s-%s-%s-%s-%s%s%s', str_split(bin2hex($data), 4))) :
         vsprintf('%s%s-%s-%s-%s-%s%s%s', str_split(bin2hex($data), 4));
-}
+}
+
+function working_dir() {
+    if (LOAD_MODE == 0) return WORKING_DIR;
+    elseif (LOAD_MODE == 1) return LOAD_MODE_COMPOSER_PATH;
+    elseif (LOAD_MODE == 2) return realpath('.');
+    return null;
+}