@tracepanel/js 0.11.0 → 0.13.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/README.md +8 -1
- package/dist/body.d.ts +33 -1
- package/dist/body.js +82 -6
- package/dist/body.js.map +1 -1
- package/dist/browser.d.ts +13 -0
- package/dist/browser.js +58 -3
- package/dist/browser.js.map +1 -1
- package/dist/bun.js +5 -2
- package/dist/bun.js.map +1 -1
- package/dist/config.d.ts +8 -0
- package/dist/config.js +9 -0
- package/dist/config.js.map +1 -1
- package/dist/explain.js +4 -1
- package/dist/explain.js.map +1 -1
- package/dist/explainable.d.ts +7 -0
- package/dist/explainable.js +195 -0
- package/dist/explainable.js.map +1 -0
- package/dist/express.js +12 -5
- package/dist/express.js.map +1 -1
- package/dist/fastify.js +7 -2
- package/dist/fastify.js.map +1 -1
- package/dist/headers.js +20 -5
- package/dist/headers.js.map +1 -1
- package/dist/hono.js +5 -2
- package/dist/hono.js.map +1 -1
- package/dist/koa.js +11 -4
- package/dist/koa.js.map +1 -1
- package/dist/processor.d.ts +21 -0
- package/dist/processor.js +62 -4
- package/dist/processor.js.map +1 -1
- package/dist/request.d.ts +13 -3
- package/dist/request.js +43 -20
- package/dist/request.js.map +1 -1
- package/dist/respond.d.ts +2 -2
- package/dist/respond.js +28 -8
- package/dist/respond.js.map +1 -1
- package/dist/response-body.d.ts +66 -0
- package/dist/response-body.js +269 -0
- package/dist/response-body.js.map +1 -0
- package/dist/runtime.js +2 -0
- package/dist/runtime.js.map +1 -1
- package/dist/setup.js +6 -0
- package/dist/setup.js.map +1 -1
- package/dist/sqlite.js +8 -3
- package/dist/sqlite.js.map +1 -1
- package/dist/transactions.d.ts +4 -0
- package/dist/transactions.js +20 -2
- package/dist/transactions.js.map +1 -1
- package/dist/widget.d.ts +8 -3
- package/dist/widget.js +11 -4
- package/dist/widget.js.map +1 -1
- package/package.json +2 -2
package/dist/explain.js
CHANGED
|
@@ -5,8 +5,9 @@
|
|
|
5
5
|
// its settings (the password among them), and EXPLAIN opens one of its own with them, so it never runs inside the
|
|
6
6
|
// app's transaction. Whatever EXPLAIN ANALYZE does is rolled back. A SQLite database (sqlite.ts) is explained on the
|
|
7
7
|
// app's own connection, the last one that queried that file: EXPLAIN QUERY PLAN only plans, and the connection is
|
|
8
|
-
// the app's thread's, between its statements.
|
|
8
|
+
// the app's thread's, between its statements. Only an explainable statement runs, the agent's rule (explainable.ts).
|
|
9
9
|
import { InstrumentationBase, InstrumentationNodeModuleDefinition, InstrumentationNodeModuleFile, } from "@opentelemetry/instrumentation";
|
|
10
|
+
import { checkExplain } from "./explainable.js";
|
|
10
11
|
import { commonJs } from "./transactions.js";
|
|
11
12
|
const DATABASES = new Map();
|
|
12
13
|
/** The first connection to a database is remembered; a SQLite one's last, as the app may have closed the others. */
|
|
@@ -69,6 +70,8 @@ function databaseFor(request) {
|
|
|
69
70
|
return exact ?? (candidates.length === 1 ? candidates[0] : undefined);
|
|
70
71
|
}
|
|
71
72
|
export async function explain(request) {
|
|
73
|
+
// Only the agent's EXPLAIN of a statement that reads (explainable.ts): SQLite's runs on the app's own connection.
|
|
74
|
+
checkExplain(request.sql, request.vendor === "mariadb" ? "mysql" : request.vendor);
|
|
72
75
|
const database = databaseFor(request);
|
|
73
76
|
if (!database)
|
|
74
77
|
throw new Error(`The app has queried no ${request.vendor} database it can run EXPLAIN on.`);
|
package/dist/explain.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"explain.js","sourceRoot":"","sources":["../src/explain.ts"],"names":[],"mappings":"AAAA,oHAAoH;AACpH,6GAA6G;AAC7G,EAAE;AACF,kHAAkH;AAClH,kHAAkH;AAClH,qHAAqH;AACrH,kHAAkH;AAClH,
|
|
1
|
+
{"version":3,"file":"explain.js","sourceRoot":"","sources":["../src/explain.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
/** Why a statement isn't explained (or with `analyze`, analyzed), or null when it is. */
|
|
2
|
+
export declare function explainRefusal(statement: string, analyze: boolean): string | null;
|
|
3
|
+
/**
|
|
4
|
+
* What the agent asks to run, checked: the EXPLAIN it wrote for this database before an explainable statement. Throws
|
|
5
|
+
* with the reason otherwise; the agent's console shows it.
|
|
6
|
+
*/
|
|
7
|
+
export declare function checkExplain(sql: string, vendor: string): void;
|
|
@@ -0,0 +1,195 @@
|
|
|
1
|
+
// Which statements EXPLAIN may run, the rule the agent, its console and every SDK share: a SELECT, or a WITH whose
|
|
2
|
+
// CTEs and final statement only read. Its words are read outside quoted strings and names and comments, so a keyword
|
|
3
|
+
// in a string changes nothing.
|
|
4
|
+
//
|
|
5
|
+
// - It starts (after its comments) with SELECT, or with WITH and ends in a SELECT.
|
|
6
|
+
// - It is one statement: nothing follows a `;` but comments.
|
|
7
|
+
// - No INSERT, UPDATE, DELETE or MERGE anywhere (a data-modifying CTE) and no INTO (`SELECT … INTO` makes a table).
|
|
8
|
+
// - ANALYZE runs it, so a SELECT that locks rows (`FOR UPDATE`, `FOR SHARE`, `LOCK IN SHARE MODE`) is explained but
|
|
9
|
+
// not analyzed. ANALYZE runs in a transaction that is rolled back (explain.ts).
|
|
10
|
+
const NOT_SELECT = "Only SELECT statements can be explained.";
|
|
11
|
+
const ONE_STATEMENT = "Only one statement can be explained at a time.";
|
|
12
|
+
const CHANGING = new Set(["INSERT", "UPDATE", "DELETE", "MERGE"]);
|
|
13
|
+
/** What can follow a WITH's CTEs: the statement they are for. */
|
|
14
|
+
const MAIN = new Set(["SELECT", "INSERT", "UPDATE", "DELETE", "MERGE", "VALUES", "TABLE"]);
|
|
15
|
+
const changes = (what) => `This query changes data (${what}): it isn't explained.`;
|
|
16
|
+
/** Why a statement isn't explained (or with `analyze`, analyzed), or null when it is. */
|
|
17
|
+
export function explainRefusal(statement, analyze) {
|
|
18
|
+
const tokens = tokenize(statement);
|
|
19
|
+
const words = tokens.map((token) => (token.word ? token.text : ""));
|
|
20
|
+
let withClause;
|
|
21
|
+
if (words[0] === "SELECT")
|
|
22
|
+
withClause = false;
|
|
23
|
+
else if (words[0] === "WITH")
|
|
24
|
+
withClause = true;
|
|
25
|
+
else
|
|
26
|
+
return NOT_SELECT;
|
|
27
|
+
const end = tokens.findIndex((token) => token.depth === 0 && !token.word && token.text === ";");
|
|
28
|
+
if (end >= 0 && end + 1 < tokens.length)
|
|
29
|
+
return ONE_STATEMENT;
|
|
30
|
+
const main = withClause ? tokens.findIndex((token) => token.word && token.depth === 0 && MAIN.has(token.text)) : 0;
|
|
31
|
+
const previous = (at) => (at > 0 ? (words[at - 1] ?? "") : "");
|
|
32
|
+
const lock = (at) => previous(at) === "FOR" || previous(at) === "KEY";
|
|
33
|
+
for (const [at, word] of words.entries()) {
|
|
34
|
+
if (CHANGING.has(word) && !(word === "UPDATE" && lock(at))) {
|
|
35
|
+
const inside = withClause && (main < 0 || at < main) ? " inside WITH" : "";
|
|
36
|
+
return changes(`${word}${inside}`);
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
if (words.includes("INTO"))
|
|
40
|
+
return changes("SELECT INTO");
|
|
41
|
+
if (main < 0 || words[main] !== "SELECT")
|
|
42
|
+
return NOT_SELECT;
|
|
43
|
+
if (!analyze)
|
|
44
|
+
return null;
|
|
45
|
+
for (const [at, word] of words.entries()) {
|
|
46
|
+
let locks = null;
|
|
47
|
+
if (word === "UPDATE" && lock(at))
|
|
48
|
+
locks = "FOR UPDATE";
|
|
49
|
+
else if (word === "SHARE" && lock(at))
|
|
50
|
+
locks = "FOR SHARE";
|
|
51
|
+
else if (word === "SHARE" && previous(at) === "IN" && words[at - 2] === "LOCK")
|
|
52
|
+
locks = "LOCK IN SHARE MODE";
|
|
53
|
+
if (locks)
|
|
54
|
+
return `This query locks rows (${locks}): it can be explained, not analyzed.`;
|
|
55
|
+
}
|
|
56
|
+
return null;
|
|
57
|
+
}
|
|
58
|
+
const isLetter = (char) => char !== undefined && /\p{L}/u.test(char);
|
|
59
|
+
const isWordChar = (char) => char !== undefined && /[\p{L}\p{N}_$]/u.test(char);
|
|
60
|
+
/**
|
|
61
|
+
* The statement's tokens, without its comments and spaces: a quoted string or name (`'…'` with `''`, `E'…'` with
|
|
62
|
+
* backslashes too, `"…"`, `` `…` ``, `[…]`, PostgreSQL's `$tag$…$tag$`) is one token whose text is never read. The
|
|
63
|
+
* inside of MySQL's `/*! … *\/`, which MySQL runs, is read as the statement.
|
|
64
|
+
*/
|
|
65
|
+
function tokenize(statement) {
|
|
66
|
+
const chars = [...statement];
|
|
67
|
+
const tokens = [];
|
|
68
|
+
let depth = 0;
|
|
69
|
+
let at = 0;
|
|
70
|
+
while (at < chars.length) {
|
|
71
|
+
const char = chars[at];
|
|
72
|
+
const next = chars[at + 1];
|
|
73
|
+
let text;
|
|
74
|
+
let word = false;
|
|
75
|
+
if (/\s/u.test(char)) {
|
|
76
|
+
at += 1;
|
|
77
|
+
continue;
|
|
78
|
+
}
|
|
79
|
+
else if (char === "-" && next === "-") {
|
|
80
|
+
at = past(chars, at + 2, ["\n"]);
|
|
81
|
+
continue;
|
|
82
|
+
}
|
|
83
|
+
else if (char === "/" && next === "*") {
|
|
84
|
+
at = chars[at + 2] === "!" ? at + 3 : past(chars, at + 2, ["*", "/"]);
|
|
85
|
+
continue;
|
|
86
|
+
}
|
|
87
|
+
else if (char === "'") {
|
|
88
|
+
// E'…' (PostgreSQL's escape string): a backslash escapes the next character.
|
|
89
|
+
const last = tokens.at(-1);
|
|
90
|
+
const escapes = at > 0 && /[Ee]/.test(chars[at - 1]) && last?.word === true && last.text === "E";
|
|
91
|
+
at = quoted(chars, at, "'", escapes);
|
|
92
|
+
text = "'";
|
|
93
|
+
}
|
|
94
|
+
else if (char === '"' || char === "`") {
|
|
95
|
+
at = quoted(chars, at, char, false);
|
|
96
|
+
text = char;
|
|
97
|
+
}
|
|
98
|
+
else if (char === "[" && (isLetter(next) || next === "_")) {
|
|
99
|
+
at = past(chars, at + 1, ["]"]);
|
|
100
|
+
text = "[";
|
|
101
|
+
}
|
|
102
|
+
else if (char === "$" && dollarTag(chars, at)) {
|
|
103
|
+
const tag = dollarTag(chars, at);
|
|
104
|
+
at = past(chars, at + tag.length, tag);
|
|
105
|
+
text = "$";
|
|
106
|
+
}
|
|
107
|
+
else if (isLetter(char) || char === "_") {
|
|
108
|
+
const start = at;
|
|
109
|
+
while (isWordChar(chars[at]))
|
|
110
|
+
at += 1;
|
|
111
|
+
text = chars.slice(start, at).join("").toUpperCase();
|
|
112
|
+
word = true;
|
|
113
|
+
}
|
|
114
|
+
else if (/[0-9]/.test(char)) {
|
|
115
|
+
while (chars[at] !== undefined && /[\p{L}\p{N}_.]/u.test(chars[at]))
|
|
116
|
+
at += 1;
|
|
117
|
+
text = "0";
|
|
118
|
+
}
|
|
119
|
+
else {
|
|
120
|
+
at += 1;
|
|
121
|
+
text = char;
|
|
122
|
+
}
|
|
123
|
+
if (!word && text === ")")
|
|
124
|
+
depth = Math.max(0, depth - 1);
|
|
125
|
+
tokens.push({ text, word, depth });
|
|
126
|
+
if (!word && text === "(")
|
|
127
|
+
depth += 1;
|
|
128
|
+
}
|
|
129
|
+
return tokens;
|
|
130
|
+
}
|
|
131
|
+
/** Where a quote opened at `at` ends: past its closing `quote` (doubled, it is one inside), or the statement's end. */
|
|
132
|
+
function quoted(chars, at, quote, escapes) {
|
|
133
|
+
let i = at + 1;
|
|
134
|
+
while (i < chars.length) {
|
|
135
|
+
const char = chars[i];
|
|
136
|
+
if (escapes && char === "\\")
|
|
137
|
+
i += 2;
|
|
138
|
+
else if (char === quote && chars[i + 1] === quote)
|
|
139
|
+
i += 2;
|
|
140
|
+
else if (char === quote)
|
|
141
|
+
return i + 1;
|
|
142
|
+
else
|
|
143
|
+
i += 1;
|
|
144
|
+
}
|
|
145
|
+
return chars.length;
|
|
146
|
+
}
|
|
147
|
+
/** Past the first `end` from `from` on, or the statement's end. */
|
|
148
|
+
function past(chars, from, end) {
|
|
149
|
+
for (let i = from; i < chars.length; i += 1) {
|
|
150
|
+
if (end.every((char, offset) => chars[i + offset] === char))
|
|
151
|
+
return i + end.length;
|
|
152
|
+
}
|
|
153
|
+
return chars.length;
|
|
154
|
+
}
|
|
155
|
+
/** PostgreSQL's dollar quote opening at `at`: `$$` or `$tag$` (not a `$1` parameter). */
|
|
156
|
+
function dollarTag(chars, at) {
|
|
157
|
+
for (let end = at + 1; end < chars.length; end += 1) {
|
|
158
|
+
const char = chars[end];
|
|
159
|
+
if (char === "$")
|
|
160
|
+
return chars.slice(at, end + 1);
|
|
161
|
+
const first = end === at + 1;
|
|
162
|
+
if (!(isLetter(char) || char === "_" || (!first && /[0-9]/.test(char))))
|
|
163
|
+
return null;
|
|
164
|
+
}
|
|
165
|
+
return null;
|
|
166
|
+
}
|
|
167
|
+
/** The EXPLAIN the agent writes before a statement, for each database: whether it analyzes, by its prefix. */
|
|
168
|
+
const AGENT_PREFIXES = {
|
|
169
|
+
sqlite: [[/^\s*EXPLAIN\s+QUERY\s+PLAN\s+/i, false]],
|
|
170
|
+
postgresql: [
|
|
171
|
+
[/^\s*EXPLAIN\s+\(ANALYZE,\s*BUFFERS\)\s+/i, true],
|
|
172
|
+
[/^\s*EXPLAIN\s+/i, false],
|
|
173
|
+
],
|
|
174
|
+
mysql: [
|
|
175
|
+
[/^\s*EXPLAIN\s+ANALYZE\s+/i, true],
|
|
176
|
+
[/^\s*EXPLAIN\s+/i, false],
|
|
177
|
+
],
|
|
178
|
+
};
|
|
179
|
+
/**
|
|
180
|
+
* What the agent asks to run, checked: the EXPLAIN it wrote for this database before an explainable statement. Throws
|
|
181
|
+
* with the reason otherwise; the agent's console shows it.
|
|
182
|
+
*/
|
|
183
|
+
export function checkExplain(sql, vendor) {
|
|
184
|
+
for (const [prefix, analyze] of AGENT_PREFIXES[vendor] ?? []) {
|
|
185
|
+
const match = prefix.exec(sql);
|
|
186
|
+
if (!match)
|
|
187
|
+
continue;
|
|
188
|
+
const refusal = explainRefusal(sql.slice(match[0].length), analyze);
|
|
189
|
+
if (refusal)
|
|
190
|
+
throw new Error(refusal);
|
|
191
|
+
return;
|
|
192
|
+
}
|
|
193
|
+
throw new Error(NOT_SELECT);
|
|
194
|
+
}
|
|
195
|
+
//# sourceMappingURL=explainable.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"explainable.js","sourceRoot":"","sources":["../src/explainable.ts"],"names":[],"mappings":"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"}
|
package/dist/express.js
CHANGED
|
@@ -7,8 +7,9 @@
|
|
|
7
7
|
// body from the stream itself (GraphQL Yoga) has it recorded as it read it. One that writes its headers itself with
|
|
8
8
|
// `res.writeHead()` before its body (Yoga, a Node handler under `app.use()`) gets the badge's headers then, and its
|
|
9
9
|
// HTML page no script.
|
|
10
|
-
import { tapIncoming, tapOf } from "./body.js";
|
|
10
|
+
import { tapIncoming, tapOf, tapsBody } from "./body.js";
|
|
11
11
|
import { hasBody, parsedBody, redirectCookie, requestAttrs, responseHeaders, searchOf } from "./request.js";
|
|
12
|
+
import { addedToResponse } from "./response-body.js";
|
|
12
13
|
import { runtime } from "./runtime.js";
|
|
13
14
|
import { expressSession } from "./session.js";
|
|
14
15
|
import { badge, exposedHeaders, inject, Stream, streamablePage } from "./widget.js";
|
|
@@ -57,7 +58,8 @@ export function tracepanel() {
|
|
|
57
58
|
}
|
|
58
59
|
tp.processor.setFramework("Express");
|
|
59
60
|
// A handler may read the body from the stream itself: its pieces pass the tap on their way.
|
|
60
|
-
|
|
61
|
+
// Its GraphQL operation is read from it too (body.ts).
|
|
62
|
+
if (tapsBody(tp.config.captureRequest, req.headers) && !req.readableEnded && !tapOf(req))
|
|
61
63
|
tapIncoming(req);
|
|
62
64
|
const startedMs = performance.now();
|
|
63
65
|
const chunks = [];
|
|
@@ -107,8 +109,9 @@ export function tracepanel() {
|
|
|
107
109
|
}
|
|
108
110
|
const page = streamablePage((name) => res.getHeader(name));
|
|
109
111
|
const tag = mark(page);
|
|
112
|
+
// The script isn't the app's: its size isn't counted in the page's.
|
|
110
113
|
if (page && tag)
|
|
111
|
-
script = new Stream(tag);
|
|
114
|
+
script = new Stream(tag, (bytes) => addedToResponse(res, bytes));
|
|
112
115
|
};
|
|
113
116
|
// A handler that writes its headers itself, before its body: the badge's go with them. Headers passed here join
|
|
114
117
|
// the response's own first, so a CORS one among them exposes the badge's.
|
|
@@ -176,8 +179,12 @@ export function tracepanel() {
|
|
|
176
179
|
let body = Buffer.concat(chunks);
|
|
177
180
|
const page = String(res.getHeader("content-type") ?? "").includes("text/html");
|
|
178
181
|
const tag = mark(page);
|
|
179
|
-
if (tag)
|
|
180
|
-
|
|
182
|
+
if (tag) {
|
|
183
|
+
const injected = Buffer.from(inject(body.toString("utf8"), tag));
|
|
184
|
+
// The script isn't the app's: its size isn't counted in the page's.
|
|
185
|
+
addedToResponse(res, injected.length - body.length);
|
|
186
|
+
body = injected;
|
|
187
|
+
}
|
|
181
188
|
if (!res.getHeader("transfer-encoding"))
|
|
182
189
|
res.setHeader("Content-Length", body.length);
|
|
183
190
|
return end(body, callback);
|
package/dist/express.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"express.js","sourceRoot":"","sources":["../src/express.ts"],"names":[],"mappings":"AAAA,mHAAmH;AACnH,oHAAoH;AACpH,mHAAmH;AACnH,kHAAkH;AAClH,8IAA8I;AAC9I,qHAAqH;AACrH,oHAAoH;AACpH,oHAAoH;AACpH,uBAAuB;AAIvB,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"express.js","sourceRoot":"","sources":["../src/express.ts"],"names":[],"mappings":"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"}
|
package/dist/fastify.js
CHANGED
|
@@ -8,6 +8,7 @@
|
|
|
8
8
|
// Fastify's own OpenTelemetry instrumentation is deprecated, and @fastify/otel is a plugin to register too, with a span
|
|
9
9
|
// for every hook: this plugin needs nothing but Fastify's hooks.
|
|
10
10
|
import { hasBody, parsedBody, requestAttrs, responseHeaders, searchOf } from "./request.js";
|
|
11
|
+
import { addedToResponse } from "./response-body.js";
|
|
11
12
|
import { runtime } from "./runtime.js";
|
|
12
13
|
import { expressSession } from "./session.js";
|
|
13
14
|
import { madeAt } from "./stack.js";
|
|
@@ -82,9 +83,13 @@ export function tracepanel() {
|
|
|
82
83
|
reply.header("set-cookie", marks.cookie);
|
|
83
84
|
if (!page || !marks.script)
|
|
84
85
|
return payload;
|
|
86
|
+
// The script isn't the app's: its size isn't counted in the page's.
|
|
87
|
+
const added = (bytes) => addedToResponse(reply.raw, bytes);
|
|
85
88
|
if (isStream(payload))
|
|
86
|
-
return streamWith(payload, marks.script);
|
|
87
|
-
const
|
|
89
|
+
return streamWith(payload, marks.script, added);
|
|
90
|
+
const sent = Buffer.isBuffer(payload) ? payload.toString("utf8") : payload;
|
|
91
|
+
const body = inject(sent, marks.script);
|
|
92
|
+
added(Buffer.byteLength(body) - Buffer.byteLength(sent));
|
|
88
93
|
if (header("content-length") !== undefined)
|
|
89
94
|
reply.header("content-length", Buffer.byteLength(body));
|
|
90
95
|
return body;
|
package/dist/fastify.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fastify.js","sourceRoot":"","sources":["../src/fastify.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"fastify.js","sourceRoot":"","sources":["../src/fastify.ts"],"names":[],"mappings":"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"}
|
package/dist/headers.js
CHANGED
|
@@ -3,15 +3,20 @@
|
|
|
3
3
|
// the request carried goes into its trace (headers, query, cookies, the body as far as the framework read it for the
|
|
4
4
|
// app), with the response's headers; and a redirect that answers a page's navigation sets the cookie that shows it in
|
|
5
5
|
// the next page's panel. A request's body is tapped as the server hands the request over: the framework reads it from
|
|
6
|
-
// the stream, and its pieces pass the tap on their way (body.ts).
|
|
6
|
+
// the stream, and its pieces pass the tap on their way (body.ts). Its response's body is tapped then too, on its way
|
|
7
|
+
// out, and the trace reads it as it ends (response-body.ts).
|
|
7
8
|
import http, { ServerResponse } from "node:http";
|
|
8
9
|
import https from "node:https";
|
|
9
|
-
import { tapIncoming, tapOf } from "./body.js";
|
|
10
|
-
import {
|
|
10
|
+
import { incomingOperation, tapIncoming, tapOf, tapsBody } from "./body.js";
|
|
11
|
+
import { redirectCookie, requestAttrs, responseHeaders, searchOf } from "./request.js";
|
|
12
|
+
import { capturesResponse, tapResponse } from "./response-body.js";
|
|
11
13
|
import { exposedHeaders } from "./widget.js";
|
|
12
14
|
const PATCHED = Symbol.for("tracepanel.headers");
|
|
13
15
|
const TAPPING = Symbol.for("tracepanel.body.tapping");
|
|
14
|
-
/**
|
|
16
|
+
/**
|
|
17
|
+
* The app's HTTP servers (made before this runs too) tap the body of each request that has one, and of each response
|
|
18
|
+
* when bodies are recorded.
|
|
19
|
+
*/
|
|
15
20
|
function tapBodies(tracepanel) {
|
|
16
21
|
for (const prototype of [http.Server.prototype, https.Server.prototype]) {
|
|
17
22
|
const server = prototype;
|
|
@@ -21,9 +26,12 @@ function tapBodies(tracepanel) {
|
|
|
21
26
|
const emit = server.emit;
|
|
22
27
|
server.emit = function (event, ...args) {
|
|
23
28
|
const req = args[0];
|
|
24
|
-
if (event === "request" && req && tracepanel.config.captureRequest
|
|
29
|
+
if (event === "request" && req && tapsBody(tracepanel.config.captureRequest, req.headers) && !tapOf(req)) {
|
|
25
30
|
tapIncoming(req);
|
|
26
31
|
}
|
|
32
|
+
const res = args[1];
|
|
33
|
+
if (event === "request" && res && capturesResponse(tracepanel))
|
|
34
|
+
tapResponse(res);
|
|
27
35
|
return emit.call(this, event, ...args);
|
|
28
36
|
};
|
|
29
37
|
}
|
|
@@ -43,6 +51,13 @@ export function headersOnResponses(tracepanel, framework) {
|
|
|
43
51
|
// Headers passed to writeHead itself (an object) count too: CORS middleware often sets them there.
|
|
44
52
|
const given = [args[1], args[2]].find((arg) => arg !== null && typeof arg === "object" && !Array.isArray(arg));
|
|
45
53
|
const passed = (given ?? {});
|
|
54
|
+
const read = this.req ? incomingOperation(this.req) : undefined;
|
|
55
|
+
if (read)
|
|
56
|
+
tracepanel.processor.readOperation(read, { method, url });
|
|
57
|
+
if (capturesResponse(tracepanel) && this.req) {
|
|
58
|
+
const tap = tapResponse(this);
|
|
59
|
+
tracepanel.processor.readResponse(() => tap.attrs(), { method, url });
|
|
60
|
+
}
|
|
46
61
|
if (tracepanel.config.captureRequest && this.req) {
|
|
47
62
|
// Before the badge: a response sent outside the request's context finds its trace by the URL until then.
|
|
48
63
|
tracepanel.processor.setTraceAttrs({
|
package/dist/headers.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"headers.js","sourceRoot":"","sources":["../src/headers.ts"],"names":[],"mappings":"AAAA,qHAAqH;AACrH,oHAAoH;AACpH,qHAAqH;AACrH,sHAAsH;AACtH,sHAAsH;AACtH,
|
|
1
|
+
{"version":3,"file":"headers.js","sourceRoot":"","sources":["../src/headers.ts"],"names":[],"mappings":"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"}
|
package/dist/hono.js
CHANGED
|
@@ -9,7 +9,7 @@
|
|
|
9
9
|
// Hono matches a request before its middleware run: the handler is the last of the routes it matched that is not
|
|
10
10
|
// middleware, and its span holds what runs after this middleware (the others the route has, then the handler).
|
|
11
11
|
import { matchedRoutes } from "hono/route";
|
|
12
|
-
import { tapRequest } from "./body.js";
|
|
12
|
+
import { fetchOperation, tapRequest, tapsFetchBody } from "./body.js";
|
|
13
13
|
import { MARKED, marked } from "./respond.js";
|
|
14
14
|
import { runtime } from "./runtime.js";
|
|
15
15
|
import { inView, recordError, wasRecorded } from "./view.js";
|
|
@@ -35,7 +35,10 @@ export function tracepanel() {
|
|
|
35
35
|
const startedMs = performance.now();
|
|
36
36
|
const request = c.req.raw;
|
|
37
37
|
const marking = !request[MARKED];
|
|
38
|
-
const body = marking && tp.config.captureRequest ? tapRequest(request) : undefined;
|
|
38
|
+
const body = marking && tapsFetchBody(tp.config.captureRequest, request) ? tapRequest(request) : undefined;
|
|
39
|
+
const operation = marking ? fetchOperation(request, body) : undefined;
|
|
40
|
+
if (operation)
|
|
41
|
+
tp.processor.readOperation(operation);
|
|
39
42
|
const route = handlerRoute(c);
|
|
40
43
|
if (route) {
|
|
41
44
|
tp.processor.setRoute(route);
|
package/dist/hono.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hono.js","sourceRoot":"","sources":["../src/hono.ts"],"names":[],"mappings":"AAAA,wHAAwH;AACxH,sHAAsH;AACtH,oHAAoH;AACpH,qHAAqH;AACrH,oHAAoH;AACpH,sHAAsH;AACtH,6BAA6B;AAC7B,EAAE;AACF,iHAAiH;AACjH,+GAA+G;AAG/G,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"hono.js","sourceRoot":"","sources":["../src/hono.ts"],"names":[],"mappings":"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"}
|
package/dist/koa.js
CHANGED
|
@@ -9,6 +9,7 @@
|
|
|
9
9
|
// and the routers nested in them), each route's last function its handler. OpenTelemetry's Koa instrumentation does
|
|
10
10
|
// the same from Koa's `use()`, once, with a span for each middleware besides; here the routes added later count too.
|
|
11
11
|
import { hasBody, parsedBody, requestAttrs, responseHeaders, searchOf } from "./request.js";
|
|
12
|
+
import { addedToResponse } from "./response-body.js";
|
|
12
13
|
import { runtime } from "./runtime.js";
|
|
13
14
|
import { expressSession } from "./session.js";
|
|
14
15
|
import { inView, statusOf, wasRecorded } from "./view.js";
|
|
@@ -110,10 +111,16 @@ export function tracepanel() {
|
|
|
110
111
|
if (!page || !marks.script)
|
|
111
112
|
return;
|
|
112
113
|
// Koa sets the new body's Content-Length, and leaves a stream's out.
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
ctx.body =
|
|
114
|
+
// The script isn't the app's: its size isn't counted in the page's.
|
|
115
|
+
const added = (bytes) => addedToResponse(ctx.res, bytes);
|
|
116
|
+
if (isStream(body)) {
|
|
117
|
+
ctx.body = streamWith(body, marks.script, added);
|
|
118
|
+
return;
|
|
119
|
+
}
|
|
120
|
+
const sent = Buffer.isBuffer(body) ? body.toString("utf8") : body;
|
|
121
|
+
const injected = inject(sent, marks.script);
|
|
122
|
+
added(Buffer.byteLength(injected) - Buffer.byteLength(sent));
|
|
123
|
+
ctx.body = injected;
|
|
117
124
|
};
|
|
118
125
|
}
|
|
119
126
|
//# sourceMappingURL=koa.js.map
|
package/dist/koa.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"koa.js","sourceRoot":"","sources":["../src/koa.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"koa.js","sourceRoot":"","sources":["../src/koa.ts"],"names":[],"mappings":"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"}
|