Protocol tweaks + rxq

Looks like we're not using JWT after all

internal/pmanager/conf.go

@@ -48,9 +48,6 @@ type configSnapshot struct {
 	// use the one used by pinecone for websockets. This saves allocating another
 	// port and other system resources.
 	webserverHandlers map[string]http.HandlerFunc
-
-	// Handlers exposed over pinecone.
-	pineconeWebserverHandlers map[string]http.HandlerFunc
 }
 
 // This struct represents the configuration for a pinecone manager. Values can be
@@ -153,12 +150,6 @@ func (pm *manager) SetWebserverHandlers(u map[string]http.HandlerFunc) {
 	pm.conf.webserverHandlers = u
 }
 
-func (pm *manager) SetPineconeWebserverHandlers(u map[string]http.HandlerFunc) {
-	defer pm.conf.autolock()()
-
-	pm.conf.pineconeWebserverHandlers = u
-}
-
 //
 // Getters
 //
@@ -210,9 +201,3 @@ func (pm *manager) GetWebserverHandlers() map[string]http.HandlerFunc {
 
 	return pm.conf.webserverHandlers
 }
-
-func (pm *manager) GetPineconeWebserverHandlers() map[string]http.HandlerFunc {
-	defer pm.conf.autorlock()()
-
-	return pm.conf.pineconeWebserverHandlers
-}

internal/pmanager/pmanager.go

@@ -1,9 +1,11 @@
 package pmanager
 
 import (
+	"bytes"
 	"context"
 	"crypto/ed25519"
 	"crypto/tls"
+	"encoding/json"
 	"fmt"
 	"io"
 	"log"
@@ -16,7 +18,6 @@ import (
 	"time"
 
 	"git.0x1a8510f2.space/wraith-labs/wraith-module-pinecomms/internal/misc"
-	"github.com/cristalhq/jwt/v4"
 	"github.com/gorilla/mux"
 	"github.com/gorilla/websocket"
 	pineconeConnections "github.com/matrix-org/pinecone/connections"
@@ -76,15 +77,41 @@ func (pm *manager) Start() {
 		pMulticast := pineconeMulticast.NewMulticast(c.logger, pRouter)
 		pManager := pineconeConnections.NewConnectionManager(pRouter, nil)
 
-		// Set up pinecone HTTP paths.
+		// Set up rx queue handling.
 		pMux := mux.NewRouter().SkipClean(true).UseEncodedPath()
-		pMux.PathPrefix("/ptest").HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			println("HELLO")
+		pMux.PathPrefix(ROUTE_PREFIX).HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			// Read the payload from request body.
+			payload, err := io.ReadAll(r.Body)
+			if err != nil {
+				w.WriteHeader(400)
+				return
+			}
+
+			// Try to JSON parse the payload.
+			data := packetData{}
+			err = json.Unmarshal(payload, &data)
+			if err != nil {
+				w.WriteHeader(400)
+				return
+			}
+
+			// Fill out packet metadata.
+			p := packet{
+				Peer:   r.RemoteAddr,
+				Method: r.Method,
+				Route:  strings.TrimPrefix(r.URL.EscapedPath(), ROUTE_PREFIX),
+				Data:   data,
+			}
+
+			// Respond so the requester doesn't have to wait for the queue to empty.
 			w.WriteHeader(200)
+
+			// Add to the queue.
+			pm.rxq <- p
 		})
 
 		pHTTP := pQUIC.Protocol("wraith").HTTP()
-		pHTTP.Mux().Handle("/ptest", pMux)
+		pHTTP.Mux().Handle("/", pMux)
 
 		// Pinecone HTTP server.
 		pineconeHttpServer := http.Server{
@@ -224,14 +251,6 @@ func (pm *manager) Start() {
 		// Connect to any static peers we were given.
 		for _, peer := range c.staticPeers {
 			pManager.AddPeer(peer)
-			/*resp, err := pHTTP.Client().Get("http://3d5054f46a6cbb6526a9e892151714e22ade8ff9e3a60fe534d991428936bbdf/ptest")
-			if err != nil {
-				fmt.Print(err)
-			} else {
-				var respbytes []byte
-				resp.Body.Read(respbytes)
-				fmt.Printf("%v\n%v\n", resp.StatusCode, respbytes)
-			}*/
 		}
 
 		// Manage tx queue.
@@ -239,23 +258,14 @@ func (pm *manager) Start() {
 		go func(ctx context.Context) {
 			defer wg.Done()
 
-			// Prepare JWT signing helpers.
-			signer, err := jwt.NewSignerEdDSA(c.pineconeIdentity)
-			if err != nil {
-				panic(err)
-			}
-
-			builder := jwt.NewBuilder(signer)
-
 			for {
 				select {
 				case p := <-pm.txq:
 
-					// Build a JWT with the payload from the queue element.
-					claims := map[string]any{}
-					data, err := builder.Build(claims)
+					// Serialize the payload from the queue element.
+					payload, err := json.Marshal(p.Data)
 					if err != nil {
-						pm.conf.logger.Printf("failed to build token for tx queue element due to error: %e", err)
+						pm.conf.logger.Printf("failed to serialize tx queue element due to error: %e", err)
 						continue
 					}
 
@@ -265,14 +275,15 @@ func (pm *manager) Start() {
 						URL: &url.URL{
 							Scheme: "http",
 							Host:   p.Peer,
-							Path:   "/" + fmt.Sprint(p.Route),
+							Path:   ROUTE_PREFIX + p.Route,
 						},
 						Cancel: ctx.Done(),
-						Body:   io.NopCloser(strings.NewReader(data.String())),
+						Body:   io.NopCloser(bytes.NewReader(payload)),
 					}
 
 					// Send request to peer.
 					pHTTP.Client().Do(&req)
+
 				case <-ctx.Done():
 					// If the context is closed, exit.
 					return

internal/pmanager/proto.go

@@ -9,7 +9,7 @@ const (
 	CURRENT_PROTO = "james"
 
 	// The prefix for all Wraith PineComms HTTP routes.
-	ROUTE_PREFIX = "wpc"
+	ROUTE_PREFIX = "/_wpc/" + CURRENT_PROTO + "/"
 )
 
 /*
@@ -24,11 +24,9 @@ The HTTP part of the protocol is extremely simple; only two routes are provided:
 
 */
 
-type route int
-
 const (
-	ROUTE_PING route = iota
-	ROUTE_SEND
+	ROUTE_PING = "ping"
+	ROUTE_SEND = "send"
 )
 
 type packetData struct {
@@ -46,8 +44,8 @@ type packet struct {
 	// The HTTP method this packet was received or is to be sent with.
 	Method string
 
-	// The HTTP route this packet was received on or is being sent to.
-	Route route
+	// The HTTP route this packet was received on or is being sent to (excluding prefix).
+	Route string
 
 	// The data included with the packet encoded as pmanager-flavoured JWT.
 	Data packetData