From 4d115cb69d11b8c95d7a34cab1cdc667880cc1e5 Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Tue, 28 Jan 2025 11:34:59 -0500 Subject: [PATCH 1/2] Fix for detecting best path for zss Signed-off-by: 1000TurquoisePogs --- lib/webapp.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/webapp.js b/lib/webapp.js index 89853eca..7b16a08b 100644 --- a/lib/webapp.js +++ b/lib/webapp.js @@ -234,7 +234,8 @@ const hostname = os.hostname(); function getUserEnv(rbac, zoweConfig){ var date = new Date(); return new Promise(function(resolve, reject){ - const nodeConfig = zoweConfig.components['app-server'].node; + const serverConfig = zoweConfig.components['app-server']; + const nodeConfig = serverConfig.node; if (rbac) { resolve({ "timestamp": date.toUTCString(), @@ -248,7 +249,7 @@ function getUserEnv(rbac, zoweConfig){ "hostname": hostname, "userEnvironment": process.env, "agent": { - "mediationLayer": nodeConfig.agent?.mediationLayer + "mediationLayer": serverConfig.agent?.mediationLayer }, "PID": process.pid, "PPID": process.ppid, @@ -279,7 +280,7 @@ function getUserEnv(rbac, zoweConfig){ "GATEWAY_PORT": nodeConfig.mediationLayer.server.gatewayPort, }, "agent": { - "mediationLayer": nodeConfig.agent?.mediationLayer + "mediationLayer": serverConfig.agent?.mediationLayer } }) } From 11465123365575955b77fa74aadf36f7b4de7951 Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Tue, 28 Jan 2025 11:35:31 -0500 Subject: [PATCH 2/2] Update CHANGELOG.md Signed-off-by: 1000TurquoisePogs --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5a37b2d5..fdea4245 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,9 @@ All notable changes to the Zlux Server Framework package will be documented in this file.. This repo is part of the app-server Zowe Component, and the change logs here may appear on Zowe.org in that section. +## 2.18.1 +- Bugfix: App-server /server/environment endpoint was missing the "agent" object, causing the Desktop to choose an indirect route to accessing ZSS. This fix improves latency and high availability behavior of ZSS APIs in the Desktop. (#589) + ## 2.17.0 - Enhancement: Added function `isClientAttls(zoweConfig)` within `libs/util.js`. Whenever a plugin makes a network request, it should always use this to determine if a normally HTTPS request should instead be made as HTTP due to AT-TLS handling the TLS when enabled. (#544) - Bugfix: Fixed function `isServerAttls(zoweConfig)` within `libs/util.js`, which was preventing using AT-TLS with app-server. (#544)