diff --git a/backend/deps.edn b/backend/deps.edn index c72e3351a..273672f4b 100644 --- a/backend/deps.edn +++ b/backend/deps.edn @@ -12,20 +12,21 @@ org.apache.logging.log4j/log4j-api {:mvn/version "2.13.0"} org.apache.logging.log4j/log4j-core {:mvn/version "2.13.0"} org.apache.logging.log4j/log4j-jul {:mvn/version "2.13.0"} + org.apache.logging.log4j/log4j-slf4j-impl {:mvn/version "2.13.0"} funcool/datoteka {:mvn/version "1.2.0"} expound/expound {:mvn/version "0.8.4"} instaparse/instaparse {:mvn/version "1.4.10"} com.cognitect/transit-clj {:mvn/version "0.8.319"} - ;; vertx deps - ;; vertx-clojure/vertx {:mvn/version "0.0.0-SNAPSHOT"} - metosin/reitit-core {:mvn/version "0.3.10"} - metosin/sieppari {:mvn/version "0.0.0-alpha8"} - io.vertx/vertx-core {:mvn/version "3.8.4"} - io.vertx/vertx-web {:mvn/version "3.8.4"} - io.vertx/vertx-web-client {:mvn/version "3.8.4"} io.vertx/vertx-pg-client {:mvn/version "3.8.4"} - ;; end verx deps + + vertx-clojure/vertx + {:local/root "vendor/vertx" + :deps/manifest :pom} + + funcool/sodi + {:local/root "vendor/sodi" + :deps/manifest :pom} io.github.resilience4j/resilience4j-core {:mvn/version "1.2.0"} io.github.resilience4j/resilience4j-ratelimiter {:mvn/version "1.2.0"} @@ -43,9 +44,6 @@ com.draines/postal {:mvn/version "2.0.3" :exclusions [commons-codec/commons-codec]} - funcool/sodi {:local/root "vendor/sodi" - :deps/manifest :pom} - ;; exception printing io.aviso/pretty {:mvn/version "0.1.37"} diff --git a/backend/src/uxbox/http.clj b/backend/src/uxbox/http.clj index a72263bd8..5a1701a35 100644 --- a/backend/src/uxbox/http.clj +++ b/backend/src/uxbox/http.clj @@ -52,9 +52,9 @@ :name "login-handler"}) echo-handler (rl/ratelimit handlers/echo-handler - {:limit 100 - :period 1000 - :timeout 1000 + {:limit 1 + :period 5000 + :timeout 10 :name "echo-handler"}) routes [["/sub/:file-id" {:interceptors [(vxi/cookies) @@ -87,4 +87,4 @@ (defstate server :start (let [factory (vc/verticle {:on-start on-start})] - @(vc/deploy! system factory {:instances 4}))) + @(vc/deploy! system factory {:instances 1}))) diff --git a/backend/src/uxbox/http/errors.clj b/backend/src/uxbox/http/errors.clj index 4ac6b86c4..0b190dad1 100644 --- a/backend/src/uxbox/http/errors.clj +++ b/backend/src/uxbox/http/errors.clj @@ -30,6 +30,12 @@ {:status 400 :body response}))) +(defmethod handle-exception :ratelimit + [err req] + {:status 429 + :headers {"retry-after" 1000} + :body ""}) + (defmethod handle-exception :not-found [err req] (let [response (ex-data err)] diff --git a/backend/src/uxbox/http/handlers.clj b/backend/src/uxbox/http/handlers.clj index ba7103876..25ee3cad4 100644 --- a/backend/src/uxbox/http/handlers.clj +++ b/backend/src/uxbox/http/handlers.clj @@ -75,7 +75,10 @@ (defn echo-handler [req] + ;; (locking echo-handler + ;; (prn "echo-handler" (Thread/currentThread))) {:status 200 :body {:params (:params req) :cookies (:cookies req) :headers (:headers req)}}) + diff --git a/backend/vendor/vertx/.gitignore b/backend/vendor/vertx/.gitignore new file mode 100644 index 000000000..10209a4dd --- /dev/null +++ b/backend/vendor/vertx/.gitignore @@ -0,0 +1,14 @@ +/target +/classes +/checkouts +pom.xml +pom.xml.asc +*.jar +*.class +/.lein-* +/.nrepl-port +/*-init.clj +/out +/repl +/.cpcache +/.rebel* diff --git a/backend/vendor/vertx/LICENSE b/backend/vendor/vertx/LICENSE new file mode 100644 index 000000000..14e2f777f --- /dev/null +++ b/backend/vendor/vertx/LICENSE @@ -0,0 +1,373 @@ +Mozilla Public License Version 2.0 +================================== + +1. Definitions +-------------- + +1.1. "Contributor" + means each individual or legal entity that creates, contributes to + the creation of, or owns Covered Software. + +1.2. "Contributor Version" + means the combination of the Contributions of others (if any) used + by a Contributor and that particular Contributor's Contribution. + +1.3. "Contribution" + means Covered Software of a particular Contributor. + +1.4. "Covered Software" + means Source Code Form to which the initial Contributor has attached + the notice in Exhibit A, the Executable Form of such Source Code + Form, and Modifications of such Source Code Form, in each case + including portions thereof. + +1.5. "Incompatible With Secondary Licenses" + means + + (a) that the initial Contributor has attached the notice described + in Exhibit B to the Covered Software; or + + (b) that the Covered Software was made available under the terms of + version 1.1 or earlier of the License, but not also under the + terms of a Secondary License. + +1.6. "Executable Form" + means any form of the work other than Source Code Form. + +1.7. "Larger Work" + means a work that combines Covered Software with other material, in + a separate file or files, that is not Covered Software. + +1.8. "License" + means this document. + +1.9. "Licensable" + means having the right to grant, to the maximum extent possible, + whether at the time of the initial grant or subsequently, any and + all of the rights conveyed by this License. + +1.10. "Modifications" + means any of the following: + + (a) any file in Source Code Form that results from an addition to, + deletion from, or modification of the contents of Covered + Software; or + + (b) any new file in Source Code Form that contains any Covered + Software. + +1.11. "Patent Claims" of a Contributor + means any patent claim(s), including without limitation, method, + process, and apparatus claims, in any patent Licensable by such + Contributor that would be infringed, but for the grant of the + License, by the making, using, selling, offering for sale, having + made, import, or transfer of either its Contributions or its + Contributor Version. + +1.12. "Secondary License" + means either the GNU General Public License, Version 2.0, the GNU + Lesser General Public License, Version 2.1, the GNU Affero General + Public License, Version 3.0, or any later versions of those + licenses. + +1.13. "Source Code Form" + means the form of the work preferred for making modifications. + +1.14. "You" (or "Your") + means an individual or a legal entity exercising rights under this + License. For legal entities, "You" includes any entity that + controls, is controlled by, or is under common control with You. For + purposes of this definition, "control" means (a) the power, direct + or indirect, to cause the direction or management of such entity, + whether by contract or otherwise, or (b) ownership of more than + fifty percent (50%) of the outstanding shares or beneficial + ownership of such entity. + +2. License Grants and Conditions +-------------------------------- + +2.1. Grants + +Each Contributor hereby grants You a world-wide, royalty-free, +non-exclusive license: + +(a) under intellectual property rights (other than patent or trademark) + Licensable by such Contributor to use, reproduce, make available, + modify, display, perform, distribute, and otherwise exploit its + Contributions, either on an unmodified basis, with Modifications, or + as part of a Larger Work; and + +(b) under Patent Claims of such Contributor to make, use, sell, offer + for sale, have made, import, and otherwise transfer either its + Contributions or its Contributor Version. + +2.2. Effective Date + +The licenses granted in Section 2.1 with respect to any Contribution +become effective for each Contribution on the date the Contributor first +distributes such Contribution. + +2.3. Limitations on Grant Scope + +The licenses granted in this Section 2 are the only rights granted under +this License. No additional rights or licenses will be implied from the +distribution or licensing of Covered Software under this License. +Notwithstanding Section 2.1(b) above, no patent license is granted by a +Contributor: + +(a) for any code that a Contributor has removed from Covered Software; + or + +(b) for infringements caused by: (i) Your and any other third party's + modifications of Covered Software, or (ii) the combination of its + Contributions with other software (except as part of its Contributor + Version); or + +(c) under Patent Claims infringed by Covered Software in the absence of + its Contributions. + +This License does not grant any rights in the trademarks, service marks, +or logos of any Contributor (except as may be necessary to comply with +the notice requirements in Section 3.4). + +2.4. Subsequent Licenses + +No Contributor makes additional grants as a result of Your choice to +distribute the Covered Software under a subsequent version of this +License (see Section 10.2) or under the terms of a Secondary License (if +permitted under the terms of Section 3.3). + +2.5. Representation + +Each Contributor represents that the Contributor believes its +Contributions are its original creation(s) or it has sufficient rights +to grant the rights to its Contributions conveyed by this License. + +2.6. Fair Use + +This License is not intended to limit any rights You have under +applicable copyright doctrines of fair use, fair dealing, or other +equivalents. + +2.7. Conditions + +Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted +in Section 2.1. + +3. Responsibilities +------------------- + +3.1. Distribution of Source Form + +All distribution of Covered Software in Source Code Form, including any +Modifications that You create or to which You contribute, must be under +the terms of this License. You must inform recipients that the Source +Code Form of the Covered Software is governed by the terms of this +License, and how they can obtain a copy of this License. You may not +attempt to alter or restrict the recipients' rights in the Source Code +Form. + +3.2. Distribution of Executable Form + +If You distribute Covered Software in Executable Form then: + +(a) such Covered Software must also be made available in Source Code + Form, as described in Section 3.1, and You must inform recipients of + the Executable Form how they can obtain a copy of such Source Code + Form by reasonable means in a timely manner, at a charge no more + than the cost of distribution to the recipient; and + +(b) You may distribute such Executable Form under the terms of this + License, or sublicense it under different terms, provided that the + license for the Executable Form does not attempt to limit or alter + the recipients' rights in the Source Code Form under this License. + +3.3. Distribution of a Larger Work + +You may create and distribute a Larger Work under terms of Your choice, +provided that You also comply with the requirements of this License for +the Covered Software. If the Larger Work is a combination of Covered +Software with a work governed by one or more Secondary Licenses, and the +Covered Software is not Incompatible With Secondary Licenses, this +License permits You to additionally distribute such Covered Software +under the terms of such Secondary License(s), so that the recipient of +the Larger Work may, at their option, further distribute the Covered +Software under the terms of either this License or such Secondary +License(s). + +3.4. Notices + +You may not remove or alter the substance of any license notices +(including copyright notices, patent notices, disclaimers of warranty, +or limitations of liability) contained within the Source Code Form of +the Covered Software, except that You may alter any license notices to +the extent required to remedy known factual inaccuracies. + +3.5. Application of Additional Terms + +You may choose to offer, and to charge a fee for, warranty, support, +indemnity or liability obligations to one or more recipients of Covered +Software. However, You may do so only on Your own behalf, and not on +behalf of any Contributor. You must make it absolutely clear that any +such warranty, support, indemnity, or liability obligation is offered by +You alone, and You hereby agree to indemnify every Contributor for any +liability incurred by such Contributor as a result of warranty, support, +indemnity or liability terms You offer. You may include additional +disclaimers of warranty and limitations of liability specific to any +jurisdiction. + +4. Inability to Comply Due to Statute or Regulation +--------------------------------------------------- + +If it is impossible for You to comply with any of the terms of this +License with respect to some or all of the Covered Software due to +statute, judicial order, or regulation then You must: (a) comply with +the terms of this License to the maximum extent possible; and (b) +describe the limitations and the code they affect. Such description must +be placed in a text file included with all distributions of the Covered +Software under this License. Except to the extent prohibited by statute +or regulation, such description must be sufficiently detailed for a +recipient of ordinary skill to be able to understand it. + +5. Termination +-------------- + +5.1. The rights granted under this License will terminate automatically +if You fail to comply with any of its terms. However, if You become +compliant, then the rights granted under this License from a particular +Contributor are reinstated (a) provisionally, unless and until such +Contributor explicitly and finally terminates Your grants, and (b) on an +ongoing basis, if such Contributor fails to notify You of the +non-compliance by some reasonable means prior to 60 days after You have +come back into compliance. Moreover, Your grants from a particular +Contributor are reinstated on an ongoing basis if such Contributor +notifies You of the non-compliance by some reasonable means, this is the +first time You have received notice of non-compliance with this License +from such Contributor, and You become compliant prior to 30 days after +Your receipt of the notice. + +5.2. If You initiate litigation against any entity by asserting a patent +infringement claim (excluding declaratory judgment actions, +counter-claims, and cross-claims) alleging that a Contributor Version +directly or indirectly infringes any patent, then the rights granted to +You by any and all Contributors for the Covered Software under Section +2.1 of this License shall terminate. + +5.3. In the event of termination under Sections 5.1 or 5.2 above, all +end user license agreements (excluding distributors and resellers) which +have been validly granted by You or Your distributors under this License +prior to termination shall survive termination. + +************************************************************************ +* * +* 6. Disclaimer of Warranty * +* ------------------------- * +* * +* Covered Software is provided under this License on an "as is" * +* basis, without warranty of any kind, either expressed, implied, or * +* statutory, including, without limitation, warranties that the * +* Covered Software is free of defects, merchantable, fit for a * +* particular purpose or non-infringing. The entire risk as to the * +* quality and performance of the Covered Software is with You. * +* Should any Covered Software prove defective in any respect, You * +* (not any Contributor) assume the cost of any necessary servicing, * +* repair, or correction. This disclaimer of warranty constitutes an * +* essential part of this License. No use of any Covered Software is * +* authorized under this License except under this disclaimer. * +* * +************************************************************************ + +************************************************************************ +* * +* 7. Limitation of Liability * +* -------------------------- * +* * +* Under no circumstances and under no legal theory, whether tort * +* (including negligence), contract, or otherwise, shall any * +* Contributor, or anyone who distributes Covered Software as * +* permitted above, be liable to You for any direct, indirect, * +* special, incidental, or consequential damages of any character * +* including, without limitation, damages for lost profits, loss of * +* goodwill, work stoppage, computer failure or malfunction, or any * +* and all other commercial damages or losses, even if such party * +* shall have been informed of the possibility of such damages. This * +* limitation of liability shall not apply to liability for death or * +* personal injury resulting from such party's negligence to the * +* extent applicable law prohibits such limitation. Some * +* jurisdictions do not allow the exclusion or limitation of * +* incidental or consequential damages, so this exclusion and * +* limitation may not apply to You. * +* * +************************************************************************ + +8. Litigation +------------- + +Any litigation relating to this License may be brought only in the +courts of a jurisdiction where the defendant maintains its principal +place of business and such litigation shall be governed by laws of that +jurisdiction, without reference to its conflict-of-law provisions. +Nothing in this Section shall prevent a party's ability to bring +cross-claims or counter-claims. + +9. Miscellaneous +---------------- + +This License represents the complete agreement concerning the subject +matter hereof. If any provision of this License is held to be +unenforceable, such provision shall be reformed only to the extent +necessary to make it enforceable. Any law or regulation which provides +that the language of a contract shall be construed against the drafter +shall not be used to construe this License against a Contributor. + +10. Versions of the License +--------------------------- + +10.1. New Versions + +Mozilla Foundation is the license steward. Except as provided in Section +10.3, no one other than the license steward has the right to modify or +publish new versions of this License. Each version will be given a +distinguishing version number. + +10.2. Effect of New Versions + +You may distribute the Covered Software under the terms of the version +of the License under which You originally received the Covered Software, +or under the terms of any subsequent version published by the license +steward. + +10.3. Modified Versions + +If you create software not governed by this License, and you want to +create a new license for such software, you may create and use a +modified version of this License if you rename the license and remove +any references to the name of the license steward (except to note that +such modified license differs from this License). + +10.4. Distributing Source Code Form that is Incompatible With Secondary +Licenses + +If You choose to distribute Source Code Form that is Incompatible With +Secondary Licenses under the terms of this version of the License, the +notice described in Exhibit B of this License must be attached. + +Exhibit A - Source Code Form License Notice +------------------------------------------- + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. + +If it is not possible or desirable to put the notice in a particular +file, then You may include the notice in a location (such as a LICENSE +file in a relevant directory) where a recipient would be likely to look +for such a notice. + +You may add additional accurate notices of copyright ownership. + +Exhibit B - "Incompatible With Secondary Licenses" Notice +--------------------------------------------------------- + + This Source Code Form is "Incompatible With Secondary Licenses", as + defined by the Mozilla Public License, v. 2.0. diff --git a/backend/vendor/vertx/README.md b/backend/vendor/vertx/README.md new file mode 100644 index 000000000..2b4a617a3 --- /dev/null +++ b/backend/vendor/vertx/README.md @@ -0,0 +1,249 @@ +# vertx-clojure + +A lightweight clojure adapter for vertx toolkit. + +- **STATUS**: *alpha*, in design and prototyping phase. +- **AUDIENCE**: this is not a vertx documentation, this readme intends + to explain only the clojure api + +Example code on `resources/user.clj` file. + + +## Install + +Using `deps.edn`: + +```clojure +vertx-clojure/vertx {:mvn/version "0.0.0-SNAPSHOT"} +``` + +Using Leiningen: + +```clojure +[vertx-clojure/vertx "0.0.0-SNAPSHOT"] +``` + +## User Guide + + +### Verticles + +Verticles is the basic "unit of execution" in the vertx toolkit. The +concept is very simular to actors with the exception that a verticle +does not have a inbox, and verticles communicates with other verticles +or with the rest of the world using **eventbus**. + +For create a verticle, you will need to create first a system instance +(a name that we give to the `Vertx` instance): + +```clojure +(require '[vertx.core :as vc]) + +(def system (vc/system)) +``` + +Then, you can proceed to create a verticle. A verticle concist on +three functions: `on-start`, `on-stop` and `on-error` (where the +`on-start` is mandatory the rest optional). + +Lets define a dummy verticle that just prints hello world on start +callback: + +```clojure +(defn on-start + [ctx] + (println "Hello world")) + +(def dummy-verticle + (vc/verticle {:on-start on-start})) +``` + +The `dummy-verticle` is a verticle factory, nothing is running at this +momment. For run the verticle we need to deploy it using the +previously created `system` instance: + +```clojure +(vc/deploy! system dummy-verticle) +``` + +The `deploy!` return value is a `CompletionStage` so you can deref it +like a regular `Future` or use **funcool/promesa** for chain more +complex transformations. The return value implements `AutoCloseable` +that will allow to undeploy the verticle. + +The `deploy!` function also accepts an additional parameter for +options, and at this momment it only accepts as single option: + +- `:instances` - number of instances to launch of the same verticle. + + +### Event Bus + +The **eventbus** is the central communication system for verticles. It +has different patterns of communication. On this documentation we will +cover the: `publish/subscribe` and `request/reply`. + +Lets define a simple echo verticle: + +```clojure +(require '[vertx.eventbus :as ve]) + +(defn on-message + [msg] + (:body msg)) + +(defn on-start + [ctx] + (vc/consumer ctx "test.echo" on-message)) + +(def echo-verticle + (vc/verticle {:on-start on-start})) +``` + +And then, lets deploy 4 instances of it: + +```clojure +(vc/deploy! system echo-verticle {:instances 4}) +``` + +Now, depending on how you send the messages to the "test.echo" topic, +the message will be send to a single instance of will be broadcasted +to all verticle instances subscribed to it. + +To send a message and expect a response we need to use the +`ve/request!` function: + +```clojure +@(ve/request! system {:foo "bar"}) +;; => #vertx.eventbus.Msg{:body {:foo "bar"}} +``` + +The return value of `on-message` callback will be used as a reply and +it can be any plain value or a `CompletionStage`. + +When you want to send a message but you don't need the return value, +there is the `ve/send!` function. And finally, if you want to send a +message to all instances subscribed to a topic, you will need to use +the `ve/publish!` function. + + +### Http Server (vertx.http) + +**STATUS**: pre-alpha: experimental & incomplete + +This part will explain the low-level api for the http server. It is +intended to be used as a building block for a more higher-level api or +when you know that you exactly need for a performance sensitive +applications. + +The `vertx.http` exposes two main functions `handler` and +`server`. Lets start creating a simple "hello world" http server: + +``` +(require '[vertx.http :as vh]) + +(defn hello-world-handler + [req] + {:status 200 + :body "Hello world\n"}) + +(defn on-start + [ctx] + (vh/server {:handler (vh/handler hello-world-handler) + :port 2021})) + +(->> (vc/verticle {:on-start on-start}) + (vc/deploy! system)) +``` + +NOTE: you can start the server without creating a verticle but you +will loss the advantage of scaling (using verticle instances +parameter). + +The `req` object is a plain map with the following keys: + +- `:method` the HTTP method. +- `:path` the PATH of the requested URI. +- `:headers` a map with string lower-cased keys of headers. +- `:vertx.http/request` the underlying vertx request instance. +- `:vertx.http/response` the underlying vertx response instance. + +And the response object to the ring response, it can contain +`:status`, `:body` and `:headers`. + + +**WARNING:** at this moment there are no way to obtain directly the +body of request using clojure api, this is in **design** phase and we +need to think how to expose it correctly without constraint too much +the user code (if you have suggestions, please open an issue). + +**NOTE**: If you want completly bypass the clojure api, pass a vertx +`Handler` instance to server instead of using +`vertx.http/handler`. There is the `vertx.util/fn->handler` helper +that converts a plain clojure function into raw `Handler` instance. + + +### Web Server (vertx.web) + +**STATUS**: alpha + +This part will explain the higher-level http/web server api. It is a +general purpose with more clojure friendly api. It uses +`reitit-core`for the routing and `sieppari` for interceptors. + +Lets start with a complete example: + +```clojure +(require '[vertx.http :as vh]) +(require '[vertx.web :as vw]) +(require '[vertx.web.interceptors :as vwi]) + +(defn hello-world-handler + [req] + {:status 200 + :body "Hello world!\n"}) + +(defn on-start + [ctx] + (let [routes [["/" {:interceptors [(vwi/cookies)] + :all hello-world-handler}]] + handler (vw/handler ctx + (vw/assets "/static/*" {:root "resources/public/static"}) + (vw/router routes))] + (vh/server {:handler handler + :port 2022}))) + +(->> (vc/verticle {:on-start on-start}) + (vc/deploy! system)) +``` + +The routes are defined using `reitit-core` and the interceptors are +using `sieppari` as underlying implementation. The request object is +very similar to the one explained in `vertx.http`. + +The main difference with `vertx.http` is that the handler is called +when the body is ready to be used and is available under `:body` +keyword on the request. + +All additional features such that reading the query/form params, +parse/write cookies, cors and file uploads are provided with +interceptors as pluggable pieces: + +- `vertx.web.interceptors/uploads` parses the vertx uploaded file data + structure and expose it as clojure maps under `:uploads` key. +- `vertx.web.interceptors/params` parses the query string and form + params in the body if the content-type is appropriate and exposes + them under `:params`. +- `vertx.web.interceptors/cors` properly sets the CORS headers. +- `vertx.web.interceptors/cookies` handles the cookies reading from + the request and cookies writing from the response. + + +## License ## + +``` +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at http://mozilla.org/MPL/2.0/. +``` + diff --git a/backend/vendor/vertx/deps.edn b/backend/vendor/vertx/deps.edn new file mode 100644 index 000000000..c151e0622 --- /dev/null +++ b/backend/vendor/vertx/deps.edn @@ -0,0 +1,35 @@ +{:deps + {org.clojure/tools.logging {:mvn/version "0.5.0"} + funcool/promesa {:mvn/version "5.0.0"} + metosin/reitit-core {:mvn/version "0.3.10"} + metosin/sieppari {:mvn/version "0.0.0-alpha8"} + io.vertx/vertx-core {:mvn/version "3.8.4"} + io.vertx/vertx-web {:mvn/version "3.8.4"} + io.vertx/vertx-web-client {:mvn/version "3.8.4"}} + :paths ["src" "resources"] + :aliases + {:dev + {:extra-deps + {com.bhauman/rebel-readline {:mvn/version "0.1.4"} + metosin/jsonista {:mvn/version "0.2.5"} + mount/mount {:mvn/version "0.1.16"} + org.clojure/clojure {:mvn/version "1.10.1"} + io.netty/netty-transport-native-epoll {:mvn/version "4.1.39.Final"} + environ/environ {:mvn/version "1.1.0"} + metosin/pohjavirta {:mvn/version "0.0.1-alpha5"} + org.clojure/tools.namespace {:mvn/version "0.3.1"}} + :extra-paths ["test"]} + :repl + {:main-opts ["-m" "rebel-readline.main"]} + + :jar + {:extra-deps {seancorfield/depstar {:mvn/version "0.3.4"}} + :main-opts ["-m" "hf.depstar.jar", "target/vertx.jar"]} + + :ancient + {:main-opts ["-m" "deps-ancient.deps-ancient"] + :extra-deps {deps-ancient {:mvn/version "RELEASE"}}} + }} + + + diff --git a/backend/vendor/vertx/mvn-upload.sh b/backend/vendor/vertx/mvn-upload.sh new file mode 100755 index 000000000..5d7f11d52 --- /dev/null +++ b/backend/vendor/vertx/mvn-upload.sh @@ -0,0 +1,2 @@ +#!/bin/sh +mvn deploy:deploy-file -Dfile=target/vertx.jar -DpomFile=pom.xml -DrepositoryId=clojars -Durl=https://clojars.org/repo/ diff --git a/backend/src/vertx/core.clj b/backend/vendor/vertx/src/vertx/core.clj similarity index 100% rename from backend/src/vertx/core.clj rename to backend/vendor/vertx/src/vertx/core.clj diff --git a/backend/src/vertx/eventbus.clj b/backend/vendor/vertx/src/vertx/eventbus.clj similarity index 100% rename from backend/src/vertx/eventbus.clj rename to backend/vendor/vertx/src/vertx/eventbus.clj diff --git a/backend/src/vertx/http.clj b/backend/vendor/vertx/src/vertx/http.clj similarity index 100% rename from backend/src/vertx/http.clj rename to backend/vendor/vertx/src/vertx/http.clj diff --git a/backend/src/vertx/timers.clj b/backend/vendor/vertx/src/vertx/timers.clj similarity index 100% rename from backend/src/vertx/timers.clj rename to backend/vendor/vertx/src/vertx/timers.clj diff --git a/backend/src/vertx/util.clj b/backend/vendor/vertx/src/vertx/util.clj similarity index 100% rename from backend/src/vertx/util.clj rename to backend/vendor/vertx/src/vertx/util.clj diff --git a/backend/src/vertx/web.clj b/backend/vendor/vertx/src/vertx/web.clj similarity index 100% rename from backend/src/vertx/web.clj rename to backend/vendor/vertx/src/vertx/web.clj diff --git a/backend/src/vertx/web/client.clj b/backend/vendor/vertx/src/vertx/web/client.clj similarity index 100% rename from backend/src/vertx/web/client.clj rename to backend/vendor/vertx/src/vertx/web/client.clj diff --git a/backend/src/vertx/web/interceptors.clj b/backend/vendor/vertx/src/vertx/web/interceptors.clj similarity index 100% rename from backend/src/vertx/web/interceptors.clj rename to backend/vendor/vertx/src/vertx/web/interceptors.clj diff --git a/backend/vendor/vertx/test/user.clj b/backend/vendor/vertx/test/user.clj new file mode 100644 index 000000000..ff556433c --- /dev/null +++ b/backend/vendor/vertx/test/user.clj @@ -0,0 +1,147 @@ +(ns user + (:require + [clojure.pprint :refer [pprint]] + [clojure.test :as test] + [clojure.tools.namespace.repl :as r] + [clojure.walk :refer [macroexpand-all]] + [mount.core :as mount :refer [defstate]] + [pohjavirta.server :as pohjavirta] + [promesa.core :as p] + [reitit.core :as rt] + [jsonista.core :as j] + [vertx.core :as vc] + [vertx.eventbus :as ve] + [vertx.http :as vh] + [vertx.web :as vw] + [vertx.web.interceptors :as vwi]) + (:import + io.vertx.core.http.HttpServerRequest + io.vertx.core.http.HttpServerResponse)) + +(declare thr-name) + +;; --- System + +(defstate system + :start (vc/system) + :stop (.close system)) + +;; --- Echo Verticle (using eventbus) + +(def echo-verticle* + (letfn [(on-message [ctx message] + (println (pr-str "received:" message + "on" (thr-name) + "with ctx" ctx)) + (:body message)) + (on-start [ctx] + (ve/consumer ctx "test.echo" on-message))] + + (vc/verticle {:on-start on-start}))) + +(defstate echo-verticle + :start @(vc/deploy! system echo-verticle* {:instances 4})) + +;; --- Echo Verticle Actor (using eventbus) + +;; This is the same as the previous echo verticle, it just reduces the +;; boilerplate of creating the consumer. + +;; (def echo-actor-verticle +;; (letfn [(on-message [message] +;; (println (pr-str "received:" (.body message) +;; "on" (thr-name))) +;; (.body message))] +;; (vc/actor "test.echo2" {:on-message on-message}))) + +;; (defstate echo-actor-verticle +;; :start @(vc/deploy! system echo-actor-verticle options)) + +;; --- Http Server Verticle + +(def http-verticle + (letfn [(simple-handler [req] + ;; (prn req) + {:status 200 + :body (j/write-value-as-string + {:method (:method req) + :headers (:headers req) + :path (:path req)})}) + + (on-start [ctx] + (let [handler (vh/handler ctx simple-handler)] + (vh/server ctx {:handler handler :port 2020})))] + (vc/verticle {:on-start on-start}))) + +(defstate http-server-verticle + :start @(vc/deploy! system http-verticle {:instances 2})) + +;; --- Web Router Verticle + +(def web-router-verticle + (letfn [(simple-handler [req] + {:status 200 + :body (j/write-value-as-string + {:method (:method req) + :path (:path req)})}) + + (on-start [ctx] + (let [routes [["/" {:all simple-handler}]] + handler (vw/handler ctx (vw/router routes))] + (vh/server ctx {:handler handler :port 2021})))] + (vc/verticle {:on-start on-start}))) + +(defstate web-server-with-router-verticle + :start @(vc/deploy! system web-router-verticle {:instances 2})) + +;; --- pohjavirta + +(defn handler + [req] + {:status 200 + :body (j/write-value-as-string + {:method (:request-method req) + :headers (:headers req) + :path (:uri req)})}) + +(defstate pohjavirta-server + :start (let [instance (pohjavirta/create #'handler {:port 2022 :io-threads 2})] + (pohjavirta/start instance) + instance) + :stop (pohjavirta/stop pohjavirta-server)) + +;; --- Repl + +(defn start + [] + (mount/start)) + +(defn stop + [] + (mount/stop)) + +(defn restart + [] + (stop) + (r/refresh :after 'user/start)) + +(defn- run-test + ([] (run-test #"^vertx-tests.*")) + ([o] + (r/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))))) + +;; --- Helpers + +(defn thr-name + [] + (.getName (Thread/currentThread))) + diff --git a/backend/vendor/vertx/test/vertx_tests/main.clj b/backend/vendor/vertx/test/vertx_tests/main.clj new file mode 100644 index 000000000..6ecc0478e --- /dev/null +++ b/backend/vendor/vertx/test/vertx_tests/main.clj @@ -0,0 +1,15 @@ +;; This Source Code Form is subject to the terms of the Mozilla Public +;; License, v. 2.0. If a copy of the MPL was not distributed with this +;; file, You can obtain one at http://mozilla.org/MPL/2.0/. +;; +;; Copyright (c) 2019 Andrey Antukh + +(ns vertx-tests.main + (:require [clojure.test :as t])) + +(defn -main + [& args] + (let [{:keys [fail]} (t/run-all-tests #"^vertx-tests.*")] + (if (pos? fail) + (System/exit fail) + (System/exit 0)))) diff --git a/backend/vendor/vertx/test/vertx_tests/test_core.clj b/backend/vendor/vertx/test/vertx_tests/test_core.clj new file mode 100644 index 000000000..3546417d6 --- /dev/null +++ b/backend/vendor/vertx/test/vertx_tests/test_core.clj @@ -0,0 +1,53 @@ +;; This Source Code Form is subject to the terms of the Mozilla Public +;; License, v. 2.0. If a copy of the MPL was not distributed with this +;; file, You can obtain one at http://mozilla.org/MPL/2.0/. +;; +;; Copyright (c) 2019 Andrey Antukh + +(ns vertx-tests.test-core + (:require [clojure.test :as t] + [vertx.core :as vx] + [vertx.eventbus :as vxe])) + +(def sleep #(Thread/sleep %)) + +(t/deftest start-stop-verticle + (with-open [vsm (vx/system)] + (let [state (atom {})] + (let [on-start (fn [_] (swap! state assoc :start true) {:a 1}) + on-stop (fn [_ s] (swap! state assoc :stop true :inner (:a s))) + verticle (vx/verticle {:on-start on-start :on-stop on-stop})] + ;; Start and stop verticle + (.close @(vx/deploy! vsm verticle)) + + ;; Checks + (t/is (:start @state)) + (t/is (:stop @state)) + (t/is (= (:inner @state) 1)))))) + +(t/deftest start-stop-actor + (with-open [vsm (vx/system)] + (let [state (atom {})] + (let [on-start (fn [_] (swap! state assoc :start true) {:a 1}) + on-stop (fn [_ s] (swap! state assoc :stop true :inner (:a s))) + rcvlock (promise) + on-message #(deliver rcvlock %2) + verticle (vx/actor "test.topic" {:on-message on-message + :on-start on-start + :on-stop on-stop})] + (with-open [vid @(vx/deploy! vsm verticle)] + ;; Checks + (t/is (true? (:start @state))) + (t/is (nil? (:stop @state))) + + (vxe/send! vsm "test.topic" {:num 1}) + + ;; Checks + (t/is (vxe/message? @rcvlock)) + (t/is (= {:num 1} (:body @rcvlock)))) + + (t/is (= (:inner @state) 1)) + (t/is (true? (:stop @state))))))) + + + diff --git a/backend/vendor/vertx/tools.clj b/backend/vendor/vertx/tools.clj new file mode 100644 index 000000000..74b5e8313 --- /dev/null +++ b/backend/vendor/vertx/tools.clj @@ -0,0 +1,17 @@ +(require '[clojure.java.shell :as shell] + '[clojure.main]) +(require '[rebel-readline.core] + '[rebel-readline.clojure.main] + '[rebel-readline.clojure.line-reader] + '[rebel-readline.clojure.service.local]) + +(defmulti task first) + +(defmethod task :default + [args] + (let [all-tasks (-> task methods (dissoc :default) keys sort) + interposed (->> all-tasks (interpose ", ") (apply str))] + (println "Unknown or missing task. Choose one of:" interposed) + (System/exit 1))) + +(task *command-line-args*)