@sap-ux/ui5-proxy-middleware 1.1.26 → 1.1.29

package/dist/base/types.d.ts

@@ -1,20 +1,12 @@
 /// <reference types="node" />
 import type { NextFunction } from 'express';
 import type { IncomingMessage } from 'http';
-import type { UI5ProxyConfig } from '@sap-ux/ui5-config';
-export type Ui5MiddlewareConfig = UI5ProxyConfig;
 export interface ProxyConfig {
     path: string;
     url: string;
     version?: string;
     proxy?: string;
 }
-export interface MiddlewareParameters<T> {
-    resources: object;
-    options: {
-        configuration: T;
-    };
-}
 export interface UI5ProxyRequest {
     next?: NextFunction;
 }

package/dist/base/utils.d.ts

@@ -73,28 +73,15 @@ export declare const getWebAppFolderFromYaml: (ui5YamlPath: string) => Promise<s
  * @param html - The HTML content
  */
 export declare const setHtmlResponse: (res: any, html: string) => void;
-/**
- * Gets the manifest.json for a given application.
- *
- * @param args list of runtime arguments
- * @returns The content of the manifest.json
- */
-export declare const getManifest: (args: string[]) => Promise<Manifest>;
-/**
- * Gets the minUI5Version from the manifest.json.
- *
- * @param args list of runtime args
- * @returns The minUI5Version from manifest.json or undefined otherwise
- */
-export declare function getUI5VersionFromManifest(args: string[]): Promise<string | undefined>;
 /**
  * Determines which UI5 version to use when previewing the application.
  *
  * @param version ui5 version as defined in the yaml or via cli argument
  * @param log logger for outputing information from where ui5 version config is coming
+ * @param manifest optional already loaded manifest.json
  * @returns The UI5 version with which the application will be started
  */
-export declare function resolveUI5Version(version?: string, log?: ToolsLogger): Promise<string>;
+export declare function resolveUI5Version(version?: string, log?: ToolsLogger, manifest?: Manifest): Promise<string>;
 /**
  * Injects the absolute UI5 urls into the html file, which is used to preview the application.
  *

package/dist/base/utils.js

@@ -9,7 +9,7 @@ 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.updateProxyEnv = exports.hideProxyCredentials = exports.getCorporateProxyServer = exports.proxyRequestHandler = exports.proxyResponseHandler = void 0;
+exports.proxyErrorHandler = exports.filterCompressedHtmlFiles = exports.injectScripts = exports.injectUI5Url = exports.resolveUI5Version = 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");
@@ -99,8 +99,8 @@ function updateProxyEnv(proxyFromConfig) {
         }
     });
     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;
+        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 ||
@@ -110,8 +110,8 @@ function updateProxyEnv(proxyFromConfig) {
             process.env.https_proxy ||
             process.env.HTTPS_PROXY;
         if (!proxyFromEnv && proxyFromConfig) {
-            process.env.npm_config_proxy = proxyFromConfig;
-            process.env.npm_config_https_proxy = proxyFromConfig;
+            process.env['npm_config_proxy'] = proxyFromConfig;
+            process.env['npm_config_https_proxy'] = proxyFromConfig;
         }
     }
 }
@@ -184,44 +184,16 @@ const setHtmlResponse = (res, html) => {
     }
 };
 exports.setHtmlResponse = setHtmlResponse;
-/**
- * Gets the manifest.json for a given application.
- *
- * @param args list of runtime arguments
- * @returns The content of the manifest.json
- */
-const getManifest = (args) => __awaiter(void 0, void 0, void 0, function* () {
-    const projectRoot = process.cwd();
-    const yamlFileName = (0, exports.getYamlFile)(args);
-    const ui5YamlPath = (0, path_1.join)(projectRoot, yamlFileName);
-    const webAppFolder = yield (0, exports.getWebAppFolderFromYaml)(ui5YamlPath);
-    const manifestPath = (0, path_1.join)(projectRoot, webAppFolder, 'manifest.json');
-    const manifest = JSON.parse((0, fs_1.readFileSync)(manifestPath, { encoding: 'utf8' }));
-    return manifest;
-});
-exports.getManifest = getManifest;
-/**
- * Gets the minUI5Version from the manifest.json.
- *
- * @param args list of runtime args
- * @returns The minUI5Version from manifest.json or undefined otherwise
- */
-function getUI5VersionFromManifest(args) {
-    var _a, _b;
-    return __awaiter(this, void 0, void 0, function* () {
-        const manifest = yield (0, exports.getManifest)(args);
-        return (_b = (_a = manifest['sap.ui5']) === null || _a === void 0 ? void 0 : _a.dependencies) === null || _b === void 0 ? void 0 : _b.minUI5Version;
-    });
-}
-exports.getUI5VersionFromManifest = getUI5VersionFromManifest;
 /**
  * Determines which UI5 version to use when previewing the application.
  *
  * @param version ui5 version as defined in the yaml or via cli argument
  * @param log logger for outputing information from where ui5 version config is coming
+ * @param manifest optional already loaded manifest.json
  * @returns The UI5 version with which the application will be started
  */
