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

Fix app and media type detection for non-app triggered receiver selector

Browse Source
This commit is contained in:
hensm
2022-09-01 13:43:59 +01:00
parent 314a1d2031
commit 78e936195c
4 changed files with 74 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,6 +20,7 @@ import {
import type { ApiConfig } from "../cast/sdk/classes";
import { ReceiverAction } from "../cast/sdk/enums";
import { DEFAULT_MEDIA_RECEIVER_APP_ID } from "../cast/sdk/media";
import { createReceiver } from "../cast/utils";
import deviceManager from "./deviceManager";
@@ -301,10 +302,10 @@ const castManager = new (class {
if (
receiverSelector?.isOpen &&
// If selector context is the same as the instance context
receiverSelector.pageInfo?.tabId ===
instance.contentContext?.tabId &&
receiverSelector.pageInfo?.frameId ===
instance.contentContext?.frameId &&
isSameContext(
receiverSelector.pageInfo,
instance.contentContext
) &&
// If selector is supposed to close
(await options.get("receiverSelectorWaitForConnection"))
) {
@@ -566,17 +567,48 @@ async function getReceiverSelection(selectionOpts: {
let availableMediaTypes = ReceiverSelectorMediaType.None;
// Default frame ID
if (!selectionOpts.frameId) selectionOpts.frameId = 0;
if (selectionOpts.frameId === undefined) selectionOpts.frameId = 0;
// Fallback to instance context
if (!selectionOpts.tabId && selectionOpts.castInstance?.contentContext) {
if (
selectionOpts.tabId === undefined &&
selectionOpts.castInstance?.contentContext
) {
selectionOpts.tabId = selectionOpts.castInstance.contentContext.tabId;
selectionOpts.frameId =
selectionOpts.castInstance.contentContext.frameId;
}
const opts = await options.getAll();
/**
* If context supplied, but no instance, check for an instance at
* that context.
*/
if (
!selectionOpts.castInstance &&
selectionOpts.tabId !== undefined &&
selectionOpts.frameId !== undefined
) {
const contextInstance = castManager.getInstanceAt(
selectionOpts.tabId,
selectionOpts.frameId
);
/**
* If the app in that context is the extension mirroring app or
* the default receiver, just ignore it.
*/
const contextAppId = contextInstance?.apiConfig?.sessionRequest.appId;
if (
contextAppId !== opts.mirroringAppId &&
contextAppId !== DEFAULT_MEDIA_RECEIVER_APP_ID
) {
selectionOpts.castInstance = contextInstance;
}
}
let pageInfo: Optional<ReceiverSelectorPageInfo>;
if (selectionOpts.tabId) {
if (selectionOpts.tabId !== undefined) {
try {
pageInfo = {
tabId: selectionOpts.tabId,
@@ -603,8 +635,6 @@ async function getReceiverSelection(selectionOpts: {
availableMediaTypes |= ReceiverSelectorMediaType.App;
}
const opts = await options.getAll();
// Disable mirroring media types if mirroring is not enabled
if (!opts.mirroringEnabled) {
availableMediaTypes &= ~(