Merge pull request #87 from mutablelogic/v5

V5

Author: djthorpe

.github/workflows/docker.yaml

@@ -28,7 +28,7 @@ jobs:
       - name: Install build tools
         run: |
           sudo apt -y update
-          sudo apt -y install build-essential git
+          sudo apt -y install build-essential git npm
           git config --global advice.detachedHead false    
       - name: Checkout
         uses: actions/checkout@v4

Makefile

@@ -44,25 +44,32 @@ all: clean build
 ###############################################################################
 # BUILD
 
-# Build the commands in the cmd directory
+# Compile NPM and build the commands in the cmd directory
 .PHONY: build
-build: tidy $(NPM_DIR) $(PLUGIN_DIR) $(CMD_DIR)
+build: $(NPM_DIR) build-docker
+
+# Build the commands in the cmd directory
+.PHONY: build-docker
+build-docker: tidy $(PLUGIN_DIR) $(CMD_DIR)
 
+# Build the commands
 $(CMD_DIR): go-dep mkdir
 	@echo Build command $(notdir $@) GOOS=${OS} GOARCH=${ARCH}
 	@GOOS=${OS} GOARCH=${ARCH} ${GO} build ${BUILD_FLAGS} -o ${BUILD_DIR}/$(notdir $@) ./$@
 
+# Build the plugins
 $(PLUGIN_DIR): go-dep mkdir
 	@echo Build plugin $(notdir $@) GOOS=${OS} GOARCH=${ARCH}
 	@GOOS=${OS} GOARCH=${ARCH} ${GO} build -buildmode=plugin ${BUILD_FLAGS} -o ${BUILD_DIR}/$(notdir $@).plugin ./$@
 
+# Build the NPM packages
 $(NPM_DIR): npm-dep
 	@echo Build npm $(notdir $@)
 	@cd $@ && npm install && npm run prod	
 
 # Build the docker image
 .PHONY: docker
-docker: docker-dep
+docker: docker-dep ${NPM_DIR}
 	@echo build docker image ${DOCKER_TAG} OS=${OS} ARCH=${ARCH} SOURCE=${DOCKER_SOURCE} VERSION=${VERSION}
 	@${DOCKER} build \
 		--tag ${DOCKER_TAG} \

cmd/server/main.go

@@ -34,6 +34,7 @@ type CLI struct {
 	auth.UserCommands
 	auth.TokenCommands
 	auth.AuthCommands
+	VersionCommands
 }
 
 ///////////////////////////////////////////////////////////////////////////////

cmd/server/service.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"context"
+	"fmt"
 	"net/http"
 
 	// Packages
