core/async: return nil values w/ Grx even on errs

Author: ignoramous

intra/core/async.go

@@ -78,9 +78,8 @@ func Grx[T any](who string, f WorkCtx[T], d time.Duration) (zz T, completed bool
 		defer Recover(Exit11, who)
 		defer close(ch)
 
-		if out, err := f(ctx); err == nil {
-			ch <- out
-		} // else: discard
+		out, _ := f(ctx) // TODO: log error?
+		ch <- out
 	}()
 
 	select {

intra/core/barrier.go

@@ -195,7 +195,7 @@ func (ba *Barrier[T, K]) Do(k K, once Work[T]) (*V[T, K], int) {
 		c.Val, c.Err = once()
 		return c, c.Err
 	}, ba.to); !completed {
-		c.Err = errTimeout
+		c.Err = JoinErr(c.Err, errTimeout)
 	}
 
 	c.wg.Done() // unblock all waiters
@@ -220,7 +220,7 @@ func (ba *Barrier[T, K]) Do1(k K, once Work1[T], arg T) (*V[T, K], int) {
 		c.Val, c.Err = once(arg)
 		return c, c.Err
 	}, ba.to); !completed {
-		c.Err = errTimeout
+		c.Err = JoinErr(c.Err, errTimeout)
 	}
 
 	c.wg.Done() // unblock all waiters

intra/dnsx/alg.go

@@ -676,15 +676,15 @@ func (t *dnsgateway) qs(t2 Transport, uid, network string, msg *dns.Msg, t1res <
 
 		qname := xdns.QName(msg)
 
-		r, ok := core.Grx("alg.qs."+qname, func(_ context.Context) (secans, error) {
+		r, completed := core.Grx("alg.qs."+qname, func(_ context.Context) (secans, error) {
 			return t.querySecondary(t2, uid, network, msg, t1res), nil
 		}, timeout)
 
-		if !ok {
+		if !completed {
 			log.W("alg: skip; qs timeout; tr2: %s, qname: %s", idstr(t2), qname)
 		}
 
-		r.initIfNeeded() // r may be nil on Grx:timeout
+		r.initIfNeeded() // r may be nil value on Grx:timeout
 
 		t2res <- r // may be zero secans
 	}()

intra/dnsx/transport.go

@@ -510,11 +510,11 @@ func (r *resolver) forward(q []byte, uid string, chosenids ...string) (res0 []by
 		return nil, NoDNS, errMissingQueryName
 	}
 
-	pref, oqok := core.Grx("r.onQuery", func(_ context.Context) (*x.DNSOpts, error) {
+	pref, oqcompleted := core.Grx("r.onQuery", func(_ context.Context) (*x.DNSOpts, error) {
 		return r.listener.OnQuery(uid, qname, qtyp), nil
 	}, onQueryTimeout)
-	if !oqok {
-		log.W("dns: fwd: for %s; no preferences for %s:%d", uid, qname, qtyp)
+	if !oqcompleted || pref == nil {
+		log.W("dns: fwd: for %s; no preferences (%t) for %s:%d", uid, pref == nil, qname, qtyp)
 		smm.Latency = time.Since(starttime).Seconds()
 		smm.Status = ClientError
 		smm.Msg = errOnQueryTimeout.Error()

intra/ipn/proxies.go

@@ -629,14 +629,14 @@ func (px *proxifier) ProxyFor(id string) (Proxy, error) {
 	}
 
 	// go.dev/play/p/xCug1W3OcMH
-	p, ok := core.Grx("pxr.ProxyFor: "+id, func(_ context.Context) (Proxy, error) {
+	p, completed := core.Grx("pxr.ProxyFor: "+id, func(_ context.Context) (Proxy, error) {
 		px.RLock()
 		defer px.RUnlock()
 
 		return px.p[id], nil
 	}, getproxytimeout)
 
-	if !ok {
+	if !completed {
 		log.W("proxy: for: %s; timeout!", id)
 		// possibly a deadlock, so return an error
 		return nil, errGetProxyTimeout