Test and bugfixes

Author: jtkDvlp

project.clj

@@ -3,4 +3,36 @@
   :url "https://github.com/jtkDvlp/cljs-workers"
   :license {:name "MIT"}
   :dependencies [[org.clojure/clojure "1.8.0"]
-                 [org.clojure/clojurescript "1.9.229"]])
+                 [org.clojure/clojurescript "1.9.229"]]
+
+  :min-lein-version "2.5.3"
+
+  :source-paths ["src"]
+  :test-paths ["test"]
+
+  :clean-targets ^{:protect false} ["resources/public/js" "target"]
+
+  :plugins [[lein-cljsbuild "1.1.4" :exclusions [[org.clojure/clojure]]]
+            [lein-figwheel "0.5.0-1"]]
+
+  :profiles {:dev {:dependencies [[figwheel-sidecar "0.5.8"]
+                                  [com.cemerick/piggieback "0.2.1"]]}}
+
+  :repl-options {:nrepl-middleware [cemerick.piggieback/wrap-cljs-repl]}
+
+  :cljsbuild
+  {:builds
+   [{:id "test"
+     :source-paths ["src" "test"]
+     :figwheel true
+     :compiler {:main cljs-workers.test
+                :asset-path "js/test/out"
+                :output-to "resources/public/js/test/test.js"
+                :output-dir "resources/public/js/test/out" }}
+    {:id "worker"
+     :source-paths ["src" "test"]
+     :compiler {:main cljs-workers.test
+                :asset-path "js/worker/out"
+                :output-to "resources/public/js/worker/worker.js"
+                :output-dir "resources/public/js/worker/out"
+                :optimizations :simple}}]})

resources/public/test.html

@@ -0,0 +1 @@
+<script src="js/test/test.js"></script>

src/cljs_workers/core.cljs

@@ -4,10 +4,20 @@
 
 (defn supported?
   []
-  (-> js/Worker
+  (-> js/self
+      .-Worker
       undefined?
       not))
 
+(defn worker?
+  []
+  (-> js/self
+      .-document
+      undefined?))
+
+(def main?
+  (complement worker?))
+
 (defn create-one
   [script]
   (js/Worker. script))

src/cljs_workers/worker.cljs

@@ -38,6 +38,7 @@
 
 (defn- handle-request!
   [event]
+
   (let [data
         (.-data event)
 
@@ -49,4 +50,6 @@
 
     (do-respond! handler arguments)))
 
-(aset js/self "onmessage" handle-request!)
+(defn bootstrap
+  []
+  (aset js/self "onmessage" handle-request!))

test/cljs_workers/test.cljs

@@ -0,0 +1,24 @@
+(ns cljs-workers.test
+  (:require [cljs-workers.core :as main]
+            [cljs-workers.worker :as worker]))
+
+(defn app
+  []
+  (let [worker-pool (main/create-pool 2 "js/worker/worker.js")]
+    (main/do-with-pool! worker-pool {:handler :mirror, :arguments {:a "Hallo" :b "Welt" :c 10}} #(.debug js/console %))
+    (main/do-with-pool! worker-pool {:handler :mirror, :arguments {:a "Hallo" :b "Welt" :c 10 :d (js/ArrayBuffer. 10) :transfer [:d]} :transfer [:d]} #(.debug js/console %))
+    (main/do-with-pool! worker-pool {:handler :mirror, :arguments {:a "Hallo" :b "Welt" :c 10 :d (js/ArrayBuffer. 10) :transfer [:d]} :transfer [:c]} #(.debug js/console %))
+    (main/do-with-pool! worker-pool {:handler :mirror, :arguments {:a "Hallo" :b "Welt" :c 10 :d (js/ArrayBuffer. 10) :transfer [:c]} :transfer [:d]} #(.debug js/console %))))
+
+(defn worker
+  []
+  (worker/register
+   :mirror
+   (fn [arguments]
+     arguments))
+
+  (worker/bootstrap))
+
+(if (and (main/supported?) (main/main?))
+  (app)
+  (worker))