improve nodeinfo

- enable usage outside of secure-node.nix
- use json as the output format
- show ports
- also show local addresses, which is particularly useful when
  netns-isolation is enabled
- only show enabled services

modules/modules.nix

@@ -27,6 +27,7 @@ with lib;
     ./onion-addresses.nix
     ./onion-services.nix
     ./netns-isolation.nix
+    ./nodeinfo.nix
     ./backups.nix
   ];
 

modules/nodeinfo.nix

@@ -1,74 +1,117 @@
 { config, lib, pkgs, ... }:
 
 with lib;
-
 let
-  operatorName = config.nix-bitcoin.operator.name;
+  cfg = config.nix-bitcoin.nodeinfo;
+
+  # Services included in the output
+  services = {
+    bitcoind = mkInfo "";
+    clightning = mkInfo ''
+      info["nodeid"] = shell("lightning-cli getinfo | jq -r '.id'")
+      if 'onion_address' in info:
+          info["id"] = f"{info['nodeid']}@{info['onion_address']}"
+    '';
+    lnd = mkInfo ''
+      info["nodeid"] = shell("lightning-cli getinfo | jq -r '.id'")
+    '';
+    electrs = mkInfo "";
+    spark-wallet = mkInfo "";
+    btcpayserver = mkInfo "";
+    liquidd = mkInfo "";
+    # Only add sshd when it has an onion service
+    sshd = name: cfg: mkIfOnionPort "sshd" (onionPort: ''
+      add_service("sshd", """set_onion_address(info, "sshd", ${onionPort})""")
+    '');
+  };
+
   script = pkgs.writeScriptBin "nodeinfo" ''
-    set -eo pipefail
+    #!${pkgs.python3}/bin/python
 
-    BITCOIND_ONION="$(cat /var/lib/onion-addresses/${operatorName}/bitcoind)"
-    echo BITCOIND_ONION="$BITCOIND_ONION"
+    import json
+    import subprocess
+    from collections import OrderedDict
 
-    if systemctl is-active --quiet clightning; then
-      CLIGHTNING_NODEID=$(lightning-cli getinfo | jq -r '.id')
-      CLIGHTNING_ONION="$(cat /var/lib/onion-addresses/${operatorName}/clightning)"
-      CLIGHTNING_ID="$CLIGHTNING_NODEID@$CLIGHTNING_ONION:9735"
-      echo CLIGHTNING_NODEID="$CLIGHTNING_NODEID"
-      echo CLIGHTNING_ONION="$CLIGHTNING_ONION"
-      echo CLIGHTNING_ID="$CLIGHTNING_ID"
-    fi
+    def success(*args):
+        return subprocess.call(args, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL) == 0
 
-    if systemctl is-active --quiet lnd; then
-      LND_NODEID=$(lncli getinfo | jq -r '.uris[0]')
-      echo LND_NODEID="$LND_NODEID"
-    fi
+    def is_active(unit):
+        return success("systemctl", "is-active", "--quiet", unit)
 
-    NGINX_ONION_FILE=/var/lib/onion-addresses/${operatorName}/nginx
-    if [ -e "$NGINX_ONION_FILE" ]; then
-      NGINX_ONION="$(cat $NGINX_ONION_FILE)"
-      echo NGINX_ONION="$NGINX_ONION"
-    fi
+    def is_enabled(unit):
+        return success("systemctl", "is-enabled", "--quiet", unit)
 
-    LIQUIDD_ONION_FILE=/var/lib/onion-addresses/${operatorName}/liquidd
-    if [ -e "$LIQUIDD_ONION_FILE" ]; then
-      LIQUIDD_ONION="$(cat $LIQUIDD_ONION_FILE)"
-      echo LIQUIDD_ONION="$LIQUIDD_ONION"
-    fi
+    def cmd(*args):
+        return subprocess.run(args, stdout=subprocess.PIPE).stdout.decode('utf-8')
 
