add email in worker env

pomdtr · Jan 24, 2025 · 03300f7 · 03300f7
1 parent a0c6ee0
commit 03300f7
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 13 deletions.
diff --git a/cmd/crons.go b/cmd/crons.go
@@ -166,7 +166,7 @@ func CronRunner() *cron.Cron {
 					continue
 				}
 
-				wk := worker.NewWorker(a)
+				wk := worker.NewWorker(a, k.String("email"))
 
 				command, err := wk.Command(context.Background(), job.Args...)
 				if err != nil {

diff --git a/cmd/email.go b/cmd/email.go
@@ -84,7 +84,7 @@ func NewCmdEmail() *cobra.Command {
 				return fmt.Errorf("failed to load app: %w", err)
 			}
 
-			wk := worker.NewWorker(a)
+			wk := worker.NewWorker(a, k.String("email"))
 
 			if err := wk.SendEmail(cmd.Context(), strings.NewReader(message.String())); err != nil {
 				return fmt.Errorf("failed to send email: %w", err)

diff --git a/cmd/fetch.go b/cmd/fetch.go
@@ -57,7 +57,7 @@ func NewCmdFetch() *cobra.Command {
 				return fmt.Errorf("failed to load app: %w", err)
 			}
 
-			wk := worker.NewWorker(a)
+			wk := worker.NewWorker(a, k.String("email"))
 			if err := wk.Start(); err != nil {
 				return fmt.Errorf("failed to start worker: %w", err)
 			}

diff --git a/cmd/run.go b/cmd/run.go
@@ -29,7 +29,7 @@ func NewCmdRun() *cobra.Command {
 				return fmt.Errorf("failed to load app: %w", err)
 			}
 
-			wk := worker.NewWorker(a)
+			wk := worker.NewWorker(a, k.String("email"))
 			command, err := wk.Command(cmd.Context(), args[1:]...)
 			if err != nil {
 				return fmt.Errorf("failed to create command: %w", err)

diff --git a/cmd/up.go b/cmd/up.go
@@ -249,7 +249,7 @@ func NewCmdUp() *cobra.Command {
 								return
 							}
 
-							wk := worker.NewWorker(a)
+							wk := worker.NewWorker(a, k.String("email"))
 							command, err := wk.Command(sess.Context(), sess.Command()...)
 							if err != nil {
 								fmt.Fprintf(sess, "failed to get command: %v\n", err)
@@ -347,7 +347,7 @@ func NewCmdUp() *cobra.Command {
 							return fmt.Errorf("failed to load app: %v", err)
 						}
 
-						wk := worker.NewWorker(a)
+						wk := worker.NewWorker(a, k.String("email"))
 						if err := wk.SendEmail(context.Background(), strings.NewReader(string(data))); err != nil {
 							return fmt.Errorf("failed to send email: %v", err)
 						}
@@ -535,7 +535,7 @@ func (me *Handler) GetWorker(appname, rootDir, domain string) (*worker.Worker, e
 		return nil, fmt.Errorf("failed to load app: %w", err)
 	}
 
-	wk := worker.NewWorker(a)
+	wk := worker.NewWorker(a, k.String("email"))
 
 	wk.Logger = me.logger
 	if err := wk.Start(); err != nil {

diff --git a/worker/worker.go b/worker/worker.go
@@ -54,6 +54,7 @@ type Worker struct {
 	App       app.App
 	Env       map[string]string
 	StartedAt time.Time
+	Email     string
 
 	port      int
 	idleTimer *time.Timer
@@ -62,7 +63,7 @@ type Worker struct {
 	activeRequests atomic.Int32
 }
 
-func commandEnv(a app.App) []string {
+func commandEnv(a app.App, email string) []string {
 	env := []string{}
 
 	for k, v := range a.Env {
@@ -79,6 +80,7 @@ func commandEnv(a app.App) []string {
 	env = append(env, fmt.Sprintf("SMALLWEB_APP_NAME=%s", a.Name))
 	env = append(env, fmt.Sprintf("SMALLWEB_APP_DOMAIN=%s", a.Domain))
 	env = append(env, fmt.Sprintf("SMALLWEB_APP_URL=%s", a.URL))
+	env = append(env, fmt.Sprintf("SMALLWEB_EMAIL=%s", email))
 
 	if deno, ok := os.LookupEnv("DENO_EXEC_PATH"); ok {
 		env = append(env, fmt.Sprintf("DENO_EXEC_PATH=%s", deno))
@@ -92,9 +94,10 @@ func commandEnv(a app.App) []string {
 	return env
 }
 
-func NewWorker(app app.App) *Worker {
+func NewWorker(app app.App, email string) *Worker {
 	worker := &Worker{
-		App: app,
+		App:   app,
+		Email: email,
 	}
 
 	return worker
@@ -189,7 +192,7 @@ func (me *Worker) Start() error {
 
 	command := exec.Command(deno, args...)
 	command.Dir = me.App.Dir()
-	command.Env = commandEnv(me.App)
+	command.Env = commandEnv(me.App, me.Email)
 
 	stdoutPipe, err := command.StdoutPipe()
 	if err != nil {
@@ -503,7 +506,7 @@ func (me *Worker) Command(ctx context.Context, args ...string) (*exec.Cmd, error
 	command := exec.CommandContext(ctx, deno, denoArgs...)
 	command.Dir = me.App.Dir()
 
-	command.Env = commandEnv(me.App)
+	command.Env = commandEnv(me.App, me.Email)
 
 	return command, nil
 }
@@ -532,7 +535,7 @@ func (me *Worker) SendEmail(ctx context.Context, message io.Reader) error {
 	command := exec.CommandContext(ctx, deno, denoArgs...)
 	command.Dir = me.App.Dir()
 	command.Stderr = os.Stderr
-	command.Env = commandEnv(me.App)
+	command.Env = commandEnv(me.App, me.Email)
 
 	stdin, err := command.StdinPipe()
 	if err != nil {