diff --git a/proxy-lgp.sh b/proxy-lgp.sh index ca03afb..6d2c685 100755 --- a/proxy-lgp.sh +++ b/proxy-lgp.sh @@ -37,12 +37,15 @@ fi if ! [ "${port}" -eq "${port}" ] 2>/dev/null; then >&2 echo "Port number must be numeric"; exit 1; fi +# User settings Jusers=`jq -nc --arg uuid "${id}" '. += {"id":$uuid, "encryption":"none", "level":0}'` +# Vnext settings Jvnext=`jq -nc --arg host "${host}" --arg port "${port}" --argjson juser "${Jusers}" \ '. += {"address":$host, "port":($port | tonumber), "users":[$juser]}' ` -JstreamSettings=`jq -nc --arg serverName "${serverName}" --arg fingerprint "${fingerprint}" --arg path "${path}" \ +# Stream Settings +JstreamSettings=`jq -nc --arg path "${path}" \ '. += {"network":"grpc", "security":"none", "grpcSettings":{"serviceName":$path}}' ` Jproxy=`jq -nc --arg host "${host}" --argjson jvnext "${Jvnext}" --argjson jstreamSettings "${JstreamSettings}" \ diff --git a/proxy-lgt.sh b/proxy-lgt.sh index 4331295..037db04 100755 --- a/proxy-lgt.sh +++ b/proxy-lgt.sh @@ -64,11 +64,7 @@ Jvnext=`jq -nc --arg host "${host}" --arg port "${port}" --argjson juser "${Juse '. += {"address":$host,"port":($port | tonumber),"users":[$juser]}' ` # Stream Settings -Jalpn='[]' -for alpn in "${ALPN[@]}" -do - Jalpn=`echo $Jalpn | jq -c --arg alpn "${alpn}" '. +=[$alpn]'` -done +Jalpn=`printf '%s\n' "${ALPN[@]}"|jq -R|jq -sc` JstreamSettings=`jq -nc --arg serverName "${serverName}" --arg fingerprint "${fingerprint}" --arg path "${path}" --argjson jalpn "${Jalpn}" \ '. += {"network":"grpc","security":"tls","tlsSettings":{"serverName":$serverName,"fingerprint":$fingerprint,"alpn":$jalpn},"grpcSettings":{"serviceName":$path}}' ` diff --git a/proxy-lst.sh b/proxy-lst.sh index 252b785..d0bd4e8 100755 --- a/proxy-lst.sh +++ b/proxy-lst.sh @@ -64,11 +64,7 @@ Jvnext=`jq -nc --arg host "${host}" --arg port "${port}" --argjson juser "${Juse '. += {"address":$host,"port":($port | tonumber),"users":[$juser]}' ` # Stream Settings -Jalpn='[]' -for alpn in "${ALPN[@]}" -do - Jalpn=`echo $Jalpn | jq -c --arg alpn "${alpn}" '. +=[$alpn]'` -done +Jalpn=`printf '%s\n' "${ALPN[@]}"|jq -R|jq -sc` JstreamSettings=`jq -nc --arg serverName "${serverName}" --arg fingerprint "${fingerprint}" --arg path "${path}" --argjson jalpn "${Jalpn}" \ '. += {"network":"splithttp","security":"tls","tlsSettings":{"serverName":$serverName,"fingerprint":$fingerprint,"alpn":$jalpn},"splithttpSettings":{"path":$path}}' ` diff --git a/proxy-ltt.sh b/proxy-ltt.sh index 402948a..4a6a8c6 100755 --- a/proxy-ltt.sh +++ b/proxy-ltt.sh @@ -66,11 +66,7 @@ Jvnext=`jq -nc --arg host "${host}" --arg port "${port}" --argjson juser "${Juse '. += {"address":$host,"port":($port | tonumber),"users":[$juser]}' ` # Stream Settings -Jalpn='[]' -for alpn in "${ALPN[@]}" -do - Jalpn=`echo $Jalpn | jq -c --arg alpn "${alpn}" '. +=[$alpn]'` -done +Jalpn=`printf '%s\n' "${ALPN[@]}"|jq -R|jq -sc` JstreamSettings=`jq -nc --arg serverName "${serverName}" --arg fingerprint "${fingerprint}" \ '. += {"network":"tcp","security":"tls","tlsSettings":{"serverName":$serverName,"fingerprint":$fingerprint,"alpn":$jalpn}}' ` diff --git a/proxy-lwt.sh b/proxy-lwt.sh index b5ed1b6..ec5dbc7 100755 --- a/proxy-lwt.sh +++ b/proxy-lwt.sh @@ -64,11 +64,7 @@ Jvnext=`jq -nc --arg host "${host}" --arg port "${port}" --argjson juser "${Juse '. += {"address":$host,"port":($port | tonumber),"users":[$juser]}' ` # Stream Settings -Jalpn='[]' -for alpn in "${ALPN[@]}" -do - Jalpn=`echo $Jalpn | jq -c --arg alpn "${alpn}" '. +=[$alpn]'` -done +Jalpn=`printf '%s\n' "${ALPN[@]}"|jq -R|jq -sc` JstreamSettings=`jq -nc --arg serverName "${serverName}" --arg fingerprint "${fingerprint}" --arg path "${path}" --argjson jalpn "${Jalpn}" \ '. += {"network":"ws","security":"tls","tlsSettings":{"serverName":$serverName,"fingerprint":$fingerprint,"alpn":$jalpn},"wsSettings":{"path":$path}}' ` diff --git a/proxy-mtt.sh b/proxy-mtt.sh index 4b01091..9967378 100755 --- a/proxy-mtt.sh +++ b/proxy-mtt.sh @@ -63,11 +63,7 @@ Jvnext=`jq -nc --arg host "${host}" --arg port "${port}" --argjson juser "${Juse '. += {"address":$host,"port":($port | tonumber),"users":[$juser]}' ` # Stream Settings -Jalpn='[]' -for alpn in "${ALPN[@]}" -do - Jalpn=`echo $Jalpn | jq -c --arg alpn "${alpn}" '. +=[$alpn]'` -done +Jalpn=`printf '%s\n' "${ALPN[@]}"|jq -R|jq -sc` JstreamSettings=`jq -nc --arg serverName "${serverName}" --arg fingerprint "${fingerprint}" --argjson jalpn "${Jalpn}" \ '. += {"network":"tcp","security":"tls","tlsSettings":{"serverName":$serverName,"fingerprint":$fingerprint,"alpn":$jalpn}}' ` diff --git a/proxy-mwt.sh b/proxy-mwt.sh index c71f1c5..51cb2e9 100755 --- a/proxy-mwt.sh +++ b/proxy-mwt.sh @@ -64,11 +64,7 @@ Jvnext=`jq -nc --arg host "${host}" --arg port "${port}" --argjson juser "${Juse '. += {"address":$host,"port":($port | tonumber),"users":[$juser]}' ` # Stream Settings -Jalpn='[]' -for alpn in "${ALPN[@]}" -do - Jalpn=`echo $Jalpn | jq -c --arg alpn "${alpn}" '. +=[$alpn]'` -done +Jalpn=`printf '%s\n' "${ALPN[@]}"|jq -R|jq -sc` JstreamSettings=`jq -nc --arg serverName "${serverName}" --arg fingerprint "${fingerprint}" --arg path "${path}" --argjson jalpn "${Jalpn}" \ '. += {"network":"ws","security":"tls","tlsSettings":{"serverName":$serverName,"fingerprint":$fingerprint,"alpn":$jalpn},"wsSettings":{"path":$path}}' ` diff --git a/proxy-ttt.sh b/proxy-ttt.sh index 07ffb41..4a82b5e 100755 --- a/proxy-ttt.sh +++ b/proxy-ttt.sh @@ -61,11 +61,7 @@ Jservers=`jq -nc --arg host "${host}" --arg port "${port}" --arg passwd "${passw '. += {"address":$host,"port":($port | tonumber),"password":$passwd}' ` # Stream Settings -Jalpn='[]' -for alpn in "${ALPN[@]}" -do - Jalpn=`echo $Jalpn | jq -c --arg alpn "${alpn}" '. +=[$alpn]'` -done +Jalpn=`printf '%s\n' "${ALPN[@]}"|jq -R|jq -sc` JstreamSettings=`jq -nc --arg serverName "${serverName}" --arg fingerprint "${fingerprint}" --argjson jalpn "${Jalpn}" \ '. += {"network":"tcp","security":"tls","tlsSettings":{"serverName":$serverName,"fingerprint":$fingerprint,"alpn":$jalpn}}' ` diff --git a/proxy-twt.sh b/proxy-twt.sh index c93f8e3..5c495f0 100755 --- a/proxy-twt.sh +++ b/proxy-twt.sh @@ -62,11 +62,7 @@ Jservers=`jq -nc --arg host "${host}" --arg port "${port}" --arg passwd "${passw '. += {"address":$host,"port":($port | tonumber),"password":$passwd}' ` # Stream Settings -Jalpn='[]' -for alpn in "${ALPN[@]}" -do - Jalpn=`echo $Jalpn | jq -c --arg alpn "${alpn}" '. +=[$alpn]'` -done +Jalpn=`printf '%s\n' "${ALPN[@]}"|jq -R|jq -sc` JstreamSettings=`jq -nc --arg serverName "${serverName}" --arg fingerprint "${fingerprint}" --arg path "${path}" --argjson jalpn "${Jalpn}" \ '. += {"network":"ws","security":"tls","tlsSettings":{"serverName":$serverName,"fingerprint":$fingerprint,"alpn":$jalpn},"wsSettings":{"path":$path}}' `