Djt/1012/refactor (#103)

* Refactoring to remove pgqueue and pgmanager
* Other updates for refactoring

Author: djthorpe

Makefile

@@ -1,13 +1,11 @@
 # Executables
 GO ?= $(shell which go 2>/dev/null)
 DOCKER ?= $(shell which docker 2>/dev/null)
-NPM ?= $(shell which npm 2>/dev/null)
 
 # Locations
 BUILD_DIR ?= build
 CMD_DIR := $(wildcard cmd/*)
 PLUGIN_DIR := $(wildcard plugin/*)
-NPM_DIR := $(wildcard npm/*)
 
 # VERBOSE=1
 ifneq ($(VERBOSE),)
@@ -44,9 +42,9 @@ all: clean build
 ###############################################################################
 # BUILD
 
-# Compile NPM and build the commands in the cmd directory
+# Compile and build the commands in the cmd directory
 .PHONY: build
-build: $(NPM_DIR) build-docker
+build: build-docker
 
 # Build the commands in the cmd directory
 .PHONY: build-docker
@@ -59,21 +57,16 @@ $(CMD_DIR): go-dep mkdir
 
 # Build the plugins
 .PHONY: plugins
-plugins: $(NPM_DIR) $(PLUGIN_DIR) 
+plugins: $(PLUGIN_DIR) 
 
 # 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 dist	
-
 # Build the docker image
 .PHONY: docker
-docker: docker-dep ${NPM_DIR}
+docker: docker-dep 
 	@echo build docker image ${DOCKER_TAG} OS=${OS} ARCH=${ARCH} SOURCE=${DOCKER_SOURCE} VERSION=${VERSION}
 	@${DOCKER} build \
 		--tag ${DOCKER_TAG} \
@@ -126,11 +119,7 @@ mkdir:
 clean:
 	@echo Clean $(BUILD_DIR)
 	@rm -fr $(BUILD_DIR)
-	@${GO} clean
-	@for dir in $(NPM_DIR); do \
-		echo "Cleaning npm $$dir"; \
-		cd $$dir && ${NPM} run clean; \
-	done
+	@${GO} clean -modcache
 
 ###############################################################################
 # DEPENDENCIES
@@ -142,7 +131,3 @@ go-dep:
 .PHONY: docker-dep
 docker-dep:
 	@test -f "${DOCKER}" && test -x "${DOCKER}"  || (echo "Missing docker binary" && exit 1)
-
-.PHONY: npm-dep
-npm-dep:
-	@test -f "${NPM}" && test -x "${NPM}"  || (echo "Missing npm binary" && exit 1)

cmd/server/main.go

@@ -9,8 +9,6 @@ import (
 	certmanager "github.com/mutablelogic/go-server/pkg/cert/cmd"
 	cmd "github.com/mutablelogic/go-server/pkg/cmd"
 	ldap "github.com/mutablelogic/go-server/pkg/ldap/cmd"
-	pgmanager "github.com/mutablelogic/go-server/pkg/pgmanager/cmd"
-	pgqueue "github.com/mutablelogic/go-server/pkg/pgqueue/cmd"
 )
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -20,18 +18,6 @@ type CLI struct {
 	ServiceCommands
 	Service2Commands
 
-	PG struct {
-		pgmanager.DatabaseCommands
-		pgmanager.SchemaCommands
-		pgmanager.ObjectCommands
-		pgmanager.RoleCommands
-		pgmanager.ConnectionCommands
-		pgmanager.TablespaceCommands
-		pgqueue.QueueCommands
-		pgqueue.TaskCommands
-		pgqueue.TickerCommands
-	} `cmd:""`
-
 	Cert struct {
 		certmanager.NameCommands
 		certmanager.CertCommands

cmd/server/service.go

@@ -18,14 +18,10 @@ import (
 
 	// Plugins
 	auth "github.com/mutablelogic/go-server/pkg/auth/config"
-	cert "github.com/mutablelogic/go-server/pkg/cert/config"
 	httprouter "github.com/mutablelogic/go-server/pkg/httprouter/config"
 	httpserver "github.com/mutablelogic/go-server/pkg/httpserver/config"
 	ldap "github.com/mutablelogic/go-server/pkg/ldap/config"
 	logger "github.com/mutablelogic/go-server/pkg/logger/config"
-	metrics "github.com/mutablelogic/go-server/pkg/metrics/config"
-	pg "github.com/mutablelogic/go-server/pkg/pgmanager/config"
-	pgqueue "github.com/mutablelogic/go-server/pkg/pgqueue/config"
 )
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -109,30 +105,7 @@ func (cmd *ServiceRunCommand) Run(app server.Cmd) error {
 		// Return success
 		return nil
 	}))
-	err = errors.Join(err, provider.Load("pgpool", "main", func(ctx context.Context, label string, config server.Plugin) error {
-		pgpool := config.(*pg.Config)
 
-		// Set router
-		if router, ok := provider.Task(ctx, "httprouter.main").(server.HTTPRouter); !ok || router == nil {
-			return httpresponse.ErrInternalError.With("Invalid router")
-		} else {
-			pgpool.Router = router
-		}
-
-		// Set trace
-		if app.GetDebug() == server.Trace {
-			pgpool.Trace = func(ctx context.Context, query string, args any, err error) {
-				if err != nil {
-					ref.Log(ctx).With("args", args).Print(ctx, err, " ON ", query)
-				} else {
-					ref.Log(ctx).With("args", args).Debug(ctx, query)
-				}
-			}
-		}
-
-		// Return success
-		return nil
-	}))
 	err = errors.Join(err, provider.Load("auth", "main", func(ctx context.Context, label string, config server.Plugin) error {
 		auth := config.(*auth.Config)
 
@@ -153,51 +126,6 @@ func (cmd *ServiceRunCommand) Run(app server.Cmd) error {
 		// Return success
 		return nil
 	}))
-	err = errors.Join(err, provider.Load("pgqueue", "main", func(ctx context.Context, label string, config server.Plugin) error {
-		pgqueue := config.(*pgqueue.Config)
-
-		// Set the router
-		if router, ok := ref.Provider(ctx).Task(ctx, "httprouter.main").(server.HTTPRouter); !ok || router == nil {
-			return httpresponse.ErrInternalError.With("Invalid router")
-		} else {
-			pgqueue.Router = router
-		}
-
-		// Set the connection pool
-		if pool, ok := ref.Provider(ctx).Task(ctx, "pgpool.main").(server.PG); !ok || pool == nil {
-			return httpresponse.ErrInternalError.With("Invalid connection pool")
-		} else {
-			pgqueue.Pool = pool
-		}
-
-		return nil
-	}))
-	err = errors.Join(err, provider.Load("certmanager", "main", func(ctx context.Context, label string, config server.Plugin) error {
-		certmanager := config.(*cert.Config)
-
-		// Set the router
-		if router, ok := ref.Provider(ctx).Task(ctx, "httprouter.main").(server.HTTPRouter); !ok || router == nil {
-			return httpresponse.ErrInternalError.With("Invalid router")
-		} else {
-			certmanager.Router = router
-		}
-
-		// Set the connection pool
-		if pool, ok := ref.Provider(ctx).Task(ctx, "pgpool.main").(server.PG); !ok || pool == nil {
-			return httpresponse.ErrInternalError.With("Invalid connection pool")
-		} else {
-			certmanager.Pool = pool
-		}
-
-		// Set the queue
-		if queue, ok := ref.Provider(ctx).Task(ctx, "pgqueue.main").(server.PGQueue); !ok || queue == nil {
-			return httpresponse.ErrInternalError.With("Invalid task queue")
-		} else {
-			certmanager.Queue = queue
-		}
-
-		return nil
-	}))
 
 	err = errors.Join(err, provider.Load("ldap", "main", func(ctx context.Context, label string, config server.Plugin) error {
 		ldap := config.(*ldap.Config)
@@ -221,19 +149,6 @@ func (cmd *ServiceRunCommand) Run(app server.Cmd) error {
 		return nil
 	}))
 
-	err = errors.Join(err, provider.Load("metrics", "main", func(ctx context.Context, label string, config server.Plugin) error {
-		metrics := config.(*metrics.Config)
-
-		// Set the router
-		if router, ok := ref.Provider(ctx).Task(ctx, "httprouter.main").(server.HTTPRouter); !ok || router == nil {
-			return httpresponse.ErrInternalError.With("Invalid router")
-		} else {
-			metrics.Router = router
-		}
-
-		return nil
-	}))
-
 	if err != nil {
 		return err
 	}

etc/docker/Dockerfile

@@ -14,7 +14,7 @@ RUN \
     OS=${OS} ARCH=${ARCH} make build-docker 
 
 # Copy binaries to /usr/local/bin
-FROM --platform=${OS}/${ARCH} debian:bookworm-slim
+FROM --platform=${OS}/${ARCH} debian:trixie-slim
 ARG OS
 ARG ARCH
 ARG SOURCE
@@ -25,7 +25,6 @@ RUN apt update -y && apt install -y ca-certificates
 LABEL org.opencontainers.image.source=https://${SOURCE}
 
 # Entrypoint when running the server
-ENV PLUGIN_PATH="/usr/local/bin/*.plugin" \
-    ENDPOINT="http://:80/"
+ENV PLUGIN_PATH="/usr/local/bin/*.plugin" ENDPOINT="http://0.0.0.0:80/"
 EXPOSE 80 443
 ENTRYPOINT [ "/usr/local/bin/server" ]

go.mod

@@ -1,77 +1,90 @@
 module github.com/mutablelogic/go-server
 
-go 1.23.5
+go 1.24.0
+
+toolchain go1.24.2
 
 require (
-	github.com/alecthomas/kong v1.10.0
-	github.com/djthorpe/go-marshaler v1.0.0
-	github.com/djthorpe/go-pg v1.0.6
-	github.com/go-ldap/ldap/v3 v3.4.11
-	github.com/golang-jwt/jwt/v5 v5.2.2
-	github.com/mutablelogic/go-client v1.0.12
-	github.com/stretchr/testify v1.10.0
+	github.com/alecthomas/kong v1.13.0
+	github.com/go-ldap/ldap/v3 v3.4.12
+	github.com/golang-jwt/jwt/v5 v5.3.0
+	github.com/mutablelogic/go-client v1.3.2
+	github.com/mutablelogic/go-pg v1.1.1
+	github.com/stretchr/testify v1.11.1
 	github.com/yinyin/go-ldap-schema-parser v0.0.0-20190716182935-542aadd3dcb5
 )
 
 require (
-	dario.cat/mergo v1.0.0 // indirect
-	github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
-	github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 // indirect
+	dario.cat/mergo v1.0.2 // indirect
+	github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
+	github.com/Azure/go-ntlmssp v0.1.0 // indirect
 	github.com/Microsoft/go-winio v0.6.2 // indirect
-	github.com/cenkalti/backoff/v4 v4.2.1 // indirect
-	github.com/containerd/containerd v1.7.27 // indirect
+	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
+	github.com/cenkalti/backoff/v5 v5.0.3 // indirect
+	github.com/cespare/xxhash/v2 v2.3.0 // indirect
+	github.com/containerd/errdefs v1.0.0 // indirect
+	github.com/containerd/errdefs/pkg v0.3.0 // indirect
 	github.com/containerd/log v0.1.0 // indirect
 	github.com/containerd/platforms v0.2.1 // indirect
 	github.com/cpuguy83/dockercfg v0.3.2 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/distribution/reference v0.6.0 // indirect
 	github.com/djthorpe/go-errors v1.0.3 // indirect
-	github.com/docker/docker v27.1.1+incompatible // indirect
-	github.com/docker/go-connections v0.5.0 // indirect
+	github.com/docker/docker v28.5.2+incompatible // indirect
+	github.com/docker/go-connections v0.6.0 // indirect
 	github.com/docker/go-units v0.5.0 // indirect
+	github.com/ebitengine/purego v0.9.1 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/go-asn1-ber/asn1-ber v1.5.8-0.20250403174932-29230038a667 // indirect
-	github.com/go-logr/logr v1.4.2 // indirect
+	github.com/go-logr/logr v1.4.3 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/go-ole/go-ole v1.2.6 // indirect
-	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/go-ole/go-ole v1.3.0 // indirect
 	github.com/google/uuid v1.6.0 // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.4 // 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
+	github.com/jackc/pgx/v5 v5.8.0 // indirect
 	github.com/jackc/puddle/v2 v2.2.2 // indirect
-	github.com/klauspost/compress v1.17.4 // indirect
-	github.com/kr/text v0.2.0 // indirect
-	github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
-	github.com/magiconair/properties v1.8.7 // indirect
+	github.com/klauspost/compress v1.18.2 // indirect
+	github.com/lufia/plan9stats v0.0.0-20251013123823-9fd1530e3ec3 // indirect
+	github.com/magiconair/properties v1.8.10 // indirect
 	github.com/moby/docker-image-spec v1.3.1 // indirect
+	github.com/moby/go-archive v0.2.0 // indirect
 	github.com/moby/patternmatcher v0.6.0 // indirect
-	github.com/moby/sys/sequential v0.5.0 // indirect
-	github.com/moby/sys/user v0.3.0 // indirect
+	github.com/moby/sys/sequential v0.6.0 // indirect
+	github.com/moby/sys/user v0.4.0 // indirect
 	github.com/moby/sys/userns v0.1.0 // indirect
-	github.com/moby/term v0.5.0 // indirect
-	github.com/morikuni/aec v1.0.0 // indirect
+	github.com/moby/term v0.5.2 // indirect
+	github.com/morikuni/aec v1.1.0 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
-	github.com/opencontainers/image-spec v1.1.0 // indirect
+	github.com/opencontainers/image-spec v1.1.1 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
-	github.com/rogpeppe/go-internal v1.14.1 // indirect
-	github.com/shirou/gopsutil/v3 v3.23.12 // indirect
-	github.com/shoenig/go-m1cpu v0.1.6 // indirect
+	github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
+	github.com/shirou/gopsutil/v4 v4.25.12 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
-	github.com/testcontainers/testcontainers-go v0.35.0 // indirect
-	github.com/tklauser/go-sysconf v0.3.12 // indirect
-	github.com/tklauser/numcpus v0.6.1 // indirect
-	github.com/yusufpapurcu/wmi v1.2.3 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
-	go.opentelemetry.io/otel v1.24.0 // indirect
-	go.opentelemetry.io/otel/metric v1.24.0 // indirect
-	go.opentelemetry.io/otel/trace v1.24.0 // indirect
-	golang.org/x/crypto v0.36.0 // indirect
-	golang.org/x/sync v0.12.0 // indirect
-	golang.org/x/sys v0.32.0 // indirect
-	golang.org/x/text v0.23.0 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20240318140521-94a12d6c2237 // indirect
+	github.com/testcontainers/testcontainers-go v0.40.0 // indirect
+	github.com/tklauser/go-sysconf v0.3.16 // indirect
+	github.com/tklauser/numcpus v0.11.0 // indirect
+	github.com/yusufpapurcu/wmi v1.2.4 // indirect
+	go.opentelemetry.io/auto/sdk v1.2.1 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.64.0 // indirect
+	go.opentelemetry.io/otel v1.39.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.39.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.39.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.39.0 // indirect
+	go.opentelemetry.io/otel/metric v1.39.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.39.0 // indirect
+	go.opentelemetry.io/otel/trace v1.39.0 // indirect
+	go.opentelemetry.io/proto/otlp v1.9.0 // indirect
+	golang.org/x/crypto v0.46.0 // indirect
+	golang.org/x/net v0.48.0 // indirect
+	golang.org/x/sync v0.19.0 // indirect
+	golang.org/x/sys v0.40.0 // indirect
+	golang.org/x/text v0.33.0 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20251222181119-0a764e51fe1b // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20251222181119-0a764e51fe1b // indirect
+	google.golang.org/grpc v1.78.0 // indirect
+	google.golang.org/protobuf v1.36.11 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )