diff --git a/LogBridgeAgent/build.gradle b/LogBridgeAgent/build.gradle deleted file mode 100644 index 04a82ce..0000000 --- a/LogBridgeAgent/build.gradle +++ /dev/null @@ -1,27 +0,0 @@ -plugins { - id 'java' -} - -group = 'org.ceciliastudio' -version = '1.0' - -repositories { - mavenCentral() -} - -dependencies { - -} - -java { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 -} - -jar { - manifest { - attributes( - 'Premain-Class': 'org.ceciliastudio.logbridgeagent.Agent' - ) - } -} \ No newline at end of file diff --git a/LogBridgeAgent/gradle/wrapper/gradle-wrapper.jar b/LogBridgeAgent/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 249e583..0000000 Binary files a/LogBridgeAgent/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/LogBridgeAgent/gradle/wrapper/gradle-wrapper.properties b/LogBridgeAgent/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index f9467bb..0000000 --- a/LogBridgeAgent/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,6 +0,0 @@ -#Tue Mar 10 17:38:50 CST 2026 -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists diff --git a/LogBridgeAgent/gradlew b/LogBridgeAgent/gradlew deleted file mode 100755 index 1b6c787..0000000 --- a/LogBridgeAgent/gradlew +++ /dev/null @@ -1,234 +0,0 @@ -#!/bin/sh - -# -# Copyright © 2015-2021 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. -# - -############################################################################## -# -# 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/master/subprojects/plugins/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 - -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" -APP_BASE_NAME=${0##*/} - -# 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"' - -# 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 - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - - -# 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 - which java >/dev/null 2>&1 || 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 - -# Increase the maximum file descriptors if we can. -if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then - case $MAX_FD in #( - max*) - MAX_FD=$( ulimit -H -n ) || - warn "Could not query maximum file descriptor limit" - esac - case $MAX_FD in #( - '' | soft) :;; #( - *) - 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" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) - - 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 - -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. - -set -- \ - "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ - "$@" - -# 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" "$@" diff --git a/LogBridgeAgent/gradlew.bat b/LogBridgeAgent/gradlew.bat deleted file mode 100644 index ac1b06f..0000000 --- a/LogBridgeAgent/gradlew.bat +++ /dev/null @@ -1,89 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/LogBridgeAgent/settings.gradle b/LogBridgeAgent/settings.gradle deleted file mode 100644 index 1db045c..0000000 --- a/LogBridgeAgent/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = 'log-bridge-agent' \ No newline at end of file diff --git a/LogBridgeAgent/src/main/java/org/ceciliastudio/logbridgeagent/Agent.java b/LogBridgeAgent/src/main/java/org/ceciliastudio/logbridgeagent/Agent.java deleted file mode 100644 index c2fb133..0000000 --- a/LogBridgeAgent/src/main/java/org/ceciliastudio/logbridgeagent/Agent.java +++ /dev/null @@ -1,50 +0,0 @@ -package org.ceciliastudio.logbridgeagent; - -import java.io.IOException; -import java.io.PrintStream; -import java.lang.instrument.Instrumentation; -import java.net.StandardProtocolFamily; -import java.net.UnixDomainSocketAddress; -import java.nio.channels.SocketChannel; -import java.nio.file.Files; -import java.nio.file.Path; - -public class Agent { - public static void premain(String agentArgs, Instrumentation inst) { - System.out.println("[GameStub LogBridge] Premain loaded. agentArgs: " + agentArgs); - if (agentArgs == null) { - System.err.println("[GameStub LogBridge] agentArgs is null"); - return; - } - Path socketPath = Path.of(agentArgs); - if (!Files.exists(socketPath)) { - System.err.println("[GameStub LogBridge] The socket file does not exist: " + socketPath); - System.exit(40); - } - - try { - SocketChannel channel = createSocketChannel(socketPath); - SharedSocketWriter writer = new SharedSocketWriter(channel); - System.setOut(new PrintStream(new BridgedOutputStream(writer, System.out, false), true)); - System.setErr(new PrintStream(new BridgedOutputStream(writer, System.err, true), true)); - Runtime.getRuntime().addShutdownHook(new Thread(() -> { - try { - System.out.close(); - System.err.close(); - writer.write(new byte[] { (byte) 0xFF }); - writer.close(); - } catch (IOException ignored) {} - })); - } catch (IOException e) { - System.err.println("[GameStub LogBridge] Failed to create socket: " + e.getMessage()); - } - } - - private static SocketChannel createSocketChannel(Path path) throws IOException { - UnixDomainSocketAddress address = UnixDomainSocketAddress.of(path); - SocketChannel socketChannel = SocketChannel.open(StandardProtocolFamily.UNIX); - socketChannel.configureBlocking(true); - socketChannel.connect(address); - return socketChannel; - } -} diff --git a/LogBridgeAgent/src/main/java/org/ceciliastudio/logbridgeagent/BridgedOutputStream.java b/LogBridgeAgent/src/main/java/org/ceciliastudio/logbridgeagent/BridgedOutputStream.java deleted file mode 100644 index 0df3428..0000000 --- a/LogBridgeAgent/src/main/java/org/ceciliastudio/logbridgeagent/BridgedOutputStream.java +++ /dev/null @@ -1,44 +0,0 @@ -package org.ceciliastudio.logbridgeagent; - -import java.io.IOException; -import java.io.OutputStream; - -public class BridgedOutputStream extends OutputStream { - private final SharedSocketWriter writer; - private final OutputStream standardOutputStream; - private final boolean isError; - - public BridgedOutputStream(SharedSocketWriter writer, OutputStream standardOutputStream, boolean isError) throws IOException { - this.writer = writer; - this.standardOutputStream = standardOutputStream; - this.isError = isError; - } - - @Override - public void write(int b) throws IOException { - int v = b & 0xFF; - byte[] one = new byte[] { (byte) v }; - this.write(one, 0, 1); - } - - @Override - public void write(byte[] b, int off, int len) throws IOException { - this.standardOutputStream.write(b, off, len); - - byte[] content = new byte[len]; - System.arraycopy(b, off, content, 0, len); - this.writer.write(payload(content, this.isError)); - } - - @Override - public void flush() throws IOException { - this.standardOutputStream.flush(); - } - - private static byte[] payload(byte[] lineBytes, boolean isError) { - byte[] framed = new byte[lineBytes.length + 1]; - framed[0] = (byte) (isError ? 0x01 : 0x00); - System.arraycopy(lineBytes, 0, framed, 1, lineBytes.length); - return framed; - } -} diff --git a/LogBridgeAgent/src/main/java/org/ceciliastudio/logbridgeagent/SharedSocketWriter.java b/LogBridgeAgent/src/main/java/org/ceciliastudio/logbridgeagent/SharedSocketWriter.java deleted file mode 100644 index 9e2cae0..0000000 --- a/LogBridgeAgent/src/main/java/org/ceciliastudio/logbridgeagent/SharedSocketWriter.java +++ /dev/null @@ -1,85 +0,0 @@ -package org.ceciliastudio.logbridgeagent; - -import java.io.Closeable; -import java.io.IOException; -import java.nio.ByteBuffer; -import java.nio.channels.SocketChannel; -import java.util.concurrent.ArrayBlockingQueue; -import java.util.concurrent.BlockingQueue; - -public class SharedSocketWriter implements Closeable { - private static final int DEFAULT_QUEUE_CAPACITY = 4096; - - private final SocketChannel channel; - private final BlockingQueue payloadQueue; - - private final Thread writerThread; - - private volatile boolean degraded; - - public SharedSocketWriter(SocketChannel channel) throws IOException { - this.channel = channel; - this.payloadQueue = new ArrayBlockingQueue<>(DEFAULT_QUEUE_CAPACITY); - this.channel.configureBlocking(true); - - Thread thread = new Thread(this::runWriter, "logbridge-writer"); - thread.start(); - this.writerThread = thread; - } - - public void write(byte[] bytes) { - if (degraded) return; - offer(bytes); - } - - private void runWriter() { - while (true) { - if (this.degraded) { - while (this.payloadQueue.poll() != null) ; - return; - } - - try { - byte[] payload = this.payloadQueue.take(); - if (payload.length == 1 && payload[0] == (byte) 0xFC) { - return; - } - - synchronized (this.channel) { - ByteBuffer buf = ByteBuffer.wrap(payload); - while (buf.hasRemaining()) { - this.channel.write(buf); - } - } - } catch (InterruptedException ignored) { - Thread.currentThread().interrupt(); - return; - } catch (IOException e) { - this.degraded = true; - return; - } - } - } - - @Override - public void close() throws IOException { - offer(new byte[] { (byte) 0xFC }); - try { - if (this.writerThread != null) { - this.writerThread.join(100); - } - } catch (InterruptedException ignored) { - Thread.currentThread().interrupt(); - } - this.channel.close(); - } - - public boolean isDegraded() { - return this.degraded; - } - - @SuppressWarnings("ResultOfMethodCallIgnored") - private void offer(byte[] payload) { - this.payloadQueue.offer(payload); - } -} diff --git a/Makefile b/Makefile index 8f60f0a..9cd3e5b 100644 --- a/Makefile +++ b/Makefile @@ -13,15 +13,15 @@ BUILD_DIR := .build/$(CONFIG) RUNNER_BIN := $(BUILD_DIR)/runner LAUNCHER_BIN := $(BUILD_DIR)/launcher -AGENT_BUILD_DIR := LogBridgeAgent/build/libs +SWIFT_DEFINES ?= +SWIFT_FLAGS := $(foreach d,$(SWIFT_DEFINES),-Xswiftc -D -Xswiftc $(d)) .PHONY: all build bundle clean all: bundle build: - swift build -c $(CONFIG) - cd LogBridgeAgent && ./gradlew build + swift build -c $(CONFIG) $(SWIFT_FLAGS) bundle: build @test -f "$(INFO_PLIST)" || (echo "Missing: $(INFO_PLIST)" && exit 1) @@ -39,10 +39,7 @@ bundle: build cp "$(LAUNCHER_BIN)" "$(RESOURCES_DIR)/launcher" chmod +x "$(RESOURCES_DIR)/launcher" - cp $(AGENT_BUILD_DIR)/*.jar "$(RESOURCES_DIR)/log-bridge-agent.jar" - clean: swift package clean rm -rf "$(DIST_DIR)" - cd LogBridgeAgent && ./gradlew clean diff --git a/Sources/Launcher/main.swift b/Sources/Launcher/main.swift index 9425945..338d8b1 100644 --- a/Sources/Launcher/main.swift +++ b/Sources/Launcher/main.swift @@ -87,7 +87,7 @@ func startSocket() { defer { close(clientSocket) } var lastMessages: [String] = [] - var javaQuitReceived: Bool = false + var exitCode: Int32? while true { var buffer: [UInt8] = .init(repeating: 0, count: 16384) @@ -106,17 +106,24 @@ func startSocket() { log("Failed to decode UTF-8 message (bytesRead=\(bytesRead))", error: true) } } else if buffer[0] == 0xFF { - javaQuitReceived = true + let exitCodeSize: Int = MemoryLayout.size + guard bytesRead >= 1 + exitCodeSize else { + log("Incomplete exit code message (bytesRead=\(bytesRead))", error: true) + exit(1) + } + var decodedExitCode: Int32 = 0 + withUnsafeMutableBytes(of: &decodedExitCode) { destination in + destination.copyBytes(from: buffer[1..<(1 + exitCodeSize)]) + } + exitCode = decodedExitCode } } else if bytesRead == 0 { - if lastMessages.contains(where: { $0.contains("#@!@# Game crashed!") }) { - log("Game crashed (Minecraft crash log marker detected)") - exit(1) - } else if !javaQuitReceived { - log("JVM terminated unexpectedly (unexpected socket EOF)") + guard let exitCode else { + log("JVM holder terminated unexpectedly (unexpected socket EOF)", error: true) exit(1) } - exit(0) + log("Game exited with exit code \(exitCode)") + exit(exitCode) } else { perror("read") exit(1) @@ -142,12 +149,22 @@ while true { } } -var runnerArguments: [String] = Array(arguments.dropFirst()) -runnerArguments.insert(FileManager.default.currentDirectoryPath, at: 0) -runnerArguments.insert( - "-javaagent:\(appBundleURL.appending(path: "Contents/Resources/log-bridge-agent.jar").path)=\(socketPath)", - at: 2 -) +var runnerArguments: [String] = [ + "--holder", + "--working-directory", FileManager.default.currentDirectoryPath, + "--socket-path", socketPath, + "--args" +] + arguments.dropFirst() + +#if DEBUG_PROCESS_LAUNCH + +let process: Process = .init() +process.executableURL = appBundleURL.appending(path: "Contents/MacOS/runner") +process.arguments = runnerArguments +process.currentDirectoryURL = .init(filePath: FileManager.default.currentDirectoryPath) +try process.run() + +#else let configuration: NSWorkspace.OpenConfiguration = .init() configuration.createsNewApplicationInstance = true @@ -171,6 +188,7 @@ NSWorkspace.shared.openApplication(at: appBundleURL, configuration: configuratio signal(SIGINT, SIG_IGN) let handler: () -> Void = { + if application.isTerminated { return } kill(pid, SIGTERM) exit(0) } @@ -192,4 +210,7 @@ NSWorkspace.shared.openApplication(at: appBundleURL, configuration: configuratio } } } + +#endif + dispatchMain() diff --git a/Sources/Runner/main.swift b/Sources/Runner/main.swift index 4f5c24e..764d5b8 100644 --- a/Sources/Runner/main.swift +++ b/Sources/Runner/main.swift @@ -8,20 +8,110 @@ import Foundation import AppKit +if CommandLine.arguments.count == 1 { + let alert: NSAlert = .init() + alert.messageText = "You can't open this app directly." + alert.alertStyle = .warning + alert.runModal() + exit(1) +} + +let arguments: [String] = Array(CommandLine.arguments.dropFirst()) + +var holder: Bool = false +var workingDirectory: String? +var socketPath: String? +var javaArguments: [String]? + +for (index, arg) in arguments.enumerated() { + if arg == "-h" || arg == "--holder" { + holder = true + } else if arg == "-w" || arg == "--working-directory" { + workingDirectory = arguments[index + 1] + } else if arg == "--socket-path" { + socketPath = arguments[index + 1] + } else if arg == "--args" { + javaArguments = Array(arguments.dropFirst(index + 1)) + break + } +} + +@MainActor func launch() { - let workingDirectory: String = ProcessInfo.processInfo.arguments[1] - if chdir(workingDirectory) != 0 { - perror("chdir") - exit(EXIT_FAILURE) - } - let arguments: [String] = Array(ProcessInfo.processInfo.arguments.dropFirst(2)) - let executablePath: String = arguments[0] - let argv: [UnsafeMutablePointer?] = arguments.map { strdup($0) } + [nil] + guard let javaArguments else { exit(1) } + let executablePath: String = javaArguments[0] + let argv: [UnsafeMutablePointer?] = javaArguments.map { strdup($0) } + [nil] argv.withUnsafeBufferPointer { buffer in execv(executablePath, buffer.baseAddress) perror("execv") } - exit(EXIT_FAILURE) + exit(1) +} + +func connectSocket(at path: String) -> Int32? { + let sockfd: Int32 = socket(AF_UNIX, SOCK_STREAM, 0) + if sockfd < 0 { + perror("socket") + return nil + } + + var addr = sockaddr_un() + addr.sun_family = sa_family_t(AF_UNIX) + + let bytes = path.utf8CString + let sunPathCapacity: Int = MemoryLayout.size(ofValue: addr.sun_path) + + guard bytes.count <= sunPathCapacity else { + fputs("socket path too long (len=\(bytes.count), cap=\(sunPathCapacity))\n", stderr) + close(sockfd) + return nil + } + + withUnsafeMutablePointer(to: &addr.sun_path) { sunptr in + let dst = UnsafeMutableRawPointer(sunptr).assumingMemoryBound(to: CChar.self) + _ = bytes.withUnsafeBufferPointer { src in + memcpy(dst, src.baseAddress, bytes.count) + } + } + let len = socklen_t(MemoryLayout.size + bytes.count) + let result = withUnsafePointer(to: &addr) { + $0.withMemoryRebound(to: sockaddr.self, capacity: 1) { + connect(sockfd, $0, len) + } + } + if result != 0 { + perror("connect") + close(sockfd) + return nil + } + return sockfd +} + +func send(data: Data, to sockfd: Int32, type: UInt8, queue: DispatchQueue, completion: (@Sendable () -> Void)? = nil) { + let payload: Data = [type] + data + queue.async { + payload.withUnsafeBytes { + let base = $0.baseAddress?.assumingMemoryBound(to: UInt8.self) + var written: Int = 0 + while written < payload.count { + let rc = write(sockfd, base! + written, payload.count - written) + if rc <= 0 { break } + written += rc + } + completion?() + } + } +} + +func handlePipe(_ pipe: Pipe, to sockfd: Int32, error: Bool, queue: DispatchQueue) { + let handle: FileHandle = pipe.fileHandleForReading + DispatchQueue.global().async { + while true { + let data: Data = handle.availableData + if data.isEmpty { break } + send(data: data, to: sockfd, type: error ? 1 : 0, queue: queue) + } + } } class ApplicationDelegate: NSObject, NSApplicationDelegate { @@ -30,6 +120,45 @@ class ApplicationDelegate: NSObject, NSApplicationDelegate { } } -let delegate: ApplicationDelegate = .init() -NSApplication.shared.delegate = delegate -NSApplication.shared.run() +guard let javaArguments, javaArguments.count > 2 else { + exit(1) +} + +if holder { + guard let workingDirectory, let socketPath else { + exit(1) + } + + guard let sockfd: Int32 = connectSocket(at: socketPath) else { + exit(1) + } + let socketQueue: DispatchQueue = .init(label: "socket_write_queue") + + let process: Process = .init() + process.executableURL = Bundle.main.executableURL + process.arguments = ["--args"] + javaArguments + process.currentDirectoryURL = .init(filePath: workingDirectory) + + let outputPipe: Pipe = .init() + let errorPipe: Pipe = .init() + process.standardOutput = outputPipe + process.standardError = errorPipe + + process.terminationHandler = { process in + let data: Data = withUnsafeBytes(of: process.terminationStatus) { Data($0) } + send(data: data, to: sockfd, type: 0xFF, queue: socketQueue) { + exit(process.terminationStatus) + } + } + + try process.run() + + handlePipe(outputPipe, to: sockfd, error: false, queue: socketQueue) + handlePipe(errorPipe, to: sockfd, error: true, queue: socketQueue) + + dispatchMain() +} else { + let delegate: ApplicationDelegate = .init() + NSApplication.shared.delegate = delegate + NSApplication.shared.run() +}