demo: handle errors in SVG generation and fix empty prefix handling

demo/demo

@@ -408,6 +408,7 @@ def node_by_ll(addr):
                     _ll[a] = n, t
     return _ll[addr]
 
+
 def route_svg(ipv4, z=4):
     graph = {}
     for n in nodes:
@@ -416,8 +417,8 @@ def route_svg(ipv4, z=4):
             if (r.prefix and r.prefix.startswith('10.42.') if ipv4 else
                 r.prefix is None or r.prefix.startswith('2001:db8:')):
                 try:
-                    g[node_by_ll(r.nexthop)].append(
-                        node_by_ll(r.prefix)[0] if r.prefix else default)
+                    if r.prefix:
+                        g[node_by_ll(r.nexthop)].append(node_by_ll(r.prefix)[0])
                 except KeyError:
                     pass
     gv = ["digraph { splines = true; edge[color=grey, labelangle=0];"]
@@ -432,9 +433,9 @@ def route_svg(ipv4, z=4):
             j = abs(nodes.index(p[0]) - i)
             l.append((min(j, N - j), p, r))
         for j, (_, (p2, t), r) in enumerate(sorted(l, key=lambda x: x[0])):
-            l = []
+            l2 = []
             arrowhead = 'none'
-            for r2 in sorted(r2.short for r2 in r):
+            for r2 in sorted(r2.short or '' for r2 in r):
                 if r2:
                     if r2 == p2.short:
                         r2 = '<font color="grey">%s</font>' % r2
@@ -479,11 +480,14 @@ if args.port:
             if page < 2:
                 body = route_svg(page)
             else:
-                body = registry.Popen(('python3', '-c', r"""if 1:
+                out, err = (registry.Popen(('python3', '-c', r"""if 1:
                     import math, json
                     from re6st.registry import RegistryClient
-                    g = json.loads(RegistryClient(
-                        'http://localhost/').topology())
+                    topo = RegistryClient('http://localhost/').topology()
+                    g = json.loads(topo)
+                    if not g:
+                        print('digraph { "empty topology" [shape="none"] }')
+                        exit()
                     r = set(g.pop('', ()))
                     a = set()
                     for v in g.values():
@@ -502,13 +506,21 @@ if args.port:
                         for v in v:
                             print('"%s" -> "%s";' % (n, title(v)))
                     print('}')
-                """), stdout=subprocess.PIPE, cwd="..").communicate()[0].decode("utf-8")
-                if body:
-                    body = subprocess.Popen(('neato', '-Tsvg'),
-                                            stdin=subprocess.PIPE, stdout=subprocess.PIPE,
-                                            ).communicate(body.encode("utf-8"))[0].decode("utf-8")
-                if not body:
-                    self.send_error(500)
+                """), stdout=subprocess.PIPE, stderr=subprocess.PIPE, cwd="..")
+                            .communicate())
+                if err:
+                    self.send_error(500, explain='SVG generation failed: '
+                                                 + err.decode(errors='replace'))
+                    return
+                graph_body = out.decode("utf-8")
+                try:
+                    body = subprocess.run(
+                        ('neato', '-Tsvg'), check=True, text=True,
+                        capture_output=True,
+                        input=graph_body).stdout
+                except subprocess.CalledProcessError as e:
+                    self.send_error(500, explain='neato failed: '
+                                                 + e.stderr)
                     return
             if ext == 'svg':
                 mt = 'image/svg+xml'