X-Git-Url: https://jxself.org/git/?p=mudsync.git;a=blobdiff_plain;f=mudsync.scm;h=fca151a60aabcef226a5e80146b6d0f4c5c66ed9;hp=3d1d21463fc363f128e0ac0cdf7cf292b6983561;hb=a49c96e631da387ea77d281e91c743b27bf538b3;hpb=47c165486537192942bac3a3ea806b81852cb762 diff --git a/mudsync.scm b/mudsync.scm index 3d1d214..fca151a 100644 --- a/mudsync.scm +++ b/mudsync.scm @@ -1,32 +1,64 @@ +;;; Mudsync --- Live hackable MUD +;;; Copyright © 2016 Christopher Allan Webber +;;; +;;; This file is part of Mudsync. +;;; +;;; Mudsync is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or +;;; (at your option) any later version. +;;; +;;; Mudsync is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;;; General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; 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) (define-class () (server-socket #:accessor nm-server-socket) + ;; mapping of client -> client-id (clients #:accessor 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)))))) + (message-ref message 'port %default-port))) + ((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!" ;; close all clients (hash-for-each - (lambda (client _) + (lambda (_ client) (close client) (if remove-from-agenda (8sync-port-remove client))) (nm-clients nm)) + ;; reset the clients list + (set! (nm-clients) (make-hash-table)) ;; close the server (close (nm-server-socket nm)) (if remove-from-agenda @@ -36,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 @@ -72,10 +104,11 @@ (format #t "Listening for clients in pid: ~s\n" (getpid)) (8sync-port s #:read (lambda (s) (nm-new-client nm s))) - ;; TODO: set up periodic close of idle connections + ;; 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)) (client (car client-connection))) @@ -84,10 +117,12 @@ (gethostbyaddr (sockaddr:addr client-details))) - (hash-set! (nm-clients nm) client #f) - (8sync-port client #:read (nm-make-client-receive nm)))) + (let ((client-id (big-random-number))) + (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 )) +(define (nm-make-client-receive nm client-id) + "Make a method to receive client data" (let ((buffer '())) (define (reset-buffer) (set! buffer '())) @@ -96,45 +131,128 @@ (char-ready? client) (not (eof-object? (peek-char client))))) (define (receive-handler client) - (display "Horray, we got something!\n") (while (should-read-char client) (set! buffer (cons (read-char client) buffer)) (match buffer (;; @@: Do we need the "char?" - (#\newline #\newline (? char? line-chars) ...) + (#\newline #\return (? char? line-chars) ...) (let ((ready-line (list->string (reverse line-chars)))) ;; reset buffer (set! buffer '()) ;; run it - (nm-handle-line nm client ready-line))) + (nm-handle-line nm client client-id ready-line))) (_ #f))) ;; Shut things down on closed port or EOF object (cond ((port-closed? client) - ;; TODO: replace with nm-handle-port-closed - (display "port closed time\n") - (8sync-port-remove client)) + (nm-handle-port-closed nm client client-id)) ((and (char-ready? client) (eof-object? (peek-char client))) - (display "port eof time\n") - ;; TODO: replace with nm-handle-port-eof - (close client) - (8sync-port-remove client)))) + (nm-handle-port-eof nm client client-id)))) receive-handler)) -(define-method (nm-handle-line (nm ) client line) +(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) + "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) "Handle an incoming line of input from a client" - (format #t "Got line: ~s\n" line)) + (<- nm (nm-send-input-to nm) 'client-input + #:data line + #:client client-id)) + +(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))) + +; (ez-run-hive hive (list (bootstrap-message hive (actor-id nm) 'start-listening))) ;; (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-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 (wrap-apply gm-init-world)) + (client-input (wrap-apply gm-handle-client-input))))) + + +(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-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))))