Fix script disk watcher registration for runtime and manual disk creation

Agent-Logs-Url: https://github.com/CyclopsMC/IntegratedScripting/sessions/36e2dd59-8157-4d69-b974-dbb9b29ccd47

Co-authored-by: rubensworks <440384+rubensworks@users.noreply.github.com>

Author: Copilot

src/main/java/org/cyclops/integratedscripting/core/network/ScriptingData.java

@@ -105,6 +105,18 @@ public void initialize() {
             e.printStackTrace();
         }
 
+        // Register watcher for all disk directories
+        try {
+            WatchKey watchKey = disksPath.register(watchService,
+                    StandardWatchEventKinds.ENTRY_CREATE,
+                    StandardWatchEventKinds.ENTRY_MODIFY,
+                    StandardWatchEventKinds.ENTRY_DELETE);
+            pathWatchers.put(disksPath, watchKey);
+            pathWatchersReverse.put(watchKey, disksPath);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
         // Collect all disk ids
         List<Integer> diskIds = Lists.newArrayList();
         try {
@@ -248,6 +260,7 @@ public void setScripts(int disk, Map<Path, String> scripts, ChangeLocation chang
             }
 
             // Register watchers for all directories
+            this.registerPathWatcher(disk, null);
             for (Path path : scripts.keySet()) {
                 this.registerPathWatcher(disk, path.getParent());
             }
@@ -366,6 +379,8 @@ protected void flushScript(int disk, Path scriptPathRelative) {
             } else {
                 scriptPathAbsolute.getParent().toFile().mkdirs();
                 FileUtils.write(scriptPathAbsolute.toFile(), script, StandardCharsets.UTF_8);
+                this.registerPathWatcher(disk, null);
+                this.registerPathWatcher(disk, scriptPathRelative.getParent());
             }
         } catch (IOException e) {
             e.printStackTrace();

src/test/java/org/cyclops/integratedscripting/core/network/ScriptingDataTest.java

@@ -0,0 +1,76 @@
+package org.cyclops.integratedscripting.core.network;
+
+import org.apache.commons.io.FileUtils;
+import org.cyclops.integratedscripting.api.network.IScriptingData;
+import org.junit.Test;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.hasItem;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
+public class ScriptingDataTest {
+
+    @Test
+    public void testExternalUpdatesOnRuntimeCreatedDiskFolderAreSynced() throws IOException, InterruptedException {
+        Path rootPath = Files.createTempDirectory("integratedscripting-test");
+        ScriptingData scriptingData = new ScriptingData(rootPath);
+        try {
+            scriptingData.initialize();
+
+            Path diskPath = rootPath.resolve("scripting-disks").resolve("123");
+            Files.createDirectories(diskPath);
+            awaitCondition(() -> scriptingData.getDisks().contains(123));
+
+            Files.writeString(diskPath.resolve("main.js"), "export const value = 1;");
+            awaitCondition(() -> "export const value = 1;".equals(scriptingData.getScripts(123).get(Path.of("main.js"))));
+
+            assertThat(scriptingData.getDisks(), hasItem(123));
+            assertThat(scriptingData.getScripts(123).get(Path.of("main.js")), equalTo("export const value = 1;"));
+        } finally {
+            scriptingData.close();
+            FileUtils.deleteDirectory(rootPath.toFile());
+        }
+    }
+
+    @Test
+    public void testExternalUpdatesOnRuntimeFirstUsedDiskAreSynced() throws IOException, InterruptedException {
+        Path rootPath = Files.createTempDirectory("integratedscripting-test");
+        ScriptingData scriptingData = new ScriptingData(rootPath);
+        try {
+            scriptingData.initialize();
+
+            scriptingData.setScript(456, Path.of("main.js"), "export const value = 1;", IScriptingData.ChangeLocation.MEMORY);
+            scriptingData.tick();
+            assertTrue(Files.exists(rootPath.resolve("scripting-disks").resolve("456").resolve("main.js")));
+
+            Files.writeString(rootPath.resolve("scripting-disks").resolve("456").resolve("main.js"), "export const value = 2;");
+            awaitCondition(() -> "export const value = 2;".equals(scriptingData.getScripts(456).get(Path.of("main.js"))));
+
+            assertThat(scriptingData.getScripts(456).get(Path.of("main.js")), equalTo("export const value = 2;"));
+        } finally {
+            scriptingData.close();
+            FileUtils.deleteDirectory(rootPath.toFile());
+        }
+    }
+
+    private static void awaitCondition(Condition condition) throws InterruptedException {
+        long deadline = System.currentTimeMillis() + 5000;
+        while (System.currentTimeMillis() < deadline) {
+            if (condition.matches()) {
+                return;
+            }
+            Thread.sleep(25);
+        }
+        assertTrue("Timed out waiting for condition", condition.matches());
+    }
+
+    @FunctionalInterface
+    private interface Condition {
+        boolean matches();
+    }
+}