simplify worker logic

Author: pomdtr

internal/cmd/run.go

@@ -3,9 +3,11 @@ package cmd
 import (
 	"errors"
 	"fmt"
+	"os"
 	"os/exec"
 	"path/filepath"
 
+	"github.com/mattn/go-isatty"
 	"github.com/pomdtr/smallweb/internal/api"
 	"github.com/pomdtr/smallweb/internal/app"
 	"github.com/pomdtr/smallweb/internal/worker"
@@ -26,7 +28,6 @@ func NewCmdRun() *cobra.Command {
 			return nil
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
-
 			var appConfig app.Config
 			if err := conf.Unmarshal(fmt.Sprintf("apps.%s", args[0]), &appConfig); err != nil {
 				fmt.Fprintf(cmd.ErrOrStderr(), "failed to get app config: %v\n", err)
@@ -42,11 +43,17 @@ func NewCmdRun() *cobra.Command {
 
 			cmd.SilenceErrors = true
 
-			if err := wk.Run(cmd.Context(), worker.RunParams{
+			params := worker.RunParams{
 				Args:   args[1:],
 				Stdout: cmd.OutOrStdout(),
 				Stderr: cmd.ErrOrStderr(),
-			}); err != nil {
+			}
+
+			if !isatty.IsTerminal(os.Stdin.Fd()) {
+				params.Stdin = cmd.InOrStdin()
+			}
+
+			if err := wk.Run(cmd.Context(), params); err != nil {
 				var exitErr *exec.ExitError
 				if errors.As(err, &exitErr) {
 					return ExitError{exitErr.ExitCode()}

internal/cmd/up.go

@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"bytes"
 	"context"
 	"crypto/tls"
 	"errors"
@@ -240,7 +241,7 @@ func NewCmdUp() *cobra.Command {
 						}
 
 						worker := worker.NewWorker(a, api.NewHandler(conf))
-						if err := worker.SendEmail(context.Background(), data); err != nil {
+						if err := worker.SendEmail(context.Background(), bytes.NewReader(data)); err != nil {
 							logger.Error("failed to send email", "error", err)
 							continue
 						}

internal/worker/sandbox.ts

@@ -1,6 +1,5 @@
 import { accepts } from "jsr:@std/http@1.0.12/negotiation"
 import { escape } from "jsr:@std/html@1.0.3"
-import { decodeBase64 } from "jsr:@std/encoding@1.0.8/base64"
 
 function cleanStack(str?: string) {
     if (!str) return undefined;
@@ -78,7 +77,27 @@ function respondWithError(request: Request, error: Error) {
     );
 }
 
-const payload = JSON.parse(Deno.args[0]);
+const { SMALLWEB_SOCKET_PATH } = Deno.env.toObject();
+
+if (!SMALLWEB_SOCKET_PATH) {
+    console.error("SMALLWEB_SOCKET is not set.");
+    Deno.exit(1);
+}
+
+const client = Deno.createHttpClient({
+    proxy: {
+        transport: "unix",
+        path: SMALLWEB_SOCKET_PATH,
+    }
+});
+
+const resp = await fetch("http://worker.localhost/payload", { client })
+if (!resp.ok) {
+    console.error("Could not get worker payload:", resp.statusText);
+    Deno.exit(1);
+}
+
+const payload = await resp.json();
 
 if (!payload || !payload.command) {
     console.error("Invalid input.");
@@ -89,10 +108,9 @@ if (payload.command === "fetch") {
     Deno.serve(
         {
             port: parseInt(payload.port),
-            onListen: () => {
-                // This line will signal that the server is ready to the go
-                console.error("READY");
-            },
+            onListen: async () => {
+                await fetch("http://worker.localhost/ready", { client });
+            }
         },
         async (req) => {
             try {
@@ -162,7 +180,13 @@ if (payload.command === "fetch") {
         Deno.exit(1);
     }
 
-    await handler.run(payload.args);
+    const resp = await fetch("http://worker.localhost/command/stdin", { client });
+    if (!resp.ok) {
+        console.error("Could not get command input:", resp.statusText);
+        Deno.exit(1);
+    }
+
+    await handler.run(payload.args, await resp.body);
 } else if (payload.command === "email") {
     const mod = await import(payload.entrypoint);
     if (!mod.default || typeof mod.default !== "object") {
@@ -178,9 +202,13 @@ if (payload.command === "fetch") {
         Deno.exit(1);
     }
 
-    const data = decodeBase64(payload.msg)
-    const blob = new Blob([data]);
-    await handler.email(blob.stream());
+    const resp = await fetch("http://worker.localhost/email/msg", { client });
+    if (!resp.ok) {
+        console.error("Could not get email message:", resp.statusText);
+        Deno.exit(1);
+    }
+
+    await handler.email(await resp.body);
 } else {
     console.error("Unknown command: ", payload.command);
     Deno.exit(1);