Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #5935 from jjm2473/frpc-master

Browse source 
luci-app-frpc: some improvement
This commit is contained in:
Florian Eckert 2022-09-19 07:58:59 +02:00 committed by GitHub
commit 1c52dda3e7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 56 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
applications/luci-app-frpc/htdocs/luci-static/resources/view/frpc.js
View file

@ -45,7 +45,7 @@ var baseProxyConf = [
[form.ListValue, 'type', _('Proxy type'), _('ProxyType specifies the type of this proxy. Valid values include "tcp", "udp", "http", "https", "stcp", and "xtcp".<br />By default, this value is "tcp".'), {values: ['tcp', 'udp', 'http', 'https', 'stcp', 'xtcp']}],
[form.Flag, 'use_encryption', _('Encryption'), _('UseEncryption controls whether or not communication with the server will be encrypted. Encryption is done using the tokens supplied in the server and client configuration.<br />By default, this value is false.'), {datatype: 'bool'}],
[form.Flag, 'use_compression', _('Compression'), _('UseCompression controls whether or not communication with the server will be compressed.<br />By default, this value is false.'), {datatype: 'bool'}],
[form.Value, 'local_ip', _('Local IP'), _('LocalIp specifies the IP address or host name to proxy to.'), {datatype: 'ipaddr'}],
[form.Value, 'local_ip', _('Local IP'), _('LocalIp specifies the IP address or host name to proxy to.'), {datatype: 'host'}],
[form.Value, 'local_port', _('Local port'), _('LocalPort specifies the port to proxy to.'), {datatype: 'port'}],
];
@ -72,6 +72,16 @@ var stcpProxyConf = [
[form.Value, 'sk', _('Sk')],
];
var pluginConf = [
[form.ListValue, 'plugin', _('Plugin'), undefined, {values: ['', 'http_proxy', 'socks5', 'unix_domain_socket'], rmempty: true}],
[form.Value, 'plugin_http_user', _('HTTP user'), undefined, {depends: {plugin: 'http_proxy'}}],
[form.Value, 'plugin_http_passwd', _('HTTP password'), undefined, {depends: {plugin: 'http_proxy'}}],
[form.Value, 'plugin_user', _('SOCKS5 user'), undefined, {depends: {plugin: 'socks5'}}],
[form.Value, 'plugin_passwd', _('SOCKS5 password'), undefined, {depends: {plugin: 'socks5'}}],
[form.Value, 'plugin_unix_path', _('Unix domain socket path'), undefined, {depends: {plugin: 'unix_domain_socket'}, optional: false, rmempty: false,
datatype: 'file', placeholder: '/var/run/docker.sock', default: '/var/run/docker.sock'}],
];
function setParams(o, params) {
if (!params) return;
for (var key in params) {
@ -207,11 +217,20 @@ return view.extend({
s.tab('general', _('General Settings'));
s.tab('http', _('HTTP Settings'));
s.tab('plugin', _('Plugin Settings'));
s.option(form.Value, 'name', _('Proxy name')).modalonly = false;
s.option(form.Value, 'type', _('Proxy type')).modalonly = false;
s.option(form.Value, 'local_ip', _('Local IP')).modalonly = false;
s.option(form.Value, 'local_port', _('Local port')).modalonly = false;
o = s.option(form.Value, 'remote_port', _('Remote port'));
o.modalonly = false;
o.depends('type', 'tcp');
o.depends('type', 'udp');
o.cfgvalue = function() {
var v = this.super('cfgvalue', arguments);
return v&&v!='0'?v:'#';
};
defTabOpts(s, 'general', baseProxyConf, {modalonly: true});
@ -227,6 +246,9 @@ return view.extend({
// STCP and XTCP
defTabOpts(s, 'general', stcpProxyConf, {modalonly: true, depends: [{type: 'stcp'}, {type: 'xtcp'}]});
// Plugin
defTabOpts(s, 'plugin', pluginConf, {modalonly: true});
return m.render();
}
});

15
applications/luci-app-frpc/po/templates/frpc.pot
View file

@ -410,3 +410,18 @@ msgstr ""
#: applications/luci-app-frpc/root/usr/share/luci/menu.d/luci-app-frpc.json:3
msgid "frp Client"
msgstr ""
msgid "Plugin Settings"
msgstr ""
msgid "Plugin"
msgstr ""
msgid "SOCKS5 user"
msgstr ""
msgid "SOCKS5 password"
msgstr ""
msgid "Unix domain socket path"
msgstr ""

21
applications/luci-app-frpc/po/zh_Hans/frpc.po
View file

@ -197,15 +197,15 @@ msgstr "本地 IP"
#: applications/luci-app-frpc/htdocs/luci-static/resources/view/frpc.js:49
#: applications/luci-app-frpc/htdocs/luci-static/resources/view/frpc.js:214
msgid "Local port"
msgstr "监听端口"
msgstr "本地端口"
#: applications/luci-app-frpc/htdocs/luci-static/resources/view/frpc.js:48
msgid "LocalIp specifies the IP address or host name to proxy to."
msgstr "LocalIp 指定要被代理的 IP 地址或主机名。"
msgstr "本地 IP 指定要被代理的 IP 地址或主机名。"
#: applications/luci-app-frpc/htdocs/luci-static/resources/view/frpc.js:49
msgid "LocalPort specifies the port to proxy to."
msgstr "LocalPort 指定要被代理的端口。"
msgstr "本地端口指定要被代理的端口。"
#: applications/luci-app-frpc/htdocs/luci-static/resources/view/frpc.js:62
msgid "Locations"
@ -454,5 +454,20 @@ msgstr ""
msgid "frp Client"
msgstr "frp 客户端"
msgid "Plugin Settings"
msgstr "插件设置"
msgid "Plugin"
msgstr "插件"
msgid "SOCKS5 user"
msgstr "SOCKS5 用户"
msgid "SOCKS5 password"
msgstr "SOCKS5 密码"
msgid "Unix domain socket path"
msgstr "Unix 域套接字路径"
#~ msgid "Name can not be \"common\""
#~ msgstr "名称不能\"common\""