diff --git a/app/src/MediaServer.ts b/app/src/MediaServer.ts index 702d009..db2bb90 100644 --- a/app/src/MediaServer.ts +++ b/app/src/MediaServer.ts @@ -1,9 +1,9 @@ "use strict"; +import EventEmitter from "events"; import fs from "fs"; import http from "http"; import mime from "mime-types"; -import EventEmitter from "events"; import { Message , SendMessageCallback } from "./types"; diff --git a/app/src/castTypes.ts b/app/src/castTypes.ts index 9c3384b..160685f 100644 --- a/app/src/castTypes.ts +++ b/app/src/castTypes.ts @@ -7,15 +7,15 @@ export interface ReceiverStatus { controlType: string; level: number; }; - applications?: { + applications?: Array<{ displayName: string; statusText: string; transportId: string; isIdleScreen: boolean; sessionId: string; - namespaces: { name: string }[]; + namespaces: Array<{ name: string }>; appId: string; - }[]; + }>; userEq?: {}; } @@ -33,7 +33,7 @@ export interface MediaStatus { volume: { muted: boolean; level: number; - } + }; currentItemId: number; idleReason: string; playerState: string; @@ -44,11 +44,11 @@ export interface MediaStatus { streamType: string; contentType: string; metadata: { - images: { url: string }[]; + images: Array<{ url: string }>; metadataType: number; artist: string; title: string; }; } - } + }; } diff --git a/app/src/main.ts b/app/src/main.ts index f966a91..341e53a 100755 --- a/app/src/main.ts +++ b/app/src/main.ts @@ -13,7 +13,7 @@ import Session from "./Session"; import StatusListener from "./StatusListener"; import * as transforms from "./transforms"; -import { ReceiverStatus, MediaStatus } from "./castTypes"; +import { MediaStatus, ReceiverStatus } from "./castTypes"; import { Message } from "./types"; @@ -145,7 +145,7 @@ async function handleMessage (message: Message) { try { JSON.parse(receiverSelectorData); } catch (err) { - console.error("Invalid native selector data.") + console.error("Invalid native selector data."); } } @@ -153,19 +153,19 @@ async function handleMessage (message: Message) { path.join(process.cwd(), "selector") , [ receiverSelectorData ]); - receiverSelectorApp.stdout.setEncoding("utf8") + receiverSelectorApp.stdout.setEncoding("utf8"); receiverSelectorApp.stdout.on("data", data => { sendMessage({ subject: "main:/receiverSelector/selected" , data: JSON.parse(data) - }) + }); }); receiverSelectorApp.addListener("error", err => { sendMessage({ subject: "main:/receiverSelector/error" , data: err.message - }) + }); }); receiverSelectorApp.on("close", () => { @@ -199,7 +199,7 @@ async function handleMessage (message: Message) { sendMessage({ subject: "mediaCast:/mediaServer/stopped" }); - }) + }); break; } diff --git a/common/tslint.json b/common/tslint.json index 888b2f5..7cff856 100644 --- a/common/tslint.json +++ b/common/tslint.json @@ -5,8 +5,8 @@ ] , "jsRules": false , "rules": { - "no-consecutive-blank-lines": false - , "arrow-parens": false + "arrow-parens": false + , "import-spacing": false , "interface-name": false , "max-classes-per-file": false , "max-line-length": [ true, { @@ -14,6 +14,7 @@ , "ignore-pattern": "//|.*(\"|`);?$" }] , "member-access": [ true ] + , "no-consecutive-blank-lines": false , "no-console": [ true, "log" ] , "no-namespace": [ true, "allow-declarations" ] , "object-literal-sort-keys": false diff --git a/ext/src/global.d.ts b/ext/src/global.d.ts index 5d23f8b..5cd4aca 100644 --- a/ext/src/global.d.ts +++ b/ext/src/global.d.ts @@ -59,7 +59,7 @@ declare namespace browser.runtime { * https://git.io/fjmzb * addListener cb `() => void` is wrong */ - onMessage: browser.events.Event + onMessage: browser.events.Event; } function connect (connectInfo: { diff --git a/ext/src/messageTypes.ts b/ext/src/messageTypes.ts index a0ca657..7630fe8 100644 --- a/ext/src/messageTypes.ts +++ b/ext/src/messageTypes.ts @@ -8,7 +8,7 @@ export interface ReceiverStatusMessage extends Message { data: { id: string; status: ReceiverStatus; - } + }; } export interface ServiceDownMessage extends Message { @@ -25,16 +25,16 @@ export interface ServiceUpMessage extends Message { export interface NativeReceiverSelectorSelectedMessage extends Message { - subject: "main:/receiverSelector/selected" - , data: Receiver + subject: "main:/receiverSelector/selected"; + data: Receiver; } export interface NativeReceiverSelectorCloseMessage extends Message { - subject: "main:/receiverSelector/error" - , data: string + subject: "main:/receiverSelector/error"; + data: string; } export interface NativeReceiverSelectorErrorMessage extends Message { - subject: "main:/receiverSelector/error" - , data: string + subject: "main:/receiverSelector/error"; + data: string; } diff --git a/ext/src/receiverSelectorManager/index.ts b/ext/src/receiverSelectorManager/index.ts index 6a6a12d..b929677 100644 --- a/ext/src/receiverSelectorManager/index.ts +++ b/ext/src/receiverSelectorManager/index.ts @@ -18,7 +18,7 @@ export enum ReceiverSelectorManagerType { , NativeMac } -export function getReceiverSelectorManager( +export function getReceiverSelectorManager ( type: ReceiverSelectorManagerType) { switch (type) { diff --git a/ext/src/receiverSelectorManager/selectorManagers/NativeMacReceiverSelectorManager.ts b/ext/src/receiverSelectorManager/selectorManagers/NativeMacReceiverSelectorManager.ts index 60cddb7..d9e7291 100644 --- a/ext/src/receiverSelectorManager/selectorManagers/NativeMacReceiverSelectorManager.ts +++ b/ext/src/receiverSelectorManager/selectorManagers/NativeMacReceiverSelectorManager.ts @@ -5,9 +5,9 @@ import ReceiverSelectorManager, { import { Message, Receiver } from "../../types"; -import { NativeReceiverSelectorSelectedMessage +import { NativeReceiverSelectorCloseMessage , NativeReceiverSelectorErrorMessage - , NativeReceiverSelectorCloseMessage } from "../../messageTypes"; + , NativeReceiverSelectorSelectedMessage } from "../../messageTypes"; const _ = browser.i18n.getMessage; @@ -26,7 +26,7 @@ class NativeMacReceiverSelectorManager public async open ( receivers: Receiver[] , defaultMediaType: ReceiverSelectorMediaType): Promise { - + this.bridgePort = browser.runtime.connectNative(APPLICATION_NAME); this.bridgePort.onMessage.addListener((message: Message) => { @@ -91,7 +91,7 @@ class NativeMacReceiverSelectorManager private onBridgePortMessageClose ( message: NativeReceiverSelectorCloseMessage) { - + if (!this.wasReceiverSelected) { this.dispatchEvent(new CustomEvent("cancelled")); } diff --git a/ext/src/receiverSelectorManager/selectorManagers/PopupReceiverSelectorManager.ts b/ext/src/receiverSelectorManager/selectorManagers/PopupReceiverSelectorManager.ts index a2ae890..26e6066 100644 --- a/ext/src/receiverSelectorManager/selectorManagers/PopupReceiverSelectorManager.ts +++ b/ext/src/receiverSelectorManager/selectorManagers/PopupReceiverSelectorManager.ts @@ -54,7 +54,7 @@ class PopupReceiverSelectorManager receivers: this.receivers , defaultMediaType: this.defaultMediaType } - }) + }); }); } @@ -103,8 +103,6 @@ class PopupReceiverSelectorManager * Handles popup messages. */ private onPopupMessage (message: Message) { - console.log("popupmsg", message); - switch (message.subject) { case "receiverSelectorManager:/selected": { this.wasReceiverSelected = true; diff --git a/ext/src/shim/cast/index.ts b/ext/src/shim/cast/index.ts index 632ed83..668b38e 100755 --- a/ext/src/shim/cast/index.ts +++ b/ext/src/shim/cast/index.ts @@ -190,11 +190,9 @@ export function unescape (escaped: string): string { onMessage(async message => { - console.log(message) switch (message.subject) { case "shim:/initialized": { isAvailable = true; - break; } diff --git a/ext/src/ui/popup/index.tsx b/ext/src/ui/popup/index.tsx index ea3160b..1ed0994 100755 --- a/ext/src/ui/popup/index.tsx +++ b/ext/src/ui/popup/index.tsx @@ -86,13 +86,13 @@ class PopupApp extends Component<{}, PopupAppState> { browser.windows.update(this.win.id, { height: windowHeight }); - }, 1) + }, 1); } public render () { const shareMedia = this.state.mediaType === ReceiverSelectorMediaType.Tab - || this.state.mediaType === ReceiverSelectorMediaType.Screen + || this.state.mediaType === ReceiverSelectorMediaType.Screen; return (
@@ -103,7 +103,6 @@ class PopupApp extends Component<{}, PopupAppState> { className="media-select-dropdown">