Handle incrementing transaction id

gomuks-structs.el

@@ -41,6 +41,8 @@
 
 (cl-defstruct gomuks-session
   user token transaction-id
+  websocket
+  ping-timer
   ;; Hash table of available rooms
   rooms)
 

gomuks.el

@@ -36,14 +36,12 @@
 
 (defvar client-state (make-gomuks-state :rooms '() :spaces '()))
 
+(defvar gomuks-current-session nil)
+
 (defvar gomuks-server-buffer "*gomuks-server*")
 (defvar gomuks-socket-buffer "*gomuks-socket-frame*")
 (defvar gomuks-server-name "*gomuks-server*")
 
-(defvar gomuks-auth-cookie nil)
-(defvar gomuks-websocket nil)
-(defvar gomuks-ping-timer nil)
-
 (defcustom gomuks-server-binary "~/tmp/gomuks"
   "The Gomuks backend binary."
   :type 'string
@@ -69,15 +67,14 @@
   (notifications-notify :title "Gomuks Server Closed" :app-name "gomuks.el"))
 
 (defvar gomuks-auth-endpoint (concat "http://" gomuks-base-url "/_gomuks/auth"))
-(defvar gomuks-auth-cookie)
 
 (defvar gomuks-ws-endpoint (concat "ws://" gomuks-base-url "/_gomuks/websocket"))
 
 (defun gomuks-connect (gomuks-username)
   "Opens a websocket connection with the specified gomuks endpoint"
   (interactive "sGomuks Username: \n")
-  (let ((gomuks-password (read-passwd "Gomuks Password: ")))
+  (let ((gomuks-password (read-passwd "Gomuks Password: "))
-    (setq gomuks-auth-cookie (let ((request--curl-cookie-jar (expand-file-name (make-temp-name "gomuks-cookie-")
+	(gomuks-auth-cookie (let ((request--curl-cookie-jar (expand-file-name (make-temp-name "gomuks-cookie-")
 									      temporary-file-directory)))
 			      (request gomuks-auth-endpoint
 				:type "POST"
@@ -88,14 +85,15 @@
 			      (sleep-for 0.5)
 			      ;; TODO: this needs to select domain dynamically, instead of hardcoding a string here
 			      (cdar (request--netscape-get-cookies request--curl-cookie-jar "localhost" "/_gomuks" t)))))
-  (setq gomuks-ping-timer (run-with-timer
+    (setq gomuks-current-session
+	  (make-gomuks-session :token gomuks-auth-cookie :transaction-id 0
+			       :ping-timer (run-with-timer
 					    0
 					    15
 					    (lambda ()
-			     (message "pinging")
+					      (gomuks-send-message "ping")))
-			     (websocket-send-text gomuks-websocket
+			       :websocket (websocket-open
-						  "{\"command\":\"ping\"}"))))
+					   gomuks-ws-endpoint
-  (setq gomuks-websocket (websocket-open gomuks-ws-endpoint
 					   :custom-header-alist
 					   `(("Cookie" . ,(concat "gomuks_auth=" gomuks-auth-cookie)))
 					   :on-message (lambda (_ws frame)
@@ -123,7 +121,7 @@
 											  :null-object '())))
 							     (message "test %S" msg)
 							     (cond ((equal (alist-get 'command msg) "sync_complete")
-								  (gomuks-sync-state (alist-get 'data msg)))))))))))
+								    (gomuks-sync-state (alist-get 'data msg)))))))))))))
 
 (defun gomuks-disconnect ()
   "Disconnect the gomuks websocket."
@@ -131,6 +129,20 @@
   (cancel-timer gomuks-ping-timer)
   (websocket-close gomuks-websocket))
 
+(defun gomuks-send-message (command &optional data)
+  "Send a message down the gomuks websocket, automatically incrementing the session transaction ID.
+`command' is the command string to send, and `data' is an alist that is converted to JSON as required by the command."
+  (setf (gomuks-session-transaction-id gomuks-current-session) (+ 1 (gomuks-session-transaction-id gomuks-current-session)))
+  (websocket-send-text
+   (gomuks-session-websocket gomuks-current-session)
+   (json-serialize
+    (let ((command-header `((command . ,command)
+			    (request_id . ,(gomuks-session-transaction-id gomuks-current-session)))))
+      (if data
+	  (append command-header
+		  `((data . ,data)))
+	command-header)))))
+
 (defun gomuks-process-initial-events (events)
   (mapcar
    (lambda (event)