tweak memory settings, play with iOS audio fixes

Author: zigster64

README.md

@@ -68,7 +68,7 @@ This code is interesting, and worth a read for the following reasons :
 - It uses the excellent http.zig library https://github.com/karlseguin/http.zig to do all the web stuff. I have had exactly zero issues using this lib.
 - Single file binary, which includes the game, a web server, all assets such as HTML, images and audio.  1 file - no litter on your filesystem
 - Generated docker image = 770Kb (compressed) All it has is the compiled executable (2.5MB), which includes only a single binary, nothing else.
-- Run stats - uses about 60MB RAM and really low CPU %
+- Run stats - in ReleaseFast mode running a 2 player game, uses less than 2MB RAM to run, and hardly any CPU. Its pretty resource efficient.
 - Its about as simple as doing the same thing in Go, there is really nothing too nasty required in the code.  
 - The router, and all the HTML contents is part of the Game object ... the implications of this are that it is possible to create 'web components' using this
 zig/htmx approach that are all self contained, and can be imported into other projects, without having to know about connecting up routes, or pulling in content. Interesting.

build.zig.zon

@@ -5,7 +5,7 @@
     .dependencies = .{
         .http = .{
             .url = "https://github.com/zigster64/http.zig/archive/refs/heads/master.tar.gz",
-            .hash = "1220a436e7e2e498447d79057194e84c9f7158a8c796dbe721dbe14bb1de5f25c92f",
+	    .hash = "1220acf589a63430b28bdb796f5b923b8ad031fdd30291ec3f151b0982e1909be3e5",
         },
     },
 }

src/game.zig

@@ -10,7 +10,7 @@ const all_players: u8 = 100;
 
 const Self = @This();
 
