thesis-php · kafkiansky · Mar 3, 2026 · Mar 3, 2026
diff --git a/README.md b/README.md
@@ -557,7 +557,7 @@ service CounterService {
 }
 ```
 
-The server implementation now iterates up to the requested count, streaming each word back to the client before closing the stream:
+The server implementation now iterates up to the requested count, streaming each word back to the client:
 
 ```php
 use Amp\Cancellation;
@@ -572,13 +572,11 @@ use Thesis\Grpc\Server;
 final readonly class CounterServer implements CounterServiceServer
 {
     #[\Override]
-    public function count(Info $request, Server\ServerStreamChannel $stream, Metadata $md, Cancellation $cancellation): void
+    public function count(Info $request, Metadata $md, Cancellation $cancellation): iterable
     {
         for ($i = 0; $i < $request->count; ++$i) {
-            $stream->send(new Word(random_bytes(10)));
+            yield new Word(random_bytes(10));
         }
-
-        $stream->close();
     }
 }
 ```

diff --git a/src/Server/ServerStreamHandler.php b/src/Server/ServerStreamHandler.php
@@ -17,7 +17,7 @@
 final readonly class ServerStreamHandler implements Handler
 {
     /**
-     * @param \Closure(TRequest, ServerStreamChannel<TRequest, TResponse>, Metadata, Cancellation): void $handler
+     * @param \Closure(TRequest, Metadata, Cancellation): iterable<array-key, TResponse> $handler
      */
     public function __construct(
         private \Closure $handler,
@@ -27,6 +27,12 @@ public function __construct(
     public function handle(ServerStream $stream, Metadata $md, Cancellation $cancellation): void
     {
         $request = $stream->receive();
-        ($this->handler)($request, new ServerStreamChannel($stream), $md, $cancellation);
+        $messages = ($this->handler)($request, $md, $cancellation);
+
+        foreach ($messages as $message) {
+            $stream->send($message);
+        }
+
+        $stream->close();
     }
 }
diff --git a/tests/ServerStreamTest.php b/tests/ServerStreamTest.php
@@ -86,10 +86,9 @@ public function testServerStream(): void
     #[\Override]
     public function subscribe(
         SubscribeRequest $request,
-        Server\ServerStreamChannel $stream,
         Metadata $md,
         Cancellation $cancellation,
-    ): void {
+    ): iterable {
         $events = [
             'payments' => [
                 new Event('payment_finished', '{"id": 1}', new Timestamp(new Number(1_771_782_096))),
@@ -100,10 +99,6 @@ public function subscribe(
             ],
         ];
 
-        foreach ($events[$request->topic] ?? throw new InvokeError(Code::FAILED_PRECONDITION, 'Unknown topic "' . $request->topic . '"') as $it) {
-            $stream->send($it);
-        }
-
-        $stream->close();
+        yield from $events[$request->topic] ?? throw new InvokeError(Code::FAILED_PRECONDITION, 'Unknown topic "' . $request->topic . '"');
     }
 }
diff --git a/tests/genproto/Chat/Api/V1/Message.php b/tests/genproto/Chat/Api/V1/Message.php
@@ -3,7 +3,7 @@
 /**
  * Code generated by thesis/protoc-plugin. DO NOT EDIT.
  * Versions:
- *   thesis/protoc-plugin — v0.1.10
+ *   thesis/protoc-plugin — v0.1.11
  *   protoc               — v6.33.5
  * Source: tests/protos/chat_v1.proto
  */

diff --git a/tests/genproto/Chat/Api/V1/MessengerServiceClient.php b/tests/genproto/Chat/Api/V1/MessengerServiceClient.php
@@ -3,7 +3,7 @@
 /**
  * Code generated by thesis/protoc-plugin. DO NOT EDIT.
  * Versions:
- *   thesis/protoc-plugin — v0.1.10
+ *   thesis/protoc-plugin — v0.1.11
  *   protoc               — v6.33.5
  * Source: tests/protos/chat_v1.proto
  */

diff --git a/tests/genproto/Chat/Api/V1/MessengerServiceServer.php b/tests/genproto/Chat/Api/V1/MessengerServiceServer.php
@@ -3,7 +3,7 @@
 /**
  * Code generated by thesis/protoc-plugin. DO NOT EDIT.
  * Versions:
- *   thesis/protoc-plugin — v0.1.10
+ *   thesis/protoc-plugin — v0.1.11
  *   protoc               — v6.33.5
  * Source: tests/protos/chat_v1.proto
  */

diff --git a/tests/genproto/Chat/Api/V1/MessengerServiceServerRegistry.php b/tests/genproto/Chat/Api/V1/MessengerServiceServerRegistry.php
@@ -3,7 +3,7 @@
 /**
  * Code generated by thesis/protoc-plugin. DO NOT EDIT.
  * Versions:
- *   thesis/protoc-plugin — v0.1.10
+ *   thesis/protoc-plugin — v0.1.11
  *   protoc               — v6.33.5
  * Source: tests/protos/chat_v1.proto
  */

diff --git a/tests/genproto/Chat/Api/V1/TestsProtosChatV1DescriptorRegistry.php b/tests/genproto/Chat/Api/V1/TestsProtosChatV1DescriptorRegistry.php
@@ -3,7 +3,7 @@
 /**
  * Code generated by thesis/protoc-plugin. DO NOT EDIT.
  * Versions:
- *   thesis/protoc-plugin — v0.1.10
+ *   thesis/protoc-plugin — v0.1.11
  *   protoc               — v6.33.5
  * Source: tests/protos/chat_v1.proto
  */

diff --git a/tests/genproto/Chat/Api/V1/autoload.metadata.php b/tests/genproto/Chat/Api/V1/autoload.metadata.php
@@ -3,7 +3,7 @@
 /**
  * Code generated by thesis/protoc-plugin. DO NOT EDIT.
  * Versions:
- *   thesis/protoc-plugin — v0.1.10
+ *   thesis/protoc-plugin — v0.1.11
  *   protoc               — v6.33.5
  */
 

diff --git a/tests/genproto/Echos/Api/V1/EchoRequest.php b/tests/genproto/Echos/Api/V1/EchoRequest.php
@@ -3,7 +3,7 @@
 /**
  * Code generated by thesis/protoc-plugin. DO NOT EDIT.
  * Versions:
- *   thesis/protoc-plugin — v0.1.10
+ *   thesis/protoc-plugin — v0.1.11
  *   protoc               — v6.33.5
  * Source: tests/protos/echo_v1.proto
  */

diff --git a/tests/genproto/Echos/Api/V1/EchoResponse.php b/tests/genproto/Echos/Api/V1/EchoResponse.php
@@ -3,7 +3,7 @@
 /**
  * Code generated by thesis/protoc-plugin. DO NOT EDIT.
  * Versions:
- *   thesis/protoc-plugin — v0.1.10
+ *   thesis/protoc-plugin — v0.1.11
  *   protoc               — v6.33.5
  * Source: tests/protos/echo_v1.proto
  */

diff --git a/tests/genproto/Echos/Api/V1/EchoServiceClient.php b/tests/genproto/Echos/Api/V1/EchoServiceClient.php
@@ -3,7 +3,7 @@
 /**
  * Code generated by thesis/protoc-plugin. DO NOT EDIT.
  * Versions:
- *   thesis/protoc-plugin — v0.1.10
+ *   thesis/protoc-plugin — v0.1.11
  *   protoc               — v6.33.5
  * Source: tests/protos/echo_v1.proto
  */

diff --git a/tests/genproto/Echos/Api/V1/EchoServiceServer.php b/tests/genproto/Echos/Api/V1/EchoServiceServer.php
@@ -3,7 +3,7 @@
 /**
  * Code generated by thesis/protoc-plugin. DO NOT EDIT.
  * Versions:
- *   thesis/protoc-plugin — v0.1.10
+ *   thesis/protoc-plugin — v0.1.11
  *   protoc               — v6.33.5
  * Source: tests/protos/echo_v1.proto
  */

diff --git a/tests/genproto/Echos/Api/V1/EchoServiceServerRegistry.php b/tests/genproto/Echos/Api/V1/EchoServiceServerRegistry.php
@@ -3,7 +3,7 @@
 /**
  * Code generated by thesis/protoc-plugin. DO NOT EDIT.
  * Versions:
- *   thesis/protoc-plugin — v0.1.10
+ *   thesis/protoc-plugin — v0.1.11
  *   protoc               — v6.33.5
  * Source: tests/protos/echo_v1.proto
  */

diff --git a/tests/genproto/Echos/Api/V1/TestsProtosEchoV1DescriptorRegistry.php b/tests/genproto/Echos/Api/V1/TestsProtosEchoV1DescriptorRegistry.php
@@ -3,7 +3,7 @@
 /**
  * Code generated by thesis/protoc-plugin. DO NOT EDIT.
  * Versions:
- *   thesis/protoc-plugin — v0.1.10
+ *   thesis/protoc-plugin — v0.1.11
  *   protoc               — v6.33.5
  * Source: tests/protos/echo_v1.proto
  */

diff --git a/tests/genproto/Echos/Api/V1/autoload.metadata.php b/tests/genproto/Echos/Api/V1/autoload.metadata.php
@@ -3,7 +3,7 @@
 /**
  * Code generated by thesis/protoc-plugin. DO NOT EDIT.
  * Versions:
- *   thesis/protoc-plugin — v0.1.10
+ *   thesis/protoc-plugin — v0.1.11
  *   protoc               — v6.33.5
  */
 

diff --git a/tests/genproto/File/Api/V1/Chunk.php b/tests/genproto/File/Api/V1/Chunk.php
@@ -3,7 +3,7 @@
 /**
  * Code generated by thesis/protoc-plugin. DO NOT EDIT.
  * Versions:
- *   thesis/protoc-plugin — v0.1.10
+ *   thesis/protoc-plugin — v0.1.11
  *   protoc               — v6.33.5
  * Source: tests/protos/file_v1.proto
  */

diff --git a/tests/genproto/File/Api/V1/FileInfo.php b/tests/genproto/File/Api/V1/FileInfo.php
@@ -3,7 +3,7 @@
 /**
  * Code generated by thesis/protoc-plugin. DO NOT EDIT.
  * Versions:
- *   thesis/protoc-plugin — v0.1.10
+ *   thesis/protoc-plugin — v0.1.11
  *   protoc               — v6.33.5
  * Source: tests/protos/file_v1.proto
  */

diff --git a/tests/genproto/File/Api/V1/FileServiceClient.php b/tests/genproto/File/Api/V1/FileServiceClient.php
@@ -3,7 +3,7 @@
 /**
  * Code generated by thesis/protoc-plugin. DO NOT EDIT.
  * Versions:
- *   thesis/protoc-plugin — v0.1.10
+ *   thesis/protoc-plugin — v0.1.11
  *   protoc               — v6.33.5
  * Source: tests/protos/file_v1.proto
  */

diff --git a/tests/genproto/File/Api/V1/FileServiceServer.php b/tests/genproto/File/Api/V1/FileServiceServer.php
@@ -3,7 +3,7 @@
 /**
  * Code generated by thesis/protoc-plugin. DO NOT EDIT.
  * Versions:
- *   thesis/protoc-plugin — v0.1.10
+ *   thesis/protoc-plugin — v0.1.11
  *   protoc               — v6.33.5
  * Source: tests/protos/file_v1.proto
  */

diff --git a/tests/genproto/File/Api/V1/FileServiceServerRegistry.php b/tests/genproto/File/Api/V1/FileServiceServerRegistry.php
@@ -3,7 +3,7 @@
 /**
  * Code generated by thesis/protoc-plugin. DO NOT EDIT.
  * Versions:
- *   thesis/protoc-plugin — v0.1.10
+ *   thesis/protoc-plugin — v0.1.11
  *   protoc               — v6.33.5
  * Source: tests/protos/file_v1.proto
  */

diff --git a/tests/genproto/File/Api/V1/TestsProtosFileV1DescriptorRegistry.php b/tests/genproto/File/Api/V1/TestsProtosFileV1DescriptorRegistry.php
@@ -3,7 +3,7 @@
 /**
  * Code generated by thesis/protoc-plugin. DO NOT EDIT.
  * Versions:
- *   thesis/protoc-plugin — v0.1.10
+ *   thesis/protoc-plugin — v0.1.11
  *   protoc               — v6.33.5
  * Source: tests/protos/file_v1.proto
  */

diff --git a/tests/genproto/File/Api/V1/autoload.metadata.php b/tests/genproto/File/Api/V1/autoload.metadata.php
@@ -3,7 +3,7 @@
 /**
  * Code generated by thesis/protoc-plugin. DO NOT EDIT.
  * Versions:
- *   thesis/protoc-plugin — v0.1.10
+ *   thesis/protoc-plugin — v0.1.11
  *   protoc               — v6.33.5
  */
 

diff --git a/tests/genproto/Topic/Api/V1/Event.php b/tests/genproto/Topic/Api/V1/Event.php
@@ -3,7 +3,7 @@
 /**
  * Code generated by thesis/protoc-plugin. DO NOT EDIT.
  * Versions:
- *   thesis/protoc-plugin — v0.1.10
+ *   thesis/protoc-plugin — v0.1.11
  *   protoc               — v6.33.5
  * Source: tests/protos/topic_v1.proto
  */

diff --git a/tests/genproto/Topic/Api/V1/SubscribeRequest.php b/tests/genproto/Topic/Api/V1/SubscribeRequest.php
@@ -3,7 +3,7 @@
 /**
  * Code generated by thesis/protoc-plugin. DO NOT EDIT.
  * Versions:
- *   thesis/protoc-plugin — v0.1.10
+ *   thesis/protoc-plugin — v0.1.11
  *   protoc               — v6.33.5
  * Source: tests/protos/topic_v1.proto
  */

diff --git a/tests/genproto/Topic/Api/V1/TestsProtosTopicV1DescriptorRegistry.php b/tests/genproto/Topic/Api/V1/TestsProtosTopicV1DescriptorRegistry.php
@@ -3,7 +3,7 @@
 /**
  * Code generated by thesis/protoc-plugin. DO NOT EDIT.
  * Versions:
- *   thesis/protoc-plugin — v0.1.10
+ *   thesis/protoc-plugin — v0.1.11
  *   protoc               — v6.33.5
  * Source: tests/protos/topic_v1.proto
  */

diff --git a/tests/genproto/Topic/Api/V1/TopicServiceClient.php b/tests/genproto/Topic/Api/V1/TopicServiceClient.php
@@ -3,7 +3,7 @@
 /**
  * Code generated by thesis/protoc-plugin. DO NOT EDIT.
  * Versions:
- *   thesis/protoc-plugin — v0.1.10
+ *   thesis/protoc-plugin — v0.1.11
  *   protoc               — v6.33.5
  * Source: tests/protos/topic_v1.proto
  */

diff --git a/tests/genproto/Topic/Api/V1/TopicServiceServer.php b/tests/genproto/Topic/Api/V1/TopicServiceServer.php
@@ -3,7 +3,7 @@
 /**
  * Code generated by thesis/protoc-plugin. DO NOT EDIT.
  * Versions:
- *   thesis/protoc-plugin — v0.1.10
+ *   thesis/protoc-plugin — v0.1.11
  *   protoc               — v6.33.5
  * Source: tests/protos/topic_v1.proto
  */
@@ -14,20 +14,18 @@
 
 use Amp\Cancellation;
 use Thesis\Grpc\Metadata;
-use Thesis\Grpc\Server;
 
 /**
  * @api
  */
 interface TopicServiceServer
 {
     /**
-     * @param Server\ServerStreamChannel<\Topic\Api\V1\SubscribeRequest, \Topic\Api\V1\Event> $stream
+     * @return iterable<array-key, \Topic\Api\V1\Event>
      */
     public function subscribe(
         \Topic\Api\V1\SubscribeRequest $request,
-        Server\ServerStreamChannel $stream,
         Metadata $md,
         Cancellation $cancellation,
-    ): void;
+    ): iterable;
 }
diff --git a/tests/genproto/Topic/Api/V1/TopicServiceServerRegistry.php b/tests/genproto/Topic/Api/V1/TopicServiceServerRegistry.php
@@ -3,7 +3,7 @@
 /**
  * Code generated by thesis/protoc-plugin. DO NOT EDIT.
  * Versions:
- *   thesis/protoc-plugin — v0.1.10
+ *   thesis/protoc-plugin — v0.1.11
  *   protoc               — v6.33.5
  * Source: tests/protos/topic_v1.proto
  */

diff --git a/tests/genproto/Topic/Api/V1/autoload.metadata.php b/tests/genproto/Topic/Api/V1/autoload.metadata.php
@@ -3,7 +3,7 @@
 /**
  * Code generated by thesis/protoc-plugin. DO NOT EDIT.
  * Versions:
- *   thesis/protoc-plugin — v0.1.10
+ *   thesis/protoc-plugin — v0.1.11
  *   protoc               — v6.33.5
  */