cache buster

.github/workflows/docker-build-self.yml

@@ -14,10 +14,12 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
 
+      - name: Write build number
+        run: echo "${{ github.run_number }}" >> build_number
+
       - name: Build Docker image
         run: |
           IMAGE_NAME="go-web-server"
-            RUN_NUMBER="${{ github.run_number }}"
           docker build -t "$IMAGE_NAME:latest" -t "$IMAGE_NAME:${{ github.run_number }}" .
 
       - name: Ensure no existing temp container
@@ -27,7 +29,6 @@ jobs:
             docker rm temp-go-web-server || true
           fi
 
-
       - name: Run temporary container for health check
         run: |
           docker run -d --name temp-go-web-server -p 54322:54321 go-web-server:latest
@@ -55,4 +56,3 @@ jobs:
         run: |
           IMAGE_NAME="go-web-server"
           docker run -d --name go-web-server -p 54321:54321 --restart=always -v  "/volume2/docker/knet/data:/app/data" "$IMAGE_NAME:latest"
-  

build_number

@@ -0,0 +1 @@
+1

dockerfile

@@ -15,6 +15,7 @@ COPY ./src ./src
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o /server ./src
 
 COPY ./views ./views
+COPY ./build_number ./build_number
 
 FROM scratch
 

js/boxes.js

@@ -33,20 +33,8 @@
             socket.send("b:" + id + ":" + value);
         });
     });
-    var autoPlayTimer = undefined;
-    const handleAutoPlay = (el) => {
-        if (el.checked) {
-            autoPlayTimer = setInterval(() => {
-                socket.send("random");
-            }, 50);
-        }
-        else {
-            clearInterval(autoPlayTimer);
-        }
-    };
-    const autoPlayEl = document.querySelector("#auto-boxes");
-    handleAutoPlay(autoPlayEl);
-    autoPlayEl?.addEventListener("change", (e) => handleAutoPlay(e.target));
+    const autoPlayEl = document.querySelector("#randomize");
+    autoPlayEl?.addEventListener("click", (e) => socket.send("r:1000"));
     var golTimer = undefined;
     const handleGol = (el) => {
         if (el.checked) {

js/boxes.ts

@@ -46,22 +46,8 @@ type Box = {
     });
   });
 
