(fullname (concatenate 'string +static-files-root+ fname)))
(handle-static-file fullname)))
-(defvar *update-queue* (locked-queue:create))
+(defclass session ()
+ ((update-queue
+ :accessor update-queue
+ :initform (locked-queue:create)
+ :documentation "Updates to be sent to the browser")
+ (connection
+ :accessor connection
+ :documentation "Connection to the empire game server")))
+
+(defun make-session (username password)
+ (let* ((session (make-instance 'session))
+ (connection (empire:connect :user username
+ :password password
+ :session session)))
+ (setf (slot-value session 'connection) connection)
+ session))
+
+(defgeneric send (session string))
+(defgeneric prompt (session minutes btus))
+(defgeneric data (session message))
(defun update ()
"Send stream of updates to client"
- (locked-queue:dequeue *update-queue*))
+ (let ((s (session-value `session)))
+ (locked-queue:dequeue (update-queue s))))
-(defun send (string)
+(defmethod send ((s session) string)
"Push a javascript update fragment to the client."
- (locked-queue:enqueue *update-queue* string))
+ (locked-queue:enqueue (update-queue s) string))
-(defun prompt (minutes btus)
- (send (format nil "prompt(~a,~a);~%" minutes btus)))
+(defmethod prompt ((s session) minutes btus)
+ (send s (format nil "prompt(~a,~a);~%" minutes btus)))
-(defun data (message)
- (send (parenscript:ps* `(msg ,message))))
+(defmethod data ((s session) message)
+ (send s (parenscript:ps* `(msg ,message))))
(defun login ()
- (let ((connection (session-value 'connection)))
- (if connection
+ (let ((s (session-value 'session)))
+ (if s
(redirect +root-url+)
(redirect +login-page+))))
;; destination of login-form
(defun login-action ()
(handler-case
- (let ((connection (empire:connect :user (post-parameter "username")
- :password (post-parameter "password"))))
- (setf (session-value 'connection) connection)
+ (let ((session (make-session (post-parameter "username")
+ (post-parameter "password"))))
+ (setf (session-value 'session) session)
(redirect +root-url+))
(usocket:connection-refused-error (e)
(format nil "Connection error: ~a~%" e))))
(defun command-action ()
- (let ((connection (session-value 'connection)))
- (empire:send-message connection (get-parameter "q"))))
+ (let ((s (session-value 'session)))
+ (empire:send-message (connection s) (get-parameter "q"))))
(defun dispatch (request)
(let ((script-name (script-name request)))