mirror of
https://github.com/nabbar/golib.git
synced 2025-09-26 20:01:15 +08:00

- fix bug with cert type marshall/unmarshall - add old config to allow retro compatibility - add new type function to retrieve a tls root ca cert instead of a slice of string to get root ca Package HTTPCli: - fix default DNS Mapper - optimze global DNS Mapper - fix non closing sub goroutine Package HTTPCli/DNS-Mapper: - change request function of Root CA with function of root ca cert instance - add function to return a root ca cert from a function that return a slice of root ca string Package Config/Components: - httpcli: bump sub package of certificate, httpcli - httpcli: adjust code following bump - httpcli: change request function of Root CA with function of root ca cert instance - httpcli: add function to return a root ca cert from a function that return a slice of root ca string - tls: change request function of Root CA with function of root ca cert instance - tls: add function to return a root ca cert from a function that return a slice of root ca string Package IOUtils/mapCloser: - fix bug with mapcloser not stopped - optimize code & goroutine Package Logger: - rework mapCloser call - optimize mapClaoser managment Package Request: - rework error managment - using []byte instead of buffer to read response body - add free capability - optimize memory consumption Package Socket / Server: - add filtering error capability - add params to specify a function called on each new connection and before using the connection - the new function param allow to update the network incomming connection (like buffer, deadline...) - rework some useless atomic to direct value to optimize code Package Socket/Delim: - rework to optimize memory & variable use - remove capabilities of update the instance when running, prefert recreate new one if necessary Other: - bump dependencies - minor bug / fix
133 lines
2.8 KiB
Go
133 lines
2.8 KiB
Go
/*
|
|
* MIT License
|
|
*
|
|
* Copyright (c) 2020 Nicolas JUHEL
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
* in the Software without restriction, including without limitation the rights
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
* furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in all
|
|
* copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
* SOFTWARE.
|
|
*
|
|
*
|
|
*/
|
|
|
|
package dns_mapper
|
|
|
|
import (
|
|
"context"
|
|
"net/http"
|
|
"sync"
|
|
"time"
|
|
|
|
libatm "github.com/nabbar/golib/atomic"
|
|
libtls "github.com/nabbar/golib/certificates"
|
|
)
|
|
|
|
type dmp struct {
|
|
d *sync.Map
|
|
z *sync.Map
|
|
c libatm.Value[*Config]
|
|
t libatm.Value[*http.Transport]
|
|
n libatm.Value[context.CancelFunc]
|
|
x libatm.Value[context.Context]
|
|
f libtls.FctRootCACert
|
|
i func(msg string)
|
|
}
|
|
|
|
func (o *dmp) Close() error {
|
|
if i := o.n.Swap(func() {}); i != nil {
|
|
i()
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func (o *dmp) config() *Config {
|
|
var cfg = &Config{}
|
|
|
|
if c := o.c.Load(); c == nil {
|
|
return cfg
|
|
} else {
|
|
*cfg = *c
|
|
return cfg
|
|
}
|
|
}
|
|
|
|
func (o *dmp) configDialerTimeout() time.Duration {
|
|
if cfg := o.config(); cfg == nil {
|
|
return 30 * time.Second
|
|
} else if cfg.Transport.TimeoutGlobal == 0 {
|
|
return 30 * time.Second
|
|
} else {
|
|
return cfg.Transport.TimeoutGlobal.Time()
|
|
}
|
|
}
|
|
|
|
func (o *dmp) configDialerKeepAlive() time.Duration {
|
|
if cfg := o.config(); cfg == nil {
|
|
return 15 * time.Second
|
|
} else if cfg.Transport.TimeoutKeepAlive == 0 {
|
|
return 15 * time.Second
|
|
} else {
|
|
return cfg.Transport.TimeoutKeepAlive.Time()
|
|
}
|
|
}
|
|
|
|
func (o *dmp) TimeCleaner(ctx context.Context, dur time.Duration) {
|
|
if dur < 5*time.Second {
|
|
dur = 5 * time.Minute
|
|
}
|
|
|
|
var (
|
|
x context.Context
|
|
n context.CancelFunc
|
|
)
|
|
|
|
if ctx != nil {
|
|
x, n = context.WithCancel(ctx)
|
|
o.x.Store(x)
|
|
if i := o.n.Swap(n); i != nil {
|
|
i()
|
|
}
|
|
}
|
|
|
|
go func() {
|
|
var (
|
|
tk = time.NewTicker(dur)
|
|
cx = o.x.Load()
|
|
)
|
|
|
|
defer func() {
|
|
tk.Stop()
|
|
}()
|
|
|
|
for {
|
|
select {
|
|
case <-cx.Done():
|
|
return
|
|
case <-tk.C:
|
|
o.DefaultTransport().CloseIdleConnections()
|
|
}
|
|
}
|
|
}()
|
|
}
|
|
|
|
func (o *dmp) Message(msg string) {
|
|
if o.i != nil {
|
|
o.i(msg)
|
|
}
|
|
}
|