Merge pull request #34 from johnwmail/dev

Refactor to use Fetch API and remove legacy iframe handling

Author: johnwmail

MIGRATION.md

@@ -81,22 +81,19 @@ All functions that previously called `loadFromServer()` now use `fetchAPI()`:
 
  - `echoReqHtml()` — HTML wrapper used to execute parent callbacks from an iframe.
  - `ea()` — JS helper that encoded arrays into a string for embedding in HTML callback arguments.
- - `setVersion()` (frontend) — compatibility wrapper; version rendering is handled directly by `loadVersion()` now.
 
  In Go code, leftover helpers used only for the iframe flow were also removed.
 
  ## Notable updated handlers (backend)
 
  - `handleRequest` — accepts JSON (`Content-Type: application/json`) and falls back to form parsing if needed. It dispatches on the request `function` field and returns JSON.
- - `handleVersion` — returns `{status: "ok", "version": "..."}`.
  - `handleDirRequest`, `handleGetAllMp3`, `handleGetAllMp3InDir`, `handleGetAllDirs`, `handleGetAllMp3InDirs`, `handleSearchTitle`, `handleSearchDir` — all return consistent JSON shapes.
 
  The backend changes are focused on returning proper JSON and preserving behaviors (directory listing, searches, presigned URLs for S3, or local-file routing).
 
  ## Frontend changes (static/script.js)
 
  - New `fetchAPI()` async wrapper that sends JSON and parses JSON responses.
- - `loadVersion()` is async and updates the version DOM element directly.
  - UI callbacks (`getBrowserData`, `getSearchTitle`, `getSearchDir`, etc.) now accept JSON objects and handle them without iframe callbacks.
 
  ## Backward compatibility
@@ -116,7 +113,6 @@ All functions that previously called `loadFromServer()` now use `fetchAPI()`:
  Run these locally before/after deployment:
 
  - [x] Directory browsing (browse directories and see file lists)
- - [x] Version loads and displays in the UI
  - [x] Search by title (results show expected matches)
  - [x] Search by directory (results show expected matches)
  - [x] Get all MP3(s) and per-directory MP3 listings

main.go

@@ -293,18 +293,11 @@ func handleRequest(c *gin.Context) {
 		handleGetAllDirs(c)
 	case "getAllMp3InDirs":
 		handleGetAllMp3InDirs(c, req.Data)
-	case "version":
-		handleVersion(c)
 	default:
 		c.JSON(http.StatusOK, gin.H{"status": "error", "message": "Unknown function"})
 	}
 }
 
