Skip to content
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.

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

Add support for Server-Sent Events #2088

Merged
merged 18 commits into from
Jul 31, 2024
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
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
6 changes: 3 additions & 3 deletions ballerina-tests/http-advanced-tests/Ballerina.toml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
[package]
org = "ballerina"
name = "http_advanced_tests"
version = "2.11.2"
version = "2.11.3"

[[dependency]]
org = "ballerina"
name = "http_test_common"
repository = "local"
version = "2.11.2"
version = "2.11.3"

[platform.java17]
graalvmCompatible = true

[[platform.java17.dependency]]
scope = "testOnly"
path = "../../test-utils/build/libs/http-test-utils-2.11.2.jar"
path = "../../test-utils/build/libs/http-test-utils-2.11.3-SNAPSHOT.jar"
10 changes: 5 additions & 5 deletions ballerina-tests/http-advanced-tests/Dependencies.toml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ modules = [
[[package]]
org = "ballerina"
name = "http"
version = "2.11.2"
version = "2.11.3"
scope = "testOnly"
dependencies = [
{org = "ballerina", name = "auth"},
Expand Down Expand Up @@ -105,7 +105,7 @@ modules = [
[[package]]
org = "ballerina"
name = "http_advanced_tests"
version = "2.11.2"
version = "2.11.3"
dependencies = [
{org = "ballerina", name = "crypto"},
{org = "ballerina", name = "file"},
Expand All @@ -125,7 +125,7 @@ modules = [
[[package]]
org = "ballerina"
name = "http_test_common"
version = "2.11.2"
version = "2.11.3"
scope = "testOnly"
dependencies = [
{org = "ballerina", name = "lang.string"},
Expand Down Expand Up @@ -160,7 +160,7 @@ scope = "testOnly"
[[package]]
org = "ballerina"
name = "jwt"
version = "2.11.0"
version = "2.12.1"
scope = "testOnly"
dependencies = [
{org = "ballerina", name = "cache"},
Expand Down Expand Up @@ -285,7 +285,7 @@ dependencies = [
[[package]]
org = "ballerina"
name = "mime"
version = "2.9.0"
version = "2.10.0"
scope = "testOnly"
dependencies = [
{org = "ballerina", name = "io"},
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,153 @@
// Copyright (c) 2024 WSO2 LLC. (https://www.wso2.com).
//
// WSO2 LLC. licenses this file to you under the Apache License,
// Version 2.0 (the "License"); you may not use this file except
// in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
// software distributed under the License is distributed on an
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.

import ballerina/http;
import ballerina/lang.runtime;
import ballerina/test;

listener http:Listener http1SseListener = new http:Listener(http1SsePort, httpVersion = http:HTTP_1_1);
listener http:Listener http2SseListener = new http:Listener(http2SsePort, httpVersion = http:HTTP_2_0);
TharmiganK marked this conversation as resolved.
Show resolved Hide resolved
final http:Client http1SseClient = check new (string `http://localhost:${http1SsePort}`, httpVersion = http:HTTP_1_1);
final http:Client http2SseClient = check new (string `http://localhost:${http2SsePort}`, httpVersion = http:HTTP_2_0);
TharmiganK marked this conversation as resolved.
Show resolved Hide resolved

class SseEventGenerator {
private final int eventCount;
private boolean completeWithError;
private int currentEventCount = 0;

function init(int eventCount = 10, boolean completeWithError = false) {
self.eventCount = eventCount;
self.completeWithError = completeWithError;
}

public isolated function next() returns record {|http:SseEvent value;|}|error? {
runtime:sleep(0.1);
http:SseEvent sseEvent = {data: string `count: ${self.currentEventCount}`, id: self.currentEventCount.toString()};
if self.currentEventCount == 0 {
sseEvent.event = "start";
} else if self.currentEventCount == self.eventCount {
sseEvent.event = "end";
} else {
sseEvent.event = "continue";
sseEvent.'retry = 10;
}
if self.currentEventCount > self.eventCount {
return self.completeWithError ? error("Ending with error") : ();
}
self.currentEventCount += 1;
return {value: sseEvent};
}
}

service /sse on http1SseListener {
resource function 'default [string... paths](http:Request req) returns stream<http:SseEvent, error?> {
stream<http:SseEvent, error?> sseEventStream = new (new SseEventGenerator());
return sseEventStream;
TharmiganK marked this conversation as resolved.
Show resolved Hide resolved
}
}

service /sse on http2SseListener {
resource function post .(http:Request req) returns http:Response {
http:Response response = new;
stream<http:SseEvent, error?> sseEventStream = new (new SseEventGenerator());
response.setSseEventStream(sseEventStream);
return response;
}

resource function get completeWithError() returns stream<http:SseEvent, error?> {
stream<http:SseEvent, error?> sseEventStream = new (new SseEventGenerator(3, true));
return sseEventStream;
TharmiganK marked this conversation as resolved.
Show resolved Hide resolved
}
}

@test:Config {}
function testHttp1ResponseHeadersForSseEventStream() returns error? {
http:Response response = check http1SseClient->/sse;
test:assertEquals(response.getHeader("Connection"), "keep-alive");
test:assertEquals(response.getHeader("Content-Type"), "text/event-stream");
test:assertEquals(response.getHeader("Transfer-Encoding"), "chunked");
test:assertTrue((check response.getHeader("Cache-Control")).startsWith("no-cache"));
stream<http:SseEvent, error?> actualSseEvents = check response.getSseEventStream();
stream<http:SseEvent, error?> expectedSseEvents = new (new SseEventGenerator());
check assertEventStream(actualSseEvents, expectedSseEvents);
}

@test:Config {}
function testHttp2ResponseHeadersForSseEventStream() returns error? {
http:Response response = check http2SseClient->/sse.post({});
test:assertTrue(response.getHeader("Connection") is http:HeaderNotFoundError);
test:assertEquals(response.getHeader("Content-Type"), "text/event-stream");
test:assertTrue((check response.getHeader("Cache-Control")).startsWith("no-cache"));
stream<http:SseEvent, error?> actualSseEvents = check response.getSseEventStream();
stream<http:SseEvent, error?> expectedSseEvents = new (new SseEventGenerator());
check assertEventStream(actualSseEvents, expectedSseEvents);
}

@test:Config {}
function testClientDataBindingForSseEventStream() returns error? {
stream<http:SseEvent, error?> actualSseEvents = check http1SseClient->/sse;
stream<http:SseEvent, error?> expectedSseEvents = new (new SseEventGenerator());
check assertEventStream(actualSseEvents, expectedSseEvents);
}

@test:Config {}
function testClientRequestMethodsWithStreamType() returns error? {
stream<http:SseEvent, error?> actualSseEvents = check http1SseClient->/sse;
stream<http:SseEvent, error?> expectedSseEvents = new (new SseEventGenerator());
check assertEventStream(actualSseEvents, expectedSseEvents);

actualSseEvents = check http1SseClient->/sse.delete();
expectedSseEvents = new (new SseEventGenerator());
check assertEventStream(actualSseEvents, expectedSseEvents);

actualSseEvents = check http1SseClient->/sse.options();
expectedSseEvents = new (new SseEventGenerator());
check assertEventStream(actualSseEvents, expectedSseEvents);

actualSseEvents = check http1SseClient->/sse.post({});
expectedSseEvents = new (new SseEventGenerator());
check assertEventStream(actualSseEvents, expectedSseEvents);

actualSseEvents = check http1SseClient->/sse.put({});
expectedSseEvents = new (new SseEventGenerator());
check assertEventStream(actualSseEvents, expectedSseEvents);

actualSseEvents = check http1SseClient->/sse.patch({});
expectedSseEvents = new (new SseEventGenerator());
check assertEventStream(actualSseEvents, expectedSseEvents);
}

@test:Config {}
function testServiceCompletesStreamWithErrorEvent() returns error? {
stream<http:SseEvent, error?> actualSseEvents = check http2SseClient->/sse/completeWithError;
stream<http:SseEvent, error?> expectedSseEvents = new (new SseEventGenerator(3, true));
check assertEventStream(actualSseEvents, expectedSseEvents);
}

function assertEventStream(stream<http:SseEvent, error?> actualSseEvents, stream<http:SseEvent, error?> expectedSseEvents) returns error? {
TharmiganK marked this conversation as resolved.
Show resolved Hide resolved
error? err = from http:SseEvent expectedEvent in expectedSseEvents
do {
record {|http:SseEvent value;|}? valueRecord = check actualSseEvents.next();
http:SseEvent? actualEvent = valueRecord !is () ? valueRecord.value : valueRecord;
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
http:SseEvent? actualEvent = valueRecord !is () ? valueRecord.value : valueRecord;
http:SseEvent? actualEvent = valueRecord?.value;

test:assertEquals(actualEvent, expectedEvent);
};
if err is error {
http:SseEvent expectedEvent = {event: "error", data: err.message()};
record {|http:SseEvent value;|}? valueRecord = check actualSseEvents.next();
http:SseEvent? actualEvent = valueRecord !is () ? valueRecord.value : valueRecord;
test:assertEquals(actualEvent, expectedEvent);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,5 @@ const int statusCodeErrorUseCasePort = 9090;
const int statusCodeErrorPort = 9092;

const int identicalCookiePort = 9093;
const int http1SsePort = 9094;
const int http2SsePort = 9095;
6 changes: 3 additions & 3 deletions ballerina-tests/http-client-tests/Ballerina.toml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
[package]
org = "ballerina"
name = "http_client_tests"
version = "2.11.2"
version = "2.11.3"
MohamedSabthar marked this conversation as resolved.
Show resolved Hide resolved

[[dependency]]
org = "ballerina"
name = "http_test_common"
repository = "local"
version = "2.11.2"
version = "2.11.3"

[platform.java17]
graalvmCompatible = true

[[platform.java17.dependency]]
scope = "testOnly"
path = "../../test-utils/build/libs/http-test-utils-2.11.2.jar"
path = "../../test-utils/build/libs/http-test-utils-2.11.3-SNAPSHOT.jar"
10 changes: 5 additions & 5 deletions ballerina-tests/http-client-tests/Dependencies.toml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ dependencies = [
[[package]]
org = "ballerina"
name = "http"
version = "2.11.2"
version = "2.11.3"
scope = "testOnly"
dependencies = [
{org = "ballerina", name = "auth"},
Expand Down Expand Up @@ -102,7 +102,7 @@ modules = [
[[package]]
org = "ballerina"
name = "http_client_tests"
version = "2.11.2"
version = "2.11.3"
dependencies = [
{org = "ballerina", name = "constraint"},
{org = "ballerina", name = "http"},
Expand All @@ -121,7 +121,7 @@ modules = [
[[package]]
org = "ballerina"
name = "http_test_common"
version = "2.11.2"
version = "2.11.3"
scope = "testOnly"
dependencies = [
{org = "ballerina", name = "lang.string"},
Expand Down Expand Up @@ -156,7 +156,7 @@ scope = "testOnly"
[[package]]
org = "ballerina"
name = "jwt"
version = "2.11.0"
version = "2.12.1"
scope = "testOnly"
dependencies = [
{org = "ballerina", name = "cache"},
Expand Down Expand Up @@ -281,7 +281,7 @@ dependencies = [
[[package]]
org = "ballerina"
name = "mime"
version = "2.9.0"
version = "2.10.0"
scope = "testOnly"
dependencies = [
{org = "ballerina", name = "io"},
Expand Down
6 changes: 3 additions & 3 deletions ballerina-tests/http-dispatching-tests/Ballerina.toml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
[package]
org = "ballerina"
name = "http_dispatching_tests"
version = "2.11.2"
version = "2.11.3"

[[dependency]]
org = "ballerina"
name = "http_test_common"
repository = "local"
version = "2.11.2"
version = "2.11.3"

[platform.java17]
graalvmCompatible = true

[[platform.java17.dependency]]
scope = "testOnly"
path = "../../test-utils/build/libs/http-test-utils-2.11.2.jar"
path = "../../test-utils/build/libs/http-test-utils-2.11.3-SNAPSHOT.jar"
10 changes: 5 additions & 5 deletions ballerina-tests/http-dispatching-tests/Dependencies.toml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ dependencies = [
[[package]]
org = "ballerina"
name = "http"
version = "2.11.2"
version = "2.11.3"
scope = "testOnly"
dependencies = [
{org = "ballerina", name = "auth"},
Expand Down Expand Up @@ -102,7 +102,7 @@ modules = [
[[package]]
org = "ballerina"
name = "http_dispatching_tests"
version = "2.11.2"
version = "2.11.3"
dependencies = [
{org = "ballerina", name = "constraint"},
{org = "ballerina", name = "http"},
Expand All @@ -124,7 +124,7 @@ modules = [
[[package]]
org = "ballerina"
name = "http_test_common"
version = "2.11.2"
version = "2.11.3"
scope = "testOnly"
dependencies = [
{org = "ballerina", name = "lang.string"},
Expand Down Expand Up @@ -159,7 +159,7 @@ scope = "testOnly"
[[package]]
org = "ballerina"
name = "jwt"
version = "2.11.0"
version = "2.12.1"
scope = "testOnly"
dependencies = [
{org = "ballerina", name = "cache"},
Expand Down Expand Up @@ -320,7 +320,7 @@ dependencies = [
[[package]]
org = "ballerina"
name = "mime"
version = "2.9.0"
version = "2.10.0"
scope = "testOnly"
dependencies = [
{org = "ballerina", name = "io"},
Expand Down
6 changes: 3 additions & 3 deletions ballerina-tests/http-interceptor-tests/Ballerina.toml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
[package]
org = "ballerina"
name = "http_interceptor_tests"
version = "2.11.2"
version = "2.11.3"

[[dependency]]
org = "ballerina"
name = "http_test_common"
repository = "local"
version = "2.11.2"
version = "2.11.3"

[platform.java17]
graalvmCompatible = true

[[platform.java17.dependency]]
scope = "testOnly"
path = "../../test-utils/build/libs/http-test-utils-2.11.2.jar"
path = "../../test-utils/build/libs/http-test-utils-2.11.3-SNAPSHOT.jar"
Loading
Loading