@sap-ux/ui5-proxy-middleware 1.1.14 → 1.1.16

package/dist/base/proxy.js

@@ -4,6 +4,8 @@ exports.ui5Proxy = void 0;
 const http_proxy_middleware_1 = require("http-proxy-middleware");
 const utils_1 = require("./utils");
 const logger_1 = require("@sap-ux/logger");
+const proxy_from_env_1 = require("proxy-from-env");
+const https_proxy_agent_1 = require("https-proxy-agent");
 /**
  * Function for proxying UI5 sources.
  *
@@ -33,6 +35,12 @@ const ui5Proxy = (config, options, filter) => {
             utils_1.proxyErrorHandler(err, req, logger, res, target);
         }
     };
+    // update proxy config with values coming from args or ui5.yaml
+    utils_1.updateProxyEnv(config.proxy);
+    const corporateProxy = proxy_from_env_1.getProxyForUrl(config.url);
+    if (corporateProxy) {
+        proxyConfig.agent = new https_proxy_agent_1.HttpsProxyAgent(corporateProxy);
+    }
     Object.assign(proxyConfig, options);
     let proxyFilter = utils_1.filterCompressedHtmlFiles;
     if (filter) {

package/dist/base/types.d.ts

@@ -7,6 +7,7 @@ export interface ProxyConfig {
     path: string;
     url: string;
     version?: string;
+    proxy?: string;
 }
 export interface MiddlewareParameters<T> {
     resources: object;

package/dist/base/utils.d.ts

@@ -39,12 +39,11 @@ export declare const getCorporateProxyServer: (yamlProxyServer: string | undefin
  */
 export declare const hideProxyCredentials: (proxy: string | undefined) => string | undefined;
 /**
- * Checks if a host should be proxied through user's corporate proxy.
+ * Updates the proxy configuration with values from runtime args (highest priority), environment variables or given config value.
  *
- * @param url - url to be checked
- * @returns false if host is excluded from user's corporate server, true otherwise
+ * @param proxyFromConfig - optional proxy string from configuration
  */
-export declare const isProxyRequired: (url: string) => boolean;
+export declare function updateProxyEnv(proxyFromConfig?: string): void;
 /**
  * Returns the name of html file, which is used to preview the application, from the URL.
  *

package/dist/base/utils.js

@@ -9,13 +9,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.proxyErrorHandler = exports.filterCompressedHtmlFiles = exports.injectScripts = exports.injectUI5Url = exports.resolveUI5Version = exports.getUI5VersionFromManifest = exports.getManifest = exports.setHtmlResponse = exports.getWebAppFolderFromYaml = exports.getYamlFile = exports.getHtmlFile = exports.isProxyRequired = exports.hideProxyCredentials = exports.getCorporateProxyServer = exports.proxyRequestHandler = exports.proxyResponseHandler = void 0;
+exports.proxyErrorHandler = exports.filterCompressedHtmlFiles = exports.injectScripts = exports.injectUI5Url = exports.resolveUI5Version = exports.getUI5VersionFromManifest = exports.getManifest = exports.setHtmlResponse = exports.getWebAppFolderFromYaml = exports.getYamlFile = exports.getHtmlFile = exports.updateProxyEnv = exports.hideProxyCredentials = exports.getCorporateProxyServer = exports.proxyRequestHandler = exports.proxyResponseHandler = void 0;
 const ui5_config_1 = require("@sap-ux/ui5-config");
 const fs_1 = require("fs");
 const path_1 = require("path");
 const constants_1 = require("./constants");
 const i18n_1 = require("../i18n");
-const proxy_from_env_1 = require("proxy-from-env");
 /**
  * Handler for the proxy response event.
  * Sets an Etag which will be used for re-validation of the cached UI5 sources.
@@ -59,21 +58,15 @@ const getCorporateProxyServer = (yamlProxyServer) => {
             proxyFromArgs = arg.split('=')[1];
         }
     });
-    const proxyFromFioriToolsConfig = proxyFromArgs || yamlProxyServer || process.env.FIORI_TOOLS_PROXY;
-    const proxyFromOSEnvConfig = process.env.http_proxy ||
+    return (proxyFromArgs ||
+        process.env.FIORI_TOOLS_PROXY ||
+        process.env.npm_config_proxy ||
+        process.env.npm_config_https_proxy ||
+        process.env.http_proxy ||
         process.env.HTTP_PROXY ||
         process.env.https_proxy ||
         process.env.HTTPS_PROXY ||
-        process.env.npm_config_proxy ||
-        process.env.npm_config_https_proxy;
-    if (proxyFromFioriToolsConfig) {
-        process.env.npm_config_proxy = proxyFromFioriToolsConfig;
-        process.env.npm_config_https_proxy = proxyFromFioriToolsConfig;
-        return proxyFromFioriToolsConfig;
-    }
-    else {
-        return proxyFromOSEnvConfig;
-    }
+        yamlProxyServer);
 };
 exports.getCorporateProxyServer = getCorporateProxyServer;
 /**
@@ -94,15 +87,35 @@ const hideProxyCredentials = (proxy) => {
 };
 exports.hideProxyCredentials = hideProxyCredentials;
 /**
- * Checks if a host should be proxied through user's corporate proxy.
+ * Updates the proxy configuration with values from runtime args (highest priority), environment variables or given config value.
  *
- * @param url - url to be checked
- * @returns false if host is excluded from user's corporate server, true otherwise
+ * @param proxyFromConfig - optional proxy string from configuration
  */
