More complex message (preparation for knowing status of tapped items in UI) (#49)

* no message
* no message

Makefile

@@ -38,8 +38,7 @@ api: ## build API server
 
 docker: ## build Docker image 
 	@(echo "building docker image" )
-	docker build -t up9inc/mizu:latest .
-	#./build-push-featurebranch.sh
+	./build-push-featurebranch.sh
 
 push: push-docker push-cli ## build and publish Mizu docker image & CLI
 

api/pkg/api/main.go

@@ -33,7 +33,7 @@ func init() {
 	go func() {
 		for {
 			select {
-			case err := <- errOut:
+			case err := <-errOut:
 				fmt.Printf("name resolving error %s", err)
 			}
 		}
@@ -120,7 +120,8 @@ func saveHarToDb(entry *har.Entry, sender string) {
 	database.GetEntriesTable().Create(&mizuEntry)
 
 	baseEntry := utils.GetResolvedBaseEntry(mizuEntry)
-	baseEntryBytes, _ := json.Marshal(&baseEntry)
+	messageToSend := models.CreateBaseEntryWebSocketMessage(&baseEntry)
+	baseEntryBytes, _ := json.Marshal(&messageToSend)
 	broadcastToBrowserClients(baseEntryBytes)
 }
 

api/pkg/models/models.go

@@ -1,6 +1,8 @@
 package models
 
-import "time"
+import (
+	"time"
+)
 
 type MizuEntry struct {
 	ID                  uint `gorm:"primarykey"`
@@ -40,3 +42,41 @@ type EntriesFilter struct {
 	Operator  string `query:"operator" validate:"required,oneof='lt' 'gt'"`
 	Timestamp int64  `query:"timestamp" validate:"required,min=1"`
 }
+
+
+
+type WebSocketMessageType string
+const (
+	WebSocketMessageTypeEntry        WebSocketMessageType = "entry"
+	// WebSocketMessageTypeUpdateStatus WebSocketMessageType = "status"
+)
+
+func CreateBaseEntryWebSocketMessage(base *BaseEntryDetails) *WebSocketEntryMessage {
+	return &WebSocketEntryMessage{
+		WebSocketMessageMetadata: &WebSocketMessageMetadata{
+			MessageType: WebSocketMessageTypeEntry,
+		},
+		Data: base,
+	}
+}
+
+//func CreateWebSocketStatusMessage() *WebSocketStatusMessage {
+//	return &WebSocketEntryMessage{
+//		WebSocketMessageMetadata: &WebSocketMessageMetadata{
+//			MessageType: WebSocketMessageTypeUpdateStatus,
+//		}
+//	}
+//}
+
+type WebSocketEntryMessage struct {
+	*WebSocketMessageMetadata
+	Data *BaseEntryDetails `json:"data,omitempty"`
+}
+
+type WebSocketStatusMessage struct {
+	*WebSocketMessageMetadata
+}
+
+type WebSocketMessageMetadata struct {
+	MessageType WebSocketMessageType `json:"messageType,omitempty"`
+}

ui/src/components/HarPage.tsx

@@ -60,7 +60,11 @@ export const HarPage: React.FC = () => {
     if(ws.current) {
         ws.current.onmessage = e => {
             if(!e?.data) return;
-            const entry = JSON.parse(e.data);
+            const message = JSON.parse(e.data);
+
+            switch (message.messageType) {
+                case "entry":
+                    const entry = message.data
                     if(connection === ConnectionStatus.Paused) {
                         setNoMoreDataBottom(false)
                         return;
@@ -72,6 +76,13 @@ export const HarPage: React.FC = () => {
                         setNoMoreDataTop(false);
                     }
                     setEntries([...newEntries, entry])
+                    break
+                case "updateStatus":
+                    console.log("not implemented yet")
+                    break
+                default:
+                    console.error(`unsupported websocket message type, Got: ${message.messageType}`)
+            }
         }
     }