merge v0.23.0-rc changes

plugins/jsvm/jsvm.go

@@ -27,17 +27,12 @@ import (
 	"github.com/dop251/goja_nodejs/require"
 	"github.com/fatih/color"
 	"github.com/fsnotify/fsnotify"
-	"github.com/labstack/echo/v5"
-	"github.com/pocketbase/dbx"
 	"github.com/pocketbase/pocketbase/core"
-	m "github.com/pocketbase/pocketbase/migrations"
 	"github.com/pocketbase/pocketbase/plugins/jsvm/internal/types/generated"
 	"github.com/pocketbase/pocketbase/tools/template"
 )
 
-const (
-	typesFileName = "types.d.ts"
-)
+const typesFileName = "types.d.ts"
 
 // Config defines the config options of the jsvm plugin.
 type Config struct {
@@ -131,9 +126,15 @@ func Register(app core.App, config Config) error {
 		p.config.TypesDir = app.DataDir()
 	}
 
-	p.app.OnAfterBootstrap().Add(func(e *core.BootstrapEvent) error {
+	p.app.OnBootstrap().BindFunc(func(e *core.BootstrapEvent) error {
+		err := e.Next()
+		if err != nil {
+			return err
+		}
+
 		// ensure that the user has the latest types declaration
-		if err := p.refreshTypesFile(); err != nil {
+		err = p.refreshTypesFile()
+		if err != nil {
 			color.Yellow("Unable to refresh app types file: %v", err)
 		}
 
@@ -173,14 +174,13 @@ func (p *plugin) registerMigrations() error {
 		process.Enable(vm)
 		baseBinds(vm)
 		dbxBinds(vm)
-		tokensBinds(vm)
 		securityBinds(vm)
 		osBinds(vm)
 		filepathBinds(vm)
 		httpClientBinds(vm)
 
-		vm.Set("migrate", func(up, down func(db dbx.Builder) error) {
-			m.AppMigrations.Register(up, down, file)
+		vm.Set("migrate", func(up, down func(txApp core.App) error) {
+			core.AppMigrations.Register(up, down, file)
 		})
 
 		if p.config.OnInit != nil {
@@ -238,9 +238,10 @@ func (p *plugin) registerHooks() error {
 		return err
 	}
 
-	p.app.OnBeforeServe().Add(func(e *core.ServeEvent) error {
-		e.Router.HTTPErrorHandler = p.normalizeServeExceptions(e.Router.HTTPErrorHandler)
-		return nil
+	p.app.OnServe().BindFunc(func(e *core.ServeEvent) error {
+		e.Router.BindFunc(p.normalizeServeExceptions)
+
+		return e.Next()
 	})
 
 	// safe to be shared across multiple vms
@@ -255,7 +256,6 @@ func (p *plugin) registerHooks() error {
 		baseBinds(vm)
 		dbxBinds(vm)
 		filesystemBinds(vm)
-		tokensBinds(vm)
 		securityBinds(vm)
 		osBinds(vm)
 		filepathBinds(vm)
@@ -311,32 +311,31 @@ func (p *plugin) registerHooks() error {
 	return nil
 }
 
-// normalizeExceptions wraps the provided error handler and returns a new one
-// with extracted goja exception error value for consistency when throwing or returning errors.
-func (p *plugin) normalizeServeExceptions(oldErrorHandler echo.HTTPErrorHandler) echo.HTTPErrorHandler {
-	return func(c echo.Context, err error) {
-		defer func() {
-			oldErrorHandler(c, err)
-		}()
+// normalizeExceptions registers a global error handler that
+// wraps the extracted goja exception error value for consistency
+// when throwing or returning errors.
+func (p *plugin) normalizeServeExceptions(e *core.RequestEvent) error {
+	err := e.Next()
 
-		if err == nil || c.Response().Committed {
-			return // no error or already committed
-		}
+	if err == nil || e.Written() {
+		return err // no error or already committed
+	}
 
-		jsException, ok := err.(*goja.Exception)
-		if !ok {
-			return // no exception
-		}
+	jsException, ok := err.(*goja.Exception)
+	if !ok {
+		return err // no exception
+	}
 
-		switch v := jsException.Value().Export().(type) {
-		case error:
-			err = v
-		case map[string]any: // goja.GoError
-			if vErr, ok := v["value"].(error); ok {
-				err = vErr
-			}
+	switch v := jsException.Value().Export().(type) {
+	case error:
+		err = v
+	case map[string]any: // goja.GoError
+		if vErr, ok := v["value"].(error); ok {
+			err = vErr
 		}
 	}
+
+	return err
 }
 
 // watchHooks initializes a hooks file watcher that will restart the
@@ -365,12 +364,12 @@ func (p *plugin) watchHooks() error {
 		}
 	}
 
-	p.app.OnTerminate().Add(func(e *core.TerminateEvent) error {
+	p.app.OnTerminate().BindFunc(func(e *core.TerminateEvent) error {
 		watcher.Close()
 
 		stopDebounceTimer()
 
-		return nil
+		return e.Next()
 	})
 
 	// start listening for events.