aleph seems to be working

Author: alekcz

src/pcp/core.clj

@@ -175,6 +175,7 @@
 
 (defn body-handler [req]
   (let [type (:content-type req)]
+    ;; (print "\n\n\n" (slurp (:body req)) "\n\n\n")
     (if (nil? type)
       req
       (cond 
@@ -200,7 +201,7 @@
   ([path]       
     (let [scgi-port (Integer/parseInt (or (System/getenv "SCGI_PORT") "9000"))]
       (case path
-        ""  (scgi/serve scgi-handler scgi-port);(server/start-server handler {:port scgi-port});
+        ""  (scgi/serve scgi-handler scgi-port)
         (run-script path)))))
 
 

src/pcp/scgi.clj

@@ -14,8 +14,8 @@
 (defn to-byte-array [^String text]
   (-> text (.getBytes "UTF-8") ByteBuffer/wrap))
 
-(defn to-string [bytes]
-  (bs/to-string bytes))
+(defn to-string [str-as-bytes]
+  (bs/to-string str-as-bytes))
 
 (defn extract-headers [header]
   (let [data (str/split header #"\u0000")
@@ -57,17 +57,17 @@
 
 
 (defn size [bts]
-  (let [seg (bs/to-string (byte-array (take 50 bts)))
+  (let [seg (to-string (byte-array (vec (take 50 bts))))
         header-len (str/replace seg #":.*" "")
         len (count header-len)
-        header-int (Integer/parseInt header-len)
+        header-int (Integer/parseInt (if-not (str/blank? header-len) header-len "0" ))
         body (re-find #"(\d+)" (subs seg (inc len)))
-        body-int (Integer/parseInt (second body))]
+        body-int (Integer/parseInt (if-not (str/blank? (second body)) (second body) "0"))]
     {:drop (inc len)
      :header header-int
      :body body-int
-     :end (+ len header-int 1)
-     :total (+ body-int header-int (inc len) 1)}))
+     :end (+ len header-int 1 1)
+     :total (+ body-int header-int len 1 1)}))
 
 (defn str+bin [string binary]
   (str string (bs/to-string binary)))
@@ -81,7 +81,6 @@
         (d/chain
           (fn [msg]
             (let [meta (size msg) 
-                  len (count msg)
                   dmsg (d/deferred)
                   total (:total meta)] 
               (d/success! dmsg msg)
@@ -93,8 +92,6 @@
                     [meta (mapcat seq (conj bin @m))]
                     (d/recur (s/take! s null) (conj bin @m) progress))))))
           (fn [res]
-            ;; (with-open [w (clojure.java.io/output-stream "test-resources/multipart.bin")]
-            ;;   (.write w (byte-array (second res))))
             (let [meta (first res)
                   msg (second res)
                   main (drop (:drop meta) msg)

src/pcp/utility.clj

@@ -106,14 +106,18 @@ Options:
         (resp/content-type mime))))
 
 (defn create-resp [scgi-response]
-  (let [resp-array (str/split scgi-response #"\r\n")
-        resp-status (first resp-array)
-        end  (+ 4 (str/index-of scgi-response "\r\n\r\n"))
-        status (Integer/parseInt (if (empty? resp-status) "404" resp-status))
-        body (subs scgi-response end)
-        header-vals (re-seq #"(.*?): (.*?)\r\n" (subs scgi-response 0 end))
-        headers (apply merge (for [h header-vals] {(nth h 1) (nth h 2)}))]
-    {:status status :body body :headers headers}))
+  (when-not (str/blank? scgi-response)
+    (let [resp-array (str/split scgi-response #"\r\n")
+          resp-status (first resp-array)
+          status (Integer/parseInt (if (empty? resp-status) "404" resp-status))
+          body (last resp-array )
+          header-vals'  (-> scgi-response 
+                          (str/replace (first resp-array) "") 
+                          (str/replace (last resp-array) "")
+                          (str/trim))
+          header-vals  (re-seq #"(.*?): (.*?)\r\n" header-vals')
+          headers (apply merge (for [h header-vals] {(nth h 1) (nth h 2)}))]
+      {:status status :body body :headers headers})))
 
 (defn file-exists? [path]
   (-> path ^File io/file .exists))
@@ -140,10 +144,9 @@ Options:
             (-> (assoc full :document-uri "/404.clj") http-to-scgi (forward (:scgi-port opts)) create-resp)
           :else (format-response 404 nil nil)))))
 
-(defn run-file [path port]
+(defn run-file [path scgi-port]
   (let [path (str/replace (str "/" path) "//" "/")
         root (.getCanonicalPath ^File (io/file "./"))
-        scgi-port (Integer/parseInt (or (System/getenv "SCGI_PORT") (str port) "9000"))
         request {:document-root root :document-uri path :request-method :get}]
     (-> request http-to-scgi (forward scgi-port) create-resp :body)))
 
@@ -259,21 +262,6 @@ Options:
       (slurp (str (template-path) "/api/info.clj")))
     (println (str "Created pcp project `" project-name "` in directory") (.getAbsolutePath ^File (io/file path)))))
 
-;; (def cli-options
-;;   ;; An option with a required argument
-;;   [["-s" "--serve PATH" "Server root"
-;;     :default "./public"
-;;     :parse-fn #(Integer/parseInt %)
-;;     :validate [#(< 0 % 0x10000) "Must be a number between 0 and 65536"]]
-;;    ["-t" nil "SCGI server port"
-;;     :default 9000
-;;     :validate [#(< 0 % 0x10000) "Must be a number between 0 and 65536"]]
-;;    ["-v" "--version"]
-;;    ["-h" "--help"]])
-
-;; (defn -main [& args]
-;;   (println (parse-opts args cli-options)))
-
 (defn -main 
   ([]
     (-main "" ""))
@@ -285,8 +273,8 @@ Options:
       "--serve" (start-local-server {:root value})
       "-v" (println "pcp" version)
       "--version" (println "pcp" version)
-      "-e" (println (run-file value 9000))
-      "--evaluate" (println (run-file value 9000))
+      "-e" (println (run-file value (Integer/parseInt (or (System/getenv "SCGI_PORT") "9000"))))
+      "--evaluate" (println (run-file value (Integer/parseInt (or (System/getenv "SCGI_PORT") "9000"))))
       "new" (new-project value)
       "passphrase" (add-passphrase value)
       "secret" (add-secret {:root value})

test/pcp/scgi_test.clj

@@ -2,7 +2,8 @@
   (:require [clojure.test :refer :all]
             [pcp.scgi :as scgi]
             [pcp.core :as core]
-            [clojure.java.io :as io])
+            [clojure.java.io :as io]
+            [byte-streams :as bs])
   (:import  [java.net Socket InetAddress]
             [org.apache.commons.io IOUtils]))
 
@@ -13,7 +14,7 @@
     (let [handler #(core/scgi-handler %)
           scgi-port 55555
           server (scgi/serve handler scgi-port)
-          message (IOUtils/toByteArray (io/input-stream "test-resources/scgi.bin"))
+          message (bs/to-byte-array (io/input-stream "test-resources/scgi.bin"))
           len (count message)]
       (Thread/sleep boot-time)
       (let [socket (Socket. (InetAddress/getByName "127.0.0.1") scgi-port)]
@@ -32,14 +33,14 @@
     (let [handler #(core/scgi-handler %)
           scgi-port 11112
           server (scgi/serve handler scgi-port)
-          message (IOUtils/toByteArray (io/input-stream "test-resources/multipart.bin"))
+          message (bs/to-byte-array (io/input-stream "test-resources/multipart.bin"))
           len (count message)]
       (Thread/sleep boot-time)
       (let [socket (Socket. (InetAddress/getByName "127.0.0.1") scgi-port)]
         (with-open [os (io/output-stream (.getOutputStream socket))]
           (.write os message 0 len)
           (.flush os)
-          (let [ans (IOUtils/toString (.getInputStream socket))]
+          (let [ans (bs/to-string (.getInputStream socket))]
             (is (= "200\r\nContent-Type: text/plain\r\n\r\n1275" ans))
             (Thread/sleep 2000)
             (.close socket)
@@ -52,14 +53,14 @@
     (let [handler #(core/scgi-handler %)
           scgi-port 11113
           server (scgi/serve handler scgi-port)
-          message (IOUtils/toByteArray (io/input-stream "test-resources/json.bin"))
+          message (bs/to-byte-array (io/input-stream "test-resources/json.bin"))
           len (count message)]
       (Thread/sleep boot-time)
       (let [socket (Socket. (InetAddress/getByName "127.0.0.1") scgi-port)]
         (with-open [os (io/output-stream (.getOutputStream socket))]
           (.write os message 0 len)
           (.flush os)
-          (let [ans (IOUtils/toString (.getInputStream socket))
+          (let [ans (bs/to-string (.getInputStream socket))
                 _ (.close socket)]
             (is (= "200\r\nContent-Type: text/plain\r\n\r\n1275" ans))
             (is (true? (.isClosed socket)))

test/pcp/utility_test.clj

@@ -155,8 +155,8 @@
           scgi (core/-main)
           _ (Thread/sleep boot-time)
           local (utility/-main "-s" root)
-          file-eval (json/decode (with-out-str (utility/-main "-e" (str root "/index.clj"))) true)
-          file-eval2 (json/decode (with-out-str (utility/-main "--evaluate" (str root "/index.clj"))) true)
+          file-eval (json/decode (with-out-str (utility/-main "-e" "./test-resources/site/index.clj")) true)
+          file-eval2 (json/decode (with-out-str (utility/-main "--evaluate" "./test-resources/site/index.clj")) true)
           file-eval-expected (json/decode "{\"num\":1275,\"name\":\"Test\",\"end\":null}" true)
           resp-index (client/get (str "http://localhost:3000/"))
           resp-text  (client/get (str "http://localhost:3000/text.txt"))]