Skip to content

Make WebSocket compression actually work #414

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
robert-s-ubi wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Make WebSocket compression actually work #414

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
19 changes: 12 additions & 7 deletions ocpp-v2/src/main/java/eu/chargetime/ocpp/MultiProtocolJSONClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
import org.java_websocket.drafts.Draft;
import org.java_websocket.drafts.Draft_6455;
import org.java_websocket.extensions.IExtension;
import org.java_websocket.extensions.permessage_deflate.PerMessageDeflateExtension;
import org.java_websocket.protocols.IProtocol;
import org.java_websocket.protocols.Protocol;
import org.slf4j.Logger;
Expand All @@ -58,6 +57,7 @@ public class MultiProtocolJSONClient implements IMultiProtocolClientAPI {
private final String identity;
private final MultiProtocolFeatureRepository featureRepository;
private final MultiProtocolWebSocketTransmitter transmitter;
private final WebSocketPerMessageDeflateExtension compressionExtension;
private final Client client;

/**
Expand Down Expand Up @@ -92,12 +92,13 @@ public MultiProtocolJSONClient(
featureRepository = new MultiProtocolFeatureRepository(protocolVersions);
List<IExtension> inputExtensions = new ArrayList<>();
if (configuration.getParameter(JSONConfiguration.WEBSOCKET_COMPRESSION_SUPPORT, false)) {
PerMessageDeflateExtension perMessageDeflateExtension =
new PerMessageDeflateExtension(Deflater.BEST_COMPRESSION);
perMessageDeflateExtension.setThreshold(0);
perMessageDeflateExtension.setServerNoContextTakeover(false);
perMessageDeflateExtension.setClientNoContextTakeover(false);
inputExtensions.add(perMessageDeflateExtension);
compressionExtension = new WebSocketPerMessageDeflateExtension(Deflater.BEST_COMPRESSION);
compressionExtension.setThreshold(64);
compressionExtension.setServerNoContextTakeover(false);
compressionExtension.setClientNoContextTakeover(false);
inputExtensions.add(compressionExtension);
} else {
compressionExtension = null;
}
List<IProtocol> inputProtocols = new ArrayList<>(protocolVersions.size());
for (ProtocolVersion protocolVersion : protocolVersions) {
Expand Down Expand Up @@ -221,6 +222,10 @@ public Exception getLastError() {
return transmitter.getLastError();
}

public double getCompressionRatio() {
return compressionExtension != null ? compressionExtension.getCompressionRatio() : 1;
}

@Override
public boolean isClosed() {
return transmitter.isClosed();
Expand Down
13 changes: 6 additions & 7 deletions ocpp-v2/src/main/java/eu/chargetime/ocpp/MultiProtocolJSONServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ of this software and associated documentation files (the "Software"), to deal
import org.java_websocket.drafts.Draft;
import org.java_websocket.drafts.Draft_6455;
import org.java_websocket.extensions.IExtension;
import org.java_websocket.extensions.permessage_deflate.PerMessageDeflateExtension;
import org.java_websocket.protocols.IProtocol;
import org.java_websocket.protocols.Protocol;
import org.slf4j.Logger;
Expand Down Expand Up @@ -71,12 +70,12 @@ public MultiProtocolJSONServer(

List<IExtension> extensions = new ArrayList<>();
if (configuration.getParameter(JSONConfiguration.WEBSOCKET_COMPRESSION_SUPPORT, true)) {
PerMessageDeflateExtension perMessageDeflateExtension =
new PerMessageDeflateExtension(Deflater.BEST_COMPRESSION);
perMessageDeflateExtension.setThreshold(0);
perMessageDeflateExtension.setServerNoContextTakeover(false);
perMessageDeflateExtension.setClientNoContextTakeover(false);
extensions.add(perMessageDeflateExtension);
WebSocketPerMessageDeflateExtension compressionExtension =
new WebSocketPerMessageDeflateExtension(Deflater.BEST_COMPRESSION);
compressionExtension.setThreshold(64);
compressionExtension.setServerNoContextTakeover(false);
compressionExtension.setClientNoContextTakeover(false);
extensions.add(compressionExtension);
}
List<IProtocol> protocols = new ArrayList<>(protocolVersions.size());
for (ProtocolVersion protocolVersion : protocolVersions) {
Expand Down
Loading