chore: update go module, readme

chore: expose default logger
chore: add ctx alias method
2024-08-27 14:39:24 +08:00 · 2024-08-12 16:14:16 +08:00 · 2024-07-25 17:23:53 +08:00 · 2024-07-17 23:00:45 +08:00 · 2024-07-17 18:07:10 +08:00 · 2024-07-14 21:17:40 +08:00
16 changed files with 341 additions and 159 deletions
--- a/.github/workflows/nfctl.yml
+++ b/.github/workflows/nfctl.yml
@ -0,0 +1,62 @@
+name: Auto Build
+on:
+  push:
+    branches:
+      - 'release/nfctl/*'
+
+env:
+  RELEASE_VERSION: v24.07.14-r3
+
+jobs:
+  build-job:
+    runs-on: ubuntu-latest
+    permissions:
+      id-token: write
+      contents: write
+      pull-requests: write
+      repository-projects: write
+    steps:
+      - name: checkout repository
+        uses: actions/checkout@v4
+
+      - name: install golang
+        uses: actions/setup-go@v4
+        with:
+          go-version: '1.20'
+
+      - name: build linux amd64
+        run: CGO_ENABLE=0 GOOS=linux GOARCH=amd64 go build -ldflags='-s -w' -o "dist/nfctl-linux_amd64-${{ env.RELEASE_VERSION }}" nft/nfctl/main.go
+
+      - name: build linux arm64
+        run: CGO_ENABLE=0 GOOS=linux GOARCH=arm64 go build -ldflags='-s -w' -o "dist/nfctl-linux_arm64-${{ env.RELEASE_VERSION }}" nft/nfctl/main.go
+
+      - name: build windows amd64
+        run: CGO_ENABLE=0 GOOS=windows GOARCH=amd64 go build -ldflags='-s -w' -o "dist/nfctl-win_amd64-${{ env.RELEASE_VERSION }}.exe" nft/nfctl/main.go
+
+      - name: build windows arm64
+        run: CGO_ENABLE=0 GOOS=windows GOARCH=arm64 go build -ldflags='-s -w' -o "dist/nfctl-win_arm64-${{ env.RELEASE_VERSION }}.exe" nft/nfctl/main.go
+
+      - name: build darwin amd64
+        run: CGO_ENABLE=0 GOOS=darwin GOARCH=amd64 go build -ldflags='-s -w' -o "dist/nfctl-darwin_amd64-${{ env.RELEASE_VERSION }}" nft/nfctl/main.go
+
+      - name: build darwin arm64
+        run: CGO_ENABLE=0 GOOS=darwin GOARCH=arm64 go build -ldflags='-s -w' -o "dist/nfctl-darwin_arm64-${{ env.RELEASE_VERSION }}" nft/nfctl/main.go
+
+      - name: show all builds
+        run: ls -lash dist
+
+      - name: create releases
+        id: create_releases
+        uses: "marvinpinto/action-automatic-releases@latest"
+        with:
+          automatic_release_tag: "Release-nfctl-${{ env.RELEASE_VERSION }}"
+          repo_token: "${{ secrets.GITHUB_TOKEN }}"
+          title: "Release_${{ env.RELEASE_VERSION }}"
+          prerelease: false
+          files: |
+            dist/nfctl-linux_amd64-${{ env.RELEASE_VERSION }}
+            dist/nfctl-linux_arm64-${{ env.RELEASE_VERSION }}
+            dist/nfctl-win_amd64-${{ env.RELEASE_VERSION }}.exe
+            dist/nfctl-win_arm64-${{ env.RELEASE_VERSION }}.exe
+            dist/nfctl-darwin_amd64-${{ env.RELEASE_VERSION }}
+            dist/nfctl-darwin_arm64-${{ env.RELEASE_VERSION }}
--- a/ctx.go
+++ b/ctx.go
@ -2,9 +2,11 @@ package nf

 import (
 	"bytes"
+	"context"
 	"encoding/json"
 	"errors"
 	"fmt"
+	"github.com/google/uuid"
 	"github.com/loveuer/nf/internal/sse"
 	"io"
 	"mime/multipart"
@ -38,12 +40,21 @@ type Ctx struct {

 func newContext(app *App, writer http.ResponseWriter, request *http.Request) *Ctx {

-	skippedNodes := make([]skippedNode, 0, app.maxSections)
-	v := make(Params, 0, app.maxParams)
+	var (
+		traceId      string
+		skippedNodes = make([]skippedNode, 0, app.maxSections)
+		v            = make(Params, 0, app.maxParams)
+	)
+
+	if traceId = request.Header.Get(TraceKey); traceId == "" {
+		traceId = uuid.Must(uuid.NewV7()).String()
+	}
+
+	c := context.WithValue(request.Context(), TraceKey, traceId)

 	ctx := &Ctx{
 		lock:       sync.Mutex{},
-		Request:    request,
+		Request:    request.WithContext(c),
 		path:       request.URL.Path,
 		method:     request.Method,
 		StatusCode: 200,
@ -63,6 +74,7 @@ func newContext(app *App, writer http.ResponseWriter, request *http.Request) *Ct
 	}

 	ctx.Writer = &ctx.writermem
+	ctx.writermem.Header().Set(TraceKey, traceId)

 	return ctx
 }
@ -112,6 +124,10 @@ func (c *Ctx) Cookies(key string, defaultValue ...string) string {
 	return cookie.Value
 }

+func (c *Ctx) Context() context.Context {
+	return c.Request.Context()
+}
+
 func (c *Ctx) Next() error {
 	c.index++

@ -273,23 +289,30 @@ func (c *Ctx) Status(code int) *Ctx {
 	c.lock.Lock()
 	defer c.lock.Unlock()

-	c.writermem.WriteHeader(code)
+	c.Writer.WriteHeader(code)
 	c.StatusCode = c.writermem.status

 	return c
 }

+// Set set response header
 func (c *Ctx) Set(key string, value string) {
-	c.writermem.Header().Set(key, value)
+	c.Writer.Header().Set(key, value)
 }

+// AddHeader add response header
+func (c *Ctx) AddHeader(key string, value string) {
+	c.Writer.Header().Add(key, value)
+}
+
+// SetHeader set response header
 func (c *Ctx) SetHeader(key string, value string) {
-	c.writermem.Header().Set(key, value)
+	c.Writer.Header().Set(key, value)
 }

 func (c *Ctx) SendStatus(code int) error {
 	c.Status(code)
-	c.writermem.WriteHeaderNow()
+	c.Writer.WriteHeaderNow()
 	return nil
 }

@ -307,7 +330,7 @@ func (c *Ctx) Writef(format string, values ...interface{}) (int, error) {
 func (c *Ctx) JSON(data interface{}) error {
 	c.SetHeader("Content-Type", MIMEApplicationJSON)

-	encoder := json.NewEncoder(&c.writermem)
+	encoder := json.NewEncoder(c.Writer)

 	if err := encoder.Encode(data); err != nil {
 		return err
@ -340,5 +363,5 @@ func (c *Ctx) HTML(html string) error {
 }

 func (c *Ctx) Write(data []byte) (int, error) {
-	return c.writermem.Write(data)
+	return c.Writer.Write(data)
 }
--- a/go.mod
+++ b/go.mod
@ -4,9 +4,9 @@ go 1.20

 require (
 	github.com/fatih/color v1.17.0
-	github.com/go-git/go-billy/v5 v5.5.0
 	github.com/go-git/go-git/v5 v5.12.0
 	github.com/google/uuid v1.6.0
+	github.com/savioxavier/termlink v1.3.0
 	github.com/spf13/cobra v1.8.1
 )

@ -18,6 +18,7 @@ require (
 	github.com/cyphar/filepath-securejoin v0.2.4 // indirect
 	github.com/emirpasic/gods v1.18.1 // indirect
 	github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
+	github.com/go-git/go-billy/v5 v5.5.0 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
@ -25,15 +26,14 @@ require (
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/pjbgf/sha1cd v0.3.0 // indirect
-	github.com/savioxavier/termlink v1.3.0 // indirect
 	github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
 	github.com/skeema/knownhosts v1.2.2 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/xanzy/ssh-agent v0.3.3 // indirect
-	golang.org/x/crypto v0.21.0 // indirect
+	golang.org/x/crypto v0.23.0 // indirect
 	golang.org/x/mod v0.12.0 // indirect
-	golang.org/x/net v0.22.0 // indirect
-	golang.org/x/sys v0.18.0 // indirect
+	golang.org/x/net v0.25.0 // indirect
+	golang.org/x/sys v0.20.0 // indirect
 	golang.org/x/tools v0.13.0 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 )
--- a/go.sum
+++ b/go.sum
@ -83,8 +83,8 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y
 golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
 golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
-golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA=
-golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
+golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI=
+golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc=
@ -96,8 +96,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug
 golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
 golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
-golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc=
-golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
+golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac=
+golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@ -116,14 +116,14 @@ golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
-golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
+golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
-golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8=
+golang.org/x/term v0.20.0 h1:VnkxpohqXaOBYJtBmEppKUG6mXpi+4O6purfc2+sMhw=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
@ -131,7 +131,7 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
-golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
+golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
--- a/middleware.go
+++ b/middleware.go
@ -2,11 +2,9 @@ package nf

 import (
 	"fmt"
-	"github.com/google/uuid"
 	"github.com/loveuer/nf/nft/log"
 	"os"
 	"runtime/debug"
-	"strings"
 	"time"
 )

@ -29,33 +27,19 @@ func NewRecover(enableStackTrace bool) HandlerFunc {
 	}
 }

-func NewLogger(traceHeader ...string) HandlerFunc {
-	Header := "X-Trace-ID"
-	if len(traceHeader) > 0 && traceHeader[0] != "" {
-		Header = traceHeader[0]
-	}
+func NewLogger() HandlerFunc {

 	return func(c *Ctx) error {
 		var (
 			now   = time.Now()
-			trace = c.Get(Header)
 			logFn func(msg string, data ...any)
 			ip    = c.IP()
 		)

-		if trace == "" {
-			trace = uuid.Must(uuid.NewV7()).String()
-		}
-
-		c.SetHeader(Header, trace)
-
-		traces := strings.Split(trace, "-")
-		shortTrace := traces[len(traces)-1]
-
 		err := c.Next()
 		duration := time.Since(now)

-		msg := fmt.Sprintf("NF | %s | %15s | %3d | %s | %6s | %s", shortTrace, ip, c.StatusCode, HumanDuration(duration.Nanoseconds()), c.Method(), c.Path())
+		msg := fmt.Sprintf("NF | %v | %15s | %3d | %s | %6s | %s", c.Context().Value(TraceKey), ip, c.StatusCode, HumanDuration(duration.Nanoseconds()), c.Method(), c.Path())

 		switch {
 		case c.StatusCode >= 500:
--- a/nf.go
+++ b/nf.go
@ -1,10 +1,11 @@
 package nf

 const (
-	banner = "  _  _     _     ___                 _ \n | \\| |___| |_  | __|__ _  _ _ _  __| |\n | .` / _ \\  _| | _/ _ \\ || | ' \\/ _` |\n |_|\\_\\___/\\__| |_|\\___/\\_,_|_||_\\__,_|\n "
-	_404   = "<!doctype html><html lang=\"en\"><head><meta charset=\"UTF-8\"><meta name=\"viewport\" content=\"width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1\"><meta http-equiv=\"X-UA-Compatible\" content=\"ie=edge\"><title>Not Found</title><style>body{background:#333;margin:0;color:#ccc;display:flex;align-items:center;max-height:100vh;height:100vh;justify-content:center}textarea{min-height:5rem;min-width:20rem;text-align:center;border:none;background:0 0;color:#ccc;resize:none;user-input:none;user-select:none;cursor:default;-webkit-user-select:none;-webkit-touch-callout:none;-moz-user-select:none;-ms-user-select:none;outline:0}</style></head><body><textarea id=\"banner\" readonly=\"readonly\"></textarea><script type=\"text/javascript\">let htmlCodes = [\n    ' _  _     _     ___                 _ ',\n    '| \\\\| |___| |_  | __|__ _  _ _ _  __| |',\n    '| .` / _ \\\\  _| | _/ _ \\\\ || | \\' \\\\/ _` |',\n    '|_|\\\\_\\\\___/\\\\__| |_|\\\\___/\\\\_,_|_||_\\\\__,_|'\n].join('\\n');\ndocument.querySelector('#banner').value = htmlCodes</script></body></html>"
-	_405   = `405 Method Not Allowed`
-	_500   = `500 Internal Server Error`
+	banner   = "  _  _     _     ___                 _ \n | \\| |___| |_  | __|__ _  _ _ _  __| |\n | .` / _ \\  _| | _/ _ \\ || | ' \\/ _` |\n |_|\\_\\___/\\__| |_|\\___/\\_,_|_||_\\__,_|\n "
+	_404     = "<!doctype html><html lang=\"en\"><head><meta charset=\"UTF-8\"><meta name=\"viewport\" content=\"width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1\"><meta http-equiv=\"X-UA-Compatible\" content=\"ie=edge\"><title>Not Found</title><style>body{background:#333;margin:0;color:#ccc;display:flex;align-items:center;max-height:100vh;height:100vh;justify-content:center}textarea{min-height:5rem;min-width:20rem;text-align:center;border:none;background:0 0;color:#ccc;resize:none;user-input:none;user-select:none;cursor:default;-webkit-user-select:none;-webkit-touch-callout:none;-moz-user-select:none;-ms-user-select:none;outline:0}</style></head><body><textarea id=\"banner\" readonly=\"readonly\"></textarea><script type=\"text/javascript\">let htmlCodes = [\n    ' _  _     _     ___                 _ ',\n    '| \\\\| |___| |_  | __|__ _  _ _ _  __| |',\n    '| .` / _ \\\\  _| | _/ _ \\\\ || | \\' \\\\/ _` |',\n    '|_|\\\\_\\\\___/\\\\__| |_|\\\\___/\\\\_,_|_||_\\\\__,_|'\n].join('\\n');\ndocument.querySelector('#banner').value = htmlCodes</script></body></html>"
+	_405     = `405 Method Not Allowed`
+	_500     = `500 Internal Server Error`
+	TraceKey = "X-Trace-Id"
 )

 type Map map[string]interface{}
--- a/nft/log/default.go
+++ b/nft/log/default.go
@ -21,7 +21,7 @@ var (
 		os.Exit(1)
 	}

-	defaultLogger = &logger{
+	DefaultLogger = &logger{
 		Mutex:      sync.Mutex{},
 		timeFormat: "2006-01-02T15:04:05",
 		writer:     os.Stdout,
@ -36,32 +36,32 @@ var (
 )

 func SetTimeFormat(format string) {
-	defaultLogger.SetTimeFormat(format)
+	DefaultLogger.SetTimeFormat(format)
 }

 func SetLogLevel(level LogLevel) {
-	defaultLogger.SetLogLevel(level)
+	DefaultLogger.SetLogLevel(level)
 }

 func Debug(msg string, data ...any) {
-	defaultLogger.Debug(msg, data...)
+	DefaultLogger.Debug(msg, data...)
 }
 func Info(msg string, data ...any) {
-	defaultLogger.Info(msg, data...)
+	DefaultLogger.Info(msg, data...)
 }

 func Warn(msg string, data ...any) {
-	defaultLogger.Warn(msg, data...)
+	DefaultLogger.Warn(msg, data...)
 }

 func Error(msg string, data ...any) {
-	defaultLogger.Error(msg, data...)
+	DefaultLogger.Error(msg, data...)
 }

 func Panic(msg string, data ...any) {
-	defaultLogger.Panic(msg, data...)
+	DefaultLogger.Panic(msg, data...)
 }

 func Fatal(msg string, data ...any) {
-	defaultLogger.Fatal(msg, data...)
+	DefaultLogger.Fatal(msg, data...)
 }
--- a/nft/nfctl/cmd/check.go
+++ b/nft/nfctl/cmd/check.go
@ -0,0 +1,16 @@
+package cmd
+
+import (
+	"github.com/loveuer/nf/nft/nfctl/version"
+	"github.com/spf13/cobra"
+)
+
+var (
+	checkCmd = &cobra.Command{
+		Use:   "check",
+		Short: "nfctl new version check",
+		Run: func(cmd *cobra.Command, args []string) {
+			version.Check(true, true, 30)
+		},
+	}
+)
--- a/nft/nfctl/cmd/cmd.go
+++ b/nft/nfctl/cmd/cmd.go
@ -1,19 +1,30 @@
 package cmd

-import "github.com/spf13/cobra"
+import (
+	"github.com/loveuer/nf/nft/log"
+	"github.com/loveuer/nf/nft/nfctl/opt"
+	"github.com/spf13/cobra"
+)

 var (
 	Root = &cobra.Command{
 		Use:   "nfctl",
 		Short: "nfctl: easy start your nf backend work",
+		PersistentPreRun: func(cmd *cobra.Command, args []string) {
+			if opt.Debug == true {
+				log.SetLogLevel(log.LogLevelDebug)
+			}
+		},
 	}
 )

 func init() {
 	initNew()
+	Root.PersistentFlags().BoolVar(&opt.Debug, "debug", false, "debug mode")

 	Root.AddCommand(
 		versionCmd,
+		checkCmd,
 		cmdNew,
 	)
 }
--- a/nft/nfctl/cmd/new.go
+++ b/nft/nfctl/cmd/new.go
@ -7,6 +7,7 @@ import (
 	"github.com/loveuer/nf/nft/nfctl/clone"
 	"github.com/loveuer/nf/nft/nfctl/opt"
 	"github.com/loveuer/nf/nft/nfctl/tp"
+	"github.com/loveuer/nf/nft/nfctl/version"
 	"github.com/spf13/cobra"
 	"net/url"
 	"os"
@ -33,14 +34,11 @@ nfctl new {project} --template http://username:token@my.gitlab.com/my-zone/my-re
 )

 func initNew() {
-	cmdNew.Flags().BoolVar(&opt.Debug, "debug", false, "debug mode")
 	cmdNew.Flags().StringVarP(&template, "template", "t", "", "template name/url[example:ultone, https://github.com/xxx/yyy.git]")
 	cmdNew.Flags().BoolVar(&disableInit, "without-init", false, "don't run template init script")

 	cmdNew.RunE = func(cmd *cobra.Command, args []string) error {
-		if opt.Debug {
-			log.SetLogLevel(log.LogLevelDebug)
-		}
+		version.Check(true, false, 5)

 		var (
 			err        error
@ -126,6 +124,8 @@ func initNew() {
 			log.Warn("remove .git folder err: %s", err.Error())
 		}

+		log.Info("🎉 create project [%s] 成功!!!", args[0])
+
 		return nil
 	}
 }
--- a/nft/nfctl/cmd/version.go
+++ b/nft/nfctl/cmd/version.go
@ -1,7 +1,7 @@
 package cmd

 import (
-	"github.com/loveuer/nf/nft/log"
+	"github.com/fatih/color"
 	"github.com/loveuer/nf/nft/nfctl/version"
 	"github.com/spf13/cobra"
 )
@ -11,7 +11,8 @@ var (
 		Use:   "version",
 		Short: "print nfctl version and exit",
 		Run: func(cmd *cobra.Command, args []string) {
-			log.Info("version: %s", version.Version)
+			color.Cyan("nfctl - version: %s", version.Version)
+			version.Check(true, false, 5)
 		},
 	}
 )
--- a/nft/nfctl/main.go
+++ b/nft/nfctl/main.go
@ -3,7 +3,6 @@ package main
 import (
 	"context"
 	"github.com/loveuer/nf/nft/nfctl/cmd"
-	"github.com/loveuer/nf/nft/nfctl/version"
 	"os/signal"
 	"syscall"
 )
@ -12,8 +11,9 @@ func main() {
 	ctx, cancel := signal.NotifyContext(context.Background(), syscall.SIGHUP, syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT)
 	defer cancel()

-	version.Check()
-	defer version.Fn()
+	//if !(len(os.Args) >= 2 && os.Args[1] == "version") {
+	//	version.Check(5)
+	//}

 	_ = cmd.Root.ExecuteContext(ctx)
 }
--- a/nft/nfctl/version/var.go
+++ b/nft/nfctl/version/var.go
@ -0,0 +1,3 @@
+package version
+
+const Version = "v24.07.14-r3"
--- a/nft/nfctl/version/version.go
+++ b/nft/nfctl/version/version.go
@ -1,66 +1,95 @@
 package version

 import (
-	"bufio"
+	"crypto/tls"
 	"fmt"
 	"github.com/fatih/color"
 	"github.com/loveuer/nf/nft/log"
 	"github.com/savioxavier/termlink"
+	"io"
 	"net/http"
 	"strings"
-	"sync"
+	"time"
 )

-const Version = "v24.07.12-r1"
-
 var (
-	lk      = &sync.Mutex{}
-	empty   = func() {}
-	upgrade = func(v string) func() {
-		return func() {
-			color.Green("\n🎉 🎉 🎉 [nfctl] New Version Found: %s", v)
-			color.Cyan("Upgrade it with: [go install github.com/loveuer/nf/nft/nfctl@latest]")
-			fmt.Print("Or Download by: ")
-			color.Cyan(termlink.Link("Releases", "https://github.com/loveuer/nf/releases"))
-			fmt.Println()
-		}
-	}
-	Fn = empty
+	uri    = "https://raw.gitcode.com/loveuer/nf/raw/master/nft/nfctl/version/var.go"
+	prefix = "const Version = "
 )

-func Check() {
-	ready := make(chan struct{})
-	go func() {
-		ready <- struct{}{}
-		uri := "https://raw.gitcode.com/loveuer/nf/raw/master/nft/nfctl/version/version.go"
-		prefix := "const Version = "
-		resp, err := http.Get(uri)
-		if err != nil {
-			log.Debug("[Check] http get[%s] err: %v", uri, err.Error())
-			return
+func UpgradePrint(newVersion string) {
+	fmt.Printf(`+----------------------------------------------------------------------+
+|          🎉 🎉 🎉 %s 🎉 🎉 🎉          |
+| %s |
+| Or Download by:                                                      |
+| %s                    |
+| %s                   |
+----------------------------------------------------------------------+
+`,
+		color.GreenString("New Version Found: %s", newVersion),
+		color.CyanString("Upgrade it with: [go install github.com/loveuer/nf/nft/nfctl@master]"),
+		color.CyanString(termlink.Link("Releases", "https://github.com/loveuer/nf/releases")),
+		color.CyanString(termlink.Link("Releases", "https://gitcode.com/loveuer/nf/releases")),
+	)
+}
+
+func Check(printUpgradable bool, printNoNeedUpgrade bool, timeouts ...int) string {
+	var (
+		v string
+	)
+
+	defer func() {
+		if printUpgradable {
+			if v > Version {
+				UpgradePrint(v)
+			}
 		}
-		defer resp.Body.Close()

-		scanner := bufio.NewScanner(resp.Body)
-		scanner.Buffer(make([]byte, 16*1024), 1024*1024)
-
-		for scanner.Scan() {
-			line := scanner.Text()
-			log.Debug("[Check] version.go line: %s", line)
-			if strings.HasPrefix(line, prefix) {
-				v := strings.TrimPrefix(line, prefix)
-				if len(v) > 2 {
-					v = v[1 : len(v)-1]
-				}
-
-				if v != "" && v > Version {
-					lk.Lock()
-					Fn = upgrade(v)
-					lk.Unlock()
-					return
-				}
+		if printNoNeedUpgrade {
+			if v == Version {
+				color.Cyan("Your Version: %s is Newest", Version)
 			}
 		}
 	}()
-	<-ready
+
+	timeout := time.Duration(30) * time.Second
+	if len(timeouts) > 0 && timeouts[0] > 0 {
+		timeout = time.Duration(timeouts[0]) * time.Second
+	}
+
+	req, _ := http.NewRequest(http.MethodGet, uri, nil)
+	resp, err := (&http.Client{
+		Timeout: timeout,
+		Transport: &http.Transport{
+			TLSClientConfig: &tls.Config{
+				InsecureSkipVerify: true,
+			},
+		},
+	}).Do(req)
+	if err != nil {
+		log.Debug("[Check] http get[%s] err: %v", uri, err.Error())
+		return ""
+	}
+	defer resp.Body.Close()
+
+	content, err := io.ReadAll(resp.Body)
+	if err != nil {
+		log.Debug("[Check] http read all body err: %v", err)
+	}
+
+	log.Debug("[Check] http get[%s] body:\n%s", uri, string(content))
+
+	for _, line := range strings.Split(string(content), "\n") {
+		log.Debug("[Check] version.go line: %s", line)
+		if strings.HasPrefix(line, prefix) {
+			may := strings.TrimPrefix(line, prefix)
+			if len(may) > 2 {
+				v = may[1 : len(may)-1]
+			}
+
+			return v
+		}
+	}
+
+	return ""
 }
--- a/nft/nfctl/version/version_test.go
+++ b/nft/nfctl/version/version_test.go
@ -0,0 +1,17 @@
+package version
+
+import (
+	"github.com/loveuer/nf/nft/log"
+	"testing"
+)
+
+func TestUpgradePrint(t *testing.T) {
+	log.SetLogLevel(log.LogLevelDebug)
+	UpgradePrint("v24.07.14-r5")
+}
+
+func TestCheck(t *testing.T) {
+	log.SetLogLevel(log.LogLevelDebug)
+	v := Check(true, true, 1)
+	t.Logf("got version: %s", v)
+}
--- a/readme.md
+++ b/readme.md
@ -5,63 +5,98 @@
 ##### basic usage

 - get param
-```go
-func main() {
-    app := nf.New()

-    app.Get("/hello/:name", func(c *nf.Ctx) error {
-        name := c.Param("name")
-        return c.JSON(nf.Map{"status": 200, "data": "hello, " + name})
-    })
+  ```go
+  func main() {
+      app := nf.New()

-    log.Fatal(app.Run("0.0.0.0:80"))
-}
-```
+      app.Get("/hello/:name", func(c *nf.Ctx) error {
+          name := c.Param("name")
+          return c.JSON(nf.Map{"status": 200, "data": "hello, " + name})
+      })
+
+      log.Fatal(app.Run("0.0.0.0:80"))
+  }
+  ```

 - parse request query
-```go
-func handleQuery(c *nf.Ctx) error {
-    type Req struct {
-        Name string   `query:"name"`
-        Addr []string `query:"addr"`
-    }

-    var (
-        err error
-        req = Req{}
-    )
+  ```go
+  func handleQuery(c *nf.Ctx) error {
+      type Req struct {
+          Name string   `query:"name"`
+          Addr []string `query:"addr"`
+      }

-    if err = c.QueryParser(&req); err != nil {
-        return nf.NewNFError(400, err.Error())
-	}
+      var (
+          err error
+          req = Req{}
+      )

-    return c.JSON(nf.Map{"query": req})
-}
-```
+      if err = c.QueryParser(&req); err != nil {
+          return nf.NewNFError(400, err.Error())
+      }
+
+      return c.JSON(nf.Map{"query": req})
+  }
+  ```

 - parse application/json body
-```go
-func handlePost(c *nf.Ctx) error {
-    type Req struct {
-        Name string   `json:"name"`
-        Addr []string `json:"addr"`
-    }

-    var (
-        err error
-        req = Req{}
-        reqMap = make(map[string]interface{})
-    )
+  ```go
+  func handlePost(c *nf.Ctx) error {
+      type Req struct {
+          Name string   `json:"name"`
+          Addr []string `json:"addr"`
+      }

-    if err = c.BodyParser(&req); err != nil {
-        return nf.NewNFError(400, err.Error())
-    }
+      var (
+          err error
+          req = Req{}
+          reqMap = make(map[string]interface{})
+      )

-    // can parse body multi times
-    if err = c.BodyParser(&reqMap); err != nil {
-        return nf.NewNFError(400, err.Error())
-    }
+      if err = c.BodyParser(&req); err != nil {
+          return nf.NewNFError(400, err.Error())
+      }

-    return c.JSON(nf.Map{"struct": req, "map": reqMap})
-}
-```
+      // can parse body multi times
+      if err = c.BodyParser(&reqMap); err != nil {
+          return nf.NewNFError(400, err.Error())
+      }
+
+      return c.JSON(nf.Map{"struct": req, "map": reqMap})
+  }
+  ```
+
+- pass local value
+
+  ```go
+  type User struct {
+      Id int
+      Username string
+  }
+
+  func main() {
+      app := nf.New()
+      app.Use(auth())
+
+      app.Get("/item/list", list)
+  }
+
+  func auth() nf.HandlerFunc {
+      return func(c *nf.Ctx) error {
+          c.Locals("user", &User{Id: 1, Username:"user"})
+          return c.Next()
+      }
+  }
+
+  func list(c *nf.Ctx) error {
+      user, ok := c.Locals("user").(*User)
+      if !ok {
+          return c.Status(401).SendString("login required")
+      }
+
+      ...
+  }
+  ```
Author	SHA1	Message	Date
zhaoyupeng	940e86bd8d	chore: update go module, readme	2024-08-27 14:39:24 +08:00
loveuer	5263cba44a	chore: expose default logger chore: add ctx alias method	2024-08-12 16:14:16 +08:00
loveuer	63f7516667	fix: c.Writer	2024-07-25 17:23:53 +08:00
loveuer	9b7f1e4413	chore: X-Trace-Id fix req context trace id; default logger with trace-id ci: fix nfctl run	2024-07-17 23:00:45 +08:00
loveuer	e4a6228b0a	feat: add trace_id to context	2024-07-17 18:07:10 +08:00
loveuer	fb97d6e811	style: nfctl new version print	2024-07-14 21:17:40 +08:00
loveuer	f2a73056c8	fix: github action	2024-07-14 17:49:43 +08:00
loveuer	52ec9a0686	chore: nfctl version, check cmd	2024-07-14 17:26:48 +08:00
loveuer	cbb959a31e	chore: add github workflow to build nfctl	2024-07-13 22:37:05 +08:00
loveuer	b267cc7a2e	style: cmd.new add success tip	2024-07-12 16:33:35 +08:00