From 79228f15f851b7d5b0084f6cc4100eacb2c36adf Mon Sep 17 00:00:00 2001 From: Naohide Sano Date: Wed, 7 Oct 2026 11:23:33 +0900 Subject: [PATCH 1/4] update settings --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 0165347..37b5ab2 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.hid4java hid4java - 0.14.14v + 0.14.15v-SNAPSHOT hid4java A cross-platform hidapi like library (depends on jna but hidapi native library) @@ -35,8 +35,8 @@ - com.github.umjammer.jinput - 2.0.20v + net.java.jinput + 2.0.21v-SNAPSHOT @@ -190,7 +190,7 @@ org.junit junit-bom - 6.1.1 + 6.1.3 pom import From 2f9fa19b394aa15f01d5a913f1e86d65f176d45c Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 7 Oct 2026 03:18:56 +0000 Subject: [PATCH 2/4] add report read/write to the jinput controller, fix feature/input report reading - Hid4JavaController: getReportDescriptor, writeReport and readReport (output/feature/input) from jinput's HidController - HidDevice does the report id handling its javadoc promises (body in, body out), NativeHidDevice keeps hidapi's buffers with the id in front - macos: getReport read into a local copy that was never copied back, so feature and input reports always came back as zeros; native get/send feature report now take hidapi's buffers like linux and windows - windows: hidGetReport did not copy the result back either - HidDevice#getInputReport, getInputDescriptor kept as deprecated alias - HoriOctaPlugin for the HORI Fighting Commander OCTA Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_0193PPUYe26xcJQ6zAbMkuYy --- src/main/java/org/hid4java/HidDevice.java | 44 +++++++++--- .../org/hid4java/macos/MacosHidDevice.java | 30 +++------ .../hid4java/windows/WindowsHidDevice.java | 1 + .../hid4java/spi/Hid4JavaController.java | 39 +++++++++++ .../hid4java/spi/plugin/HoriOctaPlugin.java | 29 ++++++++ .../net.java.games.input.DeviceSupportPlugin | 3 +- .../org/hid4java/HidDeviceReportTest.java | 67 +++++++++++++++++++ 7 files changed, 182 insertions(+), 31 deletions(-) create mode 100644 src/main/java/vavi/games/input/hid4java/spi/plugin/HoriOctaPlugin.java create mode 100644 src/test/java/org/hid4java/HidDeviceReportTest.java diff --git a/src/main/java/org/hid4java/HidDevice.java b/src/main/java/org/hid4java/HidDevice.java index 7da17ae..7c68351 100644 --- a/src/main/java/org/hid4java/HidDevice.java +++ b/src/main/java/org/hid4java/HidDevice.java @@ -303,20 +303,23 @@ public void addInputReportListener(HidDeviceListener l) { /** * Get a feature report from a HID device *

- * Under the covers the HID library will set the first byte of data[] to the - * Report ID of the report to be read. Upon return, the first byte will - * still contain the Report ID, and the report data will start in data[1] - *

