@lwrjs/core 0.12.0-alpha.9 → 0.12.0

package/build/cjs/context/provider.cjs

@@ -26,7 +26,9 @@ __markAsModule(exports);
 __export(exports, {
   createProviderContext: () => createProviderContext
 });
+var import_fs = __toModule(require("fs"));
 var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
+var import_site_metadata = __toModule(require("@lwrjs/static/site-metadata"));
 function createProviderContext(serverContext) {
   const {
     assets,
@@ -43,7 +45,8 @@ function createProviderContext(serverContext) {
     esmLoader,
     environment,
     basePath,
-    bundleConfig
+    bundleConfig,
+    staticSiteGenerator
   } = serverContext.appConfig;
   const {onModuleDefinitionChange, onModuleSourceChange} = serverContext.appObserver;
   const {
@@ -52,6 +55,7 @@ function createProviderContext(serverContext) {
     notifyViewSourceChanged,
     notifyAssetSourceChanged
   } = serverContext.appEmitter;
+  const siteMetadata = staticSiteGenerator.outputDir && import_fs.default.existsSync(staticSiteGenerator.outputDir) ? new import_site_metadata.SiteMetadataImpl({rootDir: staticSiteGenerator.outputDir}) : void 0;
   return {
     appObserver: (0, import_shared_utils.deepFreeze)({onModuleDefinitionChange, onModuleSourceChange}),
     appEmitter: {
@@ -83,6 +87,7 @@ function createProviderContext(serverContext) {
       bundleConfig
     }),
     runtimeEnvironment: (0, import_shared_utils.deepFreeze)(serverContext.runtimeEnvironment),
-    watcherFactory: serverContext.watcherFactory
+    watcherFactory: serverContext.watcherFactory,
+    siteMetadata
   };
 }

package/build/cjs/index.cjs

@@ -70,10 +70,15 @@ async function initContext(appConfig, runtimeEnvironment, globalData) {
     const skipValidation = true;
     await (0, import_config.executeConfigHooks)(hooks, appConfig, runtimeEnvironment, globalData, skipValidation);
     (0, import_config.executeInstrumentationHooks)(hooks);
-    (0, import_config.executeStartHooks)(hooks, appConfig, runtimeEnvironment);
   }
   const services = await (0, import_modules.loadServices)(appConfig);
   const serverContext = (0, import_instrumentation.getTracer)().trace({name: import_instrumentation.CoreSpan.CreateServerContext}, () => (0, import_server2.createServerContext)(appConfig, runtimeEnvironment, globalData));
+  const routeHandlers = await (0, import_modules.loadRouteHandlers)(appConfig);
+  serverContext.routeHandlers = routeHandlers;
+  if (hooks.length) {
+    await (0, import_config.executeContextHooks)(hooks, serverContext);
+    (0, import_config.executeStartHooks)(hooks, appConfig, runtimeEnvironment);
+  }
   const providerContext = (0, import_provider.createProviderContext)(serverContext);
   const {moduleRegistry, assetRegistry, resourceRegistry, viewRegistry, moduleBundler} = serverContext;
   const moduleProviders = createServices(services.moduleProviders, providerContext);
@@ -94,29 +99,26 @@ async function initContext(appConfig, runtimeEnvironment, globalData) {
   viewRegistry.addViewProviders(viewProviders);
   viewRegistry.addViewTransformers(viewTransformers);
   await serverContext.viewRegistry.initializeViewProviders();
-  const routeHandlers = await (0, import_modules.loadRouteHandlers)(appConfig);
-  serverContext.routeHandlers = routeHandlers;
   return serverContext;
 }
 var LwrApp = class {
-  constructor(config = {}) {
+  constructor(configs) {
     this.initialized = false;
     const span = (0, import_instrumentation.getTracer)().startSpan({name: import_instrumentation.CoreSpan.CreateServer});
-    const {appConfig, runtimeEnvironment, globalData} = (0, import_config.loadConfig)(config);
+    const {appConfig, runtimeEnvironment, globalData} = configs;
     this.config = appConfig;
     this.runtimeEnvironment = runtimeEnvironment;
     this.globalData = globalData;
-    const {basePath} = this.config;
-    this.app = (0, import_server.createInternalServer)(this.config.serverType, {basePath});
+    const {basePath, serverType} = this.config;
+    this.serverType = serverType;
+    this.app = (0, import_server.createInternalServer)(serverType, {basePath});
     this.server = this.app.createHttpServer();
+    this.use = this.app.use.bind(this.app);
+    this.all = this.app.all.bind(this.app);
+    this.get = this.app.get.bind(this.app);
+    this.post = this.app.post.bind(this.app);
     span.end();
   }
-  setConfig(config) {
-    const {appConfig, runtimeEnvironment, globalData} = (0, import_config.loadConfig)(config);
-    this.config = appConfig;
-    this.runtimeEnvironment = runtimeEnvironment;
-    this.globalData = globalData;
-  }
   getConfig() {
     return this.config;
   }
@@ -168,24 +170,16 @@ var LwrApp = class {
       });
     });
   }
