add back a run method

Author: pomdtr

example/cron/smallweb.json

@@ -2,7 +2,7 @@
     "crons": [
         {
             "schedule": "* * * * *",
-            "args": []
+            "name": "example"
         }
     ]
 }

go.mod

@@ -104,7 +104,6 @@ require (
 	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/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
@@ -138,7 +137,6 @@ 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

go.sum

@@ -175,8 +175,6 @@ github.com/cpuguy83/go-md2man/v2 v2.0.7 h1:zbFlGlXEAKlwXpmvle3d8Oe3YnkKIK4xSRTd3
 github.com/cpuguy83/go-md2man/v2 v2.0.7/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
 github.com/creack/pty v1.1.24 h1:bJrF4RRfyJnbTJqzRLHzcGaZK1NeM5kTC9jGgovnR1s=
 github.com/creack/pty v1.1.24/go.mod h1:08sCNb52WyoAwi2QDyzUCTgcvVFhUzewun7wtTfvcwE=
-github.com/danielgtaylor/huma/v2 v2.37.2 h1:Nf9vjy2sxBJFaupPlthXL/Hy2+LurfVbaKHmCMEI7xE=
-github.com/danielgtaylor/huma/v2 v2.37.2/go.mod h1:95S04G/lExFRYlBkKaBaZm9lVmxRmqX9f2CgoOZ11AM=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
@@ -306,8 +304,6 @@ github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
 github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
 github.com/json-iterator/go v1.1.13-0.20220915233716-71ac16282d12 h1:9Nu54bhS/H/Kgo2/7xNSUuC5G28VR8ljfrLKU2G4IjU=
 github.com/json-iterator/go v1.1.13-0.20220915233716-71ac16282d12/go.mod h1:TBzl5BIHNXfS9+C35ZyJaklL7mLDbgUkcgXzSLa8Tk0=
-github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U=
-github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
 github.com/keybase/go-keychain v0.0.1 h1:way+bWYa6lDppZoZcgMbYsvC7GxljxrskdNInRtuthU=
 github.com/keybase/go-keychain v0.0.1/go.mod h1:PdEILRW3i9D8JcdM+FmY6RwkHGnhHxXwkPPMeUgOK1k=
 github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=

internal/cmd/crons.go

@@ -39,10 +39,9 @@ func NewCmdCronList() *cobra.Command {
 	}
 
 	cmd := &cobra.Command{
-		Use:               "list",
-		Aliases:           []string{"cron"},
-		Short:             "List cron jobs",
-		ValidArgsFunction: completeApp,
+		Use:     "list",
+		Aliases: []string{"cron"},
+		Short:   "List cron jobs",
 		RunE: func(cmd *cobra.Command, args []string) error {
 			var crons []CronItem
 			apps, err := app.LookupApps(k.String("dir"))
@@ -127,6 +126,44 @@ func NewCmdCronList() *cobra.Command {
 	return cmd
 }
 
+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
+}
+
 func CronRunner(logger *slog.Logger) *cron.Cron {
 	parser := cron.NewParser(cron.Minute | cron.Hour | cron.Dom | cron.Month | cron.Dow | cron.Descriptor)
 	c := cron.New(cron.WithParser(parser))
@@ -164,52 +201,14 @@ func CronRunner(logger *slog.Logger) *cron.Cron {
 				wk := worker.NewWorker(a, nil)
 
 				logger.Info("running cron job", "app", appname, "name", job.Name, "schedule", job.Schedule)
-				go func() {
+				go func(job app.CronJob) {
 					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)
 					}
-				}()
+				}(job)
 			}
 		}
 	})
 
 	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/up.go

@@ -322,18 +322,18 @@ func NewCmdUp() *cobra.Command {
 					wish.WithMiddleware(
 						func(next ssh.Handler) ssh.Handler {
 							return func(sess ssh.Session) {
-									execPath, err := os.Executable()
-									if err != nil {
-										fmt.Fprintf(sess.Stderr(), "failed to get executable path: %v\n", err)
-										sess.Exit(1)
-										return
-									}
+								execPath, err := os.Executable()
+								if err != nil {
+									fmt.Fprintf(sess.Stderr(), "failed to get executable path: %v\n", err)
+									sess.Exit(1)
+									return
+								}
 
 								cmd := exec.Command(execPath, "--dir", k.String("dir"), "--domain", k.String("domain"))
-									cmd.Args = append(cmd.Args, sess.Command()...)
-									cmd.Env = os.Environ()
+								cmd.Args = append(cmd.Args, sess.Command()...)
+								cmd.Env = os.Environ()
 
-									cmd.Env = append(cmd.Env, "SMALLWEB_DISABLED_COMMANDS=up,config,init,doctor,completion")
+								cmd.Env = append(cmd.Env, "SMALLWEB_DISABLED_COMMANDS=up,config,init,doctor,completion")
 
 								ptyReq, winCh, isPty := sess.Pty()
 								if isPty {
@@ -580,7 +580,7 @@ func (me *Handler) GetWorker(appname string, rootDir, domain string) (*worker.Wo
 	}
 
 	wk := worker.NewWorker(a, me.logger.With("logger", "console", "app", appname))
-	if err := wk.Start(); err != nil {
+	if err := wk.StartServer(); err != nil {
 		return nil, fmt.Errorf("failed to start worker: %w", err)
 	}