;;; Mudsync --- Live hackable MUD
-;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org>
+;;; Copyright © 2016-2017 Christopher Allan Webber <cwebber@dustycloud.org>
;;;
;;; This file is part of Mudsync.
;;;
;;; along with Mudsync. If not, see <http://www.gnu.org/licenses/>.
(define-module (mudsync networking)
- #:use-module (8sync systems actors)
+ #:use-module (8sync actors)
#:use-module (8sync agenda)
+ #:use-module (8sync systems websocket server)
#:use-module (ice-9 format)
#:use-module (ice-9 match)
#:use-module (ice-9 rdelim)
+ #:use-module (ice-9 receive)
#:use-module (oop goops)
+ ;; used by web server only
+ #:use-module (sxml simple)
+ #:use-module (web request)
+ #:use-module (web response)
+ #:use-module (web uri)
+ #:use-module (mudsync package-config)
+ #:use-module (rnrs io ports)
+
#:export (;; Should we be exporting these?
%default-server
%default-port
(define %default-server #f)
(define %default-port 8889)
+(define %default-web-server-port 8888)
+
+(define-actor <network-manager> (<actor>)
+ ((start-listening
+ (lambda* (actor message
+ #:key (server %default-server)
+ (port %default-port)
+ (web-server-port %default-web-server-port))
+ (if web-server-port
+ (nm-install-web-server actor server web-server-port))
+ (nm-install-socket actor server port)))
+ (send-to-client
+ (lambda* (actor message #:key client data)
+ (nm-send-to-client-id actor client data)))
+ (new-client nm-new-client))
+
+ (web-server #:accessor .web-server)
-(define-class <network-manager> (<actor>)
(server-socket #:getter nm-server-socket)
;; mapping of client -> client-id
(clients #:getter nm-clients
#:init-thunk make-hash-table)
;; send input to this actor
(send-input-to #:getter nm-send-input-to
- #:init-keyword #:send-input-to)
- (message-handler
- #:init-value
- (make-action-dispatch
- ((start-listening actor message)
- (nm-install-socket actor (message-ref message 'server %default-server)
- (message-ref message 'port %default-port)))
- ((send-to-client actor message client data)
- (nm-send-to-client-id actor client data)))))
+ #:init-keyword #:send-input-to))
;;; TODO: We should provide something like this, but this isn't used currently,
;;; and uses old deprecated code (the 8sync-port-remove stuff).
(let loop ()
;; (yield) ;; @@: Do we need this?
(define client-connection (accept s))
- (8sync (nm-new-client nm s client-connection))
+ (<- (actor-id nm) 'new-client
+ s client-connection)
(loop)))
-(define (nm-new-client nm s client-connection)
+(define (nm-new-client nm message s client-connection)
"Handle new client coming in to socket S"
(define client-details (cdr client-connection))
(define client (car client-connection))
(sockaddr:addr client-details)))
(fcntl client F_SETFL (logior O_NONBLOCK (fcntl client F_GETFL)))
(hash-set! (nm-clients nm) client-id client)
- (<- nm (nm-send-input-to nm) 'new-client #:client client-id)
+ (<- (nm-send-input-to nm) 'new-client #:client client-id)
(nm-client-receive-loop nm client client-id))
(define (nm-client-receive-loop nm client client-id)
(begin
(nm-handle-line nm client client-id
(string-trim-right line #\return))
- (loop))))
+ (when (actor-alive? nm)
+ (loop)))))
(loop))
(define (nm-handle-port-closed nm client client-id)
"Handle a closed port"
(format #t "DEBUG: handled closed port ~x\n" client-id)
(hash-remove! (nm-clients nm) client-id)
- (<- nm (nm-send-input-to nm) 'client-closed #:client client-id))
+ (<-* `(#:actor ,nm) (nm-send-input-to nm) 'client-closed #:client client-id))
(define-method (nm-handle-port-eof nm client client-id)
"Handle seeing an EOF on port"
(format #t "DEBUG: handled eof-object on port ~x\n" client-id)
(close client)
(hash-remove! (nm-clients nm) client-id)
- (<- nm (nm-send-input-to nm) 'client-closed #:client client-id))
+ (<-* `(#:actor ,nm) (nm-send-input-to nm) 'client-closed
+ #:client client-id))
(define-method (nm-handle-line nm client client-id line)
"Handle an incoming line of input from a client"
- (<- nm (nm-send-input-to nm) 'client-input
+ (<-* `(#:actor ,nm) (nm-send-input-to nm) 'client-input
#:data line
#:client client-id))
#:client-id client-id
#:data data))
(display data client-obj))
+
+
+\f
+;;; Web server interface
+
+(define (nm-install-web-server nm server web-server-port)
+ "This installs the web server, which we see in use below...."
+ (set! (.web-server nm)
+ (pk 'web-server (create-actor nm <websocket-server>
+ #:port web-server-port
+ #:http-handler (wrap-apply http-handler)
+ #:websocket-handler (wrap-apply websocket-handler)))))
+
+(define (view:main-display request body)
+ (define body-tmpl
+ '((div (@ (id "stream-output"))
+ (p "nope"))
+ (div (@ (id "input-box"))
+ (p "test test")
+ (input (@ (id "input"))))))
+
+ (define (main-tmpl)
+ `(html (@ (xmlns "http://www.w3.org/1999/xhtml"))
+ (head (title "Mudsync!")
+ (meta (@ (charset "UTF-8")))
+ (link (@ (rel "stylesheet")
+ (href "/static/css/main.css"))))
+ (body ,@body-tmpl)))
+ (define (write-template-to-string)
+ (with-fluids ((%default-port-encoding "UTF-8"))
+ (with-output-to-string
+ (lambda ()
+ (sxml->xml (main-tmpl))))))
+ (values (build-response #:code 200
+ #:headers '((content-type . (application/xhtml+xml))))
+ (write-template-to-string)))
+
+(define (view:render-static request body static-path)
+ (values (build-response #:code 200
+ ;; #:content-type (mime-type static-path)
+ )
+ (call-with-input-file (web-static-filepath static-path) get-bytevector-all)))
+
+(define (view:standard-four-oh-four . args)
+ (values (build-response #:code 404
+ #:headers '((content-type . (text/plain))))
+ "Four-oh-four! Not found."))
+
+(define (route request)
+ (match (split-and-decode-uri-path (uri-path (request-uri request)))
+ (() (values view:main-display '()))
+
+ (("static" static-path ...)
+ ;; TODO: make this toggle'able
+ (values view:render-static
+ (list (string-append "/" (string-join
+ static-path "/")))))
+
+ ;; Not found!
+ (_ (values view:standard-four-oh-four '()))))
+
+(define (http-handler request body)
+ (receive (view args)
+ (route request)
+ (apply view request body args)))
+
+;; Respond to text messages by reversing the message. Respond to
+;; binary messages with "hello".
+(define (websocket-handler data)
+ (if (string? data)
+ (string-reverse data)
+ "hello"))
projects / mudsync.git / blobdiff