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

Remove some extension-only messages from app definitions

Browse Source
This commit is contained in:
hensm
2021-04-25 01:20:50 +01:00
committed by Matt Hensman
parent f8003d99a0
commit 0c2535ff1e
5 changed files with 163 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/bridge/components/receiverSelector.ts
View File

@@ -48,7 +48,7 @@ export function startReceiverSelector (data: string) {
if (!jsonData.mediaType) { if (!jsonData.mediaType) {
sendMessage({ sendMessage({
subject: "main:receiverSelector/stop" subject: "main:receiverSelector/stopped"
, data: jsonData , data: jsonData
}); });
@@ -74,7 +74,7 @@ export function startReceiverSelector (data: string) {
selectorAppOpen = false; selectorAppOpen = false;
sendMessage({ sendMessage({
subject: "main:receiverSelector/close" subject: "main:receiverSelector/cancelled"
}); });
} }
}); });

7
app/src/bridge/index.ts
View File

@@ -51,8 +51,8 @@ decodeTransform.on("data", (message: Message) => {
} }
case "bridge:stopReceiverApp": { case "bridge:stopReceiverApp": {
stopReceiverApp(message.data.receiver.host const { host, port } = message.data.receiver;
, message.data.receiver.port); stopReceiverApp(host, port);
break; break;
} }
@@ -66,7 +66,8 @@ decodeTransform.on("data", (message: Message) => {
// Media server // Media server
case "bridge:mediaServer/start": { case "bridge:mediaServer/start": {
startMediaServer(message.data.filePath, message.data.port); const { filePath, port } = message.data;
startMediaServer(filePath, port);
break; break;
} }
case "bridge:mediaServer/stop": { case "bridge:mediaServer/stop": {

260
app/src/bridge/messaging.ts
View File

@@ -7,150 +7,148 @@ import { Receiver
type MessageDefinitions = { type MessageDefinitions = {
"shim:serviceUp": { id: Receiver["id"] } // Session messages
, "shim:serviceDown": { id: Receiver["id"] } "shim:session/stopped": {}
, "shim:session/connected": {
sessionId: string
, namespaces: Array<{ name: string }>
, displayName: string
, statusText: string
}
, "shim:session/updateStatus": { volume: any /* Volume */ }
, "shim:session/impl_addMessageListener": {
namespace: string
, data: string
}
, "shim:session/impl_sendMessage": {
messageId: string
, error: boolean
}
, "shim:session/impl_setReceiverMuted": {
volumeId: string
, error: boolean
}
, "shim:session/impl_setReceiverVolumeLevel": {
volumeId: string
, error: boolean
}
, "shim:session/impl_stop": {
stopId: string
, error: boolean
}
, "shim:launchApp": { receiver: Receiver } // Bridge session messages
, "bridge:session/initialize": {
address: string
, port: number
, appId: string
, sessionId: string
, _id: string
}
, "bridge:session/close": {}
, "bridge:session/impl_leave": {
id: string
, _id: string
}
, "bridge:session/impl_sendMessage": {
namespace: string
, message: any
, messageId: string
, _id: string
}
, "bridge:session/impl_setReceiverMuted": {
muted: boolean
, volumeId: string
, _id: string
}
, "bridge:session/impl_setReceiverVolumeLevel": {
newLevel: number
, volumeId: string
, _id: string
}
, "bridge:session/impl_stop": {
stopId: string;
_id: string;
}
, "bridge:session/impl_addMessageListener": {
namespace: string;
_id: string;
}
// Session messages // Media messages
, "shim:session/stopped": {} , "shim:media/update": {
, "shim:session/connected": { currentTime: number
sessionId: string , _lastCurrentTime: number
, namespaces: Array<{ name: string }> , customData: any
, displayName: string , playbackRate: number
, statusText: string , playerState: string
} , repeatMode: string
, "shim:session/updateStatus": { volume: any /* Volume */ } , _volumeLevel: number
, "shim:session/impl_addMessageListener": { , _volumeMuted: boolean
namespace: string , media: unknown // MediaInfo
, data: string , mediaSessionId: number
} }
, "shim:session/impl_sendMessage": { , "shim:media/sendMediaMessageResponse": {
messageId: string messageId: string
, error: boolean , error: boolean
} }
, "shim:session/impl_setReceiverMuted": {
volumeId: string
, error: boolean
}
, "shim:session/impl_setReceiverVolumeLevel": {
volumeId: string
, error: boolean
}
, "shim:session/impl_stop": {
stopId: string
, error: boolean
}
// Bridge session messages // Bridge media messages
, "bridge:session/initialize": { , "bridge:media/initialize": {
address: string sessionId: string
, port: number , mediaSessionId: number
, appId: string , _internalSessionId: string
, sessionId: string , _id: string
, _id: string }
}
, "bridge:session/close": {}
, "bridge:session/impl_leave": {
id: string
, _id: string
}
, "bridge:session/impl_sendMessage": {
namespace: string
, message: any
, messageId: string
, _id: string
}
, "bridge:session/impl_setReceiverMuted": {
muted: boolean
, volumeId: string
, _id: string
}
, "bridge:session/impl_setReceiverVolumeLevel": {
newLevel: number
, volumeId: string
, _id: string
}
, "bridge:session/impl_stop": {
stopId: string;
_id: string;
}
, "bridge:session/impl_addMessageListener": {
namespace: string;
_id: string;
}
// Media messages , "bridge:media/sendMediaMessage": {
, "shim:media/update": { message: any
currentTime: number , messageId: string
, _lastCurrentTime: number , _id: string
, customData: any }
, playbackRate: number
, playerState: string
, repeatMode: string
, _volumeLevel: number
, _volumeMuted: boolean
, media: unknown // MediaInfo
, mediaSessionId: number
}
, "shim:media/sendMediaMessageResponse": {
messageId: string
, error: boolean
}
// Bridge media messages
, "bridge:media/initialize": {
sessionId: string
, mediaSessionId: number
, _internalSessionId: string
, _id: string
}
, "bridge:media/sendMediaMessage": {
message: any
, messageId: string
, _id: string
}
// Bridge messages // Bridge messages
, "main:receiverSelector/selected": ReceiverSelectionCast , "main:receiverSelector/selected": ReceiverSelectionCast
, "main:receiverSelector/error": string , "main:receiverSelector/stopped": ReceiverSelectionStop
, "main:receiverSelector/close": {} , "main:receiverSelector/cancelled": {}
, "main:receiverSelector/stop": ReceiverSelectionStop , "main:receiverSelector/error": string
/** /**
* getInfo uses the old :/ form for compat with old bridge * getInfo uses the old :/ form for compat with old bridge
* versions. * versions.
*/ */
, "bridge:getInfo": string , "bridge:getInfo": string
, "bridge:/getInfo": string , "bridge:/getInfo": string
, "bridge:initialize": { shouldWatchStatus: boolean } , "bridge:initialize": {
shouldWatchStatus: boolean
}
, "bridge:receiverSelector/open": any , "bridge:receiverSelector/open": any
, "bridge:receiverSelector/close": {} , "bridge:receiverSelector/close": {}
, "bridge:stopReceiverApp": { receiver: Receiver } , "bridge:stopReceiverApp": { receiver: Receiver }
, "bridge:mediaServer/start": { , "bridge:mediaServer/start": {
filePath: string filePath: string
, port: number , port: number
} }
, "bridge:mediaServer/stop": {} , "bridge:mediaServer/stop": {}
, "mediaCast:mediaServer/started": { , "mediaCast:mediaServer/started": {
mediaPath: string mediaPath: string
, subtitlePaths: string[] , subtitlePaths: string[]
, localAddress: string , localAddress: string
} }
, "mediaCast:mediaServer/stopped": {} , "mediaCast:mediaServer/stopped": {}
, "mediaCast:mediaServer/error": {} , "mediaCast:mediaServer/error": {}
, "main:serviceUp": Receiver , "main:serviceUp": Receiver
, "main:serviceDown": { id: string } , "main:serviceDown": { id: string }
, "main:receiverStatus": { , "main:receiverStatus": {
id: string id: string
, status: ReceiverStatus , status: ReceiverStatus
} }
} }

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

@@ -114,12 +114,7 @@ export default class NativeReceiverSelector extends ReceiverSelector {
break; break;
} }
case "main:receiverSelector/error": { case "main:receiverSelector/cancelled": {
logger.error("Native receiver selector error", message.data);
this.dispatchEvent(new CustomEvent("error"));
break;
}
case "main:receiverSelector/close": {
if (!this.wasReceiverSelected) { if (!this.wasReceiverSelected) {
this.dispatchEvent(new CustomEvent("cancelled")); this.dispatchEvent(new CustomEvent("cancelled"));
} }
@@ -134,12 +129,17 @@ export default class NativeReceiverSelector extends ReceiverSelector {
break; break;
} }
case "main:receiverSelector/stop": { case "main:receiverSelector/stopped": {
this.dispatchEvent(new CustomEvent("stop", { this.dispatchEvent(new CustomEvent("stop", {
detail: message.data detail: message.data
})); }));
break; break;
} }
case "main:receiverSelector/error": {
logger.error("Native receiver selector error", message.data);
this.dispatchEvent(new CustomEvent("error"));
break;
}
} }
} }
} }

