fix: reload and watcher

Signed-off-by: gfanton <[email protected]>

contribs/gnodev/pkg/events/static/hotreload.js

@@ -1,23 +1,51 @@
 (function() {
+    // Define the events that will trigger a page reload
     var eventsReload = {{ .ReloadEvents | jsEventsArray }};
+
+    // Establish the WebSocket connection to the event server
     var ws = new WebSocket('ws://{{- .Remote -}}');
+
+    // Flag to determine if the page is in the grace period after loading
+    var gracePeriod = true;
+    var graceTimeout = 1000; // ms
 
+    // Set a timer to end the grace period after `graceTimeout`
+    var debounceTimeout = setTimeout(function() {
+        gracePeriod = false;
+    }, graceTimeout); 
+
+    // Handle incoming WebSocket messages
     ws.onmessage = function(event) {
         try {
             var message = JSON.parse(event.data);
-            console.log('receiving message:', message);
-            if (eventsReload.includes(message.type)) {
+            console.log('Receiving message:', message);
+
+            // Ignore events not in the reload-triggering list
+            if (!eventsReload.includes(message.type)) {
+                return; 
+            }
+
+            // Reload the page immediately if we're not in the grace period
+            if (!gracePeriod) {
                 window.location.reload();
+                return;
             }
+
+            // If still in the grace period, debounce the reload
+            clearTimeout(debounceTimeout);
+            debounceTimeout = setTimeout(function() {
+                window.location.reload();
+            }, graceTimeout);
+
         } catch (e) {
-            console.error('Error parsing message:', e);
+            console.error('Error handling message:', e);
         }
     };
 
+    // Handle ws errors and closure
     ws.onerror = function(error) {
         console.error('WebSocket Error:', error);
     };
-
     ws.onclose = function() {
         console.log('WebSocket connection closed');
     };

contribs/gnodev/pkg/watcher/watch.go

@@ -129,11 +129,14 @@ func (p *PackageWatcher) AddPackages(pkgs ...gnomod.Pkg) error {
 			return len(p.pkgsDir[i]) <= len(dir) // Longest paths first
 		})
 
-		// Check for duplicates at the insertion point to avoid redundancy
+		// Check for duplicates
 		if index < len(p.pkgsDir) && p.pkgsDir[index] == dir {
 			continue // Skip
 		}
 
+		// Insert the package
+		p.pkgsDir = append(p.pkgsDir[:index], append([]string{abs}, p.pkgsDir[index:]...)...)
+
 		// Add the package to the watcher and handle any errors
 		if err := p.watcher.Add(abs); err != nil {
 			return fmt.Errorf("unable to watch %q: %w", pkg.Dir, err)
@@ -149,8 +152,10 @@ func (p *PackageWatcher) generatePackagesUpdateList(paths []string) PackageUpdat
 	mpkgs := map[string]*events.PackageUpdate{} // Pkg -> Update
 	for _, path := range paths {
 		for _, pkg := range p.pkgsDir {
-			// Check if the path is inside the package directory
-			if !strings.HasPrefix(pkg, path) {
+			dirPath := filepath.Dir(path)
+
+			// Check if a package directory contain our path directory
+			if !strings.HasPrefix(pkg, dirPath) {
 				continue
 			}