async-lube 2.0.0 → 2.1.0

package/src/http/sse.js

@@ -63,11 +63,15 @@ const stable_delay = 5000
  */
 function check_sse_options(options) {
 	for (const key of Object.keys(options)) {
-		if (request_only_keys.has(key)) throw TypeError(`Unknown sse option "${key}"`)
+		if (request_only_keys.has(key)) {
+			throw TypeError(`Unknown sse option "${key}"`)
+		}
+	}
+	if (options.as != null && options.as != "json" && options.as != "text") {
+		throw TypeError(
+			"The as of sse() must be \"json\" or \"text\""
+		)
 	}
-	if (options.as != null && options.as != "json" && options.as != "text") throw TypeError(
-		"The as of sse() must be \"json\" or \"text\""
-	)
 	check_reconnect(options.reconnect, "sse")
 }
 /**
@@ -76,8 +80,8 @@ function check_sse_options(options) {
  */
 function is_reconnectable(error) {
 	return error instanceof NetworkError
-	|| error instanceof TimeoutError
-	|| error instanceof HttpError && (error.status < 400 || error.status >= 500 || sse_retry_statuses.has(error.status))
+		|| error instanceof TimeoutError
+		|| error instanceof HttpError && (error.status < 400 || error.status >= 500 || sse_retry_statuses.has(error.status))
 }
 /**
  * @param {string} data
@@ -121,6 +125,45 @@ export function sse(c, path, params, options) {
 			}
 		)
 		: noop
+	return {
+		[Symbol.asyncIterator]() {
+			const controller = new AbortController()
+			current = controller
+			return watch_records(
+				connect(controller),
+				left => {
+					if (!left) {
+						return
+					}
+					controller.abort(
+						new CancelError("The event stream was closed")
+					)
+					if (current == controller) {
+						set_status(
+							closed.signal.aborted ? "closed" : "idle"
+						)
+					}
+				}
+			)
+		},
+		/**
+		 * @param {unknown} reason
+		 * @returns {void}
+		 */
+		cancel(reason) {
+			unwatch()
+			closed.abort(
+				new CancelError(reason ?? "Cancelled")
+			)
+			set_status("closed")
+		},
+		get lastEventId() {
+			return last_event_id
+		},
+		get status() {
+			return options.signal?.aborted ? "closed" : stream_status
+		}
+	}
 	/**
 	 * @param {AbortController} controller
 	 * @returns {AsyncGenerator<import("../../public.js").ServerEvent<unknown>, void, undefined>}
@@ -133,19 +176,16 @@ export function sse(c, path, params, options) {
 		let last_error
 		/** @type {number | undefined} */
 		let server_retry
