Fix webdriver.io interception issue by getting fetch function at call…

… time rather than import time
segmentio · Dec 29, 2022 · e7b9761 · e7b9761
1 parent d8af6fc
commit e7b9761
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 15 deletions.
diff --git a/.changeset/quiet-foxes-approve.md b/.changeset/quiet-foxes-approve.md
@@ -0,0 +1,5 @@
+---
+'@segment/analytics-next': patch
+---
+
+Fix webdriver.io interception bug. Refactor to use native fetch where unfetch is unavailable.
diff --git a/packages/browser/src/browser/index.ts b/packages/browser/src/browser/index.ts
@@ -1,7 +1,7 @@
 import { getProcessEnv } from '../lib/get-process-env'
 import { getCDN, setGlobalCDNUrl } from '../lib/parse-cdn'
 
-import fetch from 'unfetch'
+import { fetch } from '../lib/fetch'
 import { Analytics, AnalyticsSettings, InitOptions } from '../core/analytics'
 import { Context } from '../core/context'
 import { Plan } from '../core/events'

diff --git a/packages/browser/src/core/stats/remote-metrics.ts b/packages/browser/src/core/stats/remote-metrics.ts
@@ -1,4 +1,4 @@
-import fetch from 'unfetch'
+import { fetch } from '../../lib/fetch'
 import { version } from '../../generated/version'
 import { getVersionType } from '../../plugins/segmentio/normalize'
 

diff --git a/packages/browser/src/lib/fetch.ts b/packages/browser/src/lib/fetch.ts
@@ -0,0 +1,15 @@
+import unfetch from 'unfetch'
+import { getGlobal } from './get-global'
+
+/**
+ * Wrapper around native `fetch` containing `unfetch` fallback.
+ */
+export const fetch: typeof unfetch = (...args) => {
+  const global = getGlobal()
+  let fetch = unfetch
+
+  if (global && global.fetch) {
+    fetch = global.fetch
+  }
+  return fetch(...args)
+}
diff --git a/packages/browser/src/plugins/segmentio/batched-dispatcher.ts b/packages/browser/src/plugins/segmentio/batched-dispatcher.ts
@@ -1,12 +1,7 @@
-import unfetch from 'unfetch'
 import { SegmentEvent } from '../../core/events'
+import { fetch } from '../../lib/fetch'
 import { onPageLeave } from '../../lib/on-page-leave'
 
-let fetch = unfetch
-if (typeof window !== 'undefined') {
-  fetch = window.fetch || unfetch
-}
-
 type BatchingConfig = {
   size?: number
   timeout?: number
@@ -61,7 +56,6 @@ export default function batch(apiHost: string, config?: BatchingConfig) {
     }
 
     const writeKey = (batch[0] as SegmentEvent)?.writeKey
-
     return fetch(`https://${apiHost}/b`, {
       keepalive: pageUnloaded,
       headers: {

diff --git a/packages/browser/src/plugins/segmentio/fetch-dispatcher.ts b/packages/browser/src/plugins/segmentio/fetch-dispatcher.ts
@@ -1,13 +1,8 @@
-import unfetch from 'unfetch'
-
+import { fetch } from '../../lib/fetch'
 export type Dispatcher = (url: string, body: object) => Promise<unknown>
 
 export default function (): { dispatch: Dispatcher } {
   function dispatch(url: string, body: object): Promise<unknown> {
-    let fetch = unfetch
-    if (typeof window !== 'undefined') {
-      fetch = window.fetch || unfetch
-    }
     return fetch(url, {
       headers: { 'Content-Type': 'text/plain' },
       method: 'post',