From 3d6c1e8891c2cfa7a8d5ede55e478157fc709473 Mon Sep 17 00:00:00 2001 From: hensm Date: Thu, 13 Jun 2019 20:11:47 +0100 Subject: [PATCH] Rename ReceiverSelectorManager -> ReceiverSelector --- ext/src/main.ts | 50 +++++++++---------- ext/src/receiverSelectorManager/index.ts | 32 ------------ .../NativeMacReceiverSelector.ts} | 16 +++--- .../PopupReceiverSelector.ts} | 14 +++--- .../ReceiverSelector.ts} | 2 +- ext/src/receiver_selectors/index.ts | 32 ++++++++++++ ext/src/{ => senders}/mediaCast.js | 0 ext/src/{ => senders}/mirroringCast.js | 2 +- ext/src/shim/cast/classes/ApiConfig.ts | 2 +- ext/src/ui/popup/index.tsx | 4 +- ext/webpack.config.js | 4 +- 11 files changed, 79 insertions(+), 79 deletions(-) delete mode 100644 ext/src/receiverSelectorManager/index.ts rename ext/src/{receiverSelectorManager/selectorManagers/NativeMacReceiverSelectorManager.ts => receiver_selectors/NativeMacReceiverSelector.ts} (88%) rename ext/src/{receiverSelectorManager/selectorManagers/PopupReceiverSelectorManager.ts => receiver_selectors/PopupReceiverSelector.ts} (92%) rename ext/src/{receiverSelectorManager/ReceiverSelectorManager.ts => receiver_selectors/ReceiverSelector.ts} (88%) create mode 100644 ext/src/receiver_selectors/index.ts rename ext/src/{ => senders}/mediaCast.js (100%) rename ext/src/{ => senders}/mirroringCast.js (98%) diff --git a/ext/src/main.ts b/ext/src/main.ts index f10dfb1..8a89470 100755 --- a/ext/src/main.ts +++ b/ext/src/main.ts @@ -11,10 +11,10 @@ import options from "./lib/options"; import { getChromeUserAgent } from "./lib/userAgents"; import { getWindowCenteredProps } from "./lib/utils"; -import { getReceiverSelectorManager - , ReceiverSelectorManagerType +import { getReceiverSelector + , ReceiverSelectorType , ReceiverSelectorMediaType - , ReceiverSelectorSelectedEvent } from "./receiverSelectorManager"; + , ReceiverSelectorSelectedEvent } from "./receiver_selectors"; import { Message, Receiver } from "./types"; @@ -452,7 +452,7 @@ browser.menus.onClicked.addListener(async (info, tab) => { // Load mirroring sender app await browser.tabs.executeScript(tab.id, { - file: "mirroringCast.js" + file: "senders/mirroringCast.js" , frameId }); @@ -472,7 +472,7 @@ browser.menus.onClicked.addListener(async (info, tab) => { // Load media sender app await browser.tabs.executeScript(tab.id, { - file: "mediaCast.js" + file: "senders/mediaCast.js" , frameId }); @@ -641,11 +641,11 @@ async function onConnectShim (port: browser.runtime.Port) { const { os } = await browser.runtime.getPlatformInfo(); - const receiverSelectorManager = getReceiverSelectorManager(os === "mac" - ? ReceiverSelectorManagerType.NativeMac - : ReceiverSelectorManagerType.Popup); + const receiverSelector = getReceiverSelector(os === "mac" + ? ReceiverSelectorType.NativeMac + : ReceiverSelectorType.Popup); - function onReceiverSelectorManagerSelected ( + function onReceiverSelectorSelected ( ev: ReceiverSelectorSelectedEvent) { port.postMessage({ @@ -654,33 +654,33 @@ async function onConnectShim (port: browser.runtime.Port) { }); } - function onReceiverSelectorManagerCancelled () { + function onReceiverSelectorCancelled () { port.postMessage({ subject: "shim:/selectReceiverCancelled" }); } - function onReceiverSelectorManagerError () { + function onReceiverSelectorError () { // TODO: Report errors properly port.postMessage({ subject: "shim:/selectReceiverCancelled" }); } - receiverSelectorManager.addEventListener("selected" - , onReceiverSelectorManagerSelected); - receiverSelectorManager.addEventListener("cancelled" - , onReceiverSelectorManagerCancelled); - receiverSelectorManager.addEventListener("error" - , onReceiverSelectorManagerError); + receiverSelector.addEventListener("selected" + , onReceiverSelectorSelected); + receiverSelector.addEventListener("cancelled" + , onReceiverSelectorCancelled); + receiverSelector.addEventListener("error" + , onReceiverSelectorError); port.onDisconnect.addListener(() => { - receiverSelectorManager.removeEventListener("selected" - , onReceiverSelectorManagerSelected); - receiverSelectorManager.removeEventListener("cancelled" - , onReceiverSelectorManagerCancelled); - receiverSelectorManager.removeEventListener("error" - , onReceiverSelectorManagerError); + receiverSelector.removeEventListener("selected" + , onReceiverSelectorSelected); + receiverSelector.removeEventListener("cancelled" + , onReceiverSelectorCancelled); + receiverSelector.removeEventListener("error" + , onReceiverSelectorError); }); @@ -756,12 +756,12 @@ async function onConnectShim (port: browser.runtime.Port) { } case "main:/sessionCreated": { - receiverSelectorManager.close(); + receiverSelector.close(); break; } case "main:/selectReceiverBegin": { - receiverSelectorManager.open( + receiverSelector.open( Array.from(statusBridgeReceivers.values()) , message.data.defaultMediaType); break; diff --git a/ext/src/receiverSelectorManager/index.ts b/ext/src/receiverSelectorManager/index.ts deleted file mode 100644 index e9bc0af..0000000 --- a/ext/src/receiverSelectorManager/index.ts +++ /dev/null @@ -1,32 +0,0 @@ -"use strict"; - -import NativeMacReceiverSelectorManager - from "./selectorManagers/NativeMacReceiverSelectorManager"; -import PopupReceiverSelectorManager - from "./selectorManagers/PopupReceiverSelectorManager"; - - -export { ReceiverSelection - , ReceiverSelectorCancelledEvent - , ReceiverSelectorErrorEvent - , ReceiverSelectorMediaType - , ReceiverSelectorSelectedEvent } from "./ReceiverSelectorManager"; - - -export enum ReceiverSelectorManagerType { - Popup - , NativeMac -} - -export function getReceiverSelectorManager ( - type: ReceiverSelectorManagerType) { - - switch (type) { - case ReceiverSelectorManagerType.Popup: { - return new PopupReceiverSelectorManager(); - } - case ReceiverSelectorManagerType.NativeMac: { - return new NativeMacReceiverSelectorManager(); - } - } -} diff --git a/ext/src/receiverSelectorManager/selectorManagers/NativeMacReceiverSelectorManager.ts b/ext/src/receiver_selectors/NativeMacReceiverSelector.ts similarity index 88% rename from ext/src/receiverSelectorManager/selectorManagers/NativeMacReceiverSelectorManager.ts rename to ext/src/receiver_selectors/NativeMacReceiverSelector.ts index db2cef0..a37860f 100644 --- a/ext/src/receiverSelectorManager/selectorManagers/NativeMacReceiverSelectorManager.ts +++ b/ext/src/receiver_selectors/NativeMacReceiverSelector.ts @@ -1,24 +1,24 @@ "use strict"; -import nativeMessaging from "../../lib/nativeMessaging"; -import options from "../../lib/options"; +import nativeMessaging from "../lib/nativeMessaging"; +import options from "../lib/options"; -import ReceiverSelectorManager, { - ReceiverSelectorMediaType } from "../ReceiverSelectorManager"; +import ReceiverSelector, { + ReceiverSelectorMediaType } from "./ReceiverSelector"; -import { Message, Receiver } from "../../types"; +import { Message, Receiver } from "../types"; import { NativeReceiverSelectorCloseMessage , NativeReceiverSelectorErrorMessage - , NativeReceiverSelectorSelectedMessage } from "../../messageTypes"; + , NativeReceiverSelectorSelectedMessage } from "../messageTypes"; const _ = browser.i18n.getMessage; -export default class NativeMacReceiverSelectorManager +export default class NativeMacReceiverSelector extends EventTarget - implements ReceiverSelectorManager { + implements ReceiverSelector { private bridgePort: browser.runtime.Port; private bridgePortDisconnected: boolean = false; diff --git a/ext/src/receiverSelectorManager/selectorManagers/PopupReceiverSelectorManager.ts b/ext/src/receiver_selectors/PopupReceiverSelector.ts similarity index 92% rename from ext/src/receiverSelectorManager/selectorManagers/PopupReceiverSelectorManager.ts rename to ext/src/receiver_selectors/PopupReceiverSelector.ts index ebb132d..90bf062 100644 --- a/ext/src/receiverSelectorManager/selectorManagers/PopupReceiverSelectorManager.ts +++ b/ext/src/receiver_selectors/PopupReceiverSelector.ts @@ -1,15 +1,15 @@ "use strict"; -import ReceiverSelectorManager, { - ReceiverSelectorMediaType } from "../ReceiverSelectorManager"; +import ReceiverSelector, { + ReceiverSelectorMediaType } from "./ReceiverSelector"; -import { getWindowCenteredProps } from "../../lib/utils"; -import { Message, Receiver } from "../../types"; +import { getWindowCenteredProps } from "../lib/utils"; +import { Message, Receiver } from "../types"; -export default class PopupReceiverSelectorManager +export default class PopupReceiverSelector extends EventTarget - implements ReceiverSelectorManager { + implements ReceiverSelector { private windowId: number; private openerWindowId: number; @@ -104,7 +104,7 @@ export default class PopupReceiverSelectorManager */ private onPopupMessage (message: Message) { switch (message.subject) { - case "receiverSelectorManager:/selected": { + case "receiverSelector:/selected": { this.wasReceiverSelected = true; this.dispatchEvent(new CustomEvent("selected", { detail: message.data diff --git a/ext/src/receiverSelectorManager/ReceiverSelectorManager.ts b/ext/src/receiver_selectors/ReceiverSelector.ts similarity index 88% rename from ext/src/receiverSelectorManager/ReceiverSelectorManager.ts rename to ext/src/receiver_selectors/ReceiverSelector.ts index 2d5b902..ab8f558 100644 --- a/ext/src/receiverSelectorManager/ReceiverSelectorManager.ts +++ b/ext/src/receiver_selectors/ReceiverSelector.ts @@ -19,7 +19,7 @@ export type ReceiverSelectorErrorEvent = CustomEvent; export type ReceiverSelectorCancelledEvent = CustomEvent; -export default interface ReceiverSelectorManager extends EventTarget { +export default interface ReceiverSelector extends EventTarget { open (receivers: Receiver[] , defaultMediaType: ReceiverSelectorMediaType): void; diff --git a/ext/src/receiver_selectors/index.ts b/ext/src/receiver_selectors/index.ts new file mode 100644 index 0000000..1d7f5e2 --- /dev/null +++ b/ext/src/receiver_selectors/index.ts @@ -0,0 +1,32 @@ +"use strict"; + +import NativeMacReceiverSelector + from "./NativeMacReceiverSelector"; +import PopupReceiverSelector + from "./PopupReceiverSelector"; + + +export { ReceiverSelection + , ReceiverSelectorCancelledEvent + , ReceiverSelectorErrorEvent + , ReceiverSelectorMediaType + , ReceiverSelectorSelectedEvent } from "./ReceiverSelector"; + + +export enum ReceiverSelectorType { + Popup + , NativeMac +} + +export function getReceiverSelector ( + type: ReceiverSelectorType) { + + switch (type) { + case ReceiverSelectorType.Popup: { + return new PopupReceiverSelector(); + } + case ReceiverSelectorType.NativeMac: { + return new NativeMacReceiverSelector(); + } + } +} diff --git a/ext/src/mediaCast.js b/ext/src/senders/mediaCast.js similarity index 100% rename from ext/src/mediaCast.js rename to ext/src/senders/mediaCast.js diff --git a/ext/src/mirroringCast.js b/ext/src/senders/mirroringCast.js similarity index 98% rename from ext/src/mirroringCast.js rename to ext/src/senders/mirroringCast.js index 874411e..05380ce 100644 --- a/ext/src/mirroringCast.js +++ b/ext/src/senders/mirroringCast.js @@ -1,7 +1,7 @@ "use strict"; import { ReceiverSelectorMediaType } - from "./receiverSelectorManager/ReceiverSelectorManager": + from "../receiver_selectors/ReceiverSelector": let chrome; let logMessage; diff --git a/ext/src/shim/cast/classes/ApiConfig.ts b/ext/src/shim/cast/classes/ApiConfig.ts index 687a5e7..409c71d 100755 --- a/ext/src/shim/cast/classes/ApiConfig.ts +++ b/ext/src/shim/cast/classes/ApiConfig.ts @@ -7,7 +7,7 @@ import { AutoJoinPolicy , DefaultActionPolicy } from "../enums"; import { ReceiverSelectorMediaType } - from "../../../receiverSelectorManager/ReceiverSelectorManager"; + from "../../../receiver_selectors/ReceiverSelector"; export default class ApiConfig { diff --git a/ext/src/ui/popup/index.tsx b/ext/src/ui/popup/index.tsx index 24695a8..8f869d2 100755 --- a/ext/src/ui/popup/index.tsx +++ b/ext/src/ui/popup/index.tsx @@ -8,7 +8,7 @@ import { getNextEllipsis } from "../../lib/utils"; import { Message, Receiver } from "../../types"; import { ReceiverSelectorMediaType } - from "../../receiverSelectorManager/ReceiverSelectorManager"; + from "../../receiver_selectors/ReceiverSelector"; const _ = browser.i18n.getMessage; @@ -134,7 +134,7 @@ class PopupApp extends Component<{}, PopupAppState> { }); this.port.postMessage({ - subject: "receiverSelectorManager:/selected" + subject: "receiverSelector:/selected" , data: { receiver , mediaType: this.state.mediaType diff --git a/ext/webpack.config.js b/ext/webpack.config.js index 740f0c9..00080f6 100755 --- a/ext/webpack.config.js +++ b/ext/webpack.config.js @@ -20,8 +20,8 @@ module.exports = (env) => ({ , "ui/updater/bundle": `${env.includePath}/ui/updater/index.tsx` // Sender apps - , "mediaCast": `${env.includePath}/mediaCast.js` - , "mirroringCast": `${env.includePath}/mirroringCast.js` + , "senders/mediaCast": `${env.includePath}/senders/mediaCast.js` + , "senders/mirroringCast": `${env.includePath}/senders/mirroringCast.js` // Shim entries , "shim/bundle": `${env.includePath}/shim/index.ts`