chore: get rid of AbortController when calling queries on server (#14338)

Author: Rich-Harris

packages/kit/src/runtime/app/server/remote/query.js

@@ -72,21 +72,15 @@ export function query(validate_or_fn, maybe_fn) {
 
 		const { event, state } = get_request_store();
 
-		const abort_controller = new AbortController();
 		/** @type {Promise<any> & Partial<RemoteQuery<any>>} */
-		const promise = get_response(
-			__.id,
-			arg,
-			state,
-			() => run_remote_function(event, state, false, arg, validate, fn),
-			abort_controller.signal
+		const promise = get_response(__.id, arg, state, () =>
+			run_remote_function(event, state, false, arg, validate, fn)
 		);
 
 		promise.catch(() => {});
 
 		/** @param {Output} value */
 		promise.set = (value) => {
-			abort_controller.abort();
 			const { state } = get_request_store();
 			const refreshes = state.refreshes;
 
@@ -97,7 +91,7 @@ export function query(validate_or_fn, maybe_fn) {
 			}
 
 			const cache_key = create_remote_cache_key(__.id, stringify_remote_arg(arg, state.transport));
-			refreshes[cache_key] = Promise.resolve(value);
+			refreshes[cache_key] = (state.remote_data ??= {})[cache_key] = Promise.resolve(value);
 		};
 
 		promise.refresh = () => {
@@ -118,7 +112,6 @@ export function query(validate_or_fn, maybe_fn) {
 		};
 
 		promise.withOverride = () => {
-			abort_controller.abort();
 			throw new Error(`Cannot call '${__.name}.withOverride()' on the server`);
 		};
 

packages/kit/src/runtime/app/server/remote/shared.js

@@ -66,16 +66,14 @@ export function create_validator(validate_or_fn, maybe_fn) {
  * @param {any} arg
  * @param {RequestState} state
  * @param {() => Promise<T>} get_result
- * @param {AbortSignal | undefined=} signal
  * @returns {Promise<T>}
  */
-export async function get_response(id, arg, state, get_result, signal) {
-	if (signal) {
-		await new Promise((r) => setTimeout(r, 0));
-		if (signal.aborted) throw new DOMException('The operation was aborted.', 'AbortError');
-	}
-	const cache_key = create_remote_cache_key(id, stringify_remote_arg(arg, state.transport));
+export async function get_response(id, arg, state, get_result) {
+	// wait a beat, in case `myQuery().set(...)` is immediately called
+	// eslint-disable-next-line @typescript-eslint/await-thenable
+	await 0;
 
+	const cache_key = create_remote_cache_key(id, stringify_remote_arg(arg, state.transport));
 	return ((state.remote_data ??= {})[cache_key] ??= get_result());
 }