@@ -32,7 +33,8 @@ type ServiceCommands struct {
 }
 
 type ServiceRunCommand struct {
-	Router struct {
+	Plugins []string `help:"Plugin paths"`
+	Router  struct {
 		httprouter.Config `embed:"" prefix:"router."` // Router configuration
 	} `embed:""`
 	Server struct {
@@ -62,6 +64,15 @@ type ServiceRunCommand struct {
 // PUBLIC METHODS
 
 func (cmd *ServiceRunCommand) Run(app server.Cmd) error {
+	// Load plugins
+	plugins, err := provider.LoadPluginsForPattern(cmd.Plugins...)
+	if err != nil {
+		return err
+	}
+	for _, plugin := range plugins {
+		fmt.Println("TODO: Loaded plugins:", plugin.Name())
+	}
+
 	// Set the server listener and router prefix
 	cmd.Server.Listen = app.GetEndpoint()
 	cmd.Router.Prefix = types.NormalisePath(cmd.Server.Listen.Path)

cmd/server/version.go

@@ -0,0 +1,32 @@
+package main
+
+import (
+	"encoding/json"
+	"fmt"
+
+	// Packages
+	server "github.com/mutablelogic/go-server"
+	version "github.com/mutablelogic/go-server/pkg/version"
+)
+
+///////////////////////////////////////////////////////////////////////////////
+// TYPES
+
+type VersionCommands struct {
+	Version VersionCommand `cmd:"" group:"MISC" help:"Print version information"`
+}
+
+type VersionCommand struct{}
+
+///////////////////////////////////////////////////////////////////////////////
+// PUBLIC METHODS
+
+func (cmd *VersionCommand) Run(app server.Cmd) error {
+	// Print version information
+	data, err := json.MarshalIndent(version.Map(), "", "  ")
+	if err != nil {
+		return err
+	}
+	fmt.Println(string(data))
+	return nil
+}

etc/docker/Dockerfile

@@ -11,7 +11,7 @@ COPY . .
 # Build the server
 RUN \
     apt update -y && apt upgrade -y && \
-    OS=${OS} ARCH=${ARCH} make build 
+    OS=${OS} ARCH=${ARCH} make build-docker 
 
 # Copy binaries to /usr/local/bin
 FROM --platform=${OS}/${ARCH} debian:bookworm-slim

go.mod

@@ -4,6 +4,7 @@ go 1.23.5
 
 require (
 	github.com/alecthomas/kong v1.10.0
+	github.com/djthorpe/go-marshaler v0.0.15
 	github.com/djthorpe/go-pg v1.0.5
 	github.com/golang-jwt/jwt/v5 v5.2.2
 	github.com/mutablelogic/go-client v1.0.12
@@ -31,6 +32,8 @@ require (
 	github.com/go-ole/go-ole v1.2.6 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/google/uuid v1.6.0 // indirect
+	github.com/hashicorp/errwrap v1.1.0 // indirect
+	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
 	github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
 	github.com/jackc/pgx/v5 v5.7.3 // indirect

go.sum

@@ -32,6 +32,8 @@ github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5Qvfr
 github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
 github.com/djthorpe/go-errors v1.0.3 h1:GZeMPkC1mx2vteXLI/gvxZS0Ee9zxzwD1mcYyKU5jD0=
 github.com/djthorpe/go-errors v1.0.3/go.mod h1:HtfrZnMd6HsX75Mtbv9Qcnn0BqOrrFArvCaj3RMnZhY=
+github.com/djthorpe/go-marshaler v0.0.15 h1:ZXq5YHCsbREbbYJtc0ie9hz7HJ7vIeeDlMbe7cGh0C0=
+github.com/djthorpe/go-marshaler v0.0.15/go.mod h1:xCXhTzj52UL3YStRsqUSfrKses7ofmfTXYQfVedn8Lw=
 github.com/djthorpe/go-pg v1.0.5 h1:UYCV5fSXOJEFTafem1wB57RK2J0V7Nr9nCquC5sO+ZE=
 github.com/djthorpe/go-pg v1.0.5/go.mod h1:XHl/w8+66Hs746nOYd+gdjqPImNuLVZ5UsXLI47rb4c=
 github.com/docker/docker v27.1.1+incompatible h1:hO/M4MtV36kzKldqnA37IWhebRA+LnqqcqDja6kVaKY=
@@ -61,6 +63,11 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms=
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0/go.mod h1:YN5jB8ie0yfIUg6VvR9Kz84aCaG7AsGZnLjhHbUqwPg=
+github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
+github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
+github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
+github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
+github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
 github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM=
 github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg=
 github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=

pkg/cert/config/config.go

@@ -71,15 +71,14 @@ func (c Config) New(ctx context.Context) (server.Task, error) {
 		certhandler.RegisterCert(ctx, c.Router, c.Prefix, certmanager)
 	}
 
-	// Queue task to check for SSL expiry
+	// Queue ticker and queue to check for SSL expiry
 	if c.Queue != nil {
-		c.Queue.RegisterTicker(ctx, pgqueue.TickerMeta{
-			Ticker:   c.Name(),
-			Interval: types.DurationPtr(time.Minute),
-		}, func(ctx context.Context, _ any) error {
-			ref.Log(ctx).Print(ctx, "Checking for SSL expiry...")
+		if _, err := c.Queue.RegisterTicker(ctx, pgqueue.TickerMeta{Ticker: c.Name(), Interval: types.DurationPtr(time.Hour)}, func(ctx context.Context, _ any) error {
+			ref.Log(ctx).Print(ctx, "TODO: Checking for SSL expiry...")
 			return nil
-		})
+		}); err != nil {
+			return nil, err
+		}
 	}
 
 	// Return the task

pkg/httpserver/httpserver.go

@@ -11,7 +11,7 @@ import (
 	"time"
 
 	// Packages
-	"github.com/mutablelogic/go-server/pkg/httpresponse"
+	httpresponse "github.com/mutablelogic/go-server/pkg/httpresponse"
 	ref "github.com/mutablelogic/go-server/pkg/ref"
 )