httpRequest.dump.go

@@ -1,86 +0,0 @@
-package httppb
-
-import (
-	"fmt"
-
-	"go.wit.com/log"
-)
-
-func (pb *HttpRequest) DumpRemoteAddr() string {
-	return pb.RemoteAddr
-}
-
-func (pb *HttpRequest) DumpUserAgent() string {
-	var all string
-	for param, values := range pb.Query {
-		for _, value := range values {
-			all += fmt.Sprint(" Query:", param, value)
-		}
-	}
-	// hostname := r.URL.Query().Get("hostname")
-	return pb.GetUserAgent() + all
-}
-
-// todo: convert this code
-func (pb *HttpRequest) DumpClient() {
-	log.Infof("%s %s %s\n", pb.Host, pb.URL, pb.RemoteAddr)
-	/*
-		var host, url, proto, addr, agent string
-
-		host = r.Host
-		url = r.URL.String()
-		proto = r.Proto
-		addr = r.RemoteAddr
-		agent = r.UserAgent()
-
-		log.Warn(host, proto, addr, url, agent)
-
-		fmt.Fprintln(accessf, time.Now(), host, proto, addr, url, agent)
-		// return
-
-		fmt.Fprintln(clientf)
-		fmt.Fprintln(clientf, time.Now())
-		// Basic request information
-		fmt.Fprintln(clientf, "Method:", r.Method)
-		fmt.Fprintln(clientf, "URL:", r.URL)
-		fmt.Fprintln(clientf, "Protocol:", r.Proto)
-		fmt.Fprintln(clientf, "Host:", r.Host)
-		fmt.Fprintln(clientf, "Remote Address:", r.RemoteAddr)
-
-		// Headers
-		fmt.Fprintln(clientf, "Headers:")
-		for name, values := range r.Header {
-			for _, value := range values {
-				fmt.Fprintln(clientf, "Headers:", name, value)
-			}
-		}
-
-		// Query parameters
-		fmt.Fprintln(clientf, "Query Parameters:")
-		for param, values := range r.URL.Query() {
-			for _, value := range values {
-				fmt.Fprintln(clientf, "Query:", param, value)
-			}
-		}
-
-		// User-Agent
-		fmt.Fprintln(clientf, "User-Agent:", r.UserAgent())
-
-		// Content Length
-		fmt.Fprintln(clientf, "Content Length:", r.ContentLength)
-
-		// Cookies
-		fmt.Fprintln(clientf, "Cookies:")
-		for _, cookie := range r.Cookies() {
-			fmt.Fprintln(clientf, cookie.Name, cookie.Value)
-		}
-
-		// Request Body (if applicable)
-		if r.Body != nil {
-			body, err := ioutil.ReadAll(r.Body)
-			if err == nil {
-				fmt.Fprintln(clientf, "Body:", string(body))
-			}
-		}
-	*/
-}

httpRequest.proto

@@ -4,9 +4,6 @@ syntax = "proto3";
 
 package httppb;
 
