WIP refactor lua bridge

mikew · mikew · commit cffef1bf2e2f · 2026-01-31T17:51:43.000-04:00
diff --git a/src/bridge_files/lua/finalize_bridge.lua b/src/bridge_files/lua/finalize_bridge.lua
@@ -0,0 +1,3 @@
+if _G._nvrh_is_initialized ~= true then
+  _G._nvrh_is_initialized = true
+end
diff --git a/src/bridge_files/lua/init_bridge.lua b/src/bridge_files/lua/init_bridge.lua
diff --git a/src/bridge_files/lua/init_nvrh.lua b/src/bridge_files/lua/init_nvrh.lua
@@ -7,7 +7,10 @@
 ---@field id integer
 ---@field client NvrhChannelClient?
 
-if should_initialize then
+if _G._nvrh_is_initialized ~= true then
+  local nvrh_server_info, session_id, browser_script_path, editor_script_path, socket_path, windows_launcher_path =
+    ...
+
   _G._nvrh = {
     ---@type { [string]: boolean }
     mapped_ports = {},
@@ -39,9 +42,9 @@ if should_initialize then
     os.remove(socket_path)
 
     if
-        _G._nvrh.server_info.os == 'windows'
-        and windows_launcher_path
-        and windows_launcher_path ~= ''
+      _G._nvrh.server_info.os == 'windows'
+      and windows_launcher_path
+      and windows_launcher_path ~= ''
     then
       os.remove(windows_launcher_path)
     end
diff --git a/src/bridge_files/lua/rpc_open_file.lua b/src/bridge_files/lua/rpc_open_file.lua
@@ -1,4 +1,6 @@
-if should_initialize then
+if _G._nvrh_is_initialized ~= true then
+  local editor_script_path = ...
+
   ---@param filename string
   ---@param line? number
   ---@param col? number
diff --git a/src/bridge_files/lua/rpc_open_url.lua b/src/bridge_files/lua/rpc_open_url.lua
@@ -1,4 +1,6 @@
-if should_initialize then
+if _G._nvrh_is_initialized ~= true then
+  local browser_script_path = ...
+
   ---@param url string
   function _G._nvrh.open_url(url)
     for _, channel in ipairs(_G._nvrh.get_nvrh_channels()) do
@@ -16,6 +18,7 @@ if should_initialize then
   })
 
   local original_open = vim.ui.open
+  ---@diagnostic disable-next-line: duplicate-set-field
   vim.ui.open = function(uri, opts)
     if type(uri) == 'string' and uri:match('^https?://') then
       _G._nvrh.open_url(uri)
diff --git a/src/bridge_files/lua/rpc_tunnel_port.lua b/src/bridge_files/lua/rpc_tunnel_port.lua
@@ -1,4 +1,4 @@
-if should_initialize then
+if _G._nvrh_is_initialized ~= true then
   ---@param port string|integer
   function _G._nvrh.tunnel_port(port)
     for _, channel in ipairs(_G._nvrh.get_nvrh_channels()) do
diff --git a/src/bridge_files/lua/session_automap_ports.lua b/src/bridge_files/lua/session_automap_ports.lua
@@ -1,3 +1,5 @@
+local channel_id = ...
+
 for port, _ in pairs(_G._nvrh.mapped_ports) do
   _G._nvrh._tunnel_port_with_channel(channel_id, port)
 end
