@restatedev/restate-sdk-cloudflare-workers 1.17.2 → 1.17.4

package/dist/context_impl.cjs

@@ -23,6 +23,7 @@ var ContextImpl = class {
 	outputPump;
 	inputPump;
 	runClosuresTracker;
+	ephemeralRequestTracker;
 	promisesExecutor;
 	serviceKey;
 	runInterceptor;
@@ -42,8 +43,9 @@ var ContextImpl = class {
 		this.outputPump = new require_io.OutputPump(coreVm, outputWriter);
 		const externalProgressChannel = new require_external_progress_channel.ExternalProgressChannel();
 		this.runClosuresTracker = new RunClosuresTracker(externalProgressChannel);
+		this.ephemeralRequestTracker = new EphemeralRequestTracker(externalProgressChannel);
 		this.inputPump = new require_io.InputPump(coreVm, inputReader, externalProgressChannel, this.abortAttempt.bind(this));
-		this.promisesExecutor = new require_promises.PromisesExecutor(coreVm, this.outputPump, this.runClosuresTracker, externalProgressChannel, this.abortAttempt.bind(this));
+		this.promisesExecutor = new require_promises.PromisesExecutor(coreVm, this.outputPump, this.runClosuresTracker, this.ephemeralRequestTracker, externalProgressChannel, this.abortAttempt.bind(this));
 		this.serviceKey = input.key;
 		this.runInterceptor = (_name, runner) => runner();
 		this.defaultSerde = executionOptions?.defaultSerde ?? __restatedev_restate_sdk_core.serde.json;
@@ -76,20 +78,40 @@ var ContextImpl = class {
 	request() {
 		return this.invocationRequest;
 	}
-	get(name, serde$1) {
-		return this.processCompletableEntry(require_sdk_shared_core_wasm_bindings.WasmCommandType.GetState, () => {}, (vm) => vm.sys_get_state(name), VoidAsNull, SuccessWithSerde(serde$1 ?? this.defaultSerde, this.journalValueCodec));
+	get(name, serde$1, options) {
+		return this.processCompletableEntry(require_sdk_shared_core_wasm_bindings.WasmCommandType.GetState, () => {}, (vm) => vm.sys_get_state(name, options?.name), VoidAsNull, SuccessWithSerde(serde$1 ?? this.defaultSerde, this.journalValueCodec));
+	}
+	getProject(name, projection, options) {
+		const stateSerde = options?.serde ?? this.defaultSerde;
+		return this.run(`project:${name}`, async () => projection(await this.ephemeralStateGet(name, stateSerde)), { serde: options?.resultSerde ?? options?.serde });
+	}
+	/**
+	* Get the state value with an ephemeral command: neither the command nor its notification are recorded in the journal.
+	* Because of this, the returned value MUST be used only within a run closure.
+	*
+	* The returned promise is completed only if a Restate's DurablePromise is being awaited.
+	*/
+	ephemeralStateGet(name, serde$1) {
+		let ephemeralCompletionId;
+		try {
+			ephemeralCompletionId = this.coreVm.ephemeral_state_get(name);
+		} catch (e) {
+			this.abortAttempt(e);
+			return require_promises.pendingPromise();
+		}
+		return this.ephemeralRequestTracker.register(ephemeralCompletionId, completeUsing({}, VoidAsNull, SuccessWithSerde(serde$1, this.journalValueCodec)));
 	}
-	stateKeys() {
-		return this.processCompletableEntry(require_sdk_shared_core_wasm_bindings.WasmCommandType.GetStateKeys, () => {}, (vm) => vm.sys_get_state_keys(), StateKeys);
+	stateKeys(options) {
+		return this.processCompletableEntry(require_sdk_shared_core_wasm_bindings.WasmCommandType.GetStateKeys, () => {}, (vm) => vm.sys_get_state_keys(options?.name), StateKeys);
 	}
-	set(name, value, serde$1) {
-		this.processNonCompletableEntry(require_sdk_shared_core_wasm_bindings.WasmCommandType.SetState, () => this.journalValueCodec.encode((serde$1 ?? this.defaultSerde).serialize(value)), (vm, bytes) => vm.sys_set_state(name, bytes));
+	set(name, value, serde$1, options) {
+		this.processNonCompletableEntry(require_sdk_shared_core_wasm_bindings.WasmCommandType.SetState, () => this.journalValueCodec.encode((serde$1 ?? this.defaultSerde).serialize(value)), (vm, bytes) => vm.sys_set_state(name, bytes, options?.name));
 	}
-	clear(name) {
-		this.processNonCompletableEntry(require_sdk_shared_core_wasm_bindings.WasmCommandType.ClearState, () => {}, (vm) => vm.sys_clear_state(name));
+	clear(name, options) {
+		this.processNonCompletableEntry(require_sdk_shared_core_wasm_bindings.WasmCommandType.ClearState, () => {}, (vm) => vm.sys_clear_state(name, options?.name));
 	}
-	clearAll() {
-		this.processNonCompletableEntry(require_sdk_shared_core_wasm_bindings.WasmCommandType.ClearAllState, () => {}, (vm) => vm.sys_clear_all_state());
+	clearAll(options) {
+		this.processNonCompletableEntry(require_sdk_shared_core_wasm_bindings.WasmCommandType.ClearAllState, () => {}, (vm) => vm.sys_clear_all_state(options?.name));
 	}
 	genericCall(call) {
 		const requestSerde = call.inputSerde ?? __restatedev_restate_sdk_core.serde.binary;
@@ -104,9 +126,15 @@ var ContextImpl = class {
 		try {
 			const call_handles = this.coreVm.sys_call(call.service, call.method, parameter, call.key, call.headers ? Object.entries(call.headers).map(([key, value]) => new require_sdk_shared_core_wasm_bindings.WasmHeader(key, value)) : [], call.idempotencyKey, call.scope, call.limitKey, call.name);
 			const commandIndex = this.coreVm.last_command_index();
-			const invocationIdPromise = new require_promises.SingleRestatePromise(this, call_handles.invocation_id_completion_id, completeCommandPromiseUsing(require_sdk_shared_core_wasm_bindings.WasmCommandType.Call, commandIndex, InvocationIdCompleter));
+			const invocationIdPromise = new require_promises.SingleRestatePromise(this, call_handles.invocation_id_completion_id, completeUsing({ command: {
+				type: require_sdk_shared_core_wasm_bindings.WasmCommandType.Call,
+				index: commandIndex
+			} }, InvocationIdCompleter));
 			this.trackedInvocationIdPromises?.push(invocationIdPromise);
-			return new require_promises.InvocationRestatePromise(this, call_handles.call_completion_id, completeCommandPromiseUsing(require_sdk_shared_core_wasm_bindings.WasmCommandType.Call, commandIndex, SuccessWithSerde(responseSerde, this.journalValueCodec), Failure), invocationIdPromise);
+			return new require_promises.InvocationRestatePromise(this, call_handles.call_completion_id, completeUsing({ command: {
+				type: require_sdk_shared_core_wasm_bindings.WasmCommandType.Call,
+				index: commandIndex
+			} }, SuccessWithSerde(responseSerde, this.journalValueCodec), Failure), invocationIdPromise);
 		} catch (e) {
 			this.abortAttempt(e);
 			return Object.assign(require_promises.ConstRestatePromise.pending(), { invocationId: require_promises.pendingPromise() });
@@ -125,7 +153,10 @@ var ContextImpl = class {
 			const delay = send.delay !== void 0 ? (0, __restatedev_restate_sdk_core.millisOrDurationToMillis)(send.delay) : void 0;
 			const handles = this.coreVm.sys_send(send.service, send.method, parameter, send.key, send.headers ? Object.entries(send.headers).map(([key, value]) => new require_sdk_shared_core_wasm_bindings.WasmHeader(key, value)) : [], delay !== void 0 && delay > 0 ? BigInt(delay) : void 0, send.idempotencyKey, send.scope, send.limitKey, send.name);
 			const commandIndex = this.coreVm.last_command_index();
-			return { invocationId: new require_promises.SingleRestatePromise(this, handles.invocation_id_completion_id, completeCommandPromiseUsing(require_sdk_shared_core_wasm_bindings.WasmCommandType.OneWayCall, commandIndex, InvocationIdCompleter)) };
+			return { invocationId: new require_promises.SingleRestatePromise(this, handles.invocation_id_completion_id, completeUsing({ command: {
+				type: require_sdk_shared_core_wasm_bindings.WasmCommandType.OneWayCall,
+				index: commandIndex
+			} }, InvocationIdCompleter)) };
 		} catch (e) {
 			this.abortAttempt(e);
 			return { invocationId: require_promises.pendingPromise() };
@@ -228,7 +259,10 @@ var ContextImpl = class {
 			};
 			this.runClosuresTracker.registerRunClosure(handle, doRun);
 		}
-		return new require_promises.SingleRestatePromise(this, handle, completeCommandPromiseUsing(require_sdk_shared_core_wasm_bindings.WasmCommandType.Run, commandIndex, SuccessWithSerde(serde$1, this.journalValueCodec), Failure));
+		return new require_promises.SingleRestatePromise(this, handle, completeUsing({ command: {
+			type: require_sdk_shared_core_wasm_bindings.WasmCommandType.Run,
+			index: commandIndex
+		} }, SuccessWithSerde(serde$1, this.journalValueCodec), Failure));
 	}
 	sleep(duration, name) {
 		return this.processCompletableEntry(require_sdk_shared_core_wasm_bindings.WasmCommandType.Sleep, () => {
@@ -251,7 +285,7 @@ var ContextImpl = class {
 		}
 		return {
 			id: awakeable.id,
-			promise: new require_promises.SingleRestatePromise(this, awakeable.handle, completeSignalPromiseUsing(VoidAsUndefined, SuccessWithSerde(serde$1 ?? this.defaultSerde, this.journalValueCodec), Failure))
+			promise: new require_promises.SingleRestatePromise(this, awakeable.handle, completeUsing({}, VoidAsUndefined, SuccessWithSerde(serde$1 ?? this.defaultSerde, this.journalValueCodec), Failure))
 		};
 	}
 	resolveAwakeable(id, payload, serde$1) {
@@ -275,7 +309,7 @@ var ContextImpl = class {
 			this.abortAttempt(e);
 			return require_promises.ConstRestatePromise.pending();
 		}
-		return new require_promises.SingleRestatePromise(this, handle, completeSignalPromiseUsing(VoidAsUndefined, SuccessWithSerde(serde$1 ?? this.defaultSerde, this.journalValueCodec), Failure));
+		return new require_promises.SingleRestatePromise(this, handle, completeUsing({}, VoidAsUndefined, SuccessWithSerde(serde$1 ?? this.defaultSerde, this.journalValueCodec), Failure));
 	}
 	invocation(invocationId) {
 		return new InvocationReferenceImpl(this, invocationId);
@@ -284,7 +318,7 @@ var ContextImpl = class {
 		return new DurablePromiseImpl(this, name, serde$1);
 	}
 	cancellation() {
-		if (!this.cancellationPromise || this.cancellationPromise.isCompleted()) this.cancellationPromise = new require_promises.SingleRestatePromise(this, 1, completeSignalPromiseUsing(VoidAsUndefined));
+		if (!this.cancellationPromise || this.cancellationPromise.isCompleted()) this.cancellationPromise = new require_promises.SingleRestatePromise(this, 1, completeUsing({}, VoidAsUndefined));
 		return this.cancellationPromise;
 	}
 	cancelPreviousCalls() {
@@ -329,7 +363,10 @@ var ContextImpl = class {
 			return require_promises.ConstRestatePromise.pending();
 		}
 		const commandIndex = this.coreVm.last_command_index();
-		return new require_promises.SingleRestatePromise(this, handle, completeCommandPromiseUsing(commandType, commandIndex, ...completers));
+		return new require_promises.SingleRestatePromise(this, handle, completeUsing({ command: {
+			type: commandType,
+			index: commandIndex
+		} }, ...completers));
 	}
 	abortAttempt(e, commandType) {
 		this.invocationEndPromise.reject(commandType !== void 0 ? new CommandError(e, commandType) : require_errors.ensureError(e));
@@ -428,6 +465,31 @@ var DurablePromiseImpl = class {
 		}), VoidAsUndefined, Failure);
 	}
 };
+var EphemeralRequestTracker = class {
+	pending = /* @__PURE__ */ new Map();
+	constructor(channel) {
+		this.channel = channel;
+	}
+	register(completionId, completer) {
+		const prom = Promise.withResolvers();
+		this.pending.set(completionId, async (value) => {
+			try {
+				await completer(value, prom);
+			} catch (e) {
+				prom.reject(e);
+			}
+		});
+		this.channel.signal();
+		return prom.promise;
+	}
+	async complete(completionId, value) {
+		const complete = this.pending.get(completionId);
+		if (complete === void 0) throw new Error(`Ephemeral request with completion id ${completionId} doesn't exist`);
+		if (value === "NotReady") throw new Error(`Notification for ephemeral request with completion id ${completionId} is not ready. This is unexpected behavior.`);
+		this.pending.delete(completionId);
+		await complete(value);
+	}
+};
 var RunClosuresTracker = class {
 	runsToExecute = /* @__PURE__ */ new Map();
 	constructor(channel) {
@@ -456,22 +518,17 @@ var CommandError = class extends Error {
 		return this.commandIndex !== void 0;
 	}
 };
-function completeCommandPromiseUsing(commandType, commandIndex, ...completers) {
+function completeUsing(meta, ...completers) {
 	return async (value, prom) => {
 		try {
 			for (const completer of completers) if (await completer(value, prom)) return;
 		} catch (e) {
-			throw new CommandError(e, commandType, commandIndex);
+			if (meta.command !== void 0) throw new CommandError(e, meta.command.type, meta.command.index);
+			throw e;
 		}
 		throw new Error(`Unexpected variant in async result: ${JSON.stringify(value)}`);
 	};
 }
-function completeSignalPromiseUsing(...completers) {
-	return async (value, prom) => {
-		for (const completer of completers) if (await completer(value, prom)) return;
-		throw new Error(`Unexpected variant in async result: ${JSON.stringify(value)}`);
-	};
-}
 const VoidAsNull = (value, prom) => {
 	if (value === "Empty") {
 		prom.resolve(null);

package/dist/context_impl.js

@@ -21,6 +21,7 @@ var ContextImpl = class {
 	outputPump;
 	inputPump;
 	runClosuresTracker;
+	ephemeralRequestTracker;
 	promisesExecutor;
 	serviceKey;
 	runInterceptor;
@@ -40,8 +41,9 @@ var ContextImpl = class {
 		this.outputPump = new OutputPump(coreVm, outputWriter);
 		const externalProgressChannel = new ExternalProgressChannel();
 		this.runClosuresTracker = new RunClosuresTracker(externalProgressChannel);
+		this.ephemeralRequestTracker = new EphemeralRequestTracker(externalProgressChannel);
 		this.inputPump = new InputPump(coreVm, inputReader, externalProgressChannel, this.abortAttempt.bind(this));
-		this.promisesExecutor = new PromisesExecutor(coreVm, this.outputPump, this.runClosuresTracker, externalProgressChannel, this.abortAttempt.bind(this));
+		this.promisesExecutor = new PromisesExecutor(coreVm, this.outputPump, this.runClosuresTracker, this.ephemeralRequestTracker, externalProgressChannel, this.abortAttempt.bind(this));
 		this.serviceKey = input.key;
 		this.runInterceptor = (_name, runner) => runner();
 		this.defaultSerde = executionOptions?.defaultSerde ?? serde.json;
@@ -74,20 +76,40 @@ var ContextImpl = class {
 	request() {
 		return this.invocationRequest;
 	}
-	get(name, serde$1) {
-		return this.processCompletableEntry(WasmCommandType.GetState, () => {}, (vm) => vm.sys_get_state(name), VoidAsNull, SuccessWithSerde(serde$1 ?? this.defaultSerde, this.journalValueCodec));
+	get(name, serde$1, options) {
+		return this.processCompletableEntry(WasmCommandType.GetState, () => {}, (vm) => vm.sys_get_state(name, options?.name), VoidAsNull, SuccessWithSerde(serde$1 ?? this.defaultSerde, this.journalValueCodec));
+	}
+	getProject(name, projection, options) {
+		const stateSerde = options?.serde ?? this.defaultSerde;
+		return this.run(`project:${name}`, async () => projection(await this.ephemeralStateGet(name, stateSerde)), { serde: options?.resultSerde ?? options?.serde });
+	}
+	/**
+	* Get the state value with an ephemeral command: neither the command nor its notification are recorded in the journal.
+	* Because of this, the returned value MUST be used only within a run closure.
+	*
+	* The returned promise is completed only if a Restate's DurablePromise is being awaited.
+	*/
+	ephemeralStateGet(name, serde$1) {
+		let ephemeralCompletionId;
+		try {
+			ephemeralCompletionId = this.coreVm.ephemeral_state_get(name);
+		} catch (e) {
+			this.abortAttempt(e);
+			return pendingPromise();
+		}
+		return this.ephemeralRequestTracker.register(ephemeralCompletionId, completeUsing({}, VoidAsNull, SuccessWithSerde(serde$1, this.journalValueCodec)));
 	}
-	stateKeys() {
-		return this.processCompletableEntry(WasmCommandType.GetStateKeys, () => {}, (vm) => vm.sys_get_state_keys(), StateKeys);
+	stateKeys(options) {
+		return this.processCompletableEntry(WasmCommandType.GetStateKeys, () => {}, (vm) => vm.sys_get_state_keys(options?.name), StateKeys);
 	}
-	set(name, value, serde$1) {
-		this.processNonCompletableEntry(WasmCommandType.SetState, () => this.journalValueCodec.encode((serde$1 ?? this.defaultSerde).serialize(value)), (vm, bytes) => vm.sys_set_state(name, bytes));
+	set(name, value, serde$1, options) {
+		this.processNonCompletableEntry(WasmCommandType.SetState, () => this.journalValueCodec.encode((serde$1 ?? this.defaultSerde).serialize(value)), (vm, bytes) => vm.sys_set_state(name, bytes, options?.name));
 	}
-	clear(name) {
-		this.processNonCompletableEntry(WasmCommandType.ClearState, () => {}, (vm) => vm.sys_clear_state(name));
+	clear(name, options) {
+		this.processNonCompletableEntry(WasmCommandType.ClearState, () => {}, (vm) => vm.sys_clear_state(name, options?.name));
 	}
-	clearAll() {
-		this.processNonCompletableEntry(WasmCommandType.ClearAllState, () => {}, (vm) => vm.sys_clear_all_state());
+	clearAll(options) {
+		this.processNonCompletableEntry(WasmCommandType.ClearAllState, () => {}, (vm) => vm.sys_clear_all_state(options?.name));
 	}
 	genericCall(call) {
 		const requestSerde = call.inputSerde ?? serde.binary;
@@ -102,9 +124,15 @@ var ContextImpl = class {
 		try {
 			const call_handles = this.coreVm.sys_call(call.service, call.method, parameter, call.key, call.headers ? Object.entries(call.headers).map(([key, value]) => new WasmHeader(key, value)) : [], call.idempotencyKey, call.scope, call.limitKey, call.name);
 			const commandIndex = this.coreVm.last_command_index();
-			const invocationIdPromise = new SingleRestatePromise(this, call_handles.invocation_id_completion_id, completeCommandPromiseUsing(WasmCommandType.Call, commandIndex, InvocationIdCompleter));
+			const invocationIdPromise = new SingleRestatePromise(this, call_handles.invocation_id_completion_id, completeUsing({ command: {
+				type: WasmCommandType.Call,
+				index: commandIndex
+			} }, InvocationIdCompleter));
 			this.trackedInvocationIdPromises?.push(invocationIdPromise);
-			return new InvocationRestatePromise(this, call_handles.call_completion_id, completeCommandPromiseUsing(WasmCommandType.Call, commandIndex, SuccessWithSerde(responseSerde, this.journalValueCodec), Failure), invocationIdPromise);
+			return new InvocationRestatePromise(this, call_handles.call_completion_id, completeUsing({ command: {
+				type: WasmCommandType.Call,
+				index: commandIndex
+			} }, SuccessWithSerde(responseSerde, this.journalValueCodec), Failure), invocationIdPromise);
 		} catch (e) {
 			this.abortAttempt(e);
 			return Object.assign(ConstRestatePromise.pending(), { invocationId: pendingPromise() });
@@ -123,7 +151,10 @@ var ContextImpl = class {
 			const delay = send.delay !== void 0 ? millisOrDurationToMillis(send.delay) : void 0;
 			const handles = this.coreVm.sys_send(send.service, send.method, parameter, send.key, send.headers ? Object.entries(send.headers).map(([key, value]) => new WasmHeader(key, value)) : [], delay !== void 0 && delay > 0 ? BigInt(delay) : void 0, send.idempotencyKey, send.scope, send.limitKey, send.name);
 			const commandIndex = this.coreVm.last_command_index();
-			return { invocationId: new SingleRestatePromise(this, handles.invocation_id_completion_id, completeCommandPromiseUsing(WasmCommandType.OneWayCall, commandIndex, InvocationIdCompleter)) };
+			return { invocationId: new SingleRestatePromise(this, handles.invocation_id_completion_id, completeUsing({ command: {
+				type: WasmCommandType.OneWayCall,
+				index: commandIndex
+			} }, InvocationIdCompleter)) };
 		} catch (e) {
 			this.abortAttempt(e);
 			return { invocationId: pendingPromise() };
@@ -226,7 +257,10 @@ var ContextImpl = class {
 			};
 			this.runClosuresTracker.registerRunClosure(handle, doRun);
 		}
-		return new SingleRestatePromise(this, handle, completeCommandPromiseUsing(WasmCommandType.Run, commandIndex, SuccessWithSerde(serde$1, this.journalValueCodec), Failure));
+		return new SingleRestatePromise(this, handle, completeUsing({ command: {
+			type: WasmCommandType.Run,
+			index: commandIndex
+		} }, SuccessWithSerde(serde$1, this.journalValueCodec), Failure));
 	}
 	sleep(duration, name) {
 		return this.processCompletableEntry(WasmCommandType.Sleep, () => {
@@ -249,7 +283,7 @@ var ContextImpl = class {
 		}
 		return {
 			id: awakeable.id,
-			promise: new SingleRestatePromise(this, awakeable.handle, completeSignalPromiseUsing(VoidAsUndefined, SuccessWithSerde(serde$1 ?? this.defaultSerde, this.journalValueCodec), Failure))
+			promise: new SingleRestatePromise(this, awakeable.handle, completeUsing({}, VoidAsUndefined, SuccessWithSerde(serde$1 ?? this.defaultSerde, this.journalValueCodec), Failure))
 		};
 	}
 	resolveAwakeable(id, payload, serde$1) {
@@ -273,7 +307,7 @@ var ContextImpl = class {
 			this.abortAttempt(e);
 			return ConstRestatePromise.pending();
 		}
-		return new SingleRestatePromise(this, handle, completeSignalPromiseUsing(VoidAsUndefined, SuccessWithSerde(serde$1 ?? this.defaultSerde, this.journalValueCodec), Failure));
+		return new SingleRestatePromise(this, handle, completeUsing({}, VoidAsUndefined, SuccessWithSerde(serde$1 ?? this.defaultSerde, this.journalValueCodec), Failure));
 	}
 	invocation(invocationId) {
 		return new InvocationReferenceImpl(this, invocationId);
@@ -282,7 +316,7 @@ var ContextImpl = class {
 		return new DurablePromiseImpl(this, name, serde$1);
 	}
 	cancellation() {
-		if (!this.cancellationPromise || this.cancellationPromise.isCompleted()) this.cancellationPromise = new SingleRestatePromise(this, 1, completeSignalPromiseUsing(VoidAsUndefined));
+		if (!this.cancellationPromise || this.cancellationPromise.isCompleted()) this.cancellationPromise = new SingleRestatePromise(this, 1, completeUsing({}, VoidAsUndefined));
 		return this.cancellationPromise;
 	}
 	cancelPreviousCalls() {
@@ -327,7 +361,10 @@ var ContextImpl = class {
 			return ConstRestatePromise.pending();
 		}
 		const commandIndex = this.coreVm.last_command_index();
-		return new SingleRestatePromise(this, handle, completeCommandPromiseUsing(commandType, commandIndex, ...completers));
+		return new SingleRestatePromise(this, handle, completeUsing({ command: {
+			type: commandType,
+			index: commandIndex
+		} }, ...completers));
 	}
 	abortAttempt(e, commandType) {
 		this.invocationEndPromise.reject(commandType !== void 0 ? new CommandError(e, commandType) : ensureError(e));
@@ -426,6 +463,31 @@ var DurablePromiseImpl = class {
 		}), VoidAsUndefined, Failure);
 	}
 };
+var EphemeralRequestTracker = class {
+	pending = /* @__PURE__ */ new Map();
+	constructor(channel) {
+		this.channel = channel;
+	}
+	register(completionId, completer) {
+		const prom = Promise.withResolvers();
+		this.pending.set(completionId, async (value) => {
+			try {
+				await completer(value, prom);
+			} catch (e) {
+				prom.reject(e);
+			}
+		});
+		this.channel.signal();
+		return prom.promise;
+	}
+	async complete(completionId, value) {
+		const complete = this.pending.get(completionId);
+		if (complete === void 0) throw new Error(`Ephemeral request with completion id ${completionId} doesn't exist`);
+		if (value === "NotReady") throw new Error(`Notification for ephemeral request with completion id ${completionId} is not ready. This is unexpected behavior.`);
+		this.pending.delete(completionId);
+		await complete(value);
+	}
+};
 var RunClosuresTracker = class {
 	runsToExecute = /* @__PURE__ */ new Map();
 	constructor(channel) {
@@ -454,22 +516,17 @@ var CommandError = class extends Error {
 		return this.commandIndex !== void 0;
 	}
 };
-function completeCommandPromiseUsing(commandType, commandIndex, ...completers) {
+function completeUsing(meta, ...completers) {
 	return async (value, prom) => {
 		try {
 			for (const completer of completers) if (await completer(value, prom)) return;
 		} catch (e) {
-			throw new CommandError(e, commandType, commandIndex);
+			if (meta.command !== void 0) throw new CommandError(e, meta.command.type, meta.command.index);
+			throw e;
 		}
 		throw new Error(`Unexpected variant in async result: ${JSON.stringify(value)}`);
 	};
 }
-function completeSignalPromiseUsing(...completers) {
-	return async (value, prom) => {
-		for (const completer of completers) if (await completer(value, prom)) return;
-		throw new Error(`Unexpected variant in async result: ${JSON.stringify(value)}`);
-	};
-}
 const VoidAsNull = (value, prom) => {
 	if (value === "Empty") {
 		prom.resolve(null);