Set default credentials path to user config

Author: omarroth

cmd/doubletake/main.go

@@ -20,7 +20,7 @@ func main() {
 	target := flag.String("target", "", "Apple TV IP address or hostname (skip discovery)")
 	port := flag.Int("port", 7000, "AirPlay port")
 	pin := flag.String("pin", "", "4-digit PIN for pairing (shown on Apple TV)")
-	credFile := flag.String("creds", airplay.DefaultCredentialsFile, "Path to saved pairing credentials")
+	credFile := flag.String("creds", airplay.DefaultCredentialsPath(), "Path to saved pairing credentials")
 	forcePair := flag.Bool("pair", false, "Force new pairing even if credentials exist")
 	width := flag.Int("width", 1920, "Stream width")
 	height := flag.Int("height", 1080, "Stream height")

internal/airplay/credentials.go

@@ -16,10 +16,8 @@ type SavedCredentials struct {
 	Ed25519Seed   []byte `json:"ed25519_seed"` // 32-byte seed (private key is derived from this)
 }
 
-const DefaultCredentialsFile = "airplay-credentials.json"
-
-// DefaultCredentialStorePath returns ~/.config/doubletake/credentials.json.
-func DefaultCredentialStorePath() string {
+// DefaultCredentialsPath returns ~/.config/doubletake/credentials.json.
+func DefaultCredentialsPath() string {
 	dir := os.Getenv("XDG_CONFIG_HOME")
 	if dir == "" {
 		home, _ := os.UserHomeDir()
@@ -45,8 +43,9 @@ func SaveCredentials(path string, pairingID string, pub ed25519.PublicKey, priv
 	return nil
 }
 
-// LoadCredentials reads pairing credentials from disk (legacy single-device format).
-// Returns nil, nil if the file doesn't exist.
+// LoadCredentials reads pairing credentials from disk.
+// Supports both the legacy single-device format and the multi-device map format
+// written by CredentialStore. Returns nil, nil if the file doesn't exist.
 func LoadCredentials(path string) (*SavedCredentials, error) {
 	data, err := os.ReadFile(path)
 	if err != nil {
@@ -55,15 +54,33 @@ func LoadCredentials(path string) (*SavedCredentials, error) {
 		}
 		return nil, fmt.Errorf("read credentials: %w", err)
 	}
+
+	// Try multi-device format first (map[string]*SavedCredentials)
+	var multi map[string]*SavedCredentials
+	if err := json.Unmarshal(data, &multi); err == nil && len(multi) > 0 {
+		for _, creds := range multi {
+			if creds != nil && creds.PairingID != "" {
+				return creds, nil
+			}
+		}
+	}
+
+	// Fall back to legacy single-device format
 	var creds SavedCredentials
 	if err := json.Unmarshal(data, &creds); err != nil {
 		return nil, fmt.Errorf("unmarshal credentials: %w", err)
 	}
+	if creds.PairingID == "" {
+		return nil, nil
+	}
 	return &creds, nil
 }
 
 // Ed25519Keys reconstructs the key pair from saved credentials.
 func (c *SavedCredentials) Ed25519Keys() (ed25519.PublicKey, ed25519.PrivateKey) {
+	if len(c.Ed25519Seed) != ed25519.SeedSize {
+		return nil, nil
+	}
 	priv := ed25519.NewKeyFromSeed(c.Ed25519Seed)
 	return ed25519.PublicKey(c.Ed25519Public), priv
 }

internal/daemon/daemon.go

@@ -103,8 +103,8 @@ type Daemon struct {
 // New creates a new Daemon with the given configuration.
 func New(cfg Config) (*Daemon, error) {
 	credPath := cfg.CredFile
-	if credPath == "" || credPath == airplay.DefaultCredentialsFile {
-		credPath = airplay.DefaultCredentialStorePath()
+	if credPath == "" {
+		credPath = airplay.DefaultCredentialsPath()
 	}
 	cs, err := airplay.NewCredentialStore(credPath)
 	if err != nil {
@@ -452,34 +452,38 @@ func (d *Daemon) connectAndStream(ctx context.Context, target string, port int,
 		savedCreds := d.credStore.Lookup(deviceID)
 		if savedCreds != nil {
 			pub, priv := savedCreds.Ed25519Keys()
-			client.PairingID = savedCreds.PairingID
-			client.PairKeys = &airplay.PairKeys{
-				Ed25519Public:  pub,
-				Ed25519Private: priv,
-			}
-			if err := client.PairVerify(ctx); err != nil {
-				log.Printf("[daemon] pair-verify with saved creds failed: %v, trying transient pairing", err)
-				// Reconnect for fresh pairing attempt
-				client.Close()
-				client = airplay.NewAirPlayClient(target, port)
-				if err := client.Connect(ctx); err != nil {
-					setErr(fmt.Sprintf("reconnect failed: %v", err))
-					return
-				}
-				if _, err := client.GetInfo(); err != nil {
-					setErr(fmt.Sprintf("get info after reconnect failed: %v", err))
-					return
+			if priv == nil {
+				log.Printf("[daemon] saved credentials have invalid keys, skipping pair-verify")
+			} else {
+				client.PairingID = savedCreds.PairingID
+				client.PairKeys = &airplay.PairKeys{
+					Ed25519Public:  pub,
+					Ed25519Private: priv,
 				}
-				// Try transient (no-PIN) pairing as fallback
-				if err := client.Pair(ctx, ""); err != nil {
-					log.Printf("[daemon] transient pairing also failed: %v", err)
+				if err := client.PairVerify(ctx); err != nil {
+					log.Printf("[daemon] pair-verify with saved creds failed: %v, trying transient pairing", err)
+					// Reconnect for fresh pairing attempt
+					client.Close()
+					client = airplay.NewAirPlayClient(target, port)
+					if err := client.Connect(ctx); err != nil {
+						setErr(fmt.Sprintf("reconnect failed: %v", err))
+						return
+					}
+					if _, err := client.GetInfo(); err != nil {
+						setErr(fmt.Sprintf("get info after reconnect failed: %v", err))
+						return
+					}
+					// Try transient (no-PIN) pairing as fallback
+					if err := client.Pair(ctx, ""); err != nil {
+						log.Printf("[daemon] transient pairing also failed: %v", err)
+					} else {
+						paired = true
+						log.Printf("[daemon] transient pairing succeeded for %s", info.Name)
+					}
 				} else {
 					paired = true
-					log.Printf("[daemon] transient pairing succeeded for %s", info.Name)
+					log.Printf("[daemon] pair-verify succeeded for %s", info.Name)
 				}
-			} else {
-				paired = true
-				log.Printf("[daemon] pair-verify succeeded for %s", info.Name)
 			}
 		}
 	}