Merge pull request #4 from inhere/master

some update, add more ui page

Author: inhere

README.md

@@ -1,4 +1,4 @@
-# swoft-devtool
+# swoft devtool
 
 Dev tool for swoft
 
@@ -10,13 +10,9 @@ Dev tool for swoft
 composer require swoft/devtool
 ```
 
-## Document
-
-Please see [document site](https://doc.swoft.org)
-
 ## Quick start
 
-1. add http middleware in `config/beans/base.php`
+1. Add http middleware in `config/beans/base.php`
 
 ```php
 'serverDispatcher' => [
@@ -27,7 +23,7 @@ Please see [document site](https://doc.swoft.org)
   ],
 ```
 
-2. some optional config for devtool(in `config/properties/app.php`).
+2. Some optional config for devtool(in `config/properties/app.php`).
 
 ```php
 'devtool' => [
@@ -36,28 +32,39 @@ Please see [document site](https://doc.swoft.org)
 ],
 ```
 
-3. publish devtool's assets to `public` dir.
+3. Publish static assets to `public` dir.
 
 ```bash
 php bin/swoft dev:publish swoft/devtool
+// -f will delete old assets.
+php bin/swoft dev:publish swoft/devtool -f
 ```
 
-4. now, you can access your server address by browser. like `http://127.0.0.1:9088/__devtool/`
-
-> NOTICE: ensure your static assets is can accessed.
+4. Now, you can access `HOST:PORT/__devtool` by browser. e.g `http://127.0.0.1:9088/__devtool`
 
 5. If you see the following screen, you have successfully installed
 
 ![image](./res/images/devtool.jpg)
 
+## Question
+
+If you cannot access the address `HOST:PORT/__devtool`
+
+- Ensure your static assets is can accessed and assets is publish successful.
+- Ensure that the server was restarted after updating the package
+
 ## Notice
 
 Opening devTool will have some impact on server operation, please turn it off during stress test.
 
+## Document
+
+Please see [document site](https://doc.swoft.org)
+
 ## Unit testing
 
 ```bash
-phpunit test/unit
+phpunit
 ```
 
 ## LICENSE

src/Bootstrap/Listener/EventFireListener.php

@@ -2,6 +2,7 @@
 
 namespace Swoft\Devtool\Bootstrap\Listener;
 
+use Swoft\App;
 use Swoft\Bean\Annotation\Listener;
 use Swoft\Bean\Annotation\Value;
 use Swoft\Console\Helper\ConsoleUtil;
@@ -37,10 +38,11 @@ public function handle(EventInterface $event)
 
         ConsoleUtil::log(
             \sprintf('Trigger the event <cyan>%s</cyan>', $event->getName()),
-            $event->getParams(),
+            [],
             'debug',
             [
-                'Application'
+                'Application',
+                'WorkerId' => App::getWorkerId()
             ]
         );
     }

src/Bootstrap/Listener/ServerStartListener.php

@@ -2,12 +2,15 @@
 
 namespace Swoft\Devtool\Bootstrap\Listener;
 
+use Swoft\App;
 use Swoft\Bean\Annotation\ServerListener;
+use Swoft\Bean\BeanFactory;
 use Swoft\Bootstrap\Listeners\Interfaces\BeforeStartInterface;
 use Swoft\Bootstrap\Listeners\Interfaces\WorkerStartInterface;
 use Swoft\Bootstrap\SwooleEvent;
 use Swoft\Bootstrap\Server\AbstractServer;
 use Swoft\Devtool\DevTool;
+use Swoft\Devtool\WebSocket\DevToolController;
 use Swoft\Memory\Table;
 use Swoole\Server;
 
@@ -39,10 +42,16 @@ public function onWorkerStart(Server $server, int $workerId, bool $isWorker)
     {
         \output()->writeln(\sprintf(
             'Children process start successful. ' .
-            'PID <magenta>%s</magenta>, Worker Id <magenta>%s</magenta>, Role <info>%s</info> process',
+            'PID <magenta>%s</magenta>, Worker Id <magenta>%s</magenta>, Role <info>%s</info>',
             $server->worker_pid,
             $workerId,
-            $isWorker ? 'Work' : 'Task'
+            $isWorker ? 'Worker' : 'Task'
         ));
+
+        // if websocket is enabled. register a ws route
+        if ($isWorker && App::hasBean('wsRouter')) {
+            /* @see \Swoft\WebSocket\Server\Router\HandlerMapping::add() */
+            App::getBean('wsRouter')->add(DevTool::ROUTE_PREFIX, DevToolController::class);
+        }
     }
 }

src/Command/DevCommand.php

@@ -6,6 +6,7 @@
 use Swoft\Console\Bean\Annotation\Command;
 use Swoft\Console\Helper\ConsoleUtil;
 use Swoft\Console\Input\Input;
+use Swoft\Helper\DirHelper;
 use Swoft\Helper\ProcessHelper;
 
 /**
@@ -18,12 +19,12 @@ class DevCommand
     /**
      * @return array
      */
-    public function internalConfig(): array
+    public static function internalConfig(): array
     {
         return [
             'swoft/devtool' => [
-                '@devtool/web/dist/devtool',
-                '@root/public'
+                '@devtool/web/dist/devtool/static',
+                '@root/public/devtool'
             ],
         ];
     }
@@ -34,7 +35,7 @@ public function internalConfig(): array
      *  srcDir   The source assets directory path. eg. `@vendor/some/lib/assets`
      *  dstDir   The defined component name.(default is `@root/public`)
      * @Options
-     *   -y, --yes BOOL      Whether to ask when writing a file. default is: <info>True</info>
+     *   -y, --yes BOOL      Do not confirm when execute publish. default is: <info>False</info>
      *   -f, --force BOOL    Force override all exists file.(default: <info>False</info>)
      * @Example
      *   {fullCommand} swoft/devtool
@@ -56,7 +57,7 @@ public function publish(Input $input): int
 
         // first arg is internal component name
         if ($assetDir && !$targetDir) {
-            $config = $this->internalConfig();
+            $config = static::internalConfig();
 
             if (!isset($config[$assetDir])) {
                 \output()->colored('missing arguments!', 'warning');
@@ -68,6 +69,21 @@ public function publish(Input $input): int
         $assetDir = App::getAlias($assetDir);
         $targetDir = App::getAlias($targetDir);
 
+        $force = \input()->sameOpt(['f', 'force'], false);
+
+        if ($force && \is_dir($targetDir)) {
+            \output()->writeln("Will delete the old assets: $targetDir");
+
+            list($code, , $error) = ProcessHelper::run("rm -rf $targetDir");
+
+            if ($code !== 0) {
+                \output()->colored("Delete dir $targetDir is failed!", 'error');
+                \output()->writeln($error);
+
+                return -2;
+            }
+        }
+
         $yes = \input()->sameOpt(['y', 'yes'], false);
         $command = "cp -Rf $assetDir $targetDir";
 
@@ -79,6 +95,8 @@ public function publish(Input $input): int
             return 0;
         }
 
+        DirHelper::mkdir($targetDir);
+
         list($code, , $error) = ProcessHelper::run($command, App::getAlias('@root'));
 
         if ($code !== 0) {

src/Controller/AppController.php

@@ -11,12 +11,15 @@
 namespace Swoft\Devtool\Controller;
 
 use Swoft\App;
+use Swoft\Bean\BeanFactory;
+use Swoft\Bean\Collector\PoolCollector;
 use Swoft\Core\Config;
 use Swoft\Http\Message\Server\Request;
 use Swoft\Http\Server\Bean\Annotation\Controller;
 use Swoft\Http\Server\Bean\Annotation\RequestMapping;
 use Swoft\Http\Server\Bean\Annotation\RequestMethod;
 use Swoft\Http\Server\Payload;
+use Swoft\Pool\PoolConfigInterface;
 
 /**
  * Class AppController
@@ -27,16 +30,17 @@ class AppController
 {
     /**
      * get app info
-     * @RequestMapping(route="info", method=RequestMethod::GET)
+     * @RequestMapping(route="env", method=RequestMethod::GET)
      * @return array
      */
     public function index(): array
     {
         return [
             'os' => \PHP_OS,
             'phpVersion' => \PHP_VERSION,
-            'swoVersion' => \SWOOLE_VERSION,
-            'swfVersion' => App::version(),
+            'swooleVersion' => \SWOOLE_VERSION,
+            'swoftVersion' => App::version(),
+            'appName' => \APP_NAME,
             'basePath' => \BASE_PATH,
         ];
     }
@@ -58,6 +62,59 @@ public function config(Request $request)
         return \bean('config')->toArray();
     }
 
+    /**
+     * get app pools
+     * @RequestMapping(route="pools", method=RequestMethod::GET)
+     * @param Request $request
+     * @return array
+     * @throws \Swoft\Exception\InvalidArgumentException
+     */
+    public function pools(Request $request): array
+    {
+        if ($name = $request->query('name')) {
+            if (!App::hasPool($name)) {
+                return [];
+            }
+
+            /** @var PoolConfigInterface $poolConfig */
+            $poolConfig = App::getPool($name)->getPoolConfig();
+
+            return $poolConfig->toArray();
+        }
+
+        return PoolCollector::getCollector();
+    }
+
+    /**
+     * get app beans
+     * @RequestMapping(route="beans", method=RequestMethod::GET)
+     * @param Request $request
+     * @return array
+     */
+    public function beans(Request $request): array
+    {
+        if ($name = $request->query('name')) {
+            return [];
+        }
+
+        return BeanFactory::getContainer()->getBeanNames();
+    }
+
+    /**
+     * get app beans config
+     * @RequestMapping(route="beans-config", method=RequestMethod::GET)
+     * @param Request $request
+     * @return array
+     */
+    public function beansConfig(Request $request): array
+    {
+        if ($name = $request->query('name')) {
+            return [];
+        }
+
+        return [];
+    }
+
     /**
      * get app path aliases
      * @RequestMapping(route="aliases", method=RequestMethod::GET)

src/Controller/GenController.php

@@ -17,7 +17,7 @@
 
 /**
  * Class GenController
- * @Controller(prefix="/__devtool/gen")
+ * @Controller(prefix="/__devtool/gen/")
  * @package Swoft\Devtool\Controller
  */
 class GenController
@@ -35,6 +35,19 @@ public function index(Request $request): array
         return ['item0', 'item1'];
     }
 
+    /**
+     * Generate class file preview
+     * @RequestMapping(route="preview", method=RequestMethod::POST)
+     * @param Request $request
+     * @return array
+     */
+    public function preview(Request $request): array
+    {
+        // $data = $request->json();
+
+        return ['item0', 'item1'];
+    }
+
     /**
      * Generate class file
      * @RequestMapping(route="file", method=RequestMethod::POST)

src/Controller/RouteController.php

@@ -77,9 +77,18 @@ public function rpcRoutes(): array
         }
 
         /** @var \Swoft\Rpc\Server\Router\HandlerMapping $router */
-        // $router = \bean('serviceRouter');
+        $router = \bean('serviceRouter');
+        $rawList = $router->getRoutes();
+        $routes = [];
 
-        // return $router->getRoutes();
-        return [];
+        foreach ($rawList as $key => $route) {
+            $routes[] = [
+                'serviceKey' => $key,
+                'class' => $route[0],
+                'method' => $route[1],
+            ];
+        }
+
+        return $routes;
     }
 }

