From 631a39aecacf6e62ddc13ad4c8f3c81a0f5f49c7 Mon Sep 17 00:00:00 2001
From: Melonai <einebeere@gmail.com>
Date: Thu, 3 Jun 2021 15:37:52 +0200
Subject: Remove circular channel dependency

---
 assets/src/network/channel/connection.ts | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

(limited to 'assets/src/network/channel/connection.ts')

diff --git a/assets/src/network/channel/connection.ts b/assets/src/network/channel/connection.ts
index 6d6f3de..59eb633 100644
--- a/assets/src/network/channel/connection.ts
+++ b/assets/src/network/channel/connection.ts
@@ -69,7 +69,13 @@ export function onWithToken<Message extends AnyMessage>(
     token: string | null,
     handler: Handler<Message>
 ): UnregisterHandler {
-    return registerTokenHandler(connection.handlers, event, token, handler);
+    return registerTokenHandler(
+        connection.handlers,
+        connection.channel,
+        event,
+        token,
+        handler
+    );
 }
 
 export function on<Message extends AnyMessage>(
@@ -87,14 +93,6 @@ export function getOwnToken(): string {
     return connection.token;
 }
 
-export function getChannel(): Channel {
-    if (connection.state <= ConnectionState.FETCHING_TOKEN) {
-        throw new Error("There is no channel yet.");
-    }
-
-    return connection.channel;
-}
-
 function updateState(state: ConnectionState) {
     // TODO: Notify state listeners
     connection.state = state;
-- 
cgit 1.4.1