loveuer/nf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: loveuer:Release-nfctl-v24.07.14-r2
Branches Tags
loveuer:master loveuer:dev
loveuer:v0.3.1 loveuer:v0.3.0 loveuer:v0.2.12 loveuer:Release-nfctl-v24.09.23-r1 loveuer:v0.2.11 loveuer:v0.2.10 loveuer:v0.2.9 loveuer:v0.2.8 loveuer:v0.2.7 loveuer:v0.2.6 loveuer:Release-nfctl-v24.07.14-r3 loveuer:Release-nfctl-v24.07.14-r2 loveuer:Release-nfctl-v24.07.14-r1 loveuer:Release-nfctl-v24.07.13-r1 loveuer:Release-nfctl-$RELEASE_VERSION loveuer:v0.2.5 loveuer:v0.2.4 loveuer:v0.2.3 loveuer:v0.2.2 loveuer:v0.2.1 loveuer:v0.2.0 loveuer:v0.1.7 loveuer:v0.1.6 loveuer:v0.1.5 loveuer:v0.1.4 loveuer:v0.1.3 loveuer:v0.1.2 loveuer:v0.1.1 loveuer:v0.1.0 loveuer:v0.0.9 loveuer:v0.0.8 loveuer:v0.0.7 loveuer:v0.0.6 loveuer:v0.0.5 loveuer:v0.0.4 loveuer:v0.0.3 loveuer:v0.0.2 loveuer:v0.0.1
...
compare: loveuer:v0.3.0
Branches Tags
loveuer:master loveuer:dev
loveuer:v0.3.1 loveuer:v0.3.0 loveuer:v0.2.12 loveuer:Release-nfctl-v24.09.23-r1 loveuer:v0.2.11 loveuer:v0.2.10 loveuer:v0.2.9 loveuer:v0.2.8 loveuer:v0.2.7 loveuer:v0.2.6 loveuer:Release-nfctl-v24.07.14-r3 loveuer:Release-nfctl-v24.07.14-r2 loveuer:Release-nfctl-v24.07.14-r1 loveuer:Release-nfctl-v24.07.13-r1 loveuer:Release-nfctl-$RELEASE_VERSION loveuer:v0.2.5 loveuer:v0.2.4 loveuer:v0.2.3 loveuer:v0.2.2 loveuer:v0.2.1 loveuer:v0.2.0 loveuer:v0.1.7 loveuer:v0.1.6 loveuer:v0.1.5 loveuer:v0.1.4 loveuer:v0.1.3 loveuer:v0.1.2 loveuer:v0.1.1 loveuer:v0.1.0 loveuer:v0.0.9 loveuer:v0.0.8 loveuer:v0.0.7 loveuer:v0.0.6 loveuer:v0.0.5 loveuer:v0.0.4 loveuer:v0.0.3 loveuer:v0.0.2 loveuer:v0.0.1

10 Commits
Release-nf ... v0.3.0

Author SHA1 Message Date
loveuer
d8d771aec6 feat: allocate ctx by pool 2024-12-17 09:19:07 +08:00
loveuer
1e66a221e0 feat: add RenderHTML, Redirect 2024-10-25 10:23:52 +08:00
loveuer
df318682fa fix: nfctl new(project name include '/') 2024-09-22 20:50:19 -07:00
root
af1e58bce9 update: add resp 418 2024-09-19 01:43:05 -07:00
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
16 changed files with 285 additions and 209 deletions
Expand all files Collapse all files

4
.github/workflows/nfctl.yml vendored
View File

@ -2,10 +2,10 @@ name: Auto Build
on: on:
push: push:
branches: branches:
- 'master' - 'release/nfctl/*'
env: env:
RELEASE_VERSION: v24.07.14-r2 RELEASE_VERSION: v24.09.23-r1
jobs: jobs:
build-job: build-job:

39
app.go
View File

