Send updates in chunks

[eow] / empire.lisp

diff --git a/empire.lisp b/empire.lisp
index 34aea1367f279b6a5c6130f00719a420083b3673..c32696c3504258bd0f4bf78d61806f3b419c11c0 100644 (file)
--- a/empire.lisp
+++ b/empire.lisp
@@ -44,7 +44,11 @@
    (session
     :accessor session
     :initarg :session
    (session
     :accessor session
     :initarg :session

-    :documentation "web session to which this connection belongs")))
+    :documentation "web session to which this connection belongs")
+   (send-queue
+    :accessor send-queue
+    :initform (locked-queue:create)
+    :documentation "lines outstanding to be sent at next prompt")))

 
 (defun make-connection (&key (user nil)
                        (password nil)
 
 (defun make-connection (&key (user nil)
                        (password nil)


@@ -81,24 +85,27 @@
         (handler (spawn-with-name (format nil "empire-handler-~a" user)
                                   #'handle-connection connection)))
     (setf (connection-handler connection) handler)
         (handler (spawn-with-name (format nil "empire-handler-~a" user)
                                   #'handle-connection connection)))
     (setf (connection-handler connection) handler)

-    (empire-log:info "empire:connect: ~a" connection)
+    (empire-log:info "~a: connect" connection)

     connection))
 
 (defgeneric quit (connection))
 (defgeneric handle-connection (connection))
 (defgeneric read-message (connection))
     connection))
 
 (defgeneric quit (connection))
 (defgeneric handle-connection (connection))
 (defgeneric read-message (connection))

-(defgeneric send-message (connection message))
+(defgeneric send-message (connection message &key next-mode))
+(defgeneric connected-p (connection))

 (defgeneric reconnect (conncetion))
 
 (defgeneric reconnect (conncetion))
 

+(defmethod connected-p ((c connection))
+  (sb-thread:thread-alive-p (connection-handler c)))
+

 (defmethod reconnect ((c connection))
   (with-slots (server-name server-port user password socket stream connection-handler) c
       (let* ((sock (usocket:socket-connect server-name server-port))
 (defmethod reconnect ((c connection))
   (with-slots (server-name server-port user password socket stream connection-handler) c
       (let* ((sock (usocket:socket-connect server-name server-port))

-            (s (usocket:socket-stream sock))
-            (handler (spawn-with-name (format nil "empire-handler-~a" user)
-                                      #'handle-connection c)))
+            (s (usocket:socket-stream sock)))

        (setf socket sock
              stream s
        (setf socket sock
              stream s

-             connection-handler handler)))
+             connection-handler (spawn-with-name (format nil "empire-handler-~a" user)
+                                                 #'handle-connection c))))

   (empire-log:info "~a: reconnect" c))
 
 (defparameter +C_CMDOK+ "0")
   (empire-log:info "~a: reconnect" c))
 
 (defparameter +C_CMDOK+ "0")


@@ -140,19 +147,20 @@
 (defgeneric handle-prompt (base-mode message))
 (defgeneric handle-flush (base-mode message))
 (defgeneric handle-simple-message (base-mode message))
 (defgeneric handle-prompt (base-mode message))
 (defgeneric handle-flush (base-mode message))
 (defgeneric handle-simple-message (base-mode message))

+(defgeneric handle-ignore (base-mode message))

 
 (defmethod handle-init ((m init-mode) message)
   (declare (ignorable message))
   (with-slots (play-sent-p) m
     (if (not play-sent-p)
 
 (defmethod handle-init ((m init-mode) message)
   (declare (ignorable message))
   (with-slots (play-sent-p) m
     (if (not play-sent-p)

-       (progn 
-         (play (connection m))
+       (let ((c (connection m)))
+         (login-and-play c)

          (setf play-sent-p t))
        (set-new-mode m 'play-mode))))
 
 (defmethod handle-exit ((m init-mode) message)
   (declare (ignorable message))
          (setf play-sent-p t))
        (set-new-mode m 'play-mode))))
 
 (defmethod handle-exit ((m init-mode) message)
   (declare (ignorable message))

-  (quit (connection m)))
+  t)

 
 (defmethod handle-exit ((m play-mode) message)
   (declare (ignorable message))
 
 (defmethod handle-exit ((m play-mode) message)
   (declare (ignorable message))


@@ -168,7 +176,17 @@
 
 (defmethod handle-flush ((m play-mode) message)
   (let* ((c (connection m)))
 
 (defmethod handle-flush ((m play-mode) message)
   (let* ((c (connection m)))

-    (empire-web:prompt (session c) message)))
+    (empire-web:prompt (session c) message)
+    (send-next-line c)))
+
+(defmethod send-next-line ((c connection))
+  (let ((next-event (locked-queue:dequeue (send-queue c))))
+    (etypecase next-event
+      (string (send-message-one c next-event))
+      (cons (let ((message (car next-event))
+                 (mode (cdr next-event)))
+             (send-message-one c message)
+             (set-new-mode c mode))))))

 
 (defmethod handle-prompt ((m play-mode) message)
   (let* ((c (connection m)))
 
 (defmethod handle-prompt ((m play-mode) message)
   (let* ((c (connection m)))


@@ -176,7 +194,12 @@
       (let* ((minutes (read s)) ;;FIXME DANGEROUS
             (btus (read s)))
        (empire-web:prompt (session c)
       (let* ((minutes (read s)) ;;FIXME DANGEROUS
             (btus (read s)))
        (empire-web:prompt (session c)

-                          (format nil "[~a,~a]: " minutes btus))))))
+                          (format nil "[~a,~a]: " minutes btus))))
+    (send-next-line c)))
+
+(defmethod handle-ignore ((m init-mode) message)
+  (declare (ignorable message))
+  t)

 
 (defparameter *line-type-dispatch*
   (list `(,+C_DATA+ . handle-data)
 
 (defparameter *line-type-dispatch*
   (list `(,+C_DATA+ . handle-data)


@@ -185,6 +208,7 @@
        `(,+C_FLUSH+ . handle-flush)
        `(,+C_BADCMD+ . handle-simple-message)
        `(,+C_FLASH+ . handle-simple-message)
        `(,+C_FLUSH+ . handle-flush)
        `(,+C_BADCMD+ . handle-simple-message)
        `(,+C_FLASH+ . handle-simple-message)

+       `(,+C_CMDOK+ . handle-ignore)

        `(,+C_PROMPT+ . handle-prompt)))
 
 (defun parse-server-line (line)
        `(,+C_PROMPT+ . handle-prompt)))
 
 (defun parse-server-line (line)


@@ -231,29 +255,25 @@
     (write-sequence message s)
     (terpri s)
     (force-output s))
     (write-sequence message s)
     (terpri s)
     (force-output s))

-  
-(defmethod send-message ((c connection) message)
+
+(defgeneric send-message-one (connection string))
+(defmethod send-message-one ((c connection) message)

   (empire-log:info "~a: > ~a" c message)
   (empire-log:info "~a: > ~a" c message)

-  (let ((sent-p nil)
-       (tries 3))
-    (loop
-       while (and (not sent-p)
-                 (> tries 0))
-       do (handler-case
-             (let ((s (network-stream c)))
-               (raw-send-message s message)
-               (setf sent-p t))
-           (sb-int:closed-stream-error ()
-             (progn
-               (decf tries)
-               (empire-log:info "~a: Connection close - retrying (~a tries left)" c tries)
-               (reconnect c))))))
-  message)
+  (let ((s (network-stream c)))
+    (raw-send-message s message)))
+
+(defmethod send-message ((c connection) message &key next-mode)
+  (if (not (connected-p c))
+      (reconnect c))
+  (if next-mode
+      (locked-queue:enqueue (send-queue c) (cons message next-mode))
+      (locked-queue:enqueue (send-queue c) message)))

 
 (defparameter +special-command-char+ #\;)
 
 (defun special-command-p (line)
 
 (defparameter +special-command-char+ #\;)
 
 (defun special-command-p (line)

-  (char= +special-command-char+ (aref line 0)))
+  (and (> (length line) 0)
+       (char= +special-command-char+ (aref line 0))))

 
 (defmethod special-xup ((c connection))
   t)
 
 (defmethod special-xup ((c connection))
   t)


@@ -267,10 +287,15 @@
   (cond ((special-command-p line) (special-command c (subseq line 1)))
        (t (send-message c line))))
 
   (cond ((special-command-p line) (special-command c (subseq line 1)))
        (t (send-message c line))))
 

-(defgeneric play (connection))
-(defmethod play ((c connection))
+(defgeneric login-and-play (connection))
+(defmethod login-and-play ((c connection))
+  (send-message-one c (format nil "client eow ~a" *version*))
+  (send-message-one c "user FIXME")

   (with-slots (user password) c
   (with-slots (user password) c

-    (send-message c (format nil "play FIXME ~a ~a" user password))))
+    (send-message-one c (format nil "coun ~a" user))
+    (send-message-one c (format nil "pass ~a" password)))
+  (send-message-one c "kill")
+  (send-message-one c "play"))

 
 (defmethod quit ((c connection))
   (usocket:socket-close (socket c)))
 
 (defmethod quit ((c connection))
   (usocket:socket-close (socket c)))