diff --git a/default.aproj b/default.aproj index aecc82f..85b902c 100644 --- a/default.aproj +++ b/default.aproj @@ -1,5 +1,5 @@  - + @@ -8,6 +8,7 @@ + @@ -15,7 +16,7 @@ - + @@ -31,6 +32,7 @@ + diff --git a/forms/main/config/jsonConfig.aardio b/forms/main/config/jsonConfig.aardio index 87b669f..9da0d8f 100644 --- a/forms/main/config/jsonConfig.aardio +++ b/forms/main/config/jsonConfig.aardio @@ -1,27 +1,25 @@ import fonts.fontAwesome; import win.ui; /*DSG{{*/ -var winform = win.form(text="aardio form";right=938;bottom=638;bgcolor=16777215) +var winform = win.form(text="aardio form";right=912;bottom=793;bgcolor=16777215) winform.add( -advancedConfig={cls="\forms\main\config\advancedConfig.aardio";left=9;top=20;right=930;bottom=594;bgcolor=16777215;db=1;dl=1;dr=1;dt=1;edge=1;z=12}; -btnUpdate={cls="plus";text="更新服务器配置";left=699;top=604;right=868;bottom=635;align="left";bgcolor=11580047;db=1;dr=1;font=LOGFONT(h=-13);iconStyle={align="left";font=LOGFONT(h=-13;name='FontAwesome');padding={left=22}};iconText='\uF0C7';notify=1;textPadding={left=40};z=6}; +advancedConfig={cls="\forms\main\config\advancedConfig.aardio";left=9;top=29;right=902;bottom=739;bgcolor=16777215;db=1;dl=1;dr=1;dt=1;edge=1;z=11}; +btnUpdate={cls="plus";text="更新服务器配置";left=687;top=753;right=856;bottom=784;align="left";bgcolor=11580047;db=1;dr=1;font=LOGFONT(h=-13);iconStyle={align="left";font=LOGFONT(h=-13;name='FontAwesome');padding={left=22}};iconText='\uF0C7';notify=1;textPadding={left=40};z=5}; btnUpdateNaiveCore={cls="plus";text="下载 / 更新 NaÏveProxy Core";left=448;top=7;right=709;bottom=35;align="left";color=3947580;dl=1;dt=1;font=LOGFONT(h=-13);iconStyle={align="left";font=LOGFONT(h=-17;name='FontAwesome');padding={left=18}};iconText='\uF1A0';notify=1;textPadding={left=50};z=17}; btnUpdateRules={cls="plus";text="下载 / 更新 路由规则";left=227;top=39;right=425;bottom=67;align="left";color=3947580;dl=1;dt=1;font=LOGFONT(h=-13);iconStyle={align="left";font=LOGFONT(h=-19;name='FontAwesome');padding={left=18}};iconText='\uF041';notify=1;textPadding={left=50};z=15}; btnUpdateSsrCore={cls="plus";text="下载 / 更新 SSR Core";left=16;top=39;right=214;bottom=67;align="left";color=3947580;dl=1;dt=1;font=LOGFONT(h=-13);iconStyle={align="left";font=LOGFONT(h=-17;name='FontAwesome');padding={left=18}};iconText='\uF1D8';notify=1;textPadding={left=50};z=16}; -btnUpdatev2rayCore={cls="plus";text="下载 / 更新 V2ray Core";left=227;top=5;right=425;bottom=33;align="left";color=3947580;dl=1;dt=1;font=LOGFONT(h=-13);iconStyle={align="left";font=LOGFONT(h=-19;name='FontAwesome');padding={left=18}};iconText='\uF27D';notify=1;textPadding={left=50};z=14}; -btnUpdatexrayCore={cls="plus";text="下载 / 更新 Xray Core";left=16;top=5;right=223;bottom=33;align="left";color=3947580;dl=1;dt=1;font=LOGFONT(h=-13);iconStyle={align="left";font=LOGFONT(h=-19;name='FontAwesome');padding={left=18}};iconText='\uF0E7';notify=1;textPadding={left=50};z=13}; -editCoreConfig={cls="edit";left=9;top=72;right=930;bottom=594;db=1;dl=1;dr=1;dt=1;edge=1;hide=1;hscroll=1;multiline=1;vscroll=1;z=7}; -editOutbounds={cls="edit";left=9;top=29;right=930;bottom=594;db=1;dl=1;dr=1;dt=1;edge=1;hscroll=1;multiline=1;vscroll=1;z=8}; -lbTip={cls="static";text="可在下面输入多行服务器分享链接，或JSON数组( 点击字段名会显示用法说明 )：";left=11;top=9;right=899;bottom=29;color=3947580;dl=1;dr=1;dt=1;font=LOGFONT(h=-13);transparent=1;z=9}; -lbTipForCoreJson={cls="static";text="tag 指定为 proxy,http_proxy 的节点属于自动维护节点 - 不可删除";left=468;top=45;right=849;bottom=68;color=4964352;dl=1;dt=1;transparent=1;z=19}; -navAdvancedConfig={cls="plus";text="代理端口 / 高级配置";left=359;top=600;right=493;bottom=632;border={top=1;color=-16744448};db=1;dl=1;z=10}; -navCoreConfig={cls="plus";text="Core 配置 ( JSON )";left=162;top=600;right=293;bottom=632;border={top=1;color=-16744448};db=1;dl=1;z=3}; -navOutbounds={cls="plus";text="服务器配置( JSON )";left=31;top=600;right=162;bottom=632;border={top=1;color=-16744448};db=1;dl=1;z=2}; -navRight={cls="plus";left=493;top=600;right=762;bottom=601;bgcolor=16777215;border={top=1;color=-16744448};db=1;dl=1;dr=1;linearGradient=180;z=4}; -navSubscription={cls="plus";text="订阅";left=293;top=600;right=359;bottom=632;border={top=1;color=-16744448};db=1;dl=1;z=11}; -navUwpExemption={cls="plus";text="UWP 应用配置";left=499;top=600;right=633;bottom=632;border={top=1;color=-16744448};db=1;dl=1;notify=1;z=18}; -plus={cls="plus";left=9;top=600;right=31;bottom=601;border={top=1;color=-16744448};db=1;dl=1;z=5}; -subscription={cls="\forms\main\config\subscription.aardio";left=9;top=19;right=930;bottom=594;bgcolor=16777215;db=1;dl=1;dr=1;dt=1;edge=1;z=1} +btnUpdatev2rayCore={cls="plus";text="下载 / 更新 V2ray Core";left=227;top=5;right=425;bottom=33;align="left";color=3947580;dl=1;dt=1;font=LOGFONT(h=-13);iconStyle={align="left";font=LOGFONT(h=-19;name='FontAwesome');padding={left=18}};iconText='\uF27D';notify=1;textPadding={left=50};z=13}; +btnUpdatexrayCore={cls="plus";text="下载 / 更新 Xray Core";left=16;top=5;right=223;bottom=33;align="left";color=3947580;dl=1;dt=1;font=LOGFONT(h=-13);iconStyle={align="left";font=LOGFONT(h=-19;name='FontAwesome');padding={left=18}};iconText='\uF0E7';notify=1;textPadding={left=50};z=12}; +editCoreConfig={cls="edit";left=9;top=72;right=902;bottom=739;db=1;dl=1;dr=1;dt=1;edge=1;hide=1;hscroll=1;multiline=1;vscroll=1;z=6}; +editOutbounds={cls="edit";left=9;top=29;right=902;bottom=739;db=1;dl=1;dr=1;dt=1;edge=1;hscroll=1;multiline=1;vscroll=1;z=7}; +lbTip={cls="static";text="可在下面输入多行服务器分享链接，或JSON数组( 点击字段名会显示用法说明 )：";left=11;top=9;right=899;bottom=29;color=3947580;dl=1;dr=1;dt=1;font=LOGFONT(h=-13);transparent=1;z=8}; +navAdvancedConfig={cls="plus";text="代理端口 / 高级配置";left=359;top=750;right=493;bottom=782;border={top=1;color=-16744448};db=1;dl=1;z=9}; +navCoreConfig={cls="plus";text="Core 配置 ( JSON )";left=162;top=750;right=293;bottom=782;border={top=1;color=-16744448};db=1;dl=1;z=2}; +navOutbounds={cls="plus";text="服务器配置( JSON )";left=31;top=750;right=162;bottom=782;border={top=1;color=-16744448};db=1;dl=1;z=1}; +navRight={cls="plus";left=493;top=750;right=762;bottom=751;bgcolor=16777215;border={top=1;color=-16744448};db=1;dl=1;dr=1;linearGradient=180;z=3}; +navSubscription={cls="plus";text="订阅";left=293;top=750;right=359;bottom=782;border={top=1;color=-16744448};db=1;dl=1;z=10}; +plus={cls="plus";left=9;top=750;right=31;bottom=751;border={top=1;color=-16744448};db=1;dl=1;z=4}; +subscription={cls="\forms\main\config\subscription.aardio";left=9;top=29;right=902;bottom=739;bgcolor=16777215;db=1;dl=1;dr=1;dt=1;edge=1;z=14} ) /*}}*/ @@ -59,7 +57,6 @@ tbs.onSelchange = function(idx,strip,form){ winform.advancedConfig.hide = idx!=4; winform.btnUpdate.hide = idx>2; winform.lbTip.hide = idx!=1; - winform.lbTipForCoreJson.hide = true; if(idx==1){ winform.btnUpdate.text = "更新服务器配置"; @@ -109,62 +106,33 @@ winform.btnUpdate.oncommand = function(id,event){ winform.btnUpdate.disabledText = null; return; } - - var proxyOutboundInCore; - for(k,ob in cfg.outbounds){ - if(ob.tag == "proxy"){ - proxyOutboundInCore = ob; - } - } - - if( type(proxyOutboundInCore) !="table" ){ - winform.msgErr(`outbounds 数组中未找到默认出站节点 {tag:"proxy"}`); - winform.btnUpdate.disabledText = null; - return; - } - - var socksInbounds,httpInbounds; - for(k,ib in cfg.inbounds){ - if(ib.tag == "proxy"){ - socksInbounds = ib; - } - elseif(ib.tag == "http_proxy"){ - httpInbounds = ib; - } - } - - if( type(socksInbounds) !="table" ){ - winform.msgErr(`inbounds 数组中未找到SOCKS协议入站节点 {tag:"proxy"}`); - winform.btnUpdate.disabledText = null; - return; - } - - if( type(httpInbounds) !="table" ){ - winform.msgErr(`inbounds 数组中未找到HTTP协议入站节点 {tag:"http_proxy"}`); + + if(cfg.outbounds[[1]][["tag"]]!="proxy"){ + winform.msgErr(`outbounds[0]必须指定为{"tag":"proxy"}`); winform.btnUpdate.disabledText = null; return; } - - if(type(socksInbounds[["listen"]])!="string"){ - winform.msgErr(`出站节点 {tag:"proxy"} listen字段必须指定IP或0.0.0.0`); + + if(type(cfg.inbounds[[1]][["listen"]])!="string"){ + winform.msgErr(`inbounds[0].listen必须指定为SOCKS代理监听IP或0.0.0.0`); winform.btnUpdate.disabledText = null; return; } - if(type(socksInbounds[["port"]])!="number"){ - winform.msgErr(`出站节点 {tag:"proxy"} port字段必须用数值指定监听端口`); + if(type(cfg.inbounds[[1]][["port"]])!="number"){ + winform.msgErr(`inbounds[0].port必须指定为SOCKS代理监听端口`); winform.btnUpdate.disabledText = null; return; } - if(type(httpInbounds[["listen"]])!="string"){ - winform.msgErr(`出站节点 {tag:"http_proxy"} listen字段必须指定IP或0.0.0.0`); + if(type(cfg.inbounds[[2]][["listen"]])!="string"){ + winform.msgErr(`inbounds[1].listen必须指定为HTTP代理监听IP或0.0.0.0`); winform.btnUpdate.disabledText = null; return; } - if(type(httpInbounds[["port"]])!="number"){ - winform.msgErr(`出站节点 {tag:"http_proxy"} port字段必须用数值指定监听端口`); + if(type(cfg.inbounds[[2]][["port"]])!="number"){ + winform.msgErr(`inbounds[1].port必须指定为HTTP代理监听端口`); winform.btnUpdate.disabledText = null; return; } @@ -390,8 +358,8 @@ winform.editOutbounds.enablePopMenu(function(){ config.proxy.outbounds,true,false,true ) - string.save("/xray-core/WinXray-default-servers.json",str ); - winform.msgOk("已存为默认服务器列表 /xray-core/WinXray-default-servers.json",1000) + string.save("/xray-core/winv2ray-default-servers.json",str ); + winform.msgOk("已存为默认服务器列表 /xray-core/winv2ray-default-servers.json",1000) } }); @@ -550,13 +518,13 @@ winform.editCoreConfig.enablePopMenu({ { /*---分隔线---*/ }; { "重置为默认内核配置"; function(id){ - winform.editCoreConfig.text = string.crlf( string.load("\forms\main\config\coreConfigs\default.json") ) + winform.editCoreConfig.text = ..string.load("\forms\main\config\coreConfigs\default.json") winform.editCoreConfig.msgOk('已重置为默认内核配置。\n请在下面点击：『更新内核配置』启用新的配置。',1300) } }; { "重置为启用路由规则默认内核配置"; function(id){ - winform.editCoreConfig.text = string.crlf( string.load("\forms\main\config\coreConfigs\xray.rules.json") ) + winform.editCoreConfig.text = ..string.load("\forms\main\config\coreConfigs\xray.rules.json") import xray.core.rules; var versionTag = xray.core.rules.check(); if(versionTag) winform.editCoreConfig.msgOk('已重置为启用路由规则默认内核配置，\n已下载路由规则数据最新版本：' + versionTag+ '\n\n请在下面点击：『更新内核配置』启用新的配置。',2000) @@ -628,7 +596,7 @@ var editOutboundsTip = { obfs = {"混淆插件";"可选值：plain,http_simple,http_post,tls1.2_ticket_auth ..."}; obfsParam = {"混淆参数";"SSR 里的 obfs_param"}; networkParam = {"SSR网络协议参数";"SSR 里的 protocol_param"}; - concurrency = {"Mux多路复用:最大并发连接数";"最小值1，最大值1024，特殊值-1，不加载mux模块。缺省由WinXray根据连接协议自动设定此值。"}; + concurrency = {"Mux多路复用:最大并发连接数";"最小值1，最大值1024，特殊值-1，不加载mux模块。缺省由winv2ray根据连接协议自动设定此值。"}; } winform.editOutbounds.wndproc = function(hwnd,message,wParam,lParam){ @@ -651,7 +619,7 @@ winform.editOutbounds.wndproc = function(hwnd,message,wParam,lParam){ winform.editCoreConfig.oncommand = function(id,event){ if( event === 0x100/*_EN_SETFOCUS*/){ - winform.lbTipForCoreJson.hide = false; + winform.editCoreConfig.showInfoTip("提示",'inbounds[0] 必须为入站 SOCKS 代理，\ninbounds[1] 必须为入站 HTTP 代理，\noutbounds[0] 会转换为出站服务器数组。') } } @@ -750,22 +718,6 @@ winform.btnUpdateNaiveCore.oncommand = function(id,event){ } } -if(!_WIN10_LATER){ - winform.navUwpExemption.close(); -} -else { - winform.navUwpExemption.skin(style.plainButton) - winform.navUwpExemption.oncommand = function( id,event ){ - if(_STUDIO_INVOKED){ - winform.msgErr("请先发布为 EXE！"); - return; - } - - import process; - process.execute(io._exepath,"/uwp","runas") - } -} - winform.show(); win.loopMessage(); return winform; \ No newline at end of file diff --git a/forms/main/json.aardio b/forms/main/json.aardio index 402c551..45ead27 100644 --- a/forms/main/json.aardio +++ b/forms/main/json.aardio @@ -1,19 +1,19 @@ import fonts.fontAwesome; -import win.ui; -/*DSG{{*/ -var winform = win.form(text="aardio form";right=912;bottom=793;bgcolor=16777215) -winform.add( -btnUpdate={cls="plus";text="更新设置";left=731;top=750;right=863;bottom=781;align="left";bgcolor=11580047;db=1;dr=1;font=LOGFONT(h=-13);iconStyle={align="left";font=LOGFONT(h=-13;name='FontAwesome');padding={left=22}};iconText='\uF0C7';notify=1;textPadding={left=40};z=7}; -editCoreConfig={cls="edit";left=10;top=34;right=903;bottom=744;db=1;dl=1;dr=1;dt=1;edge=1;hide=1;hscroll=1;multiline=1;vscroll=1;z=6}; -editOutbounds={cls="edit";left=9;top=32;right=902;bottom=743;db=1;dl=1;dr=1;dt=1;edge=1;hscroll=1;multiline=1;vscroll=1;z=1}; -lbTip={cls="static";text="可在下面输入JSON数组、或每行一个服务器链接、或每行以空格分开的服务器配置文本：";left=11;top=9;right=899;bottom=29;color=3947580;dl=1;dr=1;dt=1;font=LOGFONT(h=-13);transparent=1;z=8}; -navCoreConfig={cls="plus";text="高级配置( JSON )";left=184;top=750;right=315;bottom=782;border={top=1;color=-16744448};db=1;dl=1;z=3}; -navOutbounds={cls="plus";text="服务器配置( JSON )";left=53;top=750;right=184;bottom=782;border={top=1;color=-16744448};db=1;dl=1;z=2}; -navRight={cls="plus";left=314;top=750;right=604;bottom=751;bgcolor=16777215;border={color=-16744448};db=1;dl=1;dr=1;forecolor=32768;linearGradient=180;z=4}; -plus={cls="plus";left=9;top=750;right=53;bottom=751;border={color=-16744448};db=1;dl=1;forecolor=32768;z=5} -) -/*}}*/ - +import win.ui; +/*DSG{{*/ +var winform = win.form(text="aardio form";right=912;bottom=793;bgcolor=16777215) +winform.add( +btnUpdate={cls="plus";text="更新设置";left=731;top=750;right=863;bottom=781;align="left";bgcolor=11580047;db=1;dr=1;font=LOGFONT(h=-13);iconStyle={align="left";font=LOGFONT(h=-13;name='FontAwesome');padding={left=22}};iconText='\uF0C7';notify=1;textPadding={left=40};z=7}; +editCoreConfig={cls="edit";left=10;top=34;right=903;bottom=744;db=1;dl=1;dr=1;dt=1;edge=1;hide=1;hscroll=1;multiline=1;vscroll=1;z=6}; +editOutbounds={cls="edit";left=9;top=32;right=902;bottom=743;db=1;dl=1;dr=1;dt=1;edge=1;hscroll=1;multiline=1;vscroll=1;z=1}; +lbTip={cls="static";text="可在下面输入JSON数组、或每行一个服务器链接、或每行以空格分开的服务器配置文本：";left=11;top=9;right=899;bottom=29;color=3947580;dl=1;dr=1;dt=1;font=LOGFONT(h=-13);transparent=1;z=8}; +navCoreConfig={cls="plus";text="高级配置( JSON )";left=184;top=750;right=315;bottom=782;border={top=1;color=-16744448};db=1;dl=1;z=3}; +navOutbounds={cls="plus";text="服务器配置( JSON )";left=53;top=750;right=184;bottom=782;border={top=1;color=-16744448};db=1;dl=1;z=2}; +navRight={cls="plus";left=314;top=750;right=604;bottom=751;bgcolor=16777215;border={color=-16744448};db=1;dl=1;dr=1;forecolor=32768;linearGradient=180;z=4}; +plus={cls="plus";left=9;top=750;right=53;bottom=751;border={color=-16744448};db=1;dl=1;forecolor=32768;z=5} +) +/*}}*/ + import config; import web.json; import win.ui.tabs; diff --git a/forms/main/outbound.aardio b/forms/main/outbound.aardio index 81cb5c2..6e79c86 100644 --- a/forms/main/outbound.aardio +++ b/forms/main/outbound.aardio @@ -11,22 +11,22 @@ btnGenGuid={cls="plus";text="生成";left=914;top=259;right=986;bottom=284;align btnImportSharedLink={cls="plus";text="导入";left=912;top=471;right=984;bottom=496;align="left";clip=1;db=1;dr=1;font=LOGFONT(h=-13);iconStyle={align="left";font=LOGFONT(h=-13;name='FontAwesome');padding={left=12}};iconText='\uF0C1';notify=1;textPadding={left=30};z=21}; btnInsertField={cls="plus";text="插入更多配置字段";left=10;top=0;right=191;bottom=24;align="left";dl=1;dt=1;font=LOGFONT(h=-13);iconStyle={align="left";font=LOGFONT(h=-13;name='FontAwesome');padding={left=12}};iconText='\uF196 ';notify=1;textPadding={left=30};z=18}; btnSaveOutbound={cls="plus";text="保 存";left=826;top=410;right=929;bottom=446;align="left";bgcolor=11580047;db=1;disabled=1;dr=1;font=LOGFONT(h=-13);iconStyle={align="left";font=LOGFONT(h=-13;name='FontAwesome');padding={left=22}};iconText='\uF0C7';notify=1;textPadding={left=40};z=16}; -btnUpdateCore={cls="plus";text="下载 / 更新 NaÏveProxy Core";left=637;top=61;right=979;bottom=89;align="left";color=3947580;dr=1;dt=1;font=LOGFONT(h=-13);iconStyle={align="left";font=LOGFONT(h=-17;name='FontAwesome');padding={left=18}};iconText='\uF0AB';notify=1;textPadding={left=50};z=23}; +btnUpdateCore={cls="plus";text="下载 / 更新 NaÏveProxy Core";left=637;top=61;right=979;bottom=89;align="left";color=3947580;dl=1;dt=1;font=LOGFONT(h=-13);iconStyle={align="left";font=LOGFONT(h=-17;name='FontAwesome');padding={left=18}};iconText='\uF0AB';notify=1;textPadding={left=50};z=23}; cmbNetwork={cls="combobox";left=656;top=97;right=814;bottom=123;dr=1;dt=1;edge=1;items={"tcp";"kcp";"ws";"h2";"quic"};mode="dropdown";z=13}; -cmbProtocol={cls="combobox";left=656;top=28;right=814;bottom=54;dr=1;dt=1;edge=1;items={"vmess";"vless";"trojan";"trojan-go";"ssr";"shadowsocks";"naive";"socks";"https";"http"};mode="dropdown";z=12}; +cmbProtocol={cls="combobox";left=656;top=28;right=814;bottom=54;dr=1;dt=1;edge=1;items={"vmess";"vless";"trojan";"trojan-go";"ssr";"shadowsocks";"naive";"socks"};mode="dropdown";z=12}; cmbSecurity={cls="combobox";left=656;top=140;right=814;bottom=166;dr=1;dt=1;edge=1;items={"auto";"none";"chacha20-poly1305";"aes-128-gcm"};mode="dropdown";z=15}; editAddress={cls="plus";left=656;top=183;right=878;bottom=207;align="left";bgcolor=16777215;border={bottom=1;color=-8355712};dr=1;dt=1;editable="edit";font=LOGFONT(h=-16);textPadding={bottom=1};z=2}; -editId={cls="plus";left=656;top=263;right=986;bottom=287;align="left";bgcolor=16777215;border={bottom=1;color=-8355712};clip=1;dr=1;dt=1;editable="edit";font=LOGFONT(h=-16);notify=1;textPadding={right=75;bottom=1};z=20}; +editId={cls="plus";left=656;top=263;right=986;bottom=287;align="left";bgcolor=16777215;border={bottom=1;color=-8355712};clip=1;dr=1;dt=1;editable="edit";font=LOGFONT(h=-16);textPadding={right=75;bottom=1};z=20}; editOutbound={cls="edit";left=15;top=25;right=472;bottom=462;db=1;dl=1;dr=1;dt=1;edge=1;font=LOGFONT(h=-13);hscroll=1;multiline=1;vscroll=1;z=14}; -editPort={cls="plus";left=656;top=224;right=745;bottom=248;align="left";bgcolor=16777215;border={bottom=1;color=-8355712};dr=1;dt=1;editable="edit";font=LOGFONT(h=-16);num=1;textPadding={bottom=1};z=4}; +editPort={cls="plus";left=656;top=224;right=745;bottom=248;align="left";bgcolor=16777215;border={bottom=1;color=-8355712};dr=1;dt=1;editable="edit";font=LOGFONT(h=-16);textPadding={bottom=1};z=4}; editPs={cls="plus";left=656;top=306;right=878;bottom=330;align="left";bgcolor=16777215;border={bottom=1;color=-8355712};dr=1;dt=1;editable="edit";font=LOGFONT(h=-16);textPadding={bottom=1};z=7}; editSharedLink={cls="plus";left=13;top=475;right=986;bottom=499;align="left";bgcolor=16777215;border={bottom=1;color=-8355712};clip=1;db=1;dl=1;dr=1;font=LOGFONT(h=-16);notify=1;textPadding={right=150;bottom=1};z=22}; -lbId={cls="static";text="登录用户( id ):";left=492;top=262;right=641;bottom=288;align="right";bgcolor=16777215;dr=1;dt=1;font=LOGFONT(h=-16);transparent=1;z=6}; lbSecurity={cls="static";text="加密方式( security ):";left=473;top=136;right=641;bottom=162;align="right";bgcolor=16777215;dl=1;dr=1;dt=1;font=LOGFONT(h=-16);transparent=1;z=10}; qrPicture={cls="plus";left=510;top=358;right=606;bottom=454;bgcolor=16777215;db=1;dr=1;notify=1;repeat="scale";z=24}; static={cls="static";text="服务器( address ):";left=481;top=178;right=641;bottom=204;align="right";bgcolor=16777215;dl=1;dr=1;dt=1;font=LOGFONT(h=-16);transparent=1;z=3}; static10={cls="static";text="代理协议( protocol ):";left=473;top=26;right=641;bottom=52;align="right";bgcolor=16777215;dl=1;dr=1;dt=1;font=LOGFONT(h=-16);transparent=1;z=11}; -static2={cls="static";text="服务端口( port ):";left=498;top=220;right=641;bottom=246;align="right";bgcolor=16777215;dr=1;dt=1;font=LOGFONT(h=-16);transparent=1;z=5}; +static2={cls="static";text="端口( port ):";left=498;top=220;right=641;bottom=246;align="right";bgcolor=16777215;dr=1;dt=1;font=LOGFONT(h=-16);transparent=1;z=5}; +static3={cls="static";text="密码( id ):";left=498;top=262;right=641;bottom=288;align="right";bgcolor=16777215;dr=1;dt=1;font=LOGFONT(h=-16);transparent=1;z=6}; static4={cls="static";text="备注( ps ):";left=498;top=304;right=641;bottom=330;align="right";bgcolor=16777215;dr=1;dt=1;font=LOGFONT(h=-16);transparent=1;z=8}; static5={cls="static";text="传输协议( network ):";left=473;top=94;right=641;bottom=126;align="right";bgcolor=16777215;dl=1;dr=1;dt=1;font=LOGFONT(h=-16);transparent=1;z=9} ) @@ -43,7 +43,7 @@ winform.addOutboundField = function(k,v){ winform.updateSharedLink(); } -winform.cmbProtocol.onProtocolChange = function(){ +winform.cmbProtocol.onListChange = function(){ var sel = winform.cmbProtocol.selText; if(sel=="vmess"){ winform.cmbSecurity.items = { @@ -53,12 +53,11 @@ winform.cmbProtocol.onProtocolChange = function(){ winform.outboundConfig.security = "auto"; winform.cmbNetwork.items = { - "tcp";"ws";"kcp";"h2";"quic"; + "tcp";"kcp";"h2";"quic"; } winform.cmbNetwork.selIndex = 1; winform.outboundConfig.network = "tcp"; winform.btnUpdateCore.text = '下载 / 更新支持组件： Xray Core'; - winform.editId.setCueBannerText("请输入 GUID"); } elseif(sel=="shadowsocks"){ winform.cmbSecurity.items = { @@ -71,8 +70,7 @@ winform.cmbProtocol.onProtocolChange = function(){ winform.cmbNetwork.items = {"tcp";} winform.cmbNetwork.selIndex = 1; winform.outboundConfig.network = "tcp"; - winform.btnUpdateCore.text = '下载 / 更新支持组件： xray Core'; - winform.editId.setCueBannerText("请输入密码"); + winform.btnUpdateCore.text = '下载 / 更新支持组件： Xray Core'; } elseif(sel=="ssr"){ winform.cmbNetwork.items = { @@ -88,7 +86,6 @@ winform.cmbProtocol.onProtocolChange = function(){ winform.cmbSecurity.selIndex = 1; winform.outboundConfig.security = "none"; winform.btnUpdateCore.text = '下载 / 更新支持组件： SSR Core'; - winform.editId.setCueBannerText("请输入密码"); } elseif(sel=="vless"){ winform.cmbSecurity.items = { @@ -98,12 +95,11 @@ winform.cmbProtocol.onProtocolChange = function(){ winform.outboundConfig.security = "none"; winform.cmbNetwork.items = { - "tcp";"kcp";"h2";"quic";"ws"; + "tcp";"kcp";"h2";"quic"; } winform.cmbNetwork.selIndex = 1; winform.outboundConfig.network = "tcp"; - winform.btnUpdateCore.text = '下载 / 更新支持组件： v2ray Core'; - winform.editId.setCueBannerText("请输入 GUID"); + winform.btnUpdateCore.text = '下载 / 更新支持组件： Xray Core'; } elseif(sel=="naive"){ winform.cmbNetwork.items = { @@ -114,9 +110,11 @@ winform.cmbProtocol.onProtocolChange = function(){ winform.cmbSecurity.items = {} winform.outboundConfig.security = null; - + + if(!string.indexOf(winform.editId.text:"",":")){ + winform.editId.text = "username:password"; + } winform.btnUpdateCore.text = '下载 / 更新支持组件： NaïveProxy Core'; - winform.editId.setCueBannerText("请输入 用户名:密码"); } elseif(sel=="socks"){ winform.cmbSecurity.items = { } @@ -124,19 +122,11 @@ winform.cmbProtocol.onProtocolChange = function(){ winform.cmbNetwork.items = {"tcp";} winform.cmbNetwork.selIndex = 1; - winform.outboundConfig.network = "tcp"; - winform.btnUpdateCore.text = '下载 / 更新支持组件： xray Core'; - winform.editId.setCueBannerText("请输入 用户名:密码"); - } - elseif(sel=="http" || sel=="https"){ - winform.cmbSecurity.items = { } - winform.outboundConfig.security = null; - - winform.cmbNetwork.items = {"tcp";} - winform.cmbNetwork.selIndex = 1; - winform.outboundConfig.network = "tcp"; - winform.btnUpdateCore.text = '下载 / 更新支持组件： xray Core'; - winform.editId.setCueBannerText("请输入 用户名:密码"); + winform.outboundConfig.network = "tcp"; + if(!string.indexOf(winform.editId.text:"",":")){ + winform.editId.text = "username:password"; + } + winform.btnUpdateCore.text = '下载 / 更新支持组件： Xray Core'; } else { winform.cmbSecurity.items = { } @@ -145,16 +135,11 @@ winform.cmbProtocol.onProtocolChange = function(){ winform.cmbNetwork.items = {"tcp";} winform.cmbNetwork.selIndex = 1; winform.outboundConfig.network = "tcp"; - winform.btnUpdateCore.text = '下载 / 更新支持组件： xray Core'; - winform.editId.setCueBannerText("请输入密码"); + winform.btnUpdateCore.text = '下载 / 更新支持组件： Xray Core'; } -} - -winform.cmbProtocol.onListChange = function(){ - winform.cmbProtocol.onProtocolChange(); table.define(winform.outboundConfig); - winform.outboundConfig.protocol = winform.cmbProtocol.selText;; + winform.outboundConfig.protocol = sel; winform.editOutbound.text = web.json.stringify(winform.outboundConfig,true,false); winform.updateSharedLink(); } @@ -173,12 +158,8 @@ winform.cmbSecurity.onListChange = function(){ winform.updateSharedLink(); } -winform.editId.editBox.onChange = function(){ - if( winform.outboundConfig.id == winform.editId.text ){ - return; - } - - winform.outboundConfig.id = winform.editId.text; +winform.editId.editBox.onChange = function(){ + winform.outboundConfig.id = owner.text; winform.editOutbound.text = web.json.stringify(winform.outboundConfig,true,false); winform.updateSharedLink(); } @@ -302,9 +283,9 @@ var insertFieldMenu = { winform.addOutboundField("headers",{method="GET"}); } }; - { "SS混淆插件:obfs"; + { "SSR混淆插件:obfs"; function(id){ - winform.addOutboundField("obfs","plain",""); + winform.addOutboundField("obfs","plain"); } }; { "SSR混淆参数:obfsParam"; @@ -388,7 +369,19 @@ var onEditChange = win.debounce( winform.cmbNetwork.selText = data.network; winform.cmbProtocol.selText = data.protocol; - winform.cmbProtocol.onProtocolChange(); + + if(data.protocol=="vmess"){ + winform.cmbSecurity.items = { "auto";"none";"chacha20-poly1305";"aes-128-gcm" } + } + elseif(data.protocol=="shadowsocks"){ + winform.cmbSecurity.items = { "aes-256-gcm";"aes-128-gcm";"aes-256-cfb";"aes-128-cfb";"chacha20";"chacha20-ietf";"chacha20-poly1305";"chacha20-ietf-poly1305";} + } + elseif(data.protocol=="vless"){ + winform.cmbSecurity.items = { "none"; } + } + else { + winform.cmbSecurity.items = { } + } winform.cmbSecurity.selText = data.security; winform.cmbNetwork.onListChange = cmbNetworkChange; @@ -412,11 +405,8 @@ winform.btnSaveOutbound.oncommand = function(id,event){ return winform.editPort.editBox.showErrorTip("配置错误","端口不能为空") } - if( !#winform.editId.text ){ - var protocol = winform.outboundConfig.protocol; - if((protocol!="socks") && (protocol!="http") && (protocol!="https")){ - return winform.editId.editBox.showErrorTip("配置错误","当前代理协议密码不能为空") - } + if(!#winform.editId.text && (winform.outboundConfig.protocol!="socks") ){ + return winform.editId.editBox.showErrorTip("配置错误","当前代理协议密码不能为空") } table.assign(winform.origOutboundConfig,winform.outboundConfig); @@ -437,11 +427,8 @@ winform.btnAddOutbound.oncommand = function(id,event){ return winform.editPort.editBox.showErrorTip("配置错误","端口不能为空") } - if(!#winform.editId.text ){ - var protocol = winform.outboundConfig.protocol - if( (protocol!="socks") && (protocol!="http") && (protocol!="https") ){ - return winform.editId.editBox.showErrorTip("配置错误","当前代理协议密码不能为空") - } + if(!#winform.editId.text && (winform.outboundConfig.protocol!="socks") ){ + return winform.editId.editBox.showErrorTip("配置错误","当前代理协议密码不能为空") } table.push(config.proxy.outbounds,winform.outboundConfig); @@ -453,17 +440,8 @@ winform.btnAddOutbound.oncommand = function(id,event){ import win.guid; winform.btnGenGuid.oncommand = function(id,event){ - var sel = winform.cmbProtocol.selText; - if(sel=="socks" || sel=="http" || sel=="https" || sel=="naive" ){ - winform.editId.text = "user:" + string.random(16); - } - elseif(sel=="shadowsocks" || sel=="ssr" ){ - winform.editId.text = string.random(22,"/@0123456abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"); - } - else { - var guid = win.guid.create(); - winform.editId.text = string.lower( tostring(guid) ); - } + var guid = win.guid.create(); + winform.editId.text = string.lower( tostring(guid) ); } winform.btnGenGuid.skin(style.link) @@ -566,16 +544,16 @@ winform.btnUpdateCore.oncommand = function(id,event){ } } elseif(sel=="vless"){ - import xray.core.v2ray; - var versionTag = xray.core.v2ray.updateCore(); + import xray.core.xray; + var versionTag = xray.core.xray.updateCore(); if( versionTag ){ publish("uiCommand.restartxrayCore"); winform.btnUpdateCore.disabledText = null; - winform.msgOk("已下载最新 v2ray Core 版本：" + versionTag+ '\nxray 内核已切换为：v2ray Core',1500) + winform.msgOk("已下载最新 Xray Core 版本：" + versionTag+ '\nxray 内核已切换为：XRay Core',1500) } else { winform.btnUpdateCore.disabledText = null; - winform.msgErr("v2ray Core 下载失败！"); + winform.msgErr("Xray Core 下载失败！"); } } elseif(sel=="naive"){ diff --git a/forms/main/tools/uwpExemption.aardio b/forms/main/tools/uwpExemption.aardio index 72fd503..9fcddac 100644 --- a/forms/main/tools/uwpExemption.aardio +++ b/forms/main/tools/uwpExemption.aardio @@ -15,7 +15,7 @@ tip={cls="static";text="单击列标题可排序，双击列表项可复制， ) /*}}*/ -//var atom,hwnd = winform.atom("762C7E32-3E75-42BE-8F4A-4B0E8AAC4EF0"); +var atom,hwnd = winform.atom("DFA5667E-1D8C-49C0-8918-C6FEC2DECCF8"); if(!atom && hwnd){ win.showForeground(hwnd); win.quitMessage(); return; diff --git a/lib/xray/core/_.aardio b/lib/xray/core/_.aardio index 52d3e29..51e5db6 100644 --- a/lib/xray/core/_.aardio +++ b/lib/xray/core/_.aardio @@ -30,7 +30,7 @@ restart = function(editor,outbound){ if(!outbound){ return null,"错误的出站代理服务器配置" } if(_WINXP){ - return null,"抱歉！xray Core 不支持 Windows XP, 仅支持 Windows 7, Windows 10 以及更新操作系统。"; + return null,"抱歉！Xray Core 不支持 Windows XP, 仅支持 Windows 7, Windows 10 以及更新操作系统。"; } var inbounds = ..config.core.default[["inbounds"]]; @@ -41,7 +41,7 @@ restart = function(editor,outbound){ return null,"错误的入站HTTP代理服务器配置" } - if(xrayStarting){ return null,"不能重复启动 xray Core" } + if(xrayStarting){ return null,"不能重复启动 Xray Core" } xrayStarting = true; var corePath = getPath(editor.hwnd); @@ -133,7 +133,7 @@ restart = function(editor,outbound){ if(!prcsxray){ if( nexCore ){ nexCore.stop(); } - ..publish("uiCommand.print",err:"启动 xray Core 时遇到未知错误!"); + ..publish("uiCommand.print",err:"启动 Xray Core 时遇到未知错误!"); if(!..process().isWow64()){ if(..process.isExe(corePath)!="PE32"){ @@ -183,7 +183,7 @@ stop = function(){ var getxrayCoreUrl = function(){ var msgDlg = ..win.dlg.message(..mainForm); - var form = msgDlg.create('正在获取 xray Core 最新版本',,true) + var form = msgDlg.create('正在获取 Xray Core 最新版本',,true) form.icon = '\uF1D8'; form.progress.startProgress(50); @@ -218,14 +218,14 @@ getPath = function(hwnd){ return path; } - var path = ..io.fullpath("/xray-core/xray.exe"); + var path = ..io.fullpath("/v2ray-core/v2ray.exe"); if(..io.exist(path)){ - ..io.rename("/xray-core/","/xray-core/") + ..io.rename("/v2ray-core/","/xray-core/") } - var path = ..io.fullpath("/xray-core/xray.exe"); + var path = ..io.fullpath("/xray-core/v2ray.exe"); if(..io.exist(path)){ - ..io.rename("/xray-core/xray.exe","/xray-core/xray.exe") + ..io.rename("/xray-core/v2ray.exe","/xray-core/xray.exe") return ..io.fullpath("/xray-core/xray.exe"); } @@ -237,7 +237,7 @@ getPath = function(hwnd){ var url,versionTag = getxrayCoreUrl(); if(!url) { - ..publish("uiCommand.print","请下载 xray Core 到以下路径:"); + ..publish("uiCommand.print","请下载 V2Rary Core 到以下路径:"); ..publish("uiCommand.print",path); ..mainForm.disabled = false; @@ -246,7 +246,7 @@ getPath = function(hwnd){ } import zlib.httpFile; - if( ..zlib.httpFile.download(url,"正在下载 xray Core" + if( ..zlib.httpFile.download(url,"正在下载 Xray Core" ,..io.appData("/WinXray/download/") ,..io.appData("/WinXray/core/"),,..mainForm.hwnd) ){ @@ -258,7 +258,7 @@ getPath = function(hwnd){ ..mainForm.disabled = false; self.lastDownloadingCoreFailed = true; - ..publish("uiCommand.print","请到以下网址下载 xray Core:"); + ..publish("uiCommand.print","请到以下网址下载 Xray Core:"); ..publish("uiCommand.print",url); ..publish("uiCommand.print","下载后请解压到以下目录内:"); @@ -304,7 +304,7 @@ updateCore = function(){ import zlib.httpFile; - if( ..zlib.httpFile.download(url,"正在下载 xray Core，版本：" + versionTag + if( ..zlib.httpFile.download(url,"正在下载 Xray Core，版本：" + versionTag ,..io.appData("/WinXray/download/") ,..io.appData("/WinXray/temp/xray/"),,..mainForm.hwnd) ){ ..mainForm.disabled = false; diff --git a/lib/xray/core/configJson.aardio b/lib/xray/core/configJson.aardio index 795e31f..6dd8f43 100644 --- a/lib/xray/core/configJson.aardio +++ b/lib/xray/core/configJson.aardio @@ -5,52 +5,26 @@ import inet.url; import crypt; namespace xray.core.configJson; - + write = function(jsonPath,outbound,sockPort,httpPort){ - if(!outbound){ return; } + if(!outbound){ return; } if(type(outbound.port)!=type.number){ outbound.port = tonumber(outbound.port); } - var currentCore = ..table.clone(..config.core.default); - if(! ..table.isArray(currentCore.outbounds) ){ - return null,"错误的出站代理服务器配置" - } - - var inboundsInCore = currentCore.inbounds; - if(! ..table.isArray(inboundsInCore) ){ - return null,"错误的入站代理服务器配置" - } - - var proxyOutboundInCore; - for(k,ob in currentCore.outbounds){ - if(ob.tag == "proxy"){ - proxyOutboundInCore = ob; - } - } - - if( type(proxyOutboundInCore) !="table" ){ - return null,"未找到默认出站代理服务器配置节点" + var current = ..table.clone(..config.core.default); + var inbounds = current.inbounds; + if(! (..table.isArray(inbounds) && inbounds[1] ) ){ + return null,"错误的入站SOCKS代理服务器配置" } - var socksInbounds,httpInbounds; - for(k,ib in currentCore.inbounds){ - if(ib.tag == "proxy"){ - socksInbounds = ib; - socksInbounds.port = sockPort; - } - elseif(ib.tag == "http_proxy"){ - httpInbounds = ib; - httpInbounds.port = httpPort; - } - } - - if( type(socksInbounds) !="table" ){ - return null,"未找到默认 SOCKS 入站代理服务器配置节点" - } + inbounds[1].pacPort = null; + inbounds[1].port = sockPort; + if(inbounds[2]){ inbounds[2].port = httpPort; } - if( type(httpInbounds) !="table" ){ - return null,"未找到默认 HTTP 入站代理服务器配置节点" + + if(sockPort<0){ + ..table.shift(inbounds); } if(#outbound.tls && !outbound.sni){ @@ -185,11 +159,11 @@ write = function(jsonPath,outbound,sockPort,httpPort){ } } - ..table.assign(proxyOutboundInCore,ob); + ..table.assign(current.outbounds[1],ob); } elseif(outbound.protocol=="vmess"){ if(!#outbound.security) outbound.security = "auto"; - + var ob = { mux = (outbound.concurrency !== null) ? { concurrency=outbound.concurrency; @@ -302,7 +276,7 @@ write = function(jsonPath,outbound,sockPort,httpPort){ } } - ..table.assign(proxyOutboundInCore,ob); + ..table.assign(current.outbounds[1],ob); } elseif(outbound.protocol=="trojan" || outbound.protocol=="trojan-go"){ outbound.tls = #outbound.tls ? outbound.tls : "tls"; @@ -353,7 +327,7 @@ write = function(jsonPath,outbound,sockPort,httpPort){ ob.streamSettings.wsSettings.headers.Host = outbound.host; } } - ..table.assign(proxyOutboundInCore,ob); + ..table.assign(current.outbounds[1],ob); } elseif(outbound.protocol=="shadowsocks"){ var ob = { @@ -379,12 +353,11 @@ write = function(jsonPath,outbound,sockPort,httpPort){ }; streamSettings={ network = outbound.network : "tcp"; - obfs = outbound.obfs : ""; }; tag="proxy" }; - ..table.assign(proxyOutboundInCore,ob); + ..table.assign(current.outbounds[1],ob); } elseif(outbound.protocol=="socks"){ @@ -410,7 +383,7 @@ write = function(jsonPath,outbound,sockPort,httpPort){ }; tag="proxy" }; - + if(#outbound.id){ var user,password = ..string.match(outbound.id,"([^\:]+)\:(.+)"); if(user && password){ @@ -428,7 +401,7 @@ write = function(jsonPath,outbound,sockPort,httpPort){ } } - ..table.assign(proxyOutboundInCore,ob); + ..table.assign(current.outbounds[1],ob); } elseif(outbound.protocol=="https" || outbound.protocol=="http"){ @@ -450,7 +423,7 @@ write = function(jsonPath,outbound,sockPort,httpPort){ }; tag="proxy" }; - + if(#outbound.id){ var user,password = ..string.match(outbound.id,"([^\:]+)\:(.+)"); if(user && password){ @@ -466,11 +439,11 @@ write = function(jsonPath,outbound,sockPort,httpPort){ } } - ..table.assign(proxyOutboundInCore,ob); + ..table.assign(current.outbounds[1],ob); } - ..string.save(jsonPath,..web.json.stringify(currentCore) ); + ..string.save(jsonPath,..web.json.stringify(current) ); return jsonPath; } - \ No newline at end of file + \ No newline at end of file diff --git a/lib/xray/core/ssrJson.aardio b/lib/xray/core/ssrJson.aardio index e09ab88..0ee2ec7 100644 --- a/lib/xray/core/ssrJson.aardio +++ b/lib/xray/core/ssrJson.aardio @@ -20,7 +20,7 @@ write = function(jsonPath,outbound,ssrSocksPort){ idle_timeout = 300; method = outbound.security; obfs = outbound.obfs : "plain"; - obfs_param = outbound.obfsParam: ""; + obfs_param = outbound.obfsParam:""; over_tls_settings = { enable = outbound.tls == "tls"; path = outbound.path: "/abcd1234/"; diff --git a/main.aardio b/main.aardio index fa12356..f50865a 100644 --- a/main.aardio +++ b/main.aardio @@ -162,7 +162,7 @@ import win.ui; mainForm = win.form(text="WinXray";right=1019;bottom=679;bgcolor=15793151;border="none") mainForm.add( Promote={cls="plus";text="推荐";left=0;top=300;right=85;bottom=380;bkBottom=3;bkLeft=7;bkRight=8;bkTop=2;border={color=-65536};color=16777215;dl=1;dt=1;font=LOGFONT(h=-13);iconStyle={font=LOGFONT(h=-37;name='FontAwesome');padding={bottom=20}};iconText='\uF233';notify=1;textPadding={bottom=10};valign="bottom";x=0.5;y=0.2;z=9}; -caption={cls="bkplus";text="WinXray 3.3";left=67;top=9;right=727;bottom=27;align="left";color=6052956;dl=1;dt=1;font=LOGFONT(h=-14);z=7}; +caption={cls="bkplus";text="WinXray 3.4";left=67;top=9;right=727;bottom=27;align="left";color=6052956;dl=1;dt=1;font=LOGFONT(h=-14);z=7}; custom={cls="custom";left=83;top=40;right=1022;bottom=679;bgcolor=16777215;db=1;dl=1;dr=1;dt=1;z=4}; logo={cls="bkplus";text='\uF1D9';left=35;top=7;right=64;bottom=32;color=3054125;dl=1;dt=1;font=LOGFONT(h=-18;name='FontAwesome');z=6}; navBar={cls="bkplus";left=0;top=37;right=83;bottom=681;bgcolor=3442175;db=1;dl=1;dt=1;z=1}; diff --git a/release/WinXray.7z b/release/WinXray.7z index 2ea3966..d3cf766 100644 Binary files a/release/WinXray.7z and b/release/WinXray.7z differ diff --git a/release/WinXray32.7z b/release/WinXray32.7z index cdaa03b..d3cf766 100644 Binary files a/release/WinXray32.7z and b/release/WinXray32.7z differ diff --git a/release/update/checksum.lzma b/release/update/checksum.lzma index 442c0ca..73995f7 100644 Binary files a/release/update/checksum.lzma and b/release/update/checksum.lzma differ diff --git a/release/update/files/WinXray.exe.lzma b/release/update/files/WinXray.exe.lzma index 586ef13..7895aa1 100644 Binary files a/release/update/files/WinXray.exe.lzma and b/release/update/files/WinXray.exe.lzma differ diff --git a/release/update/files/xray-core/xray.exe.lzma b/release/update/files/xray-core/xray.exe.lzma index 27d9eff..1ed599a 100644 Binary files a/release/update/files/xray-core/xray.exe.lzma and b/release/update/files/xray-core/xray.exe.lzma differ diff --git a/release/update/version.txt b/release/update/version.txt index 7f1bbb9..2138df6 100644 --- a/release/update/version.txt +++ b/release/update/version.txt @@ -1,8 +1,8 @@ { - "description":"为提升速度，本版本开启了MUX！修复了右键本机ping无反应的问题，另在编辑代理服务器添加传输协议WS！", + "description":"默认Xray内核升级到了1.4.3！", "format":".lzma", "main":"\\WinXray.exe", "updater":"\\WinXray.exe", "url":"https://raw.githubusercontent.com/TheMRLL/winxray/main/release/update/", - "version":"3.3" + "version":"3.4" } \ No newline at end of file diff --git a/winXray/WinXray.exe b/winXray/WinXray.exe index 034eab6..3117ea6 100644 Binary files a/winXray/WinXray.exe and b/winXray/WinXray.exe differ diff --git a/winXray/xray-core/config.json b/winXray/xray-core/config.json index 4e5a70a..deac3fb 100644 --- a/winXray/xray-core/config.json +++ b/winXray/xray-core/config.json @@ -1 +1 @@ -{"inbounds":[{"listen":"127.0.0.1","port":1081,"protocol":"socks","settings":{"auth":"noauth","udp":true},"sniffing":{"destOverride":["http","tls"],"enabled":true},"tag":"proxy"},{"listen":"127.0.0.1","port":1082,"protocol":"http","settings":{},"sniffing":{"destOverride":["http","tls"],"enabled":true},"tag":"http_proxy"}],"log":{"access":"","error":"","loglevel":"warning"},"outbounds":[{"mux":{"concurrency":-1,"enabled":false},"protocol":"vmess","settings":{"vnext":[{"address":"k3.fastfrog.top","port":41321,"users":[{"alterId":0,"email":"t@t.tt","id":"6dc64225-2d72-d088-35a8-6c46d0fe7679","security":"auto"}]}]},"streamSettings":{"network":"ws","wsSettings":{"headers":{"Host":"k3.fastfrog.top"},"path":"/6171787662796323346c7775"}},"tag":"proxy"},{"protocol":"freedom","settings":{},"tag":"direct"},{"protocol":"blackhole","settings":{"response":{"type":"http"}},"tag":"block"}],"routing":{"domainStrategy":"IPIfNonMatch","rules":[{"inboundTag":["api"],"outboundTag":"api","type":"field"}]}} \ No newline at end of file +{"inbounds":[{"listen":"127.0.0.1","port":1081,"protocol":"socks","tag":"proxy","settings":{"auth":"noauth","udp":true},"sniffing":{"destOverride":["http","tls"],"enabled":true}},{"listen":"127.0.0.1","port":1082,"protocol":"http","tag":"http_proxy","settings":{},"sniffing":{"destOverride":["http","tls"],"enabled":true}}],"outbounds":[{"protocol":"vmess","tag":"proxy","mux":{"concurrency":8,"enabled":true},"settings":{"vnext":[{"address":"74.211.102.133","port":10086,"users":[{"alterId":1,"email":"t@t.tt","id":"10747431-d08a-4ac7-b3ff-d53684e31d9d","security":"auto"}]}]},"streamSettings":{"network":"ws","wsSettings":{"path":"/jcnf","headers":{"Host":""}}}},{"protocol":"freedom","tag":"direct","settings":{}},{"protocol":"blackhole","tag":"block","settings":{"response":{"type":"http"}}}],"log":{"access":"","error":"","loglevel":"warning"},"routing":{"domainStrategy":"IPIfNonMatch","rules":[{"inboundTag":["api"],"outboundTag":"api","type":"field"}]}} \ No newline at end of file diff --git a/winXray/xray-core/xray.exe b/winXray/xray-core/xray.exe index 347c9c4..899631b 100644 Binary files a/winXray/xray-core/xray.exe and b/winXray/xray-core/xray.exe differ diff --git a/xray-core/xray.exe b/xray-core/xray.exe index 347c9c4..899631b 100644 Binary files a/xray-core/xray.exe and b/xray-core/xray.exe differ