重构项目

Author: ExplodingDragon

Makefile

@@ -54,3 +54,8 @@ lint:
 lint-fix:
 	@(test -f "$(GOPATH)/bin/golangci-lint" || go install github.com/golangci/golangci-lint/v2/cmd/[email protected]) && \
 	"$(GOPATH)/bin/golangci-lint" run -c .golangci.yml --fix
+
+EXAMPLE_DIRS := $(shell find examples -maxdepth 1 -type d ! -path "examples" | sort)
+.PHONY: $(EXAMPLE_DIRS)
+$(EXAMPLE_DIRS):
+	@go run ./cmd/local/main.go -path $@

cmd/local/main.go

@@ -1,8 +1,20 @@
 package main
 
 import (
+	"context"
 	"flag"
+	"fmt"
+	"io"
+	"net/http"
 	"os"
+	"time"
+
+	"github.com/pkg/errors"
+	"go.uber.org/zap"
+	"gopkg.d7z.net/gitea-pages/pkg"
+	"gopkg.d7z.net/gitea-pages/pkg/providers"
+	"gopkg.d7z.net/middleware/cache"
+	"gopkg.d7z.net/middleware/kv"
 )
 
 var (
@@ -11,19 +23,68 @@ var (
 	repo   = org + "." + domain
 	path   = ""
 
-	port = 8080
+	port = ":8080"
 )
 
 func init() {
+	atom := zap.NewAtomicLevel()
+	atom.SetLevel(zap.DebugLevel)
+	cfg := zap.NewProductionConfig()
+	cfg.Level = atom
+	logger, _ := cfg.Build()
+	zap.ReplaceGlobals(logger)
 	dir, _ := os.Getwd()
 	path = dir
+	zap.L().Info("exec workdir", zap.String("path", path))
 	flag.StringVar(&org, "org", org, "org")
 	flag.StringVar(&repo, "repo", repo, "repo")
 	flag.StringVar(&domain, "domain", domain, "domain")
 	flag.StringVar(&path, "path", path, "path")
-	flag.IntVar(&port, "port", port, "port")
+	flag.StringVar(&port, "port", port, "port")
 	flag.Parse()
 }
 
 func main() {
+	fmt.Printf("请访问 http://%s%s/", repo, port)
+	if stat, err := os.Stat(path); err != nil || !stat.IsDir() {
+		zap.L().Fatal("path is not a directory", zap.String("path", path))
+	}
+	provider := providers.NewLocalProvider(map[string][]string{
+		org: {repo},
+	}, path)
+	memory, err := kv.NewMemory("")
+	if err != nil {
+		zap.L().Fatal("failed to init memory provider", zap.Error(err))
+	}
+	server := pkg.NewPageServer(http.DefaultClient,
+		provider, domain, "gh-pages", memory, memory, 0, &nopCache{},
+		func(w http.ResponseWriter, r *http.Request, err error) {
+			if errors.Is(err, os.ErrNotExist) {
+				http.Error(w, "page not found.", http.StatusNotFound)
+			} else if err != nil {
+				http.Error(w, err.Error(), http.StatusInternalServerError)
+			}
+		})
+	err = http.ListenAndServe(port, server)
+	if err != nil && !errors.Is(err, http.ErrServerClosed) {
+		zap.L().Fatal("failed to start server", zap.Error(err))
+	}
+}
+
+type nopCache struct{}
+
+func (n *nopCache) Child(_ string) cache.Cache {
+	return n
+}
+
+func (n *nopCache) Put(_ context.Context, _ string, _ map[string]string, _ io.Reader, _ time.Duration) error {
+	return nil
+}
+
+func (n *nopCache) Get(_ context.Context, _ string) (*cache.Content, error) {
+	return nil, os.ErrNotExist
+}
+
+func (n *nopCache) Delete(_ context.Context, _ string) error {
+	return nil
 }

cmd/server/main.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"context"
+	"errors"
 	"flag"
 	"fmt"
 	"log"
@@ -36,7 +37,7 @@ func main() {
 		log.Fatalf("fail to load config file: %v", err)
 	}
 
-	gitea, err := providers.NewGitea(config.Auth.Server, config.Auth.Token)
+	gitea, err := providers.NewGitea(http.DefaultClient, config.Auth.Server, config.Auth.Token)
 	if err != nil {
 		log.Fatalln(err)
 	}
@@ -51,22 +52,27 @@ func main() {
 	}
 	defer cacheBlob.Close()
 	backend := providers.NewProviderCache(gitea, cacheMeta, config.Cache.MetaTTL,
-		cacheBlob, uint64(config.Cache.BlobLimit),
+		cacheBlob.Child("backend"), uint64(config.Cache.BlobLimit),
 	)
 	defer backend.Close()
 	db, err := kv.NewKVFromURL(config.Database.URL)
 	if err != nil {
 		log.Fatalln(err)
 	}
 	defer db.Close()
+	cdb, ok := db.(kv.RawKV).Raw().(kv.CursorPagedKV)
+	if !ok {
+		log.Fatalln(errors.New("database not support cursor"))
+	}
 	pageServer := pkg.NewPageServer(
 		http.DefaultClient,
 		backend,
 		config.Domain,
 		config.Page.DefaultBranch,
-		db,
+		cdb,
 		cacheMeta,
 		config.Cache.MetaTTL,
+		cacheBlob.Child("filter"),
 		config.ErrorHandler,
 	)
 	ctx, stop := signal.NotifyContext(context.Background(), os.Interrupt, syscall.SIGTERM, syscall.SIGQUIT)

examples/HelloWorld/index.html

@@ -0,0 +1,13 @@
+<!doctype html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport"
+          content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <title>qjs 验证</title>
+</head>
+<body>
+<p>Hello World</p>
+</body>
+</html>

examples/QuickJS/.pages.yaml

@@ -0,0 +1,5 @@
+routes:
+- path: "api/v1/**"
+  qjs:
+    exec: "index.js"
+    debug: true

examples/QuickJS/index.html

@@ -0,0 +1,13 @@
+<!doctype html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport"
+          content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <title>Document</title>
+</head>
+<body>
+
+</body>
+</html>

examples/QuickJS/index.js

@@ -0,0 +1,7 @@
+response.write("hello world")
+console.log("hello world")
+console.log(req.methaaod)
+function aaa(){
+    throw Error("Method not implemented")
+}
+aaa()

go.mod

@@ -11,7 +11,7 @@ require (
 	github.com/pkg/errors v0.9.1
 	github.com/stretchr/testify v1.11.1
 	go.uber.org/zap v1.27.0
-	gopkg.d7z.net/middleware v0.0.0-20251114092249-67753b883a45
+	gopkg.d7z.net/middleware v0.0.0-20251114145539-bb74bd940f32
 	gopkg.in/yaml.v3 v3.0.1
 )
 

go.sum

@@ -195,6 +195,12 @@ gopkg.d7z.net/middleware v0.0.0-20251113064153-9f946bf959f5 h1:RwEXivoUP8qEbKxRW
 gopkg.d7z.net/middleware v0.0.0-20251113064153-9f946bf959f5/go.mod h1:BJ8ySXqmlBpM9B2zFJfmvYQ61XPA+G0O1VDmYomxyrM=
 gopkg.d7z.net/middleware v0.0.0-20251114092249-67753b883a45 h1:ujyhl4Di/z6fGOcIAqydzRQNwI13F9JD3xj8+s+rTVM=
 gopkg.d7z.net/middleware v0.0.0-20251114092249-67753b883a45/go.mod h1:BJ8ySXqmlBpM9B2zFJfmvYQ61XPA+G0O1VDmYomxyrM=
+gopkg.d7z.net/middleware v0.0.0-20251114132513-93389190aeca h1:5RUUXCIUFBMNvCXiYNDdcEu27HeNr3mfH7MRKS1ftdo=
+gopkg.d7z.net/middleware v0.0.0-20251114132513-93389190aeca/go.mod h1:/1/EuissKhUbuhUe01rcWuwpA5mt7jASb4uKVNOLtR8=
+gopkg.d7z.net/middleware v0.0.0-20251114144707-95f41bfca5bc h1:mPcaskQN8j32dI59txtCAFVIKUb427bh7sXS9adv2jM=
+gopkg.d7z.net/middleware v0.0.0-20251114144707-95f41bfca5bc/go.mod h1:/1/EuissKhUbuhUe01rcWuwpA5mt7jASb4uKVNOLtR8=
+gopkg.d7z.net/middleware v0.0.0-20251114145539-bb74bd940f32 h1:3JvqnWFLWzAoS57vLBT1LVePO3RqR32ijM3ZyjyoqyY=
+gopkg.d7z.net/middleware v0.0.0-20251114145539-bb74bd940f32/go.mod h1:/1/EuissKhUbuhUe01rcWuwpA5mt7jASb4uKVNOLtR8=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=

pkg/core/backend.go

@@ -19,5 +19,5 @@ type Backend interface {
 	// Branches return branch + commit id
 	Branches(ctx context.Context, owner, repo string) (map[string]*BranchInfo, error)
 	// Open return file or error (error)
-	Open(ctx context.Context, client *http.Client, owner, repo, commit, path string, headers http.Header) (*http.Response, error)
+	Open(ctx context.Context, owner, repo, commit, path string, headers http.Header) (*http.Response, error)
 }