缓存策略增加“允许读取不完整的Partial Content”选项

Author: iwind

internal/web/actions/default/servers/components/cache/cacheutils/utils.go

@@ -29,11 +29,12 @@ func FindCachePolicy(parent *actionutils.ParentAction, cachePolicyId int64) (*se
 	if len(resp.HttpCachePolicyJSON) == 0 {
 		return nil, errors.New("cache policy not found")
 	}
-	config := &serverconfigs.HTTPCachePolicy{}
+	var config = &serverconfigs.HTTPCachePolicy{}
 	err = json.Unmarshal(resp.HttpCachePolicyJSON, config)
 	if err != nil {
 		return nil, err
 	}
+
 	return config, nil
 }
 

internal/web/actions/default/servers/components/cache/createPopup.go

@@ -37,11 +37,12 @@ func (this *CreatePopupAction) RunPost(params struct {
 	FileEnableSendfile     bool
 	FileMinFreeSizeJSON    []byte
 
-	CapacityJSON         []byte
-	MaxSizeJSON          []byte
-	FetchTimeoutJSON     []byte
-	SyncCompressionCache bool
-	EnableMMAP           bool
+	CapacityJSON                   []byte
+	MaxSizeJSON                    []byte
+	FetchTimeoutJSON               []byte
+	SyncCompressionCache           bool
+	EnableMMAP                     bool
+	EnableIncompletePartialContent bool
 
 	Description string
 	IsOn        bool
@@ -95,10 +96,11 @@ func (this *CreatePopupAction) RunPost(params struct {
 			MemoryPolicy: &serverconfigs.HTTPCachePolicy{
 				Capacity: memoryCapacity,
 			},
-			OpenFileCache:  openFileCacheConfig,
-			EnableSendfile: params.FileEnableSendfile,
-			MinFreeSize:    minFreeSize,
-			EnableMMAP:     params.EnableMMAP,
+			OpenFileCache:                  openFileCacheConfig,
+			EnableSendfile:                 params.FileEnableSendfile,
+			MinFreeSize:                    minFreeSize,
+			EnableMMAP:                     params.EnableMMAP,
+			EnableIncompletePartialContent: params.EnableIncompletePartialContent,
 		}
 	case serverconfigs.CachePolicyStorageMemory:
 		options = &serverconfigs.HTTPMemoryCacheStorage{}

internal/web/actions/default/servers/components/cache/update.go

@@ -59,6 +59,14 @@ func (this *UpdateAction) RunGet(params struct {
 				cachePolicy.Options["enableMMAP"] = false
 			}
 		}
+
+		// fix enableIncompletePartialContent
+		{
+			_, ok := cachePolicy.Options["enableIncompletePartialContent"]
+			if !ok {
+				cachePolicy.Options["enableIncompletePartialContent"] = true
+			}
+		}
 	}
 
 	this.Data["cachePolicy"] = cachePolicy
@@ -87,7 +95,8 @@ func (this *UpdateAction) RunPost(params struct {
 	SyncCompressionCache bool
 	FetchTimeoutJSON     []byte
 
-	EnableMMAP bool
+	EnableMMAP                     bool
+	EnableIncompletePartialContent bool
 
 	Description string
 	IsOn        bool
@@ -146,10 +155,11 @@ func (this *UpdateAction) RunPost(params struct {
 			MemoryPolicy: &serverconfigs.HTTPCachePolicy{
 				Capacity: memoryCapacity,
 			},
-			OpenFileCache:  openFileCacheConfig,
-			EnableSendfile: params.FileEnableSendfile,
-			MinFreeSize:    minFreeSize,
-			EnableMMAP:     params.EnableMMAP,
+			OpenFileCache:                  openFileCacheConfig,
+			EnableSendfile:                 params.FileEnableSendfile,
+			MinFreeSize:                    minFreeSize,
+			EnableMMAP:                     params.EnableMMAP,
+			EnableIncompletePartialContent: params.EnableIncompletePartialContent,
 		}
 	case serverconfigs.CachePolicyStorageMemory:
 		options = &serverconfigs.HTTPMemoryCacheStorage{}

web/views/@default/servers/components/cache/createPopup.html

@@ -84,6 +84,13 @@ <h3>创建缓存策略</h3>
                     <p class="comment"><pro-warning-label></pro-warning-label><plus-label></plus-label>使用sendfile提升发送缓存文件的效率。</p>
                 </td>
             </tr>
+            <tr>
+                <td class="color-border">允许读取不完整的Partial Content</td>
+                <td>
+                    <checkbox name="enableIncompletePartialContent" checked="checked"></checkbox>
+                    <p class="comment">允许在有一部分内容缓存的情况下读取分区内容，剩余的部分将会自动回源读取。</p>
+                </td>
+            </tr>
             <tr v-show="moreOptionsVisible && policyType == 'file'">
                 <td class="color-border">启用MMAP</td>
                 <td>

web/views/@default/servers/components/cache/policy.html

@@ -58,11 +58,16 @@
             <td class="color-border">缓存硬盘最小空余空间</td>
             <td><size-capacity-view :v-value="cachePolicy.options.minFreeSize"></size-capacity-view></td>
         </tr>
-        <tr v-if="cachePolicy.options != null">
+        <tr v-if="cachePolicy.options.enableIncompletePartialContent">
+            <td class="color-border">允许读取不完整的Partial Content</td>
+            <td>
+                <span class="green">Y</span>
+            </td>
+        </tr>
+        <tr v-if="cachePolicy.options.enableMMAP">
             <td class="color-border">启用MMAP</td>
             <td>
-                <span class="green" v-if="cachePolicy.options.enableMMAP || cachePolicy.options.enableMMAP == null">Y</span>
-                <span class="disabled" v-else>N</span>
+                <span>Y</span>
             </td>
         </tr>
     </tbody>

web/views/@default/servers/components/cache/update.html

@@ -91,6 +91,13 @@
                         <p class="comment"><pro-warning-label></pro-warning-label><plus-label></plus-label>使用sendfile提升发送缓存文件的效率。</p>
                     </td>
                 </tr>
+                <tr>
+                    <td class="color-border">允许读取不完整的Partial Content</td>
+                    <td>
+                        <checkbox name="enableIncompletePartialContent" v-model="cachePolicy.options.enableIncompletePartialContent"></checkbox>
+                        <p class="comment">允许在有一部分内容缓存的情况下读取分区内容，剩余的部分将会自动回源读取。</p>
+                    </td>
+                </tr>
                 <tr>
                     <td class="color-border">启用MMAP</td>
                     <td>

web/views/@default/servers/components/cache/update.js

@@ -13,6 +13,7 @@ Tea.context(function () {
 			let options = this.cachePolicy.options
 			if (options != null && typeof options == "object" && typeof options["dir"] === "undefined") {
 				options["enableMMAP"] = false
+				options["enableIncompletePartialContent"] = true
 				options["dir"] = "/opt/cache"
 				options["memoryPolicy"] = {
 					capacity: {