Merge pull request #44 from huangzhhui/kernel-switch

Kernel switch, also support Swoole Kernel

Author: huangzhhui

README-CN.md

@@ -6,10 +6,6 @@ Box 致力于帮助提升 Hyperf 应用程序的编程体验，管理 PHP 环境
 
 ## 目前还是早期实验版本，欢迎试玩 ~
 
-请注意 box 内的 `php` **仅支持 Swow**, 暂 **不支持** Swoole，故你的项目骨架应由 [hyperf/swow-skeleton](https://github.com/hyperf/swow-skeleton) 项目创建或其它 Swow 骨架创建。   
-如果要使用 Swoole，请使用 `swoole-cli` 代替 `php` 命令，同时其他 PHP 代理命令将无效。   
-提示：运行 `box get swoole-cli` 可获取最新版本的 swoole-cli。   
-
 ### 使用
 
 #### 安装 box
@@ -50,6 +46,18 @@ Box 需要一个 Github 访问令牌来请求 Github API，以检索包的版本
 2. 运行 `box config set github.access-token <Your Token>` 命令来设置您的 token；
 3. 玩得开心 ~
 
+#### 设置 Box Kernel
+
+默认情况下，Box 由 Swow Kernel 提供支持，但是我们也提供了 Swoole Kernel，您可以通过 `box config set kernel swoole` 来切换为 Swoole Kernel，但是需要注意的是，Swoole Kernel 仅支持 PHP 8.1 版本，且不支持构建二进制程序功能。
+
+```bash
+// 设置为 Swow Kernel [默认]
+box config set kernel swow
+
+// 设置为 Swoole Kernel
+box config set kernel swoole
+```
+
 ### 命令
 
 - `box get pkg@version`从远程安装包，`pkg`是包名，`version`是包的版本，`box get pkg`表示安装最新版本的 pkg，例如, 运行 `box get php@8.1` 安装 PHP 8.1, 运行 `box get composer` 安装最新的 composer bin

README.md

@@ -6,10 +6,6 @@ Box is committed to helping improve the programming experience of Hyperf applica
 
 ## This is still an early experimental version, have fun ~
 
-Please notice that the `php` which in box **ONLY** supports for **Swow**, but **NOT** Swoole, so your Hyperf application should created by [hyperf/swow-skeleton](https://github.com/hyperf/swow-skeleton) or other else swow skeleton.   
-If you want to use Swoole, please use `swoole-cli` instead of `php` command, also the other PHP proxy commands are invalid.
-Tips: run `box get swoole-cli` to get the latest version swoole-cli..
-
 ### Usage
 
 #### Install box
@@ -50,6 +46,18 @@ Box needs a Github Access Token to request github api, to retrieve the versions
 2. Run `box config set github.access-token <Your Token>` to init the token.
 3. Have fun ~
 
+#### Setting the Box Kernel
+
+By default, Box is supported by Swow Kernel, but we also provide Swoole Kernel, you can switch to Swoole Kernel by `box config set kernel swoole`, but it should be noted that Swoole Kernel only supports PHP 8.1 version, and The Build Binaries feature is not supported.
+
+```bash
+// set to Swow Kernel [default]
+box config set kernel swow
+
+// set to Swoole Kernel
+box config set kernel swoole
+````
+
 ### Commands
 
 - `box get pkg@version` to install the package from remote automatically, `pkg` is the package name, and `version` is the version of package, `box get pkg` means to install the latest version of pkg, for example, run `box get php@8.1` to install the PHP 8.1, run `box get composer` to install the latest composer bin

src/app/Command/AbstractCommand.php

@@ -13,6 +13,7 @@
 namespace App\Command;
 
 use App\Config;
+use Hyperf\Contract\StdoutLoggerInterface;
 use RuntimeException;
 use Hyperf\Di\Annotation\Inject;
 use Hyperf\Command\Command as HyperfCommand;
@@ -22,6 +23,9 @@ abstract class AbstractCommand extends HyperfCommand
     #[Inject]
     protected Config $config;
 
+    #[Inject]
+    protected StdoutLoggerInterface $logger;
+
     protected function liveCommand(string $command)
     {
         if ($this->isFunctionExists('passthru')) {

src/app/Command/AbstractPhpCallProxyCommand.php

@@ -38,6 +38,16 @@ public function handle()
     protected function buildBinCommand(): string
     {
         $path = $this->getRuntimePath();
-        return $path . '/php' . $this->getCurrentPhpVersion() . ' ' . $path . '/' . $this->proxyBin;
+        $kernel = strtolower($this->config->getConfig('kernel', 'swow'));
+        $currentPhpVersion = $this->getCurrentPhpVersion();
+        if ($kernel === 'swoole') {
+            $bin = $path . '/swoole-cli';
+            if ($currentPhpVersion < '8.1') {
+                $this->logger->warning(sprintf('Current setting PHP version is %s, but the kernel is Swoole and Swoole only support 8.1, so the PHP version is forced to 8.1.', $currentPhpVersion));
+            }
+        } else {
+            $bin = $path . '/php' . $currentPhpVersion;
+        }
+        return $bin . ' ' . $path . '/' . $this->proxyBin;
     }
 }

src/app/Command/BuildCommand.php

@@ -32,6 +32,11 @@ public function configure()
 
     public function handle()
     {
+        $kernel = strtolower($this->config->getConfig('kernel', 'swow'));
+        if ($kernel === 'swoole') {
+            $this->logger->error('The build command is not supported in Swoole kernel.');
+            return;
+        }
         $path = $this->input->getArgument('path');
         $binName = $this->input->getOption('name');
         $outputPath = $this->input->getOption('output');

src/app/Command/GetCommand.php

@@ -61,7 +61,11 @@ public function handle()
         }
         if ($versions) {
             $versions = $this->downloadManager->versions($pkg, $options);
-            $this->output->writeln($versions);
+            if (empty($versions)) {
+                $this->output->writeln('No versions found.');
+            } else {
+                $this->output->writeln($versions);
+            }
         } else {
             $this->downloadManager->get($pkg, $version, $options);
         }

src/app/Command/HyperfCommand.php

@@ -38,9 +38,18 @@ public function configure()
     public function handle()
     {
         $path = $this->config->getConfig('path.runtime', getenv('HOME') . '/.box');
+        $kernel = strtolower($this->config->getConfig('kernel', 'swow'));
         $currentPhpVersion = $this->config->getConfig('versions.php', '8.1');
         $hyperfBin = $this->config->getConfig('hyperf.bin', './bin/hyperf.php');
-        $bin = $path . '/php' . $currentPhpVersion . ' ' . $hyperfBin;
+        if ($kernel === 'swoole') {
+            $closeShortname = "-d swoole.use_shortname='Off'";
+            $bin = $path . '/swoole-cli ' . $closeShortname . ' ' . $hyperfBin;
+            if ($currentPhpVersion < '8.1') {
+                $this->logger->warning(sprintf('Current setting PHP version is %s, but the kernel is Swoole and Swoole only support 8.1, so the PHP version is forced to 8.1.', $currentPhpVersion));
+            }
+        } else {
+            $bin = $path . '/php' . $currentPhpVersion . ' ' . $hyperfBin;
+        }
         $command = Str::replaceFirst('hyperf ', '', (string) $this->input);
         $fullCommand = sprintf('%s %s', $bin, $command);
         $this->liveCommand($fullCommand);

src/app/Command/PhpCommand.php

@@ -34,8 +34,16 @@ public function configure()
     public function handle()
     {
         $path = $this->config->getConfig('path.runtime', getenv('HOME') . '/.box');
+        $kernel = strtolower($this->config->getConfig('kernel', 'swow'));
         $currentPhpVersion = $this->config->getConfig('versions.php', '8.1');
-        $bin = $path . '/php' . $currentPhpVersion;
+        if ($kernel === 'swoole') {
+            $bin = $path . '/swoole-cli';
+            if ($currentPhpVersion < '8.1') {
+                $this->logger->warning(sprintf('Current setting PHP version is %s, but the kernel is Swoole and Swoole only support 8.1, so the PHP version is forced to 8.1.', $currentPhpVersion));
+            }
+        } else {
+            $bin = $path . '/php' . $currentPhpVersion;
+        }
         $command = Str::replaceFirst('php ', '', (string) $this->input);
         $fullCommand = sprintf('%s %s', $bin, $command);
         $this->liveCommand($fullCommand);

src/app/Command/SwooleCliCommand.php

@@ -12,22 +12,19 @@
 
 namespace App\DownloadHandler;
 
-use App\Box;
 use App\Config;
 use App\Exception\BoxException;
 use App\Exception\NotSupportVersionsException;
 use App\GithubClient;
 use App\PkgDefinition\Definition;
 use App\PkgDefinitionManager;
 use GuzzleHttp\Client;
-use GuzzleHttp\TransferStats;
 use Hyperf\Context\Context;
 use Hyperf\Contract\StdoutLoggerInterface;
 use Hyperf\Di\Annotation\Inject;
 use Hyperf\Engine\Channel;
 use Hyperf\Engine\Coroutine;
 use Hyperf\Utils\Str;
-use Psr\Http\Message\ResponseInterface;
 use SplFileInfo;
 use Symfony\Component\Console\Helper\ProgressBar;
 use Symfony\Component\Console\Output\OutputInterface;