优化文件输出

Author: yunwuxin

README.md

@@ -120,3 +120,20 @@ class Controller {
     }
 }
 ```
+
+### 流式输出
+
+```php
+
+class Controller {
+
+    public function action(){
+        return \think\swoole\helper\iterator(value(function(){
+            foreach(range(1,10) as $i)
+                yield $i;
+                sleep(1);//模拟等待
+            }
+        }));
+    }
+}
+```

composer.json

@@ -11,7 +11,7 @@
     "require": {
         "php": "^8.0",
         "ext-json": "*",
-        "ext-swoole": "^4.0|^5.0",
+        "ext-swoole": "^4.0|^5.0|^6.0",
         "topthink/framework": "^6.0|^8.0",
         "nette/php-generator": "^4.0",
         "open-smf/connection-pool": ">=1.0",

src/concerns/InteractsWithHttp.php

@@ -263,11 +263,13 @@ protected function sendIterator(Response $res, IteratorResponse $response)
 
     protected function sendFile(Response $res, \think\Request $request, FileResponse $response)
     {
-        $ifNoneMatch = $request->header('If-None-Match');
-        $ifRange     = $request->header('If-Range');
 
-        $code         = $response->getCode();
-        $file         = $response->getFile();
+        $header = $response->getHeader();
+        $code   = $response->getCode();
+        $file   = $response->getFile();
+
+        $ifNoneMatch            = $request->header('If-None-Match');
+        $ifRange                = $request->header('If-Range');
         $eTag         = $response->getHeader('ETag');
         $lastModified = $response->getHeader('Last-Modified');
 
@@ -277,6 +279,7 @@ protected function sendFile(Response $res, \think\Request $request, FileResponse
 
         if ($ifNoneMatch == $eTag) {
             $code = 304;
+            unset($header['Content-Length']);
         } elseif (!$ifRange || $ifRange === $eTag || $ifRange === $lastModified) {
             $range = $request->header('Range', '');
             if (Str::startsWith($range, 'bytes=')) {
@@ -294,15 +297,15 @@ protected function sendFile(Response $res, \think\Request $request, FileResponse
                 if ($start <= $end) {
                     $end = min($end, $fileSize - 1);
                     if ($start < 0 || $start > $end) {
-                        $code = 416;
-                        $response->header([
+                        $code   = 416;
+                        $header = array_merge($header, [
                             'Content-Range' => sprintf('bytes */%s', $fileSize),
                         ]);
                     } elseif ($end - $start < $fileSize - 1) {
                         $length = $end < $fileSize ? $end - $start + 1 : -1;
                         $offset = $start;
                         $code   = 206;
-                        $response->header([
+                        $header = array_merge($header, [
                             'Content-Range'  => sprintf('bytes %s-%s/%s', $start, $end, $fileSize),
                             'Content-Length' => $end - $start + 1,
                         ]);
@@ -312,7 +315,7 @@ protected function sendFile(Response $res, \think\Request $request, FileResponse
         }
 
         $this->setStatus($res, $code);
-        $this->setHeader($res, $response->getHeader());
+        $this->setHeader($res, $header);
 
         if ($code >= 200 && $code < 300 && $length !== 0) {
             $res->sendfile($file->getPathname(), $offset, $length);