From 7a36160bf24f87506caf8e10e25e3506a6a05ca3 Mon Sep 17 00:00:00 2001
From: hensm <m+github@matt.tf>
Date: Wed, 10 Apr 2019 05:34:17 +0100
Subject: [PATCH] Add additional type info to messageRouter

---
 ext/src/lib/messageRouter.ts | 13 +++++++++++--
 ext/src/main.ts              | 12 ++++++++----
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/ext/src/lib/messageRouter.ts b/ext/src/lib/messageRouter.ts
index b5a1780..0b6bc47 100644
--- a/ext/src/lib/messageRouter.ts
+++ b/ext/src/lib/messageRouter.ts
@@ -1,6 +1,15 @@
 "use strict";
 
-type SenderCallback = (message: any, details: any) => void;
+import { Message } from "../types";
+
+
+interface Details {
+    tabId: number
+  , frameId: number
+}
+
+type SenderCallback = (message: Message, details: Details) => void;
+
 
 const routeMap = new Map<string, SenderCallback>();
 
@@ -12,7 +21,7 @@ function deregister (routeName: string) {
     routeMap.delete(routeName);
 }
 
-function handleMessage (message: any, details?: any) {
+function handleMessage (message: Message, details?: Details) {
     const destination = message.subject.split(":")[0];
     if (routeMap.has(destination)) {
         routeMap.get(destination)(message, details);
diff --git a/ext/src/main.ts b/ext/src/main.ts
index ecd77c4..74ef7e2 100755
--- a/ext/src/main.ts
+++ b/ext/src/main.ts
@@ -529,17 +529,21 @@ function onConnectPopup (port: browser.runtime.Port) {
 
 browser.runtime.onConnect.addListener(port => {
     switch (port.name) {
-        case "shim": onConnectShim(port); break;
-        case "popup": onConnectPopup(port); break;
+        case "shim":
+            onConnectShim(port);
+            break;
+        case "popup":
+            onConnectPopup(port);
+            break;
     }
 });
 
 
-messageRouter.register("mirrorCast", (message: object) => {
+messageRouter.register("mirrorCast", message => {
     browser.tabs.sendMessage(mirrorCastTabId, message
           , { frameId: mirrorCastFrameId });
 });
-messageRouter.register("mediaCast", (message: object) => {
+messageRouter.register("mediaCast", message => {
     browser.tabs.sendMessage(mediaCastTabId, message
           , { frameId: mediaCastFrameId });
 });