mp.input: send buffer ids with logs to avoid race conditions

This commit modifies the log methods in mp.input to always send the id
of the latest `input.get()` request with log entries.

Previously, the log methods applied to whichever input request happened
to be open when the log message was received. Even when scripts used
these methods correctly, there was the risk of sending a log to the
wrong log buffer if the active input request changed while the log
message was in transit; a race condition.

Now the id of the latest `input.get()` request is sent alongside the log
messages, preventing data races between scripts while also preventing
those logs from being discarded.

Author: CogentRedTester

DOCS/man/lua.rst

@@ -980,16 +980,18 @@ REPL.
     requests made by other scripts.
 
 ``input.log(message, style, terminal_style)``
-    Add a line to the log buffer. ``style`` can contain additional ASS tags to
-    apply to ``message``, and ``terminal_style`` can contain escape sequences
-    that are used when the console is displayed in the terminal.
+    Add a line to the log buffer of the latest ``input.get()`` request.
+    ``style`` can contain additional ASS tags to apply to ``message``,
+    and ``terminal_style`` can contain escape sequences that are used
+    when the console is displayed in the terminal.
 
 ``input.log_error(message)``
-    Helper to add a line to the log buffer with the same color as the one used
+    Helper to add an error line to the log buffer of the latest ``input.get()``
+    request. The line is styled with the same color as the one used
     for commands that error. Useful when the user submits invalid input.
 
 ``input.set_log(log)``
-    Replace the entire log buffer.
+    Replace the entire log buffer of the latest ``input.get()`` request.
 
     ``log`` is a table of strings, or tables with ``text``, ``style`` and
     ``terminal_style`` keys.

player/javascript/defaults.js

@@ -654,7 +654,8 @@ mp.options = { read_options: read_options };
 *  input
 *********************************************************************/
 var input_handle_counter = 1;
-var latest_handler_id;
+var latest_handler_id
+var latest_log_id;
 
 function register_event_handler(t) {
     var handler_id = "input-event/" + input_handle_counter;
@@ -686,13 +687,18 @@ function register_event_handler(t) {
     return handler_id;
 }
 
+function input_request(t) {
+    t.has_completions = t.complete !== undefined;
+    t.script_name = mp.script_name;
+    t.handler_id = register_event_handler(t);
+
+    mp.commandv("script-message-to", "console", "get-input", JSON.stringify(t));
+}
+
 mp.input = {
     get: function(t) {
-        t.has_completions = t.complete !== undefined;
-        t.script_name = mp.script_name;
-        t.handler_id = register_event_handler(t);
-
-        mp.commandv("script-message-to", "console", "get-input", JSON.stringify(t));
+        latest_log_id = t.id || mp.script_name + (t.prompt || "");
+        return input_request(t);
     },
     terminate: function () {
         mp.commandv("script-message-to", "console", "disable", JSON.stringify({
@@ -701,21 +707,26 @@ mp.input = {
     },
     log: function (message, style, terminal_style) {
         mp.commandv("script-message-to", "console", "log", JSON.stringify({
+                        log_id: latest_log_id,
                         text: message,
                         style: style,
                         terminal_style: terminal_style,
                    }));
     },
     log_error: function (message) {
-        mp.commandv("script-message-to", "console", "log",
-                    JSON.stringify({ text: message, error: true }));
+        mp.commandv("script-message-to", "console", "log", JSON.stringify({
+                        log_id: latest_log_id,
+                        text: message,
+                        error: true,
+                    }));
     },
     set_log: function (log) {
+        if (!latest_log_id) return;
         mp.commandv("script-message-to", "console", "set-log",
-                    JSON.stringify(log));
+                    JSON.stringify(log), latest_log_id);
     }
 }
-mp.input.select = mp.input.get
+mp.input.select = input_request;
 
 /**********************************************************************
  *  various

player/lua/console.lua

@@ -1740,8 +1740,11 @@ end)
 
 -- Add a line to the log buffer
 mp.register_script_message("log", function (message)
-    local log_buffer = log_buffers[id]
-    message = utils.parse_json(message)
+    message = utils.parse_json(message or '')
+    if not message or not message.log_id then return end
+
+    local log_buffer = log_buffers[message.log_id]
+    if not log_buffer then return end
 
     log_buffer[#log_buffer + 1] = {
         text = message.text,
@@ -1754,7 +1757,7 @@ mp.register_script_message("log", function (message)
         table.remove(log_buffer, 1)
     end
 
-    if not open then
+    if not open or message.log_id ~= id then
         return
     end
 
@@ -1770,9 +1773,10 @@ mp.register_script_message("log", function (message)
     end
 end)
 
-mp.register_script_message("set-log", function (log)
+mp.register_script_message("set-log", function (log, log_id)
+    if not log or not log_id then return end
     log = utils.parse_json(log)
-    log_buffers[id] = {}
+    log_buffers[log_id] = {}
 
     for i = 1, #log do
         if type(log[i]) == "table" then
@@ -1789,7 +1793,9 @@ mp.register_script_message("set-log", function (log)
         end
     end
 
-    render()
+    if log_id == id then
+        render()
+    end
 end)
 
 mp.register_script_message("complete", function (message)

player/lua/input.lua

@@ -19,6 +19,7 @@ local utils = require "mp.utils"
 local input = {}
 local handle_counter = 1
 local latest_handler_id
+local latest_log_id
 
 local function get_non_callbacks(t)
     local non_callbacks = {}
@@ -66,15 +67,21 @@ local function register_event_handler(t)
     return handler_id
 end
 
-function input.get(t)
+local function input_request(t)
     t.has_completions = t.complete ~= nil
     t.script_name = mp.get_script_name()
     t.handler_id = register_event_handler(t)
 
     mp.commandv("script-message-to", "console", "get-input", utils.format_json(get_non_callbacks(t)))
 end
 
-input.select = input.get
+function input.get(t)
+    -- input.select does not support log buffers, so cannot override the latest id.
+    latest_log_id = t.id or mp.get_script_name()..(t.prompt or "")
+    return input_request(t)
+end
+
+input.select = input_request
 
 function input.terminate()
     mp.commandv("script-message-to", "console", "disable", utils.format_json({
@@ -84,19 +91,25 @@ end
 
 function input.log(message, style, terminal_style)
     mp.commandv("script-message-to", "console", "log", utils.format_json({
-                   text = message,
-                   style = style,
-                   terminal_style = terminal_style,
-               }))
+                    log_id = latest_log_id,
+                    text = message,
+                    style = style,
+                    terminal_style = terminal_style,
+                }))
 end
 
 function input.log_error(message)
-    mp.commandv("script-message-to", "console", "log",
-                 utils.format_json({ text = message, error = true }))
+    mp.commandv("script-message-to", "console", "log", utils.format_json({
+                    log_id = latest_log_id,
+                    text = message,
+                    error = true,
+                }))
 end
 
 function input.set_log(log)
-    mp.commandv("script-message-to", "console", "set-log", utils.format_json(log))
+    if not latest_log_id then return end
+    mp.commandv("script-message-to", "console", "set-log",
+                    utils.format_json(log), latest_log_id)
 end
 
 return input