update to 1.5 version

README.md

@@ -2,7 +2,7 @@
 
 [![作者QQ](https://img.shields.io/badge/作者QQ-627577391-orange.svg)]()
 [![zhamao License](https://img.shields.io/hexpm/l/plug.svg?maxAge=2592000)](https://github.com/zhamao-robot/zhamao-framework/blob/master/LICENSE)
-[![版本](https://img.shields.io/badge/version-1.4-green.svg)]()
+[![版本](https://img.shields.io/badge/version-1.5-green.svg)]()
 
 [![stupid counter](https://img.shields.io/github/search/zhamao-robot/zhamao-framework/stupid.svg)](https://github.com/zhamao-robot/zhamao-framework/search?q=stupid)
 [![TODO counter](https://img.shields.io/github/search/zhamao-robot/zhamao-framework/TODO.svg)](https://github.com/zhamao-robot/zhamao-framework/search?q=TODO)
@@ -19,8 +19,9 @@ zhamao-framework 是一个基于 酷Q 的 PHP Swoole 的机器人框架，它会
 除了起到解析消息的作用，炸毛框架 还提供了完整的 WebSocket + HTTP 服务器，你还能用此框架构建出高性能的 API 接口服务器。
 
 ## 开始
-1. 你可以使用项目的 `Use this template` 功能将框架克隆到你的公开或私有仓库进行开发
-2. 你也可以直接到 **Release** 中下载最新的 phar 包，放入文件夹后快速启动框架
+先安装环境，环境安装见下方文档。
+1. `composer create-project zhamao/framework-starter` 从模板新建基础文档结构进行使用
+2. 你也可以直接到 **Release** 中下载最新的 phar 包，放入文件夹后 `php server.phar` 快速启动框架
 3. 还可以使用 Dockerfile 构建 Docker 容器
 
 ## 文档

bin/phar-build

@@ -2,14 +2,10 @@
 <?php /** @since 1.2.1 */
 global $version;
 echo "version: " . ($version = json_decode(file_get_contents(__DIR__ . "/../composer.json"), true)["version"]) . PHP_EOL;
-global $wechat_patch;
-$wechat_patch = "<?php


namespace ZM;


use Co;
use Framework\Console;
use Framework\ZMBuf;
use Module\WechatPatch\WechatHandler;
use Swoole\Http\Request;
use ZM\API\CQAPI;
use ZM\Connection\WSConnection;
use ZM\Exception\InvalidArgumentException;
use ZM\Exception\WaitTimeoutException;
use ZM\Http\Response;
use Swoole\WebSocket\Frame;
use Swoole\WebSocket\Server;
use ZM\Utils\ZMUtil;

abstract class ModBase
{
    /** @var Server */
    protected $server;
    /** @var Frame */
    protected $frame;
    /** @var array */
    protected $data;
    /** @var Request */
    protected $request;
    /** @var Response */
    protected $response;
    /** @var int */
    protected $fd;
    /** @var int */
    protected $worker_id;
    /** @var WSConnection|Response */
    protected $connection;

    protected $handle_type = ModHandleType::CQ_MESSAGE;

    public $block_continue = false;
    /**
     * @var array
     */
    public $wx_reply = [];

    /** @var Response */
    public $wx_response = null;

    public function __construct($param0 = [], $handle_type = 0) {
        if (isset($param0["server"])) $this->server = $param0["server"];
        if (isset($param0["frame"])) $this->frame = $param0["frame"];
        if (isset($param0["data"])) $this->data = $param0["data"];
        if (isset($param0["request"])) $this->request = $param0["request"];
        if (isset($param0["response"])) $this->response = $param0["response"];
        if (isset($param0["fd"])) $this->fd = $param0["fd"];
        if (isset($param0["worker_id"])) $this->worker_id = $param0["worker_id"];
        if (isset($param0["connection"])) {
            if ($param0["connection"] instanceof Response)
                $this->wx_response = $param0["connection"];
            $this->connection = $param0["connection"];
        }
        $this->handle_type = $handle_type;
    }

    /**
     * only can used by cq->message event function
     * @param $msg
     * @param bool $yield
     * @return mixed
     */
    public function reply($msg, $yield = false) {
        switch ($this->data["message_type"]) {
            case "group":
            case "private":
            case "discuss":
                return CQAPI::quick_reply($this->connection, $this->data, $msg, $yield);
            case "wechat":
                $this->wx_reply [] = $msg;
                //Console::warning("微信回复添加了" . $msg);
                return true;
        }
        return false;
    }

    public function finalReply($msg, $yield = false) {
        $this->block_continue = true;
        if ($msg == "") return true;
        return $this->reply($msg, $yield);
    }

    /**
     * @param string $prompt
     * @param int $timeout
     * @param string $timeout_prompt
     * @return string
     * @throws InvalidArgumentException
     * @throws WaitTimeoutException
     */
    public function waitMessage($prompt = "", $timeout = 600, $timeout_prompt = "") {
        if ($prompt != "") $this->reply($prompt);
        if (!isset($this->data["user_id"], $this->data["message"], $this->data["self_id"]))
            throw new InvalidArgumentException("协程等待参数缺失");
        if (($this->data["message_type"] ?? null) == "wechat") {
            Console::warning("当前fd：" . $this->connection->fd);
            $this->processWXResponse();
            $this->wx_response = null;
            $this->wx_reply = [];
        }
        $cid = Co::getuid();
        $api_id = ZMBuf::$atomics["wait_msg_id"]->get();
        ZMBuf::$atomics["wait_msg_id"]->add(1);
        $hang = [
            "coroutine" => $cid,
            "user_id" => $this->data["user_id"],
            "message" => $this->data["message"],
            "self_id" => $this->data["self_id"],
            "message_type" => $this->data["message_type"],
            "result" => null
        ];
        if ($hang["message_type"] == "group" || $hang["message_type"] == "discuss") {
            $hang[$hang["message_type"] . "_id"] = $this->data[$this->data["message_type"] . "_id"];
        }
        ZMBuf::appendKey("wait_api", $api_id, $hang);
        $id = swoole_timer_after($timeout * 1000, function () use ($api_id, $timeout_prompt) {
            $r = ZMBuf::get("wait_api")[$api_id] ?? null;
            if ($r !== null) {
                Co::resume($r["coroutine"]);
            }
        });
        //Console::info("从这里挂起～");
        Co::suspend();
        //Console::info("俺恢复了！");
        $sess = ZMBuf::get("wait_api")[$api_id];
        if ($sess["message_type"] == "wechat") {
            $this->connection = $sess["wx_response"];
            $this->wx_response = $this->connection;
            //Console::warning("替换后的fd：".$this->connection->fd."，回复的消息：".$sess["result"]);
        }
        ZMBuf::unsetByValue("wait_api", $api_id);
        $result = $sess["result"];
        if (isset($id)) swoole_timer_clear($id);
        if ($result === null) throw new WaitTimeoutException($this, $timeout_prompt);
        return $result;
    }

    /**
     * @param $arg
     * @param $mode
     * @param $prompt_msg
     * @return mixed|string
     * @throws InvalidArgumentException
     * @throws WaitTimeoutException
     */
    public function getArgs(&$arg, $mode, $prompt_msg) {
        switch ($mode) {
            case ZM_MATCH_ALL:
                $p = $arg;
                array_shift($p);
                return trim(implode(" ", $p)) == "" ? $this->waitMessage($prompt_msg) : trim(implode(" ", $p));
            case ZM_MATCH_NUMBER:
                foreach ($arg as $k => $v) {
                    if (is_numeric($v)) {
                        array_splice($arg, $k, 1);
                        return $v;
                    }
                }
                return $this->waitMessage($prompt_msg);
            case ZM_MATCH_FIRST:
                if (isset($arg[1])) {
                    $a = $arg[1];
                    array_splice($arg, 1, 1);
                    return $a;
                } else {
                    return $this->waitMessage($prompt_msg);
                }
        }
        throw new InvalidArgumentException();
    }

    public function getMessage() {
        return $this->data["message"] ?? null;
    }

    public function getUserId() {
        return $this->data["user_id"] ?? null;
    }

    public function getGroupId() {
        return $this->data["group_id"] ?? null;
    }

    public function getMessageType() {
        return $this->data["message_type"] ?? null;
    }

    public function getRobotId() {
        return $this->data["self_id"];
    }

    public function getConnection() {
        return $this->connection;
    }

    public function setBlock($result = true) {
        $this->block_continue = $result;
    }

    public function formatWXReply() {
        if ($this->wx_reply == []) return "";
        else {
            $ls = [];
            $have_image = false;
            foreach ($this->wx_reply as $v) {
                while (($cq = ZMUtil::getCQ($v)) !== null) {
                    if ($cq["type"] == "image" && (substr($cq["params"]["file"], 0, 7) == "http://" || substr($cq["params"]["file"], 0, 8) == "https://")) {
                        $v = str_replace(mb_substr($v, $cq["start"], $cq["end"] - $cq["start"] + 1), "<img src='" . $cq["params"]["file"] . "'>", $v);
                        $have_image = true;
                    } else {
                        $v = str_replace(mb_substr($v, $cq["start"], $cq["end"] - $cq["start"] + 1), "  ", $v);
                    }
                }
                $ls [] = $v;
            }
            if ($have_image === true) {
                $msgs = implode("\n\n", $ls);
                $key = md5($msgs);
                ZMBuf::appendKey("html_content", $key, "<html lang=\"en\"><head><meta charset='utf-8'><title></title></head><body><pre>" . $msgs . "</pre></body></html>");
                return $this->replyWechatNews("点击查看", "多媒体消息", "", WechatHandler::WX_HTTP_ADDR . $key);
            }
            $msg = implode("\n\n", $ls);
            $user_id = "<![CDATA[" . $this->data["user_id"] . "]]>";
            $from = "<![CDATA[".$this->data["self_id"]."]]>";
            $type = "<![CDATA[text]]>";
            $content = "<![CDATA[" . $msg . "]]>";
            $this->wx_reply = [];
            /** @noinspection HtmlDeprecatedTag */
            return "\n<xml><ToUserName>$user_id</ToUserName><FromUserName>$from</FromUserName><CreateTime>" . time() . "</CreateTime><MsgType>$type</MsgType><Content>$content</Content></xml>";
        }
    }

    /**
     * 用图文信息方式回复微信消息
     * @param $title
     * @param $description
     * @param $pic_url
     * @param $url
     * @return bool
     */
    public function replyWechatNews($title, $description, $pic_url, $url) {
        //$this->setFunctionCalled();
        $user_id = "<![CDATA[" . $this->data["user_id"] . "]]>";
        $from = "<![CDATA[" . $this->data["self_id"] . "]]>";
        $type = "<![CDATA[news]]>";
        //$content = "<![CDATA[" . $media_id . "]]>";
        $title = "<![CDATA[" . $title . "]]>";
        $description = "<![CDATA[" . $description . "]]>";
        $url = "<![CDATA[" . $url . "]]>";
        $pic_url = "<![CDATA[" . $pic_url . "]]>";
        return "\n<xml><ToUserName>$user_id</ToUserName><FromUserName>$from</FromUserName><CreateTime>" . time() . "</CreateTime><MsgType>$type</MsgType><ArticleCount>1</ArticleCount><Articles><item><Title>$title</Title><Description>$description</Description><PicUrl>$pic_url</PicUrl><Url>$url</Url></item></Articles></xml>";
    }

    public function processWXResponse($raw = "") {
        if ($this->wx_response === null) return;
        //else Console::info("还行，没丢，这个的fd是" . $this->wx_response->fd);
        if ($raw == "") {
            if (($reply = $this->formatWXReply()) !== "") {
                $this->wx_response->end($reply);
                ZMBuf::$atomics["out_count"]->add(1);
            } else {
                $this->wx_response->end("success");
            }
        } else {
            $this->wx_response->end($raw);
            ZMBuf::$atomics["out_count"]->add(1);
        }
    }

    public function __destruct() {
        if ($this->wx_reply != []) {
            $this->processWXResponse();
        }
    }
}";
 
 switch ($argv[1] ?? '') {
-    case '--with-wechat-patch':
-        build(true);
-        break;
     case '--normal':
+    case '':
         build();
         break;
     case '--help':

bin/start

@@ -10,6 +10,14 @@ require __DIR__ . '/../src/Scheduler/Scheduler.php';
 Swoole\Coroutine::set([
     'max_coroutine' => 30000,
 ]);
+global $vendor_mode;
+$vendor_mode = false;
+if (mb_strpos(__DIR__, getcwd()) !== false && substr(str_replace(getcwd(), "", __DIR__), 0, 8) == "/vendor/") {
+    define("LOAD_MODE", 1); //composer项目模式
+    define("LOAD_MODE_COMPOSER_PATH", getcwd());
+} else {
+    define("LOAD_MODE", 0); //正常模式
+}
 
 date_default_timezone_set("Asia/Shanghai");
 
@@ -24,13 +32,21 @@ switch ($argv[1] ?? '') {
             }
         });
         break;
+    case 'phar-build':
+        array_shift($argv);
+        require_once 'phar-build';
+        break;
+    case 'systemd':
+        array_shift($argv);
+        require_once 'systemd';
+        break;
     case '':
     case 'framework':
     case 'server':
-        if(!is_dir(__DIR__.'/../vendor/')){
+        if (!is_dir(__DIR__ . '/../vendor/') && LOAD_MODE == 0) {
             echo "Warning: you have not update composer!\n";
             exec("composer update", $out, $var);
-            if($var != 0) {
+            if ($var != 0) {
                 echo "You need to run \"composer update\" at root of zhamao-framework!\n";
                 die;
             }
@@ -39,10 +55,12 @@ switch ($argv[1] ?? '') {
         break;
     case '--help':
     case '-h':
-        echo "\nUsage: ".$argv[0]." [OPTION]\n";
+        echo "\nUsage: " . $argv[0] . " [OPTION]\n";
         echo "\nzhamao-framework start script, provides several startup arguments.";
         echo "\n\n  -h, --help\t\tShow this help menu";
-        echo "\n  framework, server\tstart main framework, this is default option\n\n";
+        echo "\n  framework, server\tstart main framework, this is default option";
+        echo "\n  phar-build\t\tbuild a new phar archive";
+        echo "\n  systemd\t\tgenerate a new systemd \".service\" file to use\n\n";
         break;
     default:
         echo "Unknown option \"{$argv[1]}\"!\n\"--help\" for more information\n";

bin/systemd

@@ -2,7 +2,8 @@
 <?php /** @since 1.2 */
 switch ($argv[1] ?? '') {
     case '--generate':
-        generate();
+    case '':
+        generate($argv);
         break;
     case '--help':
     case '-h':
@@ -14,13 +15,17 @@ switch ($argv[1] ?? '') {
         break;
 }
 
-function generate() {
+function generate($argv) {
     $s = "[Unit]\nDescription=zhamao-framework Daemon\nAfter=rc-local.service\n\n[Service]\nType=simple";
     $s .= "\nUser=" . exec("whoami");
     $s .= "\nGroup=" . exec("groups | awk '{print $1}'");
     $s .= "\nWorkingDirectory=" . getcwd();
-    $s .= "\nExecStart=" . getcwd() . "/bin/start server --disable-console-input";
+    if ($argv[0] == "systemd" && !file_exists(getcwd() . '/systemd'))
+        $s .= "\nExecStart=" . getcwd() . "/vendor/bin/start server --disable-console-input";
+    else
+        $s .= "\nExecStart=" . getcwd() . "/bin/start server --disable-console-input";
     $s .= "\nRestart=always\n\n[Install]\nWantedBy=multi-user.target\n";
+    @mkdir(getcwd() . "/resources/");
     file_put_contents(getcwd() . "/resources/zhamao.service", $s);
     echo "File successfully generated. Path: " . getcwd() . "/resources/zhamao.service\n";
 }

composer.json

@@ -3,7 +3,7 @@
     "description": "high-performance intelligent assistant",
     "minimum-stability": "stable",
     "license": "Apache-2.0",
-    "version": "1.4.1",
+    "version": "1.5",
     "authors": [
         {
             "name": "whale",
@@ -14,6 +14,10 @@
             "email": "[email protected]"
         }
     ],
+    "prefer-stable": true,
+    "bin": [
+        "bin/start"
+    ],
     "require": {
         "php": ">=7.2",
         "swoole/ide-helper": "@dev",
@@ -25,11 +29,5 @@
         "ext-ctype": "*",
         "ext-pdo": "*",
         "psy/psysh": "@stable"
-    },
-    "repositories": {
-        "packagist": {
-            "type": "composer",
-            "url": "https://mirrors.aliyun.com/composer/"
-        }
     }
 }

config/global.php

@@ -14,7 +14,7 @@
 $config['debug_mode'] = false;
 
 /** 存放框架内文件数据的目录 */
-$config['zm_data'] = WORKING_DIR.'/zm_data/';
+$config['zm_data'] = realpath(__DIR__ . "/../").'/zm_data/';
 
 /** 存放各个模块配置文件的目录 */
 $config['config_dir'] = $config['zm_data'].'config/';
@@ -73,7 +73,7 @@
 /** 静态文件访问 */
 $config['static_file_server'] = [
     'status' => false,
-    'document_root' => WORKING_DIR . '/resources/html',
+    'document_root' => realpath(__DIR__ . "/../") . '/resources/html',
     'document_index' => [
         'index.html'
     ]