wrynegade/dotwryn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remote scwrypts v5 refactor

Browse Source
This commit is contained in:
Wryn (yage) Wagner
2025-02-19 21:58:02 -07:00
parent f11c6dfad6
commit a3410d9b15
11 changed files with 191 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

130
scwrypts/remote/tmux/manager
View File

@ -1,66 +1,56 @@
#!/usr/bin/env zsh
#
# works as a standalone zsh script
# must work as a standalone zsh script
#
eval "$(scwrypts --config)" \
&& use omni --group remote \
&& utils.check-environment \
|| { echo 'scwrypts config error; aborting' >&2; sleep 5; return 1; }
#####################################################################
CONNECTIONS_FILE="$HOME/.config/wryn/remote-connections.toml"
OMNI_LOGFILE="${OMNI_LOGDIR}/omni.current.txt"
OMNI_LOGDIR="$HOME/.local/share/scwrypts/dotwryn"
OMNI_LOGFILE="$HOME/.local/share/scwrypts/dotwryn/omni.current.txt"
[ ! -d "$OMNI_LOGDIR" ] && mkdir -p "$OMNI_LOGDIR"
[ -f "$OMNI_LOGFILE" ] && {
[ -f "${OMNI_LOGFILE}" ] && {
for x in {1..99}
do
[ ! -f "$OMNI_LOGDIR/omni.$x.txt" ] && break
[ ! -f "${OMNI_LOGDIR}/omni.${x}.txt" ] && {
mv "${OMNI_LOGFILE}" "${OMNI_LOGDIR}/omni.${x}.txt"
break
}
done
[ ! -f "$OMNI_LOGDIR/omni.$x.txt" ] && mv "$OMNI_LOGFILE" "$OMNI_LOGDIR/omni.$x.txt"
}
echo "OMNI MANAGER START : $(date)" > "$OMNI_LOGFILE"
echo "OMNI MANAGER START : $(date)" > "${OMNI_LOGFILE}"
OMNI_SOCKET="omni.socket"
OMNI_TMUX() { tmux -L $OMNI_SOCKET $@; }
#####################################################################
CONFIG_QUERY() { yq -oy -r $@ "$CONNECTIONS_FILE" | grep -v ^null$; }
CONNECTED() {
[ $WINDOW_ID ] \
&& echo "\\033[1;32mconnected (window $WINDOW_ID)\\033[0m" >&2 \
|| echo "\\033[1;32mconnected\\033[0m" >&2 \
}
DISCONNECTED() { echo "\\033[1;31mdisconnected\\033[0m" >&2; }
GET_UNIQUE_WINDOW_ID() {
get-unique-window-id() {
local MODE=use-default
local WINDOW_ID="$(eval "echo \$WINDOW_ID__$REMOTE_NAME")"
local WINDOW_ID="$(eval echo "\$WINDOW_ID__${REMOTE_NAME}")"
: \
&& [[ $(eval "echo \$CAN_CONNECT__$REMOTE_NAME") =~ true ]] \
&& [ $WINDOW_ID ] \
&& echo $WINDOW_ID \
&& [[ $(eval echo "\$CAN_CONNECT__${REMOTE_NAME}") =~ true ]] \
&& [ ${WINDOW_ID} ] \
&& echo ${WINDOW_ID} \
&& return 0 \
;
unset WINDOW_ID__$REMOTE_NAME &>>"$OMNI_LOGFILE"
unset WINDOW_ID__${REMOTE_NAME} &>>"${OMNI_LOGFILE}"
WINDOW_ID="$1"
WINDOW_ID=$(CONFIG_QUERY .sessions.$REMOTE_NAME.id)
[ $WINDOW_ID ] && MODE=specify-preferred
WINDOW_ID=$(remote.config.yq .sessions.${REMOTE_NAME}.id)
[ ${WINDOW_ID} ] && MODE=specify-preferred
WINDOW_ID_IS_TAKEN() {
: \
&& [[ $(OMNI_TMUX list-windows -t=omni | grep "^$WINDOW_ID:" | wc -l) -gt 0 ]] \
&& [[ ! $(OMNI_TMUX list-windows -t=omni | grep "^$WINDOW_ID:" | awk '{print $2;}' =~ ^$REMOTE_NAME$) ]] \
&& [[ $(remote.omni.tmux list-windows -t=omni | grep "^${WINDOW_ID}:" | wc -l) -gt 0 ]] \
&& [[ ! $(remote.omni.tmux list-windows -t=omni | grep "^${WINDOW_ID}:" | awk '{print $2;}' =~ ^${REMOTE_NAME}$) ]] \
;
}
local FALLBACK_STARTING_POINT
case $MODE in
case ${MODE} in
use-default ) FALLBACK_STARTING_POINT=42 ;;
specify-preferred ) FALLBACK_STARTING_POINT=69 ;;
esac
@ -68,78 +58,78 @@ GET_UNIQUE_WINDOW_ID() {
local I=0
while WINDOW_ID_IS_TAKEN
do
echo "$REMOTE_NAME tried to acquire window id $WINDOW_ID, but it is already in-use (trying $(($FALLBACK_STARTING_POINT-$I)))" >&2
WINDOW_ID=$(($FALLBACK_STARTING_POINT-$I))
echo "${REMOTE_NAME} tried to acquire window id ${WINDOW_ID}, but it is already in-use (trying $((${FALLBACK_STARTING_POINT}-${I})))" >&2
WINDOW_ID=$((${FALLBACK_STARTING_POINT}-${I}))
((I+=1))
[[ $I -gt 10 ]] && WINDOW_ID= && break
[[ ${I} -gt 10 ]] && WINDOW_ID= && break
done
echo $WINDOW_ID
echo ${WINDOW_ID}
}
#####################################################################
sleep 1
OMNI_TMUX new-window -t=omni-manager -dn 'harakiri' "
remote.omni.tmux new-window -t=omni-manager -dn 'harakiri' "
echo 'waiting for omni-manager to close'
while true
do
tmux -L $OMNI_SOCKET list-sessions | grep -v omni-manager | grep -qi omni || {
tmux -L $OMNI_SOCKET kill-session -t omni-manager
}
sleep 5
tmux -L ${OMNI_SOCKET} list-sessions 2>/dev/null | grep -v omni-manager | grep -qi omni || {
echo 'no active sessions detected; killing omni-manager session'
tmux -L ${OMNI_SOCKET} kill-session -t omni-manager
}
done
"
while true
do
clear
for REMOTE_NAME in $(CONFIG_QUERY '.sessions | keys | .[]')
#clear
for REMOTE_NAME in $(remote.config.yq '.sessions | keys | .[]')
do
WINDOW_ID=$(GET_UNIQUE_WINDOW_ID)
export WINDOW_ID__$REMOTE_NAME=$WINDOW_ID
WINDOW_ID=$(get-unique-window-id)
export WINDOW_ID__${REMOTE_NAME}=${WINDOW_ID}
OMNI_TMUX list-windows -t=omni | awk '{print $2;}' | grep -q $REMOTE_NAME \
remote.omni.tmux list-windows -t=omni | awk '{print $2;}' | grep -q ${REMOTE_NAME} \
&& continue
printf "testing connection $REMOTE_NAME..."
echo "testing connection $REMOTE_NAME..." &>>"$OMNI_LOGFILE"
printf "testing connection ${REMOTE_NAME}..."
echo "testing connection ${REMOTE_NAME}..." &>>"${OMNI_LOGFILE}"
scwrypts --name test --group remote --type zsh \
-- \
--name $REMOTE_NAME \
--name ${REMOTE_NAME} \
--command 'command -v tmux' \
&>>"$OMNI_LOGFILE" \
&& export CAN_CONNECT__$REMOTE_NAME=true \
|| export CAN_CONNECT__$REMOTE_NAME=false \
&>>"${OMNI_LOGFILE}" \
&& export CAN_CONNECT__${REMOTE_NAME}=true \
|| export CAN_CONNECT__${REMOTE_NAME}=false \
;
[[ $(eval echo "\$CAN_CONNECT__$REMOTE_NAME") =~ true ]] \
&& echo " \\033[1;32m✔\\033[0m" >&2 \
|| { echo " \\033[1;31m✖\\033[0m" >&2; continue; }
[[ $(eval echo "\$CAN_CONNECT__${REMOTE_NAME}") =~ true ]] \
&& utils.colors.print bright-green " ✔\n" >&2 \
|| { utils.colors.print bright-red " ✖\n" >&2; continue; }
OMNI_TMUX new-window \
-t=omni:$WINDOW_ID \
-dn $REMOTE_NAME "
remote.omni.tmux new-window \
-t=omni:${WINDOW_ID} \
-dn ${REMOTE_NAME} "
source ~/.zshrc &>/dev/null
TMUX='' scwrypts -n connect/$REMOTE_NAME -- --type tmux
TMUX='' scwrypts -n connect/${REMOTE_NAME} -- --type tmux
echo 'connection closed'
sleep 2
"
OMNI_TMUX list-window -t=omni | awk '{print $1;}' | grep -q '99:' && OMNI_TMUX kill-window -t omni:99
remote.omni.tmux list-window -t=omni | awk '{print $1;}' | grep -q '99:' && remote.omni.tmux kill-window -t omni:99
OMNI_TMUX list-windows -t=omni | awk '{print $2;}' | grep -q $REMOTE_NAME \
|| export CAN_CONNECT__$REMOTE_NAME=false
remote.omni.tmux list-windows -t=omni | awk '{print $2;}' | grep -q ${REMOTE_NAME} \
|| export CAN_CONNECT__${REMOTE_NAME}=false
done
clear
#clear
echo "connections:\n"
local STATUS
{
for REMOTE_NAME in $(CONFIG_QUERY '.sessions | keys | .[]')
for REMOTE_NAME in $(remote.config.yq '.sessions | keys | .[]')
do
[[ $(eval "echo \$CAN_CONNECT__$REMOTE_NAME") =~ true ]] \
&& echo "${REMOTE_NAME}^$(eval "echo \$WINDOW_ID__$REMOTE_NAME")^\\033[1;32mconnected\\033[0m" \
|| echo "${REMOTE_NAME}^-^\\033[1;31mdisconnected\\033[0m" \
[[ $(eval echo "\$CAN_CONNECT__${REMOTE_NAME}") =~ true ]] \
&& echo "${REMOTE_NAME}^$(eval echo "\$WINDOW_ID__${REMOTE_NAME}")^$(utils.colors.print bright-green connected)" \
|| echo "${REMOTE_NAME}^-^$(utils.colors.print bright-red disconnected)" \
;
done
} | column -ts '^'

44
scwrypts/remote/tmux/omni
View File

@ -1,5 +1,10 @@
#!/bin/zsh
#####################################################################
DEPENDENCIES+=(tmux scwrypts)
use omni --group remote
#####################################################################
USAGE__description="
@ -12,7 +17,7 @@ USAGE__description="
Switch between connections by using 'M-s' followed by the session ID
number (or use any other default default tmux navigation command). Full
configuration can be found here:
- $SCWRYPTS_ROOT__remote/omni/tmux.conf
- $(scwrypts.config.group remote root)/omni/tmux.conf
Shut-down the omni-session by pressing 'M-Q' (Q not q! ALT + SHIFT + Q)
@ -20,7 +25,7 @@ USAGE__description="
A background process periodically attempts to refresh lost connections.
Immediate retry can be forced with 'M-R'.
Running this command in an existing tmux session will likely result
in an infinite loop, so:
- don't run the omni-session in a TMUX session
@ -30,7 +35,7 @@ USAGE__description="
#####################################################################
MAIN() {
[[ $TERM =~ tmux ]] && ERROR "\n Cannot run tmux-omni within a tmux session!\n "
[[ $TERM =~ tmux ]] && echo.error "\n Cannot run tmux-omni within a tmux session!\n "
local BACKGROUND_LAUNCH=false
@ -43,33 +48,34 @@ MAIN() {
esac
[[ $_S -le $# ]] \
&& shift $_S \
|| ERROR "missing argument for '$1'" \
|| echo.error "missing argument for '$1'" \
|| shift $# \
;
done
CHECK_ERRORS
utils.check-errors --fail
local OMNI_SOCKET="omni.socket"
OMNI_TMUX() { tmux -L $OMNI_SOCKET $@; }
local SCWRYPTS_ROOT_REMOTE="$(scwrypts.config.group remote root)"
OMNI_TMUX list-sessions 2>/dev/null | grep -v omni-manager | grep -qi omni || {
STATUS "initializing omni server"
OMNI_TMUX kill-session -t=omni-manager >/dev/null 2>&1
OMNI_TMUX -f "$SCWRYPTS_ROOT__remote/tmux/tmux.conf" new -d -s omni \
"echo searching for first connection...; sleep 30" \; \
split-window "sleep 3; TMUX= tmux -L $OMNI_SOCKET a -t=omni-manager" \; \
remote.omni.tmux list-sessions 2>/dev/null | grep -v omni-manager | grep -qi omni || {
echo.status "initializing omni server"
remote.omni.tmux kill-session -t=omni-manager >/dev/null 2>&1
echo.debug "${SCWRYPTS_ROOT_REMOTE}/tmux/tmux.conf"
remote.omni.tmux -f "${SCWRYPTS_ROOT_REMOTE}/tmux/tmux.conf" new -d -s omni \
"echo searching for first connection...; sleep 10" \; \
split-window "sleep 1; TMUX= tmux -L ${OMNI_SOCKET} a -t=omni-manager" \; \
move-window -t 99 \;
OMNI_TMUX new -d -s omni-manager "$SCWRYPTS_ROOT__remote/tmux/manager"
remote.omni.tmux new -d -s omni-manager "${SCWRYPTS_ROOT_REMOTE}/tmux/manager"
}
[[ $BACKGROUND_LAUNCH =~ true ]] && {
SUCCESS "omni server activated"
echo.success "omni server activated"
return 0
}
STATUS 'connecting to omni server'
OMNI_TMUX a -t=omni
echo.status 'connecting to omni server'
remote.omni.tmux a -t=omni
}

4
scwrypts/remote/tmux/tmux.conf
View File

@ -57,14 +57,12 @@ bind-key -n M-q send-keys M-q
bind-key -n M-z send-keys M-z
bind-key -n M-w send-keys C-M-w
bind-key -n M-Q kill-session
unbind-key C-b
bind-key C-b send-prefix
set-option -g prefix M-s
bind-key M-s send-keys M-s
bind-key -n M-Q kill-session
bind-key -n M-Q kill-server
# force reload now
bind-key -n M-R send-keys -t omni-manager ENTER