From 7ed5c4840d17ec1726c7c9ba8dcb8320162b9eac Mon Sep 17 00:00:00 2001
From: Squibid <me@zacharyscheiman.com>
Date: Fri, 28 Nov 2025 18:16:33 -0500
Subject: [PATCH] actually setup the remote_lua protocol on the server

---
 src/RemoteLua.zig        | 38 ++++++++++++++++++++++++++++----------
 src/RemoteLuaManager.zig | 10 +++++-----
 src/server.zig           |  3 +++
 3 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/src/RemoteLua.zig b/src/RemoteLua.zig
index cc3a992..92143ff 100644
--- a/src/RemoteLua.zig
+++ b/src/RemoteLua.zig
@@ -3,15 +3,16 @@ const RemoteLua = @This();
 const std = @import("std");
 const wayland = @import("wayland");
 const Utils = @import("utils.zig");
+const Lua = @import("lua/lua.zig");
 const wl = wayland.server.wl;
 const mez = wayland.server.zmez;
 
 const gpa = std.heap.c_allocator;
 const server = &@import("main.zig").server;
-const Lua = &@import("main.zig").lua;
 
 id: usize,
 remote_lua_v1: *mez.RemoteLuaV1,
+L: Lua,
 
 pub fn sendNewLogEntry(str: [*:0]const u8) void {
   for (server.remote_lua_clients.items) |c| {
@@ -24,32 +25,49 @@ pub fn create(client: *wl.Client, version: u32, id: u32) !void {
 
   const node = try gpa.create(RemoteLua);
   errdefer gpa.destroy(node);
-  node = .{
+  node.* = .{
     .remote_lua_v1 = remote_lua_v1,
     .id = server.remote_lua_clients.items.len,
+    .L = undefined,
   };
-  server.remote_lua_clients.append(gpa, node);
+  try node.L.init();
+  errdefer node.L.deinit();
+  try server.remote_lua_clients.append(gpa, node);
 
-  remote_lua_v1.setHandler(*RemoteLua, handleRequest, handleDestroy, &node);
+  remote_lua_v1.setHandler(*RemoteLua, handleRequest, handleDestroy, node);
 }
 
 fn handleRequest(
 remote_lua_v1: *mez.RemoteLuaV1,
 request: mez.RemoteLuaV1.Request,
-_: *RemoteLua,
+remote: *RemoteLua,
 ) void {
   switch (request) {
     .destroy => remote_lua_v1.destroy(),
     .push_lua => |req| {
-      Lua.state.loadString(req.lua_chunk) catch {
-        const errTxt: []const u8 = Lua.state.toString(-1) catch unreachable;
-        try sendNewLogEntry("repl: " ++ errTxt);
-      };
+      const chunk = std.mem.sliceTo(req.lua_chunk, 0);
+      remote.L.state.loadString(chunk) catch catchLuaFail(remote);
+      remote.L.state.protectedCall(.{}) catch catchLuaFail(remote);
     },
   }
 }
 
+fn catchLuaFail(remote: *RemoteLua) void {
+  const err_txt: []const u8 = remote.L.state.toString(-1) catch unreachable;
+  const txt = std.mem.concat(gpa, u8, &[_][]const u8{ "repl: ", err_txt }) catch Utils.oomPanic();
+  defer gpa.free(txt);
+
+  // must add the sentinel back to pass the data over the wire
+  const w_sentinel = gpa.allocSentinel(u8, txt.len, 0) catch Utils.oomPanic();
+  defer gpa.free(w_sentinel);
+  std.mem.copyForwards(u8, w_sentinel, txt[0..txt.len]);
+
+  sendNewLogEntry(w_sentinel);
+  return;
+}
+
 fn handleDestroy(_: *mez.RemoteLuaV1, remote_lua: *RemoteLua) void {
-  server.remote_lua_clients.swapRemove(remote_lua.id);
+  _ = server.remote_lua_clients.swapRemove(remote_lua.id);
+  remote_lua.L.deinit();
   gpa.destroy(remote_lua);
 }
diff --git a/src/RemoteLuaManager.zig b/src/RemoteLuaManager.zig
index 1df4411..e4cedea 100644
--- a/src/RemoteLuaManager.zig
+++ b/src/RemoteLuaManager.zig
@@ -12,7 +12,7 @@ const server = &@import("main.zig").server;
 
 global: *wl.Global,
 
-pub fn init() ?*RemoteLuaManager {
+pub fn init() !?*RemoteLuaManager {
   const self = try gpa.create(RemoteLuaManager);
 
   self.global = try wl.Global.create(server.wl_server, mez.RemoteLuaManagerV1, 1, ?*anyopaque, null, bind);
@@ -37,10 +37,10 @@ _: ?*anyopaque,
     .destroy => remote_lua_manager_v1.destroy(),
     .get_remote => |req| {
       RemoteLua.create(
-      remote_lua_manager_v1.getClient(),
-      remote_lua_manager_v1.getVersion(),
-      req.id,
-    ) catch {
+        remote_lua_manager_v1.getClient(),
+        remote_lua_manager_v1.getVersion(),
+        req.id,
+      ) catch {
         remote_lua_manager_v1.getClient().postNoMemory();
         Utils.oomPanic();
       };
diff --git a/src/server.zig b/src/server.zig
index e04c8ad..032fbb6 100644
--- a/src/server.zig
+++ b/src/server.zig
@@ -15,6 +15,7 @@ const Keymap = @import("types/keymap.zig");
 const Hook = @import("types/hook.zig");
 const Events = @import("types/events.zig");
 const RemoteLua = @import("RemoteLua.zig");
+const RemoteLuaManager = @import("RemoteLuaManager.zig");
 
 const gpa = std.heap.c_allocator;
 const server = &@import("main.zig").server;
@@ -25,6 +26,7 @@ renderer: *wlr.Renderer,
 backend: *wlr.Backend,
 event_loop: *wl.EventLoop,
 session: ?*wlr.Session,
+remote_lua_manager: ?*RemoteLuaManager,
 
 shm: *wlr.Shm,
 xdg_shell: *wlr.XdgShell,
@@ -97,6 +99,7 @@ pub fn init(self: *Server) void {
     .root = undefined,
     .seat = undefined,
     .cursor = undefined,
+    .remote_lua_manager = RemoteLuaManager.init() catch Utils.oomPanic(),
     .keymaps = .init(gpa),
     .hooks = try .initCapacity(gpa, 10), // TODO: choose how many slots to start with
     .events = try .init(gpa),