imgfloat/server
1
0
Fork 0
mirror of https://github.com/imgfloat/server.git synced 2026-02-05 03:39:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fail fast and include pakcage.json

Browse Source
This commit is contained in:
Andreas Krühlmann
2026-01-06 03:40:05 +01:00
parent e886a3600b
commit c67fdb94f2
2 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pom.xml
View File

@@ -128,6 +128,17 @@
</dependencies>
<build>
<resources>
<resource>
<directory>src/main/resources</directory>
</resource>
<resource>
<directory>${project.basedir}</directory>
<includes>
<include>package.json</include>
</includes>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>

27
src/main/java/dev/kruhlmann/imgfloat/service/VersionService.java
View File

@@ -62,12 +62,11 @@ public class VersionService {
}
private String resolveClientVersion() {
String packageJsonVersion = getPackageJsonVersion();
if (packageJsonVersion != null && !packageJsonVersion.isBlank()) {
return packageJsonVersion;
try {
return getPackageJsonVersion();
} catch (IOException e) {
throw new IllegalStateException("Client manifest is missing", e);
}
return serverVersion;
}
private String normalizeReleaseVersion(String baseVersion) {
@@ -159,23 +158,19 @@ public class VersionService {
return null;
}
private String getPackageJsonVersion() {
private String getPackageJsonVersion() throws IOException {
Path packageJsonPath = Paths.get("package.json");
if (!Files.exists(packageJsonPath) || !Files.isRegularFile(packageJsonPath)) {
return null;
}
try {
String packageJson = Files.readString(packageJsonPath, StandardCharsets.UTF_8);
Matcher matcher = PACKAGE_VERSION_PATTERN.matcher(packageJson);
if (matcher.find()) {
String version = matcher.group(1);
if (version != null && !version.isBlank()) {
return version.trim();
}
String packageJson = Files.readString(packageJsonPath, StandardCharsets.UTF_8);
Matcher matcher = PACKAGE_VERSION_PATTERN.matcher(packageJson);
if (matcher.find()) {
String version = matcher.group(1);
if (version != null && !version.isBlank()) {
return version.trim();
}
} catch (IOException e) {
LOG.warn("Unable to read version from package.json", e);
}
return null;