vikarti.anatra/opera-proxy
1
0
Fork 0
mirror of https://github.com/Snawoot/opera-proxy.git synced 2025-09-02 10:42:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

retry credential refresh

Browse source
This commit is contained in:
Vladislav Yarmak 2021-04-23 13:01:53 +03:00
parent 9afba73a08
commit 5260f97be9
3 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
README.md
View file

@ -97,6 +97,7 @@ eu3.sec-tunnel.com,77.111.244.22,443
| list-proxies | - | output proxy list and exit | | list-proxies | - | output proxy list and exit |
| proxy | String | sets base proxy to use for all dial-outs. Format: `<http\|https\|socks5\|socks5h>://[login:password@]host[:port]` Examples: `http://user:password@192.168.1.1:3128`, `socks5://10.0.0.1:1080` | | proxy | String | sets base proxy to use for all dial-outs. Format: `<http\|https\|socks5\|socks5h>://[login:password@]host[:port]` Examples: `http://user:password@192.168.1.1:3128`, `socks5://10.0.0.1:1080` |
| refresh | Duration | login refresh interval (default 4h0m0s) | | refresh | Duration | login refresh interval (default 4h0m0s) |
| refresh-retry | Duration | login refresh retry interval (default 5s) |
| timeout | Duration | timeout for network operations (default 10s) | | timeout | Duration | timeout for network operations (default 10s) |
| verbosity | Number | logging verbosity (10 - debug, 20 - info, 30 - warning, 40 - error, 50 - critical) (default 20) | | verbosity | Number | logging verbosity (10 - debug, 20 - info, 30 - warning, 40 - error, 50 - critical) (default 20) |
| version | - | show program version and exit | | version | - | show program version and exit |

9
main.go
View file

@ -55,6 +55,7 @@ type CLIArgs struct {
apiAddress string apiAddress string
bootstrapDNS string bootstrapDNS string
refresh time.Duration refresh time.Duration
refreshRetry time.Duration
} }
func parse_args() CLIArgs { func parse_args() CLIArgs {
@ -78,6 +79,7 @@ func parse_args() CLIArgs {
"See https://github.com/ameshkov/dnslookup/ for upstream DNS URL format. "+ "See https://github.com/ameshkov/dnslookup/ for upstream DNS URL format. "+
"Examples: https://1.1.1.1/dns-query, quic://dns.adguard.com") "Examples: https://1.1.1.1/dns-query, quic://dns.adguard.com")
flag.DurationVar(&args.refresh, "refresh", 4*time.Hour, "login refresh interval") flag.DurationVar(&args.refresh, "refresh", 4*time.Hour, "login refresh interval")
flag.DurationVar(&args.refreshRetry, "refresh-retry", 5*time.Second, "login refresh retry interval")
flag.Parse() flag.Parse()
if args.country == "" { if args.country == "" {
arg_fail("Country can't be empty string.") arg_fail("Country can't be empty string.")
@ -229,14 +231,14 @@ func run() int {
return 13 return 13
} }
runTicker(context.Background(), args.refresh, func(ctx context.Context) { runTicker(context.Background(), args.refresh, args.refreshRetry, func(ctx context.Context) error {
mainLogger.Info("Refreshing login...") mainLogger.Info("Refreshing login...")
reqCtx, cl := context.WithTimeout(ctx, args.timeout) reqCtx, cl := context.WithTimeout(ctx, args.timeout)
defer cl() defer cl()
err := seclient.Login(reqCtx) err := seclient.Login(reqCtx)
if err != nil { if err != nil {
mainLogger.Error("Login refresh failed: %v", err) mainLogger.Error("Login refresh failed: %v", err)
return return err
} }
mainLogger.Info("Login refreshed.") mainLogger.Info("Login refreshed.")
@ -246,9 +248,10 @@ func run() int {
err = seclient.DeviceGeneratePassword(reqCtx) err = seclient.DeviceGeneratePassword(reqCtx)
if err != nil { if err != nil {
mainLogger.Error("Device password refresh failed: %v", err) mainLogger.Error("Device password refresh failed: %v", err)
return return err
} }
mainLogger.Info("Device password refreshed.") mainLogger.Info("Device password refreshed.")
return nil
}) })
endpoint := ips[0] endpoint := ips[0]

11
utils.go
View file

@ -171,14 +171,19 @@ func AfterWallClock(d time.Duration) <-chan time.Time {
return ch return ch
} }
func runTicker(ctx context.Context, interval time.Duration, cb func(context.Context)) { func runTicker(ctx context.Context, interval, retryInterval time.Duration, cb func(context.Context) error) {
go func() { go func() {
var err error
for { for {
nextInterval := interval
if err != nil {
nextInterval = retryInterval
}
select { select {
case <-ctx.Done(): case <-ctx.Done():
return return
case <-AfterWallClock(interval): case <-AfterWallClock(nextInterval):
cb(ctx) err = cb(ctx)
} }
} }
}() }()