-const isProxyRequired = (url) => {
-    return proxy_from_env_1.getProxyForUrl(url) ? true : false;
-};
-exports.isProxyRequired = isProxyRequired;
+function updateProxyEnv(proxyFromConfig) {
+    let proxyFromArgs;
+    process.argv.forEach((arg) => {
+        if (arg.match(/proxy=/g)) {
+            proxyFromArgs = arg.split('=')[1];
+        }
+    });
+    if (proxyFromArgs || process.env.FIORI_TOOLS_PROXY) {
+        process.env.npm_config_proxy = proxyFromArgs || process.env.FIORI_TOOLS_PROXY;
+        process.env.npm_config_https_proxy = proxyFromArgs || process.env.FIORI_TOOLS_PROXY;
+    }
+    else {
+        const proxyFromEnv = process.env.npm_config_proxy ||
+            process.env.npm_config_https_proxy ||
+            process.env.http_proxy ||
+            process.env.HTTP_PROXY ||
+            process.env.https_proxy ||
+            process.env.HTTPS_PROXY;
+        if (!proxyFromEnv && proxyFromConfig) {
+            process.env.npm_config_proxy = proxyFromConfig;
+            process.env.npm_config_https_proxy = proxyFromConfig;
+        }
+    }
+}
+exports.updateProxyEnv = updateProxyEnv;
 /**
  * Returns the name of html file, which is used to preview the application, from the URL.
  *

package/dist/ui5/middleware.js

@@ -12,7 +12,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const https_proxy_agent_1 = require("https-proxy-agent");
 const logger_1 = require("@sap-ux/logger");
 const base_1 = require("../base");
 const dotenv_1 = __importDefault(require("dotenv"));
@@ -70,11 +69,9 @@ module.exports = ({ options }) => __awaiter(void 0, void 0, void 0, function* ()
             const ui5Config = {
                 path: ui5Path,
                 url: envUI5Url || ui5.url,
-                version: ui5Version
+                version: ui5Version,
+                proxy: config.proxy
             };
-            if (corporateProxyServer && base_1.isProxyRequired(ui5Config.url)) {
-                proxyOptions.agent = new https_proxy_agent_1.HttpsProxyAgent(corporateProxyServer);
-            }
             routes.push({ route: ui5Config.path, handler: base_1.ui5Proxy(ui5Config, proxyOptions) });
             ui5Configs.push(ui5Config);
         }

package/package.json

@@ -9,7 +9,7 @@
   "bugs": {
     "url": "https://github.com/SAP/open-ux-tools/issues?q=is%3Aopen+is%3Aissue+label%3Abug+label%3Aui5-proxy-middleware"
   },
-  "version": "1.1.14",
+  "version": "1.1.16",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",
@@ -22,7 +22,7 @@
   ],
   "dependencies": {
     "@sap-ux/logger": "0.3.1",
-    "@sap-ux/ui5-config": "0.15.3",
+    "@sap-ux/ui5-config": "0.15.4",
     "dotenv": "16.0.0",
     "http-proxy-middleware": "2.0.1",
     "https-proxy-agent": "5.0.0",
@@ -30,7 +30,7 @@
     "proxy-from-env": "1.1.0"
   },
   "devDependencies": {
-    "@sap-ux/project-access": "1.0.0",
+    "@sap-ux/project-access": "1.0.1",
     "@types/express": "4.17.13",
     "@types/supertest": "2.0.12",
     "@types/proxy-from-env": "1.0.1",