-  var autoPlayTimer: number | undefined = undefined;
-  const handleAutoPlay = (el: CheckboxEl) => {
-    if (el.checked) {
-      autoPlayTimer = setInterval(() => {
-        socket.send("random");
-      }, 50);
-    } else {
-      clearInterval(autoPlayTimer);
-    }
-  };
-
-  const autoPlayEl = document.querySelector("#auto-boxes") as CheckboxEl;
-  handleAutoPlay(autoPlayEl);
-  autoPlayEl?.addEventListener("change", (e) =>
-    handleAutoPlay(e.target as CheckboxEl)
-  );
+  const autoPlayEl = document.querySelector("#randomize") as CheckboxEl;
+  autoPlayEl?.addEventListener("click", (e) => socket.send("r:1000"));
 
   var golTimer: number | undefined = undefined;
   const handleGol = (el: CheckboxEl) => {

src/boxes/box-db.go

@@ -57,13 +57,12 @@ func (box Box) persist() {
 		log.Fatal(err)
 	}
 
-	res, err := stmt.Exec(box.Id, box.Value)
+	_, err = stmt.Exec(box.Id, box.Value)
 	if err != nil {
 		log.Fatal(err)
 	}
 	stmt.Close()
 
-	log.Info(res.LastInsertId())
 }
 
 func getBox(id int) (Box, error) {

src/boxes/boxes.go

@@ -58,7 +58,6 @@ func handleWsError(err error, conn *websocket.Conn) {
 func broadcastMessage(message string) {
 	wsMutex.Lock()
 	defer wsMutex.Unlock()
-
 	for conn := range wsConnections {
 		err := websocket.Message.Send(conn, message)
 		handleWsError(err, conn)
@@ -66,6 +65,22 @@ func broadcastMessage(message string) {
 	}
 }
 
+func randomizeBoxes(count int) []Box {
+	boxes := make([]Box, count)
+	for i := 0; i < count; i++ {
+		index := random.Int() % 1000
+		box, err := getBox(index)
+		if err != nil {
+			log.Fatal(err)
+		}
+		box.Value = !box.Value
+		box.persist()
+		boxes[i] = box
+	}
+	return boxes
+
+}
+
 func handleMessage(msg string, ws *websocket.Conn) error {
 	if msg == "gol" {
 		matrix := make(map[string]Box)
@@ -77,7 +92,6 @@ func handleMessage(msg string, ws *websocket.Conn) error {
 				index++
 			}
 		}
-		log.Error(matrix)
 		nextGen := make([]Box, 0)
 		for id, item := range matrix {
 			nextItem := shouldBeAlive(matrix, id)
@@ -94,16 +108,17 @@ func handleMessage(msg string, ws *websocket.Conn) error {
 		}
 		broadcastMessage(nextMessage)
 
-	} else if msg == "random" {
-		index := random.Int() % 1000
-		box, err := getBox(index)
+	} else if strings.Contains(msg, "r:") {
+		count, err := strconv.Atoi(strings.Split(msg, ":")[1])
 		if err != nil {
-			log.Fatal(err)
+			log.Errorf("Failed to parse randomize count: %v", err)
+		}
+		boxes := randomizeBoxes(count)
+		message := ""
+		for _, box := range boxes {
+			message += box.serialize()
 		}
-		box.Value = !box.Value
-		box.persist()
 
-		message := box.serialize()
 		broadcastMessage(message)
 
 	} else if strings.Contains(msg, "b:") {

src/draw/draw.go

@@ -8,6 +8,8 @@ import (
 	"github.com/labstack/echo/v4"
 	"github.com/labstack/gommon/log"
 	"golang.org/x/net/websocket"
+
+	"knet.sk/src/util"
 )
 
 var (
@@ -86,9 +88,9 @@ func InitWs(c echo.Context) error {
 }
 
 type Data struct {
-	Template string
+	BuildNumber string
 }
 
 func Page(c echo.Context) error {
-	return c.Render(200, "index2", Data{Template: "draw"})
+	return c.Render(200, "index2", Data{BuildNumber: util.GetBuildNumber()})
 }

src/main.go

@@ -9,6 +9,7 @@ import (
 	"github.com/labstack/gommon/log"
 	"knet.sk/src/boxes"
 	"knet.sk/src/draw"
+	"knet.sk/src/util"
 )
 
 type Templates struct {
@@ -27,11 +28,13 @@ func NewTemplates() *Templates {
 
 type Page struct {
 	Boxes       []boxes.Box
+	BuildNumber string
 }
 
 func newPage(boxes []boxes.Box) Page {
 	return Page{
 		Boxes:       boxes,
+		BuildNumber: util.GetBuildNumber(),
 	}
 }
 
@@ -41,6 +44,7 @@ var (
 
 func main() {
 	e.Renderer = NewTemplates()
+	// read the ./build_number file
 
 	e.Logger.SetLevel(log.DEBUG)
 	e.Use(middleware.Logger())

src/util/build-number.go

@@ -0,0 +1,20 @@
+package util
+
+import (
+	"fmt"
+	"os"
+)
+
+var buildNumber string
+
+func GetBuildNumber() string {
+	if buildNumber == "" {
+		b, err := os.ReadFile("build_number") // just pass the file name
+		if err != nil {
+			fmt.Print(err)
+		}
+		buildNumber = string(b)
+	}
+
+	return buildNumber
+}

views/boxes.html

@@ -1,16 +1,16 @@
 {{block "boxes" .}}
-<link rel="stylesheet" href="/css/boxes.css" />
+<link rel="stylesheet" href="/css/boxes.css?v={{.BuildNumber}}" />
 <div class="boxes-container">
   <label>
-    Auto play boxes
-    <input type="checkbox" id="auto-boxes" />
+   
+    <Button id="randomize">Randomize</Button> 
   </label>
   <label>
     Auto play Game of Life
     <input type="checkbox" id="game-of-life" />
   </label>
   <div class="boxes">
-    {{range .}}<label
+    {{range .Boxes}}<label
       ><input
         type="checkbox"
         id="box-{{.Id}}"
@@ -24,6 +24,6 @@
   </div>
 </div>
 
-<script src="js/ws.js"></script>
-<script src="js/boxes.js"></script>
+<script src="js/ws.js?v={{.BuildNumber}}"></script>
+<script src="js/boxes.js?v={{.BuildNumber}}"></script>
 {{end}}

views/draw.html

@@ -23,9 +23,9 @@
       bottom: 0;
     "
   ></div>
-    <script src="js/ws.js"></script>
-    <script src="/js/mitt/mitt.js"></script>
-    <script src="/js/draw.js"></script>
+    <script src="js/ws.js?v={{.BuildNumber}}"></script>
+    <script src="/js/mitt/mitt.js?v={{.BuildNumber}}"></script>
+    <script src="/js/draw.js?v={{.BuildNumber}}"></script>
     {{end}}
   </div>
 </div>

views/drawIndex.html

@@ -5,12 +5,12 @@
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Home</title>
-    <link rel="stylesheet" href="/css/main.css" />
+    <link rel="stylesheet" href="/css/main.css?v={{.BuildNumber}}" />
   </head>
   <body>
     <main>
       <section>
-        {{template "draw" }}
+        {{template "draw" . }}
       </section>
     </main>
   </body>

views/index.html

@@ -5,7 +5,7 @@
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Home</title>
-    <link rel="stylesheet" href="/css/main.css" />
+    <link rel="stylesheet" href="/css/main.css?v={{.BuildNumber}}" />
   </head>
   <body>
     <header>
@@ -20,7 +20,7 @@
 
     <main>
       <section>
-        {{template "boxes" .Boxes}}
+        {{template "boxes" .}}
       </section>
     </main>