fix(cloudflare_workers): correctly construct RequestInit object when …

…calling `fetch`
invertase · Feb 10, 2023 · c75720b · c75720b
1 parent 4d93cdb
commit c75720b
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 30 deletions.
diff --git a/packages/cloudflare_workers/lib/interop/request_init_interop.dart b/packages/cloudflare_workers/lib/interop/request_init_interop.dart
@@ -4,19 +4,19 @@ import 'package:js_bindings/js_bindings.dart' as interop;
 import 'package:edge_runtime/src/interop/utils_interop.dart';
 
 extension CloudflareWorkersRequestInteropExtension on interop.RequestInit {
-  set cf(RequestInitCfProperties properties) {
+  set cf(CloudflareRequestInit properties) {
     js_util.setProperty(this, 'cf', properties);
   }
 }
 
 @anonymous
 @JS()
 @staticInterop
-class RequestInitCfProperties {
-  external factory RequestInitCfProperties();
+class CloudflareRequestInit {
+  external factory CloudflareRequestInit();
 }
 
-extension PropsRequestInitCfProperties on RequestInitCfProperties {
+extension PropsCloudflareRequestInit on CloudflareRequestInit {
   set cacheEverything(bool? value) {
     js_util.setProperty(this, 'cacheEverything', value ?? jsUndefined);
   }

diff --git a/packages/cloudflare_workers/lib/public/request_init.dart b/packages/cloudflare_workers/lib/public/request_init.dart
@@ -31,8 +31,8 @@ class CloudflareRequestInit {
 }
 
 extension CloudflareRequestInitExtension on CloudflareRequestInit {
-  interop.RequestInitCfProperties get delegate {
-    return interop.RequestInitCfProperties()
+  interop.CloudflareRequestInit get delegate {
+    return interop.CloudflareRequestInit()
       ..cacheEverything = cacheEverything
       ..cacheKey = cacheKey
       ..cacheTags = cacheTags

diff --git a/packages/cloudflare_workers/lib/public/top.dart b/packages/cloudflare_workers/lib/public/top.dart
@@ -1,4 +1,4 @@
-import 'dart:js_util';
+import 'dart:js_util' as js_util;
 
 import 'package:edge_runtime/edge_runtime.dart' hide fetch;
 import 'package:edge_runtime/src/headers.dart';
@@ -8,6 +8,7 @@ import 'package:edge_runtime/src/abort.dart';
 import 'package:js_bindings/js_bindings.dart' as interop;
 import 'package:edge_runtime/src/interop/utils_interop.dart' as interop;
 import 'package:edge_runtime/src/interop/scope_interop.dart' as interop;
+import '../interop/request_init_interop.dart' as interop;
 
 import 'request_init.dart';
 
@@ -28,25 +29,33 @@ Future<Response> fetch(
   AbortSignal? signal,
   interop.RequestDuplex? duplex,
 }) async {
-  return responseFromJsObject(await promiseToFuture(interop.fetch(
-    interop.requestFromResource(resource),
-    jsify({
-      // Cloudflare specific properties
-      cf: cf ?? interop.jsUndefined,
-      // Fetch API properties
-      method: method,
-      headers: headers?.delegate,
-      body: body,
-      referrer: referrer,
-      referrerPolicy: referrerPolicy,
-      mode: mode,
-      credentials: credentials,
-      cache: cache,
-      redirect: redirect,
-      integrity: integrity,
-      keepalive: keepalive,
-      signal: signal?.delegate,
-      duplex: duplex,
-    }),
-  )));
+  final init = interop.RequestInit(
+    method: method,
+    headers: headers?.delegate,
+    body: body,
+    referrer: referrer,
+    referrerPolicy: referrerPolicy,
+    mode: mode,
+    credentials: credentials,
+    cache: cache,
+    redirect: redirect,
+    integrity: integrity,
+    keepalive: keepalive,
+    signal: signal?.delegate,
+    duplex: duplex,
+  );
+
+  // Attach the non-standard Cloudflare properties to the Request Init object.
+  if (cf != null) {
+    init.cf = cf.delegate;
+  }
+
+  return responseFromJsObject(
+    await js_util.promiseToFuture(
+      interop.fetch(
+        interop.requestFromResource(resource),
+        init,
+      ),
+    ),
+  );
 }
diff --git a/packages/edge_runtime/lib/src/interop/scope_interop.dart b/packages/edge_runtime/lib/src/interop/scope_interop.dart
@@ -12,8 +12,7 @@ external void addEventListener(
 @js.JS('fetch')
 external Promise<interop.Response> fetch(
   interop.Request request, [
-  // Object, since we need to pass a Map in some cases.
-  Object? init,
+  interop.RequestInit? init,
 ]);
 
 @js.JS('atob')