@lwrjs/lwc-ssr 0.15.0-alpha.21 → 0.15.0-alpha.22

package/build/cjs/fetchController.cjs

@@ -74,11 +74,10 @@ var FetchController = class {
       this.noOpActivated = false;
     };
     this.setFetchRequestContext = (context) => {
-      const {host, headers, requestDepth, basePath, coreProxy} = context;
+      const {host, headers, requestDepth, coreProxy} = context;
       this.host = host;
       this.headers = headers;
       this.requestDepth = requestDepth;
-      this.basePath = basePath;
       this.coreProxy = coreProxy;
     };
     this.killSwitchActivated = false;
@@ -109,8 +108,8 @@ var FetchController = class {
   }
   createFetchEndowment(trace) {
     return (request, init) => {
-      const {host = "", requestDepth = 1, basePath = "/", coreProxy} = this;
-      const origin = coreProxy?.origin || host;
+      const {host = "", requestDepth = 1, coreProxy} = this;
+      const origin = coreProxy?.origin && coreProxy.origin.startsWith("http") ? coreProxy.origin : host;
       const {finalRequest, finalUrl} = this.getFinalRequest(request, origin);
       const finalInit = {
         ...init,
@@ -129,7 +128,7 @@ var FetchController = class {
       });
       return trace({name: import_instrumentation.ViewSpan.Fetch, attributes: {url: finalUrl, coreProxy: coreProxyStr}}, () => {
         if (coreProxy) {
-          return this.fetchWithAgent(finalUrl, finalInit, basePath, coreProxy).catch((err) => {
+          return this.fetchWithAgent(finalUrl, finalInit, host, coreProxy).catch((err) => {
             const {finalRequest: cdnRequest, finalUrl: cdnUrl} = this.getFinalRequest(request, host);
             import_diagnostics.logger.warn(`Fetching data directly from Core failed, retrying through CDN: ${cdnUrl}`, err.message || err);
             return fetch(cdnRequest, finalInit);
@@ -157,9 +156,17 @@ var FetchController = class {
     }
     return {finalRequest, finalUrl};
   }
-  async fetchWithAgent(url, init, basePath, coreProxy) {
-    const {origin, host, servername, sitePath} = coreProxy;
-    const urlParts = new URL(url);
+  async fetchWithAgent(url, init, forwardedHost, coreProxy) {
+    let {origin, servername} = coreProxy;
+    const host = coreProxy.host ?? forwardedHost.replace(/^https?:\/\//, "");
+    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;
+    } else if (origin.startsWith(".")) {
+      origin = forwardedHost + origin;
+    }
     let client = CORE_CLIENTS.get(origin);
     if (!client) {
       client = new import_undici.Pool(origin, {
@@ -168,11 +175,8 @@ var FetchController = class {
       });
       CORE_CLIENTS.set(origin, client);
     }
-    let path = urlParts.pathname + urlParts.search;
-    if (sitePath) {
-      const hasBasePath = basePath !== "/" && path.startsWith(basePath);
-      path = hasBasePath ? path.replace(basePath, sitePath) : `${sitePath === "/" ? "" : sitePath}${path}`;
-    }
+    const urlParts = new URL(url);
+    const path = urlParts.pathname + urlParts.search;
     return client.request({
       ...init,
       method: init.method || "GET",
@@ -182,7 +186,7 @@ var FetchController = class {
     }).then((res) => {
       import_diagnostics.logger.info({
         label: `post ${import_instrumentation.ViewSpan.Fetch}`,
-        message: `status: ${res.statusCode}, path: ${path}, basePath: ${basePath}, coreProxy: ${JSON.stringify(coreProxy)}`
+        message: `status: ${res.statusCode}, path: ${path}, coreProxy: ${JSON.stringify(coreProxy)}, request info: ${JSON.stringify({origin, host, servername})}`
       });
       return {
         ...res,

package/build/cjs/moduleLoader.cjs

@@ -209,7 +209,6 @@ function createContext(LWR, runtimeParams, runtimeEnvironment) {
   const fetchController = new import_fetchController.FetchController(trace, {
     host: runtimeParams.host,
     requestDepth: runtimeParams.requestDepth,
-    basePath: runtimeParams.basePath || runtimeEnvironment.basePath,
     coreProxy: runtimeParams.coreProxy
   });
   const context = {

package/build/cjs/renderer.cjs

@@ -95,7 +95,7 @@ var Renderer = class {
       bootstrapServiceEvaluationMap = bootstrapContext.bootstrapServiceEvaluationMap;
       loader = await loaderPromise;
       const fetchController = loader.getFetchController();
-      this.resetFetchController(fetchController, runtimeParams, runtimeEnvironment, route);
+      this.resetFetchController(fetchController, runtimeParams, route);
       const engineServerSpecifier = (0, import_shared_utils.getSpecifier)({
         specifier: "@lwc/engine-server",
         version: route.bootstrap.lwcVersion
@@ -192,13 +192,15 @@ var Renderer = class {
       }
     }
   }
-  resetFetchController(fetchController, runtimeParams, runtimeEnvironment, route) {
+  resetFetchController(fetchController, runtimeParams, route) {
     fetchController.disableFetchKillSwitch();
     fetchController.setFetchRequestContext({
       host: runtimeParams.host,
       requestDepth: runtimeParams.requestDepth,
-      headers: route.bootstrap.includeCookiesForSSR ? {Cookie: runtimeParams.cookie} : void 0,
-      basePath: runtimeParams.basePath || runtimeEnvironment.basePath,
+      headers: route.bootstrap.includeCookiesForSSR ? {
+        Cookie: runtimeParams.cookie,
+        "True-Client-IP": runtimeParams.trueClientIP
+      } : {"True-Client-IP": runtimeParams.trueClientIP},
       coreProxy: runtimeParams.coreProxy
     });
   }

package/build/cjs/utils.cjs

@@ -118,7 +118,8 @@ function getLoaderConfig(bootstrapModule, config, runtimeParams, serverData) {
 function getServerBootstrapServices(route) {
   return route.bootstrap.services.reduce((acc, service) => {
     if (service.ssr === true) {
-      acc.push(service.name);
+      const serviceId = (0, import_shared_utils.getSpecifier)({specifier: service.name, version: service.version});
+      acc.push(serviceId);
     }
     return acc;
   }, []);

package/build/es/fetchController.d.ts

@@ -5,7 +5,6 @@ export type FetchRequestContext = {
     host?: string;
     requestDepth?: number;
     headers?: HeadersInit | undefined;
-    basePath?: string;
     coreProxy?: DirectToCoreProxy;
 };
 /**
@@ -24,7 +23,6 @@ export declare class FetchController {
     private headers;
     private host;
     private requestDepth;
-    private basePath;
     private coreProxy;
     fetchEndowment: FetchFunction;
     constructor(trace: TraceFn<Response>, context: FetchRequestContext);

package/build/es/fetchController.js

@@ -71,11 +71,10 @@ export class FetchController {
             this.noOpActivated = false;
         };
         this.setFetchRequestContext = (context) => {
-            const { host, headers, requestDepth, basePath, coreProxy } = context;
+            const { host, headers, requestDepth, coreProxy } = context;
             this.host = host;
             this.headers = headers;
             this.requestDepth = requestDepth;
-            this.basePath = basePath;
             this.coreProxy = coreProxy;
         };
         this.killSwitchActivated = false;
@@ -117,8 +116,8 @@ export class FetchController {
     }
     createFetchEndowment(trace) {
         return (request, init) => {
-            const { host = '', requestDepth = 1, basePath = '/', coreProxy } = this;
-            const origin = coreProxy?.origin || host; // The Direct-to-Core proxy origin takes precedence over the Forwarded host
+            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 { finalRequest, finalUrl } = this.getFinalRequest(request, origin);
             const finalInit = {
                 ...init,
@@ -142,7 +141,7 @@ export class FetchController {
                 // if the caller throws the fetch error, then it will be surfaced in the PARENT traces:
                 // lwr.view.ssr.fetch (this) > lwr.view.ssr > lwr.view.ssr.island > lwr.view.render > lwr.handle.view
                 if (coreProxy) {
-                    return this.fetchWithAgent(finalUrl, finalInit, basePath, coreProxy).catch((err) => {
+                    return this.fetchWithAgent(finalUrl, finalInit, host, coreProxy).catch((err) => {
                         const { finalRequest: cdnRequest, finalUrl: cdnUrl } = this.getFinalRequest(request, host);
                         logger.warn(`Fetching data directly from Core failed, retrying through CDN: ${cdnUrl}`, err.message || err);
                         return fetch(cdnRequest, finalInit);
@@ -173,9 +172,22 @@ export class FetchController {
         }
         return { finalRequest, finalUrl };
     }
-    async fetchWithAgent(url, init, basePath, coreProxy) {
-        const { origin, host, servername, sitePath } = coreProxy;
-        const urlParts = new URL(url);
+    async fetchWithAgent(url, init, forwardedHost, coreProxy) {
+        let { origin, servername } = coreProxy;
+        const host = coreProxy.host ?? forwardedHost.replace(/^https?:\/\//, '');
+        const ENHANCED_DOMAIN_TLD = '.site.com';
+        const MY_DOMAIN_TLD = '.salesforce.com';
+        if (forwardedHost.endsWith(ENHANCED_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;
+            // do not use SNI with the Enhanced Domain route
+            servername = origin;
+        }
+        else if (origin.startsWith('.')) {
+            // use the CDN origin if the leading '.' is missing in the coreProxy origin
+            origin = forwardedHost + origin;
+        }
         let client = CORE_CLIENTS.get(origin);
         if (!client) {
             client = new ClientPool(origin, {
@@ -184,14 +196,8 @@ export class FetchController {
             });
             CORE_CLIENTS.set(origin, client);
         }
-        let path = urlParts.pathname + urlParts.search;
-        if (sitePath) {
-            // replace the data API basePath with the Core sitePath prefix
-            const hasBasePath = basePath !== '/' && path.startsWith(basePath);
-            path = hasBasePath
-                ? path.replace(basePath, sitePath)
-                : `${sitePath === '/' ? '' : sitePath}${path}`;
-        }
+        const urlParts = new URL(url);
+        const path = urlParts.pathname + urlParts.search;
         return client
             .request({
             ...init,
@@ -207,7 +213,7 @@ export class FetchController {
             .then((res) => {
             logger.info({
                 label: `post ${ViewSpan.Fetch}`,
-                message: `status: ${res.statusCode}, path: ${path}, basePath: ${basePath}, coreProxy: ${JSON.stringify(coreProxy)}`,
+                message: `status: ${res.statusCode}, path: ${path}, coreProxy: ${JSON.stringify(coreProxy)}, request info: ${JSON.stringify({ origin, host, servername })}`,
             });
             return {
                 // convert the response to a fetch Response object

package/build/es/moduleLoader.js

@@ -222,7 +222,6 @@ function createContext(LWR, runtimeParams, runtimeEnvironment) {
     const fetchController = new FetchController(trace, {
         host: runtimeParams.host,
         requestDepth: runtimeParams.requestDepth,
-        basePath: runtimeParams.basePath || runtimeEnvironment.basePath,
         coreProxy: runtimeParams.coreProxy,
     });
     const context = {

package/build/es/renderer.js

@@ -109,7 +109,7 @@ export class Renderer {
             loader = await loaderPromise;
             // reset/init the fetch controller between page renders
             const fetchController = loader.getFetchController();
-            this.resetFetchController(fetchController, runtimeParams, runtimeEnvironment, route);
+            this.resetFetchController(fetchController, runtimeParams, route);
             // load and alias the LWC server engine
             // this MUST be done first in case bootstrap services depend on LWC
             const engineServerSpecifier = getSpecifier({
@@ -239,16 +239,18 @@ export class Renderer {
             }
         }
     }
-    resetFetchController(fetchController, runtimeParams, runtimeEnvironment, route) {
+    resetFetchController(fetchController, runtimeParams, route) {
         // Re-enable fetch that was disabled at the end of the previous page render via `enableFetchKillSwitch`
         fetchController.disableFetchKillSwitch();
         fetchController.setFetchRequestContext({
             host: runtimeParams.host,
             requestDepth: runtimeParams.requestDepth,
             headers: route.bootstrap.includeCookiesForSSR
-                ? { Cookie: runtimeParams.cookie }
-                : undefined,
-            basePath: runtimeParams.basePath || runtimeEnvironment.basePath,
+                ? {
+                    Cookie: runtimeParams.cookie,
+                    'True-Client-IP': runtimeParams.trueClientIP,
+                }
+                : { 'True-Client-IP': runtimeParams.trueClientIP },
             coreProxy: runtimeParams.coreProxy,
         });
     }

package/build/es/utils.js

@@ -1,5 +1,5 @@
 import { logger, stringifyError } from '@lwrjs/diagnostics';
-import { buildEnvironmentContext, getFeatureFlags, normalizeVersionToUri, isLambdaEnv, } from '@lwrjs/shared-utils';
+import { buildEnvironmentContext, getFeatureFlags, normalizeVersionToUri, isLambdaEnv, getSpecifier, } from '@lwrjs/shared-utils';
 const DEFAULT_SSR_TIMEOUT = 5000; // 5 seconds, override with process.env.SSR_TIMEOUT
 export const SSR_PROPS_ATTR = 'data-lwr-props-id';
 export function getPropsId() {
@@ -95,7 +95,8 @@ export function getLoaderConfig(bootstrapModule, config, runtimeParams, serverDa
 export function getServerBootstrapServices(route) {
     return route.bootstrap.services.reduce((acc, service) => {
         if (service.ssr === true) {
-            acc.push(service.name);
+            const serviceId = getSpecifier({ specifier: service.name, version: service.version });
+            acc.push(serviceId);
         }
         return acc;
     }, []);

package/package.json

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