Skip to content

Commit

Permalink
1.519.10
Browse files Browse the repository at this point in the history
  • Loading branch information
sergeyba committed Jan 27, 2025
1 parent 98aea0d commit f8718ad
Show file tree
Hide file tree
Showing 27 changed files with 92 additions and 49 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
Proxy manager - Change Log

## 1.519.10 Development Latest
- :star: Add port settings option to use proxy port 33335

## 1.517.992 Development Latest
- :star: Bump bootstrap to 5.x
- :star: Bump docker npm to 10.9.2
Expand Down
3 changes: 2 additions & 1 deletion README-zh-CN.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
- <a href="https://nodejs.org/en/download/">Node.js</a> 6+版

### Windows
下载 <a href="https://lum-lpm.com/static/lpm/luminati-proxy-manager-v1.517.992-setup.exe">代理管理安装器</a>.
下载 <a href="https://lum-lpm.com/static/lpm/luminati-proxy-manager-v1.519.10-setup.exe">代理管理安装器</a>.

### Linux/MacOS
- 安装 Node.js 20.12.1版 (最好用x
Expand Down Expand Up @@ -255,6 +255,7 @@ Options:
--start-upgrader Install CRON process that checks upgrades
--stop-upgrader Removes CRON process that checks upgrades
--insecure-http-parser Disables the strict checks
--new_proxy_port [default: 33335]
--proxy_country [default: ""]
--resolve_proxies_interval [default: 10000]
--info [default: false]
Expand Down
3 changes: 2 additions & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Please report issues or bugs to your account manager or from our [help center](h
## Installation

### Windows
Download the [Proxy Manager installer](https://github.com/luminati-io/luminati-proxy/releases/download/v1.517.992/luminati-proxy-manager-v1.517.992-setup.exe)
Download the [Proxy Manager installer](https://github.com/luminati-io/luminati-proxy/releases/download/v1.519.10/luminati-proxy-manager-v1.519.10-setup.exe)

### Linux/MacOS - Install script
- Run the setup script to install
Expand Down Expand Up @@ -307,6 +307,7 @@ Options:
--start-upgrader Install CRON process that checks upgrades
--stop-upgrader Removes CRON process that checks upgrades
--insecure-http-parser Disables the strict checks
--new_proxy_port [default: 33335]
--proxy_country [default: ""]
--resolve_proxies_interval [default: 10000]
--info [default: false]
Expand Down
2 changes: 1 addition & 1 deletion bin/lpm_install.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ if [ $(id -u) = 0 ]; then
IS_ROOT=1
fi
LUM=0
VERSION="1.517.992"
VERSION="1.519.10"
if [ -f "/usr/local/hola/zon_config.sh" ]; then
LUM=1
fi
Expand Down
2 changes: 1 addition & 1 deletion bin/pub/f631e65a272530fc3edf.vendor.js → bin/pub/a2077dab5090f880c07c.vendor.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68145,7 +68145,7 @@ function _objectWithoutPropertiesLoose(r, e) {
if (null == r) return {};
var t = {};
for (var n in r) if ({}.hasOwnProperty.call(r, n)) {
if (e.includes(n)) continue;
if (-1 !== e.indexOf(n)) continue;
t[n] = r[n];
}
return t;
Expand Down
28 changes: 17 additions & 11 deletions bin/pub/72c95d06b91b6ca178ac.app.js → bin/pub/e2fac87f04a2eca49322.app.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10703,6 +10703,8 @@ E.is_mocha = function(){

E.is_lxc = function(){ return is_node && +process.env.LXC; };

E.is_prod = function(){ return !E.is_mocha() && !E.is_lxc(); };

// refresh() was added in node 10, we need to support node 8 for webOS TV 5.0
// https://webostv.developer.lge.com/develop/guides/js-service-basics
E.is_timer_refresh = (()=>{
Expand Down Expand Up @@ -29590,7 +29592,7 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;!(__WEBPACK_AMD_
val: this.state.val === undefined ? '' : this.state.val,
disabled: disabled,
disabled_ips: this.props.disabled_ips,
note: this.props.note,
note: this.props.note || _fields.tabs[tab_id].fields[id].note,
placeholder: _fields.tabs[tab_id].fields[id].placeholder || '',
on_blur: this.on_blur,
label: _fields.tabs[tab_id].fields[id].label,
Expand Down Expand Up @@ -29934,9 +29936,10 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;!(__WEBPACK_AMD_
label: 'Follow redirect',
tooltip: 'Auto redirect requests on status code 30x'
},
socket_inactivity_timeout: {
label: 'Inactivity timeout',
tooltip: 'The amount of milliseconds a socket' + ' can be inactive before it times out and closes'
new_proxy_port: {
label: 'Use new proxy port',
tooltip: 'Use proxy port 33335 instead of 22225',
note: 'This option will be removed and port 33335 become' + ' default in future releases'
}
}
}
Expand Down Expand Up @@ -30294,6 +30297,9 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;!(__WEBPACK_AMD_
}), /*#__PURE__*/_react["default"].createElement(_common2.Config, {
type: "yes_no",
id: "follow_redirect"
}), /*#__PURE__*/_react["default"].createElement(_common2.Config, {
type: "yes_no",
id: "new_proxy_port"
})));
}
}]);
Expand Down Expand Up @@ -148092,8 +148098,8 @@ function _objectWithoutProperties(e, t) {
r,
i = objectWithoutPropertiesLoose(e, t);
if (Object.getOwnPropertySymbols) {
var s = Object.getOwnPropertySymbols(e);
for (r = 0; r < s.length; r++) o = s[r], t.includes(o) || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]);
var n = Object.getOwnPropertySymbols(e);
for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]);
}
return i;
}
Expand All @@ -148108,7 +148114,7 @@ function _objectWithoutPropertiesLoose(r, e) {
if (null == r) return {};
var t = {};
for (var n in r) if ({}.hasOwnProperty.call(r, n)) {
if (e.includes(n)) continue;
if (-1 !== e.indexOf(n)) continue;
t[n] = r[n];
}
return t;
Expand Down Expand Up @@ -148773,8 +148779,8 @@ function _objectWithoutProperties(e, t) {
r,
i = (0,_objectWithoutPropertiesLoose_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A)(e, t);
if (Object.getOwnPropertySymbols) {
var s = Object.getOwnPropertySymbols(e);
for (r = 0; r < s.length; r++) o = s[r], t.includes(o) || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]);
var n = Object.getOwnPropertySymbols(e);
for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]);
}
return i;
}
Expand All @@ -148793,7 +148799,7 @@ function _objectWithoutPropertiesLoose(r, e) {
if (null == r) return {};
var t = {};
for (var n in r) if ({}.hasOwnProperty.call(r, n)) {
if (e.includes(n)) continue;
if (-1 !== e.indexOf(n)) continue;
t[n] = r[n];
}
return t;
Expand Down Expand Up @@ -149039,7 +149045,7 @@ module.exports = /*#__PURE__*/JSON.parse('{"version":"2024b","zones":["Africa/Ab
/***/ ((module) => {

"use strict";
module.exports = /*#__PURE__*/JSON.parse('[{"label":"Chrome 118 Windows 10","value":"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/118.0.0.0 Safari/537.36"},{"label":"Chrome 66 Windows 7","value":"Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/66.0.3359.117 Safari/537.36"},{"label":"Chrome 118 Android 10","value":"Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/118.0.0.0 Mobile Safari/537.36"},{"label":"Chrome 118 OSX 10.15.7","value":"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/118.0.0.0 Safari/537.36"},{"label":"Chrome 118 Linux","value":"Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/118.0.0.0 Safari/537.36"},{"label":"Chrome 119 iOS 16.1","value":"Mozilla/5.0 (iPhone; CPU iPhone OS 16_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/119.0.6045.41 Mobile/15E148 Safari/604.1"},{"label":"Chrome 118 Chromium OS 14541.0.0","value":"Mozilla/5.0 (X11; CrOS x86_64 14541.0.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/118.0.0.0 Safari/537.36"},{"label":"Opera 103 Windows 10","value":"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/117.0.0.0 Safari/537.36 OPR/103.0.0.0"},{"label":"Opera 78 Android 13","value":"Mozilla/5.0 (Linux; Android 13; SM-N986U) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/117.0.5938.154 Mobile Safari/537.36 OPR/78.2.4143.75485"},{"label":"Opera 104 Linux","value":"Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/118.0.0.0 Safari/537.36 OPR/104.0.0.0"},{"label":"Firefox 119 Windows 10","value":"Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:109.0) Gecko/20100101 Firefox/119.0"},{"label":"Firefox 118 Linux","value":"Mozilla/5.0 (X11; Linux x86_64; rv:109.0) Gecko/20100101 Firefox/118.0"},{"label":"Firefox 119 OSX 10.15","value":"Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:109.0) Gecko/20100101 Firefox/119.0"},{"label":"Safari 17 OSX 10.15.7","value":"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.0 Safari/605.1.15"},{"label":"Mobile Safari 17 iOS 17.0.3","value":"Mozilla/5.0 (iPhone; CPU iPhone OS 17_0_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.0.1 Mobile/15E148 Safari/604.1"},{"label":"Edge 118 Windows 10","value":"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/118.0.0.0 Safari/537.36 Edg/118.0.2088.69"},{"label":"Edge 120 OSX 10.15.7","value":"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36 Edg/120.0.0.0"},{"label":"Yandex 23 Windows 10","value":"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/116.0.5845.933 YaBrowser/23.9.3.933 Yowser/2.5 Safari/537.36"},{"label":"GSA 287 iOS 17.1","value":"Mozilla/5.0 (iPhone; CPU iPhone OS 17_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) GSA/287.0.575244645 Mobile/15E148 Safari/604.1"}]');
module.exports = /*#__PURE__*/JSON.parse('[{"label":"Chrome 118 Windows 10","value":"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/118.0.0.0 Safari/537.36"},{"label":"Chrome 117 Windows 7","value":"Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/117.0.0.0 Safari/537.36"},{"label":"Chrome 118 Android 10","value":"Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/118.0.0.0 Mobile Safari/537.36"},{"label":"Chrome 118 OSX 10.15.7","value":"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/118.0.0.0 Safari/537.36"},{"label":"Chrome 118 Linux","value":"Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/118.0.0.0 Safari/537.36"},{"label":"Chrome 118 iOS 17.0","value":"Mozilla/5.0 (iPhone; CPU iPhone OS 17_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/118.0.5993.92 Mobile/15E148 Safari/604.1"},{"label":"Chrome 118 Chromium OS 14541.0.0","value":"Mozilla/5.0 (X11; CrOS x86_64 14541.0.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/118.0.0.0 Safari/537.36"},{"label":"Opera 103 Windows 10","value":"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/117.0.0.0 Safari/537.36 OPR/103.0.0.0"},{"label":"Opera 78 Android 13","value":"Mozilla/5.0 (Linux; Android 13; SM-N986U) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/117.0.5938.154 Mobile Safari/537.36 OPR/78.2.4143.75485"},{"label":"Opera 104 Linux","value":"Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/118.0.0.0 Safari/537.36 OPR/104.0.0.0"},{"label":"Firefox 119 Windows 10","value":"Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:109.0) Gecko/20100101 Firefox/119.0"},{"label":"Firefox 118 Linux","value":"Mozilla/5.0 (X11; Linux x86_64; rv:109.0) Gecko/20100101 Firefox/118.0"},{"label":"Firefox 119 OSX 10.15","value":"Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:109.0) Gecko/20100101 Firefox/119.0"},{"label":"Safari 17 OSX 10.15.7","value":"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.0 Safari/605.1.15"},{"label":"Mobile Safari 17 iOS 17.1","value":"Mozilla/5.0 (iPhone; CPU iPhone OS 17_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.1 Mobile/15E148 Safari/604.1"},{"label":"Edge 118 Windows 10","value":"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/118.0.0.0 Safari/537.36 Edg/118.0.2088.76"},{"label":"Edge 118 OSX 10.15.7","value":"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/118.0.0.0 Safari/537.36 Edg/118.0.2088.69"},{"label":"Yandex 23 Windows 10","value":"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/116.0.5845.933 YaBrowser/23.9.3.933 Yowser/2.5 Safari/537.36"},{"label":"GSA 287 iOS 17.0","value":"Mozilla/5.0 (iPhone; CPU iPhone OS 17_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) GSA/287.0.575244645 Mobile/15E148 Safari/604.1"}]');

/***/ })

Expand Down
2 changes: 1 addition & 1 deletion bin/pub/index.html
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!doctype html><html><head><meta charset="utf-8"><title>Proxy Manager</title><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><base href="/"><link rel="shortcut icon" href="/favicon.ico"><link rel="stylesheet" href="https://use.fontawesome.com/releases/v6.7.2/css/all.css" integrity="sha384-nRgPTkuX86pH8yjPJUAFuASXQSSl2/bBUiNV47vSYpKFxHJhbcrGnmlYpYJMeD7a" crossorigin="anonymous"><script defer="defer" src="/8c65e8e579be395b9ad6.runtime.js"></script><script defer="defer" src="/72c95d06b91b6ca178ac.app.js"></script><script defer="defer" src="/f631e65a272530fc3edf.vendor.js"></script></head><body><div id="react_root"></div><div id="notif_react_modal"></div><div id="del_modal"></div></body></html>
<!doctype html><html><head><meta charset="utf-8"><title>Proxy Manager</title><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><base href="/"><link rel="shortcut icon" href="/favicon.ico"><link rel="stylesheet" href="https://use.fontawesome.com/releases/v6.7.2/css/all.css" integrity="sha384-nRgPTkuX86pH8yjPJUAFuASXQSSl2/bBUiNV47vSYpKFxHJhbcrGnmlYpYJMeD7a" crossorigin="anonymous"><script defer="defer" src="/8c65e8e579be395b9ad6.runtime.js"></script><script defer="defer" src="/e2fac87f04a2eca49322.app.js"></script><script defer="defer" src="/a2077dab5090f880c07c.vendor.js"></script></head><body><div id="react_root"></div><div id="notif_react_modal"></div><div id="del_modal"></div></body></html>
2 changes: 1 addition & 1 deletion extensions/timezone/manifest.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@
"*://*/*",
"webNavigation"
],
"version": "1.517.992"
"version": "1.519.10"
}
2 changes: 1 addition & 1 deletion extensions/webrtc/manifest.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@
"permissions": [
"privacy"
],
"version": "1.517.992"
"version": "1.519.10"
}
8 changes: 4 additions & 4 deletions lib/manager.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ const mgr_on_server_conf = function(server_conf){
}
this.server_conf = server_conf;
let port = this.check_proxy_port(server_conf.cloud);
if (port && port != E.default.proxy_port)
if (port && port != this.get_mgr_proxy_port())
this.change_default_proxy_port(port);
if (zone_auth_wl_diff.length)
this.update_zone_auth_wl();
Expand Down Expand Up @@ -228,7 +228,7 @@ E.prototype.apply_argv_opts = function(_defaults){
};

