chore: enable debug logging on web server

Author: Emyrk

cli/web.go

@@ -42,7 +42,7 @@ func (r *RootCmd) WebsocketServer() *serpent.Command {
 		Hidden: true,
 		Handler: func(i *serpent.Invocation) error {
 			ctx := i.Context()
-			logger := slog.Make(sloghuman.Sink(i.Stderr))
+			logger := slog.Make(sloghuman.Sink(i.Stderr)).Leveled(slog.LevelDebug)
 
 			mux := chi.NewMux()
 			mux.HandleFunc("/ws/{dir}", websocketHandler(logger))

types/parameter.go

@@ -45,6 +45,7 @@ type RichParameter struct {
 	Name         string                 `json:"name"`
 	DisplayName  string                 `json:"display_name"`
 	Description  string                 `json:"description"`
+	FormControl  string                 `json:"form_control"`
 	Type         ParameterType          `json:"type"`
 	Mutable      bool                   `json:"mutable"`
 	DefaultValue string                 `json:"default_value"`

web/session.go

@@ -12,11 +12,12 @@ import (
 type Request struct {
 	// ID identifies the request. The response contains the same
 	// ID so that the client can match it to the request.
-	ID     int
-	Inputs map[string]string
+	ID     int               `json:"id"`
+	Inputs map[string]string `json:"inputs"`
 }
 
 type Response struct {
+	ID          int               `json:"id"`
 	Diagnostics Diagnostics       `json:"diagnostics"`
 	Parameters  []types.Parameter `json:"parameters"`
 	// TODO: Workspace tags
@@ -71,6 +72,7 @@ func (s *Session) preview(ctx context.Context, req *Request) Response {
 	}, s.dir)
 
 	r := Response{
+		ID:          req.ID,
 		Diagnostics: FromHCLDiagnostics(diags),
 	}
 	if output == nil {

web/typescripttypes/preview.ts

@@ -59,6 +59,7 @@ export interface RichParameter {
     readonly name: string;
     readonly display_name: string;
     readonly description: string;
+    readonly form_control: string;
     readonly type: ParameterType;
     readonly mutable: boolean;
     readonly default_value: string;

web/websocket.go

@@ -2,8 +2,6 @@ package web
 
 import (
 	"context"
-	"fmt"
-	"time"
 
 	"cdr.dev/slog"
 	"github.com/coder/websocket"
@@ -24,9 +22,6 @@ func (s *Session) Listen(ctx context.Context, conn *websocket.Conn) {
 	// write responses back
 	go s.writeLoop(ctx, cancel, conn)
 
-	time.Sleep(time.Second)
-	fmt.Println("CLOSE")
-
 	// Always close the connection at the end of the Listen.
 	defer conn.Close(websocket.StatusNormalClosure, "closing connection")
 	<-ctx.Done()
@@ -44,6 +39,10 @@ func (s *Session) readLoop(ctx context.Context, cancel func(), conn *websocket.C
 			return
 		}
 
+		s.logger.Debug(ctx, "received request",
+			slog.F("id", req.ID),
+			slog.F("inputs", req.Inputs),
+		)
 		s.sendRequest(ctx, req)
 	}
 }