@lwrjs/core 0.17.2-alpha.12 → 0.17.2-alpha.15
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.
|
@@ -26,17 +26,16 @@ __markAsModule(exports);
|
|
|
26
26
|
__export(exports, {
|
|
27
27
|
viewMiddleware: () => viewMiddleware
|
|
28
28
|
});
|
|
29
|
-
var import_util = __toModule(require("util"));
|
|
30
29
|
var import_url = __toModule(require("url"));
|
|
30
|
+
var import_util = __toModule(require("util"));
|
|
31
|
+
var import_zlib = __toModule(require("zlib"));
|
|
31
32
|
var import_diagnostics = __toModule(require("@lwrjs/diagnostics"));
|
|
33
|
+
var import_instrumentation = __toModule(require("@lwrjs/instrumentation"));
|
|
32
34
|
var import_router = __toModule(require("@lwrjs/router"));
|
|
33
35
|
var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
|
|
34
|
-
var import_instrumentation = __toModule(require("@lwrjs/instrumentation"));
|
|
35
|
-
var import_error_handling = __toModule(require("./utils/error-handling.cjs"));
|
|
36
36
|
var import_view_registry = __toModule(require("@lwrjs/view-registry"));
|
|
37
|
-
var import_instrumentation2 = __toModule(require("@lwrjs/instrumentation"));
|
|
38
|
-
var import_zlib = __toModule(require("zlib"));
|
|
39
37
|
var import_compression = __toModule(require("./utils/compression.cjs"));
|
|
38
|
+
var import_error_handling = __toModule(require("./utils/error-handling.cjs"));
|
|
40
39
|
function createViewMiddleware(route, errorRoutes, context, viewHandler) {
|
|
41
40
|
const errorRoute = errorRoutes.find((route2) => route2.status === 500);
|
|
42
41
|
const appConfig = context.appConfig;
|
|
@@ -63,21 +62,21 @@ function createViewMiddleware(route, errorRoutes, context, viewHandler) {
|
|
|
63
62
|
query: req.query,
|
|
64
63
|
requestPath: req.path
|
|
65
64
|
};
|
|
66
|
-
const correlationID = req.headers && req.headers[import_shared_utils.CORRELATION_ID];
|
|
67
65
|
const runtimeParams = {
|
|
68
66
|
...defaultRuntimeParams,
|
|
69
|
-
correlationID,
|
|
70
67
|
url: viewRequest.url,
|
|
71
68
|
params: viewRequest.params,
|
|
72
69
|
query: viewRequest.query,
|
|
73
70
|
cookie: req.headers?.cookie,
|
|
74
71
|
trueClientIP: req.headers && req.headers[import_shared_utils.TRUE_CLIENT_IP],
|
|
72
|
+
correlationID: req.headers && req.headers[import_shared_utils.CORRELATION_ID],
|
|
75
73
|
coreProxy: req.getCoreProxy(appConfig.coreProxy ?? void 0, route.bootstrap?.proxyForSSR)
|
|
76
74
|
};
|
|
77
75
|
const resolve = req.isJsonRequest() ? viewHandler.getViewJson : viewHandler.getViewContent;
|
|
78
76
|
let viewResponse;
|
|
79
77
|
let resolvedRoute;
|
|
80
78
|
let traceId;
|
|
79
|
+
let headers = {};
|
|
81
80
|
try {
|
|
82
81
|
viewResponse = await (0, import_instrumentation.getTracer)().trace({
|
|
83
82
|
name: import_instrumentation.RequestHandlerSpan.GetView,
|
|
@@ -90,7 +89,7 @@ function createViewMiddleware(route, errorRoutes, context, viewHandler) {
|
|
|
90
89
|
}
|
|
91
90
|
}, async (span) => {
|
|
92
91
|
traceId = span.traceId;
|
|
93
|
-
|
|
92
|
+
headers = (0, import_shared_utils.getTraceHeaders)(runtimeParams, span);
|
|
94
93
|
const res2 = await resolve.call(viewHandler, viewRequest, route, runtimeEnvironment, runtimeParams);
|
|
95
94
|
span.setAttributes({
|
|
96
95
|
size: byteSize(res2.body)
|
|
@@ -114,15 +113,13 @@ function createViewMiddleware(route, errorRoutes, context, viewHandler) {
|
|
|
114
113
|
});
|
|
115
114
|
resolvedRoute = errorRoute;
|
|
116
115
|
} finally {
|
|
117
|
-
if (
|
|
118
|
-
res.
|
|
119
|
-
}
|
|
116
|
+
if (Object.keys(headers).length)
|
|
117
|
+
res.set(headers);
|
|
120
118
|
if (traceId?.length) {
|
|
121
|
-
res.setHeader(import_shared_utils.B3_TRACE_ID, traceId);
|
|
122
119
|
res.set({
|
|
123
|
-
"Server-Timing": (0,
|
|
120
|
+
"Server-Timing": (0, import_instrumentation.getTraceCollector)().getSpansInTrace(traceId)
|
|
124
121
|
});
|
|
125
|
-
(0,
|
|
122
|
+
(0, import_instrumentation.getTraceCollector)().dropTrace(traceId);
|
|
126
123
|
}
|
|
127
124
|
}
|
|
128
125
|
if (req.isSiteGeneration()) {
|
|
@@ -1,14 +1,13 @@
|
|
|
1
|
-
import { TextEncoder } from 'util';
|
|
2
1
|
import { URLSearchParams } from 'url';
|
|
2
|
+
import { TextEncoder } from 'util';
|
|
3
|
+
import { brotliCompressSync, gzipSync } from 'zlib';
|
|
3
4
|
import { descriptions, logger } from '@lwrjs/diagnostics';
|
|
5
|
+
import { RequestHandlerSpan, getTraceCollector, getTracer } from '@lwrjs/instrumentation';
|
|
4
6
|
import { getClientRoutes } from '@lwrjs/router';
|
|
5
|
-
import {
|
|
6
|
-
import { RequestHandlerSpan, getTracer } from '@lwrjs/instrumentation';
|
|
7
|
-
import { handleErrors } from './utils/error-handling.js';
|
|
7
|
+
import { CORRELATION_ID, TRUE_CLIENT_IP, decodeViewPath, extractRequestParams, getClientBootstrapConfigurationRoutes, getTraceHeaders, isLambdaEnv, isLocalDev, shortestTtl, } from '@lwrjs/shared-utils';
|
|
8
8
|
import { LwrViewHandler } from '@lwrjs/view-registry';
|
|
9
|
-
import { getTraceCollector } from '@lwrjs/instrumentation';
|
|
10
|
-
import { brotliCompressSync, gzipSync } from 'zlib';
|
|
11
9
|
import { getMrtCompressionThreshold } from './utils/compression.js';
|
|
10
|
+
import { handleErrors } from './utils/error-handling.js';
|
|
12
11
|
function createViewMiddleware(route, errorRoutes, context, viewHandler) {
|
|
13
12
|
const errorRoute = errorRoutes.find((route) => route.status === 500);
|
|
14
13
|
const appConfig = context.appConfig;
|
|
@@ -37,21 +36,21 @@ function createViewMiddleware(route, errorRoutes, context, viewHandler) {
|
|
|
37
36
|
requestPath: req.path,
|
|
38
37
|
};
|
|
39
38
|
// Augment runtime params with viewRequest info
|
|
40
|
-
const correlationID = req.headers && req.headers[CORRELATION_ID];
|
|
41
39
|
const runtimeParams = {
|
|
42
40
|
...defaultRuntimeParams,
|
|
43
|
-
correlationID,
|
|
44
41
|
url: viewRequest.url,
|
|
45
42
|
params: viewRequest.params,
|
|
46
43
|
query: viewRequest.query,
|
|
47
44
|
cookie: req.headers?.cookie,
|
|
48
45
|
trueClientIP: req.headers && req.headers[TRUE_CLIENT_IP],
|
|
46
|
+
correlationID: req.headers && req.headers[CORRELATION_ID],
|
|
49
47
|
coreProxy: req.getCoreProxy(appConfig.coreProxy ?? undefined, route.bootstrap?.proxyForSSR),
|
|
50
48
|
};
|
|
51
49
|
const resolve = req.isJsonRequest() ? viewHandler.getViewJson : viewHandler.getViewContent;
|
|
52
50
|
let viewResponse;
|
|
53
51
|
let resolvedRoute;
|
|
54
52
|
let traceId;
|
|
53
|
+
let headers = {};
|
|
55
54
|
try {
|
|
56
55
|
viewResponse = await getTracer().trace({
|
|
57
56
|
name: RequestHandlerSpan.GetView,
|
|
@@ -64,7 +63,7 @@ function createViewMiddleware(route, errorRoutes, context, viewHandler) {
|
|
|
64
63
|
},
|
|
65
64
|
}, async (span) => {
|
|
66
65
|
traceId = span.traceId;
|
|
67
|
-
|
|
66
|
+
headers = getTraceHeaders(runtimeParams, span);
|
|
68
67
|
const res = await resolve.call(viewHandler, viewRequest, route, runtimeEnvironment, runtimeParams);
|
|
69
68
|
// Add the view size metric
|
|
70
69
|
span.setAttributes({
|
|
@@ -94,11 +93,9 @@ function createViewMiddleware(route, errorRoutes, context, viewHandler) {
|
|
|
94
93
|
resolvedRoute = errorRoute;
|
|
95
94
|
}
|
|
96
95
|
finally {
|
|
97
|
-
if (
|
|
98
|
-
res.
|
|
99
|
-
}
|
|
96
|
+
if (Object.keys(headers).length)
|
|
97
|
+
res.set(headers);
|
|
100
98
|
if (traceId?.length) {
|
|
101
|
-
res.setHeader(B3_TRACE_ID, traceId);
|
|
102
99
|
res.set({
|
|
103
100
|
'Server-Timing': getTraceCollector().getSpansInTrace(traceId),
|
|
104
101
|
});
|
package/package.json
CHANGED
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
7
|
-
"version": "0.17.2-alpha.
|
|
7
|
+
"version": "0.17.2-alpha.15",
|
|
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.17.2-alpha.
|
|
47
|
-
"@lwrjs/asset-registry": "0.17.2-alpha.
|
|
48
|
-
"@lwrjs/asset-transformer": "0.17.2-alpha.
|
|
49
|
-
"@lwrjs/base-view-provider": "0.17.2-alpha.
|
|
50
|
-
"@lwrjs/base-view-transformer": "0.17.2-alpha.
|
|
51
|
-
"@lwrjs/client-modules": "0.17.2-alpha.
|
|
52
|
-
"@lwrjs/config": "0.17.2-alpha.
|
|
53
|
-
"@lwrjs/diagnostics": "0.17.2-alpha.
|
|
54
|
-
"@lwrjs/esbuild": "0.17.2-alpha.
|
|
55
|
-
"@lwrjs/fs-asset-provider": "0.17.2-alpha.
|
|
56
|
-
"@lwrjs/fs-watch": "0.17.2-alpha.
|
|
57
|
-
"@lwrjs/html-view-provider": "0.17.2-alpha.
|
|
58
|
-
"@lwrjs/instrumentation": "0.17.2-alpha.
|
|
59
|
-
"@lwrjs/loader": "0.17.2-alpha.
|
|
60
|
-
"@lwrjs/lwc-module-provider": "0.17.2-alpha.
|
|
61
|
-
"@lwrjs/lwc-ssr": "0.17.2-alpha.
|
|
62
|
-
"@lwrjs/markdown-view-provider": "0.17.2-alpha.
|
|
63
|
-
"@lwrjs/module-bundler": "0.17.2-alpha.
|
|
64
|
-
"@lwrjs/module-registry": "0.17.2-alpha.
|
|
65
|
-
"@lwrjs/npm-module-provider": "0.17.2-alpha.
|
|
66
|
-
"@lwrjs/nunjucks-view-provider": "0.17.2-alpha.
|
|
67
|
-
"@lwrjs/o11y": "0.17.2-alpha.
|
|
68
|
-
"@lwrjs/resource-registry": "0.17.2-alpha.
|
|
69
|
-
"@lwrjs/router": "0.17.2-alpha.
|
|
70
|
-
"@lwrjs/server": "0.17.2-alpha.
|
|
71
|
-
"@lwrjs/shared-utils": "0.17.2-alpha.
|
|
72
|
-
"@lwrjs/static": "0.17.2-alpha.
|
|
73
|
-
"@lwrjs/view-registry": "0.17.2-alpha.
|
|
46
|
+
"@lwrjs/app-service": "0.17.2-alpha.15",
|
|
47
|
+
"@lwrjs/asset-registry": "0.17.2-alpha.15",
|
|
48
|
+
"@lwrjs/asset-transformer": "0.17.2-alpha.15",
|
|
49
|
+
"@lwrjs/base-view-provider": "0.17.2-alpha.15",
|
|
50
|
+
"@lwrjs/base-view-transformer": "0.17.2-alpha.15",
|
|
51
|
+
"@lwrjs/client-modules": "0.17.2-alpha.15",
|
|
52
|
+
"@lwrjs/config": "0.17.2-alpha.15",
|
|
53
|
+
"@lwrjs/diagnostics": "0.17.2-alpha.15",
|
|
54
|
+
"@lwrjs/esbuild": "0.17.2-alpha.15",
|
|
55
|
+
"@lwrjs/fs-asset-provider": "0.17.2-alpha.15",
|
|
56
|
+
"@lwrjs/fs-watch": "0.17.2-alpha.15",
|
|
57
|
+
"@lwrjs/html-view-provider": "0.17.2-alpha.15",
|
|
58
|
+
"@lwrjs/instrumentation": "0.17.2-alpha.15",
|
|
59
|
+
"@lwrjs/loader": "0.17.2-alpha.15",
|
|
60
|
+
"@lwrjs/lwc-module-provider": "0.17.2-alpha.15",
|
|
61
|
+
"@lwrjs/lwc-ssr": "0.17.2-alpha.15",
|
|
62
|
+
"@lwrjs/markdown-view-provider": "0.17.2-alpha.15",
|
|
63
|
+
"@lwrjs/module-bundler": "0.17.2-alpha.15",
|
|
64
|
+
"@lwrjs/module-registry": "0.17.2-alpha.15",
|
|
65
|
+
"@lwrjs/npm-module-provider": "0.17.2-alpha.15",
|
|
66
|
+
"@lwrjs/nunjucks-view-provider": "0.17.2-alpha.15",
|
|
67
|
+
"@lwrjs/o11y": "0.17.2-alpha.15",
|
|
68
|
+
"@lwrjs/resource-registry": "0.17.2-alpha.15",
|
|
69
|
+
"@lwrjs/router": "0.17.2-alpha.15",
|
|
70
|
+
"@lwrjs/server": "0.17.2-alpha.15",
|
|
71
|
+
"@lwrjs/shared-utils": "0.17.2-alpha.15",
|
|
72
|
+
"@lwrjs/static": "0.17.2-alpha.15",
|
|
73
|
+
"@lwrjs/view-registry": "0.17.2-alpha.15",
|
|
74
74
|
"chokidar": "^3.6.0",
|
|
75
75
|
"esbuild": "^0.9.7",
|
|
76
76
|
"fs-extra": "^11.2.0",
|
|
@@ -80,7 +80,7 @@
|
|
|
80
80
|
"ws": "^8.18.0"
|
|
81
81
|
},
|
|
82
82
|
"devDependencies": {
|
|
83
|
-
"@lwrjs/types": "0.17.2-alpha.
|
|
83
|
+
"@lwrjs/types": "0.17.2-alpha.15",
|
|
84
84
|
"@types/ws": "^8.5.12",
|
|
85
85
|
"memfs": "^4.13.0"
|
|
86
86
|
},
|
|
@@ -88,10 +88,10 @@
|
|
|
88
88
|
"lwc": ">= 2.x"
|
|
89
89
|
},
|
|
90
90
|
"engines": {
|
|
91
|
-
"node": ">=
|
|
91
|
+
"node": ">=20.0.0"
|
|
92
92
|
},
|
|
93
93
|
"volta": {
|
|
94
94
|
"extends": "../../../package.json"
|
|
95
95
|
},
|
|
96
|
-
"gitHead": "
|
|
96
|
+
"gitHead": "91299b871adb9aea8c743d830dd62bce418a0933"
|
|
97
97
|
}
|