Update abort for testing

Author: pombosilva

packages/vitest-pool-workers/src/worker/workflows.ts

@@ -1,6 +1,5 @@
 import { WORKFLOW_ENGINE_BINDING } from "../shared/workflows";
 import { internalEnv } from "./env";
-// import type { InstanceStatus } from "@cloudflare/workflows-shared/src/instance";
 import type { InstanceModifier } from "@cloudflare/workflows-shared/src/modifier";
 
 export type StepSelector = {
@@ -36,13 +35,11 @@ export async function introspectWorkflowInstance(
 		`[Vitest-Workflows] Introspecting workflow instance: ${instanceId}`
 	);
 
-	//await workflow.create({ id: instanceId });
-
 	// @ts-expect-error getWorkflowName() not exposed
 	const engineBindingName = `${WORKFLOW_ENGINE_BINDING}${(await workflow.getWorkflowName()).toUpperCase()}`;
-	// @ts-expect-error binding created at in runner worker start
+	// @ts-expect-error DO binding created in runner worker start
 	const engineStubId = internalEnv[engineBindingName].idFromName(instanceId);
-	// @ts-expect-error binding created at in runner worker start
+	// @ts-expect-error DO binding created in runner worker start
 	const engineStub = internalEnv[engineBindingName].get(engineStubId);
 
 	const instanceModifier = await engineStub.getInstanceModifier();
@@ -63,15 +60,15 @@ class WorkflowInstanceIntrospectorHandle
 		this.instanceModifier = instanceModifier;
 	}
 
-	public async modify(
+	async modify(
 		fn: (m: InstanceModifier) => Promise<void>
 	): Promise<WorkflowInstanceIntrospector> {
 		console.log("[Vitest-Workflows] I should go call a modifier");
 		await fn(this.instanceModifier);
 		return this;
 	}
 
-	public async waitForStepResult(step: StepSelector): Promise<unknown> {
+	async waitForStepResult(step: StepSelector): Promise<unknown> {
 		console.log("waiting for step result of step", step.name);
 		// @ts-expect-error waitForStepResult not exposed
 		const stepResult = await this.engineStub.waitForStepResult(
@@ -83,18 +80,19 @@ class WorkflowInstanceIntrospectorHandle
 		return stepResult;
 	}
 
-	public async waitForStatus(status: string): Promise<void> {
+	async waitForStatus(status: string): Promise<void> {
 		console.log("[Vitest-Workflows] waiting for status");
 		// @ts-expect-error waitForStatus not exposed
 		await this.engineStub.waitForStatus(status);
 
 		console.log("[Vitest-Workflows] status awaited");
 	}
 
-	public async cleanUp(): Promise<void> {
+	async cleanUp(): Promise<void> {
 		// works with isolatedStorage = false
 		try {
-			await this.engineStub.abort("user called delete");
+			// @ts-expect-error DO binding created in runner worker start
+			await this.engineStub.unsafeAbort("user called delete");
 		} catch {
 			// do nothing because we want to clean up this instance
 		}

packages/workflows-shared/src/engine.ts

@@ -291,7 +291,7 @@ export class Engine extends DurableObject<Env> {
 			}
 		}
 
-		// if it hasn't completed the step, create a new promise and add its resolver and rejecter to the waiters map
+		// if it hasn't completed the step, create a new promise to later resolve/reject
 		return new Promise<unknown>((resolve, reject) => {
 			this.stepResultWaiters.set(cacheKey, { resolve, reject });
 		});
@@ -317,14 +317,16 @@ export class Engine extends DurableObject<Env> {
 		}
 	}
 
-	async abort(reason?: string) {
-		console.log("[Engine] Will abort because", reason);
+	async abort(_reason: string) {
+		// TODO: Maybe don't actually kill but instead check a flag and return early if true
+	}
 
-		// TODO: have the grace period end somehow?
+	async unsafeAbort(reason?: string) {
+		console.log("[Engine] Will abort because", reason);
 
 		await this.ctx.storage.sync();
-		await this.ctx.storage.deleteAlarm();
-		await this.ctx.storage.deleteAll();
+		await this.ctx.storage.deleteAll({ noCache: true });
+
 		this.ctx.abort(reason);
 	}