Bump semver from 5.7.1 to 5.7.2

.gitignore

@@ -1,7 +1,5 @@
-bina*
 config.yml
-rice-box.go
+dist
 node_modules
 cmd/public/scripts
 cmd/public/styles
-.env*

Dockerfile

@@ -1,8 +1,8 @@
-FROM docker.io/library/node:16-alpine as frontend-builder
+FROM docker.io/library/node:18-alpine as frontend-builder
 WORKDIR /app
 COPY package.json package-lock.json build.js ./
 COPY src/ src/
-RUN npm i && NODE_ENV=production npm run build
+RUN npm ci && NODE_ENV=production npm run build
 
 FROM docker.io/library/golang:alpine as backend-builder
 WORKDIR /app

Makefile

@@ -1,17 +1,17 @@
 build: build_public
-	CGO_ENABLED=0 go build -ldflags '-s -w' -trimpath -o bina ./cmd
+	CGO_ENABLED=0 go build -ldflags '-s -w' -trimpath -o dist/bina ./cmd
 
 build_linux:
-	CGO_ENABLED=0 GOOS=linux go build -ldflags '-s -w' -trimpath -o bina_linux ./cmd
+	CGO_ENABLED=0 GOOS=linux go build -ldflags '-s -w' -trimpath -o dist/bina_linux ./cmd
 
 build_windows:
-	CGO_ENABLED=0 GOOS=windows go build -ldflags '-s -w' -trimpath -o bina.exe ./cmd
+	CGO_ENABLED=0 GOOS=windows go build -ldflags '-s -w' -trimpath -o dist/bina.exe ./cmd
 
 build_macosx:
-	CGO_ENABLED=0 GOOS=darwin go build -ldflags '-s -w' -trimpath -o bina_macosx ./cmd
+	CGO_ENABLED=0 GOOS=darwin go build -ldflags '-s -w' -trimpath -o dist/bina_macosx ./cmd
 
 build_android:
-	GOOS=linux GOARCH=arm GOARM=7 go build -o bina_android ./cmd
+	CGO_ENABLED=0 GOOS=linux GOARCH=arm GOARM=7 go build -ldflags '-s -w' -trimpath -o dist/bina_android ./cmd
 
 all: build_linux build_windows build_macosx
 
@@ -31,4 +31,4 @@ container_image:
 	docker build -t bina .
 
 clean:
-	rm -rf bina* node_modules cmd/public/scripts cmd/public/styles
+	rm -rf dist node_modules cmd/public/scripts cmd/public/styles

cmd/main.go

@@ -5,14 +5,16 @@ import (
 	"flag"
 	"fmt"
 	"io/fs"
+	"log"
 	"net/http"
 	"os"
+	"time"
 
 	"github.com/go-chi/chi/v5"
 	"github.com/go-chi/chi/v5/middleware"
 
-	"github.com/hitalos/bina/config"
-	"github.com/hitalos/bina/controllers"
+	"github.com/hitalos/bina/internal/config"
+	"github.com/hitalos/bina/internal/controllers"
 )
 
 //go:embed public
@@ -24,11 +26,20 @@ func main() {
 	cfg := config.Load(*configFilepath)
 
 	app := chi.NewRouter()
+
+	setMiddlewares(app)
+	setRoutes(app, cfg)
+	listen(app, cfg.Port)
+}
+
+func setMiddlewares(app *chi.Mux) {
 	app.Use(middleware.Compress(6))
 	if os.Getenv("DEBUG") == "1" {
 		app.Use(middleware.Logger)
 	}
+}
 
