Added msg-id

backplane-server.lisp

@@ -5,14 +5,18 @@
 ;; request
 
 (defclass request ()
-  ((sender :initarg :sender)))
+  ((sender     :initarg :sender)
+   (msg-id :initarg :msg-id
+               :reader  msg-id)))
 
 (defclass unknown-request (request)
   ((request :initarg :request
             :reader  request)))
 
 (defclass result ()
-  ((message :initarg :message)))
+  ((message    :initarg :message)
+   (msg-id :initarg :msg-id
+               :reader  msg-id)))
 
 ;; result
 
@@ -22,52 +26,60 @@
 (defun error-p (obj) (typep obj (find-class 'result/error)))
 (defun success-p (obj) (typep obj (find-class 'result/success)))
 
-(defun make-success (&optional msg)
-  (make-instance 'result/success :message msg))
+(defun make-success (&key msg msg-id)
+  (make-instance 'result/success
+                 :message    msg
+                 :msg-id msg-id))
 
-(defun make-error (&optional msg)
-  (make-instance 'result/error :message msg))
+(defun make-error (&key msg msg-id)
+  (make-instance 'result/error
+                 :message    msg
+                 :msg-id msg-id))
 
 (defgeneric render-result (result))
 
 (defmethod render-result ((res result/success))
-  (with-slots (message) res
-    (if message
-        (format nil "OK: ~A" message)
-        "OK")))
+  (with-slots (message msg-id) res
+    (let ((msg   (if message (format nil ":~A" message) ""))
+          (msgid (if msg-id (format nil " (~A)" msg-id) "")))
+      (format nil "OK~A~A" msgid msg))))
 
 (defmethod render-result ((res result/error))
-  (with-slots (message) res
-    (if message
-        (format nil "ERROR: ~A" message)
-        "ERROR")))
+  (with-slots (message msg-id) res
+    (let ((msg   (if message (format nil ":~A" message) ""))
+          (msgid (if msg-id (format nil " (~A)" msg-id) "")))
+      (format nil "ERROR~A~A" msgid msg))))
 
-(defgeneric parse-message (sender service api-version message)
+(defgeneric parse-message (sender service api-version message msg-id)
   (:documentation "Given an incoming message, turn it into the appropriate request."))
 
-(defmethod parse-message (sender service api-version message)
-  (make-error (format nil "unsupported service: ~A" service)))
+(defmethod parse-message (sender service api-version message msg-id)
+  (make-error :msg (format nil "unsupported service: ~A" service)
+              :msg-id msg-id))
 
 (defun decode-message (message-str)
   (handler-case
       (cl-json:decode-json-from-string message-str)
     (json:json-syntax-error (err)
       (declare (ignorable err))
-      (make-error (format nil "invalid json string: ~A" message-str)))))
+      (make-error :msg (format nil "invalid json string: ~A" message-str)))))
 
 (defun symbolize (str) (-> str string-upcase (intern :KEYWORD)))
 
 (defun dispatch-parse-message (message sender)
   (if-let ((api-version (cdr (assoc :VERSION message)))
-           (service     (symbolize (cdr (assoc :SERVICE message)))))
-    (parse-message sender service api-version (cdr (assoc :PAYLOAD message)))
-    (make-error (format nil "missing api_version or service name in request in message"))))
+           (service     (symbolize (cdr (assoc :SERVICE message))))
+           (msg-id      (cdr (assoc :MSGID message))))
+    (parse-message sender service api-version (cdr (assoc :PAYLOAD message)) msg-id)
+    (make-error :msg (format nil "missing api_version, msgid, or service name in request in message")
+                :msg-id msg-id)))
 
 (defgeneric handle-message (message)
   (:documentation "Perform necessary actions to handle a backplane message, and return a result."))
 
 (defmethod handle-message ((message unknown-request))
-  (make-error (format nil "unknown request: ~A" (request message))))
+  (make-error :msg (format nil "unknown request: ~A" (request message))
+              :msg-id (msg-id message)))
 
 (defmacro success-> (init &rest forms)
   (let ((blocksym (gensym)))