-		/**
-		 * @param {import("../../public.js").ConnectionStatus} next
-		 * @returns {void}
-		 */
-		function show(next) {
-			if (current == controller && !controller.signal.aborted) set_status(next)
-		}
 		try {
-			if (controller.signal.aborted) return
+			if (controller.signal.aborted) {
+				return
+			}
 			show("connecting")
-			if (reconnect && options.body instanceof ReadableStream) throw TypeError(
-				"An event stream with a ReadableStream body cannot reconnect: set reconnect to false"
-			)
+			if (reconnect && options.body instanceof ReadableStream) {
+				throw TypeError(
+					"An event stream with a ReadableStream body cannot reconnect: set reconnect to false"
+				)
+			}
 			for (;;) {
 				const connection = new AbortController()
 				let opened_at = 0
@@ -155,10 +195,12 @@ export function sse(c, path, params, options) {
 				try {
 					const headers = new Headers(options.headers)
 					headers.set("Accept", "text/event-stream")
-					if (last_event_id) headers.set(
-						"Last-Event-ID",
-						to_byte_string(last_event_id)
-					)
+					if (last_event_id) {
+						headers.set(
+							"Last-Event-ID",
+							to_byte_string(last_event_id)
+						)
+					}
 					/** @type {import("../../public.js").RawResponse<unknown>} */
 					const {
 						data,
@@ -183,7 +225,9 @@ export function sse(c, path, params, options) {
 						true
 					)
 						.raw()
-					if (status == 204) return
+					if (status == 204) {
+						return
+					}
 					if (!event_stream_regex.test(
 						response_headers.get("Content-Type") ?? ""
 					)) {
@@ -196,9 +240,11 @@ export function sse(c, path, params, options) {
 					show("open")
 					const records = /** @type {AsyncIterable<StreamRecord>} */(data)/**/
 					for await (const record of records) {
-						if (record.type == "retry") server_retry = record.retry
-						else if (record.type == "id") last_event_id = record.id
-						else {
+						if (record.type == "retry") {
+							server_retry = record.retry
+						} else if (record.type == "id") {
+							last_event_id = record.id
+						} else {
 							last_event_id = record.event.id
 							const event_data = as_json ? read_json(record.event.data) : record.event.data
 							if (!parse) {
@@ -226,11 +272,17 @@ export function sse(c, path, params, options) {
 					}
 					failures = 0
 				} catch (error) {
-					if (controller.signal.aborted) return
+					if (controller.signal.aborted) {
+						return
+					}
 					last_error = error
 					report(c, error)
-					if (opened_at && Date.now() - opened_at >= stable_delay) failures = 0
-					if (error === fatal || !reconnect || !is_reconnectable(error) || ++failures > reconnect_count) throw error
+					if (opened_at && Date.now() - opened_at >= stable_delay) {
+						failures = 0
+					}
+					if (error === fatal || !reconnect || !is_reconnectable(error) || ++failures > reconnect_count) {
+						throw error
+					}
 				} finally {
 					unlink_connection()
 					connection.abort(
@@ -239,79 +291,65 @@ export function sse(c, path, params, options) {
 						)
 					)
 				}
-				if (!reconnect || controller.signal.aborted) return
+				if (!reconnect || controller.signal.aborted) {
+					return
+				}
 				show("connecting")
 				const delay = failures
 					? get_reconnect_wait(reconnect, failures, last_error)
 					: server_retry ?? 3000
-				if (delay == null) throw last_error
+				if (delay == null) {
+					throw last_error
+				}
 				await wait(
 					delay,
 					controller.signal,
 					!!failures && read_retry_after(last_error) == null
 				)
-				if (controller.signal.aborted) return
+				if (controller.signal.aborted) {
+					return
+				}
 			}
 		} catch (error) {
-			if (error !== last_error) report(c, error)
+			if (error !== last_error) {
+				report(c, error)
+			}
 			throw error
 		} finally {
-			if (current == controller) set_status(
-				closed.signal.aborted ? "closed" : "idle"
-			)
+			if (current == controller) {
+				set_status(
+					closed.signal.aborted ? "closed" : "idle"
+				)
+			}
 			unlink()
 			unlink_closed()
 			controller.abort(
 				new CancelError("The event stream was closed")
 			)
 		}
+		/**
+		 * @param {import("../../public.js").ConnectionStatus} next
+		 * @returns {void}
+		 */
+		function show(next) {
+			if (current == controller && !controller.signal.aborted) {
+				set_status(next)
+			}
+		}
 	}
 	/**
 	 * @param {import("../../public.js").ConnectionStatus} next
 	 * @returns {void}
 	 */
 	function set_status(next) {
-		if (stream_status == next) return
+		if (stream_status == next) {
+			return
+		}
 		stream_status = next
 		try {
 			options.onStatus?.(next)
 		} catch {}
 	}
-	return {
-		[Symbol.asyncIterator]() {
-			const controller = new AbortController()
-			current = controller
-			return watch_records(
-				connect(controller),
-				left => {
-					if (!left) return
-					controller.abort(
-						new CancelError("The event stream was closed")
-					)
-					if (current == controller) set_status(
-						closed.signal.aborted ? "closed" : "idle"
-					)
-				}
-			)
-		},
-		/**
-		 * @param {unknown} reason
-		 * @returns {void}
-		 */
-		cancel(reason) {
-			unwatch()
-			closed.abort(
-				new CancelError(reason ?? "Cancelled")
-			)
-			set_status("closed")
-		},
-		get lastEventId() {
-			return last_event_id
-		},
-		get status() {
-			return options.signal?.aborted ? "closed" : stream_status
-		}
-	}
 }
 /**
  * @param {number} delay
@@ -330,15 +368,16 @@ function wait(delay, signal, online) {
 				resolve()
 				return
 			}
+			const timer = setTimeout(done, clamp_delay(delay))
+			const unwatch = on_abort(signal, done)
+			globalThis.addEventListener("online", done)
+			/** @returns {void} */
 			function done() {
 				clearTimeout(timer)
 				unwatch()
 				globalThis.removeEventListener("online", done)
 				resolve()
 			}
-			const timer = setTimeout(done, clamp_delay(delay))
-			const unwatch = on_abort(signal, done)
-			globalThis.addEventListener("online", done)
 		}
 	)
 }

package/src/http/throttle.js

@@ -24,15 +24,20 @@ export async function throttle(c, key, ms, cancel, signal) {
 		try {
 			await sleep(Math.max(wait, 0), signal)
 		} finally {
-			if (current.cancel == cancel) current.cancel = void 0
+			if (current.cancel == cancel) {
+				current.cancel = void 0
+			}
 		}
 	}
 	current.next = Date.now() + ms
-	const sweeper = /** @type {{ unref?: () => void }} */(/** @type {unknown} */(setTimeout(
+	/** @type {{ unref?: () => void }} */
+	const sweeper = setTimeout(
 		() => {
-			if (!current.cancel && Date.now() >= current.next && c.shared.throttles.get(key) == current) c.shared.throttles.delete(key)
+			if (!current.cancel && Date.now() >= current.next && c.shared.throttles.get(key) == current) {
+				c.shared.throttles.delete(key)
+			}
 		},
 		clamp_delay(ms)
-	)))/**/
+	)
 	sweeper.unref?.()
 }

package/src/http/url.js

@@ -10,13 +10,19 @@ const trailing_slash_regex = /\/+$/
  * @returns {string}
  */
 function add_query(url, query, first) {
-	if (!query) return url
+	if (!query) {
+		return url
+	}
 	const hash_index = url.indexOf("#")
 	const without_hash = hash_index < 0 ? url : url.slice(0, hash_index)
 	const hash = hash_index < 0 ? "" : url.slice(hash_index)
 	const query_index = without_hash.indexOf("?")
-	if (query_index < 0) return without_hash + "?" + query + hash
-	if (!first) return without_hash + "&" + query + hash
+	if (query_index < 0) {
+		return without_hash + "?" + query + hash
+	}
+	if (!first) {
+		return without_hash + "&" + query + hash
+	}
 	const existing = without_hash.slice(query_index + 1)
 	return without_hash.slice(0, query_index + 1) + query + (existing ? "&" + existing : "") + hash
 }
@@ -27,17 +33,26 @@ function add_query(url, query, first) {
  * @returns {void}
  */
 function append_query(pairs, key, value) {
-	if (value == null) return
+	if (value == null) {
+		return
+	}
 	if (Array.isArray(value)) {
-		for (const item of /** @type {readonly import("../../public.js").QueryValue[]} */(value)/**/) append_query(pairs, key, item)
-	} else if (value instanceof Date) pairs.push([ key, value.toISOString() ])
-	else if (typeof value == "object") {
-		for (const name of Object.keys(value)) append_query(
-			pairs,
-			`${key}[${name}]`,
-			/** @type {{ readonly [key: string]: import("../../public.js").QueryValue }} */(value)/**/[name]
-		)
-	} else pairs.push([ key, String(value) ])
+		for (const item of /** @type {readonly import("../../public.js").QueryValue[]} */(value)/**/) {
+			append_query(pairs, key, item)
+		}
+	} else if (value instanceof Date) {
+		pairs.push([ key, value.toISOString() ])
+	} else if (typeof value == "object") {
+		for (const name of Object.keys(value)) {
+			append_query(
+				pairs,
+				`${key}[${name}]`,
+				/** @type {{ readonly [key: string]: import("../../public.js").QueryValue }} */(value)/**/[name]
+			)
+		}
+	} else {
+		pairs.push([ key, String(value) ])
+	}
 }
 /**
  * @param {string | undefined} base
@@ -57,6 +72,23 @@ export function build_url(
 	const rest = { ...source }
 	/** @type {string[]} */
 	const used = []
+	let url = fill(path)
+	if (base && !absolute_regex.test(url)) {
+		const split_index = base.search(/[?#]/)
+		const base_path = fill(
+			split_index < 0 ? base : base.slice(0, split_index)
+		)
+		const base_query = split_index < 0 || base[split_index] != "?"
+			? ""
+			: /** @type {string} */(base.slice(split_index + 1).split("#")[0])/**/
+		const trimmed = url.replace(leading_slash_regex, "")
+		url = base_path.replace(trailing_slash_regex, "") + (trimmed && !trimmed.startsWith("?") ? "/" : "") + trimmed
+		url = add_query(url, base_query, true)
+	}
+	for (const name of used) {
+		delete rest[name]
+	}
+	return add_query(url, serialize(rest), false)
 	/**
 	 * @param {string} text
 	 * @returns {string}
@@ -73,33 +105,22 @@ export function build_url(
 					: value instanceof Date
 						? value.toISOString()
 						: String(value)
-				if (!value_text) throw TypeError(
-					`Missing path parameter "${name}" for ${text}`
-				)
-				if (dot_segment_regex.test(value_text)) throw TypeError(
-					`Path parameter "${name}" cannot be "${value_text}"`
-				)
+				if (!value_text) {
+					throw TypeError(
+						`Missing path parameter "${name}" for ${text}`
+					)
+				}
+				if (dot_segment_regex.test(value_text)) {
+					throw TypeError(
+						`Path parameter "${name}" cannot be "${value_text}"`
+					)
+				}
 				used.push(name)
 				return "/" + encodeURIComponent(value_text)
 			}
 		)
 		return split_index < 0 ? filled : filled + text.slice(split_index)
 	}
-	let url = fill(path)
-	if (base && !absolute_regex.test(url)) {
-		const split_index = base.search(/[?#]/)
-		const base_path = fill(
-			split_index < 0 ? base : base.slice(0, split_index)
-		)
-		const base_query = split_index < 0 || base[split_index] != "?"
-			? ""
-			: base.slice(split_index + 1).split("#")[0] ?? ""
-		const trimmed = url.replace(leading_slash_regex, "")
-		url = base_path.replace(trailing_slash_regex, "") + (trimmed && !trimmed.startsWith("?") ? "/" : "") + trimmed
-		url = add_query(url, base_query, true)
-	}
-	for (const name of used) delete rest[name]
-	return add_query(url, serialize(rest), false)
 }
 /**
  * @param {import("../../public.js").QueryParams} params
@@ -108,7 +129,9 @@ export function build_url(
 export function serialize_query(params) {
 	/** @type {[string, string][]} */
 	const pairs = []
-	for (const key of Object.keys(params)) append_query(pairs, key, params[key])
+	for (const key of Object.keys(params)) {
+		append_query(pairs, key, params[key])
+	}
 	return pairs.map(
 		([ key, value ]) => encodeURIComponent(key) + "=" + encodeURIComponent(value)
 	)

package/src/http/xhr.js

@@ -3,7 +3,7 @@ const header_line_regex = /\r?\n/
 const null_body_statuses = new Set([ 101, 103, 204, 205, 304 ])
 /**
  * @param {string} url
- * @param {RequestInit & { headers: Headers }} init
+ * @param {RequestInit & { headers: Headers, method: string }} init
  * @param {(progress: import("../../public.js").Progress) => void} on_upload
  * @returns {Promise<Response>}
  */
@@ -12,24 +12,7 @@ export function send_with_xhr(url, init, on_upload) {
 		(resolve, reject) => {
 			const xhr = new XMLHttpRequest()
 			const signal = init.signal
-			function abort() {
-				return xhr.abort()
-			}
-			/**
-			 * @param {() => void} settle
-			 * @returns {() => void}
-			 */
-			function finish(settle) {
-				return () => {
-					signal?.removeEventListener("abort", abort)
-					try {
-						settle()
-					} catch (error) {
-						reject(error)
-					}
-				}
-			}
-			xhr.open(init.method ?? "GET", url)
+			xhr.open(init.method, url)
 			init.headers.forEach(
 				(value, key) => xhr.setRequestHeader(key, value)
 			)
@@ -51,15 +34,19 @@ export function send_with_xhr(url, init, on_upload) {
 			xhr.ontimeout = xhr.onerror
 			xhr.onload = finish(
 				() => {
-					if (!xhr.status) throw TypeError("Network request failed")
+					if (!xhr.status) {
+						throw TypeError("Network request failed")
+					}
 					/** @type {Headers} */
 					const headers = new Headers()
 					for (const line of xhr.getAllResponseHeaders().split(header_line_regex)) {
 						const index = line.indexOf(":")
-						if (index > 0) headers.append(
-							line.slice(0, index).trim(),
-							line.slice(index + 1).trim()
-						)
+						if (index > 0) {
+							headers.append(
+								line.slice(0, index).trim(),
+								line.slice(index + 1).trim()
+							)
+						}
 					}
 					resolve(
 						new Response(
@@ -81,6 +68,24 @@ export function send_with_xhr(url, init, on_upload) {
 			xhr.send(
 				/** @type {XMLHttpRequestBodyInit | null} */(init.body ?? null)/**/
 			)
+			/** @returns {void} */
+			function abort() {
+				return xhr.abort()
+			}
+			/**
+			 * @param {() => void} settle
+			 * @returns {() => void}
+			 */
+			function finish(settle) {
+				return () => {
+					signal?.removeEventListener("abort", abort)
+					try {
+						settle()
+					} catch (error) {
+						reject(error)
+					}
+				}
+			}
 		}
 	)
 }

package/src/index.js

@@ -12,6 +12,7 @@ export { default as flow } from "./flow/index.js"
 export { offload } from "./offload.js"
 export { attempt } from "./attempt.js"
 export { limiter } from "./limiter.js"
+export { redial } from "./redial.js"
 export {
 	buffer,
 	channel,

package/src/key.js

@@ -1,8 +1,6 @@
-/**
- * @returns {string}
- */
+/** @returns {string} */
 export function random_key() {
 	return globalThis.crypto?.randomUUID?.()
-	?? Date.now().toString(36) + Math.random().toString(36)
-		.slice(2)
+		?? Date.now().toString(36) + Math.random().toString(36)
+			.slice(2)
 }