refactor: migrate to new configuration system and model definitions

Makefile

@@ -308,15 +308,13 @@ sh-testnet: mod-tidy
 ###############################################################################
 .PHONY: gen-pkl gen-templ
 
-gen-pkl:
-	go install github.com/apple/pkl-go/cmd/pkl-gen-go@latest
-	pkl-gen-go pkl/sonr.motr/ATN.pkl
-	pkl-gen-go pkl/sonr.hway/Env.pkl
-	pkl-gen-go pkl/sonr.motr/DWN.pkl
-	pkl-gen-go pkl/sonr.hway/ORM.pkl
-
-gen-templ:
-	@go install github.com/a-h/templ/cmd/templ@latest
+gen-pkl: init-env
+	pkl-gen-go pkl/sonr.orm/UCAN.pkl
+	pkl-gen-go pkl/sonr.orm/Models.pkl
+	pkl-gen-go pkl/sonr.conf/Hway.pkl
+	pkl-gen-go pkl/sonr.conf/Motr.pkl
+
+gen-templ: init-env
 	templ generate
 
 

cmd/hway/cmds.go

@@ -10,8 +10,8 @@ import (
 	"github.com/labstack/echo/v4/middleware"
 	"github.com/onsonr/sonr/crypto/ucan"
 	"github.com/onsonr/sonr/internal/gateway"
-	"github.com/onsonr/sonr/internal/gateway/config"
 	"github.com/onsonr/sonr/pkg/common/ipfs"
+	config "github.com/onsonr/sonr/pkg/config/hway"
 	"github.com/onsonr/sonr/pkg/database/sessions"
 	"github.com/onsonr/sonr/pkg/didauth/producer"
 	"github.com/spf13/cobra"
@@ -60,13 +60,13 @@ func rootCmd() *cobra.Command {
 	return cmd
 }
 
-func loadEnvImplFromArgs(args []string) (config.Env, error) {
+func loadEnvImplFromArgs(args []string) (config.Hway, error) {
 	cmd := rootCmd()
 	if err := cmd.ParseFlags(args); err != nil {
 		return nil, err
 	}
 
-	env := &config.EnvImpl{
+	env := &config.HwayImpl{
 		ServePort:      servePort,
 		ConfigDir:      configDir,
 		SqliteFile:     sqliteFile,
@@ -80,7 +80,7 @@ func loadEnvImplFromArgs(args []string) (config.Env, error) {
 }
 
 // setupServer sets up the server
-func setupServer(env config.Env) (*echo.Echo, error) {
+func setupServer(env config.Hway) (*echo.Echo, error) {
 	ipc, err := ipfs.NewClient()
 	if err != nil {
 		return nil, err

internal/vault/context/middleware.go

@@ -5,8 +5,8 @@ import (
 	"net/http"
 
 	"github.com/labstack/echo/v4"
+	config "github.com/onsonr/sonr/pkg/config/motr"
 
-	"github.com/onsonr/sonr/internal/vault/types"
 	"github.com/onsonr/sonr/pkg/common"
 )
 
@@ -33,7 +33,7 @@ func Get(c echo.Context) (SessionCtx, error) {
 }
 
 // WebNodeMiddleware establishes a Session Cookie.
-func Middleware(config *types.Config) echo.MiddlewareFunc {
+func Middleware(config *config.Config) echo.MiddlewareFunc {
 	return func(next echo.HandlerFunc) echo.HandlerFunc {
 		return func(c echo.Context) error {
 			err := injectConfig(c, config)
@@ -46,7 +46,7 @@ func Middleware(config *types.Config) echo.MiddlewareFunc {
 	}
 }
 
-func injectConfig(c echo.Context, config *types.Config) error {
+func injectConfig(c echo.Context, config *config.Config) error {
 	common.HeaderWrite(c, common.SonrAPIURL, config.SonrApiUrl)
 	common.HeaderWrite(c, common.SonrRPCURL, config.SonrRpcUrl)
 

internal/vault/config/fs.go → internal/vault/embed/fs.go

@@ -1,10 +1,10 @@
-package config
+package embed
 
 import (
 	"encoding/json"
 
 	"github.com/ipfs/boxo/files"
-	"github.com/onsonr/sonr/internal/vault/embed"
+	config "github.com/onsonr/sonr/pkg/config/motr"
 )
 
 const SchemaVersion = 1
@@ -17,7 +17,7 @@ const (
 )
 
 // spawnVaultDirectory creates a new directory with the default files
-func NewVaultFS(cfg *Config) (files.Directory, error) {
+func NewVaultFS(cfg *config.Config) (files.Directory, error) {
 	manifestBz, err := newWebManifestBytes()
 	if err != nil {
 		return nil, err
@@ -29,15 +29,15 @@ func NewVaultFS(cfg *Config) (files.Directory, error) {
 	return files.NewMapDirectory(map[string]files.Node{
 		AppManifestFileName:   files.NewBytesFile(manifestBz),
 		DWNConfigFileName:     files.NewBytesFile(cnfBz),
-		IndexHTMLFileName:     files.NewBytesFile(embed.IndexHTML),
-		MainJSFileName:        files.NewBytesFile(embed.MainJS),
-		ServiceWorkerFileName: files.NewBytesFile(embed.WorkerJS),
+		IndexHTMLFileName:     files.NewBytesFile(IndexHTML),
+		MainJSFileName:        files.NewBytesFile(MainJS),
+		ServiceWorkerFileName: files.NewBytesFile(WorkerJS),
 	}), nil
 }
 
 // NewVaultConfig returns the default vault config
-func NewVaultConfig(addr string, ucanCID string) *Config {
-	return &Config{
+func NewVaultConfig(addr string, ucanCID string) *config.Config {
+	return &config.Config{
 		MotrToken:      ucanCID,
 		MotrAddress:    addr,
 		IpfsGatewayUrl: "http://localhost:80",

internal/vault/config/manifest.go → internal/vault/embed/manifest.go

@@ -1,4 +1,4 @@
-package config
+package embed
 
 import "encoding/json"
 

internal/vault/config/schema.go → internal/vault/embed/schema.go

@@ -1,15 +1,16 @@
-package config
+package embed
 
 import (
 	"reflect"
 	"strings"
 
 	"github.com/onsonr/sonr/pkg/common/models"
+	config "github.com/onsonr/sonr/pkg/config/motr"
 )
 
 // DefaultSchema returns the default schema
-func DefaultSchema() *Schema {
-	return &Schema{
+func DefaultSchema() *config.Schema {
+	return &config.Schema{
 		Version:    SchemaVersion,
 		Account:    getSchema(&models.Account{}),
 		Asset:      getSchema(&models.Asset{}),