-  async close() {
-    this.server?.close && await this.server.close();
+  close() {
+    this.server?.close && this.server.close();
   }
   getInternalServer() {
     return this.app.getImpl();
   }
-  getServer() {
-    return {
-      use: this.app.use.bind(this.app),
-      all: this.app.all.bind(this.app),
-      get: this.app.get.bind(this.app),
-      post: this.app.post.bind(this.app),
-      getRegexWildcard: this.app.getRegexWildcard.bind(this.app)
-    };
-  }
 };
 function createServer(config) {
-  return new LwrApp(config);
+  const configs = (0, import_config.loadConfig)(config);
+  return new LwrApp(configs);
 }
 async function generateStaticSite(config) {
   config = config || {};

package/build/cjs/middleware/asset-middleware.cjs

@@ -31,6 +31,24 @@ var import_diagnostics = __toModule(require("@lwrjs/diagnostics"));
 var import_instrumentation = __toModule(require("@lwrjs/instrumentation"));
 var import_identity = __toModule(require("./utils/identity.cjs"));
 var import_error_handling = __toModule(require("./utils/error-handling.cjs"));
+var import_fs_extra = __toModule(require("fs-extra"));
+function assetMiddleware(app, context) {
+  const paths = context.appConfig.assets.map((config) => {
+    const assetDirConfig = config;
+    let urlPath = config.urlPath;
+    if (assetDirConfig.root) {
+      urlPath = "/:filename";
+    } else if (assetDirConfig.dir) {
+      urlPath += app.getRegexWildcard();
+    }
+    return urlPath;
+  });
+  app.get([
+    ...[...new Set(paths)],
+    "/:apiVersion/:assetType(asset|content-asset)/:immutable?/s/:signature/" + app.getRegexWildcard(),
+    "/:apiVersion/:assetType(asset|content-asset)/:immutable?/" + app.getRegexWildcard()
+  ], (0, import_error_handling.handleErrors)(createAssetMiddleware(context)));
+}
 function createAssetMiddleware(context) {
   const {
     assetRegistry,
@@ -43,24 +61,16 @@ function createAssetMiddleware(context) {
       assetId.specifier = import_path.default.join(basePath, assetId.specifier);
     }
     try {
+      let asset;
       const assetUri = await assetRegistry.resolveAssetUri(assetId, runtimeEnvironment);
       if (assetUri.external) {
-        res.set({
-          Location: assetUri.uri,
-          "cache-control": "public, max-age=60"
-        });
-        res.sendStatus(302);
-        return;
-      }
-      const asset = await (0, import_instrumentation.getTracer)().trace({
-        name: import_instrumentation.RequestHandlerSpan.GetAsset,
-        attributes: {
-          specifier: assetId.specifier,
-          url: req.originalUrl
+        asset = await getAssetDefinition(assetId, req, assetRegistry, signature, runtimeEnvironment);
+        if (!import_fs_extra.default.existsSync(asset.entry) && assetUri.uri.startsWith("/mobify/bundle")) {
+          return sendRedirect(res, assetUri);
         }
-      }, () => {
-        return assetRegistry.getAsset({...assetId, signature}, runtimeEnvironment, req.isSiteGeneration());
-      });
+      } else {
+        asset = await getAssetDefinition(assetId, req, assetRegistry, signature, runtimeEnvironment);
+      }
       if (req.isSiteGeneration()) {
         res.setSiteGenerationMetadata({asset});
       }
@@ -82,20 +92,22 @@ function createAssetMiddleware(context) {
     }
   };
 }
-function assetMiddleware(app, context) {
-  const paths = context.appConfig.assets.map((config) => {
-    const assetDirConfig = config;
-    let urlPath = config.urlPath;
-    if (assetDirConfig.root) {
-      urlPath = "/:filename";
-    } else if (assetDirConfig.dir) {
-      urlPath += app.getRegexWildcard();
+async function getAssetDefinition(assetId, req, assetRegistry, signature, runtimeEnvironment) {
+  const asset = await (0, import_instrumentation.getTracer)().trace({
+    name: import_instrumentation.RequestHandlerSpan.GetAsset,
+    attributes: {
+      specifier: assetId.specifier,
+      url: req.originalUrl
     }
-    return urlPath;
+  }, () => {
+    return assetRegistry.getAsset({...assetId, signature}, runtimeEnvironment, req.isSiteGeneration());
   });
-  app.get([
-    ...[...new Set(paths)],
-    "/:apiVersion/:assetType(asset|content-asset)/:immutable?/s/:signature/" + app.getRegexWildcard(),
-    "/:apiVersion/:assetType(asset|content-asset)/:immutable?/" + app.getRegexWildcard()
-  ], (0, import_error_handling.handleErrors)(createAssetMiddleware(context)));
+  return asset;
+}
+function sendRedirect(res, assetUri) {
+  res.set({
+    Location: assetUri.uri,
+    "cache-control": "public, max-age=60"
+  });
+  res.sendStatus(302);
 }

package/build/cjs/middleware/request-processor-middleware.cjs

@@ -27,14 +27,20 @@ __export(exports, {
   requestProcessorMiddleware: () => requestProcessorMiddleware
 });
 var import_diagnostics = __toModule(require("@lwrjs/diagnostics"));
+var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
 var MRT_REQUEST_CLASS = "X-Mobify-Request-Class";
 var MRT_REQUEST_CLASS_KEY = MRT_REQUEST_CLASS.toLowerCase();
 function requestProcessorMiddleware(app, context) {
   const {basePath} = context.runtimeEnvironment;
-  app.use(async (req, _res, next) => {
+  app.use(async (req, res, next) => {
     let requestClass;
+    let requestDepth;
     if (req.headers) {
       if (import_diagnostics.logger.isDebugEnabled()) {
+        import_diagnostics.logger.debug({
+          label: `request-processor-middleware`,
+          message: `Request: ${req.originalUrl}`
+        });
         for (const headerName in req.headers) {
           import_diagnostics.logger.debug({
             label: `request-processor-middleware`,
@@ -43,6 +49,14 @@ function requestProcessorMiddleware(app, context) {
         }
       }
       requestClass = req.headers[MRT_REQUEST_CLASS_KEY];
+      requestDepth = (0, import_shared_utils.parseRequestDepthHeader)(req.headers);
+    }
+    if (requestDepth && requestDepth > 0) {
+      import_diagnostics.logger.error({
+        label: "request-processor-middleware",
+        message: `Lambda SSR request cycle detected: ${req.originalUrl}`
+      });
+      return res.status(400).send("Request depth limit reached");
     }
     if (req.headers && typeof requestClass === "string") {
       const parsedRequestClass = parseRequestClass(requestClass);

package/build/cjs/middleware/utils/error-handling.cjs

@@ -35,7 +35,7 @@ function createReturnStatus(error, url) {
   if (error instanceof import_diagnostics.LwrUnresolvableError) {
     return {status: 404, message: error.message};
   }
-  return {status: 500, message: import_diagnostics.descriptions.UNRESOLVABLE.SERVER_ERROR(url).message};
+  return {status: 500, message: import_diagnostics.descriptions.SERVER.SERVER_ERROR(url).message};
 }
 function handleErrors(middleware) {
   return async (req, res, next) => {

package/build/cjs/middleware/view-middleware.cjs

@@ -66,14 +66,19 @@ function createViewMiddleware(route, errorRoutes, context, viewHandler) {
     const resolve = req.isJsonRequest() ? viewHandler.getViewJson : viewHandler.getViewContent;
     let viewResponse;
     let resolvedRoute;
+    let traceId;
     try {
       viewResponse = await (0, import_instrumentation.getTracer)().trace({
         name: import_instrumentation.RequestHandlerSpan.GetView,
         attributes: {
           view: route.id,
-          url: req.originalUrl
+          url: req.originalUrl,
+          host: runtimeParams.host,
+          basePath: runtimeParams.basePath,
+          locale: runtimeParams.locale
         }
-      }, () => {
+      }, (span) => {
+        traceId = span.traceId;
         return resolve.call(viewHandler, viewRequest, route, runtimeEnvironment, runtimeParams);
       });
       resolvedRoute = route;
@@ -106,6 +111,9 @@ function createViewMiddleware(route, errorRoutes, context, viewHandler) {
         res.setHeader("cache-control", `public, max-age=${cacheTtl}`);
       }
     }
+    if (traceId?.length) {
+      res.setHeader("x-trace-id", traceId);
+    }
     const status = resolvedRoute.status || viewResponse.status || 200;
     res.status(status);
     res.send(viewResponse.body);

package/build/cjs/tools/static-generation.cjs

@@ -36,6 +36,7 @@ var import_fs_extra = __toModule(require("fs-extra"));
 var import_stream = __toModule(require("./utils/stream.cjs"));
 var import_dir = __toModule(require("./utils/dir.cjs"));
 var import_config = __toModule(require("@lwrjs/config"));
+var import_url = __toModule(require("url"));
 var SiteGenerator = class {
   async buildStaticApplication(config, dispatcher) {
     const startTime = import_perf_hooks.performance.now();
@@ -161,6 +162,14 @@ var SiteGenerator = class {
   }
   async handleJavascriptResource(url, context, siteConfig, dispatcher) {
     const {outputDir} = siteConfig;
+    const moduleDefinition = context.fs?.metadata?.moduleDefinition;
+    const bundleConfig = moduleDefinition?.config || {};
+    const siteBundles = siteConfig?.siteMetadata?.getSiteBundles()?.bundles;
+    const specifier = moduleDefinition?.specifier;
+    if ((0, import_shared_utils.isExternalSpecifier)(specifier, bundleConfig)) {
+      this.handleExternalBundle(specifier, siteBundles, bundleConfig.external, outputDir);
+      return;
+    }
     const normalizedUrl = decodeURIComponent(url);
     (0, import_dir.createResourceDir)((0, import_path.dirname)(normalizedUrl), outputDir);
     const ext = (0, import_path.extname)(normalizedUrl);
@@ -173,17 +182,26 @@ var SiteGenerator = class {
       siteConfig.urlRewriteMap.set(normalizedUrl.substring(0, normalizedUrl.indexOf("/v/")), normalizedUrl);
       siteConfig.urlRewriteMap.set(url.substring(0, url.indexOf("%2Fv%2F")), normalizedUrl);
     }
-    const moduleDefinition = context.fs?.metadata?.moduleDefinition;
     if (moduleDefinition) {
       const imports = moduleDefinition.linkedModuleRecord?.imports || moduleDefinition.bundleRecord?.imports || [];
       for (const importModule of imports) {
-        const jsUri = importModule.specifier.startsWith("/") ? importModule.specifier : (0, import_shared_utils.getSpecifier)(importModule);
-        dispatchRequests.push(this.dispatchJSResourceRecursive(jsUri, dispatcher, siteConfig));
+        const importSpecifier = importModule.specifier;
+        if ((0, import_shared_utils.isExternalSpecifier)(importSpecifier, bundleConfig)) {
+          this.handleExternalBundle(importSpecifier, siteBundles, bundleConfig.external, outputDir);
+        } else {
+          const jsUri = importSpecifier.startsWith("/") ? importSpecifier : (0, import_shared_utils.getSpecifier)(importModule);
+          dispatchRequests.push(this.dispatchJSResourceRecursive(jsUri, dispatcher, siteConfig));
+        }
       }
       const dynamicImports = moduleDefinition.linkedModuleRecord?.dynamicImports || moduleDefinition.bundleRecord?.dynamicImports || [];
       for (const importModule of dynamicImports) {
-        const jsUri = importModule.specifier.startsWith("/") ? importModule.specifier : (0, import_shared_utils.getSpecifier)(importModule);
-        dispatchRequests.push(this.dispatchJSResourceRecursive(jsUri, dispatcher, siteConfig));
+        const importSpecifier = importModule.specifier;
+        if ((0, import_shared_utils.isExternalSpecifier)(importSpecifier, bundleConfig)) {
+          this.handleExternalBundle(importSpecifier, siteBundles, bundleConfig.external, outputDir);
+        } else {
+          const jsUri = importSpecifier.startsWith("/") ? importSpecifier : (0, import_shared_utils.getSpecifier)(importModule);
+          dispatchRequests.push(this.dispatchJSResourceRecursive(jsUri, dispatcher, siteConfig));
+        }
       }
       if (moduleDefinition.bundleRecord) {
         this.addBundleToSiteMetadata(moduleDefinition, url, siteConfig);
@@ -195,14 +213,31 @@ var SiteGenerator = class {
     }
     await Promise.all(dispatchRequests);
   }
+  handleExternalBundle(specifier, siteBundles, externals, outputDir) {
+    if (siteBundles && externals[specifier]?.startsWith(import_shared_utils.PROTOCOL_FILE) && !siteBundles[specifier]) {
+      const path = (0, import_shared_utils.normalizeFromFileURL)(externals[specifier], process.cwd());
+      const normalizedPath = decodeURIComponent(path);
+      (0, import_dir.createResourceDir)((0, import_path.dirname)(normalizedPath), outputDir);
+      const ext = (0, import_path.extname)(normalizedPath);
+      const fullPath = (0, import_path.join)(outputDir, `${normalizedPath}${ext ? "" : ".js"}`);
+      import_fs_extra.default.copyFileSync((0, import_url.fileURLToPath)(externals[specifier]), fullPath);
+      const bundleMetadata = {
+        specifier,
+        path: normalizedPath,
+        imports: []
+      };
+      siteBundles[specifier] = bundleMetadata;
+    }
+  }
   addBundleToSiteMetadata(bundleDefinition, url, siteConfig) {
     if (siteConfig.siteMetadata) {
       const locale = siteConfig.locale;
       const specifier = siteConfig.i18n.defaultLocale === locale ? bundleDefinition.specifier : `${bundleDefinition.specifier}|l/${locale}`;
       const imports = bundleDefinition.bundleRecord.imports?.map((moduleRef) => (0, import_shared_utils.getSpecifier)(moduleRef)) || [];
       const dynamicImports = bundleDefinition.bundleRecord.dynamicImports?.map((moduleRef) => (0, import_shared_utils.getSpecifier)(moduleRef));
+      const version = bundleDefinition.version === import_shared_utils.VERSION_NOT_PROVIDED ? void 0 : bundleDefinition.version;
       const bundleMetadata = {
-        version: bundleDefinition.version,
+        version,
         path: decodeURIComponent(url),
         includedModules: bundleDefinition.bundleRecord.includedModules || [],
         imports,

package/build/cjs/tools/utils/network-dispatcher.cjs

@@ -79,16 +79,17 @@ var NetworkDispatcher = class {
               const jsonResponse = JSON.parse(body);
               resolve(jsonResponse);
             } catch (err) {
+              const message = process.env.MRT_HMR !== "true" ? `unexpected response body: [${method}][${lang}] ${url}: '${body}'` : `unexpected response body: [${method}][${lang}] ${url}`;
               if (import_diagnostics.logger.isDebugEnabled()) {
                 import_diagnostics.logger.warn({
                   label: `NetworkDispatcher`,
-                  message: `unexpected response body: [${method}][${lang}] ${url}: '${body}'`,
+                  message,
                   additionalInfo: err
                 });
               } else {
                 import_diagnostics.logger.warn({
                   label: `NetworkDispatcher`,
-                  message: `unexpected response body: [${method}][${lang}] ${url}: '${body}'`
+                  message
                 });
               }
               resolve({});

package/build/es/context/provider.js

@@ -1,9 +1,14 @@
+import fs from 'fs';
 import { deepFreeze } from '@lwrjs/shared-utils';
+import { SiteMetadataImpl } from '@lwrjs/static/site-metadata';
 export function createProviderContext(serverContext) {
     // This is a subset of config to user-land code
-    const { assets, cacheDir, i18n, lwc: { modules = [] }, routes, errorRoutes, rootDir, contentDir, layoutsDir, locker, amdLoader, esmLoader, environment, basePath, bundleConfig, } = serverContext.appConfig;
+    const { assets, cacheDir, i18n, lwc: { modules = [] }, routes, errorRoutes, rootDir, contentDir, layoutsDir, locker, amdLoader, esmLoader, environment, basePath, bundleConfig, staticSiteGenerator, } = serverContext.appConfig;
     const { onModuleDefinitionChange, onModuleSourceChange } = serverContext.appObserver;
     const { notifyModuleDefinitionChanged, notifyModuleSourceChanged, notifyViewSourceChanged, notifyAssetSourceChanged, } = serverContext.appEmitter;
+    const siteMetadata = staticSiteGenerator.outputDir && fs.existsSync(staticSiteGenerator.outputDir)
+        ? new SiteMetadataImpl({ rootDir: staticSiteGenerator.outputDir })
+        : undefined;
     return {
         appObserver: deepFreeze({ onModuleDefinitionChange, onModuleSourceChange }),
         appEmitter: {
@@ -36,6 +41,7 @@ export function createProviderContext(serverContext) {
         }),
         runtimeEnvironment: deepFreeze(serverContext.runtimeEnvironment),
         watcherFactory: serverContext.watcherFactory,
+        siteMetadata,
     };
 }
 //# sourceMappingURL=provider.js.map

package/build/es/index.d.ts

@@ -1,4 +1,4 @@
-import type { LwrGlobalConfig, NormalizedLwrGlobalConfig, ServerTypeImpl, PublicAppServer, ServerTypes } from '@lwrjs/types';
+import type { LwrGlobalConfig, NormalizedLwrGlobalConfig, ServerTypeImpl, ServerTypes, RuntimeEnvironment, GlobalData, MiddlewareFunction } from '@lwrjs/types';
 export declare class LwrApp {
     private app;
     private server;
@@ -6,8 +6,16 @@ export declare class LwrApp {
     private config;
     private runtimeEnvironment;
     private globalData;
-    constructor(config?: LwrGlobalConfig);
-    setConfig(config: LwrGlobalConfig): void;
+    serverType: ServerTypes;
+    use: (m: MiddlewareFunction) => void;
+    all: (path: string | string[], m: MiddlewareFunction) => void;
+    get: (path: string | string[], m: MiddlewareFunction) => void;
+    post: (path: string | string[], m: MiddlewareFunction) => void;
+    constructor(configs: {
+        appConfig: NormalizedLwrGlobalConfig;
+        runtimeEnvironment: RuntimeEnvironment;
+        globalData: GlobalData;
+    });
     getConfig(): NormalizedLwrGlobalConfig;
     init(): Promise<void>;
     listen(callback?: ((opts: {
@@ -17,9 +25,8 @@ export declare class LwrApp {
         serverMode: string;
         port: number;
     }>;
-    close(): Promise<void>;
+    close(): void;
     getInternalServer<S extends ServerTypes>(): ServerTypeImpl<S>;
-    getServer(): PublicAppServer<ServerTypes>;
 }
 export declare function createServer(config?: LwrGlobalConfig): LwrApp;
 export declare function generateStaticSite(config?: LwrGlobalConfig): Promise<NormalizedLwrGlobalConfig>;

package/build/es/index.js

@@ -1,7 +1,7 @@
 import { getFeatureFlags, DEFAULT_LWR_BOOTSTRAP_CONFIG } from '@lwrjs/shared-utils';
 import { createInternalServer } from '@lwrjs/server';
 import { LwrServerError, createSingleDiagnosticError, descriptions, logger } from '@lwrjs/diagnostics';
-import { loadConfig, executeConfigHooks, executeStartHooks, executeInstrumentationHooks, } from '@lwrjs/config';
+import { loadConfig, executeConfigHooks, executeStartHooks, executeInstrumentationHooks, executeContextHooks, } from '@lwrjs/config';
 import { loadHooks, loadServices, loadRouteHandlers } from '@lwrjs/config/modules';
 import SiteGenerator from './tools/static-generation.js';
 import { warmupServer } from './tools/server-warmup.js';
@@ -47,12 +47,18 @@ async function initContext(appConfig, runtimeEnvironment, globalData) {
         const skipValidation = true; // skip for config hook, since `executeStartHooks` hook will validate
         await executeConfigHooks(hooks, appConfig, runtimeEnvironment, globalData, skipValidation);
         executeInstrumentationHooks(hooks);
-        executeStartHooks(hooks, appConfig, runtimeEnvironment);
     }
     // load all configurable modules
     const services = await loadServices(appConfig);
     // create all framework components(ie. registries)
     const serverContext = getTracer().trace({ name: CoreSpan.CreateServerContext }, () => createServerContext(appConfig, runtimeEnvironment, globalData));
+    // set routes on server context
+    const routeHandlers = await loadRouteHandlers(appConfig);
+    serverContext.routeHandlers = routeHandlers;
+    if (hooks.length) {
+        await executeContextHooks(hooks, serverContext);
+        executeStartHooks(hooks, appConfig, runtimeEnvironment);
+    }
     // create public subset of configurations
     const providerContext = createProviderContext(serverContext);
     const { moduleRegistry, assetRegistry, resourceRegistry, viewRegistry, moduleBundler } = serverContext;
@@ -82,30 +88,26 @@ async function initContext(appConfig, runtimeEnvironment, globalData) {
     viewRegistry.addViewTransformers(viewTransformers);
     // invoke async initialization
     await serverContext.viewRegistry.initializeViewProviders();
-    // set routes on server context
-    const routeHandlers = await loadRouteHandlers(appConfig);
-    serverContext.routeHandlers = routeHandlers;
     return serverContext;
 }
 export class LwrApp {
-    constructor(config = {}) {
+    constructor(configs) {
         this.initialized = false;
         const span = getTracer().startSpan({ name: CoreSpan.CreateServer });
-        const { appConfig, runtimeEnvironment, globalData } = loadConfig(config);
+        const { appConfig, runtimeEnvironment, globalData } = configs;
         this.config = appConfig;
         this.runtimeEnvironment = runtimeEnvironment;
         this.globalData = globalData;
-        const { basePath } = this.config;
-        this.app = createInternalServer(this.config.serverType, { basePath });
+        const { basePath, serverType } = this.config;
+        this.serverType = serverType;
+        this.app = createInternalServer(serverType, { basePath });
         this.server = this.app.createHttpServer();
+        this.use = this.app.use.bind(this.app);
+        this.all = this.app.all.bind(this.app);
+        this.get = this.app.get.bind(this.app);
+        this.post = this.app.post.bind(this.app);
         span.end();
     }
-    setConfig(config) {
-        const { appConfig, runtimeEnvironment, globalData } = loadConfig(config);
-        this.config = appConfig;
-        this.runtimeEnvironment = runtimeEnvironment;
-        this.globalData = globalData;
-    }
     getConfig() {
         return this.config;
     }
@@ -163,26 +165,17 @@ export class LwrApp {
             });
         });
     }
-    async close() {
-        this.server?.close && (await this.server.close());
+    close() {
+        this.server?.close && this.server.close();
     }
     // Get the underlying server (e.g. express, koa...)
     getInternalServer() {
         return this.app.getImpl();
     }
-    // Return the public server interface which is compatible with all server types
-    getServer() {
-        return {
-            use: this.app.use.bind(this.app),
-            all: this.app.all.bind(this.app),
-            get: this.app.get.bind(this.app),
-            post: this.app.post.bind(this.app),
-            getRegexWildcard: this.app.getRegexWildcard.bind(this.app),
-        };
-    }
 }
 export function createServer(config) {
-    return new LwrApp(config);
+    const configs = loadConfig(config);
+    return new LwrApp(configs);
 }
 export async function generateStaticSite(config) {
     config = config || {};

package/build/es/middleware/asset-middleware.js

@@ -3,6 +3,30 @@ import { DiagnosticsError } from '@lwrjs/diagnostics';
 import { RequestHandlerSpan, getTracer } from '@lwrjs/instrumentation';
 import { getAssetIdentity } from './utils/identity.js';
 import { handleErrors } from './utils/error-handling.js';
+import fs from 'fs-extra';
+export function assetMiddleware(app, context) {
+    const paths = context.appConfig.assets.map((config) => {
+        const assetDirConfig = config;
+        let urlPath = config.urlPath;
+        // If this is a root config add a /:filename path to match any file in the root.  The middleware will fall through if there is no match.
+        if (assetDirConfig.root) {
+            urlPath = '/:filename';
+        }
+        else if (assetDirConfig.dir) {
+            urlPath += app.getRegexWildcard();
+        }
+        return urlPath;
+    });
+    app.get([
+        // De-dupe paths (i.e. root path may have been added more than once)
+        ...[...new Set(paths)],
+        '/:apiVersion/:assetType(asset|content-asset)/:immutable?/s/:signature/' + app.getRegexWildcard(),
+        '/:apiVersion/:assetType(asset|content-asset)/:immutable?/' + app.getRegexWildcard(),
+    ], handleErrors(createAssetMiddleware(context)));
+}
+/**
+ * Create middleware function to handle get assets requests
+ */
 function createAssetMiddleware(context) {
     const { assetRegistry, runtimeEnvironment: { basePath }, } = context;
     return async (req, res, next) => {
@@ -12,25 +36,22 @@ function createAssetMiddleware(context) {
             assetId.specifier = path.join(basePath, assetId.specifier);
         }
         try {
-            // Redirect if this is an external asset
+            let asset;
             const assetUri = await assetRegistry.resolveAssetUri(assetId, runtimeEnvironment);
+            // Check if this asset is available externally
             if (assetUri.external) {
-                res.set({
-                    Location: assetUri.uri,
-                    'cache-control': 'public, max-age=60',
-                });
-                res.sendStatus(302);
-                return;
+                // This asset is marked external but hit the middleware anyway
+                // Check if we have this file locally, if not, send a 302 to
+                // redirect to the external URL
+                asset = await getAssetDefinition(assetId, req, assetRegistry, signature, runtimeEnvironment);
+                // Verify the content actually exists locally
+                if (!fs.existsSync(asset.entry) && assetUri.uri.startsWith('/mobify/bundle')) {
+                    return sendRedirect(res, assetUri);
+                }
+            }
+            else {
+                asset = await getAssetDefinition(assetId, req, assetRegistry, signature, runtimeEnvironment);
             }
-            const asset = await getTracer().trace({
-                name: RequestHandlerSpan.GetAsset,
-                attributes: {
-                    specifier: assetId.specifier,
-                    url: req.originalUrl,
-                },
-            }, () => {
-                return assetRegistry.getAsset({ ...assetId, signature }, runtimeEnvironment, req.isSiteGeneration());
-            });
             if (req.isSiteGeneration()) {
                 res.setSiteGenerationMetadata({ asset });
             }
@@ -59,24 +80,29 @@ function createAssetMiddleware(context) {
         }
     };
 }
-export function assetMiddleware(app, context) {
-    const paths = context.appConfig.assets.map((config) => {
-        const assetDirConfig = config;
-        let urlPath = config.urlPath;
-        // If this is a root config add a /:filename path to match any file in the root.  The middleware will fall through if there is no match.
-        if (assetDirConfig.root) {
-            urlPath = '/:filename';
-        }
-        else if (assetDirConfig.dir) {
-            urlPath += app.getRegexWildcard();
-        }
-        return urlPath;
+/**
+ * Get the asset definition if asset is local
+ */
+async function getAssetDefinition(assetId, req, assetRegistry, signature, runtimeEnvironment) {
+    const asset = await getTracer().trace({
+        name: RequestHandlerSpan.GetAsset,
+        attributes: {
+            specifier: assetId.specifier,
+            url: req.originalUrl,
+        },
+    }, () => {
+        return assetRegistry.getAsset({ ...assetId, signature }, runtimeEnvironment, req.isSiteGeneration());
     });
-    app.get([
-        // De-dupe paths (i.e. root path may have been added more than once)
-        ...[...new Set(paths)],
-        '/:apiVersion/:assetType(asset|content-asset)/:immutable?/s/:signature/' + app.getRegexWildcard(),
-        '/:apiVersion/:assetType(asset|content-asset)/:immutable?/' + app.getRegexWildcard(),
-    ], handleErrors(createAssetMiddleware(context)));
+    return asset;
+}
+/**
+ * Send a redirect (302) response
+ */
+function sendRedirect(res, assetUri) {
+    res.set({
+        Location: assetUri.uri,
+        'cache-control': 'public, max-age=60',
+    });
+    res.sendStatus(302);
 }
 //# sourceMappingURL=asset-middleware.js.map

package/build/es/middleware/request-processor-middleware.js

@@ -7,15 +7,21 @@
  *
  */
 import { logger } from '@lwrjs/diagnostics';
+import { parseRequestDepthHeader } from '@lwrjs/shared-utils';
 const MRT_REQUEST_CLASS = 'X-Mobify-Request-Class';
 const MRT_REQUEST_CLASS_KEY = MRT_REQUEST_CLASS.toLowerCase();
 export function requestProcessorMiddleware(app, context) {
     const { basePath } = context.runtimeEnvironment;
-    app.use(async (req, _res, next) => {
+    app.use(async (req, res, next) => {
         let requestClass;
+        let requestDepth;
         if (req.headers) {
             // If debug print log all the headers
             if (logger.isDebugEnabled()) {
+                logger.debug({
+                    label: `request-processor-middleware`,
+                    message: `Request: ${req.originalUrl}`,
+                });
                 // Loop through and print each header
                 for (const headerName in req.headers) {
                     logger.debug({
@@ -25,6 +31,16 @@ export function requestProcessorMiddleware(app, context) {
                 }
             }
             requestClass = req.headers[MRT_REQUEST_CLASS_KEY];
+            requestDepth = parseRequestDepthHeader(req.headers);
+        }
+        // TODO Clean up once we have a long term solution
+        if (requestDepth && requestDepth > 0) {
+            logger.error({
+                label: 'request-processor-middleware',
+                message: `Lambda SSR request cycle detected: ${req.originalUrl}`,
+            });
+            // Return 400 Too Many Requests status
+            return res.status(400).send('Request depth limit reached');
         }
         if (req.headers && typeof requestClass === 'string') {
             const parsedRequestClass = parseRequestClass(requestClass);

package/build/es/middleware/utils/error-handling.js

@@ -8,7 +8,7 @@ function createReturnStatus(error, url) {
     if (error instanceof LwrUnresolvableError) {
         return { status: 404, message: error.message };
     }
-    return { status: 500, message: descriptions.UNRESOLVABLE.SERVER_ERROR(url).message };
+    return { status: 500, message: descriptions.SERVER.SERVER_ERROR(url).message };
 }
 export function handleErrors(middleware) {
     return async (req, res, next) => {

package/build/es/middleware/view-middleware.js

@@ -40,14 +40,19 @@ function createViewMiddleware(route, errorRoutes, context, viewHandler) {
         const resolve = req.isJsonRequest() ? viewHandler.getViewJson : viewHandler.getViewContent;
         let viewResponse;
         let resolvedRoute;
+        let traceId;
         try {
             viewResponse = await getTracer().trace({
                 name: RequestHandlerSpan.GetView,
                 attributes: {
                     view: route.id,
                     url: req.originalUrl,
+                    host: runtimeParams.host,
+                    basePath: runtimeParams.basePath,
+                    locale: runtimeParams.locale,
                 },
-            }, () => {
+            }, (span) => {
+                traceId = span.traceId;
                 return resolve.call(viewHandler, viewRequest, route, runtimeEnvironment, runtimeParams);
             });
             resolvedRoute = route;
@@ -85,6 +90,9 @@ function createViewMiddleware(route, errorRoutes, context, viewHandler) {
                 res.setHeader('cache-control', `public, max-age=${cacheTtl}`);
             }
         }
+        if (traceId?.length) {
+            res.setHeader('x-trace-id', traceId);
+        }
         const status = resolvedRoute.status || viewResponse.status || 200;
         res.status(status);
         res.send(viewResponse.body);

package/build/es/tools/static-generation.d.ts

@@ -40,6 +40,10 @@ export default class SiteGenerator {
      * @param dispatcher - Network dispatcher
      */
     private handleJavascriptResource;
+    /**
+     * If this is a file based external copy it to the site folder and add it to the bundle metadata
+     */
+    private handleExternalBundle;
     private addBundleToSiteMetadata;
     private addResourceToSiteMetadata;
     private addAssetToSiteMetadata;

package/build/es/tools/static-generation.js

@@ -1,12 +1,13 @@
 import { performance } from 'perf_hooks';
 import { logger } from '@lwrjs/diagnostics';
-import { getSpecifier, getFeatureFlags, hashContent, isSelfUrl, getModuleUriPrefix, getMappingUriPrefix, isExternalUrl, mimeLookup, getViewUri, sortLocalesByFallback, } from '@lwrjs/shared-utils';
+import { getSpecifier, getFeatureFlags, hashContent, isSelfUrl, getModuleUriPrefix, getMappingUriPrefix, isExternalUrl, mimeLookup, getViewUri, sortLocalesByFallback, VERSION_NOT_PROVIDED, PROTOCOL_FILE, normalizeFromFileURL, isExternalSpecifier, } from '@lwrjs/shared-utils';
 import { SiteMetadataImpl } from '@lwrjs/static/site-metadata';
 import { join, dirname, extname, normalize } from 'path';
 import fs from 'fs-extra';
 import { writeResponse } from './utils/stream.js';
 import { createResourceDir } from './utils/dir.js';
 import { getRuntimeEnvironment } from '@lwrjs/config';
+import { fileURLToPath } from 'url';
 export default class SiteGenerator {
     /**
      * Build a static site in the configured directory
@@ -198,6 +199,14 @@ export default class SiteGenerator {
      */
     async handleJavascriptResource(url, context, siteConfig, dispatcher) {
         const { outputDir } = siteConfig;
+        const moduleDefinition = context.fs?.metadata?.moduleDefinition; // LinkedModuleDefinition | BundleDefinition
+        const bundleConfig = moduleDefinition?.config || {};
+        const siteBundles = siteConfig?.siteMetadata?.getSiteBundles()?.bundles;
+        const specifier = moduleDefinition?.specifier;
+        if (isExternalSpecifier(specifier, bundleConfig)) {
+            this.handleExternalBundle(specifier, siteBundles, bundleConfig.external, outputDir);
+            return;
+        }
         const normalizedUrl = decodeURIComponent(url);
         createResourceDir(dirname(normalizedUrl), outputDir);
         const ext = extname(normalizedUrl);
@@ -223,26 +232,37 @@ export default class SiteGenerator {
             siteConfig.urlRewriteMap.set(url.substring(0, url.indexOf('%2Fv%2F')), normalizedUrl);
         }
         // Recursively traverse dependencies
-        const moduleDefinition = context.fs?.metadata?.moduleDefinition; // LinkedModuleDefinition | BundleDefinition
         if (moduleDefinition) {
             // Imports
             const imports = moduleDefinition.linkedModuleRecord?.imports || moduleDefinition.bundleRecord?.imports || [];
             // /1/module/esm/0/l/en-US/mi/lwc
             for (const importModule of imports) {
-                const jsUri = importModule.specifier.startsWith('/')
-                    ? importModule.specifier
-                    : getSpecifier(importModule);
-                dispatchRequests.push(this.dispatchJSResourceRecursive(jsUri, dispatcher, siteConfig));
+                const importSpecifier = importModule.specifier;
+                if (isExternalSpecifier(importSpecifier, bundleConfig)) {
+                    this.handleExternalBundle(importSpecifier, siteBundles, bundleConfig.external, outputDir);
+                }
+                else {
+                    const jsUri = importSpecifier.startsWith('/')
+                        ? importSpecifier
+                        : getSpecifier(importModule);
+                    dispatchRequests.push(this.dispatchJSResourceRecursive(jsUri, dispatcher, siteConfig));
+                }
             }
             // Dynamic imports
             const dynamicImports = moduleDefinition.linkedModuleRecord?.dynamicImports ||
                 moduleDefinition.bundleRecord?.dynamicImports ||
                 [];
             for (const importModule of dynamicImports) {
-                const jsUri = importModule.specifier.startsWith('/')
-                    ? importModule.specifier
-                    : getSpecifier(importModule);
-                dispatchRequests.push(this.dispatchJSResourceRecursive(jsUri, dispatcher, siteConfig));
+                const importSpecifier = importModule.specifier;
+                if (isExternalSpecifier(importSpecifier, bundleConfig)) {
+                    this.handleExternalBundle(importSpecifier, siteBundles, bundleConfig.external, outputDir);
+                }
+                else {
+                    const jsUri = importSpecifier.startsWith('/')
+                        ? importSpecifier
+                        : getSpecifier(importModule);
+                    dispatchRequests.push(this.dispatchJSResourceRecursive(jsUri, dispatcher, siteConfig));
+                }
             }
             // If this is a bundle add it to the bundle metadata
             if (moduleDefinition.bundleRecord) {
@@ -257,6 +277,25 @@ export default class SiteGenerator {
         // -- Dispatch dependencies
         await Promise.all(dispatchRequests);
     }
+    /**
+     * If this is a file based external copy it to the site folder and add it to the bundle metadata
+     */
+    handleExternalBundle(specifier, siteBundles, externals, outputDir) {
+        if (siteBundles && externals[specifier]?.startsWith(PROTOCOL_FILE) && !siteBundles[specifier]) {
+            const path = normalizeFromFileURL(externals[specifier], process.cwd());
+            const normalizedPath = decodeURIComponent(path);
+            createResourceDir(dirname(normalizedPath), outputDir);
+            const ext = extname(normalizedPath);
+            const fullPath = join(outputDir, `${normalizedPath}${ext ? '' : '.js'}`);
+            fs.copyFileSync(fileURLToPath(externals[specifier]), fullPath);
+            const bundleMetadata = {
+                specifier,
+                path: normalizedPath,
+                imports: [],
+            };
+            siteBundles[specifier] = bundleMetadata;
+        }
+    }
     addBundleToSiteMetadata(bundleDefinition, url, siteConfig) {
         if (siteConfig.siteMetadata) {
             const locale = siteConfig.locale;
@@ -265,8 +304,9 @@ export default class SiteGenerator {
                 : `${bundleDefinition.specifier}|l/${locale}`;
             const imports = bundleDefinition.bundleRecord.imports?.map((moduleRef) => getSpecifier(moduleRef)) || [];
             const dynamicImports = bundleDefinition.bundleRecord.dynamicImports?.map((moduleRef) => getSpecifier(moduleRef));
+            const version = bundleDefinition.version === VERSION_NOT_PROVIDED ? undefined : bundleDefinition.version;
             const bundleMetadata = {
-                version: bundleDefinition.version,
+                version,
                 path: decodeURIComponent(url),
                 includedModules: bundleDefinition.bundleRecord.includedModules || [],
                 imports,

package/build/es/tools/utils/network-dispatcher.js

@@ -53,17 +53,20 @@ export default class NetworkDispatcher {
                             resolve(jsonResponse);
                         }
                         catch (err) {
+                            const message = process.env.MRT_HMR !== 'true' // avoid giant log messages during local dev
+                                ? `unexpected response body: [${method}][${lang}] ${url}: '${body}'`
+                                : `unexpected response body: [${method}][${lang}] ${url}`;
                             if (logger.isDebugEnabled()) {
                                 logger.warn({
                                     label: `NetworkDispatcher`,
-                                    message: `unexpected response body: [${method}][${lang}] ${url}: '${body}'`,
+                                    message,
                                     additionalInfo: err,
                                 });
                             }
                             else {
                                 logger.warn({
                                     label: `NetworkDispatcher`,
-                                    message: `unexpected response body: [${method}][${lang}] ${url}: '${body}'`,
+                                    message,
                                 });
                             }
                             resolve({});

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.12.0-alpha.9",
+    "version": "0.12.0",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -43,45 +43,46 @@
         "build": "tsc -b"
     },
     "dependencies": {
-        "@lwrjs/app-service": "0.12.0-alpha.9",
-        "@lwrjs/asset-registry": "0.12.0-alpha.9",
-        "@lwrjs/asset-transformer": "0.12.0-alpha.9",
-        "@lwrjs/base-view-provider": "0.12.0-alpha.9",
-        "@lwrjs/base-view-transformer": "0.12.0-alpha.9",
-        "@lwrjs/client-modules": "0.12.0-alpha.9",
-        "@lwrjs/config": "0.12.0-alpha.9",
-        "@lwrjs/diagnostics": "0.12.0-alpha.9",
-        "@lwrjs/esbuild": "0.12.0-alpha.9",
-        "@lwrjs/fs-asset-provider": "0.12.0-alpha.9",
-        "@lwrjs/fs-watch": "0.12.0-alpha.9",
-        "@lwrjs/html-view-provider": "0.12.0-alpha.9",
-        "@lwrjs/instrumentation": "0.12.0-alpha.9",
-        "@lwrjs/loader": "0.12.0-alpha.9",
-        "@lwrjs/lwc-module-provider": "0.12.0-alpha.9",
-        "@lwrjs/lwc-ssr": "0.12.0-alpha.9",
-        "@lwrjs/markdown-view-provider": "0.12.0-alpha.9",
-        "@lwrjs/module-bundler": "0.12.0-alpha.9",
-        "@lwrjs/module-registry": "0.12.0-alpha.9",
-        "@lwrjs/npm-module-provider": "0.12.0-alpha.9",
-        "@lwrjs/nunjucks-view-provider": "0.12.0-alpha.9",
-        "@lwrjs/o11y": "0.12.0-alpha.9",
-        "@lwrjs/resource-registry": "0.12.0-alpha.9",
-        "@lwrjs/router": "0.12.0-alpha.9",
-        "@lwrjs/server": "0.12.0-alpha.9",
-        "@lwrjs/shared-utils": "0.12.0-alpha.9",
-        "@lwrjs/static": "0.12.0-alpha.9",
-        "@lwrjs/view-registry": "0.12.0-alpha.9",
-        "chokidar": "^3.5.3",
+        "@lwrjs/app-service": "0.12.0",
+        "@lwrjs/asset-registry": "0.12.0",
+        "@lwrjs/asset-transformer": "0.12.0",
+        "@lwrjs/base-view-provider": "0.12.0",
+        "@lwrjs/base-view-transformer": "0.12.0",
+        "@lwrjs/client-modules": "0.12.0",
+        "@lwrjs/config": "0.12.0",
+        "@lwrjs/diagnostics": "0.12.0",
+        "@lwrjs/esbuild": "0.12.0",
+        "@lwrjs/fs-asset-provider": "0.12.0",
+        "@lwrjs/fs-watch": "0.12.0",
+        "@lwrjs/html-view-provider": "0.12.0",
+        "@lwrjs/instrumentation": "0.12.0",
+        "@lwrjs/loader": "0.12.0",
+        "@lwrjs/lwc-module-provider": "0.12.0",
+        "@lwrjs/lwc-ssr": "0.12.0",
+        "@lwrjs/markdown-view-provider": "0.12.0",
+        "@lwrjs/module-bundler": "0.12.0",
+        "@lwrjs/module-registry": "0.12.0",
+        "@lwrjs/npm-module-provider": "0.12.0",
+        "@lwrjs/nunjucks-view-provider": "0.12.0",
+        "@lwrjs/o11y": "0.12.0",
+        "@lwrjs/resource-registry": "0.12.0",
+        "@lwrjs/router": "0.12.0",
+        "@lwrjs/server": "0.12.0",
+        "@lwrjs/shared-utils": "0.12.0",
+        "@lwrjs/static": "0.12.0",
+        "@lwrjs/view-registry": "0.12.0",
+        "chokidar": "^3.6.0",
         "esbuild": "^0.9.7",
-        "fs-extra": "^11.1.1",
+        "fs-extra": "^11.2.0",
         "path-to-regexp": "^6.2.0",
         "qs": "^6.11.2",
         "rollup": "^2.78.0",
-        "ws": "^8.8.1"
+        "ws": "^8.16.0"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.12.0-alpha.9",
-        "@types/ws": "^8.5.3"
+        "@lwrjs/types": "0.12.0",
+        "@types/ws": "^8.5.10",
+        "mock-fs": "^5.2.0"
     },
     "peerDependencies": {
         "lwc": ">= 2.x"
@@ -92,5 +93,5 @@
     "volta": {
         "extends": "../../../package.json"
     },
-    "gitHead": "58b28fbc6300b704ac17f8878423120de0e376d7"
+    "gitHead": "90f93604b26003e1e1eb85bb0d1f34f4fc9e9ff9"
 }