From feb87e717ed041dc39fc871402b1beb861da931c Mon Sep 17 00:00:00 2001
From: Todd <github@quaddi.com>
Date: Fri, 21 Apr 2023 14:26:56 -0700
Subject: [PATCH] Add Closed error code and rename recorder cache to manager

---
 internal/daemon/worker/handler.go |  2 +-
 internal/daemon/worker/worker.go  | 20 ++++++++++++--------
 internal/errors/code.go           |  1 +
 internal/errors/code_test.go      |  5 +++++
 internal/errors/info.go           |  4 ++++
 5 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/internal/daemon/worker/handler.go b/internal/daemon/worker/handler.go
index e0d0af984f..de3ef4829e 100644
--- a/internal/daemon/worker/handler.go
+++ b/internal/daemon/worker/handler.go
@@ -294,7 +294,7 @@ func (w *Worker) handleProxy(listenerCfg *listenerutil.ListenerConfig, sessionMa
 			conn.Close(proxyHandlers.WebsocketStatusProtocolSetupError, "error getting decryption function")
 			event.WriteError(ctx, op, err)
 		}
-		runProxy, err := handleProxyFn(ctx, decryptFn, cc, pDialer, acResp.GetConnectionId(), protocolCtx, w.recorderCache)
+		runProxy, err := handleProxyFn(ctx, decryptFn, cc, pDialer, acResp.GetConnectionId(), protocolCtx, w.recorderManager)
 		if err != nil {
 			conn.Close(proxyHandlers.WebsocketStatusProtocolSetupError, "unable to setup proxying")
 			event.WriteError(ctx, op, err)
diff --git a/internal/daemon/worker/worker.go b/internal/daemon/worker/worker.go
index 3a50f167d1..1d2ca0a20f 100644
--- a/internal/daemon/worker/worker.go
+++ b/internal/daemon/worker/worker.go
@@ -75,9 +75,9 @@ type downstreamers interface {
 	RootId() string
 }
 
-// recorderCache updates the status updates with relevant recording
+// recorderManager updates the status updates with relevant recording
 // information
-type recorderCache any
+type recorderManager any
 
 // reverseConnReceiverFactory provides a simple factory which a Worker can use to
 // create its reverseConnReceiver
@@ -85,7 +85,7 @@ var reverseConnReceiverFactory func() reverseConnReceiver
 
 var recordingStorageFactory func(ctx context.Context, path string, plgClients map[string]plgpb.StoragePluginServiceClient, enableLoopback bool) (storage.RecordingStorage, error)
 
-var recorderCacheFactory func() recorderCache
+var recorderManagerFactory func(*Worker) (recorderManager, error)
 
 var initializeReverseGrpcClientCollectors = noopInitializePromCollectors
 
@@ -117,7 +117,7 @@ type Worker struct {
 
 	sessionManager session.Manager
 
-	recorderCache recorderCache
+	recorderManager recorderManager
 
 	controllerStatusConn *atomic.Value
 	everAuthenticated    *ua.Uint32
@@ -204,10 +204,6 @@ func New(ctx context.Context, conf *Config) (*Worker, error) {
 		w.downstreamReceiver = reverseConnReceiverFactory()
 	}
 
-	if recorderCacheFactory != nil {
-		w.recorderCache = recorderCacheFactory()
-	}
-
 	w.lastStatusSuccess.Store((*LastStatusInformation)(nil))
 	scheme := strconv.FormatInt(time.Now().UnixNano(), 36)
 	controllerResolver := manual.NewBuilderWithScheme(scheme)
@@ -291,6 +287,14 @@ func New(ctx context.Context, conf *Config) (*Worker, error) {
 	// FIXME: This is really ugly, but works.
 	session.CloseCallTimeout = w.statusCallTimeoutDuration
 
+	if recorderManagerFactory != nil {
+		var err error
+		w.recorderManager, err = recorderManagerFactory(w)
+		if err != nil {
+			return nil, fmt.Errorf("error calling recorderManagerFactory: %w", err)
+		}
+	}
+
 	var listenerCount int
 	for i := range conf.Listeners {
 		l := conf.Listeners[i]
diff --git a/internal/errors/code.go b/internal/errors/code.go
index bf7f53a511..e4918ae7da 100644
--- a/internal/errors/code.go
+++ b/internal/errors/code.go
@@ -64,6 +64,7 @@ const (
 	StorageContainerWriteOnly = 132 // StorageContainerWriteOnly represents an error when a container is write only and a read operation is attempted on it
 
 	WorkerNotFoundForRequest = 133 // WorkerNotFoundForRequest represents an error when no appropriate worker is found which meets the conditions required to handle a request
+	Closed                   = 134 // Closed represents an error when an operation cannot be completed because the thing being operated on is closed
 
 	AuthAttemptExpired Code = 198 // AuthAttemptExpired represents an expired authentication attempt
 	AuthMethodInactive Code = 199 // AuthMethodInactive represents an error that means the auth method is not active.
diff --git a/internal/errors/code_test.go b/internal/errors/code_test.go
index 3c3e75f368..ab026223f5 100644
--- a/internal/errors/code_test.go
+++ b/internal/errors/code_test.go
@@ -395,6 +395,11 @@ func TestCode_Both_String_Info(t *testing.T) {
 			c:    WorkerNotFoundForRequest,
 			want: WorkerNotFoundForRequest,
 		},
+		{
+			name: "Closed",
+			c:    Closed,
+			want: Closed,
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
diff --git a/internal/errors/info.go b/internal/errors/info.go
index b5f7bab95b..652f05af33 100644
--- a/internal/errors/info.go
+++ b/internal/errors/info.go
@@ -331,4 +331,8 @@ var errorCodeInfo = map[Code]Info{
 		Message: "container is write only",
 		Kind:    State,
 	},
+	Closed: {
+		Message: "closed",
+		Kind:    State,
+	},
 }