@solidjs/web 2.0.0-rc.8 → 2.0.0-rc.9

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.
Files changed (36) hide show
  1. package/dist/server.dev.js +626 -125
  2. package/dist/server.js +433 -95
  3. package/dist/server.observe.js +3980 -0
  4. package/dist/web.dev.js +208 -60
  5. package/dist/web.js +175 -58
  6. package/dist/web.observe.js +175 -58
  7. package/frames/dist/client.dev.js +103 -4
  8. package/frames/dist/client.js +5 -2
  9. package/frames/dist/client.observe.js +2123 -0
  10. package/frames/dist/server.dev.js +521 -79
  11. package/frames/dist/server.js +352 -52
  12. package/frames/dist/server.observe.js +4946 -0
  13. package/frames/package.json +12 -0
  14. package/package.json +87 -3
  15. package/server-functions/dist/client.dev.js +1102 -0
  16. package/server-functions/dist/client.js +74 -69
  17. package/server-functions/dist/client.observe.js +1102 -0
  18. package/server-functions/dist/server.dev.js +402 -31
  19. package/server-functions/dist/server.js +339 -30
  20. package/server-functions/dist/server.observe.js +2726 -0
  21. package/server-functions/package.json +12 -0
  22. package/types/client.d.ts +22 -1
  23. package/types/diagnostics.d.ts +24 -0
  24. package/types/frames/frame-transport.d.ts +1 -1
  25. package/types/index.d.ts +25 -15
  26. package/types/index.server.d.ts +35 -8
  27. package/types/jsx.d.ts +15 -4
  28. package/types/observe.d.ts +294 -0
  29. package/types/response.d.ts +18 -0
  30. package/types/server-functions/client.d.ts +32 -22
  31. package/types/server-functions/server.d.ts +28 -37
  32. package/types/server-functions/shared.d.ts +39 -9
  33. package/types/server-mock.d.ts +26 -4
  34. package/types/server-observe.d.ts +39 -0
  35. package/types/server.d.ts +104 -5
  36. package/types/trace.d.ts +79 -0
@@ -1,4 +1,5 @@
1
- import { sharedConfig, createRoot, ssrHandleError, getOwner, runWithOwner, inServerComponentScope, creationStamp, NoHydration, runInServerComponentScope, createMemo, Hydration, createOwner, getProjectionTrace } from 'solid-js';
1
+ import { reportServerError, ssrHandleError, ssrSanitizeError, inServerComponentScope, creationStamp, runInServerComponentScope, getProjectionTrace } from 'solid-js/internal';
2
+ import { sharedConfig, createRoot, getOwner, runWithOwner, NoHydration, createMemo, Hydration, createOwner } from 'solid-js';
2
3
  import { Feature, createStream, toCrossJSONStream, Serializer, getCrossReferenceHeader } from 'seroval';
3
4
  import { AbortSignalPlugin, CustomEventPlugin, DOMExceptionPlugin, EventPlugin, FormDataPlugin, HeadersPlugin, ReadableStreamPlugin, RequestPlugin, ResponsePlugin, URLSearchParamsPlugin, URLPlugin } from 'seroval-plugins/web';
4
5
 
