Add logging package. Handle flush prompts.

[eow] / web.lisp

diff --git a/web.lisp b/web.lisp
index e648f319f150cd1804c91ffddac05b5431c6a17e..135cdb4c424b27aaf366e4ced1a51d9caecebdb1 100644 (file)
--- a/web.lisp
+++ b/web.lisp
@@ -11,12 +11,13 @@
                                   :directory (pathname-directory *this-file*)))
 
 (defparameter +templates-root+ (namestring *this-dir*))
-(defparameter +root-url+ "/eow/static/test.html")
+(defparameter +root-url+ "/eow/")
 (defparameter +web-root-base+ "/eow")
 (defparameter +web-root+ (concatenate 'string +web-root-base+ "/"))
 (defparameter +static-web-root+ (concatenate 'string +web-root+ "static/"))
 (defparameter +static-files-root+ (concatenate 'string +templates-root+ "static/"))
 (defparameter +login-page+ (concatenate 'string +static-web-root+ "login.html"))
+(defparameter +root-page-file+ "root.html")
 
 (defun string-starts-with (string prefix)
   ;; (from Hunchentoot)
@@ -49,43 +50,51 @@
     session))
 
 (defgeneric send (session string))
-(defgeneric prompt (session minutes btus))
+(defgeneric prompt (session string))
 (defgeneric data (session message))
 
+(defvar *empire-session*)
+
+(defmacro with-session (&body body)
+  `(let ((*empire-session* (session-value 'session)))
+     (if *empire-session*
+        (progn ,@body)
+        (redirect +login-page+))))
+
 (defun update ()
   "Send stream of updates to client"
-  (let ((s (session-value `session)))
-    (locked-queue:dequeue (update-queue s))))
+  (with-session
+    (locked-queue:dequeue (update-queue *empire-session*))))
 
 (defmethod send ((s session) string)
   "Push a javascript update fragment to the client."
   (locked-queue:enqueue (update-queue s) string))
 
-(defmethod prompt ((s session) minutes btus)
-  (send s (format nil "prompt(~a,~a);~%" minutes btus)))
+(defmethod prompt ((s session) p)
+  (send s (parenscript:ps* `(prompt ,p))))
 
 (defmethod data ((s session) message)
   (send s (parenscript:ps* `(msg ,message))))
 
-(defun login ()
-  (let ((s (session-value 'session)))
-    (if s
-       (redirect +root-url+)
-       (redirect +login-page+))))
-
 ;; destination of login-form
 (defun login-action ()
   (handler-case
-      (let ((session (make-session (post-parameter "username")
-                                  (post-parameter "password"))))
+      (let* ((user (post-parameter "username"))
+            (pass (post-parameter "password"))
+            (session (make-session user pass)))
        (setf (session-value 'session) session)
+       (empire-log:info "User ~a logging in. Session ~a" user session)
        (redirect +root-url+))
     (usocket:connection-refused-error (e)
       (format nil "Connection error: ~a~%" e))))
 
 (defun command-action ()
-  (let ((s (session-value 'session)))
-    (empire:send-message (connection s) (get-parameter "q"))))
+  (with-session
+      (empire:send-message (connection *empire-session*) (get-parameter "q"))))
+
+(defun root-page ()
+  (with-session
+    (handle-static-file (concatenate 'string +static-files-root+ +root-page-file+))))
 
 (defun dispatch (request)
   (let ((script-name (script-name request)))
@@ -95,10 +104,11 @@
       ((string= script-name "/eow/login") 'login-action)
       ((string= script-name "/eow/command") 'command-action)
       ((or (string-equal script-name +web-root-base+)
-           (string-equal script-name +web-root+)) 'login) ; go to the start page
+           (string-equal script-name +web-root+)) 'root-page) ; go to the start page
       ((string-starts-with script-name +static-web-root+) 'serve-static)))) ; serve static file
 
 
 (defun start ()
+  (empire-log:info "Startup")
   (pushnew 'dispatch *dispatch-table* :test #'eq))