## Description This PR continues the refactoring of `netx` under the following principles: 1. do not break the rest of the tree and do not engage in extensive tree-wide refactoring yet 2. move under `netxlite` clearly related subpackages (e.g., `iox`, `netxmocks`) 3. move into `internal/netxlite/internal` stuff that is clearly private of `netxlite` 4. hide implementation details in `netxlite` pending new factories 5. refactor `tls` code in `netxlite` to clearly separate `crypto/tls` code from `utls` code After each commit, I run `go test -short -race ./...` locally. Each individual commit explains what it does. I will squash, but this operation will preserve the original commit titles, so this will give further insight on each step. ## Commits * refactor: rename netxmocks -> netxlite/mocks Part of https://github.com/ooni/probe/issues/1591 * refactor: rename quicx -> netxlite/quicx See https://github.com/ooni/probe/issues/1591 * refactor: rename iox -> netxlite/iox Regenerate sources and make sure the tests pass. See https://github.com/ooni/probe/issues/1591. * refactor(iox): move MockableReader to netxlite/mocks See https://github.com/ooni/probe/issues/1591 * refactor(netxlite): generator is an implementation detail See https://github.com/ooni/probe/issues/1591 * refactor(netxlite): separate tls and utls code See https://github.com/ooni/probe/issues/1591 * refactor(netxlite): hide most types but keep old names as legacy With this change we avoid breaking the rest of the tree, but we start hiding some implementation details a bit. Factories will follow. See https://github.com/ooni/probe/issues/1591
		
			
				
	
	
		
			99 lines
		
	
	
		
			2.4 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			99 lines
		
	
	
		
			2.4 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
| package ndt7
 | |
| 
 | |
| import (
 | |
| 	"context"
 | |
| 	"errors"
 | |
| 	"io"
 | |
| 	"time"
 | |
| 
 | |
| 	"github.com/gorilla/websocket"
 | |
| 	"github.com/ooni/probe-cli/v3/internal/netxlite/iox"
 | |
| )
 | |
| 
 | |
| type downloadManager struct {
 | |
| 	conn            mockableConn
 | |
| 	maxMessageSize  int64
 | |
| 	maxRuntime      time.Duration
 | |
| 	measureInterval time.Duration
 | |
| 	onJSON          callbackJSON
 | |
| 	onPerformance   callbackPerformance
 | |
| }
 | |
| 
 | |
| func newDownloadManager(
 | |
| 	conn mockableConn, onPerformance callbackPerformance,
 | |
| 	onJSON callbackJSON,
 | |
| ) downloadManager {
 | |
| 	return downloadManager{
 | |
| 		conn:            conn,
 | |
| 		maxMessageSize:  paramMaxMessageSize,
 | |
| 		maxRuntime:      paramMaxRuntime,
 | |
| 		measureInterval: paramMeasureInterval,
 | |
| 		onJSON:          onJSON,
 | |
| 		onPerformance:   onPerformance,
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func (mgr downloadManager) run(ctx context.Context) error {
 | |
| 	return mgr.reduceErr(mgr.doRun(ctx))
 | |
| }
 | |
| 
 | |
| // reduceErr treats as non-errors the errors caused by the context
 | |
| // so that we can focus instead on network errors.
 | |
| //
 | |
| // This function was introduced by https://github.com/ooni/probe-cli/pull/379
 | |
| // since before such a PR we did not see context interrupting
 | |
| // errors when we were reading messages. Since before such a PR
 | |
| // we used to return `nil` on context errors, this function is
 | |
| // here to keep the previous behavior by filtering the error
 | |
| // returned when reading messages, given that now reading messages
 | |
| // can fail midway because we use iox.ReadAllContext.
 | |
| func (mgr downloadManager) reduceErr(err error) error {
 | |
| 	if errors.Is(err, context.Canceled) {
 | |
| 		return nil
 | |
| 	}
 | |
| 	if errors.Is(err, context.DeadlineExceeded) {
 | |
| 		return nil
 | |
| 	}
 | |
| 	return err
 | |
| }
 | |
| 
 | |
| func (mgr downloadManager) doRun(ctx context.Context) error {
 | |
| 	var total int64
 | |
| 	start := time.Now()
 | |
| 	if err := mgr.conn.SetReadDeadline(start.Add(mgr.maxRuntime)); err != nil {
 | |
| 		return err
 | |
| 	}
 | |
| 	mgr.conn.SetReadLimit(mgr.maxMessageSize)
 | |
| 	ticker := time.NewTicker(mgr.measureInterval)
 | |
| 	defer ticker.Stop()
 | |
| 	for ctx.Err() == nil {
 | |
| 		kind, reader, err := mgr.conn.NextReader()
 | |
| 		if err != nil {
 | |
| 			return err
 | |
| 		}
 | |
| 		if kind == websocket.TextMessage {
 | |
| 			data, err := iox.ReadAllContext(ctx, reader)
 | |
| 			if err != nil {
 | |
| 				return err
 | |
| 			}
 | |
| 			total += int64(len(data))
 | |
| 			if err := mgr.onJSON(data); err != nil {
 | |
| 				return err
 | |
| 			}
 | |
| 			continue
 | |
| 		}
 | |
| 		n, err := iox.CopyContext(ctx, io.Discard, reader)
 | |
| 		if err != nil {
 | |
| 			return err
 | |
| 		}
 | |
| 		total += int64(n)
 | |
| 		select {
 | |
| 		case now := <-ticker.C:
 | |
| 			mgr.onPerformance(now.Sub(start), total)
 | |
| 		default:
 | |
| 			// NOTHING
 | |
| 		}
 | |
| 	}
 | |
| 	return nil
 | |
| }
 |