Properly define timeout

Signed-off-by: Chmouel Boudjnah <[email protected]>

README.md

@@ -75,6 +75,7 @@ You can also use it to test and develop the source code:
 nix develop # drops you in a shell with all the thing needed
 nix flake check # runs tests
 ```
+
 ### System Services
 
 System Service example file for macOS and Linux is available in the [misc](./misc) directory.

gosmee/app.go

@@ -90,13 +90,14 @@ accessible endpoint and forward request to your local service`,
 						decorate = false
 					}
 					cfg := goSmee{
-						smeeURL:      smeeURL,
-						targetURL:    targetURL,
-						saveDir:      c.String("saveDir"),
-						noReplay:     c.Bool("noReplay"),
-						decorate:     decorate,
-						ignoreEvents: c.StringSlice("ignore-event"),
-						channel:      c.String("channel"),
+						smeeURL:          smeeURL,
+						targetURL:        targetURL,
+						saveDir:          c.String("saveDir"),
+						noReplay:         c.Bool("noReplay"),
+						decorate:         decorate,
+						ignoreEvents:     c.StringSlice("ignore-event"),
+						channel:          c.String("channel"),
+						targetCnxTimeout: c.Int("target-connection-timeout"),
 					}
 					err := cfg.clientSetup()
 					return err
@@ -121,7 +122,7 @@ accessible endpoint and forward request to your local service`,
 					},
 					&cli.IntFlag{
 						Name:    "target-connection-timeout",
-						Usage:   "How long to wait for the connection timeout",
+						Usage:   "How long to wait when forwarding the request to the service",
 						EnvVars: []string{"GOSMEE_TARGET_TIMEOUT"},
 						Value:   defaultTimeout,
 					},

gosmee/client.go

@@ -40,6 +40,7 @@ type goSmee struct {
 	decorate, noReplay          bool
 	ignoreEvents                []string
 	channel                     string
+	targetCnxTimeout            int
 }
 
 type payloadMsg struct {
@@ -230,9 +231,10 @@ func (c goSmee) replayData(b []byte) error {
 		return nil
 	}
 
-	client := http.Client{Timeout: time.Duration(defaultTimeout) * time.Second}
-	ctx := context.Background()
-	req, err := http.NewRequestWithContext(ctx, "POST", c.targetURL, strings.NewReader(string(pm.body)))
+	ctx, cancel := context.WithTimeout(context.Background(), time.Duration(c.targetCnxTimeout)*time.Second)
+	defer cancel()
+	client := http.Client{}
+	req, err := http.NewRequestWithContext(ctx, http.MethodPost, c.targetURL, strings.NewReader(string(pm.body)))
 	if err != nil {
 		return err
 	}