impv: previous response to stack

Author: Benzbeeb

cmd/init.go

@@ -44,7 +44,7 @@ func InitiaInitCommand() *cobra.Command {
 				}
 			}
 
-			_, err := tea.NewProgram(weaveinit.NewRunL1NodeNetworkSelect(&weaveinit.RunL1NodeState{})).Run()
+			_, err := tea.NewProgram(weaveinit.NewRunL1NodeNetworkSelect(weaveinit.NewRunL1NodeState())).Run()
 			if err != nil {
 				return err
 			}

models/weaveinit/run_l1_node.go

@@ -24,3 +24,9 @@ type RunL1NodeState struct {
 	snapshotEndpoint    string
 	stateSyncEndpoint   string
 }
+
+func NewRunL1NodeState() *RunL1NodeState {
+	return &RunL1NodeState{
+		weave: types.NewWeaveState(),
+	}
+}

models/weaveinit/state.go

@@ -98,6 +98,29 @@ var (
 	SelectorCursor  string = Text("> ", Cyan)
 )
 
+func RenderPromptWithError(text string, highlights []string, err error, status PromptStatus) string {
+	prompt := ""
+	switch status {
+	case Question:
+		prompt += QuestionMark
+	case Completed:
+		prompt += CorrectMark
+	case Information:
+		prompt += InformationMark
+	}
+
+	for _, highlight := range highlights {
+		if strings.Contains(text, highlight) {
+			text = strings.ReplaceAll(text, highlight, BoldText(highlight, Cyan))
+		}
+	}
+
+	text = DefaultTextWithoutOverridingStyledText(text)
+
+	return prompt + RenderError(err) + text
+
+}
+
 // RenderPrompt highlights phrases in the text if they match any phrase in the highlights list
 func RenderPrompt(text string, highlights []string, status PromptStatus) string {
 	prompt := ""

styles/text.go

@@ -1,5 +1,32 @@
 package types
 
 type WeaveState struct {
-	PreviousResponse string
+	PreviousResponse []string
+}
+
+func NewWeaveState() WeaveState {
+	return WeaveState{
+		PreviousResponse: make([]string, 0),
+	}
+}
+
+func (w *WeaveState) Render() string {
+	render := ""
+	for _, r := range w.PreviousResponse {
+		render += r
+	}
+	return render
+}
+
+func (w *WeaveState) PopPreviousResponse() {
+	l := len(w.PreviousResponse)
+	if l == 0 {
+		return
+	}
+
+	w.PreviousResponse = w.PreviousResponse[:l-1]
+}
+
+func (w *WeaveState) PushPreviousResponse(s string) {
+	w.PreviousResponse = append(w.PreviousResponse, s)
 }

types/state.go

@@ -21,6 +21,7 @@ type Downloader struct {
 	url      string
 	dest     string
 	done     bool
+	err      error
 }
 
 func NewDownloader(text, url, dest string) *Downloader {
@@ -30,54 +31,78 @@ func NewDownloader(text, url, dest string) *Downloader {
 		text:     text,
 		url:      url,
 		dest:     dest,
+		err:      nil,
 	}
 }
 
+func (m *Downloader) GetError() error {
+	return m.err
+}
+
 func (m *Downloader) startDownload() tea.Cmd {
 	return func() tea.Msg {
 		const bufferSize = 65536
 
+		// Send a GET request to the URL
 		resp, err := http.Get(m.url)
 		if err != nil {
 			m.done = true
+			m.err = fmt.Errorf("failed to connect to URL: %w", err)
 			return nil
 		}
 		defer resp.Body.Close()
 
+		// Check if the response status is not 200 OK
+		if resp.StatusCode != http.StatusOK {
+			m.done = true
+			m.err = fmt.Errorf("failed to download: received status code %d", resp.StatusCode)
+			return nil
+		}
+
+		// Get the total size of the file
 		m.total = resp.ContentLength
 		if m.total <= 0 {
+			// If Content-Length is not provided, we set a default value for safety
 			m.total = 1
 		}
 
+		// Create the destination file
 		file, err := os.Create(m.dest)
 		if err != nil {
 			m.done = true
+			m.err = fmt.Errorf("failed to create destination file: %w", err)
 			return nil
 		}
 		defer file.Close()
 
+		// Prepare to download the file in chunks
 		buffer := make([]byte, bufferSize)
 		var totalDownloaded int64
 		for {
 			n, err := resp.Body.Read(buffer)
 			if err != nil && err != io.EOF {
 				m.done = true
+				m.err = fmt.Errorf("error during file download: %w", err)
 				return nil
 			}
 			if n == 0 {
 				break
 			}
 
+			// Write the downloaded chunk to the file
 			if _, err := file.Write(buffer[:n]); err != nil {
 				m.done = true
+				m.err = fmt.Errorf("failed to write to file: %w", err)
 				return nil
 			}
 
+			// Update the progress
 			totalDownloaded += int64(n)
 			m.current = totalDownloaded
 		}
 
 		m.done = true
+		m.err = nil
 		return nil
 	}
 }
@@ -103,6 +128,10 @@ func (m *Downloader) Update(msg tea.Msg) (*Downloader, tea.Cmd) {
 }
 
 func (m *Downloader) View() string {
+	if m.err != nil {
+		return ""
+	}
+
 	if m.done {
 		return fmt.Sprintf("%sDownload Complete!\nTotal Size: %d bytes\n", styles.CorrectMark, m.total)
 	}

utils/downloader.go

@@ -94,3 +94,30 @@ func (ti TextInput) View() string {
 	// Compose the full view string
 	return fmt.Sprintf("\n%s %s%s%s\n\n%s%s", styles.Text(">", styles.Cyan), beforeCursor, cursorChar, afterCursor, feedback, bottomText)
 }
+
+func (ti TextInput) ViewErr(err error) string {
+	var beforeCursor, cursorChar, afterCursor string
+	bottomText := styles.Text("Press Enter to submit or Ctrl+C to quit.", styles.Gray)
+	if len(ti.Text) == 0 {
+		return "\n" + styles.Text("> ", styles.Cyan) + styles.Text(ti.Placeholder, styles.Gray) + styles.Cursor(" ") + "\n\n" + styles.RenderError(err) + bottomText
+	} else if ti.Cursor < len(ti.Text) {
+		// Cursor is within the text
+		beforeCursor = styles.Text(ti.Text[:ti.Cursor], styles.Ivory)
+		cursorChar = styles.Cursor(ti.Text[ti.Cursor : ti.Cursor+1])
+		afterCursor = styles.Text(ti.Text[ti.Cursor+1:], styles.Ivory)
+	} else {
+		// Cursor is at the end of the text
+		beforeCursor = styles.Text(ti.Text, styles.Ivory)
+		cursorChar = styles.Cursor(" ")
+	}
+
+	feedback := ""
+	if ti.IsEntered {
+		if err := ti.ValidationFn(ti.Text); err != nil {
+			feedback = styles.RenderError(err)
+		}
+	}
+
+	// Compose the full view string
+	return fmt.Sprintf("\n%s %s%s%s\n\n%s%s%s", styles.Text(">", styles.Cyan), beforeCursor, cursorChar, afterCursor, feedback, styles.RenderError(err), bottomText)
+}