19
ext/src/messaging.ts
View File

@@ -53,6 +53,10 @@ type ExtMessageDefinitions = {
, "main:sessionCreated": {} , "main:sessionCreated": {}
, "shim:initialized": BridgeInfo , "shim:initialized": BridgeInfo
, "shim:serviceUp": { id: Receiver["id"] }
, "shim:serviceDown": { id: Receiver["id"] }
, "shim:launchApp": { receiver: Receiver }
} }
/** /**
@@ -61,13 +65,8 @@ type ExtMessageDefinitions = {
* app/bridge/messaging.ts > MessagesBase * app/bridge/messaging.ts > MessagesBase
*/ */
type AppMessageDefinitions = { type AppMessageDefinitions = {
"shim:serviceUp": { id: Receiver["id"] }
, "shim:serviceDown": { id: Receiver["id"] }
, "shim:launchApp": { receiver: Receiver }
// Session messages // Session messages
, "shim:session/stopped": {} "shim:session/stopped": {}
, "shim:session/connected": { , "shim:session/connected": {
sessionId: string sessionId: string
, namespaces: Array<{ name: string }> , namespaces: Array<{ name: string }>
@@ -167,9 +166,9 @@ type AppMessageDefinitions = {
// Bridge messages // Bridge messages
, "main:receiverSelector/selected": ReceiverSelectionCast , "main:receiverSelector/selected": ReceiverSelectionCast
, "main:receiverSelector/stopped": ReceiverSelectionStop
, "main:receiverSelector/cancelled": {}
, "main:receiverSelector/error": string , "main:receiverSelector/error": string
, "main:receiverSelector/close": {}
, "main:receiverSelector/stop": ReceiverSelectionStop
/** /**
* getInfo uses the old :/ form for compat with old bridge * getInfo uses the old :/ form for compat with old bridge
@@ -178,7 +177,9 @@ type AppMessageDefinitions = {
, "bridge:getInfo": string , "bridge:getInfo": string
, "bridge:/getInfo": string , "bridge:/getInfo": string
, "bridge:initialize": { shouldWatchStatus: boolean } , "bridge:initialize": {
shouldWatchStatus: boolean
}
, "bridge:receiverSelector/open": any , "bridge:receiverSelector/open": any
, "bridge:receiverSelector/close": {} , "bridge:receiverSelector/close": {}