-const MAX_PLAYERS = 8;
+pub const MAX_PLAYERS = 8;
 
 const State = enum {
     init,
@@ -288,9 +288,9 @@ fn lostAudio(self: *Self, req: *httpz.Request, res: *httpz.Response) !void {
 fn calcAudio(self: *Self, player: u8) []const u8 {
     if (player == self.current_player) {
         return switch (self.player_mode) {
-            .normal => "<script>yourTurnAudio.play()</script>",
-            .flipper => "<script>zeroWingAudio.play()</script>",
-            .nuke => "<script>nukeAudio.play()</script>",
+            .normal => "<script>yourTurnAudio.volume = 0.8; yourTurnAudio.play()</script>",
+            .flipper => "<script>zeroWingAudio.volume = 0.7; zeroWingAudio.play()</script>",
+            .nuke => "<script>nukeAudio.volume = 1; nukeAudio.play()</script>",
         };
     }
     return "";
@@ -393,7 +393,10 @@ fn showBoard(self: *Self, player: u8, res: *httpz.Response) !void {
 
     for (0..self.grid_y) |y| {
         for (0..self.grid_x) |x| {
-            const value = try self.board.get(x, y);
+            const value = self.board.get(x, y) catch |err| blk: {
+                std.log.info("get {} {} gives error {}", .{ x, y, err });
+                break :blk 0;
+            };
 
             // used square that we cant normally click on
             if (value != 0) {
@@ -426,7 +429,7 @@ fn showBoard(self: *Self, player: u8, res: *httpz.Response) !void {
                 continue;
             }
 
-            // empty square that we cant click on,because its another player's turn
+            // empty square that we cant click on,because its not your turn
             try w.print(@embedFile("html/board/square.x.html"), .{
                 .class = "grid-square",
                 .player = value,
@@ -644,9 +647,14 @@ fn setup(self: *Self, req: *httpz.Request, res: *httpz.Response) !void {
 /// events GET handler is an SSE stream that emits events whenever the state changes
 /// or a clock event expires. Uses the Game.event_condition to synch with the outer threads
 fn events(self: *Self, req: *httpz.Request, res: *httpz.Response) !void {
-    std.log.info("(event-source) GET /events {}", .{self.state});
+    const start_time = std.time.timestamp();
+    std.log.info("(event-source) GET /events {} started at {}", .{self.state, start_time});
     _ = req;
 
+    errdefer {
+        std.log.info("(event-source) started at {} now exiting", .{start_time});
+    }
+
     var stream = try res.startEventStream();
 
     // on initial connect, send the clock details, and send the last event processed
@@ -682,8 +690,8 @@ fn events(self: *Self, req: *httpz.Request, res: *httpz.Response) !void {
             defer self.game_mutex.unlock();
             std.log.debug("condition fired - last event is {}", .{self.last_event});
             if (self.last_event == .login) {
-                // this is a bit nasty - on a login event, need to wait a short time to let the 
-                // login handler flush itself so the client can get it's new player ID 
+                // this is a bit nasty - on a login event, need to wait a short time to let the
+                // login handler flush itself so the client can get it's new player ID
                 // before we signal the frontend that a new login event has happened
                 std.time.sleep(std.time.ns_per_ms * 200);
             }

src/html/header/winner-lost.html

@@ -1,2 +1,2 @@
 <span class="red">You Lost !</span>
-<script>lostAudio.play()</script>
+<script>lostAudio.volume = 1; lostAudio.play()</script>

src/html/index.html

@@ -10,11 +10,9 @@
     <script src="https://unpkg.com/htmx.org/dist/ext/sse.js"></script>
     <script src="https://unpkg.com/htmx.org/dist/ext/json-enc.js"></script>
 
-    <meta name="app-version" version="20230728.4">
-    <meta fix="use player uuids for security">
-    <meta fix="maybe fixes the login race condition">
-    <meta fix="added link to user manual / wiki">
-    <meta fix="readme updates">
+    <meta name="app-version" version="20230803.1">
+    <meta fix="tweak memory settings">
+    <meta fix="iOS audio fixes">
 
     <link rel="stylesheet" href="styles.css">
     <link rel="preconnect" href="https://fonts.googleapis.com">
@@ -63,6 +61,19 @@
         const victoryAudio = new Audio("audio/victory.mp3")
         const lostAudio = new Audio("audio/lost.mp3")
 
+        function sing(audio, volume) {
+            audio.volume = volume;
+            audio.play();
+        }
+
+        function initAllAudio() {
+            sing(yourTurnAudio, 1);
+            sing(zeroWingAudio, 0);
+            sing(nukeAudio, 0);
+            sing(victoryAudio, 0);
+            sing(lostAudio, 0);
+        }
+
         // Just some minimal vanilla-JS to add a couple of helper functions
         function getPlayer() {
             return document.getElementById("player").innerText;

src/html/setup/setup_game.x.html

@@ -1,6 +1,6 @@
 <form hx-post="/setup" hx-ext="json-enc">
     <div>
-        <input type="range" id="x" name="x" value="{[x]}" min="2" max="15"
+        <input type="range" id="x" name="x" value="{[x]}" min="2" max="12"
             oninput="document.getElementById('x-value').textContent = this.value">
         <span id="x-value">{[x]}</span>
         <label for="x">Columns</label>
@@ -36,7 +36,7 @@
         <label for="nuke">% Chance to set us up the Bomb ?</label>
     </div>
     <div>
-        <input class="blue-button" type="button" value="Enable Audio" onclick="yourTurnAudio.play()">
+        <input class="blue-button" type="button" value="Enable Audio" onclick="initAllAudio()">
     </div>
     <button class="green-button">Start</button>
 </form>

src/main.zig

@@ -2,18 +2,25 @@ const std = @import("std");
 const httpz = @import("httpz");
 const Game = @import("game.zig");
 
+const default_port = 3000;
+
+// always log .info, even in release modes
+pub const std_options = struct {
+    pub const log_level = .info;
+};
+
 pub fn usage() void {
     std.debug.print("USAGE: zig-zag-zoe [-p PORTNUMBER]\n", .{});
     std.debug.print("       or use the PORT env var to set the port, for like Docker or whatever\n", .{});
 }
 
 pub fn main() !void {
-    var port: u16 = 3000;
+    var port: u16 = default_port;
 
     var env_port = std.os.getenv("PORT");
     if (env_port != null and env_port.?.len > 0) {
         port = try std.fmt.parseInt(u16, env_port.?, 10);
-        std.debug.print("Port set to {} via ENV\n", .{port});
+        std.log.debug("Port set to {} via ENV\n", .{port});
     }
 
     var args = std.process.args();
@@ -37,8 +44,8 @@ pub fn main() !void {
         }
     }
 
-    std.debug.print("Starting Zig-Zag-Zoe server with new game.\n", .{});
-    std.debug.print("Go to http://localhost:{} to run the game\n", .{port});
+    std.log.info("Starting Zig-Zag-Zoe server with new game", .{});
+    std.log.info("Go to http://localhost:{} to run the game", .{port});
     var gpa = std.heap.GeneralPurposeAllocator(.{}){};
     const allocator = gpa.allocator();
 
@@ -55,6 +62,14 @@ pub fn main() !void {
     var server = try httpz.ServerCtx(*Game, *Game).init(allocator, .{
         .address = "0.0.0.0",
         .port = port,
+        .pool_size = Game.MAX_PLAYERS,
+        .request = .{
+            .max_body_size = 256,
+        },
+        .response = .{
+            .body_buffer_size = 100_000, // big enough for the biggest audio file
+            .header_buffer_size = 256,
+        },
     }, &game);
     server.notFound(notFound);
     server.errorHandler(errorHandler);