E.prototype.check_proxy_port = function(conf={}){
let def_port = E.default.proxy_port;
let def_port = this.get_mgr_proxy_port();
let def_id = this._defaults.customer_id || this._defaults.account_id;
let conf_def_port = lpm_config.manager_default.proxy_port;
if (!conf)
Expand Down Expand Up @@ -1294,9 +1294,9 @@ E.prototype.run_stats_reporting = etask._fn(function*(_this){
if (i%5==0)
{
stats.tcp_established = yield util_lib.count_tcp('ESTABLISHED',
E.default.proxy_port);
this.get_mgr_proxy_port());
stats.tcp_time_wait = yield util_lib.count_tcp('TIME_WAIT',
E.default.proxy_port);
this.get_mgr_proxy_port());
i = 0;
}
_this.cluster_mgr.health_check();
Expand Down
8 changes: 7 additions & 1 deletion lib/mixins/mgr_config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,12 @@ E.prototype.add_config_change = function(key, area, payload, source, username,
this.lpm_f.event(key, source, username, assign(ev_payload||{}, {area}));
};

E.prototype.get_mgr_proxy_port = function(){
const opts_pp = this.opts.proxy_port;
const def_pp = E.default.proxy_port;
return !opts_pp || def_pp==opts_pp ? def_pp : opts_pp;
};

E.prototype.get_settings = function(){
return {
account_id: this._defaults.account_id,
Expand Down Expand Up @@ -71,7 +77,7 @@ E.prototype.get_settings = function(){
lpm_token: this._defaults.lpm_token,
cloud_url_address: this.get_cloud_url_address(),
server_conf: this.server_conf,
proxy_port: E.default.proxy_port,
proxy_port: this.get_mgr_proxy_port(),
username: this.last_username,
logs_settings: this._defaults.logs_settings,
bw_limit_webhook_url: this._defaults.bw_limit_webhook_url,
Expand Down
3 changes: 2 additions & 1 deletion lib/mixins/mgr_proxy.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ E.prototype.get_super_proxy_ports = function(server_conf){
};

E.prototype.complete_proxy_config = function(conf){
const c = assign({}, E.default, this._defaults, conf);
const c = assign({}, E.default, this._defaults, conf,
{proxy_port: this.get_mgr_proxy_port()});
const zone = this.zones_mgr.get_obj(c.zone);
const {plan, perm} = zone||{};
const perms = perm?.split(' ');
Expand Down
5 changes: 4 additions & 1 deletion lib/server.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -753,9 +753,12 @@ E.prototype.get_req_cred = function(req){
};

E.prototype.get_proxy_port = function(){
const use_pp = this.opt.new_proxy_port&&
this.opt.proxy_port===E.default.proxy_port;
const def_pp = use_pp ? E.default.new_proxy_port : this.opt.proxy_port;
const {super_proxy_ports} = this.opt;
if (!super_proxy_ports || super_proxy_ports.length<2)
return this.opt.proxy_port;
return def_pp;
if (!super_proxy_ports[super_proxy_ports_cursor])
super_proxy_ports_cursor = 0;
return super_proxy_ports[super_proxy_ports_cursor++];
Expand Down
2 changes: 1 addition & 1 deletion lib/swagger.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"swagger": "2.0",
"info": {
"version": "1.517.992",
"version": "1.519.10",
"title": "Proxy Manager",
"license": {
"name": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion lib/util.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ E.count_fd = ()=>etask(function*mgr_count_fd(){
return list.length;
});

E.count_tcp = (key='ESTABLISHED', port='22225')=>etask(function*_count_tcp(){
E.count_tcp = (key='ESTABLISHED', port='33335')=>etask(function*_count_tcp(){
if (is_win || is_darwin)
return 0;
this.alarm(1000);
Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -541,7 +541,7 @@
"webpack.dev.js",
"webpack.prod.js"
],
"md5": "41ddaeda92abfedbe461c36ec989b014"
"md5": "a3626e0c3606937ea9f2ee8e479c318f"
},
"main": "bin/index.js",
"name": "@luminati-io/luminati-proxy",
Expand Down Expand Up @@ -571,5 +571,5 @@
"build": "webpack --env production",
"dev": "webpack --env development"
},
"version": "1.517.992"
"version": "1.519.10"
}
2 changes: 1 addition & 1 deletion src/pub/proxy_edit/common.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ export const Config = withRouter(class Config extends Pure_component {
val={this.state.val===undefined ? '' : this.state.val}
disabled={disabled}
disabled_ips={this.props.disabled_ips}
note={this.props.note}
note={this.props.note||tabs[tab_id].fields[id].note}
placeholder={tabs[tab_id].fields[id].placeholder||''}
on_blur={this.on_blur}
label={tabs[tab_id].fields[id].label}
Expand Down
9 changes: 5 additions & 4 deletions src/pub/proxy_edit/fields.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -364,10 +364,11 @@ export const tabs = {
label: 'Follow redirect',
tooltip: 'Auto redirect requests on status code 30x',
},
socket_inactivity_timeout: {
label: 'Inactivity timeout',
tooltip: 'The amount of milliseconds a socket'
+' can be inactive before it times out and closes',
new_proxy_port: {
label: 'Use new proxy port',
tooltip: 'Use proxy port 33335 instead of 22225',
note: 'This option will be removed and port 33335 become'
+' default in future releases',
},
},
},
Expand Down
1 change: 1 addition & 0 deletions src/pub/proxy_edit/general.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,7 @@ export default class General extends Pure_component {
note={!is_render_plan && <Limit_zone_note zones={render_zones}/>}
/>
<Config type="yes_no" id="follow_redirect" />
<Config type="yes_no" id="new_proxy_port" />
</Tab_context.Provider>
</div>;
}
Expand Down
Loading

0 comments on commit f8718ad

Please sign in to comment.