From 251cba56d9103c9ac38f9b98b69ee953ce23111e Mon Sep 17 00:00:00 2001
From: Melonai <einebeere@gmail.com>
Date: Wed, 14 Jul 2021 19:36:29 +0200
Subject: Started better typing for message handler

---
 assets/src/network/transfer/request_transfer.ts |  6 +++---
 assets/src/network/transfer/share_transfer.ts   | 11 ++++++-----
 assets/src/network/transfer/transfer.ts         |  4 ++--
 3 files changed, 11 insertions(+), 10 deletions(-)

(limited to 'assets/src/network/transfer')

diff --git a/assets/src/network/transfer/request_transfer.ts b/assets/src/network/transfer/request_transfer.ts
index 317f5e5..e69a9a8 100644
--- a/assets/src/network/transfer/request_transfer.ts
+++ b/assets/src/network/transfer/request_transfer.ts
@@ -1,6 +1,6 @@
 import data from "../../stores/data";
 import { on, send } from "../channel/connection";
-import type { RequestIceCandidateMessage } from "../channel/messages/messages";
+import type { ShareIceCandidateMessage } from "../channel/messages/messages";
 import {
     createTransfer,
     onIncomingIceCandidate,
@@ -27,8 +27,8 @@ export async function createAnswerTransfer(
     };
 
     const unregisterIce = on(
-        "ice_candidate",
-        (message: RequestIceCandidateMessage) =>
+        "share_ice_candidate",
+        (message: ShareIceCandidateMessage) =>
             onIncomingIceCandidate(transfer, message)
     );
 
diff --git a/assets/src/network/transfer/share_transfer.ts b/assets/src/network/transfer/share_transfer.ts
index fc6df9c..16ad68a 100644
--- a/assets/src/network/transfer/share_transfer.ts
+++ b/assets/src/network/transfer/share_transfer.ts
@@ -1,11 +1,12 @@
 import { get } from "svelte/store";
 import dataStore from "../../stores/data";
 import { onWithToken, send } from "../channel/connection";
-import type { UnregisterHandler } from "../channel/messages/handler";
+import type { Unregister } from "../channel/messages/event_handler";
 import type {
     RequestIceCandidateMessage,
     ShareAcceptedMessage,
 } from "../channel/messages/messages";
+import { connectSocket } from "../channel/socket";
 import {
     createTransfer,
     onIncomingIceCandidate,
@@ -34,10 +35,10 @@ export async function createOfferTransfer(
         type: offer.type,
     });
 
-    onWithToken(
+    const unregister: Unregister = onWithToken(
         "share_accepted",
         request_token,
-        (message: ShareAcceptedMessage, unregister) =>
+        (message: ShareAcceptedMessage) =>
             onShareAccepted(transfer, message, unregister)
     );
 
@@ -47,7 +48,7 @@ export async function createOfferTransfer(
 function onShareAccepted(
     transfer: Transfer,
     message: ShareAcceptedMessage,
-    unregister: UnregisterHandler
+    unregister: Unregister
 ) {
     const token = message.token;
 
@@ -55,7 +56,7 @@ function onShareAccepted(
     transfer.pc.setRemoteDescription(answerDescription);
 
     const unregisterIce = onWithToken(
-        "ice_candidate",
+        "request_ice_candidate",
         token,
         (message: RequestIceCandidateMessage) =>
             onIncomingIceCandidate(transfer, message)
diff --git a/assets/src/network/transfer/transfer.ts b/assets/src/network/transfer/transfer.ts
index 7641c17..a0df5bb 100644
--- a/assets/src/network/transfer/transfer.ts
+++ b/assets/src/network/transfer/transfer.ts
@@ -1,7 +1,7 @@
 import { Writable, writable } from "svelte/store";
 import type { IncomingRequest } from "../../models/incoming_request";
 import type { OwnRequest } from "../../models/own_request";
-import type { UnregisterHandler } from "../channel/messages/handler";
+import type { Unregister } from "../channel/messages/event_handler";
 import type {
     RequestIceCandidateMessage,
     ShareIceCandidateMessage,
@@ -83,7 +83,7 @@ export function onIncomingIceCandidate(
 
 export function unregisterIceOnComplete(
     transfer: Transfer,
-    unregister: UnregisterHandler
+    unregister: Unregister
 ) {
     transfer.pc.onicegatheringstatechange = event => {
         const connection = event.target as any;
-- 
cgit 1.4.1