From 9b84d6f651eda8af1247a107cdfc5ada4b60d33a Mon Sep 17 00:00:00 2001 From: Jeeves Date: Tue, 18 Feb 2025 16:06:08 -0700 Subject: [PATCH] shelving this version for a bit --- src/main.zig | 139 +++++++++++++++++++++++------------------- src/web/statusline.js | 17 ++++-- src/web/style.css | 12 ++++ 3 files changed, 100 insertions(+), 68 deletions(-) diff --git a/src/main.zig b/src/main.zig index 1666a50..5e60285 100644 --- a/src/main.zig +++ b/src/main.zig @@ -14,12 +14,6 @@ const std = @import("std"); // // A - means immediately, a + means eventually. -var global_connection: ?std.net.Server.Connection = null; -var global_websocket: ?*std.http.WebSocket = null; - -var global_send_buf: ?[]u8 = null; -var global_recv_buf: ?[]align(4) u8 = null; - pub fn main() !void { var gpa = std.heap.GeneralPurposeAllocator(.{}){}; defer _ = gpa.deinit(); @@ -28,30 +22,33 @@ pub fn main() !void { var vlc = try VLC.init(allocator, try std.Uri.parse("http://localhost:8080")); defer vlc.deinit(); - var tz_file = try std.fs.openFileAbsolute("/etc/localtime", .{}); - defer tz_file.close(); - var tz = try std.tz.Tz.parse(allocator, tz_file.reader()); - defer tz.deinit(); + // var tz_file = try std.fs.openFileAbsolute("/etc/localtime", .{}); + // defer tz_file.close(); + // var tz = try std.tz.Tz.parse(allocator, tz_file.reader()); + // defer tz.deinit(); var server = try std.net.Address.initIp4(.{ 127, 0, 0, 1 }, 8009).listen(.{}); defer server.deinit(); - // while (true) : (std.time.sleep(1_000_000_000)) { // sleep 500ms - // try updateTime(tz); - // try updateStatus(allocator, &vlc); - // // scroll += 1; - // } + var clients = std.ArrayList(Client).init(allocator); + defer { + for (0..clients.items.len) |i| clients.items[i].deinit(allocator); + clients.deinit(); + } - defer if (global_connection) |conn| conn.stream.close(); - defer if (global_send_buf) |buf| allocator.free(buf); - defer if (global_recv_buf) |buf| allocator.free(buf); - - var delay: u8 = 0; + // var delay: u8 = 0; while (true) { - var pollfds = [_]std.posix.pollfd{.{ .fd = server.stream.handle, .events = std.posix.POLL.IN, .revents = 0 }}; - const num = try std.posix.poll(&pollfds, 100); - std.debug.print("num pollfds {d}\nrevents {d}\n", .{ num, pollfds[0].revents }); - if (pollfds[0].revents != 0) { + var pollfds = std.ArrayList(std.posix.pollfd).init(allocator); + defer pollfds.deinit(); + try pollfds.append(.{ .fd = server.stream.handle, .events = std.posix.POLL.IN, .revents = 0 }); + for (clients.items, 0..) |client, i| { + std.debug.print("appending client {d} to poll()\n", .{i}); + try pollfds.append(.{ .fd = client.connection.stream.handle, .events = std.posix.POLL.IN, .revents = 0 }); + } + const num = try std.posix.poll(pollfds.items, 100); + // std.debug.print("num pollfds {d}\n", .{num}); + _ = num; + if (pollfds.items[0].revents != 0) { const read_buf = try allocator.alloc(u8, 1024 * 32); defer allocator.free(read_buf); @@ -64,24 +61,26 @@ pub fn main() !void { var websocket: std.http.WebSocket = undefined; - global_send_buf = try allocator.alloc(u8, 1024 * 32); - global_recv_buf = try allocator.alignedAlloc(u8, 4, 1024 * 32); + const send_buf = try allocator.alloc(u8, 1024 * 32); + errdefer allocator.free(send_buf); + const recv_buf = try allocator.alignedAlloc(u8, 4, 1024 * 32); + errdefer allocator.free(recv_buf); - const is_websocket = try websocket.init(&request, global_send_buf.?, global_recv_buf.?); + const is_websocket = try websocket.init(&request, send_buf, recv_buf); if (is_websocket) { + // if websocket, we clean up at the end of main(), not the end of the block try websocket.response.flush(); std.debug.print("is a websocket now\n", .{}); - global_connection = connection; - global_websocket = &websocket; - // const msg = try websocket.readSmallMessage(); - // std.debug.print("{any}\n{s}\n", .{ msg, msg.data }); - // try websocket.writeMessage("dude i cant believe you just ate that", .text); - // // try websocket.writeMessage("", .ping); - // std.time.sleep(5_000_000_000); - // try websocket.writeMessage("dude why did i just eat that now", .text); - // std.debug.print("sent second one\n", .{}); + const client = Client{ + .connection = connection, + .websocket = websocket, + .send_buf = send_buf, + .recv_buf = recv_buf, + }; + try clients.append(client); } else { + // if normal HTTP, clean up at the end of the block defer connection.stream.close(); switch (request.head.method) { .GET, .HEAD => { @@ -104,43 +103,57 @@ pub fn main() !void { } } - delay += 1; - if (delay == 10) { - delay = 0; - try updateStatus(allocator, &vlc); + const status_string = try getStatusString(allocator, &vlc); + defer allocator.free(status_string); + for (1..pollfds.items.len) |i| { + const pollfd = pollfds.items[i]; + var client = &clients.items[i - 1]; + std.debug.print("client idx {d} for status update\nrevents {d}\n", .{ i - 1, pollfd.revents }); + // try std.http.WebSocket.writeMessage(&client.websocket, status_string, .text); + if (pollfd.revents & std.posix.POLL.IN != 0) { + const data = std.http.WebSocket.readSmallMessage(&client.websocket) catch |e| switch (e) { + error.EndOfStream => continue, + error.ConnectionClose => continue, + else => return e, + }; + std.debug.print("recieved opcode: {any} with data {s}\n", .{ data.opcode, data.data }); + } } + + std.Thread.sleep(1_000_000_000); } } +const Client = struct { + connection: std.net.Server.Connection, + websocket: std.http.WebSocket, + send_buf: []u8, + recv_buf: []align(4) u8, + + pub fn deinit(self: *Client, allocator: std.mem.Allocator) void { + allocator.free(self.send_buf); + allocator.free(self.recv_buf); + self.connection.stream.close(); + } +}; + const base64_encoder = std.base64.standard.Encoder; // TODO make the URL something short like jeevio.xyz/streamboy const topic = "Something Fun For Everyone With Streamboy!!!!!!!! git.jeevio.xyz/jeeves/streamboy"; -// var scroll: usize = 0; +fn getStatusString(allocator: std.mem.Allocator, vlc: *VLC) ![]u8 { + var song_info = try vlc.getSongInfo(); + defer song_info.deinit(); -fn updateStatus(allocator: std.mem.Allocator, vlc: *VLC) !void { - // var stream_info_file = try std.fs.createFileAbsolute("/tmp/streaminfo", .{ .truncate = true }); - // defer stream_info_file.close(); - if (global_websocket) |ws| { - var song_info = try vlc.getSongInfo(); - defer song_info.deinit(); + const string = try std.fmt.allocPrint(allocator, "{s} | ♪ {s} - {s} | ", .{ + topic, + song_info.title orelse "Unknown Title", + song_info.artist orelse "Unknown Artist", + }); + errdefer allocator.free(string); - const string = try std.fmt.allocPrint(allocator, "{s} | ♪ {s} - {s} | ", .{ - topic, - song_info.title orelse "Unknown Title", - song_info.artist orelse "Unknown Artist", - }); - defer allocator.free(string); - - try ws.writeMessage(string, .text); - } - - // if (scroll > string.len) scroll = 0; - // if (scroll == 0) try stream_info_file.writeAll(string) else { - // for (string[scroll..]) |char| try stream_info_file.writer().writeByte(char); - // for (string[0..scroll]) |char| try stream_info_file.writer().writeByte(char); - // } + return string; } pub const VLC = struct { @@ -159,6 +172,7 @@ pub const VLC = struct { const authorization = try std.fmt.allocPrint(allocator, "Basic {s}", .{base64_encoder.encode(base64_userpass, userpass)}); errdefer allocator.free(authorization); + // TODO actually launch VLC // var vlc = std.process.Child.init(&[_][]const u8{ // "vlc", // "--intf", @@ -226,7 +240,6 @@ pub const VLC = struct { album: ?[]const u8, artist: ?[]const u8, - // TODO move allocator into struct pub fn deinit(self: *SongInfo) void { if (self.title) |b| self.allocator.free(b); if (self.album) |b| self.allocator.free(b); diff --git a/src/web/statusline.js b/src/web/statusline.js index f3670fe..ed564cf 100644 --- a/src/web/statusline.js +++ b/src/web/statusline.js @@ -2,11 +2,18 @@ const statusLineElement = document.getElementById("status-line"); const socket = new WebSocket("ws://localhost:8009"); -// socket.addEventListener("open", (event) => { -// socket.send("Hello Server!"); -// }); - socket.addEventListener("message", (event) => { - console.log("Message from server ", event.data); + console.log(event); statusLineElement.textContent = event.data; }); + +// const status = { +// blocks: [ +// "Something Fun For Everyone With Streamboy!!!!!!!! git.jeevio.xyz/jeeves/streamboy", +// "♪ Bonhomme de Neige (EarthBound) - Ridley Snipes feat. Earth Kid", +// ], +// }; + +// setInterval(() => { +// // statusText = "Something Fun For Everyone With Streamboy!!!!!!!! git.jeevio.xyz/jeeves/streamboy | ♪ Bonhomme de Neige (EarthBound) - Ridley Snipes feat. Earth Kid | "; +// }, 5000); diff --git a/src/web/style.css b/src/web/style.css index 9e78832..73d62d2 100644 --- a/src/web/style.css +++ b/src/web/style.css @@ -13,4 +13,16 @@ body { #status-line { font-size: 16px; margin: 0px; + white-space: nowrap; + animation: marquee 5s linear infinite; + max-width: none; +} + +@keyframes marquee { + from { + left: -100%; + } + to { + left: 100%; + } }