@lwrjs/core 0.12.0-alpha.12 → 0.12.0-alpha.13

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/build/cjs/middleware/utils/error-handling.cjs +1 -1
  2. package/build/cjs/middleware/view-middleware.cjs +6 -1
  3. package/build/es/middleware/utils/error-handling.js +1 -1
  4. package/build/es/middleware/view-middleware.js +6 -1
  5. package/package.json +31 -31
package/build/cjs/middleware/utils/error-handling.cjs CHANGED
@@ -35,7 +35,7 @@ function createReturnStatus(error, url) {
35
35
  if (error instanceof import_diagnostics.LwrUnresolvableError) {
36
36
  return {status: 404, message: error.message};
37
37
  }
38
- return {status: 500, message: import_diagnostics.descriptions.UNRESOLVABLE.SERVER_ERROR(url).message};
38
+ return {status: 500, message: import_diagnostics.descriptions.SERVER.SERVER_ERROR(url).message};
39
39
  }
40
40
  function handleErrors(middleware) {
41
41
  return async (req, res, next) => {
package/build/cjs/middleware/view-middleware.cjs CHANGED
@@ -66,6 +66,7 @@ function createViewMiddleware(route, errorRoutes, context, viewHandler) {
66
66
  const resolve = req.isJsonRequest() ? viewHandler.getViewJson : viewHandler.getViewContent;
67
67
  let viewResponse;
68
68
  let resolvedRoute;
69
+ let traceId;
69
70
  try {
70
71
  viewResponse = await (0, import_instrumentation.getTracer)().trace({
71
72
  name: import_instrumentation.RequestHandlerSpan.GetView,
@@ -73,7 +74,8 @@ function createViewMiddleware(route, errorRoutes, context, viewHandler) {
73
74
  view: route.id,
74
75
  url: req.originalUrl
75
76
  }
76
- }, () => {
77
+ }, (span) => {
78
+ traceId = span.traceId;
77
79
  return resolve.call(viewHandler, viewRequest, route, runtimeEnvironment, runtimeParams);
78
80
  });
79
81
  resolvedRoute = route;
@@ -106,6 +108,9 @@ function createViewMiddleware(route, errorRoutes, context, viewHandler) {
106
108
  res.setHeader("cache-control", `public, max-age=${cacheTtl}`);
107
109
  }
108
110
  }
111
+ if (traceId?.length) {
112
+ res.setHeader("x-trace-id", traceId);
113
+ }
109
114
  const status = resolvedRoute.status || viewResponse.status || 200;
110
115
  res.status(status);
111
116
  res.send(viewResponse.body);
package/build/es/middleware/utils/error-handling.js CHANGED
@@ -8,7 +8,7 @@ function createReturnStatus(error, url) {
8
8
  if (error instanceof LwrUnresolvableError) {
9
9
  return { status: 404, message: error.message };
10
10
  }
11
- return { status: 500, message: descriptions.UNRESOLVABLE.SERVER_ERROR(url).message };
11
+ return { status: 500, message: descriptions.SERVER.SERVER_ERROR(url).message };
12
12
  }
13
13
  export function handleErrors(middleware) {
14
14
  return async (req, res, next) => {
package/build/es/middleware/view-middleware.js CHANGED
@@ -40,6 +40,7 @@ function createViewMiddleware(route, errorRoutes, context, viewHandler) {
40
40
  const resolve = req.isJsonRequest() ? viewHandler.getViewJson : viewHandler.getViewContent;
41
41
  let viewResponse;
42
42
  let resolvedRoute;
43
+ let traceId;
43
44
  try {
44
45
  viewResponse = await getTracer().trace({
45
46
  name: RequestHandlerSpan.GetView,
@@ -47,7 +48,8 @@ function createViewMiddleware(route, errorRoutes, context, viewHandler) {
47
48
  view: route.id,
48
49
  url: req.originalUrl,
49
50
  },
50
- }, () => {
51
+ }, (span) => {
52
+ traceId = span.traceId;
51
53
  return resolve.call(viewHandler, viewRequest, route, runtimeEnvironment, runtimeParams);
52
54
  });
53
55
  resolvedRoute = route;
@@ -85,6 +87,9 @@ function createViewMiddleware(route, errorRoutes, context, viewHandler) {
85
87
  res.setHeader('cache-control', `public, max-age=${cacheTtl}`);
86
88
  }
87
89
  }
90
+ if (traceId?.length) {
91
+ res.setHeader('x-trace-id', traceId);
92
+ }
88
93
  const status = resolvedRoute.status || viewResponse.status || 200;
89
94
  res.status(status);
90
95
  res.send(viewResponse.body);
package/package.json CHANGED
@@ -4,7 +4,7 @@
4
4
  "publishConfig": {
5
5
  "access": "public"
6
6
  },
7
- "version": "0.12.0-alpha.12",
7
+ "version": "0.12.0-alpha.13",
8
8
  "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
9
9
  "repository": {
10
10
  "type": "git",
@@ -43,34 +43,34 @@
43
43
  "build": "tsc -b"
44
44
  },
45
45
  "dependencies": {
46
- "@lwrjs/app-service": "0.12.0-alpha.12",
47
- "@lwrjs/asset-registry": "0.12.0-alpha.12",
48
- "@lwrjs/asset-transformer": "0.12.0-alpha.12",
49
- "@lwrjs/base-view-provider": "0.12.0-alpha.12",
50
- "@lwrjs/base-view-transformer": "0.12.0-alpha.12",
51
- "@lwrjs/client-modules": "0.12.0-alpha.12",
52
- "@lwrjs/config": "0.12.0-alpha.12",
53
- "@lwrjs/diagnostics": "0.12.0-alpha.12",
54
- "@lwrjs/esbuild": "0.12.0-alpha.12",
55
- "@lwrjs/fs-asset-provider": "0.12.0-alpha.12",
56
- "@lwrjs/fs-watch": "0.12.0-alpha.12",
57
- "@lwrjs/html-view-provider": "0.12.0-alpha.12",
58
- "@lwrjs/instrumentation": "0.12.0-alpha.12",
59
- "@lwrjs/loader": "0.12.0-alpha.12",
60
- "@lwrjs/lwc-module-provider": "0.12.0-alpha.12",
61
- "@lwrjs/lwc-ssr": "0.12.0-alpha.12",
62
- "@lwrjs/markdown-view-provider": "0.12.0-alpha.12",
63
- "@lwrjs/module-bundler": "0.12.0-alpha.12",
64
- "@lwrjs/module-registry": "0.12.0-alpha.12",
65
- "@lwrjs/npm-module-provider": "0.12.0-alpha.12",
66
- "@lwrjs/nunjucks-view-provider": "0.12.0-alpha.12",
67
- "@lwrjs/o11y": "0.12.0-alpha.12",
68
- "@lwrjs/resource-registry": "0.12.0-alpha.12",
69
- "@lwrjs/router": "0.12.0-alpha.12",
70
- "@lwrjs/server": "0.12.0-alpha.12",
71
- "@lwrjs/shared-utils": "0.12.0-alpha.12",
72
- "@lwrjs/static": "0.12.0-alpha.12",
73
- "@lwrjs/view-registry": "0.12.0-alpha.12",
46
+ "@lwrjs/app-service": "0.12.0-alpha.13",
47
+ "@lwrjs/asset-registry": "0.12.0-alpha.13",
48
+ "@lwrjs/asset-transformer": "0.12.0-alpha.13",
49
+ "@lwrjs/base-view-provider": "0.12.0-alpha.13",
50
+ "@lwrjs/base-view-transformer": "0.12.0-alpha.13",
51
+ "@lwrjs/client-modules": "0.12.0-alpha.13",
52
+ "@lwrjs/config": "0.12.0-alpha.13",
53
+ "@lwrjs/diagnostics": "0.12.0-alpha.13",
54
+ "@lwrjs/esbuild": "0.12.0-alpha.13",
55
+ "@lwrjs/fs-asset-provider": "0.12.0-alpha.13",
56
+ "@lwrjs/fs-watch": "0.12.0-alpha.13",
57
+ "@lwrjs/html-view-provider": "0.12.0-alpha.13",
58
+ "@lwrjs/instrumentation": "0.12.0-alpha.13",
59
+ "@lwrjs/loader": "0.12.0-alpha.13",
60
+ "@lwrjs/lwc-module-provider": "0.12.0-alpha.13",
61
+ "@lwrjs/lwc-ssr": "0.12.0-alpha.13",
62
+ "@lwrjs/markdown-view-provider": "0.12.0-alpha.13",
63
+ "@lwrjs/module-bundler": "0.12.0-alpha.13",
64
+ "@lwrjs/module-registry": "0.12.0-alpha.13",
65
+ "@lwrjs/npm-module-provider": "0.12.0-alpha.13",
66
+ "@lwrjs/nunjucks-view-provider": "0.12.0-alpha.13",
67
+ "@lwrjs/o11y": "0.12.0-alpha.13",
68
+ "@lwrjs/resource-registry": "0.12.0-alpha.13",
69
+ "@lwrjs/router": "0.12.0-alpha.13",
70
+ "@lwrjs/server": "0.12.0-alpha.13",
71
+ "@lwrjs/shared-utils": "0.12.0-alpha.13",
72
+ "@lwrjs/static": "0.12.0-alpha.13",
73
+ "@lwrjs/view-registry": "0.12.0-alpha.13",
74
74
  "chokidar": "^3.5.3",
75
75
  "esbuild": "^0.9.7",
76
76
  "fs-extra": "^11.1.1",
@@ -80,7 +80,7 @@
80
80
  "ws": "^8.8.1"
81
81
  },
82
82
  "devDependencies": {
83
- "@lwrjs/types": "0.12.0-alpha.12",
83
+ "@lwrjs/types": "0.12.0-alpha.13",
84
84
  "@types/ws": "^8.5.3"
85
85
  },
86
86
  "peerDependencies": {
@@ -92,5 +92,5 @@
92
92
  "volta": {
93
93
  "extends": "../../../package.json"
94
94
  },
95
- "gitHead": "bc8a88bce246e9ec00641955152de526ea030ebb"
95
+ "gitHead": "7a63e416f9e5f27b44331311a371f68e20ce685c"
96
96
  }