Add ping command

client/src/connector.lisp

@@ -28,14 +28,16 @@
       (loop while enabled-p
          do (log-errors
               (usocket:wait-for-input connection)
-              (let* ((message (decode-message (connection-stream-of this)))
-                     (message-id (getf message :reply-for)))
-                (with-instance-lock-held (this)
-                  (if-let ((handler (gethash message-id message-table)))
-                    (progn
-                      (remhash message-id message-table)
-                      (funcall handler message))
-                    (log:error "Handler not found for message with id ~A" message-id)))))
+              (let ((message (decode-message (connection-stream-of this))))
+                (if-let ((reply-id (getf message :reply-for)))
+                  (with-instance-lock-held (this)
+                    (if-let ((handler (gethash reply-id message-table)))
+                      (progn
+                        (remhash reply-id message-table)
+                        (funcall handler message))
+                      (log:error "Handler not found for message with id ~A" reply-id)))
+                  (encode-message (process-command (getf message :command) message)
+                                  (connection-stream-of this)))))
          finally (usocket:socket-close connection)))))
 
 
@@ -67,9 +69,9 @@
 
 
 (defmacro with-response (command-name (&rest properties) response &body body)
-    `(destructuring-bind (&key ,@properties &allow-other-keys) ,response
-       (check-response ,response ,command-name)
-       ,@body))
+  `(destructuring-bind (&key ,@properties &allow-other-keys) ,response
+     (check-response ,response ,command-name)
+     ,@body))
 
 
 (defmethod dispatch ((this connector) (task function) invariant &rest keys
@@ -115,3 +117,12 @@
 (defun register-game-stream (connector peer-id)
   (-> (connector :command :register-game-stream :peer-id peer-id) ()
     (with-response :ok () *message*)))
+
+
+(defun ping-peer (connector)
+  (-> (connector :command :ping) ()
+    (with-response :ok () *message*)))
+
+
+(defmethod process-command ((command (eql :ping)) message)
+  +ok-reply+)

common/packages.lisp

@@ -2,7 +2,8 @@
 
 
 (defpackage :mortar-combat.common
-  (:use :cl :ge.ng :ge.util)
-  (:export process-command
+  (:use :cl :ge.util)
+  (:export +ok-reply+
+           process-command
            encode-message
            decode-message))

common/process-command.lisp

@@ -1,6 +1,10 @@
 (in-package :mortar-combat.common)
 
 
+(define-constant +ok-reply+ (list :command :ok)
+  :test #'equal)
+
+
 (defgeneric process-command (command message)
   (:method (command message)
     (list :command :error

mortar-combat.asd

@@ -9,7 +9,7 @@
   :author "Pavel Korolev"
   :mailto "dev@borodust.org"
   :license "GPLv3"
-  :depends-on (cl-conspack)
+  :depends-on (cl-bodge/utils cl-conspack)
   :serial t
   :pathname "common/"
   :components ((:file "packages")

proxy/commands.lisp

@@ -1,10 +1,6 @@
 (in-package :mortar-combat.proxy)
 
 
-(define-constant +ok-reply+ (list :command :ok)
-  :test #'equal)
-
-
 (defmacro when-peer-identified (&body body)
   `(if *peer*
        (progn ,@body)