Merge pull request #97 from mutablelogic/v5

Add multipart forms

Author: djthorpe

cmd/server/main.go

@@ -18,6 +18,7 @@ import (
 
 type CLI struct {
 	ServiceCommands
+	Service2Commands
 
 	PG struct {
 		pgmanager.DatabaseCommands

cmd/server/service.go

@@ -10,11 +10,7 @@ import (
 	// Packages
 	server "github.com/mutablelogic/go-server"
 	helloworld "github.com/mutablelogic/go-server/npm/helloworld"
-	auth_schema "github.com/mutablelogic/go-server/pkg/auth/schema"
-	cert_schema "github.com/mutablelogic/go-server/pkg/cert/schema"
 	httpresponse "github.com/mutablelogic/go-server/pkg/httpresponse"
-	pgmanager_schema "github.com/mutablelogic/go-server/pkg/pgmanager/schema"
-	pgqueue_schema "github.com/mutablelogic/go-server/pkg/pgqueue/schema"
 	provider "github.com/mutablelogic/go-server/pkg/provider"
 	ref "github.com/mutablelogic/go-server/pkg/ref"
 	types "github.com/mutablelogic/go-server/pkg/types"
@@ -27,6 +23,7 @@ import (
 	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"
 )
@@ -116,7 +113,6 @@ func (cmd *ServiceRunCommand) Run(app server.Cmd) error {
 		pgpool := config.(*pg.Config)
 
 		// Set router
-		pgpool.Prefix = pgmanager_schema.APIPrefix
 		if router, ok := provider.Task(ctx, "httprouter.main").(server.HTTPRouter); !ok || router == nil {
 			return httpresponse.ErrInternalError.With("Invalid router")
 		} else {
@@ -141,7 +137,6 @@ func (cmd *ServiceRunCommand) Run(app server.Cmd) error {
 		auth := config.(*auth.Config)
 
 		// Set the router
-		auth.Prefix = auth_schema.APIPrefix
 		if router, ok := ref.Provider(ctx).Task(ctx, "httprouter.main").(server.HTTPRouter); !ok || router == nil {
 			return httpresponse.ErrInternalError.With("Invalid router")
 		} else {
@@ -162,7 +157,6 @@ func (cmd *ServiceRunCommand) Run(app server.Cmd) error {
 		pgqueue := config.(*pgqueue.Config)
 
 		// Set the router
-		pgqueue.Prefix = pgqueue_schema.APIPrefix
 		if router, ok := ref.Provider(ctx).Task(ctx, "httprouter.main").(server.HTTPRouter); !ok || router == nil {
 			return httpresponse.ErrInternalError.With("Invalid router")
 		} else {
@@ -182,7 +176,6 @@ func (cmd *ServiceRunCommand) Run(app server.Cmd) error {
 		certmanager := config.(*cert.Config)
 
 		// Set the router
-		certmanager.Prefix = cert_schema.APIPrefix
 		if router, ok := ref.Provider(ctx).Task(ctx, "httprouter.main").(server.HTTPRouter); !ok || router == nil {
 			return httpresponse.ErrInternalError.With("Invalid router")
 		} else {
@@ -228,6 +221,19 @@ 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
 	}

cmd/server/service2.go

@@ -0,0 +1,48 @@
+package main
+
+import (
+
+	// Packages
+	server "github.com/mutablelogic/go-server"
+	provider "github.com/mutablelogic/go-server/pkg/provider"
+	parser "github.com/mutablelogic/go-server/pkg/provider/parser"
+)
+
+///////////////////////////////////////////////////////////////////////////////
+// TYPES
+
+type Service2Commands struct {
+	//	Run  ServiceRunCommand  `cmd:"" group:"SERVICE" help:"Run the service"`
+	Run2 Service2RunCommand `cmd:"" group:"SERVICE" help:"Run the service with plugins"`
+}
+
+type Service2RunCommand struct {
+	Plugins []string `help:"Plugin paths" env:"PLUGIN_PATH"`
+	Args    []string `arg:"" help:"Configuration files"`
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// PUBLIC METHODS
+
+func (cmd *Service2RunCommand) Run(app server.Cmd) error {
+	// Create a provider by loading the plugins
+	provider, err := provider.NewWithPlugins(cmd.Plugins...)
+	if err != nil {
+		return err
+	}
+
+	// Create a parser of the config files
+	parser, err := parser.New(provider.Plugins()...)
+	if err != nil {
+		return err
+	}
+
+	// Parse the configuration files
+	for _, path := range cmd.Args {
+		if err := parser.Parse(path); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}

etc/testdata/httpserver.json

@@ -0,0 +1,8 @@
+{
+    "httpserver": {
+        "main": {
+            "port": 8080,
+            "host": "localhost"
+        }
+    }
+}

npm/helloworld/package.json

@@ -4,13 +4,15 @@
     "description": "Static files",
     "main": "dist/index.js",
     "scripts": {
-        "dev": "esbuild src/index.ts src/index.html --bundle --loader:.html=copy --watch --outdir=dist --allow-overwrite --servedir=dist --banner:js=\"document.addEventListener('DOMContentLoaded', () => { new EventSource('/esbuild').addEventListener('change', () => location.reload()) });\"",
-        "dist": "rm -fr dist && install -d dist && esbuild src/index.ts src/index.html --bundle --sourcemap --loader:.html=copy --outdir=dist --allow-overwrite",
+        "dev": "esbuild src/index.ts src/index.html --bundle --loader:.html=copy --loader:.ttf=file --loader:.svg=file --watch --outdir=dist --allow-overwrite --servedir=dist --banner:js=\"document.addEventListener('DOMContentLoaded', () => { new EventSource('/esbuild').addEventListener('change', () => location.reload()) });\"",
+        "dist": "rm -fr dist && install -d dist && esbuild src/index.ts src/index.html --bundle --sourcemap --loader:.html=copy --loader:.ttf=file --loader:.svg=file --outdir=dist --allow-overwrite",
         "clean": "rm -fr dist"
     },
     "dependencies": {
-        "tslib": "^2.5.2",
-        "lit":"^3.3.0"
+        "bootstrap-icons": "^1.13.1",
+        "echarts": "^5.6.0",
+        "lit": "^3.3.0",
+        "tslib": "^2.5.2"
     },
     "devDependencies": {
         "esbuild": "^0.25.3",