Merge pull request #37 from johnwmail/dev

Merge pull request #35 from johnwmail/feature/tmpl

Author: johnwmail

.github/workflows/container.yml

@@ -35,8 +35,9 @@ jobs:
           else
             VERSION="sha-${GITHUB_SHA::7}"
           fi
-          echo "Replacing __VERSION__ with ${VERSION} in static/index.html"
-          sed -i "s/__VERSION__/${VERSION}/g" static/index.html
+          # If using static/index.html replacement, uncomment to replace __VERSION__ placeholder
+          #echo "Replacing __VERSION__ with ${VERSION} in static/index.html"
+          #sed -i "s/__VERSION__/${VERSION}/g" static/index.html
 
       - name: Set up QEMU (for multi-arch builds)
         uses: docker/setup-qemu-action@v3

.github/workflows/deploy-lambda.yml

@@ -69,8 +69,8 @@ jobs:
       - name: Build Lambda bootstrap
         run: |
           # Replace __VERSION__ placeholder in index.html for cache busting
-          echo "Replacing __VERSION__ with ${VERSION} in static/index.html"
-          sed -i "s/__VERSION__/${VERSION}/g" static/index.html
+          #echo "Replacing __VERSION__ with ${VERSION} in static/index.html"
+          #sed -i "s/__VERSION__/${VERSION}/g" static/index.html
 
           go build \
             -ldflags "-X main.BuildTime=$(date --utc +%Y-%m-%dT%H:%M:%SZ) -X main.CommitHash=${{ github.sha }} -X main.Version=${VERSION}" \
@@ -82,6 +82,7 @@ jobs:
           mkdir -p lambda-artifacts
           mv -f bootstrap lambda-artifacts/bootstrap
           cp -r static lambda-artifacts/static
+          cp -r templates lambda-artifacts/templates
           ls -l lambda-artifacts
 
       - name: Configure AWS credentials

.github/workflows/release.yml

@@ -73,8 +73,8 @@ jobs:
           fi
 
           # Replace __VERSION__ placeholder in index.html for cache busting
-          echo "Replacing __VERSION__ with ${VERSION} in static/index.html"
-          sed -i "s/__VERSION__/${VERSION}/g" static/index.html
+          #echo "Replacing __VERSION__ with ${VERSION} in static/index.html"
+          #sed -i "s/__VERSION__/${VERSION}/g" static/index.html
 
           # Ensure dist directory exists
           mkdir -p dist
@@ -105,6 +105,7 @@ jobs:
               # Copy the binary and rename it to generic 'go-music'
               cp "$file" "$pkg_dir/go-music"
               cp -r ../static "$pkg_dir/"
+              cp -r ../templates "$pkg_dir/"
               tar -czf "${file}.tar.gz" "$pkg_dir"
               rm -rf "$pkg_dir"
               echo "Created archive: ${file}.tar.gz"

MIGRATION.md

@@ -144,7 +144,7 @@ All functions that previously called `loadFromServer()` now use `fetchAPI()`:
  Once the new fetch-based flow is stable, consider removing:
 
  1. Form-data fallback parsing in `handleRequest()`.
- 2. Any leftover iframe/form DOM elements in `static/index.html`.
+ 2. Any leftover iframe/form DOM elements in `templates/index.html`.
  3. Any migration-only comments or shim helpers in the codebase.
 
  ## Notes about `setVersion()`

README.md

@@ -118,11 +118,12 @@ The app switches to Lambda mode when `AWS_LAMBDA_FUNCTION_NAME` is present. The
      -o bootstrap .
    ```
 
-2. Package with static assets:
+2. Package with static and templates assets:
    ```bash
    mkdir -p lambda-artifacts
    mv bootstrap lambda-artifacts/
    cp -r static lambda-artifacts/
+   cp -r templates lambda-artifacts/
    cd lambda-artifacts && zip -r ../deployment.zip . && cd ..
    ```
 

docker/Dockerfile

@@ -22,6 +22,7 @@ WORKDIR /app
 
 # copy static assets from build stage (they live at /build/static inside the build stage)
 COPY --from=build /build/static /app/static
+COPY --from=build /build/templates /app/templates
 # copy the compiled binary placed at /build/go-music in the build stage
 COPY --from=build /build/go-music /app/go-music
 

main.go

@@ -5,6 +5,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"html/template"
 	"log"
 	"net/http"
 	"os"
@@ -24,6 +25,7 @@ import (
 
 var ginLambda *ginadapter.GinLambdaV2
 var r *gin.Engine
+var indexTmpl *template.Template
 
 const (
 	CHARSET           = "UTF-8"
@@ -47,9 +49,9 @@ var s3Client *s3.Client
 
 // Build info variables, set via -ldflags at build time
 var (
-	Version    = "dev"
-	BuildTime  = "unknown"
-	CommitHash = "none"
+	Version    = "vDev"
+	BuildTime  = "timeless"
+	CommitHash = "sha-unknown"
 )
 
 // init function runs before main and sets up the Gin router.
@@ -73,8 +75,18 @@ func init() {
 
 	r = gin.Default()
 	r.Static("/static", "./static")
+	// Parse index.html once and render as a Go template so we can inject build info
+	// like the Version string dynamically from the Go build.
+	indexTmpl = template.Must(template.ParseFiles("./templates/index.html"))
 	r.GET("/", func(c *gin.Context) {
-		c.File("./static/index.html")
+		data := struct{ Version string }{Version: Version}
+		var buf bytes.Buffer
+		if err := indexTmpl.Execute(&buf, data); err != nil {
+			log.Printf("failed to render index template: %v", err)
+			c.String(http.StatusInternalServerError, "Internal Server Error")
+			return
+		}
+		c.Data(http.StatusOK, "text/html; charset=utf-8", buf.Bytes())
 	})
 	r.GET("/favicon.ico", func(c *gin.Context) {
 		c.File("./static/favicon.ico")

main_test.go

@@ -651,3 +651,18 @@ func TestHandleSearchInDir(t *testing.T) {
 		assert.Contains(t, mm, "dir")
 	}
 }
+
+// TestIndexServesVersion ensures the server-side template injects the build Version
+// into the served HTML for the index page.
+func TestIndexServesVersion(t *testing.T) {
+	gin.SetMode(gin.TestMode)
+
+	w := httptest.NewRecorder()
+	req := httptest.NewRequest("GET", "/", nil)
+	// Use the global router created in init()
+	r.ServeHTTP(w, req)
+
+	assert.Equal(t, http.StatusOK, w.Code)
+	body := w.Body.String()
+	assert.Contains(t, body, Version, "index page should contain Version string")
+}

static/index.html renamed to templates/index.html

@@ -7,7 +7,7 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
 	<meta name="mobile-web-app-capable" content="yes">
 	<meta name="theme-color" content="#2196f3">
-	<link rel="stylesheet" href="/static/style.css?v=__VERSION__">
+	<link rel="stylesheet" href="/static/style.css?v={{ .Version }}">
 </head>
 
 <body onload="init()">
@@ -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">__VERSION__</span>
+					<span id="appVersion">{{ .Version }}</span>
 				</div>
 			</a>
 		</div>
@@ -121,7 +121,7 @@ <h1 class="header-title">
 
 	</main>
 
-	<script src="/static/script.js?v=__VERSION__"></script>
+	<script src="/static/script.js?v={{ .Version }}"></script>
 </body>
 
 </html>