with manager

builder.go

@@ -3,21 +3,32 @@ package curre
 import "context"
 
 type FunctionalComponent struct {
-	init  func(ctx context.Context) error
-	start func(ctx context.Context) error
-	stop  func(ctx context.Context) error
+	InitFunc  func(fc *FunctionalComponent, ctx context.Context) error
+	StartFunc func(fc *FunctionalComponent, ctx context.Context) error
+	StopFunc  func(fc *FunctionalComponent, ctx context.Context) error
 }
 
 func NewFunctionalComponent(
-	init func(ctx context.Context) error,
-	start func(ctx context.Context) error,
-	stop func(ctx context.Context) error,
+	fc *FunctionalComponent,
 ) Component {
-	return &FunctionalComponent{
-		init, start, stop,
-	}
+	return fc
 }
 
-func (fc *FunctionalComponent) Init(ctx context.Context) error  { return fc.init(ctx) }
-func (fc *FunctionalComponent) Start(ctx context.Context) error { return fc.start(ctx) }
-func (fc *FunctionalComponent) Stop(ctx context.Context) error  { return fc.stop(ctx) }
+func (fc *FunctionalComponent) Init(ctx context.Context) error {
+	if fc.InitFunc != nil {
+		return fc.InitFunc(fc, ctx)
+	}
+	return nil
+}
+func (fc *FunctionalComponent) Start(ctx context.Context) error {
+	if fc.StartFunc != nil {
+		return fc.StartFunc(fc, ctx)
+	}
+	return nil
+}
+func (fc *FunctionalComponent) Stop(ctx context.Context) error {
+	if fc.StopFunc != nil {
+		return fc.StopFunc(fc, ctx)
+	}
+	return nil
+}

manager.go

@@ -30,10 +30,37 @@ func NewManager() *Manager {
 	}
 }
 
-func (m *Manager) RunNonBlocking(ctx context.Context) error {
-	go m.Run(ctx)
+type ComponentsAreReady struct {
+}
 
-	return nil
+type CleanupFunc func(ctx context.Context) error
+
+func (m *Manager) RunNonBlocking(ctx context.Context, readyChan chan ComponentsAreReady) (CleanupFunc, error) {
+	go func() error {
+		m.initLifetime()
+		err := m.init(ctx)
+		if err != nil {
+			return err
+		}
+
+		err = m.startBlocking(ctx)
+		if err != nil {
+			return err
+		}
+
+		readyChan <- ComponentsAreReady{}
+
+		err = m.wait(ctx)
+		if err != nil {
+			return err
+		}
+
+		return nil
+	}()
+
+	return func(ctx context.Context) error {
+		return m.shutdown(ctx)
+	}, nil
 }
 
 func (m *Manager) Run(ctx context.Context) error {
@@ -98,6 +125,14 @@ func (m *Manager) start(ctx context.Context) error {
 	return nil
 }
 
+func (m *Manager) startBlocking(ctx context.Context) error {
+	for _, c := range m.components {
+		m.startComponent(ctx, c)
+	}
+
+	return nil
+}
+
 func (m *Manager) startComponent(ctx context.Context, component Component) {
 	defer func() {
 		err := recover()
@@ -128,8 +163,13 @@ func (m *Manager) initLifetime() {
 }
 
 func (m *Manager) wait(ctx context.Context) error {
-	exitCode := <-m.exitChan
-	m.exitCode = exitCode
+	select {
+	case exitCode := <-m.exitChan:
+		m.exitCode = exitCode
+		return nil
+	case <-ctx.Done():
+		return nil
+	}
 	return nil
 }