:initarg :stream
:accessor network-stream
:documentation "Stream used to talk to the empire server.")
- (logging-stream
- :initarg :logging-stream
- :accessor logging-stream
- :initform t
- :documentation "Messages coming back from the server is sent to
-this stream.")
(connection-handler
:accessor connection-handler
:initform nil
(server-port *default-empire-server-port*)
(socket nil)
(network-stream nil)
- (logging-stream nil)
session)
(make-instance 'connection
:user user
:server-port server-port
:socket socket
:stream network-stream
- :logging-stream logging-stream
:session session))
;;; interface
(password nil)
(server-name *default-empire-server*)
(server-port *default-empire-server-port*)
- (logging-stream *standard-output*)
session)
"Connect to server and return a connection object."
(let* ((socket (usocket:socket-connect server-name server-port))
:password password
:socket socket
:network-stream stream
- :logging-stream logging-stream
:server-name server-name
:server-port server-port
:session session))
(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)
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)))
+ (empire-log:info "~a: reconnect" c))
(defparameter +C_CMDOK+ "0")
(defparameter +C_DATA+ "1")
(defmethod set-new-mode ((m base-mode) new-mode)
(let* ((c (connection m))
(mode (make-mode c new-mode)))
+ (empire-log:info "~a: set-new-mode ~a -> ~a" c (connection-mode c) new-mode)
(setf (connection-mode c) mode)))
(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))
(defmethod handle-init ((m init-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)
+ (let* ((c (connection m)))
(empire-web:data (session c) message)))
-(defmethod handle-flush ((m play-mode) message)
- (let* ((c (connection m))
- (log (logging-stream c)))
- (format log "handle-flush ~a~%" message)
+(defmethod handle-simple-message ((m play-mode) message)
+ (let* ((c (connection m)))
(empire-web:data (session c) message)))
+(defmethod handle-flush ((m play-mode) message)
+ (let* ((c (connection m)))
+ (empire-web:prompt (session c) message)))
+
(defmethod handle-prompt ((m play-mode) message)
- (let* ((c (connection m))
- (log (logging-stream c)))
+ (let* ((c (connection m)))
(with-input-from-string (s message)
(let* ((minutes (read s)) ;;FIXME DANGEROUS
(btus (read s)))
- (format log "[~a:~a]: ~%" minutes btus)
- (empire-web:prompt (session c) minutes btus)))))
+ (empire-web:prompt (session c)
+ (format nil "[~a,~a]: " minutes btus))))))
(defparameter *line-type-dispatch*
(list `(,+C_DATA+ . handle-data)
`(,+C_INIT+ . handle-init)
`(,+C_EXIT+ . handle-exit)
+ `(,+C_FLUSH+ . handle-flush)
+ `(,+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))
(defmethod read-message ((c connection))
(handler-case
(let* ((s (network-stream c))
- (log (logging-stream c))
(line (read-line s)))
- (format log "< ~a~%" line)
+ (empire-log:info "< ~a~%" line)
(multiple-value-bind (message type) (parse-server-line line)
(let ((handler (lookup-handler type))
(mode (connection-mode c)))
(funcall handler mode message)
(error 'no-handler :mode mode :type type))))
line)
- (sb-int:closed-stream-error () nil)))
-
-(defmethod send-message ((c connection) message)
- (let ((s (network-stream c))
- (log (logging-stream c)))
- (format log "< ~a~%" message)
+ (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)
+ (force-output s))
+
+(defmethod send-message ((c connection) message)
+ (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))
+(defparameter +special-command-char+ #\;)
+
+(defun special-command-p (line)
+ (char= +special-command-char+ (aref line 0)))
+
+(defmethod special-xup ((c connection))
+ t)
+
+(defmethod special-command ((c connection) line)
+ (cond ((string= line "xup") (special-xup c))
+ (t (empire-web:data (session c) "Unknown special command"))))
+
+(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
projects / eow / blobdiff