Remove some extension-only messages from app definitions

app/src/bridge/components/receiverSelector.ts

@@ -48,7 +48,7 @@ export function startReceiverSelector (data: string) {
 
             if (!jsonData.mediaType) {
                 sendMessage({
-                    subject: "main:receiverSelector/stop"
+                    subject: "main:receiverSelector/stopped"
                   , data: jsonData
                 });
 
@@ -74,7 +74,7 @@ export function startReceiverSelector (data: string) {
             selectorAppOpen = false;
 
             sendMessage({
-                subject: "main:receiverSelector/close"
+                subject: "main:receiverSelector/cancelled"
             });
         }
     });

app/src/bridge/index.ts

@@ -51,8 +51,8 @@ decodeTransform.on("data", (message: Message) => {
         }
 
         case "bridge:stopReceiverApp": {
-            stopReceiverApp(message.data.receiver.host
+            const { host, port } = message.data.receiver;
-                          , message.data.receiver.port);
+            stopReceiverApp(host, port);
             break;
         }
 
@@ -66,7 +66,8 @@ decodeTransform.on("data", (message: Message) => {
 
         // Media server
         case "bridge:mediaServer/start": {
-            startMediaServer(message.data.filePath, message.data.port);
+            const { filePath, port } = message.data;
+            startMediaServer(filePath, port);
             break;
         }
         case "bridge:mediaServer/stop": {

app/src/bridge/messaging.ts

@@ -7,13 +7,8 @@ import { Receiver
 
 
 type MessageDefinitions = {
-      "shim:serviceUp": { id: Receiver["id"] }
-    , "shim:serviceDown": { id: Receiver["id"] }
-  
-    , "shim:launchApp": { receiver: Receiver }
-  
     // Session messages
-    , "shim:session/stopped": {}
+    "shim:session/stopped": {}
   , "shim:session/connected": {
         sessionId: string
       , namespaces: Array<{ name: string }>
@@ -105,6 +100,7 @@ type MessageDefinitions = {
       , _internalSessionId: string
       , _id: string
     }
+
   , "bridge:media/sendMediaMessage": {
         message: any
       , messageId: string
@@ -113,9 +109,9 @@ type MessageDefinitions = {
 
       // Bridge messages
   , "main:receiverSelector/selected": ReceiverSelectionCast
+  , "main:receiverSelector/stopped": ReceiverSelectionStop
+  , "main:receiverSelector/cancelled": {}
   , "main:receiverSelector/error": string
-    , "main:receiverSelector/close": {}
-    , "main:receiverSelector/stop": ReceiverSelectionStop
 
     /**
      * getInfo uses the old :/ form for compat with old bridge
@@ -124,7 +120,9 @@ type MessageDefinitions = {
   , "bridge:getInfo": string
   , "bridge:/getInfo": string
 
-    , "bridge:initialize": { shouldWatchStatus: boolean }
+  , "bridge:initialize": {
+        shouldWatchStatus: boolean
+    }
 
   , "bridge:receiverSelector/open": any
   , "bridge:receiverSelector/close": {}

ext/src/background/receiverSelector/NativeReceiverSelector.ts

@@ -114,12 +114,7 @@ export default class NativeReceiverSelector extends ReceiverSelector {
 
                 break;
             }
-            case "main:receiverSelector/error": {
+            case "main:receiverSelector/cancelled": {
-                logger.error("Native receiver selector error", message.data);
-                this.dispatchEvent(new CustomEvent("error"));
-                break;
-            }
-            case "main:receiverSelector/close": {
                 if (!this.wasReceiverSelected) {
                     this.dispatchEvent(new CustomEvent("cancelled"));
                 }
@@ -134,12 +129,17 @@ export default class NativeReceiverSelector extends ReceiverSelector {
 
                 break;
             }
-            case "main:receiverSelector/stop": {
+            case "main:receiverSelector/stopped": {
                 this.dispatchEvent(new CustomEvent("stop", {
                     detail: message.data
                 }));
                 break;
             }
+            case "main:receiverSelector/error": {
+                logger.error("Native receiver selector error", message.data);
+                this.dispatchEvent(new CustomEvent("error"));
+                break;
+            }
         }
     }
 }

ext/src/messaging.ts

@@ -53,6 +53,10 @@ type ExtMessageDefinitions = {
   , "main:sessionCreated": {}
 
   , "shim:initialized": BridgeInfo
+  , "shim:serviceUp": { id: Receiver["id"] }
+  , "shim:serviceDown": { id: Receiver["id"] }
+
+  , "shim:launchApp": { receiver: Receiver }
 }
 
 /**
@@ -61,13 +65,8 @@ type ExtMessageDefinitions = {
  *   app/bridge/messaging.ts > MessagesBase
  */
 type AppMessageDefinitions = {
-    "shim:serviceUp": { id: Receiver["id"] }
-  , "shim:serviceDown": { id: Receiver["id"] }
-
-  , "shim:launchApp": { receiver: Receiver }
-
     // Session messages
-  , "shim:session/stopped": {}
+    "shim:session/stopped": {}
   , "shim:session/connected": {
         sessionId: string
       , namespaces: Array<{ name: string }>
@@ -167,9 +166,9 @@ type AppMessageDefinitions = {
 
     // Bridge messages
   , "main:receiverSelector/selected": ReceiverSelectionCast
+  , "main:receiverSelector/stopped": ReceiverSelectionStop
+  , "main:receiverSelector/cancelled": {}
   , "main:receiverSelector/error": string
-  , "main:receiverSelector/close": {}
-  , "main:receiverSelector/stop": ReceiverSelectionStop
 
     /**
      * getInfo uses the old :/ form for compat with old bridge
@@ -178,7 +177,9 @@ type AppMessageDefinitions = {
   , "bridge:getInfo": string
   , "bridge:/getInfo": string
 
-  , "bridge:initialize": { shouldWatchStatus: boolean }
+  , "bridge:initialize": {
+        shouldWatchStatus: boolean
+    }
 
   , "bridge:receiverSelector/open": any
   , "bridge:receiverSelector/close": {}