From: Christopher Allan Webber Date: Fri, 29 Apr 2016 21:18:52 +0000 (-0500) Subject: Networking hooked up to rudimentary X-Git-Tag: fosdem-2017~211 X-Git-Url: https://jxself.org/git/?p=mudsync.git;a=commitdiff_plain;h=f96e5f3c95dd19e79dde36097379cb1c388cea83 Networking hooked up to rudimentary --- diff --git a/mudsync.scm b/mudsync.scm index 8c4fb94..544dc3a 100644 --- a/mudsync.scm +++ b/mudsync.scm @@ -17,12 +17,17 @@ ;;; along with Mudsync. If not, see . (use-modules (8sync systems actors) + (8sync systems actors debug) (8sync agenda) (ice-9 format) (ice-9 match) (oop goops)) + +;;; Networking +;;; ========== + (define %default-server #f) (define %default-port 8889) @@ -40,8 +45,8 @@ ((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 to-client data) - (nm-send-to-client-id actor to-client data))))) + ((send-to-client actor message client data) + (nm-send-to-client-id actor client data))))) (define-method (nm-close-everything (nm ) remove-from-agenda) "Shut it down!" @@ -63,7 +68,7 @@ (define %maximum-backlog-conns 128) ; same as SOMAXCONN on Linux 2.X, ; says the intarwebs -(define-method (nm-install-socket (nm ) server port) +(define (nm-install-socket nm server port) "Install socket on SERVER with PORT" (let ((s (socket PF_INET ; ipv4 SOCK_STREAM ; two-way connection-based byte stream @@ -102,7 +107,7 @@ ;; TODO: set up periodic close of idle connections? )) -(define-method (nm-new-client (nm ) s) +(define (nm-new-client nm s) "Handle new client coming in to socket S" (let* ((client-connection (accept s)) (client-details (cdr client-connection)) @@ -116,7 +121,7 @@ (hash-set! (nm-clients nm) client-id client) (8sync-port client #:read (nm-make-client-receive nm client-id))))) -(define-method (nm-make-client-receive (nm ) client-id) +(define (nm-make-client-receive nm client-id) "Make a method to receive client data" (let ((buffer '())) (define (reset-buffer) @@ -146,25 +151,26 @@ (nm-handle-port-eof nm client client-id)))) receive-handler)) -(define-method (nm-handle-port-closed (nm ) client client-id) +(define (nm-handle-port-closed nm client client-id) "Handle a closed port" (format #t "DEBUG: handled closed port ~x\n" client-id) (8sync-port-remove client) (hash-remove! (nm-clients nm) client-id)) -(define-method (nm-handle-port-eof (nm ) 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) (8sync-port-remove client) (hash-remove! (nm-clients nm) client-id)) -(define-method (nm-handle-line (nm ) client client-id line) +(define-method (nm-handle-line nm client client-id line) "Handle an incoming line of input from a client" - (format #t "~x got line: ~s\n" client-id line) - (nm-send-to-client-id nm client-id "Thank, you, processed.\n" )) + (<- nm (nm-send-input-to nm) 'client-input + #:data line + #:client client-id)) -(define-method (nm-send-to-client-id (nm ) client-id data) +(define-method (nm-send-to-client-id nm client-id data) "Send DATA to TO-CLIENT id" (display data (hash-ref (nm-clients nm) client-id))) @@ -175,12 +181,77 @@ ;; (define-method (nm-close-port (nm ))) -(define-generic gm-init-world) +;;; The game master! Runs the world. +;;; ================================= + +;; @@: We could call this a "world builder" instead... +;; I kinda like calling it a GM though. + +(define (gm-init-world gm message) + ;; Load database + ;; TODO + + ;; Init basic rooms / structure + ;; TODO + + ;; Restore database-based actors + ;; TODO + + ;; Set up the network + (gm-setup-network gm)) + +(define (gm-setup-network gm) + ;; Create a default network manager if none available + (set! (gm-network-manager gm) + (create-actor* gm "netman" + #:send-input-to (actor-id gm))) + + ;; TODO: Add host and port options + (<-wait gm (gm-network-manager gm) 'start-listening)) + +(define (gm-handle-client-input actor message) + "Handle input from a client." + (define client-id (message-ref message 'client)) + (define input (message-ref message 'data)) + (format #t "From ~s: ~s\n" client-id input) + (<- actor (gm-network-manager actor) 'send-to-client + #:client client-id + #:data "Thanks, we got it!\n")) + (define-class () + ;; The directory is a "namespaced" directory of all "special" content + ;; in the game, identifiable by some special key. + ;; (The namespace is simply a cons of (namespace . special-symbol)) + (directory #:init-thunk make-hash-table) + ;; A mapping of client ids to in-game actors + (client-to-actor #:init-thunk make-hash-table) + ;; Network manager + (network-manager #:accessor gm-network-manager + #:init-val #f) + (message-handler #:init-value (make-action-dispatch - ;; init-world - ))) + (init-world gm-init-world) + (client-input gm-handle-client-input)))) + + +(define-method (gm-setup-database (gm )) + 'TODO) + +(define-method (gm-setup-rooms-etc (gm )) + 'TODO) + +;; Debugging stuff +(define %test-gm #f) +(define (run-demo . args) + (define hive (make-hive)) + (define gm + (hive-create-actor-gimmie* hive "gm")) + (set! %test-gm gm) + ;; @@: Boy, wouldn't it be nice if the agenda could do things + ;; on interrupt :P + (ez-run-hive hive + (list (bootstrap-message hive (actor-id gm) 'init-world))))