Use isomorphic fetch

.github/workflows/ci.yml

@@ -15,7 +15,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [12.x, 14.x, 15.x, 16.x]
+        node-version: [18.x, 19.x, 20.x, 22.x]
 
     steps:
       - uses: actions/checkout@v2

package.json

@@ -3,7 +3,7 @@
   "version": "2.2.15",
   "description": "A simple and easy to use client for the Notion API",
   "engines": {
-    "node": ">=12"
+    "node": ">=18"
   },
   "homepage": "https://developers.notion.com/docs/getting-started",
   "bugs": {
@@ -39,10 +39,6 @@
     "build/package.json",
     "build/src/**"
   ],
-  "dependencies": {
-    "@types/node-fetch": "^2.5.10",
-    "node-fetch": "^2.6.1"
-  },
   "devDependencies": {
     "@types/jest": "^28.1.4",
     "@typescript-eslint/eslint-plugin": "^5.39.0",

src/Client.ts

@@ -77,12 +77,10 @@ import {
   OauthTokenParameters,
   oauthToken,
 } from "./api-endpoints"
-import nodeFetch from "node-fetch"
 import {
   version as PACKAGE_VERSION,
   name as PACKAGE_NAME,
 } from "../package.json"
-import { SupportedFetch } from "./fetch-types"
 
 export interface ClientOptions {
   auth?: string
@@ -91,7 +89,6 @@ export interface ClientOptions {
   logLevel?: LogLevel
   logger?: Logger
   notionVersion?: string
-  fetch?: SupportedFetch
   /** Silently ignored in the browser */
   agent?: Agent
 }
@@ -121,8 +118,6 @@ export default class Client {
   #prefixUrl: string
   #timeoutMs: number
   #notionVersion: string
-  #fetch: SupportedFetch
-  #agent: Agent | undefined
   #userAgent: string
 
   static readonly defaultNotionVersion = "2022-06-28"
@@ -134,8 +129,6 @@ export default class Client {
     this.#prefixUrl = (options?.baseUrl ?? "https://api.notion.com") + "/v1/"
     this.#timeoutMs = options?.timeoutMs ?? 60_000
     this.#notionVersion = options?.notionVersion ?? Client.defaultNotionVersion
-    this.#fetch = options?.fetch ?? nodeFetch
-    this.#agent = options?.agent
     this.#userAgent = `notionhq-client/${PACKAGE_VERSION}`
   }
 
@@ -204,11 +197,10 @@ export default class Client {
     }
     try {
       const response = await RequestTimeoutError.rejectAfterTimeout(
-        this.#fetch(url.toString(), {
+        fetch(url.toString(), {
           method: method.toUpperCase(),
           headers,
           body: bodyAsJsonString,
-          agent: this.#agent,
         }),
         this.#timeoutMs
       )

src/errors.ts

@@ -1,4 +1,3 @@
-import { SupportedResponse } from "./fetch-types"
 import { isObject } from "./utils"
 import { Assert } from "./type-utils"
 
@@ -125,14 +124,14 @@ class HTTPResponseError<
   readonly name: string = "HTTPResponseError"
   readonly code: Code
   readonly status: number
-  readonly headers: SupportedResponse["headers"]
+  readonly headers: Headers
   readonly body: string
 
   constructor(args: {
     code: Code
     status: number
     message: string
-    headers: SupportedResponse["headers"]
+    headers: Headers
     rawBodyText: string
   }) {
     super(args.message)
@@ -184,7 +183,7 @@ export class UnknownHTTPResponseError extends HTTPResponseError<ClientErrorCode.
   constructor(args: {
     status: number
     message: string | undefined
-    headers: SupportedResponse["headers"]
+    headers: Headers
     rawBodyText: string
   }) {
     super({
@@ -232,7 +231,7 @@ export class APIResponseError extends HTTPResponseError<APIErrorCode> {
 }
 
 export function buildRequestError(
-  response: SupportedResponse,
+  response: Response,
   bodyText: string
 ): APIResponseError | UnknownHTTPResponseError {
   const apiErrorResponseBody = parseAPIErrorResponseBody(bodyText)