fix op-id

Cirru · Nov 24, 2017 · 9814264 · 9814264
1 parent be745a7
commit 9814264
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 17 deletions.
diff --git a/app/coir.edn b/app/coir.edn
diff --git a/app/src/app/comp/container.cljs b/app/src/app/comp/container.cljs
@@ -64,10 +64,6 @@
          (if (= :watching (:name router))
            (cursor-> :watching comp-watching states (:data router) theme)
            (comp-login states))))
-      (comp-inspect "Session" (:user store) style-inspector)
-      (comment
-       comp-inspect
-       "Router data"
-       (get-in store [:router :data])
-       (merge style-inspector {:left 100}))
+      (comment comp-inspect "Session" (:user store) style-inspector)
+      (comment comp-inspect "Router data" states (merge style-inspector {:left 100}))
       (comp-messages (get-in store [:session :notifications]))))))
diff --git a/server/coir.edn b/server/coir.edn
diff --git a/server/src/server/main.cljs b/server/src/server/main.cljs
@@ -10,7 +10,8 @@
             ["chalk" :as chalk]
             ["path" :as path]
             ["express" :as express]
-            ["serve-index" :as serve-index])
+            ["serve-index" :as serve-index]
+            ["shortid" :as shortid])
   (:require-macros [cljs.core.async.macros :refer [go-loop go]]))
 
 (defonce *writer-db
@@ -26,14 +27,21 @@
 
 (def global-configs (pick-configs (:configs @*writer-db)))
 
-(defn dispatch! [op op-data sid op-id]
-  (comment .log js/console "Action" (str op) (clj->js op-data) sid op-id)
+(defn dispatch! [op op-data sid]
+  (comment .log js/console "Action" (str op) (clj->js op-data) sid)
   (comment .log js/console "Database:" (clj->js @*writer-db))
   (cond
-    (= op :effect/save-files) (handle-files! @*writer-db global-configs dispatch! true)
+    (= op :effect/save-files)
+      (handle-files! @*writer-db global-configs #(dispatch! %1 %2 sid) true)
     :else
       (try
-       (let [new-db (updater @*writer-db op op-data sid op-id (.valueOf (js/Date.)))]
+       (let [new-db (updater
+                     @*writer-db
+                     op
+                     op-data
+                     sid
+                     (.generate shortid)
+                     (.valueOf (js/Date.)))]
          (reset! *writer-db new-db))
        (catch js/Error e (println (.red chalk e))))))
 

diff --git a/server/src/server/network.cljs b/server/src/server/network.cljs
@@ -39,23 +39,23 @@
               wss
               "connection"
               (fn [socket]
-                (let [sid (.generate shortid), op-id (.generate shortid)]
-                  (on-action! :session/connect nil sid op-id)
+                (let [sid (.generate shortid)]
+                  (on-action! :session/connect nil sid)
                   (swap! *registry assoc sid socket)
                   (println (.gray chalk (str "client connected: " sid)))
                   (.on
                    socket
                    "message"
                    (fn [rawData]
                      (let [action (reader/read-string rawData), [op op-data] action]
-                       (on-action! op op-data sid op-id))))
+                       (on-action! op op-data sid))))
                   (.on
                    socket
                    "close"
                    (fn []
                      (println (.gray chalk (str "client disconnected: " sid)))
                      (swap! *registry dissoc sid)
-                     (on-action! :session/disconnect nil sid op-id))))))
+                     (on-action! :session/disconnect nil sid))))))
              (println
               "Server started, please edit on"
               (.blue chalk (str "http://cumulo-editor.cirru.org?port=" port))))))))))