refactor: restructure application for WASM compatibility

Author: Prad N

.taskfile.dist.yml

@@ -107,7 +107,7 @@ tasks:
 
   gen:sqlc:
     internal: true
-    dir: sink
+    dir: pkg/sqlite/internal
     sources:
       - pkg/sink/query.sql
       - pkg/sink/schema.sql

app/app.go

@@ -3,16 +3,47 @@
 package app
 
 import (
+	"net/http"
+	"strings"
+	"syscall/js"
+
 	"github.com/onsonr/motr/app/handlers"
 	"github.com/onsonr/motr/app/routes"
-	"github.com/onsonr/motr/pkg/context"
-	"github.com/onsonr/motr/pkg/models"
-	"github.com/onsonr/motr/pkg/server"
+	"github.com/onsonr/motr/internal/server"
+	"github.com/onsonr/motr/internal/worker"
 )
 
-// New returns a new Vault instance
-func New(config *context.Config, dbq *models.Queries) (*server.Server, error) {
-	e := server.New(config, handlers.GlobalErrorHandler())
-	routes.RegisterRoutes(e.Echo)
-	return e, nil
+// Start returns a new Vault instance
+func Start(s *server.Server) func() {
+	s.Echo.HTTPErrorHandler = handlers.GlobalErrorHandler()
+	routes.Register(s.Echo)
+	return serveFetch(s.Echo)
+}
+
+// serveFetch serves HTTP requests with optimized handler management
+func serveFetch(handler http.Handler) func() {
+	h := handler
+	if h == nil {
+		h = http.DefaultServeMux
+	}
+
+	// Optimize prefix handling
+	prefix := strings.TrimRight(worker.JSWasmHTTP.Get("path").String(), "/")
+	if prefix != "" {
+		mux := http.NewServeMux()
+		mux.Handle(prefix+"/", http.StripPrefix(prefix, h))
+		h = mux
+	}
+
+	// Create request handler function
+	cb := js.FuncOf(func(_ js.Value, args []js.Value) any {
+		promise, resolve, reject := worker.NewPromiseOptimized()
+
+		go worker.HandleRequest(h, args[1], resolve, reject)
+
+		return promise
+	})
+
+	worker.JSWasmHTTP.Call("setHandler", cb)
+	return cb.Release
 }

app/handlers/index_handler.go

@@ -1,6 +1,3 @@
-//go:build js && wasm
-// +build js,wasm
-
 package handlers
 
 import (
@@ -54,6 +51,6 @@ func RedirectUserProfile(c echo.Context) error {
 }
 
 // ShowMintSuccess renders a Modal with the user's new Vault information
-func ShowMintSuccess(c echo.Context) error {
+func ShowRegisterSuccess(c echo.Context) error {
 	return nil
 }

app/routes/groups.go

@@ -0,0 +1,48 @@
+//go:build js && wasm
+// +build js,wasm
+
+package routes
+
+import (
+	"github.com/labstack/echo/v4"
+	"github.com/onsonr/motr/app/handlers"
+)
+
+// setAuthorizeGroup creates a new group for the Authorize route
+func setAuthorizeGroup(g *echo.Group) {
+	g.GET("/", handlers.InitialAuthorizeView)
+	g.POST("/:service", handlers.HandleAuthorizationSubmit)
+}
+
+// setLoginGroup creates a new group for the Login route
+func setLoginGroup(g *echo.Group) {
+	g.GET("/", handlers.InitialAuthorizeView)
+	g.POST("/:service", handlers.HandleAuthorizationSubmit)
+}
+
+// setRegisterGroup creates a new group for the Register route
+func setRegisterGroup(g *echo.Group) {
+	g.GET("/", handlers.InitialRegistrationView)
+	g.POST("/:handle", handlers.GetRegistrationOptions)
+	g.GET("/:handle", handlers.RegisterUserView)
+	g.POST("/:handle/submit", handlers.HandleAttestationSubmit)
+	g.GET("/:handle/success", handlers.ShowRegisterSuccess)
+}
+
+// setSearchGroup creates a new group for the Search route
+func setSearchGroup(g *echo.Group) {
+	g.GET("/", handlers.InitialRegistrationView)
+	g.POST("/:handle", handlers.GetRegistrationOptions)
+	g.GET("/:handle", handlers.RegisterUserView)
+	g.POST("/:handle/submit", handlers.HandleAttestationSubmit)
+	g.GET("/:handle/success", handlers.ShowRegisterSuccess)
+}
+
+// setWalletGroup creates a new group for the Wallet route
+func setWalletGroup(g *echo.Group) {
+	g.GET("/", handlers.InitialRegistrationView)
+	g.POST("/:handle", handlers.GetRegistrationOptions)
+	g.GET("/:handle", handlers.RegisterUserView)
+	g.POST("/:handle/submit", handlers.HandleAttestationSubmit)
+	g.GET("/:handle/success", handlers.ShowRegisterSuccess)
+}

app/routes/routes.go

@@ -5,62 +5,24 @@ package routes
 
 import (
 	"github.com/labstack/echo/v4"
-	"github.com/onsonr/motr/app/handlers"
 )
 
-// RegisterRoutes registers all the routes for the application
-func RegisterRoutes(e *echo.Echo) {
-	// Authorization Routes
-	e.GET("/authorize", handlers.InitialAuthorizeView)
-	e.POST("/authorize/:service", handlers.HandleAuthorizationSubmit)
-
-	// Login Routes
-	e.GET("/login", handlers.InitialLoginView)
-	e.GET("/login/:handle", handlers.LoginUserView)
-	e.POST("/login/:handle/submit", handlers.HandleAssertionSubmit)
-
-	// Register Routes
-	e.GET("/register", handlers.InitialRegistrationView)
-	e.GET("/register/:handle", handlers.RegisterUserView)
-	e.POST("/register/:handle/submit", handlers.HandleAttestationSubmit)
-	e.GET("/register/:handle/success", handlers.ShowMintSuccess)
+// Register registers all the routes for the application
+func Register(e *echo.Echo) {
+	// Handle Index
+	e.GET("/", indexHandler)
+
+	// Grouped Routes
+	setAuthorizeGroup(e.Group("/authorize"))
+	setLoginGroup(e.Group("/login"))
+	setRegisterGroup(e.Group("/register"))
+	setSearchGroup(e.Group("/search"))
+	setWalletGroup(e.Group("/wallet"))
 }
 
-// NewAuthorizeGroup creates a new group for the Authorize route
-func NewAuthorizeGroup(g *echo.Group) {
-	g.GET("/", handlers.InitialAuthorizeView)
-	g.POST("/:service", handlers.HandleAuthorizationSubmit)
-}
-
-// NewLoginGroup creates a new group for the Login route
-func NewLoginGroup(g *echo.Group) {
-	g.GET("/", handlers.InitialAuthorizeView)
-	g.POST("/:service", handlers.HandleAuthorizationSubmit)
-}
-
-// NewRegisterGroup creates a new group for the Register route
-func NewRegisterGroup(g *echo.Group) {
-	g.GET("/", handlers.InitialRegistrationView)
-	g.POST("/:handle", handlers.GetRegistrationOptions)
-	g.GET("/:handle", handlers.RegisterUserView)
-	g.POST("/:handle/submit", handlers.HandleAttestationSubmit)
-	g.GET("/:handle/success", handlers.ShowMintSuccess)
-}
-
-// NewSearchGroup creates a new group for the Search route
-func NewSearchGroup(g *echo.Group) {
-	g.GET("/", handlers.InitialRegistrationView)
-	g.POST("/:handle", handlers.GetRegistrationOptions)
-	g.GET("/:handle", handlers.RegisterUserView)
-	g.POST("/:handle/submit", handlers.HandleAttestationSubmit)
-	g.GET("/:handle/success", handlers.ShowMintSuccess)
-}
+// indexHandler handles the root path
+func indexHandler(c echo.Context) error {
+	// Fetch the Motr instance information
 
-// NewWalletGroup creates a new group for the Wallet route
-func NewWalletGroup(g *echo.Group) {
-	g.GET("/", handlers.InitialRegistrationView)
-	g.POST("/:handle", handlers.GetRegistrationOptions)
-	g.GET("/:handle", handlers.RegisterUserView)
-	g.POST("/:handle/submit", handlers.HandleAttestationSubmit)
-	g.GET("/:handle/success", handlers.ShowMintSuccess)
+	return c.NoContent(200)
 }

pkg/context/settings.go internal/server/config.go

@@ -1,11 +1,14 @@
-package context
+package server
+
+import "github.com/labstack/echo/v4"
 
 type Config struct {
-	// TODO
 	MotrToken      string `json:"motr_token"`
 	MotrAddress    string `json:"motr_address"`
 	IpfsGatewayURL string `json:"ipfs_gateway_url"`
 	SonrAPIURL     string `json:"sonr_api_url"`
 	SonrRPCURL     string `json:"sonr_rpc_url"`
 	SonrChainID    string `json:"sonr_chain_id"`
 }
+
+type RouteRegistrationFunc func(e *echo.Echo)

internal/server/server.go

@@ -0,0 +1,35 @@
+//go:build js && wasm
+// +build js,wasm
+
+package server
+
+import (
+	"github.com/labstack/echo/v4"
+	"github.com/labstack/echo/v4/middleware"
+	"github.com/onsonr/motr/pkg/models"
+)
+
+// Server is the application server
+type Server struct {
+	Echo   *echo.Echo
+	Config *Config
+	DB     *models.Queries
+}
+
+// New returns a new server instance
+func New(config *Config, db *models.Queries) (*Server, error) {
+	return &Server{
+		DB:     db,
+		Config: config,
+		Echo:   SetupEcho(),
+	}, nil
+}
+
+// SetupEcho sets up the echo server
+func SetupEcho() *echo.Echo {
+	e := echo.New()
+	e.IPExtractor = echo.ExtractIPDirect()
+	e.Use(middleware.Logger())
+	e.Use(middleware.Recover())
+	return e
+}

internal/sqlite/db.go

@@ -0,0 +1,32 @@
+//go:build js && wasm
+// +build js,wasm
+
+package sqlite
+
+import (
+	"context"
+	"database/sql"
+
+	_ "embed"
+
+	_ "github.com/ncruces/go-sqlite3/driver"
+	_ "github.com/ncruces/go-sqlite3/embed"
+	"github.com/onsonr/motr/pkg/models"
+)
+
+//go:embed sink/schema.sql
+var schemaVaultSQL string
+
+// SeedDB initializes and returns a configured database connection
+func SeedDB() (*models.Queries, error) {
+	db, err := sql.Open("sqlite3", ":memory:")
+	if err != nil {
+		return nil, err
+	}
+
+	// create tables
+	if _, err := db.ExecContext(context.Background(), schemaVaultSQL); err != nil {
+		return nil, err
+	}
+	return models.New(db), nil
+}