prettier: Re-format .ts files

ext/src/messaging.ts

@@ -4,63 +4,59 @@ import { TypedPort } from "./lib/TypedPort";
 import { BridgeInfo } from "./lib/bridge";
 
 import { ReceiverSelectorMediaType } from "./background/receiverSelector";
-import { ReceiverSelection
-       , ReceiverSelectionCast
-       , ReceiverSelectionStop } from "./background/receiverSelector";
+import {
+    ReceiverSelection,
+    ReceiverSelectionCast,
+    ReceiverSelectionStop
+} from "./background/receiverSelector";
 
-import { CastSessionCreated
-       , CastSessionUpdated
-       , ReceiverStatus
-       , SenderMessage } from "./shim/cast/types";
+import {
+    CastSessionCreated,
+    CastSessionUpdated,
+    ReceiverStatus,
+    SenderMessage
+} from "./shim/cast/types";
 
 import { ReceiverDevice } from "./types";
 
-
 /**
  * Messages are JSON objects with a `subject` string key and a
  * generic `data` key:
  *   { subject: "...", data: ... }
- * 
+ *
  * Message subjects may include an optional destination and
  * response name formatted like this:
  *   ^(destination:)?messageName(\/responseName)?$
- * 
+ *
  * Message formats are specified with subject as a key and data
  * as the value in the message tables.
  */
 
-
 /**
  * Messages exclusively used internally between extension
  * components.
  */
 type ExtMessageDefinitions = {
-    "popup:init": { appId?: string }
-  , "popup:update": {
-        receivers: ReceiverDevice[]
-      , defaultMediaType?: ReceiverSelectorMediaType
-      , availableMediaTypes?: ReceiverSelectorMediaType
-    }
-  , "popup:close": {}
-
-  , "receiverSelector:selected": ReceiverSelection
-  , "receiverSelector:stop": ReceiverSelection
-
-  , "main:shimReady": { appId: string }
-
-  , "main:selectReceiver": {}
-  , "shim:selectReceiver/selected": ReceiverSelectionCast
-  , "shim:selectReceiver/stopped": ReceiverSelectionStop
-  , "shim:selectReceiver/cancelled": {}
-
-  , "main:sessionCreated": {}
-
-  , "shim:initialized": BridgeInfo
-  , "shim:serviceUp": { receiverDevice: ReceiverDevice }
-  , "shim:serviceDown": { receiverDeviceId: ReceiverDevice["id"] }
-
-  , "shim:launchApp": { receiver: ReceiverDevice }
-}
+    "popup:init": { appId?: string };
+    "popup:update": {
+        receivers: ReceiverDevice[];
+        defaultMediaType?: ReceiverSelectorMediaType;
+        availableMediaTypes?: ReceiverSelectorMediaType;
+    };
+    "popup:close": {};
+    "receiverSelector:selected": ReceiverSelection;
+    "receiverSelector:stop": ReceiverSelection;
+    "main:shimReady": { appId: string };
+    "main:selectReceiver": {};
+    "shim:selectReceiver/selected": ReceiverSelectionCast;
+    "shim:selectReceiver/stopped": ReceiverSelectionStop;
+    "shim:selectReceiver/cancelled": {};
+    "main:sessionCreated": {};
+    "shim:initialized": BridgeInfo;
+    "shim:serviceUp": { receiverDevice: ReceiverDevice };
+    "shim:serviceDown": { receiverDeviceId: ReceiverDevice["id"] };
+    "shim:launchApp": { receiver: ReceiverDevice };
+};
 
 /**
  * Messages that cross the native messaging channel. MUST keep
@@ -68,89 +64,76 @@ type ExtMessageDefinitions = {
  *   app/bridge/messaging.ts > MessagesBase
  */
 type AppMessageDefinitions = {
-    "shim:castSessionCreated": CastSessionCreated
-  , "shim:castSessionUpdated": CastSessionUpdated
-  , "shim:castSessionStopped": {
-        sessionId: string
-    }
-
-  , "shim:receivedCastSessionMessage": {
-        sessionId: string
-      , namespace: string
-      , messageData: string
-    }
-
-  , "shim:impl_sendCastMessage": {
-        sessionId: string
-      , messageId: string
-      , error?: string
-    }
-
-  , "bridge:createCastSession": {
-        appId: string
-      , receiverDevice: ReceiverDevice
-    }
-  , "bridge:sendCastReceiverMessage": {
-        sessionId: string
-      , messageData: SenderMessage
-      , messageId: string
-    }
-  , "bridge:sendCastSessionMessage": {
-        sessionId: string
-      , namespace: string
-      , messageData: object | string
-      , messageId: string
-    }
-
-  , "bridge:stopCastApp": { receiverDevice: ReceiverDevice }
+    "shim:castSessionCreated": CastSessionCreated;
+    "shim:castSessionUpdated": CastSessionUpdated;
+    "shim:castSessionStopped": {
+        sessionId: string;
+    };
+    "shim:receivedCastSessionMessage": {
+        sessionId: string;
+        namespace: string;
+        messageData: string;
+    };
+    "shim:impl_sendCastMessage": {
+        sessionId: string;
+        messageId: string;
+        error?: string;
+    };
+    "bridge:createCastSession": {
+        appId: string;
+        receiverDevice: ReceiverDevice;
+    };
+    "bridge:sendCastReceiverMessage": {
+        sessionId: string;
+        messageData: SenderMessage;
+        messageId: string;
+    };
+    "bridge:sendCastSessionMessage": {
+        sessionId: string;
+        namespace: string;
+        messageData: object | string;
+        messageId: string;
+    };
+    "bridge:stopCastApp": { receiverDevice: ReceiverDevice };
 
     // Bridge messages
-  , "main:receiverSelector/selected": ReceiverSelectionCast
-  , "main:receiverSelector/stopped": ReceiverSelectionStop
-  , "main:receiverSelector/cancelled": {}
-  , "main:receiverSelector/error": string
+    "main:receiverSelector/selected": ReceiverSelectionCast;
+    "main:receiverSelector/stopped": ReceiverSelectionStop;
+    "main:receiverSelector/cancelled": {};
+    "main:receiverSelector/error": string;
 
     /**
      * getInfo uses the old :/ form for compat with old bridge
      * versions.
      */
-  , "bridge:getInfo": string
-  , "bridge:/getInfo": string
-
-  , "bridge:startDiscovery": {
-        shouldWatchStatus: boolean
-    }
-
-  , "bridge:openReceiverSelector": string
-  , "bridge:closeReceiverSelector": {}
-
-  , "bridge:startMediaServer": {
-        filePath: string
-      , port: number
-    }
-  , "bridge:stopMediaServer": {}
-
-  , "mediaCast:mediaServerStarted": {
-        mediaPath: string
-      , subtitlePaths: string[]
-      , localAddress: string
-    }
-  , "mediaCast:mediaServerStopped": {}
-  , "mediaCast:mediaServerError": {}
-
-
-  , "main:receiverDeviceUp": { receiverDevice: ReceiverDevice }
-  , "main:receiverDeviceDown": { receiverDeviceId: string }
-  , "main:receiverDeviceUpdated": {
-        receiverDeviceId: string
-      , status: ReceiverStatus
-    }
-}
-
-type MessageDefinitions =
-        ExtMessageDefinitions
-      & AppMessageDefinitions;
+    "bridge:getInfo": string;
+    "bridge:/getInfo": string;
+    "bridge:startDiscovery": {
+        shouldWatchStatus: boolean;
+    };
+    "bridge:openReceiverSelector": string;
+    "bridge:closeReceiverSelector": {};
+    "bridge:startMediaServer": {
+        filePath: string;
+        port: number;
+    };
+    "bridge:stopMediaServer": {};
+    "mediaCast:mediaServerStarted": {
+        mediaPath: string;
+        subtitlePaths: string[];
+        localAddress: string;
+    };
+    "mediaCast:mediaServerStopped": {};
+    "mediaCast:mediaServerError": {};
+    "main:receiverDeviceUp": { receiverDevice: ReceiverDevice };
+    "main:receiverDeviceDown": { receiverDeviceId: string };
+    "main:receiverDeviceUpdated": {
+        receiverDeviceId: string;
+        status: ReceiverStatus;
+    };
+};
 
