@takodotid/circuit 0.20.0 → 0.21.0

package/README.md

@@ -22,7 +22,7 @@ Documentation: [circuit.tako.id](https://circuit.tako.id)
 
 <picture>
     <source media="(prefers-color-scheme: dark)" srcset="docs/public/screenshots/studio-dark.png">
-    <img src="docs/public/screenshots/studio-light.png" alt="Studio's graph showing the cables between five devices. One device is outlined in amber because it differs from its last snapshot.">
+    <img src="docs/public/screenshots/studio-light.png" alt="Studio's VLAN graph with devices that differ from their snapshots marked by orange dashed borders, beside the layer details and legend.">
 </picture>
 
 ## Start

package/dist/chunks/{index-jtzfw679.js → index-n4zpd25n.js}

@@ -1,24 +1,62 @@
 import {
-  contains,
-  familyOf,
-  formatAddress,
-  host,
-  isAddress,
-  isCidr,
-  network,
+  familyOf2,
   parse,
-  prefixesBetween,
+  split,
+  isAddress2,
+  isCidr2,
+  network,
+  contains2,
+  formatAddress,
   rangeOf,
-  split
-} from "./index-xm9nma2t.js";
+  prefixesBetween,
+  host2
+} from "./index-v8zgr7wm.js";
+
+// src/adapters/devices/raisecom-ros/models.ts
+var models = {
+  "RAX721-C-6C48": {
+    ports: { "100g": 6, "25g": 24, "10g": 24 },
+    spelling: { "100g": "hundredgige 1/1/{n}", "25g": "twenty-fivegige 1/2/{n}", "10g": "tengigabitethernet 1/3/{n}" }
+  }
+};
+
+// src/adapters/devices/routeros/models.ts
+var models2 = {
+  "CCR2216-1G-12XS-2XQ": {
+    ports: { "100g": 2, "25g": 12, "1g": 1 },
+    spelling: { "100g": "qsfp28-{n}-1", "25g": "sfp28-{n}", "1g": "ether{n}" }
+  }
+};
+
+// src/adapters/devices/vrp/models.ts
+var models3 = {
+  "CE6855-48S6Q-HI": { ports: { "10g": 48, "40g": 6 }, spelling: { "10g": "10GE1/0/{n}", "40g": "40GE1/0/{n}" } }
+};
+
+// src/adapters/devices/catalog.ts
+var catalog = { routeros: models2, vrp: models3, "raisecom-ros": models };
+function portsOf(platform, model) {
+  const spec = catalog[platform]?.[model];
+  if (!spec)
+    throw new Error(`${platform} has no model ${model}`);
+  return Object.entries(spec.ports).flatMap(([speed, count]) => Array.from({ length: count }, (_, i) => `${speed}-${i + 1}`));
+}
+function spell(platform, model, port) {
+  const spec = catalog[platform]?.[model];
+  const parts = /^(\d+[gm])-(\d+)$/.exec(port);
+  const template = parts && spec?.spelling[parts[1]];
+  if (!template)
+    throw new Error(`${model} has no port ${port}`);
+  return template.replace("{n}", parts[2]);
+}
 
 // src/core/graph.ts
 var LAYERS = ["l1", "l2", "l3", "bgp", "ospf", "tunnels"];
 var deviceId = (name) => `device:${name}`;
 function keyOf(address) {
-  if (!address || !isAddress(address))
+  if (!address || !isAddress2(address))
     return;
-  return `${familyOf(address)}:${parse(address)}`;
+  return `${familyOf2(address)}:${parse(address)}`;
 }
 var isHostRoute = (cidr) => {
   const { len, family } = split(cidr);
@@ -51,7 +89,7 @@ function routedOf(device) {
 function holdersOf(devices) {
   return devices.flatMap((device) => routedOf(device).flatMap(([name, settings]) => (settings.addresses ?? []).flatMap((entry) => {
     const address = typeof entry === "string" ? entry : entry.address;
-    if (!isCidr(address))
+    if (!isCidr2(address))
       return [];
     const peer = typeof entry === "string" ? undefined : entry.peer;
     return [{ device, name, address, peer, vrrp: settings.vrrp ?? [] }];
@@ -156,7 +194,7 @@ function segments(holders, owners, graph) {
         layer: "l3",
         from: deviceId(holder.device.name),
         to: deviceId(far.device.name),
-        label: `${host(holder.address)} to ${host(far.address)}`,
+        label: `${host2(holder.address)} to ${host2(far.address)}`,
         detail: [`${holder.device.name} ${holder.name} ${holder.address}`, `${far.device.name} ${far.name} ${far.address}`]
       });
       continue;
@@ -188,7 +226,7 @@ function segments(holders, owners, graph) {
         layer: "l3",
         from: deviceId(member.device.name),
         to: id,
-        label: `${member.name} ${host(member.address)}`,
+        label: `${member.name} ${host2(member.address)}`,
         detail: [`${member.device.name} ${member.name} ${member.address}`]
       });
     }
@@ -229,7 +267,7 @@ function sessions(devices, owners, graph) {
       continue;
     const far = ownerOf(session);
     if (far && far !== session.device) {
-      const back = all.find((other) => other.device === far && !paired.has(other) && ownerOf(other) === session.device && familyOf(other.address) === familyOf(session.address));
+      const back = all.find((other) => other.device === far && !paired.has(other) && ownerOf(other) === session.device && familyOf2(other.address) === familyOf2(session.address));
       if (back)
         paired.add(back);
       graph.edge({
@@ -265,7 +303,7 @@ function adjacencies(devices, graph) {
         const cost = settings?.cost ? `, cost ${settings.cost}` : "";
         for (const entry of routed?.addresses ?? []) {
           const address = typeof entry === "string" ? entry : entry.address;
-          if (!isCidr(address) || isHostRoute(address))
+          if (!isCidr2(address) || isHostRoute(address))
             continue;
           const key = `${area} ${network(address)}`;
           const member = { device, name, line: `${device.name} ${name} ${address}${cost}` };
@@ -345,8 +383,8 @@ function wireguard(devices, owners, graph) {
   const farEndOf = (device, peer) => interfaces.find(({ device: other, iface }) => {
     if (other === device)
       return false;
-    const tunnelAddresses = (iface.addresses ?? []).map((entry) => host(typeof entry === "string" ? entry : entry.address));
-    const sendsFrom = tunnelAddresses.some((address) => isAddress(address) && peer.allowed_addresses.some((allowed) => isCidr(allowed) && contains(allowed, address)));
+    const tunnelAddresses = (iface.addresses ?? []).map((entry) => host2(typeof entry === "string" ? entry : entry.address));
+    const sendsFrom = tunnelAddresses.some((address) => isAddress2(address) && peer.allowed_addresses.some((allowed) => isCidr2(allowed) && contains2(allowed, address)));
     const endpoint = peer.endpoint ? endpointHost(peer.endpoint) : undefined;
     const isEndpoint = endpoint !== undefined && owners.get(keyOf(endpoint) ?? "")?.device === other;
     return sendsFrom || isEndpoint;
@@ -375,11 +413,11 @@ function wireguard(devices, owners, graph) {
         continue;
       }
       const endpoint = endpointHost(peer.endpoint);
-      const outside2 = graph.node(`address:${endpoint}`, "outside", peer.name, [`WireGuard endpoint ${peer.endpoint}`]);
+      const outside = graph.node(`address:${endpoint}`, "outside", peer.name, [`WireGuard endpoint ${peer.endpoint}`]);
       graph.edge({
         layer: "tunnels",
         from: deviceId(device.name),
-        to: outside2,
+        to: outside,
         label: `WireGuard ${name}`,
         detail: [`${device.name} ${name} peer ${peer.name}, allowed ${peer.allowed_addresses.join(", ")}`]
       });
@@ -403,7 +441,7 @@ function graphOf(devices) {
   const holders = holdersOf(devices);
   const owners = new Map;
   for (const holder of holders) {
-    const key = keyOf(host(holder.address));
+    const key = keyOf(host2(holder.address));
     if (!owners.has(key))
       owners.set(key, holder);
   }
@@ -482,24 +520,24 @@ function comparePrefixes(a, b) {
 }
 var byPrefix = (a, b) => comparePrefixes(a.prefix, b.prefix);
 function addressesOf(devices, within) {
-  const segments2 = new Map;
+  const segments = new Map;
   const blocks = [];
-  const segmentOf = (address) => [...segments2.keys()].find((prefix) => contains(prefix, address));
+  const segmentOf = (address) => [...segments.keys()].find((prefix) => contains2(prefix, address));
   for (const holder of holdersOf(devices)) {
     const vrf = holder.device.ports?.[holder.name]?.vrf ?? holder.device.interfaces?.[holder.name]?.vrf;
     const what = `${holder.device.name} ${holder.name}${vrf ? `, VRF ${vrf}` : ""}`;
     if (isHostRoute2(holder.address) || holder.peer) {
-      blocks.push({ prefix: `${host(holder.address)}/${bits(familyOf(holder.address))}`, what });
+      blocks.push({ prefix: `${host2(holder.address)}/${bits(familyOf2(holder.address))}`, what });
       continue;
     }
     const prefix = network(holder.address);
-    const segment = segments2.get(prefix) ?? { uses: [], taken: [] };
-    const value = numberOf(host(holder.address));
-    segment.uses.push({ address: host(holder.address), what });
+    const segment = segments.get(prefix) ?? { uses: [], taken: [] };
+    const value = numberOf(host2(holder.address));
+    segment.uses.push({ address: host2(holder.address), what });
     segment.taken.push({ first: value, last: value });
-    segments2.set(prefix, segment);
+    segments.set(prefix, segment);
     for (const group of holder.vrrp) {
-      if (!isAddress(group.address) || !contains(prefix, group.address))
+      if (!isAddress2(group.address) || !contains2(prefix, group.address))
         continue;
       if (segment.uses.some((use) => use.address === group.address))
         continue;
@@ -512,7 +550,7 @@ function addressesOf(devices, within) {
     const prefix = segmentOf(first);
     if (!prefix)
       return false;
-    const segment = segments2.get(prefix);
+    const segment = segments.get(prefix);
     if (segment.uses.some((use) => use.address === address))
       return true;
     segment.uses.push({ address, what });
@@ -522,19 +560,19 @@ function addressesOf(devices, within) {
   for (const device of devices) {
     for (const [name, server] of Object.entries(device.dhcp ?? {})) {
       const [start, end] = server.pool;
-      if (isAddress(start) && isAddress(end))
+      if (isAddress2(start) && isAddress2(end))
         take(`${start}-${end}`, `DHCP pool ${name} on ${device.name}`, start, end);
       for (const reservation of server.reservations ?? []) {
-        if (isAddress(reservation.address))
+        if (isAddress2(reservation.address))
           take(reservation.address, `reserved for ${reservation.description ?? reservation.mac} by ${device.name}`);
       }
     }
     for (const route of device.routing?.static ?? []) {
-      if (route.via && isAddress(route.via))
+      if (route.via && isAddress2(route.via))
         take(route.via, `next hop for ${route.prefix} on ${device.name}`);
     }
     for (const [name, neighbor] of Object.entries(device.routing?.bgp?.neighbors ?? {})) {
-      if (isAddress(neighbor.address))
+      if (isAddress2(neighbor.address))
         take(neighbor.address, `BGP neighbor ${name} of ${device.name}`);
     }
     for (const [name, iface] of Object.entries(device.interfaces ?? {})) {
@@ -542,12 +580,12 @@ function addressesOf(devices, within) {
         continue;
       for (const peer of iface.peers ?? []) {
         for (const allowed of peer.allowed_addresses) {
-          if (!isCidr(allowed))
+          if (!isCidr2(allowed))
             continue;
           const what = `WireGuard peer ${peer.name} on ${device.name} ${name}`;
-          if (isHostRoute2(allowed) && take(host(allowed), what))
+          if (isHostRoute2(allowed) && take(host2(allowed), what))
             continue;
-          if (!segmentOf(host(allowed)))
+          if (!segmentOf(host2(allowed)))
             blocks.push({ prefix: network(allowed), what });
         }
       }
@@ -556,17 +594,17 @@ function addressesOf(devices, within) {
   const owners = new Map;
   for (const device of devices) {
     for (const prefix of device.routing?.bgp?.networks ?? []) {
-      if (!isCidr(prefix))
+      if (!isCidr2(prefix))
         continue;
       owners.set(network(prefix), [...owners.get(network(prefix)) ?? [], device.name]);
     }
   }
   for (const device of devices) {
     for (const route of device.routing?.static ?? []) {
-      if (!isCidr(route.prefix) || split(route.prefix).len === 0)
+      if (!isCidr2(route.prefix) || split(route.prefix).len === 0)
         continue;
-      const overlapsSegment = [...segments2.keys()].some((prefix) => contains(route.prefix, prefix) || contains(prefix, route.prefix));
-      const coversOwned = [...owners.keys()].some((owned) => contains(route.prefix, owned));
+      const overlapsSegment = [...segments.keys()].some((prefix) => contains2(route.prefix, prefix) || contains2(prefix, route.prefix));
+      const coversOwned = [...owners.keys()].some((owned) => contains2(route.prefix, owned));
       if (overlapsSegment || coversOwned)
         continue;
       const how = route.blackhole ? "discarded" : route.via ? `routed via ${route.via}` : `routed out ${route.interface}`;
@@ -575,12 +613,12 @@ function addressesOf(devices, within) {
   }
   const asked = within ? network(within) : undefined;
   const spacePrefixes = asked ? [asked] : [...owners.keys()];
-  const spaceOf = (prefix) => spacePrefixes.filter((space) => contains(space, prefix)).sort((a, b) => split(b).len - split(a).len)[0];
+  const spaceOf = (prefix) => spacePrefixes.filter((space) => contains2(space, prefix)).sort((a, b) => split(b).len - split(a).len)[0];
   const toSegment = (prefix) => {
-    const { uses, taken } = segments2.get(prefix);
+    const { uses, taken } = segments.get(prefix);
     const free = gaps(usable(prefix), taken);
     const total = free.reduce((sum, range) => sum + range.last - range.first + 1n, 0n);
-    const family = familyOf(prefix);
+    const family = familyOf2(prefix);
     return {
       prefix,
       uses: uses.sort(byAddress),
@@ -591,11 +629,11 @@ function addressesOf(devices, within) {
   const uniqueBlocks = blocks.filter((block, index) => blocks.findIndex((other) => other.prefix === block.prefix && other.what === block.what) === index);
   const spaces = spacePrefixes.sort(comparePrefixes).map((space) => {
     const inside = (prefix) => spaceOf(prefix) === space;
-    const spaceSegments = [...segments2.keys()].filter(inside).sort(comparePrefixes);
+    const spaceSegments = [...segments.keys()].filter(inside).sort(comparePrefixes);
     const spaceBlocks = uniqueBlocks.filter((block) => inside(block.prefix)).sort(byPrefix);
-    const nested = spacePrefixes.filter((other) => other !== space && contains(space, other));
+    const nested = spacePrefixes.filter((other) => other !== space && contains2(space, other));
     const taken = [...spaceSegments, ...spaceBlocks.map((block) => block.prefix), ...nested].map((prefix) => rangeOf(prefix));
-    const family = familyOf(space);
+    const family = familyOf2(space);
     return {
       prefix: space,
       owner: asked && !owners.has(space) ? "asked for" : `originated by ${(owners.get(space) ?? []).join(", ")}`,
@@ -608,7 +646,7 @@ function addressesOf(devices, within) {
   return {
     spaces,
     elsewhere: asked ? { segments: [], blocks: [] } : {
-      segments: [...segments2.keys()].filter(outside).sort(comparePrefixes).map(toSegment),
+      segments: [...segments.keys()].filter(outside).sort(comparePrefixes).map(toSegment),
       blocks: uniqueBlocks.filter((block) => outside(block.prefix)).sort(byPrefix)
     }
   };
@@ -636,44 +674,6 @@ import { existsSync, readFileSync } from "node:fs";
 import { dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
 
-// src/adapters/devices/raisecom-ros/models.ts
-var models = {
-  "RAX721-C-6C48": {
-    ports: { "100g": 6, "25g": 24, "10g": 24 },
-    spelling: { "100g": "hundredgige 1/1/{n}", "25g": "twenty-fivegige 1/2/{n}", "10g": "tengigabitethernet 1/3/{n}" }
-  }
-};
-
-// src/adapters/devices/routeros/models.ts
-var models2 = {
-  "CCR2216-1G-12XS-2XQ": {
-    ports: { "100g": 2, "25g": 12, "1g": 1 },
-    spelling: { "100g": "qsfp28-{n}-1", "25g": "sfp28-{n}", "1g": "ether{n}" }
-  }
-};
-
-// src/adapters/devices/vrp/models.ts
-var models3 = {
-  "CE6855-48S6Q-HI": { ports: { "10g": 48, "40g": 6 }, spelling: { "10g": "10GE1/0/{n}", "40g": "40GE1/0/{n}" } }
-};
-
-// src/adapters/devices/catalog.ts
-var catalog = { routeros: models2, vrp: models3, "raisecom-ros": models };
-function portsOf(platform, model) {
-  const spec = catalog[platform]?.[model];
-  if (!spec)
-    throw new Error(`${platform} has no model ${model}`);
-  return Object.entries(spec.ports).flatMap(([speed, count2]) => Array.from({ length: count2 }, (_, i) => `${speed}-${i + 1}`));
-}
-function spell(platform, model, port) {
-  const spec = catalog[platform]?.[model];
-  const parts = /^(\d+[gm])-(\d+)$/.exec(port);
-  const template = parts && spec?.spelling[parts[1]];
-  if (!template)
-    throw new Error(`${model} has no port ${port}`);
-  return template.replace("{n}", parts[2]);
-}
-
 // src/core/schema-docs.ts
 var SCHEMA_FILES = [
   ["device.ts", "Device"],
@@ -825,7 +825,7 @@ function sessionsOf(devices, owners) {
   return all.map(({ deviceObject, ...session }) => {
     const far = ownerOf(session.address);
     if (far && far !== deviceObject) {
-      const back = all.some((other) => other.deviceObject === far && ownerOf(other.address) === deviceObject && familyOf(other.address) === familyOf(session.address));
+      const back = all.some((other) => other.deviceObject === far && ownerOf(other.address) === deviceObject && familyOf2(other.address) === familyOf2(session.address));
       return { ...session, far: far.name, ...back ? {} : { oneSided: true } };
     }
     return { ...session, ...session.remoteAs ? { far: `AS${session.remoteAs}` } : {} };
@@ -834,7 +834,7 @@ function sessionsOf(devices, owners) {
 function cablesOf(devices) {
   const byName = new Map(devices.map((device) => [device.name, device]));
   const drawn = new Set;
-  const cables2 = [];
+  const cables = [];
   const vlansOf = (device, portName) => {
     const port = device.ports?.[portName];
     const lag = port?.lag ? device.interfaces?.[port.lag] : undefined;
@@ -854,7 +854,7 @@ function cablesOf(devices) {
       drawn.add(`${here}|${there}`);
       const farPort = byName.get(link.device)?.ports?.[link.port];
       const linksBack = farPort?.link?.device === device.name && farPort.link.port === portName;
-      cables2.push({
+      cables.push({
         device: device.name,
         port: portName,
         farDevice: link.device,
@@ -867,7 +867,7 @@ function cablesOf(devices) {
       });
     }
   }
-  return cables2;
+  return cables;
 }
 function packageRoot() {
   let directory = dirname(fileURLToPath(import.meta.url));
@@ -899,7 +899,7 @@ function schemaDocs() {
 function studioData(devices, graph, texts) {
   const owners = new Map;
   for (const holder of holdersOf(devices)) {
-    const key = keyOf(host(holder.address));
+    const key = keyOf(host2(holder.address));
     if (!owners.has(key))
       owners.set(key, holder);
   }

package/dist/chunks/{index-xm9nma2t.js → index-v8zgr7wm.js}

@@ -1,11 +1,11 @@
 // src/core/addr.ts
-var familyOf = (address) => address.includes(":") ? "ipv6" : "ipv4";
+var familyOf2 = (address) => address.includes(":") ? "ipv6" : "ipv4";
 var bitsOf = (family) => family === "ipv4" ? 32 : 128;
 function parse(address) {
   if (!address.includes(":")) {
     const octets = address.split(".");
-    const valid2 = octets.length === 4 && octets.every((octet) => /^\d{1,3}$/.test(octet) && Number(octet) <= 255);
-    if (!valid2)
+    const valid = octets.length === 4 && octets.every((octet) => /^\d{1,3}$/.test(octet) && Number(octet) <= 255);
+    if (!valid)
       return null;
     return octets.reduce((value, octet) => value << 8n | BigInt(octet), 0n);
   }
@@ -24,15 +24,15 @@ function parse(address) {
 }
 function split(cidr) {
   const [address, lengthText] = cidr.split("/");
-  const family = familyOf(address);
+  const family = familyOf2(address);
   const length = Number(lengthText);
   const valid = parse(address) !== null && lengthText !== undefined && Number.isInteger(length) && length >= 0 && length <= bitsOf(family);
   if (!valid)
     throw new Error(`'${cidr}' is not an address with a length`);
   return { addr: address, len: length, family };
 }
-var isAddress = (text) => parse(text) !== null;
-function isCidr(text) {
+var isAddress2 = (text) => parse(text) !== null;
+function isCidr2(text) {
   try {
     split(text);
     return true;
@@ -73,10 +73,10 @@ function network(cidr) {
   const { addr, len, family } = split(cidr);
   return `${format(parse(addr) & mask(len, family), family)}/${len}`;
 }
-function contains(outer, inner) {
+function contains2(outer, inner) {
   const outerParts = split(outer);
   const [innerAddress, innerLengthText] = inner.split("/");
-  if (familyOf(innerAddress) !== outerParts.family)
+  if (familyOf2(innerAddress) !== outerParts.family)
     return false;
   const innerLength = innerLengthText === undefined ? bitsOf(outerParts.family) : Number(innerLengthText);
   if (innerLength < outerParts.len)
@@ -105,7 +105,7 @@ function prefixesBetween(first, last, family) {
 }
 var netmask = (length) => format(mask(length, "ipv4"), "ipv4");
 var wildcard = (length) => format(mask(length, "ipv4") ^ 0xffffffffn, "ipv4");
-var host = (cidr) => cidr.split("/")[0];
+var host2 = (cidr) => cidr.split("/")[0];
 var NOT_GLOBAL_V4 = [
   "0.0.0.0/8",
   "10.0.0.0/8",
@@ -119,10 +119,10 @@ var NOT_GLOBAL_V4 = [
   "198.51.100.0/24",
   "203.0.113.0/24"
 ];
-function isGlobal(address) {
-  if (familyOf(address) === "ipv6")
-    return contains("2000::/3", address) && !contains("2001:db8::/32", address);
-  return !NOT_GLOBAL_V4.some((prefix) => contains(prefix, address));
+function isGlobal2(address) {
+  if (familyOf2(address) === "ipv6")
+    return contains2("2000::/3", address) && !contains2("2001:db8::/32", address);
+  return !NOT_GLOBAL_V4.some((prefix) => contains2(prefix, address));
 }
 
-export { familyOf, parse, split, isAddress, isCidr, network, contains, formatAddress, rangeOf, prefixesBetween, netmask, wildcard, host, isGlobal };
+export { familyOf2, parse, split, isAddress2, isCidr2, network, contains2, formatAddress, rangeOf, prefixesBetween, netmask, wildcard, host2, isGlobal2 };

package/dist/chunks/{new-7n8qvtjd.js → new-ny89s7y7.js}

@@ -1,5 +1,3 @@
-import"./index-fq57hya4.js";
-
 // src/cli/new.ts
 import { spawnSync } from "node:child_process";
 import { cpSync, existsSync, readdirSync, readFileSync, renameSync, writeFileSync } from "node:fs";
@@ -87,7 +85,7 @@ async function create(args) {
     if (terminal) {
       console.log(`
 Which is closest to your network?`);
-      names.forEach((name2, index) => console.log(`  ${index + 1}. ${PATTERNS[name2].title}: ${PATTERNS[name2].fits}`));
+      names.forEach((name, index) => console.log(`  ${index + 1}. ${PATTERNS[name].title}: ${PATTERNS[name].fits}`));
     }
     pattern = names[Number(await ask("Number", "1")) - 1];
   }
@@ -120,14 +118,14 @@ Which is closest to your network?`);
     let text = readFileSync(path, "utf8");
     if (asn && asn !== EXAMPLE_ASN)
       text = text.replaceAll(new RegExp(`\\b${EXAMPLE_ASN}\\b`, "g"), asn);
-    for (const [, name2] of text.matchAll(/secret\("([A-Z0-9_]+)"\)/g))
-      secrets.add(name2);
+    for (const [, name] of text.matchAll(/secret\("([A-Z0-9_]+)"\)/g))
+      secrets.add(name);
     writeFileSync(path, text);
   }
   const env = [
     "# Secrets for Circuit. Never commit this file.",
     "# A value is the secret itself, or a 1Password reference, op://vault/item/field, read with the 1Password CLI.",
-    ...[...secrets].sort().map((name2) => onePassword ? `${name2}=op://Network/${name2}/password` : `${name2}=`),
+    ...[...secrets].sort().map((name) => onePassword ? `${name}=op://Network/${name}/password` : `${name}=`),
     ""
   ];
   writeFileSync(join(target, ".env"), env.join(`

package/dist/chunks/{server-5shmsmse.js → server-zapfzhv4.js}

@@ -1,8 +1,6 @@
 import {
   packageRoot
-} from "./index-jtzfw679.js";
-import"./index-xm9nma2t.js";
-import"./index-fq57hya4.js";
+} from "./index-n4zpd25n.js";
 
 // src/studio/server.ts
 import { execFile as execFile2, spawn } from "node:child_process";
@@ -106,7 +104,8 @@ var CONTENT_TYPES = {
   ".html": "text/html; charset=utf-8",
   ".css": "text/css; charset=utf-8",
   ".js": "text/javascript; charset=utf-8",
-  ".svg": "image/svg+xml"
+  ".svg": "image/svg+xml",
+  ".woff2": "font/woff2"
 };
 function gather(configPath) {
   const cli = process.argv[1];
@@ -160,11 +159,11 @@ async function studio(options) {
     const path = url.pathname;
     if (path === "/history") {
       answer(response, async () => {
-        const name2 = url.searchParams.get("device") ?? "";
-        const files = JSON.parse(data).files?.[name2];
+        const name = url.searchParams.get("device") ?? "";
+        const files = JSON.parse(data).files?.[name];
         if (!files)
-          throw new Error(`no device ${name2}`);
-        return history(root, [files.source, files.snapshot].filter((file2) => Boolean(file2)));
+          throw new Error(`no device ${name}`);
+        return history(root, [files.source, files.snapshot].filter((file) => Boolean(file)));
       });
       return;
     }
@@ -208,7 +207,7 @@ async function studio(options) {
     const name = path === "/" ? "index.html" : path.slice(1);
     const type = CONTENT_TYPES[extname(name)];
     const file = join2(pages, name);
-    if (!/^[a-z-]+\.[a-z]+$/.test(name) || !type || !existsSync(file)) {
+    if (!/^[a-z-]+\.[a-z0-9]+$/.test(name) || !type || !existsSync(file)) {
       response.writeHead(404).end();
       return;
     }
@@ -240,7 +239,6 @@ async function studio(options) {
   });
 }
 export {
-  studio,
   isLoopback,
-  hostAllowed
+  studio
 };