@supabase/realtime-js 2.7.3 → 2.8.0

package/src/RealtimeClient.ts

@@ -14,6 +14,8 @@ import Serializer from './lib/serializer'
 import RealtimeChannel from './RealtimeChannel'
 import type { RealtimeChannelOptions } from './RealtimeChannel'
 
+type Fetch = typeof fetch
+
 export type RealtimeClientOptions = {
   transport?: WebSocket
   timeout?: number
@@ -25,6 +27,7 @@ export type RealtimeClientOptions = {
   headers?: { [key: string]: string }
   params?: { [key: string]: any }
   log_level?: 'info' | 'debug' | 'warn' | 'error'
+  fetch?: Fetch
 }
 
 export type RealtimeMessage = {
@@ -72,6 +75,7 @@ export default class RealtimeClient {
   }
   eventsPerSecondLimitMs: number = 100
   inThrottle: boolean = false
+  fetch: Fetch
 
   /**
    * Initializes the Socket.
@@ -102,6 +106,9 @@ export default class RealtimeClient {
     if (eventsPerSecond)
       this.eventsPerSecondLimitMs = Math.floor(1000 / eventsPerSecond)
 
+    const accessToken = options?.params?.apikey
+    if (accessToken) this.accessToken = accessToken
+
     this.reconnectAfterMs = options?.reconnectAfterMs
       ? options.reconnectAfterMs
       : (tries: number) => {
@@ -119,6 +126,8 @@ export default class RealtimeClient {
       this.disconnect()
       this.connect()
     }, this.reconnectAfterMs)
+
+    this.fetch = this._resolveFetch(options?.fetch)
   }
 
   /**
@@ -229,10 +238,6 @@ export default class RealtimeClient {
     topic: string,
     params: RealtimeChannelOptions = { config: {} }
   ): RealtimeChannel {
-    if (!this.isConnected()) {
-      this.connect()
-    }
-
     const chan = new RealtimeChannel(`realtime:${topic}`, params, this)
     this.channels.push(chan)
     return chan
@@ -282,6 +287,26 @@ export default class RealtimeClient {
     })
   }
 
+  /**
+   * Use either custom fetch, if provided, or default fetch to make HTTP requests
+   *
+   * @internal
+   */
+  _resolveFetch = (customFetch?: Fetch): Fetch => {
+    let _fetch: Fetch
+    if (customFetch) {
+      _fetch = customFetch
+    } else if (typeof fetch === 'undefined') {
+      _fetch = (...args) =>
+        import('@supabase/node-fetch' as any).then(({ default: fetch }) =>
+          fetch(...args)
+        )
+    } else {
+      _fetch = fetch
+    }
+    return (...args) => _fetch(...args)
+  }
+
   /**
    * Return the next message ref, accounting for overflows
    *

package/src/lib/version.ts

@@ -1 +1 @@
-export const version = '2.7.3'
+export const version = '2.8.0'