-// todo: try this
-// import "google/rpc/status.proto";
-//    google.rpc.Status           error            = 13;
 import "google/protobuf/timestamp.proto"; // Import the well-known type for Timestamp
 
 message HttpRequest {                                      // HttpRequest represents the essential fields of an incoming HTTP request.
@@ -18,16 +15,10 @@ message HttpRequest {                                       // HttpRequest repre
         string                      IP               = 6;  // The remote IP address of the client, after resolving proxies.
         string                      host             = 7;  // The host on which the URL is sought (www.wit.com)
         string                      hostname         = 8;  // The hostname of the client if passed from the client (mylaptop.fun.me)
-        string                      namespace         = 9;  // This is the pb namespace ("go.wit.com/lib/protobuf/virtpb")
+        bytes                       body             = 9;  // The request body as raw bytes.
-        google.protobuf.Timestamp   ctime             = 10; // create time of the patch
+        string                      namespace        = 10; // When the body is a pb (always!). This is the pb namespace ("go.wit.com/lib/protobuf/virtpb")
-        bytes                       clientData        = 11; // the client payload
+        google.protobuf.Timestamp   ctime            = 11; // create time of the patch
-        int64                       clientDataLen     = 12; // len(body)
+        repeated string             errors           = 12; // When the body is a pb (always!). This is the pb namespace ("go.wit.com/lib/protobuf/virtpb")
-        bytes                       serverData        = 13; // the server response
-        int64                       serverDataLen     = 14; // len(data)
-        repeated string             logs              = 15; // use this to store whatever you want while the whole POST happens
-        string                      userAgent         = 16; // client user-agent
-        map<string, string>         query             = 17; // r.URL.Query()
-        string                      remoteAddr        = 18; // r.RemoteAddr
 }
 
 message HttpRequests {                                     // `autogenpb:marshal` `autogenpb:mutex`

log.go

@@ -1,11 +0,0 @@
-package httppb
-
-import "fmt"
-
-func (pb *HttpRequest) Log(a ...any) {
-	pb.Logs = append(pb.Logs, fmt.Sprint(a...))
-}
-
-func (pb *HttpRequest) Logf(s string, a ...any) {
-	pb.Logs = append(pb.Logs, fmt.Sprintf(s, a...))
-}

middleware.go

@@ -1,72 +0,0 @@
-package httppb
-
-// http middleware example. probably not interesting since we only pass protobufs
-// middleware concepts might, or might not be useful here
-
-/*
-// Define a key type to avoid context key collisions.
-type contextKey string
-
-const bufferedBodyKey = contextKey("bufferedBody")
-
-// bufferBodyMiddleware reads the request body and replaces it with a new reader,
-// allowing it to be read multiple times. The original body is stored in the request context.
-func bufferBodyMiddleware(next http.Handler) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		// Only buffer if there's a body to read.
-		if r.Body == nil || r.ContentLength == 0 {
-			next.ServeHTTP(w, r)
-			return
-		}
-
-		bodyBytes, err := ioutil.ReadAll(r.Body)
-		if err != nil {
-			log.Printf("Error reading body in middleware: %v\n", err)
-			return
-		}
-		defer r.Body.Close()
-
-		// Store the buffered body in the context for downstream handlers.
-		ctx := context.WithValue(r.Context(), bufferedBodyKey, bodyBytes)
-
-		// Replace the original body with a new reader on the buffered bytes.
-		// This allows subsequent handlers to read the body again.
-		r.Body = ioutil.NopCloser(bytes.NewReader(bodyBytes))
-
-		// Call the next handler in the chain with the modified request.
-		next.ServeHTTP(w, r.WithContext(ctx))
-	})
-}
-
-// okHandler is the final handler. It can now safely access the body from the context,
-// knowing that other middleware might have also read it.
-func okHandler(w http.ResponseWriter, r *http.Request) {
-	// For demonstration, we can try reading the body directly here too.
-	// The middleware ensures this is a fresh stream of the buffered data.
-	bodyFromStream, err := ioutil.ReadAll(r.Body)
-	if err != nil {
-		log.Printf("Error reading body in handler: %v", err)
-		http.Error(w, "Internal Server Error", http.StatusInternalServerError)
-		return
-	}
-
-	log.Printf("Handler read %d bytes from the request body stream.", len(bodyFromStream))
-
-	// We can also retrieve the body from the context if needed.
-	bodyFromContext, ok := r.Context().Value(bufferedBodyKey).([]byte)
-	if !ok {
-		log.Println("Could not retrieve buffered body from context.")
-		http.Error(w, "Internal Server Error", http.StatusInternalServerError)
-		return
-	}
-
-	log.Printf("Handler retrieved %d bytes from context.", len(bodyFromContext))
-
-	// Prove they are the same.
-	if !bytes.Equal(bodyFromStream, bodyFromContext) {
-		log.Println("FATAL: Body from stream and context do not match!")
-	}
-
-	fmt.Fprintf(w, "Successfully read body of %d bytes.\n", len(bodyFromContext))
-}
-*/

post.go

@@ -54,10 +54,7 @@ func DoPost(baseURL string, route string, data []byte) (*HttpRequest, error) {
 
 	reqPB, err := ReqToPB(req)
 	reqPB.URL = finalURL.String()
-	reqPB.ClientData = data
+	reqPB.Body = body
-	reqPB.ClientDataLen = int64(len(data))
-	reqPB.ServerData = body
-	reqPB.ServerDataLen = int64(len(body))
 
 	return reqPB, nil
 }

reqToPB.go

@@ -53,13 +53,6 @@ func ReqToPB(r *http.Request) (*HttpRequest, error) {
 		}
 	}
 
-	query := make(map[string]string)
-	for param, values := range r.URL.Query() {
-		if len(values) > 0 {
-			query[param] = strings.Join(values, "\n")
-		}
-	}
-
 	msg, err := ioutil.ReadAll(r.Body) // Read the body as []byte
 	r.Body.Close()
 	// log.Info("TRYING TO MARSHAL bytes:", len(msg), err)
@@ -71,12 +64,8 @@ func ReqToPB(r *http.Request) (*HttpRequest, error) {
 		Headers:  headers,
 		IP:       getClientIP(r),
 		Host:     r.Host,
-		ClientData:    msg,
+		Body:     msg,
-		ClientDataLen: int64(len(msg)),
 		Hostname: r.Header.Get("hostname"),
-		UserAgent:     r.UserAgent(),
-		Query:         query,
-		RemoteAddr:    r.RemoteAddr,
 	}
 	pb.Route = cleanURL(r.URL.Path)
 

startHTTP.go

@@ -1,25 +0,0 @@
-// Copyright 1994-2025 WIT.COM Inc Licensed GPL 3.0
-
-package httppb
-
-import (
-	"fmt"
-	"net/http"
-
-	"go.wit.com/log"
-)
-
-// starts and sits waiting for HTTP requests
-func StartHTTP(okHandler func(http.ResponseWriter, *http.Request), port int) error {
-	http.HandleFunc("/", okHandler)
-
-	p := fmt.Sprintf(":%d", port)
-	log.Println("Running on port", p)
-
-	err := http.ListenAndServe(p, nil)
-	if err != nil {
-		log.Println("Error starting server:", err)
-		return err
-	}
-	return nil
-}

writefile.go

@@ -1,29 +0,0 @@
-// Copyright 1994-2025 WIT.COM Inc Licensed GPL 3.0
-
-package httppb
-
-import (
-	"embed"
-	"fmt"
-	"net/http"
-
-	"go.wit.com/log"
-)
-
-func WriteFile(w http.ResponseWriter, resfork embed.FS, filename string) error {
-	// fmt.Fprintln(w, "GOT TEST?")
-	fullname := "resources/" + filename
-	pfile, err := resfork.ReadFile(fullname)
-	if err != nil {
-		return err
-	}
-
-	var repohtml string
-	repohtml = string(pfile)
-	if filename == "goReference.svg" {
-		w.Header().Set("Content-Type", "image/svg+xml")
-	}
-	fmt.Fprintln(w, repohtml)
-	log.Println("writeFile() found internal file:", filename)
-	return nil
-}