Fix bug

clj-totp.iml

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="BuildSystem">
+    <option name="buildSystemId" value="CLOJURE_DEPS" />
+    <option name="displayName" value="clj-totp" />
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Deps: org.clojure/clojure:1.12.1" level="project" />
+    <orderEntry type="library" name="Deps: lambdaisland/deep-diff2:2.11.216" level="project" />
+    <orderEntry type="library" name="Deps: org.clojure/core.specs.alpha:0.4.74" level="project" />
+    <orderEntry type="library" name="Deps: lambdaisland/kaocha:1.91.1392" level="project" />
+    <orderEntry type="library" name="Deps: expound:0.9.0" level="project" />
+    <orderEntry type="library" name="Deps: org.clojure/spec.alpha:0.5.238" level="project" />
+    <orderEntry type="library" name="Deps: org.clojure/tools.cli:1.1.230" level="project" />
+    <orderEntry type="library" name="Deps: lambdaisland/clj-diff:1.4.78" level="project" />
+    <orderEntry type="library" name="Deps: net.incongru.watchservice/barbary-watchservice:1.0" level="project" />
+    <orderEntry type="library" name="Deps: slingshot:0.12.2" level="project" />
+    <orderEntry type="library" name="Deps: fipp:0.6.26" level="project" />
+    <orderEntry type="library" name="Deps: com.nextjournal/beholder:1.0.2" level="project" />
+    <orderEntry type="library" name="Deps: aero:1.1.6" level="project" />
+    <orderEntry type="library" name="Deps: lambdaisland/tools.namespace:0.3.256" level="project" />
+    <orderEntry type="library" name="Deps: mvxcvi/arrangement:2.1.0" level="project" />
+    <orderEntry type="library" name="Deps: io.methvin/directory-watcher:0.17.3" level="project" />
+    <orderEntry type="library" name="Deps: progrock:0.1.2" level="project" />
+    <orderEntry type="library" name="Deps: org.clojure/java.classpath:1.0.0" level="project" />
+    <orderEntry type="library" name="Deps: clojure.java-time:1.4.3" level="project" />
+    <orderEntry type="library" name="Deps: org.clojure/core.rrb-vector:0.1.2" level="project" />
+    <orderEntry type="library" name="Deps: net.java.dev.jna/jna:5.12.1" level="project" />
+    <orderEntry type="library" name="Deps: org.clojure/tools.reader:1.3.6" level="project" />
+    <orderEntry type="library" name="Deps: org.tcrawley/dynapath:1.1.0" level="project" />
+    <orderEntry type="library" name="Deps: org.slf4j/slf4j-api:1.7.36" level="project" />
+    <orderEntry type="library" name="Deps: hawk:0.2.11" level="project" />
+    <orderEntry type="library" name="Deps: meta-merge:1.0.0" level="project" />
+  </component>
+</module>

deps.edn

@@ -3,7 +3,13 @@
            io.github.clojure/tools.build       {:mvn/version "0.10.10"}
            mvxcvi/alphabase                    {:mvn/version "3.0.185"} ;; https://github.com/greglook/alphabase
            cli-matic/cli-matic                 {:mvn/version "0.5.4"}   ;; https://github.com/l3nz/cli-matic
-           com.github.clj-easy/graal-build-time {:mvn/version "1.0.5"}  ;; Tutorial: https://shagunagrawal.me/posts/setup-clojure-with-graalvm-for-native-image/
+           ;; For SQLite
+           com.github.seancorfield/next.jdbc   {:mvn/version "1.3.1048"}
+           org.xerial/sqlite-jdbc              {:mvn/version "3.50.3.0"}
+           ;; For Datomic local
+           com.datomic/local                   {:mvn/version "1.0.291"};; https://docs.datomic.com/datomic-local.html
+           ;; Native image (GraalVM)
+           com.github.clj-easy/graal-build-time {:mvn/version "1.0.5"};; Tutorial: https://shagunagrawal.me/posts/setup-clojure-with-graalvm-for-native-image/
            ;; Protobuf for java
            com.google.protobuf/protobuf-java   {:mvn/version "3.25.8"}
            ;; Progress bar

doc/db.plantuml

@@ -0,0 +1,34 @@
+@startuml
+' configuration
+skinparam linetype ortho
+
+entity "user" as user {
+        id: number
+        --
+        login: varchar(64)
+        passw: varchar(512)
+        active: shortint
+        desc: varchar(512)
+        config: varchar(512)
+}
+
+entity "app" as app {
+        id: number
+        --
+        name: varchar(32)
+        desc: varchar(512)
+        secret: varchar(512)
+        period: int
+        config: varchar(512)
+}
+
+entity "user_app" as user_app {
+        user_id: number
+        app_id: number
+        --
+}
+
+user ||--o{ user_app
+app ||--o{ user_app
+
+@enduml

native.sh

@@ -4,7 +4,7 @@ NATIVE=~/.sdkman/candidates/java/21.0.2-graalce/bin/native-image
 BIN_FILE=totp
 
 echo "Creating uberjar"
-#clojure -T:build uber
+clojure -T:build uber
 UBERJAR=$(realpath --relative-to=target target/clj-totp-*-standalone.jar)
 
 echo "Creating native image"
@@ -27,4 +27,4 @@ cp target/$BIN_FILE ~/bin
 echo "Copied to ~/bin/$BIN_FILE"
 
 echo "Compress executable for distribution"
-xz target/$BIN_FILE
+xz -fv target/$BIN_FILE

src/totp/db/datomic.clj

@@ -0,0 +1,68 @@
+(ns totp.db.datomic
+  (:require [totp.data :as data]
+            [datomic.client.api :as d]))
+
+
+(def cfg-path (data/join-path (System/getProperty "user.home") ".config" "totp"))
+(def db-path (str cfg-path java.io.File/separator "data"))
+
+(def cfg {:server-type :datomic-local
+          :system "local-data"
+          :storage-dir db-path})
+
+(def client (d/client cfg))
+
+;; Schema for our database
+
+(def totp-schema [{:db/ident :app/name
+                   :db/valueType :db.type/string
+                   :db/cardinality :db.cardinality/one
+                   :db/unique :db.unique/identity
+                   :db/doc "Unique name of the application. Between 2 and 32 chars"
+                   :db.attr/preds  (fn [s] (<= 3 (count s) 15))}
+                  {:db/ident :app/desc
+                   :db/valueType :db.type/string
+                   :db/cardinality :db.cardinality/one
+                   :db/doc "(optional) Description of the application"}
+                  {:db/ident :app/secret
+                   :db/valueType :db.type/string
+                   :db/cardinality :db.cardinality/one
+                   :db/doc "Secret BASE32"}
+                  {:db/ident :app/period
+                   :db/valueType :db.type/long
+                   :db/cardinality :db.cardinality/one
+                   :db/doc "Time slice in seconds (30 by default)"}
+                  {:db/ident :app/config
+                   :db/valueType :db.type/string
+                   :db/cardinality :db.cardinality/one
+                   :db/doc "(Optional) Extra config"}
+
+                  {:db/ident :user/login
+                   :db/valueType :db.type/string
+                   :db/cardinality :db.cardinality/one
+                   :db/unique :db.unique/identity
+                   :db/doc "Identifier for the user"}
+                  {:db/ident :user/passwd
+                   :db/valueType :db.type/string
+                   :db/cardinality :db.cardinality/one
+                   :db/doc "Password"}
+                  {:db/ident :user/active
+                   :db/valueType :db.type/boolean
+                   :db/cardinality :db.cardinality/one
+                   :db/doc "Is the user active?"}
+                  {:db/ident :user/desc
+                   :db/valueType :db.type/string
+                   :db/cardinality :db.cardinality/one
+                   :db/doc "(Optional) Description of the user"}
+                  {:db/ident :user/config
+                   :db/valueType :db.type/string
+                   :db/cardinality :db.cardinality/one
+                   :db/doc "(Optional) Extra config"}
+                  {:db/ident :user/apps
+                   :db/valueType :db.type/ref
+                   :db/cardinality :db.cardinality/many
+                   :db/doc "Applications for this user"}])
+
+(defn init-db
+  [client]
+  (d/create-database client {:db-name "totp"}))

src/totp/db/sqlite.clj

@@ -0,0 +1,23 @@
+(ns totp.db.sqlite
+  (:require [next.jdbc :as jdbc]))
+
+;; DB configuration
+(def db {:dbname "totp-data.sqlite"
+         :dbtype "sqlite"})
+
+;; DB parsed config
+(def data-source (jdbc/get-datasource db))
+
+(defn init-db
+  "Create an empty DB"
+  []
+  (jdbc/execute! data-source ["
+  create table apps (
+    id int auto_increment primary key,
+    name varchar(32),
+    desc varchar(255)
+  )"]))
+
+(comment 
+  (init-db)
+  )