实现缓存策略的部分功能

pkg/serverconfigs/http_cache_policy.go

@@ -17,8 +17,12 @@ type HTTPCachePolicy struct {
 	MaxSize     *shared.SizeCapacity   `yaml:"maxSize" json:"maxSize"`         // 单个缓存最大尺寸 TODO 需要实现
 	Type        CachePolicyStorageType `yaml:"type" json:"type"`               // 类型
 	Options     map[string]interface{} `yaml:"options" json:"options"`         // 选项
+	Life        *shared.TimeDuration   `yaml:"life" json:"life"`               // 默认有效期 TODO 需要实现
+	MinLife     *shared.TimeDuration   `yaml:"minLife" json:"minLife"`         // 最小有效期 TODO 需要实现
+	MaxLife     *shared.TimeDuration   `yaml:"maxLife" json:"maxLife"`         // 最大有效期 TODO 需要实现
 
 	capacity int64
+	maxSize  int64
 }
 
 // 校验
@@ -29,6 +33,10 @@ func (this *HTTPCachePolicy) Init() error {
 		this.capacity = this.Capacity.Bytes()
 	}
 
+	if this.maxSize > 0 {
+		this.maxSize = this.MaxSize.Bytes()
+	}
+
 	return err
 }
 
@@ -37,6 +45,11 @@ func (this *HTTPCachePolicy) CapacitySize() int64 {
 	return this.capacity
 }
 
+// 单个缓存最大尺寸
+func (this *HTTPCachePolicy) MaxSizeBytes() int64 {
+	return this.maxSize
+}
+
 // 对比Policy是否有变化
 func (this *HTTPCachePolicy) IsSame(anotherPolicy *HTTPCachePolicy) bool {
 	policyJSON1, err := json.Marshal(this)

pkg/serverconfigs/http_cache_ref.go

@@ -4,7 +4,6 @@ import (
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/shared"
 	"github.com/iwind/TeaGo/lists"
 	"strings"
-	"time"
 )
 
 var DefaultSkippedResponseCacheControlValues = []string{"private", "no-cache", "no-store"}
@@ -26,7 +25,7 @@ type HTTPCacheRef struct {
 
 	CachePolicy *HTTPCachePolicy `yaml:"cachePolicy" json:"cachePolicy"`
 
-	life                            time.Duration
+	lifeSeconds                     int64
 	maxSize                         int64
 	uppercaseSkipCacheControlValues []string
 }
@@ -36,7 +35,7 @@ func (this *HTTPCacheRef) Init() error {
 		this.maxSize = this.MaxSize.Bytes()
 	}
 	if this.Life != nil {
-		this.life = this.Life.Duration()
+		this.lifeSeconds = int64(this.Life.Duration().Seconds())
 	}
 
 	// control-values
@@ -65,13 +64,13 @@ func (this *HTTPCacheRef) Init() error {
 }
 
 // 最大数据尺寸
-func (this *HTTPCacheRef) MaxDataSize() int64 {
+func (this *HTTPCacheRef) MaxSizeBytes() int64 {
 	return this.maxSize
 }
 
 // 生命周期
-func (this *HTTPCacheRef) LifeDuration() time.Duration {
-	return this.life
+func (this *HTTPCacheRef) LifeSeconds() int64 {
+	return this.lifeSeconds
 }
 
 // 是否包含某个Cache-Control值

pkg/serverconfigs/shared/http_request_cond_group.go

@@ -17,7 +17,7 @@ func (this *HTTPRequestCondGroup) Init() error {
 	if len(this.Connector) == 0 {
 		this.Connector = "or"
 	}
-	
+
 	if len(this.Conds) > 0 {
 		for _, cond := range this.Conds {
 			err := cond.Init()
@@ -43,6 +43,14 @@ func (this *HTTPRequestCondGroup) MatchResponse(formatter func(source string) st
 	return this.match(this.responseConds, formatter)
 }
 
+func (this *HTTPRequestCondGroup) HasRequestConds() bool {
+	return len(this.requestConds) > 0
+}
+
+func (this *HTTPRequestCondGroup) HasResponseConds() bool {
+	return len(this.responseConds) > 0
+}
+
 func (this *HTTPRequestCondGroup) match(conds []*HTTPRequestCond, formatter func(source string) string) bool {
 	if !this.IsOn || len(conds) == 0 {
 		return !this.IsReverse

pkg/serverconfigs/shared/http_request_conds_config.go

@@ -6,6 +6,9 @@ type HTTPRequestCondsConfig struct {
 	IsOn      bool                    `yaml:"isOn" json:"isOn"`
 	Connector string                  `yaml:"connector" json:"connector"`
 	Groups    []*HTTPRequestCondGroup `yaml:"groups" json:"groups"`
+
+	hasRequestConds  bool
+	hasResponseConds bool
 }
 
 // 初始化
@@ -21,6 +24,18 @@ func (this *HTTPRequestCondsConfig) Init() error {
 		}
 	}
 
+	// 是否有请求条件
+	for _, group := range this.Groups {
+		if group.IsOn {
+			if group.HasRequestConds() {
+				this.hasRequestConds = true
+			}
+			if group.HasResponseConds() {
+				this.hasResponseConds = true
+			}
+		}
+	}
+
 	return nil
 }
 
@@ -67,3 +82,13 @@ func (this *HTTPRequestCondsConfig) MatchResponse(formatter func(s string) strin
 	}
 	return ok
 }
+
+// 判断是否有请求条件
+func (this *HTTPRequestCondsConfig) HasRequestConds() bool {
+	return this.hasRequestConds
+}
+
+// 判断是否有响应条件
+func (this *HTTPRequestCondsConfig) HasResponseConds() bool {
+	return this.hasResponseConds
+}