@lwrjs/lwc-ssr 0.24.2 → 0.24.4

package/build/cjs/__mocks__/renderer.cjs

@@ -1,16 +1,28 @@
 var __defProp = Object.defineProperty;
-var __markAsModule = (target) => __defProp(target, "__esModule", {value: true});
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
-    __defProp(target, name, {get: all[name], enumerable: true});
+    __defProp(target, name, { get: all[name], enumerable: true });
 };
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // packages/@lwrjs/lwc-ssr/src/__mocks__/renderer.ts
-__markAsModule(exports);
-__export(exports, {
+var renderer_exports = {};
+__export(renderer_exports, {
   Renderer: () => Renderer,
   getRenderer: () => getRenderer
 });
+module.exports = __toCommonJS(renderer_exports);
 var mockComponents = {};
 function getRenderer() {
   return new Renderer();
@@ -37,6 +49,6 @@ var Renderer = class {
         throw new Error(mockOutput.error);
       }
     }
-    return {results, warnings, bundles: new Set([2, 3, 4])};
+    return { results, warnings, bundles: /* @__PURE__ */ new Set([2, 3, 4]) };
   }
 };

package/build/cjs/__mocks__/undici.cjs

@@ -1,30 +1,43 @@
 var __defProp = Object.defineProperty;
