@sapui5/sap.ushell 1.139.0 → 1.141.0

package/src/main/js/sap/ushell/appRuntime/ui5/services/MessageBroker.js

@@ -3,17 +3,23 @@
 /**
  * @fileOverview The app runtime wrapper for {@link sap.ushell.services.MessageBroker}.
  *
- * @version 1.139.0
+ * @version 1.141.0
  */
 sap.ui.define([
-    "sap/ushell/appRuntime/ui5/AppRuntimeService"
+    "sap/base/Log",
+    "sap/ushell/appRuntime/ui5/AppCommunicationMgr",
+    "sap/ushell/appRuntime/ui5/services/MessageBroker/Client",
+    "sap/ushell/services/MessageBroker/ClientAlias",
+    "sap/ushell/utils/CallbackQueue"
 ], (
-    AppRuntimeService
+    Log,
+    AppCommunicationMgr,
+    MessageBrokerClient,
+    ClientAlias,
+    CallbackQueue
 ) => {
     "use strict";
 
-    let oClientData = {};
-
     /**
      * @alias sap.ushell.appRuntime.ui5.services.MessageBroker
      * @class
@@ -23,78 +29,152 @@ sap.ui.define([
      *
      * @private
      */
-    function MessageBrokerProxy () {}
+    function MessageBrokerProxy () {
+        this._mClientData = new Map();
+        this._oLogger = Log.getLogger("sap.ushell.services.MessageBroker");
+
+        /*
+         * We have to track changes in a queue because the underlying communication layer is asynchronous.
+         * This ensures that the internal state is always consistent.
+         * E.g.
+         * When a client is connecting and subscribing and receives messages in the meantime.
+         * The sender might be already informed and it should be legit to send a message.
+         * But the appruntime wasn't informed yet.
+         */
+        this.oCallbackQueue = new CallbackQueue();
+    }
+
+    MessageBrokerProxy.prototype.connect = async function (sClientId, fnClientConnectionCallback) {
+        return this.oCallbackQueue.push(async () => {
+            if (typeof sClientId !== "string" || !sClientId.length) {
+                throw new Error("Cannot connect client: Missing required parameter client id");
+            }
+
+            if (typeof fnClientConnectionCallback !== "function") {
+                this._oLogger.error(`Missing required parameter 'fnClientConnectionCallback' for client '${sClientId}'! It has to be provided as part of the connect() call`);
+            }
+
+            const oClient = new MessageBrokerClient(sClientId);
+            oClient.setClientConnectionCallback(fnClientConnectionCallback);
 
-    MessageBrokerProxy.prototype.connect = function (sClientId) {
-        return new Promise((fnResolve, fnReject) => {
-            AppRuntimeService.postMessageToFLP("sap.ushell.services.MessageBroker", {
+            await AppCommunicationMgr.postMessageToFLP("sap.ushell.services.MessageBroker", {
                 channelId: "sap.ushell.MessageBroker",
                 clientId: sClientId,
                 messageName: "connect"
-            }).then(fnResolve).catch(fnReject);
+            });
+
+            this._mClientData.set(sClientId, oClient);
         });
     };
 
-    MessageBrokerProxy.prototype.disconnect = function (sClientId) {
-        return new Promise((fnResolve, fnReject) => {
-            oClientData = {};
-            AppRuntimeService.postMessageToFLP("sap.ushell.services.MessageBroker", {
+    MessageBrokerProxy.prototype.disconnect = async function (sClientId) {
+        return this.oCallbackQueue.push(async () => {
+            if (typeof sClientId !== "string" || !sClientId.length) {
+                throw new Error("Cannot disconnect client: Missing required parameter client id");
+            }
+
+            await AppCommunicationMgr.postMessageToFLP("sap.ushell.services.MessageBroker", {
                 channelId: "sap.ushell.MessageBroker",
                 clientId: sClientId,
                 messageName: "disconnect"
-            }).then(fnResolve).catch(fnReject);
+            });
+
+            this._mClientData.delete(sClientId);
         });
     };
 
-    MessageBrokerProxy.prototype.subscribe = function (
-        sClientId,
-        aSubscribedChannels,
-        fnMessageCallback,
-        fnClientConnectionCallback
-    ) {
-        return new Promise((fnResolve, fnReject) => {
-            oClientData = {
-                fnMessageCallback: fnMessageCallback,
-                fnClientConnectionCallback: fnClientConnectionCallback
-            };
-
-            AppRuntimeService.postMessageToFLP("sap.ushell.services.MessageBroker", {
+    MessageBrokerProxy.prototype.subscribe = async function (sClientId, aSubscribedChannels, fnMessageCallback, fnClientConnectionCallback) {
+        return this.oCallbackQueue.push(async () => {
+            if (
+                typeof sClientId !== "string"
+                || !sClientId.length
+                || !aSubscribedChannels.length
+                || typeof fnMessageCallback !== "function"
+            ) {
+                throw new Error(`Cannot subscribe client '${sClientId}': Missing required parameter(s)`);
+            }
+
+            if (typeof fnClientConnectionCallback === "function") {
+                // eslint-disable-next-line max-len
+                this._oLogger.error(`The 'fnClientConnectionCallback' parameter was provided by client '${sClientId}'. This parameter is deprecated and should be provided as part of the connect() call`);
+            }
+
+            const oClient = this._mClientData.get(sClientId);
+
+            if (!oClient) {
+                throw new Error(`Cannot subscribe client '${sClientId}': Client is not connected`);
+            }
+
+            await AppCommunicationMgr.postMessageToFLP("sap.ushell.services.MessageBroker", {
                 channelId: "sap.ushell.MessageBroker",
                 clientId: sClientId,
                 messageName: "subscribe",
                 subscribedChannels: aSubscribedChannels
-            }).then(fnResolve).catch(fnReject);
+            });
+
+            aSubscribedChannels.forEach((oChannel) => oClient.subscribe(oChannel.channelId, fnMessageCallback));
+
+            if (fnClientConnectionCallback) {
+                oClient.setClientConnectionCallback(fnClientConnectionCallback);
+            }
         });
     };
 
-    MessageBrokerProxy.prototype.unsubscribe = function (sClientId, aUnsubscribedChannels) {
-        return new Promise((fnResolve, fnReject) => {
-            oClientData = {};
-            AppRuntimeService.postMessageToFLP("sap.ushell.services.MessageBroker", {
+    MessageBrokerProxy.prototype.unsubscribe = async function (sClientId, aUnsubscribedChannels) {
+        return this.oCallbackQueue.push(async () => {
+            if (
+                typeof sClientId !== "string"
+                || !sClientId.length
+                || !Array.isArray(aUnsubscribedChannels)
+                || !aUnsubscribedChannels.length
+            ) {
+                throw new Error(`Cannot unsubscribe client '${sClientId}': Missing required parameter(s)`);
+            }
+
+            const oClient = this._mClientData.get(sClientId);
+
+            if (!oClient) {
+                throw new Error(`Cannot subscribe client '${sClientId}': Client is not connected`);
+            }
+
+            await AppCommunicationMgr.postMessageToFLP("sap.ushell.services.MessageBroker", {
                 channelId: "sap.ushell.MessageBroker",
                 clientId: sClientId,
                 messageName: "unsubscribe",
                 subscribedChannels: aUnsubscribedChannels
-            }).then(fnResolve).catch(fnReject);
+            });
+
+            aUnsubscribedChannels.forEach((oChannel) => oClient.subscribe(oChannel.channelId, undefined));
         });
     };
 
-    MessageBrokerProxy.prototype.publish = function (
-        sChannelId,
-        sClientId,
-        sMessageId,
-        sMessageName,
-        aTargetClientIds,
-        data
-    ) {
-        return new Promise((fnResolve, fnReject) => {
-            AppRuntimeService.postMessageToFLP("sap.ushell.services.MessageBroker", {
+    MessageBrokerProxy.prototype.publish = async function (sChannelId, sClientId, sMessageId, sMessageName, vTargetClientIds, oData) {
+        return this.oCallbackQueue.push(async () => {
+            if (typeof sMessageName === "string" && (Array.isArray(vTargetClientIds) || vTargetClientIds === ClientAlias.AllClients)) {
+                this._oLogger.error(`The parameter 'sMessageId' was provided by client '${sClientId}'. It is deprecated and should not be provided`);
+            } else {
+                // do remapping
+                oData = vTargetClientIds;
+                vTargetClientIds = sMessageName;
+                sMessageName = sMessageId;
+                sMessageId = undefined;
+            }
+
+            let aTargetClientIds;
+            if (vTargetClientIds === ClientAlias.AllClients) {
+                aTargetClientIds = [ClientAlias.AllClients];
+            } else {
+                aTargetClientIds = [...vTargetClientIds];
+            }
+
+            // do not await, because it does not respond!
+            AppCommunicationMgr.postMessageToFLP("sap.ushell.services.MessageBroker", {
                 clientId: sClientId,
                 channelId: sChannelId,
                 targetClientIds: aTargetClientIds,
                 messageName: sMessageName,
-                data: data
-            }, sMessageId).then(fnResolve).catch(fnReject);
+                data: oData
+            });
         });
     };
 
@@ -114,21 +194,40 @@ sap.ui.define([
         // should be empty in AppRuntime
     };
 
-    MessageBrokerProxy.prototype.handleMessage = function (oBody) {
-        return new Promise((fnResolve, fnReject) => {
-            switch (oBody.messageName) {
-                case "clientSubscribed":
-                case "clientUnsubscribed":
-                    oClientData.fnClientConnectionCallback(oBody.messageName, oBody.clientId, oBody.channels);
-                    break;
-                default:
-                    oClientData.fnMessageCallback(oBody.clientId, oBody.channelId, oBody.messageName, oBody.data);
-                    break;
+    MessageBrokerProxy.prototype.handleMessage = async function (oBody) {
+        return this.oCallbackQueue.push(async () => {
+            const oClient = this._mClientData.get(oBody.targetClientId);
+
+            if (!oClient) {
+                throw new Error(`Client '${oBody.targetClientId}' is not connected`);
             }
-            fnResolve({_noresponse_: true});
+
+            if (["clientSubscribed", "clientUnsubscribed"].includes(oBody.messageName)) {
+                oClient.callClientConnectionCallback(
+                    oBody.messageName,
+                    oBody.clientId,
+                    oBody.channels
+                );
+                return { _noresponse_: true };
+            }
+
+            const fnMessageCallback = oClient.getMessageCallback(oBody.channelId);
+            if (!fnMessageCallback) {
+                throw new Error(`Client '${oBody.clientId}' is not subscribed to channel '${oBody.channelId}'`);
+            }
+
+            fnMessageCallback(
+                oBody.clientId,
+                oBody.channelId,
+                oBody.messageName,
+                oBody.data
+            );
+
+            return { _noresponse_: true };
         });
     };
 
     MessageBrokerProxy.hasNoAdapter = true;
+
     return MessageBrokerProxy;
-}, false);
+});

package/src/main/js/sap/ushell/appRuntime/ui5/services/NavTargetResolution.js

@@ -3,17 +3,17 @@
 /**
  * @fileOverview The app runtime wrapper for {@link sap.ushell.services.NavTargetResolution}.
  *
- * @version 1.139.0
+ * @version 1.141.0
  * @deprecated since 1.120. Use {@link sap.ushell.services.Navigation} for Navigation instead.
  */
 sap.ui.define([
     "sap/ushell/services/NavTargetResolution",
-    "sap/ushell/appRuntime/ui5/AppRuntimeService",
+    "sap/ushell/appRuntime/ui5/AppCommunicationMgr",
     "sap/ushell/appRuntime/ui5/AppRuntimeContext",
     "sap/ui/thirdparty/jquery"
 ], (
     NavTargetResolution,
-    AppRuntimeService,
+    AppCommunicationMgr,
     AppRuntimeContext,
     jQuery
 ) => {
@@ -43,7 +43,7 @@ sap.ui.define([
             let arrResult;
 
             aPromises.push(AppRuntimeContext.getIsScube() ? this.getDistinctSemanticObjectsLocal() : Promise.resolve([]));
-            aPromises.push(AppRuntimeService.postMessageToFLP("sap.ushell.services.NavTargetResolution.getDistinctSemanticObjects"));
+            aPromises.push(AppCommunicationMgr.postMessageToFLP("sap.ushell.services.NavTargetResolution.getDistinctSemanticObjects"));
             Promise.allSettled(aPromises).then((aResults) => {
                 arrResult = aResults[0].status === "fulfilled" ? aResults[0].value : [];
                 arrResult = arrResult.concat(aResults[1].status === "fulfilled" ? aResults[1].value : []);
@@ -58,7 +58,7 @@ sap.ui.define([
 
         this.expandCompactHash = function (sHashFragment) {
             if (sHashFragment && sHashFragment.indexOf("sap-intent-param") > 0) {
-                return AppRuntimeService.sendMessageToOuterShell("sap.ushell.services.NavTargetResolution.expandCompactHash", {
+                return AppCommunicationMgr.sendMessageToOuterShell("sap.ushell.services.NavTargetResolution.expandCompactHash", {
                     sHashFragment: sHashFragment
                 });
             }
@@ -72,13 +72,13 @@ sap.ui.define([
                 this.resolveHashFragmentLocal(sHashFragment)
                     .done(oDeferred.resolve)
                     .fail(() => {
-                        return AppRuntimeService.postMessageToFLP("sap.ushell.services.NavTargetResolution.resolveHashFragment", {
+                        return AppCommunicationMgr.postMessageToFLP("sap.ushell.services.NavTargetResolution.resolveHashFragment", {
                             sHashFragment: sHashFragment
-                        }).then(oDeferred.resolve, oDeferred.reject);
+                        }).then(oDeferred.resolve).catch(oDeferred.reject);
                     });
                 return oDeferred.promise();
             }
-            return AppRuntimeService.sendMessageToOuterShell("sap.ushell.services.NavTargetResolution.resolveHashFragment", {
+            return AppCommunicationMgr.sendMessageToOuterShell("sap.ushell.services.NavTargetResolution.resolveHashFragment", {
                 sHashFragment: sHashFragment
             });
         };
@@ -91,7 +91,7 @@ sap.ui.define([
             let oResult2;
 
             aPromises.push(AppRuntimeContext.getIsScube() ? this.isIntentSupportedLocal(aIntents) : Promise.resolve(undefined));
-            aPromises.push(AppRuntimeService.postMessageToFLP("sap.ushell.services.NavTargetResolution.isIntentSupported", {
+            aPromises.push(AppCommunicationMgr.postMessageToFLP("sap.ushell.services.NavTargetResolution.isIntentSupported", {
                 aIntents: aIntents
             }));
             Promise.allSettled(aPromises).then((aResults) => {

package/src/main/js/sap/ushell/appRuntime/ui5/services/NavTargetResolutionInternal.js

@@ -3,16 +3,16 @@
 /**
  * @fileOverview The app runtime wrapper for {@link sap.ushell.services.NavTargetResolutionInternal}.
  *
- * @version 1.139.0
+ * @version 1.141.0
  */
 sap.ui.define([
     "sap/ushell/services/NavTargetResolutionInternal",
-    "sap/ushell/appRuntime/ui5/AppRuntimeService",
+    "sap/ushell/appRuntime/ui5/AppCommunicationMgr",
     "sap/ushell/appRuntime/ui5/AppRuntimeContext",
     "sap/ui/thirdparty/jquery"
 ], (
     NavTargetResolutionInternal,
-    AppRuntimeService,
+    AppCommunicationMgr,
     AppRuntimeContext,
     jQuery
 ) => {
@@ -42,7 +42,7 @@ sap.ui.define([
             let arrResult;
 
             aPromises.push(AppRuntimeContext.getIsScube() ? this.getDistinctSemanticObjectsLocal() : Promise.resolve([]));
-            aPromises.push(AppRuntimeService.postMessageToFLP("sap.ushell.services.NavTargetResolutionInternal.getDistinctSemanticObjects"));
+            aPromises.push(AppCommunicationMgr.postMessageToFLP("sap.ushell.services.NavTargetResolutionInternal.getDistinctSemanticObjects"));
             Promise.allSettled(aPromises).then((aResults) => {
                 arrResult = aResults[0].status === "fulfilled" ? aResults[0].value : [];
                 arrResult = arrResult.concat(aResults[1].status === "fulfilled" ? aResults[1].value : []);
@@ -57,7 +57,7 @@ sap.ui.define([
 
         this.expandCompactHash = function (sHashFragment) {
             if (sHashFragment && sHashFragment.indexOf("sap-intent-param") > 0) {
-                return AppRuntimeService.sendMessageToOuterShell("sap.ushell.services.NavTargetResolutionInternal.expandCompactHash", {
+                return AppCommunicationMgr.sendMessageToOuterShell("sap.ushell.services.NavTargetResolutionInternal.expandCompactHash", {
                     sHashFragment: sHashFragment
                 });
             }
@@ -72,13 +72,13 @@ sap.ui.define([
                 this.resolveHashFragmentLocal(sHashFragment)
                     .done(oDeferred.resolve)
                     .fail(() => {
-                        return AppRuntimeService.postMessageToFLP("sap.ushell.services.NavTargetResolutionInternal.resolveHashFragment", {
+                        return AppCommunicationMgr.postMessageToFLP("sap.ushell.services.NavTargetResolutionInternal.resolveHashFragment", {
                             sHashFragment: sHashFragment
-                        }).then(oDeferred.resolve, oDeferred.reject);
+                        }).then(oDeferred.resolve).catch(oDeferred.reject);
                     });
                 return oDeferred.promise();
             }
-            return AppRuntimeService.sendMessageToOuterShell("sap.ushell.services.NavTargetResolutionInternal.resolveHashFragment", {
+            return AppCommunicationMgr.sendMessageToOuterShell("sap.ushell.services.NavTargetResolutionInternal.resolveHashFragment", {
                 sHashFragment: sHashFragment
             });
         };
@@ -91,7 +91,7 @@ sap.ui.define([
             let oResult2;
 
             aPromises.push(AppRuntimeContext.getIsScube() ? this.isIntentSupportedLocal(aIntents) : Promise.resolve(undefined));
-            aPromises.push(AppRuntimeService.postMessageToFLP("sap.ushell.services.NavTargetResolutionInternal.isIntentSupported", {
+            aPromises.push(AppCommunicationMgr.postMessageToFLP("sap.ushell.services.NavTargetResolutionInternal.isIntentSupported", {
                 aIntents: aIntents
             }));
             Promise.allSettled(aPromises).then((aResults) => {

package/src/main/js/sap/ushell/appRuntime/ui5/services/Navigation.js

@@ -3,11 +3,11 @@
 /**
  * @fileOverview The app runtime wrapper for {@link sap.ushell.services.Navigation}.
  *
- * @version 1.139.0
+ * @version 1.141.0
  */
 sap.ui.define([
     "sap/ushell/services/Navigation",
-    "sap/ushell/appRuntime/ui5/AppRuntimeService",
+    "sap/ushell/appRuntime/ui5/AppCommunicationMgr",
     "sap/ushell/services/appstate/AppState",
     "sap/ushell/appRuntime/ui5/AppRuntimeContext",
     "sap/base/util/deepClone",
@@ -15,7 +15,7 @@ sap.ui.define([
     "sap/ushell/appRuntime/ui5/services/Container"
 ], (
     Navigation,
-    AppRuntimeService,
+    AppCommunicationMgr,
     AppStateAppState,
     AppRuntimeContext,
     deepClone,
@@ -42,7 +42,7 @@ sap.ui.define([
 
         this.getHref = function (oTarget) {
             // not ready for scube
-            return AppRuntimeService.postMessageToFLP("sap.ushell.services.Navigation.getHref", {
+            return AppCommunicationMgr.postMessageToFLP("sap.ushell.services.Navigation.getHref", {
                 oTarget: oTarget
             });
         };
@@ -50,7 +50,7 @@ sap.ui.define([
         this.backToPreviousApp = function () {
             // ready also for scube
             if (AppRuntimeContext.checkDataLossAndContinue()) {
-                return AppRuntimeService.postMessageToFLP("sap.ushell.services.Navigation.backToPreviousApp");
+                return AppCommunicationMgr.postMessageToFLP("sap.ushell.services.Navigation.backToPreviousApp");
             }
 
             return Promise.resolve();
@@ -59,7 +59,7 @@ sap.ui.define([
         this.historyBack = function (iSteps) {
             // ready for scube
             if (AppRuntimeContext.checkDataLossAndContinue()) {
-                AppRuntimeService.postMessageToFLP("sap.ushell.services.Navigation.historyBack", {
+                AppCommunicationMgr.postMessageToFLP("sap.ushell.services.Navigation.historyBack", {
                     iSteps: iSteps
                 });
             }
@@ -67,7 +67,7 @@ sap.ui.define([
 
         this.isInitialNavigation = function () {
             // ready for scube
-            return AppRuntimeService.postMessageToFLP("sap.ushell.services.Navigation.isInitialNavigation", {});
+            return AppCommunicationMgr.postMessageToFLP("sap.ushell.services.Navigation.isInitialNavigation", {});
         };
 
         this.navigate = function (oTarget, oComponent) {
@@ -86,7 +86,7 @@ sap.ui.define([
                     return oShellNavigationInternal.toExternal(oTarget, oComponent);
                 });
             } else if (AppRuntimeContext.checkDataLossAndContinue()) {
-                return AppRuntimeService.postMessageToFLP("sap.ushell.services.Navigation.navigate", {
+                return AppCommunicationMgr.postMessageToFLP("sap.ushell.services.Navigation.navigate", {
                     oTarget: oTarget
                 });
             }
@@ -96,44 +96,40 @@ sap.ui.define([
 
         this.getPrimaryIntent = async function (sSemanticObject, oLinkFilter) {
             // not ready for scube
-            return AppRuntimeService.postMessageToFLP("sap.ushell.services.Navigation.getPrimaryIntent", {
+            return AppCommunicationMgr.postMessageToFLP("sap.ushell.services.Navigation.getPrimaryIntent", {
                 sSemanticObject: sSemanticObject,
                 oLinkFilter: oLinkFilter
             });
         };
-
+        // ready also for scube
+        this._removeComponent = function (aArgsParam) {
+            aArgsParam.forEach((oElement) => {
+                if (oElement) {
+                    delete oElement.ui5Component;
+                }
+            });
+        };
         this.getLinksLocal = this.getLinks;
         this.getLinks = function (aLinkFilter = []) {
-            // ready also for scube
-            function removeComponent (oArgsParam) {
-                oArgsParam.forEach((element) => {
-                    if (element) {
-                        delete element.ui5Component;
-                    }
-                });
-            }
-
             if (!Array.isArray(aLinkFilter)) {
                 throw new Error("Unexpected Input: aLinkFilter has to be an array with plain objects!");
             }
 
             if (AppRuntimeContext.getIsScube()) {
-                this.getLinksLocal(aLinkFilter).then((arrResult1) => {
-                    removeComponent(aLinkFilter);
-                    return AppRuntimeService.postMessageToFLP(
+                return this.getLinksLocal(aLinkFilter).then((aResultLocal) => {
+                    this._removeComponent(aLinkFilter);
+                    return AppCommunicationMgr.postMessageToFLP(
                         "sap.ushell.services.Navigation.getLinks",
                         aLinkFilter
-                    ).then((arrResult2) => {
-                        if (arrResult1.length !== 0) {
-                            arrResult2 = arrResult2.concat(arrResult1);
-                        }
-                        return arrResult2;
+                    ).then((aResultFlp) => {
+                        return aResultLocal.map((_oLink, iIndex) => {
+                            return aResultFlp[iIndex].concat(aResultLocal[iIndex]);
+                        });
                     });
                 });
-            } else {
-                removeComponent(aLinkFilter);
-                return AppRuntimeService.postMessageToFLP("sap.ushell.services.Navigation.getLinks", aLinkFilter);
             }
+            this._removeComponent(aLinkFilter);
+            return AppCommunicationMgr.postMessageToFLP("sap.ushell.services.Navigation.getLinks", aLinkFilter);
         };
 
         this.getSemanticObjectsLocal = this.getSemanticObjects;
@@ -143,12 +139,12 @@ sap.ui.define([
                 return this.getSemanticObjectsLocal();
             }
 
-            return AppRuntimeService.postMessageToFLP("sap.ushell.services.Navigation.getSemanticObjects");
+            return AppCommunicationMgr.postMessageToFLP("sap.ushell.services.Navigation.getSemanticObjects");
         };
 
         this.isNavigationSupported = function (aTargets, oComponent, bCheckInOuterShellOnly) {
             function fnCheckInShell (aTargetsTmp) {
-                return AppRuntimeService.postMessageToFLP("sap.ushell.services.Navigation.isNavigationSupported", {
+                return AppCommunicationMgr.postMessageToFLP("sap.ushell.services.Navigation.isNavigationSupported", {
                     aTargets: aTargetsTmp
                 });
             }
@@ -179,7 +175,7 @@ sap.ui.define([
 
         this.getAppState = function (oAppComponent, sAppStateKey) {
             // ready also for scube
-            return AppRuntimeService.postMessageToFLP("sap.ushell.services.Navigation.getAppState", {
+            return AppCommunicationMgr.postMessageToFLP("sap.ushell.services.Navigation.getAppState", {
                 sAppStateKey: sAppStateKey
             }).then((oState) => {
                 return Container.getServiceAsync("AppState").then((AppStateService) => {
@@ -204,13 +200,13 @@ sap.ui.define([
                 return this.resolveIntentLocal(sHashFragment);
             }
 
-            return AppRuntimeService.postMessageToFLP("sap.ushell.services.Navigation.resolveIntent", {
+            return AppCommunicationMgr.postMessageToFLP("sap.ushell.services.Navigation.resolveIntent", {
                 sHashFragment: sHashFragment
             });
         };
 
         this.isUrlSupported = function (sUrl) {
-            return AppRuntimeService.postMessageToFLP("sap.ushell.services.Navigation.isUrlSupported", {
+            return AppCommunicationMgr.postMessageToFLP("sap.ushell.services.Navigation.isUrlSupported", {
                 sUrl: sUrl
             });
         };

package/src/main/js/sap/ushell/appRuntime/ui5/services/ReferenceResolver.js

@@ -3,12 +3,12 @@
 /**
  * @fileOverview The app runtime wrapper for {@link sap.ushell.services.ReferenceResolver}.
  *
- * @version 1.139.0
+ * @version 1.141.0
  */
 sap.ui.define([
-    "sap/ushell/appRuntime/ui5/AppRuntimeService"
+    "sap/ushell/appRuntime/ui5/AppCommunicationMgr"
 ], (
-    AppRuntimeService
+    AppCommunicationMgr
 ) => {
     "use strict";
 
@@ -23,7 +23,7 @@ sap.ui.define([
      */
     function ReferenceResolverProxy () {
         this.resolveReferences = function (aReferences, oSystemContext) {
-            return AppRuntimeService.sendMessageToOuterShell("sap.ushell.services.ReferenceResolver.resolveReferences", {
+            return AppCommunicationMgr.sendMessageToOuterShell("sap.ushell.services.ReferenceResolver.resolveReferences", {
                 aReferences: aReferences
             });
         };

package/src/main/js/sap/ushell/appRuntime/ui5/services/ShellNavigation.js

@@ -3,19 +3,19 @@
 /**
  * @fileOverview The app runtime wrapper for {@link sap.ushell.services.ShellNavigation}.
  *
- * @version 1.139.0
+ * @version 1.141.0
  * @deprecated since 1.120. Use {@link sap.ushell.services.Navigation} for Navigation instead.
  */
 sap.ui.define([
     "sap/ushell/services/ShellNavigation",
     "sap/ushell/appRuntime/ui5/services/Container",
-    "sap/ushell/appRuntime/ui5/AppRuntimeService",
+    "sap/ushell/appRuntime/ui5/AppCommunicationMgr",
     "sap/ushell/appRuntime/ui5/AppRuntimeContext",
     "sap/ushell/utils/UrlParsing"
 ], (
     ShellNavigation,
     Container,
-    AppRuntimeService,
+    AppCommunicationMgr,
     AppRuntimeContext,
     UrlParsing
 ) => {
@@ -61,25 +61,25 @@ sap.ui.define([
                             oArgs.params["sap-remote-system"] = AppRuntimeContext.getRemoteSystemId();
                             oArgs.target.semanticObject = "Shell";
                             oArgs.target.action = "startIntent";
-                            return AppRuntimeService.sendMessageToOuterShell("sap.ushell.services.CrossApplicationNavigation.toExternal", {
+                            return AppCommunicationMgr.sendMessageToOuterShell("sap.ushell.services.CrossApplicationNavigation.toExternal", {
                                 oArgs: oArgs
                             });
                         }
 
-                        AppRuntimeService.sendMessageToOuterShell("sap.ushell.services.CrossApplicationNavigation.toExternal", {
+                        AppCommunicationMgr.sendMessageToOuterShell("sap.ushell.services.CrossApplicationNavigation.toExternal", {
                             oArgs: oArgs
                         });
                     });
                 });
             } else {
-                AppRuntimeService.sendMessageToOuterShell("sap.ushell.services.CrossApplicationNavigation.toExternal", {
+                AppCommunicationMgr.sendMessageToOuterShell("sap.ushell.services.CrossApplicationNavigation.toExternal", {
                     oArgs: oArgs
                 });
             }
         };
 
         this.toAppHash = function (sAppHash, bWriteHistory) {
-            AppRuntimeService.sendMessageToOuterShell("sap.ushell.services.ShellNavigationInternal.toExternal", {
+            AppCommunicationMgr.sendMessageToOuterShell("sap.ushell.services.ShellNavigationInternal.toExternal", {
                 sAppHash: sAppHash,
                 bWriteHistory: bWriteHistory
             });