refactor: move config and models to pkg directory

Author: Prad N

app/app.go

@@ -5,16 +5,15 @@ package app
 import (
 	"github.com/labstack/echo/v4"
 	echomiddleware "github.com/labstack/echo/v4/middleware"
+	"github.com/onsonr/motr/app/context"
 	"github.com/onsonr/motr/app/routes"
-	"github.com/onsonr/motr/internal/context"
-	"github.com/onsonr/motr/internal/models"
-	"github.com/onsonr/motr/pkg/types"
+	"github.com/onsonr/motr/pkg/models"
 )
 
 type Vault = *echo.Echo
 
 // New returns a new Vault instance
-func New(config *types.Config, dbq *models.Queries) (Vault, error) {
+func New(config *context.Config, dbq *models.Queries) (Vault, error) {
 	e := echo.New()
 	// Override default behaviors
 	e.IPExtractor = echo.ExtractIPDirect()

pkg/types/config.go app/context/config.go

@@ -1,4 +1,4 @@
-package types
+package context
 
 type Config struct {
 	// TODO

embed/main.js

@@ -76,10 +76,10 @@ async function init() {
       return true;
     };
 
-    // Handle HTMX after request
-    htmx.config.afterRequest = function (config) {
-      // Additional processing after request if needed
-    };
+    // TODO: Handle HTMX after request
+    // htmx.config.afterRequest = function (config) {
+    //   // Additional processing after request if needed
+    // };
 
     // Handle HTMX errors
     htmx.config.errorHandler = function (error) {
@@ -91,7 +91,7 @@ async function init() {
 }
 
 function handleWasmResponse(data) {
-  const { requestId, response } = data;
+  const { requestId } = data;
   // Process the WASM response
   // This might update the UI or trigger HTMX swaps
   const targetElement = document.querySelector(

embed/sw.js

@@ -36,7 +36,7 @@ function setupWasmCommunication() {
 
     switch (type) {
       case "WASM_REQUEST":
-        handleWasmRequest(data);
+        handleWasmResponse(data);
         break;
       case "SYNC_REQUEST":
         processSyncQueue();

internal/context/wasm.go

@@ -19,7 +19,7 @@ import (
 	_ "github.com/ncruces/go-sqlite3/driver"
 	_ "github.com/ncruces/go-sqlite3/embed"
 	vault "github.com/onsonr/motr/app"
-	"github.com/onsonr/motr/internal/models"
+	"github.com/onsonr/motr/pkg/models"
 	sink "github.com/onsonr/motr/sink"
 )
 
@@ -94,7 +94,7 @@ func serveFetch(handler http.Handler) func() {
 	}
 
 	// Create request handler function
-	cb := js.FuncOf(func(_ js.Value, args []js.Value) interface{} {
+	cb := js.FuncOf(func(_ js.Value, args []js.Value) any {
 		promise, resolve, reject := newPromiseOptimized()
 
 		go handleRequest(h, args[1], resolve, reject)
@@ -107,7 +107,7 @@ func serveFetch(handler http.Handler) func() {
 }
 
 // handleRequest processes the request with panic recovery
-func handleRequest(h http.Handler, jsReq js.Value, resolve, reject func(interface{})) {
+func handleRequest(h http.Handler, jsReq js.Value, resolve, reject func(any)) {
 	defer func() {
 		if r := recover(); r != nil {
 			var errMsg string
@@ -196,13 +196,13 @@ func (rr *ResponseRecorder) jsResponse() js.Value {
 	}
 
 	// Prepare response init object
-	init := make(map[string]interface{}, 3)
+	init := make(map[string]any, 3)
 	if res.StatusCode != 0 {
 		init["status"] = res.StatusCode
 	}
 
 	if len(res.Header) > 0 {
-		headers := make(map[string]interface{}, len(res.Header))
+		headers := make(map[string]any, len(res.Header))
 		for k, v := range res.Header {
 			if len(v) > 0 {
 				headers[k] = v[0]
@@ -215,13 +215,13 @@ func (rr *ResponseRecorder) jsResponse() js.Value {
 }
 
 // newPromiseOptimized creates a new JavaScript Promise with optimized callback handling
-func newPromiseOptimized() (js.Value, func(interface{}), func(interface{})) {
+func newPromiseOptimized() (js.Value, func(any), func(any)) {
 	var (
-		resolve     func(interface{})
-		reject      func(interface{})
-		promiseFunc = js.FuncOf(func(_ js.Value, args []js.Value) interface{} {
-			resolve = func(v interface{}) { args[0].Invoke(v) }
-			reject = func(v interface{}) { args[1].Invoke(v) }
+		resolve     func(any)
+		reject      func(any)
+		promiseFunc = js.FuncOf(func(_ js.Value, args []js.Value) any {
+			resolve = func(v any) { args[0].Invoke(v) }
+			reject = func(v any) { args[1].Invoke(v) }
 			return js.Undefined()
 		})
 	)
@@ -238,14 +238,14 @@ func awaitPromiseOptimized(promise js.Value) (js.Value, error) {
 		err    error
 	)
 
-	thenFunc := js.FuncOf(func(_ js.Value, args []js.Value) interface{} {
+	thenFunc := js.FuncOf(func(_ js.Value, args []js.Value) any {
 		result = args[0]
 		close(done)
 		return nil
 	})
 	defer thenFunc.Release()
 
-	catchFunc := js.FuncOf(func(_ js.Value, args []js.Value) interface{} {
+	catchFunc := js.FuncOf(func(_ js.Value, args []js.Value) any {
 		err = js.Error{Value: args[0]}
 		close(done)
 		return nil

main.go

@@ -8,4 +8,4 @@ sql:
         emit_interface: true
         emit_json_tags: true
         package: "models"
-        out: "./internal/models"
+        out: "./pkg/models"