✨ Add improved REPL support

backend/deps.edn

@@ -4,6 +4,8 @@
  :deps
  {penpot/common {:local/root "../common"}
   org.clojure/clojure {:mvn/version "1.12.0-alpha5"}
+  org.clojure/tools.namespace {:mvn/version "1.4.4"}
+
   com.github.luben/zstd-jni {:mvn/version "1.5.5-10"}
 
   io.prometheus/simpleclient {:mvn/version "0.16.0"}
@@ -26,6 +28,8 @@
 
   com.github.seancorfield/next.jdbc {:mvn/version "1.3.894"}
   metosin/reitit-core {:mvn/version "0.6.0"}
+  nrepl/nrepl {:mvn/version "1.1.0"}
+  cider/cider-nrepl {:mvn/version "0.43.1"}
 
   org.postgresql/postgresql {:mvn/version "42.6.0"}
 
@@ -61,7 +65,6 @@
  {:dev
   {:extra-deps
    {com.bhauman/rebel-readline {:mvn/version "RELEASE"}
-    org.clojure/tools.namespace {:mvn/version "RELEASE"}
     clojure-humanize/clojure-humanize {:mvn/version "0.2.2"}
     org.clojure/data.csv {:mvn/version "RELEASE"}
     com.clojure-goes-fast/clj-async-profiler {:mvn/version "RELEASE"}

backend/package.json

@@ -1,18 +1,16 @@
 {
-  "name": "uxbox-back",
-  "version": "0.1.0",
-  "description": "The Open-Source prototyping tool",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "build-emails": "./scripts/build-email-templates.sh"
+  "name": "penpot-backend",
+  "version": "1.0.0",
+  "main": "index.js",
+  "license": "MPL-2.0",
+  "dependencies": {
+    "luxon": "^3.4.2",
+    "sax": "^1.2.4"
   },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/uxbox/uxbox.git"
-  },
-  "author": "Uxbox",
-  "license": "SEE LICENSE IN <LICENSE>",
+  "scripts": {},
   "devDependencies": {
-    "mjml": "^4.6.3"
+    "nodemon": "^3.0.1",
+    "source-map-support": "^0.5.21",
+    "ws": "^8.13.0"
   }
 }

backend/scripts/nrepl

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+clojure -J-Xms50m -J-Xmx256m -J-XX:+UseSerialGC -Sdeps '{:deps {reply/reply {:mvn/version "0.5.0"}}}' -M -m reply.main --attach localhost:6064 -e "(in-ns 'app.main)"

backend/scripts/start-dev

@@ -6,6 +6,7 @@ export PENPOT_FLAGS="\
        $PENPOT_FLAGS \
        enable-prepl-server \
        enable-urepl-server \
+       enable-nrepl-server \
        enable-webhooks \
        enable-backend-asserts \
        enable-audit-log \
@@ -18,22 +19,35 @@ export PENPOT_FLAGS="\
        enable-access-tokens \
        disable-file-validation";
 
-set -ex
+# Initialize MINIO config
+mc alias set penpot-s3/ http://minio:9000 minioadmin minioadmin
+mc admin user add penpot-s3 penpot-devenv penpot-devenv
+mc admin policy attach penpot-s3 readwrite --user=penpot-devenv
+mc mb penpot-s3/penpot -p
+
+export AWS_ACCESS_KEY_ID=penpot-devenv
+export AWS_SECRET_ACCESS_KEY=penpot-devenv
+export PENPOT_ASSETS_STORAGE_BACKEND=assets-s3
+export PENPOT_STORAGE_ASSETS_S3_ENDPOINT=http://minio:9000
+export PENPOT_STORAGE_ASSETS_S3_BUCKET=penpot
 
 if [ "$1" = "--watch" ]; then
+    trap "exit" INT TERM ERR
+    trap "kill 0" EXIT
+
     echo "Start Watch..."
 
     clojure -A:dev -M -m app.main &
-    PID=$!
 
     npx nodemon \
         --watch src \
         --watch ../common \
         --ext "clj" \
         --signal SIGKILL \
-        --exec 'echo "(user/restart)" | nc -N localhost 6062'
+        --exec 'echo "(app.main/stop)\n\r(repl/refresh)\n\r(app.main/start)\n" | nc -N localhost 6062'
+
+    wait;
 
-    kill -9 $PID
 else
-    clojure -A:dev -M -m app.main
+    clojure -A:dev -M -m app.main;
 fi

backend/src/app/main.clj

@@ -37,8 +37,12 @@
    [app.storage.s3 :as-alias sto.s3]
    [app.util.time :as dt]
    [app.worker :as-alias wrk]
+   [cider.nrepl :refer [cider-nrepl-handler]]
+   [clojure.test :as test]
+   [clojure.tools.namespace.repl :as repl]
    [cuerdas.core :as str]
    [integrant.core :as ig]
+   [nrepl.server :as nrepl]
    [promesa.exec :as px])
   (:gen-class))
 
@@ -527,22 +531,65 @@
                                    (merge worker-config))
                                  (ig/prep)
                                  (ig/init))))
