Rename await to awaitOutput

Author: rculbertson

modal-js/src/function.ts

@@ -69,7 +69,7 @@ export class Function_ {
     let retryCount = 0;
     while (true) {
       try {
-        return await invocation.await();
+        return await invocation.awaitOutput();
       } catch (err) {
         if (err instanceof InternalFailure && retryCount <= maxSystemRetries) {
           await invocation.retry(retryCount);

modal-js/src/function_call.ts

@@ -37,7 +37,7 @@ export class FunctionCall {
     const invocation = ControlPlaneInvocation.fromFunctionCallId(
       this.functionCallId,
     );
-    return invocation.await(timeout);
+    return invocation.awaitOutput(timeout);
   }
 
   /** Cancel a running function call. */

modal-js/src/invocation.ts

@@ -4,7 +4,6 @@ import {
   FunctionCallType,
   FunctionGetOutputsResponse,
   FunctionInput,
-  FunctionMapResponse,
   FunctionRetryInputsItem,
   GeneratorDone,
   GenericResult,
@@ -24,12 +23,7 @@ const outputsTimeout = 55 * 1000;
  * For now, we support just the control plane, and will add support for the input plane soon.
  */
 export interface Invocation {
-  /**
-   * Spawns the function call asynchronously.
-   * @returns A promise that resolves to the function call ID.
-   */
-  await(): Promise<any>;
-
+  awaitOutput(timeout?: number): Promise<any>;
   retry(retryCount: number): Promise<void>;
 }
 
@@ -59,11 +53,18 @@ export class ControlPlaneInvocation implements Invocation {
     input: FunctionInput,
     invocationType: FunctionCallInvocationType,
   ) {
-    const functionMapResponse = await ControlPlaneInvocation.execFunctionCall(
-      functionId,
-      input,
-      invocationType,
-    );
+    const functionPutInputsItem = {
+      idx: 0,
+      input: input,
+    };
+
+    const functionMapResponse = await client.functionMap({
+      functionId: functionId,
+      functionCallType: FunctionCallType.FUNCTION_CALL_TYPE_UNARY,
+      functionCallInvocationType: invocationType,
+      pipelinedInputs: [functionPutInputsItem],
+    });
+
     return new ControlPlaneInvocation(
       functionMapResponse.functionCallId,
       input,
@@ -76,7 +77,7 @@ export class ControlPlaneInvocation implements Invocation {
     return new ControlPlaneInvocation(functionCallId);
   }
 
-  async await(timeout?: number): Promise<any> {
+  async awaitOutput(timeout?: number): Promise<any> {
     return await pollControlPlaneForOutput(this.functionCallId, timeout);
   }
 
@@ -98,24 +99,6 @@ export class ControlPlaneInvocation implements Invocation {
     });
     this.inputJwt = functionRetryResponse.inputJwts[0];
   }
-
-  private static async execFunctionCall(
-    functionId: string,
-    input: FunctionInput,
-    invocationType: FunctionCallInvocationType,
-  ): Promise<FunctionMapResponse> {
-    const functionPutInputsItem = {
-      idx: 0,
-      input: input,
-    };
-    // Single input sync invocation
-    return await client.functionMap({
-      functionId: functionId,
-      functionCallType: FunctionCallType.FUNCTION_CALL_TYPE_UNARY,
-      functionCallInvocationType: invocationType,
-      pipelinedInputs: [functionPutInputsItem],
-    });
-  }
 }
 
 function timeNowSeconds() {