-    SPARKWALLET_ONION_FILE=/var/lib/onion-addresses/${operatorName}/spark-wallet
-    if [ -e "$SPARKWALLET_ONION_FILE" ]; then
-      SPARKWALLET_ONION="$(cat $SPARKWALLET_ONION_FILE)"
-      echo SPARKWALLET_ONION="http://$SPARKWALLET_ONION"
-    fi
+    def shell(*args):
+        return cmd("bash", "-c", *args).strip()
 
-    ELECTRS_ONION_FILE=/var/lib/onion-addresses/${operatorName}/electrs
-    if [ -e "$ELECTRS_ONION_FILE" ]; then
-      ELECTRS_ONION="$(cat $ELECTRS_ONION_FILE)"
-      echo ELECTRS_ONION="$ELECTRS_ONION"
-    fi
+    infos = OrderedDict()
+    operator = "${config.nix-bitcoin.operator.name}"
 
-    BTCPAYSERVER_ONION_FILE=/var/lib/onion-addresses/${operatorName}/btcpayserver
-    if [ -e "$BTCPAYSERVER_ONION_FILE" ]; then
-      BTCPAYSERVER_ONION="$(cat $BTCPAYSERVER_ONION_FILE)"
-      echo BTCPAYSERVER_ONION="$BTCPAYSERVER_ONION"
-    fi
+    def set_onion_address(info, name, port):
+        path = f"/var/lib/onion-addresses/{operator}/{name}"
+        try:
+            with open(path, "r") as f:
+                onion_address = f.read().strip()
+        except OSError:
+            print(f"error reading file {path}", file=sys.stderr)
+            return
+        info["onion_address"] = f"{onion_address}:{port}"
 
-    SSHD_ONION_FILE=/var/lib/onion-addresses/${operatorName}/sshd
-    if [ -e "$SSHD_ONION_FILE" ]; then
-    SSHD_ONION="$(cat $SSHD_ONION_FILE)"
-    echo SSHD_ONION="$SSHD_ONION"
-    fi
+    def add_service(service, make_info):
+        if not is_active(service):
+            infos[service] = "service is not running"
+        else:
+            info = OrderedDict()
+            exec(make_info, globals(), locals())
+            infos[service] = info
+
+    if is_enabled("onion-adresses") and not is_active("onion-adresses"):
+        print("error: service 'onion-adresses' is not running")
+        exit(1)
+
+    ${concatStrings infos}
+
+    print(json.dumps(infos, indent=2))
   '';
+
+  infos = map (service:
+    let cfg = config.services.${service};
+    in optionalString cfg.enable (services.${service} service cfg)
+  ) (builtins.attrNames services);
+
+  mkInfo = extraCode: name: cfg:
+    ''
+      add_service("${name}", """
+      info["local_address"] = "${cfg.address}:${toString cfg.port}"
+    '' + mkIfOnionPort name (onionPort: ''
+      set_onion_address(info, "${name}", ${onionPort})
+    '') + extraCode + ''
+
+      """)
+    '';
+
+   mkIfOnionPort = name: fn:
+     if hiddenServices ? ${name} then
+       fn (toString (builtins.elemAt hiddenServices.${name}.map 0).port)
+     else
+       "";
+
+  inherit (config.services.tor) hiddenServices;
 in {
   options = {
-    programs.nodeinfo = mkOption {
-      readOnly = true;
-      default = script;
+    nix-bitcoin.nodeinfo = {
+      enable = mkEnableOption "nodeinfo";
+      program = mkOption {
+        readOnly = true;
+        default = script;
+      };
     };
   };
 
   config = {
-    environment.systemPackages = [ script ];
+    environment.systemPackages = optional cfg.enable script;
   };
 }

modules/presets/secure-node.nix

@@ -14,7 +14,6 @@ let
 in {
   imports = [
     ../modules.nix
-    ../nodeinfo.nix
     ./enable-tor.nix
   ];
 
@@ -75,5 +74,7 @@ in {
           cp "${config.users.users.root.home}/.vbox-nixops-client-key" "${config.users.users.${operatorName}.home}"
         '';
       };
+
+    nix-bitcoin.nodeinfo.enable = true;
   };
 }