@lwrjs/dev-proxy-server 0.12.0-alpha.3 → 0.12.0-alpha.31

package/build/cjs/index.cjs

@@ -50,7 +50,7 @@ function findProxyConfiguration(rootDir, buildDir) {
   return;
 }
 function readAndProcessProxyConfiguration(proxyConfigFile) {
-  const entries = import_fs.default.readFileSync(proxyConfigFile).toString().split("\n");
+  const entries = import_fs.default.readFileSync(proxyConfigFile).toString().trim().split("\n");
   const proxyConfigs = entries.map((entry, idx) => {
     const config = entry.split(" ");
     if (config.length !== 2) {

package/build/cjs/middleware.cjs

@@ -38,8 +38,21 @@ var ProxyLogLevels;
   ProxyLogLevels2["Error"] = "error";
   ProxyLogLevels2["Silent"] = "silent";
 })(ProxyLogLevels || (ProxyLogLevels = {}));
-function addLocalProxyMiddleware(app, localHost) {
-  app.use("/", (0, import_http_proxy_middleware.default)({target: localHost, changeOrigin: true}));
+function addLocalProxyMiddleware(app, defaultHost) {
+  const domainAndPort = defaultHost.replace(/^([a-z][a-z0-9+\-.]*):\/\//, "");
+  app.use("/", (0, import_http_proxy_middleware.default)({
+    target: defaultHost,
+    changeOrigin: true,
+    onProxyReq: (proxyRequest, incomingRequest) => {
+      const forwarded = incomingRequest.headers.forwarded;
+      const hostHeader = incomingRequest.headers.host;
+      const hostProto = incomingRequest.protocol;
+      if (hostHeader !== domainAndPort) {
+        proxyRequest.setHeader(HOST, domainAndPort);
+        proxyRequest.setHeader("Forwarded", forwarded ? forwarded : `host=${hostHeader};proto=${hostProto}`);
+      }
+    }
+  }));
 }
 function addRemoteProxyMiddleware(app, proxyConfig) {
   const {proxyConfigs} = proxyConfig;

package/build/es/index.js

@@ -37,7 +37,7 @@ export function findProxyConfiguration(rootDir, buildDir) {
     return;
 }
 function readAndProcessProxyConfiguration(proxyConfigFile) {
-    const entries = fs.readFileSync(proxyConfigFile).toString().split('\n');
+    const entries = fs.readFileSync(proxyConfigFile).toString().trim().split('\n');
     const proxyConfigs = entries.map((entry, idx) => {
         const config = entry.split(' ');
         if (config.length !== 2) {

package/build/es/middleware.d.ts

@@ -3,9 +3,9 @@ import type { ProxyConfiguration } from './proxy-server.js';
 /**
  * The Proxy middleware responsible for proxying all other requests not configured to external systems.
  * @param app
- * @param localHost
+ * @param defaultHost
  */
-export declare function addLocalProxyMiddleware(app: ExpressApp, localHost: string): void;
+export declare function addLocalProxyMiddleware(app: ExpressApp, defaultHost: string): void;
 /**
  * The Proxy middleware responsible for proxying requests to a configured remote origin.
  * @param app

package/build/es/middleware.js

@@ -14,10 +14,26 @@ var ProxyLogLevels;
 /**
  * The Proxy middleware responsible for proxying all other requests not configured to external systems.
  * @param app
- * @param localHost
+ * @param defaultHost
  */
-export function addLocalProxyMiddleware(app, localHost) {
-    app.use('/', proxy({ target: localHost, changeOrigin: true }));
+export function addLocalProxyMiddleware(app, defaultHost) {
+    const domainAndPort = defaultHost.replace(/^([a-z][a-z0-9+\-.]*):\/\//, '');
+    app.use('/', proxy({
+        target: defaultHost,
+        changeOrigin: true,
+        onProxyReq: (proxyRequest, incomingRequest) => {
+            // If a forwarded header is passed it should take precedence
+            const forwarded = incomingRequest.headers.forwarded;
+            // Host: <host>:<port>
+            const hostHeader = incomingRequest.headers.host;
+            const hostProto = incomingRequest.protocol;
+            if (hostHeader !== domainAndPort) {
+                proxyRequest.setHeader(HOST, domainAndPort);
+                // Add Forwarded header per https://git.soma.salesforce.com/pages/benjamin-fry/lwr-on-mrt-designs/request_path.html
+                proxyRequest.setHeader('Forwarded', forwarded ? forwarded : `host=${hostHeader};proto=${hostProto}`);
+            }
+        },
+    }));
 }
 /**
  * The Proxy middleware responsible for proxying requests to a configured remote origin.

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.12.0-alpha.3",
+    "version": "0.12.0-alpha.31",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -30,13 +30,13 @@
         "build/**/*.d.ts"
     ],
     "dependencies": {
-        "@lwrjs/diagnostics": "0.12.0-alpha.3",
-        "@lwrjs/shared-utils": "0.12.0-alpha.3",
-        "express": "^4.18.2",
+        "@lwrjs/diagnostics": "0.12.0-alpha.31",
+        "@lwrjs/shared-utils": "0.12.0-alpha.31",
+        "express": "^4.19.2",
         "http-proxy-middleware": "0.21.0"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.12.0-alpha.3"
+        "@lwrjs/types": "0.12.0-alpha.31"
     },
     "engines": {
         "node": ">=18.0.0"
@@ -44,5 +44,5 @@
     "volta": {
         "extends": "../../../package.json"
     },
-    "gitHead": "48f97b40cbacce6cd6a6faee9206a465832c6774"
+    "gitHead": "ef2602996527852ec4694104723baae93a130b87"
 }