+type MessageDefinitions = ExtMessageDefinitions & AppMessageDefinitions;
 
 interface MessageBase<K extends keyof MessageDefinitions> {
     subject: K;
@@ -159,7 +142,7 @@ interface MessageBase<K extends keyof MessageDefinitions> {
 
 type Messages = {
     [K in keyof MessageDefinitions]: MessageBase<K>;
-}
+};
 
 /**
  * For better call semantics, make message data key optional if
@@ -172,39 +155,35 @@ type NarrowedMessage<L extends MessageBase<keyof MessageDefinitions>> =
             : L
         : never;
 
-        
 export type Port = TypedPort<Message>;
 export type Message = NarrowedMessage<Messages[keyof Messages]>;
 
-
 /**
  * Typed WebExtension-style messaging utility class.
  */
 class Messenger<T> {
-    connect(connectInfo: { name: string; }) {
-        return browser.runtime.connect(connectInfo) as
-                unknown as TypedPort<T>;
+    connect(connectInfo: { name: string }) {
+        return browser.runtime.connect(connectInfo) as unknown as TypedPort<T>;
     }
 
-    connectTab(tabId: number
-            , connectInfo: { name: string
-                           , frameId: number }) {
-
-        return browser.tabs.connect(tabId, connectInfo) as
-                unknown as TypedPort<T>;
+    connectTab(tabId: number, connectInfo: { name: string; frameId: number }) {
+        return browser.tabs.connect(
+            tabId,
+            connectInfo
+        ) as unknown as TypedPort<T>;
     }
 
     onConnect = {
         addListener(cb: (port: TypedPort<T>) => void) {
             browser.runtime.onConnect.addListener(cb as any);
-        }
-      , removeListener(cb: (port: TypedPort<T>) => void) {
+        },
+        removeListener(cb: (port: TypedPort<T>) => void) {
             browser.runtime.onConnect.removeListener(cb as any);
-        }
-      , hasListener(cb: (port: TypedPort<T>) => void) {
+        },
+        hasListener(cb: (port: TypedPort<T>) => void) {
             return browser.runtime.onConnect.hasListener(cb as any);
         }
-    }
+    };
 }
 
 export default new Messenger<Message>();