feat:优化性能

Author: qbhy

.gitignore

@@ -4,5 +4,5 @@ composer.lock
 *.log
 /hooks
 .idea
-/runtime
+runtime
 config

composer.json

@@ -46,8 +46,10 @@
         "hyperf/session": "^2.0",
         "hyperf/testing": "^2.0",
         "hyperf/utils": "^2.2",
+        "itsgoingd/clockwork": "^5.0",
         "phpstan/phpstan": "^0.12",
-        "swoft/swoole-ide-helper": "dev-master"
+        "swoft/swoole-ide-helper": "dev-master",
+        "symfony/var-dumper": "^5.3"
     },
     "config": {
         "sort-packages": true

src/Guard/JwtGuard.php

@@ -66,7 +66,7 @@ public function parseToken()
 
     public function login(Authenticatable $user)
     {
-        $token = $this->jwtManager->make([
+        $token = $this->getJwtManager()->make([
             'uid' => $user->getId(),
             's' => str_random(),
         ])->token();
@@ -100,7 +100,7 @@ public function user(?string $token = null): ?Authenticatable
 
         try {
             if ($token) {
-                $jwt = $this->jwtManager->parse($token);
+                $jwt = $this->getJwtManager()->parse($token);
                 $uid = $jwt->getPayload()['uid'] ?? null;
                 $user = $uid ? $this->userProvider->retrieveByCredentials($uid) : null;
                 Context::set($key, $user ?: 0);
@@ -150,14 +150,14 @@ public function refresh(?string $token = null): ?string
             Context::set($this->resultKey($token), null);
 
             try {
-                $jwt = $this->jwtManager->parse($token);
+                $jwt = $this->getJwtManager()->parse($token);
             } catch (TokenExpiredException $exception) {
                 $jwt = $exception->getJwt();
             }
 
-            $this->jwtManager->addBlacklist($jwt);
+            $this->getJwtManager()->addBlacklist($jwt);
 
-            return $this->jwtManager->refresh($jwt)->token();
+            return $this->getJwtManager()->refresh($jwt)->token();
         }
 
         return null;
@@ -167,8 +167,8 @@ public function logout($token = null)
     {
         if ($token = $token ?? $this->parseToken()) {
             Context::set($this->resultKey($token), null);
-            $this->jwtManager->addBlacklist(
-                $this->jwtManager->parse($token)
+            $this->getJwtManager()->addBlacklist(
+                $this->getJwtManager()->parse($token)
             );
             return true;
         }
@@ -182,14 +182,15 @@ public function getJwtManager(): JWTManager
 
     /**
      * 获取 token 标识.
+     * 为了性能，直接 md5.
      *
+     * @throws \Qbhy\SimpleJwt\Exceptions\TokenExpiredException
      * @throws \Qbhy\SimpleJwt\Exceptions\InvalidTokenException
      * @throws \Qbhy\SimpleJwt\Exceptions\SignatureException
-     * @throws \Qbhy\SimpleJwt\Exceptions\TokenExpiredException
      * @return mixed|string
      */
     protected function getJti(string $token): string
     {
-        return $this->getJwtManager()->justParse($token)->getPayload()['jti'] ?? md5($token);
+        return md5($token);
     }
 }

src/helper.php

@@ -15,8 +15,8 @@
 if (! function_exists('auth')) {
     /**
      * 建议视图中使用该函数，其他地方请使用注入.
-     * @throws \Qbhy\HyperfAuth\Exception\GuardException
      * @throws \Qbhy\HyperfAuth\Exception\UserProviderException
+     * @throws \Qbhy\HyperfAuth\Exception\GuardException
      * @return AuthManager|mixed|\Qbhy\HyperfAuth\AuthGuard
      */
     function auth(?string $guard = null)
@@ -37,9 +37,20 @@ function str_random($num = 6): string
         $characters = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
         $randomString = '';
         for ($i = 0; $i < $num; ++$i) {
-            $index = rand(0, strlen($characters) - 1);
+            $index = rand(0, 61);
             $randomString .= $characters[$index];
         }
         return $randomString;
     }
 }
+
+if (! function_exists('dev_clock')) {
+    function dev_clock(string $title, callable $handler)
+    {
+        $start = microtime(true);
+        $result = $handler();
+        $end = microtime(true);
+        dump($title . ' 用时：' . (($end - $start) * 1000) . 'ms');
+        return $result;
+    }
+}

tests/Cases/ExampleTest.php

@@ -41,15 +41,36 @@ public function testAuthFunc()
         $this->assertTrue(auth() instanceof AuthManager);
     }
 
+    /**
+     * 大概用时：0.028848648071289 ms.
+     */
+    public function testRandomStr()
+    {
+        dev_clock('随机字符串', function () {
+            str_random();
+        });
+        $this->assertTrue(true);
+    }
+
     public function testJwtGuard()
     {
         /** @var AuthManager|JwtGuard $auth */
         $auth = $this->auth();
         /** @var JwtGuard $guard */
         $guard = $auth->guard();
-        $token = $auth->login($this->user());
-        $this->assertTrue($auth->check($token));
-        $this->assertTrue(! $auth->guest($token));
+        $user = $this->user();
+
+        $token = dev_clock('jwt login 方法', function () use ($auth, $user) {
+            return $auth->login($user);
+        });
+
+        $this->assertTrue(dev_clock('jwt check 方法', function () use ($auth, $token) {
+            return $auth->check($token);
+        }));
+
+        $this->assertTrue(dev_clock('jwt guest 方法', function () use ($auth, $token) {
+            return ! $auth->guest($token);
+        }));
 
         // 测试默认 guard
         $this->assertTrue($guard instanceof AuthGuard);
@@ -59,7 +80,9 @@ public function testJwtGuard()
         $jwtManager = $guard->getJwtManager();
         $token = $guard->login($this->user());
 
-        $this->assertTrue(is_string($newToken = $guard->refresh($token))); // 测试刷新 token
+        $this->assertTrue(is_string($newToken = dev_clock('jwt refresh 方法', function () use ($guard, $token) {
+            return $guard->refresh($token);
+        }))); // 测试刷新 token
 
         try {
             $this->assertTrue($guard->guest($token)); // 试试新 token 是否生效
@@ -96,6 +119,7 @@ public function testSsoGuard()
         $guard = $this->auth()->guard('sso');
         $this->assertTrue($guard instanceof SsoGuard);
         $this->assertTrue($guard->getProvider() instanceof EloquentProvider);
+
         $user = $this->user(10);
         $token = $guard->login($user, 'pc');
         $this->assertTrue(is_string($token));

tests/bootstrap.php

@@ -48,6 +48,11 @@
         'secret' => 'test.secret',
         'provider' => 'test-provider', // 不设置的话用上面的 default.provider 或者用 'default'
         'encoder' => null,
+        /*
+         * 可选配置
+         * 默认使用的加密类
+         */
+        'default' => \Qbhy\SimpleJwt\EncryptAdapters\SHA1Encrypter::class,
         'cache' => new FilesystemCache(sys_get_temp_dir()), // 如果需要分布式部署，请选择 redis 或者其他支持分布式的缓存驱动
     ];