-func handleVersion(c *gin.Context) {
-	log.Printf("Returning version: %s", Version)
-	c.JSON(http.StatusOK, gin.H{"status": "ok", "version": Version})
-}
-
 // --- S3 Helper Functions ---
 
 func s3ListAllAudioFiles(prefix string) ([]string, error) {

main_test.go

@@ -60,55 +60,6 @@ func TestIsAudioFile(t *testing.T) {
 
 // (removed TestEa and its test-local ea implementation because the helper was removed from production code)
 
-// TestHandleVersion tests the version endpoint
-func TestHandleVersion(t *testing.T) {
-	// Save original values
-	origVersion := Version
-	origCommitHash := CommitHash
-	origBuildTime := BuildTime
-
-	defer func() {
-		Version = origVersion
-		CommitHash = origCommitHash
-		BuildTime = origBuildTime
-	}()
-
-	tests := []struct {
-		name    string
-		version string
-	}{
-		{
-			name:    "Dev version",
-			version: "dev",
-		},
-		{
-			name:    "Release version",
-			version: "v1.2.3",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			Version = tt.version
-
-			gin.SetMode(gin.TestMode)
-			w := httptest.NewRecorder()
-			c, _ := gin.CreateTestContext(w)
-
-			handleVersion(c)
-
-			assert.Equal(t, http.StatusOK, w.Code)
-
-			// Verify JSON response
-			var response map[string]interface{}
-			err := json.Unmarshal(w.Body.Bytes(), &response)
-			assert.NoError(t, err)
-			assert.Equal(t, "ok", response["status"])
-			assert.Equal(t, tt.version, response["version"])
-		})
-	}
-}
-
 // TestUsingLocal tests the backend detection
 func TestUsingLocal(t *testing.T) {
 	// Save original
@@ -354,14 +305,6 @@ func TestHandleRequest(t *testing.T) {
 		wantJSONStatus string
 		checkFields    []string
 	}{
-		{
-			name:           "Get version",
-			function:       "version",
-			data:           "",
-			wantStatus:     http.StatusOK,
-			wantJSONStatus: "ok",
-			checkFields:    []string{"version"},
-		},
 		{
 			name:           "List root directory",
 			function:       "dir",
@@ -428,39 +371,6 @@ func TestHandleRequest(t *testing.T) {
 	}
 }
 
-// TestHandleRequestFormData tests backwards compatibility with form data
-func TestHandleRequestFormData(t *testing.T) {
-	tmpDir, err := os.MkdirTemp("", "gomusic-test-*")
-	assert.NoError(t, err)
-	defer os.RemoveAll(tmpDir)
-
-	origLocalMusicDir := localMusicDir
-	defer func() {
-		localMusicDir = origLocalMusicDir
-	}()
-	localMusicDir = tmpDir
-
-	gin.SetMode(gin.TestMode)
-
-	w := httptest.NewRecorder()
-	c, _ := gin.CreateTestContext(w)
-
-	// Create form data request (legacy iframe style)
-	formData := "dffunc=version&dfdata="
-	c.Request = httptest.NewRequest("POST", "/api", strings.NewReader(formData))
-	c.Request.Header.Set("Content-Type", "application/x-www-form-urlencoded")
-
-	handleRequest(c)
-
-	assert.Equal(t, http.StatusOK, w.Code)
-
-	var response map[string]interface{}
-	err = json.Unmarshal(w.Body.Bytes(), &response)
-	assert.NoError(t, err)
-	assert.Equal(t, "ok", response["status"])
-	assert.Contains(t, response, "version")
-}
-
 // TestHandleDirRequest tests directory listing
 func TestHandleDirRequest(t *testing.T) {
 	tmpDir, err := os.MkdirTemp("", "gomusic-test-*")

static/index.html

@@ -34,7 +34,7 @@ <h1 class="header-title">
 								d="M8 0C3.58 0 0 3.58 0 8a7.96 7.96 0 0 0 5.47 7.59c.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.01.08-2.1 0 0 .67-.21 2.2.82a7.55 7.55 0 0 1 2-.27c.68 0 1.37.09 2 .27 1.52-1.03 2.2-.82 2.2-.82.44 1.09.16 1.9.08 2.1.51.56.82 1.28.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A7.96 7.96 0 0 0 16 8c0-4.42-3.58-8-8-8Z" />
 						</svg>
 					</span>
-					<span id="appVersion">Loading ...</span>
+					<span id="appVersion">__VERSION__</span>
 				</div>
 			</a>
 		</div>

static/script.js

@@ -83,10 +83,6 @@ function getBrowserData(data) {
         browserDirs = data.dirs || [];
         browserTitles = data.files || [];
         updateBrowser();
-        // Load version after initial directory is loaded (only on first load)
-        if (browserCurDir === '' && gebi('appVersion').textContent === 'Loading ...') {
-            loadVersion();
-        }
     } else {
         alert(data.message || 'Error loading directory');
     }
@@ -128,14 +124,6 @@ function init() {
     }
 }
 
-async function loadVersion() {
-    const data = await fetchAPI('version', '');
-    if (data.status === 'ok' && data.version) {
-        gebi('appVersion').textContent = data.version;
-    }
-}
-
-
 function markLoading(tab) {
     var browserLoader = gebi('markLoadBrowser');
     var searchLoader = gebi('markLoadSearch');