update cron config

Author: pomdtr

go.mod

@@ -19,8 +19,6 @@ require (
 )
 
 require (
-	github.com/abiosoft/ishell/v2 v2.0.2
-	github.com/abiosoft/readline v0.0.0-20180607040430-155bce2042db
 	github.com/caddyserver/certmagic v0.25.2
 	github.com/charmbracelet/ssh v0.0.0-20250826160808-ebfa259c7309
 	github.com/charmbracelet/wish v1.4.7
@@ -64,7 +62,6 @@ require (
 	github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.55.0 // indirect
 	github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.55.0 // indirect
 	github.com/ProtonMail/go-crypto v1.4.0 // indirect
-	github.com/abiosoft/ishell v2.0.0+incompatible // indirect
 	github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be // indirect
 	github.com/aws/aws-sdk-go-v2 v1.41.2 // indirect
 	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.5 // indirect
@@ -100,22 +97,19 @@ require (
 	github.com/charmbracelet/x/ansi v0.11.6 // indirect
 	github.com/charmbracelet/x/cellbuf v0.0.15 // indirect
 	github.com/charmbracelet/x/conpty v0.2.0 // indirect
-	github.com/charmbracelet/x/errors v0.0.0-20260301003739-baafbde16d0a // indirect
 	github.com/charmbracelet/x/term v0.2.2 // indirect
 	github.com/charmbracelet/x/termios v0.1.1 // indirect
 	github.com/clipperhouse/displaywidth v0.11.0 // indirect
-	github.com/clipperhouse/stringish v0.1.1 // indirect
 	github.com/clipperhouse/uax29/v2 v2.7.0 // indirect
 	github.com/cloudflare/circl v1.6.3 // indirect
 	github.com/cncf/xds/go v0.0.0-20260202195803-dba9d589def2 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.7 // indirect
-	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
+	github.com/danielgtaylor/huma/v2 v2.37.2 // indirect
 	github.com/envoyproxy/go-control-plane/envoy v1.37.0 // indirect
 	github.com/envoyproxy/protoc-gen-validate v1.3.3 // indirect
 	github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect
 	github.com/fatih/color v1.18.0 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
-	github.com/flynn-archive/go-shlex v0.0.0-20150515145356-3f9db97f8568 // indirect
 	github.com/getsops/gopgagent v0.0.0-20241224165529-7044f28e491e // indirect
 	github.com/go-jose/go-jose/v4 v4.1.3 // indirect
 	github.com/go-logfmt/logfmt v0.6.1 // indirect
@@ -144,6 +138,7 @@ require (
 	github.com/huaweicloud/huaweicloud-sdk-go-v3 v0.1.187 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/json-iterator/go v1.1.13-0.20220915233716-71ac16282d12 // indirect
+	github.com/julienschmidt/httprouter v1.3.0 // indirect
 	github.com/klauspost/cpuid/v2 v2.3.0 // indirect
 	github.com/knadh/koanf/maps v0.1.2 // indirect
 	github.com/kr/fs v0.1.0 // indirect
@@ -170,9 +165,7 @@ require (
 	github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
-	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/rivo/uniseg v0.4.7 // indirect
-	github.com/rogpeppe/go-internal v1.14.1 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/ryanuber/go-glob v1.0.0 // indirect
 	github.com/sirupsen/logrus v1.9.4 // indirect
@@ -203,13 +196,11 @@ require (
 	golang.org/x/text v0.34.0 // indirect
 	golang.org/x/time v0.14.0 // indirect
 	golang.org/x/tools v0.42.0 // indirect
-	golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect
 	google.golang.org/api v0.269.0 // indirect
 	google.golang.org/genproto v0.0.0-20260226221140-a57be14db171 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20260226221140-a57be14db171 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20260226221140-a57be14db171 // indirect
 	google.golang.org/grpc v1.79.1 // indirect
 	google.golang.org/protobuf v1.36.11 // indirect
 	gopkg.in/ini.v1 v1.67.1 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -47,11 +47,6 @@ type App struct {
 
 func (me *App) Dir() string {
 	dir := me.BaseDir
-	if fi, err := os.Lstat(dir); err == nil && fi.Mode()&os.ModeSymlink != 0 {
-		if root, err := os.Readlink(dir); err == nil {
-			dir = filepath.Join(filepath.Dir(dir), root)
-		}
-	}
 
 	if me.Config.Root != "" {
 		return filepath.Join(dir, me.Config.Root)
@@ -80,17 +75,6 @@ func (me *App) Dir() string {
 	return dir
 }
 
-func (me *App) DataDir() string {
-	dir := filepath.Join(me.Dir(), "data")
-	if fi, err := os.Lstat(dir); err == nil && fi.Mode()&os.ModeSymlink != 0 {
-		if root, err := os.Readlink(dir); err == nil {
-			dir = filepath.Join(filepath.Dir(dir), root)
-		}
-	}
-
-	return dir
-}
-
 func LookupApps(rootDir string) ([]string, error) {
 	entries, err := os.ReadDir(rootDir)
 	if err != nil {

internal/app/app.go

@@ -21,14 +21,25 @@ type CronItem struct {
 	app.CronJob
 }
 
-func NewCmdCrons() *cobra.Command {
+func NewCmdCron() *cobra.Command {
+	cmd := &cobra.Command{
+		Use: "cron",
+	}
+
+	cmd.AddCommand(NewCmdCronList())
+	cmd.AddCommand(NewCmdCronTrigger())
+
+	return cmd
+}
+
+func NewCmdCronList() *cobra.Command {
 	var flags struct {
 		json bool
 		app  string
 	}
 
 	cmd := &cobra.Command{
-		Use:               "crons [app]",
+		Use:               "list",
 		Aliases:           []string{"cron"},
 		Short:             "List cron jobs",
 		ValidArgsFunction: completeApp,
@@ -154,8 +165,8 @@ func CronRunner(logger *slog.Logger) *cron.Cron {
 
 				logger.Info("running cron job", "app", appname, "name", job.Name, "schedule", job.Schedule)
 				go func() {
-					if err := wk.TriggerCron(context.Background(), job.Name); err != nil {
-						logger.Error("failed to run command", "app", appname, "name", job.Name, "error", err)
+					if err := wk.TriggerCron(context.Background(), job); err != nil {
+						logger.Error("failed to run command", "app", appname, "name", job.Name, "schedule", job.Schedule, "error", err)
 					}
 				}()
 			}
@@ -164,3 +175,41 @@ func CronRunner(logger *slog.Logger) *cron.Cron {
 
 	return c
 }
+
+func NewCmdCronTrigger() *cobra.Command {
+	var flags struct {
+		app string
+	}
+
+	cmd := &cobra.Command{
+		Use:  "trigger <name>",
+		Args: cobra.ExactArgs(1),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			a, err := app.LoadApp(flags.app, k.String("dir"), k.String("domain"))
+			if err != nil {
+				return ExitError{1}
+			}
+
+			var job *app.CronJob
+			for _, j := range a.Config.Crons {
+				if j.Name == args[0] {
+					job = &j
+					break
+				}
+			}
+
+			if job == nil {
+				return ExitError{1}
+			}
+
+			wk := worker.NewWorker(a, nil)
+			if err := wk.TriggerCron(cmd.Context(), *job); err != nil {
+				return ExitError{1}
+			}
+
+			return nil
+		},
+	}
+
+	return cmd
+}

internal/cmd/crons.go

@@ -156,10 +156,9 @@ func NewCmdRoot() *cobra.Command {
 	rootCmd.AddCommand(NewCmdUp())
 	rootCmd.AddCommand(NewCmdDoctor())
 	rootCmd.AddCommand(NewCmdList())
-	rootCmd.AddCommand(NewCmdCrons())
+	rootCmd.AddCommand(NewCmdCron())
 	rootCmd.AddCommand(NewCmdInit())
 	rootCmd.AddCommand(NewCmdConfig())
-	rootCmd.AddCommand(NewCmdLink())
 	rootCmd.AddCommand(NewCmdGitReceivePack())
 	rootCmd.AddCommand(NewCmdGitUploadPack())
 

internal/cmd/link.go

@@ -442,7 +442,7 @@ func DenoExecutable() (string, error) {
 	return "", fmt.Errorf("deno executable not found")
 }
 
-func (me *Worker) TriggerCron(ctx context.Context, name string) error {
+func (me *Worker) TriggerCron(ctx context.Context, job app.CronJob) error {
 	deno, err := DenoExecutable()
 	if err != nil {
 		return fmt.Errorf("could not find deno executable")
@@ -461,7 +461,8 @@ func (me *Worker) TriggerCron(ctx context.Context, name string) error {
 	if err := encoder.Encode(map[string]any{
 		"command":    "cron",
 		"entrypoint": me.App.Entrypoint(),
-		"name":       name,
+		"name":       job.Name,
+		"schedule":   job.Schedule,
 	}); err != nil {
 		return fmt.Errorf("could not encode input: %w", err)
 	}

internal/cmd/root.go

@@ -11,8 +11,8 @@
         },
         "additionalDomains": {
             "description": "Additional wildcard domains",
-            "type": "array",
-            "items": {
+            "type": "object",
+            "additionalProperties": {
                 "type": "string"
             }
         },
@@ -22,6 +22,13 @@
             "items": {
                 "type": "string"
             }
+        },
+        "authorizedTokens": {
+            "description": "Authorized API tokens",
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
         }
     }
 }