@lwrjs/core 0.15.0-alpha.16 → 0.15.0-alpha.18

package/build/cjs/__mocks__/undici.cjs

@@ -0,0 +1,25 @@
+var __defProp = Object.defineProperty;
+var __markAsModule = (target) => __defProp(target, "__esModule", {value: true});
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, {get: all[name], enumerable: true});
+};
+
+// packages/@lwrjs/core/src/__mocks__/undici.ts
+__markAsModule(exports);
+__export(exports, {
+  Pool: () => Pool
+});
+var Pool = class {
+  async request() {
+    return Promise.resolve({
+      statusCode: 200,
+      body: {
+        text: () => Promise.resolve('{"one":1}'),
+        json: () => Promise.resolve({one: 1})
+      }
+    });
+  }
+  close() {
+  }
+};

package/build/cjs/index.cjs

@@ -109,9 +109,9 @@ var LwrApp = class {
     this.config = appConfig;
     this.runtimeEnvironment = runtimeEnvironment;
     this.globalData = globalData;
-    const {basePath, serverType} = this.config;
+    const {basePath, serverType, caseSensitiveRoutes} = this.config;
     this.serverType = serverType;
-    this.app = (0, import_server.createInternalServer)(serverType, {basePath});
+    this.app = (0, import_server.createInternalServer)(serverType, {basePath, caseSensitiveRoutes});
     this.server = this.app.createHttpServer();
     this.use = this.app.use.bind(this.app);
     this.all = this.app.all.bind(this.app);

package/build/cjs/middleware/bundle-middleware.cjs

@@ -84,7 +84,7 @@ function createBundleMiddleware(context) {
     if (signature !== import_shared_utils.LATEST_SIGNATURE) {
       res.setHeader("Cache-control", "public, max-age=31536000, immutable");
     }
-    res.status(200).type("application/javascript").send(bundleDefinition.code);
+    res.status(200).type("application/javascript").send(await bundleDefinition.getCode());
   };
 }
 function createSourceMapMiddleware(context) {

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

@@ -72,6 +72,16 @@ function requestProcessorMiddleware(app, context) {
       });
       const pathValue = parsedRequestClass?.basePath || basePath || "";
       req.basePath = pathValue === "" || pathValue.indexOf("/") === 0 ? pathValue : `/${pathValue}`;