+func setRoutes(app *chi.Mux, cfg *config.Config) {
 	app.Route("/contacts", func(contacts chi.Router) {
 		contacts.Get("/all.json", controllers.GetContacts(cfg))
 		contacts.Get("/{contact}", controllers.GetCard(cfg))
@@ -39,6 +50,18 @@ func main() {
 
 	publicDir, _ := fs.Sub(embeds, "public")
 	app.Handle("/*", http.FileServer(http.FS(publicDir)))
+}
+
+func listen(app *chi.Mux, port int) {
+	s := http.Server{
+		Addr:         fmt.Sprintf(":%d", port),
+		Handler:      app,
+		ReadTimeout:  30 * time.Second,
+		WriteTimeout: 30 * time.Second,
+		IdleTimeout:  60 * time.Second,
+	}
 
-	fmt.Println(http.ListenAndServe(fmt.Sprintf(":%d", cfg.Port), app))
+	if err := s.ListenAndServe(); err != nil {
+		log.Println(err)
+	}
 }

go.mod

@@ -1,16 +1,16 @@
 module github.com/hitalos/bina
 
-go 1.17
+go 1.19
 
 require (
-	github.com/go-chi/chi/v5 v5.0.7
+	github.com/go-chi/chi/v5 v5.0.8
 	github.com/go-ldap/ldap/v3 v3.4.4
-	golang.org/x/text v0.3.7
+	golang.org/x/text v0.6.0
 	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
-	github.com/Azure/go-ntlmssp v0.0.0-20220621081337-cb9428e4ac1e // indirect
+	github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 // indirect
 	github.com/go-asn1-ber/asn1-ber v1.5.4 // indirect
-	golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa // indirect
+	golang.org/x/crypto v0.5.0 // indirect
 )

go.sum

@@ -1,11 +1,12 @@
-github.com/Azure/go-ntlmssp v0.0.0-20220621081337-cb9428e4ac1e h1:NeAW1fUYUEWhft7pkxDf6WoUvEZJ/uOKsvtpjLnn8MU=
 github.com/Azure/go-ntlmssp v0.0.0-20220621081337-cb9428e4ac1e/go.mod h1:chxPXzSsl7ZWRAuOIE23GDNzjWuZquvFlgA8xmpunjU=
+github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 h1:mFRzDkZVAjdal+s7s0MwaRv9igoPqLRdzOLzw/8Xvq8=
+github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358/go.mod h1:chxPXzSsl7ZWRAuOIE23GDNzjWuZquvFlgA8xmpunjU=
 github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/go-asn1-ber/asn1-ber v1.5.4 h1:vXT6d/FNDiELJnLb6hGNa309LMsrCoYFvpwHDF0+Y1A=
 github.com/go-asn1-ber/asn1-ber v1.5.4/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
-github.com/go-chi/chi/v5 v5.0.7 h1:rDTPXLDHGATaeHvVlLcR4Qe0zftYethFucbjVQ1PxU8=
-github.com/go-chi/chi/v5 v5.0.7/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
+github.com/go-chi/chi/v5 v5.0.8 h1:lD+NLqFcAi1ovnVZpsnObHGW4xb4J8lNmoYVfECH1Y0=
+github.com/go-chi/chi/v5 v5.0.8/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
 github.com/go-ldap/ldap/v3 v3.4.4 h1:qPjipEpt+qDa6SI/h1fzuGWoRUY+qqQ9sOZq67/PYUs=
 github.com/go-ldap/ldap/v3 v3.4.4/go.mod h1:fe1MsuN5eJJ1FeLT/LEBVdWfNWKh459R7aXgXtJC+aI=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
@@ -14,16 +15,16 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
 github.com/stretchr/testify v1.7.2 h1:4jaiDzPyXQvSd7D0EjG45355tLlV3VOECpq10pLC+8s=
 github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
 golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa h1:zuSxTR4o9y82ebqCUJYNGJbGPo6sKVl54f/TVDObg1c=
-golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/crypto v0.5.0 h1:U/0M97KRkSFvyD/3FSmdP5W5swImpNgle/EHFhOsQPE=
+golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.6.0 h1:3XmdazWV+ubf7QgHSTWeykHOci5oeekaGJBLkrkaw4k=
+golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

config/config.go → internal/config/config.go

@@ -68,7 +68,11 @@ func Load(configFilepath string) *Config {
 		}
 		fmt.Println(err)
 	}
-	defer f.Close()
+	defer func() {
+		if err := f.Close(); err != nil {
+			fmt.Println(err)
+		}
+	}()
 
 	if err = yaml.NewDecoder(f).Decode(c); err != nil {
 		fmt.Println(err)

controllers/contacts.go → internal/controllers/contacts.go

@@ -7,8 +7,8 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/hitalos/bina/config"
-	"github.com/hitalos/bina/models"
+	"github.com/hitalos/bina/internal/config"
+	"github.com/hitalos/bina/internal/models"
 )
 
 var (

controllers/images.go → internal/controllers/images.go

@@ -11,8 +11,8 @@ import (
 
 	"github.com/go-chi/chi/v5"
 
-	"github.com/hitalos/bina/config"
-	"github.com/hitalos/bina/models"
+	"github.com/hitalos/bina/internal/config"
+	"github.com/hitalos/bina/internal/models"
 )
 
 func loadFromURL(url string) ([]byte, error) {

controllers/vcard.go → internal/controllers/vcard.go

@@ -10,8 +10,8 @@ import (
 	"time"
 
 	"github.com/go-chi/chi/v5"
-	"github.com/hitalos/bina/config"
-	"github.com/hitalos/bina/models"
+	"github.com/hitalos/bina/internal/config"
+	"github.com/hitalos/bina/internal/models"
 )
 
 var (

models/entries.go → internal/models/entries.go

@@ -9,8 +9,8 @@ import (
 	"golang.org/x/text/transform"
 	"golang.org/x/text/unicode/norm"
 
-	"github.com/hitalos/bina/config"
-	"github.com/hitalos/bina/services/ldap"
+	"github.com/hitalos/bina/internal/config"
+	"github.com/hitalos/bina/internal/services/ldap"
 )
 
 var mutex sync.Mutex

models/entry.go → internal/models/entry.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/go-ldap/ldap/v3"
 
-	"github.com/hitalos/bina/config"
+	"github.com/hitalos/bina/internal/config"
 )
 
 // Entry struct of contact

services/ldap/ldap.go → internal/services/ldap/ldap.go

@@ -10,7 +10,7 @@ import (
 
 	"github.com/go-ldap/ldap/v3"
 
-	"github.com/hitalos/bina/config"
+	"github.com/hitalos/bina/internal/config"
 )
 
 func getAttrFields(p config.Provider) []string {