feat: converting generators to async iterables

Related #500 Related #501 [ci skip]
MatrixAI · Feb 10, 2023 · 1b33d12 · 1b33d12
1 parent ff8e311
commit 1b33d12
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/src/RPC/RPCClient.ts b/src/RPC/RPCClient.ts
@@ -166,7 +166,7 @@ class RPCClient<M extends ClientManifest> {
   public async serverStreamCaller<I extends JSONValue, O extends JSONValue>(
     method: string,
     parameters: I,
-  ): Promise<AsyncGenerator<O>> {
+  ): Promise<AsyncIterable<O>> {
     const callerInterface = await this.rawDuplexStreamCaller<I, O>(method);
     const writer = callerInterface.writable.getWriter();
     await writer.write(parameters);
@@ -183,7 +183,7 @@ class RPCClient<M extends ClientManifest> {
   @ready(new rpcErrors.ErrorRpcDestroyed())
   public async clientStreamCaller<I extends JSONValue, O extends JSONValue>(
     method: string,
-    f: (output: Promise<O>) => AsyncGenerator<I | undefined>,
+    f: (output: Promise<O>) => AsyncIterable<I | undefined>,
   ): Promise<void> {
     const callerInterface = await this.rawClientStreamCaller<I, O>(method);
     const writer = callerInterface.writable.getWriter();
@@ -203,7 +203,7 @@ class RPCClient<M extends ClientManifest> {
   @ready(new rpcErrors.ErrorRpcDestroyed())
   public async duplexStreamCaller<I extends JSONValue, O extends JSONValue>(
     method: string,
-    f: (output: AsyncGenerator<O>) => AsyncGenerator<I>,
+    f: (output: AsyncIterable<O>) => AsyncIterable<I>,
   ): Promise<void> {
     const callerInterface = await this.rawDuplexStreamCaller<I, O>(method);
     const outputGenerator = async function* () {

diff --git a/src/RPC/RPCServer.ts b/src/RPC/RPCServer.ts
@@ -154,7 +154,7 @@ class RPCServer {
       const events = this.events;
       const outputGen = async function* (): AsyncGenerator<JsonRpcResponse> {
         if (ctx.signal.aborted) throw ctx.signal.reason;
-        const dataGen = async function* () {
+        const dataGen = async function* (): AsyncIterable<I> {
           for await (const data of forwardStream) {
             yield data.params as I;
           }

diff --git a/src/RPC/types.ts b/src/RPC/types.ts
@@ -121,15 +121,15 @@ type RawHandlerImplementation = HandlerImplementation<
 type DuplexHandlerImplementation<
   I extends JSONValue = JSONValue,
   O extends JSONValue = JSONValue,
-> = HandlerImplementation<AsyncGenerator<I>, AsyncGenerator<O>>;
+> = HandlerImplementation<AsyncIterable<I>, AsyncIterable<O>>;
 type ServerHandlerImplementation<
   I extends JSONValue = JSONValue,
   O extends JSONValue = JSONValue,
-> = HandlerImplementation<I, AsyncGenerator<O>>;
+> = HandlerImplementation<I, AsyncIterable<O>>;
 type ClientHandlerImplementation<
   I extends JSONValue = JSONValue,
   O extends JSONValue = JSONValue,
-> = HandlerImplementation<AsyncGenerator<I>, Promise<O>>;
+> = HandlerImplementation<AsyncIterable<I>, Promise<O>>;
 type UnaryHandlerImplementation<
   I extends JSONValue = JSONValue,
   O extends JSONValue = JSONValue,
@@ -156,17 +156,17 @@ type UnaryCallerImplementation<
 type ServerCallerImplementation<
   I extends JSONValue = JSONValue,
   O extends JSONValue = JSONValue,
-> = (parameters: I) => Promise<AsyncGenerator<O>>;
+> = (parameters: I) => Promise<AsyncIterable<O>>;
 
 type ClientCallerImplementation<
   I extends JSONValue = JSONValue,
   O extends JSONValue = JSONValue,
-> = (f: (output: Promise<O>) => AsyncGenerator<I | undefined>) => Promise<void>;
+> = (f: (output: Promise<O>) => AsyncIterable<I | undefined>) => Promise<void>;
 
 type DuplexCallerImplementation<
   I extends JSONValue = JSONValue,
   O extends JSONValue = JSONValue,
-> = (f: (output: AsyncGenerator<O>) => AsyncGenerator<I>) => Promise<void>;
+> = (f: (output: AsyncIterable<O>) => AsyncIterable<I>) => Promise<void>;
 
 // Raw callers