diff --git a/composer.json b/composer.json index c82cf16e..dfa54e46 100644 --- a/composer.json +++ b/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.1", + "version": "1.5.2", "authors": [ { "name": "whale", diff --git a/src/Framework/FrameworkLoader.php b/src/Framework/FrameworkLoader.php index 344a810d..6925792c 100644 --- a/src/Framework/FrameworkLoader.php +++ b/src/Framework/FrameworkLoader.php @@ -100,7 +100,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 +130,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); diff --git a/src/Framework/global_functions.php b/src/Framework/global_functions.php index ff86fe22..d0af5c3a 100644 --- a/src/Framework/global_functions.php +++ b/src/Framework/global_functions.php @@ -222,3 +222,5 @@ function zm_timer_tick($ms, callable $callable) { } + + diff --git a/src/ZM/Utils/ZMWebSocket.php b/src/ZM/Utils/ZMWebSocket.php index 1d96fc7a..6340ba7c 100644 --- a/src/ZM/Utils/ZMWebSocket.php +++ b/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";