HYPERFIDDLE_ELECTRIC_..._VERSION has been renamed

Electric now only defines ELECTRIC_USER_VERSION.

Dockerfile

@@ -23,4 +23,4 @@ COPY --from=build /app/app.jar app.jar
 EXPOSE 8080
 ARG VERSION
 ENV VERSION=$VERSION
-CMD java -DHYPERFIDDLE_ELECTRIC_SERVER_VERSION=$VERSION -jar app.jar
+CMD java -DELECTRIC_USER_VERSION=$VERSION -jar app.jar

README.md

@@ -66,7 +66,7 @@ ClojureScript optimized build, Dockerfile, Uberjar, Github actions CD to fly.io
 ```
 HYPERFIDDLE_ELECTRIC_APP_VERSION=`git describe --tags --long --always --dirty`
 clojure -X:build uberjar :jar-name "app.jar" :version '"'$HYPERFIDDLE_ELECTRIC_APP_VERSION'"'
-java -DHYPERFIDDLE_ELECTRIC_SERVER_VERSION=$HYPERFIDDLE_ELECTRIC_APP_VERSION -jar app.jar
+java -DELECTRIC_USER_VERSION=$HYPERFIDDLE_ELECTRIC_APP_VERSION -jar app.jar
 ```
 
 ```

src-build/build.clj

@@ -30,7 +30,7 @@ on startup)"
   (shadow-api/release :prod {:debug debug,
                              :verbose verbose,
                              :config-merge [{:compiler-options {:optimizations (if optimize :advanced :simple)}
-                                             :closure-defines {'hyperfiddle.electric-client/VERSION version}}]})
+                                             :closure-defines {'hyperfiddle.electric-client/ELECTRIC_USER_VERSION version}}]})
   (shadow-server/stop!))
 
 (defn uberjar [{:keys [jar-name version optimize debug verbose]
@@ -59,4 +59,4 @@ on startup)"
            :basis     basis
            :main      'prod}))
 
-(defn noop [_])                         ; run to preload mvn deps
+(defn noop [_])                         ; run to preload mvn deps

src/app/electric_server_java11_jetty10.clj

@@ -68,7 +68,7 @@
       ;; index.html file not found on classpath
       (next-handler ring-req))))
 
-(def ^:const VERSION (not-empty (System/getProperty "HYPERFIDDLE_ELECTRIC_SERVER_VERSION"))) ; see Dockerfile
+(def ^:const VERSION (not-empty (System/getProperty "ELECTRIC_USER_VERSION"))) ; see Dockerfile
 
 (defn wrap-reject-stale-client
   "Intercept websocket UPGRADE request and check if client and server versions matches.
@@ -77,7 +77,7 @@
   [next-handler]
   (fn [ring-req]
     (if (ring/ws-upgrade-request? ring-req)
-      (let [client-version (get-in ring-req [:query-params "HYPERFIDDLE_ELECTRIC_CLIENT_VERSION"])]
+      (let [client-version (get-in ring-req [:query-params "ELECTRIC_USER_VERSION"])]
         (cond
           (nil? VERSION)             (next-handler ring-req)
           (= client-version VERSION) (next-handler ring-req)

src/app/electric_server_java8_jetty9.clj

@@ -68,15 +68,15 @@
       ;; index.html file not found on classpath
       (next-handler ring-req))))
 
-(def ^:const VERSION (not-empty (System/getProperty "HYPERFIDDLE_ELECTRIC_SERVER_VERSION"))) ; see Dockerfile
+(def VERSION (not-empty (System/getProperty "ELECTRIC_USER_VERSION"))) ; see Dockerfile
 
 (defn wrap-reject-stale-client
   "Intercept websocket UPGRADE request and check if client and server versions matches.
   An electric client is allowed to connect if its version matches the server's version, or if the server doesn't have a version set (dev mode).
   Otherwise, the client connection is rejected gracefully."
   [next-handler]
   (fn [ring-req]
-    (let [client-version (get-in ring-req [:query-params "HYPERFIDDLE_ELECTRIC_CLIENT_VERSION"])]
+    (let [client-version (get-in ring-req [:query-params "ELECTRIC_USER_VERSION"])]
       (cond
         (nil? VERSION)             (next-handler ring-req)
         (= client-version VERSION) (next-handler ring-req)

src/prod.clj

@@ -9,8 +9,8 @@
   {:host "0.0.0.0", :port 8080, :resources-path "public"})
 
 (defn -main [& args] ; run with `clj -M -m prod`
-  (when (clojure.string/blank? (System/getProperty "HYPERFIDDLE_ELECTRIC_SERVER_VERSION"))
-    (throw (ex-info "HYPERFIDDLE_ELECTRIC_SERVER_VERSION jvm property must be set in prod" {})))
+  (when (clojure.string/blank? (System/getProperty "ELECTRIC_USER_VERSION"))
+    (throw (ex-info "ELECTRIC_USER_VERSION jvm property must be set in prod" {})))
   (app.electric-server-java8-jetty9/start-server! boot/with-ring-request electric-server-config))
 
 ; On CLJS side we reuse src/user.cljs for prod entrypoint