Merge branch 'master' of ssh://github.com/rogchap/wombat

.github/workflows/package.yml

@@ -174,4 +174,3 @@ jobs:
         asset_path: Wombat_${{ steps.version.outputs.tag }}_Windows_x86_64.zip/Wombat_${{ steps.version.outputs.tag }}_Windows_x86_64.zip
         asset_name: Wombat_${{ steps.version.outputs.tag }}_Windows_x86_64.zip
         asset_content_type: application/octet-stream
-

CHANGELOG.md

@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 - Support export/import request to/from grpcurl command. Thanks to [@devkanro](https://github.com/devkanro) & [@iou90](https://github.com/iou90)
+- Immediately retry a disconnected grpc connection before attempting to send a request. Thanks to [@aschey](https://github.com/aschey) 
 
 ### Fixed
 - Update dependencies to fix an issue with newer versions of webkit2gtk. Thanks to [@aschey](https://github.com/aschey)

internal/app/api.go

@@ -709,6 +709,19 @@ func fieldViewsFromDesc(fds protoreflect.FieldDescriptors, isOneof bool, cd *cyc
 	return fields, nil
 }
 
+func (a *api) RetryConnection() {
+	state := a.client.conn.GetState()
+	if state == connectivity.TransientFailure || state == connectivity.Shutdown {
+		// State is currently disconnected. Do a quick retry in case the server restarted recently.
+		a.client.conn.ResetConnectBackoff()
+		stateChanged := make(chan bool)
+		waitForStateChange := func(data ...interface{}) { stateChanged <- true }
+		a.runtime.Events.Once(eventClientStateChanged, waitForStateChange)
+		// Wait for at least one retry to complete before continuing
+		<-stateChanged
+	}
+}
+
 func (a *api) Send(method string, rawJSON []byte, rawHeaders interface{}) (rerr error) {
 	defer func() {
 		if rerr != nil {
@@ -718,6 +731,8 @@ func (a *api) Send(method string, rawJSON []byte, rawHeaders interface{}) (rerr
 		}
 	}()
 
+	a.RetryConnection()
+
 	md, err := a.getMethodDesc(method)
 	if err != nil {
 		return err
@@ -1033,8 +1048,8 @@ func (a *api) ImportCommand(kind string, command string) (rerr error) {
 			return err
 		}
 
-		return a.emitServicesSelect("/" + args.Method, args.Data, args.Metadata)
+		return a.emitServicesSelect("/"+args.Method, args.Data, args.Metadata)
 	}
 
 	return nil
-}
+}