From 5b8a55a2de660ccbe0f8f01fb9d9066ad9ac6c5f Mon Sep 17 00:00:00 2001 From: hensm Date: Fri, 26 Aug 2022 21:21:24 +0100 Subject: [PATCH] Improve message names --- app/src/bridge/components/cast/discovery.ts | 6 +++--- app/src/bridge/index.ts | 4 ++-- app/src/bridge/messaging.ts | 4 ++-- ext/src/background/ReceiverSelector.ts | 8 ++++---- ext/src/background/deviceManager.ts | 4 ++-- ext/src/messaging.ts | 13 +++++++------ ext/src/ui/popup/Popup.svelte | 6 +++--- ext/src/ui/popup/Receiver.svelte | 4 ++-- 8 files changed, 25 insertions(+), 24 deletions(-) diff --git a/app/src/bridge/components/cast/discovery.ts b/app/src/bridge/components/cast/discovery.ts index 9836fff..935936a 100644 --- a/app/src/bridge/components/cast/discovery.ts +++ b/app/src/bridge/components/cast/discovery.ts @@ -48,8 +48,8 @@ export default class Discovery { constructor(opts: DiscoveryOptions) { /** - * When a service is found, gather device info from service object and - * TXT record, then send a `main:receiverDeviceUp` message. + * When a service is found, gather device info from service + * object and TXT record, then send a `main:deviceUp` message. */ this.browser.on("serviceUp", service => { // Filter invalid results @@ -69,7 +69,7 @@ export default class Discovery { }); /** - * When a service is lost, send a `main:receiverDeviceDown` message with + * When a service is lost, send a `main:deviceDown` message with * the service name as the `deviceId`. */ this.browser.on("serviceDown", service => { diff --git a/app/src/bridge/index.ts b/app/src/bridge/index.ts index 8f81189..7c26bfa 100755 --- a/app/src/bridge/index.ts +++ b/app/src/bridge/index.ts @@ -39,7 +39,7 @@ messaging.on("message", (message: Message) => { discovery = new Discovery({ onDeviceFound(device) { messaging.sendMessage({ - subject: "main:receiverDeviceUp", + subject: "main:deviceUp", data: { deviceId: device.id, deviceInfo: device @@ -80,7 +80,7 @@ messaging.on("message", (message: Message) => { }, onDeviceDown(deviceId) { messaging.sendMessage({ - subject: "main:receiverDeviceDown", + subject: "main:deviceDown", data: { deviceId } }); diff --git a/app/src/bridge/messaging.ts b/app/src/bridge/messaging.ts index 2d70152..917f1eb 100644 --- a/app/src/bridge/messaging.ts +++ b/app/src/bridge/messaging.ts @@ -48,12 +48,12 @@ type MessageDefinitions = { * Sent to extension from the bridge whenever a receiver device is * found. */ - "main:receiverDeviceUp": { deviceId: string; deviceInfo: ReceiverDevice }; + "main:deviceUp": { deviceId: string; deviceInfo: ReceiverDevice }; /** * Sent to extension from the bridge whenever a previously found * receiver device is lost. */ - "main:receiverDeviceDown": { deviceId: string }; + "main:deviceDown": { deviceId: string }; /** * Sent to the extension from the bridge whenever a diff --git a/ext/src/background/ReceiverSelector.ts b/ext/src/background/ReceiverSelector.ts index ef7bb67..5ac8f2a 100644 --- a/ext/src/background/ReceiverSelector.ts +++ b/ext/src/background/ReceiverSelector.ts @@ -233,25 +233,25 @@ export default class ReceiverSelector extends TypedEventTarget { private onBridgeMessage = (message: Message) => { switch (message.subject) { - case "main:receiverDeviceUp": { + case "main:deviceUp": { const { deviceId, deviceInfo } = message.data; this.receiverDevices.set(deviceId, deviceInfo); @@ -147,7 +147,7 @@ export default new (class extends TypedEventTarget { break; } - case "main:receiverDeviceDown": { + case "main:deviceDown": { const { deviceId } = message.data; if (this.receiverDevices.has(deviceId)) { diff --git a/ext/src/messaging.ts b/ext/src/messaging.ts index f584daa..efec414 100644 --- a/ext/src/messaging.ts +++ b/ext/src/messaging.ts @@ -54,16 +54,17 @@ type ExtMessageDefinitions = { }; "popup:close": undefined; - "receiverSelector:selected": ReceiverSelection; - "receiverSelector:stop": { deviceId: string }; - "receiverSelector:receiverMessage": ReceiverSelectorReceiverMessage; - "receiverSelector:mediaMessage": ReceiverSelectorMediaMessage; + "main:receiverSelected": ReceiverSelection; + "main:receiverStopped": { deviceId: string }; + "main:sendReceiverMessage": ReceiverSelectorReceiverMessage; + "main:sendMediaMessage": ReceiverSelectorMediaMessage; "main:selectReceiver": { sessionRequest: SessionRequest; }; "cast:selectReceiver/selected": ReceiverSelection; "cast:selectReceiver/cancelled": undefined; + "cast:receiverStoppedAction": { deviceId: string }; "main:closeReceiverSelector": undefined; @@ -107,12 +108,12 @@ type AppMessageDefinitions = { * Sent to extension from the bridge whenever a receiver device is * found. */ - "main:receiverDeviceUp": { deviceId: string; deviceInfo: ReceiverDevice }; + "main:deviceUp": { deviceId: string; deviceInfo: ReceiverDevice }; /** * Sent to extension from the bridge whenever a previously found * receiver device is lost. */ - "main:receiverDeviceDown": { deviceId: string }; + "main:deviceDown": { deviceId: string }; /** * Sent to the extension from the bridge whenever a diff --git a/ext/src/ui/popup/Popup.svelte b/ext/src/ui/popup/Popup.svelte index ef7542b..337531f 100644 --- a/ext/src/ui/popup/Popup.svelte +++ b/ext/src/ui/popup/Popup.svelte @@ -343,7 +343,7 @@ isConnecting = true; port?.postMessage({ - subject: "receiverSelector:selected", + subject: "main:receiverSelected", data: { receiverDevice, mediaType @@ -353,7 +353,7 @@ function onReceiverStop(receiverDevice: ReceiverDevice) { port?.postMessage({ - subject: "receiverSelector:receiverMessage", + subject: "main:sendReceiverMessage", data: { deviceId: receiverDevice.id, message: { requestId: 0, type: "STOP" } @@ -361,7 +361,7 @@ }); port?.postMessage({ - subject: "receiverSelector:stop", + subject: "main:receiverStopped", data: { deviceId: receiverDevice.id } }); } diff --git a/ext/src/ui/popup/Receiver.svelte b/ext/src/ui/popup/Receiver.svelte index 5dca371..dcf2c6a 100644 --- a/ext/src/ui/popup/Receiver.svelte +++ b/ext/src/ui/popup/Receiver.svelte @@ -49,7 +49,7 @@ }; port?.postMessage({ - subject: "receiverSelector:receiverMessage", + subject: "main:sendReceiverMessage", data: { deviceId: device.id, message } }); } @@ -68,7 +68,7 @@ }; port?.postMessage({ - subject: "receiverSelector:mediaMessage", + subject: "main:sendMediaMessage", data: { deviceId: device.id, message } }); }