@plumix/core 0.4.0 → 0.6.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/dist/auth/authenticator.d.ts +8 -1
- package/dist/auth/authenticator.d.ts.map +1 -1
- package/dist/auth/authenticator.js +15 -0
- package/dist/auth/authenticator.js.map +1 -1
- package/dist/auth/bearer.js +2 -2
- package/dist/auth/bearer.js.map +1 -1
- package/dist/cache/decision.d.ts +7 -3
- package/dist/cache/decision.d.ts.map +1 -1
- package/dist/cache/decision.js +8 -6
- package/dist/cache/decision.js.map +1 -1
- package/dist/cache/read-through.d.ts +3 -0
- package/dist/cache/read-through.d.ts.map +1 -1
- package/dist/cache/read-through.js +14 -7
- package/dist/cache/read-through.js.map +1 -1
- package/dist/config.d.ts +9 -0
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +1 -0
- package/dist/config.js.map +1 -1
- package/dist/context/app.d.ts +50 -6
- package/dist/context/app.d.ts.map +1 -1
- package/dist/context/app.js +51 -12
- package/dist/context/app.js.map +1 -1
- package/dist/context/collector.d.ts +9 -0
- package/dist/context/collector.d.ts.map +1 -0
- package/dist/context/collector.js +130 -0
- package/dist/context/collector.js.map +1 -0
- package/dist/context/index.d.ts +1 -0
- package/dist/context/index.d.ts.map +1 -1
- package/dist/context/index.js +1 -0
- package/dist/context/index.js.map +1 -1
- package/dist/context/memo.d.ts +22 -0
- package/dist/context/memo.d.ts.map +1 -0
- package/dist/context/memo.js +27 -0
- package/dist/context/memo.js.map +1 -0
- package/dist/context/stores.d.ts +2 -9
- package/dist/context/stores.d.ts.map +1 -1
- package/dist/context/stores.js.map +1 -1
- package/dist/context/telemetry.d.ts +148 -0
- package/dist/context/telemetry.d.ts.map +1 -0
- package/dist/context/telemetry.js +20 -0
- package/dist/context/telemetry.js.map +1 -0
- package/dist/context/traced-fetch.d.ts +14 -0
- package/dist/context/traced-fetch.d.ts.map +1 -0
- package/dist/context/traced-fetch.js +33 -0
- package/dist/context/traced-fetch.js.map +1 -0
- package/dist/context/traced-slots.d.ts +17 -0
- package/dist/context/traced-slots.d.ts.map +1 -0
- package/dist/context/traced-slots.js +57 -0
- package/dist/context/traced-slots.js.map +1 -0
- package/dist/db/libsql.d.ts.map +1 -1
- package/dist/db/libsql.js +6 -12
- package/dist/db/libsql.js.map +1 -1
- package/dist/db/query-kind.d.ts +8 -0
- package/dist/db/query-kind.d.ts.map +1 -0
- package/dist/db/query-kind.js +11 -0
- package/dist/db/query-kind.js.map +1 -0
- package/dist/db/trace-libsql.d.ts +15 -0
- package/dist/db/trace-libsql.d.ts.map +1 -0
- package/dist/db/trace-libsql.js +37 -0
- package/dist/db/trace-libsql.js.map +1 -0
- package/dist/db/trace.d.ts +21 -0
- package/dist/db/trace.d.ts.map +1 -0
- package/dist/db/trace.js +64 -0
- package/dist/db/trace.js.map +1 -0
- package/dist/debug-bar/consumer.d.ts +12 -0
- package/dist/debug-bar/consumer.d.ts.map +1 -0
- package/dist/debug-bar/consumer.js +13 -0
- package/dist/debug-bar/consumer.js.map +1 -0
- package/dist/debug-bar/format-param.d.ts +6 -4
- package/dist/debug-bar/format-param.d.ts.map +1 -1
- package/dist/debug-bar/format-param.js +6 -9
- package/dist/debug-bar/format-param.js.map +1 -1
- package/dist/debug-bar/highlight-sql.d.ts +0 -3
- package/dist/debug-bar/highlight-sql.d.ts.map +1 -1
- package/dist/debug-bar/highlight-sql.js +0 -6
- package/dist/debug-bar/highlight-sql.js.map +1 -1
- package/dist/debug-bar/panels/database.d.ts +6 -4
- package/dist/debug-bar/panels/database.d.ts.map +1 -1
- package/dist/debug-bar/panels/database.js +44 -8
- package/dist/debug-bar/panels/database.js.map +1 -1
- package/dist/debug-bar/panels/template.d.ts +1 -1
- package/dist/debug-bar/panels/template.d.ts.map +1 -1
- package/dist/debug-bar/panels/template.js +16 -2
- package/dist/debug-bar/panels/template.js.map +1 -1
- package/dist/debug-bar/panels/timeline.js +1 -1
- package/dist/debug-bar/panels/timeline.js.map +1 -1
- package/dist/debug-bar/styles.d.ts.map +1 -1
- package/dist/debug-bar/styles.js +5 -0
- package/dist/debug-bar/styles.js.map +1 -1
- package/dist/debug-bar/timeline-model.d.ts +3 -3
- package/dist/debug-bar/timeline-model.d.ts.map +1 -1
- package/dist/debug-bar/timeline-model.js +1 -1
- package/dist/debug-bar/timeline-model.js.map +1 -1
- package/dist/debug-bar/types.d.ts +1 -1
- package/dist/entries/read-service.d.ts +6 -0
- package/dist/entries/read-service.d.ts.map +1 -1
- package/dist/entries/read-service.js +14 -0
- package/dist/entries/read-service.js.map +1 -1
- package/dist/hooks/registry.d.ts.map +1 -1
- package/dist/hooks/registry.js +21 -3
- package/dist/hooks/registry.js.map +1 -1
- package/dist/index.d.ts +7 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +6 -4
- package/dist/index.js.map +1 -1
- package/dist/mcp/server.d.ts.map +1 -1
- package/dist/mcp/server.js +9 -3
- package/dist/mcp/server.js.map +1 -1
- package/dist/plugin/fields/entry.d.ts +8 -0
- package/dist/plugin/fields/entry.d.ts.map +1 -1
- package/dist/plugin/fields/entry.js.map +1 -1
- package/dist/plugin/lookup.d.ts +4 -9
- package/dist/plugin/lookup.d.ts.map +1 -1
- package/dist/plugin/manifest.d.ts +28 -32
- package/dist/plugin/manifest.d.ts.map +1 -1
- package/dist/plugin/manifest.js +7 -2
- package/dist/plugin/manifest.js.map +1 -1
- package/dist/plugin/provides-context.d.ts.map +1 -1
- package/dist/plugin/provides-context.js +5 -0
- package/dist/plugin/provides-context.js.map +1 -1
- package/dist/plugin/setup-context.d.ts +5 -0
- package/dist/plugin/setup-context.d.ts.map +1 -1
- package/dist/plugin/setup-context.js.map +1 -1
- package/dist/rest/build-handler.d.ts.map +1 -1
- package/dist/rest/build-handler.js +14 -1
- package/dist/rest/build-handler.js.map +1 -1
- package/dist/revisions/snapshot-envelope.d.ts +4 -2
- package/dist/revisions/snapshot-envelope.d.ts.map +1 -1
- package/dist/revisions/snapshot-envelope.js +6 -3
- package/dist/revisions/snapshot-envelope.js.map +1 -1
- package/dist/route/render/asset-manifest.d.ts +1 -1
- package/dist/route/render/asset-manifest.d.ts.map +1 -1
- package/dist/route/render/asset-manifest.js +7 -1
- package/dist/route/render/asset-manifest.js.map +1 -1
- package/dist/route/render/build-resolved-entries.d.ts.map +1 -1
- package/dist/route/render/build-resolved-entries.js +18 -10
- package/dist/route/render/build-resolved-entries.js.map +1 -1
- package/dist/route/render/render-template.d.ts +1 -1
- package/dist/route/render/render-template.d.ts.map +1 -1
- package/dist/route/render/render-template.js +61 -35
- package/dist/route/render/render-template.js.map +1 -1
- package/dist/route/render/template-builders.d.ts +12 -0
- package/dist/route/render/template-builders.d.ts.map +1 -1
- package/dist/route/render/template-builders.js +20 -0
- package/dist/route/render/template-builders.js.map +1 -1
- package/dist/route/resolve.d.ts.map +1 -1
- package/dist/route/resolve.js +4 -1
- package/dist/route/resolve.js.map +1 -1
- package/dist/rpc/authenticated.d.ts.map +1 -1
- package/dist/rpc/authenticated.js +2 -1
- package/dist/rpc/authenticated.js.map +1 -1
- package/dist/rpc/build-handler.d.ts.map +1 -1
- package/dist/rpc/build-handler.js +12 -0
- package/dist/rpc/build-handler.js.map +1 -1
- package/dist/rpc/meta/core.d.ts +3 -4
- package/dist/rpc/meta/core.d.ts.map +1 -1
- package/dist/rpc/meta/core.js +87 -152
- package/dist/rpc/meta/core.js.map +1 -1
- package/dist/rpc/procedures/auth/session.d.ts.map +1 -1
- package/dist/rpc/procedures/auth/session.js +2 -1
- package/dist/rpc/procedures/auth/session.js.map +1 -1
- package/dist/rpc/procedures/entry/helpers.d.ts +21 -0
- package/dist/rpc/procedures/entry/helpers.d.ts.map +1 -1
- package/dist/rpc/procedures/entry/helpers.js +44 -0
- package/dist/rpc/procedures/entry/helpers.js.map +1 -1
- package/dist/rpc/procedures/entry/index.d.ts +1 -0
- package/dist/rpc/procedures/entry/index.d.ts.map +1 -1
- package/dist/rpc/procedures/entry/lookup.js +14 -11
- package/dist/rpc/procedures/entry/lookup.js.map +1 -1
- package/dist/rpc/procedures/entry/schemas.d.ts +2 -0
- package/dist/rpc/procedures/entry/schemas.d.ts.map +1 -1
- package/dist/rpc/procedures/entry/schemas.js +7 -0
- package/dist/rpc/procedures/entry/schemas.js.map +1 -1
- package/dist/rpc/procedures/entry/update.d.ts +1 -0
- package/dist/rpc/procedures/entry/update.d.ts.map +1 -1
- package/dist/rpc/procedures/entry/update.js +10 -5
- package/dist/rpc/procedures/entry/update.js.map +1 -1
- package/dist/rpc/procedures/lookup.errors.d.ts +2 -1
- package/dist/rpc/procedures/lookup.errors.d.ts.map +1 -1
- package/dist/rpc/procedures/lookup.errors.js +3 -0
- package/dist/rpc/procedures/lookup.errors.js.map +1 -1
- package/dist/rpc/procedures/term/lookup.js +3 -8
- package/dist/rpc/procedures/term/lookup.js.map +1 -1
- package/dist/rpc/procedures/user/index.d.ts +1 -0
- package/dist/rpc/procedures/user/index.d.ts.map +1 -1
- package/dist/rpc/procedures/user/schemas.d.ts +1 -0
- package/dist/rpc/procedures/user/schemas.d.ts.map +1 -1
- package/dist/rpc/procedures/user/schemas.js +5 -0
- package/dist/rpc/procedures/user/schemas.js.map +1 -1
- package/dist/rpc/procedures/user/update.d.ts +1 -0
- package/dist/rpc/procedures/user/update.d.ts.map +1 -1
- package/dist/rpc/procedures/user/update.js +10 -1
- package/dist/rpc/procedures/user/update.js.map +1 -1
- package/dist/rpc/router.d.ts +2 -0
- package/dist/rpc/router.d.ts.map +1 -1
- package/dist/rpc/schemas.js +6 -6
- package/dist/rpc/schemas.js.map +1 -1
- package/dist/rpc/validation.d.ts +10 -0
- package/dist/rpc/validation.d.ts.map +1 -1
- package/dist/rpc/validation.js +10 -0
- package/dist/rpc/validation.js.map +1 -1
- package/dist/runtime/dispatcher.d.ts.map +1 -1
- package/dist/runtime/dispatcher.js +105 -37
- package/dist/runtime/dispatcher.js.map +1 -1
- package/dist/runtime/load-user-for-public-request.d.ts.map +1 -1
- package/dist/runtime/load-user-for-public-request.js +2 -2
- package/dist/runtime/load-user-for-public-request.js.map +1 -1
- package/dist/runtime/scheduled.d.ts +3 -1
- package/dist/runtime/scheduled.d.ts.map +1 -1
- package/dist/runtime/scheduled.js +16 -2
- package/dist/runtime/scheduled.js.map +1 -1
- package/dist/runtime/telemetry-delivery.d.ts +14 -0
- package/dist/runtime/telemetry-delivery.d.ts.map +1 -0
- package/dist/runtime/telemetry-delivery.js +39 -0
- package/dist/runtime/telemetry-delivery.js.map +1 -0
- package/dist/telemetry-otel.d.ts +29 -0
- package/dist/telemetry-otel.d.ts.map +1 -0
- package/dist/telemetry-otel.js +218 -0
- package/dist/telemetry-otel.js.map +1 -0
- package/dist/template-deps-core.d.ts.map +1 -1
- package/dist/template-deps-core.js +31 -14
- package/dist/template-deps-core.js.map +1 -1
- package/dist/template-deps.d.ts.map +1 -1
- package/dist/template-deps.js +12 -8
- package/dist/template-deps.js.map +1 -1
- package/dist/test/dispatcher.d.ts +13 -0
- package/dist/test/dispatcher.d.ts.map +1 -1
- package/dist/test/dispatcher.js +9 -3
- package/dist/test/dispatcher.js.map +1 -1
- package/dist/test/harness.d.ts.map +1 -1
- package/dist/test/harness.js +4 -12
- package/dist/test/harness.js.map +1 -1
- package/dist/test/index.d.ts +3 -0
- package/dist/test/index.d.ts.map +1 -1
- package/dist/test/index.js +4 -0
- package/dist/test/index.js.map +1 -1
- package/dist/test/traced-context.d.ts +17 -0
- package/dist/test/traced-context.d.ts.map +1 -0
- package/dist/test/traced-context.js +28 -0
- package/dist/test/traced-context.js.map +1 -0
- package/package.json +6 -2
- package/dist/context/debug.d.ts +0 -25
- package/dist/context/debug.d.ts.map +0 -1
- package/dist/context/debug.js +0 -13
- package/dist/context/debug.js.map +0 -1
- package/dist/debug-bar/collector.d.ts +0 -9
- package/dist/debug-bar/collector.d.ts.map +0 -1
- package/dist/debug-bar/collector.js +0 -80
- package/dist/debug-bar/collector.js.map +0 -1
- package/dist/debug-bar/db-query.d.ts +0 -21
- package/dist/debug-bar/db-query.d.ts.map +0 -1
- package/dist/debug-bar/db-query.js +0 -23
- package/dist/debug-bar/db-query.js.map +0 -1
- package/dist/debug-bar/trace-libsql.d.ts +0 -18
- package/dist/debug-bar/trace-libsql.d.ts.map +0 -1
- package/dist/debug-bar/trace-libsql.js +0 -42
- package/dist/debug-bar/trace-libsql.js.map +0 -1
|
@@ -0,0 +1,218 @@
|
|
|
1
|
+
const SPAN_KIND_INTERNAL = 1;
|
|
2
|
+
const SPAN_KIND_SERVER = 2;
|
|
3
|
+
const STATUS_CODE_ERROR = 2;
|
|
4
|
+
function randomHex(byteLength) {
|
|
5
|
+
const bytes = crypto.getRandomValues(new Uint8Array(byteLength));
|
|
6
|
+
return Array.from(bytes, (b) => b.toString(16).padStart(2, "0")).join("");
|
|
7
|
+
}
|
|
8
|
+
/** Epoch milliseconds → OTLP nanosecond string (exceeds Number range). */
|
|
9
|
+
function unixNano(ms) {
|
|
10
|
+
return (BigInt(Math.round(ms)) * 1000000n).toString();
|
|
11
|
+
}
|
|
12
|
+
/**
|
|
13
|
+
* OTLP attribute values are primitives or arrays of primitives; nested
|
|
14
|
+
* structures are JSON-stringified rather than projected onto `kvlistValue`.
|
|
15
|
+
*/
|
|
16
|
+
function toAnyValue(value) {
|
|
17
|
+
if (typeof value === "string")
|
|
18
|
+
return { stringValue: value };
|
|
19
|
+
if (typeof value === "boolean")
|
|
20
|
+
return { boolValue: value };
|
|
21
|
+
if (typeof value === "number") {
|
|
22
|
+
// Beyond the safe range `String(n)` isn't a parseable int64 ("1e+21");
|
|
23
|
+
// a strict collector rejects the whole batch over one bad attribute.
|
|
24
|
+
return Number.isSafeInteger(value)
|
|
25
|
+
? { intValue: String(value) }
|
|
26
|
+
: { doubleValue: value };
|
|
27
|
+
}
|
|
28
|
+
if (Array.isArray(value) && value.every((v) => typeof v !== "object")) {
|
|
29
|
+
return { arrayValue: { values: value.map(toAnyValue) } };
|
|
30
|
+
}
|
|
31
|
+
return { stringValue: JSON.stringify(value) };
|
|
32
|
+
}
|
|
33
|
+
// `Array.isArray` alone won't exclude `readonly JsonValue[]` from the union.
|
|
34
|
+
function isJsonObject(value) {
|
|
35
|
+
return typeof value === "object" && value !== null && !Array.isArray(value);
|
|
36
|
+
}
|
|
37
|
+
function toAttributes(record) {
|
|
38
|
+
return Object.entries(record).map(([key, value]) => ({
|
|
39
|
+
key,
|
|
40
|
+
value: toAnyValue(value),
|
|
41
|
+
}));
|
|
42
|
+
}
|
|
43
|
+
/** Depth-first projection of the collected tree, minting span ids on the way. */
|
|
44
|
+
function addTreeSpans(spans, traceId, parentSpanId, out) {
|
|
45
|
+
for (const span of spans) {
|
|
46
|
+
const spanId = randomHex(8);
|
|
47
|
+
const endTimeUnixNano = unixNano(span.startedAt + span.durationMs);
|
|
48
|
+
out.push({
|
|
49
|
+
traceId,
|
|
50
|
+
spanId,
|
|
51
|
+
parentSpanId,
|
|
52
|
+
name: span.name,
|
|
53
|
+
kind: SPAN_KIND_INTERNAL,
|
|
54
|
+
startTimeUnixNano: unixNano(span.startedAt),
|
|
55
|
+
endTimeUnixNano,
|
|
56
|
+
attributes: toAttributes(span.attributes),
|
|
57
|
+
...(span.error && {
|
|
58
|
+
events: [
|
|
59
|
+
{
|
|
60
|
+
timeUnixNano: endTimeUnixNano,
|
|
61
|
+
name: "exception",
|
|
62
|
+
attributes: toAttributes({
|
|
63
|
+
"exception.type": span.error.name,
|
|
64
|
+
"exception.message": span.error.message,
|
|
65
|
+
...(span.error.stack && {
|
|
66
|
+
"exception.stacktrace": span.error.stack,
|
|
67
|
+
}),
|
|
68
|
+
}),
|
|
69
|
+
},
|
|
70
|
+
],
|
|
71
|
+
}),
|
|
72
|
+
status: span.status === "error"
|
|
73
|
+
? { code: STATUS_CODE_ERROR, message: span.error?.message }
|
|
74
|
+
: {},
|
|
75
|
+
});
|
|
76
|
+
addTreeSpans(span.children, traceId, spanId, out);
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
/** Timestamped records → root-span events, the namespace as event name. */
|
|
80
|
+
function recordEvents(records) {
|
|
81
|
+
return Object.entries(records).flatMap(([namespace, entries]) => entries.map((record) => {
|
|
82
|
+
const data = record.data;
|
|
83
|
+
return {
|
|
84
|
+
timeUnixNano: unixNano(record.at),
|
|
85
|
+
name: namespace,
|
|
86
|
+
// Object payloads flatten into event attributes; anything else
|
|
87
|
+
// rides a single `data` attribute.
|
|
88
|
+
attributes: isJsonObject(data)
|
|
89
|
+
? toAttributes(data)
|
|
90
|
+
: toAttributes({ data }),
|
|
91
|
+
};
|
|
92
|
+
}));
|
|
93
|
+
}
|
|
94
|
+
/**
|
|
95
|
+
* W3C trace-context `traceparent`: version-traceId-parentSpanId-flags. A
|
|
96
|
+
* valid inbound header joins this request's spans to the caller's trace;
|
|
97
|
+
* anything else (absent, malformed, all-zero ids, reserved version) is
|
|
98
|
+
* ignored and a fresh trace id is minted.
|
|
99
|
+
*/
|
|
100
|
+
const TRACEPARENT_PATTERN = /^([0-9a-f]{2})-([0-9a-f]{32})-([0-9a-f]{16})-[0-9a-f]{2}$/;
|
|
101
|
+
function parseTraceparent(header) {
|
|
102
|
+
const match = header ? TRACEPARENT_PATTERN.exec(header) : null;
|
|
103
|
+
if (!match)
|
|
104
|
+
return null;
|
|
105
|
+
const [, version = "", traceId = "", parentSpanId = ""] = match;
|
|
106
|
+
if (version === "ff")
|
|
107
|
+
return null;
|
|
108
|
+
if (/^0+$/.test(traceId) || /^0+$/.test(parentSpanId))
|
|
109
|
+
return null;
|
|
110
|
+
return { traceId, parentSpanId };
|
|
111
|
+
}
|
|
112
|
+
// No route abstraction reaches the snapshot; the raw path is the best label
|
|
113
|
+
// a CMS has. Deliberate semconv deviation (`{method} {route}` is preferred).
|
|
114
|
+
function rootSpanName(method, url) {
|
|
115
|
+
try {
|
|
116
|
+
return `${method} ${new URL(url).pathname}`;
|
|
117
|
+
}
|
|
118
|
+
catch {
|
|
119
|
+
return method;
|
|
120
|
+
}
|
|
121
|
+
}
|
|
122
|
+
// The envelope url keeps its query string and the exporter owns scrubbing
|
|
123
|
+
// query-borne secrets (see TelemetrySnapshot) — drop the query wholesale.
|
|
124
|
+
function scrubUrl(url) {
|
|
125
|
+
try {
|
|
126
|
+
const parsed = new URL(url);
|
|
127
|
+
return parsed.origin + parsed.pathname;
|
|
128
|
+
}
|
|
129
|
+
catch {
|
|
130
|
+
return url;
|
|
131
|
+
}
|
|
132
|
+
}
|
|
133
|
+
/**
|
|
134
|
+
* OTel trace exporter as a telemetry consumer: projects each collected
|
|
135
|
+
* snapshot onto an OTLP/HTTP JSON `ExportTraceServiceRequest` and POSTs it
|
|
136
|
+
* per request (from `waitUntil`, so export latency never blocks a response).
|
|
137
|
+
* Core spans carry no ids — trace/span ids are minted here at export time.
|
|
138
|
+
*/
|
|
139
|
+
export function otelConsumer(options) {
|
|
140
|
+
const { sample, tailSample } = options;
|
|
141
|
+
return {
|
|
142
|
+
id: "otel",
|
|
143
|
+
...(sample !== undefined && { sample: () => Math.random() < sample }),
|
|
144
|
+
onRequestEnd: async (snapshot, ctx) => {
|
|
145
|
+
if (tailSample && !tailSample(snapshot))
|
|
146
|
+
return;
|
|
147
|
+
// A failed export is an observability gap, never a request failure:
|
|
148
|
+
// the mapping too (records are `unknown` at runtime and can defeat
|
|
149
|
+
// JSON.stringify) — log and swallow so this promise cannot reject
|
|
150
|
+
// into `waitUntil`.
|
|
151
|
+
try {
|
|
152
|
+
const { request, spans: tree, records, dropped } = snapshot;
|
|
153
|
+
const inbound = parseTraceparent(ctx.request.headers.get("traceparent"));
|
|
154
|
+
const traceId = inbound?.traceId ?? randomHex(16);
|
|
155
|
+
const rootSpanId = randomHex(8);
|
|
156
|
+
const droppedRecords = Object.values(dropped.records).reduce((sum, count) => sum + count, 0);
|
|
157
|
+
const spans = [
|
|
158
|
+
{
|
|
159
|
+
traceId,
|
|
160
|
+
spanId: rootSpanId,
|
|
161
|
+
...(inbound && { parentSpanId: inbound.parentSpanId }),
|
|
162
|
+
name: rootSpanName(request.method, request.url),
|
|
163
|
+
kind: SPAN_KIND_SERVER,
|
|
164
|
+
startTimeUnixNano: unixNano(request.startedAt),
|
|
165
|
+
endTimeUnixNano: unixNano(request.startedAt + request.durationMs),
|
|
166
|
+
attributes: toAttributes({
|
|
167
|
+
"http.request.method": request.method,
|
|
168
|
+
"url.full": scrubUrl(request.url),
|
|
169
|
+
"http.response.status_code": request.status,
|
|
170
|
+
"plumix.request_id": request.requestId,
|
|
171
|
+
// OTLP spans carry no dropped-child-span field; the cap
|
|
172
|
+
// overflow rides an attribute so truncation stays visible
|
|
173
|
+
// downstream.
|
|
174
|
+
...(dropped.spans > 0 && {
|
|
175
|
+
"plumix.dropped_spans": dropped.spans,
|
|
176
|
+
}),
|
|
177
|
+
}),
|
|
178
|
+
events: recordEvents(records),
|
|
179
|
+
...(droppedRecords > 0 && { droppedEventsCount: droppedRecords }),
|
|
180
|
+
// HTTP server semconv: only 5xx marks the server span failed.
|
|
181
|
+
status: request.status >= 500 ? { code: STATUS_CODE_ERROR } : {},
|
|
182
|
+
},
|
|
183
|
+
];
|
|
184
|
+
addTreeSpans(tree, traceId, rootSpanId, spans);
|
|
185
|
+
const body = {
|
|
186
|
+
resourceSpans: [
|
|
187
|
+
{
|
|
188
|
+
resource: {
|
|
189
|
+
attributes: toAttributes({
|
|
190
|
+
"service.name": options.serviceName ?? "plumix",
|
|
191
|
+
}),
|
|
192
|
+
},
|
|
193
|
+
scopeSpans: [{ scope: { name: "plumix" }, spans }],
|
|
194
|
+
},
|
|
195
|
+
],
|
|
196
|
+
};
|
|
197
|
+
const headers = new Headers(options.headers);
|
|
198
|
+
headers.set("content-type", "application/json");
|
|
199
|
+
const response = await (options.fetch ?? fetch)(options.endpoint, {
|
|
200
|
+
method: "POST",
|
|
201
|
+
headers,
|
|
202
|
+
body: JSON.stringify(body),
|
|
203
|
+
});
|
|
204
|
+
if (response.ok) {
|
|
205
|
+
// An unread body holds the connection open on Workers.
|
|
206
|
+
void response.body?.cancel();
|
|
207
|
+
}
|
|
208
|
+
else {
|
|
209
|
+
ctx.logger.error(`[plumix] otel export failed: ${String(response.status)} ${response.statusText} ${await response.text()}`);
|
|
210
|
+
}
|
|
211
|
+
}
|
|
212
|
+
catch (error) {
|
|
213
|
+
ctx.logger.error(`[plumix] otel export failed: ${error instanceof Error ? error.message : String(error)}`);
|
|
214
|
+
}
|
|
215
|
+
},
|
|
216
|
+
};
|
|
217
|
+
}
|
|
218
|
+
//# sourceMappingURL=telemetry-otel.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"telemetry-otel.js","sourceRoot":"","sources":["../src/telemetry-otel.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"template-deps-core.d.ts","sourceRoot":"","sources":["../src/template-deps-core.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"template-deps-core.d.ts","sourceRoot":"","sources":["../src/template-deps-core.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAOlE,OAAO,QAAQ,eAAe,CAAC;IAC7B,UAAU,mBAAmB;QAC3B,QAAQ,EAAE;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;SAAE,CAAC;KAC7D;CACF;AAED;;;;;GAKG;AACH,wBAAgB,wBAAwB,CACtC,QAAQ,EAAE,qBAAqB,GAC9B,IAAI,CAMN;AAED,wBAAsB,cAAc,CAClC,MAAM,EAAE,SAAS,MAAM,EAAE,EACzB,GAAG,EAAE,UAAU,GACd,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CAqClD"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { inArray } from "drizzle-orm";
|
|
2
|
+
import { memoBatch } from "./context/memo.js";
|
|
2
3
|
import { settings } from "./db/schema/settings.js";
|
|
3
4
|
/**
|
|
4
5
|
* Seed the plugin registry with built-in template deps before plugin
|
|
@@ -14,22 +15,38 @@ export function registerCoreTemplateDeps(registry) {
|
|
|
14
15
|
});
|
|
15
16
|
}
|
|
16
17
|
export async function settingsLoader(groups, ctx) {
|
|
17
|
-
|
|
18
|
+
const unique = [...new Set(groups)];
|
|
19
|
+
if (unique.length === 0)
|
|
18
20
|
return {};
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
//
|
|
24
|
-
//
|
|
25
|
-
|
|
26
|
-
|
|
21
|
+
// Per-group memo (#1493): head defaults, SEO surfaces, and the template
|
|
22
|
+
// dep all read `group='site'` in one request — only the first pays a
|
|
23
|
+
// query. The lazy batch queries every requested group in one `IN(...)`;
|
|
24
|
+
// a group with no rows memoizes as `null` and stays absent from the
|
|
25
|
+
// result so the caller's `loadTemplateDeps` still fills missing slugs
|
|
26
|
+
// with `null`.
|
|
27
|
+
const bags = await memoBatch(ctx.memo, unique, (group) => `core:settings-group:${group}`, async () => {
|
|
28
|
+
const rows = await ctx.db
|
|
29
|
+
.select({
|
|
30
|
+
group: settings.group,
|
|
31
|
+
key: settings.key,
|
|
32
|
+
value: settings.value,
|
|
33
|
+
})
|
|
34
|
+
.from(settings)
|
|
35
|
+
.where(inArray(settings.group, unique));
|
|
36
|
+
const byGroup = new Map();
|
|
37
|
+
for (const row of rows) {
|
|
38
|
+
const bag = byGroup.get(row.group) ?? {};
|
|
39
|
+
bag[row.key] = row.value;
|
|
40
|
+
byGroup.set(row.group, bag);
|
|
41
|
+
}
|
|
42
|
+
return byGroup;
|
|
43
|
+
});
|
|
27
44
|
const grouped = {};
|
|
28
|
-
|
|
29
|
-
const bag =
|
|
30
|
-
bag
|
|
31
|
-
|
|
32
|
-
}
|
|
45
|
+
unique.forEach((group, i) => {
|
|
46
|
+
const bag = bags[i];
|
|
47
|
+
if (bag)
|
|
48
|
+
grouped[group] = bag;
|
|
49
|
+
});
|
|
33
50
|
return grouped;
|
|
34
51
|
}
|
|
35
52
|
//# sourceMappingURL=template-deps-core.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"template-deps-core.js","sourceRoot":"","sources":["../src/template-deps-core.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAItC,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAWnD;;;;;GAKG;AACH,MAAM,UAAU,wBAAwB,CACtC,QAA+B;IAE/B,QAAQ,CAAC,YAAY,CAAC,GAAG,CAAC,UAAU,EAAE;QACpC,IAAI,EAAE,UAAU;QAChB,YAAY,EAAE,IAAI;QAClB,IAAI,EAAE,cAAc;KACrB,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,MAAyB,EACzB,GAAe;IAEf,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IACnC,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,EAAE;
|
|
1
|
+
{"version":3,"file":"template-deps-core.js","sourceRoot":"","sources":["../src/template-deps-core.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAItC,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAWnD;;;;;GAKG;AACH,MAAM,UAAU,wBAAwB,CACtC,QAA+B;IAE/B,QAAQ,CAAC,YAAY,CAAC,GAAG,CAAC,UAAU,EAAE;QACpC,IAAI,EAAE,UAAU;QAChB,YAAY,EAAE,IAAI;QAClB,IAAI,EAAE,cAAc;KACrB,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,MAAyB,EACzB,GAAe;IAEf,MAAM,MAAM,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;IACpC,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IACnC,wEAAwE;IACxE,qEAAqE;IACrE,wEAAwE;IACxE,oEAAoE;IACpE,sEAAsE;IACtE,eAAe;IACf,MAAM,IAAI,GAAG,MAAM,SAAS,CAC1B,GAAG,CAAC,IAAI,EACR,MAAM,EACN,CAAC,KAAK,EAAE,EAAE,CAAC,uBAAuB,KAAK,EAAE,EACzC,KAAK,IAAI,EAAE;QACT,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,EAAE;aACtB,MAAM,CAAC;YACN,KAAK,EAAE,QAAQ,CAAC,KAAK;YACrB,GAAG,EAAE,QAAQ,CAAC,GAAG;YACjB,KAAK,EAAE,QAAQ,CAAC,KAAK;SACtB,CAAC;aACD,IAAI,CAAC,QAAQ,CAAC;aACd,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC;QAC1C,MAAM,OAAO,GAAG,IAAI,GAAG,EAAmC,CAAC;QAC3D,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;YACzC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC;YACzB,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAC9B,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC,CACF,CAAC;IACF,MAAM,OAAO,GAA4C,EAAE,CAAC;IAC5D,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE;QAC1B,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QACpB,IAAI,GAAG;YAAE,OAAO,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC;IAChC,CAAC,CAAC,CAAC;IACH,OAAO,OAAO,CAAC;AACjB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"template-deps.d.ts","sourceRoot":"","sources":["../src/template-deps.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,KAAK,EACV,uBAAuB,EACvB,mBAAmB,EACpB,MAAM,eAAe,CAAC;AAEvB;;;;;;GAMG;AACH,MAAM,MAAM,iBAAiB,CAAC,KAAK,SAAS,MAAM,mBAAmB,IAAI,CACvE,KAAK,EAAE,SAAS,mBAAmB,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,EAAE,EACpD,GAAG,EAAE,UAAU,KACZ,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;AAQ1E,KAAK,wBAAwB,GAAG,CAC9B,KAAK,EAAE,SAAS,MAAM,EAAE,EACxB,GAAG,EAAE,UAAU,KACZ,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;AAEtC,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,wBAAwB,CAAC;IACxC,uEAAuE;IACvE,QAAQ,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;CACtC;AAaD,eAAO,MAAM,uBAAuB,EAAE,WAAW,CAAC,MAAM,CAGtD,CAAC;AAEH;;;;;GAKG;AACH,wBAAgB,4BAA4B,CAC1C,SAAS,EAAE,uBAAuB,GAAG,SAAS,EAC9C,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAC1C,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,SAAS,MAAM,EAAE,CAAC,CAAC,CAqB7C;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,gBAAgB,CACpC,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,EAC3C,QAAQ,EAAE,WAAW,CAAC,MAAM,EAAE,qBAAqB,CAAC,EACpD,GAAG,EAAE,UAAU,GACd,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"template-deps.d.ts","sourceRoot":"","sources":["../src/template-deps.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,KAAK,EACV,uBAAuB,EACvB,mBAAmB,EACpB,MAAM,eAAe,CAAC;AAEvB;;;;;;GAMG;AACH,MAAM,MAAM,iBAAiB,CAAC,KAAK,SAAS,MAAM,mBAAmB,IAAI,CACvE,KAAK,EAAE,SAAS,mBAAmB,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,EAAE,EACpD,GAAG,EAAE,UAAU,KACZ,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;AAQ1E,KAAK,wBAAwB,GAAG,CAC9B,KAAK,EAAE,SAAS,MAAM,EAAE,EACxB,GAAG,EAAE,UAAU,KACZ,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;AAEtC,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,wBAAwB,CAAC;IACxC,uEAAuE;IACvE,QAAQ,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;CACtC;AAaD,eAAO,MAAM,uBAAuB,EAAE,WAAW,CAAC,MAAM,CAGtD,CAAC;AAEH;;;;;GAKG;AACH,wBAAgB,4BAA4B,CAC1C,SAAS,EAAE,uBAAuB,GAAG,SAAS,EAC9C,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAC1C,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,SAAS,MAAM,EAAE,CAAC,CAAC,CAqB7C;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,gBAAgB,CACpC,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,EAC3C,QAAQ,EAAE,WAAW,CAAC,MAAM,EAAE,qBAAqB,CAAC,EACpD,GAAG,EAAE,UAAU,GACd,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CAsBlD"}
|
package/dist/template-deps.js
CHANGED
|
@@ -58,17 +58,21 @@ export function mergeTemplateDepDeclarations(themeDeps, template) {
|
|
|
58
58
|
* the deps map — themes use optional chaining (`settings?.["site"]`).
|
|
59
59
|
*/
|
|
60
60
|
export async function loadTemplateDeps(template, registry, ctx) {
|
|
61
|
-
const
|
|
62
|
-
for (const [kind,
|
|
63
|
-
const
|
|
64
|
-
if (!Array.isArray(
|
|
61
|
+
const declared = [];
|
|
62
|
+
for (const [kind, dep] of registry) {
|
|
63
|
+
const slugs = template[kind];
|
|
64
|
+
if (!Array.isArray(slugs) || slugs.length === 0)
|
|
65
65
|
continue;
|
|
66
|
-
|
|
67
|
-
pending.push(loadOne(kind, slugs, loader, ctx));
|
|
66
|
+
declared.push({ kind, slugs: slugs, dep });
|
|
68
67
|
}
|
|
69
|
-
if (
|
|
68
|
+
if (declared.length === 0)
|
|
70
69
|
return {};
|
|
71
|
-
|
|
70
|
+
// Spanned only when there's work: an undeclared template skips the span so
|
|
71
|
+
// ordinary requests don't carry a 0ms `render: deps` row.
|
|
72
|
+
return ctx.telemetry.span("render: deps", async (s) => {
|
|
73
|
+
s.set("deps.kinds", () => declared.map((d) => d.kind));
|
|
74
|
+
return Object.fromEntries(await Promise.all(declared.map((d) => loadOne(d.kind, d.slugs, d.dep, ctx))));
|
|
75
|
+
});
|
|
72
76
|
}
|
|
73
77
|
async function loadOne(kind, slugs, loader, ctx) {
|
|
74
78
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"template-deps.js","sourceRoot":"","sources":["../src/template-deps.ts"],"names":[],"mappings":"AAoCA,wEAAwE;AACxE,wEAAwE;AACxE,iEAAiE;AACjE,sEAAsE;AACtE,oEAAoE;AACpE,MAAM,mBAAmB,GAAG,IAAI,GAAG,CAAC,CAAC,WAAW,EAAE,UAAU,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC;AAChF,MAAM,sBAAsB,GAAG,IAAI,GAAG,CAAC;IACrC,QAAQ;IACR,UAAU;IACV,wBAAwB;CACzB,CAAC,CAAC;AACH,MAAM,CAAC,MAAM,uBAAuB,GAAwB,IAAI,GAAG,CAAC;IAClE,GAAG,mBAAmB;IACtB,GAAG,sBAAsB;CAC1B,CAAC,CAAC;AAEH;;;;;GAKG;AACH,MAAM,UAAU,4BAA4B,CAC1C,SAA8C,EAC9C,QAA2C;IAE3C,MAAM,MAAM,GAAsC,EAAE,CAAC;IACrD,IAAI,SAAS,EAAE,CAAC;QACd,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;YACtD,IAAI,mBAAmB,CAAC,GAAG,CAAC,IAAI,CAAC;gBAAE,SAAS;YAC5C,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;gBAAE,MAAM,CAAC,IAAI,CAAC,GAAG,KAA0B,CAAC;QACtE,CAAC;IACH,CAAC;IACD,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;QACrD,IAAI,sBAAsB,CAAC,GAAG,CAAC,IAAI,CAAC;YAAE,SAAS;QAC/C,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YACzB,MAAM,CAAC,IAAI,CAAC,GAAG,KAA0B,CAAC;QAC5C,CAAC;aAAM,IAAI,OAAO,KAAK,KAAK,UAAU,EAAE,CAAC;YACvC,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;YAChC,MAAM,IAAI,GAAI,KAAwD,CACpE,IAAI,CACL,CAAC;YACF,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC;gBAAE,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;QAC/C,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;;;;;;;;;;GAYG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,QAA2C,EAC3C,QAAoD,EACpD,GAAe;IAEf,MAAM,
|
|
1
|
+
{"version":3,"file":"template-deps.js","sourceRoot":"","sources":["../src/template-deps.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ import type { BootstrapVia, PlumixMagicLinkConfig } from "../auth/config.js";
|
|
|
4
4
|
import type { Mailer } from "../auth/mailer/types.js";
|
|
5
5
|
import type { OAuthProviderClient } from "../auth/oauth/types.js";
|
|
6
6
|
import type { AnyPluginDescriptor, ApiConfig, InterfaceToggle } from "../config.js";
|
|
7
|
+
import type { TelemetryConfig } from "../context/telemetry.js";
|
|
7
8
|
import type { User, UserRole } from "../db/schema/users.js";
|
|
8
9
|
import type { DebugBarInput } from "../debug-bar/config.js";
|
|
9
10
|
import type { ActionArgs, ActionName, FilterInput, FilterName, FilterRest } from "../hooks/types.js";
|
|
@@ -97,6 +98,12 @@ export interface CreateDispatcherHarnessOptions {
|
|
|
97
98
|
readonly api?: ApiConfig;
|
|
98
99
|
/** Dev debug-bar config; set to exercise disable/collection gating. */
|
|
99
100
|
readonly debugBar?: DebugBarInput;
|
|
101
|
+
/**
|
|
102
|
+
* Telemetry consumers — the config seam telemetry tests assert through.
|
|
103
|
+
* Register an in-test consumer, dispatch, then `drainDeferred()` to
|
|
104
|
+
* receive the snapshot.
|
|
105
|
+
*/
|
|
106
|
+
readonly telemetry?: TelemetryConfig;
|
|
100
107
|
/** `<Image>` remote-host allowlist; tests exercising remote optimization set it. */
|
|
101
108
|
readonly images?: {
|
|
102
109
|
readonly remotePatterns?: readonly RemotePattern[];
|
|
@@ -135,6 +142,12 @@ export interface DispatcherHarness {
|
|
|
135
142
|
* call `.override(fn)` on the returned spy to transform values.
|
|
136
143
|
*/
|
|
137
144
|
readonly spyFilter: <TName extends FilterName>(name: TName) => FilterSpy<FilterInput<TName>, FilterRest<TName>>;
|
|
145
|
+
/**
|
|
146
|
+
* Await everything routed through `ctx.defer` so far (telemetry snapshot
|
|
147
|
+
* delivery, edge-cache purges). Mirrors the platform's `waitUntil`: call
|
|
148
|
+
* after a dispatch, before asserting on deferred side effects.
|
|
149
|
+
*/
|
|
150
|
+
readonly drainDeferred: () => Promise<void>;
|
|
138
151
|
}
|
|
139
152
|
export declare function createDispatcherHarness(options?: CreateDispatcherHarnessOptions): Promise<DispatcherHarness>;
|
|
140
153
|
export declare function plumixRequest(path: string, init?: RequestInit): Request;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dispatcher.d.ts","sourceRoot":"","sources":["../../src/test/dispatcher.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAE7D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AACrE,OAAO,KAAK,EAAE,YAAY,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC7E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAClE,OAAO,KAAK,EACV,mBAAmB,EACnB,SAAS,EACT,eAAe,EAChB,MAAM,cAAc,CAAC;AAEtB,OAAO,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,KAAK,EACV,UAAU,EACV,UAAU,EACV,WAAW,EACX,UAAU,EACV,UAAU,EACX,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AACvE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,KAAK,EACV,aAAa,EACb,cAAc,EACd,sBAAsB,EACtB,aAAa,EACd,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"dispatcher.d.ts","sourceRoot":"","sources":["../../src/test/dispatcher.ts"],"names":[],"mappings":"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"}
|
package/dist/test/dispatcher.js
CHANGED
|
@@ -7,6 +7,7 @@ import { requestStore } from "../context/stores.js";
|
|
|
7
7
|
import { buildApp } from "../runtime/app.js";
|
|
8
8
|
import { createPlumixDispatcher } from "../runtime/dispatcher.js";
|
|
9
9
|
import { defaultTestTheme } from "./default-theme.js";
|
|
10
|
+
import { createDeferQueue } from "./defer.js";
|
|
10
11
|
import { factoriesFor, userFactory } from "./factories.js";
|
|
11
12
|
import { createTestDb } from "./harness.js";
|
|
12
13
|
import { buildRequest, TestResponse } from "./request.js";
|
|
@@ -26,8 +27,9 @@ const silentLogger = {
|
|
|
26
27
|
warn: noop,
|
|
27
28
|
error: noop,
|
|
28
29
|
};
|
|
29
|
-
function withRequest(app, db, env, assets, storage, cache, request, user) {
|
|
30
|
+
function withRequest(app, db, env, assets, storage, cache, defer, request, user) {
|
|
30
31
|
return createAppContext({
|
|
32
|
+
defer,
|
|
31
33
|
db,
|
|
32
34
|
env,
|
|
33
35
|
request,
|
|
@@ -54,6 +56,7 @@ function withRequest(app, db, env, assets, storage, cache, request, user) {
|
|
|
54
56
|
basePath: app.basePath,
|
|
55
57
|
siteName: app.config.auth.magicLink?.siteName,
|
|
56
58
|
debugBar: app.config.debugBar,
|
|
59
|
+
telemetry: app.config.telemetry,
|
|
57
60
|
});
|
|
58
61
|
}
|
|
59
62
|
export async function createDispatcherHarness(options = {}) {
|
|
@@ -81,6 +84,7 @@ export async function createDispatcherHarness(options = {}) {
|
|
|
81
84
|
mcp: options.mcp,
|
|
82
85
|
api: options.api,
|
|
83
86
|
debugBar: options.debugBar,
|
|
87
|
+
telemetry: options.telemetry,
|
|
84
88
|
images: options.images,
|
|
85
89
|
theme: options.theme ?? defaultTestTheme,
|
|
86
90
|
});
|
|
@@ -90,12 +94,13 @@ export async function createDispatcherHarness(options = {}) {
|
|
|
90
94
|
});
|
|
91
95
|
const dispatcher = createPlumixDispatcher(app);
|
|
92
96
|
const { assets, storage, cache } = options;
|
|
97
|
+
const { defer, drainDeferred } = createDeferQueue();
|
|
93
98
|
const harness = {
|
|
94
99
|
db,
|
|
95
100
|
app,
|
|
96
101
|
env,
|
|
97
102
|
dispatch: async (request, user = null) => {
|
|
98
|
-
const ctx = withRequest(app, db, env, assets, storage, cache, request, user);
|
|
103
|
+
const ctx = withRequest(app, db, env, assets, storage, cache, defer, request, user);
|
|
99
104
|
// Mirror the runtime adapter, which runs dispatch inside the request
|
|
100
105
|
// store so `tryGetContext()`-based features (DB logging, debug spans,
|
|
101
106
|
// audit-log) see the context.
|
|
@@ -103,7 +108,7 @@ export async function createDispatcherHarness(options = {}) {
|
|
|
103
108
|
},
|
|
104
109
|
fetch: async (path, fetchOptions = {}) => {
|
|
105
110
|
const request = await buildRequest(db, path, fetchOptions);
|
|
106
|
-
const ctx = withRequest(app, db, env, assets, storage, cache, request, fetchOptions.as ?? null);
|
|
111
|
+
const ctx = withRequest(app, db, env, assets, storage, cache, defer, request, fetchOptions.as ?? null);
|
|
107
112
|
const response = await requestStore.run(ctx, () => dispatcher(ctx));
|
|
108
113
|
return new TestResponse(response);
|
|
109
114
|
},
|
|
@@ -117,6 +122,7 @@ export async function createDispatcherHarness(options = {}) {
|
|
|
117
122
|
factory: factoriesFor(db),
|
|
118
123
|
spyAction: (name) => spyAction(app.hooks, name),
|
|
119
124
|
spyFilter: (name) => spyFilter(app.hooks, name),
|
|
125
|
+
drainDeferred,
|
|
120
126
|
};
|
|
121
127
|
return harness;
|
|
122
128
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dispatcher.js","sourceRoot":"","sources":["../../src/test/dispatcher.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"dispatcher.js","sourceRoot":"","sources":["../../src/test/dispatcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"harness.d.ts","sourceRoot":"","sources":["../../src/test/harness.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,KAAK,MAAM,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"harness.d.ts","sourceRoot":"","sources":["../../src/test/harness.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,KAAK,MAAM,MAAM,uBAAuB,CAAC;AAGhD,KAAK,MAAM,GAAG,UAAU,CAAC,OAAO,OAAO,CAAC,OAAO,MAAM,CAAC,CAAC,CAAC;AAwBxD;;;GAGG;AACH,wBAAsB,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC,CAOpD"}
|
package/dist/test/harness.js
CHANGED
|
@@ -3,8 +3,7 @@ import { generateSQLiteDrizzleJson, generateSQLiteMigration, } from "drizzle-kit
|
|
|
3
3
|
import { sql } from "drizzle-orm";
|
|
4
4
|
import { drizzle } from "drizzle-orm/libsql";
|
|
5
5
|
import * as schema from "../db/schema/index.js";
|
|
6
|
-
import {
|
|
7
|
-
import { traceSqlClient } from "../debug-bar/trace-libsql.js";
|
|
6
|
+
import { traceSqlClient } from "../db/trace-libsql.js";
|
|
8
7
|
const schemaImports = schema;
|
|
9
8
|
let cachedStatements = null;
|
|
10
9
|
// drizzle-kit's `api` surface is loosely typed (`SQLiteSchema` is opaque);
|
|
@@ -26,16 +25,9 @@ async function compileSchemaSql() {
|
|
|
26
25
|
* Pure JS — works on Node, Bun, Deno, CI without native deps.
|
|
27
26
|
*/
|
|
28
27
|
export async function createTestDb() {
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
const
|
|
32
|
-
const db = drizzle(client, {
|
|
33
|
-
schema,
|
|
34
|
-
casing: "snake_case",
|
|
35
|
-
// Mirrors the real adapters: dev-gated debug-bar query logging, so the
|
|
36
|
-
// Database panel can be exercised end-to-end through the harness.
|
|
37
|
-
logger: process.env.PLUMIX_DEV ? createDebugSqlLogger() : undefined,
|
|
38
|
-
});
|
|
28
|
+
// Mirror the real adapter: unconditional per-query span tracing.
|
|
29
|
+
const client = traceSqlClient(createClient({ url: ":memory:" }));
|
|
30
|
+
const db = drizzle(client, { schema, casing: "snake_case" });
|
|
39
31
|
const statements = await compileSchemaSql();
|
|
40
32
|
for (const stmt of statements)
|
|
41
33
|
await db.run(sql.raw(stmt));
|
package/dist/test/harness.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"harness.js","sourceRoot":"","sources":["../../src/test/harness.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EACL,yBAAyB,EACzB,uBAAuB,GACxB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAClC,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,KAAK,MAAM,MAAM,uBAAuB,CAAC;AAChD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"harness.js","sourceRoot":"","sources":["../../src/test/harness.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EACL,yBAAyB,EACzB,uBAAuB,GACxB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAClC,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,KAAK,MAAM,MAAM,uBAAuB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAIvD,MAAM,aAAa,GAAG,MAA4C,CAAC;AAEnE,IAAI,gBAAgB,GAAoB,IAAI,CAAC;AAE7C,2EAA2E;AAC3E,yEAAyE;AACzE,+IAA+I;AAC/I,KAAK,UAAU,gBAAgB;IAC7B,IAAI,gBAAgB;QAAE,OAAO,gBAAgB,CAAC;IAC9C,yEAAyE;IACzE,4EAA4E;IAC5E,MAAM,KAAK,GAAG,MAAM,yBAAyB,CAAC,EAAE,EAAE,SAAS,EAAE,YAAY,CAAC,CAAC;IAC3E,MAAM,OAAO,GAAG,MAAM,yBAAyB,CAC7C,aAAa,EACb,KAAK,CAAC,EAAE,EACR,YAAY,CACb,CAAC;IACF,gBAAgB,GAAG,MAAM,uBAAuB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IACjE,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AACD,8IAA8I;AAE9I;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY;IAChC,iEAAiE;IACjE,MAAM,MAAM,GAAG,cAAc,CAAC,YAAY,CAAC,EAAE,GAAG,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC;IACjE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC,CAAC;IAC7D,MAAM,UAAU,GAAG,MAAM,gBAAgB,EAAE,CAAC;IAC5C,KAAK,MAAM,IAAI,IAAI,UAAU;QAAE,MAAM,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;IAC3D,OAAO,EAAE,CAAC;AACZ,CAAC"}
|
package/dist/test/index.d.ts
CHANGED
|
@@ -3,6 +3,9 @@ export type { Factories } from "./factories.js";
|
|
|
3
3
|
export { createTestDb } from "./harness.js";
|
|
4
4
|
export { createDispatcherHarness, plumixRequest } from "./dispatcher.js";
|
|
5
5
|
export type { DispatcherHarness, CreateDispatcherHarnessOptions, } from "./dispatcher.js";
|
|
6
|
+
export { createTracedContext } from "./traced-context.js";
|
|
7
|
+
export type { TracedContext } from "./traced-context.js";
|
|
8
|
+
export { createRequestMemo } from "../context/memo.js";
|
|
6
9
|
export { createDeferQueue } from "./defer.js";
|
|
7
10
|
export type { DeferQueue } from "./defer.js";
|
|
8
11
|
export { createRpcHarness } from "./rpc.js";
|
package/dist/test/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/test/index.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,WAAW,EACX,SAAS,EACT,UAAU,EACV,UAAU,EACV,eAAe,EACf,cAAc,EACd,YAAY,EACZ,UAAU,EACV,cAAc,EACd,YAAY,EACZ,WAAW,EACX,YAAY,EACZ,OAAO,EACP,aAAa,EACb,iBAAiB,EACjB,cAAc,EACd,cAAc,EACd,gBAAgB,EAChB,oBAAoB,EACpB,eAAe,EACf,gBAAgB,EAChB,mBAAmB,EACnB,iBAAiB,EACjB,YAAY,GACb,MAAM,gBAAgB,CAAC;AACxB,YAAY,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAEhD,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAE5C,OAAO,EAAE,uBAAuB,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AACzE,YAAY,EACV,iBAAiB,EACjB,8BAA8B,GAC/B,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAC9C,YAAY,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAE7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC5C,YAAY,EACV,UAAU,EACV,uBAAuB,EACvB,cAAc,EACd,qBAAqB,EACrB,2BAA2B,GAC5B,MAAM,UAAU,CAAC;AAElB,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC1D,YAAY,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAEjD,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAC/D,YAAY,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAE/E,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAKrD,OAAO,EACL,cAAc,EACd,gBAAgB,EAChB,sBAAsB,EACtB,kBAAkB,GACnB,MAAM,wBAAwB,CAAC;AAChC,YAAY,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/test/index.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,WAAW,EACX,SAAS,EACT,UAAU,EACV,UAAU,EACV,eAAe,EACf,cAAc,EACd,YAAY,EACZ,UAAU,EACV,cAAc,EACd,YAAY,EACZ,WAAW,EACX,YAAY,EACZ,OAAO,EACP,aAAa,EACb,iBAAiB,EACjB,cAAc,EACd,cAAc,EACd,gBAAgB,EAChB,oBAAoB,EACpB,eAAe,EACf,gBAAgB,EAChB,mBAAmB,EACnB,iBAAiB,EACjB,YAAY,GACb,MAAM,gBAAgB,CAAC;AACxB,YAAY,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAEhD,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAE5C,OAAO,EAAE,uBAAuB,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AACzE,YAAY,EACV,iBAAiB,EACjB,8BAA8B,GAC/B,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC1D,YAAY,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAIzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAEvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAC9C,YAAY,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAE7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC5C,YAAY,EACV,UAAU,EACV,uBAAuB,EACvB,cAAc,EACd,qBAAqB,EACrB,2BAA2B,GAC5B,MAAM,UAAU,CAAC;AAElB,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC1D,YAAY,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAEjD,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAC/D,YAAY,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAE/E,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAKrD,OAAO,EACL,cAAc,EACd,gBAAgB,EAChB,sBAAsB,EACtB,kBAAkB,GACnB,MAAM,wBAAwB,CAAC;AAChC,YAAY,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC"}
|
package/dist/test/index.js
CHANGED
|
@@ -4,6 +4,10 @@
|
|
|
4
4
|
export { userFactory, adminUser, editorUser, authorUser, contributorUser, subscriberUser, entryFactory, draftEntry, publishedEntry, trashedEntry, termFactory, categoryTerm, tagTerm, inviteFactory, credentialFactory, sessionFactory, settingFactory, entryTermFactory, allowedDomainFactory, apiTokenFactory, authTokenFactory, oauthAccountFactory, deviceCodeFactory, factoriesFor, } from "./factories.js";
|
|
5
5
|
export { createTestDb } from "./harness.js";
|
|
6
6
|
export { createDispatcherHarness, plumixRequest } from "./dispatcher.js";
|
|
7
|
+
export { createTracedContext } from "./traced-context.js";
|
|
8
|
+
// Real request-memo implementation for hand-rolled AppContext stand-ins —
|
|
9
|
+
// service functions read through `ctx.memo`, so a stand-in needs one.
|
|
10
|
+
export { createRequestMemo } from "../context/memo.js";
|
|
7
11
|
export { createDeferQueue } from "./defer.js";
|
|
8
12
|
export { createRpcHarness } from "./rpc.js";
|
|
9
13
|
export { buildRequest, TestResponse } from "./request.js";
|
package/dist/test/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/test/index.ts"],"names":[],"mappings":"AAAA,yEAAyE;AACzE,4EAA4E;AAC5E,wDAAwD;AAExD,OAAO,EACL,WAAW,EACX,SAAS,EACT,UAAU,EACV,UAAU,EACV,eAAe,EACf,cAAc,EACd,YAAY,EACZ,UAAU,EACV,cAAc,EACd,YAAY,EACZ,WAAW,EACX,YAAY,EACZ,OAAO,EACP,aAAa,EACb,iBAAiB,EACjB,cAAc,EACd,cAAc,EACd,gBAAgB,EAChB,oBAAoB,EACpB,eAAe,EACf,gBAAgB,EAChB,mBAAmB,EACnB,iBAAiB,EACjB,YAAY,GACb,MAAM,gBAAgB,CAAC;AAGxB,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAE5C,OAAO,EAAE,uBAAuB,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAMzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAG9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAS5C,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAG1D,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAG/D,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAErD,2EAA2E;AAC3E,0EAA0E;AAC1E,2DAA2D;AAC3D,OAAO,EACL,cAAc,EACd,gBAAgB,EAChB,sBAAsB,EACtB,kBAAkB,GACnB,MAAM,wBAAwB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/test/index.ts"],"names":[],"mappings":"AAAA,yEAAyE;AACzE,4EAA4E;AAC5E,wDAAwD;AAExD,OAAO,EACL,WAAW,EACX,SAAS,EACT,UAAU,EACV,UAAU,EACV,eAAe,EACf,cAAc,EACd,YAAY,EACZ,UAAU,EACV,cAAc,EACd,YAAY,EACZ,WAAW,EACX,YAAY,EACZ,OAAO,EACP,aAAa,EACb,iBAAiB,EACjB,cAAc,EACd,cAAc,EACd,gBAAgB,EAChB,oBAAoB,EACpB,eAAe,EACf,gBAAgB,EAChB,mBAAmB,EACnB,iBAAiB,EACjB,YAAY,GACb,MAAM,gBAAgB,CAAC;AAGxB,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAE5C,OAAO,EAAE,uBAAuB,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAMzE,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAG1D,0EAA0E;AAC1E,sEAAsE;AACtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAEvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAG9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAS5C,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAG1D,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAG/D,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAErD,2EAA2E;AAC3E,0EAA0E;AAC1E,2DAA2D;AAC3D,OAAO,EACL,cAAc,EACd,gBAAgB,EAChB,sBAAsB,EACtB,kBAAkB,GACnB,MAAM,wBAAwB,CAAC"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import type { AppContext } from "../context/app.js";
|
|
2
|
+
import { createDispatcherHarness } from "./dispatcher.js";
|
|
3
|
+
export interface TracedContext {
|
|
4
|
+
readonly harness: Awaited<ReturnType<typeof createDispatcherHarness>>;
|
|
5
|
+
readonly ctx: AppContext;
|
|
6
|
+
/** Run `fn` with `ctx` in the ambient request store so DB spans attribute to it. */
|
|
7
|
+
readonly run: <T>(fn: () => Promise<T>) => Promise<T>;
|
|
8
|
+
/** Number of `db:` spans collected so far — one per query. */
|
|
9
|
+
readonly dbQueryCount: () => number;
|
|
10
|
+
}
|
|
11
|
+
/**
|
|
12
|
+
* A dispatcher harness plus a standalone request context with telemetry
|
|
13
|
+
* sampled on — for unit tests that assert how many queries a service
|
|
14
|
+
* function issues (request-memo coverage, N+1 guards).
|
|
15
|
+
*/
|
|
16
|
+
export declare function createTracedContext(): Promise<TracedContext>;
|
|
17
|
+
//# sourceMappingURL=traced-context.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"traced-context.d.ts","sourceRoot":"","sources":["../../src/test/traced-context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAGpD,OAAO,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAE1D,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,uBAAuB,CAAC,CAAC,CAAC;IACtE,QAAQ,CAAC,GAAG,EAAE,UAAU,CAAC;IACzB,oFAAoF;IACpF,QAAQ,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;IACtD,8DAA8D;IAC9D,QAAQ,CAAC,YAAY,EAAE,MAAM,MAAM,CAAC;CACrC;AAED;;;;GAIG;AACH,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,aAAa,CAAC,CAmBlE"}
|