+      const expressRequest = req.req;
+      if (expressRequest?.url?.startsWith(parsedRequestClass?.basePath)) {
+        expressRequest.url = expressRequest.url.split(parsedRequestClass?.basePath)[1] || "/";
+        expressRequest.originalUrl = expressRequest.url.split(parsedRequestClass?.basePath)[1] || "/";
+      } else {
+        import_diagnostics.logger.warn({
+          label: `request-processor-middleware`,
+          message: `The URL requested for doesn't start with the Base path`
+        });
+      }
     } else {
       import_diagnostics.logger.debug({
         label: `request-processor-middleware`,

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

@@ -24,6 +24,7 @@ var __toModule = (module2) => {
 // packages/@lwrjs/core/src/middleware/view-middleware.ts
 __markAsModule(exports);
 __export(exports, {
+  convertMetricsToArrayOfStrings: () => convertMetricsToArrayOfStrings,
   viewMiddleware: () => viewMiddleware
 });
 var import_diagnostics = __toModule(require("@lwrjs/diagnostics"));
@@ -32,6 +33,7 @@ var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
 var import_instrumentation = __toModule(require("@lwrjs/instrumentation"));
 var import_error_handling = __toModule(require("./utils/error-handling.cjs"));
 var import_view_registry = __toModule(require("@lwrjs/view-registry"));
+var import_aws_exporter = __toModule(require("@lwrjs/instrumentation/aws-exporter"));
 function createViewMiddleware(route, errorRoutes, context, viewHandler) {
   const errorRoute = errorRoutes.find((route2) => route2.status === 500);
   const appConfig = context.appConfig;
@@ -62,12 +64,14 @@ function createViewMiddleware(route, errorRoutes, context, viewHandler) {
       url: viewRequest.url,
       params: viewRequest.params,
       query: viewRequest.query,
-      cookie: req.headers?.cookie
+      cookie: req.headers?.cookie,
+      coreProxy: req.getCoreProxy(appConfig.coreProxy ?? void 0, route.bootstrap?.proxyForSSR)
     };
     const resolve = req.isJsonRequest() ? viewHandler.getViewJson : viewHandler.getViewContent;
     let viewResponse;
     let resolvedRoute;
     let traceId;
+    let reqSpan;
     try {
       viewResponse = await (0, import_instrumentation.getTracer)().trace({
         name: import_instrumentation.RequestHandlerSpan.GetView,
@@ -80,6 +84,7 @@ function createViewMiddleware(route, errorRoutes, context, viewHandler) {
         }
       }, (span) => {
         traceId = span.traceId;
+        reqSpan = span.reqSpan;
         return resolve.call(viewHandler, viewRequest, route, runtimeEnvironment, runtimeParams);
       });
       resolvedRoute = route;
@@ -114,6 +119,11 @@ function createViewMiddleware(route, errorRoutes, context, viewHandler) {
     }
     if (traceId?.length) {
       res.setHeader("x-trace-id", traceId);
+      if (reqSpan?.status?.code === 0) {
+        res.set({
+          "X-Custom-Lwr-Metric": convertMetricsToArrayOfStrings((0, import_aws_exporter.convertToReadableSpan)(reqSpan))
+        });
+      }
     }
     let status = resolvedRoute.status || viewResponse.status || 200;
     const redirect = viewResponse.metadata?.viewDefinition?.redirect;
@@ -239,3 +249,16 @@ function addRedirectQueryParam(redirectUrl, depth) {
   url.searchParams.set(import_shared_utils.REQUEST_DEPTH_KEY, String(depth + 1));
   return url.toString().replace(fakeOrigin, "");
 }
+function convertMetricsToArrayOfStrings(span) {
+  const requiredMetrics = ["traceId", "name", "attributes", "duration"];
+  return requiredMetrics.reduce((metricString, prop) => {
+    if (metricString && !metricString.endsWith("; ")) {
+      metricString += "; ";
+    }
+    if (span[prop]) {
+      const propValue = typeof span[prop] === "object" ? JSON.stringify(span[prop]) : span[prop];
+      metricString += `${prop}: ${propValue}`;
+    }
+    return metricString;
+  }, "");
+}

package/build/es/index.js

@@ -98,9 +98,9 @@ export class LwrApp {
         this.config = appConfig;
         this.runtimeEnvironment = runtimeEnvironment;
         this.globalData = globalData;
-        const { basePath, serverType } = this.config;
+        const { basePath, serverType, caseSensitiveRoutes } = this.config;
         this.serverType = serverType;
-        this.app = createInternalServer(serverType, { basePath });
+        this.app = createInternalServer(serverType, { basePath, caseSensitiveRoutes });
         this.server = this.app.createHttpServer();
         this.use = this.app.use.bind(this.app);
         this.all = this.app.all.bind(this.app);

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

@@ -56,7 +56,9 @@ function createBundleMiddleware(context) {
         if (signature !== LATEST_SIGNATURE) {
             res.setHeader('Cache-control', 'public, max-age=31536000, immutable');
         }
-        res.status(200).type('application/javascript').send(bundleDefinition.code);
+        res.status(200)
+            .type('application/javascript')
+            .send(await bundleDefinition.getCode());
     };
 }
 function createSourceMapMiddleware(context) {

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

@@ -57,6 +57,17 @@ export function requestProcessorMiddleware(app, context) {
             const pathValue = parsedRequestClass?.basePath || basePath || '';
             // If base path is '' or starts with / leave it alone
             req.basePath = pathValue === '' || pathValue.indexOf('/') === 0 ? pathValue : `/${pathValue}`;
+            const expressRequest = req.req;
+            if (expressRequest?.url?.startsWith(parsedRequestClass?.basePath)) {
+                expressRequest.url = expressRequest.url.split(parsedRequestClass?.basePath)[1] || '/';
+                expressRequest.originalUrl = expressRequest.url.split(parsedRequestClass?.basePath)[1] || '/';
+            }
+            else {
+                logger.warn({
+                    label: `request-processor-middleware`,
+                    message: `The URL requested for doesn't start with the Base path`,
+                });
+            }
         }
         else {
             logger.debug({

package/build/es/middleware/view-middleware.d.ts

@@ -1,3 +1,4 @@
 import type { InternalAppServer, ServerContext, ServerTypes } from '@lwrjs/types';
 export declare function viewMiddleware<T extends ServerTypes>(app: InternalAppServer<T>, context: ServerContext): void;
+export declare function convertMetricsToArrayOfStrings(span: Record<string, any>): string;
 //# sourceMappingURL=view-middleware.d.ts.map

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

@@ -4,6 +4,7 @@ import { decodeViewPath, extractRequestParams, getClientBootstrapConfigurationRo
 import { RequestHandlerSpan, getTracer } from '@lwrjs/instrumentation';
 import { handleErrors } from './utils/error-handling.js';
 import { LwrViewHandler } from '@lwrjs/view-registry';
+import { convertToReadableSpan } from '@lwrjs/instrumentation/aws-exporter';
 function createViewMiddleware(route, errorRoutes, context, viewHandler) {
     const errorRoute = errorRoutes.find((route) => route.status === 500);
     const appConfig = context.appConfig;
@@ -37,11 +38,13 @@ function createViewMiddleware(route, errorRoutes, context, viewHandler) {
             params: viewRequest.params,
             query: viewRequest.query,
             cookie: req.headers?.cookie,
+            coreProxy: req.getCoreProxy(appConfig.coreProxy ?? undefined, route.bootstrap?.proxyForSSR),
         };
         const resolve = req.isJsonRequest() ? viewHandler.getViewJson : viewHandler.getViewContent;
         let viewResponse;
         let resolvedRoute;
         let traceId;
+        let reqSpan;
         try {
             viewResponse = await getTracer().trace({
                 name: RequestHandlerSpan.GetView,
@@ -54,6 +57,7 @@ function createViewMiddleware(route, errorRoutes, context, viewHandler) {
                 },
             }, (span) => {
                 traceId = span.traceId;
+                reqSpan = span.reqSpan;
                 return resolve.call(viewHandler, viewRequest, route, runtimeEnvironment, runtimeParams);
             });
             resolvedRoute = route;
@@ -93,6 +97,11 @@ function createViewMiddleware(route, errorRoutes, context, viewHandler) {
         }
         if (traceId?.length) {
             res.setHeader('x-trace-id', traceId);
+            if (reqSpan?.status?.code === 0) {
+                res.set({
+                    'X-Custom-Lwr-Metric': convertMetricsToArrayOfStrings(convertToReadableSpan(reqSpan)),
+                });
+            }
         }
         let status = resolvedRoute.status || viewResponse.status || 200;
         const redirect = viewResponse.metadata?.viewDefinition?.redirect;
@@ -247,4 +256,17 @@ function addRedirectQueryParam(redirectUrl, depth) {
     url.searchParams.set(REQUEST_DEPTH_KEY, String(depth + 1));
     return url.toString().replace(fakeOrigin, '');
 }
+export function convertMetricsToArrayOfStrings(span) {
+    const requiredMetrics = ['traceId', 'name', 'attributes', 'duration'];
+    return requiredMetrics.reduce((metricString, prop) => {
+        if (metricString && !metricString.endsWith('; ')) {
+            metricString += '; ';
+        }
+        if (span[prop]) {
+            const propValue = typeof span[prop] === 'object' ? JSON.stringify(span[prop]) : span[prop];
+            metricString += `${prop}: ${propValue}`;
+        }
+        return metricString;
+    }, '');
+}
 //# sourceMappingURL=view-middleware.js.map

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.15.0-alpha.16",
+    "version": "0.15.0-alpha.18",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -43,44 +43,44 @@
         "build": "tsc -b"
     },
     "dependencies": {
-        "@lwrjs/app-service": "0.15.0-alpha.16",
-        "@lwrjs/asset-registry": "0.15.0-alpha.16",
-        "@lwrjs/asset-transformer": "0.15.0-alpha.16",
-        "@lwrjs/base-view-provider": "0.15.0-alpha.16",
-        "@lwrjs/base-view-transformer": "0.15.0-alpha.16",
-        "@lwrjs/client-modules": "0.15.0-alpha.16",
-        "@lwrjs/config": "0.15.0-alpha.16",
-        "@lwrjs/diagnostics": "0.15.0-alpha.16",
-        "@lwrjs/esbuild": "0.15.0-alpha.16",
-        "@lwrjs/fs-asset-provider": "0.15.0-alpha.16",
-        "@lwrjs/fs-watch": "0.15.0-alpha.16",
-        "@lwrjs/html-view-provider": "0.15.0-alpha.16",
-        "@lwrjs/instrumentation": "0.15.0-alpha.16",
-        "@lwrjs/loader": "0.15.0-alpha.16",
-        "@lwrjs/lwc-module-provider": "0.15.0-alpha.16",
-        "@lwrjs/lwc-ssr": "0.15.0-alpha.16",
-        "@lwrjs/markdown-view-provider": "0.15.0-alpha.16",
-        "@lwrjs/module-bundler": "0.15.0-alpha.16",
-        "@lwrjs/module-registry": "0.15.0-alpha.16",
-        "@lwrjs/npm-module-provider": "0.15.0-alpha.16",
-        "@lwrjs/nunjucks-view-provider": "0.15.0-alpha.16",
-        "@lwrjs/o11y": "0.15.0-alpha.16",
-        "@lwrjs/resource-registry": "0.15.0-alpha.16",
-        "@lwrjs/router": "0.15.0-alpha.16",
-        "@lwrjs/server": "0.15.0-alpha.16",
-        "@lwrjs/shared-utils": "0.15.0-alpha.16",
-        "@lwrjs/static": "0.15.0-alpha.16",
-        "@lwrjs/view-registry": "0.15.0-alpha.16",
+        "@lwrjs/app-service": "0.15.0-alpha.18",
+        "@lwrjs/asset-registry": "0.15.0-alpha.18",
+        "@lwrjs/asset-transformer": "0.15.0-alpha.18",
+        "@lwrjs/base-view-provider": "0.15.0-alpha.18",
+        "@lwrjs/base-view-transformer": "0.15.0-alpha.18",
+        "@lwrjs/client-modules": "0.15.0-alpha.18",
+        "@lwrjs/config": "0.15.0-alpha.18",
+        "@lwrjs/diagnostics": "0.15.0-alpha.18",
+        "@lwrjs/esbuild": "0.15.0-alpha.18",
+        "@lwrjs/fs-asset-provider": "0.15.0-alpha.18",
+        "@lwrjs/fs-watch": "0.15.0-alpha.18",
+        "@lwrjs/html-view-provider": "0.15.0-alpha.18",
+        "@lwrjs/instrumentation": "0.15.0-alpha.18",
+        "@lwrjs/loader": "0.15.0-alpha.18",
+        "@lwrjs/lwc-module-provider": "0.15.0-alpha.18",
+        "@lwrjs/lwc-ssr": "0.15.0-alpha.18",
+        "@lwrjs/markdown-view-provider": "0.15.0-alpha.18",
+        "@lwrjs/module-bundler": "0.15.0-alpha.18",
+        "@lwrjs/module-registry": "0.15.0-alpha.18",
+        "@lwrjs/npm-module-provider": "0.15.0-alpha.18",
+        "@lwrjs/nunjucks-view-provider": "0.15.0-alpha.18",
+        "@lwrjs/o11y": "0.15.0-alpha.18",
+        "@lwrjs/resource-registry": "0.15.0-alpha.18",
+        "@lwrjs/router": "0.15.0-alpha.18",
+        "@lwrjs/server": "0.15.0-alpha.18",
+        "@lwrjs/shared-utils": "0.15.0-alpha.18",
+        "@lwrjs/static": "0.15.0-alpha.18",
+        "@lwrjs/view-registry": "0.15.0-alpha.18",
         "chokidar": "^3.6.0",
         "esbuild": "^0.9.7",
         "fs-extra": "^11.2.0",
         "path-to-regexp": "^6.2.2",
         "qs": "^6.13.0",
-        "rollup": "^2.78.0",
+        "rollup": "^2.79.2",
         "ws": "^8.18.0"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.15.0-alpha.16",
+        "@lwrjs/types": "0.15.0-alpha.18",
         "@types/ws": "^8.5.12",
         "memfs": "^4.9.3"
     },
@@ -93,5 +93,5 @@
     "volta": {
         "extends": "../../../package.json"
     },
-    "gitHead": "7aed7f695758ebce4869f0f3d42c54b057fc4d76"
+    "gitHead": "fefc639770948be769b1ace03b7759e7b8906cae"
 }