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

Change message subject format and rename some messages

Browse Source
This commit is contained in:
hensm
2019-02-11 18:52:01 +00:00
parent 53a16ccde7
commit da17c6df0d
14 changed files with 324 additions and 319 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/Media.js
View File

@@ -1,7 +1,7 @@
export default class Media {
messageHandler (message) {
switch (message.subject) {
case "bridge:bridgemedia/sendMediaMessage": {
case "bridge:/media/sendMediaMessage": {
let error = false;
try {
this.channel.send(message.data.message);
@@ -9,7 +9,7 @@ export default class Media {
error = true;
}
this.sendMessage("shim:media/sendMediaMessageResponse", {
this.sendMessage("shim:/media/sendMediaMessageResponse", {
messageId: message.data.messageId
, error
});
@@ -62,7 +62,7 @@ export default class Media {
messageData.mediaSessionId = status.mediaSessionId;
}
this.sendMessage("shim:media/update", messageData);
this.sendMessage("shim:/media/update", messageData);
// Update ID
if (status.mediaSessionId) {

28
app/src/Session.js
View File

@@ -3,34 +3,34 @@ import { Client } from "castv2";
export default class Session {
messageHandler (message) {
switch (message.subject) {
case "bridge:bridgesession/close":
case "bridge:/session/close":
this.close();
break;
case "bridge:bridgesession/impl_addMessageListener":
case "bridge:/session/impl_addMessageListener":
this._impl_addMessageListener(message.data.namespace);
break;
case "bridge:bridgesession/impl_sendMessage":
case "bridge:/session/impl_sendMessage":
this._impl_sendMessage(
message.data.namespace
, message.data.message
, message.data.messageId)
break;
case "bridge:bridgesession/impl_setReceiverMuted":
case "bridge:/session/impl_setReceiverMuted":
this._impl_setReceiverMuted(
message.data.muted
, message.data.volumeId);
break;
case "bridge:bridgesession/impl_setReceiverVolumeLevel":
case "bridge:/session/impl_setReceiverVolumeLevel":
this._impl_setReceiverVolumeLevel(
message.data.newLevel
, message.data.volumeId);
break;
case "bridge:bridgesession/impl_stop":
case "bridge:/session/impl_stop":
this._impl_stop(message.data.stopId);
break;
}
@@ -89,7 +89,7 @@ export default class Session {
switch (data.type) {
case "RECEIVER_STATUS":
this.sendMessage("shim:session/updateStatus", data.status);
this.sendMessage("shim:/session/updateStatus", data.status);
if (!data.status.applications) return;
@@ -100,7 +100,7 @@ export default class Session {
if (receiverAppId !== appId) {
// Close session
this.sendMessage("shim:session/stopped");
this.sendMessage("shim:/session/stopped");
this.client.close();
clearInterval(this.clientHeartbeatInterval);
return;
@@ -129,7 +129,7 @@ export default class Session {
this.sessionId = this.app.sessionId;
this.sendMessage("shim:session/connected", {
this.sendMessage("shim:/session/connected", {
sessionId: this.app.sessionId
, namespaces: this.app.namespaces
, displayName: this.app.displayName
@@ -170,7 +170,7 @@ export default class Session {
_impl_addMessageListener (namespace) {
this.createChannel(namespace);
this.channelMap.get(namespace).on("message", data => {
this.sendMessage("shim:session/impl_addMessageListener", {
this.sendMessage("shim:/session/impl_addMessageListener", {
namespace: namespace
, data: JSON.stringify(data)
});
@@ -187,7 +187,7 @@ export default class Session {
error = true;
}
this.sendMessage("shim:session/impl_sendMessage", {
this.sendMessage("shim:/session/impl_sendMessage", {
messageId
, error
});
@@ -206,7 +206,7 @@ export default class Session {
error = true;
}
this.sendMessage("shim:session/impl_setReceiverMuted", {
this.sendMessage("shim:/session/impl_setReceiverMuted", {
volumeId
, error
});
@@ -225,7 +225,7 @@ export default class Session {
error = true;
}
this.sendMessage("shim:session/impl_setReceiverVolumeLevel", {
this.sendMessage("shim:/session/impl_setReceiverVolumeLevel", {
volumeId
, error
});
@@ -247,7 +247,7 @@ export default class Session {
this.client.close();
clearInterval(this.clientHeartbeatInterval);
this.sendMessage("shim:session/impl_stop", {
this.sendMessage("shim:/session/impl_stop", {
stopId
, error
});

21
app/src/main.js
View File

@@ -54,7 +54,7 @@ const existingMedia = new Map();
* for managing existing ones.
*/
async function handleMessage (message) {
if (message.subject.startsWith("bridge:bridgemedia/")) {
if (message.subject.startsWith("bridge:/media/")) {
if (existingMedia.has(message._id)) {
// Forward message to instance message handler
existingMedia.get(message._id).messageHandler(message);
@@ -77,7 +77,7 @@ async function handleMessage (message) {
return;
}
if (message.subject.startsWith("bridge:bridgesession/")) {
if (message.subject.startsWith("bridge:/session/")) {
if (existingSessions.has(message._id)) {
// Forward message to instance message handler
existingSessions.get(message._id).messageHandler(message);
@@ -96,22 +96,21 @@ async function handleMessage (message) {
return;
}
switch (message.subject) {
case "bridge:getInfo": {
case "bridge:/getInfo": {
const extensionVersion = message.data;
return {
subject: "main:bridgeInfo"
subject: "main:/bridgeInfo"
, data: __applicationVersion
};
};
case "bridge:discover":
case "bridge:/discover":
browser.start();
break;
case "bridge:startHttpServer": {
case "bridge:/startHttpServer": {
const { filePath, port } = message.data;
httpServer = http.createServer((req, res) => {
@@ -152,14 +151,14 @@ async function handleMessage (message) {
httpServer.listen(port, () => {
sendMessage({
subject: "mediaCast:httpServerStarted"
subject: "mediaCast:/httpServerStarted"
});
});
break;
};
case "bridge:stopHttpServer":
case "bridge:/stopHttpServer":
if (httpServer) httpServer.close();
break;
}
@@ -168,7 +167,7 @@ async function handleMessage (message) {
browser.on("serviceUp", service => {
transforms.encode.write({
subject: "serviceUp"
subject: "shim:/serviceUp"
, data: {
address: service.addresses[0]
, port: service.port
@@ -181,7 +180,7 @@ browser.on("serviceUp", service => {
browser.on("serviceDown", service => {
transforms.encode.write({
subject:"serviceDown"
subject:"shim:/serviceDown"
, data: {
id: service.txt.id
}