@timber-js/app 0.2.0-alpha.234 → 0.2.0-alpha.235
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/_chunks/{cli-check-BAKOSTkg.js → cli-check-Dl3yo3Zv.js} +3 -3
- package/dist/_chunks/{cli-check-BAKOSTkg.js.map → cli-check-Dl3yo3Zv.js.map} +1 -1
- package/dist/_chunks/{cli-context-BPdyA7Fp.js → cli-context-BbwVqarO.js} +1 -1
- package/dist/_chunks/{cli-context-CwTKMjVe.js → cli-context-DZh5v0yd.js} +2 -2
- package/dist/_chunks/{cli-context-CwTKMjVe.js.map → cli-context-DZh5v0yd.js.map} +1 -1
- package/dist/_chunks/{cli-schema-sync-y_8ijmzO.js → cli-schema-sync-CTWiBMZZ.js} +1 -1
- package/dist/_chunks/{cli-schema-sync-CAllbqRB.js → cli-schema-sync-CyrOHbAo.js} +2 -2
- package/dist/_chunks/{cli-schema-sync-CAllbqRB.js.map → cli-schema-sync-CyrOHbAo.js.map} +1 -1
- package/dist/_chunks/dev-server-DrYBIg66.js +1 -0
- package/dist/_chunks/{dev-server-Rq659RR1.js → dev-server-cmWVDgTf.js} +2 -2
- package/dist/_chunks/{dev-server-Rq659RR1.js.map → dev-server-cmWVDgTf.js.map} +1 -1
- package/dist/_chunks/dev-span-_NzMX-au.js.map +1 -1
- package/dist/_chunks/{plugin-context-FCkaNLUB.js → plugin-context-BtaQcMuh.js} +2 -2
- package/dist/_chunks/{plugin-context-FCkaNLUB.js.map → plugin-context-BtaQcMuh.js.map} +1 -1
- package/dist/_chunks/{plugin-context-BfSRKJfz.js → plugin-context-I1dvGccO.js} +1 -1
- package/dist/_chunks/{walkers-D_QHR_nf.js → walkers-DFC9KsBL.js} +2 -2
- package/dist/_chunks/{walkers-D_QHR_nf.js.map → walkers-DFC9KsBL.js.map} +1 -1
- package/dist/analyze/crawl-entry.js +1 -1
- package/dist/analyze/graph-command.js +2 -2
- package/dist/cli.js +6 -6
- package/dist/client/dev-pill/store.d.ts +0 -18
- package/dist/client/dev-pill/store.d.ts.map +1 -1
- package/dist/client/dev-pill/view.d.ts.map +1 -1
- package/dist/client/dev-pill/waterfall.d.ts +64 -0
- package/dist/client/dev-pill/waterfall.d.ts.map +1 -0
- package/dist/dev-tools/await-span.d.ts +5 -1
- package/dist/dev-tools/await-span.d.ts.map +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +113 -12
- package/dist/index.js.map +1 -1
- package/dist/native/rsc/dev-tools/await-span.js +6 -6
- package/dist/native/rsc/dev-tools/await-span.js.map +1 -1
- package/dist/native/rsc/manifest.json +1 -2
- package/dist/native/rsc/shared/dev-span.js +4 -3
- package/dist/native/rsc/shared/dev-span.js.map +1 -1
- package/dist/native/ssr/dev-tools/await-span.js +6 -6
- package/dist/native/ssr/dev-tools/await-span.js.map +1 -1
- package/dist/native/ssr/shared/dev-span.js +4 -3
- package/dist/native/ssr/shared/dev-span.js.map +1 -1
- package/dist/plugins/dev-await.d.ts +3 -0
- package/dist/plugins/dev-await.d.ts.map +1 -1
- package/dist/plugins/native-runtime.d.ts +2 -2
- package/dist/plugins/native-runtime.d.ts.map +1 -1
- package/dist/plugins/plugin-rsc-package.d.ts +35 -0
- package/dist/plugins/plugin-rsc-package.d.ts.map +1 -0
- package/dist/routing/index.js +1 -1
- package/dist/shared/dev-span.d.ts +9 -2
- package/dist/shared/dev-span.d.ts.map +1 -1
- package/package.json +2 -2
- package/src/client/dev-pill/store.ts +5 -64
- package/src/client/dev-pill/view.ts +165 -53
- package/src/client/dev-pill/waterfall.ts +194 -0
- package/src/dev-tools/await-span.ts +22 -13
- package/src/index.ts +3 -10
- package/src/plugins/dev-await.ts +61 -3
- package/src/plugins/native-runtime.ts +4 -3
- package/src/plugins/plugin-rsc-package.ts +81 -0
- package/src/shared/dev-span.ts +12 -4
- package/dist/_chunks/dev-server-L8biS7Az.js +0 -1
|
@@ -1,23 +1,23 @@
|
|
|
1
1
|
import { traceCall } from "../server/tracing.js";
|
|
2
|
-
import { AWAIT_SPAN_NAME, DEV_AWAIT_KEY } from "../shared/dev-span.js";
|
|
2
|
+
import { AWAIT_SPAN_NAME, AWAIT_WAIT_ATTRIBUTE, DEV_AWAIT_KEY } from "../shared/dev-span.js";
|
|
3
3
|
import { trace } from "@opentelemetry/api";
|
|
4
4
|
// src/dev-tools/await-span.ts
|
|
5
5
|
var awaited = new WeakSet();
|
|
6
|
-
function
|
|
6
|
+
function noteWait(value, startsNoWork) {
|
|
7
7
|
if (typeof value !== "object" || value === null) return;
|
|
8
8
|
if (Object.getPrototypeOf(value) !== Promise.prototype) return;
|
|
9
|
-
if (awaited.has(value)) trace.getActiveSpan()?.setAttribute(
|
|
10
|
-
|
|
9
|
+
if (startsNoWork || awaited.has(value)) trace.getActiveSpan()?.setAttribute(AWAIT_WAIT_ATTRIBUTE, true);
|
|
10
|
+
awaited.add(value);
|
|
11
11
|
}
|
|
12
12
|
function installDevAwait() {
|
|
13
|
-
const wrapper = (thunk, label, location) => {
|
|
13
|
+
const wrapper = (thunk, label, location, startsNoWork = false) => {
|
|
14
14
|
if (!trace.getActiveSpan()) return thunk();
|
|
15
15
|
return traceCall(AWAIT_SPAN_NAME, {
|
|
16
16
|
"timber.await_label": label,
|
|
17
17
|
"timber.await_location": location
|
|
18
18
|
}, () => {
|
|
19
19
|
const value = thunk();
|
|
20
|
-
|
|
20
|
+
noteWait(value, startsNoWork);
|
|
21
21
|
return value;
|
|
22
22
|
});
|
|
23
23
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"await-span.js","names":[],"sources":["../../../../src/dev-tools/await-span.ts"],"mappings":";;;;
|
|
1
|
+
{"version":3,"file":"await-span.js","names":[],"sources":["../../../../src/dev-tools/await-span.ts"],"mappings":";;;;AAiCA,IAAM,UAAU,IAAI,QAAgB;AAYpC,SAAS,SAAS,OAAgB,cAA6B;CAC7D,IAAI,OAAO,UAAU,YAAY,UAAU,MAAM;CACjD,IAAI,OAAO,eAAe,KAAK,MAAM,QAAQ,WAAW;CACxD,IAAI,gBAAgB,QAAQ,IAAI,KAAK,GACnC,MAAM,cAAc,CAAC,EAAE,aAAa,sBAAsB,IAAI;CAEhE,QAAQ,IAAI,KAAK;AACnB;AAOA,SAAgB,kBAAwB;CACtC,MAAM,WAA4B,OAAO,OAAO,UAAU,eAAe,UAAU;EAGjF,IAAI,CAAC,MAAM,cAAc,GAAG,OAAO,MAAM;EAGzC,OAAO,UACL,iBACA;GAAE,sBAAsB;GAAO,yBAAyB;EAAS,SAC3D;GACJ,MAAM,QAAQ,MAAM;GACpB,SAAS,OAAO,YAAY;GAC5B,OAAO;EACT,CACF;CACF;CACA,WAAwC,iBAAiB;AAC3D"}
|
|
@@ -5,6 +5,7 @@ var DEV_SPAN_SINK_KEY = Symbol.for("timber.dev.span-sink");
|
|
|
5
5
|
var TRACE_TIMING_NAME = "timber-trace";
|
|
6
6
|
var DEV_AWAIT_KEY = Symbol.for("timber.dev.await");
|
|
7
7
|
var AWAIT_SPAN_NAME = "timber.await";
|
|
8
|
+
var AWAIT_WAIT_ATTRIBUTE = "timber.await_wait";
|
|
8
9
|
var ROOT_SPAN_NAME = "http.server.request";
|
|
9
10
|
var DEV_SPAN_ATTRIBUTES = [
|
|
10
11
|
"http.request.method",
|
|
@@ -18,7 +19,7 @@ var DEV_SPAN_ATTRIBUTES = [
|
|
|
18
19
|
"timber.cache_status",
|
|
19
20
|
"timber.await_label",
|
|
20
21
|
"timber.await_location",
|
|
21
|
-
"timber.
|
|
22
|
+
"timber.await_wait"
|
|
22
23
|
];
|
|
23
24
|
var DEV_SPAN_URL_ATTRIBUTES = new Set(["http.url", "url.path"]);
|
|
24
25
|
function traceTimingEntry(traceId) {
|
|
@@ -87,7 +88,7 @@ function devSpanLabel(name, attrs) {
|
|
|
87
88
|
};
|
|
88
89
|
}
|
|
89
90
|
case AWAIT_SPAN_NAME: return {
|
|
90
|
-
label: `await ${String(attrs["timber.await_label"] ?? "")}${attrs["timber.
|
|
91
|
+
label: `await ${String(attrs["timber.await_label"] ?? "")}${attrs["timber.await_wait"] === true ? " (wait)" : ""}`,
|
|
91
92
|
env: "await"
|
|
92
93
|
};
|
|
93
94
|
case "timber.fetch": {
|
|
@@ -104,6 +105,6 @@ function devSpanLabel(name, attrs) {
|
|
|
104
105
|
};
|
|
105
106
|
}
|
|
106
107
|
}
|
|
107
|
-
export { AWAIT_SPAN_NAME, DEV_AWAIT_KEY, DEV_SPAN_ATTRIBUTES, DEV_SPAN_EVENT, DEV_SPAN_REPLAY_EVENT, DEV_SPAN_SINK_KEY, DEV_SPAN_URL_ATTRIBUTES, ROOT_SPAN_NAME, TRACE_TIMING_NAME, devSpanLabel, traceTimingEntry };
|
|
108
|
+
export { AWAIT_SPAN_NAME, AWAIT_WAIT_ATTRIBUTE, DEV_AWAIT_KEY, DEV_SPAN_ATTRIBUTES, DEV_SPAN_EVENT, DEV_SPAN_REPLAY_EVENT, DEV_SPAN_SINK_KEY, DEV_SPAN_URL_ATTRIBUTES, ROOT_SPAN_NAME, TRACE_TIMING_NAME, devSpanLabel, traceTimingEntry };
|
|
108
109
|
|
|
109
110
|
//# sourceMappingURL=dev-span.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev-span.js","names":[],"sources":["../../../../src/shared/dev-span.ts"],"mappings":";AAQA,IAAa,iBAAiB;AAG9B,IAAa,wBAAwB;AAOrC,IAAa,oBAAoB,OAAO,IAAI,sBAAsB;AAGlE,IAAa,oBAAoB;AASjC,IAAa,gBAAgB,OAAO,IAAI,kBAAkB;AAG1D,IAAa,kBAAkB;
|
|
1
|
+
{"version":3,"file":"dev-span.js","names":[],"sources":["../../../../src/shared/dev-span.ts"],"mappings":";AAQA,IAAa,iBAAiB;AAG9B,IAAa,wBAAwB;AAOrC,IAAa,oBAAoB,OAAO,IAAI,sBAAsB;AAGlE,IAAa,oBAAoB;AASjC,IAAa,gBAAgB,OAAO,IAAI,kBAAkB;AAG1D,IAAa,kBAAkB;AAQ/B,IAAa,uBAAuB;AAUpC,IAAa,iBAAiB;AAU9B,IAAa,sBAAsB;CACjC;CACA;CAEA;CAEA;CACA;CACA;CACA;CACA;CACA;CAEA;CAEA;CAEA;AACF;AAKA,IAAa,0BAAyD,IAAI,IAAI,CAC5E,YACA,UACF,CAAC;AAyCD,SAAgB,iBAAiB,SAAyB;CACxD,OAAO,GAAG,kBAAkB,SAAS,QAAQ;AAC/C;AAQA,SAAS,WAAW,OAA+B;CACjD,MAAM,OAAO,MAAM;CACnB,OAAO,OAAO,GAAG,OAAO,IAAI,EAAE,KAAK;AACrC;AAOA,SAAgB,aAAa,MAAc,OAAuD;CAChG,QAAQ,MAAR;EACE,KAAK,gBAAgB;GACnB,MAAM,SAAS,MAAM,0BAA0B;GAC/C,MAAM,OAAO,MAAM,eAAe;GAClC,OAAO;IAAE,OAAO,GAAG,OAAO,MAAM,EAAE,GAAG,OAAO,IAAI;IAAK,KAAK;GAAM;EAClE;EACA,KAAK,gBACH,OAAO;GAAE,OAAO;GAAY,KAAK;EAAQ;EAC3C,KAAK,qBACH,OAAO;GAAE,OAAO;GAAiB,KAAK;EAAM;EAC9C,KAAK,iBACH,OAAO;GAAE,OAAO;GAAU,KAAK;EAAM;EACvC,KAAK,iBAAiB;GACpB,MAAM,MAAM,MAAM,qBAAqB;GACvC,OAAO;IAAE,OAAO,eAAe,OAAO,GAAG,EAAE;IAAI,KAAK;GAAM;EAC5D;EACA,KAAK,cACH,OAAO;GAAE,OAAO;GAAoB,KAAK;EAAM;EACjD,KAAK,iBAAiB;GACpB,MAAM,aAAa,MAAM,yBAAyB;GAClD,OAAO;IAAE,OAAO,OAAO,UAAU;IAAG,KAAK;GAAM;EACjD;EACA,KAAK,mBACH,OAAO;GAAE,OAAO;GAAc,KAAK;EAAM;EAC3C,KAAK,iBAAiB;GACpB,MAAM,MAAM,MAAM,qBAAqB;GACvC,OAAO;IAAE,OAAO,UAAU,WAAW,KAAK,IAAI,OAAO,GAAG;IAAK,KAAK;GAAM;EAC1E;EACA,KAAK,eAAe;GAClB,MAAM,QAAQ,MAAM,mBAAmB;GACvC,OAAO;IAAE,OAAO,QAAQ,WAAW,KAAK,IAAI,OAAO,KAAK;IAAK,KAAK;GAAM;EAC1E;EACA,KAAK,iBAEH,OAAO;GACL,OAAO,SAAS,OAAO,MAAM,yBAAyB,EAAE,IAAI,MAAA,yBAAgC,OAAO,YAAY;GAC/G,KAAK;EACP;EACF,KAAK,gBAAgB;GACnB,MAAM,cAAc,MAAM,0BAA0B;GACpD,MAAM,WAAW,MAAM,eAAe;GACtC,OAAO;IAAE,OAAO,SAAS,OAAO,WAAW,EAAE,GAAG,OAAO,QAAQ;IAAK,KAAK;GAAQ;EACnF;EACA,SACE,OAAO;GAAE,OAAO;GAAM,KAAK;EAAM;CACrC;AACF"}
|
|
@@ -1,23 +1,23 @@
|
|
|
1
1
|
import { traceCall } from "../server/tracing.js";
|
|
2
|
-
import { AWAIT_SPAN_NAME, DEV_AWAIT_KEY } from "../shared/dev-span.js";
|
|
2
|
+
import { AWAIT_SPAN_NAME, AWAIT_WAIT_ATTRIBUTE, DEV_AWAIT_KEY } from "../shared/dev-span.js";
|
|
3
3
|
import { trace } from "@opentelemetry/api";
|
|
4
4
|
// src/dev-tools/await-span.ts
|
|
5
5
|
var awaited = new WeakSet();
|
|
6
|
-
function
|
|
6
|
+
function noteWait(value, startsNoWork) {
|
|
7
7
|
if (typeof value !== "object" || value === null) return;
|
|
8
8
|
if (Object.getPrototypeOf(value) !== Promise.prototype) return;
|
|
9
|
-
if (awaited.has(value)) trace.getActiveSpan()?.setAttribute(
|
|
10
|
-
|
|
9
|
+
if (startsNoWork || awaited.has(value)) trace.getActiveSpan()?.setAttribute(AWAIT_WAIT_ATTRIBUTE, true);
|
|
10
|
+
awaited.add(value);
|
|
11
11
|
}
|
|
12
12
|
function installDevAwait() {
|
|
13
|
-
const wrapper = (thunk, label, location) => {
|
|
13
|
+
const wrapper = (thunk, label, location, startsNoWork = false) => {
|
|
14
14
|
if (!trace.getActiveSpan()) return thunk();
|
|
15
15
|
return traceCall(AWAIT_SPAN_NAME, {
|
|
16
16
|
"timber.await_label": label,
|
|
17
17
|
"timber.await_location": location
|
|
18
18
|
}, () => {
|
|
19
19
|
const value = thunk();
|
|
20
|
-
|
|
20
|
+
noteWait(value, startsNoWork);
|
|
21
21
|
return value;
|
|
22
22
|
});
|
|
23
23
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"await-span.js","names":[],"sources":["../../../../src/dev-tools/await-span.ts"],"mappings":";;;;
|
|
1
|
+
{"version":3,"file":"await-span.js","names":[],"sources":["../../../../src/dev-tools/await-span.ts"],"mappings":";;;;AAiCA,IAAM,UAAU,IAAI,QAAgB;AAYpC,SAAS,SAAS,OAAgB,cAA6B;CAC7D,IAAI,OAAO,UAAU,YAAY,UAAU,MAAM;CACjD,IAAI,OAAO,eAAe,KAAK,MAAM,QAAQ,WAAW;CACxD,IAAI,gBAAgB,QAAQ,IAAI,KAAK,GACnC,MAAM,cAAc,CAAC,EAAE,aAAa,sBAAsB,IAAI;CAEhE,QAAQ,IAAI,KAAK;AACnB;AAOA,SAAgB,kBAAwB;CACtC,MAAM,WAA4B,OAAO,OAAO,UAAU,eAAe,UAAU;EAGjF,IAAI,CAAC,MAAM,cAAc,GAAG,OAAO,MAAM;EAGzC,OAAO,UACL,iBACA;GAAE,sBAAsB;GAAO,yBAAyB;EAAS,SAC3D;GACJ,MAAM,QAAQ,MAAM;GACpB,SAAS,OAAO,YAAY;GAC5B,OAAO;EACT,CACF;CACF;CACA,WAAwC,iBAAiB;AAC3D"}
|
|
@@ -5,6 +5,7 @@ var DEV_SPAN_SINK_KEY = Symbol.for("timber.dev.span-sink");
|
|
|
5
5
|
var TRACE_TIMING_NAME = "timber-trace";
|
|
6
6
|
var DEV_AWAIT_KEY = Symbol.for("timber.dev.await");
|
|
7
7
|
var AWAIT_SPAN_NAME = "timber.await";
|
|
8
|
+
var AWAIT_WAIT_ATTRIBUTE = "timber.await_wait";
|
|
8
9
|
var ROOT_SPAN_NAME = "http.server.request";
|
|
9
10
|
var DEV_SPAN_ATTRIBUTES = [
|
|
10
11
|
"http.request.method",
|
|
@@ -18,7 +19,7 @@ var DEV_SPAN_ATTRIBUTES = [
|
|
|
18
19
|
"timber.cache_status",
|
|
19
20
|
"timber.await_label",
|
|
20
21
|
"timber.await_location",
|
|
21
|
-
"timber.
|
|
22
|
+
"timber.await_wait"
|
|
22
23
|
];
|
|
23
24
|
var DEV_SPAN_URL_ATTRIBUTES = new Set(["http.url", "url.path"]);
|
|
24
25
|
function traceTimingEntry(traceId) {
|
|
@@ -87,7 +88,7 @@ function devSpanLabel(name, attrs) {
|
|
|
87
88
|
};
|
|
88
89
|
}
|
|
89
90
|
case AWAIT_SPAN_NAME: return {
|
|
90
|
-
label: `await ${String(attrs["timber.await_label"] ?? "")}${attrs["timber.
|
|
91
|
+
label: `await ${String(attrs["timber.await_label"] ?? "")}${attrs["timber.await_wait"] === true ? " (wait)" : ""}`,
|
|
91
92
|
env: "await"
|
|
92
93
|
};
|
|
93
94
|
case "timber.fetch": {
|
|
@@ -104,6 +105,6 @@ function devSpanLabel(name, attrs) {
|
|
|
104
105
|
};
|
|
105
106
|
}
|
|
106
107
|
}
|
|
107
|
-
export { AWAIT_SPAN_NAME, DEV_AWAIT_KEY, DEV_SPAN_ATTRIBUTES, DEV_SPAN_EVENT, DEV_SPAN_REPLAY_EVENT, DEV_SPAN_SINK_KEY, DEV_SPAN_URL_ATTRIBUTES, ROOT_SPAN_NAME, TRACE_TIMING_NAME, devSpanLabel, traceTimingEntry };
|
|
108
|
+
export { AWAIT_SPAN_NAME, AWAIT_WAIT_ATTRIBUTE, DEV_AWAIT_KEY, DEV_SPAN_ATTRIBUTES, DEV_SPAN_EVENT, DEV_SPAN_REPLAY_EVENT, DEV_SPAN_SINK_KEY, DEV_SPAN_URL_ATTRIBUTES, ROOT_SPAN_NAME, TRACE_TIMING_NAME, devSpanLabel, traceTimingEntry };
|
|
108
109
|
|
|
109
110
|
//# sourceMappingURL=dev-span.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev-span.js","names":[],"sources":["../../../../src/shared/dev-span.ts"],"mappings":";AAQA,IAAa,iBAAiB;AAG9B,IAAa,wBAAwB;AAOrC,IAAa,oBAAoB,OAAO,IAAI,sBAAsB;AAGlE,IAAa,oBAAoB;AASjC,IAAa,gBAAgB,OAAO,IAAI,kBAAkB;AAG1D,IAAa,kBAAkB;
|
|
1
|
+
{"version":3,"file":"dev-span.js","names":[],"sources":["../../../../src/shared/dev-span.ts"],"mappings":";AAQA,IAAa,iBAAiB;AAG9B,IAAa,wBAAwB;AAOrC,IAAa,oBAAoB,OAAO,IAAI,sBAAsB;AAGlE,IAAa,oBAAoB;AASjC,IAAa,gBAAgB,OAAO,IAAI,kBAAkB;AAG1D,IAAa,kBAAkB;AAQ/B,IAAa,uBAAuB;AAUpC,IAAa,iBAAiB;AAU9B,IAAa,sBAAsB;CACjC;CACA;CAEA;CAEA;CACA;CACA;CACA;CACA;CACA;CAEA;CAEA;CAEA;AACF;AAKA,IAAa,0BAAyD,IAAI,IAAI,CAC5E,YACA,UACF,CAAC;AAyCD,SAAgB,iBAAiB,SAAyB;CACxD,OAAO,GAAG,kBAAkB,SAAS,QAAQ;AAC/C;AAQA,SAAS,WAAW,OAA+B;CACjD,MAAM,OAAO,MAAM;CACnB,OAAO,OAAO,GAAG,OAAO,IAAI,EAAE,KAAK;AACrC;AAOA,SAAgB,aAAa,MAAc,OAAuD;CAChG,QAAQ,MAAR;EACE,KAAK,gBAAgB;GACnB,MAAM,SAAS,MAAM,0BAA0B;GAC/C,MAAM,OAAO,MAAM,eAAe;GAClC,OAAO;IAAE,OAAO,GAAG,OAAO,MAAM,EAAE,GAAG,OAAO,IAAI;IAAK,KAAK;GAAM;EAClE;EACA,KAAK,gBACH,OAAO;GAAE,OAAO;GAAY,KAAK;EAAQ;EAC3C,KAAK,qBACH,OAAO;GAAE,OAAO;GAAiB,KAAK;EAAM;EAC9C,KAAK,iBACH,OAAO;GAAE,OAAO;GAAU,KAAK;EAAM;EACvC,KAAK,iBAAiB;GACpB,MAAM,MAAM,MAAM,qBAAqB;GACvC,OAAO;IAAE,OAAO,eAAe,OAAO,GAAG,EAAE;IAAI,KAAK;GAAM;EAC5D;EACA,KAAK,cACH,OAAO;GAAE,OAAO;GAAoB,KAAK;EAAM;EACjD,KAAK,iBAAiB;GACpB,MAAM,aAAa,MAAM,yBAAyB;GAClD,OAAO;IAAE,OAAO,OAAO,UAAU;IAAG,KAAK;GAAM;EACjD;EACA,KAAK,mBACH,OAAO;GAAE,OAAO;GAAc,KAAK;EAAM;EAC3C,KAAK,iBAAiB;GACpB,MAAM,MAAM,MAAM,qBAAqB;GACvC,OAAO;IAAE,OAAO,UAAU,WAAW,KAAK,IAAI,OAAO,GAAG;IAAK,KAAK;GAAM;EAC1E;EACA,KAAK,eAAe;GAClB,MAAM,QAAQ,MAAM,mBAAmB;GACvC,OAAO;IAAE,OAAO,QAAQ,WAAW,KAAK,IAAI,OAAO,KAAK;IAAK,KAAK;GAAM;EAC1E;EACA,KAAK,iBAEH,OAAO;GACL,OAAO,SAAS,OAAO,MAAM,yBAAyB,EAAE,IAAI,MAAA,yBAAgC,OAAO,YAAY;GAC/G,KAAK;EACP;EACF,KAAK,gBAAgB;GACnB,MAAM,cAAc,MAAM,0BAA0B;GACpD,MAAM,WAAW,MAAM,eAAe;GACtC,OAAO;IAAE,OAAO,SAAS,OAAO,WAAW,EAAE,GAAG,OAAO,QAAQ;IAAK,KAAK;GAAQ;EACnF;EACA,SACE,OAAO;GAAE,OAAO;GAAM,KAAK;EAAM;CACrC;AACF"}
|
|
@@ -9,6 +9,9 @@
|
|
|
9
9
|
* const rows = await __timber_await$(() => (db.select().from(users)),
|
|
10
10
|
* "db.select().from(users)", "app/users/page.tsx:12");
|
|
11
11
|
*
|
|
12
|
+
* An operand that starts no work (`await call`, `await Promise.all([a, b])`)
|
|
13
|
+
* gets a fourth argument, `true`, so the wrapper can mark the await a wait.
|
|
14
|
+
*
|
|
12
15
|
* `__timber_await$` is declared once per module and looks the wrapper up on
|
|
13
16
|
* `globalThis[DEV_AWAIT_KEY]` at call time (installed with dev tracing,
|
|
14
17
|
* `dev-tools/await-span.ts`); with none installed it calls the thunk. A
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev-await.d.ts","sourceRoot":"","sources":["../../src/plugins/dev-await.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"dev-await.d.ts","sourceRoot":"","sources":["../../src/plugins/dev-await.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AAMH,OAAO,WAAW,MAAM,cAAc,CAAC;AACvC,OAAO,EAAY,KAAK,MAAM,EAAE,MAAM,MAAM,CAAC;AAC7C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AA0G1D,4EAA4E;AAC5E,wBAAgB,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,KAAK,GAAG,KAAK,CAI1D;AA4FD;;;;;;;;GAQG;AACH,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,IAAI,GAAG,KAAK,GAAG,KAAK,CAAC;IAC3B,qFAAqF;IACrF,QAAQ,CAAC,eAAe,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;CAClD;AA4CD;;;;GAIG;AACH,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EACf,OAAO,GAAE;IAAE,IAAI,CAAC,EAAE,IAAI,GAAG,KAAK,GAAG,KAAK,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,cAAc,GAAG,IAAI,CAAA;CAAO,GACpF;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,UAAU,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC,CAAA;CAAE,GAAG,IAAI,CA2EtE;AAED,iEAAiE;AACjE,UAAU,WAAW;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,OAAO,EAAE,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC;IAC3B,cAAc,CAAC,EAAE,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC;IAC1C,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAC7B,GAAG,EAAE,WAAW,EAChB,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,MAAM,GAChB,cAAc,GAAG,IAAI,CAkCvB;AAaD,wBAAgB,cAAc,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAkBzD"}
|
|
@@ -30,8 +30,8 @@
|
|
|
30
30
|
* `__vite_rsc_require__`, so a global alias stands in for it.
|
|
31
31
|
*
|
|
32
32
|
* Used only when timber runs from an installed package with its mirrors, and
|
|
33
|
-
* `TIMBER_DEV_NATIVE_RUNTIME` is not `0`; RSC also needs the app's React
|
|
34
|
-
* react-dom
|
|
33
|
+
* `TIMBER_DEV_NATIVE_RUNTIME` is not `0`; RSC also needs the app's React and
|
|
34
|
+
* react-dom to be the versions the mirror bundled, and falls
|
|
35
35
|
* back to Vite with a warning otherwise (design/51 §"Two dev paths").
|
|
36
36
|
* timber's own repo and examples alias `@timber-js/app` to `src/` and keep the
|
|
37
37
|
* Vite path.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"native-runtime.d.ts","sourceRoot":"","sources":["../../src/plugins/native-runtime.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqCG;AAKH,OAAO,EAAY,KAAK,MAAM,EAAE,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"native-runtime.d.ts","sourceRoot":"","sources":["../../src/plugins/native-runtime.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqCG;AAKH,OAAO,EAAY,KAAK,MAAM,EAAE,MAAM,MAAM,CAAC;AAK7C,OAAO,EAEL,KAAK,cAAc,EACnB,KAAK,iBAAiB,EAEvB,MAAM,8BAA8B,CAAC;AAYtC,MAAM,WAAW,qBAAqB;IACpC,yEAAyE;IACzE,SAAS,EAAE,OAAO,CAAC,MAAM,CAAC,iBAAiB,EAAE,cAAc,CAAC,CAAC,CAAC;IAC9D,yDAAyD;IACzD,QAAQ,EAAE,OAAO,CAAC,MAAM,CAAC,iBAAiB,EAAE,MAAM,CAAC,CAAC,CAAC;IACrD;;;;OAIG;IACH,IAAI,EAAE,OAAO,CAAC;CACf;AAED,MAAM,WAAW,mBAAmB;IAClC,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,0EAA0E;IAC1E,gBAAgB,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI,CAAC;CACnD;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,MAAM,EACd,EAAE,GAAiB,EAAE,gBAAgB,EAAE,EAAE,mBAAmB,GAC3D,qBAAqB,CAmCvB;AAoDD,wBAAgB,mBAAmB,IAAI,MAAM,CAyJ5C"}
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Which copy of `@vitejs/plugin-rsc` timber runs, and the one Vite setting
|
|
3
|
+
* that follows from it.
|
|
4
|
+
*
|
|
5
|
+
* plugin-rsc is a dependency of `@timber-js/app`, pinned exactly: apps never
|
|
6
|
+
* import it, and the RSC mirror bundles that version's Flight runtime
|
|
7
|
+
* (design/51-native-dev-runtime.md). So:
|
|
8
|
+
*
|
|
9
|
+
* - **An installed timber loads its own copy.** The plugin, the runtime that
|
|
10
|
+
* timber's modules import and the bundled Flight runtime are then one
|
|
11
|
+
* version, whatever else the app installed. Package managers give that copy
|
|
12
|
+
* the app's Vite through timber's `vite` peer.
|
|
13
|
+
* - **A linked or from-source timber loads the app's copy.** It has its own
|
|
14
|
+
* `node_modules` with its own Vite, and plugin-rsc checks environments
|
|
15
|
+
* against the Vite it imports (`vite.isRunnableDevEnvironment`), so a copy
|
|
16
|
+
* resolved from timber would see a second Vite. This repo's examples and
|
|
17
|
+
* `pnpm link` setups take this path, with plugin-rsc installed in the
|
|
18
|
+
* workspace or the app.
|
|
19
|
+
*/
|
|
20
|
+
import type { Plugin } from 'vite';
|
|
21
|
+
/** Whether timber's `src/` is inside an installed package, not a checkout or link. */
|
|
22
|
+
export declare function isInstalledPackage(srcDir: string): boolean;
|
|
23
|
+
/** plugin-rsc's plugin factory: timber's own copy when installed, the app's otherwise. */
|
|
24
|
+
export declare function loadPluginRsc(appRoot: string): (typeof import('@vitejs/plugin-rsc'))['default'];
|
|
25
|
+
/**
|
|
26
|
+
* plugin-rsc lists its vendored Flight runtime in each environment's
|
|
27
|
+
* `optimizeDeps.include` by bare specifier, which Vite resolves from the app's
|
|
28
|
+
* root. An app that does not install plugin-rsc itself cannot resolve it
|
|
29
|
+
* there, so the browser's Flight client would be found only mid-load, and
|
|
30
|
+
* pre-bundled with a full page reload. When timber runs its own copy, each
|
|
31
|
+
* entry names the package it comes through (`@timber-js/app > …`), which Vite
|
|
32
|
+
* resolves from timber.
|
|
33
|
+
*/
|
|
34
|
+
export declare function timberPluginRscDeps(): Plugin;
|
|
35
|
+
//# sourceMappingURL=plugin-rsc-package.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"plugin-rsc-package.d.ts","sourceRoot":"","sources":["../../src/plugins/plugin-rsc-package.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAIH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAMnC,sFAAsF;AACtF,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAE1D;AAKD,0FAA0F;AAC1F,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,CAAC,cAAc,oBAAoB,CAAC,CAAC,CAAC,SAAS,CAAC,CAc/F;AAED;;;;;;;;GAQG;AACH,wBAAgB,mBAAmB,IAAI,MAAM,CAkB5C"}
|
package/dist/routing/index.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { a as INTERCEPTION_MARKERS, i as DEFAULT_PAGE_EXTENSIONS, n as classifyUrlSegment, t as classifySegment } from "../_chunks/segment-classify-Ho8jXWeC.js";
|
|
2
2
|
import { d as collectInterceptionRewrites, n as scanRoutes } from "../_chunks/scanner-BNQ4qnLX.js";
|
|
3
3
|
import { t as generateRouteMap } from "../_chunks/codegen-vaCyFyVN.js";
|
|
4
|
-
import { n as collectDynamicSegmentsFromTree, r as validateSchemaAgainstRoutes, t as collectLeafRoutes } from "../_chunks/walkers-
|
|
4
|
+
import { n as collectDynamicSegmentsFromTree, r as validateSchemaAgainstRoutes, t as collectLeafRoutes } from "../_chunks/walkers-DFC9KsBL.js";
|
|
5
5
|
export { DEFAULT_PAGE_EXTENSIONS, INTERCEPTION_MARKERS, classifySegment, classifyUrlSegment, collectDynamicSegmentsFromTree, collectInterceptionRewrites, collectLeafRoutes, generateRouteMap, scanRoutes, validateSchemaAgainstRoutes };
|
|
@@ -26,6 +26,13 @@ export declare const TRACE_TIMING_NAME = "timber-trace";
|
|
|
26
26
|
export declare const DEV_AWAIT_KEY: unique symbol;
|
|
27
27
|
/** Span name for one awaited call in app server code. */
|
|
28
28
|
export declare const AWAIT_SPAN_NAME = "timber.await";
|
|
29
|
+
/**
|
|
30
|
+
* Set on an await span that waited on work started elsewhere: a promise
|
|
31
|
+
* another await already took (React's `cache()`), or one made before the
|
|
32
|
+
* await began (`const p = load(); … await p`). The work's own spans nest
|
|
33
|
+
* where it started, so the wait adds no new information when they exist.
|
|
34
|
+
*/
|
|
35
|
+
export declare const AWAIT_WAIT_ATTRIBUTE = "timber.await_wait";
|
|
29
36
|
/**
|
|
30
37
|
* Await spans shorter than this are dropped before they reach the terminal
|
|
31
38
|
* tree or the pill: `await params` and other awaits of settled values would
|
|
@@ -51,8 +58,8 @@ export declare const DEV_SPAN_ATTRIBUTES: readonly ['http.request.method', 'http
|
|
|
51
58
|
'timber.await_label',
|
|
52
59
|
/** `path/relative/to/root.ts:line` of the await. */
|
|
53
60
|
'timber.await_location',
|
|
54
|
-
/**
|
|
55
|
-
'timber.
|
|
61
|
+
/** See `AWAIT_WAIT_ATTRIBUTE`. */
|
|
62
|
+
'timber.await_wait'];
|
|
56
63
|
export type DevSpanAttribute = (typeof DEV_SPAN_ATTRIBUTES)[number];
|
|
57
64
|
/** Attributes that hold a URL; sent without query or fragment. */
|
|
58
65
|
export declare const DEV_SPAN_URL_ATTRIBUTES: ReadonlySet<DevSpanAttribute>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev-span.d.ts","sourceRoot":"","sources":["../../src/shared/dev-span.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,+DAA+D;AAC/D,eAAO,MAAM,cAAc,gBAAgB,CAAC;AAE5C,uFAAuF;AACvF,eAAO,MAAM,qBAAqB,uBAAuB,CAAC;AAE1D;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,eAAqC,CAAC;AAEpE,0EAA0E;AAC1E,eAAO,MAAM,iBAAiB,iBAAiB,CAAC;AAEhD;;;;;;GAMG;AACH,eAAO,MAAM,aAAa,eAAiC,CAAC;AAE5D,yDAAyD;AACzD,eAAO,MAAM,eAAe,iBAAiB,CAAC;AAE9C;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,IAAI,CAAC;AAEnC,2CAA2C;AAC3C,eAAO,MAAM,cAAc,wBAAwB,CAAC;AAEpD;;;;;;;GAOG;AACH,eAAO,MAAM,mBAAmB,YAC9B,qBAAqB,EACrB,2BAA2B;AAC3B,mCAAmC;AACnC,UAAU;AACV,mCAAmC;AACnC,UAAU,EACV,cAAc,EACd,gBAAgB,EAChB,aAAa,EACb,oBAAoB,EACpB,qBAAqB;AACrB,6EAA6E;AAC7E,oBAAoB;AACpB,oDAAoD;AACpD,uBAAuB;AACvB,
|
|
1
|
+
{"version":3,"file":"dev-span.d.ts","sourceRoot":"","sources":["../../src/shared/dev-span.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,+DAA+D;AAC/D,eAAO,MAAM,cAAc,gBAAgB,CAAC;AAE5C,uFAAuF;AACvF,eAAO,MAAM,qBAAqB,uBAAuB,CAAC;AAE1D;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,eAAqC,CAAC;AAEpE,0EAA0E;AAC1E,eAAO,MAAM,iBAAiB,iBAAiB,CAAC;AAEhD;;;;;;GAMG;AACH,eAAO,MAAM,aAAa,eAAiC,CAAC;AAE5D,yDAAyD;AACzD,eAAO,MAAM,eAAe,iBAAiB,CAAC;AAE9C;;;;;GAKG;AACH,eAAO,MAAM,oBAAoB,sBAAsB,CAAC;AAExD;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,IAAI,CAAC;AAEnC,2CAA2C;AAC3C,eAAO,MAAM,cAAc,wBAAwB,CAAC;AAEpD;;;;;;;GAOG;AACH,eAAO,MAAM,mBAAmB,YAC9B,qBAAqB,EACrB,2BAA2B;AAC3B,mCAAmC;AACnC,UAAU;AACV,mCAAmC;AACnC,UAAU,EACV,cAAc,EACd,gBAAgB,EAChB,aAAa,EACb,oBAAoB,EACpB,qBAAqB;AACrB,6EAA6E;AAC7E,oBAAoB;AACpB,oDAAoD;AACpD,uBAAuB;AACvB,kCAAkC;AAClC,mBAAmB,CACX,CAAC;AAEX,MAAM,MAAM,gBAAgB,GAAG,CAAC,OAAO,mBAAmB,CAAC,CAAC,MAAM,CAAC,CAAC;AAEpE,kEAAkE;AAClE,eAAO,MAAM,uBAAuB,EAAE,WAAW,CAAC,gBAAgB,CAGhE,CAAC;AAEH,MAAM,MAAM,WAAW,GAAG,CAAC,IAAI,EAAE,cAAc,KAAK,IAAI,CAAC;AAEzD,oDAAoD;AACpD,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,gCAAgC;IAChC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,0BAA0B;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,0BAA0B;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,OAAO,CAAC;IACf,kEAAkE;IAClE,UAAU,EAAE,OAAO,CAAC,MAAM,CAAC,gBAAgB,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC;IACzE,gEAAgE;IAChE,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,EAAE,GACvE,MAAM,GAAG,IAAI,CAUf;AAED,yDAAyD;AACzD,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAExD;AAID,2EAA2E;AAC3E,KAAK,cAAc,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;AAQxD;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,cAAc,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,CA+ChG"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@timber-js/app",
|
|
3
|
-
"version": "0.2.0-alpha.
|
|
3
|
+
"version": "0.2.0-alpha.235",
|
|
4
4
|
"description": "Vite-native React framework built for Servers and Serverless Platforms — correct HTTP semantics, real status codes, pages that work without JavaScript",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"cloudflare-workers",
|
|
@@ -159,6 +159,7 @@
|
|
|
159
159
|
"@opentelemetry/api": "~1.10.0",
|
|
160
160
|
"@opentelemetry/context-async-hooks": "^3.0.0",
|
|
161
161
|
"@opentelemetry/sdk-trace-base": "^2.12.0",
|
|
162
|
+
"@vitejs/plugin-rsc": "0.5.39",
|
|
162
163
|
"cookie": "^2.0.1",
|
|
163
164
|
"jsonc-parser": "^3.3.1",
|
|
164
165
|
"magic-string": "^1.4.5",
|
|
@@ -172,7 +173,6 @@
|
|
|
172
173
|
"@content-collections/vite": "^0.2.0 || ^0.3.0",
|
|
173
174
|
"@typescript/native-preview": "^7.0.0-dev.0",
|
|
174
175
|
"@vitejs/plugin-react": "^6.1.0",
|
|
175
|
-
"@vitejs/plugin-rsc": "^0.5.39",
|
|
176
176
|
"nuqs": "^2.7.0",
|
|
177
177
|
"react": "19.3.1",
|
|
178
178
|
"react-dom": "19.3.1",
|
|
@@ -8,6 +8,7 @@
|
|
|
8
8
|
|
|
9
9
|
import { ROOT_SPAN_NAME, type DevSpanPayload } from '../../shared/dev-span.ts';
|
|
10
10
|
import { RSC_KEY_PARAM } from '../../shared/rsc-cache-key.ts';
|
|
11
|
+
import { explainedWaits } from './waterfall.ts';
|
|
11
12
|
|
|
12
13
|
export type DevRequestKind = 'document' | 'navigation' | 'action' | 'fetch';
|
|
13
14
|
|
|
@@ -41,19 +42,6 @@ export interface TraceSummary {
|
|
|
41
42
|
error: boolean;
|
|
42
43
|
}
|
|
43
44
|
|
|
44
|
-
/** Every span, or only the I/O: awaits and fetches. */
|
|
45
|
-
export type WaterfallView = 'all' | 'awaits';
|
|
46
|
-
|
|
47
|
-
const IO_SPANS = new Set(['timber.await', 'timber.fetch']);
|
|
48
|
-
|
|
49
|
-
export interface WaterfallRow {
|
|
50
|
-
span: DevSpanPayload;
|
|
51
|
-
depth: number;
|
|
52
|
-
/** Milliseconds from the trace's start. */
|
|
53
|
-
offsetMs: number;
|
|
54
|
-
durationMs: number;
|
|
55
|
-
}
|
|
56
|
-
|
|
57
45
|
/**
|
|
58
46
|
* The page a URL addresses, comparable across the address bar and a payload
|
|
59
47
|
* URL: `_rsc` dropped, and the query re-serialized by `URLSearchParams` on
|
|
@@ -160,68 +148,21 @@ export class DevPillStore {
|
|
|
160
148
|
const spans = this.spans(traceId);
|
|
161
149
|
const root = spans.find((s) => s.name === ROOT_SPAN_NAME);
|
|
162
150
|
const status = root?.attributes['http.response.status_code'];
|
|
151
|
+
// Explained waits waited on work other spans show; not new work.
|
|
152
|
+
const waits = explainedWaits(spans);
|
|
163
153
|
return {
|
|
164
154
|
fetches: spans.filter((s) => s.name === 'timber.fetch').length,
|
|
165
|
-
|
|
166
|
-
awaits: spans.filter(
|
|
167
|
-
(s) => s.name === 'timber.await' && s.attributes['timber.await_shared'] !== true
|
|
168
|
-
).length,
|
|
155
|
+
awaits: spans.filter((s) => s.name === 'timber.await' && !waits.has(s.spanId)).length,
|
|
169
156
|
durationMs: root
|
|
170
157
|
? Math.max(...spans.map((s) => s.endMs)) - Math.min(...spans.map((s) => s.startMs))
|
|
171
158
|
: null,
|
|
172
159
|
slow: spans.some(
|
|
173
|
-
(s) =>
|
|
174
|
-
s !== root &&
|
|
175
|
-
s.attributes['timber.await_shared'] !== true &&
|
|
176
|
-
s.endMs - s.startMs > this.slowMs
|
|
160
|
+
(s) => s !== root && !waits.has(s.spanId) && s.endMs - s.startMs > this.slowMs
|
|
177
161
|
),
|
|
178
162
|
error: spans.some((s) => s.error) || (typeof status === 'number' && status >= 500),
|
|
179
163
|
};
|
|
180
164
|
}
|
|
181
165
|
|
|
182
|
-
/**
|
|
183
|
-
* Spans in tree order (parent before children, siblings by start).
|
|
184
|
-
*
|
|
185
|
-
* `view: 'awaits'` keeps only awaits and fetches — the I/O — each nested
|
|
186
|
-
* under its nearest kept ancestor, so hiding framework phases leaves no
|
|
187
|
-
* gaps in the indentation. The time axis still starts at the request's
|
|
188
|
-
* first span.
|
|
189
|
-
*/
|
|
190
|
-
waterfall(traceId: string, view: WaterfallView = 'all'): WaterfallRow[] {
|
|
191
|
-
const spans = this.spans(traceId);
|
|
192
|
-
if (spans.length === 0) return [];
|
|
193
|
-
const ids = new Set(spans.map((s) => s.spanId));
|
|
194
|
-
const children = new Map<string | undefined, DevSpanPayload[]>();
|
|
195
|
-
for (const span of spans) {
|
|
196
|
-
// A span whose parent isn't here (the root still open, or a parent
|
|
197
|
-
// outside this trace's spans) sits at the top level.
|
|
198
|
-
const parent =
|
|
199
|
-
span.parentSpanId && ids.has(span.parentSpanId) ? span.parentSpanId : undefined;
|
|
200
|
-
const siblings = children.get(parent) ?? [];
|
|
201
|
-
siblings.push(span);
|
|
202
|
-
children.set(parent, siblings);
|
|
203
|
-
}
|
|
204
|
-
const origin = Math.min(...spans.map((s) => s.startMs));
|
|
205
|
-
const rows: WaterfallRow[] = [];
|
|
206
|
-
const visit = (parent: string | undefined, depth: number) => {
|
|
207
|
-
const siblings = (children.get(parent) ?? []).sort((a, b) => a.startMs - b.startMs);
|
|
208
|
-
for (const span of siblings) {
|
|
209
|
-
const shown = view === 'all' || IO_SPANS.has(span.name);
|
|
210
|
-
if (shown) {
|
|
211
|
-
rows.push({
|
|
212
|
-
span,
|
|
213
|
-
depth,
|
|
214
|
-
offsetMs: span.startMs - origin,
|
|
215
|
-
durationMs: span.endMs - span.startMs,
|
|
216
|
-
});
|
|
217
|
-
}
|
|
218
|
-
visit(span.spanId, shown ? depth + 1 : depth);
|
|
219
|
-
}
|
|
220
|
-
};
|
|
221
|
-
visit(undefined, 0);
|
|
222
|
-
return rows;
|
|
223
|
-
}
|
|
224
|
-
|
|
225
166
|
/**
|
|
226
167
|
* Keep the newest requests, and always the selected one: a page that polls
|
|
227
168
|
* a route handler would otherwise push its own trace out, leaving the pill
|