src/FileGenerator.php

@@ -1,6 +1,7 @@
 <?php
 
 namespace Swoft\Devtool;
+
 use Leuffen\TextTemplate\TextTemplate;
 use Swoft\App;
 

src/Middleware/DevToolMiddleware.php

@@ -15,6 +15,7 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Swoft\App;
 use Swoft\Bean\Annotation\Bean;
+use Swoft\Bean\Annotation\Value;
 use Swoft\Console\Helper\ConsoleUtil;
 use Swoft\Core\Coroutine;
 use Swoft\Devtool\DevTool;
@@ -28,12 +29,16 @@
  */
 class DevToolMiddleware implements MiddlewareInterface
 {
+    /**
+     * @Value("{$config.devtool.logHttpRequestToConsole}")
+     * @var bool
+     */
     public $logHttpRequestToConsole = true;
 
-    public function __construct()
-    {
-        $this->logHttpRequestToConsole = \bean('config')->get('devtool.logHttpRequestToConsole', true);
-    }
+    // public function __construct()
+    // {
+    //     $this->logHttpRequestToConsole = \bean('config')->get('devtool.logHttpRequestToConsole', true);
+    // }
 
     /**
      * @param \Psr\Http\Message\ServerRequestInterface|Request $request
@@ -49,7 +54,8 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
         if ($this->logHttpRequestToConsole) {
             ConsoleUtil::log(\sprintf('%s %s', $request->getMethod(), $path), [], 'debug', [
                 'HttpServer',
-                'coID' => Coroutine::tid()
+                'WorkerId' => App::getWorkerId(),
+                'CoId' => Coroutine::tid()
             ]);
         }