mirror of
https://codeberg.org/Mercury-IM/Smack
synced 2025-09-09 10:19:41 +02:00
Add smack-websocket-java11
This also lifts a bunch of logic from smack-websocket-okhttp into smack-websocket. Furthermore, the following subprojects require now Java 11: - smack-integration-test - smack-omemo-signal-integration-test - smack-repl - smack-websocket-java11 Related tracking issue: SMACK-835
This commit is contained in:
Florian Schmaus
parent
cd40455b62
commit
4aacdc5154
24 changed files with 442 additions and 162 deletions
|
|
@ -1,84 +0,0 @@
|
|||
/**
|
||||
*
|
||||
* Copyright 2020 Aditya Borikar, 2021 Florian Schmaus
|
||||
*
|
||||
* Licensed 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.
|
||||
*/
|
||||
package org.jivesoftware.smack.websocket.okhttp;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.Iterator;
|
||||
import java.util.logging.Level;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
import org.jivesoftware.smack.debugger.SmackDebugger;
|
||||
|
||||
import okhttp3.Headers;
|
||||
import okhttp3.Response;
|
||||
|
||||
import org.jxmpp.xml.splitter.XmlPrettyPrinter;
|
||||
import org.jxmpp.xml.splitter.XmppXmlSplitter;
|
||||
|
||||
public final class LoggingInterceptor {
|
||||
private static final Logger LOGGER = Logger.getLogger(LoggingInterceptor.class.getName());
|
||||
|
||||
private final SmackDebugger debugger;
|
||||
private final XmppXmlSplitter incomingXmlSplitter;
|
||||
private final XmppXmlSplitter outgoingXmlSplitter;
|
||||
|
||||
LoggingInterceptor(SmackDebugger smackDebugger) {
|
||||
this.debugger = smackDebugger;
|
||||
|
||||
XmlPrettyPrinter incomingTextPrinter = XmlPrettyPrinter.builder()
|
||||
.setPrettyWriter(sb -> debugger.incomingStreamSink(sb))
|
||||
.setTabWidth(4)
|
||||
.build();
|
||||
incomingXmlSplitter = new XmppXmlSplitter(incomingTextPrinter);
|
||||
|
||||
XmlPrettyPrinter outgoingTextPrinter = XmlPrettyPrinter.builder()
|
||||
.setPrettyWriter(sb -> debugger.outgoingStreamSink(sb))
|
||||
.setTabWidth(4)
|
||||
.build();
|
||||
outgoingXmlSplitter = new XmppXmlSplitter(outgoingTextPrinter);
|
||||
}
|
||||
|
||||
// Open response received here isn't in the form of an Xml an so, there isn't much to format.
|
||||
void interceptOpenResponse(Response response) {
|
||||
Headers headers = response.headers();
|
||||
Iterator<?> iterator = headers.iterator();
|
||||
StringBuilder sb = new StringBuilder();
|
||||
sb.append("Received headers:");
|
||||
while (iterator.hasNext()) {
|
||||
sb.append("\n\t" + iterator.next());
|
||||
}
|
||||
debugger.incomingStreamSink(sb);
|
||||
}
|
||||
|
||||
void interceptReceivedText(String text) {
|
||||
try {
|
||||
incomingXmlSplitter.write(text);
|
||||
} catch (IOException e) {
|
||||
// Connections shouldn't be terminated due to exceptions encountered during debugging. hence only log them.
|
||||
LOGGER.log(Level.WARNING, "IOException encountered while parsing received text: " + text, e);
|
||||
}
|
||||
}
|
||||
|
||||
void interceptSentText(String text) {
|
||||
try {
|
||||
outgoingXmlSplitter.write(text);
|
||||
} catch (IOException e) {
|
||||
// Connections shouldn't be terminated due to exceptions encountered during debugging, hence only log them.
|
||||
LOGGER.log(Level.WARNING, "IOException encountered while parsing outgoing text: " + text, e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -16,15 +16,11 @@
|
|||
*/
|
||||
package org.jivesoftware.smack.websocket.okhttp;
|
||||
|
||||
import java.net.URI;
|
||||
import java.util.logging.Level;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
import javax.net.ssl.SSLSession;
|
||||
|
||||
import org.jivesoftware.smack.SmackFuture;
|
||||
import org.jivesoftware.smack.c2s.internal.ModularXmppClientToServerConnectionInternal;
|
||||
import org.jivesoftware.smack.websocket.WebSocketException;
|
||||
import org.jivesoftware.smack.websocket.impl.AbstractWebSocket;
|
||||
import org.jivesoftware.smack.websocket.rce.WebSocketRemoteConnectionEndpoint;
|
||||
|
||||
|
|
@ -36,37 +32,21 @@ import okhttp3.WebSocketListener;
|
|||
|
||||
public final class OkHttpWebSocket extends AbstractWebSocket {
|
||||
|
||||
private static final Logger LOGGER = Logger.getLogger(OkHttpWebSocket.class.getName());
|
||||
|
||||
private static final OkHttpClient okHttpClient = new OkHttpClient();
|
||||
|
||||
// This is a potential candidate to be placed into AbstractWebSocket, but I keep it here until smack-websocket-java11
|
||||
// arrives.
|
||||
private final SmackFuture.InternalSmackFuture<AbstractWebSocket, Exception> future = new SmackFuture.InternalSmackFuture<>();
|
||||
|
||||
private final LoggingInterceptor interceptor;
|
||||
private static final OkHttpClient OK_HTTP_CLIENT = new OkHttpClient();
|
||||
|
||||
private final WebSocket okHttpWebSocket;
|
||||
|
||||
public OkHttpWebSocket(WebSocketRemoteConnectionEndpoint endpoint,
|
||||
OkHttpWebSocket(WebSocketRemoteConnectionEndpoint endpoint,
|
||||
ModularXmppClientToServerConnectionInternal connectionInternal) {
|
||||
super(endpoint, connectionInternal);
|
||||
|
||||
if (connectionInternal.smackDebugger != null) {
|
||||
interceptor = new LoggingInterceptor(connectionInternal.smackDebugger);
|
||||
} else {
|
||||
interceptor = null;
|
||||
}
|
||||
|
||||
final URI uri = endpoint.getUri();
|
||||
final String url = uri.toString();
|
||||
|
||||
final String url = endpoint.getRawString();
|
||||
Request request = new Request.Builder()
|
||||
.url(url)
|
||||
.header("Sec-WebSocket-Protocol", "xmpp")
|
||||
.header(SEC_WEBSOCKET_PROTOCOL_HEADER_FILED_NAME, SEC_WEBSOCKET_PROTOCOL_HEADER_FILED_VALUE_XMPP)
|
||||
.build();
|
||||
|
||||
okHttpWebSocket = okHttpClient.newWebSocket(request, listener);
|
||||
okHttpWebSocket = OK_HTTP_CLIENT.newWebSocket(request, listener);
|
||||
}
|
||||
|
||||
private final WebSocketListener listener = new WebSocketListener() {
|
||||
|
|
@ -75,35 +55,18 @@ public final class OkHttpWebSocket extends AbstractWebSocket {
|
|||
public void onOpen(WebSocket webSocket, Response response) {
|
||||
LOGGER.log(Level.FINER, "OkHttp invoked onOpen() for {0}. Response: {1}",
|
||||
new Object[] { webSocket, response });
|
||||
|
||||
if (interceptor != null) {
|
||||
interceptor.interceptOpenResponse(response);
|
||||
}
|
||||
|
||||
future.setResult(OkHttpWebSocket.this);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onMessage(WebSocket webSocket, String text) {
|
||||
if (interceptor != null) {
|
||||
interceptor.interceptReceivedText(text);
|
||||
}
|
||||
|
||||
onIncomingWebSocketElement(text);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onFailure(WebSocket webSocket, Throwable throwable, Response response) {
|
||||
LOGGER.log(Level.FINER, "OkHttp invoked onFailure() for " + webSocket + ". Response: " + response, throwable);
|
||||
WebSocketException websocketException = new WebSocketException(throwable);
|
||||
|
||||
// If we are already connected, then we need to notify the connection that it got tear down. Otherwise we
|
||||
// need to notify the thread calling connect() that the connection failed.
|
||||
if (future.wasSuccessful()) {
|
||||
connectionInternal.notifyConnectionError(websocketException);
|
||||
} else {
|
||||
future.setException(websocketException);
|
||||
}
|
||||
onWebSocketFailure(throwable);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -118,16 +81,8 @@ public final class OkHttpWebSocket extends AbstractWebSocket {
|
|||
|
||||
};
|
||||
|
||||
@Override
|
||||
public SmackFuture<AbstractWebSocket, Exception> getFuture() {
|
||||
return future;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void send(String element) {
|
||||
if (interceptor != null) {
|
||||
interceptor.interceptSentText(element);
|
||||
}
|
||||
okHttpWebSocket.send(element);
|
||||
}
|
||||
|
||||
|
|
@ -137,17 +92,6 @@ public final class OkHttpWebSocket extends AbstractWebSocket {
|
|||
okHttpWebSocket.close(code, message);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isConnectionSecure() {
|
||||
return endpoint.isSecureEndpoint();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isConnected() {
|
||||
// TODO: Do we need this method at all if we create an AbstractWebSocket object for every endpoint?
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public SSLSession getSSLSession() {
|
||||
// TODO: What shall we do about this method, as it appears that OkHttp does not provide access to the used SSLSession?
|
||||
|
|
|
|||
|
|
@ -23,6 +23,8 @@ import org.jivesoftware.smack.websocket.rce.WebSocketRemoteConnectionEndpoint;
|
|||
|
||||
public class OkHttpWebSocketFactory implements WebSocketFactory {
|
||||
|
||||
public static final OkHttpWebSocketFactory INSTANCE = new OkHttpWebSocketFactory();
|
||||
|
||||
@Override
|
||||
public AbstractWebSocket create(WebSocketRemoteConnectionEndpoint endpoint, ModularXmppClientToServerConnectionInternal connectionInternal) {
|
||||
return new OkHttpWebSocket(endpoint, connectionInternal);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue