@valon-technologies/gestalt 0.0.1-alpha.37 → 0.0.1-alpha.38

package/src/runtime.ts

@@ -594,13 +594,12 @@ export function createProviderService(
 	        await provider.execute(
 	          request.operation,
 	          objectFromUnknown(request.params),
-	          providerRequest(
-	            request.token,
-	            request.connectionParams,
-	            request.context,
-	            request.invocationToken,
-	            request.idempotencyKey,
-	          ),
+          providerRequest(
+            request.token,
+            request.connectionParams,
+            request.context,
+            request.idempotencyKey,
+          ),
 	        ),
       );
     },
@@ -828,7 +827,6 @@ function providerRequest(
   token: string,
   connectionParams: Record<string, string>,
   requestContext?: ProtoRequestContext,
-  invocationToken = "",
   idempotencyKey = "",
 ): Request {
   const credential = requestContext?.credential;
@@ -859,7 +857,6 @@ function providerRequest(
     host: {
       publicBaseUrl: host?.publicBaseUrl ?? "",
     },
-    invocationToken,
     __requestContext: requestContext,
     idempotencyKey: idempotencyKey.trim(),
   };

package/src/workflow-access.ts

@@ -13,7 +13,6 @@ import {
   ENV_HOST_SERVICE_SOCKET,
   ENV_HOST_SERVICE_TOKEN,
 } from "./host-service.ts";
-import { hostInvocationContext } from "./invocation-context.ts";
 import type { Request, SubjectInput } from "./api.ts";
 import { jsonFromValue, structFromObject, type JsonObjectInput } from "./protocol.ts";
 import {
@@ -185,17 +184,13 @@ export interface Workflow {
  */
 class WorkflowImpl implements Workflow {
   private readonly client: Client<typeof WorkflowProviderService>;
-  private readonly invocationContext: ReturnType<typeof hostInvocationContext>;
+  private readonly context: Request["__requestContext"];
   private readonly idempotencyKey: string;
 
   constructor(request: Request);
-  constructor(invocationToken: string);
-  constructor(requestOrToken: Request | string) {
-    this.invocationContext = hostInvocationContext(requestOrToken);
-    if (typeof requestOrToken === "string" && !this.invocationContext.invocationToken) {
-      throw new Error("workflow: invocation token is not available");
-    }
-    this.idempotencyKey = typeof requestOrToken === "string" ? "" : requestOrToken.idempotencyKey.trim();
+  constructor(request: Request) {
+    this.context = request.__requestContext;
+    this.idempotencyKey = request.idempotencyKey.trim();
 
     const target = process.env[ENV_HOST_SERVICE_SOCKET]?.trim();
     if (!target) {
@@ -222,7 +217,7 @@ class WorkflowImpl implements Workflow {
         await this.client.applyDefinition({
           providerName: request.providerName,
           spec: workflowDefinitionSpecToProto(request.spec),
-          ...this.invocationContext,
+          context: this.context,
           idempotencyKey: request.idempotencyKey?.trim() || this.idempotencyKey,
           requestedBySubjectId: request.requestedBySubjectId ?? "",
         }),
@@ -239,7 +234,7 @@ class WorkflowImpl implements Workflow {
       workflowDefinitionFromProto(
         await this.client.getDefinition({
           definitionId: request.definitionId,
-          ...this.invocationContext,
+          context: this.context,
         }),
       ),
       "Workflow.getDefinition returned no definition",
@@ -251,7 +246,7 @@ class WorkflowImpl implements Workflow {
     _request: WorkflowListDefinitions = {},
   ): Promise<readonly WorkflowDefinition[]> {
     const response = await this.client.listDefinitions({
-      ...this.invocationContext,
+      context: this.context,
     });
     return response.definitions.map((definition) =>
       requireDefinition(workflowDefinitionFromProto(definition), "Workflow.listDefinitions returned an empty definition")
@@ -267,7 +262,7 @@ class WorkflowImpl implements Workflow {
         await this.client.setDefinitionPaused({
           definitionId: request.definitionId,
           paused: request.paused,
-          ...this.invocationContext,
+          context: this.context,
           requestedBySubjectId: request.requestedBySubjectId ?? "",
         }),
       ),
@@ -285,7 +280,7 @@ class WorkflowImpl implements Workflow {
           definitionId: request.definitionId,
           activationId: request.activationId,
           paused: request.paused,
-          ...this.invocationContext,
+          context: this.context,
           requestedBySubjectId: request.requestedBySubjectId ?? "",
         }),
       ),
@@ -299,7 +294,7 @@ class WorkflowImpl implements Workflow {
   ): Promise<void> {
     await this.client.deleteDefinition({
       definitionId: request.definitionId,
-      ...this.invocationContext,
+      context: this.context,
     });
   }
 
@@ -316,7 +311,7 @@ class WorkflowImpl implements Workflow {
           input: structFromObject(request.input),
           idempotencyKey: request.idempotencyKey?.trim() || this.idempotencyKey,
           workflowKey: request.workflowKey ?? "",
-          ...this.invocationContext,
+          context: this.context,
           createdBySubjectId: request.createdBySubjectId ?? "",
           runAs: subjectToProto(request.runAs),
         }),
@@ -333,7 +328,7 @@ class WorkflowImpl implements Workflow {
       workflowRunFromProto(
         await this.client.getRun({
           runId: request.runId,
-          ...this.invocationContext,
+          context: this.context,
         }),
       ),
       "Workflow.getRun returned no run",
@@ -349,7 +344,7 @@ class WorkflowImpl implements Workflow {
       pageToken: request.pageToken ?? "",
       status: request.status ?? 0,
       targetApp: request.targetApp ?? "",
-      ...this.invocationContext,
+      context: this.context,
     });
     return {
       runs: response.runs.map((run) => requireRun(workflowRunFromProto(run), "Workflow.listRuns returned an empty run")),
@@ -363,7 +358,7 @@ class WorkflowImpl implements Workflow {
   ): Promise<readonly WorkflowRunEvent[]> {
     const response = await this.client.getRunEvents({
       runId: request.runId,
-      ...this.invocationContext,
+      context: this.context,
     });
     return response.events.map((event) =>
       requireRunEvent(workflowRunEventFromProto(event), "Workflow.getRunEvents returned an empty event")
@@ -376,7 +371,7 @@ class WorkflowImpl implements Workflow {
   ): Promise<GetWorkflowProviderRunOutputResponse> {
     const response = await this.client.getRunOutput({
       runId: request.runId,
-      ...this.invocationContext,
+      context: this.context,
     });
     return {
       output: response.output === undefined
@@ -394,7 +389,7 @@ class WorkflowImpl implements Workflow {
         await this.client.cancelRun({
           runId: request.runId,
           reason: request.reason ?? "",
-          ...this.invocationContext,
+          context: this.context,
         }),
       ),
       "Workflow.cancelRun returned no run",
@@ -410,7 +405,7 @@ class WorkflowImpl implements Workflow {
         await this.client.signalRun({
           runId: request.runId,
           signal: workflowSignalToProto(request.signal),
-          ...this.invocationContext,
+          context: this.context,
         }),
       ),
       "Workflow.signalRun returned no response",
@@ -431,7 +426,7 @@ class WorkflowImpl implements Workflow {
           input: structFromObject(request.input),
           idempotencyKey: request.idempotencyKey?.trim() || this.idempotencyKey,
           signal: workflowSignalToProto(request.signal),
-          ...this.invocationContext,
+          context: this.context,
           createdBySubjectId: request.createdBySubjectId ?? "",
           runAs: subjectToProto(request.runAs),
         }),
@@ -450,7 +445,7 @@ class WorkflowImpl implements Workflow {
           appName: request.appName ?? "",
           event: workflowEventToProto(request.event),
           deliveredBySubjectId: request.deliveredBySubjectId ?? "",
-          ...this.invocationContext,
+          context: this.context,
           providerName: request.providerName ?? "",
         }),
       ),

package/src/workflow.ts

@@ -410,18 +410,15 @@ export interface ApplyWorkflowProviderDefinitionRequest {
   spec?: WorkflowDefinitionSpec | undefined;
   idempotencyKey?: string | undefined;
   requestedBySubjectId?: string | undefined;
-  invocationToken?: string | undefined;
   context?: ProtoRequestContext | undefined;
 }
 
 export interface GetWorkflowProviderDefinitionRequest {
   definitionId: string;
-  invocationToken?: string | undefined;
   context?: ProtoRequestContext | undefined;
 }
 
 export interface ListWorkflowProviderDefinitionsRequest {
-  invocationToken?: string | undefined;
   context?: ProtoRequestContext | undefined;
 }
 
@@ -429,7 +426,6 @@ export interface SetWorkflowProviderDefinitionPausedRequest {
   definitionId: string;
   paused: boolean;
   requestedBySubjectId?: string | undefined;
-  invocationToken?: string | undefined;
   context?: ProtoRequestContext | undefined;
 }
 
@@ -438,13 +434,11 @@ export interface SetWorkflowProviderActivationPausedRequest {
   activationId: string;
   paused: boolean;
   requestedBySubjectId?: string | undefined;
-  invocationToken?: string | undefined;
   context?: ProtoRequestContext | undefined;
 }
 
 export interface DeleteWorkflowProviderDefinitionRequest {
   definitionId: string;
-  invocationToken?: string | undefined;
   context?: ProtoRequestContext | undefined;
 }
 
@@ -456,13 +450,11 @@ export interface StartWorkflowProviderRunRequest {
   createdBySubjectId?: string | undefined;
   runAs?: SubjectInput | undefined;
   workflowKey?: string | undefined;
-  invocationToken?: string | undefined;
   context?: ProtoRequestContext | undefined;
 }
 
 export interface GetWorkflowProviderRunRequest {
   runId: string;
-  invocationToken?: string | undefined;
   context?: ProtoRequestContext | undefined;
 }
 
@@ -471,33 +463,28 @@ export interface ListWorkflowProviderRunsRequest {
   pageToken?: string | undefined;
   status?: WorkflowRunStatus | undefined;
   targetApp?: string | undefined;
-  invocationToken?: string | undefined;
   context?: ProtoRequestContext | undefined;
 }
 
 export interface GetWorkflowProviderRunEventsRequest {
   runId: string;
-  invocationToken?: string | undefined;
   context?: ProtoRequestContext | undefined;
 }
 
 export interface GetWorkflowProviderRunOutputRequest {
   runId: string;
-  invocationToken?: string | undefined;
   context?: ProtoRequestContext | undefined;
 }
 
 export interface CancelWorkflowProviderRunRequest {
   runId: string;
   reason: string;
-  invocationToken?: string | undefined;
   context?: ProtoRequestContext | undefined;
 }
 
 export interface SignalWorkflowProviderRunRequest {
   runId: string;
   signal?: WorkflowSignal | undefined;
-  invocationToken?: string | undefined;
   context?: ProtoRequestContext | undefined;
 }
 
@@ -510,7 +497,6 @@ export interface SignalOrStartWorkflowProviderRunRequest {
   createdBySubjectId?: string | undefined;
   runAs?: SubjectInput | undefined;
   signal?: WorkflowSignal | undefined;
-  invocationToken?: string | undefined;
   context?: ProtoRequestContext | undefined;
 }
 
@@ -525,7 +511,6 @@ export interface DeliverWorkflowProviderEventRequest {
   appName?: string | undefined;
   event?: WorkflowEvent | undefined;
   deliveredBySubjectId?: string | undefined;
-  invocationToken?: string | undefined;
   context?: ProtoRequestContext | undefined;
 }
 
@@ -1608,29 +1593,28 @@ function applyWorkflowProviderDefinitionRequestFromProto(input: ProtoApplyWorkfl
     spec: workflowDefinitionSpecFromProto(input.spec),
     idempotencyKey: input.idempotencyKey,
     requestedBySubjectId: input.requestedBySubjectId,
-    invocationToken: input.invocationToken,
     context: input.context,
   };
 }
 
 function getWorkflowProviderDefinitionRequestFromProto(input: ProtoGetWorkflowProviderDefinitionRequest): GetWorkflowProviderDefinitionRequest {
-  return { definitionId: input.definitionId, invocationToken: input.invocationToken, context: input.context };
+  return { definitionId: input.definitionId, context: input.context };
 }
 
 function listWorkflowProviderDefinitionsRequestFromProto(input: ProtoListWorkflowProviderDefinitionsRequest): ListWorkflowProviderDefinitionsRequest {
-  return { invocationToken: input.invocationToken, context: input.context };
+  return { context: input.context };
 }
 
 function setWorkflowProviderDefinitionPausedRequestFromProto(input: ProtoSetWorkflowProviderDefinitionPausedRequest): SetWorkflowProviderDefinitionPausedRequest {
-  return { definitionId: input.definitionId, paused: input.paused, requestedBySubjectId: input.requestedBySubjectId, invocationToken: input.invocationToken, context: input.context };
+  return { definitionId: input.definitionId, paused: input.paused, requestedBySubjectId: input.requestedBySubjectId, context: input.context };
 }
 
 function setWorkflowProviderActivationPausedRequestFromProto(input: ProtoSetWorkflowProviderActivationPausedRequest): SetWorkflowProviderActivationPausedRequest {
-  return { definitionId: input.definitionId, activationId: input.activationId, paused: input.paused, requestedBySubjectId: input.requestedBySubjectId, invocationToken: input.invocationToken, context: input.context };
+  return { definitionId: input.definitionId, activationId: input.activationId, paused: input.paused, requestedBySubjectId: input.requestedBySubjectId, context: input.context };
 }
 
 function deleteWorkflowProviderDefinitionRequestFromProto(input: ProtoDeleteWorkflowProviderDefinitionRequest): DeleteWorkflowProviderDefinitionRequest {
-  return { definitionId: input.definitionId, invocationToken: input.invocationToken, context: input.context };
+  return { definitionId: input.definitionId, context: input.context };
 }
 
 function startWorkflowProviderRunRequestFromProto(input: ProtoStartWorkflowProviderRunRequest): StartWorkflowProviderRunRequest {
@@ -1642,13 +1626,12 @@ function startWorkflowProviderRunRequestFromProto(input: ProtoStartWorkflowProvi
     createdBySubjectId: input.createdBySubjectId,
     runAs: subjectInputFromProto(input.runAs),
     workflowKey: input.workflowKey,
-    invocationToken: input.invocationToken,
     context: input.context,
   };
 }
 
 function getWorkflowProviderRunRequestFromProto(input: ProtoGetWorkflowProviderRunRequest): GetWorkflowProviderRunRequest {
-  return { runId: input.runId, invocationToken: input.invocationToken, context: input.context };
+  return { runId: input.runId, context: input.context };
 }
 
 function listWorkflowProviderRunsRequestFromProto(input: ProtoListWorkflowProviderRunsRequest): ListWorkflowProviderRunsRequest {
@@ -1657,25 +1640,24 @@ function listWorkflowProviderRunsRequestFromProto(input: ProtoListWorkflowProvid
     pageToken: input.pageToken,
     status: input.status as WorkflowRunStatus,
     targetApp: input.targetApp,
-    invocationToken: input.invocationToken,
     context: input.context,
   };
 }
 
 function getWorkflowProviderRunEventsRequestFromProto(input: ProtoGetWorkflowProviderRunEventsRequest): GetWorkflowProviderRunEventsRequest {
-  return { runId: input.runId, invocationToken: input.invocationToken, context: input.context };
+  return { runId: input.runId, context: input.context };
 }
 
 function getWorkflowProviderRunOutputRequestFromProto(input: ProtoGetWorkflowProviderRunOutputRequest): GetWorkflowProviderRunOutputRequest {
-  return { runId: input.runId, invocationToken: input.invocationToken, context: input.context };
+  return { runId: input.runId, context: input.context };
 }
 
 function cancelWorkflowProviderRunRequestFromProto(input: ProtoCancelWorkflowProviderRunRequest): CancelWorkflowProviderRunRequest {
-  return { runId: input.runId, reason: input.reason, invocationToken: input.invocationToken, context: input.context };
+  return { runId: input.runId, reason: input.reason, context: input.context };
 }
 
 function signalWorkflowProviderRunRequestFromProto(input: ProtoSignalWorkflowProviderRunRequest): SignalWorkflowProviderRunRequest {
-  return { runId: input.runId, signal: workflowSignalFromProto(input.signal), invocationToken: input.invocationToken, context: input.context };
+  return { runId: input.runId, signal: workflowSignalFromProto(input.signal), context: input.context };
 }
 
 function signalOrStartWorkflowProviderRunRequestFromProto(input: ProtoSignalOrStartWorkflowProviderRunRequest): SignalOrStartWorkflowProviderRunRequest {
@@ -1688,7 +1670,6 @@ function signalOrStartWorkflowProviderRunRequestFromProto(input: ProtoSignalOrSt
     createdBySubjectId: input.createdBySubjectId,
     runAs: subjectInputFromProto(input.runAs),
     signal: workflowSignalFromProto(input.signal),
-    invocationToken: input.invocationToken,
     context: input.context,
   };
 }
@@ -1698,7 +1679,6 @@ function deliverWorkflowProviderEventRequestFromProto(input: ProtoDeliverWorkflo
     appName: input.appName,
     event: workflowEventFromProto(input.event),
     deliveredBySubjectId: input.deliveredBySubjectId,
-    invocationToken: input.invocationToken,
     context: input.context,
   };
 }
@@ -1722,7 +1702,6 @@ export interface WorkflowExecutionRequest {
   input?: Record<string, JsonInput> | undefined;
   metadata?: Record<string, JsonInput> | undefined;
   createdBySubjectId?: string | undefined;
-  invocationToken?: string | undefined;
   signals?: readonly WorkflowSignal[] | undefined;
   steps?: Record<string, { inputs?: Record<string, unknown>; outputs?: unknown }> | undefined;
 }

package/src/invocation-context.ts

@@ -1,28 +0,0 @@
-import type { Request } from "./api.ts";
-
-export function hostInvocationContext(requestOrToken: Request | string) {
-  const invocationToken = (
-    typeof requestOrToken === "string"
-      ? requestOrToken
-      : requestOrToken.invocationToken
-  ).trim();
-  if (typeof requestOrToken === "string") {
-    return { invocationToken, context: undefined };
-  }
-  const providerName =
-    stringValue(requestOrToken.workflow.providerName) ||
-    stringValue(requestOrToken.workflow.provider);
-  const runId = stringValue(requestOrToken.workflow.runId);
-  const workflow =
-    providerName && runId
-      ? { provider: providerName, providerName, runId }
-      : undefined;
-  return {
-    invocationToken,
-    ...(workflow === undefined ? {} : { workflow }),
-    context: requestOrToken.__requestContext,
-  };
-}
-
-const stringValue = (value: unknown) =>
-  typeof value === "string" ? value.trim() : "";