Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/chubby-keys-decide.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@effect/workflow": minor
---

Expose interrupt method to proxy
23 changes: 22 additions & 1 deletion packages/workflow/src/WorkflowProxy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,10 @@ export const toRpcGroup = <
payload: workflow.payloadSchema
}).annotateContext(workflow.annotations),
Rpc.make(`${prefix}${workflow.name}Resume`, { payload: ResumePayload })
.annotateContext(workflow.annotations)
.annotateContext(workflow.annotations),
Rpc.make(`${prefix}${workflow.name}Interrupt`, {
payload: InterruptPayload
}).annotateContext(workflow.annotations)
)
}
return RpcGroup.make(...rpcs) as any
Expand All @@ -82,6 +85,7 @@ export type ConvertRpcs<Workflows extends Workflow.Any, Prefix extends string> =
| Rpc.Rpc<`${Prefix}${_Name}`, _Payload, _Success, _Error>
| Rpc.Rpc<`${Prefix}${_Name}Discard`, _Payload>
| Rpc.Rpc<`${Prefix}${_Name}Resume`, typeof ResumePayload>
| Rpc.Rpc<`${Prefix}${_Name}Interrupt`, typeof InterruptPayload>
: never

/**
Expand Down Expand Up @@ -140,6 +144,10 @@ export const toHttpApiGroup = <const Name extends string, const Workflows extend
HttpApiEndpoint.post(workflow.name + "Resume", `${path}/resume`)
.setPayload(ResumePayload)
.annotateContext(workflow.annotations)
).add(
HttpApiEndpoint.post(workflow.name + "Interrupt", `${path}/interrupt`)
.setPayload(InterruptPayload)
.annotateContext(workflow.annotations)
) as any
}
return group as any
Expand Down Expand Up @@ -193,7 +201,20 @@ export type ConvertHttpApi<Workflows extends Workflow.Any> = Workflows extends W
void,
never,
typeof ResumePayload.Context
>
| HttpApiEndpoint.HttpApiEndpoint<
`${_Name}Interrupt`,
"POST",
never,
never,
typeof InterruptPayload.Type,
never,
void,
never,
typeof InterruptPayload.Context
> :
never

const ResumePayload = Schema.Struct({ executionId: Schema.String })

const InterruptPayload = Schema.Struct({ executionId: Schema.String })
24 changes: 23 additions & 1 deletion packages/workflow/src/WorkflowProxyServer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,17 @@ export const layerHttpApi = <
})
)
)
.handle(
workflow.name + "Interrupt" as any,
({ payload }: { payload: any }) =>
workflow.interrupt(payload.executionId).pipe(
Effect.tapDefect(Effect.logError),
Effect.annotateLogs({
module: "WorkflowProxyServer",
method: workflow.name + "Interrupt"
})
)
)
}
return handlers as HttpApiBuilder.Handlers<never, never, never>
})
Expand Down Expand Up @@ -101,9 +112,11 @@ export const layerRpcHandlers = <
const tag = `${prefix}${workflow.name}`
const tagDiscard = `${tag}Discard`
const tagResume = `${tag}Resume`
const tagInterrupt = `${tag}Interrupt`
const key = `@effect/rpc/Rpc/${tag}`
const keyDiscard = `${key}Discard`
const keyResume = `${key}Resume`
const keyInterrupt = `${key}Interrupt`
handlers.set(key, {
context,
tag,
Expand All @@ -119,6 +132,11 @@ export const layerRpcHandlers = <
tag: tagResume,
handler: (payload: any) => workflow.resume(payload.executionId) as any
} as any)
handlers.set(keyInterrupt, {
context,
tag: tagInterrupt,
handler: (payload: any) => workflow.interrupt(payload.executionId) as any
} as any)
}
return Context.unsafeMake(handlers)
}))
Expand All @@ -131,5 +149,9 @@ export type RpcHandlers<Workflows extends Workflow.Any, Prefix extends string> =
infer _Payload,
infer _Success,
infer _Error
> ? Rpc.Handler<`${Prefix}${_Name}`> | Rpc.Handler<`${Prefix}${_Name}Discard`> | Rpc.Handler<`${Prefix}${_Name}Resume`>
> ?
| Rpc.Handler<`${Prefix}${_Name}`>
| Rpc.Handler<`${Prefix}${_Name}Discard`>
| Rpc.Handler<`${Prefix}${_Name}Resume`>
| Rpc.Handler<`${Prefix}${_Name}Interrupt`>
: never