frontend: Make Control Server nicer

internal/component/instances/wisski_cron.go

@@ -0,0 +1,36 @@
+package instances
+
+import (
+	"time"
+
+	"github.com/tkw1536/goprogram/exit"
+	"github.com/tkw1536/goprogram/stream"
+)
+
+var errCronFailed = exit.Error{
+	Message:  "Failed to run cron script for instance %q: exited with code %s",
+	ExitCode: exit.ExitGeneric,
+}
+
+func (wisski *WissKI) Cron(io stream.IOStream) error {
+	code, err := wisski.Shell(io, "/runtime/cron.sh")
+	if err != nil {
+		io.EPrintln(err)
+	}
+	if code != 0 {
+		// keep going, because we want to run as many crons as possible
+		err = errBlindUpdateFailed.WithMessageF(wisski.Slug, code)
+		io.EPrintln(err)
+	}
+
+	return nil
+}
+
+func (wisski *WissKI) LastCron(server *PHPServer) (t time.Time, err error) {
+	var timestamp int64
+	err = wisski.EvalPHPCode(server, &timestamp, `$val = \Drupal::state()->get('system.cron_last'); return $val; `)
+	if err != nil {
+		return
+	}
+	return time.Unix(timestamp, 0), nil
+}

internal/component/instances/wisski_info.go

@@ -1,6 +1,7 @@
 package instances
 
 import (
+	"log"
 	"time"
 
 	"github.com/FAU-CDI/wisski-distillery/internal/models"
@@ -22,6 +23,7 @@ type WissKIInfo struct {
 	Running     bool
 	LastRebuild time.Time
 	LastUpdate  time.Time
+	LastCron    time.Time
 
 	// List of backups made
 	Snapshots []models.Export
@@ -40,9 +42,9 @@ func (wisski *WissKI) Info(quick bool) (info WissKIInfo, err error) {
 	if !quick {
 		server, err := wisski.NewPHPServer()
 		if err == nil {
-			wisski.infoSlow(&info, server, &group)
 			defer server.Close()
 		}
+		wisski.infoSlow(&info, server, &group)
 	}
 
 	err = group.Wait()
@@ -87,19 +89,28 @@ func (wisski *WissKI) infoQuick(info *WissKIInfo, group *errgroup.Group) {
 
 func (wisski *WissKI) infoSlow(info *WissKIInfo, server *PHPServer, group *errgroup.Group) {
 	group.Go(func() (err error) {
-		info.Prefixes, _ = wisski.Prefixes(server)
+		info.Prefixes, err = wisski.Prefixes(server)
+		log.Println("error prefixes: ", err)
 		return nil
 	})
 
-	group.Go(func() error {
-		info.Snapshots, _ = wisski.Snapshots()
+	group.Go(func() (err error) {
+		info.Snapshots, err = wisski.Snapshots()
+		log.Println("error snapshots: ", err)
 		return nil
 	})
 
-	group.Go(func() error {
-		info.Pathbuilders, _ = wisski.AllPathbuilders(server)
+	group.Go(func() (err error) {
+		info.Pathbuilders, err = wisski.AllPathbuilders(server)
+		log.Println("error pathbuilders: ", err)
 		return nil
 	})
+
+	group.Go(func() (err error) {
+		info.LastCron, err = wisski.LastCron(server)
+		log.Println("error cron: ", err)
+		return
+	})
 }
 
 // Running checks if this WissKI is currently running.

internal/component/instances/wisski_php_server.go

@@ -174,9 +174,13 @@ func (server *PHPServer) MarshalCall(value any, function string, args ...any) er
 	if err != nil {
 		return PHPServerError{Message: errPHPMarshal, Err: err}
 	}
-	userFunctionArgs, err := marshalPHP(args)
-	if err != nil {
-		return PHPServerError{Message: errPHPMarshal, Err: err}
+
+	userFunctionArgs := "[]"
+	if len(args) > 0 {
+		userFunctionArgs, err = marshalPHP(args)
+		if err != nil {
+			return PHPServerError{Message: errPHPMarshal, Err: err}
+		}
 	}
 	code := "return call_user_func_array(" + userFunction + "," + userFunctionArgs + ");"
 
@@ -246,6 +250,7 @@ func (server *PHPServer) Close() error {
 
 // ExecPHPScript executes the PHP code as a script on the given server.
 // When server is nil, creates a new server and automatically closes it after execution.
+// Calling this function repeatedly with server = nil is inefficient.
 //
 // The script should define a function called entrypoint, and may define additional functions.
 //
@@ -257,8 +262,6 @@ func (server *PHPServer) Close() error {
 // It's arguments are encoded as json using [json.Marshal] and decoded within php.
 //
 // The return value of the function is again marshaled with json and returned to the caller.
-//
-// Calling this function is inefficient, and a [NewPHPServer] call should be prefered instead.
 func (wisski *WissKI) ExecPHPScript(server *PHPServer, value any, code string, entrypoint string, args ...any) (err error) {
 	if server == nil {
 		server, err = wisski.NewPHPServer()
@@ -268,13 +271,27 @@ func (wisski *WissKI) ExecPHPScript(server *PHPServer, value any, code string, e
 		defer server.Close()
 	}
 
-	if err := server.MarshalEval(nil, strings.TrimPrefix(code, "<?php")); err != nil {
-		return err
+	if code != "" {
+		if err := server.MarshalEval(nil, strings.TrimPrefix(code, "<?php")); err != nil {
+			return err
+		}
 	}
 
 	return server.MarshalCall(value, entrypoint, args...)
 }
 
+func (wisski *WissKI) EvalPHPCode(server *PHPServer, value any, code string) (err error) {
+	if server == nil {
+		server, err = wisski.NewPHPServer()
+		if err != nil {
+			return
+		}
+		defer server.Close()
+	}
+
+	return server.MarshalEval(value, code)
+}
+
 //go:embed php/server.php
 var serverPHP string