-function resolveUI5Version(version, log) {
+function resolveUI5Version(version, log, manifest) {
+    var _a, _b;
     return __awaiter(this, void 0, void 0, function* () {
         let ui5Version;
         let ui5VersionInfo;
@@ -235,7 +207,7 @@ function resolveUI5Version(version, log) {
             ui5VersionLocation = (0, exports.getYamlFile)(process.argv);
         }
         else {
-            const minUI5Version = yield getUI5VersionFromManifest(process.argv);
+            const minUI5Version = (_b = (_a = manifest === null || manifest === void 0 ? void 0 : manifest['sap.ui5']) === null || _a === void 0 ? void 0 : _a.dependencies) === null || _b === void 0 ? void 0 : _b.minUI5Version;
             ui5Version = minUI5Version && !isNaN(parseFloat(minUI5Version)) ? minUI5Version : '';
             ui5VersionLocation = 'manifest.json';
         }

package/dist/i18n.js

@@ -46,5 +46,7 @@ function t(key, options) {
     return i18next_1.default.t(key, options);
 }
 exports.t = t;
-initI18n();
+initI18n().catch(() => {
+    // Ignore any errors since the middleware will still work
+});
 //# sourceMappingURL=i18n.js.map

package/dist/ui5/middleware.js

@@ -46,13 +46,43 @@ function createRequestHandler(routes) {
         next();
     };
 }
-module.exports = ({ options }) => __awaiter(void 0, void 0, void 0, function* () {
+/**
+ * Search the project for the manifest.json.
+ *
+ * @param rootProject @ui5/fs reader collection with access to the project files
+ * @returns manifest.json as object or undefined if not found
+ */
+function loadManifest(rootProject) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const files = yield rootProject.byGlob('**/manifest.json');
+        if ((files === null || files === void 0 ? void 0 : files.length) > 0) {
+            return JSON.parse(yield files[0].getString());
+        }
+        else {
+            return undefined;
+        }
+    });
+}
+module.exports = ({ resources, options }) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
     const logger = new logger_1.ToolsLogger({
         transports: [new logger_1.UI5ToolingTransport({ moduleName: 'ui5-proxy-middleware' })]
     });
+    if (!((_a = options.configuration) === null || _a === void 0 ? void 0 : _a.ui5)) {
+        logger.error('Configuration missing, no proxy created.');
+        return (_req, _res, next) => next();
+    }
     dotenv_1.default.config();
     const config = options.configuration;
-    const ui5Version = yield (0, base_1.resolveUI5Version)(config.version, logger);
+    let ui5Version = '';
+    try {
+        const manifest = yield loadManifest(resources.rootProject);
+        ui5Version = yield (0, base_1.resolveUI5Version)(config.version, logger, manifest);
+    }
+    catch (error) {
+        logger.warn('Retrieving UI5 version failed, using latest version instead.');
+        logger.debug(error);
+    }
     const envUI5Url = process.env.FIORI_TOOLS_UI5_URI;
     const directLoad = !!config.directLoad;
     const corporateProxyServer = (0, base_1.getCorporateProxyServer)(config.proxy);

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.26",
+  "version": "1.1.29",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",
@@ -26,8 +26,8 @@
     "https-proxy-agent": "5.0.0",
     "i18next": "20.3.2",
     "proxy-from-env": "1.1.0",
-    "@sap-ux/logger": "0.3.5",
-    "@sap-ux/ui5-config": "0.17.0"
+    "@sap-ux/logger": "0.3.6",
+    "@sap-ux/ui5-config": "0.18.0"
   },
   "devDependencies": {
     "@types/express": "4.17.13",
@@ -37,7 +37,7 @@
     "nock": "13.2.4",
     "supertest": "6.3.2",
     "yaml": "2.2.2",
-    "@sap-ux/project-access": "1.7.0"
+    "@sap-ux/project-access": "1.8.2"
   },
   "ui5": {
     "dependencies": []