Update Fetch and HttpFetcher so they can be called in a web worker script as well.

Author: bitspittle

frontend/browser-ext/src/jsMain/kotlin/com/varabyte/kobweb/browser/http/Fetch.kt

@@ -1,13 +1,13 @@
 package com.varabyte.kobweb.browser.http
 
-import kotlinx.browser.window
+import com.varabyte.kobweb.browser.coroutines.asCoroutineDispatcher
 import kotlinx.coroutines.CompletableDeferred
+import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.asCoroutineDispatcher
 import kotlinx.coroutines.launch
 import org.khronos.webgl.Int8Array
 import org.khronos.webgl.get
-import org.w3c.dom.Window
+import org.w3c.dom.WindowOrWorkerGlobalScope
 import org.w3c.fetch.RequestInit
 import org.w3c.fetch.RequestRedirect
 import org.w3c.fetch.Response
@@ -42,8 +42,8 @@ private suspend fun Response.getBodyBytes(): ByteArray {
     }
 }
 
-private fun Response.getBodyBytesAsync(result: (ByteArray) -> Unit) {
-    CoroutineScope(window.asCoroutineDispatcher()).launch {
+private fun Response.getBodyBytesAsync(dispatcher: CoroutineDispatcher, result: (ByteArray) -> Unit) {
+    CoroutineScope(dispatcher).launch {
         result(getBodyBytes())
     }
 }
@@ -84,7 +84,7 @@ object FetchDefaults {
 }
 
 @Deprecated("DO NOT IGNORE. Please change to `fetchBytes` instead. This method will be modified soon in a backwards incompatible way, in order to support additional cases that the current form doesn't support.", replaceWith = ReplaceWith("fetchBytes(method, resource, headers, body, redirect, abortController)"))
-suspend fun Window.fetch(
+suspend fun WindowOrWorkerGlobalScope.fetch(
     method: HttpMethod,
     resource: String,
     headers: Map<String, Any>? = FetchDefaults.Headers,
@@ -104,7 +104,7 @@ suspend fun Window.fetch(
  * @param headers An optional map of headers to send with the request. Note: If a body is specified, the
  *   `Content-Length` header will be automatically set. However, any headers set manually will always take precedence.
  */
-suspend fun Window.fetchBytes(
+suspend fun WindowOrWorkerGlobalScope.fetchBytes(
     method: HttpMethod,
     resource: String,
     headers: Map<String, Any>? = FetchDefaults.Headers,
@@ -138,12 +138,12 @@ suspend fun Window.fetchBytes(
         requestInitDynamic["signal"] = abortController.signal
     }
 
-    val _ = window.fetch(resource, requestInit).then(
+    val _ = fetch(resource, requestInit).then(
         onFulfilled = { res ->
             if (res.ok) {
-                res.getBodyBytesAsync { bodyBytes -> responseBytesDeferred.complete(bodyBytes) }
+                res.getBodyBytesAsync(this.asCoroutineDispatcher()) { bodyBytes -> responseBytesDeferred.complete(bodyBytes) }
             } else {
-                res.getBodyBytesAsync { bodyBytes ->
+                res.getBodyBytesAsync(this.asCoroutineDispatcher()) { bodyBytes ->
                     responseBytesDeferred.completeExceptionally(ResponseException(res, bodyBytes))
                 }
             }
@@ -154,7 +154,7 @@ suspend fun Window.fetchBytes(
 }
 
 @Deprecated("DO NOT IGNORE. Please change to `tryFetchBytes` instead. This method will be modified soon in a backwards incompatible way, in order to support additional cases that the current form doesn't support.", replaceWith = ReplaceWith("tryFetchBytes(method, resource, headers, body, redirect, logOnError, abortController)"))
-suspend fun Window.tryFetch(
+suspend fun WindowOrWorkerGlobalScope.tryFetch(
     method: HttpMethod,
     resource: String,
     headers: Map<String, Any>? = FetchDefaults.Headers,
@@ -167,7 +167,7 @@ suspend fun Window.tryFetch(
 /**
  * Like [fetchBytes] but returns null if the fetch fails for any reason instead of throwing.
  */
-suspend fun Window.tryFetchBytes(
+suspend fun WindowOrWorkerGlobalScope.tryFetchBytes(
     method: HttpMethod,
     resource: String,
     headers: Map<String, Any>? = FetchDefaults.Headers,

frontend/browser-ext/src/jsMain/kotlin/com/varabyte/kobweb/browser/http/HttpFetcher.kt

@@ -2,6 +2,7 @@ package com.varabyte.kobweb.browser.http
 
 import kotlinx.browser.window
 import org.w3c.dom.Window
+import org.w3c.dom.WindowOrWorkerGlobalScope
 import org.w3c.fetch.RequestRedirect
 
 /**
@@ -50,7 +51,7 @@ class AbortController {
  *
  * The class additionally exposes a `logOnError` field which globally applies to all `try...` methods.
  */
-class HttpFetcher(private val window: Window) {
+class HttpFetcher(private val fetchScope: WindowOrWorkerGlobalScope) {
     /**
      * If true, when using any of the "try" methods, log any errors, if they occur, to the console.
      *
@@ -81,7 +82,7 @@ class HttpFetcher(private val window: Window) {
         headers: Map<String, Any>? = FetchDefaults.Headers,
         redirect: RequestRedirect? = FetchDefaults.Redirect,
         abortController: AbortController? = null
-    ): ByteArray = window.fetchBytes(HttpMethod.DELETE, resource, headers, body = null, redirect, abortController)
+    ): ByteArray = fetchScope.fetchBytes(HttpMethod.DELETE, resource, headers, body = null, redirect, abortController)
 
     /**
      * Like [delete], but returns null if the request failed for any reason.
@@ -107,7 +108,7 @@ class HttpFetcher(private val window: Window) {
         redirect: RequestRedirect? = FetchDefaults.Redirect,
         abortController: AbortController? = null
     ): ByteArray? =
-        window.tryFetchBytes(HttpMethod.DELETE, resource, headers, body = null, redirect, logOnError, abortController)
+        fetchScope.tryFetchBytes(HttpMethod.DELETE, resource, headers, body = null, redirect, logOnError, abortController)
 
     /**
      * Call GET on a target resource.
@@ -132,7 +133,7 @@ class HttpFetcher(private val window: Window) {
         headers: Map<String, Any>? = FetchDefaults.Headers,
         redirect: RequestRedirect? = FetchDefaults.Redirect,
         abortController: AbortController? = null
-    ): ByteArray = window.fetchBytes(HttpMethod.GET, resource, headers, body = null, redirect, abortController)
+    ): ByteArray = fetchScope.fetchBytes(HttpMethod.GET, resource, headers, body = null, redirect, abortController)
 
     /**
      * Like [get], but returns null if the request failed for any reason.
@@ -158,7 +159,7 @@ class HttpFetcher(private val window: Window) {
         redirect: RequestRedirect? = FetchDefaults.Redirect,
         abortController: AbortController? = null
     ): ByteArray? =
-        window.tryFetchBytes(HttpMethod.GET, resource, headers, body = null, redirect, logOnError, abortController)
+        fetchScope.tryFetchBytes(HttpMethod.GET, resource, headers, body = null, redirect, logOnError, abortController)
 
     /**
      * Call HEAD on a target resource.
@@ -183,7 +184,7 @@ class HttpFetcher(private val window: Window) {
         headers: Map<String, Any>? = FetchDefaults.Headers,
         redirect: RequestRedirect? = FetchDefaults.Redirect,
         abortController: AbortController? = null
-    ): ByteArray = window.fetchBytes(HttpMethod.HEAD, resource, headers, body = null, redirect, abortController)
+    ): ByteArray = fetchScope.fetchBytes(HttpMethod.HEAD, resource, headers, body = null, redirect, abortController)
 
     /**
      * Like [head], but returns null if the request failed for any reason.
@@ -209,7 +210,7 @@ class HttpFetcher(private val window: Window) {
         redirect: RequestRedirect? = FetchDefaults.Redirect,
         abortController: AbortController? = null
     ): ByteArray? =
-        window.tryFetchBytes(HttpMethod.HEAD, resource, headers, body = null, redirect, logOnError, abortController)
+        fetchScope.tryFetchBytes(HttpMethod.HEAD, resource, headers, body = null, redirect, logOnError, abortController)
 
     /**
      * Call OPTIONS on a target resource.
@@ -234,7 +235,7 @@ class HttpFetcher(private val window: Window) {
         headers: Map<String, Any>? = FetchDefaults.Headers,
         redirect: RequestRedirect? = FetchDefaults.Redirect,
         abortController: AbortController? = null
-    ): ByteArray = window.fetchBytes(HttpMethod.OPTIONS, resource, headers, body = null, redirect, abortController)
+    ): ByteArray = fetchScope.fetchBytes(HttpMethod.OPTIONS, resource, headers, body = null, redirect, abortController)
 
     /**
      * Like [options], but returns null if the request failed for any reason.
@@ -260,7 +261,7 @@ class HttpFetcher(private val window: Window) {
         redirect: RequestRedirect? = FetchDefaults.Redirect,
         abortController: AbortController? = null
     ): ByteArray? =
-        window.tryFetchBytes(HttpMethod.OPTIONS, resource, headers, body = null, redirect, logOnError, abortController)
+        fetchScope.tryFetchBytes(HttpMethod.OPTIONS, resource, headers, body = null, redirect, logOnError, abortController)
 
     /**
      * Call PATCH on a target resource.
@@ -289,7 +290,7 @@ class HttpFetcher(private val window: Window) {
         body: ByteArray? = null,
         redirect: RequestRedirect? = FetchDefaults.Redirect,
         abortController: AbortController? = null
-    ): ByteArray = window.fetchBytes(HttpMethod.PATCH, resource, headers, body, redirect, abortController)
+    ): ByteArray = fetchScope.fetchBytes(HttpMethod.PATCH, resource, headers, body, redirect, abortController)
 
     /**
      * Like [patch], but returns null if the request failed for any reason.
@@ -317,7 +318,7 @@ class HttpFetcher(private val window: Window) {
         redirect: RequestRedirect? = FetchDefaults.Redirect,
         abortController: AbortController? = null
     ): ByteArray? =
-        window.tryFetchBytes(HttpMethod.PATCH, resource, headers, body, redirect, logOnError, abortController)
+        fetchScope.tryFetchBytes(HttpMethod.PATCH, resource, headers, body, redirect, logOnError, abortController)
 
     /**
      * Call POST on a target resource.
@@ -346,7 +347,7 @@ class HttpFetcher(private val window: Window) {
         body: ByteArray? = null,
         redirect: RequestRedirect? = FetchDefaults.Redirect,
         abortController: AbortController? = null
-    ): ByteArray = window.fetchBytes(HttpMethod.POST, resource, headers, body, redirect, abortController)
+    ): ByteArray = fetchScope.fetchBytes(HttpMethod.POST, resource, headers, body, redirect, abortController)
 
     /**
      * Like [post], but returns null if the request failed for any reason.
@@ -374,7 +375,7 @@ class HttpFetcher(private val window: Window) {
         redirect: RequestRedirect? = FetchDefaults.Redirect,
         abortController: AbortController? = null
     ): ByteArray? =
-        window.tryFetchBytes(HttpMethod.POST, resource, headers, body, redirect, logOnError, abortController)
+        fetchScope.tryFetchBytes(HttpMethod.POST, resource, headers, body, redirect, logOnError, abortController)
 
     /**
      * Call PUT on a target resource.
@@ -403,7 +404,7 @@ class HttpFetcher(private val window: Window) {
         body: ByteArray? = null,
         redirect: RequestRedirect? = FetchDefaults.Redirect,
         abortController: AbortController? = null
-    ): ByteArray = window.fetchBytes(HttpMethod.PUT, resource, headers, body, redirect, abortController)
+    ): ByteArray = fetchScope.fetchBytes(HttpMethod.PUT, resource, headers, body, redirect, abortController)
 
     /**
      * Like [put], but returns null if the request failed for any reason.
@@ -430,8 +431,10 @@ class HttpFetcher(private val window: Window) {
         body: ByteArray? = null,
         redirect: RequestRedirect? = FetchDefaults.Redirect,
         abortController: AbortController? = null
-    ): ByteArray? = window.tryFetchBytes(HttpMethod.PUT, resource, headers, body, redirect, logOnError, abortController)
+    ): ByteArray? = fetchScope.tryFetchBytes(HttpMethod.PUT, resource, headers, body, redirect, logOnError, abortController)
 }
 
-@Suppress("unused") // We tie our class to the "Window" class on purpose, so it can be used instead of `fetch`
-val Window.http by lazy { HttpFetcher(window) }
+val WindowOrWorkerGlobalScope.http: HttpFetcher get() = with(this.asDynamic()) {
+    httpFetcher = httpFetcher ?: HttpFetcher(this)
+    httpFetcher
+}