integrate smfix, and improve discover

Author: macdylan

.gitignore

@@ -1,3 +1,4 @@
 *.py
 dist/
 .vscode/
+go.work*

connector.go

@@ -2,10 +2,53 @@ package main
 
 import (
 	"errors"
+	"io"
 	"net"
 	"time"
 )
 
+const (
+	FILE_SIZE_MIN = 1
+	FILE_SIZE_MAX = 2 << 30 // 2GB
+)
+
+var (
+	errFileEmpty    = errors.New("File is empty.")
+	errFileTooLarge = errors.New("File is too large.")
+)
+
+type Payload struct {
+	File io.Reader
+	Name string
+	Size int64
+}
+
+func (p *Payload) SetName(name string) {
+	p.Name = normalizedFilename(name)
+}
+
+func (p *Payload) ReadableSize() string {
+	return humanReadableSize(p.Size)
+}
+
+func (p *Payload) GetContent(fix bool) (cont []byte, err error) {
+	if fix {
+		cont, err = postProcess(p.File)
+		p.Size = int64(len(cont))
+	} else {
+		cont, err = io.ReadAll(p.File)
+	}
+	return cont, err
+}
+
+func NewPayload(file io.Reader, name string, size int64) *Payload {
+	return &Payload{
+		File: file,
+		Name: normalizedFilename(name),
+		Size: size,
+	}
+}
+
 type connector struct {
 	handlers []Handler
 }
@@ -14,38 +57,42 @@ type Handler interface {
 	Ping(*Printer) bool
 	Connect() error
 	Disconnect() error
-	Upload(fname string, content []byte) error
+	Upload(*Payload) error
 }
 
 func (c *connector) RegisterHandler(h Handler) {
 	c.handlers = append(c.handlers, h)
 }
 
 // Upload to upload a file to a printer
