@lwrjs/lwc-ssr 0.15.7 → 0.15.9

package/build/cjs/fetchController.cjs

@@ -106,8 +106,8 @@ var FetchController = class {
   }
   createFetchEndowment() {
     return (request, init) => {
-      const {host = "", requestDepth = 1, coreProxy} = this;
-      const origin = coreProxy?.origin && coreProxy.origin.startsWith("http") ? coreProxy.origin : host;
+      const {host: forwardedOrigin = "", requestDepth = 1, coreProxy} = this;
+      const origin = coreProxy?.origin && coreProxy.origin.startsWith("http") ? coreProxy.origin : forwardedOrigin;
       const {finalRequest, finalUrl} = this.getFinalRequest(request, origin);
       const finalInit = {
         ...init,
@@ -116,7 +116,7 @@ var FetchController = class {
           [import_shared_utils.REQUEST_DEPTH_HEADER]: String(requestDepth)
         }
       };
-      if (coreProxy || host && finalUrl.startsWith(host)) {
+      if (coreProxy || forwardedOrigin && finalUrl.startsWith(forwardedOrigin)) {
         finalInit.headers[ROUTE_CORE_HEADER] = "true";
       }
       const proxyStr = coreProxy ? JSON.stringify(coreProxy) : "none";
@@ -127,7 +127,13 @@ var FetchController = class {
       });
       return (0, import_instrumentation.getTracer)().trace({
         name: import_instrumentation.ViewSpan.Fetch,
-        attributes: {url: finalUrl, fetchType: "cdn", coreProxy: proxyStr, hasCookies}
+        attributes: {
+          url: finalUrl,
+          fetchType: "cdn",
+          forwardedOrigin,
+          coreProxy: proxyStr,
+          hasCookies
+        }
       }, (span) => {
         const addInfoToSpan = (res) => {
           res.url && span.setAttributes({url: res.url});
@@ -135,8 +141,8 @@ var FetchController = class {
           return res;
         };
         if (coreProxy) {
-          return this.fetchWithAgent(finalUrl, finalInit, host, coreProxy, span).then((res) => addInfoToSpan(res)).catch((err) => {
-            const {finalRequest: cdnRequest, finalUrl: cdnUrl} = this.getFinalRequest(request, host);
+          return this.fetchWithAgent(finalUrl, finalInit, forwardedOrigin, coreProxy, span).then((res) => addInfoToSpan(res)).catch((err) => {
+            const {finalRequest: cdnRequest, finalUrl: cdnUrl} = this.getFinalRequest(request, forwardedOrigin);
             import_diagnostics.logger.warn(`Fetching data directly from Core failed, retrying through CDN: ${cdnUrl} Error is: ${err.message || err}`);
             span.setAttributes({fetchType: "cdnFallback"});
             return fetch(cdnRequest, finalInit).then((res) => addInfoToSpan(res));
@@ -146,13 +152,13 @@ var FetchController = class {
       });
     };
   }
-  getFinalRequest(request, host) {
+  getFinalRequest(request, origin) {
     let finalRequest;
     let finalUrl;
     if (request instanceof Request) {
       const curUrl = request.url;
       if (curUrl.startsWith("/")) {
-        finalUrl = host + curUrl;
+        finalUrl = origin + curUrl;
         finalRequest = new Request(finalUrl, request);
       } else {
         finalUrl = curUrl;
@@ -160,20 +166,22 @@ var FetchController = class {
       }
     } else {
       const curUrl = typeof request === "string" ? request : request.toString();
-      finalRequest = finalUrl = curUrl.startsWith("/") ? host + curUrl : curUrl;
+      finalRequest = finalUrl = curUrl.startsWith("/") ? origin + curUrl : curUrl;
     }
     return {finalRequest, finalUrl};
   }
-  async fetchWithAgent(rawUrl, init, forwardedHost, coreProxy, span) {
+  async fetchWithAgent(rawUrl, init, forwardedOrigin, coreProxy, span) {
     let {origin, servername} = coreProxy;
-    const host = coreProxy.host ?? forwardedHost.replace(/^https?:\/\//, "");
+    const forwardedHostname = (0, import_shared_utils.originToHostname)(forwardedOrigin);
+    const hostHeader = coreProxy.host ?? forwardedHostname;
     const ENHANCED_DOMAIN_TLD = ".site.com";
     const MY_DOMAIN_TLD = ".salesforce.com";
-    if (forwardedHost.endsWith(ENHANCED_DOMAIN_TLD)) {
-      origin = forwardedHost.slice(0, -ENHANCED_DOMAIN_TLD.length) + MY_DOMAIN_TLD;
-      servername = origin;
+    if (forwardedHostname.endsWith(ENHANCED_DOMAIN_TLD)) {
+      const myHostname = forwardedHostname.slice(0, -ENHANCED_DOMAIN_TLD.length) + MY_DOMAIN_TLD;
+      origin = "https://" + myHostname;
+      servername = myHostname;
     } else if (origin.startsWith(".")) {
-      origin = forwardedHost + origin;
+      origin = "https://" + forwardedHostname + origin;
     }
     const urlParts = new URL(rawUrl);
     const path = urlParts.pathname + urlParts.search;
@@ -182,7 +190,7 @@ var FetchController = class {
       fetchType: "direct",
       url,
       coreUrl: url,
-      coreHostHeader: host,
+      coreHostHeader: hostHeader,
       coreServername: servername
     });
     let client = CORE_CLIENTS.get(origin);
@@ -197,7 +205,7 @@ var FetchController = class {
       ...init,
       method: init.method || "GET",
       path,
-      headers: {...init?.headers, Host: host},
+      headers: {...init?.headers, Host: hostHeader},
       servername
     }).then(async (res) => {
       span.setAttributes({coreStatusCode: res.statusCode});

package/build/es/fetchController.js

@@ -1,7 +1,7 @@
 import { Pool as ClientPool } from 'undici';
 import { logger } from '@lwrjs/diagnostics';
 import { getTracer, ViewSpan } from '@lwrjs/instrumentation';
-import { REQUEST_DEPTH_HEADER } from '@lwrjs/shared-utils';
+import { REQUEST_DEPTH_HEADER, originToHostname } from '@lwrjs/shared-utils';
 const ROUTE_CORE_HEADER = 'X-SFDC-Route-Core';
 // a single Lambda only services 1 org, so this cache will not grow too large
 const CORE_CLIENTS = new Map();
@@ -112,8 +112,9 @@ export class FetchController {
     }
     createFetchEndowment() {
         return (request, init) => {
-            const { host = '', requestDepth = 1, coreProxy } = this;
-            const origin = coreProxy?.origin && coreProxy.origin.startsWith('http') ? coreProxy.origin : host; // The Direct-to-Core proxy origin takes precedence over the Forwarded host
+            const { host: forwardedOrigin = '', requestDepth = 1, coreProxy } = this;
+            // The Direct-to-Core proxy origin takes precedence over the Forwarded host
+            const origin = coreProxy?.origin && coreProxy.origin.startsWith('http') ? coreProxy.origin : forwardedOrigin;
             const { finalRequest, finalUrl } = this.getFinalRequest(request, origin);
             const finalInit = {
                 ...init,
@@ -122,7 +123,7 @@ export class FetchController {
                     [REQUEST_DEPTH_HEADER]: String(requestDepth),
                 },
             };
-            if (coreProxy || (host && finalUrl.startsWith(host))) {
+            if (coreProxy || (forwardedOrigin && finalUrl.startsWith(forwardedOrigin))) {
                 // hint for the CDN that the request is targeted to Core
                 finalInit.headers[ROUTE_CORE_HEADER] = 'true';
             }
@@ -137,7 +138,13 @@ export class FetchController {
             // Default URL to  final URL if successful addInfoToSpan will replace with response.url
             {
                 name: ViewSpan.Fetch,
-                attributes: { url: finalUrl, fetchType: 'cdn', coreProxy: proxyStr, hasCookies },
+                attributes: {
+                    url: finalUrl,
+                    fetchType: 'cdn',
+                    forwardedOrigin,
+                    coreProxy: proxyStr,
+                    hasCookies,
+                },
             }, (span) => {
                 // this trace will NOT fail if fetch fails; it is meant to log the URLs fetched from the server
                 // the fetch caller (ie: getServerData) should handle the error if response.ok is false
@@ -150,10 +157,10 @@ export class FetchController {
                     return res;
                 };
                 if (coreProxy) {
-                    return this.fetchWithAgent(finalUrl, finalInit, host, coreProxy, span)
+                    return this.fetchWithAgent(finalUrl, finalInit, forwardedOrigin, coreProxy, span)
                         .then((res) => addInfoToSpan(res))
                         .catch((err) => {
-                        const { finalRequest: cdnRequest, finalUrl: cdnUrl } = this.getFinalRequest(request, host);
+                        const { finalRequest: cdnRequest, finalUrl: cdnUrl } = this.getFinalRequest(request, forwardedOrigin);
                         logger.warn(`Fetching data directly from Core failed, retrying through CDN: ${cdnUrl} Error is: ${err.message || err}`);
                         span.setAttributes({ fetchType: 'cdnFallback' });
                         return fetch(cdnRequest, finalInit).then((res) => addInfoToSpan(res));
@@ -163,14 +170,14 @@ export class FetchController {
             });
         };
     }
-    getFinalRequest(request, host) {
+    getFinalRequest(request, origin) {
         let finalRequest;
         let finalUrl;
         if (request instanceof Request) {
             const curUrl = request.url;
-            // proxy relative URLs through the host
+            // proxy relative URLs through the origin
             if (curUrl.startsWith('/')) {
-                finalUrl = host + curUrl;
+                finalUrl = origin + curUrl;
                 finalRequest = new Request(finalUrl, request);
             }
             else {
@@ -180,25 +187,28 @@ export class FetchController {
         }
         else {
             const curUrl = typeof request === 'string' ? request : request.toString(); // handle string-able types, eg: URL
-            finalRequest = finalUrl = curUrl.startsWith('/') ? host + curUrl : curUrl; // proxy relative URLs through the host
+            finalRequest = finalUrl = curUrl.startsWith('/') ? origin + curUrl : curUrl; // proxy relative URLs through the origin
         }
         return { finalRequest, finalUrl };
     }
-    async fetchWithAgent(rawUrl, init, forwardedHost, coreProxy, span) {
+    async fetchWithAgent(rawUrl, init, forwardedOrigin, coreProxy, span) {
         let { origin, servername } = coreProxy;
-        const host = coreProxy.host ?? forwardedHost.replace(/^https?:\/\//, '');
+        const forwardedHostname = originToHostname(forwardedOrigin);
+        const hostHeader = coreProxy.host ?? forwardedHostname;
         const ENHANCED_DOMAIN_TLD = '.site.com';
         const MY_DOMAIN_TLD = '.salesforce.com';
-        if (forwardedHost.endsWith(ENHANCED_DOMAIN_TLD)) {
+        if (forwardedHostname.endsWith(ENHANCED_DOMAIN_TLD)) {
+            const myHostname = forwardedHostname.slice(0, -ENHANCED_DOMAIN_TLD.length) + MY_DOMAIN_TLD;
             // use the Salesforce TLD by replacing the Site TLD
             // caller must be an Enhanced Domain on Cloudflare
-            origin = forwardedHost.slice(0, -ENHANCED_DOMAIN_TLD.length) + MY_DOMAIN_TLD;
+            origin = 'https://' + myHostname;
             // do not use SNI with the Enhanced Domain route
-            servername = origin;
+            // never include a protocol in the servername
+            servername = myHostname;
         }
         else if (origin.startsWith('.')) {
             // use the CDN origin if the leading '.' is missing in the coreProxy origin
-            origin = forwardedHost + origin;
+            origin = 'https://' + forwardedHostname + origin;
         }
         const urlParts = new URL(rawUrl);
         const path = urlParts.pathname + urlParts.search;
@@ -209,7 +219,7 @@ export class FetchController {
             fetchType: 'direct',
             url,
             coreUrl: url,
-            coreHostHeader: host,
+            coreHostHeader: hostHeader,
             coreServername: servername,
         });
         let client = CORE_CLIENTS.get(origin);
@@ -227,7 +237,7 @@ export class FetchController {
             // @ts-ignore - HttpMethod not available for typecasting :|
             method: init.method || 'GET',
             path,
-            headers: { ...init?.headers, Host: host },
+            headers: { ...init?.headers, Host: hostHeader },
             // eslint-disable-next-line @typescript-eslint/ban-ts-comment
             // @ts-ignore - not properly typed >:|
             servername,

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.15.7",
+    "version": "0.15.9",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -42,17 +42,17 @@
         "build/**/*.d.ts"
     ],
     "dependencies": {
-        "@lwrjs/config": "0.15.7",
-        "@lwrjs/diagnostics": "0.15.7",
-        "@lwrjs/instrumentation": "0.15.7",
-        "@lwrjs/loader": "0.15.7",
-        "@lwrjs/shared-utils": "0.15.7",
+        "@lwrjs/config": "0.15.9",
+        "@lwrjs/diagnostics": "0.15.9",
+        "@lwrjs/instrumentation": "0.15.9",
+        "@lwrjs/loader": "0.15.9",
+        "@lwrjs/shared-utils": "0.15.9",
         "fs-extra": "^11.2.0",
         "lru-cache": "^10.4.3",
         "undici": "^6.19.8"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.15.7",
+        "@lwrjs/types": "0.15.9",
         "jest": "^26.6.3",
         "memfs": "^4.13.0",
         "ts-jest": "^26.5.6"
@@ -63,5 +63,5 @@
     "volta": {
         "extends": "../../../package.json"
     },
-    "gitHead": "9e6803700aef18118f38f0f72006c5c87e10bc13"
+    "gitHead": "281108b0e976f7302571a77d7f1d15136b9076e9"
 }