diff --git a/src/bridge_files/lua/setup_browser_script.lua b/src/bridge_files/lua/setup_browser_script.lua
diff --git a/src/bridge_files/lua/setup_editor_script.lua b/src/bridge_files/lua/setup_editor_script.lua
diff --git a/src/bridge_files/lua/setup_nvim_launcher.lua b/src/bridge_files/lua/setup_nvim_launcher.lua
diff --git a/src/bridge_files/lua/setup_port_scanner.lua b/src/bridge_files/lua/setup_port_scanner.lua
@@ -1,4 +1,6 @@
-if should_initialize and should_map_ports then
+local should_map_ports = ...
+
+if _G._nvrh_is_initialized ~= true and should_map_ports then
   local nvrh_port_scanner = {
     active_watchers = {},
 
diff --git a/src/bridge_files/lua/setup_remote_file.lua b/src/bridge_files/lua/setup_remote_file.lua
@@ -0,0 +1,17 @@
+local file_path, file_contents, permission = ...
+
+local file, err = io.open(file_path, 'w')
+if file then
+  file:write(file_contents)
+  file:close()
+else
+  vim.print('Error opening file: ' .. err)
+end
+
+if permission and permission ~= '' then
+  vim.fn.setfperm(file_path, permission)
+end
+
+permission = nil
+file_contents = nil
+file_path = nil
diff --git a/src/bridge_files/lua/setup_remote_file_on_init.lua b/src/bridge_files/lua/setup_remote_file_on_init.lua
@@ -0,0 +1,19 @@
+if _G._nvrh_is_initialized ~= true then
+  local file_path, file_contents, permission = ...
+
+  local file, err = io.open(file_path, 'w')
+  if file then
+    file:write(file_contents)
+    file:close()
+  else
+    vim.print('Error opening file: ' .. err)
+  end
+
+  if permission and permission ~= '' then
+    vim.fn.setfperm(file_path, permission)
+  end
+
+  permission = nil
+  file_contents = nil
+  file_path = nil
+end
diff --git a/src/bridge_files/lua/types/nvrh.lua b/src/bridge_files/lua/types/nvrh.lua
@@ -8,15 +8,8 @@
 ---@field tmpdir string The temporary directory path
 ---@field shell_name string The shell name, e.g., "bash", "zsh", "cmd", "powershell"
 
---- These are bridged from the Go code
-session_id = ''
-channel_id = -1
-socket_path = ''
-browser_script_path = ''
-should_map_ports = false
-nvrh_server_info = ''
-windows_launcher_path = ''
-editor_script_path = ''
+---@type boolean|nil
+_G._nvrh_is_initialized = nil
 
 ---@type fun(filename: string, line?: number, col?: number): nil
 _G.nvrh_open_file_handler = nil
diff --git a/src/bridge_files/main.go b/src/bridge_files/main.go
@@ -1,8 +1,10 @@
 package bridge_files
 
 import (
+	"bytes"
 	"embed"
 	"log/slog"
+	"text/template"
 )
 
 //go:embed lua/* shell/*
@@ -18,3 +20,22 @@ func ReadFileWithoutError(filename string) string {
 
 	return string(data)
 }
+
+func ReadFileWithTemplate(filename string, data any) string {
+	fileContent := ReadFileWithoutError(filename)
+
+	tmpl, err := template.New("file").Parse(fileContent)
+	if err != nil {
+		slog.Error("Error parsing template", "filename", filename, "err", err)
+		return ""
+	}
+
+	var renderedContentBytes bytes.Buffer
+	err = tmpl.Execute(&renderedContentBytes, data)
+	if err != nil {
+		slog.Error("Error executing template", "filename", filename, "err", err)
+		return ""
+	}
+
+	return renderedContentBytes.String()
+}
diff --git a/src/bridge_files/shell/nvrh-browser b/src/bridge_files/shell/nvrh-browser
@@ -1,14 +1,11 @@
 #!/bin/sh
 
 escape_value() {
-  # The double-percent signs are intentional since this file is formatted with
-  # golang.
-  # shellcheck disable=SC2182
-  printf '%%s' "$1" | sed 's/\\/\\\\/g; s/"/\\"/g'
+  printf '%s' "$1" | sed 's/\\/\\\\/g; s/"/\\"/g'
 }
 
 URL=$(escape_value "$1")
 
-SOCKET_PATH="%s"
+SOCKET_PATH="{{.SocketPath}}"
 
 exec nvim --server "$SOCKET_PATH" --remote-expr "v:lua._G._nvrh.open_url(\"$URL\")" > /dev/null 2>&1
diff --git a/src/bridge_files/shell/nvrh-browser.bat b/src/bridge_files/shell/nvrh-browser.bat
@@ -1,14 +1,13 @@
 @echo off
 
-set "URL=%%~1"
+set "URL=%~1"
 
 :: Escape backslashes
-set "URL=%%URL:\=\\%%"
+set "URL=%URL:\=\\%"
 
 :: Escape double quotes
-set "URL=%%URL:"=\"%%"
+set "URL=%URL:"=\"%"
 
-set "SOCKET_PATH=%s"
+set "SOCKET_PATH={{.SocketPath}}"
 
-REM start "" nvim --server "%%SOCKET_PATH%%" --remote-expr "v:lua._G._nvrh.open_url(\"%%URL%%\")" > nul 2>&1
-nvim --server "%%SOCKET_PATH%%" --remote-expr "v:lua._G._nvrh.open_url(\"%%URL%%\")" > nul 2>&1
+nvim --server "%SOCKET_PATH%" --remote-expr "v:lua._G._nvrh.open_url(\"%URL%\")" > nul 2>&1
diff --git a/src/bridge_files/shell/nvrh-editor b/src/bridge_files/shell/nvrh-editor
@@ -1,19 +1,16 @@
 #!/bin/sh
 
 escape_value() {
-  # The double-percent signs are intentional since this file is formatted with
-  # golang.
-  # shellcheck disable=SC2182
-  printf '%%s' "$1" | sed 's/\\/\\\\/g; s/"/\\"/g'
+  printf '%s' "$1" | sed 's/\\/\\\\/g; s/"/\\"/g'
 }
 
 FILE_PATH=$(escape_value "$1")
 LINE_NUMBER=$(escape_value "$2")
 COLUMN_NUMBER=$(escape_value "$3")
 
-RANDOM_VALUE=$(head -c4 /dev/urandom | hexdump -e '1/4 "%%u" "\n"')
+RANDOM_VALUE=$(head -c4 /dev/urandom | hexdump -e '1/4 "%u" "\n"')
 LOCK_FILE="/tmp/nvrh-editor-$RANDOM_VALUE.lock"
-SOCKET_PATH="%s"
+SOCKET_PATH="{{.SocketPath}}"
 
 nvim --server "$SOCKET_PATH" --remote-expr "v:lua._G._nvrh.edit_with_lock(\"$FILE_PATH\", \"$LOCK_FILE\", \"$LINE_NUMBER\", \"$COLUMN_NUMBER\")" > /dev/null 2>&1
 
diff --git a/src/bridge_files/shell/nvrh-editor.bat b/src/bridge_files/shell/nvrh-editor.bat
@@ -1,28 +1,28 @@
 @echo off
 
-set "FILE_PATH=%%~1"
-set "LINE_NUMBER=%%~2"
-set "COLUMN_NUMBER=%%~3"
+set "FILE_PATH=%~1"
+set "LINE_NUMBER=%~2"
+set "COLUMN_NUMBER=%~3"
 
 :: Seems to be needed in cmd, otherwise they get passed as `\=\\`
-if "%%LINE_NUMBER%%"=="" set "LINE_NUMBER=-1"
-if "%%COLUMN_NUMBER%%"=="" set "COLUMN_NUMBER=-1"
+if "%LINE_NUMBER%"=="" set "LINE_NUMBER=-1"
+if "%COLUMN_NUMBER%"=="" set "COLUMN_NUMBER=-1"
 
 :: Escape backslashes
-set "FILE_PATH=%%FILE_PATH:\=\\%%"
-set "LINE_NUMBER=%%LINE_NUMBER:\=\\%%"
-set "COLUMN_NUMBER=%%COLUMN_NUMBER:\=\\%%"
+set "FILE_PATH=%FILE_PATH:\=\\%"
+set "LINE_NUMBER=%LINE_NUMBER:\=\\%"
+set "COLUMN_NUMBER=%COLUMN_NUMBER:\=\\%"
 
 :: Escape double quotes
-set "FILE_PATH=%%FILE_PATH:"=\"%%"
-set "LINE_NUMBER=%%LINE_NUMBER:"=\"%%"
-set "COLUMN_NUMBER=%%COLUMN_NUMBER:"=\"%%"
+set "FILE_PATH=%FILE_PATH:"=\"%"
+set "LINE_NUMBER=%LINE_NUMBER:"=\"%"
+set "COLUMN_NUMBER=%COLUMN_NUMBER:"=\"%"
 
-set "SOCKET_PATH=%s"
-set "LOCK_FILE=%%TEMP%%\nvrh-editor-%%RANDOM%%.lock"
-set "LOCK_FILE=%%LOCK_FILE:\=\\%%"
+set "SOCKET_PATH={{.SocketPath}}"
+set "LOCK_FILE=%TEMP%\nvrh-editor-%RANDOM%.lock"
+set "LOCK_FILE=%LOCK_FILE:\=\\%"
 
-nvim --server "%%SOCKET_PATH%%" --remote-expr "v:lua._G._nvrh.edit_with_lock(\"%%FILE_PATH%%\", \"%%LOCK_FILE%%\", \"%%LINE_NUMBER%%\", \"%%COLUMN_NUMBER%%\")" > nul 2>&1
+nvim --server "%SOCKET_PATH%" --remote-expr "v:lua._G._nvrh.edit_with_lock(\"%FILE_PATH%\", \"%LOCK_FILE%\", \"%LINE_NUMBER%\", \"%COLUMN_NUMBER%\")" > nul 2>&1
 
 pathping 127.0.0.1 -n -q 1 -p 100 >nul
 
diff --git a/src/client/main.go b/src/client/main.go

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+if _G._nvrh_is_initialized ~= true then`
	`2`	`+ _G._nvrh_is_initialized = true`
	`3`	`+end`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-if should_initialize then`
	`1`	`+if _G._nvrh_is_initialized ~= true then`
`2`	`2`	`---@param port string\|integer`
`3`	`3`	`function _G._nvrh.tunnel_port(port)`
`4`	`4`	`for _, channel in ipairs(_G._nvrh.get_nvrh_channels()) do`