@trebired/frontend 6.15.8 → 6.16.0
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.
- package/CHANGELOG.md +11 -0
- package/dist/logging/browser.d.ts +2 -0
- package/dist/logging/browser.d.ts.map +1 -1
- package/dist/logging/browser.js +4 -3
- package/dist/logging/browser.js.map +1 -1
- package/dist/logging/index.d.ts +1 -1
- package/dist/logging/index.d.ts.map +1 -1
- package/dist/logging/index.js +1 -1
- package/dist/logging/index.js.map +1 -1
- package/dist/server/index.d.ts +3 -0
- package/dist/server/index.d.ts.map +1 -1
- package/dist/server/index.js +3 -0
- package/dist/server/index.js.map +1 -1
- package/dist/server/logging.d.ts +7 -0
- package/dist/server/logging.d.ts.map +1 -0
- package/dist/server/logging.js +12 -0
- package/dist/server/logging.js.map +1 -0
- package/dist/server/performance.d.ts +48 -0
- package/dist/server/performance.d.ts.map +1 -0
- package/dist/server/performance.js +197 -0
- package/dist/server/performance.js.map +1 -0
- package/dist/server/react/document.d.ts.map +1 -1
- package/dist/server/react/document.js +8 -2
- package/dist/server/react/document.js.map +1 -1
- package/dist/server/react/render.d.ts.map +1 -1
- package/dist/server/react/render.js +30 -2
- package/dist/server/react/render.js.map +1 -1
- package/dist/server/react/types.d.ts +2 -0
- package/dist/server/react/types.d.ts.map +1 -1
- package/dist/server/request-log.d.ts +12 -0
- package/dist/server/request-log.d.ts.map +1 -0
- package/dist/server/request-log.js +116 -0
- package/dist/server/request-log.js.map +1 -0
- package/dist/src/logging/browser.d.ts +2 -0
- package/dist/src/logging/browser.d.ts.map +1 -1
- package/dist/src/logging/browser.js +4 -3
- package/dist/src/logging/browser.js.map +1 -1
- package/dist/src/logging/index.d.ts +1 -1
- package/dist/src/logging/index.d.ts.map +1 -1
- package/dist/src/logging/index.js +1 -1
- package/dist/src/logging/index.js.map +1 -1
- package/dist/src/server/index.d.ts +3 -0
- package/dist/src/server/index.d.ts.map +1 -1
- package/dist/src/server/index.js +3 -0
- package/dist/src/server/index.js.map +1 -1
- package/dist/src/server/logging.d.ts +7 -0
- package/dist/src/server/logging.d.ts.map +1 -0
- package/dist/src/server/logging.js +12 -0
- package/dist/src/server/logging.js.map +1 -0
- package/dist/src/server/performance.d.ts +48 -0
- package/dist/src/server/performance.d.ts.map +1 -0
- package/dist/src/server/performance.js +197 -0
- package/dist/src/server/performance.js.map +1 -0
- package/dist/src/server/react/document.d.ts.map +1 -1
- package/dist/src/server/react/document.js +8 -2
- package/dist/src/server/react/document.js.map +1 -1
- package/dist/src/server/react/render.d.ts.map +1 -1
- package/dist/src/server/react/render.js +30 -2
- package/dist/src/server/react/render.js.map +1 -1
- package/dist/src/server/react/types.d.ts +2 -0
- package/dist/src/server/react/types.d.ts.map +1 -1
- package/dist/src/server/request-log.d.ts +12 -0
- package/dist/src/server/request-log.d.ts.map +1 -0
- package/dist/src/server/request-log.js +116 -0
- package/dist/src/server/request-log.js.map +1 -0
- package/package.json +2 -2
|
@@ -0,0 +1,197 @@
|
|
|
1
|
+
import { AsyncLocalStorage } from "async_hooks";
|
|
2
|
+
import { resolveFrontendServerLogger, } from "./logging.js";
|
|
3
|
+
const storage = new AsyncLocalStorage();
|
|
4
|
+
const attachedPerformanceApps = new WeakSet();
|
|
5
|
+
function text(value) {
|
|
6
|
+
return String(value == null ? "" : value).trim();
|
|
7
|
+
}
|
|
8
|
+
function nowMs() {
|
|
9
|
+
return performance.now();
|
|
10
|
+
}
|
|
11
|
+
function runWithRequestContext(req, fn) {
|
|
12
|
+
const ctx = {
|
|
13
|
+
assetCount: 0,
|
|
14
|
+
assetMs: 0,
|
|
15
|
+
dbCount: 0,
|
|
16
|
+
dbEntries: [],
|
|
17
|
+
dbMs: 0,
|
|
18
|
+
id: text(req?.req_id),
|
|
19
|
+
method: text(req?.method),
|
|
20
|
+
path: text(req?.originalUrl || req?.url || req?.path),
|
|
21
|
+
renderCount: 0,
|
|
22
|
+
renderMs: 0,
|
|
23
|
+
startedAt: nowMs(),
|
|
24
|
+
};
|
|
25
|
+
storage.run(ctx, fn);
|
|
26
|
+
}
|
|
27
|
+
function current() {
|
|
28
|
+
return storage.getStore() || null;
|
|
29
|
+
}
|
|
30
|
+
function recordDbQuery(ms, meta) {
|
|
31
|
+
const ctx = current();
|
|
32
|
+
if (!ctx)
|
|
33
|
+
return;
|
|
34
|
+
const durationMs = Number(ms) || 0;
|
|
35
|
+
ctx.dbCount += 1;
|
|
36
|
+
ctx.dbMs += durationMs;
|
|
37
|
+
ctx.dbEntries.push({
|
|
38
|
+
caller: text(meta?.caller),
|
|
39
|
+
label: text(meta?.label),
|
|
40
|
+
ms: durationMs,
|
|
41
|
+
op: text(meta?.op),
|
|
42
|
+
table: text(meta?.table),
|
|
43
|
+
});
|
|
44
|
+
}
|
|
45
|
+
function recordRender(ms) {
|
|
46
|
+
const ctx = current();
|
|
47
|
+
if (!ctx)
|
|
48
|
+
return;
|
|
49
|
+
ctx.renderCount += 1;
|
|
50
|
+
ctx.renderMs += Number(ms) || 0;
|
|
51
|
+
}
|
|
52
|
+
function recordAsset(ms) {
|
|
53
|
+
const ctx = current();
|
|
54
|
+
if (!ctx)
|
|
55
|
+
return;
|
|
56
|
+
ctx.assetCount += 1;
|
|
57
|
+
ctx.assetMs += Number(ms) || 0;
|
|
58
|
+
}
|
|
59
|
+
function snapshot() {
|
|
60
|
+
const ctx = current();
|
|
61
|
+
if (!ctx)
|
|
62
|
+
return null;
|
|
63
|
+
return {
|
|
64
|
+
assetCount: ctx.assetCount,
|
|
65
|
+
assetMs: ctx.assetMs,
|
|
66
|
+
dbCount: ctx.dbCount,
|
|
67
|
+
dbEntries: ctx.dbEntries.slice(),
|
|
68
|
+
dbMs: ctx.dbMs,
|
|
69
|
+
id: ctx.id,
|
|
70
|
+
method: ctx.method,
|
|
71
|
+
path: ctx.path,
|
|
72
|
+
renderCount: ctx.renderCount,
|
|
73
|
+
renderMs: ctx.renderMs,
|
|
74
|
+
totalMs: nowMs() - ctx.startedAt,
|
|
75
|
+
};
|
|
76
|
+
}
|
|
77
|
+
function formatServerTiming(data) {
|
|
78
|
+
const snap = data && typeof data === "object" ? data : snapshot();
|
|
79
|
+
if (!snap)
|
|
80
|
+
return "";
|
|
81
|
+
const part = (name, ms, desc) => {
|
|
82
|
+
const dur = Math.max(0, Number(ms) || 0).toFixed(1);
|
|
83
|
+
return desc ? `${name};dur=${dur};desc="${desc}"` : `${name};dur=${dur}`;
|
|
84
|
+
};
|
|
85
|
+
return [
|
|
86
|
+
part("app", snap.totalMs),
|
|
87
|
+
part("db", snap.dbMs, `${snap.dbCount} queries`),
|
|
88
|
+
part("render", snap.renderMs, `${snap.renderCount} renders`),
|
|
89
|
+
part("asset", snap.assetMs, `${snap.assetCount} assets`),
|
|
90
|
+
].join(", ");
|
|
91
|
+
}
|
|
92
|
+
function contentTypeOf(res) {
|
|
93
|
+
const value = res && typeof res.getHeader === "function"
|
|
94
|
+
? res.getHeader("content-type")
|
|
95
|
+
: "";
|
|
96
|
+
return String(Array.isArray(value) ? value[0] || "" : value || "").toLowerCase();
|
|
97
|
+
}
|
|
98
|
+
function isHtmlPageRequest(req, res) {
|
|
99
|
+
if (text(req?.method).toUpperCase() !== "GET")
|
|
100
|
+
return false;
|
|
101
|
+
const type = contentTypeOf(res);
|
|
102
|
+
return type.includes("text/html") || type.includes("application/xhtml+xml");
|
|
103
|
+
}
|
|
104
|
+
function requestLogMeta(snap, res) {
|
|
105
|
+
const totalMs = Math.round(snap.totalMs);
|
|
106
|
+
const dbMs = Math.round(snap.dbMs);
|
|
107
|
+
const renderMs = Math.round(snap.renderMs);
|
|
108
|
+
const assetMs = Math.round(snap.assetMs);
|
|
109
|
+
return {
|
|
110
|
+
method: snap.method,
|
|
111
|
+
path: snap.path,
|
|
112
|
+
status: Number(res?.statusCode || 0),
|
|
113
|
+
total_ms: totalMs,
|
|
114
|
+
db_count: snap.dbCount,
|
|
115
|
+
db_ms: dbMs,
|
|
116
|
+
render_count: snap.renderCount,
|
|
117
|
+
render_ms: renderMs,
|
|
118
|
+
asset_count: snap.assetCount,
|
|
119
|
+
asset_ms: assetMs,
|
|
120
|
+
other_ms: Math.max(0, totalMs - dbMs - renderMs - assetMs),
|
|
121
|
+
};
|
|
122
|
+
}
|
|
123
|
+
function slowDbEntries(snap) {
|
|
124
|
+
return snap.dbEntries
|
|
125
|
+
.slice()
|
|
126
|
+
.sort((a, b) => (Number(b.ms) || 0) - (Number(a.ms) || 0))
|
|
127
|
+
.slice(0, 10)
|
|
128
|
+
.map((entry) => ({
|
|
129
|
+
caller: entry.caller,
|
|
130
|
+
duration_ms: Math.round(Number(entry.ms) || 0),
|
|
131
|
+
label: entry.label,
|
|
132
|
+
op: entry.op,
|
|
133
|
+
table: entry.table,
|
|
134
|
+
}));
|
|
135
|
+
}
|
|
136
|
+
function readSlowRequestMs(options) {
|
|
137
|
+
if (typeof options.readSlowRequestMs === "function") {
|
|
138
|
+
return Number(options.readSlowRequestMs()) || 0;
|
|
139
|
+
}
|
|
140
|
+
return Number(options.slowRequestMs ?? 500) || 0;
|
|
141
|
+
}
|
|
142
|
+
function readServerTimingEnabled(options) {
|
|
143
|
+
if (typeof options.readServerTiming === "function") {
|
|
144
|
+
return options.readServerTiming() !== false;
|
|
145
|
+
}
|
|
146
|
+
return options.serverTiming !== false;
|
|
147
|
+
}
|
|
148
|
+
function readPerformanceLogger(options) {
|
|
149
|
+
return resolveFrontendServerLogger(options.readLogger?.() || options.logger);
|
|
150
|
+
}
|
|
151
|
+
function attachServerTimingHeader(res, options) {
|
|
152
|
+
const origWriteHead = typeof res?.writeHead === "function" ? res.writeHead.bind(res) : null;
|
|
153
|
+
if (!origWriteHead)
|
|
154
|
+
return;
|
|
155
|
+
res.writeHead = function wrappedWriteHead(...args) {
|
|
156
|
+
if (readServerTimingEnabled(options) && !res.headersSent) {
|
|
157
|
+
const header = formatServerTiming(snapshot());
|
|
158
|
+
if (header)
|
|
159
|
+
res.setHeader("Server-Timing", header);
|
|
160
|
+
}
|
|
161
|
+
return origWriteHead(...args);
|
|
162
|
+
};
|
|
163
|
+
}
|
|
164
|
+
function logPerformanceRequest(req, res, options) {
|
|
165
|
+
const snap = snapshot();
|
|
166
|
+
if (!snap)
|
|
167
|
+
return;
|
|
168
|
+
const meta = requestLogMeta(snap, res);
|
|
169
|
+
const logger = readPerformanceLogger(options);
|
|
170
|
+
if (isHtmlPageRequest(req, res)) {
|
|
171
|
+
logger.info("performance.request", "page request", meta);
|
|
172
|
+
}
|
|
173
|
+
const slowMs = readSlowRequestMs(options);
|
|
174
|
+
if (!slowMs || snap.totalMs < slowMs)
|
|
175
|
+
return;
|
|
176
|
+
logger.warn("performance.request", "slow request", {
|
|
177
|
+
...meta,
|
|
178
|
+
slow_db_entries: slowDbEntries(snap),
|
|
179
|
+
});
|
|
180
|
+
}
|
|
181
|
+
function attachFrontendPerformanceMiddleware(app, options = {}) {
|
|
182
|
+
if (!app || typeof app.use !== "function")
|
|
183
|
+
return false;
|
|
184
|
+
if (attachedPerformanceApps.has(app))
|
|
185
|
+
return false;
|
|
186
|
+
attachedPerformanceApps.add(app);
|
|
187
|
+
app.use((req, res, next) => {
|
|
188
|
+
runWithRequestContext(req, () => {
|
|
189
|
+
attachServerTimingHeader(res, options);
|
|
190
|
+
res.on("finish", () => logPerformanceRequest(req, res, options));
|
|
191
|
+
next();
|
|
192
|
+
});
|
|
193
|
+
});
|
|
194
|
+
return true;
|
|
195
|
+
}
|
|
196
|
+
export { attachFrontendPerformanceMiddleware, current, formatServerTiming, recordAsset, recordDbQuery, recordRender, runWithRequestContext, snapshot, };
|
|
197
|
+
//# sourceMappingURL=performance.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"performance.js","sourceRoot":"","sources":["../../../src/server/performance.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"document.d.ts","sourceRoot":"","sources":["../../../../src/server/react/document.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,KAAK,kBAAkB,EACxB,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"document.d.ts","sourceRoot":"","sources":["../../../../src/server/react/document.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,KAAK,kBAAkB,EACxB,MAAM,eAAe,CAAC;AAGvB,OAAO,KAAK,EACV,uBAAuB,EACvB,4BAA4B,EAC5B,mBAAmB,EACpB,MAAM,eAAe,CAAC;AAEvB,iBAAS,sBAAsB,CAAC,MAAM,EAAE,OAAO,UAY9C;AAED,iBAAS,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,UAQrD;AAED,iBAAS,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,UAInD;AAED,iBAAS,wBAAwB,CAAC,GAAG,EAAE,kBAAkB,GAAG,IAAI,GAAG,SAAS,UAG3E;AAwCD,iBAAS,oBAAoB,CAC3B,GAAG,EAAE,kBAAkB,EACvB,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC9B,OAAO,EAAE,4BAA4B,EACrC,UAAU,CAAC,EAAE,mBAAmB,GAC/B,uBAAuB,CAoBzB;AAkBD,iBAAS,iBAAiB,CACxB,IAAI,EAAE,OAAO,EACb,OAAO,EAAE,uBAAuB,EAChC,OAAO,EAAE,4BAA4B;;;;;;;;;;;;;;;;;;EAqBtC;AAED,iBAAS,gBAAgB,CACvB,OAAO,EAAE,uBAAuB,EAChC,GAAG,EAAE,kBAAkB,EACvB,OAAO,EAAE,4BAA4B,QAyBtC;AAED,OAAO,EACL,gBAAgB,EAChB,oBAAoB,EACpB,aAAa,EACb,sBAAsB,EACtB,gBAAgB,EAChB,wBAAwB,EACxB,iBAAiB,GAClB,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { escapeHtml, toText } from "../../../components/index.js";
|
|
2
2
|
import { serverObject, } from "../../../server/http.js";
|
|
3
3
|
import { buildReactRenderShell } from "../../../server/react/shell.js";
|
|
4
|
+
import { resolveFrontendServerLogger } from "../../../server/logging.js";
|
|
4
5
|
function defaultNormalizePageId(pageId) {
|
|
5
6
|
const normalized = toText(pageId)
|
|
6
7
|
.replace(/\\/g, "/")
|
|
@@ -106,7 +107,7 @@ function rootDocumentProps(body, context, options) {
|
|
|
106
107
|
};
|
|
107
108
|
}
|
|
108
109
|
function logDocumentStart(context, res, options) {
|
|
109
|
-
|
|
110
|
+
const metadata = {
|
|
110
111
|
component_id: context.componentId,
|
|
111
112
|
css_link_count: countHtmlTags(context.cssLinks, "link"),
|
|
112
113
|
js_link_count: countHtmlTags(context.jsLinks, "script"),
|
|
@@ -117,7 +118,12 @@ function logDocumentStart(context, res, options) {
|
|
|
117
118
|
status: Number(res?.statusCode) || 200,
|
|
118
119
|
theme: toText(context.shell.theme || context.ui.theme),
|
|
119
120
|
viewer_id: toText(context.shell.viewer?.id),
|
|
120
|
-
}
|
|
121
|
+
};
|
|
122
|
+
if (options.logger) {
|
|
123
|
+
resolveFrontendServerLogger(options.logger).info("react.render", "rendering react document", metadata);
|
|
124
|
+
return;
|
|
125
|
+
}
|
|
126
|
+
options.log?.info?.("rendering react document", metadata);
|
|
121
127
|
}
|
|
122
128
|
export { applyScriptNonce, buildDocumentContext, countHtmlTags, defaultNormalizePageId, logDocumentStart, readResponseRequestRoute, rootDocumentProps, };
|
|
123
129
|
//# sourceMappingURL=document.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"document.js","sourceRoot":"","sources":["../../../../src/server/react/document.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,EACL,YAAY,GAEb,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"document.js","sourceRoot":"","sources":["../../../../src/server/react/document.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render.d.ts","sourceRoot":"","sources":["../../../../src/server/react/render.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,sBAAsB,EAGvB,MAAM,eAAe,CAAC;AACvB,OAAO,EACL,qBAAqB,EACtB,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"render.d.ts","sourceRoot":"","sources":["../../../../src/server/react/render.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,sBAAsB,EAGvB,MAAM,eAAe,CAAC;AACvB,OAAO,EACL,qBAAqB,EACtB,MAAM,eAAe,CAAC;AAEvB,OAAO,KAAK,EACV,4BAA4B,EAC5B,mBAAmB,EACnB,sBAAsB,EACvB,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AA2GxD,iBAAS,YAAY,CACnB,GAAG,EAAE,kBAAkB,EACvB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,OAAO,EACb,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC9B,OAAO,EAAE,4BAA4B,EACrC,UAAU,CAAC,EAAE,mBAAmB,WAgBjC;AAED,iBAAS,UAAU,CACjB,GAAG,EAAE,kBAAkB,EACvB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACnC,OAAO,EAAE,4BAA4B,EACrC,aAAa,GAAE,sBAA2B,WAiB3C;AAED,iBAAS,2BAA2B,CAAC,OAAO,EAAE,4BAA4B;;gCAG1C,GAAG,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;sBAGxD,kBAAkB,UACf,MAAM,SACP,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,kBACf,sBAAsB;wBAGhC,kBAAkB,UACf,MAAM,QACR,OAAO,eACA,MAAM,SACZ,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,eACjB,mBAAmB;EAGrC;AAED,OAAO,EACL,qBAAqB,EACrB,2BAA2B,EAC3B,sBAAsB,EACtB,UAAU,IAAI,uBAAuB,EACrC,YAAY,IAAI,yBAAyB,GAC1C,CAAC;AACF,YAAY,EACV,oBAAoB,EACpB,uBAAuB,EACvB,4BAA4B,EAC5B,mBAAmB,EACnB,sBAAsB,GACvB,MAAM,eAAe,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { withIconServerRenderer } from "../../../icons/server-context.js";
|
|
2
2
|
import { applyScriptNonce, buildDocumentContext, defaultNormalizePageId, logDocumentStart, rootDocumentProps, } from "../../../server/react/document.js";
|
|
3
3
|
import { buildReactRenderShell, } from "../../../server/react/shell.js";
|
|
4
|
+
import { resolveFrontendServerLogger } from "../../../server/logging.js";
|
|
4
5
|
function renderWithIcons(render, iconRenderer) {
|
|
5
6
|
return withIconServerRenderer(iconRenderer, render);
|
|
6
7
|
}
|
|
@@ -13,8 +14,35 @@ function timedRender(render, options) {
|
|
|
13
14
|
options.recordRender?.(Math.max(0, performance.now() - startedAt));
|
|
14
15
|
}
|
|
15
16
|
}
|
|
17
|
+
function logReactRenderInfo(options, message, metadata) {
|
|
18
|
+
if (options.logger) {
|
|
19
|
+
resolveFrontendServerLogger(options.logger).info("react.render", message, metadata);
|
|
20
|
+
return;
|
|
21
|
+
}
|
|
22
|
+
options.log?.info?.(message, metadata);
|
|
23
|
+
}
|
|
24
|
+
function timedResolve(resolve, onResolved) {
|
|
25
|
+
const startedAt = performance.now();
|
|
26
|
+
try {
|
|
27
|
+
return resolve();
|
|
28
|
+
}
|
|
29
|
+
finally {
|
|
30
|
+
onResolved(Math.max(0, performance.now() - startedAt));
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
function resolvePageComponent(componentId, options) {
|
|
34
|
+
return timedResolve(() => options.resolvePageComponent(componentId), (durationMs) => logReactRenderInfo(options, "resolved react page component", {
|
|
35
|
+
component_id: componentId,
|
|
36
|
+
duration_ms: durationMs,
|
|
37
|
+
}));
|
|
38
|
+
}
|
|
39
|
+
function resolveRootDocument(options) {
|
|
40
|
+
return timedResolve(() => options.resolveRootDocument(), (durationMs) => logReactRenderInfo(options, "resolved react root document", {
|
|
41
|
+
duration_ms: durationMs,
|
|
42
|
+
}));
|
|
43
|
+
}
|
|
16
44
|
function renderBody(componentId, props, options) {
|
|
17
|
-
return options.createElement(
|
|
45
|
+
return options.createElement(resolvePageComponent(componentId, options), props);
|
|
18
46
|
}
|
|
19
47
|
function renderFragment(component, props, options) {
|
|
20
48
|
if (!options.renderToStaticMarkup) {
|
|
@@ -31,7 +59,7 @@ function withAutoPageLang(res, propsInput) {
|
|
|
31
59
|
}
|
|
32
60
|
function sendDocument(res, pageId, body, componentId, props, options, shellInput) {
|
|
33
61
|
const context = buildDocumentContext(res, pageId, componentId, props, options, shellInput);
|
|
34
|
-
const root =
|
|
62
|
+
const root = resolveRootDocument(options);
|
|
35
63
|
logDocumentStart(context, res, options);
|
|
36
64
|
const html = timedRender(() => renderWithIcons(() => options.renderToString(options.createElement(root, rootDocumentProps(body, context, options))), options.createIconRenderer?.()), options);
|
|
37
65
|
if (typeof res.type === "function")
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render.js","sourceRoot":"","sources":["../../../../src/server/react/render.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;AACvD,OAAO,EACL,gBAAgB,EAChB,oBAAoB,EACpB,sBAAsB,EACtB,gBAAgB,EAChB,iBAAiB,GAClB,MAAM,eAAe,CAAC;AACvB,OAAO,EACL,qBAAqB,GACtB,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"render.js","sourceRoot":"","sources":["../../../../src/server/react/render.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { LoggerAdapterLogger } from "@package/logger-adapter";
|
|
1
2
|
import type { ServerResponseLike } from "../../../server/http.d.ts";
|
|
2
3
|
type FrontendRenderShell = {
|
|
3
4
|
dev?: Record<string, unknown>;
|
|
@@ -49,6 +50,7 @@ type FrontendReactRendererOptions = {
|
|
|
49
50
|
defaultUi?: Record<string, unknown> | (() => Record<string, unknown>);
|
|
50
51
|
dev?: Record<string, unknown>;
|
|
51
52
|
faviconHref?: string | ((context: FrontendDocumentContext) => string);
|
|
53
|
+
logger?: LoggerAdapterLogger;
|
|
52
54
|
log?: {
|
|
53
55
|
info?: (message: string, metadata?: Record<string, unknown>) => unknown;
|
|
54
56
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/server/react/types.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/server/react/types.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import { type FrontendServerLoggerInput } from "./logging.js";
|
|
2
|
+
type FrontendRequestLogOptions = {
|
|
3
|
+
browserProbe404Prefixes?: false | readonly string[];
|
|
4
|
+
logger?: FrontendServerLoggerInput;
|
|
5
|
+
quietSuccessRoutes?: readonly string[];
|
|
6
|
+
readLogger?: () => FrontendServerLoggerInput;
|
|
7
|
+
trustProxy?: unknown;
|
|
8
|
+
};
|
|
9
|
+
declare function attachFrontendRequestLogger(app: any, options?: FrontendRequestLogOptions): boolean;
|
|
10
|
+
export { attachFrontendRequestLogger };
|
|
11
|
+
export type { FrontendRequestLogOptions };
|
|
12
|
+
//# sourceMappingURL=request-log.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"request-log.d.ts","sourceRoot":"","sources":["../../../src/server/request-log.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,yBAAyB,EAC/B,MAAM,cAAc,CAAC;AAEtB,KAAK,yBAAyB,GAAG;IAC/B,uBAAuB,CAAC,EAAE,KAAK,GAAG,SAAS,MAAM,EAAE,CAAC;IACpD,MAAM,CAAC,EAAE,yBAAyB,CAAC;IACnC,kBAAkB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACvC,UAAU,CAAC,EAAE,MAAM,yBAAyB,CAAC;IAC7C,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB,CAAC;AAkIF,iBAAS,2BAA2B,CAClC,GAAG,EAAE,GAAG,EACR,OAAO,GAAE,yBAA8B,WAoBxC;AAED,OAAO,EAAE,2BAA2B,EAAE,CAAC;AACvC,YAAY,EAAE,yBAAyB,EAAE,CAAC"}
|
|
@@ -0,0 +1,116 @@
|
|
|
1
|
+
import { resolveFrontendServerLogger, } from "./logging.js";
|
|
2
|
+
const attachedRequestLogApps = new WeakSet();
|
|
3
|
+
const STATIC_ASSET_PREFIX_RE = /^\/(?:css|js)(?:\/|$)/i;
|
|
4
|
+
const STATIC_ASSET_FILE_RE = /\.(?:avif|css|gif|ico|jpe?g|js|json|mjs|png|svg|ttf|webp|woff2?)(?:$|[?#])/i;
|
|
5
|
+
const SOURCE_MAP_FILE_RE = /\.map(?:$|[?#])/i;
|
|
6
|
+
const DEFAULT_BROWSER_PROBE_404_PREFIXES = ["/.well-known/appspecific/"];
|
|
7
|
+
function text(value) {
|
|
8
|
+
return String(value == null ? "" : value).trim();
|
|
9
|
+
}
|
|
10
|
+
function pickClientIp(req) {
|
|
11
|
+
const forwardedFor = text(req?.headers?.["x-forwarded-for"]);
|
|
12
|
+
if (forwardedFor)
|
|
13
|
+
return text(forwardedFor.split(",")[0]);
|
|
14
|
+
const realIp = text(req?.headers?.["x-real-ip"]);
|
|
15
|
+
if (realIp)
|
|
16
|
+
return realIp;
|
|
17
|
+
return text(req?.ip || req?.connection?.remoteAddress);
|
|
18
|
+
}
|
|
19
|
+
function requestLogContext(req) {
|
|
20
|
+
return {
|
|
21
|
+
ip: pickClientIp(req),
|
|
22
|
+
method: text(req?.method).toUpperCase(),
|
|
23
|
+
startedAt: performance.now(),
|
|
24
|
+
url: text(req?.originalUrl || req?.url),
|
|
25
|
+
};
|
|
26
|
+
}
|
|
27
|
+
function requestLogPath(ctx) {
|
|
28
|
+
return ctx.url.split(/[?#]/)[0] || "/";
|
|
29
|
+
}
|
|
30
|
+
function requestLogKey(ctx) {
|
|
31
|
+
return `${ctx.method} ${requestLogPath(ctx)}`;
|
|
32
|
+
}
|
|
33
|
+
function isStaticAssetPath(pathname) {
|
|
34
|
+
return (STATIC_ASSET_PREFIX_RE.test(pathname) ||
|
|
35
|
+
pathname === "/favicon.svg" ||
|
|
36
|
+
pathname === "/favicon.ico" ||
|
|
37
|
+
STATIC_ASSET_FILE_RE.test(pathname));
|
|
38
|
+
}
|
|
39
|
+
function browserProbePrefixes(options) {
|
|
40
|
+
if (options.browserProbe404Prefixes === false)
|
|
41
|
+
return [];
|
|
42
|
+
return Array.isArray(options.browserProbe404Prefixes)
|
|
43
|
+
? [...options.browserProbe404Prefixes]
|
|
44
|
+
: DEFAULT_BROWSER_PROBE_404_PREFIXES;
|
|
45
|
+
}
|
|
46
|
+
function isQuietBrowserProbe404(pathname, options) {
|
|
47
|
+
return browserProbePrefixes(options).some((prefix) => prefix && pathname.startsWith(prefix));
|
|
48
|
+
}
|
|
49
|
+
function shouldSkipFinishedRequestLog(ctx, status, options) {
|
|
50
|
+
const pathname = requestLogPath(ctx);
|
|
51
|
+
if (status === 404 && SOURCE_MAP_FILE_RE.test(pathname))
|
|
52
|
+
return true;
|
|
53
|
+
if (status === 404 && isQuietBrowserProbe404(pathname, options))
|
|
54
|
+
return true;
|
|
55
|
+
if (status < 200 || status >= 400)
|
|
56
|
+
return false;
|
|
57
|
+
if (isStaticAssetPath(pathname))
|
|
58
|
+
return true;
|
|
59
|
+
return new Set(options.quietSuccessRoutes || []).has(requestLogKey(ctx));
|
|
60
|
+
}
|
|
61
|
+
function requestLogMeta(ctx, status, outcome) {
|
|
62
|
+
return {
|
|
63
|
+
ip: ctx.ip,
|
|
64
|
+
method: ctx.method,
|
|
65
|
+
url: ctx.url,
|
|
66
|
+
status,
|
|
67
|
+
outcome,
|
|
68
|
+
duration_ms: Math.max(0, Math.round(performance.now() - ctx.startedAt)),
|
|
69
|
+
};
|
|
70
|
+
}
|
|
71
|
+
function readRequestLogger(options) {
|
|
72
|
+
return resolveFrontendServerLogger(options.readLogger?.() || options.logger);
|
|
73
|
+
}
|
|
74
|
+
function logFinishedRequest(res, ctx, options) {
|
|
75
|
+
const status = Number(res?.statusCode || 0);
|
|
76
|
+
if (shouldSkipFinishedRequestLog(ctx, status, options))
|
|
77
|
+
return;
|
|
78
|
+
const ok = status >= 200 && status < 400;
|
|
79
|
+
const outcome = ok ? "success" : "fail";
|
|
80
|
+
const msg = `${ctx.ip} ${ctx.method} ${ctx.url} ${status} ${outcome}`;
|
|
81
|
+
const logger = readRequestLogger(options);
|
|
82
|
+
const meta = requestLogMeta(ctx, status, outcome);
|
|
83
|
+
if (ok)
|
|
84
|
+
logger.log("success", "client.http", msg, meta);
|
|
85
|
+
else if (status >= 500)
|
|
86
|
+
logger.fail("client.http", msg, meta);
|
|
87
|
+
else
|
|
88
|
+
logger.warn("client.http", msg, meta);
|
|
89
|
+
}
|
|
90
|
+
function logClosedRequest(res, ctx, options) {
|
|
91
|
+
if (res?.writableEnded)
|
|
92
|
+
return;
|
|
93
|
+
if (isStaticAssetPath(requestLogPath(ctx)))
|
|
94
|
+
return;
|
|
95
|
+
readRequestLogger(options).warn("client.http", `${ctx.ip} ${ctx.method} ${ctx.url} closed fail`, requestLogMeta(ctx, Number(res?.statusCode || 0), "fail"));
|
|
96
|
+
}
|
|
97
|
+
function attachFrontendRequestLogger(app, options = {}) {
|
|
98
|
+
if (!app || typeof app.use !== "function")
|
|
99
|
+
return false;
|
|
100
|
+
if (attachedRequestLogApps.has(app))
|
|
101
|
+
return false;
|
|
102
|
+
attachedRequestLogApps.add(app);
|
|
103
|
+
if (Object.prototype.hasOwnProperty.call(options, "trustProxy") &&
|
|
104
|
+
typeof app.set === "function") {
|
|
105
|
+
app.set("trust proxy", options.trustProxy);
|
|
106
|
+
}
|
|
107
|
+
app.use((req, res, next) => {
|
|
108
|
+
const ctx = requestLogContext(req);
|
|
109
|
+
res.on("finish", () => logFinishedRequest(res, ctx, options));
|
|
110
|
+
res.on("close", () => logClosedRequest(res, ctx, options));
|
|
111
|
+
next();
|
|
112
|
+
});
|
|
113
|
+
return true;
|
|
114
|
+
}
|
|
115
|
+
export { attachFrontendRequestLogger };
|
|
116
|
+
//# sourceMappingURL=request-log.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"request-log.js","sourceRoot":"","sources":["../../../src/server/request-log.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@trebired/frontend",
|
|
3
|
-
"version": "6.
|
|
3
|
+
"version": "6.16.0",
|
|
4
4
|
"description": "Generic browser runtime systems for Trebired frontend packages and applications.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"private": false,
|
|
@@ -51,7 +51,7 @@
|
|
|
51
51
|
"verify:pack": "bun ./scripts/verify/pack.mjs"
|
|
52
52
|
},
|
|
53
53
|
"dependencies": {
|
|
54
|
-
"@package/logger-adapter": "npm:@trebired/logger-adapter@^0.4.
|
|
54
|
+
"@package/logger-adapter": "npm:@trebired/logger-adapter@^0.4.9",
|
|
55
55
|
"chart.js": "^4.5.1",
|
|
56
56
|
"country-flag-icons": "^1.6.20",
|
|
57
57
|
"cropperjs": "^1.6.2",
|