Ok, this should be more or less it

Author: zefhemel

pkg/server/cmd/server.go

@@ -112,8 +112,16 @@ func buildConfig(bundledFiles fs.FS, args []string) *server.ServerConfig {
 		}
 	}
 
-	serverConfig.ClientBundle = server.NewReadOnlyFallthroughSpacePrimitives(bundledFiles, "dist_client_bundle", time.Now(), nil)
-	serverConfig.SpacePrimitives = server.NewReadOnlyFallthroughSpacePrimitives(bundledFiles, "dist_plug_bundle", time.Now(), spacePrimitives)
+	// Extract the last modified time from the main binary, best effort
+	bundlePathDate := time.Now()
+	if executablePath, err := os.Executable(); err == nil {
+		if stat, err := os.Stat(executablePath); err == nil {
+			bundlePathDate = stat.ModTime()
+		}
+	}
+
+	serverConfig.ClientBundle = server.NewReadOnlyFallthroughSpacePrimitives(bundledFiles, "dist_client_bundle", bundlePathDate, nil)
+	serverConfig.SpacePrimitives = server.NewReadOnlyFallthroughSpacePrimitives(bundledFiles, "dist_plug_bundle", bundlePathDate, spacePrimitives)
 
 	log.Printf("Starting SilverBullet binding to %s:%d", serverConfig.Hostname, serverConfig.Port)
 	if serverConfig.Hostname == "127.0.0.1" {

pkg/server/fs.go

@@ -17,7 +17,22 @@ func buildFsRoutes(spacePrimitives SpacePrimitives, spacePath string) http.Handl
 	fsRouter := chi.NewRouter()
 
 	// File list endpoint
-	fsRouter.Get("/", func(w http.ResponseWriter, r *http.Request) {
+	fsRouter.Get("/", handleFsList(spacePrimitives, spacePath))
+
+	// File operations
+	fsRouter.Get("/*", handleFsGet(spacePrimitives))
+	fsRouter.Put("/*", handleFsPut(spacePrimitives))
+	fsRouter.Delete("/*", handleFsDelete(spacePrimitives))
+	fsRouter.Options("/*", func(w http.ResponseWriter, r *http.Request) {
+		w.Header().Set("Allow", "GET, PUT, DELETE, OPTIONS")
+		w.WriteHeader(http.StatusOK)
+	})
+
+	return fsRouter
+}
+
+func handleFsList(spacePrimitives SpacePrimitives, spacePath string) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
 		if r.Header.Get("X-Sync-Mode") != "" {
 			// Handle direct requests for JSON representation of file list
 			files, err := spacePrimitives.FetchFileList()
@@ -27,23 +42,11 @@ func buildFsRoutes(spacePrimitives SpacePrimitives, spacePath string) http.Handl
 			}
 			w.Header().Set("X-Space-Path", spacePath)
 			render.JSON(w, r, files)
-
 		} else {
 			// Otherwise, redirect to the UI
 			http.Redirect(w, r, "/", http.StatusTemporaryRedirect)
 		}
-	})
-
-	// File operations
-	fsRouter.Get("/*", handleFsGet(spacePrimitives))
-	fsRouter.Put("/*", handleFsPut(spacePrimitives))
-	fsRouter.Delete("/*", handleFsDelete(spacePrimitives))
-	fsRouter.Options("/*", func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Allow", "GET, PUT, DELETE, OPTIONS")
-		w.WriteHeader(http.StatusOK)
-	})
-
-	return fsRouter
+	}
 }
 
 // handleFsGet handles GET requests for individual files