[POC] ui5 serve: Proxy mode

Author: RandomByte

lib/cli/commands/serve.js

@@ -21,10 +21,14 @@ serve.builder = function(cli) {
 			type: "string"
 		})
 		.option("h2", {
-			describe: "Shortcut for enabling the HTTP/2 protocol for the web server",
+			describe: "Enables HTTP/2 and HTTPS protocol for the web server",
 			default: false,
 			type: "boolean"
 		})
+		.option("proxy", {
+			describe: "Whether or not to use a configured proxy",
+			type: "boolean"
+		})
 		.option("accept-remote-connections", {
 			describe: "Accept remote connections. By default the server only accepts connections from localhost",
 			default: false,
@@ -63,17 +67,27 @@ serve.handler = function(argv) {
 		translatorName: argv.translator,
 		configPath: argv.config
 	}).then(function(tree) {
+		let cdnUrl;
+		if (tree.server && tree.server.cdnUrl) {
+			if (tree.specVersion !== "1.1a") {
+				throw new Error(`Server configuration "cdnUrl" can only be used with specification version "1.1a". ` +
+					`But project ${tree.metadata.name} defines "${tree.specVersion}".`);
+			}
+			cdnUrl = tree.server.cdnUrl;
+		}
 		const serverConfig = {
-			port: argv.port === undefined ? argv.h2 ? 8443 : 8080 : argv.port,
+			port: argv.port === undefined ? (argv.h2 || argv.proxy) ? 8443 : 8080 : argv.port,
 			changePortIfInUse: argv.port === undefined, // only change if port isn't explicitly set
 			h2: argv.h2,
+			useProxy: argv.proxy,
 			acceptRemoteConnections: !!argv.acceptRemoteConnections,
 			cert: argv.h2 ? argv.cert : undefined,
 			key: argv.h2 ? argv.key : undefined,
-			sendSAPTargetCSP: !!argv.sapCspPolicies
+			sendSAPTargetCSP: !!argv.sapCspPolicies,
+			cdnUrl
 		};
 
-		if (!serverConfig.h2) {
+		if (!serverConfig.h2 && !serverConfig.useProxy) {
 			return {serverConfig, tree};
 		} else {
 			return ui5Server.sslUtil.getSslCertificate(serverConfig.key, serverConfig.cert).then(({key, cert}) => {
@@ -83,8 +97,7 @@ serve.handler = function(argv) {
 			});
 		}
 	}).then(({serverConfig, tree}) => {
-		return server.serve(tree, serverConfig).then(function({h2, port}) {
-			const protocol = h2 ? "https" : "http";
+		return server.serve(tree, serverConfig).then(function({protocol, port}) {
 			let browserUrl = protocol + "://localhost:" + port;
 			console.log("Server started");
 			console.log("URL: " + browserUrl);