builtin webserver now gzips when run standalone

Author: dnolen

src/main/clojure/cljs/repl/browser.clj

@@ -132,7 +132,7 @@
     "<script src=\"" output-to "\"></script>"
     "</body></html>"))
 
-(defn send-static [{path :path :as request} conn {:keys [static-dir host port] :as opts}]
+(defn send-static [{path :path :as request} conn {:keys [static-dir host port gzip?] :as opts}]
   (if (and static-dir (not= "/favicon.ico" path))
     (let [path (if (= "/" path) "/index.html" path)
           local-path
@@ -157,13 +157,9 @@
         local-path
         (if-let [ext (some #(if (.endsWith path %) %) (keys ext->mime-type))]
           (let [mime-type (ext->mime-type ext "text/plain")
-                encoding (mime-type->encoding mime-type "UTF-8")]
-            (server/send-and-close
-              conn
-              200
-              (slurp local-path :encoding encoding)
-              mime-type
-              encoding))
+                encoding  (mime-type->encoding mime-type "UTF-8")]
+            (server/send-and-close conn 200 (slurp local-path :encoding encoding)
+              mime-type encoding (and gzip? (= "text/javascript" mime-type))))
           (server/send-and-close conn 200 (slurp local-path) "text/plain"))
         ;; "/index.html" doesn't exist, provide our own
         (= path "/index.html")
@@ -282,7 +278,8 @@
             server/state (atom {:socket nil :connection nil :promised-conn nil})]
     (server/start
       (merge opts
-        {:static-dir (cond-> ["." "out/"] output-dir (conj output-dir))}))))
+        {:static-dir (cond-> ["." "out/"] output-dir (conj output-dir))
+         :gzip? true}))))
 
 ;; =============================================================================
 ;; BrowserEnv

src/main/clojure/cljs/repl/server.clj

@@ -11,6 +11,8 @@
   (:require [clojure.string :as str])
   (:import java.io.BufferedReader
            java.io.InputStreamReader
+           java.io.ByteArrayOutputStream
+           java.util.zip.GZIPOutputStream
            java.net.ServerSocket))
 
 (def ^:dynamic state nil)
@@ -130,6 +132,18 @@
     404 "HTTP/1.1 404 Not Found"
     "HTTP/1.1 500 Error"))
 
+(defn ^bytes gzip [^bytes bytes]
+  (let [baos (ByteArrayOutputStream. (count bytes))]
+    (try
+      (let [gzos (GZIPOutputStream. baos)]
+        (try
+          (.write gzos bytes)
+          (finally
+            (.close gzos))))
+      (finally
+        (.close baos)))
+    (.toByteArray baos)))
+
 (defn send-and-close
   "Use the passed connection to send a form to the browser. Send a
   proper HTTP response."
@@ -138,16 +152,20 @@
   ([conn status form content-type]
     (send-and-close conn status form content-type "UTF-8"))
   ([conn status form content-type encoding]
-    (let [byte-form (.getBytes form encoding)
+    (send-and-close conn status form content-type encoding false))
+  ([conn status form content-type encoding gzip?]
+    (let [byte-form (cond-> (.getBytes form encoding) gzip? gzip)
           content-length (count byte-form)
           headers (map #(.getBytes (str % "\r\n"))
-                    [(status-line status)
-                     "Server: ClojureScript REPL"
-                     (str "Content-Type: "
-                       content-type
-                       "; charset=" encoding)
-                     (str "Content-Length: " content-length)
-                     ""])]
+                    (cond->
+                      [(status-line status)
+                       "Server: ClojureScript REPL"
+                       (str "Content-Type: "
+                         content-type
+                         "; charset=" encoding)
+                       (str "Content-Length: " content-length)]
+                      gzip? (conj "Content-Encoding: gzip")
+                      true (conj "")))]
       (with-open [os (.getOutputStream conn)]
         (doseq [header headers]
           (.write os header 0 (count header)))