Skip to content

Commit 169e647

Browse files
authored
Websocketsupport (#40)
1 parent aafbe38 commit 169e647

File tree

4 files changed

+9
-3
lines changed

4 files changed

+9
-3
lines changed

rsocket-cli

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22

33
./gradlew -q installDist
44

5-
./build/install/reactivesocket-cli/bin/reactivesocket-cli "$@"
5+
./build/install/rsocket-cli/bin/rsocket-cli "$@"
66

settings.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
rootProject.name='reactivesocket-cli'
1+
rootProject.name='rsocket-cli'

src/dist/bash/completion.bash

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ _reactivesocket_complete()
3030
fi
3131

3232
# TODO remember recent hosts
33-
_reactivesocket_hosts="tcp://localhost:9898"
33+
_reactivesocket_hosts="tcp://localhost:9898 ws://localhost:9897"
3434
COMPREPLY=( $( compgen -W "$_reactivesocket_hosts" -- "$cur" ) )
3535

3636
__ltrim_colon_completions "$cur"

src/main/java/io/rsocket/cli/ConnectionHelper.java

+6
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@
1616
import io.rsocket.transport.ClientTransport;
1717
import io.rsocket.transport.ServerTransport;
1818
import io.rsocket.transport.netty.client.TcpClientTransport;
19+
import io.rsocket.transport.netty.client.WebsocketClientTransport;
1920
import io.rsocket.transport.netty.server.TcpServerTransport;
21+
import io.rsocket.transport.netty.server.WebsocketServerTransport;
2022
import reactor.ipc.netty.tcp.TcpClient;
2123
import reactor.ipc.netty.tcp.TcpServer;
2224

@@ -26,6 +28,8 @@ public class ConnectionHelper {
2628
public static ClientTransport buildClientConnection(URI uri) {
2729
if ("tcp".equals(uri.getScheme())) {
2830
return TcpClientTransport.create(TcpClient.create(uri.getHost(), uri.getPort()));
31+
} else if ("ws".equals(uri.getScheme())) {
32+
return WebsocketClientTransport.create(uri.getHost(), uri.getPort());
2933
} else {
3034
throw new UnsupportedOperationException("uri unsupported: " + uri);
3135
}
@@ -34,6 +38,8 @@ public static ClientTransport buildClientConnection(URI uri) {
3438
public static ServerTransport buildServerConnection(URI uri) {
3539
if ("tcp".equals(uri.getScheme())) {
3640
return TcpServerTransport.create(TcpServer.create(uri.getHost(), uri.getPort()));
41+
} else if ("ws".equals(uri.getScheme())) {
42+
return WebsocketServerTransport.create(uri.getHost(), uri.getPort());
3743
} else {
3844
throw new UnsupportedOperationException("uri unsupported: " + uri);
3945
}

0 commit comments

Comments
 (0)