Remove node-fetch dependency

Author: mnot

package.json

@@ -11,8 +11,6 @@
   "dependencies": {
     "liquidjs": "^10.9.2",
     "marked": "^15.0.0",
-    "node-fetch": "3.1.1",
-    "node-fetch-with-proxy": "^0.1.6",
     "npm": "^11.0.0"
   },
   "scripts": {

test-browser.html

@@ -10,7 +10,7 @@
       import * as display from './test-engine/lib/display.mjs'
       import baseTests from './tests/index.mjs'
 
-      runTests(baseTests, fetch, true)
+      runTests(baseTests, true)
         .then(function() {
           let resultsTarget = document.getElementById('results')
           display.renderTestResults(baseTests, getResults(), testUUIDs, resultsTarget, true)

test-engine/cli.mjs

@@ -1,7 +1,6 @@
 import { runTests, getResults } from './client/runner.mjs'
 import { determineTestResult } from './lib/results.mjs'
 import { GREEN, NC } from './lib/defines.mjs'
-import fetch from 'node-fetch-with-proxy'
 import tests from '../tests/index.mjs'
 
 const baseUrl = process.env.npm_config_base || process.env.npm_package_config_base
@@ -27,7 +26,7 @@ if (testId !== '') {
   testsToRun = tests
 }
 
-await runTests(testsToRun, fetch, false, baseUrl).catch(err => {
+await runTests(testsToRun, false, baseUrl).catch(err => {
   console.error(err)
   process.exit(1)
 })

test-engine/client/config.mjs

@@ -1,18 +1,7 @@
-export let fetch = null
 export let useBrowserCache = false
 export let baseUrl = ''
 export const requestTimeout = 10 // seconds
 
-export function setFetch (call) {
-  if (call !== undefined) {
-    if ('bind' in call) {
-      fetch = call.bind(fetch)
-    } else {
-      fetch = call
-    }
-  }
-}
-
 export function setUseBrowserCache (bool) {
   if (bool !== undefined) useBrowserCache = bool
 }

test-engine/client/fetching.mjs

@@ -11,7 +11,7 @@ export function init (idx, reqConfig, prevResp) {
     init.headers.push(['Cache-Control', 'nothing-to-see-here']) // ditto
   }
   if ('request_method' in reqConfig) init.method = reqConfig.request_method
-  if ('request_headers' in reqConfig) init.headers = reqConfig.request_headers
+  if ('request_headers' in reqConfig) init.headers = init.headers.concat(reqConfig.request_headers)
   if ('magic_ims' in reqConfig && reqConfig.magic_ims === true) {
     for (let i = 0; i < init.headers.length; i++) {
       const header = init.headers[i]

test-engine/client/runner.mjs

@@ -1,8 +1,7 @@
 import * as config from './config.mjs'
 import { makeTest, testResults } from './test.mjs'
 
-export async function runTests (tests, myFetch, browserCache, base, chunkSize = 50) {
-  config.setFetch(myFetch)
+export async function runTests (tests, browserCache, base, chunkSize = 25) {
   config.setBaseUrl(base)
   config.setUseBrowserCache(browserCache)
 

test-engine/client/test.mjs

@@ -33,7 +33,7 @@ export async function makeTest (test) {
         }, config.requestTimeout * 1000)
         init.signal = controller.signal
         if (test.dump === true) clientUtils.logRequest(url, init, reqNum)
-        return config.fetch(url, init)
+        return fetch(url, init)
           .then(response => {
             responses.push(response)
             return checkResponse(test, requests, idx, response)
@@ -61,6 +61,10 @@ export async function makeTest (test) {
     }
   }
 
+  function handleError (err) {
+    console.error(`ERROR: ${uuid} ${err.name} ${err.message}`)
+  }
+
   return clientUtils.putTestConfig(uuid, requests)
     .catch(handleError)
     .then(runNextStep)
@@ -293,7 +297,3 @@ function checkServerRequests (requests, responses, serverState) {
     }
   }
 }
-
-function handleError (err) {
-  console.error(`ERROR: ${err}`)
-}

test-engine/client/utils.mjs

@@ -29,7 +29,7 @@ export async function putTestConfig (uuid, requests) {
     headers: [['content-type', 'application/json']],
     body: JSON.stringify(requests)
   }
-  return config.fetch(`${config.baseUrl}/config/${uuid}`, init)
+  return fetch(`${config.baseUrl}/config/${uuid}`, init)
     .then(response => {
       if (response.status !== 201) {
         let headers = ''
@@ -44,7 +44,7 @@ export async function putTestConfig (uuid, requests) {
 }
 
 export async function getServerState (uuid) {
-  return config.fetch(`${config.baseUrl}/state/${uuid}`)
+  return fetch(`${config.baseUrl}/state/${uuid}`)
     .then(response => {
       if (response.status === 200) {
         return response.text()