michael/grub-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Make state syncing code more explicit

Browse source
This commit is contained in:
Nicholas Kariniemi 2014-10-12 23:15:40 +03:00
parent 64b1bb05a7
commit 5fd54b62e6
3 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/clj/grub/core.clj
View file

@ -63,7 +63,7 @@
(let [to-client (chan)
from-client (chan)]
(ws/add-connected-client! ws-channel to-client from-client)
(state/sync-new-client! states to-client from-client)))
(state/sync-new-client! to-client from-client states)))
(handler request))))
(defn handle-root [handler index]

15
src/cljx/grub/state.cljx
View file

@ -2,6 +2,7 @@
(:require [grub.diff :as diff]
[grub.message :as message]
[grub.sync :as sync]
[hasch.core :as hasch]
#+clj [clojure.core.async :as a :refer [<! >! chan go]]
#+cljs [cljs.core.async :as a :refer [<! >! chan]])
#+cljs (:require-macros [grub.macros :refer [log logs]]
@ -16,13 +17,16 @@
(defmethod handle-event :diff [{:keys [hash diff states shadow client?] :as msg}]
(let [history-shadow (sync/get-history-state states hash)]
(if history-shadow
(let [new-states (sync/apply-diff states diff)
(let [state (sync/get-current-state states)
new-state (diff/patch-state state diff)
new-states (sync/add-history-state states new-state)
new-shadow (diff/patch-state history-shadow diff)
{new-diff :diff new-hash :hash} (sync/diff-states (sync/get-current-state new-states) new-shadow)]
new-diff (diff/diff-states new-shadow new-state)
new-hash (hasch/uuid new-shadow)]
{:out-event (when-not (sync/empty-diff? diff)
(message/diff-msg new-diff new-hash))
:new-states (if client?
(sync/new-state (sync/get-current-state new-states))
(sync/new-state new-state)
new-states)
:new-shadow new-shadow})
(if client?
@ -42,7 +46,8 @@
:new-shadow state})
(defmethod handle-event :new-state [{:keys [client? state states shadow] :as event}]
(let [{:keys [diff hash]} (sync/diff-states state shadow)]
(let [diff (diff/diff-states shadow state)
hash (hasch/uuid shadow)]
{:new-states (sync/add-history-state states state)
:out-event (when-not (sync/empty-diff? diff) (message/diff-msg diff hash))}))
@ -67,7 +72,7 @@
([<remote >remote states initial-shadow] (make-agent true <remote >remote states initial-shadow)))
#+clj
(defn sync-new-client! [states >client <client]
(defn sync-new-client! [>client <client states]
(let [client-id (java.util.UUID/randomUUID)
state-change-events (chan 1 (map (fn [s] {:type :new-state :state s})))
client-events (chan)]

8
src/cljx/grub/sync.cljx
View file

@ -32,13 +32,5 @@
(into [] (rest new-states))
new-states)))))
(defn diff-states [state shadow]
{:hash (hasch/uuid shadow)
:diff (diff/diff-states shadow state)})
(defn apply-diff [states diff]
(let [new-state (diff/patch-state (get-current-state states) diff)]
(add-history-state states new-state)))
(defn empty-diff? [diff]
(= diff {:recipes {:deleted #{}, :updated nil}, :grubs {:deleted #{}, :updated nil}}))