Merge pull request #25 from devilcove/reorg

Internal dir
devilcove · Apr 17, 2024 · 42bf522 · 42bf522
2 parents 0616a0a + 7161d86
commit 42bf522
Show file tree

Hide file tree

Showing 76 changed files with 173 additions and 172 deletions.
diff --git a/app/plexus-agent/cmd/drop.go b/app/plexus-agent/cmd/drop.go
@@ -19,7 +19,7 @@ import (
 	"fmt"
 
 	"github.com/devilcove/plexus"
-	"github.com/devilcove/plexus/agent"
+	"github.com/devilcove/plexus/internal/agent"
 	"github.com/spf13/cobra"
 )
 

diff --git a/app/plexus-agent/cmd/join.go b/app/plexus-agent/cmd/join.go
@@ -19,7 +19,7 @@ import (
 	"fmt"
 
 	"github.com/devilcove/plexus"
-	"github.com/devilcove/plexus/agent"
+	"github.com/devilcove/plexus/internal/agent"
 	"github.com/spf13/cobra"
 )
 

diff --git a/app/plexus-agent/cmd/leave.go b/app/plexus-agent/cmd/leave.go
@@ -19,7 +19,7 @@ import (
 	"fmt"
 
 	"github.com/devilcove/plexus"
-	"github.com/devilcove/plexus/agent"
+	"github.com/devilcove/plexus/internal/agent"
 	"github.com/spf13/cobra"
 )
 

diff --git a/app/plexus-agent/cmd/loglevel.go b/app/plexus-agent/cmd/loglevel.go
@@ -20,7 +20,7 @@ import (
 	"strings"
 
 	"github.com/devilcove/plexus"
-	"github.com/devilcove/plexus/agent"
+	"github.com/devilcove/plexus/internal/agent"
 	"github.com/spf13/cobra"
 )
 

diff --git a/app/plexus-agent/cmd/register.go b/app/plexus-agent/cmd/register.go
@@ -19,7 +19,7 @@ import (
 	"fmt"
 
 	"github.com/devilcove/plexus"
-	"github.com/devilcove/plexus/agent"
+	"github.com/devilcove/plexus/internal/agent"
 	"github.com/spf13/cobra"
 )
 

diff --git a/app/plexus-agent/cmd/reload.go b/app/plexus-agent/cmd/reload.go
@@ -19,7 +19,7 @@ import (
 	"fmt"
 
 	"github.com/devilcove/plexus"
-	"github.com/devilcove/plexus/agent"
+	"github.com/devilcove/plexus/internal/agent"
 	"github.com/spf13/cobra"
 )
 

diff --git a/app/plexus-agent/cmd/reset.go b/app/plexus-agent/cmd/reset.go
@@ -19,7 +19,7 @@ import (
 	"fmt"
 
 	"github.com/devilcove/plexus"
-	"github.com/devilcove/plexus/agent"
+	"github.com/devilcove/plexus/internal/agent"
 	"github.com/spf13/cobra"
 )
 

diff --git a/app/plexus-agent/cmd/root.go b/app/plexus-agent/cmd/root.go
@@ -22,7 +22,7 @@ import (
 	"os"
 	"runtime/debug"
 
-	"github.com/devilcove/plexus/agent"
+	"github.com/devilcove/plexus/internal/agent"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 )

diff --git a/app/plexus-agent/cmd/run.go b/app/plexus-agent/cmd/run.go
@@ -18,7 +18,7 @@ package cmd
 import (
 	"fmt"
 
-	"github.com/devilcove/plexus/agent"
+	"github.com/devilcove/plexus/internal/agent"
 	"github.com/spf13/cobra"
 )
 

