:initarg :logging-stream
:accessor logging-stream
:initform t
- :documentation "Messages coming back from the server is sent to
+ :documentation "Messages coming back from the server are sent to
this stream.")
(connection-handler
:accessor connection-handler
(mode
:accessor connection-mode
:initform nil
- :documentation "TODO(gefla)")))
+ :documentation "TODO(gefla)")
+ (session
+ :accessor session
+ :initarg :session
+ :documentation "web session to which this connection belongs")))
(defun make-connection (&key (user nil)
(password nil)
(server-port *default-empire-server-port*)
(socket nil)
(network-stream nil)
- (logging-stream nil))
+ (logging-stream nil)
+ session)
(make-instance 'connection
:user user
:password password
:server-port server-port
:socket socket
:stream network-stream
- :logging-stream logging-stream))
+ :logging-stream logging-stream
+ :session session))
;;; interface
(defun connect (&key (user nil)
(password nil)
(server-name *default-empire-server*)
(server-port *default-empire-server-port*)
- (logging-stream *standard-output*))
+ (logging-stream *standard-output*)
+ session)
"Connect to server and return a connection object."
(let* ((socket (usocket:socket-connect server-name server-port))
(stream (usocket:socket-stream socket))
:network-stream stream
:logging-stream logging-stream
:server-name server-name
- :server-port server-port))
+ :server-port server-port
+ :session session))
(handler (spawn-with-name (format nil "empire-handler-~a" user)
#'handle-connection connection)))
(setf (connection-handler connection) handler)
connection))
-
(defgeneric quit (connection))
(defgeneric handle-connection (connection))
(defgeneric read-message (connection))
(defgeneric send-message (connection message))
+(defgeneric reconnect (conncetion))
+
+(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)))
+ (setf socket sock
+ stream s
+ connection-handler handler))))
(defparameter +C_CMDOK+ "0")
(defparameter +C_DATA+ "1")
(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-simple-message (base-mode message))
(defmethod handle-init ((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)))
+
+(defmethod handle-exit ((m play-mode) message)
+ (declare (ignorable message))
+ (quit (connection m)))
+
(defmethod handle-data ((m play-mode) message)
(let* ((c (connection m))
(log (logging-stream c)))
- (format log "handle-data ~a~%" message)))
+ (format log "handle-data ~a~%" message)
+ (empire-web:data (session c) message)))
+
+(defmethod handle-simple-message ((m play-mode) message)
+ (let* ((c (connection m))
+ (log (logging-stream c)))
+ (format log "handle-simple-message ~a~%" message)
+ (empire-web:data (session c) message)))
(defmethod handle-prompt ((m play-mode) message)
(let* ((c (connection m))
(log (logging-stream c)))
(with-input-from-string (s message)
- (let* ((minutes (read s))
+ (let* ((minutes (read s)) ;;FIXME DANGEROUS
(btus (read s)))
- (format log "[~a:~a]: ~%" minutes btus)))))
+ (format log "[~a:~a]: ~%" minutes btus)
+ (empire-web:prompt (session c) minutes btus)))))
(defparameter *line-type-dispatch*
(list `(,+C_DATA+ . handle-data)
`(,+C_INIT+ . handle-init)
+ `(,+C_EXIT+ . handle-exit)
+ `(,+C_FLUSH+ . handle-simple-message)
+ `(,+C_BADCMD+ . handle-simple-message)
+ `(,+C_FLASH+ . handle-simple-message)
`(,+C_PROMPT+ . handle-prompt)))
(defun parse-server-line (line)
if (eq (char line i) #\Space)
do (return i)))
(message-type (subseq line 0 first-space-index))
- (message (subseq line (+ first-space-index 1))))
+ (message (if first-space-index
+ (subseq line (+ first-space-index 1))
+ "")))
(values message message-type)))
(defmethod handle-connection ((c connection))
(format stream "No handler for ~a in mode ~a."
type mode)))))
(defmethod read-message ((c connection))
- (let* ((s (network-stream c))
- (log (logging-stream c))
- (line (read-line s)))
- (format log "< ~a~%" line)
- (multiple-value-bind (message type) (parse-server-line line)
- (let ((handler (lookup-handler type))
- (mode (connection-mode c)))
- (if handler
- (funcall handler mode message)
- (error 'no-handler :mode mode :type type))))
- line))
+ (handler-case
+ (let* ((s (network-stream c))
+ (log (logging-stream c))
+ (line (read-line s)))
+ (format log "< ~a~%" line)
+ (multiple-value-bind (message type) (parse-server-line line)
+ (let ((handler (lookup-handler type))
+ (mode (connection-mode c)))
+ (if handler
+ (funcall handler mode message)
+ (error 'no-handler :mode mode :type type))))
+ line)
+ (sb-int:closed-stream-error () nil)
+ (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)
(let ((s (network-stream c))
(log (logging-stream c)))
(format log "< ~a~%" message)
- (write-sequence message s)
- (terpri s)
- (force-output s)
+ (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)
+ (reconnect c))))))
message))
(defgeneric play (connection))
projects / eow / blobdiff