fix: options

Author: ricardogobbosouza

src/runtime/echo.ts

@@ -5,33 +5,27 @@ import { ModuleOptions } from './types'
 
 export class Echo extends BaseEcho {
   ctx: Context;
-  config: ModuleOptions;
 
-  constructor (ctx: Context, config: Partial<ModuleOptions> = {}) {
-    // when enabled authModule, start broadcaster with null
-    // because laravel-echo auto connect https://github.com/laravel/echo/blob/master/src/echo.ts#L23
-    // the connection should be made only when the user logs in
-    super(defu(config.authModule && config.connectOnLogin ? { broadcaster: 'null' } : {}, config))
+  constructor (ctx: Context, options: Partial<ModuleOptions> = {}) {
+    super(defu((ctx.$config || {}).echo || {}, options))
 
     this.ctx = ctx
-    this.ctx.$config = this.ctx.$config || {} // fallback for Nuxt < 2.13
-    this.config = defu(this.ctx.$config.echo || {}, { auth: { headers: {} } }, config)
+    this.options.auth = this.options.auth || {}
   }
 
   async init () {
-    this.options.auth = this.options.auth || {}
     this.options.auth.headers = await this.getHeaders()
     this.watchAuthState()
   }
 
   async getHeaders () {
-    let headers = this.config.auth.headers || {}
+    let headers: any = {}
 
     if (typeof headers === 'function') {
       headers = await headers(this.ctx)
     }
 
-    if (this.config.authModule && this.ctx.app.$auth) {
+    if (this.options.authModule && this.ctx.app.$auth) {
       const strategy = this.ctx.app.$auth.strategy
 
       if (strategy.options.name === 'laravelSanctum') {
@@ -51,41 +45,39 @@ export class Echo extends BaseEcho {
   }
 
   async connect () {
-    if (this.config && this.config.onBeforeConnect) {
-      await this.config.onBeforeConnect()
+    if (this.options.onBeforeConnect) {
+      await this.options.onBeforeConnect().bind(this)
     }
 
     super.connect()
 
-    if (this.config && this.config.onAfterConnect) {
-      await this.config.onAfterConnect()
+    if (this.options.onAfterConnect) {
+      await this.options.onAfterConnect().bind(this)
     }
   }
 
   async disconnect () {
-    if (this.config && this.config.onBeforeDisconnect) {
-      await this.config.onBeforeDisconnect()
+    if (this.options.onBeforeDisconnect) {
+      await this.options.onBeforeDisconnect().bind(this)
     }
 
     super.disconnect()
 
-    if (this.config && this.config.onAfterDisconnect) {
-      await this.config.onAfterDisconnect()
+    if (this.options.onAfterDisconnect) {
+      await this.options.onAfterDisconnect().bind(this)
     }
   }
 
   watchAuthState () {
-    if (this.config.authModule && this.ctx.app.$auth) {
+    if (this.options.authModule && this.ctx.app.$auth) {
       this.ctx.app.$auth.$storage.watchState('loggedIn', async (loggedIn: boolean) => {
         this.options.auth.headers = await this.getHeaders()
 
-        if (this.config.connectOnLogin && loggedIn) {
-          // set broadcaster when user logged in
-          this.options.broadcaster = this.config.broadcaster
+        if (this.options.connectOnLogin && loggedIn) {
           await this.connect()
         }
 
-        if (this.config.disconnectOnLogout && !loggedIn && this.connector) {
+        if (this.options.disconnectOnLogout && !loggedIn && this.connector) {
           await this.disconnect()
         }
       }).bind(this)