-  (l/info :hint "welcome to penpot"
-          :flags (str/join "," (map name cf/flags))
-          :worker? (contains? cf/flags :backend-worker)
-          :version (:full cf/version)))
+  (l/inf :hint "welcome to penpot"
+         :flags (str/join "," (map name cf/flags))
+         :worker? (contains? cf/flags :backend-worker)
+         :version (:full cf/version)))
 
 (defn stop
   []
   (alter-var-root #'system (fn [sys]
                              (when sys (ig/halt! sys))
                              nil)))
+(defn restart
+  []
+  (stop)
+  (repl/refresh :after 'app.main/start))
+
+(defn restart-all
+  []
+  (stop)
+  (repl/refresh-all :after 'app.main/start))
+
+(defmacro run-bench
+  [& exprs]
+  `(do
+     (require 'criterium.core)
+     (criterium.core/with-progress-reporting (crit/quick-bench (do ~@exprs) :verbose))))
+
+(defn run-tests
+  ([] (run-tests #"^backend-tests.*-test$"))
+  ([o]
+   (repl/refresh)
+   (cond
+     (instance? java.util.regex.Pattern o)
+     (test/run-all-tests o)
+
+     (symbol? o)
+     (if-let [sns (namespace o)]
+       (do (require (symbol sns))
+           (test/test-vars [(resolve o)]))
+       (test/test-ns o)))))
+
+(repl/disable-reload! (find-ns 'integrant.core))
 
 (defn -main
   [& _args]
   (try
-    (start)
+    (let [p (promise)]
+      (when (contains? cf/flags :nrepl-server)
+        (l/inf :hint "start nrepl server" :port 6064)
+        (nrepl/start-server :bind "0.0.0.0" :port 6064 :handler cider-nrepl-handler))
+
+      (start)
+      (deref p))
     (catch Throwable cause
-      (l/error :hint (ex-message cause)
-               :cause cause)
+      (binding [*out* *err*]
+        (println "==== ERROR ===="))
+      (.printStackTrace cause)
+      (when-let [cause' (ex-cause cause)]
+        (binding [*out* *err*]
+          (println "==== CAUSE ===="))
+        (.printStackTrace cause'))
+      (px/sleep 500)
       (System/exit -1))))

backend/src/app/srepl.clj

@@ -36,7 +36,9 @@
         lock (locks/create)]
     (ccs/prepl *in*
                (fn [m]
-                 (binding [*out* out, *flush-on-newline* true, *print-readably* true]
+                 (binding [*out* out,
+                           *flush-on-newline* true,
+                           *print-readably* true]
                    (locks/locking lock
                      (println (json/encode-str m))))))))
 
@@ -44,13 +46,10 @@
 
 (s/def ::port ::us/integer)
 (s/def ::host ::us/not-empty-string)
-(s/def ::flag #{:urepl-server :prepl-server})
-(s/def ::type #{::prepl ::urepl})
-(s/def ::key (s/tuple ::type ::us/keyword))
 
 (defmethod ig/pre-init-spec ::server
   [_]
-  (s/keys :req [::flag ::host ::port]))
+  (s/keys :req [::host ::port]))
 
 (defmethod ig/prep-key ::server
   [[type _] cfg]
@@ -59,6 +58,12 @@
 (defmethod ig/init-key ::server
   [[type _] {:keys [::flag ::port ::host] :as cfg}]
   (when (contains? cf/flags flag)
+
+    (l/inf :hint "initializing repl server"
+           :name (name type)
+           :port port
+           :host host)
+
     (let [accept (case type
                    ::prepl 'app.srepl/json-repl
                    ::urepl 'app.srepl/user-repl)
@@ -67,14 +72,8 @@
                   :name (name type)
                   :accept accept}]
 
-      (l/info :msg "initializing repl server"
-              :name (name type)
-              :port port
-              :host host)
-
       (ccs/start-server params)
-
-      params)))
+      (assoc params :type type))))
 
 (defmethod ig/halt-key! ::server
   [_ params]

backend/src/app/srepl/main.clj

@@ -31,6 +31,7 @@
    [app.util.time :as dt]
    [app.worker :as wrk]
    [clojure.pprint :refer [pprint print-table]]
+   [clojure.tools.namespace.repl :as repl]
    [cuerdas.core :as str]))
 
 (defn print-available-tasks

docker/devenv/docker-compose.yaml

@@ -37,6 +37,9 @@ services:
       - 3449:3449
       - 6060:6060
       - 6061:6061
+      - 6062:6062
+      - 6063:6063
+      - 6064:6064
       - 9090:9090
 
     environment: