@lwrjs/server 0.11.0-alpha.8 → 0.11.0

package/build/cjs/common/abstract-request.cjs

@@ -10,6 +10,18 @@ __markAsModule(exports);
 __export(exports, {
   AbstractMiddlewareRequest: () => AbstractMiddlewareRequest
 });
+function parseForwardedHeader(forwarded) {
+  if (!forwarded)
+    return void 0;
+  const couples = forwarded.toLocaleLowerCase().split(";");
+  const map = couples.reduce((m, c) => {
+    const [key, value] = c.trim().split("=");
+    m[key] = value;
+    return m;
+  }, {});
+  const proto = map.proto ? `${map.proto}://` : "";
+  return map.host ? `${proto}${map.host}` : void 0;
+}
 var AbstractMiddlewareRequest = class {
   constructor(isSiteGenerationRequest) {
     this.isSiteGenerationRequest = isSiteGenerationRequest || false;
@@ -43,7 +55,15 @@ var AbstractMiddlewareRequest = class {
     return !targetEnvironment || targetEnvironment === defaultEnvironment || supportedEnvironments?.includes(targetEnvironment);
   }
   getRuntimeContext(defaultRuntimeEnvironment) {
-    const {format, apiVersion, compat, locale, environment, bundleSpecifier} = this.params;
+    const {
+      format,
+      apiVersion,
+      basePath: basePathParam,
+      compat,
+      locale: localeParam,
+      environment,
+      bundleSpecifier
+    } = this.params;
     const debug = this.query.debug !== void 0;
     const bundle = !!bundleSpecifier;
     const runtimeEnvironment = {
@@ -52,11 +72,25 @@ var AbstractMiddlewareRequest = class {
       compat: compat || defaultRuntimeEnvironment.compat,
       debug: debug || defaultRuntimeEnvironment.debug,
       apiVersion: apiVersion || defaultRuntimeEnvironment.apiVersion,
-      bundle: bundle || defaultRuntimeEnvironment.bundle
+      bundle: bundle || defaultRuntimeEnvironment.bundle,
+      basePath: this.basePath || basePathParam || defaultRuntimeEnvironment.basePath
     };
+    let host = parseForwardedHeader(this.headers?.forwarded) || this.headers?.host || void 0;
+    if (host && !host.startsWith("http")) {
+      host = `${this.protocol}://${host}`;
+    }
+    const basePath = runtimeEnvironment.basePath;
+    const defaultLocale = runtimeEnvironment.i18n.defaultLocale;
+    const locale = localeParam || this.locale || defaultLocale;
+    const uiBasePath = runtimeEnvironment.i18n.uriPattern === "path-prefix" && defaultLocale !== locale ? `${basePath}/${locale}` : `${basePath}`;
+    const assetBasePath = `${runtimeEnvironment.basePath}${runtimeEnvironment.defaultAssetPath}`;
     const runtimeParams = {
-      locale: locale || this.locale || defaultRuntimeEnvironment.defaultLocale,
-      environment
+      basePath,
+      locale,
+      assetBasePath,
+      uiBasePath,
+      environment,
+      host
     };
     return {
       runtimeEnvironment,

package/build/cjs/express/express-request.cjs

@@ -56,6 +56,12 @@ var ExpressRequest = class extends import_abstract_request.AbstractMiddlewareReq
   get protocol() {
     return this.req.protocol;
   }
+  get basePath() {
+    return this.req.basePath || "";
+  }
+  set basePath(bp) {
+    this.req.basePath = bp;
+  }
   get locale() {
     return this.req.locale;
   }

package/build/cjs/koa/koa-request.cjs

@@ -56,6 +56,12 @@ var KoaRequest = class extends import_abstract_request.AbstractMiddlewareRequest
   get headers() {
     return this.ctx.headers;
   }
+  get basePath() {
+    return this.ctx.basePath || "";
+  }
+  set basePath(bp) {
+    this.ctx.basePath = bp;
+  }
   get locale() {
     return this.ctx.locale;
   }

package/build/es/common/abstract-request.d.ts

@@ -10,6 +10,7 @@ export declare abstract class AbstractMiddlewareRequest implements MiddlewareReq
     abstract params: any;
     abstract query: any;
     abstract locale: string;
+    abstract basePath: string;
     abstract headers: Headers;
     abstract acceptsLanguages(): string[];
     abstract get(field: string): string | undefined;

package/build/es/common/abstract-request.js

@@ -1,3 +1,19 @@
+// See: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Forwarded
+function parseForwardedHeader(forwarded) {
+    if (!forwarded)
+        return undefined;
+    // parse the Forwarded header to find the "host" and "proto"
+    // case-insensitive and can contain empty space around the key=value pairs
+    const couples = forwarded.toLocaleLowerCase().split(';');
+    const map = couples.reduce((m, c) => {
+        const [key, value] = c.trim().split('=');
+        m[key] = value;
+        return m;
+    }, {});
+    // build the protocol:host string
+    const proto = map.proto ? `${map.proto}://` : '';
+    return map.host ? `${proto}${map.host}` : undefined;
+}
 export class AbstractMiddlewareRequest {
     constructor(isSiteGenerationRequest) {
         this.isSiteGenerationRequest = isSiteGenerationRequest || false;
@@ -36,7 +52,7 @@ export class AbstractMiddlewareRequest {
             supportedEnvironments?.includes(targetEnvironment));
     }
     getRuntimeContext(defaultRuntimeEnvironment) {
-        const { format, apiVersion, compat, locale, environment, bundleSpecifier } = this.params;
+        const { format, apiVersion, basePath: basePathParam, compat, locale: localeParam, environment, bundleSpecifier, } = this.params;
         const debug = this.query.debug !== undefined;
         const bundle = !!bundleSpecifier;
         const runtimeEnvironment = {
@@ -47,10 +63,29 @@ export class AbstractMiddlewareRequest {
             debug: debug || defaultRuntimeEnvironment.debug,
             apiVersion: apiVersion || defaultRuntimeEnvironment.apiVersion,
             bundle: bundle || defaultRuntimeEnvironment.bundle,
+            basePath: this.basePath || basePathParam || defaultRuntimeEnvironment.basePath,
         };
+        let host = parseForwardedHeader(this.headers?.forwarded) || this.headers?.host || undefined;
+        if (host && !host.startsWith('http')) {
+            host = `${this.protocol}://${host}`;
+        }
+        const basePath = runtimeEnvironment.basePath;
+        const defaultLocale = runtimeEnvironment.i18n.defaultLocale;
+        const locale = localeParam || this.locale || defaultLocale;
+        // Base path to be used in routing ${basePath}/locale
+        const uiBasePath = runtimeEnvironment.i18n.uriPattern === 'path-prefix' && defaultLocale !== locale
+            ? `${basePath}/${locale}`
+            : `${basePath}`;
+        // Path to static artifacts on MRT the is ${basePath}/mobify/build/${bundleId}
+        // On express this is ${basePath}
+        const assetBasePath = `${runtimeEnvironment.basePath}${runtimeEnvironment.defaultAssetPath}`;
         const runtimeParams = {
-            locale: locale || this.locale || defaultRuntimeEnvironment.defaultLocale,
+            basePath,
+            locale,
+            assetBasePath,
+            uiBasePath,
             environment,
+            host,
         };
         return {
             runtimeEnvironment,

package/build/es/express/express-request.d.ts

@@ -12,6 +12,8 @@ export default class ExpressRequest extends AbstractMiddlewareRequest {
     get method(): string;
     get headers(): Headers;
     get protocol(): any;
+    get basePath(): string;
+    set basePath(bp: string);
     get locale(): string;
     set locale(l: string);
     acceptsLanguages(): string[];

package/build/es/express/express-request.js

@@ -29,6 +29,12 @@ export default class ExpressRequest extends AbstractMiddlewareRequest {
     get protocol() {
         return this.req.protocol;
     }
+    get basePath() {
+        return this.req.basePath || '';
+    }
+    set basePath(bp) {
+        this.req.basePath = bp;
+    }
     get locale() {
         return this.req.locale;
     }

package/build/es/koa/koa-request.d.ts

@@ -12,6 +12,8 @@ export default class KoaRequest extends AbstractMiddlewareRequest {
     get body(): any;
     get method(): string;
     get headers(): Headers;
+    get basePath(): string;
+    set basePath(bp: string);
     get locale(): string;
     set locale(l: string);
     acceptsLanguages(): string[];

package/build/es/koa/koa-request.js

@@ -28,6 +28,12 @@ export default class KoaRequest extends AbstractMiddlewareRequest {
     get headers() {
         return this.ctx.headers;
     }
+    get basePath() {
+        return this.ctx.basePath || '';
+    }
+    set basePath(bp) {
+        this.ctx.basePath = bp;
+    }
     get locale() {
         return this.ctx.locale;
     }

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.11.0-alpha.8",
+    "version": "0.11.0",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -34,14 +34,14 @@
         "build/**/*.d.ts"
     ],
     "devDependencies": {
-        "@lwrjs/types": "0.11.0-alpha.8",
+        "@lwrjs/types": "0.11.0",
         "@types/koa-compress": "^4.0.1",
         "@types/koa__router": "^8.0.4",
         "jest-express": "^1.12.0"
     },
     "dependencies": {
         "@koa/router": "^10.0.0",
-        "@lwrjs/shared-utils": "0.11.0-alpha.8",
+        "@lwrjs/shared-utils": "0.11.0",
         "@types/express": "^4.17.17",
         "@types/koa": "^2.11.7",
         "express": "^4.18.2",
@@ -51,5 +51,5 @@
     "engines": {
         "node": ">=16.0.0"
     },
-    "gitHead": "bba3cfa996e84ee702f287e7e7b6361b807434db"
+    "gitHead": "fbc883ea90a12672ce6f1adc2201144fda8762bd"
 }