22 Commits
v4.0 ... v4.20

Author SHA1 Message Date
233boy
4d1279d038 fix caddy run 2024-06-02 17:10:22 +08:00
233boy
d999705479 add dns set 2024-05-08 20:02:55 +08:00
233boy
3af96ec0bc add (add) command usage tips 2024-02-01 13:16:01 +08:00
233boy
59bc26b457 fix openai err #1227 2023-10-27 08:58:33 +08:00
233boy
61cdfc5bbe fix typo 2023-10-26 21:27:35 +08:00
233boy
51ff04fa02 Merge pull request #1226 from clark233/master
Update README.md
2023-10-26 21:24:26 +08:00
Clark Fan
cad75208d0 Update README.md
Fix typo
2023-10-26 17:53:06 +08:00
233boy
25c14b8520 fix openai block 2023-10-25 21:49:20 +08:00
233boy
463ff482ea fix get ip err 2023-08-08 15:12:44 +08:00
233boy
83d1e045a9 fix jq install; dns check 2023-08-07 12:24:23 +08:00
233boy
67387eb0a1 fix ping host ip type 2023-07-12 20:38:19 +08:00
233boy
5c6f48df83 fix no-auto-tls err 2023-06-29 13:36:54 +08:00
233boy
4771de764d add *TLS protocol change port 2023-06-08 12:06:47 +08:00
233boy
44e340914d fix yum install epel-release 2023-05-29 18:09:16 +08:00
233boy
62433b88f3 URL add aid 0 2023-05-28 11:26:31 +08:00
233boy
b0207515a0 fix api fail and test run 2023-05-27 08:07:12 +08:00
233boy
bf8867cc63 remove qrencode install 2023-05-24 21:36:36 +08:00
233boy
b09b8b5c51 fix config read err 2023-05-23 23:48:34 +08:00
233boy
05e3c685c8 fix old core err; update tips 2023-05-20 13:16:55 +08:00
233boy
bfff42a4a6 fix URL 2023-05-17 17:31:00 +08:00
233boy
ec504a23d3 add socks url and listen string 2023-05-17 13:50:23 +08:00
233boy
07af4a2adc add socks 2023-05-16 18:37:20 +08:00
11 changed files with 327 additions and 91 deletions

View File

@@ -26,6 +26,20 @@
- 一键更改 (端口/UUID/密码/域名/路径/加密方式/SNI/动态端口/等...)
- 还有更多...
# 设计理念
设计理念为:**高效率,超快速,极易用**
脚本基于作者的自身使用需求,以 **多配置同时运行** 为核心设计
并且专门优化了,添加、更改、查看、删除、这四项常用功能
你只需要一条命令即可完成 添加、更改、查看、删除、等操作
例如,添加一个配置仅需不到 1 秒!瞬间完成添加!其他操作亦是如此!
脚本的参数非常高效率并且超级易用,请掌握参数的使用
# 脚本说明
[V2Ray 一键安装脚本](https://github.com/233boy/v2ray/wiki/V2Ray%E4%B8%80%E9%94%AE%E5%AE%89%E8%A3%85%E8%84%9A%E6%9C%AC)
@@ -72,9 +86,11 @@ Usage: v2ray [options]... [args]...
web [name] [domain] 更改伪装网站
进阶:
dns [...] 设置 DNS
dd, ddel [name...] 删除多个配置**
fix [name] 修复一个配置
fix-all 修复全部配置
fix-caddyfile 修复 Caddyfile
fix-config.json 修复 config.json
管理:
@@ -87,7 +103,7 @@ Usage: v2ray [options]... [args]...
reinstall 重装脚本
测试:
client, genc [name] 显示用于客户端 JOSN, 仅供参考
client, genc [name] 显示用于客户端 JSON, 仅供参考
debug [name] 显示一些 debug 信息, 仅供参考
gen [...] 同等于 add, 但只显示 JSON 内容, 不创建文件, 测试使用
no-auto-tls [...] 同等于 add, 但禁止自动配置 TLS, 可用于 *TLS 相关协议
@@ -102,4 +118,4 @@ Usage: v2ray [options]... [args]...
谨慎使用 del, ddel, 此选项会直接删除配置; 无需确认
反馈问题) https://github.com/233boy/v2ray/issues
文档(doc) https://233boy.com/v2ray/v2ray-script/
```
```

View File