-var __markAsModule = (target) => __defProp(target, "__esModule", {value: true});
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
-    __defProp(target, name, {get: all[name], enumerable: true});
+    __defProp(target, name, { get: all[name], enumerable: true });
 };
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // packages/@lwrjs/lwc-ssr/src/__mocks__/undici.ts
-__markAsModule(exports);
-__export(exports, {
+var undici_exports = {};
+__export(undici_exports, {
   Pool: () => Pool
 });
+module.exports = __toCommonJS(undici_exports);
 var Pool = class {
+  origin = "";
+  // passed to the Pool constructor
   constructor(origin) {
-    this.origin = "";
     this.origin = origin;
   }
   async request(options) {
-    const {path} = options;
-    if (path.endsWith("bad"))
-      throw new Error("fail");
-    const ret = {origin: this.origin, req: options};
+    const { path } = options;
+    if (path.endsWith("bad")) throw new Error("fail");
+    const ret = { origin: this.origin, req: options };
     const retStr = JSON.stringify(ret);
     return Promise.resolve({
       statusCode: path.endsWith("fail") ? 500 : path.endsWith("empty") ? 204 : path.endsWith("reset") ? 205 : 200,
-      headers: {"cache-control": "no-cache", "X-something": void 0, "set-cookie": ["a", "b", "c"]},
+      headers: { "cache-control": "no-cache", "X-something": void 0, "set-cookie": ["a", "b", "c"] },
       body: {
+        // return options passed to new Pool() and client.request()
         arrayBuffer: () => Promise.resolve(Uint8Array.from(retStr.split("").map((letter) => letter.charCodeAt(0)))),
         text: () => Promise.resolve(retStr),
         json: () => Promise.resolve(ret)

package/build/cjs/dataViewTransformer/index.cjs

@@ -1,82 +1,88 @@
-var __create = Object.create;
 var __defProp = Object.defineProperty;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __markAsModule = (target) => __defProp(target, "__esModule", {value: true});
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
-    __defProp(target, name, {get: all[name], enumerable: true});
+    __defProp(target, name, { get: all[name], enumerable: true });
 };
-var __exportStar = (target, module2, desc) => {
-  if (module2 && typeof module2 === "object" || typeof module2 === "function") {
-    for (let key of __getOwnPropNames(module2))
-      if (!__hasOwnProp.call(target, key) && key !== "default")
-        __defProp(target, key, {get: () => module2[key], enumerable: !(desc = __getOwnPropDesc(module2, key)) || desc.enumerable});
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
   }
-  return target;
-};
-var __toModule = (module2) => {
-  return __exportStar(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", module2 && module2.__esModule && "default" in module2 ? {get: () => module2.default, enumerable: true} : {value: module2, enumerable: true})), module2);
+  return to;
 };
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // packages/@lwrjs/lwc-ssr/src/dataViewTransformer/index.ts
-__markAsModule(exports);
-__export(exports, {
+var dataViewTransformer_exports = {};
+__export(dataViewTransformer_exports, {
   default: () => preloadDataViewTransformer
 });
-var import_diagnostics = __toModule(require("@lwrjs/diagnostics"));
-var import_instrumentation = __toModule(require("@lwrjs/instrumentation"));
-var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
-var import_utils = __toModule(require("../utils.cjs"));
-var import_renderer = __toModule(require("../renderer.cjs"));
+module.exports = __toCommonJS(dataViewTransformer_exports);
+var import_diagnostics = require("@lwrjs/diagnostics");
+var import_instrumentation = require("@lwrjs/instrumentation");
+var import_shared_utils = require("@lwrjs/shared-utils");
+var import_utils = require("../utils.cjs");
+var import_renderer = require("../renderer.cjs");
 var NAME = "preload-data-transformer";
-function preloadDataViewTransformer(_options, {config, moduleBundler, resourceRegistry}) {
+function preloadDataViewTransformer(_options, { config, moduleBundler, resourceRegistry }) {
   const routes = [...config.routes, ...config.errorRoutes];
   return {
     name: NAME,
     async link(stringBuilder, viewContext, metadata) {
-      const allBundles = new Set([...metadata.serverBundles ?? []]);
-      const {rootComponent} = viewContext.view;
+      const allBundles = /* @__PURE__ */ new Set([...metadata.serverBundles ?? []]);
+      const { rootComponent } = viewContext.view;
       if (!rootComponent || !viewContext.view.bootstrap?.preloadData || viewContext.view.bootstrap?.ssr) {
         return {};
       }
-      import_diagnostics.logger.debug({label: NAME, message: `Preload data for root component "${rootComponent}"`});
+      import_diagnostics.logger.debug({ label: NAME, message: `Preload data for root component "${rootComponent}"` });
       const {
         results = {},
         warnings,
         bundles
-      } = await (0, import_instrumentation.getTracer)().trace({
-        name: import_instrumentation.ViewSpan.PreloadData,
-        attributes: {rootComponent}
-      }, async () => {
-        const route = routes.find((r) => r.id === viewContext.view.id);
-        if (!route) {
-          throw new Error(`Unable to resolve configuration for view: ${viewContext.view.id}`);
-        }
-        try {
-          return await (0, import_renderer.getRenderer)(config, moduleBundler, resourceRegistry).render({[rootComponent]: {specifier: rootComponent, props: {}}}, route, viewContext.runtimeEnvironment, viewContext.runtimeParams);
-        } catch (e) {
-          if (e instanceof import_diagnostics.LwrStatusError)
-            throw e;
-          const message = import_diagnostics.descriptions.APPLICATION.PRELOAD_DATA_ERROR(rootComponent, (0, import_diagnostics.stringifyError)(e));
-          import_diagnostics.logger.warn({label: "preloadDataViewTransformer", message});
-          return {warnings: [message]};
+      } = await (0, import_instrumentation.getTracer)().trace(
+        {
+          name: import_instrumentation.ViewSpan.PreloadData,
+          attributes: { rootComponent }
+        },
+        async () => {
+          const route = routes.find((r) => r.id === viewContext.view.id);
+          if (!route) {
+            throw new Error(`Unable to resolve configuration for view: ${viewContext.view.id}`);
+          }
+          try {
+            return await (0, import_renderer.getRenderer)(config, moduleBundler, resourceRegistry).render(
+              { [rootComponent]: { specifier: rootComponent, props: {} } },
+              route,
+              viewContext.runtimeEnvironment,
+              viewContext.runtimeParams
+            );
+          } catch (e) {
+            if (e instanceof import_diagnostics.LwrStatusError) throw e;
+            const message = import_diagnostics.descriptions.APPLICATION.PRELOAD_DATA_ERROR(
+              rootComponent,
+              (0, import_diagnostics.stringifyError)(e)
+            );
+            import_diagnostics.logger.warn({ label: "preloadDataViewTransformer", message });
+            return { warnings: [message] };
+          }
         }
-      });
+      );
       (0, import_utils.mergeWarnings)(metadata, warnings);
       const result = results[rootComponent];
       if (!result) {
         return {};
       }
-      const {props, markup, cache: {ttl} = {ttl: void 0}} = result || {};
-      import_diagnostics.logger.verbose({label: NAME, message: "response", additionalInfo: props});
+      const { props, markup, cache: { ttl } = { ttl: void 0 } } = result || {};
+      import_diagnostics.logger.verbose({ label: NAME, message: "response", additionalInfo: props });
       markup && (0, import_shared_utils.addHeadMarkup)([result.markup], stringBuilder);
       metadata.serverData = metadata.serverData || {};
       Object.assign(metadata.serverData, props);
-      metadata.serverBundles = bundles ? new Set([...allBundles, ...bundles]) : allBundles;
-      return {cache: {ttl}};
+      metadata.serverBundles = bundles ? /* @__PURE__ */ new Set([...allBundles, ...bundles]) : allBundles;
+      return { cache: { ttl } };
     }
   };
 }

package/build/cjs/directFetch.cjs

@@ -1,40 +1,36 @@
-var __create = Object.create;
 var __defProp = Object.defineProperty;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __markAsModule = (target) => __defProp(target, "__esModule", {value: true});
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
-    __defProp(target, name, {get: all[name], enumerable: true});
+    __defProp(target, name, { get: all[name], enumerable: true });
 };
-var __exportStar = (target, module2, desc) => {
-  if (module2 && typeof module2 === "object" || typeof module2 === "function") {
-    for (let key of __getOwnPropNames(module2))
-      if (!__hasOwnProp.call(target, key) && key !== "default")
-        __defProp(target, key, {get: () => module2[key], enumerable: !(desc = __getOwnPropDesc(module2, key)) || desc.enumerable});
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
   }
-  return target;
-};
-var __toModule = (module2) => {
-  return __exportStar(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", module2 && module2.__esModule && "default" in module2 ? {get: () => module2.default, enumerable: true} : {value: module2, enumerable: true})), module2);
+  return to;
 };
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // packages/@lwrjs/lwc-ssr/src/directFetch.ts
-__markAsModule(exports);
-__export(exports, {
+var directFetch_exports = {};
+__export(directFetch_exports, {
   ROUTE_CORE_HEADER: () => ROUTE_CORE_HEADER,
   fetchWithAgent: () => fetchWithAgent
 });
-var import_undici = __toModule(require("undici"));
-var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
-var import_utils = __toModule(require("./utils.cjs"));
-var CORE_CLIENTS = new Map();
+module.exports = __toCommonJS(directFetch_exports);
+var import_undici = require("undici");
+var import_shared_utils = require("@lwrjs/shared-utils");
+var import_utils = require("./utils.cjs");
+var CORE_CLIENTS = /* @__PURE__ */ new Map();
 var ROUTE_CORE_HEADER = "x-sfdc-route-core";
 async function fetchWithAgent(request, init, forwardedOrigin, coreProxy, span) {
-  let {origin, servername} = coreProxy;
-  const {finalUrl} = (0, import_utils.getFinalRequest)(request, origin.startsWith("http") ? origin : forwardedOrigin);
+  let { origin, servername } = coreProxy;
+  const { finalUrl } = (0, import_utils.getFinalRequest)(request, origin.startsWith("http") ? origin : forwardedOrigin);
   const forwardedHostname = (0, import_shared_utils.toHostname)(forwardedOrigin);
   const hostHeader = coreProxy.host ?? forwardedHostname;
   const ENHANCED_DOMAIN_TLD = ".site.com";
@@ -68,20 +64,23 @@ async function fetchWithAgent(request, init, forwardedOrigin, coreProxy, span) {
   }
   const res = await client.request({
     ...init,
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore - HttpMethod not available for typecasting :|
     method: init.method || "GET",
     path,
-    headers: {...init?.headers, Host: hostHeader},
+    headers: { ...init?.headers, Host: hostHeader },
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore - not properly typed >:|
     servername
   });
-  span.setAttributes({coreStatusCode: res.statusCode});
+  span.setAttributes({ coreStatusCode: res.statusCode });
   const bodyBuffer = await res.body.arrayBuffer();
   const body = res.statusCode === 204 || res.statusCode === 205 ? null : bodyBuffer;
   const headers = new Headers();
   for (const [key, value] of Object.entries(res.headers)) {
-    if (!value)
-      continue;
+    if (!value) continue;
     const values = Array.isArray(value) ? value : [value];
     values.forEach((v) => headers.append(key, v));
   }
-  return new Response(body, {status: res.statusCode, headers});
+  return new Response(body, { status: res.statusCode, headers });
 }

package/build/cjs/fetchController.cjs

@@ -1,93 +1,105 @@
-var __create = Object.create;
 var __defProp = Object.defineProperty;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __markAsModule = (target) => __defProp(target, "__esModule", {value: true});
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
-    __defProp(target, name, {get: all[name], enumerable: true});
+    __defProp(target, name, { get: all[name], enumerable: true });
 };
-var __exportStar = (target, module2, desc) => {
-  if (module2 && typeof module2 === "object" || typeof module2 === "function") {
-    for (let key of __getOwnPropNames(module2))
-      if (!__hasOwnProp.call(target, key) && key !== "default")
-        __defProp(target, key, {get: () => module2[key], enumerable: !(desc = __getOwnPropDesc(module2, key)) || desc.enumerable});
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
   }
-  return target;
-};
-var __toModule = (module2) => {
-  return __exportStar(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", module2 && module2.__esModule && "default" in module2 ? {get: () => module2.default, enumerable: true} : {value: module2, enumerable: true})), module2);
+  return to;
 };
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // packages/@lwrjs/lwc-ssr/src/fetchController.ts
-__markAsModule(exports);
-__export(exports, {
+var fetchController_exports = {};
+__export(fetchController_exports, {
   FetchController: () => FetchController
 });
-var import_diagnostics = __toModule(require("@lwrjs/diagnostics"));
-var import_instrumentation = __toModule(require("@lwrjs/instrumentation"));
-var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
-var import_directFetch = __toModule(require("./directFetch.cjs"));
-var import_utils = __toModule(require("./utils.cjs"));
+module.exports = __toCommonJS(fetchController_exports);
+var import_diagnostics = require("@lwrjs/diagnostics");
+var import_instrumentation = require("@lwrjs/instrumentation");
+var import_shared_utils = require("@lwrjs/shared-utils");
+var import_directFetch = require("./directFetch.cjs");
+var import_utils = require("./utils.cjs");
 var FetchController = class {
+  killSwitchActivated = false;
+  noOpActivated = false;
+  abortController;
+  headers;
+  host;
+  coreProxy;
+  fetchEndowment;
   constructor(context, coreProxy) {
-    this.killSwitchActivated = false;
-    this.noOpActivated = false;
-    this.controlledFetch = (request, init) => {
-      if (this.killSwitchActivated) {
-        return this.handleAbortError(request, "Kill switch was already enabled");
-      }
-      if (!this.abortController) {
-        this.abortController = new AbortController();
-      }
-      const signal = this.abortController?.signal;
-      const updatedInit = {
-        ...init,
-        headers: {...init?.headers, ...this.headers},
-        signal
-      };
-      const fetchFunction = this.noOpActivated ? this.fetchNoOp(request, updatedInit) : this.fetchEndowment(request, updatedInit);
-      const fetchPromise = fetchFunction.catch((error) => {
-        const errorMsg = error.message || error;
-        if (error && (errorMsg.startsWith("AbortError") || error?.stack.startsWith("AbortError"))) {
-          return this.handleAbortError(request, error);
-        } else {
-          throw error;
-        }
-      });
-      return fetchPromise;
-    };
-    this.activateKillSwitch = () => {
-      this.killSwitchActivated = true;
-      this.abortController?.abort("AbortError: Kill switch enabled");
-      this.abortController = void 0;
-    };
-    this.deactivateKillSwitch = () => {
-      this.killSwitchActivated = false;
-    };
-    this.activateNoOp = () => {
-      this.noOpActivated = true;
-    };
-    this.deactivateNoOp = () => {
-      this.noOpActivated = false;
-    };
-    this.setFetchRequestContext = (context) => {
-      const {abortController, host, headers} = context;
-      this.host = host;
-      this.headers = headers;
-      this.abortController = abortController;
-    };
     this.coreProxy = coreProxy;
     this.setFetchRequestContext(context);
     this.fetchEndowment = this.createFetchEndowment();
   }
+  controlledFetch = (request, init) => {
+    if (this.killSwitchActivated) {
+      return this.handleAbortError(request, "Kill switch was already enabled");
+    }
+    if (!this.abortController) {
+      this.abortController = new AbortController();
+    }
+    const signal = this.abortController?.signal;
+    const updatedInit = {
+      ...init,
+      headers: { ...init?.headers, ...this.headers },
+      signal
+    };
+    const fetchFunction = this.noOpActivated ? this.fetchNoOp(request, updatedInit) : this.fetchEndowment(request, updatedInit);
+    const fetchPromise = fetchFunction.catch((error) => {
+      const errorMsg = error.message || error;
+      if (error && (errorMsg.startsWith("AbortError") || error?.stack.startsWith("AbortError"))) {
+        return this.handleAbortError(request, error);
+      } else {
+        throw error;
+      }
+    });
+    return fetchPromise;
+  };
+  /**
+   * After SSR is complete the kill switch will abort any pending fetch requests.
+   */
+  activateKillSwitch = () => {
+    this.killSwitchActivated = true;
+    this.abortController?.abort("AbortError: Kill switch enabled");
+    this.abortController = void 0;
+  };
+  deactivateKillSwitch = () => {
+    this.killSwitchActivated = false;
+  };
+  /**
+   * During SSR renderComponent (which is synchronous) Do not even call any fetch requests
+   * since they would not complete before SSR is done.
+   */
+  activateNoOp = () => {
+    this.noOpActivated = true;
+  };
+  deactivateNoOp = () => {
+    this.noOpActivated = false;
+  };
+  setFetchRequestContext = (context) => {
+    const { abortController, host, headers } = context;
+    this.host = host;
+    this.headers = headers;
+    this.abortController = abortController;
+  };
   handleAbortError(request, error) {
     const message = `${String(request)} request was killed. Either the request timed out or it was dispatched during SSR. Async processes are not supported during SSR. For more information, see: https://developer.salesforce.com/docs/platform/lwr/guide/lwr-configure-component-ssr.html.`;
-    import_diagnostics.logger.warn({label: `Server-side Rendering`, message}, error);
-    return Promise.resolve(new Response(message, {status: 500}));
+    import_diagnostics.logger.warn({ label: `Server-side Rendering`, message }, error);
+    return Promise.resolve(new Response(message, { status: 500 }));
   }
+  /**
+   * Create a fetch API that never calls a request.
+   * This is not expected to be called without an AbortController setup.
+   */
   fetchNoOp(request, init) {
     return new Promise((resolve) => {
       if (!init?.signal) {
@@ -97,7 +109,12 @@ var FetchController = class {
       } else {
         const abortHandler = (err) => {
           init?.signal?.removeEventListener("abort", abortHandler);
-          resolve(this.handleAbortError(request, new Error("Not allowed: Request was dispatched during SSR", {cause: err})));
+          resolve(
+            this.handleAbortError(
+              request,
+              new Error("Not allowed: Request was dispatched during SSR", { cause: err })
+            )
+          );
         };
         init.signal.addEventListener("abort", abortHandler);
       }
@@ -105,8 +122,8 @@ var FetchController = class {
   }
   createFetchEndowment() {
     return (request, init = {}) => {
-      const {host: forwardedOrigin = "", coreProxy} = this;
-      const {finalRequest, finalUrl} = (0, import_utils.getFinalRequest)(request, forwardedOrigin);
+      const { host: forwardedOrigin = "", coreProxy } = this;
+      const { finalRequest, finalUrl } = (0, import_utils.getFinalRequest)(request, forwardedOrigin);
       if (coreProxy || forwardedOrigin && finalUrl.startsWith(forwardedOrigin)) {
         init.headers[import_directFetch.ROUTE_CORE_HEADER] = "true";
       }
@@ -115,31 +132,36 @@ var FetchController = class {
         label: `pre ${import_instrumentation.ViewSpan.Fetch}`,
         message: `finalUrl: ${finalUrl}, hasCookies: ${hasCookies}`
       });
-      return (0, import_instrumentation.getTracer)().trace({
-        name: import_instrumentation.ViewSpan.Fetch,
-        attributes: {
-          url: finalUrl,
-          fetchType: "cdn",
-          forwardedOrigin,
-          hasCookies
+      return (0, import_instrumentation.getTracer)().trace(
+        // fetchType is one of ['cdn' (default), 'direct']
+        // Default URL to  final URL if successful addInfoToSpan will replace with response.url
+        {
+          name: import_instrumentation.ViewSpan.Fetch,
+          attributes: {
+            url: finalUrl,
+            fetchType: "cdn",
+            forwardedOrigin,
+            hasCookies
+          }
+        },
+        (span) => {
+          const withTracing = (fetchPromise) => {
+            return fetchPromise.then((res) => {
+              res.url && span.setAttributes({ url: res.url });
+              span.setAttributes({ statusCode: res.status });
+              return res;
+            }).catch((e) => {
+              span.setAttributes({ error: (0, import_diagnostics.stringifyError)(e) });
+              throw e;
+            });
+          };
+          init.headers = { ...init.headers, ...(0, import_shared_utils.getTraceHeaders)({}, span) };
+          if (coreProxy) {
+            return withTracing((0, import_directFetch.fetchWithAgent)(request, init, forwardedOrigin, coreProxy, span));
+          }
+          return withTracing(fetch(finalRequest, init));
         }
-      }, (span) => {
-        const withTracing = (fetchPromise) => {
-          return fetchPromise.then((res) => {
-            res.url && span.setAttributes({url: res.url});
-            span.setAttributes({statusCode: res.status});
-            return res;
-          }).catch((e) => {
-            span.setAttributes({error: (0, import_diagnostics.stringifyError)(e)});
-            throw e;
-          });
-        };
-        init.headers = {...init.headers, ...(0, import_shared_utils.getTraceHeaders)({}, span)};
-        if (coreProxy) {
-          return withTracing((0, import_directFetch.fetchWithAgent)(request, init, forwardedOrigin, coreProxy, span));
-        }
-        return withTracing(fetch(finalRequest, init));
-      });
+      );
     };
   }
 };