feat(bake): handle bundle errors, re-assemble full client payloads, initial error modal (#14504)

This commit is contained in:
dave caruso
2024-10-14 16:49:38 -07:00
committed by GitHub
parent 29d287261b
commit d2fe1ce1c8
27 changed files with 2596 additions and 1317 deletions

View File

@@ -1,326 +1,345 @@
<!DOCTYPE html>
<!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>IncrementalGraph Visualization</title>
<script type="text/javascript" src="https://unpkg.com/vis-network/standalone/umd/vis-network.min.js"></script>
<style>
html,
body {
background-color: #1e1e2e;
color: #cdd6f4;
font-family: sans-serif;
}
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>IncrementalGraph Visualization</title>
<script type="text/javascript" src="https://unpkg.com/vis-network/standalone/umd/vis-network.min.js"></script>
<style>
html,
body {
background-color: #1e1e2e;
color: #cdd6f4;
font-family: sans-serif;
}
#network {
position: fixed;
top: 0;
left: 0;
width: 100vw;
height: 100vh;
}
#network {
position: fixed;
top: 0;
left: 0;
width: 100vw;
height: 100vh;
}
h1 {
position: fixed;
top: 1rem;
left: 1rem;
pointer-events: none;
font-size: 1rem;
margin: 0;
z-index: 100;
}
h1 {
position: fixed;
top: 1rem;
left: 1rem;
pointer-events: none;
font-size: 1rem;
margin: 0;
}
#stat {
font-weight: normal;
}
</style>
</head>
#stat {
font-weight: normal;
}
</style>
</head>
<body>
<h1>IncrementalGraph Visualization <span id="stat"></span></h1>
<div id="network"></div>
<body>
<h1>IncrementalGraph Visualization <span id="stat"></span></h1>
<div id="network"></div>
<script>
// Connect to HMR WebSocket and enable visualization packets. This
// serializes the both `IncrementalGraph`s in full and sends them
// over the wire. A visualization is provided by `vis.js`. Support
//
// Script written partially by ChatGPT
<script>
const c = {
// derived from mocha theme on https://catppuccin.com/palette
red: '#f38ba8',
green: '#a6e3a1',
mauve: '#cba6f7',
gray: '#7f849c',
orange: '#fab387',
sky: '#89dceb',
blue: '#89b4fa',
yellow: '#f9e2af',
};
const ws = new WebSocket(location.origin + "/_bun/hmr");
const c = {
// Derived from mocha theme on https://catppuccin.com/palette
red: "#f38ba8",
green: "#a6e3a1",
mauve: "#cba6f7",
gray: "#7f849c",
orange: "#fab387",
sky: "#89dceb",
blue: "#89b4fa",
yellow: "#f9e2af",
};
const ws = new WebSocket(location.origin + "/_bun/hmr");
ws.binaryType = "arraybuffer"; // We are expecting binary data
ws.binaryType = "arraybuffer"; // We are expecting binary data
ws.onopen = function () {
ws.send(new Uint8Array([118])); // Send 'v' byte to initiate connection
};
ws.onopen = function () {
ws.send(new Uint8Array([118])); // Send 'v' byte to initiate connection
};
// Store nodes and edges
let clientFiles = [];
let serverFiles = [];
let clientEdges = [];
let serverEdges = [];
let currentEdgeIds = new Set();
let isFirst = true;
// Store nodes and edges
let clientFiles = [];
let serverFiles = [];
let clientEdges = [];
let serverEdges = [];
let currentEdgeIds = new Set();
let currentNodeIds = new Set();
let isFirst = true;
// When a message is received
ws.onmessage = function (event) {
const buffer = new Uint8Array(event.data);
// When a message is received
ws.onmessage = function (event) {
const buffer = new Uint8Array(event.data);
// Only process messages starting with 'v' (ASCII code 118)
if (buffer[0] !== 118) return;
console.log('Got Event');
// Only process messages starting with 'v' (ASCII code 118)
if (buffer[0] !== 118) return;
console.log("Got Event");
let offset = 1; // Skip the 'v' byte
let offset = 1; // Skip the 'v' byte
// Parse client files
const clientFileCount = readUint32(buffer, offset);
offset += 4;
clientFiles = parseFiles(buffer, clientFileCount, offset);
offset = clientFiles.offset;
clientFiles = clientFiles.files;
// Parse server files
const serverFileCount = readUint32(buffer, offset);
offset += 4;
serverFiles = parseFiles(buffer, serverFileCount, offset);
offset = serverFiles.offset;
serverFiles = serverFiles.files;
// Parse client edges
const clientEdgeCount = readUint32(buffer, offset);
offset += 4;
clientEdges = parseEdges(buffer, clientEdgeCount, offset);
offset = clientEdges.offset;
clientEdges = clientEdges.edges;
// Parse server edges
const serverEdgeCount = readUint32(buffer, offset);
offset += 4;
serverEdges = parseEdges(buffer, serverEdgeCount, offset);
offset = serverEdges.offset;
serverEdges = serverEdges.edges;
// Update the graph visualization
updateGraph();
};
// Helper to read 4-byte unsigned int
function readUint32(buffer, offset) {
return buffer[offset] |
(buffer[offset + 1] << 8) |
(buffer[offset + 2] << 16) |
(buffer[offset + 3] << 24);
}
function basename(path) {
return path.slice(path.lastIndexOf('/') + 1)
}
// Parse the files from the buffer
function parseFiles(buffer, count, offset) {
const files = [];
for (let i = 0; i < count; i++) {
const nameLength = readUint32(buffer, offset);
// Parse client files
const clientFileCount = readUint32(buffer, offset);
offset += 4;
// If the name length is 0, it's a deleted file
if (nameLength === 0) {
files.push({ id: i, deleted: true });
continue;
clientFiles = parseFiles(buffer, clientFileCount, offset);
offset = clientFiles.offset;
clientFiles = clientFiles.files;
// Parse server files
const serverFileCount = readUint32(buffer, offset);
offset += 4;
serverFiles = parseFiles(buffer, serverFileCount, offset);
offset = serverFiles.offset;
serverFiles = serverFiles.files;
// Parse client edges
const clientEdgeCount = readUint32(buffer, offset);
offset += 4;
clientEdges = parseEdges(buffer, clientEdgeCount, offset);
offset = clientEdges.offset;
clientEdges = clientEdges.edges;
// Parse server edges
const serverEdgeCount = readUint32(buffer, offset);
offset += 4;
serverEdges = parseEdges(buffer, serverEdgeCount, offset);
offset = serverEdges.offset;
serverEdges = serverEdges.edges;
// Update the graph visualization
updateGraph();
};
// Helper to read 4-byte unsigned int
function readUint32(buffer, offset) {
return buffer[offset] | (buffer[offset + 1] << 8) | (buffer[offset + 2] << 16) | (buffer[offset + 3] << 24);
}
function basename(path) {
return path.slice(path.lastIndexOf("/") + 1);
}
// Parse the files from the buffer
function parseFiles(buffer, count, offset) {
const files = [];
for (let i = 0; i < count; i++) {
const nameLength = readUint32(buffer, offset);
offset += 4;
// If the name length is 0, it's a deleted file
if (nameLength === 0) {
files.push({ id: i, deleted: true });
continue;
}
const nameBytes = buffer.slice(offset, offset + nameLength);
const name = new TextDecoder().decode(nameBytes);
offset += nameLength;
const isStale = buffer[offset++] === 1;
const isServer = buffer[offset++] === 1;
const isSSR = buffer[offset++] === 1;
const isRoute = buffer[offset++] === 1;
const isFramework = buffer[offset++] === 1;
const isBoundary = buffer[offset++] === 1;
files.push({
id: i,
name,
isStale,
isServer,
isSSR,
isRoute,
isFramework,
isBoundary,
});
}
const nameBytes = buffer.slice(offset, offset + nameLength);
const name = new TextDecoder().decode(nameBytes);
offset += nameLength;
const isStale = buffer[offset++] === 1;
const isServer = buffer[offset++] === 1;
const isSSR = buffer[offset++] === 1;
const isRoute = buffer[offset++] === 1;
const isFramework = buffer[offset++] === 1;
const isBoundary = buffer[offset++] === 1;
files.push({
id: i,
name,
isStale,
isServer,
isSSR,
isRoute,
isFramework,
isBoundary
});
return { files, offset };
}
return { files, offset };
}
// Parse the edges from the buffer
function parseEdges(buffer, count, offset) {
const edges = [];
for (let i = 0; i < count; i++) {
const from = readUint32(buffer, offset);
offset += 4;
const to = readUint32(buffer, offset);
offset += 4;
edges.push({ from, to });
// Parse the edges from the buffer
function parseEdges(buffer, count, offset) {
const edges = [];
for (let i = 0; i < count; i++) {
const from = readUint32(buffer, offset);
offset += 4;
const to = readUint32(buffer, offset);
offset += 4;
edges.push({ from, to });
}
return { edges, offset };
}
return { edges, offset };
}
// Initialize Vis.js network
const nodes = new vis.DataSet();
const edges = new vis.DataSet();
// Initialize Vis.js network
const nodes = new vis.DataSet();
const edges = new vis.DataSet();
const container = document.getElementById("network");
const data = { nodes, edges };
const options = {};
const network = new vis.Network(container, data, options);
const container = document.getElementById("network");
const data = { nodes, edges };
const options = {};
const network = new vis.Network(container, data, options);
// Helper function to add or update nodes in the graph
function updateNode(id, file, group) {
const label = basename(file.name);
const color = file.name.includes('/node_modules/')
? c.gray
: file.isStale
? c.red
: file.isBoundary
? c.orange
: group === 'client'
? c.mauve
: file.isRoute
? c.blue
: file.isSSR ? file.isServer ? c.yellow : c.green : c.sky;
const props = {
id,
label,
shape: 'dot',
color: color,
borderWidth: file.isRoute ? 3 : 1,
group,
font: file.name.includes('/node_modules/')
? '10px sans-serif #cdd6f488' : '20px sans-serif #cdd6f4',
}
if (nodes.get(id)) {
nodes.update(props);
} else {
nodes.add(props);
}
}
// Helper function to remove a node by ID
function removeNode(id) {
nodes.remove({ id });
}
// Helper function to add or update edges in the graph
const edgeProps = { arrows: 'to' };
function updateEdge(id, from, to, variant) {
const prop = variant === 'normal'
? { id, from, to, arrows: 'to' }
: variant === 'client'
? { id, from, to, arrows: 'to,from', color: '#ffffff99', width: 2, label: '[use client]' }
: { id, from, to };
if (edges.get(id)) {
edges.update(prop);
} else {
edges.add(prop);
}
}
// Helper to remove all edges of a node
function removeEdges(nodeId) {
const edgesToRemove = edges.get({
filter: (edge) => edge.from === nodeId || edge.to === nodeId,
});
edges.remove(edgesToRemove.map(e => e.id));
}
// Function to update the entire graph when new data is received
function updateGraph() {
const newEdgeIds = new Set(); // Track new edges
const boundaries = new Map();
// Update server files
serverFiles.forEach((file, index) => {
const id = `S_${index}`;
if (file.deleted) {
removeNode(id);
removeEdges(id);
// Helper function to add or update nodes in the graph
function updateNode(id, file, group) {
const label = basename(file.name);
const color = file.name.includes("/node_modules/")
? c.gray
: file.isStale
? c.red
: file.isBoundary
? c.orange
: group === "client"
? c.mauve
: file.isRoute
? c.blue
: file.isSSR
? file.isServer
? c.yellow
: c.green
: c.sky;
const props = {
id,
label,
shape: "dot",
color: color,
borderWidth: file.isRoute ? 3 : 1,
group,
font: file.name.includes("/node_modules/") ? "10px sans-serif #cdd6f488" : "20px sans-serif #cdd6f4",
};
if (nodes.get(id)) {
nodes.update(props);
} else {
updateNode(id, file, 'server');
nodes.add(props);
}
if (file.isBoundary) {
boundaries.set(file.name, { server: index, client: -1 });
}
});
// Update client files
clientFiles.forEach((file, index) => {
const id = `C_${index}`;
if (file.deleted) {
removeNode(id);
removeEdges(id);
return;
}
updateNode(id, file, 'client');
const b = boundaries.get(file.name);
if (b) {
b.client = index;
}
});
// Update client edges
clientEdges.forEach((edge, index) => {
const id = `C_edge_${index}`;
updateEdge(id, `C_${edge.from}`, `C_${edge.to}`, 'normal');
newEdgeIds.add(id); // Track this edge
});
// Update server edges
serverEdges.forEach((edge, index) => {
const id = `S_edge_${index}`;
updateEdge(id, `S_${edge.from}`, `S_${edge.to}`, 'normal');
newEdgeIds.add(id); // Track this edge
});
boundaries.forEach(({ server, client }) => {
if (client === -1) return;
const id = `S_edge_bound_${server}_${client}`;
updateEdge(id, `S_${server}`, `C_${client}`, 'client');
newEdgeIds.add(id); // Track this edge
});
// Remove edges that are no longer present
currentEdgeIds.forEach((id) => {
if (!newEdgeIds.has(id)) {
edges.remove(id);
}
});
// Update the currentEdgeIds set to the new one
currentEdgeIds = newEdgeIds;
if (isFirst) {
network.stabilize();
isFirst = false;
}
document.getElementById('stat').innerText = `(server: ${serverFiles.length} files, ${serverEdges.length} edges; client: ${clientFiles.length} files, ${clientEdges.length} edges; ${boundaries.size} boundaries)`;
}
</script>
</body>
// Helper function to remove a node by ID
function removeNode(id) {
nodes.remove({ id });
}
</html>
// Helper function to add or update edges in the graph
const edgeProps = { arrows: "to" };
function updateEdge(id, from, to, variant) {
const prop =
variant === "normal"
? { id, from, to, arrows: "to" }
: variant === "client"
? { id, from, to, arrows: "to,from", color: "#ffffff99", width: 2, label: "[use client]" }
: { id, from, to };
if (edges.get(id)) {
edges.update(prop);
} else {
edges.add(prop);
}
}
// Helper to remove all edges of a node
function removeEdges(nodeId) {
const edgesToRemove = edges.get({
filter: edge => edge.from === nodeId || edge.to === nodeId,
});
edges.remove(edgesToRemove.map(e => e.id));
}
// Function to update the entire graph when new data is received
function updateGraph() {
const newEdgeIds = new Set(); // Track new edges
const newNodeIds = new Set(); // Track new nodes
const boundaries = new Map();
// Update server files
serverFiles.forEach((file, index) => {
const id = `S_${file.name}`;
if (file.deleted) {
removeNode(id);
removeEdges(id);
} else {
updateNode(id, file, "server");
}
if (file.isBoundary) {
boundaries.set(file.name, { server: index, client: -1 });
}
newNodeIds.add(id); // Track this node
});
// Update client files
clientFiles.forEach((file, index) => {
const id = `C_${file.name}`;
if (file.deleted) {
removeNode(id);
removeEdges(id);
return;
}
updateNode(id, file, "client");
const b = boundaries.get(file.name);
if (b) {
b.client = index;
}
newNodeIds.add(id); // Track this node
});
// Update client edges
clientEdges.forEach((edge, index) => {
const id = `C_edge_${index}`;
updateEdge(id, `C_${clientFiles[edge.from].name}`, `C_${clientFiles[edge.to].name}`, "normal");
newEdgeIds.add(id); // Track this edge
});
// Update server edges
serverEdges.forEach((edge, index) => {
const id = `S_edge_${index}`;
updateEdge(id, `S_${serverFiles[edge.from].name}`, `S_${serverFiles[edge.to].name}`, "normal");
newEdgeIds.add(id); // Track this edge
});
boundaries.forEach(({ server, client }) => {
if (client === -1) return;
const id = `S_edge_bound_${server}_${client}`;
updateEdge(id, `S_${serverFiles[server].name}`, `C_${clientFiles[client].name}`, "client");
newEdgeIds.add(id); // Track this edge
});
// Remove edges that are no longer present
currentEdgeIds.forEach(id => {
if (!newEdgeIds.has(id)) {
edges.remove(id);
}
});
// Remove nodes that are no longer present
currentNodeIds.forEach(id => {
if (!newNodeIds.has(id)) {
nodes.remove(id);
}
});
// Update the currentEdgeIds set to the new one
currentEdgeIds = newEdgeIds;
currentNodeIds = newNodeIds;
if (isFirst) {
network.stabilize();
isFirst = false;
}
document.getElementById("stat").innerText =
`(server: ${serverFiles.length} files, ${serverEdges.length} edges; client: ${clientFiles.length} files, ${clientEdges.length} edges; ${boundaries.size} boundaries)`;
}
</script>
</body>
</html>