@@ -49,9 +49,11 @@ is_wget=$(type -P wget)
# x64
case $(uname -m) in
amd64 | x86_64)
is_jq_arch=amd64
is_core_arch="64"
;;
*aarch64* | *armv8*)
is_jq_arch=arm64
is_core_arch="arm64-v8a"
;;
*)
@@ -69,13 +71,15 @@ is_log_dir=/var/log/$is_core
is_sh_bin=/usr/local/bin/$is_core
is_sh_dir=$is_core_dir/sh
is_sh_repo=$author/$is_core
is_pkg="wget unzip jq qrencode"
is_pkg="wget unzip"
is_config_json=$is_core_dir/config.json
tmp_var_lists=(
tmpcore
tmpsh
tmpjq
is_core_ok
is_sh_ok
is_jq_ok
is_pkg_ok
)
@@ -141,7 +145,7 @@ install_pkg() {
msg warn "安装依赖包 >${pkg}"
$cmd install -y $pkg &>/dev/null
if [[ $? != 0 ]]; then
[[ $cmd == yum ]] && yum install epel-release -y &>/dev/null
[[ $cmd =~ yum ]] && yum install epel-release -y &>/dev/null
$cmd update -y &>/dev/null
$cmd install -y $pkg &>/dev/null
[[ $? == 0 ]] && >$is_pkg_ok
@@ -169,6 +173,12 @@ download() {
tmpfile=$tmpsh
is_ok=$is_sh_ok
;;
jq)
link=https://github.com/jqlang/jq/releases/download/jq-1.7rc1/jq-linux-$is_jq_arch
name="jq"
tmpfile=$tmpjq
is_ok=$is_jq_ok
;;
esac
msg warn "下载 ${name} > ${link}"
@@ -179,8 +189,8 @@ download() {
# get server ip
get_ip() {
export "$(_wget -4 -qO- https://www.cloudflare.com/cdn-cgi/trace | grep ip=)" &>/dev/null
[[ -z $ip ]] && export "$(_wget -6 -qO- https://www.cloudflare.com/cdn-cgi/trace | grep ip=)" &>/dev/null
export "$(_wget -4 -qO- https://one.one.one.one/cdn-cgi/trace | grep ip=)" &>/dev/null
[[ -z $ip ]] && export "$(_wget -6 -qO- https://one.one.one.one/cdn-cgi/trace | grep ip=)" &>/dev/null
}
# check background tasks status
@@ -201,11 +211,16 @@ check_status() {
msg err "下载 ${is_core_name} 脚本失败"
is_fail=1
}
[[ ! -f $is_jq_ok ]] && {
msg err "下载 jq 失败"
is_fail=1
}
else
[[ ! $is_fail ]] && {
is_wget=1
[[ ! $is_core_file ]] && download core &
[[ ! $local_install ]] && download sh &
[[ $jq_not_found ]] && download jq &
get_ip
wait
check_status
@@ -308,7 +323,7 @@ main() {
# if is_core_file, copy file
[[ $is_core_file ]] && {
cp -f $is_core_file $is_core_ok
msg warn "${is_core_name} 文件使用 > ${yellow}$is_core_file${none}"
msg warn "${yellow}${is_core_name} 文件使用 > $is_core_file${none}"
}
# local dir install sh script
[[ $local_install ]] && {
@@ -324,10 +339,17 @@ main() {
# install dependent pkg
install_pkg $is_pkg &
# if wget installed. download core, sh, get ip
# jq
if [[ $(type -P jq) ]]; then
>$is_jq_ok
else
jq_not_found=1
fi
# if wget installed. download core, sh, jq, get ip
[[ $is_wget ]] && {
[[ ! $is_core_file ]] && download core &
[[ ! $local_install ]] && download sh &
[[ $jq_not_found ]] && download jq &
get_ip
}
@@ -377,14 +399,18 @@ main() {
else
unzip -qo $is_core_ok -d $is_core_dir/bin
fi
chmod +x $is_core_bin
# add alias
echo "alias $is_core=$is_sh_bin" >>/root/.bashrc
# core command
ln -sf $is_sh_dir/$is_core.sh $is_sh_bin
chmod +x $is_sh_bin
# jq
[[ $jq_not_found ]] && mv -f $is_jq_ok /usr/bin/jq
# chmod
chmod +x $is_core_bin $is_sh_bin /usr/bin/jq
# create log dir
mkdir -p $is_log_dir

View File

@@ -8,27 +8,31 @@ caddy_config() {
# for more info, see https://233boy.com/$is_core/caddy-auto-tls/
# 不要编辑这个文件 #
# 更多相关请阅读此文章: https://233boy.com/$is_core/caddy-auto-tls/
# https://caddyserver.com/docs/caddyfile/options
{
admin off
}
import $is_caddy_conf/*.conf
import $is_caddy_dir/sites/*.conf
EOF
;;
*ws*)
cat >${is_caddy_site_file} <<<"
${host} {
${host}:${tlsport} {
reverse_proxy ${path} 127.0.0.1:${port}
import ${is_caddy_site_file}.add
}"
;;
*h2*)
cat >${is_caddy_site_file} <<<"
${host} {
${host}:${tlsport} {
reverse_proxy ${path} h2c://127.0.0.1:${port}
import ${is_caddy_site_file}.add
}"
;;
*grpc*)
cat >${is_caddy_site_file} <<<"
${host} {
${host}:${tlsport} {
reverse_proxy /${path}/* h2c://127.0.0.1:${port}
import ${is_caddy_site_file}.add
}"

View File

@@ -19,6 +19,7 @@ protocol_list=(
VMess-TCP-dynamic-port
VMess-mKCP-dynamic-port
VMess-QUIC-dynamic-port
Socks
)
ss_method_list=(
aes-128-gcm
@@ -69,6 +70,7 @@ info_list=(
"SNI (serverName)"
"指纹 (Fingerprint)"
"公钥 (Public key)"
"用户名 (Username)"
)
change_list=(
"更改协议"
@@ -86,6 +88,7 @@ change_list=(
"更改动态端口"
"更改伪装网站"
"更改 mKCP seed"
"更改用户名 (Username)"
)
servername_list=(
www.amazon.com
@@ -122,8 +125,8 @@ get_uuid() {
get_ip() {
[[ $ip || $is_no_auto_tls || $is_gen ]] && return
export "$(_wget -4 -qO- https://www.cloudflare.com/cdn-cgi/trace | grep ip=)" &>/dev/null
[[ ! $ip ]] && export "$(_wget -6 -qO- https://www.cloudflare.com/cdn-cgi/trace | grep ip=)" &>/dev/null
export "$(_wget -4 -qO- https://one.one.one.one/cdn-cgi/trace | grep ip=)" &>/dev/null
[[ ! $ip ]] && export "$(_wget -6 -qO- https://one.one.one.one/cdn-cgi/trace | grep ip=)" &>/dev/null
[[ ! $ip ]] && {
err "获取服务器 IP 失败.."
}
@@ -200,7 +203,7 @@ is_port_used() {
fi
is_cant_test_port=1
msg "$is_warn 无法检测端口是否可用."
msg "请执行: $(_yellow "${cmd}update -y; ${cmd}install net-tools -y") 来修复此问题."
msg "请执行: $(_yellow "${cmd} update -y; ${cmd} install net-tools -y") 来修复此问题."
}
# ask input a string or pick a option for list.
@@ -216,7 +219,7 @@ ask() {
set_header_type)
is_tmp_list=(${header_type_list[@]})
is_default_arg=$is_random_header_type
[[ $(grep tcp <<<"$is_new_protocol-$net") ]] && {
[[ $(grep -i tcp <<<"$is_new_protocol-$net") ]] && {
is_tmp_list=(none http)
is_default_arg=none
}
@@ -318,10 +321,8 @@ ask() {
create() {
case $1 in
server)
get new
is_sniffing='sniffing:{enabled:true,destOverride:["http","tls"]}'
is_listen_127='"listen": "127.0.0.1"'
is_tls=none
get new
# file name
if [[ $host ]]; then
@@ -332,10 +333,19 @@ create() {
is_json_file=$is_conf_dir/$is_config_name
# get json
[[ $is_change || ! $json_str ]] && get protocol $2
is_new_json=$(jq '{inbounds:[{tag:'\"$is_config_name\"',port:'"$port"',protocol:'\"$is_protocol\"','"$json_str"','"$is_sniffing"'}]}' <<<{})
case $net in
ws | h2 | grpc | http)
is_listen='"listen": "127.0.0.1"'
;;
*)
is_listen='"listen": "0.0.0.0"'
;;
esac
is_sniffing='sniffing:{enabled:true,destOverride:["http","tls"]}'
is_new_json=$(jq '{inbounds:[{tag:'\"$is_config_name\"',port:'"$port"','"$is_listen"',protocol:'\"$is_protocol\"','"$json_str"','"$is_sniffing"'}]}' <<<{})
if [[ $is_dynamic_port ]]; then
[[ ! $is_dynamic_port_range ]] && get dynamic-port
is_new_dynamic_port_json=$(jq '{inbounds:[{tag:'\"$is_config_name-link.json\"',port:'\"$is_dynamic_port_range\"',protocol:"vmess",'"$is_stream"','"$is_sniffing"',allocate:{strategy:"random"}}]}' <<<{})
is_new_dynamic_port_json=$(jq '{inbounds:[{tag:'\"$is_config_name-link.json\"',port:'\"$is_dynamic_port_range\"','"$is_listen"',protocol:"vmess",'"$is_stream"','"$is_sniffing"',allocate:{strategy:"random"}}]}' <<<{})
fi
[[ $is_test_json ]] && return # tmp test
# only show json, dont save to file.
@@ -362,7 +372,7 @@ create() {
api add $is_json_file $is_dynamic_port_link_file &>/dev/null
fi
# caddy auto tls
[[ $is_caddy && $host ]] && {
[[ $is_caddy && $host && ! $is_no_auto_tls ]] && {
create caddy $net
}
# restart core
@@ -399,7 +409,8 @@ create() {
is_ban_ad='{type:"field",domain:["geosite:category-ads-all"],marktag:"ban_ad",outboundTag:"block"}'
is_ban_bt='{type:"field",protocol:["bittorrent"],marktag:"ban_bt",outboundTag:"block"}'
is_ban_cn='{type:"field",ip:["geoip:cn"],marktag:"ban_geoip_cn",outboundTag:"block"}'
is_routing='routing:{domainStrategy:"IPIfNonMatch",rules:[{type:"field",inboundTag:["api"],outboundTag:"api"},'"$is_ban_bt"','"$is_ban_cn"',{type:"field",ip:["geoip:private"],outboundTag:"block"}]}'
is_openai='{type:"field",domain:["domain:openai.com"],marktag:"fix_openai",outboundTag:"direct"}'
is_routing='routing:{domainStrategy:"IPIfNonMatch",rules:[{type:"field",inboundTag:["api"],outboundTag:"api"},'"$is_ban_bt"','"$is_ban_cn"','"$is_openai"',{type:"field",ip:["geoip:private"],outboundTag:"block"}]}'
is_inbounds='inbounds:[{tag:"api",port:'"$tmp_port"',listen:"127.0.0.1",protocol:"dokodemo-door",settings:{address:"127.0.0.1"}}]'
is_outbounds='outbounds:[{tag:"direct",protocol:"freedom"},{tag:"block",protocol:"blackhole"}]'
is_server_config_json=$(jq '{'"$is_log"','"$is_dns"','"$is_api"','"$is_stats"','"$is_policy"','"$is_routing"','"$is_inbounds"','"$is_outbounds"'}' <<<{})
@@ -507,10 +518,23 @@ change() {
1)
# new port
is_new_port=$3
[[ $host ]] && err "($is_config_file) 不支持更改端口, 因为没啥意义."
[[ $host && ! $is_caddy ]] && err "($is_config_file) 不支持更改端口, 因为没啥意义."
if [[ $is_new_port && ! $is_auto ]]; then
[[ ! $(is_test port $is_new_port) ]] && err "请输入正确的端口, 可选(1-65535)"
[[ $is_new_port != 443 && $(is_test port_used $is_new_port) ]] && err "无法使用 ($is_new_port) 端口"
fi
[[ $is_auto ]] && get_port && is_new_port=$tmp_port
[[ ! $is_new_port ]] && ask string is_new_port "请输入新端口:"
add $net $is_new_port
if [[ $is_caddy && $host ]]; then
net=$is_old_net
tlsport=$is_new_port
load caddy.sh
caddy_config $net
manage restart caddy &
info
else
add $net $is_new_port
fi
;;
2)
# new host
@@ -531,7 +555,7 @@ change() {
4)
# new password
is_new_pass=$3
if [[ $net == 'ss' || $is_trojan ]]; then
if [[ $net == 'ss' || $is_trojan || $is_socks_pass ]]; then
[[ $is_auto ]] && get_uuid && is_new_pass=$tmp_uuid
else
err "($is_config_file) 不支持更改密码."
@@ -539,6 +563,7 @@ change() {
[[ ! $is_new_pass ]] && ask string is_new_pass "请输入新密码:"
trojan_password=$is_new_pass
ss_password=$is_new_pass
is_socks_pass=$is_new_pass
add $net
;;
5)
@@ -689,6 +714,12 @@ change() {
kcp_seed=$is_new_kcp_seed
add $net
;;
15)
# new socks user
[[ ! $is_socks_user ]] && err "($is_config_file) 不支持更改用户名 (Username)."
ask string is_socks_user "请输入新用户名 (Username):"
add $net
;;
esac
}
@@ -789,6 +820,7 @@ manage() {
[[ $is_test_run && ! $is_new_install ]] && {
sleep 2
if [[ ! $(pgrep -f $is_run_bin) ]]; then
is_run_fail=${is_do_name_msg,,}
[[ ! $is_no_manage_msg ]] && {
msg
warn "($is_do_msg) $is_do_name_msg 失败"
@@ -796,7 +828,6 @@ manage() {
get test-run
_yellow "测试结束, 请按 Enter 退出."
}
is_run_fail=${is_do_name_msg,,}
fi
}
}
@@ -811,6 +842,7 @@ api() {
[[ ! $1 ]] && err "无法识别 API 的参数."
[[ $is_core_stop ]] && {
warn "$is_core_name 当前处于停止状态."
is_api_fail=1
return
}
case $1 in
@@ -861,7 +893,10 @@ add() {
door)
is_new_protocol=Dokodemo-Door
;;
http | socks)
socks)
is_new_protocol=Socks
;;
http)
is_new_protocol=local-$is_lower
;;
*)
@@ -883,6 +918,7 @@ add() {
is_use_host=$2
is_use_uuid=$3
is_use_path=$4
is_add_opts="[host] [uuid] [/path]"
;;
vmess*)
is_use_port=$2
@@ -891,6 +927,11 @@ add() {
is_use_dynamic_port_start=$5
is_use_dynamic_port_end=$6
[[ $(grep dynamic-port <<<$is_new_protocol) ]] && is_dynamic_port=1
if [[ $is_dynamic_port ]]; then
is_add_opts="[port] [uuid] [type] [start_port] [end_port]"
else
is_add_opts="[port] [uuid] [type]"
fi
;;
# *reality*)
# is_reality=1
@@ -902,18 +943,32 @@ add() {
is_use_port=$2
is_use_pass=$3
is_use_method=$4
is_add_opts="[port] [password] [method]"
;;
*door)
is_use_port=$2
is_use_door_addr=$3
is_use_door_port=$4
is_add_opts="[port] [remote_addr] [remote_port]"
;;
*http | *socks)
socks)
is_socks=1
is_use_port=$2
is_use_socks_user=$3
is_use_socks_pass=$4
is_add_opts="[port] [username] [password]"
;;
*http)
is_use_port=$2
is_add_opts="[port]"
;;
esac
[[ $1 && ! $is_change ]] && msg "\n使用协议: $is_new_protocol"
[[ $1 && ! $is_change ]] && {
msg "\n使用协议: $is_new_protocol"
# err msg tips
is_err_tips="\n\n请使用: $(_green $is_core add $1 $is_add_opts) 来添加 $is_new_protocol 配置"
}
# remove old protocol args
if [[ $is_set_new_protocol ]]; then
@@ -962,28 +1017,28 @@ add() {
if [[ $is_use_port ]]; then
[[ ! $(is_test port ${is_use_port}) ]] && {
err "($is_use_port) 不是一个有效的端口."
err "($is_use_port) 不是一个有效的端口. $is_err_tips"
}
[[ $(is_test port_used $is_use_port) ]] && {
err "无法使用 ($is_use_port) 端口."
err "无法使用 ($is_use_port) 端口. $is_err_tips"
}
port=$is_use_port
fi
if [[ $is_use_door_port ]]; then
[[ ! $(is_test port ${is_use_door_port}) ]] && {
err "(${is_use_door_port}) 不是一个有效的目标端口."
err "(${is_use_door_port}) 不是一个有效的目标端口. $is_err_tips"
}
door_port=$is_use_door_port
fi
if [[ $is_use_uuid ]]; then
[[ ! $(is_test uuid $is_use_uuid) ]] && {
err "($is_use_uuid) 不是一个有效的 UUID."
err "($is_use_uuid) 不是一个有效的 UUID. $is_err_tips"
}
uuid=$is_use_uuid
fi
if [[ $is_use_path ]]; then
[[ ! $(is_test path $is_use_path) ]] && {
err "($is_use_path) 不是有效的路径."
err "($is_use_path) 不是有效的路径. $is_err_tips"
}
path=$is_use_path
fi
@@ -1003,7 +1058,7 @@ add() {
for v in ${is_tmp_list[@]}; do
msg "\t\t$v"
done
msg
msg "$is_err_tips\n"
exit 1
}
ss_method=$is_tmp_use_type
@@ -1016,10 +1071,12 @@ add() {
[[ $is_use_host ]] && host=$is_use_host
[[ $is_use_door_addr ]] && door_addr=$is_use_door_addr
[[ $is_use_servername ]] && is_servername=$is_use_servername
[[ $is_use_socks_user ]] && is_socks_user=$is_use_socks_user
[[ $is_use_socks_pass ]] && is_socks_pass=$is_use_socks_pass
fi
if [[ $is_use_tls ]]; then
if [[ ! $is_no_auto_tls && ! $is_caddy ]]; then
if [[ ! $is_no_auto_tls && ! $is_caddy && ! $is_gen ]]; then
# test auto tls
[[ $(is_test port_used 80) || $(is_test port_used 443) ]] && {
warn "端口 (80 或 443) 已经被占用, 无法完成自动配置 TLS. 请考虑使用 no-auto-tls"
@@ -1039,11 +1096,17 @@ add() {
# set port
[[ ! $port ]] && ask string port "请输入端口:"
case ${is_new_protocol} in
case ${is_new_protocol,,} in
*tcp* | *kcp* | *quic*)
[[ ! $header_type ]] && ask set_header_type
;;
Shadowsocks)
socks)
# set user
[[ ! $is_socks_user ]] && ask string is_socks_user "请设置用户名:"
# set password
[[ ! $is_socks_pass ]] && ask string is_socks_pass "请设置密码:"
;;
shadowsocks)
# set method
[[ ! $ss_method ]] && ask set_ss_method
# set password
@@ -1118,7 +1181,7 @@ get() {
is_file_str=$2
[[ ! $is_file_str ]] && is_file_str='.json$'
# is_all_json=("$(ls $is_conf_dir | egrep $is_file_str)")
readarray -t is_all_json <<<$(ls $is_conf_dir | egrep -i "$is_file_str" | sed '/dynamic-port-.*-link/d' | head -233) # limit max 233 lines for show.
readarray -t is_all_json <<<"$(ls $is_conf_dir | egrep -i "$is_file_str" | sed '/dynamic-port-.*-link/d' | head -233)" # limit max 233 lines for show.
[[ ! $is_all_json ]] && err "无法找到相关的配置文件: $2"
[[ ${#is_all_json[@]} -eq 1 ]] && is_config_file=$is_all_json && is_auto_get_config=1
[[ ! $is_config_file ]] && {
@@ -1130,12 +1193,12 @@ get() {
get file $2
if [[ $is_config_file ]]; then
is_json_str=$(cat $is_conf_dir/"$is_config_file")
is_json_data_base=$(jq '.inbounds[0]|.protocol,.port,.settings.clients[0].id,.settings.clients[0].password,.settings.method,.settings.password,.settings.address,.settings.port,.settings.detour.to' <<<$is_json_str)
is_json_data_base=$(jq '.inbounds[0]|.protocol,.port,.settings.clients[0].id,.settings.clients[0].password,.settings.method,.settings.password,.settings.address,.settings.port,.settings.detour.to,.settings.accounts[0].user,.settings.accounts[0].pass' <<<$is_json_str)
[[ $? != 0 ]] && err "无法读取此文件: $is_config_file"
is_json_data_more=$(jq '.inbounds[0]|.streamSettings|.network,.security,.tcpSettings.header.type,.kcpSettings.seed,.kcpSettings.header.type,.quicSettings.header.type,.wsSettings.path,.httpSettings.path,.grpcSettings.serviceName' <<<$is_json_str)
is_json_data_host=$(jq '.inbounds[0]|.streamSettings|.grpc_host,.wsSettings.headers.Host,.httpSettings.host[0]' <<<$is_json_str)
is_json_data_reality=$(jq '.inbounds[0]|.streamSettings|.realitySettings.serverNames[0],.realitySettings.publicKey,.realitySettings.privateKey' <<<$is_json_str)
is_up_var_set=(null is_protocol port uuid trojan_password ss_method ss_password door_addr door_port is_dynamic_port net is_reality tcp_type kcp_seed kcp_type quic_type ws_path h2_path grpc_path grpc_host ws_host h2_host is_servername is_public_key is_private_key)
is_up_var_set=(null is_protocol port uuid trojan_password ss_method ss_password door_addr door_port is_dynamic_port is_socks_user is_socks_pass net is_reality tcp_type kcp_seed kcp_type quic_type ws_path h2_path grpc_path grpc_host ws_host h2_host is_servername is_public_key is_private_key)
[[ $is_debug ]] && msg "\n------------- debug: $is_config_file -------------"
i=0
for v in $(sed 's/""/null/g;s/"//g' <<<"$is_json_data_base $is_json_data_more $is_json_data_host $is_json_data_reality"); do
@@ -1162,7 +1225,11 @@ get() {
is_dynamic_port_range=$(jq -r '.inbounds[0].port' $is_dynamic_port_file)
[[ $? != 0 ]] && err "无法读取动态端口文件: $is_dynamic_port"
fi
[[ $is_client && $host ]] && port=443
if [[ $is_caddy && $host && -f $is_caddy_conf/$host.conf ]]; then
tmp_tlsport=$(egrep -o "$host:[1-9][0-9]?+" $is_caddy_conf/$host.conf | sed s/.*://)
fi
[[ $tmp_tlsport ]] && tlsport=$tmp_tlsport
[[ $is_client && $host ]] && port=$tlsport
get protocol $is_protocol-$net
fi
;;
@@ -1210,17 +1277,19 @@ get() {
dokodemo-door*)
is_protocol=dokodemo-door
net=door
json_str='settings:{port:'\"$door_port\"',address:'\"$door_addr\"',network:"tcp,udp"}'
json_str='settings:{port:'"$door_port"',address:'\"$door_addr\"',network:"tcp,udp"}'
;;
*http*)
is_protocol=http
net=http
json_str=''"$is_listen_127"''
json_str='settings:{"timeout": 233}'
;;
*socks*)
is_protocol=socks
net=socks
json_str=''"$is_listen_127"',settings:{udp:true}'
[[ ! $is_socks_user ]] && is_socks_user=233boy
[[ ! $is_socks_pass ]] && is_socks_pass=$uuid
json_str='settings:{auth:"password",accounts:[{user:'\"$is_socks_user\"',pass:'\"$is_socks_pass\"'}],udp:true}'
;;
*)
err "无法识别协议: $is_config_file"
@@ -1251,20 +1320,20 @@ get() {
net=ws
[[ ! $path ]] && path="/$uuid"
is_stream='streamSettings:{network:"ws",security:'\"$is_tls\"',wsSettings:{path:'\"$path\"',headers:{Host:'\"$host\"'}}}'
json_str=''"$is_listen_127"','"$is_server_id_json"','"$is_stream"''
json_str=''"$is_server_id_json"','"$is_stream"''
;;
*grpc* | *gun)
net=grpc
[[ ! $path ]] && path="$uuid"
[[ $path ]] && path=$(sed 's#/##g' <<<$path)
is_stream='streamSettings:{network:"grpc",grpc_host:'\"$host\"',security:'\"$is_tls\"',grpcSettings:{serviceName:'\"$path\"'}}'
json_str=''"$is_listen_127"','"$is_server_id_json"','"$is_stream"''
json_str=''"$is_server_id_json"','"$is_stream"''
;;
*h2* | *http*)
net=h2
[[ ! $path ]] && path="/$uuid"
is_stream='streamSettings:{network:"h2",security:'\"$is_tls\"',httpSettings:{path:'\"$path\"',host:['\"$host\"']}}'
json_str=''"$is_listen_127"','"$is_server_id_json"','"$is_stream"''
json_str=''"$is_server_id_json"','"$is_stream"''
;;
*reality*)
net=reality
@@ -1329,7 +1398,12 @@ get() {
[[ $? != 0 ]] && err "无法生成 Shadowsocks 2022 密码, 请安装 openssl."
;;
ping)
is_host_dns=$(ping $host -c 1 -W 2 | head -1)
# is_ip_type="-4"
# [[ $(grep ":" <<<$ip) ]] && is_ip_type="-6"
# is_host_dns=$(ping $host $is_ip_type -c 1 -W 2 | head -1)
is_dns_type="a"
[[ $(grep ":" <<<$ip) ]] && is_dns_type="aaaa"
is_host_dns=$(_wget -qO- --header="accept: application/dns-json" "https://one.one.one.one/dns-query?name=$host&type=$is_dns_type")
;;
log | logerr)
msg "\n 提醒: 按 $(_green Ctrl + C) 退出\n"
@@ -1357,12 +1431,12 @@ get() {
return
}
is_no_manage_msg=1
if [[ $is_core_stop ]]; then
if [[ ! $(pgrep -f $is_core_bin) ]]; then
_yellow "\n测试运行 $is_core_name ..\n"
manage start &>/dev/null
if [[ $is_run_fail == $is_core ]]; then
_red "$is_core_name 运行失败信息:"
$is_core_bin run -c $is_config_json -confdir $is_conf_dir
$is_core_bin $is_with_run_arg -c $is_config_json -confdir $is_conf_dir
else
_green "\n测试通过, 已启动 $is_core_name ..\n"
fi
@@ -1370,7 +1444,7 @@ get() {
_green "\n$is_core_name 正在运行, 跳过测试\n"
fi
if [[ $is_caddy ]]; then
if [[ $is_caddy_stop ]]; then
if [[ ! $(pgrep -f $is_caddy_bin) ]]; then
_yellow "\n测试运行 Caddy ..\n"
manage start caddy &>/dev/null
if [[ $is_run_fail == 'caddy' ]]; then
@@ -1398,8 +1472,8 @@ info() {
tcp | kcp | quic)
is_can_change=(0 1 5 7)
is_info_show=(0 1 2 3 4 5)
is_vmess_url=$(jq -c '{v:2,ps:'\"233boy-${net}-$is_addr\"',add:'\"$is_addr\"',port:'\"$port\"',id:'\"$uuid\"',net:'\"$net\"',type:'\"$header_type\"',path:'\"$kcp_seed\"'}' <<<{})
is_url=vmess://$(base64 -w 0 <<<$is_vmess_url)
is_vmess_url=$(jq -c '{v:2,ps:'\"233boy-${net}-$is_addr\"',add:'\"$is_addr\"',port:'\"$port\"',id:'\"$uuid\"',aid:"0",net:'\"$net\"',type:'\"$header_type\"',path:'\"$kcp_seed\"'}' <<<{})
is_url=vmess://$(echo -n $is_vmess_url | base64 -w 0)
is_tmp_port=$port
[[ $is_dynamic_port ]] && {
is_can_change+=(12)
@@ -1414,12 +1488,12 @@ info() {
ss)
is_can_change=(0 1 4 6)
is_info_show=(0 1 2 10 11)
is_url="ss://$(base64 -w 0 <<<"${ss_method}:${ss_password}")@${ip}:${port}#233boy-ss-${ip}"
is_url="ss://$(echo -n ${ss_method}:${ss_password} | base64 -w 0)@${is_addr}:${port}#233boy-$net-${is_addr}"
is_info_str=($is_protocol $is_addr $port $ss_password $ss_method)
;;
ws | h2 | grpc)
is_color=45
is_can_change=(0 2 3 5)
is_can_change=(0 1 2 3 5)
is_info_show=(0 1 2 3 4 6 7 8)
is_url_path=path
[[ $net == 'grpc' ]] && {
@@ -1427,33 +1501,39 @@ info() {
is_url_path=serviceName
}
[[ $is_protocol == 'vmess' ]] && {
is_vmess_url=$(jq -c '{v:2,ps:'\"233boy-$host\"',add:'\"$is_addr\"',port:'\"443\"',id:'\"$uuid\"',net:'\"$net\"',host:'\"$host\"',path:'\"$path\"',tls:'\"tls\"'}' <<<{})
is_url=vmess://$(base64 -w 0 <<<$is_vmess_url)
is_vmess_url=$(jq -c '{v:2,ps:'\"233boy-$net-$host\"',add:'\"$is_addr\"',port:'\"$tlsport\"',id:'\"$uuid\"',aid:"0",net:'\"$net\"',host:'\"$host\"',path:'\"$path\"',tls:'\"tls\"'}' <<<{})
is_url=vmess://$(echo -n $is_vmess_url | base64 -w 0)
} || {
[[ $is_trojan ]] && {
uuid=$trojan_password
is_info_str=($is_protocol $is_addr 443 $trojan_password $net $host $path 'tls')
is_can_change=(0 2 3 4)
is_info_str=($is_protocol $is_addr $tlsport $trojan_password $net $host $path 'tls')
is_can_change=(0 1 2 3 4)
is_info_show=(0 1 2 10 4 6 7 8)
}
is_url="$is_protocol://$uuid@$host:443?encryption=none&security=tls&type=$net&host=$host&${is_url_path}=$(sed 's#/#%2F#g' <<<$path)#233boy-$host"
is_url="$is_protocol://$uuid@$host:$tlsport?encryption=none&security=tls&type=$net&host=$host&${is_url_path}=$(sed 's#/#%2F#g' <<<$path)#233boy-$net-$host"
}
[[ $is_caddy ]] && is_can_change+=(13)
is_info_str=($is_protocol $is_addr 443 $uuid $net $host $path 'tls')
is_info_str=($is_protocol $is_addr $tlsport $uuid $net $host $path 'tls')
;;
reality)
is_color=41
is_can_change=(0 1 5 10 11)
is_info_show=(0 1 2 3 15 8 16 17 18)
is_info_str=($is_protocol $is_addr $port $uuid xtls-rprx-vision reality $is_servername "ios" $is_public_key)
is_url="$is_protocol://$uuid@$ip:$port?encryption=none&security=reality&flow=xtls-rprx-vision&type=tcp&sni=$is_servername&pbk=$is_public_key&fp=ios#233boy-$is_addr"
is_url="$is_protocol://$uuid@$ip:$port?encryption=none&security=reality&flow=xtls-rprx-vision&type=tcp&sni=$is_servername&pbk=$is_public_key&fp=ios#233boy-$net-$is_addr"
;;
door)
is_can_change=(0 1 8 9)
is_info_show=(0 1 2 13 14)
is_info_str=($is_protocol $is_addr $port $door_addr $door_port)
;;
socks | http)
socks)
is_can_change=(0 1 15 4)
is_info_show=(0 1 2 19 10)
is_info_str=($is_protocol $is_addr $port $is_socks_user $is_socks_pass)
is_url="socks://$(echo -n ${is_socks_user}:${is_socks_pass} | base64 -w 0)@${is_addr}:${port}#233boy-$net-${is_addr}"
;;
http)
is_can_change=(0 1)
is_info_show=(0 1 2)
is_info_str=($is_protocol 127.0.0.1 $port)
@@ -1511,7 +1591,11 @@ url_qr() {
link="https://233boy.github.io/tools/qr.html#${is_url}"
msg "\n------------- $is_config_name & QR code 二维码 -------------"
msg
qrencode -t ANSI "${is_url}"
if [[ $(type -P qrencode) ]]; then
qrencode -t ANSI "${is_url}"
else
msg "请安装 qrencode: $(_green "$cmd update -y; $cmd install qrencode -y")"
fi
msg
msg "如果无法正常显示或识别, 请使用下面的链接来生成二维码:"
msg "\n\e[4;${is_color}m${link}\e[0m\n"
@@ -1533,17 +1617,20 @@ update() {
is_update_name=core
is_show_name=$is_core_name
is_run_ver=v${is_core_ver##* }
is_update_repo=$is_core_repo
;;
2 | sh)
is_update_name=sh
is_show_name="$is_core_name 脚本"
is_run_ver=$is_sh_ver
is_update_repo=$is_sh_repo
;;
3 | caddy)
[[ ! $is_caddy ]] && err "不支持更新 Caddy."
is_update_name=caddy
is_show_name="Caddy"
is_run_ver=$is_caddy_ver
is_update_repo=$is_caddy_repo
;;
*)
err "无法识别 ($1), 请使用: $is_core update [core | sh | caddy] [ver]"
@@ -1568,7 +1655,9 @@ update() {
fi
download $is_update_name $is_new_ver
msg "更新成功, 当前 $is_show_name 版本: $(_green $is_new_ver)\n"
manage restart $is_update_name &
msg "$(_green 请查看更新说明: https://github.com/$is_update_repo/releases/tag/$is_new_ver)\n"
[[ $is_update_name == 'core' ]] && $is_core restart
[[ $is_update_name == 'caddy' ]] && manage restart $is_update_name &
}
# main menu; if no prefer args.
@@ -1611,7 +1700,7 @@ is_main_menu() {
show_help
;;
9)
ask list is_do_other "启用BBR 查看日志 查看错误日志 测试运行 重装脚本"
ask list is_do_other "启用BBR 查看日志 查看错误日志 测试运行 重装脚本 设置DNS"
case $REPLY in
1)
load bbr.sh
@@ -1629,6 +1718,10 @@ is_main_menu() {
5)
get reinstall
;;
6)
load dns.sh
dns_set
;;
esac
;;
10)
@@ -1689,7 +1782,7 @@ main() {
msg "fix: $v"
change $v full
done
msg "\nfix 完成.\n"
_green "\nfix 完成.\n"
;;
*)
is_dont_auto_exit=1
@@ -1706,6 +1799,10 @@ main() {
[[ $is_api_fail ]] && manage restart &
[[ $is_del_host ]] && manage restart caddy &
;;
dns)
load dns.sh
dns_set ${@:2}
;;
debug)
is_debug=1
get info $2
@@ -1714,6 +1811,16 @@ main() {
fix-config.json)
create config.json
;;
fix-caddyfile)
if [[ $is_caddy ]]; then
load caddy.sh
caddy_config new
manage restart caddy &
_green "\nfix 完成.\n"
else
err "无法执行此操作"
fi
;;
i | info)
info $2
;;

58
src/dns.sh Normal file
View File

@@ -0,0 +1,58 @@
is_dns_list=(
1.1.1.1
8.8.8.8
https://dns.google/dns-query
https://cloudflare-dns.com/dns-query
https://family.cloudflare-dns.com/dns-query
set
none
)
dns_set() {
if [[ $1 ]]; then
case ${1,,} in
11 | 1111)
is_dns_use=${is_dns_list[0]}
;;
88 | 8888)
is_dns_use=${is_dns_list[1]}
;;
gg | google)
is_dns_use=${is_dns_list[2]}
;;
cf | cloudflare)
is_dns_use=${is_dns_list[3]}
;;
nosex | family)
is_dns_use=${is_dns_list[4]}
;;
set)
if [[ $2 ]]; then
is_dns_use=${2,,}
else
ask string is_dns_use "请输入 DNS: "
fi
;;
none)
is_dns_use=none
;;
*)
err "无法识别 DNS 参数: $@"
;;
esac
else
is_tmp_list=(${is_dns_list[@]})
ask list dns_pick
is_dns_use=${is_dns_list[$REPLY - 1]}
if [[ $is_dns_use == "set" ]]; then
ask string is_dns_use "请输入 DNS: "
fi
fi
is_new_dns=$(sed s/https/https+local/ <<<$is_dns_use)
if [[ $is_new_dns == "none" ]]; then
cat <<<$(jq '.dns={}' $is_config_json) >$is_config_json
else
cat <<<$(jq '.dns.servers=["'$is_new_dns'"]' $is_config_json) >$is_config_json
fi
manage restart &
msg "\n已更新 DNS 为: $(_green $is_new_dns)\n"
}

View File

@@ -10,7 +10,7 @@ get_latest_version() {
;;
caddy)
name="Caddy"
url="https://api.github.com/repos/caddyserver/caddy/releases/latest?v=$RANDOM"
url="https://api.github.com/repos/$is_caddy_repo/releases/latest?v=$RANDOM"
;;
esac
latest_ver=$(_wget -qO- $url | grep tag_name | egrep -o 'v([0-9.]+)')
@@ -43,13 +43,18 @@ download() {
link="https://github.com/${is_sh_repo}/releases/download/${latest_ver}/code.zip"
download_file
unzip -qo $tmpfile -d $is_sh_dir
chmod +x $is_sh_bin
;;
caddy)
name="Caddy"
tmpfile=$tmpdir/caddy.tar.gz
# https://github.com/caddyserver/caddy/releases/download/v2.6.4/caddy_2.6.4_linux_amd64.tar.gz
link="https://github.com/caddyserver/caddy/releases/download/${latest_ver}/caddy_${latest_ver:1}_linux_${caddy_arch}.tar.gz"
link="https://github.com/${is_caddy_repo}/releases/download/${latest_ver}/caddy_${latest_ver:1}_linux_${caddy_arch}.tar.gz"
download_file
[[ ! $(type -P tar) ]] && {
rm -rf $tmpdir
err "请安装 tar"
}
tar zxf $tmpfile -C $tmpdir
cp -f $tmpdir/caddy $is_caddy_bin
chmod +x $is_caddy_bin

View File

@@ -40,9 +40,11 @@ show_help() {
" new [name] [...] 更改协议"
" web [name] [domain] 更改伪装网站\n"
"进阶:"
" dns [...] 设置 DNS"
" dd, ddel [name...] 删除多个配置**"
" fix [name] 修复一个配置"
" fix-all 修复全部配置"
" fix-caddyfile 修复 Caddyfile"
" fix-config.json 修复 config.json\n"
"管理:"
" un, uninstall 卸载"
@@ -53,7 +55,7 @@ show_help() {
" t, test 测试运行"
" reinstall 重装脚本\n"
"测试:"
" client, genc [name] 显示用于客户端 JOSN, 仅供参考"
" client, genc [name] 显示用于客户端 JSON, 仅供参考"
" debug [name] 显示一些 debug 信息, 仅供参考"
" gen [...] 同等于 add, 但只显示 JSON 内容, 不创建文件, 测试使用"
" no-auto-tls [...] 同等于 add, 但禁止自动配置 TLS, 可用于 *TLS 相关协议"
@@ -79,9 +81,9 @@ about() {
####### 要点13脸吗只会改我链接的小人 #######
unset c n m s b
msg
msg "Blog: $(msg_ul https://233boy.com)"
msg "Chat: $(msg_ul https://t.me/tg233boy)"
msg "Chanel: $(msg_ul https://t.me/tg2333)"
msg "网站: $(msg_ul https://233boy.com)"
msg "频道: $(msg_ul https://t.me/tg2333)"
msg "群组: $(msg_ul https://t.me/tg233boy)"
msg "Github: $(msg_ul https://github.com/${is_sh_repo})"
msg "Twitter: $(msg_ul https://twitter.com/ai233boy)"
msg "$is_core_name site: $(msg_ul https://www.v2fly.org)"

View File

@@ -47,6 +47,17 @@ warn() {
echo -e "\n$is_warn $@\n"
}
# load bash script.
load() {
. $is_sh_dir/src/$1
}
# wget add --no-check-certificate
_wget() {
# [[ $proxy ]] && export https_proxy=$proxy
wget --no-check-certificate "$@"
}
# yum or apt-get
cmd=$(type -P apt-get || type -P yum)
@@ -79,9 +90,11 @@ is_pkg="wget unzip jq qrencode"
is_config_json=$is_core_dir/config.json
is_caddy_bin=/usr/local/bin/caddy
is_caddy_dir=/etc/caddy
is_caddy_repo=caddyserver/caddy
is_caddyfile=$is_caddy_dir/Caddyfile
is_caddy_conf=$is_caddy_dir/$author
is_caddy_service=$(systemctl list-units --full -all | grep caddy.service)
tlsport=443
# core ver
is_core_ver=$($is_core_bin version | head -n1 | cut -d " " -f1-2)
@@ -89,6 +102,16 @@ is_core_ver=$($is_core_bin version | head -n1 | cut -d " " -f1-2)
if [[ $(grep -o ^[0-9] <<<${is_core_ver#* }) -lt 5 ]]; then
# core version less than 5, e.g, v4.45.2
is_core_ver_lt_5=1
if [[ $(grep 'run -config' /lib/systemd/system/v2ray.service) ]]; then
sed -i 's/run //' /lib/systemd/system/v2ray.service
systemctl daemon-reload
fi
else
is_with_run_arg=run
if [[ ! $(grep 'run -config' /lib/systemd/system/v2ray.service) ]]; then
sed -i 's/-config/run -config/' /lib/systemd/system/v2ray.service
systemctl daemon-reload
fi
fi
if [[ $(pgrep -f $is_core_bin) ]]; then
@@ -99,6 +122,12 @@ else
fi
if [[ -f $is_caddy_bin && -d $is_caddy_dir && $is_caddy_service ]]; then
is_caddy=1
# fix caddy run; ver >= 2.8.2
[[ ! $(grep '\-\-adapter caddyfile' /lib/systemd/system/caddy.service) ]] && {
load systemd.sh
install_service caddy
systemctl restart caddy &
}
is_caddy_ver=$($is_caddy_bin version | head -n1 | cut -d " " -f1)
if [[ $(pgrep -f $is_caddy_bin) ]]; then
is_caddy_status=$(_green running)
@@ -108,17 +137,6 @@ if [[ -f $is_caddy_bin && -d $is_caddy_dir && $is_caddy_service ]]; then
fi
fi
# load bash script.
load() {
. $is_sh_dir/src/$1
}
# wget add --no-check-certificate
_wget() {
# [[ $proxy ]] && export https_proxy=$proxy
wget --no-check-certificate $@
}
load core.sh
# old sh ver
is_old_dir=/etc/v2ray/233boy

View File

@@ -107,7 +107,7 @@ if [[ $is_old_use ]]; then
fi
fi
if [[ $socks ]]; then
add socks $socks_port
add socks $socks_port $socks_username $socks_userpass
fi
port=$v2ray_port
uuid=$v2ray_id

View File

@@ -39,8 +39,8 @@ Requires=network-online.target
Type=notify
User=root
Group=root
ExecStart=$is_caddy_bin run --environ --config $is_caddyfile
ExecReload=$is_caddy_bin reload --config $is_caddyfile
ExecStart=$is_caddy_bin run --environ --config $is_caddyfile --adapter caddyfile
ExecReload=$is_caddy_bin reload --config $is_caddyfile --adapter caddyfile
TimeoutStopSec=5s
LimitNPROC=10000
LimitNOFILE=1048576

View File

@@ -1,6 +1,6 @@
#!/bin/bash
args=$@
is_sh_ver=v4.0
is_sh_ver=v4.20
. /etc/v2ray/sh/src/init.sh