Switching to undici to avoid node >18 dep

Author: geelen

package.json

@@ -21,14 +21,15 @@
   "scripts": {
     "build": "tsup src/index.ts --dts --format esm --external xdg-app-paths",
     "postbuild": "shx chmod +x dist/*.js",
+    "check": "tsc --noEmit",
     "build:watch": "pnpm build --watch"
   },
   "dependencies": {
     "@iarna/toml": "^2.2.5",
     "@modelcontextprotocol/sdk": "^0.6.0",
     "chalk": "^5.3.0",
     "dotenv": "^16.4.5",
-    "node-fetch": "^3.3.2",
+    "undici": "^7.0.0",
     "xdg-app-paths": "^8.3.0",
     "zod": "^3.23.8"
   },
@@ -39,5 +40,8 @@
     "shx": "^0.3.4",
     "tsup": "^8.3.5",
     "typescript": "^5.6.2"
+  },
+  "engines": {
+    "node": ">=16.17.0"
   }
 }

pnpm-lock.yaml

@@ -34,17 +34,17 @@ export async function init(accountTag: string | undefined) {
   )
 
   startSection(`Checking for existing Wrangler auth info`, `Step 1 of 3`)
+  updateStatus(chalk.gray(`If anything goes wrong, try running 'npx wrangler@latest login' manually and retrying.`))
 
   try {
     getAuthTokens()
   } catch (e: any) {
     updateStatus(`${chalk.underline.red('Warning:')} ${chalk.gray(e.message)}`, false)
-    updateStatus(`Running '${chalk.yellow('npx wrangler login')}' and retrying...`)
+    updateStatus(`Running '${chalk.yellow('npx wrangler login')}' and retrying...`, false)
 
     const { stderr, stdout } = await execAsync('npx wrangler@latest login')
-    if (stderr) {
-      throw new Error(stderr)
-    }
+    if (stderr) updateStatus(chalk.gray(stderr))
+
     getAuthTokens()
   }
 
@@ -55,7 +55,7 @@ export async function init(accountTag: string | undefined) {
     if (await refreshToken()) {
       updateStatus('Successfully refreshed access token')
     } else {
-      updateStatus('Failed to refresh access token')
+      throw new Error('Failed to refresh access token')
     }
   }
 

src/init.ts

@@ -1,5 +1,5 @@
 import { Tool } from '@modelcontextprotocol/sdk/types.js'
-import fetch from 'node-fetch'
+import { fetch } from 'undici'
 import { config } from '../utils/helpers'
 import { ToolHandlers } from '../utils/types'
 

src/tools/analytics.ts

@@ -1,6 +1,6 @@
 // Add D1 tool definitions
 import { config, log } from '../utils/helpers'
-import fetch from 'node-fetch'
+import { fetch } from 'undici'
 import { Tool } from '@modelcontextprotocol/sdk/types.js'
 import { ToolHandlers } from '../utils/types'
 
@@ -133,7 +133,7 @@ export async function handleD1CreateDatabase(name: string) {
     throw new Error(`Failed to create D1 database: ${error}`)
   }
 
-  const data = await response.json()
+  const data = (await response.json()) as CloudflareD1DatabasesResponse
   return data.result
 }
 

src/tools/d1.ts

@@ -1,5 +1,5 @@
 import { config, log } from '../utils/helpers'
-import fetch from 'node-fetch'
+import { fetch } from 'undici'
 import { ToolHandlers } from '../utils/types'
 import { Tool } from '@modelcontextprotocol/sdk/types.js'
 

src/tools/kv.ts

@@ -1,6 +1,6 @@
 // Add R2 tool definitions
 import { config, log } from '../utils/helpers'
-import fetch from 'node-fetch'
+import { fetch } from 'undici'
 import { ToolHandlers } from '../utils/types'
 import { Tool } from '@modelcontextprotocol/sdk/types.js'
 

src/tools/r2.ts

@@ -1,5 +1,5 @@
 import { config, log } from '../utils/helpers'
-import fetch from 'node-fetch'
+import { fetch, FormData } from 'undici'
 import { ToolHandlers } from '../utils/types'
 import { Tool } from '@modelcontextprotocol/sdk/types.js'
 

src/tools/workers.ts

@@ -10,6 +10,7 @@ import xdgAppPaths from 'xdg-app-paths'
 import TOML from '@iarna/toml'
 import assert from 'node:assert'
 import { mcpCloudflareVersion } from './helpers'
+import { fetch, Headers, Response, RequestInit, HeadersInit } from 'undici'
 
 export function isDirectory(configPath: string) {
   try {
@@ -406,7 +407,7 @@ function cloneHeaders(headers: HeadersInit | undefined): Record<string, string>
     ? Object.fromEntries(headers.entries())
     : Array.isArray(headers)
       ? Object.fromEntries(headers)
-      : { ...headers }
+      : ({ ...headers } as Record<string, string>)
 }
 
 function addAuthorizationHeaderIfUnspecified(headers: Record<string, string>, auth: ApiCredentials): void {