修复切面中条件判断错误, 导致不能进入组件的bug

Author: wilbur-yu

src/Aspect/ResponseAspect.php

@@ -15,7 +15,6 @@
 
 namespace Wilbur\HyperfSoar\Aspect;
 
-use Hyperf\Config\Annotation\Value;
 use Hyperf\Contract\ConfigInterface;
 use Hyperf\Di\Annotation\Aspect;
 use Hyperf\Di\Annotation\Inject;
@@ -32,53 +31,42 @@
 use Psr\Container\ContainerInterface;
 
 use function array_merge;
-use function class_basename;
 use function co;
 use function explode;
 use function json_decode;
 use function json_encode;
 
 use const JSON_UNESCAPED_UNICODE;
 
-/**
- * @Aspect
- */
+#[Aspect]
 class ResponseAspect extends AbstractAspect
 {
-    /**
-     * @Value("soar.cut_classes")
-     * @var array
-     */
     public $classes = [
         'Hyperf\HttpServer\Response::json',
     ];
-    /**
-     * @Value("soar")
-     * @var array
-     */
-    protected $config;
-    /**
-     * @Inject()
-     * @var \Wilbur\HyperfSoar\SoarService
-     */
-    protected $service;
 
-    // public function __construct(ContainerInterface $container)
-    // {
-    //     $this->service = $container->get(SoarService::class);
-    //     $this->config = $container->get(ConfigInterface::class)->get('soar');
-    //     $this->classes = $this->config['cut_classes'] ?? ['Hyperf\HttpServer\Response::json',];
-    // }
+    protected array $config;
+
+    #[Inject]
+    protected SoarService $service;
+
+    public function __construct(ContainerInterface $container)
+    {
+        $this->service = $container->get(SoarService::class);
+        $this->config = $container->get(ConfigInterface::class)->get('soar');
+        if (isset($this->config['cut_classes']) && !empty($this->config['cut_classes'])) {
+            $this->classes = $this->config['cut_classes'];
+        }
+    }
 
     /**
      * @throws \Hyperf\Di\Exception\Exception
      * @throws \JsonException
      */
     public function process(ProceedingJoinPoint $proceedingJoinPoint)
     {
-        $sqlKey = class_basename(QueryExecListener::class);
-
-        if (!$this->config['enabled'] || !Context::has($sqlKey) || !is_file($this->config['-soar-path'])) {
+        $sqlKey = QueryExecListener::SQL_RECORD_KEY;
+        if (!$this->config['enabled']) {
             return $proceedingJoinPoint->process();
         }
 
@@ -97,10 +85,7 @@ public function process(ProceedingJoinPoint $proceedingJoinPoint)
             foreach ($eventSqlList as $sql) {
                 co(function () use ($sql, $channel) {
                     $soar = $this->service->score($sql);
-                    $explain = [
-                        'query' => $sql,
-                        'explain' => $this->formatting($soar),
-                    ];
+                    $explain = $this->formatting($soar);
                     $channel->push($explain);
                 });
                 $explains[] = $channel->pop();
@@ -145,6 +130,7 @@ protected function getScore(?string $severity = null): ?int
     protected function formatting(string $json): array
     {
         $results = json_decode($json, true, 512, JSON_THROW_ON_ERROR);
+        return $results;
         $results = Arr::flatten($results, 1);
 
         $items = [];

src/Exec.php

@@ -17,28 +17,21 @@
 
 use Guanguans\SoarPHP\Exceptions\InvalidArgumentException;
 use Guanguans\SoarPHP\Exceptions\RuntimeException;
+use Guanguans\SoarPHP\Support\OsHelper;
 use Swoole\Coroutine\System;
 
 trait Exec
 {
     /**
      * @param  string  $command
      *
-     * @throws \Guanguans\SoarPHP\Exceptions\InvalidArgumentException
      * @throws \Guanguans\SoarPHP\Exceptions\RuntimeException
      *
      * @return mixed
      */
     public function exec(string $command): string
     {
-        if (!is_string($command)) {
-            throw new InvalidArgumentException('Command type must be a string');
-        }
-
-        if (stripos($command, 'soar') === false) {
-            throw new InvalidArgumentException(sprintf("Command error: '%s'", $command));
-        }
-
+        OsHelper::isWindows() && $command = 'powershell '.$command;
         $result = System::exec($command);
 
         if ($result['code'] !== 0) {

src/Listener/QueryExecListener.php

@@ -25,15 +25,11 @@
 
 use function class_basename;
 
-/**
- * @Listener
- */
+#[Listener]
 class QueryExecListener implements ListenerInterface
 {
-    /**
-     * @var bool
-     */
-    protected $soarIsEnabled;
+    protected bool $soarIsEnabled;
+    public const SQL_RECORD_KEY = 'wilbur-yu-hyperf-soar-sql-listener';
 
     public function __construct(ConfigInterface $config)
     {
@@ -56,9 +52,9 @@ public function process(object $event): void
                     $sql = Str::replaceFirst('?', "'{$value}'", $sql);
                 }
             }
-            $eventSqlList = (array)Context::get(class_basename(__CLASS__));
+            $eventSqlList = (array)Context::get(self::SQL_RECORD_KEY);
             $eventSqlList[] = $sql;
-            Context::set(class_basename(__CLASS__), $eventSqlList);
+            Context::set(self::SQL_RECORD_KEY, $eventSqlList);
         }
     }
 }

src/SoarService.php

@@ -17,6 +17,8 @@
 
 use Guanguans\SoarPHP\Soar;
 
+use Guanguans\SoarPHP\Support\OsHelper;
+
 use function config;
 
 class SoarService extends Soar
@@ -26,9 +28,21 @@ class SoarService extends Soar
     public function __construct(array $config = null)
     {
         $config = $config ?? config('soar');
-        unset($config['enabled'], $config['cut_classes']);
+        $soarPath = $config['-soar-path'];
         $config['-report-type'] = 'json';
+        unset($config['enabled'], $config['cut_classes'], $config['-soar-path']);
+        parent::__construct($config, $soarPath);
+    }
+
+    protected function getDefaultSoarPath(): string
+    {
+        if (OsHelper::isWindows()) {
+            return __DIR__.'/../vendor/guanguans/soar-php/bin/soar.windows-amd64';
+        }
+        if (OsHelper::isMacOS()) {
+            return __DIR__.'/../vendor/guanguans/soar-php/bin/soar.darwin-amd64';
+        }
 
-        parent::__construct($config);
+        return __DIR__.'/../vendor/guanguans/soar-php/bin/soar.linux-amd64';
     }
 }