Remove leading slash from message names

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

View File

@@ -55,7 +55,7 @@ export default class Session {
}
switch (message.subject) {
case "shim:/session/stopped": {
case "shim:session/stopped": {
// Disconnect from extension messages
this.#listener.disconnect();
@@ -68,7 +68,7 @@ export default class Session {
break;
}
case "shim:/session/connected": {
case "shim:session/connected": {
this.status = SessionStatus.CONNECTED;
this.sessionId = message.data.sessionId;
this.transportId = message.data.sessionId;
@@ -83,7 +83,7 @@ export default class Session {
break;
}
case "shim:/session/updateStatus": {
case "shim:session/updateStatus": {
const volume: Volume = message.data.volume;
if (volume) {
@@ -110,7 +110,7 @@ export default class Session {
}
case "shim:/session/impl_addMessageListener": {
case "shim:session/impl_addMessageListener": {
const { namespace, data } = message.data;
const messageListeners = this.#messageListeners.get(namespace);
@@ -123,7 +123,7 @@ export default class Session {
break;
}
case "shim:/session/impl_sendMessage": {
case "shim:session/impl_sendMessage": {
const { messageId, error } = message.data;
const [ successCallback, errorCallback ] =
this.#sendMessageCallbacks.get(messageId) ?? [];
@@ -139,7 +139,7 @@ export default class Session {
break;
}
case "shim:/session/impl_setReceiverMuted": {
case "shim:session/impl_setReceiverMuted": {
const { volumeId, error } = message.data;
const [ successCallback, errorCallback ] =
this.#setReceiverMutedCallbacks.get(volumeId) ?? [];
@@ -155,7 +155,7 @@ export default class Session {
break;
}
case "shim:/session/impl_setReceiverVolumeLevel": {
case "shim:session/impl_setReceiverVolumeLevel": {
const { volumeId, error } = message.data;
const [ successCallback, errorCallback ] =
this.#setReceiverVolumeLevelCallbacks
@@ -172,7 +172,7 @@ export default class Session {
break;
}
case "shim:/session/impl_stop": {
case "shim:session/impl_stop": {
const { stopId, error } = message.data;
const [ successCallback, errorCallback ]
= this.#stopCallbacks.get(stopId) ?? [];
@@ -227,7 +227,7 @@ export default class Session {
if (receiver) {
sendMessageResponse({
subject: "bridge:/session/initialize"
subject: "bridge:session/initialize"
, data: {
address: (receiver as any)._address
, port: (receiver as any)._port
@@ -255,7 +255,7 @@ export default class Session {
this.#messageListeners.get(namespace)?.add(listener);
sendMessageResponse({
subject: "bridge:/session/impl_addMessageListener"
subject: "bridge:session/impl_addMessageListener"
, data: {
namespace
, _id: this.#id
@@ -274,7 +274,7 @@ export default class Session {
const id = uuid();
sendMessageResponse({
subject: "bridge:/session/impl_leave"
subject: "bridge:session/impl_leave"
, data: {
id
, _id: this.#id
@@ -380,7 +380,7 @@ export default class Session {
const messageId = uuid();
sendMessageResponse({
subject: "bridge:/session/impl_sendMessage"
subject: "bridge:session/impl_sendMessage"
, data: {
namespace
, message
@@ -403,7 +403,7 @@ export default class Session {
const volumeId = uuid();
sendMessageResponse({
subject: "bridge:/session/impl_setReceiverMuted"
subject: "bridge:session/impl_setReceiverMuted"
, data: {
muted
, volumeId
@@ -425,7 +425,7 @@ export default class Session {
const volumeId = uuid();
sendMessageResponse({
subject: "bridge:/session/impl_setReceiverVolumeLevel"
subject: "bridge:session/impl_setReceiverVolumeLevel"
, data: {
newLevel
, volumeId
@@ -446,7 +446,7 @@ export default class Session {
const stopId = uuid();
sendMessageResponse({
subject: "bridge:/session/impl_stop"
subject: "bridge:session/impl_stop"
, data: {
stopId
, _id: this.#id

View File

@@ -102,7 +102,7 @@ export function initialize (
apiConfig = newApiConfig;
sendMessageResponse({
subject: "main:/shimReady"
subject: "main:shimReady"
, data: { appId: apiConfig.sessionRequest.appId }
});
@@ -227,7 +227,7 @@ export function _requestSession (
, selectedReceiver // receiver
, (session: Session) => {
sendMessageResponse({
subject: "main:/sessionCreated"
subject: "main:sessionCreated"
});
sessionRequestInProgress = false;
@@ -277,7 +277,7 @@ export function unescape (escaped: string): string {
onMessage(async message => {
switch (message.subject) {
case "shim:/initialized": {
case "shim:initialized": {
isAvailable = true;
break;
}
@@ -286,7 +286,7 @@ onMessage(async message => {
* Cast destination found (serviceUp). Set the API availability
* property and call the page event function (__onGCastApiAvailable).
*/
case "shim:/serviceUp": {
case "shim:serviceUp": {
const receiver = message.data;
if (receiverList.find(r => r.id === receiver.id)) {
@@ -307,7 +307,7 @@ onMessage(async message => {
* Cast destination lost (serviceDown). Remove from the receiver list
* and update availability state.
*/
case "shim:/serviceDown": {
case "shim:serviceDown": {
const receiverIndex = receiverList.findIndex(
receiver => receiver.id === message.data.id);
@@ -352,7 +352,7 @@ onMessage(async message => {
, selectedReceiver // receiver
, (session: Session) => {
sendMessageResponse({
subject: "main:/sessionCreated"
subject: "main:sessionCreated"
});
sessionRequestInProgress = false;
@@ -412,7 +412,7 @@ onMessage(async message => {
break;
}
case "shim:/launchApp": {
case "shim:launchApp": {
const receiver: Receiver = message.data.receiver;
_requestSession(receiver
, session => {

View File

@@ -50,7 +50,7 @@ export default class Media {
}
switch (message.subject) {
case "shim:/media/update": {
case "shim:media/update": {
const status = message.data;
this.currentTime = status.currentTime;
@@ -81,7 +81,7 @@ export default class Media {
break;
}
case "shim:/media/sendMediaMessageResponse": {
case "shim:media/sendMediaMessageResponse": {
const { messageId, error } = message.data;
const [ successCallback, errorCallback ]
= this.#sendMediaMessageCallbacks
@@ -125,7 +125,7 @@ export default class Media {
, _internalSessionId: string) {
sendMessageResponse({
subject: "bridge:/media/initialize"
subject: "bridge:media/initialize"
, data: {
sessionId
, mediaSessionId
@@ -344,7 +344,7 @@ export default class Media {
]);
sendMessageResponse({
subject: "bridge:/media/sendMediaMessage"
subject: "bridge:media/sendMediaMessage"
, data: {
message
, messageId