fix: use @supabase/node-fetch

Author: soedirgo

package-lock.json

@@ -36,7 +36,7 @@
   },
   "homepage": "https://github.com/supabase/functions-js#readme",
   "dependencies": {
-    "cross-fetch": "^3.1.5"
+    "@supabase/node-fetch": "^2.6.14"
   },
   "devDependencies": {
     "@types/jest": "^28.1.0",

package.json

@@ -5,7 +5,8 @@ export const resolveFetch = (customFetch?: Fetch): Fetch => {
   if (customFetch) {
     _fetch = customFetch
   } else if (typeof fetch === 'undefined') {
-    _fetch = async (...args) => await (await import('cross-fetch')).fetch(...args)
+    _fetch = (...args) =>
+      import('@supabase/node-fetch' as any).then(({ default: fetch }) => fetch(...args))
   } else {
     _fetch = fetch
   }

src/helper.ts

@@ -49,7 +49,7 @@ export type FunctionInvokeOptions = {
   /**
    * The HTTP verb of the request
    */
-  method?: "POST"| "GET"| "PUT" | "PATCH" | "DELETE"
+  method?: 'POST' | 'GET' | 'PUT' | 'PATCH' | 'DELETE'
   /**
    * The body of the request.
    */

src/types.ts

@@ -1,22 +1,20 @@
 import { serve } from 'https://deno.land/std@0.130.0/http/server.ts'
 
 serve((req) => {
-  const p = Deno.upgradeHttp(req);
-  
-  (
-    // Run this async IIFE concurrently, first packet won't arrive
-    // until we return HTTP101 response.
-    async () => {
-      const [conn, firstPacket] = await p
-      const decoder = new TextDecoder()
-      const text = decoder.decode(firstPacket)
-      console.log(text)
-      // Hello
-      const uint8Array = new Uint8Array([72, 101, 108, 108, 111])
-      conn.write(uint8Array)
-      conn.close()
-    }
-  )()
+  const p = Deno.upgradeHttp(req)
+
+  // Run this async IIFE concurrently, first packet won't arrive
+  // until we return HTTP101 response.
+  ;(async () => {
+    const [conn, firstPacket] = await p
+    const decoder = new TextDecoder()
+    const text = decoder.decode(firstPacket)
+    console.log(text)
+    // Hello
+    const uint8Array = new Uint8Array([72, 101, 108, 108, 111])
+    conn.write(uint8Array)
+    conn.close()
+  })()
 
   // HTTP101 - Switching Protocols
   return new Response(null, { status: 101 })

test/functions/hijack/index.ts

@@ -1,6 +1,7 @@
 import * as fs from 'fs'
 import { nanoid } from 'nanoid'
-import crossFetch from 'cross-fetch'
+// @ts-ignore
+import nodeFetch from '@supabase/node-fetch'
 import { sign } from 'jsonwebtoken'
 import { GenericContainer, Network, StartedTestContainer, Wait } from 'testcontainers'
 import { ExecResult } from 'testcontainers/dist/docker/types'
@@ -87,7 +88,7 @@ export async function runRelay(
   log(`check function is healthy: ${slug + '-' + id}`)
   for (let ctr = 0; ctr < 30; ctr++) {
     try {
-      const healthCheck = await crossFetch(
+      const healthCheck = await nodeFetch(
         `http://localhost:${startedRelay.getMappedPort(8081)}/${slug}`,
         {
           method: 'POST',

test/relay/container.ts

@@ -1,4 +1,5 @@
-import crossFetch from 'cross-fetch'
+// @ts-ignore
+import nodeFetch from '@supabase/node-fetch'
 
 /**
  * It returns a crossFetch function that uses overridden input: RequestInfo and init?: RequestInit for
@@ -11,5 +12,5 @@ export function getCustomFetch(
   reqInfo: RequestInfo | URL,
   reqInit?: RequestInit | undefined
 ): (input: RequestInfo | URL, init?: RequestInit | undefined) => Promise<Response> {
-  return (input, init) => crossFetch(reqInfo, reqInit)
+  return (input, init) => nodeFetch(reqInfo, reqInit)
 }