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

Fix messaging typo

Browse Source
This commit is contained in:
hensm
2022-09-08 20:41:11 +01:00
parent cae92c5dee
commit 4581ef6c92
7 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ext/src/cast/content.ts
View File

@@ -6,7 +6,7 @@
import logger from "../lib/logger";
import { loadScript } from "../lib/utils";
import pageMessenging from "./pageMessenging";
import pageMessaging from "./pageMessaging";
import CastSDK from "./sdk";
import { CAST_FRAMEWORK_SCRIPT_URL } from "./urls";
@@ -30,7 +30,7 @@ if (document.currentScript) {
}
}
pageMessenging.page.addListener(async message => {
pageMessaging.page.addListener(async message => {
switch (message.subject) {
case "cast:instanceCreated": {
// If framework API is loading, wait until completed

8
ext/src/cast/contentBridge.ts
View File

@@ -1,19 +1,19 @@
import messaging, { Message } from "../messaging";
import pageMessenging from "./pageMessenging";
import pageMessaging from "./pageMessaging";
// Message port to cast manager in background script
const managerPort = messaging.connect({ name: "cast" });
const forwardToPage = (message: Message) => {
pageMessenging.extension.sendMessage(message);
pageMessaging.extension.sendMessage(message);
};
const forwardToMain = (message: Message) => {
managerPort.postMessage(message);
};
managerPort.onMessage.addListener(forwardToPage);
pageMessenging.extension.addListener(forwardToMain);
pageMessaging.extension.addListener(forwardToMain);
managerPort.onDisconnect.addListener(() => {
pageMessenging.extension.close();
pageMessaging.extension.close();
});

18
ext/src/cast/export.ts
View File

@@ -2,10 +2,10 @@ import type { TypedMessagePort } from "../lib/TypedMessagePort";
import messaging, { Message } from "../messaging";
import type { ReceiverDevice } from "../types";
import pageMessenging from "./pageMessenging";
import pageMessaging from "./pageMessaging";
// Ensure extension-side is initialized first
void pageMessenging.extension;
void pageMessaging.extension;
import CastSDK from "./sdk";
@@ -84,12 +84,12 @@ export function ensureInit(opts: EnsureInitOpts): Promise<CastPort> {
}
}
pageMessenging.extension.sendMessage(message);
pageMessaging.extension.sendMessage(message);
});
managerPort.start();
// Cast instance -> cast manager
pageMessenging.extension.addListener(message => {
pageMessaging.extension.addListener(message => {
// Skip receiver selection
if (opts.receiverDevice) {
message = rewriteTrustedRequestSession(
@@ -107,17 +107,17 @@ export function ensureInit(opts: EnsureInitOpts): Promise<CastPort> {
managerPort.onMessage.addListener(message => {
if (message.subject === "cast:instanceCreated") {
if (message.data.isAvailable) {
resolve(pageMessenging.page.messagePort);
resolve(pageMessaging.page.messagePort);
} else {
reject();
}
}
pageMessenging.extension.sendMessage(message);
pageMessaging.extension.sendMessage(message);
});
// Cast instance -> cast manager
pageMessenging.extension.addListener(message => {
pageMessaging.extension.addListener(message => {
// Skip receiver selection
if (opts.receiverDevice) {
message = rewriteTrustedRequestSession(
@@ -130,10 +130,10 @@ export function ensureInit(opts: EnsureInitOpts): Promise<CastPort> {
});
managerPort.onDisconnect.addListener(() => {
pageMessenging.extension.close();
pageMessaging.extension.close();
});
existingPort = pageMessenging.page.messagePort;
existingPort = pageMessaging.page.messagePort;
}
});
}

4
ext/src/cast/pageMessenging.ts → ext/src/cast/pageMessaging.ts
View File

@@ -43,7 +43,7 @@ abstract class Messenger {
}
/**
* Page-side of page script messenging.
* Page-side of page script messaging.
*
* Creates a message channel, then sends an INIT_MESSAGE window message
* with a port that is handled by an ExtensionScriptMessenger in the
@@ -79,7 +79,7 @@ export class PageScriptMessenger extends Messenger {
}
/**
* Extension-side of page script messenging.
* Extension-side of page script messaging.
*
* Listens for a INIT_MESSAGE window message from a PageScriptMessenger
* running in a page script and establishes a message channel connection

6
ext/src/cast/sdk/Session.ts
View File

@@ -2,7 +2,7 @@ import { v4 as uuid } from "uuid";
import { Logger } from "../../lib/logger";
import eventMessaging from "../pageMessenging";
import pageMessaging from "../pageMessaging";
import { convertSupportedMediaCommandsFlags } from "../utils";
import type {
@@ -218,7 +218,7 @@ export default class Session {
return new Promise<void>((resolve, reject) => {
const messageId = uuid();
eventMessaging.page.sendMessage({
pageMessaging.page.sendMessage({
subject: "bridge:sendCastReceiverMessage",
data: {
sessionId: this.sessionId,
@@ -291,7 +291,7 @@ export default class Session {
) {
const messageId = uuid();
eventMessaging.page.sendMessage({
pageMessaging.page.sendMessage({
subject: "bridge:sendCastSessionMessage",
data: {
sessionId: this.sessionId,

8
ext/src/cast/sdk/index.ts
View File

@@ -1,7 +1,7 @@
import { Logger } from "../../lib/logger";
import type { Message } from "../../messaging";
import pageMessenging from "../pageMessenging";
import pageMessaging from "../pageMessaging";
import {
AutoJoinPolicy,
@@ -102,7 +102,7 @@ export default class {
timeout = new Timeout();
constructor() {
pageMessenging.page.addListener(this.#onMessage.bind(this));
pageMessaging.page.addListener(this.#onMessage.bind(this));
}
#onMessage(message: Message) {
@@ -300,7 +300,7 @@ export default class {
this.#initializeSuccessCallback = successCallback;
}
pageMessenging.page.sendMessage({
pageMessaging.page.sendMessage({
subject: "main:initializeCastSdk",
data: { apiConfig: this.#apiConfig }
});
@@ -343,7 +343,7 @@ export default class {
this.#requestSessionErrorCallback = errorCallback;
// Open receiver selector UI
pageMessenging.page.sendMessage({
pageMessaging.page.sendMessage({
subject: "main:requestSession",
data: { sessionRequest: this.#sessionRequest }
});