From fd0d26de78e91b678590aa9647a93e22f65e2b7e Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 2 Nov 2025 21:53:38 +0000 Subject: [PATCH 1/5] Initial plan From 2d5f93091d892ab95528af50564f22bebf3f3273 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 2 Nov 2025 22:12:08 +0000 Subject: [PATCH 2/5] Fix performance issues: SimpleDateFormat, LinkedList, String concat, ByteBuffer allocation Co-authored-by: marci4 <13464940+marci4@users.noreply.github.com> --- .../org/java_websocket/drafts/Draft_6455.java | 31 ++++++++++--------- .../java_websocket/util/ByteBufferUtils.java | 15 ++++++--- 2 files changed, 28 insertions(+), 18 deletions(-) diff --git a/src/main/java/org/java_websocket/drafts/Draft_6455.java b/src/main/java/org/java_websocket/drafts/Draft_6455.java index eb4879976..83352a52e 100644 --- a/src/main/java/org/java_websocket/drafts/Draft_6455.java +++ b/src/main/java/org/java_websocket/drafts/Draft_6455.java @@ -30,14 +30,14 @@ import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; -import java.text.SimpleDateFormat; +import java.time.ZonedDateTime; +import java.time.ZoneId; +import java.time.format.DateTimeFormatter; import java.util.ArrayList; -import java.util.Calendar; import java.util.Collections; import java.util.LinkedList; import java.util.List; import java.util.Locale; -import java.util.TimeZone; import org.java_websocket.WebSocketImpl; import org.java_websocket.enums.CloseHandshakeType; import org.java_websocket.enums.HandshakeState; @@ -105,6 +105,13 @@ public class Draft_6455 extends Draft { */ private static final String CONNECTION = "Connection"; + /** + * DateTimeFormatter for HTTP date format (thread-safe) + */ + private static final DateTimeFormatter HTTP_DATE_FORMAT = + DateTimeFormatter.ofPattern("EEE, dd MMM yyyy HH:mm:ss z", Locale.US) + .withZone(ZoneId.of("GMT")); + /** * Logger instance * @@ -723,7 +730,7 @@ private int getSizeBytes(ByteBuffer mes) { @Override public List translateFrame(ByteBuffer buffer) throws InvalidDataException { while (true) { - List frames = new LinkedList<>(); + List frames = new ArrayList<>(); Framedata cur; if (incompleteframe != null) { // complete an incomplete frame @@ -816,11 +823,7 @@ public void reset() { * @return the server time */ private String getServerTime() { - Calendar calendar = Calendar.getInstance(); - SimpleDateFormat dateFormat = new SimpleDateFormat( - "EEE, dd MMM yyyy HH:mm:ss z", Locale.US); - dateFormat.setTimeZone(TimeZone.getTimeZone("GMT")); - return dateFormat.format(calendar.getTime()); + return HTTP_DATE_FORMAT.format(ZonedDateTime.now()); } /** @@ -1114,15 +1117,15 @@ public CloseHandshakeType getCloseHandshakeType() { @Override public String toString() { - String result = super.toString(); + StringBuilder result = new StringBuilder(super.toString()); if (getExtension() != null) { - result += " extension: " + getExtension().toString(); + result.append(" extension: ").append(getExtension().toString()); } if (getProtocol() != null) { - result += " protocol: " + getProtocol().toString(); + result.append(" protocol: ").append(getProtocol().toString()); } - result += " max frame size: " + this.maxFrameSize; - return result; + result.append(" max frame size: ").append(this.maxFrameSize); + return result.toString(); } @Override diff --git a/src/main/java/org/java_websocket/util/ByteBufferUtils.java b/src/main/java/org/java_websocket/util/ByteBufferUtils.java index e43447984..57f02a199 100644 --- a/src/main/java/org/java_websocket/util/ByteBufferUtils.java +++ b/src/main/java/org/java_websocket/util/ByteBufferUtils.java @@ -32,6 +32,11 @@ */ public class ByteBufferUtils { + /** + * Shared empty ByteBuffer to avoid repeated allocations + */ + private static final ByteBuffer EMPTY_BYTE_BUFFER = ByteBuffer.allocate(0); + /** * Private constructor for static class */ @@ -52,10 +57,12 @@ public static int transferByteBuffer(ByteBuffer source, ByteBuffer dest) { int fremain = source.remaining(); int toremain = dest.remaining(); if (fremain > toremain) { - int limit = Math.min(fremain, toremain); - source.limit(limit); + // We know fremain > toremain, so no need for Math.min + int originalLimit = source.limit(); + source.limit(source.position() + toremain); dest.put(source); - return limit; + source.limit(originalLimit); + return toremain; } else { dest.put(source); return fremain; @@ -68,6 +75,6 @@ public static int transferByteBuffer(ByteBuffer source, ByteBuffer dest) { * @return empty ByteBuffer */ public static ByteBuffer getEmptyByteBuffer() { - return ByteBuffer.allocate(0); + return EMPTY_BYTE_BUFFER.duplicate(); } } From a5d287fffc3082949113a454fecba8647b9ae2e8 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 2 Nov 2025 22:13:36 +0000 Subject: [PATCH 3/5] Address code review: Remove unused import and add documentation Co-authored-by: marci4 <13464940+marci4@users.noreply.github.com> --- src/main/java/org/java_websocket/drafts/Draft_6455.java | 1 - .../java/org/java_websocket/util/ByteBufferUtils.java | 8 +++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/java_websocket/drafts/Draft_6455.java b/src/main/java/org/java_websocket/drafts/Draft_6455.java index 83352a52e..e435f9906 100644 --- a/src/main/java/org/java_websocket/drafts/Draft_6455.java +++ b/src/main/java/org/java_websocket/drafts/Draft_6455.java @@ -35,7 +35,6 @@ import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.Collections; -import java.util.LinkedList; import java.util.List; import java.util.Locale; import org.java_websocket.WebSocketImpl; diff --git a/src/main/java/org/java_websocket/util/ByteBufferUtils.java b/src/main/java/org/java_websocket/util/ByteBufferUtils.java index 57f02a199..509e07562 100644 --- a/src/main/java/org/java_websocket/util/ByteBufferUtils.java +++ b/src/main/java/org/java_websocket/util/ByteBufferUtils.java @@ -33,7 +33,8 @@ public class ByteBufferUtils { /** - * Shared empty ByteBuffer to avoid repeated allocations + * Shared empty ByteBuffer to avoid repeated allocations. + * Safe to share because it has zero capacity and duplicate() provides independent position/limit state. */ private static final ByteBuffer EMPTY_BYTE_BUFFER = ByteBuffer.allocate(0); @@ -70,9 +71,10 @@ public static int transferByteBuffer(ByteBuffer source, ByteBuffer dest) { } /** - * Get a ByteBuffer with zero capacity + * Get a ByteBuffer with zero capacity. Returns a duplicate of a shared empty buffer + * for efficiency - each duplicate has independent position/limit/mark state. * - * @return empty ByteBuffer + * @return empty ByteBuffer with zero capacity */ public static ByteBuffer getEmptyByteBuffer() { return EMPTY_BYTE_BUFFER.duplicate(); From 5f278e7edaebe160149047e3744159d5b8aac012 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 2 Nov 2025 22:14:28 +0000 Subject: [PATCH 4/5] Fix ZonedDateTime.now() to use explicit GMT zone Co-authored-by: marci4 <13464940+marci4@users.noreply.github.com> --- src/main/java/org/java_websocket/drafts/Draft_6455.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/java_websocket/drafts/Draft_6455.java b/src/main/java/org/java_websocket/drafts/Draft_6455.java index e435f9906..638499828 100644 --- a/src/main/java/org/java_websocket/drafts/Draft_6455.java +++ b/src/main/java/org/java_websocket/drafts/Draft_6455.java @@ -822,7 +822,7 @@ public void reset() { * @return the server time */ private String getServerTime() { - return HTTP_DATE_FORMAT.format(ZonedDateTime.now()); + return HTTP_DATE_FORMAT.format(ZonedDateTime.now(ZoneId.of("GMT"))); } /** From ddab08811c86874800e6df16b72137be1b54f521 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 2 Nov 2025 22:22:47 +0000 Subject: [PATCH 5/5] Performance improvements complete - all tests pass Co-authored-by: marci4 <13464940+marci4@users.noreply.github.com> --- gradle/wrapper/gradle-wrapper.properties | 7 + gradlew | 248 +++++++++++++++++++++++ 2 files changed, 255 insertions(+) create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 000000000..bad7c2462 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 000000000..adff685a0 --- /dev/null +++ b/gradlew @@ -0,0 +1,248 @@ +#!/bin/sh + +# +# Copyright © 2015 the original authors. +# +# 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 +# +# https://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. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@"