-func (c *connector) Upload(p *Printer, fname string, content []byte) error {
+func (c *connector) Upload(printer *Printer, payload *Payload) error {
 	// Iterate through all handlers
 	for _, h := range c.handlers {
 		// Check if handler can ping the printer
-		if h.Ping(p) {
+		if h.Ping(printer) {
 			// Connect to the printer
 			if err := h.Connect(); err != nil {
 				return err
 			}
-			// Upload the file to the printer
-			if err := h.Upload(fname, content); err != nil {
-				h.Disconnect()
-				return err
+			defer h.Disconnect()
+
+			if payload.Size > FILE_SIZE_MAX {
+				return errFileTooLarge
+			}
+			if payload.Size < FILE_SIZE_MIN {
+				return errFileEmpty
 			}
-			// Disconnect from the printer
-			if err := h.Disconnect(); err != nil {
+			// Upload the file to the printer
+			if err := h.Upload(payload); err != nil {
 				return err
 			}
+
 			// Return nil if successful
 			return nil
 		}
 	}
 	// Return error if printer is not available
-	return errors.New("Printer " + p.IP + " is not available.")
+	return errors.New("Printer " + printer.IP + " is not available.")
 }
 
 var Connector = &connector{}

connector_http.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	"bytes"
 	"fmt"
 	"io"
 	"log"
@@ -40,16 +39,12 @@ func (hc *HTTPConnector) Ping(p *Printer) bool {
 }
 
 func (hc *HTTPConnector) Connect() error {
-	hc.client = req.C()
-	hc.client.DisableAllowGetMethodPayload()
-	// hc.client.EnableDumpAllWithoutRequestBody()
-
 	result := struct {
 		Token string `json:"token"`
 	}{}
 
 	req := hc.request().
-		SetSuccessResult(&result).
+		SetResult(&result).
 		SetRetryCount(3).
 		SetRetryFixedInterval(1 * time.Second).
 		SetRetryCondition(func(r *req.Response, err error) bool {
@@ -103,19 +98,19 @@ func (hc *HTTPConnector) Connect() error {
 }
 
 func (hc *HTTPConnector) Disconnect() (err error) {
-	if hc.printer.Token != "" {
+	if hc.client != nil && hc.printer.Token != "" {
 		_, err = hc.request().Post(hc.URL("/disconnect"))
 	}
 	return
 }
 
-func (hc *HTTPConnector) Upload(fname string, content []byte) (err error) {
+func (hc *HTTPConnector) Upload(payload *Payload) (err error) {
 	finished := make(chan empty, 1)
 	defer func() {
 		finished <- empty{}
 	}()
 	go func() {
-		ticker := time.NewTicker(1 * time.Second)
+		ticker := time.NewTicker(2 * time.Second)
 		for {
 			select {
 			case <-ticker.C:
@@ -140,19 +135,40 @@ func (hc *HTTPConnector) Upload(fname string, content []byte) (err error) {
 
 	file := req.FileUpload{
 		ParamName: "file",
-		FileName:  fname,
+		FileName:  payload.Name,
 		GetFileContent: func() (io.ReadCloser, error) {
-			return io.NopCloser(bytes.NewBuffer(content)), nil
+			pr, pw := io.Pipe()
+			go func() {
+				defer pw.Close()
+				content, err := payload.GetContent(SmFix)
+				if SmFix {
+					log.SetOutput(os.Stderr)
+					if err != nil {
+						log.Printf("G-Code fix error(ignored): %s", err)
+					} else {
+						log.Printf("G-Code fixed")
+					}
+					log.SetOutput(w)
+				}
+				pw.Write(content)
+			}()
+			return pr, nil
 		},
-		FileSize:    int64(len(content)),
-		ContentType: "application/octet-stream",
+		FileSize: payload.Size,
+		// ContentType: "application/octet-stream",
 	}
-	req := hc.request(0).SetFileUpload(file).SetUploadCallbackWithInterval(func(info req.UploadInfo) {
-		perc := float64(info.UploadedSize/info.FileSize) * 100.0
-		log.Printf("  - HTTP sending %.1f%%", perc)
+	r := hc.request(0)
+	r.SetFileUpload(file)
+	r.SetUploadCallbackWithInterval(func(info req.UploadInfo) {
+		if info.FileSize > 0 {
+			perc := float64(info.UploadedSize) / float64(info.FileSize) * 100.0
+			log.Printf("  - HTTP sending %.1f%%", perc)
+		} else {
+			log.Printf("  - HTTP sending %s...", humanReadableSize(info.UploadedSize))
+		}
 	}, 35*time.Millisecond)
 
-	_, err = req.Post(hc.URL("/upload"))
+	_, err = r.Post(hc.URL("/upload"))
 	return
 }
 
@@ -161,13 +177,21 @@ func (hc *HTTPConnector) request(timeout ...int) *req.Request {
 	if len(timeout) > 0 {
 		to = timeout[0]
 	}
+
+	if hc.client == nil {
+		hc.client = req.C()
+		hc.client.DisableAllowGetMethodPayload()
+		if Debug {
+			hc.client.EnableDumpAllWithoutRequestBody()
+		}
+	}
+
 	req := hc.client.SetTimeout(time.Second * time.Duration(to)).R()
-	// for POST
-	req.SetFormData(map[string]string{"token": hc.printer.Token})
 	// for GET
 	req.SetQueryParam("token", hc.printer.Token)
-	// no cache
-	req.SetQueryParam("_", fmt.Sprintf("%d", time.Now().Unix()))
+	// for POST
+	req.SetFormData(map[string]string{"token": hc.printer.Token})
+
 	return req
 }
 

connector_sacp.go

@@ -41,12 +41,22 @@ func (sc *SACPConnector) Connect() (err error) {
 
 func (sc *SACPConnector) Disconnect() error {
 	if sc.conn != nil {
+		SACP_disconnect(sc.conn, SACPTimeout*time.Second)
 		sc.conn.Close()
 	}
 	return nil
 }
 
-func (sc *SACPConnector) Upload(fname string, content []byte) (err error) {
+func (sc *SACPConnector) Upload(payload *Payload) (err error) {
+	content, err := payload.GetContent(SmFix)
+	if SmFix {
+		if err != nil {
+			log.Printf("G-Code fix error(ignored): %s", err)
+		} else {
+			log.Printf("G-Code fixed")
+		}
+	}
+
 	w := uilive.New()
 	w.Start()
 	log.SetOutput(w)
@@ -55,7 +65,7 @@ func (sc *SACPConnector) Upload(fname string, content []byte) (err error) {
 		log.SetOutput(os.Stderr)
 	}()
 
-	err = SACP_start_upload(sc.conn, fname, content, SACPTimeout*time.Second)
+	err = SACP_start_upload(sc.conn, payload.Name, content, SACPTimeout*time.Second)
 	return
 }