From ad1ed3ff0ccd87b313e8458f5db50d4f9788ce94 Mon Sep 17 00:00:00 2001
From: Moses Narrow <36607567+0pcom@users.noreply.github.com>
Date: Tue, 31 Mar 2026 18:52:29 -0500
Subject: [PATCH 1/2] Fix shutdown hang: add timeout to discovery entry
 deletion

Client.Close() called delEntry(context.Background()) which makes HTTP
requests to the discovery server with no timeout. When discovery is
accessed over dmsg (the transport being closed), the Entry() lookup
falls back to HTTP-over-dmsg which hangs forever since the dmsg
client is already shut down.

Add a 5-second timeout context so Close() always completes.
---
 pkg/dmsg/client.go | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkg/dmsg/client.go b/pkg/dmsg/client.go
index 916aa830..28236d5c 100644
--- a/pkg/dmsg/client.go
+++ b/pkg/dmsg/client.go
@@ -377,7 +377,12 @@ func (ce *Client) Close() error {
 		ce.sessionsMx.Unlock()
 		ce.porter.CloseAll(ce.log)
 		ce.wg.Wait()
-		err = ce.EntityCommon.delEntry(context.Background())
+		// Use a short timeout for discovery cleanup — if the discovery
+		// server is accessed over dmsg (which we just closed), this
+		// request would hang forever with context.Background().
+		delCtx, delCancel := context.WithTimeout(context.Background(), 5*time.Second)
+		err = ce.EntityCommon.delEntry(delCtx)
+		delCancel()
 	})
 	return err
 }

From 7d1196fdeea9fd3074765b3166a9a5b8f1613a24 Mon Sep 17 00:00:00 2001
From: Moses Narrow <36607567+0pcom@users.noreply.github.com>
Date: Tue, 31 Mar 2026 18:59:31 -0500
Subject: [PATCH 2/2] Add hidden --with-kill flag for force-exit safety net

Add a hidden persistent flag --with-kill that enables the force-exit
goroutine (3x Ctrl+C = os.Exit). Available on all subcommands as a
safety net when graceful shutdown hangs.

Usage: skywire dmsg web --with-kill
---
 cmd/dmsg/commands/root.go | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/cmd/dmsg/commands/root.go b/cmd/dmsg/commands/root.go
index 560bf2f0..ce16abda 100644
--- a/cmd/dmsg/commands/root.go
+++ b/cmd/dmsg/commands/root.go
@@ -3,6 +3,9 @@ package commands
 
 import (
 	"fmt"
+	"os"
+	"os/signal"
+	"syscall"
 
 	"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/buildinfo"
 	"github.com/skycoin/skywire/pkg/skywire-utilities/pkg/calvin"
@@ -24,8 +27,9 @@ import (
 )
 
 var (
-	bv  bool
-	dbi bool
+	bv       bool
+	dbi      bool
+	withKill bool
 )
 
 func init() {
@@ -63,6 +67,8 @@ func init() {
 	di.RootCmd.Use = "ip"
 
 	modifySubcommands(RootCmd)
+	RootCmd.PersistentFlags().BoolVar(&withKill, "with-kill", false, "force exit after 3 interrupt signals")
+	RootCmd.PersistentFlags().MarkHidden("with-kill") //nolint:errcheck,gosec
 	if fmt.Sprintf("%v", buildinfo.DebugBuildInfo()) != "" {
 		RootCmd.Flags().BoolVarP(&dbi, "info", "d", false, "print runtime/debug.BuildInfo")
 	}
@@ -98,6 +104,21 @@ var RootCmd = &cobra.Command{
 		}
 		return ret
 	}(),
+	PersistentPreRun: func(_ *cobra.Command, _ []string) {
+		if withKill {
+			c := make(chan os.Signal, 1)
+			signal.Notify(c, os.Interrupt, syscall.SIGTERM)
+			go func() {
+				sigCount := 0
+				for range c {
+					sigCount++
+					if sigCount >= 3 {
+						os.Exit(1)
+					}
+				}
+			}()
+		}
+	},
 	SilenceErrors:         true,
 	SilenceUsage:          true,
 	DisableSuggestions:    true,