Add Wait method to detect underlying SFTP connection closed

wutz · wutz · commit fbf9e05c668e · 2018-12-03T17:46:45.000+08:00
Closes pkg#278
diff --git a/client.go b/client.go
@@ -122,6 +122,7 @@ func NewClientPipe(rd io.Reader, wr io.WriteCloser, opts ...ClientOption) (*Clie
 				WriteCloser: wr,
 			},
 			inflight: make(map[uint32]chan<- result),
+			errCh:    make(chan error, 1),
 		},
 		maxPacket:             1 << 15,
 		maxConcurrentRequests: 64,
diff --git a/conn.go b/conn.go
@@ -36,6 +36,13 @@ type clientConn struct {
 	wg         sync.WaitGroup
 	sync.Mutex                          // protects inflight
 	inflight   map[uint32]chan<- result // outstanding requests
+	errCh      chan error
+}
+
+// Wait blocks until the conn has shut down, and return the error
+// causing the shutdown.
+func (c *clientConn) Wait() error {
+	return <-c.errCh
 }
 
 // Close closes the SFTP session.
@@ -49,6 +56,7 @@ func (c *clientConn) loop() {
 	err := c.recv()
 	if err != nil {
 		c.broadcastErr(err)
+		c.errCh <- err
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,13 @@ type clientConn struct {`
`36`	`36`	`wg sync.WaitGroup`
`37`	`37`	`sync.Mutex // protects inflight`
`38`	`38`	`inflight map[uint32]chan<- result // outstanding requests`
	`39`	`+ errCh chan error`
	`40`	`+}`
	`41`	`+`
	`42`	`+// Wait blocks until the conn has shut down, and return the error`
	`43`	`+// causing the shutdown.`
	`44`	`+func (c *clientConn) Wait() error {`
	`45`	`+ return <-c.errCh`
`39`	`46`	`}`
`40`	`47`
`41`	`48`	`// Close closes the SFTP session.`
`@@ -49,6 +56,7 @@ func (c *clientConn) loop() {`
`49`	`56`	`err := c.recv()`
`50`	`57`	`if err != nil {`
`51`	`58`	`c.broadcastErr(err)`
	`59`	`+ c.errCh <- err`
`52`	`60`	`}`
`53`	`61`	`}`
`54`	`62`