refacto: add alpinejs, flowbite and htmx to app assets with explicit versions

Cargo.lock

@@ -69,6 +69,7 @@ dependencies = [
  "askama",
  "askama_axum",
  "axum",
+ "serde",
  "tokio",
  "tower-http",
 ]

README.md

@@ -12,23 +12,40 @@ Logiciel de Pharmacie libre et open-source.
 
 ### Pré-requis
 
+#### Tauri CLI
+
 La CLI Tauri est nécessaire au lancement du client `desktop`. Elle peut être installée via Cargo :
 
 ```bash
-cargo install tauri-cli
+cargo install tauri-cli --version "^2.0.0-beta"
 ```
 
-### Exécution de l'application cliente desktop
+#### Tailwindcss CLI
+
+Le CLI Tailwindcss est nécessaire pour la génération du fichier `crates/app/assets/css/style.css`.
+
+La documentation d'installation est disponible sur le site officiel de Tailwindcss : https://tailwindcss.com/blog/standalone-cli
+
+La version actuellement utilisée est la [`v3.4.7`](https://github.com/tailwindlabs/tailwindcss/releases/tag/v3.4.7)
+
+#### SESAM-Vitale
+
+La crate `sesam-vitale` nécessite la présence des librairies dynamiques fournies par le package FSV et la CryptolibCPS. Les instructions d'installation sont disponibles dans le [README](crates/sesam-vitale/README.md) de la crate `sesam-vitale`.
+
+### Lancement
+
+Le logiciel dans sa globalité peut être lancé via la commande suivante :
 
 ```bash
 cargo tauri dev
 ```
 
-### Exécution du serveur web `app` en mode endpoint
+/!\ Attention, le lancement du client `desktop` ne génère pas le fichier `crates/app/assets/css/style.css` automatiquement pour le moment. En cas de modification des interfaces web, il est donc nécessaire de procéder à sa génération comme indiqué dans le [README](crates/app/README.md) de la crate `app`.
 
-```bash
-cargo run --bin app 
-```
+Si vous souhaitez lancer les composants séparément, les indications de lancement sont disponibles dans les README des différents crates.
+
+- [app](crates/app/README.md)
+- [sesam-vitale](crates/sesam-vitale/README.md)
 
 ## Build
 

crates/app/.gitignore

@@ -1 +1,4 @@
 /target
+
+# Tailwind CSS CLI
+tailwindcss

crates/app/Cargo.toml

@@ -7,6 +7,7 @@ edition = "2021"
 askama = "0.12.1"
 askama_axum = "0.4.0"
 axum = "0.7.5"
+serde = { version = "1.0.204", features = ["derive"] }
 tokio = { version = "1.39.1", features = ["macros", "rt-multi-thread"] }
 tower-http = { version = "0.5.2", features = ["fs"] }
 

crates/app/README.md

@@ -0,0 +1,15 @@
+## Pré-requis
+
+- Récupérer le binaire TailwindCSS : https://tailwindcss.com/blog/standalone-cli
+
+## Exécution
+
+- Lancer tailwindcss en mode watch dans un terminal : 
+```bash
+./tailwindcss -i css/input.css -o assets/css/style.css --watch
+```
+
+- Lancer le serveur web dans un autre terminal :
+```bash
+cargo run --bin app
+```

crates/app/css/input.css

@@ -0,0 +1,3 @@
+@tailwind base;
+@tailwind components;
+@tailwind utilities;

crates/app/src/lib.rs

@@ -1,27 +1,30 @@
+mod pages;
 mod templates;
 
 use std::path::Path;
 
+use askama::Template;
 use askama_axum::IntoResponse;
-use templates::{hello::HelloResponse, index::GetIndexResponse};
+use axum::http::{StatusCode, Uri};
 use tower_http::services::ServeDir;
 
-async fn root() -> impl IntoResponse {
-    return GetIndexResponse {}.into_response();
+async fn fallback(uri: Uri) -> (StatusCode, String) {
+    (StatusCode::NOT_FOUND, format!("No route for {uri}"))
 }
 
-async fn hello() -> impl IntoResponse {
-    return HelloResponse {
-        name: "Theo".to_string(),
-    }
-    .into_response();
+#[derive(Template)]
+#[template(path = "index.html")]
+pub struct GetIndexResponse;
+
+async fn root() -> impl IntoResponse {
+    GetIndexResponse {}.into_response()
 }
 
 pub fn get_router(assets_path: &Path) -> axum::Router {
-    let router = axum::Router::new()
+    axum::Router::new()
         .nest_service("/assets", ServeDir::new(assets_path))
         .route("/", axum::routing::get(root))
-        .route("/hello", axum::routing::get(hello));
-
-    router
+        .nest("/pages", pages::get_routes())
+        .merge(templates::get_routes())
+        .fallback(fallback)
 }

crates/app/src/main.rs

@@ -9,6 +9,7 @@ async fn main() {
     let router = get_router(assets_path.as_path());
 
     // TODO: select port based on available port (or ask in CLI)
-    let listener = tokio::net::TcpListener::bind("0.0.0.0:3000").await.unwrap();
+    let listener = tokio::net::TcpListener::bind("localhost:3000").await.unwrap();
+    println!("Listening on: http://{}", listener.local_addr().unwrap());
     axum::serve(listener, router).await.unwrap();
 }

crates/app/src/pages/cps.rs

@@ -0,0 +1,10 @@
+use askama::Template;
+use askama_axum::IntoResponse;
+
+#[derive(Template)]
+#[template(path = "pages/cps.html")]
+struct CpsResponse;
+
+pub async fn cps() -> impl IntoResponse {
+    CpsResponse.into_response()
+}

crates/app/src/pages/home.rs

@@ -0,0 +1,10 @@
+use askama::Template;
+use askama_axum::IntoResponse;
+
+#[derive(Template)]
+#[template(path = "pages/home.html")]
+struct HomeResponse;
+
+pub async fn home() -> impl IntoResponse {
+    HomeResponse.into_response()
+}

crates/app/src/pages/mod.rs

@@ -0,0 +1,10 @@
+use axum::{routing, Router};
+
+mod cps;
+mod home;
+
+pub fn get_routes() -> Router {
+    Router::new()
+        .route("/home", routing::get(home::home))
+        .route("/cps", routing::get(cps::cps))
+}

crates/app/src/templates/hello.rs

@@ -1,7 +1,20 @@
 use askama::Template;
+use askama_axum::IntoResponse;
+use axum::{routing, Router};
 
 #[derive(Template)]
 #[template(path = "hello.html")]
-pub struct HelloResponse {
+struct HelloResponse {
     pub name: String,
 }
+
+async fn hello() -> impl IntoResponse {
+    HelloResponse {
+        name: "Theo".to_string(),
+    }.into_response()
+}
+
+pub fn get_routes() -> Router {
+    Router::new()
+        .route("/", routing::get(hello))
+}

crates/app/src/templates/index.rs

@@ -1,5 +0,0 @@
-use askama::Template;
-
-#[derive(Template)]
-#[template(path = "index.html")]
-pub struct GetIndexResponse;

crates/app/src/templates/mod.rs

@@ -1,2 +1,12 @@
-pub mod hello;
-pub mod index;
+use axum::Router;
+
+mod hello;
+mod nav;
+mod profile;
+
+pub fn get_routes() -> Router {
+    Router::new()
+        .nest("/hello", hello::get_routes())
+        .nest("/nav", nav::get_routes())
+        .nest("/profile", profile::get_routes())
+}

crates/app/src/templates/nav.rs

@@ -0,0 +1,60 @@
+use askama::Template;
+use askama_axum::IntoResponse;
+use axum::{extract::Query, routing, Router};
+use serde::Deserialize;
+
+struct MenuItem {
+    label: String,
+    href: String,
+    current: bool,
+}
+
+#[derive(Deserialize)]
+struct MenuParameters {
+    mobile: bool,
+}
+
+#[derive(Template)]
+#[template(path = "layout/nav/nav-menu-items.html")]
+struct MenuResponse {
+    mobile: bool,
+    items: Vec<MenuItem>,
+}
+
+impl MenuResponse {
+    fn get_classes(&self, is_current_item: &bool) -> String {
+        let common_classes = match self.mobile {
+            true => "block border-l-4 py-2 pl-3 pr-4 text-base font-medium".to_string(),
+            false => "inline-flex items-center border-b-2 px-1 pt-1 text-sm font-medium".to_string(),
+        };
+        match (self.mobile, is_current_item) {
+            (true, true) => common_classes + " border-indigo-500 bg-indigo-50 text-indigo-700",
+            (true, false) => common_classes + " border-transparent text-gray-600 hover:border-gray-300 hover:bg-gray-50 hover:text-gray-800",
+            (false, true) => common_classes + " border-indigo-500 text-gray-900",
+            (false, false) => common_classes + " border-transparent text-gray-500 hover:border-gray-300 hover:text-gray-700",
+        }
+    }
+}
+
+async fn menu(Query(params): Query<MenuParameters>) -> impl IntoResponse {
+    MenuResponse {
+        mobile: params.mobile,
+        items: vec![
+            MenuItem {
+                label: "Accueil".to_string(),
+                href: "/pages/home".to_string(),
+                current: true,
+            },
+            MenuItem {
+                label: "CPS".to_string(),
+                href: "/pages/cps".to_string(),
+                current: false,
+            },
+        ],        
+    }.into_response()
+}
+
+pub fn get_routes() -> Router {
+    Router::new()
+        .route("/menu", routing::get(menu))
+}

crates/app/src/templates/profile.rs

@@ -0,0 +1,65 @@
+use askama::Template;
+use askama_axum::IntoResponse;
+use axum::{extract::Query, routing, Router};
+use serde::Deserialize;
+
+struct MenuItem {
+    label: String,
+    id: String,
+    current: bool,
+}
+
+#[derive(Deserialize)]
+struct MenuParameters {
+    mobile: bool,
+}
+
+#[derive(Template)]
+#[template(path = "layout/nav/profile-menu-items.html")]
+struct MenuResponse {
+    mobile: bool,
+    items: Vec<MenuItem>,
+}
+
+impl MenuResponse {
+    fn get_classes(&self, is_current_item: &bool) -> String {
+        let common_classes = match self.mobile {
+            true => "block px-4 py-2 text-base font-medium text-gray-500 hover:bg-gray-100 hover:text-gray-800".to_string(),
+            false => "block px-4 py-2 text-sm text-gray-700".to_string(),
+        };
+        match (self.mobile, is_current_item) {
+            (true, true) => common_classes + "", // ???
+            (true, false) => common_classes + "",
+            (false, true) => common_classes + " bg-gray-100",
+            (false, false) => common_classes + "",
+        }
+    }
+}
+
+async fn menu(Query(params): Query<MenuParameters>) -> impl IntoResponse {
+    MenuResponse {
+        mobile: params.mobile,
+        items: vec![
+            MenuItem {
+                label: "Votre profil".to_string(),
+                id: "profile".to_string(),
+                current: false,
+            },
+            MenuItem {
+                label: "Paramètres".to_string(),
+                id: "settings".to_string(),
+                current: false,
+            },
+            MenuItem {
+                label: "Déconnexion".to_string(),
+                id: "logout".to_string(),
+                current: false,
+            },
+        ],
+    }.into_response()
+}
+
+pub fn get_routes() -> Router {
+    Router::new()
+        .route("/menu", routing::get(menu))
+}

crates/app/tailwind.config.js

@@ -0,0 +1,12 @@
+/** @type {import('tailwindcss').Config} */
+module.exports = {
+  content: [
+    './templates/**/*.html',
+    './css/**/*.css',
+  ],
+  theme: {
+    extend: {},
+  },
+  plugins: [],
+}
+

crates/app/templates/base.html

@@ -1,13 +1,23 @@
 <!doctype html>
-<html lang="en">
+<html lang="fr" class="h-full">
   <head>
     <title>{% block title %}{{ title }}{% endblock %}</title>
 
-    <script src="/assets/js/htmx.min.js"></script>
+    <script src="/assets/js/htmx@2.0.1.min.js"></script>
+    <script src="/assets/js/alpinejs@3.14.1.min.js" defer></script>
+    <link href="/assets/css/style.css" rel="stylesheet">
+    <link href="/assets/css/flowbite@2.5.1.min.css" rel="stylesheet" />
+    <script src="/assets/js/flowbite@2.5.1.min.js"></script>
 
     {% block head %}{% endblock %}
   </head>
-  <body>
+  <body class="h-full">
+    <div class="min-h-full">
+      {% block nav %}
+        {% include "layout/nav.html" %}
+      {% endblock %}
+
       {% block body %}{% endblock %}
+    </div>
   </body>
 </html>

crates/app/templates/index.html

@@ -3,20 +3,31 @@
 {% block title %}Pharma Libre{% endblock %}
 
 {% block body %}
-
-<div>
+<div class="py-10">
   <header>
-    <h1>Pharma Libre</h1>
+    <div class="mx-auto max-w-7xl px-4 sm:px-6 lg:px-8">
+      <h1
+        id="page-title"
+        class="text-3xl font-bold leading-tight tracking-tight text-gray-900"
+      >
+        {% include "skeletons/page-title.html" %}
+      </h1>
+    </div>
   </header>
   <main>
     <div
-      id="hello"
-      hx-get="/hello"
+      id="main-container"
+      class="mx-auto max-w-7xl px-4 py-8 sm:px-6 lg:px-8"
+    >
+      <!-- Your content -->
+      <div
+        hx-get="/pages/home"
         hx-target="this"
         hx-trigger="load"
         hx-swap="outerHTML"
       >
-      Loading...
+        {% include "skeletons/card.html" %}
+      </div>
     </div>
   </main>
 </div>

crates/app/templates/layout/nav.html

@@ -0,0 +1,41 @@
+<nav
+  class="border-b border-gray-200 bg-white"
+  x-data="{ menuOpen: false }"
+>
+  <div class="mx-auto max-w-7xl px-4 sm:px-6 lg:px-8">
+    <div class="flex h-16 justify-between">
+      <div class="flex">
+        {% include "layout/nav/logo.html" %}
+        <div class="hidden sm:-my-px sm:ml-6 sm:flex sm:space-x-8">
+          {% include "layout/nav/desktop/menu-items.html" %}
+        </div>
+      </div>
+      <div class="hidden sm:ml-6 sm:flex sm:items-center">
+        {% include "layout/nav/desktop/notifications-button.html" %}
+        {% include "layout/nav/desktop/profile.html" %}
+      </div>
+      <div class="-mr-2 flex items-center sm:hidden">
+        {% include "layout/nav/mobile/menu-button.html" %}
+      </div>
+    </div>
+  </div>
+  <!-- Mobile menu, show/hide based on menu state. -->
+  <div
+    class="sm:hidden" id="mobile-menu"
+    x-show="menuOpen"
+    x-cloak
+  >
+    <div class="space-y-1 pb-3 pt-2">
+      {% include "layout/nav/mobile/menu-items.html" %}
+    </div>
+    <div class="border-t border-gray-200 pb-3 pt-4">
+      <div class="flex items-center px-4">
+        {% include "layout/nav/mobile/profile.html" %}
+        {% include "layout/nav/mobile/notifications-button.html" %}
+      </div>
+      <div class="mt-3 space-y-1">
+        {% include "layout/nav/mobile/profile-items.html" %}
+      </div>
+    </div>
+  </div>
+</nav>

crates/app/templates/layout/nav/desktop/menu-items.html

@@ -0,0 +1,9 @@
+<div
+  id="nav-menu-desktop"
+  hx-get="/nav/menu?mobile=false"
+  hx-target="this"
+  hx-trigger="load"
+  hx-swap="outerHTML"
+>
+  {% include "skeletons/menu-items.html" %}
+</div>

crates/app/templates/layout/nav/desktop/notifications-button.html

@@ -0,0 +1,6 @@
+<button
+  type="button"
+  class="relative rounded-full bg-white p-1 text-gray-400 hover:text-gray-500 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2"
+>
+  {% include "layout/nav/notifications-icon.html" %}
+</button>

crates/app/templates/layout/nav/desktop/profile-dropdown.html

@@ -0,0 +1,22 @@
+<div
+  class="absolute right-0 z-10 mt-2 w-48 origin-top-right rounded-md bg-white py-1 shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none"
+  role="menu"
+  id="profile-dropdown"
+  aria-orientation="vertical"
+  aria-labelledby="user-menu-button"
+  tabindex="-1"
+  x-show="profileOpen"
+  x-on:click.outside="profileOpen = false"
+  x-cloak
+  x-transition
+>
+  <div
+    id="profile-menu-desktop"
+    hx-get="/profile/menu?mobile=false"
+    hx-target="this"
+    hx-trigger="load"
+    hx-swap="outerHTML"
+  >
+    Chargement ...
+  </div>
+</div>

crates/app/templates/layout/nav/desktop/profile.html

@@ -0,0 +1,27 @@
+<!-- Profile dropdown -->
+<div
+  class="relative ml-3"
+  x-data="{ profileOpen: false }"
+>
+  <div>
+    <button
+      type="button"
+      class="relative flex max-w-xs items-center rounded-full bg-white text-sm focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2"
+      id="user-menu-button"
+      aria-controls="profile-dropdown"
+      aria-expanded="false"
+      aria-haspopup="menu"
+      x-on:click="profileOpen = ! profileOpen"
+    >
+      <span class="absolute -inset-1.5"></span>
+      <span class="sr-only">Open user menu</span>
+      <img
+        class="h-8 w-8 rounded-full"
+        src="https://images.unsplash.com/photo-1472099645785-5658abf4ff4e?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=facearea&facepad=2&w=256&h=256&q=80"
+        alt=""
+      />
+    </button>
+  </div>
+
+  {% include "layout/nav/desktop/profile-dropdown.html" %}
+</div>

crates/app/templates/layout/nav/logo.html

@@ -0,0 +1,4 @@
+<div class="flex flex-shrink-0 items-center">
+  <img class="block h-8 w-auto lg:hidden" src="https://tailwindui.com/img/logos/mark.svg?color=indigo&shade=600" alt="Your Company">
+  <img class="hidden h-8 w-auto lg:block" src="https://tailwindui.com/img/logos/mark.svg?color=indigo&shade=600" alt="Your Company">
+</div>

crates/app/templates/layout/nav/mobile/menu-button.html

@@ -0,0 +1,43 @@
+<!-- Mobile menu button -->
+<button
+  type="button"
+  class="relative inline-flex items-center justify-center rounded-md bg-white p-2 text-gray-400 hover:bg-gray-100 hover:text-gray-500 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2"
+  aria-controls="mobile-menu"
+  x-on:click="menuOpen = ! menuOpen"
+  x-bind:aria-expanded="menuOpen"
+>
+  <span class="absolute -inset-0.5"></span>
+  <span class="sr-only">Open main menu</span>
+  <!-- Menu open: "hidden", Menu closed: "block" -->
+  <svg
+    class="h-6 w-6"
+    fill="none"
+    viewBox="0 0 24 24"
+    stroke-width="1.5"
+    stroke="currentColor"
+    x-bind:class="menuOpen ? 'hidden' : 'block'"
+    x-bind:aria-hidden="menuOpen"
+  >
+    <path
+      stroke-linecap="round"
+      stroke-linejoin="round"
+      d="M3.75 6.75h16.5M3.75 12h16.5m-16.5 5.25h16.5"
+    />
+  </svg>
+  <!-- Menu open: "block", Menu closed: "hidden" -->
+  <svg
+    class="h-6 w-6"
+    fill="none"
+    viewBox="0 0 24 24"
+    stroke-width="1.5"
+    stroke="currentColor"
+    x-bind:class="menuOpen ? 'block' : 'hidden'"
+    x-bind:aria-hidden="! menuOpen"
+  >
+    <path
+      stroke-linecap="round"
+      stroke-linejoin="round"
+      d="M6 18L18 6M6 6l12 12"
+    />
+  </svg>
+</button>

crates/app/templates/layout/nav/mobile/menu-items.html

@@ -0,0 +1,9 @@
+<div
+  id="nav-menu-mobile"
+  hx-get="/nav/menu?mobile=true"
+  hx-target="this"
+  hx-trigger="load"
+  hx-swap="outerHTML"
+>
+  Chargement ...
+</div>

crates/app/templates/layout/nav/mobile/notifications-button.html

@@ -0,0 +1,6 @@
+<button
+  type="button"
+  class="relative ml-auto flex-shrink-0 rounded-full bg-white p-1 text-gray-400 hover:text-gray-500 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2"
+>
+  {% include "layout/nav/notifications-icon.html" %}
+</button>

crates/app/templates/layout/nav/mobile/profile-items.html

@@ -0,0 +1,9 @@
+<div
+  id="profile-menu-mobile"
+  hx-get="/profile/menu?mobile=true"
+  hx-target="this"
+  hx-trigger="load"
+  hx-swap="outerHTML"
+>
+  Chargement ...
+</div>

crates/app/templates/layout/nav/mobile/profile.html

@@ -0,0 +1,11 @@
+<div class="flex-shrink-0">
+  <img
+    class="h-10 w-10 rounded-full"
+    src="https://images.unsplash.com/photo-1472099645785-5658abf4ff4e?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=facearea&facepad=2&w=256&h=256&q=80"
+    alt=""
+  />
+</div>
+<div class="ml-3">
+  <div class="text-base font-medium text-gray-800">Tom Cook</div>
+  <div class="text-sm font-medium text-gray-500">tom@example.com</div>
+</div>

crates/app/templates/layout/nav/nav-menu-items.html

@@ -0,0 +1,13 @@
+{% for item in items %}
+  <a
+    href=""
+    hx-get="{{ item.href }}"
+    hx-trigger="click"
+    hx-target="#main-container"
+    hx-swap="innerHTML"
+    class="{{ Self::get_classes(self, item.current) }}"
+    aria-current="{% if item.current %}page{% endif %}"
+  >
+    {{ item.label }}
+  </a>
+{% endfor %}

crates/app/templates/layout/nav/notifications-icon.html

@@ -0,0 +1,16 @@
+<span class="absolute -inset-1.5"></span>
+<span class="sr-only">View notifications</span>
+<svg
+  class="h-6 w-6"
+  fill="none"
+  viewBox="0 0 24 24"
+  stroke-width="1.5"
+  stroke="currentColor"
+  aria-hidden="true"
+>
+  <path
+    stroke-linecap="round"
+    stroke-linejoin="round"
+    d="M14.857 17.082a23.848 23.848 0 005.454-1.31A8.967 8.967 0 0118 9.75v-.7V9A6 6 0 006 9v.75a8.967 8.967 0 01-2.312 6.022c1.733.64 3.56 1.085 5.455 1.31m5.714 0a24.255 24.255 0 01-5.714 0m5.714 0a3 3 0 11-5.714 0"
+  />
+</svg>

crates/app/templates/layout/nav/profile-menu-items.html

@@ -0,0 +1,11 @@
+{% for item in items %}
+  <a
+    href="#{{ item.id }}"
+    class="{{ Self::get_classes(self, item.current) }}"
+    role="menuitem"
+    tabindex="-1"
+    id="{{ item.id }}"
+  >
+    {{ item.label }}
+  </a>
+{% endfor %}

crates/app/templates/pages/cps.html

@@ -0,0 +1,52 @@
+<h3 id="page-title" hx-swap-oob="textContent">
+    CPS
+</h3>
+
+<div class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-4 mb-4">
+  <div
+    class="border-2 border-dashed border-gray-300 rounded-lg dark:border-gray-600 h-32 md:h-64"
+  ></div>
+  <div
+    class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-32 md:h-64"
+  ></div>
+  <div
+    class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-32 md:h-64"
+  ></div>
+  <div
+    class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-32 md:h-64"
+  ></div>
+</div>
+<div
+  class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-96 mb-4"
+></div>
+<div class="grid grid-cols-2 gap-4 mb-4">
+  <div
+    class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-48 md:h-72"
+  ></div>
+  <div
+    class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-48 md:h-72"
+  ></div>
+  <div
+    class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-48 md:h-72"
+  ></div>
+  <div
+    class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-48 md:h-72"
+  ></div>
+</div>
+<div
+  class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-96 mb-4"
+></div>
+<div class="grid grid-cols-2 gap-4">
+  <div
+    class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-48 md:h-72"
+  ></div>
+  <div
+    class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-48 md:h-72"
+  ></div>
+  <div
+    class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-48 md:h-72"
+  ></div>
+  <div
+    class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-48 md:h-72"
+  ></div>
+</div>

crates/app/templates/pages/home.html

@@ -0,0 +1,52 @@
+<h3 id="page-title" hx-swap-oob="textContent">
+    Accueil
+</h3>
+
+<div class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-4 mb-4">
+  <div
+    class="border-2 border-dashed border-gray-300 rounded-lg dark:border-gray-600 h-32 md:h-64"
+  ></div>
+  <div
+    class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-32 md:h-64"
+  ></div>
+  <div
+    class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-32 md:h-64"
+  ></div>
+  <div
+    class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-32 md:h-64"
+  ></div>
+</div>
+<div
+  class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-96 mb-4"
+></div>
+<div class="grid grid-cols-2 gap-4 mb-4">
+  <div
+    class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-48 md:h-72"
+  ></div>
+  <div
+    class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-48 md:h-72"
+  ></div>
+  <div
+    class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-48 md:h-72"
+  ></div>
+  <div
+    class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-48 md:h-72"
+  ></div>
+</div>
+<div
+  class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-96 mb-4"
+></div>
+<div class="grid grid-cols-2 gap-4">
+  <div
+    class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-48 md:h-72"
+  ></div>
+  <div
+    class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-48 md:h-72"
+  ></div>
+  <div
+    class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-48 md:h-72"
+  ></div>
+  <div
+    class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-48 md:h-72"
+  ></div>
+</div>

crates/app/templates/skeletons/card.html

@@ -0,0 +1,22 @@
+<div role="status" class="animate-pulse max-w-sm p-4 border border-gray-200 rounded shadow md:p-6 dark:border-gray-700">
+    <div class="flex items-center justify-center h-48 mb-4 bg-gray-300 rounded dark:bg-gray-700">
+        <svg class="w-10 h-10 text-gray-200 dark:text-gray-600" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 16 20">
+            <path d="M14.066 0H7v5a2 2 0 0 1-2 2H0v11a1.97 1.97 0 0 0 1.934 2h12.132A1.97 1.97 0 0 0 16 18V2a1.97 1.97 0 0 0-1.934-2ZM10.5 6a1.5 1.5 0 1 1 0 2.999A1.5 1.5 0 0 1 10.5 6Zm2.221 10.515a1 1 0 0 1-.858.485h-8a1 1 0 0 1-.9-1.43L5.6 10.039a.978.978 0 0 1 .936-.57 1 1 0 0 1 .9.632l1.181 2.981.541-1a.945.945 0 0 1 .883-.522 1 1 0 0 1 .879.529l1.832 3.438a1 1 0 0 1-.031.988Z"/>
+            <path d="M5 5V.13a2.96 2.96 0 0 0-1.293.749L.879 3.707A2.98 2.98 0 0 0 .13 5H5Z"/>
+        </svg>
+    </div>
+    <div class="h-2.5 bg-gray-200 rounded-full dark:bg-gray-700 w-48 mb-4"></div>
+    <div class="h-2 bg-gray-200 rounded-full dark:bg-gray-700 mb-2.5"></div>
+    <div class="h-2 bg-gray-200 rounded-full dark:bg-gray-700 mb-2.5"></div>
+    <div class="h-2 bg-gray-200 rounded-full dark:bg-gray-700"></div>
+    <div class="flex items-center mt-4">
+       <svg class="w-10 h-10 me-3 text-gray-200 dark:text-gray-700" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 20 20">
+            <path d="M10 0a10 10 0 1 0 10 10A10.011 10.011 0 0 0 10 0Zm0 5a3 3 0 1 1 0 6 3 3 0 0 1 0-6Zm0 13a8.949 8.949 0 0 1-4.951-1.488A3.987 3.987 0 0 1 9 13h2a3.987 3.987 0 0 1 3.951 3.512A8.949 8.949 0 0 1 10 18Z"/>
+        </svg>
+        <div>
+            <div class="h-2.5 bg-gray-200 rounded-full dark:bg-gray-700 w-32 mb-2"></div>
+            <div class="w-48 h-2 bg-gray-200 rounded-full dark:bg-gray-700"></div>
+        </div>
+    </div>
+    <span class="sr-only">Loading...</span>
+</div>

crates/app/templates/skeletons/menu-items.html

@@ -0,0 +1,4 @@
+<div role="status" class="animate-pulse flex items-center justify-center h-full">
+    <div class="w-32 h-4 bg-gray-200 rounded-full dark:bg-gray-700 me-3"></div>
+    <div class="w-32 h-4 bg-gray-200 rounded-full dark:bg-gray-700"></div>
+</div>

crates/app/templates/skeletons/page-title.html

@@ -0,0 +1 @@
+<div role="status" class="animate-pulse h-7 bg-gray-200 rounded-full dark:bg-gray-700 w-48 mt-3"></div>

crates/sesam-vitale/src/cps.rs

@@ -0,0 +1,408 @@
+use libc::{c_void, size_t};
+use std::ffi::CString;
+use std::ptr;
+
+use crate::libssv::SSV_LireCartePS;
+use crate::ssv_memory::{decode_ssv_memory, Block};
+
+#[derive(Debug, Default)]
+pub struct CartePS {
+    titulaire: TitulairePS,
+    situations: Vec<SituationPS>,
+}
+
+// 1. CB = Caractères Binaires »
+// 2. CE = Caractères « Etendus » (ISO 8859-1)
+// 3. CA = Caractères Alphanumériques (ASCII?)
+// 4. CN = Caractères Numériques
+#[derive(Debug, Default)]
+struct TitulairePS {
+    type_de_carte_ps: String,                         // CN
+    type_d_identification_nationale: String,          // CN
+    numero_d_identification_nationale: String,        // CE - 8 -> 30
+    cle_du_numero_d_identification_nationale: String, // CN
+    code_civilite: String,                            // CN
+    nom_du_ps: String,                                // CE - 27
+    prenom_du_ps: String,                             // CE - 27
+    categorie_carte: char,                            // CA
+}
+
+#[derive(Debug, Default)]
+struct SituationPS {
+    numero_logique_de_la_situation_de_facturation_du_ps: u8,
+    mode_d_exercice: String,
+    statut_d_exercice: String,
+    secteur_d_activite: String,
+    type_d_identification_structure: String,
+    numero_d_identification_structure: String,
+    cle_du_numero_d_identification_structure: String,
+    raison_sociale_structure: String,
+    numero_d_identification_de_facturation_du_ps: String,
+    cle_du_numero_d_identification_de_facturation_du_ps: String,
+    numero_d_identification_du_ps_remplaçant: String,
+    cle_du_numero_d_identification_du_ps_remplaçant: String,
+    code_conventionnel: String,
+    code_specialite: String,
+    code_zone_tarifaire: String,
+    code_zone_ik: String,
+    code_agrement_1: String,
+    code_agrement_2: String,
+    code_agrement_3: String,
+    habilitation_à_signer_une_facture: String,
+    habilitation_à_signer_un_lot: String,
+}
+
+pub fn lire_carte(code_pin: &str, lecteur: &str) -> Result<CartePS, String> {
+    let resource_ps = CString::new(lecteur).expect("CString::new failed");
+    let resource_reader = CString::new("").expect("CString::new failed");
+    let card_number = CString::new(code_pin).expect("CString::new failed");
+
+    let mut buffer: *mut c_void = ptr::null_mut();
+    let mut size: size_t = 0;
+    let mut hex_values: &[u8] = &[];
+    unsafe {
+        let result = SSV_LireCartePS(
+            resource_ps.as_ptr(),
+            resource_reader.as_ptr(),
+            card_number.as_ptr(),
+            &mut buffer,
+            &mut size,
+        );
+        println!("SSV_LireCartePS result: {}", result);
+
+        if !buffer.is_null() {
+            hex_values = std::slice::from_raw_parts(buffer as *const u8, size);
+            libc::free(buffer);
+        }
+    }
+    let groups = decode_ssv_memory(hex_values, hex_values.len());
+    decode_carte_ps(groups)
+}
+
+fn decode_carte_ps(groups: Vec<Block>) -> Result<CartePS, String> {
+    let mut carte_ps = CartePS::default();
+    for group in groups {
+        for field in group.content {
+            match (group.id, field.id) {
+                (1, 1) => {
+                    carte_ps.titulaire.type_de_carte_ps =
+                        String::from_utf8_lossy(field.content).to_string();
+                }
+                (1, 2) => {
+                    carte_ps.titulaire.type_d_identification_nationale =
+                        String::from_utf8_lossy(field.content).to_string();
+                }
+                (1, 3) => {
+                    carte_ps.titulaire.numero_d_identification_nationale =
+                        String::from_utf8_lossy(field.content).to_string();
+                }
+                (1, 4) => {
+                    carte_ps.titulaire.cle_du_numero_d_identification_nationale =
+                        String::from_utf8_lossy(field.content).to_string();
+                }
+                (1, 5) => {
+                    carte_ps.titulaire.code_civilite =
+                        String::from_utf8_lossy(field.content).to_string();
+                }
+                (1, 6) => {
+                    carte_ps.titulaire.nom_du_ps =
+                        String::from_utf8_lossy(field.content).to_string();
+                }
+                (1, 7) => {
+                    carte_ps.titulaire.prenom_du_ps =
+                        String::from_utf8_lossy(field.content).to_string();
+                }
+                (1, 8) => {
+                    let byte = field.content[0];
+                    carte_ps.titulaire.categorie_carte = byte as char;
+                }
+                (2..=16, 1) => {
+                    carte_ps.situations.push(SituationPS::default());
+                    carte_ps
+                        .situations
+                        .last_mut()
+                        .unwrap()
+                        .numero_logique_de_la_situation_de_facturation_du_ps = field.content[0];
+                }
+                (2..=16, 2) => {
+                    carte_ps.situations.last_mut().unwrap().mode_d_exercice =
+                        String::from_utf8_lossy(field.content).to_string();
+                }
+                (2..=16, 3) => {
+                    carte_ps.situations.last_mut().unwrap().statut_d_exercice =
+                        String::from_utf8_lossy(field.content).to_string();
+                }
+                (2..=16, 4) => {
+                    carte_ps.situations.last_mut().unwrap().secteur_d_activite =
+                        String::from_utf8_lossy(field.content).to_string();
+                }
+                (2..=16, 5) => {
+                    carte_ps
+                        .situations
+                        .last_mut()
+                        .unwrap()
+                        .type_d_identification_structure =
+                        String::from_utf8_lossy(field.content).to_string();
+                }
+                (2..=16, 6) => {
+                    carte_ps
+                        .situations
+                        .last_mut()
+                        .unwrap()
+                        .numero_d_identification_structure =
+                        String::from_utf8_lossy(field.content).to_string();
+                }
+                (2..=16, 7) => {
+                    carte_ps
+                        .situations
+                        .last_mut()
+                        .unwrap()
+                        .cle_du_numero_d_identification_structure =
+                        String::from_utf8_lossy(field.content).to_string();
+                }
+                (2..=16, 8) => {
+                    carte_ps
+                        .situations
+                        .last_mut()
+                        .unwrap()
+                        .raison_sociale_structure =
+                        String::from_utf8_lossy(field.content).to_string();
+                }
+                (2..=16, 9) => {
+                    carte_ps
+                        .situations
+                        .last_mut()
+                        .unwrap()
+                        .numero_d_identification_de_facturation_du_ps =
+                        String::from_utf8_lossy(field.content).to_string();
+                }
+                (2..=16, 10) => {
+                    carte_ps
+                        .situations
+                        .last_mut()
+                        .unwrap()
+                        .cle_du_numero_d_identification_de_facturation_du_ps =
+                        String::from_utf8_lossy(field.content).to_string();
+                }
+                (2..=16, 11) => {
+                    carte_ps
+                        .situations
+                        .last_mut()
+                        .unwrap()
+                        .numero_d_identification_du_ps_remplaçant =
+                        String::from_utf8_lossy(field.content).to_string();
+                }
+                (2..=16, 12) => {
+                    carte_ps
+                        .situations
+                        .last_mut()
+                        .unwrap()
+                        .cle_du_numero_d_identification_du_ps_remplaçant =
+                        String::from_utf8_lossy(field.content).to_string();
+                }
+                (2..=16, 13) => {
+                    carte_ps.situations.last_mut().unwrap().code_conventionnel =
+                        String::from_utf8_lossy(field.content).to_string();
+                }
+                (2..=16, 14) => {
+                    carte_ps.situations.last_mut().unwrap().code_specialite =
+                        String::from_utf8_lossy(field.content).to_string();
+                }
+                (2..=16, 15) => {
+                    carte_ps.situations.last_mut().unwrap().code_zone_tarifaire =
+                        String::from_utf8_lossy(field.content).to_string();
+                }
+                (2..=16, 16) => {
+                    carte_ps.situations.last_mut().unwrap().code_zone_ik =
+                        String::from_utf8_lossy(field.content).to_string();
+                }
+                (2..=16, 17) => {
+                    carte_ps.situations.last_mut().unwrap().code_agrement_1 =
+                        String::from_utf8_lossy(field.content).to_string();
+                }
+                (2..=16, 18) => {
+                    carte_ps.situations.last_mut().unwrap().code_agrement_2 =
+                        String::from_utf8_lossy(field.content).to_string();
+                }
+                (2..=16, 19) => {
+                    carte_ps.situations.last_mut().unwrap().code_agrement_3 =
+                        String::from_utf8_lossy(field.content).to_string();
+                }
+                (2..=16, 20) => {
+                    carte_ps
+                        .situations
+                        .last_mut()
+                        .unwrap()
+                        .habilitation_à_signer_une_facture =
+                        String::from_utf8_lossy(field.content).to_string();
+                }
+                (2..=16, 21) => {
+                    carte_ps
+                        .situations
+                        .last_mut()
+                        .unwrap()
+                        .habilitation_à_signer_un_lot =
+                        String::from_utf8_lossy(field.content).to_string();
+                }
+                _ => {
+                    return Err(format!(
+                        "Unknown (group, field) pair: ({}, {})",
+                        group.id, field.id
+                    ))
+                }
+            }
+        }
+    }
+    Ok(carte_ps)
+}
+
+#[cfg(test)]
+mod test_decode_carte_ps {
+    use super::*;
+
+    #[test]
+    fn test_francoise_pharmacien0052419() {
+        let bytes: &[u8] = &[
+            0, 1, 51, // Block 01, Content size 51
+            1, 48, // Field 01, Content size 1
+            1, 56, // Field 02, Content size 1
+            11, 57, 57, 55, 48, 48, 53, 50, 52, 49, 57, 52, // Field 03, Content size 11
+            1, 52, // Field 04, Content size 1
+            2, 50, 50, // Field 05, Content size 2
+            17, 80, 72, 65, 82, 77, 65, 67, 73, 69, 78, 48, 48, 53, 50, 52, 49,
+            57, // Field 06, Content size 17
+            9, 70, 82, 65, 78, 67, 79, 73, 83, 69, // Field 07, Content size 9
+            1, 84, // Field 08, Content size 1
+            0, 2, 83, // Block 02, Content size 83
+            1, 1, 1, 48, 1, 49, 2, 56, 54, 1, 49, 9, 48, 66, 48, 50, 50, 49, 57, 53, 56, 1, 56, 24,
+            80, 72, 65, 82, 77, 65, 67, 73, 69, 32, 68, 85, 32, 67, 69, 78, 84, 82, 69, 50, 50, 49,
+            57, 53, 8, 48, 48, 50, 48, 50, 52, 49, 57, 1, 56, 0, 1, 48, 1, 49, 2, 53, 48, 2, 49,
+            48, 2, 48, 48, 1, 48, 1, 48, 1, 48, 1, 49, 1, 49,
+        ];
+        let blocks = decode_ssv_memory(bytes, bytes.len());
+        let carte_ps = decode_carte_ps(blocks).unwrap();
+
+        assert_eq!(carte_ps.titulaire.type_de_carte_ps, "0");
+        assert_eq!(carte_ps.titulaire.type_d_identification_nationale, "8");
+        assert_eq!(
+            carte_ps.titulaire.numero_d_identification_nationale,
+            "99700524194"
+        );
+        assert_eq!(
+            carte_ps.titulaire.cle_du_numero_d_identification_nationale,
+            "4"
+        );
+        assert_eq!(carte_ps.titulaire.code_civilite, "22");
+        assert_eq!(carte_ps.titulaire.nom_du_ps, "PHARMACIEN0052419");
+        assert_eq!(carte_ps.titulaire.prenom_du_ps, "FRANCOISE");
+        assert_eq!(carte_ps.titulaire.categorie_carte, 'T');
+
+        assert_eq!(carte_ps.situations.len(), 1);
+        assert_eq!(
+            carte_ps.situations[0].numero_logique_de_la_situation_de_facturation_du_ps,
+            1
+        );
+        assert_eq!(carte_ps.situations[0].mode_d_exercice, "0");
+        assert_eq!(carte_ps.situations[0].statut_d_exercice, "1");
+        assert_eq!(carte_ps.situations[0].secteur_d_activite, "86");
+        assert_eq!(carte_ps.situations[0].type_d_identification_structure, "1");
+        assert_eq!(
+            carte_ps.situations[0].numero_d_identification_structure,
+            "0B0221958"
+        );
+        assert_eq!(
+            carte_ps.situations[0].cle_du_numero_d_identification_structure,
+            "8"
+        );
+        assert_eq!(
+            carte_ps.situations[0].raison_sociale_structure,
+            "PHARMACIE DU CENTRE22195"
+        );
+        assert_eq!(
+            carte_ps.situations[0].numero_d_identification_de_facturation_du_ps,
+            "00202419"
+        );
+        assert_eq!(
+            carte_ps.situations[0].cle_du_numero_d_identification_de_facturation_du_ps,
+            "8"
+        );
+        assert_eq!(
+            carte_ps.situations[0].numero_d_identification_du_ps_remplaçant,
+            ""
+        );
+        assert_eq!(
+            carte_ps.situations[0].cle_du_numero_d_identification_du_ps_remplaçant,
+            "0"
+        );
+        assert_eq!(carte_ps.situations[0].code_conventionnel, "1");
+        assert_eq!(carte_ps.situations[0].code_specialite, "50");
+        assert_eq!(carte_ps.situations[0].code_zone_tarifaire, "10");
+        assert_eq!(carte_ps.situations[0].code_zone_ik, "00");
+        assert_eq!(carte_ps.situations[0].code_agrement_1, "0");
+        assert_eq!(carte_ps.situations[0].code_agrement_2, "0");
+        assert_eq!(carte_ps.situations[0].code_agrement_3, "0");
+        assert_eq!(
+            carte_ps.situations[0].habilitation_à_signer_une_facture,
+            "1"
+        );
+        assert_eq!(carte_ps.situations[0].habilitation_à_signer_un_lot, "1");
+    }
+
+    #[test]
+    fn test_multiple_situations() {
+        let bytes: &[u8] = &[
+            0, 1, 51, // Block 01, Content size 51
+            1, 48, 1, 56, 11, 57, 57, 55, 48, 48, 53, 50, 52, 49, 57, 52, 1, 52, 2, 50, 50, 17, 80,
+            72, 65, 82, 77, 65, 67, 73, 69, 78, 48, 48, 53, 50, 52, 49, 57, 9, 70, 82, 65, 78, 67,
+            79, 73, 83, 69, 1, 84, 0, 2, 83, // Block 02, Content size 83
+            1, 1, 1, 48, 1, 49, 2, 56, 54, 1, 49, 9, 48, 66, 48, 50, 50, 49, 57, 53, 56, 1, 56, 24,
+            80, 72, 65, 82, 77, 65, 67, 73, 69, 32, 68, 85, 32, 67, 69, 78, 84, 82, 69, 50, 50, 49,
+            57, 53, 8, 48, 48, 50, 48, 50, 52, 49, 57, 1, 56, 0, 1, 48, 1, 49, 2, 53, 48, 2, 49,
+            48, 2, 48, 48, 1, 48, 1, 48, 1, 48, 1, 49, 1, 49, 0, 3,
+            83, // Block 03, Content size 83
+            1, 1, 1, 48, 1, 49, 2, 56, 54, 1, 49, 9, 48, 66, 48, 50, 50, 49, 57, 53, 56, 1, 56, 24,
+            80, 72, 65, 82, 77, 65, 67, 73, 69, 32, 68, 85, 32, 67, 69, 78, 84, 82, 69, 50, 50, 49,
+            57, 53, 8, 48, 48, 50, 48, 50, 52, 49, 57, 1, 56, 0, 1, 48, 1, 49, 2, 53, 48, 2, 49,
+            48, 2, 48, 48, 1, 48, 1, 48, 1, 48, 1, 49, 1, 49, 0, 4,
+            83, // Block 04, Content size 83
+            1, 1, 1, 48, 1, 49, 2, 56, 54, 1, 49, 9, 48, 66, 48, 50, 50, 49, 57, 53, 56, 1, 56, 24,
+            80, 72, 65, 82, 77, 65, 67, 73, 69, 32, 68, 85, 32, 67, 69, 78, 84, 82, 69, 50, 50, 49,
+            57, 53, 8, 48, 48, 50, 48, 50, 52, 49, 57, 1, 56, 0, 1, 48, 1, 49, 2, 53, 48, 2, 49,
+            48, 2, 48, 48, 1, 48, 1, 48, 1, 48, 1, 49, 1, 49,
+        ];
+        let blocks = decode_ssv_memory(bytes, bytes.len());
+        let carte_ps = decode_carte_ps(blocks).unwrap();
+
+        assert_eq!(carte_ps.situations.len(), 3);
+        assert_eq!(
+            carte_ps.situations[0].raison_sociale_structure,
+            "PHARMACIE DU CENTRE22195"
+        );
+        assert_eq!(
+            carte_ps.situations[1].raison_sociale_structure,
+            "PHARMACIE DU CENTRE22195"
+        );
+        assert_eq!(
+            carte_ps.situations[2].raison_sociale_structure,
+            "PHARMACIE DU CENTRE22195"
+        );
+    }
+
+    #[test]
+    #[should_panic]
+    fn test_missing_field() {
+        todo!();
+    }
+
+    #[test]
+    #[should_panic]
+    fn test_unknown_group_field_pair() {
+        todo!();
+    }
+
+    #[test]
+    #[should_panic]
+    fn test_invalid_field_format() {
+        todo!();
+    }
+}

crates/sesam-vitale/src/lib.rs

@@ -1,3 +1,8 @@
+pub mod cps;
+pub mod libssv;
+pub mod ssv_memory;
+pub mod ssvlib_demo;
+
 pub fn add(left: usize, right: usize) -> usize {
     left + right
 }

crates/sesam-vitale/src/libssv.rs

@@ -1,17 +1,23 @@
-/**
- * libssv.rs
- * 
- * Low level bindings to the SSVLIB dynamic library.
- * TODO : look for creating a dedicated *-sys crate : https://kornel.ski/rust-sys-crate
- */
-
-use libc::{ c_char, c_void, c_ushort, size_t };
+/// libssv.rs
+///
+/// Low level bindings to the SSVLIB dynamic library.
+// TODO : look for creating a dedicated *-sys crate : https://kornel.ski/rust-sys-crate
+use libc::{c_char, c_ushort, c_void, size_t};
 
 #[cfg_attr(target_os = "linux", link(name = "ssvlux64"))]
 #[cfg_attr(target_os = "windows", link(name = "ssvw64"))]
 extern "C" {
     pub fn SSV_InitLIB2(pcRepSesamIni: *const c_char) -> c_ushort;
-    pub fn SSV_LireCartePS(NomRessourcePS: *const c_char, NomRessourceLecteur: *const c_char, CodePorteurPS: *const c_char, ZDonneesSortie: *mut *mut c_void, TTailleDonneesSortie: *mut size_t) -> c_ushort;
-    pub fn SSV_LireConfig(ZDonneesSortie: *mut *mut c_void, TTailleDonneesSortie: *mut size_t) -> c_ushort;
+    pub fn SSV_LireCartePS(
+        NomRessourcePS: *const c_char,
+        NomRessourceLecteur: *const c_char,
+        CodePorteurPS: *const c_char,
+        ZDonneesSortie: *mut *mut c_void,
+        TTailleDonneesSortie: *mut size_t,
+    ) -> c_ushort;
+    pub fn SSV_LireConfig(
+        ZDonneesSortie: *mut *mut c_void,
+        TTailleDonneesSortie: *mut size_t,
+    ) -> c_ushort;
 }
-/* TODO : replace void* by Rust struct : https://doc.rust-lang.org/nomicon/ffi.html#representing-opaque-structs */
+// TODO : replace void* by Rust struct : https://doc.rust-lang.org/nomicon/ffi.html#representing-opaque-structs

crates/sesam-vitale/src/main.rs

@@ -1,5 +1,7 @@
-mod ssvlib_demo;
+mod cps;
 mod libssv;
+mod ssv_memory;
+mod ssvlib_demo;
 
 fn main() {
     ssvlib_demo::demo();

crates/sesam-vitale/src/ssv_memory.rs

@@ -0,0 +1,283 @@
+/// # SSV Memory
+/// Provide functions to manipulate raw memory from SSV library.
+use std::convert::TryFrom;
+
+#[derive(PartialEq, Debug)]
+struct ElementSize {
+    pub size: usize,
+    pub pad: usize,
+}
+
+// TODO : Est-ce qu'on pourrait/devrait définir un type custom pour représenter les tableaux de bytes ?
+
+impl TryFrom<&[u8]> for ElementSize {
+    type Error = &'static str;
+
+    fn try_from(bytes: &[u8]) -> Result<Self, Self::Error> {
+        if bytes.is_empty() {
+            return Err("Empty bytes input");
+        }
+
+        let mut element_size = ElementSize { size: 0, pad: 1 };
+        // Longueur:
+        //   - si le bit de poids fort du premier octet est à 0, la longueur est codée sur un octet
+        //   - si le bit de poids fort du premier octet est à 1, les 7 bits de poids faible codent le nombre d'octets utilisés pour coder la longueur
+        if bytes[0] & 0b1000_0000 == 0 {
+            // Size coded on 1 byte
+            element_size.size = bytes[0] as usize;
+        } else {
+            // Size coded on N bytes
+            // N are the 7 lower bits of the first byte
+            let size_bytes_len = (bytes[0] & 0b0111_1111) as usize;
+            if size_bytes_len > bytes.len() - 1 {
+                return Err("Invalid memory: not enough bytes to read the size");
+            } else if size_bytes_len > 4 {
+                return Err("Invalid memory: size is too big");
+            }
+            let size_bytes = &bytes[1..1 + size_bytes_len];
+
+            // u32::from_be_bytes() requires a 4 bytes array
+            let mut padded_bytes = [0u8; 4];
+            padded_bytes[size_bytes_len..].copy_from_slice(size_bytes);
+
+            element_size.size = u32::from_be_bytes(padded_bytes) as usize;
+            element_size.pad += size_bytes_len;
+        }
+        Ok(element_size)
+    }
+}
+
+#[derive(Debug)]
+pub struct Block<'a> {
+    pub id: u16,
+    pub size: usize,
+    pub content: Vec<Field<'a>>,
+}
+
+impl<'a> From<&'a [u8]> for Block<'a> {
+    fn from(bytes: &'a [u8]) -> Self {
+        let mut offset = 0;
+        let id = u16::from_be_bytes(bytes[..2].try_into().unwrap());
+        offset += 2;
+        let ElementSize {
+            size: block_size,
+            pad,
+        } = bytes[2..].try_into().unwrap();
+        offset += pad;
+        let raw_content = &bytes[offset..];
+        let mut field_offset = 0;
+        // While there is still content to read, parse Fields
+        let mut content = Vec::new();
+        let mut field_id = 1;
+        while field_offset < block_size {
+            let mut field: Field<'a> = raw_content[field_offset..].into();
+            field.id = field_id;
+            field_offset += field.size;
+            field_id += 1;
+            content.push(field);
+        }
+        Block {
+            id,
+            size: offset + block_size,
+            content,
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct Field<'a> {
+    pub id: u16,
+    pub size: usize,
+    pub content: &'a [u8],
+}
+
+impl<'a> From<&'a [u8]> for Field<'a> {
+    fn from(bytes: &'a [u8]) -> Self {
+        let ElementSize { size, pad } = bytes.try_into().unwrap();
+        let contenu = &bytes[pad..pad + size];
+        Field {
+            id: 0,
+            size: pad + size,
+            content: contenu,
+        }
+    }
+}
+
+pub fn decode_ssv_memory(bytes: &[u8], size: usize) -> Vec<Block> {
+    let mut blocks: Vec<Block> = Vec::new();
+    let mut offset = 0;
+    while offset < size {
+        let block: Block = bytes[offset..].into();
+        offset += block.size;
+        blocks.push(block);
+    }
+    blocks
+}
+
+#[cfg(test)]
+mod test_element_size {
+    use super::*;
+
+    #[test]
+    fn short_size() {
+        let bytes: &[u8] = &[0b_0000_0001_u8];
+        let element_size: ElementSize = bytes.try_into().unwrap();
+        assert_eq!(element_size.size, 1);
+        assert_eq!(element_size.pad, 1);
+
+        let bytes: &[u8] = &[0b_0100_0000_u8];
+        let element_size: ElementSize = bytes.try_into().unwrap();
+        assert_eq!(element_size.size, 64);
+        assert_eq!(element_size.pad, 1);
+    }
+
+    #[test]
+    fn long_size() {
+        let bytes: &[u8] = &[0b_1000_0010_u8, 0b_0000_0001_u8, 0b_0100_0000_u8];
+        let element_size: ElementSize = bytes.try_into().unwrap();
+        assert_eq!(element_size.size, 320);
+        assert_eq!(element_size.pad, 3);
+    }
+
+    #[test]
+    fn null_size() {
+        let bytes: &[u8] = &[];
+        let result: Result<ElementSize, &str> = bytes.try_into();
+        assert_eq!(result, Err("Empty bytes input"),);
+    }
+
+    #[test]
+    fn invalid_memory() {
+        let bytes: &[u8] = &[0b_1000_0001_u8];
+        let result: Result<ElementSize, &str> = bytes.try_into();
+        assert_eq!(
+            result,
+            Err("Invalid memory: not enough bytes to read the size"),
+        );
+
+        let bytes: &[u8] = &[0b_1000_0010_u8, 1];
+        let result: Result<ElementSize, &str> = bytes.try_into();
+        assert_eq!(
+            result,
+            Err("Invalid memory: not enough bytes to read the size"),
+        );
+
+        let bytes: &[u8] = &[0b_1000_0101_u8, 1, 1, 1, 1, 1];
+        let result: Result<ElementSize, &str> = bytes.try_into();
+        assert_eq!(result, Err("Invalid memory: size is too big"),);
+    }
+}
+
+#[cfg(test)]
+mod test_field {
+    use super::*;
+
+    #[test]
+    fn short_size() {
+        let bytes: &[u8] = &[
+            51, 1, 48, 1, 56, 11, 57, 57, 55, 48, 48, 53, 50, 52, 49, 57, 52, 1, 52, 2, 50, 50, 17,
+            80, 72, 65, 82, 77, 65, 67, 73, 69, 78, 48, 48, 53, 50, 52, 49, 57, 9, 70, 82, 65, 78,
+            67, 79, 73, 83, 69, 1, 84,
+        ];
+        let element: Field = bytes.into();
+        assert_eq!(element.size, 52);
+        assert_eq!(element.content[..5], [1, 48, 1, 56, 11]);
+    }
+
+    #[test]
+    fn long_size() {
+        let mut bytes_vec = vec![
+            0b_1000_0010_u8,
+            0b_0000_0001_u8,
+            0b_0000_0000_u8, // size = 256
+        ];
+        // Add 256 bytes to the content
+        bytes_vec.append(&mut vec![1; 256]);
+        let bytes: &[u8] = &bytes_vec;
+        let element: Field = bytes.into();
+        assert_eq!(element.size, 259);
+        assert_eq!(element.content.len(), 256);
+    }
+}
+
+#[cfg(test)]
+mod test_block {
+    use super::*;
+
+    #[test]
+    fn test_francoise_pharmacien0052419_partial_block_1() {
+        let bytes: &[u8] = &[1, 48, 1, 56, 11, 57, 57, 55, 48, 48, 53, 50, 52, 49, 57, 52];
+
+        let field1: Field = bytes.into();
+        assert_eq!(field1.size, 2);
+        assert_eq!(field1.content, &[48]);
+
+        let field2: Field = bytes[field1.size..].into();
+        assert_eq!(field2.size, 2);
+        assert_eq!(field2.content, &[56]);
+
+        let field3: Field = bytes[field1.size + field2.size..].into();
+        assert_eq!(field3.size, 12);
+        assert_eq!(
+            field3.content,
+            &[57, 57, 55, 48, 48, 53, 50, 52, 49, 57, 52]
+        );
+    }
+
+    #[test]
+    fn test_francoise_pharmacien0052419() {
+        let bytes: &[u8] = &[
+            0, 1, 51, // 3
+            1, 48, // 2
+            1, 56, // 2
+            11, 57, 57, 55, 48, 48, 53, 50, 52, 49, 57, 52, // 12
+            1, 52, // 2
+            2, 50, 50, // 3
+            17, 80, 72, 65, 82, 77, 65, 67, 73, 69, 78, 48, 48, 53, 50, 52, 49, 57, // 18
+            9, 70, 82, 65, 78, 67, 79, 73, 83, 69, // 10
+            1, 84, // 2
+            // total: 54
+            0, 2, 83, 1, 1, 1, 48, 1, 49, 2, 56, 54, 1, 49, 9, 48, 66, 48, 50, 50, 49, 57, 53, 56,
+            1, 56, 24, 80, 72, 65, 82, 77, 65, 67, 73, 69, 32, 68, 85, 32, 67, 69, 78, 84, 82, 69,
+            50, 50, 49, 57, 53, 8, 48, 48, 50, 48, 50, 52, 49, 57, 1, 56, 0, 1, 48, 1, 49, 2, 53,
+            48, 2, 49, 48, 2, 48, 48, 1, 48, 1, 48, 1, 48, 1, 49, 1, 49,
+        ];
+
+        let first_block: Block = bytes.into();
+        assert_eq!(first_block.id, 1);
+        assert_eq!(first_block.size, 54);
+        assert_eq!(first_block.content.len(), 8);
+
+        let second_block: Block = bytes[first_block.size..].into();
+        assert_eq!(second_block.id, 2);
+        assert_eq!(second_block.size, 86);
+        assert_eq!(second_block.content.len(), 21);
+    }
+}
+
+#[cfg(test)]
+mod test_decode_ssv_memory {
+    use super::*;
+
+    #[test]
+    fn test_francoise_pharmacien0052419() {
+        let bytes: &[u8] = &[
+            0, 1, 51, // 3
+            1, 48, // 2
+            1, 56, // 2
+            11, 57, 57, 55, 48, 48, 53, 50, 52, 49, 57, 52, // 12
+            1, 52, // 2
+            2, 50, 50, // 3
+            17, 80, 72, 65, 82, 77, 65, 67, 73, 69, 78, 48, 48, 53, 50, 52, 49, 57, // 18
+            9, 70, 82, 65, 78, 67, 79, 73, 83, 69, // 10
+            1, 84, // 2
+            // total: 54
+            0, 2, 83, 1, 1, 1, 48, 1, 49, 2, 56, 54, 1, 49, 9, 48, 66, 48, 50, 50, 49, 57, 53, 56,
+            1, 56, 24, 80, 72, 65, 82, 77, 65, 67, 73, 69, 32, 68, 85, 32, 67, 69, 78, 84, 82, 69,
+            50, 50, 49, 57, 53, 8, 48, 48, 50, 48, 50, 52, 49, 57, 1, 56, 0, 1, 48, 1, 49, 2, 53,
+            48, 2, 49, 48, 2, 48, 48, 1, 48, 1, 48, 1, 48, 1, 49, 1, 49,
+        ];
+        let blocks = decode_ssv_memory(bytes, bytes.len());
+        assert_eq!(blocks.len(), 2);
+    }
+}

crates/sesam-vitale/src/ssvlib_demo.rs

@@ -1,24 +1,14 @@
-/**
- * High level API for the SSV library,
- * based on the low level bindings in libssv.rs.
- * 
- */
-
-extern crate libc;
+/// High level API for the SSV library,
+/// based on the low level bindings in libssv.rs.
 extern crate dotenv;
-
 use libc::{c_void, size_t};
+use std::env;
 use std::ffi::CString;
 use std::path::PathBuf;
 use std::ptr;
 
-use std::env;
-
-use crate::libssv:: {
-    SSV_InitLIB2,
-    SSV_LireCartePS,
-    SSV_LireConfig
-};
+use crate::cps::lire_carte;
+use crate::libssv::{SSV_InitLIB2, SSV_LireConfig};
 
 fn ssv_init_lib_2() {
     let ini_str = env::var("SESAM_INI_PATH").expect("SESAM_INI_PATH must be set");
@@ -29,35 +19,6 @@ fn ssv_init_lib_2() {
     }
 }
 
-fn ssv_lire_carte_ps() {
-    let resource_ps = CString::new("PS").expect("CString::new failed");
-    let resource_reader = CString::new("TRANSPA1").expect("CString::new failed");
-    let card_number = CString::new("1234567890").expect("CString::new failed");
-
-    let mut buffer: *mut c_void = ptr::null_mut();
-    let mut size: size_t = 0;
-    unsafe {
-        let result = SSV_LireCartePS(
-            resource_ps.as_ptr(),
-            resource_reader.as_ptr(),
-            card_number.as_ptr(),
-            &mut buffer,
-            &mut size
-        );
-        println!("SSV_LireCartePS result: {}", result);
-
-        if !buffer.is_null() {
-            let hex_values = std::slice::from_raw_parts(buffer as *const u8, size);
-            for &byte in hex_values {
-                print!("{:02X} ", byte);
-            }
-            println!();
-
-            libc::free(buffer);
-        }
-    }
-}
-
 fn ssv_lire_config() {
     let mut buffer: *mut c_void = ptr::null_mut();
     let mut size: size_t = 0;
@@ -78,10 +39,8 @@ fn ssv_lire_config() {
 }
 
 pub fn demo() {
-    /*
-     * TODO : this is probably not working on release, because I'm not sure it exists a CARGO_MANIFEST_DIR and so it can find the `.env`
-     * Maybe we could use a system standard config path to store a config file
-     */ 
+    // TODO : this is probably not working on release, because I'm not sure it exists a CARGO_MANIFEST_DIR and so it can find the `.env`
+    // Maybe we could use a system standard config path to store a config file
     let manifest_dir = env::var("CARGO_MANIFEST_DIR").unwrap();
     let manifest_path = PathBuf::from(manifest_dir);
     dotenv::from_path(manifest_path.join(".env")).ok();
@@ -89,7 +48,12 @@ pub fn demo() {
     println!("------- Demo for the SSV library --------");
 
     ssv_init_lib_2();
-    ssv_lire_carte_ps();
+
+    let code_pin = "1234";
+    let lecteur = "HID Global OMNIKEY 3x21 Smart Card Reader 0";
+    let carte_ps = lire_carte(code_pin, lecteur).unwrap();
+    println!("CartePS: {:#?}", carte_ps);
+
     ssv_lire_config();
 
     println!("-----------------------------------------");