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

Remove leading slash from message names

Browse Source
This commit is contained in:
hensm
2021-04-24 04:16:20 +01:00
committed by Matt Hensman
parent e349ce5db7
commit d48efe4840
23 changed files with 207 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ext/src/background/ShimManager.ts
View File

@@ -52,7 +52,7 @@ export default new class ShimManager {
: this.createShimFromContent(port));
shim.contentPort.postMessage({
subject: "shim:/initialized"
subject: "shim:initialized"
, data: await bridge.getInfo()
});
@@ -139,18 +139,18 @@ export default new class ShimManager {
}
private async handleContentMessage (shim: Shim, message: Message) {
const [ destination ] = message.subject.split(":/");
const [ destination ] = message.subject.split(":");
if (destination === "bridge") {
shim.bridgePort.postMessage(message);
}
switch (message.subject) {
case "main:/shimReady": {
case "main:shimReady": {
shim.requestedAppId = message.data.appId;
for (const receiver of StatusManager.getReceivers()) {
shim.contentPort.postMessage({
subject: "shim:/serviceUp"
subject: "shim:serviceUp"
, data: { id: receiver.id }
});
}
@@ -234,7 +234,7 @@ export default new class ShimManager {
* TODO: If we're closing a selector, make sure it's the
* same one that caused the session creation.
*/
case "main:/sessionCreated": {
case "main:sessionCreated": {
const selector = await ReceiverSelectorManager.getSelector();
const shouldClose = await options.get(
"receiverSelectorWaitForConnection");
@@ -252,7 +252,7 @@ export default new class ShimManager {
StatusManager.addEventListener("serviceUp", ev => {
for (const shim of this.activeShims) {
shim.contentPort.postMessage({
subject: "shim:/serviceUp"
subject: "shim:serviceUp"
, data: { id: ev.detail.id }
});
}
@@ -261,7 +261,7 @@ export default new class ShimManager {
StatusManager.addEventListener("serviceDown", ev => {
for (const shim of this.activeShims) {
shim.contentPort.postMessage({
subject: "shim:/serviceDown"
subject: "shim:serviceDown"
, data: { id: ev.detail.id }
});
}

10
ext/src/background/StatusManager.ts
View File

@@ -50,7 +50,7 @@ export default new class StatusManager
}
this.bridgePort.postMessage({
subject: "bridge:/stopReceiverApp"
subject: "bridge:stopReceiverApp"
, data: { receiver }
});
}
@@ -61,7 +61,7 @@ export default new class StatusManager
bridgePort.onDisconnect.addListener(this.onBridgePortDisconnect);
bridgePort.postMessage({
subject: "bridge:/initialize"
subject: "bridge:initialize"
, data: {
shouldWatchStatus: true
}
@@ -76,7 +76,7 @@ export default new class StatusManager
*/
private onBridgePortMessage (message: Message) {
switch (message.subject) {
case "main:/serviceUp": {
case "main:serviceUp": {
const { data: receiver } = message;
this.receivers.set(receiver.id, receiver);
@@ -87,7 +87,7 @@ export default new class StatusManager
break;
}
case "main:/serviceDown": {
case "main:serviceDown": {
const { data: { id }} = message;
if (this.receivers.has(id)) {
@@ -101,7 +101,7 @@ export default new class StatusManager
break;
}
case "main:/receiverStatus": {
case "main:receiverStatus": {
const { data: { id, status }} = message;
const receiver = this.receivers.get(id);

12
ext/src/background/receiverSelector/NativeReceiverSelector.ts
View File

@@ -57,7 +57,7 @@ export default class NativeReceiverSelector extends ReceiverSelector {
"receiverSelectorCloseIfFocusLost");
this.bridgePort.postMessage({
subject: "bridge:/receiverSelector/open"
subject: "bridge:receiverSelector/open"
, data: JSON.stringify({
receivers
, defaultMediaType
@@ -93,7 +93,7 @@ export default class NativeReceiverSelector extends ReceiverSelector {
public close (): void {
if (this.bridgePort) {
this.bridgePort.postMessage({
subject: "bridge:/receiverSelector/close"
subject: "bridge:receiverSelector/close"
});
}
@@ -102,7 +102,7 @@ export default class NativeReceiverSelector extends ReceiverSelector {
private async onBridgePortMessage (message: Message) {
switch (message.subject) {
case "main:/receiverSelector/selected": {
case "main:receiverSelector/selected": {
this.wasReceiverSelected = true;
this.dispatchEvent(new CustomEvent("selected", {
detail: message.data
@@ -114,12 +114,12 @@ export default class NativeReceiverSelector extends ReceiverSelector {
break;
}
case "main:/receiverSelector/error": {
case "main:receiverSelector/error": {
logger.error("Native receiver selector error", message.data);
this.dispatchEvent(new CustomEvent("error"));
break;
}
case "main:/receiverSelector/close": {
case "main:receiverSelector/close": {
if (!this.wasReceiverSelected) {
this.dispatchEvent(new CustomEvent("cancelled"));
}
@@ -134,7 +134,7 @@ export default class NativeReceiverSelector extends ReceiverSelector {
break;
}
case "main:/receiverSelector/stop": {
case "main:receiverSelector/stop": {
this.dispatchEvent(new CustomEvent("stop", {
detail: message.data
}));

10
ext/src/background/receiverSelector/PopupReceiverSelector.ts
View File

@@ -118,7 +118,7 @@ export default class PopupReceiverSelector extends ReceiverSelector {
public update (receivers: Receiver[]) {
this.receivers = receivers;
this.messagePort?.postMessage({
subject: "popup:/update"
subject: "popup:update"
, data: {
receivers: this.receivers
}
@@ -162,12 +162,12 @@ export default class PopupReceiverSelector extends ReceiverSelector {
}
this.messagePort.postMessage({
subject: "popup:/init"
subject: "popup:init"
, data: { appId: this.appId }
});
this.messagePort.postMessage({
subject: "popup:/update"
subject: "popup:update"
, data: {
receivers: this.receivers
, defaultMediaType: this.defaultMediaType
@@ -183,7 +183,7 @@ export default class PopupReceiverSelector extends ReceiverSelector {
*/
private onPopupMessage (message: Message) {
switch (message.subject) {
case "receiverSelector:/selected": {
case "receiverSelector:selected": {
this.wasReceiverSelected = true;
this.dispatchEvent(new CustomEvent("selected", {
detail: message.data
@@ -192,7 +192,7 @@ export default class PopupReceiverSelector extends ReceiverSelector {
break;
}
case "receiverSelector:/stop": {
case "receiverSelector:stop": {
this.dispatchEvent(new CustomEvent("stop", {
detail: message.data
}));