update to 1.5.5 version

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

@@ -3,7 +3,7 @@
     "description": "High performance QQ robot and web server development framework",
     "minimum-stability": "stable",
     "license": "Apache-2.0",
-    "version": "1.5.4",
+    "version": "1.5.5",
     "authors": [
         {
             "name": "whale",

src/Custom/global_function.php

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

src/Module/Example/Hello.php

@@ -28,6 +28,15 @@ class Hello
         Console::info("机器人 " . $conn->getQQ() . " 已连接！");
     }
 
+    /**
+     * 在机器人连接后向终端输出信息
+     * @SwooleEventAt("close",rule="connectType:qq")
+     */
+    public function onDisconnect() {
+        $conn = ctx()->getConnection();
+        Console::info("机器人 " . $conn->getQQ() . " 已断开连接！");
+    }
+
     /**
      * 向机器人发送"你好"，即可回复这句话
      * @CQCommand(match="你好",alias={"你好啊","你是谁"})

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

@@ -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中");