xiaoqidun/ofdgo
1
0 Fork 0
mirror of https://github.com/xiaoqidun/ofdgo.git synced 2026-10-29 17:27:08 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

perf(优化性能): 优化原生资源传输与释放
build.yaml / build (push) Successful in 45s
Details

Browse Source
This commit is contained in:
xiaoqidun committed 2026-10-17 20:31:26 +08:00
1 parent 253debb3f9
commit e261287baa
5 files changed
+190 -35
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

internal/webview/webview.go
+93 -13
View File
@@ -17,6 +17,7 @@
package webview
import (
"bytes"
"context"
"crypto/rand"
"encoding/json"
@@ -56,9 +57,10 @@ type Host struct {
pendingPaths []string
}
// resourceReader 保持资源独立的读取位置，文件生命周期由窗口管理
// resourceReader 保存资源读取位置及关闭操作
type resourceReader struct {
*io.SectionReader
close func() error
}
// Run 启动共用WebUI的原生入口
@@ -115,27 +117,105 @@ func Run(ctx context.Context, paths []string, dataDir string) error {
}
// Close 结束本次资源读取
func (r *resourceReader) Close() error { return nil }
// 返回: error 关闭错误
func (r *resourceReader) Close() error {
if r.close != nil {
return r.close()
}
return nil
}
// resource 将大文件直接交给宿主资源流
// resource 将静态资源及文件直接交给宿主资源流
// 入参: r 资源请求
// 返回: *guigo.Resource 资源响应, error 读取错误
func (h *Host) resource(r *http.Request) (*guigo.Resource, error) {
if r.Method != http.MethodGet || !strings.HasPrefix(r.URL.Path, "/__native/data/") || r.Header.Get("Range") != "" {
if r.Method != http.MethodGet && r.Method != http.MethodHead {
return nil, nil
}
id := strings.TrimPrefix(r.URL.Path, "/__native/data/")
reader, size, err := h.files.resolve(id)
if err != nil {
return nil, nil
for _, name := range []string{"If-Match", "If-None-Match", "If-Modified-Since", "If-Unmodified-Since", "If-Range"} {
if r.Header.Get(name) != "" {
return nil, nil
}
}
var reader io.ReaderAt
var size int64
var close func() error
transferred := false
defer func() {
if !transferred && close != nil {
close()
}
}()
if strings.HasPrefix(r.URL.Path, "/__native/data/") {
var err error
reader, size, close, err = h.files.resource(strings.TrimPrefix(r.URL.Path, "/__native/data/"))
if err != nil {
return nil, nil
}
} else {
name := strings.TrimPrefix(r.URL.Path, "/")
if name == "" {
name = "index.html"
}
data, err := webuiassets.NativeFS.ReadFile(name)
if err != nil {
return nil, nil
}
reader, size = bytes.NewReader(data), int64(len(data))
}
header := make([]byte, min(size, 512))
_, err = reader.ReadAt(header, 0)
_, err := reader.ReadAt(header, 0)
if err != nil && err != io.EOF {
return nil, err
}
return &guigo.Resource{
Body: &resourceReader{io.NewSectionReader(reader, 0, size)},
Header: http.Header{"Content-Type": {http.DetectContentType(header)}, "Content-Length": {strconv.FormatInt(size, 10)}, "Cache-Control": {"no-store"}},
}, nil
contentType := mime.TypeByExtension(filepath.Ext(r.URL.Path))
if contentType == "" {
contentType = http.DetectContentType(header)
}
headers := http.Header{"Content-Type": {contentType}, "Content-Length": {strconv.FormatInt(size, 10)}, "Cache-Control": {"no-store"}, "Accept-Ranges": {"bytes"}}
start, length, status := int64(0), size, http.StatusOK
if value := r.Header.Get("Range"); value != "" && r.Method == http.MethodGet {
if !strings.HasPrefix(value, "bytes=") || strings.Contains(value, ",") {
return nil, nil
}
first, last, ok := strings.Cut(strings.TrimPrefix(value, "bytes="), "-")
if !ok {
return nil, nil
}
if first == "" {
count, err := strconv.ParseInt(last, 10, 64)
if err != nil || count <= 0 {
return nil, nil
}
length = min(count, size)
start = size - length
} else {
var err error
start, err = strconv.ParseInt(first, 10, 64)
if err != nil || start < 0 || start >= size {
return nil, nil
}
end := size - 1
if last != "" {
end, err = strconv.ParseInt(last, 10, 64)
if err != nil || end < start {
return nil, nil
}
}
length = min(end, size-1) - start + 1
}
if length == 0 {
return nil, nil
}
status = http.StatusPartialContent
headers.Set("Content-Range", fmt.Sprintf("bytes %d-%d/%d", start, start+length-1, size))
headers.Set("Content-Length", strconv.FormatInt(length, 10))
}
if r.Method == http.MethodHead {
length = 0
}
transferred = true
return &guigo.Resource{Body: &resourceReader{SectionReader: io.NewSectionReader(reader, start, length), close: close}, StatusCode: status, Header: headers}, nil
}
// emit 发送当前窗口事件
internal/webview/webview_files.go
+56 -11
View File
@@ -39,11 +39,13 @@ type fileEntry struct {
file *os.File
directory bool
owned bool
temporary bool
}
// fileStore 管理窗口范围内的文件授权和临时数据
type fileStore struct {
mu sync.Mutex
transfers sync.WaitGroup
entries map[string]*fileEntry
writers map[string]*fileWriter
temporary string
@@ -206,12 +208,43 @@ func (s *fileStore) bytes(data []byte) map[string]any {
return map[string]any{"nativeFile": id, "size": len(data), "name": "data", "url": "/__native/data/" + id, "temporary": true}
}
// resource 创建独立资源读取句柄
// 入参: id 文件标识
// 返回: io.ReaderAt 随机读取器, int64 文件大小, func() error 关闭函数, error 读取错误
func (s *fileStore) resource(id string) (io.ReaderAt, int64, func() error, error) {
s.mu.Lock()
defer s.mu.Unlock()
entry := s.entries[id]
if entry == nil || entry.directory {
return nil, 0, nil, os.ErrNotExist
}
if entry.data != nil {
return bytes.NewReader(entry.data), int64(len(entry.data)), nil, nil
}
file, err := openReadFile(entry.path)
if err != nil {
return nil, 0, nil, err
}
info, err := file.Stat()
if err != nil {
file.Close()
return nil, 0, nil, err
}
return file, info.Size(), file.Close, nil
}
// release 释放已传递完成的内存结果
func (s *fileStore) release(id string) {
s.mu.Lock()
defer s.mu.Unlock()
if entry := s.entries[id]; entry != nil && entry.data != nil {
if entry := s.entries[id]; entry != nil && (entry.data != nil || entry.temporary) {
delete(s.entries, id)
if entry.file != nil {
entry.file.Close()
}
if entry.temporary {
os.Remove(entry.path)
}
}
}
@@ -449,28 +482,39 @@ func (w *fileWriter) release() {
func (s *fileStore) serve(w http.ResponseWriter, r *http.Request) {
w.Header().Set("Cache-Control", "no-store")
if r.URL.Path == "/__native/input" && r.Method == http.MethodPost {
s.mu.Lock()
if s.closed {
s.mu.Unlock()
http.Error(w, os.ErrClosed.Error(), 500)
return
}
s.transfers.Add(1)
s.mu.Unlock()
defer s.transfers.Done()
file, err := temporaryFile(s.temporary, "input-")
if err != nil {
http.Error(w, err.Error(), 500)
return
}
_, err = io.Copy(file, r.Body)
err = errors.Join(err, file.Close())
size, err := io.Copy(file, r.Body)
if err != nil {
file.Close()
os.Remove(file.Name())
http.Error(w, err.Error(), 500)
return
}
handle, err := s.add(file.Name(), false)
if err != nil {
http.Error(w, err.Error(), 500)
return
}
value, err := s.file(handle["nativeHandle"].(string))
if err != nil {
http.Error(w, err.Error(), 500)
s.mu.Lock()
if s.closed {
s.mu.Unlock()
file.Close()
os.Remove(file.Name())
http.Error(w, os.ErrClosed.Error(), 500)
return
}
id := rand.Text()
s.entries[id] = &fileEntry{path: file.Name(), name: "data", file: file, temporary: true}
s.mu.Unlock()
value := map[string]any{"nativeFile": id, "size": size, "name": "data", "url": "/__native/data/" + id, "temporary": true}
w.Header().Set("Content-Type", "application/json")
json.NewEncoder(w).Encode(value)
return
@@ -508,6 +552,7 @@ func (s *fileStore) close() error {
s.writers = make(map[string]*fileWriter)
s.entries = make(map[string]*fileEntry)
s.mu.Unlock()
s.transfers.Wait()
var err error
for _, writer := range writers {
err = errors.Join(err, writer.Abort())