sam_oneal/fx_cast
1
0
Fork 0
mirror of https://github.com/hensm/fx_cast.git synced 2026-06-11 10:09:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve handling of receiver actions

Browse Source
This commit is contained in:
hensm
2022-08-26 06:09:52 +01:00
parent ee492802e0
commit 90b00c0ce4
10 changed files with 275 additions and 356 deletions
Download Patch File Download Diff File Expand all files Collapse all files

107
ext/src/background/castManager.ts
View File

@@ -6,10 +6,7 @@ import messaging, { Message, Port } from "../messaging";
import options from "../lib/options";
import { stringify } from "../lib/utils";
import {
ReceiverSelectionActionType,
ReceiverSelectorMediaType
} from "../types";
import { ReceiverSelectorMediaType } from "../types";
import deviceManager from "./deviceManager";
import ReceiverSelector, { ReceiverSelection } from "./ReceiverSelector";
@@ -22,6 +19,12 @@ export interface CastInstance {
contentTabId?: number;
contentFrameId?: number;
appId?: string;
session?: CastSession;
}
interface CastSession {
sessionId: string;
deviceId: string;
}
/** Keeps track of cast API instances and provides bridge messaging. */
@@ -37,7 +40,7 @@ export default new (class {
});
// Forward receiver eventes to cast instances
deviceManager.addEventListener("receiverDeviceUp", ev => {
deviceManager.addEventListener("deviceUp", ev => {
for (const instance of this.activeInstances) {
instance.contentPort.postMessage({
subject: "cast:receiverDeviceUp",
@@ -45,7 +48,7 @@ export default new (class {
});
}
});
deviceManager.addEventListener("receiverDeviceDown", ev => {
deviceManager.addEventListener("deviceDown", ev => {
for (const instance of this.activeInstances) {
instance.contentPort.postMessage({
subject: "cast:receiverDeviceDown",
@@ -71,6 +74,12 @@ export default new (class {
}
}
public getInstanceByDeviceId(deviceId: string) {
for (const instance of this.activeInstances) {
if (instance.session?.deviceId === deviceId) return instance;
}
}
/**
* Creates a cast instance with a given port and connects messaging
* correctly depending on the type of port.
@@ -106,7 +115,7 @@ export default new (class {
// bridge -> content
instance.bridgePort.onMessage.addListener(message => {
contentPort.postMessage(message);
this.handleBridgeMessage(instance, message);
});
// content -> (any)
@@ -160,7 +169,7 @@ export default new (class {
};
// bridge -> content
const onBridgePortMessage = (message: Message) => {
contentPort.postMessage(message);
this.handleBridgeMessage(instance, message);
};
const onDisconnect = () => {
@@ -182,6 +191,23 @@ export default new (class {
return instance;
}
private async handleBridgeMessage(
instance: CastInstance,
message: Message
) {
// Intercept messages to store relevant info
switch (message.subject) {
case "cast:sessionCreated":
instance.session = {
deviceId: message.data.receiverId,
sessionId: message.data.sessionId
};
break;
}
instance.contentPort.postMessage(message);
}
/**
* Handle content messages from the cast instance. These will either
* be handled here in the background script or forwarded to the
@@ -238,48 +264,29 @@ export default new (class {
break;
}
switch (selection.actionType) {
case ReceiverSelectionActionType.Cast: {
/**
* If the media type returned from the
* selector has been changed, we need to
* cancel the current sender and switch it
* out for the right one.
*/
if (
selection.mediaType !==
ReceiverSelectorMediaType.App
) {
instance.contentPort.postMessage({
subject: "cast:selectReceiver/cancelled"
});
/**
* If the media type returned from the selector has
* been changed, we need to cancel the current
* sender and switch it out for the right one.
*/
if (selection.mediaType !== ReceiverSelectorMediaType.App) {
instance.contentPort.postMessage({
subject: "cast:selectReceiver/cancelled"
});
this.loadSender({
tabId: instance.contentTabId,
frameId: instance.contentFrameId,
selection
});
this.loadSender({
tabId: instance.contentTabId,
frameId: instance.contentFrameId,
selection
});
break;
}
instance.contentPort.postMessage({
subject: "cast:selectReceiver/selected",
data: selection
});
break;
}
case ReceiverSelectionActionType.Stop: {
instance.contentPort.postMessage({
subject: "cast:selectReceiver/stopped",
data: selection
});
break;
}
break;
}
instance.contentPort.postMessage({
subject: "cast:selectReceiver/selected",
data: selection
});
} catch (err) {
// TODO: Report errors properly
instance.contentPort.postMessage({
@@ -295,7 +302,7 @@ export default new (class {
* same one that caused the session creation.
*/
case "main:closeReceiverSelector": {
const selector = ReceiverSelector.shared;
const selector = ReceiverSelector.sharedInstance;
const shouldClose = await options.get(
"receiverSelectorWaitForConnection"
);
@@ -323,10 +330,6 @@ export default new (class {
return;
}
if (opts.selection.actionType !== ReceiverSelectionActionType.Cast) {
return;
}
switch (opts.selection.mediaType) {
case ReceiverSelectorMediaType.App: {
const instance = this.getInstance(opts.tabId, opts.frameId);