@ -5,13 +5,15 @@ import (
"crypto/tls" "crypto/tls"
"errors" "errors"
"fmt" "fmt"
"github.com/loveuer/nf/internal/bytesconv"
"io" "io"
"log" "log"
"net" "net"
"net/http" "net/http"
"path" "path"
"regexp" "regexp"
"sync"
"github.com/loveuer/nf/internal/bytesconv"
) )
var ( var (
@ -29,6 +31,8 @@ type App struct {
trees methodTrees trees methodTrees
pool *sync.Pool
maxParams uint16 maxParams uint16
maxSections uint16 maxSections uint16
@ -40,13 +44,34 @@ type App struct {
removeExtraSlash bool // false removeExtraSlash bool // false
} }
func (a *App) allocateContext() *Ctx {
var (
skippedNodes = make([]skippedNode, 0, a.maxSections)
v = make(Params, 0, a.maxParams)
)
ctx := Ctx{
lock: sync.Mutex{},
app: a,
index: -1,
locals: make(map[string]any),
handlers: make([]HandlerFunc, 0),
skippedNodes: &skippedNodes,
params: &v,
}
return &ctx
}
func (a *App) ServeHTTP(writer http.ResponseWriter, request *http.Request) { func (a *App) ServeHTTP(writer http.ResponseWriter, request *http.Request) {
var ( var (
err error err error
c = newContext(a, writer, request) c = a.pool.Get().(*Ctx)
nfe = new(Err) nfe = new(Err)
) )
c.reset(writer, request)
if err = c.verify(); err != nil { if err = c.verify(); err != nil {
if errors.As(err, nfe) { if errors.As(err, nfe) {
_ = c.Status(nfe.Status).SendString(nfe.Msg) _ = c.Status(nfe.Status).SendString(nfe.Msg)
@ -58,6 +83,8 @@ func (a *App) ServeHTTP(writer http.ResponseWriter, request *http.Request) {
} }
a.handleHTTPRequest(c) a.handleHTTPRequest(c)
a.pool.Put(c)
} }
func (a *App) run(ln net.Listener) error { func (a *App) run(ln net.Listener) error {
@ -137,9 +164,7 @@ func (a *App) addRoute(method, path string, handlers ...HandlerFunc) {
} }
func (a *App) handleHTTPRequest(c *Ctx) { func (a *App) handleHTTPRequest(c *Ctx) {
var ( var err error
err error
)
httpMethod := c.Request.Method httpMethod := c.Request.Method
rPath := c.Request.URL.Path rPath := c.Request.URL.Path
@ -263,7 +288,7 @@ func redirectFixedPath(c *Ctx, root *node, trailingSlash bool) bool {
func redirectRequest(c *Ctx) { func redirectRequest(c *Ctx) {
req := c.Request req := c.Request
//rPath := req.URL.Path // rPath := req.URL.Path
rURL := req.URL.String() rURL := req.URL.String()
code := http.StatusMovedPermanently // Permanent redirect, request with GET method code := http.StatusMovedPermanently // Permanent redirect, request with GET method
@ -271,7 +296,7 @@ func redirectRequest(c *Ctx) {
code = http.StatusTemporaryRedirect code = http.StatusTemporaryRedirect
} }
//debugPrint("redirecting request %d: %s --> %s", code, rPath, rURL) // debugPrint("redirecting request %d: %s --> %s", code, rPath, rURL)
http.Redirect(c.Writer, req, rURL, code) http.Redirect(c.Writer, req, rURL, code)
c.writermem.WriteHeaderNow() c.writermem.WriteHeaderNow()

100
ctx.go
View File

@ -2,21 +2,23 @@ package nf
import ( import (
"bytes" "bytes"
"context"
"encoding/json" "encoding/json"
"errors" "errors"
"fmt" "fmt"
"github.com/loveuer/nf/internal/sse" "html/template"
"io" "io"
"mime/multipart" "mime/multipart"
"net" "net"
"net/http" "net/http"
"strings" "strings"
"sync" "sync"
"github.com/google/uuid"
"github.com/loveuer/nf/internal/sse"
) )
var ( var forwardHeaders = []string{"CF-Connecting-IP", "X-Forwarded-For", "X-Real-Ip"}
forwardHeaders = []string{"CF-Connecting-IP", "X-Forwarded-For", "X-Real-Ip"}
)
type Ctx struct { type Ctx struct {
lock sync.Mutex lock sync.Mutex
@ -36,35 +38,29 @@ type Ctx struct {
fullPath string fullPath string
} }
func newContext(app *App, writer http.ResponseWriter, request *http.Request) *Ctx { func (c *Ctx) reset(w http.ResponseWriter, r *http.Request) {
traceId := r.Header.Get(TraceKey)
skippedNodes := make([]skippedNode, 0, app.maxSections) if traceId == "" {
v := make(Params, 0, app.maxParams) traceId = uuid.Must(uuid.NewV7()).String()
ctx := &Ctx{
lock: sync.Mutex{},
Request: request,
path: request.URL.Path,
method: request.Method,
StatusCode: 200,
app: app,
index: -1,
locals: map[string]interface{}{},
handlers: make([]HandlerFunc, 0),
skippedNodes: &skippedNodes,
params: &v,
} }
ctx.writermem = responseWriter{ c.writermem.reset(w)
ResponseWriter: writer,
size: -1, c.Request = r.WithContext(context.WithValue(r.Context(), TraceKey, traceId))
status: 0, c.Writer = &c.writermem
c.handlers = nil
c.index = -1
c.path = r.URL.Path
c.method = r.Method
c.StatusCode = 200
c.fullPath = ""
*c.params = (*c.params)[:0]
*c.skippedNodes = (*c.skippedNodes)[:0]
for key := range c.locals {
delete(c.locals, key)
} }
c.writermem.Header().Set(TraceKey, traceId)
ctx.Writer = &ctx.writermem
return ctx
} }
func (c *Ctx) Locals(key string, value ...interface{}) interface{} { func (c *Ctx) Locals(key string, value ...interface{}) interface{} {
@ -96,9 +92,7 @@ func (c *Ctx) Path(overWrite ...string) string {
} }
func (c *Ctx) Cookies(key string, defaultValue ...string) string { func (c *Ctx) Cookies(key string, defaultValue ...string) string {
var ( dv := ""
dv = ""
)
if len(defaultValue) > 0 { if len(defaultValue) > 0 {
dv = defaultValue[0] dv = defaultValue[0]
@ -112,6 +106,10 @@ func (c *Ctx) Cookies(key string, defaultValue ...string) string {
return cookie.Value return cookie.Value
} }
func (c *Ctx) Context() context.Context {
return c.Request.Context()
}
func (c *Ctx) Next() error { func (c *Ctx) Next() error {
c.index++ c.index++
@ -273,23 +271,30 @@ func (c *Ctx) Status(code int) *Ctx {
c.lock.Lock() c.lock.Lock()
defer c.lock.Unlock() defer c.lock.Unlock()
c.writermem.WriteHeader(code) c.Writer.WriteHeader(code)
c.StatusCode = c.writermem.status c.StatusCode = c.writermem.status
return c return c
} }
// Set set response header
func (c *Ctx) Set(key string, value string) { 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) { 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 { func (c *Ctx) SendStatus(code int) error {
c.Status(code) c.Status(code)
c.writermem.WriteHeaderNow() c.Writer.WriteHeaderNow()
return nil return nil
} }
@ -307,7 +312,7 @@ func (c *Ctx) Writef(format string, values ...interface{}) (int, error) {
func (c *Ctx) JSON(data interface{}) error { func (c *Ctx) JSON(data interface{}) error {
c.SetHeader("Content-Type", MIMEApplicationJSON) c.SetHeader("Content-Type", MIMEApplicationJSON)
encoder := json.NewEncoder(&c.writermem) encoder := json.NewEncoder(c.Writer)
if err := encoder.Encode(data); err != nil { if err := encoder.Encode(data); err != nil {
return err return err
@ -339,6 +344,21 @@ func (c *Ctx) HTML(html string) error {
return err return err
} }
func (c *Ctx) Write(data []byte) (int, error) { func (c *Ctx) RenderHTML(name, html string, obj any) error {
return c.writermem.Write(data) c.SetHeader("Content-Type", "text/html")
t, err := template.New(name).Parse(html)
if err != nil {
return err
}
return t.Execute(c.Writer, obj)
}
func (c *Ctx) Redirect(url string, code int) error {
http.Redirect(c.Writer, c.Request, url, code)
return nil
}
func (c *Ctx) Write(data []byte) (int, error) {
return c.Writer.Write(data)
} }

4
go.mod
View File

@ -5,9 +5,7 @@ go 1.20
require ( require (
github.com/fatih/color v1.17.0 github.com/fatih/color v1.17.0
github.com/go-git/go-git/v5 v5.12.0 github.com/go-git/go-git/v5 v5.12.0
github.com/go-resty/resty/v2 v2.13.1
github.com/google/uuid v1.6.0 github.com/google/uuid v1.6.0
github.com/jedib0t/go-pretty/v6 v6.5.9
github.com/savioxavier/termlink v1.3.0 github.com/savioxavier/termlink v1.3.0
github.com/spf13/cobra v1.8.1 github.com/spf13/cobra v1.8.1
) )
@ -27,9 +25,7 @@ require (
github.com/kevinburke/ssh_config v1.2.0 // indirect github.com/kevinburke/ssh_config v1.2.0 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mattn/go-runewidth v0.0.15 // indirect
github.com/pjbgf/sha1cd v0.3.0 // indirect github.com/pjbgf/sha1cd v0.3.0 // indirect
github.com/rivo/uniseg v0.2.0 // indirect
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
github.com/skeema/knownhosts v1.2.2 // indirect github.com/skeema/knownhosts v1.2.2 // indirect
github.com/spf13/pflag v1.0.5 // indirect github.com/spf13/pflag v1.0.5 // indirect

21
go.sum
View File

@ -30,8 +30,6 @@ github.com/go-git/go-billy/v5 v5.5.0/go.mod h1:hmexnoNsr2SJU1Ju67OaNz5ASJY3+sHgF
github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399 h1:eMje31YglSBqCdIqdhKBW8lokaMrL3uTkpGYlE2OOT4= github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399 h1:eMje31YglSBqCdIqdhKBW8lokaMrL3uTkpGYlE2OOT4=
github.com/go-git/go-git/v5 v5.12.0 h1:7Md+ndsjrzZxbddRDZjF14qK+NN56sy6wkqaVrjZtys= github.com/go-git/go-git/v5 v5.12.0 h1:7Md+ndsjrzZxbddRDZjF14qK+NN56sy6wkqaVrjZtys=
github.com/go-git/go-git/v5 v5.12.0/go.mod h1:FTM9VKtnI2m65hNI/TenDDDnUf2Q9FHnXYjuz9i5OEY= github.com/go-git/go-git/v5 v5.12.0/go.mod h1:FTM9VKtnI2m65hNI/TenDDDnUf2Q9FHnXYjuz9i5OEY=
github.com/go-resty/resty/v2 v2.13.1 h1:x+LHXBI2nMB1vqndymf26quycC4aggYJ7DECYbiz03g=
github.com/go-resty/resty/v2 v2.13.1/go.mod h1:GznXlLxkq6Nh4sU59rPmUw3VtgpO3aS96ORAI6Q7d+0=
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
@ -41,8 +39,6 @@ github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
github.com/jedib0t/go-pretty/v6 v6.5.9 h1:ACteMBRrrmm1gMsXe9PSTOClQ63IXDUt03H5U+UV8OU=
github.com/jedib0t/go-pretty/v6 v6.5.9/go.mod h1:zbn98qrYlh95FIhwwsbIip0LYpwSG8SUOScs+v9/t0E=
github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4= github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4=
github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
@ -55,8 +51,6 @@ github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovk
github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U=
github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI= github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI=
github.com/pjbgf/sha1cd v0.3.0 h1:4D5XXmUUBUl/xQ6IjCkEAbqXskkq/4O7LmGn0AqMDs4= github.com/pjbgf/sha1cd v0.3.0 h1:4D5XXmUUBUl/xQ6IjCkEAbqXskkq/4O7LmGn0AqMDs4=
github.com/pjbgf/sha1cd v0.3.0/go.mod h1:nZ1rrWOcGJ5uZgEEVL1VUM9iRQiZvWdbZjkKyFzPPsI= github.com/pjbgf/sha1cd v0.3.0/go.mod h1:nZ1rrWOcGJ5uZgEEVL1VUM9iRQiZvWdbZjkKyFzPPsI=
@ -64,8 +58,6 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
github.com/savioxavier/termlink v1.3.0 h1:3Gl4FzQjUyiHzmoEDfmWEhgIwDiJY4poOQHP+k8ReA4= github.com/savioxavier/termlink v1.3.0 h1:3Gl4FzQjUyiHzmoEDfmWEhgIwDiJY4poOQHP+k8ReA4=
@ -91,7 +83,6 @@ 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.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.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.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI= 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/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.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
@ -105,8 +96,6 @@ 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.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.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.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= 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/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-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@ -127,8 +116,6 @@ 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.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.5.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.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= 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/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-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
@ -136,10 +123,7 @@ golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuX
golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= 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.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
golang.org/x/term v0.20.0 h1:VnkxpohqXaOBYJtBmEppKUG6mXpi+4O6purfc2+sMhw= golang.org/x/term v0.20.0 h1:VnkxpohqXaOBYJtBmEppKUG6mXpi+4O6purfc2+sMhw=
golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= 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.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
@ -147,12 +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.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.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.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk=
golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= 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.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=

20
middleware.go
View File

@ -2,11 +2,9 @@ package nf
import ( import (
"fmt" "fmt"
"github.com/google/uuid"
"github.com/loveuer/nf/nft/log" "github.com/loveuer/nf/nft/log"
"os" "os"
"runtime/debug" "runtime/debug"
"strings"
"time" "time"
) )
@ -29,33 +27,19 @@ func NewRecover(enableStackTrace bool) HandlerFunc {
} }
} }
func NewLogger(traceHeader ...string) HandlerFunc { func NewLogger() HandlerFunc {
Header := "X-Trace-ID"
if len(traceHeader) > 0 && traceHeader[0] != "" {
Header = traceHeader[0]
}
return func(c *Ctx) error { return func(c *Ctx) error {
var ( var (
now = time.Now() now = time.Now()
trace = c.Get(Header)
logFn func(msg string, data ...any) logFn func(msg string, data ...any)
ip = c.IP() 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() err := c.Next()
duration := time.Since(now) 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 { switch {
case c.StatusCode >= 500: case c.StatusCode >= 500:

47
nf.go
View File

@ -1,10 +1,13 @@
package nf package nf
import "sync"
const ( const (
banner = " _ _ _ ___ _ \n | \\| |___| |_ | __|__ _ _ _ _ __| |\n | .` / _ \\ _| | _/ _ \\ || | ' \\/ _` |\n |_|\\_\\___/\\__| |_|\\___/\\_,_|_||_\\__,_|\n " 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>" _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` _405 = `405 Method Not Allowed`
_500 = `500 Internal Server Error` _500 = `500 Internal Server Error`
TraceKey = "X-Trace-Id"
) )
type Map map[string]interface{} type Map map[string]interface{}
@ -22,26 +25,24 @@ type Config struct {
DisableRecover bool `json:"-"` DisableRecover bool `json:"-"`
DisableHttpErrorLog bool `json:"-"` DisableHttpErrorLog bool `json:"-"`
//EnableNotImplementHandler bool `json:"-"` // EnableNotImplementHandler bool `json:"-"`
NotFoundHandler HandlerFunc `json:"-"` NotFoundHandler HandlerFunc `json:"-"`
MethodNotAllowedHandler HandlerFunc `json:"-"` MethodNotAllowedHandler HandlerFunc `json:"-"`
} }
var ( var defaultConfig = &Config{
defaultConfig = &Config{ BodyLimit: 4 * 1024 * 1024,
BodyLimit: 4 * 1024 * 1024, NotFoundHandler: func(c *Ctx) error {
NotFoundHandler: func(c *Ctx) error { c.Set("Content-Type", MIMETextHTML)
c.Set("Content-Type", MIMETextHTML) _, err := c.Status(404).Write([]byte(_404))
_, err := c.Status(404).Write([]byte(_404)) return err
return err },
}, MethodNotAllowedHandler: func(c *Ctx) error {
MethodNotAllowedHandler: func(c *Ctx) error { c.Set("Content-Type", MIMETextPlain)
c.Set("Content-Type", MIMETextPlain) _, err := c.Status(405).Write([]byte(_405))
_, err := c.Status(405).Write([]byte(_405)) return err
return err },
}, }
}
)
func New(config ...Config) *App { func New(config ...Config) *App {
app := &App{ app := &App{
@ -51,6 +52,8 @@ func New(config ...Config) *App {
root: true, root: true,
}, },
pool: &sync.Pool{},
redirectTrailingSlash: true, // true redirectTrailingSlash: true, // true
redirectFixedPath: false, // false redirectFixedPath: false, // false
handleMethodNotAllowed: true, // false handleMethodNotAllowed: true, // false
@ -88,5 +91,9 @@ func New(config ...Config) *App {
app.Use(NewRecover(true)) app.Use(NewRecover(true))
} }
app.pool.New = func() any {
return app.allocateContext()
}
return app return app
} }

18
nft/log/default.go
View File

@ -21,7 +21,7 @@ var (
os.Exit(1) os.Exit(1)
} }
defaultLogger = &logger{ DefaultLogger = &logger{
Mutex: sync.Mutex{}, Mutex: sync.Mutex{},
timeFormat: "2006-01-02T15:04:05", timeFormat: "2006-01-02T15:04:05",
writer: os.Stdout, writer: os.Stdout,
@ -36,32 +36,32 @@ var (
) )
func SetTimeFormat(format string) { func SetTimeFormat(format string) {
defaultLogger.SetTimeFormat(format) DefaultLogger.SetTimeFormat(format)
} }
func SetLogLevel(level LogLevel) { func SetLogLevel(level LogLevel) {
defaultLogger.SetLogLevel(level) DefaultLogger.SetLogLevel(level)
} }
func Debug(msg string, data ...any) { func Debug(msg string, data ...any) {
defaultLogger.Debug(msg, data...) DefaultLogger.Debug(msg, data...)
} }
func Info(msg string, data ...any) { func Info(msg string, data ...any) {
defaultLogger.Info(msg, data...) DefaultLogger.Info(msg, data...)
} }
func Warn(msg string, data ...any) { func Warn(msg string, data ...any) {
defaultLogger.Warn(msg, data...) DefaultLogger.Warn(msg, data...)
} }
func Error(msg string, data ...any) { func Error(msg string, data ...any) {
defaultLogger.Error(msg, data...) DefaultLogger.Error(msg, data...)
} }
func Panic(msg string, data ...any) { func Panic(msg string, data ...any) {
defaultLogger.Panic(msg, data...) DefaultLogger.Panic(msg, data...)
} }
func Fatal(msg string, data ...any) { func Fatal(msg string, data ...any) {
defaultLogger.Fatal(msg, data...) DefaultLogger.Fatal(msg, data...)
} }

20
nft/nfctl/cmd/new.go
View File

@ -3,15 +3,16 @@ package cmd
import ( import (
"errors" "errors"
"fmt" "fmt"
"net/url"
"os"
"path"
"github.com/loveuer/nf/nft/log" "github.com/loveuer/nf/nft/log"
"github.com/loveuer/nf/nft/nfctl/clone" "github.com/loveuer/nf/nft/nfctl/clone"
"github.com/loveuer/nf/nft/nfctl/opt" "github.com/loveuer/nf/nft/nfctl/opt"
"github.com/loveuer/nf/nft/nfctl/tp" "github.com/loveuer/nf/nft/nfctl/tp"
"github.com/loveuer/nf/nft/nfctl/version" "github.com/loveuer/nf/nft/nfctl/version"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"net/url"
"os"
"path"
) )
var ( var (
@ -29,12 +30,12 @@ nfctl new {project} --template http://username:token@my.gitlab.com/my-zone/my-re
disableInit bool disableInit bool
preTemplateMap = map[string]string{ preTemplateMap = map[string]string{
"ultone": "https://gitcode.com/loveuer/ultone.git", "ultone": "https://gitea.loveuer.com/loveuer/ultone.git",
} }
) )
func initNew() { func initNew() {
cmdNew.Flags().StringVarP(&template, "template", "t", "", "template name/url[example:ultone, https://github.com/xxx/yyy.git]") cmdNew.Flags().StringVarP(&template, "template", "t", "ultone", "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.Flags().BoolVar(&disableInit, "without-init", false, "don't run template init script")
cmdNew.RunE = func(cmd *cobra.Command, args []string) error { cmdNew.RunE = func(cmd *cobra.Command, args []string) error {
@ -44,6 +45,7 @@ func initNew() {
err error err error
urlIns *url.URL urlIns *url.URL
pwd string pwd string
moduleName string
projectDir string projectDir string
initBs []byte initBs []byte
renderBs []byte renderBs []byte
@ -58,13 +60,14 @@ func initNew() {
return fmt.Errorf("get work dir err") return fmt.Errorf("get work dir err")
} }
projectDir = path.Join(pwd, args[0]) moduleName = args[0]
projectDir = path.Join(pwd, path.Base(args[0]))
if _, err = os.Stat(projectDir); !errors.Is(err, os.ErrNotExist) { if _, err = os.Stat(projectDir); !errors.Is(err, os.ErrNotExist) {
return fmt.Errorf("project folder already exist") return fmt.Errorf("project folder already exist")
} }
if err = os.MkdirAll(projectDir, 0750); err != nil { if err = os.MkdirAll(projectDir, 0o750); err != nil {
return fmt.Errorf("create project dir err: %v", err) return fmt.Errorf("create project dir err: %v", err)
} }
@ -101,7 +104,8 @@ func initNew() {
} }
if renderBs, err = tp.RenderVar(initBs, map[string]any{ if renderBs, err = tp.RenderVar(initBs, map[string]any{
"PROJECT_NAME": args[0], "PROJECT_NAME": projectDir,
"MODULE_NAME": moduleName,
}); err != nil { }); err != nil {
return fmt.Errorf("render template init script err: %v", err) return fmt.Errorf("render template init script err: %v", err)
} }

7
nft/nfctl/main.go
View File

@ -2,18 +2,15 @@ package main
import ( import (
"context" "context"
"github.com/loveuer/nf/nft/nfctl/cmd"
"os/signal" "os/signal"
"syscall" "syscall"
"github.com/loveuer/nf/nft/nfctl/cmd"
) )
func main() { func main() {
ctx, cancel := signal.NotifyContext(context.Background(), syscall.SIGHUP, syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT) ctx, cancel := signal.NotifyContext(context.Background(), syscall.SIGHUP, syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT)
defer cancel() defer cancel()
//if !(len(os.Args) >= 2 && os.Args[1] == "version") {
// version.Check(5)
//}
_ = cmd.Root.ExecuteContext(ctx) _ = cmd.Root.ExecuteContext(ctx)
} }

2
nft/nfctl/version/var.go
View File

@ -1,3 +1,3 @@
package version package version
const Version = "v24.07.14-r2" const Version = "v24.07.14-r3"

58
nft/nfctl/version/version.go
View File

@ -1,38 +1,39 @@
package version package version
import ( import (
"context"
"crypto/tls" "crypto/tls"
"fmt" "fmt"
"github.com/fatih/color" "github.com/fatih/color"
"github.com/go-resty/resty/v2"
"github.com/jedib0t/go-pretty/v6/table"
"github.com/loveuer/nf/nft/log" "github.com/loveuer/nf/nft/log"
"github.com/savioxavier/termlink" "github.com/savioxavier/termlink"
"io"
"net/http"
"strings" "strings"
"time" "time"
) )
var ( var (
client = resty.New().SetTLSClientConfig(&tls.Config{InsecureSkipVerify: true})
uri = "https://raw.gitcode.com/loveuer/nf/raw/master/nft/nfctl/version/var.go" uri = "https://raw.gitcode.com/loveuer/nf/raw/master/nft/nfctl/version/var.go"
prefix = "const Version = " prefix = "const Version = "
) )
func UpgradePrint(newVersion string) { func UpgradePrint(newVersion string) {
t := table.NewWriter() fmt.Printf(`+----------------------------------------------------------------------+
t.AppendRows([]table.Row{ | 🎉 🎉 🎉 %s 🎉 🎉 🎉 |
{color.GreenString("New Version Found: %s", newVersion)}, | %s |
{color.CyanString("Upgrade it with: [go install github.com/loveuer/nf/nft/nfctl@master]")}, | Or Download by: |
{fmt.Sprint("Or Download by: ")}, | %s |
{color.CyanString(termlink.Link("Releases", "https://github.com/loveuer/nf/releases"))}, | %s |
{color.CyanString(termlink.Link("Releases", "https://gitcode.com/loveuer/nf/releases"))}, +----------------------------------------------------------------------+
}) `,
color.GreenString("New Version Found: %s", newVersion),
fmt.Println(t.Render()) 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, timeout ...int) string { func Check(printUpgradable bool, printNoNeedUpgrade bool, timeouts ...int) string {
var ( var (
v string v string
) )
@ -51,21 +52,34 @@ func Check(printUpgradable bool, printNoNeedUpgrade bool, timeout ...int) string
} }
}() }()
ctx, _ := context.WithTimeout(context.Background(), time.Duration(30)*time.Second) timeout := time.Duration(30) * time.Second
if len(timeout) > 0 && timeout[0] > 0 { if len(timeouts) > 0 && timeouts[0] > 0 {
ctx, _ = context.WithTimeout(context.Background(), time.Duration(timeout[0])*time.Second) timeout = time.Duration(timeouts[0]) * time.Second
} }
resp, err := client.R().SetContext(ctx). req, _ := http.NewRequest(http.MethodGet, uri, nil)
Get(uri) resp, err := (&http.Client{
Timeout: timeout,
Transport: &http.Transport{
TLSClientConfig: &tls.Config{
InsecureSkipVerify: true,
},
},
}).Do(req)
if err != nil { if err != nil {
log.Debug("[Check] http get[%s] err: %v", uri, err.Error()) log.Debug("[Check] http get[%s] err: %v", uri, err.Error())
return "" return ""
} }
defer resp.Body.Close()
log.Debug("[Check] http get[%s] body:\n%s", uri, resp.String()) content, err := io.ReadAll(resp.Body)
if err != nil {
log.Debug("[Check] http read all body err: %v", err)
}
for _, line := range strings.Split(resp.String(), "\n") { 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) log.Debug("[Check] version.go line: %s", line)
if strings.HasPrefix(line, prefix) { if strings.HasPrefix(line, prefix) {
may := strings.TrimPrefix(line, prefix) may := strings.TrimPrefix(line, prefix)

3
nft/nfctl/version/version_test.go
View File

@ -6,11 +6,12 @@ import (
) )
func TestUpgradePrint(t *testing.T) { func TestUpgradePrint(t *testing.T) {
log.SetLogLevel(log.LogLevelDebug)
UpgradePrint("v24.07.14-r5") UpgradePrint("v24.07.14-r5")
} }
func TestCheck(t *testing.T) { func TestCheck(t *testing.T) {
log.SetLogLevel(log.LogLevelDebug) log.SetLogLevel(log.LogLevelDebug)
v := Check(15) v := Check(true, true, 1)
t.Logf("got version: %s", v) t.Logf("got version: %s", v)
} }

15
nft/resp/resp.go
View File

@ -2,9 +2,10 @@ package resp
import ( import (
"fmt" "fmt"
"github.com/loveuer/nf"
"strconv" "strconv"
"strings" "strings"
"github.com/loveuer/nf"
) )
func handleEmptyMsg(status uint32, msg string) string { func handleEmptyMsg(status uint32, msg string) string {
@ -102,6 +103,18 @@ func Resp403(c *nf.Ctx, data any, msgs ...string) error {
return Resp(c, 403, msg, err, data) return Resp(c, 403, msg, err, data)
} }
func Resp418(c *nf.Ctx, data any, msgs ...string) error {
msg := MSG418
err := ""
if len(msgs) > 0 && msgs[0] != "" {
msg = fmt.Sprintf("%s: %s", msg, strings.Join(msgs, "; "))
err = ""
}
return Resp(c, 418, msg, err, data)
}
func Resp429(c *nf.Ctx, data any, msgs ...string) error { func Resp429(c *nf.Ctx, data any, msgs ...string) error {
msg := MSG429 msg := MSG429
err := "" err := ""

1
nft/resp/var.go
View File

@ -7,6 +7,7 @@ const (
MSG401 = "登录已过期, 请重新登录" MSG401 = "登录已过期, 请重新登录"
MSG403 = "请求权限不足" MSG403 = "请求权限不足"
MSG404 = "请求资源未找到" MSG404 = "请求资源未找到"
MSG418 = "请求条件不满足, 请稍后再试"
MSG429 = "请求过于频繁, 请稍后再试" MSG429 = "请求过于频繁, 请稍后再试"
MSG500 = "服务器开小差了, 请稍后再试" MSG500 = "服务器开小差了, 请稍后再试"
MSG501 = "功能开发中, 尽情期待" MSG501 = "功能开发中, 尽情期待"

129
readme.md
View File

@ -5,63 +5,98 @@
##### basic usage ##### basic usage
- get param - get param
```go
func main() {
app := nf.New()
app.Get("/hello/:name", func(c *nf.Ctx) error { ```go
name := c.Param("name") func main() {
return c.JSON(nf.Map{"status": 200, "data": "hello, " + name}) 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 - parse request query
```go
func handleQuery(c *nf.Ctx) error {
type Req struct {
Name string `query:"name"`
Addr []string `query:"addr"`
}
var ( ```go
err error func handleQuery(c *nf.Ctx) error {
req = Req{} type Req struct {
) Name string `query:"name"`
Addr []string `query:"addr"`
}
if err = c.QueryParser(&req); err != nil { var (
return nf.NewNFError(400, err.Error()) 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 - parse application/json body
```go
func handlePost(c *nf.Ctx) error {
type Req struct {
Name string `json:"name"`
Addr []string `json:"addr"`
}
var ( ```go
err error func handlePost(c *nf.Ctx) error {
req = Req{} type Req struct {
reqMap = make(map[string]interface{}) Name string `json:"name"`
) Addr []string `json:"addr"`
}
if err = c.BodyParser(&req); err != nil { var (
return nf.NewNFError(400, err.Error()) err error
} req = Req{}
reqMap = make(map[string]interface{})
)
// can parse body multi times if err = c.BodyParser(&req); err != nil {
if err = c.BodyParser(&reqMap); err != nil { return nf.NewNFError(400, err.Error())
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")
}
...
}
```