Merge pull request #43586 from phillip-kruger/create-index.html

Watch for index.html creation
quarkusio · Sep 30, 2024 · 9bba606 · 9bba606
2 parents 79099ce + 711d22b
commit 9bba606
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 9 deletions.
diff --git a/...p/deployment/src/main/java/io/quarkus/vertx/http/deployment/StaticResourcesProcessor.java b/...p/deployment/src/main/java/io/quarkus/vertx/http/deployment/StaticResourcesProcessor.java
@@ -14,9 +14,11 @@
 import io.quarkus.bootstrap.classloading.QuarkusClassLoader;
 import io.quarkus.deployment.Capabilities;
 import io.quarkus.deployment.Capability;
+import io.quarkus.deployment.IsDevelopment;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.annotations.Record;
+import io.quarkus.deployment.builditem.HotDeploymentWatchedFileBuildItem;
 import io.quarkus.deployment.builditem.LaunchModeBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
 import io.quarkus.deployment.pkg.steps.NativeOrNativeSourcesBuild;
@@ -31,6 +33,12 @@
  */
 public class StaticResourcesProcessor {
 
+    @BuildStep(onlyIf = IsDevelopment.class)
+    HotDeploymentWatchedFileBuildItem indexHtmlFile() {
+        String staticRoot = StaticResourcesRecorder.META_INF_RESOURCES + "/index.html";
+        return new HotDeploymentWatchedFileBuildItem(staticRoot, !QuarkusClassLoader.isResourcePresentAtRuntime(staticRoot));
+    }
+
     @BuildStep
     void collectStaticResources(Capabilities capabilities,
             List<AdditionalStaticResourceBuildItem> additionalStaticResources,

diff --git a/extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/qwc/qwc-welcome.js b/extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/qwc/qwc-welcome.js
diff --git a/...ertx-http/runtime/src/main/java/io/quarkus/devui/runtime/DevUIBuildTimeStaticHandler.java b/...ertx-http/runtime/src/main/java/io/quarkus/devui/runtime/DevUIBuildTimeStaticHandler.java
@@ -61,7 +61,6 @@ public void handle(RoutingContext event) {
                             .putHeader(CONTENT_TYPE, getMimeType(fileName))
                             .end(Buffer.buffer(content));
                 } catch (IOException ex) {
-                    ex.printStackTrace();
                     event.next();
                 }
             } else {

diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/DevUIWebSocket.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/DevUIWebSocket.java
@@ -36,8 +36,12 @@ public void handle(AsyncResult<ServerWebSocket> event) {
     }
 
     private void addSocket(ServerWebSocket session) {
-        JsonRpcRouter jsonRpcRouter = CDI.current().select(JsonRpcRouter.class).get();
-        jsonRpcRouter.addSocket(session);
+        try {
+            JsonRpcRouter jsonRpcRouter = CDI.current().select(JsonRpcRouter.class).get();
+            jsonRpcRouter.addSocket(session);
+        } catch (IllegalStateException ise) {
+            LOG.debug("Failed to connect to dev ui communication server, " + ise.getMessage());
+        }
     }
 
     private static final String UPGRADE = "Upgrade";

diff --git a/.../runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/FileSystemStaticHandler.java b/.../runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/FileSystemStaticHandler.java
@@ -130,7 +130,7 @@ private void sendStatic(RoutingContext context, String path) throws IOException
         Path found = null;
         for (Path root : resolvedWebRoots) {
             Path resolved = root.resolve(path);
-            if (Files.exists(resolved)) {
+            if (resolved.getFileSystem().isOpen() && Files.exists(resolved)) {
                 found = resolved;
                 break;
             }

diff --git a/...c/main/java/io/quarkus/vertx/http/runtime/devmode/StaticResourcesHotReplacementSetup.java b/...c/main/java/io/quarkus/vertx/http/runtime/devmode/StaticResourcesHotReplacementSetup.java
@@ -1,6 +1,5 @@
 package io.quarkus.vertx.http.runtime.devmode;
 
-import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
@@ -34,9 +33,7 @@ public void close() {
 
     private void addPathIfContainsStaticResources(List<Path> resources, Path resourceDir) {
         Path resource = resourceDir.resolve(StaticResourcesRecorder.META_INF_RESOURCES);
-        if (Files.exists(resource)) {
-            resources.add(resource);
-        }
+        resources.add(resource);
     }
 
 }