优化：Cookie 管理器过期数据自动回收

Author: Yurunsoft

src/YurunHttp/Cookie/CookieManager.php

@@ -149,6 +149,7 @@ public function getRequestCookies($uri)
         $uriDomain = Uri::getDomain($uri);
         $uriPath = $uri->getPath();
         $cookieList = &$this->cookieList;
+        $time = time();
         foreach ($this->relationMap as $relationDomain => $list1)
         {
             if ('' === $relationDomain || $this->checkDomain($uriDomain, $relationDomain))
@@ -160,7 +161,7 @@ public function getRequestCookies($uri)
                         foreach ($idList as $id)
                         {
                             $cookieItem = $cookieList[$id];
-                            if ((0 === $cookieItem->expires || $cookieItem->expires > time()) && (!$cookieItem->secure || 'https' === $uri->getScheme() || 'wss' === $uri->getScheme()))
+                            if ((0 === $cookieItem->expires || $cookieItem->expires > $time) && (!$cookieItem->secure || 'https' === $uri->getScheme() || 'wss' === $uri->getScheme()))
                             {
                                 $result[$cookieItem->name] = $cookieItem->value;
                             }
@@ -212,6 +213,30 @@ public function getCookieItem($name, $domain = '', $path = '/')
         return null;
     }
 
+    /**
+     * 自动回收过期 Cookie 占用的空间.
+     *
+     * @return void
+     */
+    public function gc()
+    {
+        if ($this->cookieList)
+        {
+            $time = time();
+            foreach ($this->cookieList as $id => $item)
+            {
+                if ($item->expires > 0 && $time >= $item->expires)
+                {
+                    unset($this->cookieList[$id]);
+                    if (isset($this->relationMap[$item->domain][$item->path][$item->name]) && $id === $this->relationMap[$item->domain][$item->path][$item->name])
+                    {
+                        unset($this->relationMap[$item->domain][$item->path][$item->name]);
+                    }
+                }
+            }
+        }
+    }
+
     /**
      * 检查 uri 域名和 cookie 域名.
      *

src/YurunHttp/Handler/Curl.php

@@ -219,6 +219,7 @@ public function send(&$request)
                                         ->withError(sprintf('Maximum (%s) redirects followed', $maxRedirects));
                     }
                 }
+                $this->cookieManager->gc();
                 break;
             } while (true);
             // 关闭保存至文件的句柄
@@ -772,6 +773,7 @@ public function coBatch($requests, $timeout = null)
                 }
                 $result[$k] = $response;
             }
+            $this->cookieManager->gc();
         }
         finally
         {

src/YurunHttp/Handler/Swoole.php

@@ -433,6 +433,7 @@ public function recvDefer($request, $timeout = null)
         {
             $result = $result->withSavedFileName($savedFileName);
         }
+        $this->cookieManager->gc();
 
         return $result;
     }

tests/server/Http/server.php

@@ -46,12 +46,12 @@
                 'Yurun-Http'   => 'one suo',
             ]);
             $response->cookie('a', '1');
-            $response->cookie('b', '2', 1);
-            $response->cookie('c', '3', 0, '/');
-            $response->cookie('d', '4', 0, '/a');
-            $response->cookie('e', '5', 0, '/', 'localhost');
-            $response->cookie('f', '6', 0, '/', '', true);
-            $response->cookie('g', '7', 0, '/', '', true, true);
+            $response->cookie('b', '2', 0);
+            $response->cookie('c', '3', null, '/');
+            $response->cookie('d', '4', null, '/a');
+            $response->cookie('e', '5', null, '/', 'localhost');
+            $response->cookie('f', '6', null, '/', '', true);
+            $response->cookie('g', '7', null, '/', '', true, true);
             $connection->send($response);
             break;
         case 'redirect301':
@@ -84,6 +84,13 @@
                 'Location' => $request->get('url', '/'),
             ], 'test'));
             break;
+        case 'redirectCookie':
+            $response = new Response(301, [
+                'Location' => '/?a=info',
+            ]);
+            $response->cookie('redirectCookie', '1');
+            $connection->send($response);
+            break;
         case 'download1':
             if ('nb' === $request->post('yurunhttp') && 'POST' === $request->method())
             {

tests/unit/HttpRequestTest/HttpRequestTest.php

@@ -202,6 +202,7 @@ public function testCookieManager()
 
             static $compareCookie = [
                 'a' => '1',
+                'c' => '3',
             ];
 
             $data = null;
@@ -226,6 +227,8 @@ public function testCookieManager()
             $this->assertNotNull($cookieItem);
             $this->assertFalse($cookieItem->httpOnly);
 
+            $this->assertNull($cookieManager->getCookieItem('b'));
+
             $cookieItem = $cookieManager->getCookieItem('g');
             $this->assertNotNull($cookieItem);
             $this->assertTrue($cookieItem->httpOnly);
@@ -311,6 +314,23 @@ public function testRedirectOther()
         });
     }
 
+    /**
+     * @return void
+     */
+    public function testRedirectCookie()
+    {
+        $this->call(function () {
+            $http = new HttpRequest();
+
+            $response = $http->post($this->host . '?a=redirectCookie');
+            $data = $response->json(true);
+            $this->assertEquals('1', $data['cookie']['redirectCookie'] ?? null);
+            $cookieItem = $http->getHandler()->getCookieManager()->getCookieItem('redirectCookie');
+            $this->assertNotNull($cookieItem);
+            $this->assertEquals('1', $cookieItem->value);
+        });
+    }
+
     /**
      * Upload single file.
      *