@sapui5/sap.ushell 1.111.1 → 1.112.0

package/src/main/js/sap/ushell/services/_MessageBroker/MessageBrokerEngine.js

@@ -1,26 +1,29 @@
 // Copyright (c) 2009-2022 SAP SE, All Rights Reserved
 
 /**
- * @fileOverview This module contains API call processing logic
- * @version 1.111.1
+ * @fileOverview This module contains the implementation of the message broker
+ * @version 1.112.0
  */
 sap.ui.define([
     "sap/base/Log",
-    "sap/base/util/deepExtend",
-    "sap/ushell/components/applicationIntegration/application/Application"
-], function (Log, deepExtend, Application) {
+    "sap/base/util/deepExtend"
+], function (Log, deepExtend) {
     "use strict";
 
     var oAcceptedOrigins = {},
         oClientsPerChannel = {},
-        oActiveClients = {};
+        oConnectedClients = {},
+        oSubscribedClients = {};
+
+    //add default origin
+    oAcceptedOrigins[window.location.origin] = true;
 
     var MessageBrokerEngine = function () {
 
         /**
-         * This method maps PostMessage to API
          *
          * @param {object} oPostMessageData The PostMessage object.
+         * @returns {Promise} Promise result.
          *
          * @since 1.110.0
          * @private
@@ -28,40 +31,110 @@ sap.ui.define([
 
         this.processPostMessage = function (oPostMessageData) {
 
-            return new Promise(function (resolve, reject) {
+            var oMessageData = oPostMessageData.oMessageData,
+                oMessageDataBody = oMessageData.body,
+                oMessage = oPostMessageData.oMessage,
+                sOrigin = oMessage.origin,
+                oIframe = oMessage.source;
+
+            oMessageDataBody.requestId = oMessageData.request_id;
+
+            if (!oIframe) {
+                var sErrorMsg = "Missing iframe object in PostMessage request";
+                Log.error(sErrorMsg, null, "sap.ushell.services.MessageBroker");
+                return Promise.reject(sErrorMsg);
+            }
+
+            return this._handlePostMessageRequest(oMessageDataBody, oIframe, sOrigin);
+        };
+
+        /**
+         *
+         * @param {string} sClientId client id.
+         * @returns {Promise} the result.
+         *
+         * @since 1.110.0
+         * @private
+         */
 
-                var oMessageData = oPostMessageData.oMessageData,
-                    oMessageDataBody = oMessageData.body,
-                    oMessage = oPostMessageData.oMessage,
-                    sOrigin = oMessage.origin,
-                    oIframe = oMessage.source;
+        this.connect = function (sClientId) {
 
-                oMessageDataBody.requestId = oMessageData.request_id;
+            var sError;
+
+            if (typeof sClientId !== "string" || !sClientId.length) {
+                sError = "Missing required parameter client id";
+            } else if (oConnectedClients[sClientId]) {
+                sError = "Client is already connected";
+            } else {
+                var aSubscribedClients = Object.values(oSubscribedClients);
+                // add client initial entry to connected clients
+                oConnectedClients[sClientId] = true;
+                return Promise.resolve(aSubscribedClients);
+            }
 
-                if (!oIframe) {
-                    Log.error("Missing iframe object");
-                    return reject("Missing iframe object");
+            Log.error(sError, null, "sap.ushell.services.MessageBroker");
+            return Promise.reject(sError);
+        };
+
+        /**
+         *
+         * @param {string} sClientId client id.
+         * @returns {Promise} the result.
+         *
+         * @since 1.110.0
+         * @private
+         */
+
+        this.disconnect = function (sClientId) {
+
+            var sError;
+
+            if (typeof sClientId !== "string" || !sClientId.length) {
+                sError = "Missing required parameter client id";
+            } else if (!oConnectedClients[sClientId]) {
+                sError = "Client is already disconnected";
+            } else {
+
+                for (var sChannelKey in oClientsPerChannel) {
+
+                    var aChannelClients = oClientsPerChannel[sChannelKey];
+                    // find client and remove from the channel
+                    for (var oClientKey in aChannelClients) {
+
+                        var oClient = aChannelClients[oClientKey];
+
+                        if (oClient.clientId === sClientId) {
+                            aChannelClients.splice(oClientKey, 1);
+                            break;
+                        }
+                    }
                 }
 
-                this._handlePostMessageRequest(oMessageDataBody, oIframe, sOrigin)
-                    .then(function (oResponse) {
-                        return resolve(oResponse);
-                    })
-                    .catch(function (sError) {
-                        return reject(sError);
-                    });
-            }.bind(this));
+                // if client disconnects but is still subscribed
+                if (oSubscribedClients[sClientId] && oSubscribedClients[sClientId].channels.length) {
+                    this._emitEvent("clientUnsubscribed", sClientId, oSubscribedClients[sClientId].channels);
+
+                    // remove from subscribed clients
+                    delete oSubscribedClients[sClientId];
+                }
+                // remove from connected clients
+                delete oConnectedClients[sClientId];
+
+                return Promise.resolve();
+            }
+
+            Log.error(sError, null, "sap.ushell.services.MessageBroker");
+            return Promise.reject(sError);
         };
 
         /**
          *
          * @param {string} sClientId client id.
          * @param {array} aSubscribedChannels array of channel-objects.
-         * @param {object} data additional data.
          * @param {function} fnMessageCallback callback function returns promise.
          * @param {function} fnClientConnectionCallback callback function returns promise.
-         * @param {object} oIframe iframe object if embedded client.
-         * @param {string} sOrigin iframe origin if embedded client.
+         * @param {object} oIframe iframe object if iframe client.
+         * @param {string} sOrigin iframe origin if iframe client.
          * @returns {Promise} the result.
          *
          * @since 1.110.0
@@ -71,30 +144,26 @@ sap.ui.define([
         this.subscribe = function (
             sClientId,
             aSubscribedChannels,
-            data,
             fnMessageCallback,
             fnClientConnectionCallback,
             oIframe,
             sOrigin
         ) {
 
-            return new Promise(function (resolve, reject) {
-
-                // in case connect request received twice
-                if (oActiveClients[sClientId]) {
-                    Log.error("MessageBroker.subscribe: attempt to subscribe twice");
-                    return reject("Client already subscribed");
-                }
-
-                if (!sClientId || !aSubscribedChannels.length ||
-                    (typeof oIframe !== "object" &&
-                        (typeof fnMessageCallback !== "function" ||
-                            typeof fnClientConnectionCallback !== "function"))
-                ) {
-                    Log.error("MessageBroker.subscribe: Missing required parameter(s)");
-                    return reject("Missing required parameter(s)");
-                }
-
+            var sError,
+                sMessageName = "clientSubscribed",
+                aOtherSubscribedClients = [],
+                bIsNewClient = false;
+
+            if (typeof sClientId !== "string" || !sClientId.length ||
+                !aSubscribedChannels.length ||
+                (typeof oIframe !== "object" &&
+                    (typeof fnMessageCallback !== "function" ||
+                        typeof fnClientConnectionCallback !== "function"))) {
+                sError = "Missing required parameter(s)";
+            } else if (!oConnectedClients[sClientId]) {
+                sError = "Client is not connected";
+            } else {
                 for (var sChannelKey in aSubscribedChannels) {
 
                     var oChannel = aSubscribedChannels[sChannelKey];
@@ -103,96 +172,142 @@ sap.ui.define([
                     var oFullClientData = {
                         clientId: sClientId,
                         subscribedChannels: aSubscribedChannels,
-                        data: data,
                         messageCallback: fnMessageCallback,
                         clientConnectionCallback: fnClientConnectionCallback,
                         iframe: oIframe || {},
                         origin: sOrigin || "",
-                        isUI5: !oIframe && !sOrigin
+                        isUI5: !oIframe
                     };
 
+                    // add new channel
                     if (!oClientsPerChannel[oChannel.channelId]) {
                         oClientsPerChannel[oChannel.channelId] = [];
                     }
 
-                    oClientsPerChannel[oChannel.channelId].push(oFullClientData);
+                    var oExistingClient = oClientsPerChannel[oChannel.channelId].find(function (oClient) {
+                        return oClient.clientId === sClientId;
+                    });
+
+                    // add new client
+                    if (!oExistingClient) {
+                        oClientsPerChannel[oChannel.channelId].push(oFullClientData);
+                    }
+
+                    // if client is already subscribed to any channel
+                    if (oSubscribedClients[sClientId]) {
+                        var oExistingChannel = oSubscribedClients[sClientId].channels.find(function (oSubChannel) {
+                            return oSubChannel.channelId === oChannel.channelId;
+                        });
+
+                        if (!oExistingChannel) {
+                            // add new channel to the existing channels
+                            oSubscribedClients[sClientId].channels.push(oChannel);
+                        }
+                    }
                 }
 
-                var oActiveClientData = {
-                    clientId: sClientId,
-                    subscribedChannels: aSubscribedChannels
-                };
+                // if new client
+                if (!oSubscribedClients[sClientId]) {
 
-                var aConnectedClients = Object.values(oActiveClients);
-                oActiveClients[sClientId] = oActiveClientData;
+                    bIsNewClient = true;
 
-                // notify other connected clients
-                if (Object.keys(oActiveClients).length > 1) {
-                    this._emitEvent("clientConnected", sClientId, aSubscribedChannels, data);
+                    var oSubscriptionData = {
+                        clientId: sClientId,
+                        channels: aSubscribedChannels
+                    };
+                    // add to subscribed clients
+                    oSubscribedClients[sClientId] = oSubscriptionData;
+
+                    aOtherSubscribedClients = Object.values(oSubscribedClients).filter(function (oClient) {
+                        return oClient.clientId !== sClientId;
+                    });
+                    // notify new UI5 client of other already subscribed clients
+                    if (!oIframe && aOtherSubscribedClients.length) {
+                        fnClientConnectionCallback(sMessageName, aOtherSubscribedClients);
+                    }
                 }
 
-                return resolve(aConnectedClients);
-            }.bind(this));
+                // notify other subscribed clients of new subscription
+                if (Object.keys(oSubscribedClients).length > 1) {
+                    this._emitEvent(sMessageName, sClientId, aSubscribedChannels);
+                }
+
+                return Promise.resolve(oIframe && bIsNewClient ? aOtherSubscribedClients : "");
+            }
+
+            Log.error(sError, null, "sap.ushell.services.MessageBroker");
+            return Promise.reject(sError);
         };
 
         /**
          *
          * @param {string} sClientId client id.
+         * @param {array} aUnsubscribedChannels channels to unsubscribe from.
          * @returns {Promise} the resolve or error.
          *
          * @since 1.110.0
          * @private
          */
 
-        this.unsubscribe = function (sClientId) {
-
-            return new Promise(function (resolve, reject) {
+        this.unsubscribe = function (sClientId, aUnsubscribedChannels) {
 
-                var aSubscribedChannels = [];
+            var sError;
 
-                if (!sClientId) {
-                    Log.error("MessageBroker.unsubscribe: Missing required parameter sClientId");
-                    return reject("MessageBroker.unsubscribe: Missing required parameter sClientId");
-                }
+            if (typeof sClientId !== "string" || !sClientId.length ||
+                !Array.isArray(aUnsubscribedChannels) || !aUnsubscribedChannels.length) {
+                sError = "Missing required parameter(s)";
+                Log.error(sError, null, "sap.ushell.services.MessageBroker");
+                return Promise.reject(sError);
+            }
 
-                // in case disconnect request received twice
-                if (!oActiveClients[sClientId]) {
-                    Log.error("MessageBroker.unsubscribe: attempt to unsubscribe twice");
-                    return reject("Client already unsubscribed");
-                }
+            if (!oConnectedClients[sClientId]) {
+                sError = "Client is not connected";
+                Log.error(sError, null, "sap.ushell.services.MessageBroker");
+                return Promise.reject(sError);
+            }
 
-                delete oActiveClients[sClientId];
+            for (var sChannelIndex in aUnsubscribedChannels) {
 
-                for (var sChannelKey in oClientsPerChannel) {
+                var oChannel = aUnsubscribedChannels[sChannelIndex];
 
-                    var aChannelClients = oClientsPerChannel[sChannelKey];
+                if (oClientsPerChannel[oChannel.channelId]) {
+                    var aChannelClients = oClientsPerChannel[oChannel.channelId];
                     // find client and remove from the channel
                     for (var oClientKey in aChannelClients) {
 
                         var oClient = aChannelClients[oClientKey];
 
                         if (oClient.clientId === sClientId) {
+                            var aSubscribedChannels = oSubscribedClients[sClientId].channels;
+
+                            oSubscribedClients[sClientId].channels = aSubscribedChannels.filter(function (oSubChannel) {
+                                return oSubChannel.channelId !== oChannel.channelId;
+                            });
 
-                            aSubscribedChannels = oClient.subscribedChannels;
                             aChannelClients.splice(oClientKey, 1);
                             break;
                         }
                     }
+                } else {
+                    // if channel does not exist
+                    var sMessage = "Unknown channel Id: " + oChannel.channelId;
+                    Log.warning(sMessage, null, "sap.ushell.services.MessageBroker");
                 }
+            }
 
-                this._emitEvent( "clientDisconnected", sClientId, aSubscribedChannels, {});
-                return resolve();
-            }.bind(this));
+            this._emitEvent( "clientUnsubscribed", sClientId, aUnsubscribedChannels);
+            return Promise.resolve();
         };
 
         /**
          *
          * @param {string} sChannelId channel id.
          * @param {string} sClientId client id.
-         * @param {string} sMessageId request id for embedded clients or message id for UI5 clients.
+         * @param {string} sMessageId request id for iframe clients or message id for UI5 clients.
          * @param {string} sMessageName message name.
          * @param {array} aTargetClientIds array of target clients Ids.
          * @param {object} data additional data.
+         * @returns {Promise} Promise result.
          *
          * @since 1.110.0
          * @private
@@ -200,54 +315,62 @@ sap.ui.define([
 
         this.publish = function (sChannelId, sClientId, sMessageId, sMessageName, aTargetClientIds, data) {
 
-            return new Promise(function (resolve, reject) {
+            var sError,
+                aTargetClients = [];
 
-                var sError;
+            // if client is not connected
+            if (!oConnectedClients[sClientId]) {
+                sError = "Client is not connected";
+                Log.error(sError, null, "sap.ushell.services.MessageBroker");
+                return Promise.reject(sError);
+            }
 
-                // if channel does not exist
-                if (!oClientsPerChannel[sChannelId]) {
-                    sError = "Unknown channel Id: " + sChannelId;
-                    Log.error(sError);
-                    return reject(sError);
-                }
+            // if channel does not exist
+            if (!oClientsPerChannel[sChannelId]) {
+                sError = "Unknown channel Id: " + sChannelId;
+                Log.error(sError, null, "sap.ushell.services.MessageBroker");
+                return Promise.reject(sError);
+            }
 
-                var aTargetClients = [];
+            var oPubClient = oClientsPerChannel[sChannelId].find(function (oSubClient) {
+                return oSubClient.clientId === sClientId;
+            });
 
-                for (var sClientKey in aTargetClientIds) {
+            // if client is not subscribed to the channel
+            if (!oPubClient) {
+                sError = "Client is not subscribed to the provided channel";
+                Log.error(sError, null, "sap.ushell.services.MessageBroker");
+                return Promise.reject(sError);
+            }
 
+            for (var sClientKey in aTargetClientIds) {
 
-                    var sTargetClientId = aTargetClientIds[sClientKey];
+                var sTargetClientId = aTargetClientIds[sClientKey];
 
-                    // check if message is for all clients in the channel
-                    if (sTargetClientId === "*") {
-                        aTargetClients = oClientsPerChannel[sChannelId].concat();
-                        break;
-                    } else {
-                        // check if target client exists
-                        var oTargetClient = oClientsPerChannel[sChannelId].find(function (oClient) {
-                            return oClient.clientId === sTargetClientId;
-                        });
+                // if message is for all clients in the channel
+                if (sTargetClientId === "*") {
+                    aTargetClients = oClientsPerChannel[sChannelId].concat();
+                    break;
+                } else {
+                    // check if target client exists
+                    var oTargetClient = oClientsPerChannel[sChannelId].find(function (oClient) {
+                        return oClient.clientId === sTargetClientId;
+                    });
 
-                        if (oTargetClient) {
-                            aTargetClients.push(this._deepCopy(oTargetClient));
-                        }
+                    if (oTargetClient) {
+                        aTargetClients.push(this._deepCopy(oTargetClient));
                     }
                 }
+            }
 
-                if (aTargetClients.length) {
-                    this._sendMessage("request", aTargetClients, sChannelId, sMessageId, sMessageName, sClientId, data)
-                        .then(function (oResponse) {
-                            return resolve(oResponse);
-                        })
-                        .catch(function (sErrorMsg) {
-                            return reject(sErrorMsg);
-                        });
-                } else {
-                    sError = "Target client(s) not found in the provided channel";
-                    Log.error(sError);
-                    return reject(sError);
-                }
-            }.bind(this));
+            if (aTargetClients.length) {
+                this._sendMessage(aTargetClients, sChannelId, sMessageId, sMessageName, sClientId, data);
+                return Promise.resolve();
+            } else {
+                sError = "Target client(s) not found in the provided channel";
+                Log.error(sError, null, "sap.ushell.services.MessageBroker");
+                return Promise.reject(sError);
+            }
         };
 
         /**
@@ -260,10 +383,10 @@ sap.ui.define([
 
         this.addAcceptedOrigin = function (sOrigin) {
 
-            if (sOrigin) {
+            if (typeof sOrigin === "string" && sOrigin.length > 0) {
                 oAcceptedOrigins[sOrigin] = true;
             } else {
-                Log.error("MessageBroker.addAcceptedOrigin: Missing required parameter sOrigin");
+                Log.warning("Missing required parameter sOrigin", null, "sap.ushell.services.MessageBroker");
             }
         };
 
@@ -281,18 +404,17 @@ sap.ui.define([
 
         /**
          *
-         * @returns {promise} the result.
+         * @returns {array} the result.
          *
          * @since 1.110.0
          * @private
          */
 
         this.getAcceptedOrigins = function () {
-            return Promise.resolve(Object.keys(oAcceptedOrigins));
+            return Object.keys(oAcceptedOrigins);
         };
 
         /**
-         * This function is for testing the state of oActiveClients in qunit
          *
          * @returns {object} the result.
          *
@@ -300,23 +422,21 @@ sap.ui.define([
          * @private
          */
 
-        this.getConnectedClients = function () {
+        this.getSubscribedClients = function () {
             return this._deepCopy(oClientsPerChannel);
         };
 
         /**
-         * This function notifies clients of various events in a channel
          *
          * @param {string} sMessageName message name.
          * @param {string} sClientId client id.
-         * @param {array} aSubscribedChannels subscribed channels of the client.
-         * @param {object} data additional data.
+         * @param {array} aChannels subscribed/unsubscribed channels of the client.
          *
          * @since 1.110.0
          * @private
          */
 
-        this._emitEvent = function (sMessageName, sClientId, aSubscribedChannels, data) {
+        this._emitEvent = function (sMessageName, sClientId, aChannels) {
 
             var oNotifiedClients = {};
 
@@ -329,17 +449,20 @@ sap.ui.define([
                     var oClient = oChannel[sClientKey];
                     // do not notify the same client who initiated the event
                     if (oClient.clientId !== sClientId && !oNotifiedClients[oClient.clientId]) {
+
+                        var oParams = {
+                            clientId: sClientId,
+                            channels: aChannels
+                        };
+
                         if (oClient.isUI5 !== false) {
-                            oClient.clientConnectionCallback(sMessageName, sClientId, aSubscribedChannels, data);
+                            oClient.clientConnectionCallback(sMessageName, [oParams]);
                         } else {
-                            var oParams = {
-                                    clientId: sClientId,
-                                    channelId: "sap.ushell.MessageBroker",
-                                    messageName: sMessageName,
-                                    subscribedChannels: aSubscribedChannels,
-                                    data: data
-                                },
-                                oMessageBody = this._buildPostMessageObject("event", oParams);
+
+                            oParams.channelId = "sap.ushell.MessageBroker";
+                            oParams.messageName = sMessageName;
+
+                            var oMessageBody = this._buildPostMessageObject("event", oParams);
                             this._sendPostMessageToClient(oMessageBody, oClient.iframe, oClient.origin, false);
                         }
 
@@ -350,161 +473,41 @@ sap.ui.define([
         };
 
         /**
-         * This function sends message to UI5 client and awaits for reply
-         *
-         * @param {object} oClient target client object.
-         * @param {string} sClientId client id.
-         * @param {string} sChannelId channel id.
-         * @param {string} sMessageId request id for embedded clients or message id for UI5 clients.
-         * @param {string} sMessageName message name.
-         * @param {object} data additional data.
-         * @returns {Promise} Promise result.
          *
-         * @since 1.110.0
-         * @private
-         */
-
-
-        this._sendMessageToUI5Client = function(oClient, sClientId, sChannelId, sMessageId, sMessageName, data) {
-
-            return new Promise(function (resolve, reject) {
-                oClient.messageCallback(sClientId, sChannelId, sMessageName, data)
-                    .then(function (oResponse) {
-                        if (oResponse) {
-                            var oRequestingClient = oClientsPerChannel[sChannelId].find(function (oStoredClient) {
-                                    return oStoredClient.clientId === sClientId;
-                                }),
-                                oRequestingClientClone = this._deepCopy(oRequestingClient);
-
-                            // send data back to client who requested it
-                            if (oRequestingClientClone.isUI5 !== false) {
-                                oRequestingClientClone.messageCallback(oClient.clientId, sChannelId, sMessageName, oResponse, sMessageId);
-                            } else {
-                                var oParams = {
-                                        clientId: oClient.clientId,
-                                        channelId: sChannelId,
-                                        messageName: sMessageName,
-                                        subscribedChannels: oClient.subscribedChannels,
-                                        data: oResponse,
-                                        requestId: sMessageId
-                                    },
-                                    oMessageBody = this._buildPostMessageObject("response", oParams);
-                                // send data back to client who requested it
-                                this._sendPostMessageToClient(oMessageBody, oRequestingClientClone.iframe, oRequestingClientClone.origin, false);
-                            }
-                        }
-
-                        return resolve();
-                    }.bind(this))
-                    .catch(function (sError) {
-                        return reject(sError);
-                    });
-            }.bind(this));
-        };
-
-        /**
-         * This function sends message to embedded client and awaits for reply
-         *
-         * @param {string} sActionType request/response.
-         * @param {object} oClient target client object.
-         * @param {object} oParams post message parameters.
-         * @returns {Promise} Promise result.
-         *
-         * @since 1.110.0
-         * @private
-         */
-
-
-        this._sendMessageToEmbeddedClient = function(sActionType, oClient, oParams) {
-
-            return new Promise(function (resolve, reject) {
-
-                var oMessageBody = this._buildPostMessageObject(sActionType, oParams);
-
-                this._sendPostMessageToClient(oMessageBody, oClient.iframe, oClient.origin, true)
-                    .then(function (oResponse) {
-                        if (oResponse) {
-                            var oRequestingClient = oClientsPerChannel[oParams.channelId].find(function (oStoredClient) {
-                                    return oStoredClient.clientId === oParams.clientId;
-                                }),
-                                oRequestingClientClone = this._deepCopy(oRequestingClient);
-
-                            // send data back to client who requested it
-                            if (oRequestingClientClone.isUI5 !== false) {
-                                oRequestingClientClone.messageCallback(oClient.clientId, oParams.channelId, oParams.messageName, oResponse.body, oParams.requestId);
-                            } else {
-                                oResponse.request_id = oResponse.correlationMessageId = oParams.requestId;
-                                this._sendPostMessageToClient(oResponse, oRequestingClientClone.iframe, oRequestingClientClone.origin, false);
-                            }
-                        }
-
-                        return resolve();
-                    }.bind(this))
-                    .catch(function (sError) {
-                        return reject(sError);
-                    });
-            }.bind(this));
-        };
-
-        /**
-         * This function sends message to client(s)
-         *
-         * @param {string} sActionType action type (response/request).
          * @param {array} aTargetClients target clients.
          * @param {string} sChannelId channel id.
-         * @param {string} sMessageId request id for embedded clients or message id for UI5 clients.
+         * @param {string} sMessageId request id for iframe clients or message id for UI5 clients.
          * @param {string} sMessageName message name.
          * @param {string} sClientId client id.
          * @param {object} data additional data.
-         * @returns {Promise} Promise result.
          *
          * @since 1.110.0
          * @private
          */
 
-        this._sendMessage = function (sActionType, aTargetClients, sChannelId, sMessageId, sMessageName, sClientId, data) {
-
-            return new Promise(function (resolve, reject) {
-
-                if (!aTargetClients.length) {
-                    return resolve(aTargetClients);
-                }
-
-                for (var sClientKey in aTargetClients) {
+        this._sendMessage = function (aTargetClients, sChannelId, sMessageId, sMessageName, sClientId, data) {
 
-                    var oClient = aTargetClients[sClientKey];
+            for (var sClientKey in aTargetClients) {
 
-                    // do not send message to the same client who requested to send it
-                    if (oClient.clientId !== sClientId) {
-                        if (oClient.isUI5 !== false) {
+                var oClient = aTargetClients[sClientKey];
 
-                            this._sendMessageToUI5Client(oClient, sClientId, sChannelId, sMessageId, sMessageName, data)
-                                .then(function (oResponse) {
-                                    return resolve(oResponse);
-                                })
-                                .catch(function (sError) {
-                                    return reject(sError);
-                                });
-                        } else {
-                            var oParams = {
-                                clientId: sClientId,
-                                channelId: sChannelId,
-                                messageName: sMessageName,
-                                requestId: sMessageId,
-                                data: data
-                            };
-
-                            this._sendMessageToEmbeddedClient(sActionType, oClient, oParams)
-                                .then(function (oResponse) {
-                                    return resolve(oResponse);
-                                })
-                                .catch(function (sError) {
-                                    return reject(sError);
-                                });
-                        }
+                // do not send message to the same client who requested to send it
+                if (oClient.clientId !== sClientId) {
+                    if (oClient.isUI5 !== false) {
+                        oClient.messageCallback(sClientId, sChannelId, sMessageName, data);
+                    } else {
+                        var oParams = {
+                            clientId: sClientId,
+                            channelId: sChannelId,
+                            messageName: sMessageName,
+                            data: data
+                        };
+
+                        var oMessageBody = this._buildPostMessageObject("request", oParams);
+                        this._sendPostMessageToClient(oMessageBody, oClient.iframe, oClient.origin, false);
                     }
                 }
-            }.bind(this));
+            }
         };
 
         /**
@@ -536,28 +539,33 @@ sap.ui.define([
             return new Promise(function (resolve, reject) {
 
                 var sEndpoint,
-                    sStatus = "accepted",
                     bPostMsgResponse = false,
                     sClientId = oMessageDataBody.clientId,
                     sChannelId = oMessageDataBody.channelId,
                     sRequestId = oMessageDataBody.requestId,
                     sMessageName = oMessageDataBody.messageName,
                     aSubscribedChannels = oMessageDataBody.subscribedChannels,
-                    aTargetClientIds = oMessageDataBody.targetClientIds || [],
+                    aTargetClientIds = oMessageDataBody.targetClientIds,
                     data = oMessageDataBody.data;
 
                 var oEndpointParams = {
+                    connect: [
+                        sClientId
+                    ],
+                    disconnect: [
+                        sClientId
+                    ],
                     subscribe: [
                         sClientId,
                         aSubscribedChannels,
-                        data,
                         null,
                         null,
                         oIframe,
                         sOrigin
                     ],
                     unsubscribe: [
-                        sClientId
+                        sClientId,
+                        aSubscribedChannels
                     ],
                     publish: [
                         sChannelId,
@@ -573,18 +581,15 @@ sap.ui.define([
                         channelId: sChannelId,
                         clientId: sClientId,
                         messageName: sMessageName,
-                        data: data,
                         requestId: sRequestId
-                    },
-                    oResponseObject = this._buildPostMessageObject("response", oPostMessageParams);
+                    };
 
                 switch (sMessageName) {
                     case "connect":
-                        sEndpoint = "subscribe";
-                        bPostMsgResponse = true;
-                        break;
                     case "disconnect":
-                        sEndpoint = "unsubscribe";
+                    case "subscribe":
+                    case "unsubscribe":
+                        sEndpoint = sMessageName;
                         bPostMsgResponse = true;
                         break;
                     default:
@@ -592,6 +597,8 @@ sap.ui.define([
                         break;
                 }
 
+                var oResponseObject = this._buildPostMessageObject("response", oPostMessageParams);
+
                 this._callApi(sEndpoint, oEndpointParams[sEndpoint])
                     .then(function (oResponse) {
                         if (Array.isArray(oResponse)) {
@@ -606,9 +613,7 @@ sap.ui.define([
                     })
                     .finally(function () {
                         if (bPostMsgResponse) {
-                            if (sStatus) {
-                                oResponseObject.body.status = sStatus;
-                            }
+                            oResponseObject.body.status = "accepted";
                             this._sendPostMessageToClient(oResponseObject, oIframe, sOrigin, false);
                         }
                     }.bind(this));
@@ -625,46 +630,79 @@ sap.ui.define([
          */
 
         this._sendPostMessageToClient = function (oMessageDataBody, oIframe, sTargetDomain, bWaitForResponse) {
-            return Application.postMessageToIframeObject(oMessageDataBody, oIframe, sTargetDomain, bWaitForResponse);
+            return new Promise(function (resolve, reject) {
+                sap.ui.require(["sap/ushell/components/applicationIntegration/application/Application"], function (Application) {
+                    Application.postMessageToIframeObject(oMessageDataBody, oIframe, sTargetDomain, bWaitForResponse).then(resolve, reject);
+                });
+            });
         };
 
         /**
-         * This function builds post message object
          *
          * @param {string} sType object type.
          * @param {object} oParams object properties.
-         * @returns {function} relevant function to call.
+         * @returns {object} relevant post message object.
          *
          * @since 1.110.0
          * @private
          */
 
         this._buildPostMessageObject = function (sObjectType, oParams) {
+            function createPostMessageRequest (sServiceName, oMessageBody) {
+                var sRequestId = Date.now().toString();
+
+                return {
+                    type: "request",
+                    request_id: sRequestId,
+                    service: sServiceName,
+                    body: oMessageBody
+                };
+            }
+
+            function createPostMessageResponse (sServiceName, sRequestId, oMessageBody, bSuccess) {
+                return {
+                    type: "response",
+                    request_id: sRequestId,
+                    service: sServiceName,
+                    status: (bSuccess ? "success" : "error"),
+                    body: oMessageBody
+                };
+            }
 
             var sServiceName = "sap.ushell.services.MessageBroker",
                 oMessageBody = {
                     request: {
                         channelId: oParams.channelId,
                         clientId: oParams.clientId,
-                        messageName: oParams.messageName,
-                        data: oParams.data
+                        messageName: oParams.messageName
                     },
                     response: {
                         channelId: oParams.channelId,
                         clientId: oParams.clientId,
                         correlationMessageId: oParams.requestId,
-                        messageName: oParams.messageName,
-                        data: oParams.data
+                        messageName: oParams.messageName
                     },
                     event: {
                         channelId: oParams.channelId,
                         clientId: oParams.clientId,
-                        messageName: oParams.messageName,
-                        subscribedChannels: oParams.subscribedChannels,
-                        data: oParams.data
+                        messageName: oParams.messageName
                     }
                 };
 
+            switch (sObjectType) {
+                case "event":
+                    oMessageBody.event.channels = oParams.channels;
+                    break;
+                case "request":
+                    if (oParams.data) {
+                        oMessageBody[sObjectType].data = oParams.data;
+                    }
+                    if (oParams.activeClients) {
+                        oMessageBody[sObjectType].activeClients = oParams.activeClients;
+                    }
+                    break;
+            }
+
             var oObjectParams = {
                 request: [
                     sServiceName,
@@ -682,16 +720,12 @@ sap.ui.define([
                 ]
             };
 
-            if (oParams.activeClients) {
-                oMessageBody[sObjectType].activeClients = oParams.activeClients;
-            }
-
-            var sMethod = this._buildFunctionName("createPostMessage", sObjectType === "response" ? sObjectType : "request");
-            return Application[sMethod].apply(this, oObjectParams[sObjectType]);
+            var //sMethod = this._buildFunctionName("createPostMessage", sObjectType === "response" ? sObjectType : "request"),
+                fnMethod = (sObjectType === "response" ? createPostMessageResponse : createPostMessageRequest);
+            return fnMethod.apply(this, oObjectParams[sObjectType]);
         };
 
         /**
-         * This function builds function name dynamically
          *
          * @param {string} sPrefix function name prefix.
          * @param {string} sType function type.
@@ -707,7 +741,6 @@ sap.ui.define([
         };
 
         /**
-         * Deep copy
          *
          * @param {object} oEntity.
          * @returns {object} deep copy.