Feat: workerman IteratorResponse.

cloudtay · Oct 10, 2024 · 8cf899a · 8cf899a
1 parent 894e957
commit 8cf899a
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 6 deletions.
diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
   "name": "cloudtay/p-ripple-drive",
-  "version": "v1.2.9",
+  "version": "v1.2.11",
   "license": "MIT",
   "autoload": {
     "psr-4": {

diff --git a/src/Workerman/Extensions/IteratorResponse.php b/src/Workerman/Extensions/IteratorResponse.php
@@ -54,17 +54,18 @@
 class IteratorResponse extends Response
 {
     /*** @var \Iterator|mixed */
-    private Iterator $iterator;
+    protected Iterator $iterator;
 
     /**
      * @param Iterator|Closure $iterator      迭代器
      * @param TcpConnection    $tcpConnection TCP连接
      * @param bool             $autopilot     自动驾驶
      */
-    protected function __construct(
+    public function __construct(
         Iterator|Closure                 $iterator,
         protected readonly TcpConnection $tcpConnection,
-        bool                             $autopilot = true,
+        protected readonly bool          $autopilot = true,
+        protected readonly bool          $closeWhenFinish = false,
     ) {
         if ($iterator instanceof Closure) {
             $iterator = $iterator();
@@ -107,19 +108,35 @@ public function processIterator(): static
             $this->tcpConnection->send($frame, true);
         }
 
+        if ($this->closeWhenFinish) {
+            $this->close();
+        }
+
         return $this;
     }
 
+    /**
+     * @return void
+     */
+    public function close(): void
+    {
+        $this->tcpConnection->close();
+    }
+
     /**
      * @param Iterator|Closure $iterator
      * @param TcpConnection    $tcpConnection
+     * @param bool             $closeWhenFinish
+     * @param bool             $autopilot
      *
      * @return IteratorResponse
      */
     public static function create(
         Iterator|Closure $iterator,
         TcpConnection    $tcpConnection,
+        bool             $closeWhenFinish = false,
+        bool             $autopilot = true,
     ): IteratorResponse {
-        return new self($iterator, $tcpConnection);
+        return new static($iterator, $tcpConnection, $closeWhenFinish, $autopilot);
     }
 }
diff --git a/src/Workerman/RPL.php b/src/Workerman/RPL.php
@@ -44,13 +44,17 @@ class RPL
     /**
      * @param Iterator|Closure $iterator
      * @param TcpConnection    $tcpConnection
+     * @param bool             $closeWhenFinish
+     * @param bool             $autopilot
      *
      * @return IteratorResponse
      */
     public static function iteratorResponse(
         Iterator|Closure $iterator,
         TcpConnection    $tcpConnection,
+        bool             $closeWhenFinish = false,
+        bool             $autopilot = true,
     ): IteratorResponse {
-        return IteratorResponse::create($iterator, $tcpConnection);
+        return IteratorResponse::create($iterator, $tcpConnection, $closeWhenFinish, $autopilot);
     }
 }