Reorganize cast sender code

This commit is contained in:
hensm
2022-04-18 03:01:56 +01:00
parent 514b382344
commit abf657c0d4
7 changed files with 90 additions and 106 deletions

View File

@@ -1,13 +1,10 @@
"use strict";
import defaultOptions from "../defaultOptions";
import loadSender from "../lib/loadSender";
import logger from "../lib/logger";
import options from "../lib/options";
import bridge, { BridgeInfo } from "../lib/bridge";
import { RemoteMatchPattern } from "../lib/matchPattern";
import CastManager from "../cast/CastManager";
import receiverDevices from "./receiverDevices";
import ReceiverSelectorManager from "./receiverSelector/ReceiverSelectorManager";
@@ -119,12 +116,13 @@ async function init() {
*/
browser.browserAction.onClicked.addListener(async tab => {
if (tab.id === undefined) {
throw logger.error("Tab ID not found in browser action handler.");
logger.error("Tab ID not found in browser action handler.");
return;
}
const selection = await ReceiverSelectorManager.getSelection(tab.id);
if (selection) {
loadSender({
CastManager.loadSender({
tabId: tab.id,
frameId: 0,
selection

View File

@@ -1,6 +1,5 @@
"use strict";
import loadSender from "../lib/loadSender";
import logger from "../lib/logger";
import options from "../lib/options";
@@ -12,6 +11,7 @@ import {
} from "./receiverSelector";
import ReceiverSelectorManager from "./receiverSelector/ReceiverSelectorManager";
import CastManager from "../cast/CastManager";
const _ = browser.i18n.getMessage;
@@ -107,7 +107,7 @@ browser.menus.onClicked.addListener(async (info, tab) => {
break;
}
loadSender({
CastManager.loadSender({
tabId: tab.id,
frameId: info.frameId,
selection
@@ -145,12 +145,12 @@ browser.menus.onClicked.addListener(async (info, tab) => {
});
await browser.tabs.executeScript(tab.id, {
file: "senders/media/index.js",
file: "cast/senders/media/index.js",
frameId: info.frameId
});
} else {
// Handle other responses
loadSender({
CastManager.loadSender({
tabId: tab.id,
frameId: info.frameId,
selection