- * This method handles all the wide string and array manipulation for you + * The report id is taken care of here, data[] only gets the report body, + * data[0] being the first byte after the report id. * - * @param data The buffer to contain the report + * @param data The buffer to contain the report, without the report id * @param reportId The report ID (or (byte) 0x00) * @return The number of bytes read plus one for the report ID (which has * been removed from the first byte), or -1 on error. * @since 0.1.0 */ public int getFeatureReport(byte[] data, int reportId) throws IOException { - return nativeDevice.getFeatureReport(data, (byte) reportId); + byte[] report = new byte[data.length + 1]; + report[0] = (byte) reportId; + int res = nativeDevice.getFeatureReport(report, (byte) reportId); + if (res > 1) { + System.arraycopy(report, 1, data, 0, Math.min(res - 1, data.length)); + } + return res; } /** @@ -344,7 +347,10 @@ public int getFeatureReport(byte[] data, int reportId) throws IOException { * @since 0.1.0 */ public int sendFeatureReport(byte[] data, int reportId) throws IOException { - return nativeDevice.sendFeatureReport(data, (byte) reportId); + byte[] report = new byte[data.length + 1]; + report[0] = (byte) reportId; + System.arraycopy(data, 0, report, 1, data.length); + return nativeDevice.sendFeatureReport(report, (byte) reportId); } /** @@ -418,9 +424,27 @@ public int getReportDescriptor(byte[] report) throws IOException { return nativeDevice.getReportDescriptor(report); } - /** */ + /** + * Get an input report from a HID device on request, as {@link #getFeatureReport(byte[], int)}. + * + * @param data The buffer to contain the report, without the report id + * @param reportId The report ID (or (byte) 0x00) + * @return The number of bytes read plus one for the report ID, or -1 on error. + */ + public int getInputReport(byte[] data, int reportId) throws IOException { + byte[] report = new byte[data.length + 1]; + report[0] = (byte) reportId; + int res = nativeDevice.getInputReport(report, (byte) reportId); + if (res > 1) { + System.arraycopy(report, 1, data, 0, Math.min(res - 1, data.length)); + } + return res; + } + + /** @deprecated misnamed, use {@link #getInputReport(byte[], int)} */ + @Deprecated public int getInputDescriptor(byte[] report, int reportId) throws IOException { - return nativeDevice.getInputReport(report, (byte) reportId); + return getInputReport(report, reportId); } @Override diff --git a/src/main/java/org/hid4java/macos/MacosHidDevice.java b/src/main/java/org/hid4java/macos/MacosHidDevice.java index 68552a2..05a2e7a 100644 --- a/src/main/java/org/hid4java/macos/MacosHidDevice.java +++ b/src/main/java/org/hid4java/macos/MacosHidDevice.java @@ -476,6 +476,7 @@ private int getReport(int /* IOHIDReportType */ type, byte[] data, int length) t if (res != kIOReturnSuccess) { throw new HidException("IOHIDDeviceGetReport failed: (0x%08X): %s".formatted(res, this.deviceInfo.path)); } + System.arraycopy(report, 0, data, dataP, Math.min(reportLength, data.length - dataP)); if (reportId == 0x0) { // 0 report number still present at the beginning reportLength++; @@ -516,15 +517,10 @@ public int write(byte[] data, int length, byte reportId) throws IOException { public int getFeatureReport(byte[] data, byte reportId) throws IOException { internalOpen(); // let it work w/o open - // Create a large buffer - byte[] report = new byte[data.length + 1]; - report[0] = reportId; - int res = getReport(kIOHIDReportTypeFeature, report, data.length + 1); - - // Avoid index out of bounds exception - System.arraycopy(report, 1, data, 0, Math.min(res, data.length)); + data[0] = reportId; + int res = getReport(kIOHIDReportTypeFeature, data, data.length); - logTraffic(report, false); + logTraffic(data, false); return res; } @@ -537,14 +533,11 @@ public int sendFeatureReport(byte[] data, byte reportId) throws IOException { internalOpen(); // let it work w/o open - byte[] report = new byte[data.length + 1]; - report[0] = reportId; + data[0] = reportId; - System.arraycopy(data, 0, report, 1, data.length); + logTraffic(data, true); - logTraffic(report, true); - - return setReport(kIOHIDReportTypeFeature, report, report.length); + return setReport(kIOHIDReportTypeFeature, data, data.length); } @Override @@ -577,13 +570,10 @@ public int getReportDescriptor(byte[] report) throws IOException { public int getInputReport(byte[] data, byte reportId) throws IOException { internalOpen(); // let it work w/o open - byte[] report = new byte[data.length + 1]; - report[0] = reportId; - int res = getReport(kIOHIDReportTypeInput, report, data.length + 1); - - System.arraycopy(report, 1, data, 0, Math.min(res, data.length)); + data[0] = reportId; + int res = getReport(kIOHIDReportTypeInput, data, data.length); - logTraffic(report, false); + logTraffic(data, false); return res; } diff --git a/src/main/java/org/hid4java/windows/WindowsHidDevice.java b/src/main/java/org/hid4java/windows/WindowsHidDevice.java index b9c8589..9d5995f 100644 --- a/src/main/java/org/hid4java/windows/WindowsHidDevice.java +++ b/src/main/java/org/hid4java/windows/WindowsHidDevice.java @@ -319,6 +319,7 @@ private int hidGetReport(int reportType, byte[] data, int length) throws IOExcep // The operation failed. throw new IOException("Get Input/Feature Report GetOverLappedResult"); } + m.read(0, data, 0, length); // When numbered reports aren't used, // bytesReturned seem to include only what is actually received from the device diff --git a/src/main/java/vavi/games/input/hid4java/spi/Hid4JavaController.java b/src/main/java/vavi/games/input/hid4java/spi/Hid4JavaController.java index f3d5ae5..137889c 100644 --- a/src/main/java/vavi/games/input/hid4java/spi/Hid4JavaController.java +++ b/src/main/java/vavi/games/input/hid4java/spi/Hid4JavaController.java @@ -17,6 +17,7 @@ import net.java.games.input.Rumbler; import net.java.games.input.usb.GenericDesktopUsageId; import net.java.games.input.usb.HidController; +import net.java.games.input.usb.HidReportType; import org.hid4java.HidDevice; import vavi.util.StringUtil; @@ -114,4 +115,42 @@ public void output(Report report) throws IOException { throw new IOException("write returns -1"); } } + + @Override + public byte[] getReportDescriptor() { + try { + byte[] descriptor = new byte[4096]; + int r = device.getReportDescriptor(descriptor); + return r > 0 ? Arrays.copyOf(descriptor, r) : null; + } catch (IOException | IllegalStateException e) { +logger.log(Level.DEBUG, "getReportDescriptor: " + e); + return null; + } + } + + @Override + public void writeReport(HidReportType type, int reportId, byte[] data) throws IOException { + int r = switch (type) { + case OUTPUT -> device.write(data, data.length, reportId); + case FEATURE -> device.sendFeatureReport(data, reportId); + default -> throw new IllegalArgumentException("an input report cannot be written"); + }; + if (r == -1) { + throw new IOException("write %s report %d returns -1".formatted(type, reportId)); + } + } + + @Override + public int readReport(HidReportType type, int reportId, byte[] buffer) throws IOException { + int r = switch (type) { + case INPUT -> device.getInputReport(buffer, reportId); + case FEATURE -> device.getFeatureReport(buffer, reportId); + default -> throw new IllegalArgumentException("an output report cannot be read"); + }; + if (r == -1) { + throw new IOException("read %s report %d returns -1".formatted(type, reportId)); + } + // the count includes the report id, which is not in the buffer + return Math.max(0, Math.min(r - 1, buffer.length)); + } } diff --git a/src/main/java/vavi/games/input/hid4java/spi/plugin/HoriOctaPlugin.java b/src/main/java/vavi/games/input/hid4java/spi/plugin/HoriOctaPlugin.java new file mode 100644 index 0000000..c339f2c --- /dev/null +++ b/src/main/java/vavi/games/input/hid4java/spi/plugin/HoriOctaPlugin.java @@ -0,0 +1,29 @@ +/* + * Copyright (c) 2026 by Naohide Sano, All rights reserved. + * + * Programmed by Naohide Sano + */ + +package vavi.games.input.hid4java.spi.plugin; + +import net.java.games.input.plugin.HoriOctaPluginBase; +import org.hid4java.HidDevice; + + +/** + * HORI Fighting Commander OCTA support for hid4java. + *

+ * Only the hid modes of the PlayStation model are seen by hidapi (PS4 and PS5 mode), + * the PC mode and the Xbox model are not hid devices. + * + * @author Naohide Sano (nsano) + * @version 0.00 2026-10-07 nsano initial version
+ */ +public class HoriOctaPlugin extends HoriOctaPluginBase { + + /** @param object HidDevice */ + @Override + public boolean match(Object object) { + return object instanceof HidDevice device && isOcta(device.getVendorId(), device.getProductId()); + } +} diff --git a/src/main/resources/META-INF/services/net.java.games.input.DeviceSupportPlugin b/src/main/resources/META-INF/services/net.java.games.input.DeviceSupportPlugin index 4f5e464..db63b03 100644 --- a/src/main/resources/META-INF/services/net.java.games.input.DeviceSupportPlugin +++ b/src/main/resources/META-INF/services/net.java.games.input.DeviceSupportPlugin @@ -1 +1,2 @@ -vavi.games.input.hid4java.spi.plugin.DualShock4Plugin \ No newline at end of file +vavi.games.input.hid4java.spi.plugin.DualShock4Plugin +vavi.games.input.hid4java.spi.plugin.HoriOctaPlugin diff --git a/src/test/java/org/hid4java/HidDeviceReportTest.java b/src/test/java/org/hid4java/HidDeviceReportTest.java new file mode 100644 index 0000000..92e62d0 --- /dev/null +++ b/src/test/java/org/hid4java/HidDeviceReportTest.java @@ -0,0 +1,67 @@ +/* + * Copyright (c) 2026 by Naohide Sano, All rights reserved. + * + * Programmed by Naohide Sano + */ + +package org.hid4java; + +import java.util.Arrays; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; + + +/** + * HidDeviceReportTest. {@link HidDevice} speaks report bodies, {@link NativeHidDevice} + * speaks hidapi's buffers with the report id in front. + * + * @author Naohide Sano (nsano) + * @version 0.00 2026-10-07 nsano initial version
+ */ +class HidDeviceReportTest { + + /** answers a feature report as hidapi does, keeps what was sent */ + static class Native extends NativeHidDeviceListenerTest.DummyDevice { + byte[] sent; + + @Override public int getFeatureReport(byte[] data, byte reportId) { + assertEquals(reportId, data[0]); + data[1] = 0x21; + data[2] = 0x28; + return 3; // id + 2 bytes + } + + @Override public int sendFeatureReport(byte[] data, byte reportId) { + sent = data.clone(); + return data.length; + } + + @Override public int getInputReport(byte[] data, byte reportId) { + return getFeatureReport(data, reportId); + } + } + + @Test + @DisplayName("the report id is put in front and taken off") + void test1() throws Exception { + Native nativeDevice = new Native(); + HidDevice.Info info = new HidDevice.Info(); + info.path = "test"; + HidDevice device = new HidDevice(info, nativeDevice, () -> {}); + + byte[] buffer = new byte[4]; + assertEquals(3, device.getFeatureReport(buffer, 3)); + assertArrayEquals(new byte[] {0x21, 0x28, 0, 0}, buffer); + + Arrays.fill(buffer, (byte) 0); + assertEquals(3, device.getInputReport(buffer, 1)); + assertArrayEquals(new byte[] {0x21, 0x28, 0, 0}, buffer); + + assertEquals(3, device.sendFeatureReport(new byte[] {1, 2}, (byte) 0xf0)); + assertArrayEquals(new byte[] {(byte) 0xf0, 1, 2}, nativeDevice.sent); + } +} From 031d35e2f950e7625155d71a6bd4b6ed395fe8f5 Mon Sep 17 00:00:00 2001 From: Naohide Sano Date: Sun, 25 Oct 2026 18:25:54 +0900 Subject: [PATCH 3/4] update settings --- .mvn/wrapper/maven-wrapper.properties | 3 + mvnw | 295 ++++++++++++++++++++++++++ mvnw.cmd | 189 +++++++++++++++++ pom.xml | 20 +- 4 files changed, 497 insertions(+), 10 deletions(-) create mode 100644 .mvn/wrapper/maven-wrapper.properties create mode 100755 mvnw create mode 100644 mvnw.cmd diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..5291372 --- /dev/null +++ b/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,3 @@ +wrapperVersion=3.3.4 +distributionType=only-script +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.15/apache-maven-3.9.15-bin.zip diff --git a/mvnw b/mvnw new file mode 100755 index 0000000..bd8896b --- /dev/null +++ b/mvnw @@ -0,0 +1,295 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF 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. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Apache Maven Wrapper startup batch script, version 3.3.4 +# +# Optional ENV vars +# ----------------- +# JAVA_HOME - location of a JDK home dir, required when download maven via java source +# MVNW_REPOURL - repo url base for downloading maven distribution +# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output +# ---------------------------------------------------------------------------- + +set -euf +[ "${MVNW_VERBOSE-}" != debug ] || set -x + +# OS specific support. +native_path() { printf %s\\n "$1"; } +case "$(uname)" in +CYGWIN* | MINGW*) + [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")" + native_path() { cygpath --path --windows "$1"; } + ;; +esac + +# set JAVACMD and JAVACCMD +set_java_home() { + # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched + 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" + JAVACCMD="$JAVA_HOME/jre/sh/javac" + else + JAVACMD="$JAVA_HOME/bin/java" + JAVACCMD="$JAVA_HOME/bin/javac" + + if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then + echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2 + echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2 + return 1 + fi + fi + else + JAVACMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v java + )" || : + JAVACCMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v javac + )" || : + + if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then + echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2 + return 1 + fi + fi +} + +# hash string like Java String::hashCode +hash_string() { + str="${1:-}" h=0 + while [ -n "$str" ]; do + char="${str%"${str#?}"}" + h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296)) + str="${str#?}" + done + printf %x\\n $h +} + +verbose() { :; } +[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; } + +die() { + printf %s\\n "$1" >&2 + exit 1 +} + +trim() { + # MWRAPPER-139: + # Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds. + # Needed for removing poorly interpreted newline sequences when running in more + # exotic environments such as mingw bash on Windows. + printf "%s" "${1}" | tr -d '[:space:]' +} + +scriptDir="$(dirname "$0")" +scriptName="$(basename "$0")" + +# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties +while IFS="=" read -r key value; do + case "${key-}" in + distributionUrl) distributionUrl=$(trim "${value-}") ;; + distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;; + esac +done <"$scriptDir/.mvn/wrapper/maven-wrapper.properties" +[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" + +case "${distributionUrl##*/}" in +maven-mvnd-*bin.*) + MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ + case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in + *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;; + :Darwin*x86_64) distributionPlatform=darwin-amd64 ;; + :Darwin*arm64) distributionPlatform=darwin-aarch64 ;; + :Linux*x86_64*) distributionPlatform=linux-amd64 ;; + *) + echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2 + distributionPlatform=linux-amd64 + ;; + esac + distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip" + ;; +maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;; +*) MVN_CMD="mvn${scriptName#mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; +esac + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}" +distributionUrlName="${distributionUrl##*/}" +distributionUrlNameMain="${distributionUrlName%.*}" +distributionUrlNameMain="${distributionUrlNameMain%-bin}" +MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}" +MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")" + +exec_maven() { + unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || : + exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD" +} + +if [ -d "$MAVEN_HOME" ]; then + verbose "found existing MAVEN_HOME at $MAVEN_HOME" + exec_maven "$@" +fi + +case "${distributionUrl-}" in +*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;; +*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;; +esac + +# prepare tmp dir +if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then + clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; } + trap clean HUP INT TERM EXIT +else + die "cannot create temp dir" +fi + +mkdir -p -- "${MAVEN_HOME%/*}" + +# Download and Install Apache Maven +verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +verbose "Downloading from: $distributionUrl" +verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +# select .zip or .tar.gz +if ! command -v unzip >/dev/null; then + distributionUrl="${distributionUrl%.zip}.tar.gz" + distributionUrlName="${distributionUrl##*/}" +fi + +# verbose opt +__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR='' +[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v + +# normalize http auth +case "${MVNW_PASSWORD:+has-password}" in +'') MVNW_USERNAME='' MVNW_PASSWORD='' ;; +has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;; +esac + +if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then + verbose "Found wget ... using wget" + wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl" +elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then + verbose "Found curl ... using curl" + curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl" +elif set_java_home; then + verbose "Falling back to use Java to download" + javaSource="$TMP_DOWNLOAD_DIR/Downloader.java" + targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName" + cat >"$javaSource" <<-END + public class Downloader extends java.net.Authenticator + { + protected java.net.PasswordAuthentication getPasswordAuthentication() + { + return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() ); + } + public static void main( String[] args ) throws Exception + { + setDefault( new Downloader() ); + java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() ); + } + } + END + # For Cygwin/MinGW, switch paths to Windows format before running javac and java + verbose " - Compiling Downloader.java ..." + "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java" + verbose " - Running Downloader.java ..." + "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")" +fi + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +if [ -n "${distributionSha256Sum-}" ]; then + distributionSha256Result=false + if [ "$MVN_CMD" = mvnd.sh ]; then + echo "Checksum validation is not supported for maven-mvnd." >&2 + echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + elif command -v sha256sum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c - >/dev/null 2>&1; then + distributionSha256Result=true + fi + elif command -v shasum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + else + echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2 + echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + fi + if [ $distributionSha256Result = false ]; then + echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2 + echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2 + exit 1 + fi +fi + +# unzip and move +if command -v unzip >/dev/null; then + unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip" +else + tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar" +fi + +# Find the actual extracted directory name (handles snapshots where filename != directory name) +actualDistributionDir="" + +# First try the expected directory name (for regular distributions) +if [ -d "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" ]; then + if [ -f "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/bin/$MVN_CMD" ]; then + actualDistributionDir="$distributionUrlNameMain" + fi +fi + +# If not found, search for any directory with the Maven executable (for snapshots) +if [ -z "$actualDistributionDir" ]; then + # enable globbing to iterate over items + set +f + for dir in "$TMP_DOWNLOAD_DIR"/*; do + if [ -d "$dir" ]; then + if [ -f "$dir/bin/$MVN_CMD" ]; then + actualDistributionDir="$(basename "$dir")" + break + fi + fi + done + set -f +fi + +if [ -z "$actualDistributionDir" ]; then + verbose "Contents of $TMP_DOWNLOAD_DIR:" + verbose "$(ls -la "$TMP_DOWNLOAD_DIR")" + die "Could not find Maven distribution directory in extracted archive" +fi + +verbose "Found extracted Maven distribution directory: $actualDistributionDir" +printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$actualDistributionDir/mvnw.url" +mv -- "$TMP_DOWNLOAD_DIR/$actualDistributionDir" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" + +clean || : +exec_maven "$@" diff --git a/mvnw.cmd b/mvnw.cmd new file mode 100644 index 0000000..92450f9 --- /dev/null +++ b/mvnw.cmd @@ -0,0 +1,189 @@ +<# : batch portion +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Apache Maven Wrapper startup batch script, version 3.3.4 +@REM +@REM Optional ENV vars +@REM MVNW_REPOURL - repo url base for downloading maven distribution +@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output +@REM ---------------------------------------------------------------------------- + +@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0) +@SET __MVNW_CMD__= +@SET __MVNW_ERROR__= +@SET __MVNW_PSMODULEP_SAVE=%PSModulePath% +@SET PSModulePath= +@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @( + IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B) +) +@SET PSModulePath=%__MVNW_PSMODULEP_SAVE% +@SET __MVNW_PSMODULEP_SAVE= +@SET __MVNW_ARG0_NAME__= +@SET MVNW_USERNAME= +@SET MVNW_PASSWORD= +@IF NOT "%__MVNW_CMD__%"=="" ("%__MVNW_CMD__%" %*) +@echo Cannot start maven from wrapper >&2 && exit /b 1 +@GOTO :EOF +: end batch / begin powershell #> + +$ErrorActionPreference = "Stop" +if ($env:MVNW_VERBOSE -eq "true") { + $VerbosePreference = "Continue" +} + +# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties +$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl +if (!$distributionUrl) { + Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" +} + +switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) { + "maven-mvnd-*" { + $USE_MVND = $true + $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip" + $MVN_CMD = "mvnd.cmd" + break + } + default { + $USE_MVND = $false + $MVN_CMD = $script -replace '^mvnw','mvn' + break + } +} + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +if ($env:MVNW_REPOURL) { + $MVNW_REPO_PATTERN = if ($USE_MVND -eq $False) { "/org/apache/maven/" } else { "/maven/mvnd/" } + $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace "^.*$MVNW_REPO_PATTERN",'')" +} +$distributionUrlName = $distributionUrl -replace '^.*/','' +$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$','' + +$MAVEN_M2_PATH = "$HOME/.m2" +if ($env:MAVEN_USER_HOME) { + $MAVEN_M2_PATH = "$env:MAVEN_USER_HOME" +} + +if (-not (Test-Path -Path $MAVEN_M2_PATH)) { + New-Item -Path $MAVEN_M2_PATH -ItemType Directory | Out-Null +} + +$MAVEN_WRAPPER_DISTS = $null +if ((Get-Item $MAVEN_M2_PATH).Target[0] -eq $null) { + $MAVEN_WRAPPER_DISTS = "$MAVEN_M2_PATH/wrapper/dists" +} else { + $MAVEN_WRAPPER_DISTS = (Get-Item $MAVEN_M2_PATH).Target[0] + "/wrapper/dists" +} + +$MAVEN_HOME_PARENT = "$MAVEN_WRAPPER_DISTS/$distributionUrlNameMain" +$MAVEN_HOME_NAME = ([System.Security.Cryptography.SHA256]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join '' +$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME" + +if (Test-Path -Path "$MAVEN_HOME" -PathType Container) { + Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME" + Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" + exit $? +} + +if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) { + Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl" +} + +# prepare tmp dir +$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile +$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir" +$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null +trap { + if ($TMP_DOWNLOAD_DIR.Exists) { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } + } +} + +New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null + +# Download and Install Apache Maven +Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +Write-Verbose "Downloading from: $distributionUrl" +Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +$webclient = New-Object System.Net.WebClient +if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) { + $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD) +} +[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 +$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum +if ($distributionSha256Sum) { + if ($USE_MVND) { + Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." + } + Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash + if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) { + Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property." + } +} + +# unzip and move +Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null + +# Find the actual extracted directory name (handles snapshots where filename != directory name) +$actualDistributionDir = "" + +# First try the expected directory name (for regular distributions) +$expectedPath = Join-Path "$TMP_DOWNLOAD_DIR" "$distributionUrlNameMain" +$expectedMvnPath = Join-Path "$expectedPath" "bin/$MVN_CMD" +if ((Test-Path -Path $expectedPath -PathType Container) -and (Test-Path -Path $expectedMvnPath -PathType Leaf)) { + $actualDistributionDir = $distributionUrlNameMain +} + +# If not found, search for any directory with the Maven executable (for snapshots) +if (!$actualDistributionDir) { + Get-ChildItem -Path "$TMP_DOWNLOAD_DIR" -Directory | ForEach-Object { + $testPath = Join-Path $_.FullName "bin/$MVN_CMD" + if (Test-Path -Path $testPath -PathType Leaf) { + $actualDistributionDir = $_.Name + } + } +} + +if (!$actualDistributionDir) { + Write-Error "Could not find Maven distribution directory in extracted archive" +} + +Write-Verbose "Found extracted Maven distribution directory: $actualDistributionDir" +Rename-Item -Path "$TMP_DOWNLOAD_DIR/$actualDistributionDir" -NewName $MAVEN_HOME_NAME | Out-Null +try { + Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null +} catch { + if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) { + Write-Error "fail to move MAVEN_HOME" + } +} finally { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } +} + +Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" diff --git a/pom.xml b/pom.xml index 37b5ab2..ae761c2 100644 --- a/pom.xml +++ b/pom.xml @@ -35,8 +35,8 @@ - net.java.jinput - 2.0.21v-SNAPSHOT + com.github.umjammer.jinput + 2.0.21v @@ -73,7 +73,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 + 3.2.0 run @@ -99,7 +99,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.12.1 + 3.16.0 17 @@ -108,7 +108,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.2.5 + 3.6.0 **/*FunctionalTest.java @@ -123,7 +123,7 @@ org.apache.maven.plugins maven-source-plugin - 3.2.1 + 3.4.0 attach-sources @@ -137,7 +137,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.5.0 + 3.12.0 none EN @@ -155,7 +155,7 @@ org.apache.maven.plugins maven-release-plugin - 3.0.1 + 3.3.1 true forked-path @@ -166,7 +166,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.3.0 + 3.5.1 @@ -201,7 +201,7 @@ com.github.umjammer vavi-commons - 1.1.24 + 1.1.25 From 3dea2d664fb8325f70a077500a48fab332374f75 Mon Sep 17 00:00:00 2001 From: Naohide Sano Date: Sun, 25 Oct 2026 18:26:41 +0900 Subject: [PATCH 4/4] bump version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ae761c2..6b0ceb2 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.hid4java hid4java - 0.14.15v-SNAPSHOT + 0.14.15v hid4java A cross-platform hidapi like library (depends on jna but hidapi native library)