Remove circular channel dependency

1 files changed, 7 insertions, 9 deletions

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;