Skip to content

Conversation

cnlangzi
Copy link
Member

@cnlangzi cnlangzi commented Mar 12, 2025

Changed

Fixed

  • fix(sse): added id, retry and comment support in Event's payload

Added

  • feat(sse): added EventReader to read and parse Event
  • feat(sse): added PingEvent

Tests

Tasks to complete before merging PR:

  • Ensure unit tests are passing. If not run make unit-tests to check for any regressions 📋
  • Ensure lint tests are passing. if not run make lint to check for any issues
  • Ensure codecov/patch is passing for changes.

Summary by Sourcery

Adds an EventReader to parse SSE events and updates the event payload to include ID, retry, and comment support.

New Features:

  • Introduces an EventReader to read and parse SSE events from a stream.
  • Updates the event payload to include ID, retry, and comment support in the Event's payload, enhancing the flexibility and information carried by SSE events.

Tests:

  • Adds tests for the new EventReader, covering various scenarios including different event types and payload configurations.

Summary by Sourcery

Adds an EventReader to parse SSE events and updates the event payload to include ID, retry, and comment support.

New Features:

  • Introduces an EventReader to read and parse SSE events from a stream.
  • Adds PingEvent to send ping events to the client.
  • Updates the event payload to include ID, retry, and comment support in the Event's payload, enhancing the flexibility and information carried by SSE events.

Tests:

  • Adds tests for the new EventReader, covering various scenarios including different event types and payload configurations.

Copy link

sourcery-ai bot commented Mar 12, 2025

Reviewer's Guide by Sourcery

This pull request introduces an EventReader for parsing SSE events, updates the event payload to include ID, retry, and comment support, and includes a PingEvent. The server tests have been updated to use the new EventReader and validate the new event payload fields. The Client struct has been renamed to Conn.

Sequence diagram for Server Join

sequenceDiagram
    participant HTTP Request
    participant Server
    participant Conn
    participant Streamer

    HTTP Request->>Server: Join(ctx, id, rw)
    Server->>Streamer: NewStreamer(rw)
    Streamer-->>Server: sm
    alt Conn exists
        Server->>Conn: Connect(ctx, sm)
    else Conn does not exist
        Server->>Conn: Create Conn(id)
        Server->>Conn: Connect(ctx, sm)
    end
    Conn-->>Server: c
    Server-->>HTTP Request: c, nil
Loading

Sequence diagram for Server Broadcast

sequenceDiagram
    participant Server
    participant Conn

    Server->>Server: Lock()
    loop for each Conn
        Server->>Conn: Send(event)
        alt error
            Conn-->>Server: error
        end
    end
    Server->>Server: Unlock()
Loading

Updated class diagram for SSE events

classDiagram
    class Event {
        <<interface>>
        Write(w io.Writer) error
    }
    class TextEvent {
        ID string
        Name string
        Retry int
        Data string
        Write(w io.Writer) error
    }
    class JsonEvent {
        ID string
        Name string
        Retry int
        Data any
        Write(w io.Writer) error
    }
    class PingEvent {
        Write(w io.Writer) error
    }

    Event <|-- TextEvent
    Event <|-- JsonEvent
    Event <|-- PingEvent
Loading

Updated class diagram for Server and Conn

classDiagram
    class Server {
        -conns map[string]*Conn
        +Join(ctx context.Context, id string, rw http.ResponseWriter) (*Conn, error)
        +Leave(id string)
        +Get(id string) *Conn
        +Broadcast(ctx context.Context, event Event) ([]error, error)
        +Shutdown()
    }
    class Conn {
        -ID string
        -s Streamer
        -ctx context.Context
        -cancel context.CancelFunc
        +Connect(ctx context.Context, s Streamer)
        +Send(event Event) error
        +Wait()
        +Close()
    }

    Server o-- Conn : contains
Loading

Class diagram for EventReader

classDiagram
    class EventReader {
        -r io.Reader
        +Next() (TextEvent, error)
    }
Loading

File-Level Changes

