WIP

2 files changed, 62 insertions, 57 deletions

diff --git a/src/rpc.bash b/src/rpc.bash
index 644df95..eb41538 100644
--- a/src/rpc.bash
+++ b/src/rpc.bash
@@ -14,50 +14,8 @@ extract_words()
         grep -o -E '\b\w+\b' | sort -u
 }
 
-read_len()
-{
-        REPLY=
-        [ "$1" -gt 0 ] && read -r -N"$1" && [ "$REPLY" ]
-}
-
-read_remote_command()
-{
-        read_len "$1"
-        shift
-        remote_command=(bash -c "${REPLY@Q}" bash "${@@Q}")
-}
-
-remote_run_shell_script_stdin()
-{
-        read_remote_command "$@"
-        ssh    -- "${REMOTE_DEST}" "${remote_command[@]}"
-}
-
-remote_run_shell_script_tty()
-{
-        read_remote_command "$@"
-        ssh -t -- "${REMOTE_DEST}" "${remote_command[@]}" </dev/tty
-}
-
-remote_run_shell_script_arg1()
-{
-        script=$1
-        shift
-        set -- "${#script}" "$@"
-        if test -t 0 && test -t 1
-        then
-                printf '%s' "$script" |
-                        remote_run_shell_script_tty "$@"
-        else
-                cat <(printf '%s' "$script") - |
-                        remote_run_shell_script_stdin "$@"
-        fi
-}
-
 immediate_dependencies1()
 {
-        # Thanks Lri from stackoverflow.com/questions/4471364/
-        # how-do-i-list-the-functions-defined-in-my-shell/28278090
         intersection \
                 <(compgen -A function | sort -u) \
                 <(declare -f "$1" | extract_words)
@@ -73,29 +31,75 @@ immediate_dependencies()
 
 recursive_dependencies()
 {
-        resolved=()
+        seen=()
         while [ $# -gt 0 ]
         do
-                resolved+=("$@")
+                seen+=("$@")
                 set -- $(difference <(immediate_dependencies "$@") \
-                                    <(printf '%s\n' "${resolved[@]}" | sort -u))
+                                    <(printf '%s\n' "${seen[@]}" | sort -u))
         done
-        printf '%s\n' "${resolved[@]}"
+        printf '%s\n' "${seen[@]}"
+}
+
+
+
+
+
+
+
+
+# Input: $BASH_RPC_REMOTE_DEST - hostname passed to ssh (uses ssh host aliases)
+# Input: $BASH_RPC_SSH_OPTIONS - option arguments passed to ssh (they precede '--')
+# Input: $1 - bash shell script source code to run remotely
+# Input: $2, $3, ... - command line arguments passed to the remote bash shell
+# Input: stdin, stdout, stderr: passed to ssh
+bash_rpc_remote_run_script()
+{
+        (
+                local script="$1"
+                shift
+                set -- "$SHELL" -c "${script@Q}" "$0" "${@@Q}"
+                set -x
+                exec ssh \
+                        "${BASH_RPC_SSH_OPTIONS[@]}" \
+                        -- \
+                        "${BASH_RPC_REMOTE_DEST:-localhost}" \
+                        "$@"
+        )
+}
+
+# Preserves the rest of stdin for the command.
+bash_rpc_eval_stdin()
+{
+        [ "$1" -gt 0 ] || return
+        read -N"$1" -r || return
+        shift # prepare "$@" for script execution context
+        source <(printf '%s' "$REPLY" | tr -d '\015')
+}
+
+remote_run_function_simple()
+{
+        script_source=$(declare -f "$1" && printf '"$@";\n')
+        bash_rpc_remote_run_script "$script_source" "$@"
 }
 
 remote_run_function()
 {
         main=$1
-        shift
         funcs=$(recursive_dependencies "$main")
-
-        script=
-        read -N2147483647 -r script < <(
+        stage2_source=$(
                 declare -f $funcs
-                printf '%s "$@";\n' "$main"
-        ) || true
-        [ "$script" ]
-
-        remote_run_shell_script_arg1 "$script" "$@"
+                printf '"$@"\n' "$main"
+        )
+        BASH_RPC_SSH_OPTIONS=(-tt)
+        {
+                printf '%s' "$stage2_source"
+                if [ -t 0 ]
+                then
+                        socat stdio PTY
+                else
+                        cat
+                fi
+        } | remote_run_function_simple bash_rpc_eval_stdin "${#stage2_source}" "$@"
 }
 
diff --git a/src/rpc.main.bash b/src/rpc.main.bash
index b859509..9fba425 100644
--- a/src/rpc.main.bash
+++ b/src/rpc.main.bash
@@ -11,7 +11,7 @@ esac
 our_main()
 {
         REMOTE_DEST=localhost
-        main2 "$@"
+#       main2 "$@"
         main1 "$@"
 }
 
@@ -28,9 +28,10 @@ main2()
 
 find_local_only_functions()
 {
+        remote_commands=($(remote_run_function all_commands | sort -u))
         intersection <(extract_words < "$BASH_SOURCE") \
                      <(difference <(all_commands) \
-                                  <(remote_run_function all_commands))
+                                  <(printf '%s\n' "${remote_commands[@]}"))
 }
 
 all_commands()