#:use-module (oop goops)
#:use-module (srfi srfi-9)
#:use-module (srfi srfi-9 gnu)
+ #:use-module (ice-9 control)
#:use-module (ice-9 format)
#:use-module (ice-9 match)
#:use-module (ice-9 pretty-print)
big-random-number
big-random-number-string
simple-message-id-generator
- require-slot
<actor>
actor-id
- actor-hive
actor-message-handler
+ %current-actor
+
;;; Commenting out the <address> type for now;
;;; it may be back when we have better serializers
;; <address>
actor-id-hive
actor-id-string
- make-action-dispatch
+ build-actions
+
define-simple-actor
<hive>
hive-id
hive-create-actor hive-create-actor*
+ create-actor create-actor*
+ self-destruct
+
<message>
make-message message?
message-to message-action message-from
message-id message-body message-in-reply-to
message-wants-reply
- message-ref
- send-message send-message-wait
- reply-message reply-message-wait
+ message-auto-reply?
+
+ <- <-wait <-reply <-reply-wait
+
+ call-with-message msg-receive msg-val
ez-run-hive
- hive-bootstrap-message))
+ bootstrap-message
+
+ serialize-message write-message
+ serialize-message-pretty pprint-message
+ read-message read-message-from-string))
;; For ids
(define %random-state
(make-parameter (random-state-from-platform)))
-;; Probably bigger than necessary
-(define random-number-size (expt 10 50))
+;; Same size as a uuid4 I think...
+(define random-number-size (expt 2 128))
(define (big-random-number)
(random random-number-size (%random-state)))
(set! counter (1+ counter))
(string-append prefix (number->string counter)))))
-(define (require-slot slot-name)
- "Generate something for #:init-thunk to complain about unfilled slot"
- (lambda ()
- (throw 'required-slot
- (format #f "Slot ~s not filled" slot-name)
- slot-name)))
+
+\f
+;;; Messages
+;;; ========
+
+
+;; @@: We may want to add a deferred-reply to the below, similar to
+;; what we had in XUDD, for actors which do their own response
+;; queueing.... ie, that might receive messages but need to shelve
+;; them to be acted upon after something else is taken care of.
+
+(define-record-type <message>
+ (make-message-intern id to from action
+ body in-reply-to wants-reply
+ replied)
+ message?
+ (id message-id)
+ (to message-to)
+ (from message-from)
+ (action message-action)
+ (body message-body)
+ (in-reply-to message-in-reply-to)
+ (wants-reply message-wants-reply)
+ (replied message-replied set-message-replied!))
+
+
+(define* (make-message id to from action body
+ #:key in-reply-to wants-reply
+ replied)
+ (make-message-intern id to from action body
+ in-reply-to wants-reply replied))
+
+(define (message-auto-reply? message)
+ (eq? (message-action message) '*auto-reply*))
+
+(define (message-needs-reply? message)
+ "See if this message needs a reply still"
+ (and (message-wants-reply message)
+ (not (message-replied message))))
+
+
+(define (kwarg-list-to-alist args)
+ (let loop ((remaining args)
+ (result '()))
+ (match remaining
+ (((? keyword? key) val rest ...)
+ (loop rest
+ (cons (cons (keyword->symbol key) val)
+ result)))
+ (() result)
+ (_ (throw 'invalid-kwarg-list
+ "Invalid keyword argument list"
+ args)))))
+
+
+;;; See: https://web.archive.org/web/20081223021934/http://mumble.net/~jar/articles/oo-moon-weinreb.html
+;;; (also worth seeing: http://mumble.net/~jar/articles/oo.html )
+
+(define (<- from-actor to-id action . message-body-args)
+ "Send a message from an actor to another actor"
+ (let* ((hive (actor-hive from-actor))
+ (message (make-message (hive-gen-message-id hive) to-id
+ (actor-id from-actor) action
+ message-body-args)))
+ (8sync (hive-process-message hive message))))
+
+(define (<-wait from-actor to-id action . message-body-args)
+ "Send a message from an actor to another, but wait until we get a response"
+ (let* ((hive (actor-hive from-actor))
+ (abort-to (hive-prompt (actor-hive from-actor)))
+ (message (make-message (hive-gen-message-id hive) to-id
+ (actor-id from-actor) action
+ message-body-args
+ #:wants-reply #t)))
+ (abort-to-prompt abort-to from-actor message)))
+
+;; TODO: Intelligently ~propagate(ish) errors on -wait functions.
+;; We might have `send-message-wait-brazen' to allow callers to
+;; not have an exception thrown and instead just have a message with
+;; the appropriate '*error* message returned.
+
+(define (<-reply from-actor original-message . message-body-args)
+ "Reply to a message"
+ (set-message-replied! original-message #t)
+ (let* ((hive (actor-hive from-actor))
+ (new-message (make-message (hive-gen-message-id hive)
+ (message-from original-message)
+ (actor-id from-actor) '*reply*
+ message-body-args
+ #:in-reply-to (message-id original-message))))
+ (8sync (hive-process-message hive new-message))))
+
+(define (<-auto-reply from-actor original-message)
+ "Auto-reply to a message. Internal use only!"
+ (set-message-replied! original-message #t)
+ (let* ((hive (actor-hive from-actor))
+ (new-message (make-message (hive-gen-message-id hive)
+ (message-from original-message)
+ (actor-id from-actor) '*auto-reply*
+ '()
+ #:in-reply-to (message-id original-message))))
+ (8sync (hive-process-message hive new-message))))
+
+(define (<-reply-wait from-actor original-message . message-body-args)
+ "Reply to a messsage, but wait until we get a response"
+ (set-message-replied! original-message #t)
+ (let* ((hive (actor-hive from-actor))
+ (abort-to (hive-prompt (actor-hive from-actor)))
+ (new-message (make-message (hive-gen-message-id hive)
+ (message-from original-message)
+ (actor-id from-actor) '*reply*
+ message-body-args
+ #:wants-reply #t
+ #:in-reply-to (message-id original-message))))
+ (abort-to-prompt abort-to from-actor new-message)))
\f
;;; Main actor implementation
;;; =========================
+(define (actor-inheritable-message-handler actor message)
+ (define action (message-action message))
+ (define (find-message-handler return)
+ (for-each (lambda (this-class)
+ (define actions
+ (or (and (class-slot-definition this-class 'actions)
+ (class-slot-ref this-class 'actions))
+ '()))
+ (for-each (match-lambda
+ ((action-name . method)
+ (when (eq? action-name action)
+ (return method))))
+ actions))
+ (class-precedence-list (class-of actor)))
+ (throw 'action-not-found
+ "No appropriate action handler found for actor"
+ #:action action
+ #:actor actor
+ #:message message))
+ (define method
+ (call/ec find-message-handler))
+ (apply method actor message (message-body message)))
+
(define-class <actor> ()
;; An address object
- (id #:init-thunk (require-slot "id")
- #:init-keyword #:id
+ (id #:init-keyword #:id
#:getter actor-id)
;; The hive we're connected to.
;; We need this to be able to send messages.
- (hive #:init-thunk (require-slot "hive")
- #:init-keyword #:hive
+ (hive #:init-keyword #:hive
#:accessor actor-hive)
;; How we receive and process new messages
- (message-handler #:init-thunk (require-slot "message-handler")
- #:allocation #:each-subclass))
+ (message-handler #:init-value actor-inheritable-message-handler
+ ;; @@: There's no reason not to use #:class instead of
+ ;; #:each-subclass anywhere in this file, except for
+ ;; Guile bug #25211 (#:class is broken in Guile 2.2)
+ #:allocation #:each-subclass)
+
+ ;; This is the default, "simple" way to inherit and process messages.
+ (actions #:init-value '()
+ #:allocation #:each-subclass))
(define-method (actor-message-handler (actor <actor>))
(slot-ref actor 'message-handler))
"Render the full actor id as a human-readable string"
(address->string (actor-id actor)))
+(define %current-actor
+ (make-parameter #f))
+
\f
;;; Actor utilities
;;; ===============
-(define (simple-dispatcher action-map)
- (lambda (actor message)
- (let* ((action (message-action message))
- (method (assoc-ref action-map action)))
- (if (not method)
- (throw 'action-not-found
- "No appropriate action handler found for actor"
- #:action action
- #:actor actor
- #:message message
- #:available-actions (map car action-map)))
- (method actor message))))
-
-(define-syntax %expand-action-item
- (syntax-rules ()
- ((_ ((action-name action-args ...) body ...))
- (cons (quote action-name)
- (lambda (action-args ...)
- body ...)))
- ((_ (action-name handler))
- (cons (quote action-name) handler))))
-
-(define-syntax make-action-dispatch
- (syntax-rules ()
- "Expand a list of action names and actions into an alist
-
-You can use this like the following:
- (make-action-dispatch
- (cookies
- (lambda (actor message)
- (display \"I love cookies!\n\")))
- (party
- (lambda (actor message)
- (display \"Life of the party!\"))))
-
-Alternately, if you'd like to skip the lambda, you could use the slightly
-more compact following syntax:
- (make-action-dispatch
- ((cookies actor message)
- (display \"I love cookies!\n\"))
- ((party actor message)
- (display \"Life of the party!\")))"
- ((make-action-dispatch action-item ...)
- (simple-dispatcher
- (list (%expand-action-item action-item) ...)))))
-
-(define-syntax-rule (define-simple-actor class (actions ...))
+(define-syntax-rule (build-actions (symbol method) ...)
+ "Construct an alist of (symbol . method), where the method is wrapped
+with wrap-apply to facilitate live hacking and allow the method definition
+to come after class definition."
+ (list
+ (cons (quote symbol)
+ (wrap-apply method)) ...))
+
+(define-syntax-rule (define-simple-actor class action ...)
(define-class class (<actor>)
- (message-handler
- #:init-value (make-action-dispatch actions ...)
- #:allocation #:each-subclass)))
+ (actions #:init-value (build-actions action ...)
+ #:allocation #:each-subclass)))
\f
;;; The Hive
(define-generic hive-handle-failed-forward)
(define-class <hive> (<actor>)
- ;; This gets set to itself immediately after being created
- (hive #:init-value #f)
(actor-registry #:init-thunk make-hash-table
#:getter hive-actor-registry)
(msg-id-generator #:init-thunk simple-message-id-generator
;; This is a map from cons cell of message-id
;; to a cons cell of (actor-id . coroutine)
;; @@: Should we have a <waiting-coroutine> record type?
+ ;; @@: Should there be any way to clear out "old" coroutines?
(waiting-coroutines #:init-thunk make-hash-table
#:getter hive-waiting-coroutines)
;; Message prompt
;; to send the message, then carry on their way
(prompt #:init-thunk make-prompt-tag
#:getter hive-prompt)
- (message-handler
- #:init-value
- (make-action-dispatch
- ;; This is in the case of an ambassador failing to forward a message...
- ;; it reports it back to the hive
- (*failed-forward* hive-handle-failed-forward))))
+ (actions #:allocation #:each-subclass
+ #:init-value
+ (build-actions
+ ;; This is in the case of an ambassador failing to forward a
+ ;; message... it reports it back to the hive
+ (*failed-forward* hive-handle-failed-forward))))
(define-method (hive-handle-failed-forward (hive <hive>) message)
"Handle an ambassador failing to forward a message"
'*forward*
`((original . ,message))))
+(define-method (hive-reply-with-error (hive <hive>) original-message
+ error-key error-args)
+ ;; We only supply the error-args if the original sender is on the same hive
+ (define (orig-actor-on-same-hive?)
+ (equal? (hive-id hive)
+ (address-hive-id (message-from original-message))))
+ (set-message-replied! original-message #t)
+ (let* ((new-message-body
+ (if (orig-actor-on-same-hive?)
+ `(#:original-message ,original-message
+ #:error-key ,error-key
+ #:error-args ,error-args)
+ `(#:original-message ,original-message
+ #:error-key ,error-key)))
+ (new-message (make-message (hive-gen-message-id hive)
+ (message-from original-message)
+ (actor-id hive) '*error*
+ new-message-body
+ #:in-reply-to (message-id original-message))))
+ ;; We only return a thunk, rather than run 8sync here, because if
+ ;; we ran 8sync in the middle of a catch we'd end up with an
+ ;; unresumable continuation.
+ (lambda () (hive-process-message hive new-message))))
+
(define-method (hive-process-message (hive <hive>) message)
"Handle one message, or forward it via an ambassador"
- (define (process-local-message)
+ (define (maybe-autoreply actor)
+ ;; Possibly autoreply
+ (if (message-needs-reply? message)
+ (<-auto-reply actor message)))
+
+ (define (resolve-actor-to)
+ "Get the actor the message was aimed at"
(let ((actor (hive-resolve-local-actor hive (message-to message))))
(if (not actor)
(throw 'actor-not-found
(address->string (message-from message))
(address->string (message-to message)))
message))
- (call-with-prompt (hive-prompt hive)
- (lambda ()
- (define message-handler (actor-message-handler actor))
- ;; @@: Should a more general error handling happen here?
- (message-handler actor message))
-
- (lambda (kont actor message)
- (let ((hive (actor-hive actor)))
- ;; Register the coroutine
- (hash-set! (hive-waiting-coroutines hive)
- (message-id message)
- (cons (actor-id actor) kont))
- ;; Send off the message
- (8sync (hive-process-message hive message)))))))
+ actor))
+
+ (define (call-catching-coroutine thunk)
+ (define queued-error-handling-thunk #f)
+ (define (call-catching-errors)
+ ;; TODO: maybe parameterize (or attach to hive) and use
+ ;; maybe-catch-all from agenda.scm
+ ;; @@: Why not just use with-throw-handler and let the catch
+ ;; happen at the agenda? That's what we used to do, but
+ ;; it ended up with a SIGABRT. See:
+ ;; http://lists.gnu.org/archive/html/bug-guile/2016-05/msg00003.html
+ (catch #t
+ thunk
+ ;; In the actor model, we don't totally crash on errors.
+ (lambda _ #f)
+ ;; If an error happens, we raise it
+ (lambda (key . args)
+ (if (message-needs-reply? message)
+ ;; If the message is waiting on a reply, let them know
+ ;; something went wrong.
+ ;; However, we have to do it outside of this catch
+ ;; routine, or we'll end up in an unrewindable continuation
+ ;; situation.
+ (set! queued-error-handling-thunk
+ (hive-reply-with-error hive message key args)))
+ ;; print error message
+ (apply print-error-and-continue key args)))
+ ;; @@: This is a kludge. See above for why.
+ (if queued-error-handling-thunk
+ (8sync (queued-error-handling-thunk))))
+ (call-with-prompt (hive-prompt hive)
+ call-catching-errors
+ (lambda (kont actor message)
+ ;; Register the coroutine
+ (hash-set! (hive-waiting-coroutines hive)
+ (message-id message)
+ (cons (actor-id actor) kont))
+ ;; Send off the message
+ (8sync (hive-process-message hive message)))))
+
+ (define (process-local-message)
+ (let ((actor (resolve-actor-to)))
+ (call-catching-coroutine
+ (lambda ()
+ (define message-handler (actor-message-handler actor))
+ ;; @@: Should a more general error handling happen here?
+ (parameterize ((%current-actor actor))
+ (let ((result
+ (message-handler actor message)))
+ (maybe-autoreply actor)
+ ;; Returning result allows actors to possibly make a run-request
+ ;; at the end of handling a message.
+ ;; ... We do want that, right?
+ result))))))
(define (resume-waiting-coroutine)
- (match (hash-remove! (hive-waiting-coroutines hive)
- (message-in-reply-to message))
- ((_ . kont)
- (kont message))
- (#f (throw 'no-waiting-coroutine
- "message in-reply-to tries to resume nonexistent coroutine"
- message))))
+ (cond
+ ((or (eq? (message-action message) '*reply*)
+ (eq? (message-action message) '*auto-reply*))
+ (call-catching-coroutine
+ (lambda ()
+ (match (hash-remove! (hive-waiting-coroutines hive)
+ (message-in-reply-to message))
+ ((_ . (resume-actor-id . kont))
+ (if (not (equal? (message-to message)
+ resume-actor-id))
+ (throw 'resuming-to-wrong-actor
+ "Attempted to resume a coroutine to the wrong actor!"
+ #:expected-actor-id (message-to message)
+ #:got-actor-id resume-actor-id
+ #:message message))
+ (let (;; @@: How should we resolve resuming coroutines to actors who are
+ ;; now gone?
+ (actor (resolve-actor-to))
+ (result (kont message)))
+ (maybe-autoreply actor)
+ result))
+ (#f (throw 'no-waiting-coroutine
+ "message in-reply-to tries to resume nonexistent coroutine"
+ message))))))
+ ;; Yikes, we must have gotten an error or something back
+ (else
+ ;; @@: Not what we want in the long run?
+ ;; What we'd *prefer* to do is to resume this message
+ ;; and throw an error inside the message handler
+ ;; (say, from send-mesage-wait), but that causes a SIGABRT (??!!)
+ (hash-remove! (hive-waiting-coroutines hive)
+ (message-in-reply-to message))
+ (let ((explaination
+ (if (eq? (message-action message) '*reply*)
+ "Won't resume coroutine; got an *error* as a reply"
+ "Won't resume coroutine because action is not *reply*")))
+ (throw 'hive-unresumable-coroutine
+ explaination
+ #:message message)))))
(define (process-remote-message)
;; Find the ambassador
(process-remote-message))))
(define-method (hive-actor-local? (hive <hive>) address)
- (hash-ref (hive-actor-registry hive) address))
+ (equal? (hive-id hive) (address-hive-id address)))
(define-method (hive-register-actor! (hive <hive>) (actor <actor>))
(hash-set! (hive-actor-registry hive) (actor-id actor) actor))
that method for documentation."
(let* ((actor-id (hive-gen-actor-id hive id-cookie))
(actor (apply make actor-class
- ;; @@: If we switch to a hive-proxy, do it here
#:hive hive
#:id actor-id
init)))
;; return the actor id
actor-id))
-(define* (hive-create-actor hive actor-class
- #:key
- (init '())
- id-cookie)
+(define* (hive-create-actor hive actor-class #:rest init)
(%hive-create-actor hive actor-class
- init id-cookie))
+ init #f))
-(define-syntax hive-create-actor*
- (syntax-rules ()
- "Create an instance of actor-class attached to this hive.
-Return the new actor's id.
-
-Used internally, and used for bootstrapping a fresh hive.
+(define* (hive-create-actor* hive actor-class id-cookie #:rest init)
+ (%hive-create-actor hive actor-class
+ init id-cookie))
-Note that actors should generally not call this method directly.
-Instead, actors should call create-actor."
- ((_ args ... (init-args ...))
- (hive-create-actor args ...
- #:init (list init-args ...)))))
+(define (call-with-message message proc)
+ "Applies message body arguments into procedure, with message as first
+argument. Similar to call-with-values in concept."
+ (apply proc message (message-body message)))
+;; (msg-receive (<- bar baz)
+;; (baz)
+;; basil)
-;; TODO: Give actors this instead of the actual hive reference
-(define-class <hive-proxy> ()
- (send-message #:getter proxy-send-message
- #:init-keyword #:send-message)
- (create-actor #:getter proxy-create-actor
- #:init-keyword #:create-actor))
+;; Emacs: (put 'msg-receive 'scheme-indent-function 2)
-;; Live the hive proxy, but has access to the hive itself...
-(define-class <debug-hive-proxy> (<hive-proxy>)
- (hive #:init-keyword #:hive))
+;; @@: Or receive-msg or receieve-message or??
+(define-syntax-rule (msg-receive arglist message body ...)
+ "Call body with arglist (which can accept arguments like lambda*)
+applied from the message-body of message."
+ (call-with-message message
+ (lambda* arglist
+ body ...)))
+(define (msg-val message)
+ "Retrieve the first value from the message-body of message.
+Like single value return from a procedure call. Probably the most
+common case when waiting on a reply from some action invocation."
+ (call-with-message message
+ (lambda (_ val) val)))
\f
-;;; Messages
-;;; ========
-
-
-(define-record-type <message>
- (make-message-intern id to from action
- body in-reply-to wants-reply ; do we need hive-proxy?
- ;; Are these still needed?
- replied deferred-reply)
- message?
- (id message-id)
- (to message-to)
- (from message-from)
- (action message-action)
- (body message-body)
- (in-reply-to message-in-reply-to)
- (wants-reply message-wants-reply)
-
- ;; See XUDD source for these. Not use yet, maybe eventually will be?
- ;; XUDD uses them for autoreply.
- ;; Requiring mutation on message objects is clearly not great,
- ;; but it may be worth it...? Investigate!
- (replied message-replied set-message-replied!)
- (deferred-reply message-deferred-reply set-message-deferred-reply!))
-
-
-(define* (make-message id to from action body
- #:key in-reply-to wants-reply
- replied deferred-reply)
- (make-message-intern id to from action body
- in-reply-to wants-reply replied
- deferred-reply))
-
-;; Note: the body of messages is currently an alist, but it's created
-;; from a keyword based property list (see the following two functions).
-;; But, that's an extra conversion step, and maybe totally unnecessary:
-;; we already have message-ref, and this could just pull a keyword
-;; from a property list.
-;; The main ways this might be useful are error checking,
-;; serialization across the wire (but even that might require some
-;; change), and using existing tooling (though adding new tooling
-;; would be negligible in implementation effort.)
-
-(define* (message-ref message key #:optional dflt)
- "Extract KEY from body of MESSAGE.
-
-Optionally set default with [DFLT]"
- (let ((result (assoc key (message-body message))))
- (if result (cdr result)
- dflt)))
+;;; Various API methods for actors to interact with the system
+;;; ==========================================================
+;; TODO: move send-message and friends here...?
-(define (kwarg-list-to-alist args)
- (let loop ((remaining args)
- (result '()))
- (match remaining
- (((? keyword? key) val rest ...)
- (loop rest
- (cons (cons (keyword->symbol key) val)
- result)))
- (() result)
- (_ (throw 'invalid-kwarg-list
- "Invalid keyword argument list"
- args)))))
+(define* (create-actor from-actor actor-class #:rest init)
+ "Create an instance of actor-class. Return the new actor's id.
+This is the method actors should call directly (unless they want
+to supply an id-cookie, in which case they should use
+create-actor*)."
+ (%hive-create-actor (actor-hive from-actor) actor-class
+ init #f))
-(define (send-message from-actor to-id action . message-body-args)
- "Send a message from an actor to another actor"
- (let* ((hive (actor-hive from-actor))
- (message (make-message (hive-gen-message-id hive) to-id
- (actor-id from-actor) action
- (kwarg-list-to-alist message-body-args))))
- (8sync (hive-process-message hive message))))
-(define (send-message-wait from-actor to-id action . message-body-args)
- "Send a message from an actor to another, but wait until we get a response"
- (let* ((hive (actor-hive from-actor))
- (agenda-prompt (hive-prompt (actor-hive from-actor)))
- (message (make-message (hive-gen-message-id hive) to-id
- (actor-id from-actor) action
- (kwarg-list-to-alist message-body-args)
- #:wants-reply #t)))
- (abort-to-prompt agenda-prompt from-actor message)))
+(define* (create-actor* from-actor actor-class id-cookie #:rest init)
+ "Create an instance of actor-class. Return the new actor's id.
-;; TODO: Intelligently ~propagate(ish) errors on -wait functions.
-;; We might have `send-message-wait-brazen' to allow callers to
-;; not have an exception thrown and instead just have a message with
-;; the appropriate '*error* message returned.
+Like create-actor, but permits supplying an id-cookie."
+ (%hive-create-actor (actor-hive from-actor) actor-class
+ init id-cookie))
-(define (reply-message from-actor original-message
- . message-body-args)
- "Reply to a message"
- (set-message-replied! original-message #t)
- (let* ((hive (actor-hive from-actor))
- (new-message (make-message (hive-gen-message-id hive)
- (message-from original-message)
- (actor-id from-actor) '*reply*
- (kwarg-list-to-alist message-body-args)
- #:in-reply-to (message-id original-message))))
- (8sync (hive-process-message hive new-message))))
-(define (reply-message-wait from-actor original-message
- . message-body-args)
- "Reply to a messsage, but wait until we get a response"
- (set-message-replied! original-message #t)
- (let* ((hive (actor-hive from-actor))
- (agenda-prompt (hive-prompt (actor-hive from-actor)))
- (new-message (make-message (hive-gen-message-id hive)
- (message-from original-message)
- (actor-id from-actor) '*reply*
- (kwarg-list-to-alist message-body-args)
- #:wants-reply #t
- #:in-reply-to (message-id original-message))))
- (abort-to-prompt agenda-prompt from-actor new-message)))
+(define (self-destruct actor)
+ "Remove an actor from the hive."
+ (hash-remove! (hive-actor-registry (actor-hive actor))
+ (actor-id actor)))
\f
(spawn-and-queue-repl-server! agenda)))
(start-agenda agenda)))
-(define (hive-bootstrap-message hive to-id action . message-body-args)
+(define (bootstrap-message hive to-id action . message-body-args)
(wrap
- (apply send-message hive to-id action message-body-args)))
+ (apply <- hive to-id action message-body-args)))
\f
-;;; Convenience procedures
-;;; ======================
+;;; Basic readers / writers
+;;; =======================
(define (serialize-message message)
"Serialize a message for read/write"
(list
(message-id message)
- (address->string (message-to message))
- (address->string (message-from message))
+ (message-to message)
+ (message-from message)
(message-action message)
(message-body message)
(message-in-reply-to message)
(message-wants-reply message)
- (message-replied message)
- (message-deferred-reply message)))
+ (message-replied message)))
(define* (write-message message #:optional (port (current-output-port)))
"Write out a message to a port for easy reading later.
(body ,(message-body message))
(in-reply-to ,(message-in-reply-to message))
(wants-reply ,(message-wants-reply message))
- (replied ,(message-replied message))
- (deferred-reply ,(message-deferred-reply message))))
+ (replied ,(message-replied message))))
(define (pprint-message message)
"Pretty print a message."
(define* (read-message #:optional (port (current-input-port)))
"Read a message serialized via serialize-message from PORT"
(match (read port)
- ((id to from action body in-reply-to wants-reply replied deferred-reply)
+ ((id to from action body in-reply-to wants-reply replied)
(make-message-intern
id to from action body
- in-reply-to wants-reply replied deferred-reply))
+ in-reply-to wants-reply replied))
(anything-else
(throw 'message-read-bad-structure
"Could not read message from structure"