Change Details Files
Introduced EventReader to parse SSE events from a stream.
  • Added EventReader struct with a Next method to read and parse events.
  • Implemented parsing logic within Next to extract event ID, name, retry, and data.
  • Utilized bufio.NewReader for efficient reading of the stream.
  • Handled different event attributes based on line prefixes (id, event, retry, data).
  • Included logic to handle multi-line data fields.
  • Added a new reader.go file.
ext/sse/reader.go
Updated event payload to include ID, retry, and comment support.
  • Modified TextEvent and JsonEvent structs to include ID and Retry fields.
  • Updated the Write methods for TextEvent and JsonEvent to include ID and Retry in the output.
  • Added PingEvent struct.
  • Implemented Write method for PingEvent.
  • Added sync.Pool for bytes.Buffer and strings.Builder to reduce allocations.
  • Added support for comments in the event stream (lines starting with ':').
ext/sse/event.go
Updated server tests to use EventReader and validate new event payload fields.
  • Modified tests to use NewReader to read events from the response body.
  • Added assertions to check the ID, Name, Retry, and Data fields of the parsed events.
  • Added tests for PingEvent.
  • Refactored tests to accommodate the new event format and reader.
  • Updated tests to handle compressed responses (gzip, deflate) correctly with the new EventReader.
ext/sse/server_test.go
Renamed Client to Conn.
  • Renamed Client struct to Conn.
  • Renamed clients map to conns in Server struct.
  • Updated all references to Client to Conn.
ext/sse/server.go
ext/sse/conn.go

Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!
  • Generate a plan of action for an issue: Comment @sourcery-ai plan on
    an issue to generate a plan of action for it.

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

Copy link

deepsource-io bot commented Mar 12, 2025

Here's the code health analysis summary for commits 453ac18..29a934a. View details on DeepSource ↗.

Analysis Summary

AnalyzerStatusSummaryLink
DeepSource Go LogoGo✅ SuccessView Check ↗

💡 If you’re a repository administrator, you can configure the quality gates from the settings.

Copy link

@sourcery-ai sourcery-ai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey @cnlangzi - I've reviewed your changes - here's some feedback:

Overall Comments:

  • Consider renaming Client to Conn to better reflect its role as a connection rather than a client in the traditional sense.
  • The EventReader might benefit from a configurable buffer size to optimize reading from the underlying io.Reader.
Here's what I looked at during the review
  • 🟢 General issues: all looks good
  • 🟢 Security: all looks good
  • 🟢 Testing: all looks good
  • 🟢 Complexity: all looks good
  • 🟢 Documentation: all looks good

Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

Copy link

codecov bot commented Mar 12, 2025

Codecov Report

Attention: Patch coverage is 95.34884% with 6 lines in your changes missing coverage. Please review.

Project coverage is 91.20%. Comparing base (453ac18) to head (29a934a).
Report is 1 commits behind head on main.

Files with missing lines Patch % Lines
ext/sse/reader.go 86.04% 4 Missing and 2 partials ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main      #63      +/-   ##
==========================================
+ Coverage   91.09%   91.20%   +0.10%     
==========================================
  Files          61       62       +1     
  Lines        2437     2535      +98     
==========================================
+ Hits         2220     2312      +92     
- Misses        188      192       +4     
- Partials       29       31       +2     
Flag Coverage Δ
Unit-Tests 91.20% <95.34%> (+0.10%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@cnlangzi cnlangzi changed the title feat(sse): updated event payload and added EventReader feat(sse): updated event payload and added EventReader/PingEvent Mar 12, 2025
@cnlangzi
Copy link
Member Author

@sourcery-ai review

Copy link

@sourcery-ai sourcery-ai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey @cnlangzi - I've reviewed your changes - here's some feedback:

Overall Comments:

  • Consider renaming Client to Conn to better reflect its role as a connection rather than a client in the traditional sense.
  • The bufPool and sbPool should probably be defined closer to where they are used.
Here's what I looked at during the review
  • 🟢 General issues: all looks good
  • 🟢 Security: all looks good
  • 🟢 Testing: all looks good
  • 🟢 Complexity: all looks good
  • 🟢 Documentation: all looks good

Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

@cnlangzi cnlangzi merged commit b4440d5 into main Mar 12, 2025
8 checks passed
@cnlangzi cnlangzi deleted the fix/sse_event_message branch March 12, 2025 14:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant