Founder of Gaiwan.co — creator of Kaocha — drinks tea and writes Clojure, in that order.
", + :activitystreams/preferredUsername "plexus", + :activitystreams/url "https://toot.cat/@plexus", + :ldp/inbox "https://toot.cat/users/plexus/inbox"}) + +(jdbc/execute! (:ds (user/value :storage/db)) [(sql/sql 'drop-table :activitystreams/Actor)]) diff --git a/resources/lambdaisland/souk/config.edn b/resources/lambdaisland/souk/config.edn index a6df58e..f236f76 100644 --- a/resources/lambdaisland/souk/config.edn +++ b/resources/lambdaisland/souk/config.edn @@ -5,4 +5,9 @@ :http/server {:gx/component lambdaisland.souk.components.jetty/component :gx/props {:jetty-options {:port #setting :port} - :router (gx/ref :http/router)}}} + :router (gx/ref :http/router) + :db (gx/ref :storage/db)}} + + :storage/db + {:gx/component lambdaisland.souk.db/component + :gx/props {:url #setting :jdbc/url}}} diff --git a/resources/lambdaisland/souk/settings-dev.edn b/resources/lambdaisland/souk/settings-dev.edn index a1b11d6..a7633f7 100644 --- a/resources/lambdaisland/souk/settings-dev.edn +++ b/resources/lambdaisland/souk/settings-dev.edn @@ -1 +1,2 @@ -{:dev/reload-routes? true} +{:dev/reload-routes? true + :jdbc/url "jdbc:pgsql://localhost:5432/souk?user=postgres"} diff --git a/src/lambdaisland/souk/activitypub.clj b/src/lambdaisland/souk/activitypub.clj index 44b6430..3f4465a 100644 --- a/src/lambdaisland/souk/activitypub.clj +++ b/src/lambdaisland/souk/activitypub.clj @@ -16,3 +16,5 @@ (defn GET [url] (ld/internalize (ld/expand (:body (ld/json-get url))) common-prefixes)) + +(GET "https://toot.cat/users/plexus") diff --git a/src/lambdaisland/souk/db.clj b/src/lambdaisland/souk/db.clj new file mode 100644 index 0000000..9093878 --- /dev/null +++ b/src/lambdaisland/souk/db.clj @@ -0,0 +1,100 @@ +(ns lambdaisland.souk.db + (:require [lambdaisland.souk.sql :as sql] + [next.jdbc :as jdbc] + [next.jdbc.date-time :as jdbc-date-time] + [next.jdbc.plan] + [next.jdbc.result-set :as rs] + [next.jdbc.sql :as nsql] + [cheshire.core :as json] + [lambdaisland.glogc :as log]) + (:import (com.mchange.v2.c3p0 ComboPooledDataSource))) + +(def default-properties + [[:rdf/id 'text 'primary-key] + [:rdf/type 'text] + [:rdf/props 'jsonb 'default "{}"] + [:meta/created-at 'timestamp-with-time-zone 'default [:fn 'now] 'not-null] + [:meta/updated-at 'timestamp-with-time-zone]]) + +(def set-ts-trigger-def "CREATE OR REPLACE FUNCTION trigger_set_timestamp()\nRETURNS TRIGGER AS $$\nBEGIN\n NEW.\"meta/updated-at\" = NOW();\n RETURN NEW;\nEND;\n$$ LANGUAGE plpgsql;") + +(def tables + [[:activitystreams/Actor + [[:activitystreams/name 'text 'not-null] + [:activitystreams/preferredUsername 'text 'not-null] + [:activitystreams/url 'text 'not-null] + [:activitystreams/summary 'text] + [:ldp/inbox 'text 'not-null] + [:activitystreams/outbox 'text 'not-null] + [:activitystreams/published 'timestamp-with-time-zone]]]]) + +(defn create-table! [ds table-name columns] + (log/info :table/creating {:name table-name :columns columns}) + (jdbc/execute! ds [(sql/sql 'create-table 'if-not-exists table-name + (concat + default-properties + columns))]) + (jdbc/execute! ds [(sql/sql 'drop-trigger 'if-exists :set-timestamp + 'on table-name)]) + (jdbc/execute! ds [(sql/sql 'create-trigger :set-timestamp + 'before-update + 'on table-name + 'for-each-row + 'execute-procedure [:fn 'trigger_set_timestamp])])) + +(defn pg-coerce [val] + (cond + (instance? java.time.ZonedDateTime val) + (.toOffsetDateTime val) + :else + val)) + +(defn insert-sql [table entity props] + (into [(sql/sql 'insert-into table + (cons :rdf/props + (map key entity)) + 'values + (repeat (inc (count entity)) '?) + 'on-conflict [:raw "(\"rdf/id\")"] + 'do + 'update-set + (into [:commas] + (map (fn [[k]] + [k '= '?])) + entity))] + (cons + (json/encode props) + (concat + (map (comp pg-coerce val) props) + (map (comp pg-coerce val) props))))) + +(defn start! [{:keys [props]}] + (let [ds (doto (ComboPooledDataSource.) + (.setDriverClass "com.impossibl.postgres.jdbc.PGDriver") + (.setJdbcUrl (:url props)))] + (jdbc/execute! ds [set-ts-trigger-def]) + (doseq [[table columns] tables] + (create-table! ds table columns)) + (let [table-columns + (into {} + (with-open [con (jdbc/get-connection ds {})] + (let [md (.getMetaData con)] + (doall + (for [{:keys [pg_class/TABLE_NAME]} + (-> md + (.getTables nil nil nil (into-array ["TABLE" "VIEW"])) + (rs/datafiable-result-set ds {}))] + [(keyword TABLE_NAME) + (map (comp keyword :COLUMN_NAME) + (rs/datafiable-result-set (.getColumns md nil nil TABLE_NAME nil) ds {}))])))))] + {:schema table-columns + :ds ds}))) + +(defn stop! [{ds :value}] + #_(.close ds)) + +;; cpds.setUser("dbuser"); +;; cpds.setPassword("dbpassword"); +(def component + {:gx/start {:gx/processor #'start!} + :gx/stop {:gx/processor #'stop!}}) diff --git a/src/lambdaisland/souk/setup.clj b/src/lambdaisland/souk/setup.clj index 72e3a99..9c7d460 100644 --- a/src/lambdaisland/souk/setup.clj +++ b/src/lambdaisland/souk/setup.clj @@ -32,7 +32,6 @@ {:schemas schemas :keys (:dev/start-keys local-config start-keys) :sources {:config [(proj-resource "config.edn") - (proj-resource "config-development.edn") (dissoc local-config :dev/start-keys)] :secrets [(config/dotenv) (config/env) diff --git a/src/lambdaisland/souk/sql.clj b/src/lambdaisland/souk/sql.clj new file mode 100644 index 0000000..ccb16fb --- /dev/null +++ b/src/lambdaisland/souk/sql.clj @@ -0,0 +1,56 @@ +(ns lambdaisland.souk.sql + (:require [clojure.string :as str])) + +(defn sql-ident [v] + (if (sequential? v) + (str/join "." (map sql-ident v)) + (str "\"" + (if (keyword? v) + (subs (str v) 1) + v) + "\""))) + +(defn sql-kw [k] + (str/upper-case + (str/replace + (if (keyword? k) + (name k) + k) + #"-" " "))) + +(defn sql-str [& ss] + (str "'" (str/replace (apply str ss) #"'" "''") "'")) + +(defn sql-list + ([items] + (sql-list "(" ")" ", " items)) + ([before after separator items] + (str before (apply str (str/join separator items)) after))) + +(defn strs [& items] + (str/join " " items)) + +(defn sql [& items] + (apply strs + (map (fn [x] + (cond + (vector? x) + (case (first x) + :ident (sql-ident (second x)) + :kw (sql-kw (second x)) + :str (sql-str (second x)) + :raw (second x) + :list (sql-list (map sql (next x))) + :commas (sql-list "" "" ", " (map sql (next x))) + :fn (str (second x) + (sql-list (map sql (nnext x)))) + (apply sql x)) + (keyword? x) + (sql-ident x) + (symbol? x) + (sql-kw x) + (string? x) + (sql-str x) + (sequential? x) + (sql-list "(" ")" ", " (map sql x)))) + items))) diff --git a/stream-preview b/stream-preview new file mode 100644 index 0000000..07a6e1b Binary files /dev/null and b/stream-preview differ diff --git a/stream-preview.png b/stream-preview.png new file mode 100644 index 0000000..bc7e960 Binary files /dev/null and b/stream-preview.png differ diff --git a/stream-preview.svg b/stream-preview.svg new file mode 100644 index 0000000..759229e --- /dev/null +++ b/stream-preview.svg @@ -0,0 +1,5534 @@ + + + +