@lwrjs/server 0.12.0-alpha.9 → 0.12.1
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.
|
@@ -1,15 +1,32 @@
|
|
|
1
|
+
var __create = Object.create;
|
|
1
2
|
var __defProp = Object.defineProperty;
|
|
3
|
+
var __getProtoOf = Object.getPrototypeOf;
|
|
4
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
5
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
6
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
2
7
|
var __markAsModule = (target) => __defProp(target, "__esModule", {value: true});
|
|
3
8
|
var __export = (target, all) => {
|
|
4
9
|
for (var name in all)
|
|
5
10
|
__defProp(target, name, {get: all[name], enumerable: true});
|
|
6
11
|
};
|
|
12
|
+
var __exportStar = (target, module2, desc) => {
|
|
13
|
+
if (module2 && typeof module2 === "object" || typeof module2 === "function") {
|
|
14
|
+
for (let key of __getOwnPropNames(module2))
|
|
15
|
+
if (!__hasOwnProp.call(target, key) && key !== "default")
|
|
16
|
+
__defProp(target, key, {get: () => module2[key], enumerable: !(desc = __getOwnPropDesc(module2, key)) || desc.enumerable});
|
|
17
|
+
}
|
|
18
|
+
return target;
|
|
19
|
+
};
|
|
20
|
+
var __toModule = (module2) => {
|
|
21
|
+
return __exportStar(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", module2 && module2.__esModule && "default" in module2 ? {get: () => module2.default, enumerable: true} : {value: module2, enumerable: true})), module2);
|
|
22
|
+
};
|
|
7
23
|
|
|
8
24
|
// packages/@lwrjs/server/src/common/abstract-request.ts
|
|
9
25
|
__markAsModule(exports);
|
|
10
26
|
__export(exports, {
|
|
11
27
|
AbstractMiddlewareRequest: () => AbstractMiddlewareRequest
|
|
12
28
|
});
|
|
29
|
+
var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
|
|
13
30
|
function parseForwardedHeader(forwarded) {
|
|
14
31
|
if (!forwarded)
|
|
15
32
|
return void 0;
|
|
@@ -83,6 +100,7 @@ var AbstractMiddlewareRequest = class {
|
|
|
83
100
|
if (host && !host.startsWith("http")) {
|
|
84
101
|
host = `${this.protocol}://${host}`;
|
|
85
102
|
}
|
|
103
|
+
const requestDepth = (0, import_shared_utils.parseRequestDepthHeader)(this.headers) + 1;
|
|
86
104
|
const basePath = runtimeEnvironment.basePath;
|
|
87
105
|
const defaultLocale = runtimeEnvironment.i18n.defaultLocale;
|
|
88
106
|
const locale = localeParam || this.locale || defaultLocale;
|
|
@@ -94,7 +112,8 @@ var AbstractMiddlewareRequest = class {
|
|
|
94
112
|
assetBasePath,
|
|
95
113
|
uiBasePath,
|
|
96
114
|
environment,
|
|
97
|
-
host
|
|
115
|
+
host,
|
|
116
|
+
requestDepth
|
|
98
117
|
};
|
|
99
118
|
return {
|
|
100
119
|
runtimeEnvironment,
|
package/build/cjs/index.cjs
CHANGED
|
@@ -34,8 +34,14 @@ var import_express_request = __toModule(require("./express/express-request.cjs")
|
|
|
34
34
|
var import_express_response = __toModule(require("./express/express-response.cjs"));
|
|
35
35
|
var import_koa_server = __toModule(require("./koa/koa-server.cjs"));
|
|
36
36
|
var import_fs_server = __toModule(require("./fs/fs-server.cjs"));
|
|
37
|
+
var import_instrumentation = __toModule(require("@lwrjs/instrumentation"));
|
|
37
38
|
var import_diagnostics = __toModule(require("@lwrjs/diagnostics"));
|
|
38
39
|
function createInternalServer(serverType = "express", options = {}) {
|
|
40
|
+
process.on("unhandledRejection", (err) => {
|
|
41
|
+
(0, import_instrumentation.getTracer)().startSpan({name: import_instrumentation.CoreSpan.UnhandledRejection}).end();
|
|
42
|
+
import_diagnostics.logger.error(`LWR Unhandled Promise Rejection: ${err?.message || ""}`);
|
|
43
|
+
import_diagnostics.logger.error(err);
|
|
44
|
+
});
|
|
39
45
|
if (serverType === "express") {
|
|
40
46
|
const expressAppServer = new import_express_server.default(options);
|
|
41
47
|
return expressAppServer;
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { parseRequestDepthHeader } from '@lwrjs/shared-utils';
|
|
1
2
|
// See: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Forwarded
|
|
2
3
|
function parseForwardedHeader(forwarded) {
|
|
3
4
|
if (!forwarded)
|
|
@@ -73,6 +74,8 @@ export class AbstractMiddlewareRequest {
|
|
|
73
74
|
if (host && !host.startsWith('http')) {
|
|
74
75
|
host = `${this.protocol}://${host}`;
|
|
75
76
|
}
|
|
77
|
+
// Increment the depth for any fetch calls
|
|
78
|
+
const requestDepth = parseRequestDepthHeader(this.headers) + 1;
|
|
76
79
|
const basePath = runtimeEnvironment.basePath;
|
|
77
80
|
const defaultLocale = runtimeEnvironment.i18n.defaultLocale;
|
|
78
81
|
const locale = localeParam || this.locale || defaultLocale;
|
|
@@ -90,6 +93,7 @@ export class AbstractMiddlewareRequest {
|
|
|
90
93
|
uiBasePath,
|
|
91
94
|
environment,
|
|
92
95
|
host,
|
|
96
|
+
requestDepth,
|
|
93
97
|
};
|
|
94
98
|
return {
|
|
95
99
|
runtimeEnvironment,
|
package/build/es/index.js
CHANGED
|
@@ -3,8 +3,15 @@ import ExpressRequest from './express/express-request.js';
|
|
|
3
3
|
import ExpressResponse from './express/express-response.js';
|
|
4
4
|
import KoaInternalServer from './koa/koa-server.js';
|
|
5
5
|
import { FsInternalServer, LwrFsKoa } from './fs/fs-server.js';
|
|
6
|
-
import {
|
|
6
|
+
import { getTracer, CoreSpan } from '@lwrjs/instrumentation';
|
|
7
|
+
import { createSingleDiagnosticError, descriptions, logger, LwrConfigValidationError, } from '@lwrjs/diagnostics';
|
|
7
8
|
function createInternalServer(serverType = 'express', options = {}) {
|
|
9
|
+
process.on('unhandledRejection', (err) => {
|
|
10
|
+
// creating immediately closed span to mark the unhandled rejection
|
|
11
|
+
getTracer().startSpan({ name: CoreSpan.UnhandledRejection }).end();
|
|
12
|
+
logger.error(`LWR Unhandled Promise Rejection: ${err?.message || ''}`);
|
|
13
|
+
logger.error(err);
|
|
14
|
+
});
|
|
8
15
|
if (serverType === 'express') {
|
|
9
16
|
const expressAppServer = new ExpressInternalServer(options);
|
|
10
17
|
return expressAppServer;
|
package/package.json
CHANGED
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
7
|
-
"version": "0.12.
|
|
7
|
+
"version": "0.12.1",
|
|
8
8
|
"homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
|
|
9
9
|
"repository": {
|
|
10
10
|
"type": "git",
|
|
@@ -34,22 +34,24 @@
|
|
|
34
34
|
"build/**/*.d.ts"
|
|
35
35
|
],
|
|
36
36
|
"devDependencies": {
|
|
37
|
-
"@lwrjs/types": "0.12.
|
|
37
|
+
"@lwrjs/types": "0.12.1",
|
|
38
38
|
"@types/koa-compress": "^4.0.1",
|
|
39
39
|
"@types/koa__router": "^8.0.4",
|
|
40
40
|
"jest-express": "^1.12.0"
|
|
41
41
|
},
|
|
42
42
|
"dependencies": {
|
|
43
43
|
"@koa/router": "^10.0.0",
|
|
44
|
-
"@lwrjs/
|
|
44
|
+
"@lwrjs/diagnostics": "0.12.1",
|
|
45
|
+
"@lwrjs/instrumentation": "0.12.1",
|
|
46
|
+
"@lwrjs/shared-utils": "0.12.1",
|
|
45
47
|
"@types/express": "^4.17.21",
|
|
46
|
-
"@types/koa": "^2.
|
|
47
|
-
"express": "^4.
|
|
48
|
-
"koa": "^2.
|
|
48
|
+
"@types/koa": "^2.15.0",
|
|
49
|
+
"express": "^4.19.2",
|
|
50
|
+
"koa": "^2.15.1",
|
|
49
51
|
"koa-compose": "^4.1.0"
|
|
50
52
|
},
|
|
51
53
|
"engines": {
|
|
52
54
|
"node": ">=18.0.0"
|
|
53
55
|
},
|
|
54
|
-
"gitHead": "
|
|
56
|
+
"gitHead": "4f8b2759b540af7443f07528980ddb0e7d4d5e3a"
|
|
55
57
|
}
|