fix(proxy): wait on the wait group if concurrency selected (#178)

.vscode/tasks.json

@@ -20,7 +20,9 @@
               "blur",
               "--files",
               "wonky*",
-              "--dry-run"
+              "--dry-run",
+              "--now",
+              "3"
           ],
           "isBackground": true,
           "problemMatcher": {

src/app/proxy/common/const-defs.go

@@ -53,13 +53,21 @@ type (
 		Discriminator string // helps to identify files that should be filtered out
 	}
 
+	interactionDefs struct {
+		Names struct {
+			Discovery string
+			Primary   string
+		}
+	}
+
 	definitions struct {
 		Pixa        pixaDefs
 		ThirdParty  thirdPartyDefs
 		Commands    commandDefs
 		Defaults    defaultDefs
 		Environment environmentDefs
 		Filing      filingDefs
+		Interaction interactionDefs
 	}
 )
 
@@ -95,4 +103,13 @@ var Definitions = definitions{
 		JournalExt:    ".txt",
 		Discriminator: ".$",
 	},
+	Interaction: interactionDefs{
+		Names: struct {
+			Discovery string
+			Primary   string
+		}{
+			Discovery: "discover",
+			Primary:   "primary",
+		},
+	},
 }

src/app/proxy/common/interaction-defs.go

@@ -64,6 +64,7 @@ type (
 	// ClientTraverseInfo represents an entity which needs start a navigation
 	// operation.
 	ClientTraverseInfo interface {
+		Name() string
 		// ActiveOptionsFn allows the client to obtain the options func
 		// for the current phase.
 		ActiveOptionsFn() nav.TraverseOptionFn

src/app/proxy/user/interaction.go

@@ -41,6 +41,11 @@ type interaction struct {
 	arity  uint
 }
 
+func (u *interaction) IfWithPool(with nav.CreateNewRunnerWith) bool {
+	// this should go into nav, alongside IfWithPoolUseContext
+	return with&nav.RunnerWithPool > 0
+}
+
 func (u *interaction) navigate(ci common.ClientTraverseInfo,
 	with nav.CreateNewRunnerWith,
 	after ...common.AfterFunc,
@@ -69,6 +74,10 @@ func (u *interaction) navigate(ci common.ClientTraverseInfo,
 		nav.IfWithPoolUseContext(with, ctx, cancel)...,
 	)
 
+	if u.IfWithPool(with) {
+		wgan.Wait(boost.GoRoutineName(fmt.Sprintf("👾 %v", ci.Name())))
+	}
+
 	for _, fn := range after {
 		fn(result, err)
 	}

src/app/proxy/user/model.go

@@ -3,6 +3,8 @@ package user
 import (
 	"fmt"
 	"path/filepath"
+	"runtime"
+	"sync/atomic"
 	"time"
 
 	"github.com/charmbracelet/bubbles/spinner"
@@ -32,9 +34,8 @@ type model struct {
 	inputs     *common.ShrinkCommandInputs
 	executable string
 	status     string
-	workload   uint
 	arity      uint
-	level      uint
+	level      int32
 	latest     JobDescription
 	di         common.DriverTraverseInfo
 	ui         walker
@@ -105,7 +106,6 @@ func (m *model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		m.result = msg.Result
 		m.err = msg.Err
 		m.status = "🎭 discovered"
-		m.workload = msg.Result.Metrics.Count(nav.MetricNoFilesInvokedEn) * m.arity
 
 		if msg.Err != nil {
 			return m, tea.Quit
@@ -116,7 +116,7 @@ func (m *model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		return m, principal(m.di, m.ui)
 
 	case *common.ProgressMsg:
-		m.level++
+		atomic.AddInt32(&m.level, 1)
 		m.latest.Source = msg.Source
 		m.latest.Destination = msg.Destination
 		m.latest.Scheme = msg.Scheme
@@ -188,7 +188,10 @@ func (m *model) View() string {
 	wpf := m.inputs.Root.WorkerPoolFam.Native
 	cpus := lo.TernaryF(wpf.NoWorkers > 1 || wpf.CPU,
 		func() string {
-			return fmt.Sprintf("%v CPUs", fmt.Sprintf("%v", wpf.CPU))
+			if wpf.CPU {
+				return fmt.Sprintf("NumCPUs %v", runtime.NumCPU())
+			}
+			return fmt.Sprintf("%v workers", fmt.Sprintf("%v", wpf.NoWorkers))
 		},
 		func() string {
 			return "single CPU"
@@ -213,13 +216,13 @@ func (m *model) View() string {
 		-->        info: %v
 %v
 		-->       error: %v
-		-->    progress: %v of %v
+		-->    progress: %v
 	`,
 		m.spinner.View(), executable, m.status,
 		info,
 		bc.view(),
 		e,
-		m.level, m.workload,
+		m.level,
 	)
 
 	// the view will be a series of 'lanes', each one representing a job

src/app/proxy/user/walk-info.go

@@ -6,6 +6,7 @@ import (
 )
 
 type walkInfo struct {
+	name               string
 	discoverOptionsFn  nav.TraverseOptionFn
 	principalOptionsFn nav.TraverseOptionFn
 	activeOptionsFn    nav.TraverseOptionFn
@@ -21,6 +22,7 @@ func NewWalkInfo(discoverOptionsFn nav.TraverseOptionFn,
 	inputs *common.ShrinkCommandInputs,
 ) common.DriverTraverseInfo {
 	return &walkInfo{
+		name:               common.Definitions.Interaction.Names.Discovery,
 		discoverOptionsFn:  discoverOptionsFn,
 		principalOptionsFn: principalOptionsFn,
 		activeOptionsFn:    discoverOptionsFn,
@@ -30,6 +32,10 @@ func NewWalkInfo(discoverOptionsFn nav.TraverseOptionFn,
 	}
 }
 
+func (wi *walkInfo) Name() string {
+	return wi.name
+}
+
 func (wi *walkInfo) ActiveOptionsFn() nav.TraverseOptionFn {
 	return wi.activeOptionsFn
 }
@@ -47,5 +53,6 @@ func (wi *walkInfo) IsDryRun() bool {
 }
 
 func (wi *walkInfo) Next() {
+	wi.name = common.Definitions.Interaction.Names.Primary
 	wi.activeOptionsFn = wi.principalOptionsFn
 }