diff --git a/app/plexus-agent/cmd/status.go b/app/plexus-agent/cmd/status.go
@@ -23,7 +23,7 @@ import (
 	"time"
 
 	"github.com/devilcove/plexus"
-	"github.com/devilcove/plexus/agent"
+	"github.com/devilcove/plexus/internal/agent"
 	"github.com/kr/pretty"
 	"github.com/spf13/cobra"
 	"github.com/vishvananda/netlink"

diff --git a/app/plexus-agent/cmd/version.go b/app/plexus-agent/cmd/version.go
@@ -21,7 +21,7 @@ import (
 	"strings"
 
 	"github.com/devilcove/plexus"
-	"github.com/devilcove/plexus/agent"
+	"github.com/devilcove/plexus/internal/agent"
 	"github.com/spf13/cobra"
 )
 

diff --git a/app/plexus-server/main.go b/app/plexus-server/main.go
@@ -1,114 +1,7 @@
 package main
 
-import (
-	"context"
-	"crypto/tls"
-	"log/slog"
-	"net/http"
-	"os"
-	"os/signal"
-	"sync"
-	"syscall"
-
-	"github.com/devilcove/boltdb"
-	"github.com/nats-io/nats-server/v2/server"
-	"github.com/nats-io/nats.go"
-)
-
-var (
-	newDevice   chan string
-	brokerfail  chan int
-	webfail     chan int
-	natServer   *server.Server
-	natsOptions *server.Options
-	natsConn    *nats.Conn
-	eConn       *nats.EncodedConn
-)
+import "github.com/devilcove/plexus/internal/server"
 
 func main() {
-	tlsConfig, err := configureServer()
-	if err != nil {
-		slog.Error("unable to configure server", "error", err)
-		os.Exit(1)
-	}
-	defer boltdb.Close()
-	wg := sync.WaitGroup{}
-	quit := make(chan os.Signal, 1)
-	reset := make(chan os.Signal, 1)
-	brokerfail = make(chan int, 1)
-	webfail = make(chan int, 1)
-	newDevice = make(chan string, 1)
-	signal.Notify(quit, syscall.SIGTERM, os.Interrupt)
-	signal.Notify(reset, syscall.SIGHUP)
-	ctx, cancel := context.WithCancel(context.Background())
-	start(ctx, &wg, tlsConfig)
-	for {
-		select {
-		case <-quit:
-			slog.Info("Shutting down...")
-			cancel()
-			wg.Wait()
-			return
-		case <-reset:
-			slog.Info("reset...")
-			cancel()
-			wg.Wait()
-			ctx, cancel = context.WithCancel(context.Background())
-			start(ctx, &wg, tlsConfig)
-		case <-brokerfail:
-			slog.Error("error running broker .... shutting down")
-			cancel()
-			wg.Wait()
-			os.Exit(1)
-		case <-webfail:
-			slog.Error("error running web .... shutting down")
-			cancel()
-			wg.Wait()
-			os.Exit(2)
-		}
-	}
-}
-
-func start(ctx context.Context, wg *sync.WaitGroup, tls *tls.Config) {
-	wg.Add(2)
-	go web(ctx, wg, tls)
-	go broker(ctx, wg, tls)
-}
-
-func web(ctx context.Context, wg *sync.WaitGroup, tls *tls.Config) {
-	defer wg.Done()
-	slog.Info("Starting web server...")
-	router := setupRouter()
-	server := http.Server{
-		Addr:    ":" + config.Port,
-		Handler: router,
-	}
-	if config.Secure {
-		if tls == nil {
-			slog.Error("secure set but tls nil")
-			webfail <- 1
-		}
-		server.TLSConfig = tls
-		server.Addr = ":443"
-		go func() {
-			if err := server.ListenAndServeTLS("", ""); err != nil && err != http.ErrServerClosed {
-				slog.Error("https server", "error", err)
-				webfail <- 1
-			}
-		}()
-	} else {
-		go func() {
-			if err := server.ListenAndServe(); err != nil && err != http.ErrServerClosed {
-				slog.Error("http server", "error", err)
-				webfail <- 1
-			}
-		}()
-	}
-	slog.Info("web server started")
-	<-ctx.Done()
-	slog.Info("shutting down web server")
-	if err := server.Shutdown(ctx); err != nil {
-		slog.Error("http server shutdown", "error", err.Error())
-	}
-	slog.Info("http server shutdown")
+	server.Run()
 }
diff --git a/app/plexus-server/server.go b/app/plexus-server/server.go
diff --git a/agent/broker.go → internal/agent/broker.go b/agent/broker.go → internal/agent/broker.go
diff --git a/agent/config.go → internal/agent/config.go b/agent/config.go → internal/agent/config.go
diff --git a/agent/daemon.go → internal/agent/daemon.go b/agent/daemon.go → internal/agent/daemon.go
diff --git a/agent/handlers.go → internal/agent/handlers.go b/agent/handlers.go → internal/agent/handlers.go
diff --git a/agent/interface.go → internal/agent/interface.go b/agent/interface.go → internal/agent/interface.go
diff --git a/agent/join_test.go → internal/agent/join_test.go b/agent/join_test.go → internal/agent/join_test.go
diff --git a/agent/models.go → internal/agent/models.go b/agent/models.go → internal/agent/models.go
diff --git a/agent/networks.go → internal/agent/networks.go b/agent/networks.go → internal/agent/networks.go
diff --git a/agent/nftables.go → internal/agent/nftables.go b/agent/nftables.go → internal/agent/nftables.go
diff --git a/agent/nftables_test.go → internal/agent/nftables_test.go b/agent/nftables_test.go → internal/agent/nftables_test.go
diff --git a/agent/publish.go → internal/agent/publish.go b/agent/publish.go → internal/agent/publish.go
diff --git a/agent/register.go → internal/agent/register.go b/agent/register.go → internal/agent/register.go
diff --git a/app/plexus-server/assets/css/brands.min.css → internal/server/assets/css/brands.min.css b/app/plexus-server/assets/css/brands.min.css → internal/server/assets/css/brands.min.css
diff --git a/...xus-server/assets/css/fontawesome.min.css → ...nal/server/assets/css/fontawesome.min.css b/...xus-server/assets/css/fontawesome.min.css → ...nal/server/assets/css/fontawesome.min.css
diff --git a/app/plexus-server/assets/css/solid.min.css → internal/server/assets/css/solid.min.css b/app/plexus-server/assets/css/solid.min.css → internal/server/assets/css/solid.min.css
diff --git a/...erver/assets/webfonts/fa-brands-400.woff2 → ...erver/assets/webfonts/fa-brands-400.woff2 b/...erver/assets/webfonts/fa-brands-400.woff2 → ...erver/assets/webfonts/fa-brands-400.woff2
diff --git a/...rver/assets/webfonts/fa-regular-400.woff2 → ...rver/assets/webfonts/fa-regular-400.woff2 b/...rver/assets/webfonts/fa-regular-400.woff2 → ...rver/assets/webfonts/fa-regular-400.woff2
diff --git a/...server/assets/webfonts/fa-solid-900.woff2 → ...server/assets/webfonts/fa-solid-900.woff2 b/...server/assets/webfonts/fa-solid-900.woff2 → ...server/assets/webfonts/fa-solid-900.woff2
diff --git a/app/plexus-server/broker.go → internal/server/broker.go b/app/plexus-server/broker.go → internal/server/broker.go
@@ -1,4 +1,4 @@
-package main
+package server
 
 import (
 	"context"

diff --git a/app/plexus-server/config.go → internal/server/config.go b/app/plexus-server/config.go → internal/server/config.go
@@ -1,4 +1,4 @@
-package main
+package server
 
 import (
 	"crypto/tls"

diff --git a/app/plexus-server/config_test.go → internal/server/config_test.go b/app/plexus-server/config_test.go → internal/server/config_test.go
@@ -1,4 +1,4 @@
-package main
+package server
 
 import (
 	"testing"

diff --git a/app/plexus-server/html/about.html → internal/server/html/about.html b/app/plexus-server/html/about.html → internal/server/html/about.html
diff --git a/app/plexus-server/html/content.html → internal/server/html/content.html b/app/plexus-server/html/content.html → internal/server/html/content.html
diff --git a/app/plexus-server/html/error.html → internal/server/html/error.html b/app/plexus-server/html/error.html → internal/server/html/error.html
diff --git a/app/plexus-server/html/header.html → internal/server/html/header.html b/app/plexus-server/html/header.html → internal/server/html/header.html
diff --git a/app/plexus-server/html/keys.html → internal/server/html/keys.html b/app/plexus-server/html/keys.html → internal/server/html/keys.html
diff --git a/app/plexus-server/html/layout.html → internal/server/html/layout.html b/app/plexus-server/html/layout.html → internal/server/html/layout.html
diff --git a/app/plexus-server/html/login.html → internal/server/html/login.html b/app/plexus-server/html/login.html → internal/server/html/login.html
diff --git a/app/plexus-server/html/networks.html → internal/server/html/networks.html b/app/plexus-server/html/networks.html → internal/server/html/networks.html
diff --git a/app/plexus-server/html/peers.html → internal/server/html/peers.html b/app/plexus-server/html/peers.html → internal/server/html/peers.html
diff --git a/app/plexus-server/html/relay.html → internal/server/html/relay.html b/app/plexus-server/html/relay.html → internal/server/html/relay.html
diff --git a/app/plexus-server/html/router.html → internal/server/html/router.html b/app/plexus-server/html/router.html → internal/server/html/router.html
diff --git a/app/plexus-server/html/server.html → internal/server/html/server.html b/app/plexus-server/html/server.html → internal/server/html/server.html
diff --git a/app/plexus-server/html/sidebar.html → internal/server/html/sidebar.html b/app/plexus-server/html/sidebar.html → internal/server/html/sidebar.html
diff --git a/app/plexus-server/html/users.html → internal/server/html/users.html b/app/plexus-server/html/users.html → internal/server/html/users.html
diff --git a/app/plexus-server/images/attribution.txt → internal/server/images/attribution.txt b/app/plexus-server/images/attribution.txt → internal/server/images/attribution.txt
diff --git a/app/plexus-server/images/connect-green.svg → internal/server/images/connect-green.svg b/app/plexus-server/images/connect-green.svg → internal/server/images/connect-green.svg
diff --git a/app/plexus-server/images/connect-red.svg → internal/server/images/connect-red.svg b/app/plexus-server/images/connect-red.svg → internal/server/images/connect-red.svg
diff --git a/app/plexus-server/images/global_network.png → internal/server/images/global_network.png b/app/plexus-server/images/global_network.png → internal/server/images/global_network.png
diff --git a/app/plexus-server/images/global_network.svg → internal/server/images/global_network.svg b/app/plexus-server/images/global_network.svg → internal/server/images/global_network.svg
diff --git a/app/plexus-server/images/icon.svg → internal/server/images/icon.svg b/app/plexus-server/images/icon.svg → internal/server/images/icon.svg
diff --git a/app/plexus-server/images/network-green.svg → internal/server/images/network-green.svg b/app/plexus-server/images/network-green.svg → internal/server/images/network-green.svg
diff --git a/app/plexus-server/images/network-orange.svg → internal/server/images/network-orange.svg b/app/plexus-server/images/network-orange.svg → internal/server/images/network-orange.svg
diff --git a/app/plexus-server/images/network-red.svg → internal/server/images/network-red.svg b/app/plexus-server/images/network-red.svg → internal/server/images/network-red.svg
diff --git a/app/plexus-server/images/network-yellow.svg → internal/server/images/network-yellow.svg b/app/plexus-server/images/network-yellow.svg → internal/server/images/network-yellow.svg
diff --git a/app/plexus-server/images/plexus.png → internal/server/images/plexus.png b/app/plexus-server/images/plexus.png → internal/server/images/plexus.png
diff --git a/app/plexus-server/images/plexus.svg → internal/server/images/plexus.svg b/app/plexus-server/images/plexus.svg → internal/server/images/plexus.svg
diff --git a/app/plexus-server/keys.go → internal/server/keys.go b/app/plexus-server/keys.go → internal/server/keys.go
@@ -1,4 +1,4 @@
-package main
+package server
 
 import (
 	"encoding/base64"

diff --git a/app/plexus-server/keys_test.go → internal/server/keys_test.go b/app/plexus-server/keys_test.go → internal/server/keys_test.go
@@ -1,4 +1,4 @@
-package main
+package server
 
 import (
 	"bytes"

diff --git a/app/plexus-server/nathandlers.go → internal/server/nathandlers.go b/app/plexus-server/nathandlers.go → internal/server/nathandlers.go
@@ -1,4 +1,4 @@
-package main
+package server
 
 import (
 	"errors"

diff --git a/app/plexus-server/nathandlers_test.go → internal/server/nathandlers_test.go b/app/plexus-server/nathandlers_test.go → internal/server/nathandlers_test.go
@@ -1,4 +1,4 @@
-package main
+package server
 
 import (
 	"net"

diff --git a/app/plexus-server/network_test.go → internal/server/network_test.go b/app/plexus-server/network_test.go → internal/server/network_test.go
@@ -1,4 +1,4 @@
-package main
+package server
 
 import (
 	"bytes"

diff --git a/app/plexus-server/networks.go → internal/server/networks.go b/app/plexus-server/networks.go → internal/server/networks.go
@@ -1,4 +1,4 @@
-package main
+package server
 
 import (
 	"encoding/json"

diff --git a/app/plexus-server/page.go → internal/server/page.go b/app/plexus-server/page.go → internal/server/page.go
@@ -1,4 +1,4 @@
-package main
+package server
 
 import (
 	"log/slog"

diff --git a/app/plexus-server/page_test.go → internal/server/page_test.go b/app/plexus-server/page_test.go → internal/server/page_test.go
@@ -1,4 +1,4 @@
-package main
+package server
 
 import (
 	"bytes"

diff --git a/app/plexus-server/peers.go → internal/server/peers.go b/app/plexus-server/peers.go → internal/server/peers.go
@@ -1,4 +1,4 @@
-package main
+package server
 
 import (
 	"encoding/json"

diff --git a/app/plexus-server/publish.go → internal/server/publish.go b/app/plexus-server/publish.go → internal/server/publish.go
@@ -1,4 +1,4 @@
-package main
+package server
 
 import (
 	"errors"

diff --git a/app/plexus-server/router.go → internal/server/router.go b/app/plexus-server/router.go → internal/server/router.go
@@ -1,4 +1,4 @@
-package main
+package server
 
 import (
 	"crypto/rand"

diff --git a/app/plexus-server/router_test.go → internal/server/router_test.go b/app/plexus-server/router_test.go → internal/server/router_test.go
@@ -1,4 +1,4 @@
-package main
+package server
 
 import (
 	"io"