Update to use build-actions; fix clerk communication

[mudsync.git] / mudsync / networking.scm

diff --git a/mudsync/networking.scm b/mudsync/networking.scm
index 525997546ad024f05298bcacfc19e9b0af19fef0..c2c1068aedf8d3dbc50a61c56bca34b82e1377dd 100644 (file)
--- a/mudsync/networking.scm
+++ b/mudsync/networking.scm
@@ -17,7 +17,7 @@
 ;;; 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 (ice-9 format)
   #:use-module (ice-9 match)
@@ -45,14 +45,19 @@
   ;; send input to this actor
   (send-input-to #:getter nm-send-input-to
                  #:init-keyword #:send-input-to)
-  (message-handler
+
+  (actions
+   #:allocation #:each-subclass
    #: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)))))
+   (build-actions
+    (start-listening
+     (lambda* (actor message
+                     #:key (server %default-server)
+                     (port %default-port))
+       (nm-install-socket actor server port)))
+    (send-to-client
+     (lambda* (actor message #:key client data)
+       (nm-send-to-client-id actor client data))))))
 
 ;;; TODO: We should provide something like this, but this isn't used currently,
 ;;;    and uses old deprecated code (the 8sync-port-remove stuff).
@@ -136,18 +141,13 @@
 (define (nm-client-receive-loop nm client client-id)
   "Make a method to receive client data"
   (define (loop)
-    (define line (string-trim-right (read-line client) #\return))
-    (nm-handle-line nm client client-id line)
-    (cond
-     ;; The port's been closed for some reason, so stop looping
-     ((port-closed? client)
-      (nm-handle-port-closed nm client client-id))
-     ;; We've reached the EOF object, which means we should close
-     ;; the port ourselves and stop looping
-     ((eof-object? (peek-char client))
-      (nm-handle-port-eof nm client client-id))
-     ;; Otherwise, let's read till the next line!
-     (else (loop))))
+    (define line (read-line client))
+    (if (eof-object? line)
+        (nm-handle-port-eof nm client client-id)
+        (begin
+          (nm-handle-line nm client client-id
+                          (string-trim-right line #\return))
+          (loop))))
   (loop))
 
 (define (nm-handle-port-closed nm client client-id)