@@ -101,6 +102,138 @@ const ContainerTracePlugin = {
101
102
 
102
103
  const COMPOSED_BODY_FRAMING = /*#__PURE__*/new Set(["content-length", "content-encoding", "transfer-encoding"]);
103
104
 
105
+ const TRACEPARENT = /^([0-9a-f]{2})-([0-9a-f]{32})-([0-9a-f]{16})-([0-9a-f]{2})(-.*)?$/;
106
+ const ZERO_TRACE = "00000000000000000000000000000000";
107
+ const ZERO_SPAN = "0000000000000000";
108
+ function parseTraceparent(value) {
109
+ if (!value) return undefined;
110
+ const m = TRACEPARENT.exec(value.trim());
111
+ if (!m) return undefined;
112
+ const [, version, traceId, parentId, flags, rest] = m;
113
+ if (version === "ff") return undefined;
114
+ if (version === "00" && rest !== undefined) return undefined;
115
+ if (traceId === ZERO_TRACE || parentId === ZERO_SPAN) return undefined;
116
+ return {
117
+ traceId,
118
+ parentId,
119
+ sampled: (parseInt(flags, 16) & 1) === 1
120
+ };
121
+ }
122
+ function randomHex(bytes) {
123
+ const buffer = new Uint8Array(bytes);
124
+ crypto.getRandomValues(buffer);
125
+ let out = "";
126
+ for (let i = 0; i < buffer.length; i++) out += (buffer[i] < 16 ? "0" : "") + buffer[i].toString(16);
127
+ return out;
128
+ }
129
+ function randomTraceId() {
130
+ let id = randomHex(16);
131
+ while (id === ZERO_TRACE) id = randomHex(16);
132
+ return id;
133
+ }
134
+ function randomSpanId() {
135
+ let id = randomHex(8);
136
+ while (id === ZERO_SPAN) id = randomHex(8);
137
+ return id;
138
+ }
139
+ function formatTraceparent(context) {
140
+ return `00-${context.traceId}-${context.spanId}-${context.sampled === true ? "01" : "00"}`;
141
+ }
142
+ const RECORDS_KEY = Symbol.for("@solidjs/web/trace/records");
143
+ function records$1() {
144
+ const g = globalThis;
145
+ return g[RECORDS_KEY] || (g[RECORDS_KEY] = new WeakMap());
146
+ }
147
+ function traceFor(key, request) {
148
+ const store = records$1();
149
+ let record = store.get(key);
150
+ if (record) return record;
151
+ const headers = request ? request.headers : undefined;
152
+ const incoming = headers ? parseTraceparent(headers.get("traceparent")) : undefined;
153
+ const context = {
154
+ traceId: incoming ? incoming.traceId : randomTraceId(),
155
+ spanId: randomSpanId(),
156
+ entries: {}
157
+ };
158
+ if (incoming) {
159
+ context.parentId = incoming.parentId;
160
+ context.sampled = incoming.sampled;
161
+ }
162
+ if (headers) {
163
+ const state = headers.get("tracestate");
164
+ if (state) context.state = state;
165
+ const baggage = headers.get("baggage");
166
+ if (baggage) context.baggage = baggage;
167
+ }
168
+ let answered = false;
169
+ context.entries.traceparent = formatTraceparent(context);
170
+ record = {
171
+ context,
172
+ emit: incoming !== undefined && incoming.sampled || answered
173
+ };
174
+ store.set(key, record);
175
+ return record;
176
+ }
177
+ const TOKEN = /^[!#$%&'*+\-.^_`|~0-9A-Za-z]+$/;
178
+ function splitServerTiming(value) {
179
+ const entries = [];
180
+ let start = 0;
181
+ let quoted = false;
182
+ for (let i = 0; i < value.length; i++) {
183
+ const c = value[i];
184
+ if (quoted) {
185
+ if (c === "\\") i++;else if (c === '"') quoted = false;
186
+ } else if (c === '"') quoted = true;else if (c === ",") {
187
+ entries.push(value.slice(start, i));
188
+ start = i + 1;
189
+ }
190
+ }
191
+ entries.push(value.slice(start));
192
+ return entries;
193
+ }
194
+ function metricName(entry) {
195
+ return entry.split(";")[0].trim().toLowerCase();
196
+ }
197
+ function namesOnServerTiming(headers) {
198
+ const names = new Set();
199
+ const existing = headers.get("server-timing");
200
+ if (existing) {
201
+ for (const entry of splitServerTiming(existing)) {
202
+ const name = metricName(entry);
203
+ if (name) names.add(name);
204
+ }
205
+ }
206
+ return names;
207
+ }
208
+ function quoteDesc(value) {
209
+ return value.replace(/[\x00-\x1f\x7f]/g, "").replace(/[\\"]/g, m => "\\" + m);
210
+ }
211
+ function appendTraceServerTiming(headers, record) {
212
+ if (!record.emit) return;
213
+ const entries = record.context.entries;
214
+ let present;
215
+ for (const name in entries) {
216
+ if (!TOKEN.test(name)) continue;
217
+ if (!present) present = namesOnServerTiming(headers);
218
+ if (present.has(name.toLowerCase())) continue;
219
+ headers.append("Server-Timing", `${name};desc="${quoteDesc(entries[name])}"`);
220
+ present.add(name.toLowerCase());
221
+ }
222
+ }
223
+ function escapeAttr(value) {
224
+ return value.replace(/[&"<>]/g, c => c === "&" ? "&amp;" : c === '"' ? "&quot;" : c === "<" ? "&lt;" : "&gt;");
225
+ }
226
+ function traceMetaMarkup(record) {
227
+ if (!record.emit) return "";
228
+ let markup = "";
229
+ const entries = record.context.entries;
230
+ for (const name in entries) {
231
+ if (!TOKEN.test(name)) continue;
232
+ markup += `<meta name="${name}" content="${escapeAttr(entries[name])}">`;
233
+ }
234
+ return markup;
235
+ }
236
+
104
237
  setContainerTraceStreamMint(iterable => {
105
238
  const stream = createStream();
106
239
  (async () => {
@@ -1000,7 +1133,7 @@ function headGroupSignature(winner) {
1000
1133
  }
1001
1134
  return sig;
1002
1135
  }
1003
- function renderShellHead(registry, nonce, isPendingFragment, noScripts) {
1136
+ function renderShellHead(registry, nonce, isPendingFragment, noScripts, traceMetas = "") {
1004
1137
  commitHeadBoundary(registry, "", isPendingFragment);
1005
1138
  registry.shellFlushed = true;
1006
1139
  const winners = resolveHead(registry.committed);
@@ -1026,7 +1159,7 @@ function renderShellHead(registry, nonce, isPendingFragment, noScripts) {
1026
1159
  }
1027
1160
  return {
1028
1161
  prelude,
1029
- html: registry.eagerHtml + links + metas + others + scripts,
1162
+ html: registry.eagerHtml + links + metas + traceMetas + others + scripts,
1030
1163
  title,
1031
1164
  noScripts
1032
1165
  };
@@ -1177,7 +1310,7 @@ function renderToStream(code, options = {}) {
1177
1310
  const requestEvent = peekRequestEvent();
1178
1311
  let dispose;
1179
1312
  let dead = false;
1180
- const abandon = () => {
1313
+ const abandon = disconnect => {
1181
1314
  if (dead) return;
1182
1315
  dead = true;
1183
1316
  completed = true;
@@ -1194,11 +1327,16 @@ function renderToStream(code, options = {}) {
1194
1327
  }
1195
1328
  };
1196
1329
  const failRender = err => {
1197
- try {
1198
- options.onError ? options.onError(err) : console.error(err);
1199
- } catch (_) {}
1330
+ reportServerError(err, {
1331
+ kind: "render",
1332
+ handling: "failed"
1333
+ }, null);
1334
+ if (!options.onError && ambientServerErrorHook() === undefined) console.error(err);
1200
1335
  abandon();
1201
1336
  };
1337
+ const failRootRender = err => {
1338
+ failRender(err);
1339
+ };
1202
1340
  const coalesceWrites = (writeRaw, endRaw) => {
1203
1341
  let buf = "";
1204
1342
  let scheduled = false;
@@ -1336,7 +1474,7 @@ function renderToStream(code, options = {}) {
1336
1474
  plugins: options.plugins,
1337
1475
  onData: payload => sink.data(payload),
1338
1476
  onDone,
1339
- onError: options.onError
1477
+ onError: serializerErrorHook(options.onError)
1340
1478
  });
1341
1479
  let rootAssetsSerialized = false;
1342
1480
  const serializeRootAssets = () => {
@@ -1361,6 +1499,34 @@ function renderToStream(code, options = {}) {
1361
1499
  };
1362
1500
  const registry = new Map();
1363
1501
  const pendingSerialized = new Map();
1502
+ const guardedChannels = new WeakMap();
1503
+ const verdictNow = error => {
1504
+ throw ssrSanitizeError(error, null);
1505
+ };
1506
+ const guardChannel = p => {
1507
+ if (!p || typeof p !== "object" || "__SEROVAL_STREAM__" in p) return p;
1508
+ const thenable = typeof p.then === "function";
1509
+ const iterable = !thenable && typeof p[Symbol.asyncIterator] === "function";
1510
+ if (!thenable && !iterable) return p;
1511
+ let guarded = guardedChannels.get(p);
1512
+ if (guarded === undefined) {
1513
+ guarded = thenable ? p.then(undefined, verdictNow) : {
1514
+ [Symbol.asyncIterator]() {
1515
+ const iterator = p[Symbol.asyncIterator]();
1516
+ return {
1517
+ next: value => iterator.next(value).then(undefined, verdictNow),
1518
+ return: value => iterator.return ? iterator.return(value) : Promise.resolve({
1519
+ done: true,
1520
+ value
1521
+ }),
1522
+ throw: error => iterator.throw ? iterator.throw(error) : Promise.reject(error)
1523
+ };
1524
+ }
1525
+ };
1526
+ guardedChannels.set(p, guarded);
1527
+ }
1528
+ return guarded;
1529
+ };
1364
1530
  const trackSerialized = (id, p) => {
1365
1531
  let settle;
1366
1532
  const raced = Promise.race([p, new Promise(r => settle = r)]);
@@ -1369,7 +1535,7 @@ function renderToStream(code, options = {}) {
1369
1535
  p.then(drop, drop);
1370
1536
  return raced;
1371
1537
  };
1372
- const abandonSubtree = key => {
1538
+ const abandonSubtree = (key, error) => {
1373
1539
  for (const [k, entry] of registry) {
1374
1540
  if (k.length > key.length && k.startsWith(key)) {
1375
1541
  registry.delete(k);
@@ -1502,6 +1668,7 @@ function renderToStream(code, options = {}) {
1502
1668
  },
1503
1669
  serialize(id, p, deferStream) {
1504
1670
  if (sharedConfig.context.noHydrate) return;
1671
+ p = guardChannel(p);
1505
1672
  if (p && typeof p === "object" && typeof p.then === "function") {
1506
1673
  if (!firstFlushed && deferStream) {
1507
1674
  blockingPromises.add(p);
@@ -1544,7 +1711,7 @@ function renderToStream(code, options = {}) {
1544
1711
  const p = new Promise((r, rej) => (resolve = r, reject = rej));
1545
1712
  registry.set(key, {
1546
1713
  resolve: err => queue(() => queue(() => {
1547
- err ? reject(err) : resolve(true);
1714
+ err ? reject(ssrSanitizeError(err, null)) : resolve(true);
1548
1715
  queue(flushEnd);
1549
1716
  }))
1550
1717
  });
@@ -1555,7 +1722,7 @@ function renderToStream(code, options = {}) {
1555
1722
  const item = registry.get(key);
1556
1723
  registry.delete(key);
1557
1724
  if (error) abandonSubtree(key);
1558
- if (item.children) {
1725
+ if (item.children && !error) {
1559
1726
  for (const k in item.children) {
1560
1727
  value = replacePlaceholder(value, k, item.children[k]);
1561
1728
  }
@@ -1585,7 +1752,7 @@ function renderToStream(code, options = {}) {
1585
1752
  sink.fragment(key, resolveSSRSelectValues(value !== undefined ? value : " "), {
1586
1753
  styles,
1587
1754
  revealGroup,
1588
- error
1755
+ error: error ? ssrSanitizeError(error, null) : error
1589
1756
  });
1590
1757
  item.resolve(error);
1591
1758
  }
@@ -1611,9 +1778,15 @@ function renderToStream(code, options = {}) {
1611
1778
  };
1612
1779
  applyAssetTracking(context, tracking, manifest, noScripts);
1613
1780
  context.failRender = failRender;
1781
+ context.errorPolicy = options.onError;
1782
+ context.flushed = () => firstFlushed;
1783
+ context.trace = requestEvent ? traceForEvent(requestEvent) : traceFor(context, undefined);
1614
1784
  registerEntryAssets(manifest);
1615
1785
  let html = createRoot(d => {
1616
- dispose = d;
1786
+ dispose = () => {
1787
+ context.trace = undefined;
1788
+ d();
1789
+ };
1617
1790
  const res = resolveSSRNode(escape(code()));
1618
1791
  if (!res.h.length) return res.t[0];
1619
1792
  rootHoles = [];
@@ -1676,7 +1849,7 @@ function renderToStream(code, options = {}) {
1676
1849
  }
1677
1850
  serializeRootAssets();
1678
1851
  flushStubBatch();
1679
- const head = renderShellHead(headRegistry, nonce, k => registry.has(k), noScripts);
1852
+ const head = renderShellHead(headRegistry, nonce, k => registry.has(k), noScripts, traceMetaMarkup(context.trace));
1680
1853
  sink.shell(resolveSSRSelectValues(html), {
1681
1854
  preloads: tracking.emittedAssets,
1682
1855
  preloadLinks: tracking.preloadLinks,
@@ -1731,7 +1904,7 @@ function renderToStream(code, options = {}) {
1731
1904
  try {
1732
1905
  doShell();
1733
1906
  } catch (err) {
1734
- failRender(err);
1907
+ failRootRender(err);
1735
1908
  return resolve();
1736
1909
  }
1737
1910
  if (!shellCompleted) return flush();
@@ -1772,7 +1945,9 @@ function renderToStream(code, options = {}) {
1772
1945
  return {
1773
1946
  then(onFulfilled, onRejected) {
1774
1947
  const freezeHead = () => {
1775
- if (requestEvent && requestEvent.response) commitResponseStub(requestEvent.response);
1948
+ if (requestEvent && requestEvent.response) commitResponseStub(requestEvent.response, {
1949
+ event: requestEvent
1950
+ });
1776
1951
  };
1777
1952
  const p = new Promise(resolve => {
1778
1953
  function complete() {
@@ -1793,7 +1968,7 @@ function renderToStream(code, options = {}) {
1793
1968
  try {
1794
1969
  if (blockingPromises.size !== lastBlockingSize || !resolveRootHoles() || blockingPromises.size !== lastBlockingSize || !headShellReady(headRegistry, p => blockingPromises.add(p))) return flush();
1795
1970
  } catch (err) {
1796
- failRender(err);
1971
+ failRootRender(err);
1797
1972
  return resolve(tmp);
1798
1973
  }
1799
1974
  queue(flushEnd);
@@ -1813,7 +1988,7 @@ function renderToStream(code, options = {}) {
1813
1988
  try {
1814
1989
  doShell();
1815
1990
  } catch (err) {
1816
- failRender(err);
1991
+ failRootRender(err);
1817
1992
  try {
1818
1993
  w.end();
1819
1994
  } catch (_) {}
@@ -1932,6 +2107,10 @@ function ssrGroupSlot(fn, idx) {
1932
2107
  }
1933
2108
  };
1934
2109
  }
2110
+ function wireErrorMessage(err) {
2111
+ const wire = ssrSanitizeError(err, null);
2112
+ return String(wire && wire.message || wire);
2113
+ }
1935
2114
  const holePositionCache = new WeakMap();
1936
2115
  function holeContentPositions(t) {
1937
2116
  let cached = holePositionCache.get(t);
@@ -2088,7 +2267,7 @@ function createLiveHoles(sink, scoped) {
2088
2267
  } catch (err) {
2089
2268
  b.closed = true;
2090
2269
  sink.closeBinding(b.key);
2091
- sink.error(b.key, String(err && err.message || err));
2270
+ sink.error(b.key, wireErrorMessage(err));
2092
2271
  return;
2093
2272
  } finally {
2094
2273
  engine.sweeping = prevSweeping;
@@ -2233,7 +2412,7 @@ function createLiveHoles(sink, scoped) {
2233
2412
  if (ssrHandleError(err, true)) return;
2234
2413
  b.closed = true;
2235
2414
  sink.closeBinding(b.key);
2236
- sink.error("lha:" + cap.id, String(err && err.message || err));
2415
+ sink.error("lha:" + cap.id, wireErrorMessage(err));
2237
2416
  return;
2238
2417
  } finally {
2239
2418
  engine.sweeping = prevSweeping;
@@ -2761,23 +2940,26 @@ function replacePlaceholder(html, key, value) {
2761
2940
  const last = html.indexOf(close, first + marker.length);
2762
2941
  return html.slice(0, first) + value + html.slice(last + close.length);
2763
2942
  }
2764
- function tryResolveString(node) {
2943
+ let ssrTextTail = false;
2944
+ function tryResolveString(node, nested) {
2945
+ if (!nested) ssrTextTail = false;
2765
2946
  const t = typeof node;
2766
- if (t === "string") return node;
2767
- if (t === "number") return "" + node;
2947
+ if (t === "string" || t === "number") {
2948
+ const s = ssrTextTail ? "<!--!$-->" + node : "" + node;
2949
+ ssrTextTail = true;
2950
+ return s;
2951
+ }
2768
2952
  if (node == null || t === "boolean") return "";
2769
2953
  if (t === "object") {
2770
2954
  if (Array.isArray(node)) {
2771
2955
  const joined = tryJoinPlainSSRArray(node);
2772
- if (joined !== undefined) return joined;
2956
+ if (joined !== undefined) {
2957
+ ssrTextTail = false;
2958
+ return joined;
2959
+ }
2773
2960
  let s = "";
2774
- let prevNonObj = false;
2775
2961
  for (let i = 0, len = node.length; i < len; i++) {
2776
- const item = node[i];
2777
- const itemNonObj = item !== null && typeof item !== "object";
2778
- if (prevNonObj && itemNonObj) s += "<!--!$-->";
2779
- prevNonObj = itemNonObj;
2780
- const r = tryResolveString(item);
2962
+ const r = tryResolveString(node[i], true);
2781
2963
  if (typeof r !== "string") return {
2782
2964
  bail: node
2783
2965
  };
@@ -2791,6 +2973,7 @@ function tryResolveString(node) {
2791
2973
  if (node.t === undefined) {
2792
2974
  return "";
2793
2975
  }
2976
+ ssrTextTail = false;
2794
2977
  return Array.isArray(node.t) ? node.t[0] : node.t;
2795
2978
  }
2796
2979
  if (t === "function") {
@@ -2798,9 +2981,11 @@ function tryResolveString(node) {
2798
2981
  try {
2799
2982
  v = node();
2800
2983
  } catch (err) {
2801
- return buildAsyncWrap(err, node) || "";
2984
+ const wrap = buildAsyncWrap(err, node);
2985
+ if (wrap) ssrTextTail = true;
2986
+ return wrap || "";
2802
2987
  }
2803
- return tryResolveString(v);
2988
+ return tryResolveString(v, true);
2804
2989
  }
2805
2990
  return "";
2806
2991
  }
@@ -2808,21 +2993,19 @@ function resolveSSRNode(node, result = {
2808
2993
  t: [""],
2809
2994
  h: [],
2810
2995
  p: []
2811
- }, top) {
2996
+ }, top, nested) {
2997
+ if (!nested) ssrTextTail = false;
2812
2998
  const t = typeof node;
2813
2999
  if (t === "string" || t === "number") {
2814
- result.t[result.t.length - 1] += node;
3000
+ result.t[result.t.length - 1] += ssrTextTail ? "<!--!$-->" + node : node;
3001
+ ssrTextTail = true;
2815
3002
  } else if (node == null || t === "boolean") ; else if (Array.isArray(node)) {
2816
3003
  const slotLive = node.$slot && sharedConfig.context && sharedConfig.context.liveHoles;
2817
3004
  if (slotLive) slotLive.suppressed++;
2818
3005
  try {
2819
- let prevNonObj = false;
2820
3006
  for (let i = 0, len = node.length; i < len; i++) {
2821
- const item = node[i];
2822
- const itemNonObj = item !== null && typeof item !== "object";
2823
- if (!top && prevNonObj && itemNonObj) result.t[result.t.length - 1] += `<!--!$-->`;
2824
- prevNonObj = itemNonObj;
2825
- resolveSSRNode(item, result);
3007
+ if (top) ssrTextTail = false;
3008
+ resolveSSRNode(node[i], result, false, true);
2826
3009
  }
2827
3010
  } finally {
2828
3011
  if (slotLive) slotLive.suppressed--;
@@ -2835,23 +3018,30 @@ function resolveSSRNode(node, result = {
2835
3018
  result.h.push(...node.h);
2836
3019
  result.p.push(...node.p);
2837
3020
  }
3021
+ ssrTextTail = false;
2838
3022
  } else if (node.t !== undefined) {
2839
3023
  result.t[result.t.length - 1] += node.t;
3024
+ ssrTextTail = false;
2840
3025
  } else ;
2841
3026
  } else if (t === "function") {
2842
3027
  const live = sharedConfig.context && sharedConfig.context.liveHoles;
2843
3028
  let liveNode = null;
2844
3029
  if (live && (liveNode = live.content(node)) !== null) {
2845
- if (typeof liveNode === "string") result.t[result.t.length - 1] += liveNode;else resolveSSRNode(liveNode, result);
3030
+ if (typeof liveNode === "string") {
3031
+ result.t[result.t.length - 1] += ssrTextTail ? "<!--!$-->" + liveNode : liveNode;
3032
+ ssrTextTail = true;
3033
+ } else resolveSSRNode(liveNode, result, false, true);
2846
3034
  } else {
2847
3035
  try {
2848
- resolveSSRNode(node(), result);
3036
+ resolveSSRNode(node(), result, false, true);
2849
3037
  } catch (err) {
2850
3038
  const wrap = buildAsyncWrap(err, node);
2851
3039
  if (wrap) {
3040
+ if (ssrTextTail) result.t[result.t.length - 1] += "<!--!$-->";
2852
3041
  result.h.push(wrap.fn);
2853
3042
  result.p.push(wrap.p);
2854
3043
  result.t.push("");
3044
+ ssrTextTail = true;
2855
3045
  }
2856
3046
  }
2857
3047
  }
@@ -2864,20 +3054,48 @@ function resolveSSRSync(node) {
2864
3054
  throw new Error("This value cannot be rendered synchronously. Are you missing a boundary?");
2865
3055
  }
2866
3056
  const RequestContext = Symbol.for("solid.RequestContext");
3057
+ const ServerErrors = Symbol.for("solid-js/server/errors");
3058
+ function serializerErrorHook(hook) {
3059
+ return hook === undefined ? undefined : err => {
3060
+ reportServerError(err, {
3061
+ kind: "render",
3062
+ handling: "serialize"
3063
+ }, null);
3064
+ };
3065
+ }
3066
+ function ambientServerErrorHook() {
3067
+ const slot = globalThis[ServerErrors];
3068
+ return slot === undefined ? undefined : slot.hook;
3069
+ }
2867
3070
  function peekRequestEvent() {
2868
3071
  const store = globalThis[RequestContext];
2869
3072
  return store ? store.getStore() : undefined;
2870
3073
  }
3074
+ function traceForEvent(event) {
3075
+ return traceFor(event.request || event, event.request);
3076
+ }
3077
+ function traceForStub(stub, event) {
3078
+ if (!event) {
3079
+ event = peekRequestEvent();
3080
+ if (!event || event.response !== stub) return undefined;
3081
+ }
3082
+ return traceForEvent(event);
3083
+ }
2871
3084
  function reportLostHeaderWrite(method, name) {
2872
- const message = `Response header write dropped: headers.${method}(${JSON.stringify(String(name))}) ` + "ran after the response head was sent. Write headers before the shell flushes " + "(or before the handler returns).";
3085
+ const message = `[LATE_HEADER_WRITE] Response header write dropped: headers.${method}(${JSON.stringify(String(name))}) ` + "ran after the response head was sent. Write headers before the shell flushes " + "(or before the handler returns).";
2873
3086
  console.error(message);
2874
3087
  }
2875
3088
  function commitResponseStub(stub, {
2876
- allowLateLocation = false
3089
+ allowLateLocation = false,
3090
+ event
2877
3091
  } = {}) {
2878
3092
  if (!stub || stub.committed) return stub;
2879
- stub.committed = true;
2880
3093
  const headers = stub.headers;
3094
+ if (headers && typeof headers.append === "function") {
3095
+ const trace = traceForStub(stub, event);
3096
+ if (trace) appendTraceServerTiming(headers, trace);
3097
+ }
3098
+ stub.committed = true;
2881
3099
  if (!headers || typeof headers.set !== "function") return stub;
2882
3100
  for (const method of ["set", "append", "delete"]) {
2883
3101
  const original = headers[method].bind(headers);
@@ -2893,6 +3111,61 @@ function commitResponseStub(stub, {
2893
3111
  /*#__PURE__*/new Set([ERROR_HEADER, BODY_FORMAT_HEADER, SINGLE_FLIGHT_HEADER, REVALIDATE_HEADER, REDIRECT_HEADER, "Location",
2894
3112
  ...COMPOSED_BODY_FRAMING].map(header => header.toLowerCase()));
2895
3113
 
3114
+ function records() {
3115
+ return undefined;
3116
+ }
3117
+ function frameCensus(event, type, own) {
3118
+ event.chunks++;
3119
+ switch (type) {
3120
+ case "html":
3121
+ if (!own) event.regions++;else if (event.shellMs === undefined) event.shellMs = performance.now() - event.at;
3122
+ break;
3123
+ case "fragment":
3124
+ event.fragments++;
3125
+ break;
3126
+ case "slot":
3127
+ event.slots++;
3128
+ break;
3129
+ case "error":
3130
+ event.errors++;
3131
+ break;
3132
+ }
3133
+ }
3134
+
3135
+ function observeFrame(frame) {
3136
+ const channel = records();
3137
+ if (channel === undefined || !channel.observed("frame")) return undefined;
3138
+ const event = {
3139
+ side: "server",
3140
+ id: frame.id,
3141
+ version: frame.version,
3142
+ at: performance.now(),
3143
+ durationMs: 0,
3144
+ outcome: "complete",
3145
+ chunks: 0,
3146
+ fragments: 0,
3147
+ slots: 0,
3148
+ regions: 0,
3149
+ errors: 0
3150
+ };
3151
+ let settled = false;
3152
+ return {
3153
+ chunk(chunk) {
3154
+ if (chunk.type === "complete") return;
3155
+ frameCensus(event, chunk.type, chunk.id === frame.id);
3156
+ },
3157
+ settle(outcome, error) {
3158
+ if (settled) return;
3159
+ settled = true;
3160
+ event.durationMs = performance.now() - event.at;
3161
+ event.outcome = outcome;
3162
+ const live = {};
3163
+ if (outcome === "error") live.error = error;
3164
+ channel.emit("frame", event, live);
3165
+ }
3166
+ };
3167
+ }
3168
+
2896
3169
  function scopeDeferredResult(value, scope) {
2897
3170
  const bound = bindDeferredBody(value, scope);
2898
3171
  if (bound !== value || value === null || typeof value !== "object") return bound;
@@ -3084,7 +3357,7 @@ function guardFailures(value, state) {
3084
3357
  try {
3085
3358
  top.accessorValue = descriptor.get.call(top.value);
3086
3359
  } catch (error) {
3087
- throw sanitizeServerError(error);
3360
+ throw wireServerFunctionError(error, "channel");
3088
3361
  }
3089
3362
  top.accessorRead = i;
3090
3363
  }
@@ -3194,7 +3467,7 @@ function enterGuard(value, state) {
3194
3467
  } = await guardOperation(state, () => reader.read());
3195
3468
  done ? controller.close() : controller.enqueue(guardOperation(state, () => guardFailures(chunk, state)));
3196
3469
  } catch (error) {
3197
- controller.error(guardOperation(state, () => sanitizeServerError(error)));
3470
+ controller.error(guardOperation(state, () => wireServerFunctionError(error, "channel")));
3198
3471
  }
3199
3472
  },
3200
3473
  cancel(reason) {
@@ -3208,7 +3481,7 @@ function enterGuard(value, state) {
3208
3481
  }
3209
3482
  if (typeof value.then === "function") {
3210
3483
  const guardedPromise = Promise.resolve(value).then(resolved => guardOperation(state, () => guardFailures(resolved, state)), error => {
3211
- throw guardOperation(state, () => sanitizeServerError(error));
3484
+ throw guardOperation(state, () => wireServerFunctionError(error, "channel"));
3212
3485
  });
3213
3486
  guardedPromise.catch(() => {});
3214
3487
  state.seen.set(value, guardedPromise);
@@ -3243,7 +3516,7 @@ function enterGuard(value, state) {
3243
3516
  value: guardOperation(state, () => guardFailures(step.value, state))
3244
3517
  };
3245
3518
  }, error => {
3246
- throw guardOperation(state, () => sanitizeServerError(error));
3519
+ throw guardOperation(state, () => wireServerFunctionError(error, "channel"));
3247
3520
  });
3248
3521
  return {
3249
3522
  next: () => finished || !gate || gate.wantsMore() ? step() : gate.awaitDemand().then(step),
@@ -3306,6 +3579,26 @@ function keepGuarded(value, next, changed, state) {
3306
3579
  return value;
3307
3580
  }
3308
3581
  const GENERIC_SERVER_ERROR_MESSAGE = "Internal Server Error";
3582
+ const REQUEST_ERROR_HOOKS = new WeakMap();
3583
+ function siteFor(handling, event, direct) {
3584
+ const invocation = event ? INVOCATIONS.get(event) : undefined;
3585
+ const site = {
3586
+ kind: "server-function",
3587
+ handling,
3588
+ direct
3589
+ };
3590
+ if (invocation) site.functionId = invocation.id;
3591
+ if (event) site.event = event;
3592
+ return site;
3593
+ }
3594
+ function wireServerFunctionError(value, handling, event = currentEvent()) {
3595
+ const report = reportServerError(value, siteFor(handling, event, false), null, event ? REQUEST_ERROR_HOOKS.get(event) : undefined);
3596
+ return report.mapped ? report.value : sanitizeServerError(value);
3597
+ }
3598
+ function currentEvent() {
3599
+ const store = globalThis[RequestContext];
3600
+ return store ? store.getStore() : undefined;
3601
+ }
3309
3602
  function sanitizeServerError(value) {
3310
3603
  if (isSafeError(value)) return value;
3311
3604
  return new Error(GENERIC_SERVER_ERROR_MESSAGE);
@@ -3692,9 +3985,13 @@ function frameStream(makeCode, options) {
3692
3985
  version
3693
3986
  };
3694
3987
  function stream(w) {
3695
- const emit = chunk => w.write(chunk);
3988
+ const observation = observeFrame(frame);
3989
+ const emit = observation ? chunk => {
3990
+ observation.chunk(chunk);
3991
+ w.write(chunk);
3992
+ } : chunk => w.write(chunk);
3696
3993
  const sink = createFrameSink(emit, frame);
3697
- emit({
3994
+ w.write({
3698
3995
  type: "start",
3699
3996
  id,
3700
3997
  version
@@ -3709,12 +4006,15 @@ function frameStream(makeCode, options) {
3709
4006
  write() {},
3710
4007
  end() {
3711
4008
  sink.end();
4009
+ observation && observation.settle("complete");
3712
4010
  w.end && w.end();
3713
4011
  }
3714
4012
  });
3715
4013
  } catch (err) {
3716
- sink.error("", err instanceof Error ? err.message : String(err));
4014
+ const wire = ssrSanitizeError(err, null);
4015
+ sink.error("", wire instanceof Error ? wire.message : String(wire));
3717
4016
  sink.end();
4017
+ observation && observation.settle("error", err);
3718
4018
  w.end && w.end();
3719
4019
  }
3720
4020
  }