support Range header

zyxkad · zyxkad · commit 10bf24d89f8f · 2023-12-17T15:29:05.000-07:00
diff --git a/api.go b/api.go
@@ -12,7 +12,7 @@
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Affero General Public License for more details.
- * 
+ *
  *  You should have received a copy of the GNU Affero General Public License
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
diff --git a/cluster.go b/cluster.go
@@ -12,7 +12,7 @@
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Affero General Public License for more details.
- * 
+ *
  *  You should have received a copy of the GNU Affero General Public License
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
@@ -52,10 +52,11 @@ type Cluster struct {
 
 	redirectBase string
 
-	cacheDir string
-	tmpDir   string
-	dataDir  string
-	maxConn  int
+	cacheDir        string
+	tmpDir          string
+	dataDir         string
+	maxConn         int
+	ossSupportRange bool
 
 	stats  Stats
 	hits   atomic.Int32
diff --git a/dashboard.go b/dashboard.go
@@ -12,7 +12,7 @@
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Affero General Public License for more details.
- * 
+ *
  *  You should have received a copy of the GNU Affero General Public License
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
diff --git a/dashboard/src/App.vue b/dashboard/src/App.vue
@@ -28,7 +28,7 @@ const langNameMap: { [key: string]: string } = {
 			<Dropdown v-model="selectedLang" class="lang-selector"
 				:options="languages" placeholder="Language">
 				<template #value="slotProps">
-					<span class="flex-row-center">
+					<span class="flex-row-center" style="margin-right: -0.75rem;">
 						<i class="pi pi-globe"></i>
 						{{ langNameMap[slotProps.value.toString()] }}
 					</span>
diff --git a/dashboard/src/assets/lang/en-US.json b/dashboard/src/assets/lang/en-US.json
@@ -1,7 +1,11 @@
 {
 	"lang": "English",
 	"title": {
-		"dashboard": "Dashboard"
+		"dashboard": "Dashboard",
+		"day": "Day requests",
+		"month": "Month requests",
+		"year": "Year requests",
+		"total": "Total requests"
 	},
 	"message": {
 		"server": {
diff --git a/dashboard/src/assets/lang/zh-CN.json b/dashboard/src/assets/lang/zh-CN.json
@@ -1,7 +1,11 @@
 {
 	"lang": "简体中文",
 	"title": {
-		"dashboard": "仪表盘"
+		"dashboard": "仪表盘",
+		"day": "日请求",
+		"month": "月请求",
+		"year": "年请求",
+		"total": "全部请求"
 	},
 	"message": {
 		"server": {
diff --git a/dashboard/src/views/HomeView.vue b/dashboard/src/views/HomeView.vue
@@ -115,7 +115,7 @@ function getDaysInMonth(): number {
 			</div>
 		</div>
 		<div class="chart-card">
-			<h3>Day</h3>
+			<h3>{{ tr('title.day') }}</h3>
 			<HitsChart
 				v-if="data && stat"
 				class="hits-chart"
@@ -129,7 +129,7 @@ function getDaysInMonth(): number {
 			<Skeleton v-else class="hits-chart"/>
 		</div>
 		<div class="chart-card">
-			<h3>Month</h3>
+			<h3>{{ tr('title.month') }}</h3>
 			<HitsChart
 				v-if="data && stat"
 				class="hits-chart"
@@ -143,12 +143,12 @@ function getDaysInMonth(): number {
 			<Skeleton v-else class="hits-chart"/>
 		</div>
 		<div class="chart-card">
-			<h3>Year</h3>
+			<h3><h3>{{ tr('title.year') }}</h3></h3>
 			<HitsChart
 				v-if="data && stat"
 				class="hits-chart"
-				:max="14"
-				:offset="12"
+				:max="13"
+				:offset="11"
 				:data="stat.months"
 				:oldData="stat.prev.months"
 				:current="stat.date.month + getDaysInMonth()"
@@ -242,6 +242,7 @@ function getDaysInMonth(): number {
 .hits-chart {
 	width: 45rem !important;
 	height: 13rem !important;
+	user-select: none;
 }
 
 @media (max-width: 48rem) {
diff --git a/handler.go b/handler.go
@@ -12,7 +12,7 @@
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Affero General Public License for more details.
- * 
+ *
  *  You should have received a copy of the GNU Affero General Public License
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
@@ -28,6 +28,8 @@ import (
 	"strconv"
 	"strings"
 	"time"
+
+	"github.com/LiterMC/go-openbmclapi/internal/gosrc"
 )
 
 var zeroBuffer [1024 * 1024]byte
@@ -128,17 +130,31 @@ func (cr *Cluster) ServeHTTP(rw http.ResponseWriter, req *http.Request) {
 			}
 		}
 		name := req.Form.Get("name")
+
+		// if use OSS redirect
 		if cr.redirectBase != "" {
 			target, err := url.JoinPath(cr.redirectBase, "download", hashToFilename(hash))
 			if err != nil {
 				http.Error(rw, err.Error(), http.StatusInternalServerError)
 				return
 			}
+			size := stat.Size()
+			if cr.ossSupportRange { // fix the size for Ranged request
+				rg := req.Header.Get("Range")
+				rgs, err := gosrc.ParseRange(rg, size)
+				if err == nil {
+					size = 0
+					for _, r := range rgs {
+						size += r.Length
+					}
+				}
+			}
 			http.Redirect(rw, req, target, http.StatusFound)
 			cr.hits.Add(1)
-			cr.hbts.Add(stat.Size())
+			cr.hbts.Add(size)
 			return
 		}
+
 		rw.Header().Set("Cache-Control", "max-age=2592000") // 30 days
 		fd, err := os.Open(path)
 		if err != nil {
diff --git a/hijacker.go b/hijacker.go
@@ -12,7 +12,7 @@
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Affero General Public License for more details.
- * 
+ *
  *  You should have received a copy of the GNU Affero General Public License
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
diff --git a/internal/gosrc/LICENSE b/internal/gosrc/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2009 The Go Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/internal/gosrc/httprange.go b/internal/gosrc/httprange.go
@@ -0,0 +1,97 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// gosrc exports some useful code from golang source
+// Original codes are at https://github.com/golang/go/
+package gosrc
+
+import (
+	"errors"
+	"net/textproto"
+	"strconv"
+	"strings"
+)
+
+// HttpRange specifies the byte range to be sent to the client.
+type HttpRange struct {
+	Start, Length int64
+}
+
+var ErrNoOverlap = errors.New("invalid range: failed to overlap")
+
+// ParseRange parses a Range header string as per RFC 7233.
+// ErrNoOverlap is returned if none of the ranges overlap.
+func ParseRange(s string, size int64) ([]HttpRange, error) {
+	if s == "" {
+		return nil, nil // header not present
+	}
+	const b = "bytes="
+	if !strings.HasPrefix(s, b) {
+		return nil, errors.New("invalid range")
+	}
+	var ranges []HttpRange
+	noOverlap := false
+	for _, ra := range strings.Split(s[len(b):], ",") {
+		ra = textproto.TrimString(ra)
+		if ra == "" {
+			continue
+		}
+		start, end, ok := strings.Cut(ra, "-")
+		if !ok {
+			return nil, errors.New("invalid range")
+		}
+		start, end = textproto.TrimString(start), textproto.TrimString(end)
+		var r HttpRange
+		if start == "" {
+			// If no start is specified, end specifies the
+			// range start relative to the end of the file,
+			// and we are dealing with <suffix-length>
+			// which has to be a non-negative integer as per
+			// RFC 7233 Section 2.1 "Byte-Ranges".
+			if end == "" || end[0] == '-' {
+				return nil, errors.New("invalid range")
+			}
+			i, err := strconv.ParseInt(end, 10, 64)
+			if i < 0 || err != nil {
+				return nil, errors.New("invalid range")
+			}
+			if i > size {
+				i = size
+			}
+			r.Start = size - i
+			r.Length = size - r.Start
+		} else {
+			i, err := strconv.ParseInt(start, 10, 64)
+			if err != nil || i < 0 {
+				return nil, errors.New("invalid range")
+			}
+			if i >= size {
+				// If the range begins after the size of the content,
+				// then it does not overlap.
+				noOverlap = true
+				continue
+			}
+			r.Start = i
+			if end == "" {
+				// If no end is specified, range extends to end of the file.
+				r.Length = size - r.Start
+			} else {
+				i, err := strconv.ParseInt(end, 10, 64)
+				if err != nil || r.Start > i {
+					return nil, errors.New("invalid range")
+				}
+				if i >= size {
+					i = size - 1
+				}
+				r.Length = i - r.Start + 1
+			}
+		}
+		ranges = append(ranges, r)
+	}
+	if noOverlap && len(ranges) == 0 {
+		// The specified ranges did not overlap with the content.
+		return nil, ErrNoOverlap
+	}
+	return ranges, nil
+}
diff --git a/licsense.go b/licsense.go
@@ -12,7 +12,7 @@
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Affero General Public License for more details.
- * 
+ *
  *  You should have received a copy of the GNU Affero General Public License
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
diff --git a/logger.go b/logger.go
@@ -12,7 +12,7 @@
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Affero General Public License for more details.
- * 
+ *
  *  You should have received a copy of the GNU Affero General Public License
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
diff --git a/main.go b/main.go
diff --git a/socketio.go b/socketio.go
diff --git a/stat.go b/stat.go
diff --git a/util.go b/util.go
diff --git a/version.go b/version.go
