Skip to content

wait for isReady instead of erroring #142

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ckhsponge wants to merge 1 commit into
base: master
Choose a base branch
from
Open

wait for isReady instead of erroring #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 31 additions & 7 deletions pkg/handler/channels.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"fmt"
"sort"
"strings"
"time"

"github.com/gocarina/gocsv"
"github.com/korotovsky/slack-mcp-server/pkg/provider"
Expand Down Expand Up @@ -52,11 +53,21 @@ func (ch *ChannelsHandler) ChannelsResource(ctx context.Context, request mcp.Rea
return nil, err
}

var channelList []Channel
// wait for provider readiness
ctx, cancel := context.WithTimeout(ctx, 30*time.Second)
defer cancel()

if ready, err := ch.apiProvider.IsReady(); !ready {
ch.logger.Error("API provider not ready", zap.Error(err))
return nil, err
for {
if ready, _ := ch.apiProvider.IsReady(); ready {
break
}
select {
case <-ctx.Done():
ch.logger.Error("Timeout waiting for API provider to be ready")
return nil, ctx.Err()
case <-time.After(100 * time.Millisecond):
ch.logger.Debug("continue waiting")
}
}

ar, err := ch.apiProvider.Slack().AuthTest()
Expand All @@ -77,6 +88,7 @@ func (ch *ChannelsHandler) ChannelsResource(ctx context.Context, request mcp.Rea
channels := ch.apiProvider.ProvideChannelsMaps().Channels
ch.logger.Debug("Retrieved channels from provider", zap.Int("count", len(channels)))

var channelList []Channel
for _, channel := range channels {
channelList = append(channelList, Channel{
ID: channel.ID,
Expand Down Expand Up @@ -105,9 +117,21 @@ func (ch *ChannelsHandler) ChannelsResource(ctx context.Context, request mcp.Rea
func (ch *ChannelsHandler) ChannelsHandler(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
ch.logger.Debug("ChannelsHandler called")

if ready, err := ch.apiProvider.IsReady(); !ready {
ch.logger.Error("API provider not ready", zap.Error(err))
return nil, err
// wait for provider readiness
ctx, cancel := context.WithTimeout(ctx, 30*time.Second)
defer cancel()

for {
if ready, _ := ch.apiProvider.IsReady(); ready {
break
}
select {
case <-ctx.Done():
ch.logger.Error("Timeout waiting for API provider to be ready")
return nil, ctx.Err()
case <-time.After(100 * time.Millisecond):
ch.logger.Debug("continue waiting")
}
}

sortType := request.GetString("sort", "popularity")
Expand Down
19 changes: 15 additions & 4 deletions pkg/handler/conversations.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,21 @@ func (ch *ConversationsHandler) UsersResource(ctx context.Context, request mcp.R
return nil, err
}

// provider readiness
if ready, err := ch.apiProvider.IsReady(); !ready {
ch.logger.Error("API provider not ready", zap.Error(err))
return nil, err
// wait for provider readiness
ctx, cancel := context.WithTimeout(ctx, 30*time.Second)
defer cancel()

for {
if ready, _ := ch.apiProvider.IsReady(); ready {
break
}
select {
case <-ctx.Done():
ch.logger.Error("Timeout waiting for API provider to be ready")
return nil, ctx.Err()
case <-time.After(100 * time.Millisecond):
ch.logger.Debug("continue waiting")
}
}

// Slack auth test
Expand Down