websocket: return error from configured URL lookup

Author: thrasher-

exchange/websocket/manager.go

@@ -878,9 +878,9 @@ func (m *Manager) GetWebsocketURL() string {
 }
 
 // GetConfiguredWebsocketURLs returns known websocket connection URLs.
-func (m *Manager) GetConfiguredWebsocketURLs() []string {
+func (m *Manager) GetConfiguredWebsocketURLs() ([]string, error) {
 	if m == nil {
-		return nil
+		return nil, fmt.Errorf("%w: Manager", common.ErrNilPointer)
 	}
 
 	m.m.Lock()
@@ -901,16 +901,16 @@ func (m *Manager) GetConfiguredWebsocketURLs() []string {
 			seen[ws.setup.URL] = struct{}{}
 			urls = append(urls, ws.setup.URL)
 		}
-		return urls
+		return urls, nil
 	}
 
 	if m.runningURL != "" {
-		return []string{m.runningURL}
+		return []string{m.runningURL}, nil
 	}
 	if m.defaultURL != "" {
-		return []string{m.defaultURL}
+		return []string{m.defaultURL}, nil
 	}
-	return nil
+	return nil, nil
 }
 
 // SetProxyAddress sets websocket proxy address

exchange/websocket/manager_test.go

@@ -1212,18 +1212,26 @@ func TestGetConfiguredWebsocketURLs(t *testing.T) {
 	t.Parallel()
 
 	var nilManager *Manager
-	assert.Nil(t, nilManager.GetConfiguredWebsocketURLs())
+	urls, err := nilManager.GetConfiguredWebsocketURLs()
+	assert.ErrorIs(t, err, common.ErrNilPointer)
+	assert.Nil(t, urls)
 
 	single := NewManager()
 	require.NoError(t, single.Setup(newDefaultSetup()))
 	single.runningURL = "wss://single-running"
-	assert.Equal(t, []string{"wss://single-running"}, single.GetConfiguredWebsocketURLs())
+	urls, err = single.GetConfiguredWebsocketURLs()
+	require.NoError(t, err)
+	assert.Equal(t, []string{"wss://single-running"}, urls)
 
 	single.runningURL = ""
-	assert.Equal(t, []string{single.defaultURL}, single.GetConfiguredWebsocketURLs())
+	urls, err = single.GetConfiguredWebsocketURLs()
+	require.NoError(t, err)
+	assert.Equal(t, []string{single.defaultURL}, urls)
 
 	single.defaultURL = ""
-	assert.Nil(t, single.GetConfiguredWebsocketURLs(), "Configured websocket URLs should be nil when no URLs are set")
+	urls, err = single.GetConfiguredWebsocketURLs()
+	require.NoError(t, err)
+	assert.Nil(t, urls, "Configured websocket URLs should be nil when no URLs are set")
 
 	multi := NewManager()
 	setup := newDefaultSetup()
@@ -1252,7 +1260,8 @@ func TestGetConfiguredWebsocketURLs(t *testing.T) {
 	}
 	require.NoError(t, multi.SetupNewConnection(connSetupTwo))
 
-	urls := multi.GetConfiguredWebsocketURLs()
+	urls, err = multi.GetConfiguredWebsocketURLs()
+	require.NoError(t, err)
 	assert.ElementsMatch(t, []string{"wss://one.example/ws", "wss://two.example/ws"}, urls)
 }
 

exchanges/exchange.go

@@ -1801,7 +1801,10 @@ func Bootstrap(ctx context.Context, b IBotExchange) error {
 			if w, err := b.GetWebsocket(); err == nil {
 				wsURL = w.GetWebsocketURL()
 				if wsURL == "" {
-					wsURL = strings.Join(w.GetConfiguredWebsocketURLs(), ",")
+					urls, getErr := w.GetConfiguredWebsocketURLs()
+					if getErr == nil {
+						wsURL = strings.Join(urls, ",")
+					}
 				}
 				wsEnabled = w.IsEnabled()
 			}