From 6fac3cc4b31dd333596d6fb7efb41d12dd3e3a0f Mon Sep 17 00:00:00 2001
From: Ryan <ryanford@poluglottos.com>
Date: Thu, 8 Jun 2023 14:20:01 +0200
Subject: [PATCH 1/2] feat!(nodbuilder): making lifecycle timeouts configurable

---
 nodebuilder/config.go      |  2 ++
 nodebuilder/node.go        | 16 ++--------------
 nodebuilder/node/config.go | 38 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 42 insertions(+), 14 deletions(-)
 create mode 100644 nodebuilder/node/config.go

diff --git a/nodebuilder/config.go b/nodebuilder/config.go
index 3607aa593e..670bbf9bbd 100644
--- a/nodebuilder/config.go
+++ b/nodebuilder/config.go
@@ -25,6 +25,7 @@ type ConfigLoader func() (*Config, error)
 // Config is main configuration structure for a Node.
 // It combines configuration units for all Node subsystems.
 type Config struct {
+	Node    node.Config
 	Core    core.Config
 	State   state.Config
 	P2P     p2p.Config
@@ -39,6 +40,7 @@ type Config struct {
 // NOTE: Currently, configs are identical, but this will change.
 func DefaultConfig(tp node.Type) *Config {
 	commonConfig := &Config{
+		Node:    node.DefaultConfig(tp),
 		Core:    core.DefaultConfig(),
 		State:   state.DefaultConfig(),
 		P2P:     p2p.DefaultConfig(tp),
diff --git a/nodebuilder/node.go b/nodebuilder/node.go
index a6e3a3c3cc..19760831cf 100644
--- a/nodebuilder/node.go
+++ b/nodebuilder/node.go
@@ -5,7 +5,6 @@ import (
 	"errors"
 	"fmt"
 	"strings"
-	"time"
 
 	"github.com/cristalhq/jwt"
 	"github.com/ipfs/go-blockservice"
@@ -95,7 +94,7 @@ func NewWithConfig(tp node.Type, network p2p.Network, store Store, cfg *Config,
 
 // Start launches the Node and all its components and services.
 func (n *Node) Start(ctx context.Context) error {
-	to := timeout(n.Type)
+	to := n.Config.Node.StartupTimeout
 	ctx, cancel := context.WithTimeout(ctx, to)
 	defer cancel()
 
@@ -141,7 +140,7 @@ func (n *Node) Run(ctx context.Context) error {
 // Canceling the given context earlier 'ctx' unblocks the Stop and aborts graceful shutdown forcing
 // remaining Modules/Services to close immediately.
 func (n *Node) Stop(ctx context.Context) error {
-	to := timeout(n.Type)
+	to := n.Config.Node.ShutdownTimeout
 	ctx, cancel := context.WithTimeout(ctx, to)
 	defer cancel()
 
@@ -183,14 +182,3 @@ func newNode(opts ...fx.Option) (*Node, error) {
 
 // lifecycleFunc defines a type for common lifecycle funcs.
 type lifecycleFunc func(context.Context) error
-
-var DefaultLifecycleTimeout = time.Minute * 2
-
-func timeout(tp node.Type) time.Duration {
-	switch tp {
-	case node.Light:
-		return time.Second * 20
-	default:
-		return DefaultLifecycleTimeout
-	}
-}
diff --git a/nodebuilder/node/config.go b/nodebuilder/node/config.go
new file mode 100644
index 0000000000..aa89325001
--- /dev/null
+++ b/nodebuilder/node/config.go
@@ -0,0 +1,38 @@
+package node
+
+import (
+	"fmt"
+	"time"
+)
+
+var DefaultLifecycleTimeout = time.Minute * 2
+
+type Config struct {
+	StartupTimeout  time.Duration
+	ShutdownTimeout time.Duration
+}
+
+// DefaultConfig returns the default node configuration for a given node type.
+func DefaultConfig(tp Type) Config {
+	var timeout time.Duration
+	switch tp {
+	case Light:
+		timeout = time.Second * 20
+	default:
+		timeout = DefaultLifecycleTimeout
+	}
+	return Config{
+		StartupTimeout:  timeout,
+		ShutdownTimeout: timeout,
+	}
+}
+
+func (c *Config) Validate() error {
+	if c.StartupTimeout == 0 {
+		return fmt.Errorf("invalid startup timeout: %v", c.StartupTimeout)
+	}
+	if c.ShutdownTimeout == 0 {
+		return fmt.Errorf("invalid shutdown timeout: %v", c.ShutdownTimeout)
+	}
+	return nil
+}

From a913803bec144e5497a23cf8f2a31e89c6977d06 Mon Sep 17 00:00:00 2001
From: Ryan <ryanford@poluglottos.com>
Date: Wed, 14 Jun 2023 10:17:35 +0200
Subject: [PATCH 2/2] unexporting defaultLifecycleTimeout

---
 nodebuilder/node/config.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nodebuilder/node/config.go b/nodebuilder/node/config.go
index aa89325001..e44fe2f014 100644
--- a/nodebuilder/node/config.go
+++ b/nodebuilder/node/config.go
@@ -5,7 +5,7 @@ import (
 	"time"
 )
 
-var DefaultLifecycleTimeout = time.Minute * 2
+var defaultLifecycleTimeout = time.Minute * 2
 
 type Config struct {
 	StartupTimeout  time.Duration
@@ -19,7 +19,7 @@ func DefaultConfig(tp Type) Config {
 	case Light:
 		timeout = time.Second * 20
 	default:
-		timeout = DefaultLifecycleTimeout
+		timeout = defaultLifecycleTimeout
 	}
 	return Config{
 		StartupTimeout:  timeout,