Comment class stub

[eow] / empire.lisp

diff --git a/empire.lisp b/empire.lisp
index 5b58812bd257662c8afed7eb4199c597771e1070..2f3452e3af8113b120fd87fd0a6873c70231ae7e 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")


@@ -120,8 +127,8 @@
 (defclass base-mode ()
   ((connection :initarg :connection :accessor connection)))
 (defclass init-mode (base-mode)
 (defclass base-mode ()
   ((connection :initarg :connection :accessor connection)))
 (defclass init-mode (base-mode)

-  ((play-sent-p :initform nil
-               :documentation "Have we already sent the play command?")))
+  ((phase :initform :initial
+         :documentation "Initialization phase")))

 (defclass play-mode (base-mode) nil)
 
 (defun make-mode (connection mode)
 (defclass play-mode (base-mode) nil)
 
 (defun make-mode (connection mode)


@@ -134,25 +141,48 @@
     (empire-log:info "~a: set-new-mode ~a -> ~a" c (connection-mode c) new-mode)
     (setf (connection-mode c) mode)))
 
     (empire-log:info "~a: set-new-mode ~a -> ~a" c (connection-mode c) new-mode)
     (setf (connection-mode c) mode)))
 

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

 (defgeneric handle-data (base-mode message))
 (defgeneric handle-init (base-mode message))
 (defgeneric handle-exit (base-mode message))
 (defgeneric handle-prompt (base-mode message))
 (defgeneric handle-flush (base-mode message))
 (defgeneric handle-simple-message (base-mode message))
 (defgeneric handle-data (base-mode message))
 (defgeneric handle-init (base-mode message))
 (defgeneric handle-exit (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))
 
 (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))
-         (setf play-sent-p t))
-       (set-new-mode m 'play-mode))))
+  (with-slots (phase connection) m
+    (ecase phase
+      (:initial (handle-cmdok m message))
+      (:play-sent (set-new-mode m 'play-mode)))))
+
+(defmethod handle-cmdok ((m init-mode) message)
+  (declare (ignorable message))
+  (with-slots (phase connection) m
+    (flet ((init-phase (mode send-args next-phase)
+            (with-slots (phase connection) mode
+              (send-message-one connection (apply #'format nil send-args))
+              (setf phase next-phase))))
+      (with-slots (user password) (connection m)
+       (ecase phase
+         (:initial (init-phase m `("client eow ~a" ,*version*) :client-sent))
+         (:client-sent (init-phase m `("coun ~a" ,user) :coun-sent))
+         (:coun-sent (init-phase m `("pass ~a" ,password) :pass-sent))
+         (:pass-sent (init-phase m '("play") :play-sent)))))))

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

-  (quit (connection m)))
+  (with-slots (phase connection) m
+    (ecase phase
+      (:play-sent (send-message-one connection "kill")
+                 (setf phase :kill-sent))
+      (:kill-sent (send-message-one connection "play")
+                 (setf phase :play-sent)))))
+
+(defmethod handle-data ((m init-mode) message)
+  (declare (ignorable message))
+  t)

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


@@ -168,15 +198,34 @@
 
 (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 (connection-mode c) mode))))))
+
+(defun read-no-eval (stream)
+  (let ((*read-eval* nil))
+    (read stream)))

 
 (defmethod handle-prompt ((m play-mode) message)
   (let* ((c (connection m)))
     (with-input-from-string (s message)
 
 (defmethod handle-prompt ((m play-mode) message)
   (let* ((c (connection m)))
     (with-input-from-string (s message)

-      (let* ((minutes (read s)) ;;FIXME DANGEROUS
-            (btus (read s)))
+      (let* ((minutes (read-no-eval s))
+            (btus (read-no-eval s)))

        (empire-web:prompt (session c)
        (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 +234,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-cmdok)

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


@@ -216,7 +266,7 @@
   (handler-case
       (let* ((s (network-stream c))
             (line (read-line s)))
   (handler-case
       (let* ((s (network-stream c))
             (line (read-line s)))

-       (empire-log:info "< ~a~%" line)
+       (empire-log:info "~a: < ~a" c line)

        (multiple-value-bind (message type) (parse-server-line line)
          (let ((handler (lookup-handler type))
                (mode (connection-mode c)))
        (multiple-value-bind (message type) (parse-server-line line)
          (let ((handler (lookup-handler type))
                (mode (connection-mode c)))


@@ -225,57 +275,60 @@
                (error 'no-handler :mode mode :type type))))
        line)
     (sb-int:closed-stream-error () nil)
                (error 'no-handler :mode mode :type type))))
        line)
     (sb-int:closed-stream-error () nil)

+    (sb-int:simple-stream-error () nil)

     (end-of-file () nil)))
 
 (defun raw-send-message (s message)
     (write-sequence message s)
     (terpri s)
     (force-output s))
     (end-of-file () nil)))
 
 (defun raw-send-message (s message)
     (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)

   (let ((s (network-stream c)))
   (let ((s (network-stream c)))

-    (empire-log:info "> ~a~%" message)
-    (let ((sent-p nil)
-         (tries 3))
-      (loop
-        while (and (not sent-p)
-                   (> tries 0))
-        do (handler-case
-               (progn
-                 (raw-send-message s message)
-                 (setf sent-p t))
-             (sb-int:closed-stream-error ()
-               (progn
-                 (decf tries)
-                 (empire-log:info "Connection close - retrying (~a tries left)" tries)
-                 (reconnect c))))))
-    message))
+    (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))))
+
+(defclass xdump-mode (play-mode)
+  ((table-buffer
+    :initform nil
+    :accessor table-buffer
+    :documentation "Intermediate storage for incomplete table dump.")))
+
+(defmethod handle-data ((m xdump-mode) message)
+  (with-slots (connection table-buffer) m
+    (if (char= #\/ (aref message 0))
+       (progn
+         (format t "table: ~a~%" table-buffer)
+         (set-new-mode m 'play-mode)))
+                                       ;XXX check table size
+    (with-input-from-string (s (format nil "(~a)" message))
+      (setf table-buffer (cons (read s) table-buffer)))))

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

-  t)
+  (send-message c "xdump meta meta" :next-mode 'xdump-mode))

 
 (defmethod special-command ((c connection) line)
   (cond ((string= line "xup") (special-xup c))
 
 (defmethod special-command ((c connection) line)
   (cond ((string= line "xup") (special-xup c))

-       (t (empire-web:data (session c) "Unknown special command"))))
+       (t (empire-web:data (session c) "Unknown special command")))
+  line)

 
 (defmethod command ((c connection) line)
   (cond ((special-command-p line) (special-command c (subseq line 1)))
        (t (send-message c line))))
 
 
 (defmethod command ((c connection) line)
   (cond ((special-command-p line) (special-command c (subseq line 1)))
        (t (send-message c line))))
 

-(defgeneric play (connection))
-(defmethod play ((c connection))
-  (with-slots (user password) c
-    (send-message c (format nil "play FIXME ~a ~a" user password))))
-

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

-
-
-;;; Tests
-(defvar *l1* "2 Empire server ready")
-;; (parse-server-line *l1*)