lan/HMCL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

性能与内存优化 (#1848)

Browse Source 
* optimization

* Make ManagedProcess::getLines thread safe
This commit is contained in:
Glavo
2022-11-13 23:43:45 +08:00
committed by GitHub
parent fa8a479aac
commit ee843543bf
22 changed files with 72 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
HMCL/src/main/java/org/jackhuang/hmcl/game/LauncherHelper.java
View File

@@ -742,7 +742,7 @@ public final class LauncherHelper {
private boolean lwjgl; private boolean lwjgl;
private LogWindow logWindow; private LogWindow logWindow;
private final boolean detectWindow; private final boolean detectWindow;
private final LinkedList<Pair<String, Log4jLevel>> logs; private final ArrayDeque<Pair<String, Log4jLevel>> logs;
private final CountDownLatch logWindowLatch = new CountDownLatch(1); private final CountDownLatch logWindowLatch = new CountDownLatch(1);
private final CountDownLatch launchingLatch; private final CountDownLatch launchingLatch;
@@ -753,7 +753,7 @@ public final class LauncherHelper {
this.launchingLatch = launchingLatch; this.launchingLatch = launchingLatch;
this.detectWindow = detectWindow; this.detectWindow = detectWindow;
logs = new LinkedList<>(); this.logs = new ArrayDeque<>(config().getLogLines() + 1);
} }
@Override @Override

4
HMCL/src/main/java/org/jackhuang/hmcl/ui/GameCrashWindow.java
View File

@@ -85,9 +85,9 @@ public class GameCrashWindow extends Stage {
private final LaunchOptions launchOptions; private final LaunchOptions launchOptions;
private final View view; private final View view;
private final List<Pair<String, Log4jLevel>> logs; private final Collection<Pair<String, Log4jLevel>> logs;
public GameCrashWindow(ManagedProcess managedProcess, ProcessListener.ExitType exitType, DefaultGameRepository repository, Version version, LaunchOptions launchOptions, List<Pair<String, Log4jLevel>> logs) { public GameCrashWindow(ManagedProcess managedProcess, ProcessListener.ExitType exitType, DefaultGameRepository repository, Version version, LaunchOptions launchOptions, Collection<Pair<String, Log4jLevel>> logs) {
this.managedProcess = managedProcess; this.managedProcess = managedProcess;
this.exitType = exitType; this.exitType = exitType;
this.repository = repository; this.repository = repository;

4
HMCL/src/main/java/org/jackhuang/hmcl/ui/WeakListenerHolder.java
View File

@@ -24,11 +24,11 @@ import javafx.beans.value.WeakChangeListener;
import javafx.collections.ListChangeListener; import javafx.collections.ListChangeListener;
import javafx.collections.WeakListChangeListener; import javafx.collections.WeakListChangeListener;
import java.util.LinkedList; import java.util.ArrayList;
import java.util.List; import java.util.List;
public class WeakListenerHolder { public class WeakListenerHolder {
private List<Object> refs = new LinkedList<>(); private final List<Object> refs = new ArrayList<>(0);
public WeakListenerHolder() { public WeakListenerHolder() {
} }

12
HMCL/src/main/java/org/jackhuang/hmcl/upgrade/IntegrityChecker.java
View File

@@ -24,10 +24,7 @@ import org.jackhuang.hmcl.util.io.JarUtils;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.nio.file.Path; import java.nio.file.Path;
import java.security.GeneralSecurityException; import java.security.*;
import java.security.KeyFactory;
import java.security.PublicKey;
import java.security.Signature;
import java.security.spec.X509EncodedKeySpec; import java.security.spec.X509EncodedKeySpec;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
@@ -63,6 +60,7 @@ public final class IntegrityChecker {
private static boolean verifyJar(Path jarPath) throws IOException { private static boolean verifyJar(Path jarPath) throws IOException {
PublicKey publickey = getPublicKey(); PublicKey publickey = getPublicKey();
MessageDigest md = DigestUtils.getDigest("SHA-512");
byte[] signature = null; byte[] signature = null;
Map<String, byte[]> fileFingerprints = new TreeMap<>(); Map<String, byte[]> fileFingerprints = new TreeMap<>();
@@ -77,7 +75,8 @@ public final class IntegrityChecker {
if (SIGNATURE_FILE.equals(filename)) { if (SIGNATURE_FILE.equals(filename)) {
signature = IOUtils.readFullyAsByteArray(in); signature = IOUtils.readFullyAsByteArray(in);
} else { } else {
fileFingerprints.put(filename, DigestUtils.digest("SHA-512", in)); md.reset();
fileFingerprints.put(filename, DigestUtils.digest(md, in));
} }
} }
} }
@@ -91,7 +90,8 @@ public final class IntegrityChecker {
Signature verifier = Signature.getInstance("SHA512withRSA"); Signature verifier = Signature.getInstance("SHA512withRSA");
verifier.initVerify(publickey); verifier.initVerify(publickey);
for (Entry<String, byte[]> entry : fileFingerprints.entrySet()) { for (Entry<String, byte[]> entry : fileFingerprints.entrySet()) {
verifier.update(DigestUtils.digest("SHA-512", entry.getKey().getBytes(UTF_8))); md.reset();
verifier.update(md.digest(entry.getKey().getBytes(UTF_8)));
verifier.update(entry.getValue()); verifier.update(entry.getValue());
} }
return verifier.verify(signature); return verifier.verify(signature);

6
HMCLCore/src/main/java/org/jackhuang/hmcl/download/DefaultCacheRepository.java
View File

@@ -95,7 +95,7 @@ public class DefaultCacheRepository extends CacheRepository {
LibraryDownloadInfo info = library.getDownload(); LibraryDownloadInfo info = library.getDownload();
String hash = info.getSha1(); String hash = info.getSha1();
if (hash != null) { if (hash != null) {
String checksum = Hex.encodeHex(DigestUtils.digest("SHA-1", jar)); String checksum = DigestUtils.digestToString("SHA-1", jar);
if (hash.equalsIgnoreCase(checksum)) if (hash.equalsIgnoreCase(checksum))
cacheLibrary(library, jar, false); cacheLibrary(library, jar, false);
} else if (library.getChecksums() != null && !library.getChecksums().isEmpty()) { } else if (library.getChecksums() != null && !library.getChecksums().isEmpty()) {
@@ -148,7 +148,7 @@ public class DefaultCacheRepository extends CacheRepository {
if (Files.exists(jar)) { if (Files.exists(jar)) {
try { try {
if (hash != null) { if (hash != null) {
String checksum = Hex.encodeHex(DigestUtils.digest("SHA-1", jar)); String checksum = DigestUtils.digestToString("SHA-1", jar);
if (hash.equalsIgnoreCase(checksum)) if (hash.equalsIgnoreCase(checksum))
return Optional.of(restore(jar, () -> cacheLibrary(library, jar, false))); return Optional.of(restore(jar, () -> cacheLibrary(library, jar, false)));
} else if (library.getChecksums() != null && !library.getChecksums().isEmpty()) { } else if (library.getChecksums() != null && !library.getChecksums().isEmpty()) {
@@ -177,7 +177,7 @@ public class DefaultCacheRepository extends CacheRepository {
public Path cacheLibrary(Library library, Path path, boolean forge) throws IOException { public Path cacheLibrary(Library library, Path path, boolean forge) throws IOException {
String hash = library.getDownload().getSha1(); String hash = library.getDownload().getSha1();
if (hash == null) if (hash == null)
hash = Hex.encodeHex(DigestUtils.digest(SHA1, path)); hash = DigestUtils.digestToString(SHA1, path);
Path cache = getFile(SHA1, hash); Path cache = getFile(SHA1, hash);
FileUtils.copyFile(path.toFile(), cache.toFile()); FileUtils.copyFile(path.toFile(), cache.toFile());

7
HMCLCore/src/main/java/org/jackhuang/hmcl/download/forge/ForgeNewInstallTask.java
View File

@@ -32,6 +32,7 @@ import org.jackhuang.hmcl.game.Version;
import org.jackhuang.hmcl.task.FileDownloadTask; import org.jackhuang.hmcl.task.FileDownloadTask;
import org.jackhuang.hmcl.task.Task; import org.jackhuang.hmcl.task.Task;
import org.jackhuang.hmcl.task.FileDownloadTask.IntegrityCheck; import org.jackhuang.hmcl.task.FileDownloadTask.IntegrityCheck;
import org.jackhuang.hmcl.util.DigestUtils;
import org.jackhuang.hmcl.util.StringUtils; import org.jackhuang.hmcl.util.StringUtils;
import org.jackhuang.hmcl.util.function.ExceptionalFunction; import org.jackhuang.hmcl.util.function.ExceptionalFunction;
import org.jackhuang.hmcl.util.gson.JsonUtils; import org.jackhuang.hmcl.util.gson.JsonUtils;
@@ -59,8 +60,6 @@ import java.util.jar.Attributes;
import java.util.jar.JarFile; import java.util.jar.JarFile;
import java.util.zip.ZipException; import java.util.zip.ZipException;
import static org.jackhuang.hmcl.util.DigestUtils.digest;
import static org.jackhuang.hmcl.util.Hex.encodeHex;
import static org.jackhuang.hmcl.util.Logging.LOG; import static org.jackhuang.hmcl.util.Logging.LOG;
import static org.jackhuang.hmcl.util.gson.JsonUtils.fromNonNullJson; import static org.jackhuang.hmcl.util.gson.JsonUtils.fromNonNullJson;
@@ -99,7 +98,7 @@ public class ForgeNewInstallTask extends Task<Version> {
if (Files.exists(artifact)) { if (Files.exists(artifact)) {
String code; String code;
try (InputStream stream = Files.newInputStream(artifact)) { try (InputStream stream = Files.newInputStream(artifact)) {
code = encodeHex(digest("SHA-1", stream)); code = (DigestUtils.digestToString("SHA-1", stream));
} }
if (!Objects.equals(code, value)) { if (!Objects.equals(code, value)) {
@@ -167,7 +166,7 @@ public class ForgeNewInstallTask extends Task<Version> {
String code; String code;
try (InputStream stream = Files.newInputStream(artifact)) { try (InputStream stream = Files.newInputStream(artifact)) {
code = encodeHex(digest("SHA-1", stream)); code = DigestUtils.digestToString("SHA-1", stream);
} }
if (!Objects.equals(code, entry.getValue())) { if (!Objects.equals(code, entry.getValue())) {

3
HMCLCore/src/main/java/org/jackhuang/hmcl/download/game/GameAssetIndexDownloadTask.java
View File

@@ -25,7 +25,6 @@ import org.jackhuang.hmcl.game.Version;
import org.jackhuang.hmcl.task.FileDownloadTask; import org.jackhuang.hmcl.task.FileDownloadTask;
import org.jackhuang.hmcl.task.Task; import org.jackhuang.hmcl.task.Task;
import org.jackhuang.hmcl.util.DigestUtils; import org.jackhuang.hmcl.util.DigestUtils;
import org.jackhuang.hmcl.util.Hex;
import org.jackhuang.hmcl.util.StringUtils; import org.jackhuang.hmcl.util.StringUtils;
import org.jackhuang.hmcl.util.gson.JsonUtils; import org.jackhuang.hmcl.util.gson.JsonUtils;
import org.jackhuang.hmcl.util.io.FileUtils; import org.jackhuang.hmcl.util.io.FileUtils;
@@ -79,7 +78,7 @@ public final class GameAssetIndexDownloadTask extends Task<Void> {
// verify correctness of file content // verify correctness of file content
if (verifyHashCode) { if (verifyHashCode) {
try { try {
String actualSum = Hex.encodeHex(DigestUtils.digest("SHA-1", assetIndexFile)); String actualSum = DigestUtils.digestToString("SHA-1", assetIndexFile);
if (actualSum.equalsIgnoreCase(assetIndexInfo.getSha1())) if (actualSum.equalsIgnoreCase(assetIndexInfo.getSha1()))
return; return;
} catch (IOException e) { } catch (IOException e) {

7
HMCLCore/src/main/java/org/jackhuang/hmcl/download/game/LibraryDownloadTask.java
View File

@@ -25,6 +25,7 @@ import org.jackhuang.hmcl.task.DownloadException;
import org.jackhuang.hmcl.task.FileDownloadTask; import org.jackhuang.hmcl.task.FileDownloadTask;
import org.jackhuang.hmcl.task.FileDownloadTask.IntegrityCheck; import org.jackhuang.hmcl.task.FileDownloadTask.IntegrityCheck;
import org.jackhuang.hmcl.task.Task; import org.jackhuang.hmcl.task.Task;
import org.jackhuang.hmcl.util.DigestUtils;
import org.jackhuang.hmcl.util.Pack200Utils; import org.jackhuang.hmcl.util.Pack200Utils;
import org.jackhuang.hmcl.util.io.FileUtils; import org.jackhuang.hmcl.util.io.FileUtils;
import org.jackhuang.hmcl.util.io.IOUtils; import org.jackhuang.hmcl.util.io.IOUtils;
@@ -43,8 +44,6 @@ import java.util.jar.JarInputStream;
import java.util.jar.JarOutputStream; import java.util.jar.JarOutputStream;
import java.util.logging.Level; import java.util.logging.Level;
import static org.jackhuang.hmcl.util.DigestUtils.digest;
import static org.jackhuang.hmcl.util.Hex.encodeHex;
import static org.jackhuang.hmcl.util.Logging.LOG; import static org.jackhuang.hmcl.util.Logging.LOG;
public class LibraryDownloadTask extends Task<Void> { public class LibraryDownloadTask extends Task<Void> {
@@ -181,7 +180,7 @@ public class LibraryDownloadTask extends Task<Void> {
return true; return true;
} }
byte[] fileData = Files.readAllBytes(libPath.toPath()); byte[] fileData = Files.readAllBytes(libPath.toPath());
boolean valid = checksums.contains(encodeHex(digest("SHA-1", fileData))); boolean valid = checksums.contains(DigestUtils.digestToString("SHA-1", fileData));
if (!valid && libPath.getName().endsWith(".jar")) { if (!valid && libPath.getName().endsWith(".jar")) {
valid = validateJar(fileData, checksums); valid = validateJar(fileData, checksums);
} }
@@ -203,7 +202,7 @@ public class LibraryDownloadTask extends Task<Void> {
hashes = new String(eData, StandardCharsets.UTF_8).split("\n"); hashes = new String(eData, StandardCharsets.UTF_8).split("\n");
} }
if (!entry.isDirectory()) { if (!entry.isDirectory()) {
files.put(entry.getName(), encodeHex(digest("SHA-1", eData))); files.put(entry.getName(), DigestUtils.digestToString("SHA-1", eData));
} }
entry = jar.getNextJarEntry(); entry = jar.getNextJarEntry();
} }

3
HMCLCore/src/main/java/org/jackhuang/hmcl/game/AssetObject.java
View File

@@ -19,7 +19,6 @@ package org.jackhuang.hmcl.game;
import com.google.gson.JsonParseException; import com.google.gson.JsonParseException;
import org.jackhuang.hmcl.util.DigestUtils; import org.jackhuang.hmcl.util.DigestUtils;
import org.jackhuang.hmcl.util.Hex;
import org.jackhuang.hmcl.util.StringUtils; import org.jackhuang.hmcl.util.StringUtils;
import org.jackhuang.hmcl.util.gson.Validation; import org.jackhuang.hmcl.util.gson.Validation;
@@ -64,6 +63,6 @@ public final class AssetObject implements Validation {
public boolean validateChecksum(Path file, boolean defaultValue) throws IOException { public boolean validateChecksum(Path file, boolean defaultValue) throws IOException {
if (hash == null) return defaultValue; if (hash == null) return defaultValue;
return Hex.encodeHex(DigestUtils.digest("SHA-1", file)).equalsIgnoreCase(hash); return DigestUtils.digestToString("SHA-1", file).equalsIgnoreCase(hash);
} }
} }

2
HMCLCore/src/main/java/org/jackhuang/hmcl/game/DownloadInfo.java
View File

@@ -83,6 +83,6 @@ public class DownloadInfo implements Validation {
public boolean validateChecksum(Path file, boolean defaultValue) throws IOException { public boolean validateChecksum(Path file, boolean defaultValue) throws IOException {
if (getSha1() == null) return defaultValue; if (getSha1() == null) return defaultValue;
return Hex.encodeHex(DigestUtils.digest("SHA-1", file)).equalsIgnoreCase(getSha1()); return DigestUtils.digestToString("SHA-1", file).equalsIgnoreCase(getSha1());
} }
} }

4
HMCLCore/src/main/java/org/jackhuang/hmcl/launch/ExitWaiter.java
View File

@@ -28,7 +28,6 @@ import org.jackhuang.hmcl.util.platform.ManagedProcess;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.function.BiConsumer; import java.util.function.BiConsumer;
import java.util.stream.Collectors;
/** /**
* *
@@ -60,8 +59,7 @@ final class ExitWaiter implements Runnable {
for (Thread thread : joins) for (Thread thread : joins)
thread.join(); thread.join();
List<String> errorLines = process.getLines().stream() List<String> errorLines = process.getLines(Log4jLevel::guessLogLineError);
.filter(Log4jLevel::guessLogLineError).collect(Collectors.toList());
ProcessListener.ExitType exitType; ProcessListener.ExitType exitType;
// LaunchWrapper will catch the exception logged and will exit normally. // LaunchWrapper will catch the exception logged and will exit normally.

6
HMCLCore/src/main/java/org/jackhuang/hmcl/mod/MinecraftInstanceTask.java
View File

@@ -18,6 +18,7 @@
package org.jackhuang.hmcl.mod; package org.jackhuang.hmcl.mod;
import org.jackhuang.hmcl.task.Task; import org.jackhuang.hmcl.task.Task;
import org.jackhuang.hmcl.util.DigestUtils;
import org.jackhuang.hmcl.util.gson.JsonUtils; import org.jackhuang.hmcl.util.gson.JsonUtils;
import org.jackhuang.hmcl.util.io.CompressingUtils; import org.jackhuang.hmcl.util.io.CompressingUtils;
import org.jackhuang.hmcl.util.io.FileUtils; import org.jackhuang.hmcl.util.io.FileUtils;
@@ -31,9 +32,6 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static org.jackhuang.hmcl.util.DigestUtils.digest;
import static org.jackhuang.hmcl.util.Hex.encodeHex;
public final class MinecraftInstanceTask<T> extends Task<ModpackConfiguration<T>> { public final class MinecraftInstanceTask<T> extends Task<ModpackConfiguration<T>> {
private final File zipFile; private final File zipFile;
@@ -69,7 +67,7 @@ public final class MinecraftInstanceTask<T> extends Task<ModpackConfiguration<T>
@Override @Override
public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException { public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
String relativePath = root.relativize(file).normalize().toString().replace(File.separatorChar, '/'); String relativePath = root.relativize(file).normalize().toString().replace(File.separatorChar, '/');
overrides.add(new ModpackConfiguration.FileInformation(relativePath, encodeHex(digest("SHA-1", file)))); overrides.add(new ModpackConfiguration.FileInformation(relativePath, DigestUtils.digestToString("SHA-1", file)));
return FileVisitResult.CONTINUE; return FileVisitResult.CONTINUE;
} }
}); });

6
HMCLCore/src/main/java/org/jackhuang/hmcl/mod/ModpackInstallTask.java
View File

@@ -18,6 +18,7 @@
package org.jackhuang.hmcl.mod; package org.jackhuang.hmcl.mod;
import org.jackhuang.hmcl.task.Task; import org.jackhuang.hmcl.task.Task;
import org.jackhuang.hmcl.util.DigestUtils;
import org.jackhuang.hmcl.util.io.FileUtils; import org.jackhuang.hmcl.util.io.FileUtils;
import org.jackhuang.hmcl.util.io.Unzipper; import org.jackhuang.hmcl.util.io.Unzipper;
@@ -28,9 +29,6 @@ import java.nio.file.Files;
import java.util.*; import java.util.*;
import java.util.function.Predicate; import java.util.function.Predicate;
import static org.jackhuang.hmcl.util.DigestUtils.digest;
import static org.jackhuang.hmcl.util.Hex.encodeHex;
public class ModpackInstallTask<T> extends Task<Void> { public class ModpackInstallTask<T> extends Task<Void> {
private final File modpackFile; private final File modpackFile;
@@ -93,7 +91,7 @@ public class ModpackInstallTask<T> extends Task<Void> {
} else { } else {
// If both old and new modpacks have this entry, and user has modified this file, // If both old and new modpacks have this entry, and user has modified this file,
// we will not replace it since this modified file is what user expects. // we will not replace it since this modified file is what user expects.
String fileHash = encodeHex(digest("SHA-1", destPath)); String fileHash = DigestUtils.digestToString("SHA-1", destPath);
String oldHash = files.get(entryPath).getHash(); String oldHash = files.get(entryPath).getHash();
return Objects.equals(oldHash, fileHash); return Objects.equals(oldHash, fileHash);
} }

5
HMCLCore/src/main/java/org/jackhuang/hmcl/mod/mcbbs/McbbsModpackCompletionTask.java
View File

@@ -26,6 +26,7 @@ import org.jackhuang.hmcl.mod.ModpackConfiguration;
import org.jackhuang.hmcl.mod.ModpackCompletionException; import org.jackhuang.hmcl.mod.ModpackCompletionException;
import org.jackhuang.hmcl.mod.curse.CurseMetaMod; import org.jackhuang.hmcl.mod.curse.CurseMetaMod;
import org.jackhuang.hmcl.task.*; import org.jackhuang.hmcl.task.*;
import org.jackhuang.hmcl.util.DigestUtils;
import org.jackhuang.hmcl.util.Logging; import org.jackhuang.hmcl.util.Logging;
import org.jackhuang.hmcl.util.StringUtils; import org.jackhuang.hmcl.util.StringUtils;
import org.jackhuang.hmcl.util.gson.JsonUtils; import org.jackhuang.hmcl.util.gson.JsonUtils;
@@ -49,8 +50,6 @@ import java.util.logging.Level;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
import static org.jackhuang.hmcl.util.DigestUtils.digest;
import static org.jackhuang.hmcl.util.Hex.encodeHex;
import static org.jackhuang.hmcl.util.Lang.wrap; import static org.jackhuang.hmcl.util.Lang.wrap;
import static org.jackhuang.hmcl.util.Lang.wrapConsumer; import static org.jackhuang.hmcl.util.Lang.wrapConsumer;
@@ -138,7 +137,7 @@ public class McbbsModpackCompletionTask extends CompletableFutureTask<Void> {
} else if (getFileHash(file) != null) { } else if (getFileHash(file) != null) {
// If user modified this entry file, we will not replace this file since this modified file is what user expects. // If user modified this entry file, we will not replace this file since this modified file is what user expects.
// Or we have downloaded latest file in previous completion task, this time we have no need to download it again. // Or we have downloaded latest file in previous completion task, this time we have no need to download it again.
String fileHash = encodeHex(digest("SHA-1", actualPath)); String fileHash = DigestUtils.digestToString("SHA-1", actualPath);
String oldHash = getFileHash(oldFile); String oldHash = getFileHash(oldFile);
String newHash = getFileHash(file); String newHash = getFileHash(file);
if (oldHash == null) { if (oldHash == null) {

5
HMCLCore/src/main/java/org/jackhuang/hmcl/mod/mcbbs/McbbsModpackExportTask.java
View File

@@ -27,6 +27,7 @@ import org.jackhuang.hmcl.mod.curse.CurseManifest;
import org.jackhuang.hmcl.mod.curse.CurseManifestMinecraft; import org.jackhuang.hmcl.mod.curse.CurseManifestMinecraft;
import org.jackhuang.hmcl.mod.curse.CurseManifestModLoader; import org.jackhuang.hmcl.mod.curse.CurseManifestModLoader;
import org.jackhuang.hmcl.task.Task; import org.jackhuang.hmcl.task.Task;
import org.jackhuang.hmcl.util.DigestUtils;
import org.jackhuang.hmcl.util.Logging; import org.jackhuang.hmcl.util.Logging;
import org.jackhuang.hmcl.util.StringUtils; import org.jackhuang.hmcl.util.StringUtils;
import org.jackhuang.hmcl.util.gson.JsonUtils; import org.jackhuang.hmcl.util.gson.JsonUtils;
@@ -41,8 +42,6 @@ import java.util.Collections;
import java.util.List; import java.util.List;
import static org.jackhuang.hmcl.download.LibraryAnalyzer.LibraryType.*; import static org.jackhuang.hmcl.download.LibraryAnalyzer.LibraryType.*;
import static org.jackhuang.hmcl.util.DigestUtils.digest;
import static org.jackhuang.hmcl.util.Hex.encodeHex;
public class McbbsModpackExportTask extends Task<Void> { public class McbbsModpackExportTask extends Task<Void> {
private final DefaultGameRepository repository; private final DefaultGameRepository repository;
@@ -75,7 +74,7 @@ public class McbbsModpackExportTask extends Task<Void> {
Path file = runDirectory.resolve(path); Path file = runDirectory.resolve(path);
if (Files.isRegularFile(file)) { if (Files.isRegularFile(file)) {
String relativePath = runDirectory.relativize(file).normalize().toString().replace(File.separatorChar, '/'); String relativePath = runDirectory.relativize(file).normalize().toString().replace(File.separatorChar, '/');
files.add(new McbbsModpackManifest.AddonFile(true, relativePath, encodeHex(digest("SHA-1", file)))); files.add(new McbbsModpackManifest.AddonFile(true, relativePath, DigestUtils.digestToString("SHA-1", file)));
} }
return true; return true;
} else { } else {

2
HMCLCore/src/main/java/org/jackhuang/hmcl/mod/modrinth/ModrinthRemoteModRepository.java
View File

@@ -98,7 +98,7 @@ public final class ModrinthRemoteModRepository implements RemoteModRepository {
@Override @Override
public Optional<RemoteMod.Version> getRemoteVersionByLocalFile(LocalModFile localModFile, Path file) throws IOException { public Optional<RemoteMod.Version> getRemoteVersionByLocalFile(LocalModFile localModFile, Path file) throws IOException {
String sha1 = Hex.encodeHex(DigestUtils.digest("SHA-1", file)); String sha1 = DigestUtils.digestToString("SHA-1", file);
try { try {
ProjectVersion mod = HttpRequest.GET(PREFIX + "/v2/version_file/" + sha1, ProjectVersion mod = HttpRequest.GET(PREFIX + "/v2/version_file/" + sha1,

6
HMCLCore/src/main/java/org/jackhuang/hmcl/mod/server/ServerModpackCompletionTask.java
View File

@@ -26,6 +26,7 @@ import org.jackhuang.hmcl.mod.ModpackConfiguration;
import org.jackhuang.hmcl.task.FileDownloadTask; import org.jackhuang.hmcl.task.FileDownloadTask;
import org.jackhuang.hmcl.task.GetTask; import org.jackhuang.hmcl.task.GetTask;
import org.jackhuang.hmcl.task.Task; import org.jackhuang.hmcl.task.Task;
import org.jackhuang.hmcl.util.DigestUtils;
import org.jackhuang.hmcl.util.Logging; import org.jackhuang.hmcl.util.Logging;
import org.jackhuang.hmcl.util.StringUtils; import org.jackhuang.hmcl.util.StringUtils;
import org.jackhuang.hmcl.util.gson.JsonUtils; import org.jackhuang.hmcl.util.gson.JsonUtils;
@@ -42,9 +43,6 @@ import java.util.function.Function;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static org.jackhuang.hmcl.util.DigestUtils.digest;
import static org.jackhuang.hmcl.util.Hex.encodeHex;
public class ServerModpackCompletionTask extends Task<Void> { public class ServerModpackCompletionTask extends Task<Void> {
private final DefaultDependencyManager dependencyManager; private final DefaultDependencyManager dependencyManager;
@@ -149,7 +147,7 @@ public class ServerModpackCompletionTask extends Task<Void> {
download = true; download = true;
} else { } else {
// If user modified this entry file, we will not replace this file since this modified file is that user expects. // If user modified this entry file, we will not replace this file since this modified file is that user expects.
String fileHash = encodeHex(digest("SHA-1", actualPath)); String fileHash = DigestUtils.digestToString("SHA-1", actualPath);
String oldHash = files.get(file.getPath()).getHash(); String oldHash = files.get(file.getPath()).getHash();
download = !Objects.equals(oldHash, file.getHash()) && Objects.equals(oldHash, fileHash); download = !Objects.equals(oldHash, file.getHash()) && Objects.equals(oldHash, fileHash);
} }

5
HMCLCore/src/main/java/org/jackhuang/hmcl/mod/server/ServerModpackExportTask.java
View File

@@ -24,6 +24,7 @@ import org.jackhuang.hmcl.mod.Modpack;
import org.jackhuang.hmcl.mod.ModpackConfiguration; import org.jackhuang.hmcl.mod.ModpackConfiguration;
import org.jackhuang.hmcl.mod.ModpackExportInfo; import org.jackhuang.hmcl.mod.ModpackExportInfo;
import org.jackhuang.hmcl.task.Task; import org.jackhuang.hmcl.task.Task;
import org.jackhuang.hmcl.util.DigestUtils;
import org.jackhuang.hmcl.util.Logging; import org.jackhuang.hmcl.util.Logging;
import org.jackhuang.hmcl.util.StringUtils; import org.jackhuang.hmcl.util.StringUtils;
import org.jackhuang.hmcl.util.gson.JsonUtils; import org.jackhuang.hmcl.util.gson.JsonUtils;
@@ -37,8 +38,6 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import static org.jackhuang.hmcl.download.LibraryAnalyzer.LibraryType.*; import static org.jackhuang.hmcl.download.LibraryAnalyzer.LibraryType.*;
import static org.jackhuang.hmcl.util.DigestUtils.digest;
import static org.jackhuang.hmcl.util.Hex.encodeHex;
public class ServerModpackExportTask extends Task<Void> { public class ServerModpackExportTask extends Task<Void> {
private final DefaultGameRepository repository; private final DefaultGameRepository repository;
@@ -71,7 +70,7 @@ public class ServerModpackExportTask extends Task<Void> {
Path file = runDirectory.resolve(path); Path file = runDirectory.resolve(path);
if (Files.isRegularFile(file)) { if (Files.isRegularFile(file)) {
String relativePath = runDirectory.relativize(file).normalize().toString().replace(File.separatorChar, '/'); String relativePath = runDirectory.relativize(file).normalize().toString().replace(File.separatorChar, '/');
files.add(new ModpackConfiguration.FileInformation(relativePath, encodeHex(digest("SHA-1", file)))); files.add(new ModpackConfiguration.FileInformation(relativePath, DigestUtils.digestToString("SHA-1", file)));
} }
return true; return true;
} else { } else {

10
HMCLCore/src/main/java/org/jackhuang/hmcl/util/CacheRepository.java
View File

@@ -111,7 +111,7 @@ public class CacheRepository {
Path file = getFile(algorithm, hash); Path file = getFile(algorithm, hash);
if (Files.exists(file)) { if (Files.exists(file)) {
try { try {
return Hex.encodeHex(DigestUtils.digest(algorithm, file)).equalsIgnoreCase(hash); return DigestUtils.digestToString(algorithm, file).equalsIgnoreCase(hash);
} catch (IOException e) { } catch (IOException e) {
return false; return false;
} }
@@ -139,7 +139,7 @@ public class CacheRepository {
if (original != null && Files.exists(original)) { if (original != null && Files.exists(original)) {
if (hash != null) { if (hash != null) {
try { try {
String checksum = Hex.encodeHex(DigestUtils.digest(algorithm, original)); String checksum = DigestUtils.digestToString(algorithm, original);
if (checksum.equalsIgnoreCase(hash)) if (checksum.equalsIgnoreCase(hash))
return Optional.of(restore(original, () -> cacheFile(original, algorithm, hash))); return Optional.of(restore(original, () -> cacheFile(original, algorithm, hash)));
} catch (IOException e) { } catch (IOException e) {
@@ -173,7 +173,7 @@ public class CacheRepository {
if (StringUtils.isBlank(eTagItem.hash) || !fileExists(SHA1, eTagItem.hash)) throw new FileNotFoundException(); if (StringUtils.isBlank(eTagItem.hash) || !fileExists(SHA1, eTagItem.hash)) throw new FileNotFoundException();
Path file = getFile(SHA1, eTagItem.hash); Path file = getFile(SHA1, eTagItem.hash);
if (Files.getLastModifiedTime(file).toMillis() != eTagItem.localLastModified) { if (Files.getLastModifiedTime(file).toMillis() != eTagItem.localLastModified) {
String hash = Hex.encodeHex(DigestUtils.digest(SHA1, file)); String hash = DigestUtils.digestToString(SHA1, file);
if (!Objects.equals(hash, eTagItem.hash)) if (!Objects.equals(hash, eTagItem.hash))
throw new IOException("This file is modified"); throw new IOException("This file is modified");
} }
@@ -208,7 +208,7 @@ public class CacheRepository {
public void cacheRemoteFile(Path downloaded, URLConnection conn) throws IOException { public void cacheRemoteFile(Path downloaded, URLConnection conn) throws IOException {
cacheData(() -> { cacheData(() -> {
String hash = Hex.encodeHex(DigestUtils.digest(SHA1, downloaded)); String hash = DigestUtils.digestToString(SHA1, downloaded);
Path cached = cacheFile(downloaded, SHA1, hash); Path cached = cacheFile(downloaded, SHA1, hash);
return new CacheResult(hash, cached); return new CacheResult(hash, cached);
}, conn); }, conn);
@@ -220,7 +220,7 @@ public class CacheRepository {
public void cacheBytes(byte[] bytes, URLConnection conn) throws IOException { public void cacheBytes(byte[] bytes, URLConnection conn) throws IOException {
cacheData(() -> { cacheData(() -> {
String hash = Hex.encodeHex(DigestUtils.digest(SHA1, bytes)); String hash = DigestUtils.digestToString(SHA1, bytes);
Path cached = getFile(SHA1, hash); Path cached = getFile(SHA1, hash);
FileUtils.writeBytes(cached.toFile(), bytes); FileUtils.writeBytes(cached.toFile(), bytes);
return new CacheResult(hash, cached); return new CacheResult(hash, cached);

22
HMCLCore/src/main/java/org/jackhuang/hmcl/util/DigestUtils.java
View File

@@ -24,8 +24,6 @@ import java.nio.file.Path;
import java.security.MessageDigest; import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
import static java.nio.charset.StandardCharsets.UTF_8;
/** /**
* *
* @author huangyuhui * @author huangyuhui
@@ -45,10 +43,6 @@ public final class DigestUtils {
} }
} }
public static byte[] digest(String algorithm, String data) {
return digest(algorithm, data.getBytes(UTF_8));
}
public static byte[] digest(String algorithm, byte[] data) { public static byte[] digest(String algorithm, byte[] data) {
return getDigest(algorithm).digest(data); return getDigest(algorithm).digest(data);
} }
@@ -67,8 +61,22 @@ public final class DigestUtils {
return updateDigest(digest, data).digest(); return updateDigest(digest, data).digest();
} }
public static String digestToString(String algorithm, byte[] data) throws IOException {
return Hex.encodeHex(digest(algorithm, data));
}
public static String digestToString(String algorithm, Path path) throws IOException {
return Hex.encodeHex(digest(algorithm, path));
}
public static String digestToString(String algorithm, InputStream data) throws IOException {
return Hex.encodeHex(digest(algorithm, data));
}
private static final ThreadLocal<byte[]> threadLocalBuffer = ThreadLocal.withInitial(() -> new byte[STREAM_BUFFER_LENGTH]);
public static MessageDigest updateDigest(MessageDigest digest, InputStream data) throws IOException { public static MessageDigest updateDigest(MessageDigest digest, InputStream data) throws IOException {
byte[] buffer = new byte[STREAM_BUFFER_LENGTH]; byte[] buffer = threadLocalBuffer.get();
int read = data.read(buffer, 0, STREAM_BUFFER_LENGTH); int read = data.read(buffer, 0, STREAM_BUFFER_LENGTH);
while (read > -1) { while (read > -1) {

3
HMCLCore/src/main/java/org/jackhuang/hmcl/util/io/ChecksumMismatchException.java
View File

@@ -19,7 +19,6 @@ package org.jackhuang.hmcl.util.io;
import org.jackhuang.hmcl.download.ArtifactMalformedException; import org.jackhuang.hmcl.download.ArtifactMalformedException;
import org.jackhuang.hmcl.util.DigestUtils; import org.jackhuang.hmcl.util.DigestUtils;
import org.jackhuang.hmcl.util.Hex;
import java.io.IOException; import java.io.IOException;
import java.nio.file.Path; import java.nio.file.Path;
@@ -50,7 +49,7 @@ public class ChecksumMismatchException extends ArtifactMalformedException {
} }
public static void verifyChecksum(Path file, String algorithm, String expectedChecksum) throws IOException { public static void verifyChecksum(Path file, String algorithm, String expectedChecksum) throws IOException {
String checksum = Hex.encodeHex(DigestUtils.digest(algorithm, file)); String checksum = DigestUtils.digestToString(algorithm, file);
if (!checksum.equalsIgnoreCase(expectedChecksum)) { if (!checksum.equalsIgnoreCase(expectedChecksum)) {
throw new ChecksumMismatchException(algorithm, expectedChecksum, checksum); throw new ChecksumMismatchException(algorithm, expectedChecksum, checksum);
} }

18
HMCLCore/src/main/java/org/jackhuang/hmcl/util/platform/ManagedProcess.java
View File

@@ -22,8 +22,8 @@ import org.jackhuang.hmcl.util.Lang;
import java.io.IOException; import java.io.IOException;
import java.util.*; import java.util.*;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.function.Consumer; import java.util.function.Consumer;
import java.util.function.Predicate;
/** /**
* The managed process. * The managed process.
@@ -38,7 +38,7 @@ public class ManagedProcess {
private final List<String> commands; private final List<String> commands;
private final String classpath; private final String classpath;
private final Map<String, Object> properties = new HashMap<>(); private final Map<String, Object> properties = new HashMap<>();
private final Queue<String> lines = new ConcurrentLinkedQueue<>(); private final List<String> lines = new ArrayList<>();
private final List<Thread> relatedThreads = new ArrayList<>(); private final List<Thread> relatedThreads = new ArrayList<>();
public ManagedProcess(ProcessBuilder processBuilder) throws IOException { public ManagedProcess(ProcessBuilder processBuilder) throws IOException {
@@ -112,11 +112,19 @@ public class ManagedProcess {
* *
* @see #addLine * @see #addLine
*/ */
public Collection<String> getLines() { public synchronized List<String> getLines(Predicate<String> lineFilter) {
return Collections.unmodifiableCollection(lines); if (lineFilter == null)
return Collections.unmodifiableList(Arrays.asList(lines.toArray(new String[0])));
ArrayList<String> res = new ArrayList<>();
for (String line : this.lines) {
if (lineFilter.test(line))
res.add(line);
}
return Collections.unmodifiableList(res);
} }
public void addLine(String line) { public synchronized void addLine(String line) {
lines.add(line); lines.add(line);
} }