fix: per-service forwarder tracking, port merge on multi-container projects, socket permissions

Author: alysnnix

internal/api/api.go

@@ -46,6 +46,8 @@ func (a *API) ListenAndServe() error {
 	if err != nil {
 		return err
 	}
+	// Allow non-root users to connect
+	os.Chmod(a.sockPath, 0666)
 	a.listener = ln
 
 	mux := http.NewServeMux()

internal/daemon/daemon.go

@@ -144,10 +144,25 @@ func (d *Daemon) OnContainerStart(ctx context.Context, info watcher.ContainerInf
 		return entries[i].service < entries[j].service
 	})
 
-	// Create forwarders
-	var portMappings []state.PortMapping
+	// Collect existing port mappings to avoid duplicate forwarders
+	var existingPorts []state.PortMapping
+	if existing != nil {
+		existingPorts = existing.Ports
+	}
+
+	// Create forwarders only for NEW ports
+	var newPortMappings []state.PortMapping
 	for _, e := range entries {
 		listenAddr := fmt.Sprintf("%s:%d", ip, e.containerPort)
+
+		cancelKey := project + ":" + e.service + ":" + listenAddr
+
+		// Skip if a forwarder for this listen address already exists
+		if _, exists := d.cancelFns[cancelKey]; exists {
+			slog.Debug("forwarder already active, skipping", "project", project, "listen", listenAddr)
+			continue
+		}
+
 		targetAddr := fmt.Sprintf("127.0.0.1:%d", e.hostPort)
 
 		fwdCtx, fwdCancel := context.WithCancel(ctx)
@@ -159,9 +174,9 @@ func (d *Daemon) OnContainerStart(ctx context.Context, info watcher.ContainerInf
 		}()
 
 		d.forwarders[project] = append(d.forwarders[project], fwd)
-		d.cancelFns[project+":"+listenAddr] = fwdCancel
+		d.cancelFns[cancelKey] = fwdCancel
 
-		portMappings = append(portMappings, state.PortMapping{
+		newPortMappings = append(newPortMappings, state.PortMapping{
 			ContainerPort: e.containerPort,
 			HostPort:      e.hostPort,
 			Service:       e.service,
@@ -170,11 +185,26 @@ func (d *Daemon) OnContainerStart(ctx context.Context, info watcher.ContainerInf
 		slog.Info("forwarding", "project", project, "listen", listenAddr, "target", targetAddr)
 	}
 
-	// Update state
+	// Merge existing + new port mappings (deduplicated by listen addr)
+	mergedPorts := existingPorts
+	for _, np := range newPortMappings {
+		duplicate := false
+		for _, ep := range existingPorts {
+			if ep.ContainerPort == np.ContainerPort {
+				duplicate = true
+				break
+			}
+		}
+		if !duplicate {
+			mergedPorts = append(mergedPorts, np)
+		}
+	}
+
+	// Update state with merged ports
 	p := &state.Project{
 		Name:  project,
 		IP:    ip,
-		Ports: portMappings,
+		Ports: mergedPorts,
 	}
 	d.state.AddProject(p)
 
@@ -183,26 +213,44 @@ func (d *Daemon) OnContainerStart(ctx context.Context, info watcher.ContainerInf
 
 func (d *Daemon) OnContainerDie(ctx context.Context, info watcher.ContainerInfo) error {
 	project := info.Project
+	service := info.Service
 
-	// Cancel all forwarders for this project
+	// Cancel only forwarders belonging to this service
+	prefix := project + ":" + service + ":"
 	for key, cancel := range d.cancelFns {
-		if len(key) > len(project) && key[:len(project)+1] == project+":" {
+		if len(key) >= len(prefix) && key[:len(prefix)] == prefix {
 			cancel()
 			delete(d.cancelFns, key)
 		}
 	}
-	delete(d.forwarders, project)
 
+	// Remove this service's ports from the project state
 	p := d.state.GetProject(project)
 	if p == nil {
 		return nil
 	}
 
-	d.dns.Unregister(project)
-	d.ipman.RemoveLoopbackIP(p.IP)
-	d.state.RemoveProject(project)
+	var remaining []state.PortMapping
+	for _, pm := range p.Ports {
+		if pm.Service != service {
+			remaining = append(remaining, pm)
+		}
+	}
+
+	if len(remaining) == 0 {
+		// No more services in this project — full teardown
+		delete(d.forwarders, project)
+		d.dns.Unregister(project)
+		d.ipman.RemoveLoopbackIP(p.IP)
+		d.state.RemoveProject(project)
+		slog.Info("project removed", "project", project)
+	} else {
+		// Update project with remaining ports
+		p.Ports = remaining
+		d.state.AddProject(p)
+		slog.Info("service removed", "project", project, "service", service, "remaining", len(remaining))
+	}
 
-	slog.Info("project removed", "project", project)
 	return nil
 }