Compare commits
92 Commits
wip-debug-
...
080e392c21
Author | SHA1 | Date | |
---|---|---|---|
080e392c21
|
|||
1310f4fc29
|
|||
1a907fa9d7
|
|||
0c4ac137bc
|
|||
92723f5a33
|
|||
e3f6f93897
|
|||
dfb67b6ac1
|
|||
fe695f9dfb
|
|||
6f1fd934d9
|
|||
09717c4ed2
|
|||
04663295df
|
|||
32009e2f00 | |||
1561fd2a44
|
|||
4d9f6e2638
|
|||
760a9cd92c
|
|||
3f476c3114
|
|||
d44c561427
|
|||
5269dd7789 | |||
c3f97564d6 | |||
69a2d11501 | |||
fb201f9d5d | |||
dcb4a7680e
|
|||
0c8e417f11 | |||
73f45442b6 | |||
9c57b119ce | |||
237bbe789f | |||
1ae80c161f | |||
668a91941b | |||
0eaf238735 | |||
b10fc30984 | |||
e8f4c50ad0
|
|||
e084372b44
|
|||
898ee32f9a | |||
f3495b8fb4 | |||
06e03011d8 | |||
78bf81c301 | |||
aba6c101cb | |||
23f85c5e92 | |||
e057889403 | |||
4a27dacd8e | |||
a365e9206f | |||
4b96e6348e | |||
4627f9540a | |||
83aef34750
|
|||
9126d1311b
|
|||
4d004afc5e
|
|||
723c06acd9
|
|||
e9ef6cbb4b
|
|||
0be0b08f89
|
|||
13c2f7573b
|
|||
4def46745d
|
|||
2e07f0b7d1
|
|||
d65c869949
|
|||
f799f471bc
|
|||
e7f3322484 | |||
147125eff4
|
|||
ad7a0f2594 | |||
358a279f5c
|
|||
9fc3fef350
|
|||
a194b2d888
|
|||
920b3e119b | |||
91d7474ce0 | |||
3a43428ad4 | |||
d6d487a727 | |||
65059b87d4 | |||
f8d7f82c50
|
|||
d33140ebaf
|
|||
ba88b08a57
|
|||
8c38f0e4ba | |||
648a7848fd
|
|||
f6a1af5d1e
|
|||
a19b6dcd0d
|
|||
9447ad7faf | |||
5eebd5d1cb | |||
7d41fbb519 | |||
ff2c84fb33
|
|||
b807e78ac3 | |||
d8f3c276c0 | |||
c2b4264f32 | |||
0e8514d906 | |||
86a6d2b9d3 | |||
18758ff2fe | |||
1f57b70cef | |||
83cee11e65 | |||
b1cafda669 | |||
d370a9b85d
|
|||
83b2f7358d
|
|||
8ef713ccf2
|
|||
4162e55b83 | |||
d9cedca335
|
|||
820d76d0f5
|
|||
6409e3eedf
|
28
.gitea/PULL_REQUEST_TEMPLATE.yaml
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
name: Demande de fusion (Pull Request)
|
||||||
|
about: Créez une demande de fusion pour partager votre travail avec le reste de l'équipe
|
||||||
|
body:
|
||||||
|
- type: markdown
|
||||||
|
attributes:
|
||||||
|
value: |
|
||||||
|
Une demande de fusion (Pull Request) a pour objectif de
|
||||||
|
partager au reste de l'équipe un développement réalisé.
|
||||||
|
Décrire les modifications apportées, leur impact et le contexte
|
||||||
|
dans lequel elles ont été réalisées permettra aux relecteurices
|
||||||
|
de plus facilement comprendre et valider votre travail.
|
||||||
|
- type: textarea
|
||||||
|
id: details
|
||||||
|
attributes:
|
||||||
|
label: Détails
|
||||||
|
description: Décrivez le contenu de la PR, son impact concret
|
||||||
|
validations:
|
||||||
|
required: true
|
||||||
|
- type: textarea
|
||||||
|
id: why
|
||||||
|
attributes:
|
||||||
|
label: Pourquoi ?
|
||||||
|
description: Pourquoi ces modifications sont elles nécessaires ? Dans quel contexte s'inscrivent-elles ?
|
||||||
|
- type: textarea
|
||||||
|
id: documentation
|
||||||
|
attributes:
|
||||||
|
label: Documentation
|
||||||
|
description: Précisez ici des références à des ressources que vous avez utilisées pour réaliser ces modifications
|
29
.gitea/issue_template/BUG_REPORT.yaml
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
name: Rapport de bug
|
||||||
|
about: Remplissez un rapport d'erreur
|
||||||
|
title: "[Bug]: "
|
||||||
|
blank_issues_enabled: false
|
||||||
|
labels:
|
||||||
|
- bug
|
||||||
|
- to-triage
|
||||||
|
body:
|
||||||
|
- type: textarea
|
||||||
|
id: what-happened
|
||||||
|
attributes:
|
||||||
|
label: Que se passe-t-il ?
|
||||||
|
description: Décrivez la situation que vous rencontrez
|
||||||
|
validations:
|
||||||
|
required: true
|
||||||
|
- type: textarea
|
||||||
|
id: environment-description
|
||||||
|
attributes:
|
||||||
|
label: Si le problème semble lié à votre environement, décrivez-le ici
|
||||||
|
placeholder: Windows 10, Firefox 89.0, etc.
|
||||||
|
- type: dropdown
|
||||||
|
id: module
|
||||||
|
attributes:
|
||||||
|
label: Ce problème est il relatif à un ou des modules en particulier ?
|
||||||
|
multiple: true
|
||||||
|
options:
|
||||||
|
- Clego
|
||||||
|
- Tauri
|
||||||
|
- Axum
|
13
.gitea/issue_template/FEATURE.yaml
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
name: Proposez une fonctionnalité / amélioration
|
||||||
|
about: Proposez vos idées de fonctionnalités ou d'améliorations
|
||||||
|
blank_issues_enabled: false
|
||||||
|
labels:
|
||||||
|
- feature
|
||||||
|
- to-triage
|
||||||
|
body:
|
||||||
|
- type: textarea
|
||||||
|
id: description
|
||||||
|
attributes:
|
||||||
|
label: Décrivez votre idée
|
||||||
|
validations:
|
||||||
|
required: true
|
20
.gitea/issue_template/QUESTION.yaml
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
name: Posez une question
|
||||||
|
about: Une interrogation, une difficulté ? Posez votre question
|
||||||
|
blank_issues_enabled: false
|
||||||
|
labels:
|
||||||
|
- question
|
||||||
|
- to-triage
|
||||||
|
body:
|
||||||
|
- type: textarea
|
||||||
|
id: question
|
||||||
|
attributes:
|
||||||
|
label: Que se passe-t-il ?
|
||||||
|
description: Décrivez la situation que vous rencontrez, posez votre question
|
||||||
|
validations:
|
||||||
|
required: true
|
||||||
|
- type: textarea
|
||||||
|
id: environment-description
|
||||||
|
attributes:
|
||||||
|
label: Précisez votre environnement
|
||||||
|
description: S'il vous semble pertinent de préciser votre environement, décrivez-le ici
|
||||||
|
placeholder: Windows 10, Firefox 89.0, etc.
|
27
.gitignore
vendored
@ -1,6 +1,23 @@
|
|||||||
# Ignore Rust target directory
|
# ---> Rust
|
||||||
/target
|
# Generated by Cargo
|
||||||
|
# will have compiled files and executables
|
||||||
|
debug/
|
||||||
|
target/
|
||||||
|
|
||||||
|
# These are backup files generated by rustfmt
|
||||||
|
**/*.rs.bk
|
||||||
|
|
||||||
|
# MSVC Windows builds of rustc generate these, which store debugging information
|
||||||
|
*.pdb
|
||||||
|
|
||||||
|
# Editor directories and files
|
||||||
|
.vscode/*
|
||||||
|
!.vscode/extensions.json
|
||||||
|
.idea
|
||||||
|
.DS_Store
|
||||||
|
*.suo
|
||||||
|
*.ntvs*
|
||||||
|
*.njsproj
|
||||||
|
*.sln
|
||||||
|
*.sw?
|
||||||
|
|
||||||
# Ignore .env files
|
|
||||||
.env
|
|
||||||
.env.build
|
|
5
.ignore
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
# Ignorer les fichiers dont ne dépent pas la compilation
|
||||||
|
*.md
|
||||||
|
tailwind.config.js
|
||||||
|
*.example
|
||||||
|
scripts
|
5949
Cargo.lock
generated
19
Cargo.toml
@ -1,12 +1,7 @@
|
|||||||
[package]
|
[workspace]
|
||||||
name = "utils-debug-c-lib"
|
resolver = "2"
|
||||||
version = "0.1.0"
|
members = [
|
||||||
edition = "2021"
|
"crates/app",
|
||||||
build = "build.rs"
|
"crates/sesam-vitale",
|
||||||
|
"crates/desktop"
|
||||||
[dependencies]
|
]
|
||||||
dotenv = "0.15"
|
|
||||||
libc = "0.2"
|
|
||||||
|
|
||||||
[build-dependencies]
|
|
||||||
dotenv = "0.15"
|
|
||||||
|
99
README.md
@ -1,46 +1,69 @@
|
|||||||
## Requirements
|
# Krys4lide
|
||||||
|
|
||||||
- Installer le [package FSV](https://industriels.sesam-vitale.fr/group/fournitures-sesam-vitale)
|
Logiciel de Pharmacie libre et open-source.
|
||||||
- Les librairies dynamiques (.lib, .dll, ...) fournies ne sont pas installés dans les emplacements standard du système, il faudra donc configurer leur chemin d'installation dans le fichier de configuration `.env.build` (voir ci-dessous)
|
|
||||||
- Le détail des chemins d'installation est donné dans la documentation du package FSV `fsv-mi-004_pack-FSV1.40.14_V2.3.pdf`
|
|
||||||
- Linux - par défaut : `/opt/santesocial/fsv/1.40.13/lib`
|
|
||||||
- Windows - par défaut : `C:\Program Files\santesocial\santesocial\fsv\1.40.14\lib` (ou dans Program Files (x86) si c'est le package 32bits qui a été installé)
|
|
||||||
|
|
||||||
- Installer la [CryptolibCPS](https://industriels.sesam-vitale.fr/group/galss-cryptolib-cps)
|
## Crates
|
||||||
- Ce package fourni également l'utilitaire "CPS Gestion" pour obtenir des informations sur le lecteur de carte, etc.
|
|
||||||
- Linux : `cpgeslux`
|
|
||||||
- Windows : `...`
|
|
||||||
|
|
||||||
## Setup
|
- `app`: Interface du logiciel, servie par un serveur web propulsé par Axum. Utilisable en mode endpoint ou encapsulé dans le client `desktop`
|
||||||
|
- `desktop`: Client desktop propulsé par Tauri, encapsulant le serveur web `app`
|
||||||
|
- `sesam-vitale`: Bibliothèque de gestion des services SESAM-Vitale (Lecture des cartes CPS et Vitale, téléservices ...)
|
||||||
|
|
||||||
- Créer et éditer le fichier de configuration de build `.env.build` en s'inspirant d'un des fichiers d'exemple (`.env.build.linux.example`, `.env.build.win.example`...)
|
## Development
|
||||||
- Ce fichier est nécessaire pour le build du package Rust
|
|
||||||
- Créer et éditer le fichier de configuration de l'exécution `.env` en s'inspirant d'un des fichiers d'exemple (`.env.linux.example`, `.env.win.example`...)
|
### Pré-requis
|
||||||
- Ce fichier est nécessaire pour l'exécution du package Rust compilé, et doit donc être présent aux côtés de l'exécutable généré, le cas échéant
|
|
||||||
|
#### 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 --version "^2.0.0-beta"
|
||||||
|
```
|
||||||
|
|
||||||
|
#### 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
|
||||||
|
```
|
||||||
|
|
||||||
|
/!\ 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`.
|
||||||
|
|
||||||
|
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)
|
||||||
|
|
||||||
|
## Rechargement automatique
|
||||||
|
|
||||||
|
Pour permettre de développer plus rapidement, il existe une librairie qui recompile automatiquement nos modifications en cours : [`cargo-watch`](https://github.com/watchexec/cargo-watch) permet de relancer une commande `cargo` lorsqu'un fichier est modifié (example: `cargo run` --> `cargo watch -x run`).
|
||||||
|
|
||||||
|
Voici la commande pour l'installer dans un _package_ :
|
||||||
|
```bash
|
||||||
|
cargo add cargo-watch --dev --package app
|
||||||
|
```
|
||||||
|
|
||||||
|
Le fichier [`.ignore`](./ignore) permet d'ignorer certains fichiers pour éviter de relancer la recompilation inutilement.
|
||||||
|
|
||||||
|
⚠️ La librairie n'est pas compatible avec _Windows 7_ et les versions antérieurs de _Windows_.
|
||||||
|
|
||||||
## Build
|
## Build
|
||||||
|
|
||||||
### Compilation C
|
Packager le client desktop
|
||||||
|
|
||||||
Ce package s'appuie sur deux librairies :
|
```bash
|
||||||
- Une librairie statique, compilée à partir des sources (`*.c`, `*.h`) fournies dans le dossier `./src`
|
cargo tauri build
|
||||||
- Une librairie dynamique, fournie par le package FSV
|
```
|
||||||
- Windows : on fournit les headers, non présents dans la `.dll` en compilant les fichiers `src/*.def` en leur version binaire `lib/*.lib`
|
|
||||||
|
|
||||||
Pour compiler les fichiers de librairie :
|
|
||||||
|
|
||||||
- Windows : `.\make.bat`
|
|
||||||
- Linux : `make`
|
|
||||||
|
|
||||||
Pour nettoyer le dossier `./lib` :
|
|
||||||
|
|
||||||
- Windows : `.\make.bat /clean`
|
|
||||||
- Linux : `make clean`
|
|
||||||
|
|
||||||
### Compilation Rust
|
|
||||||
|
|
||||||
`cargo build`
|
|
||||||
|
|
||||||
## Run
|
|
||||||
|
|
||||||
`cargo run`
|
|
||||||
|
26
build.rs
@ -1,26 +0,0 @@
|
|||||||
extern crate dotenv;
|
|
||||||
|
|
||||||
use std::env;
|
|
||||||
use std::path::PathBuf;
|
|
||||||
|
|
||||||
fn main() {
|
|
||||||
dotenv::from_filename(".env.build").ok();
|
|
||||||
println!("cargo::rerun-if-changed=.env.build");
|
|
||||||
|
|
||||||
let manifest_dir = env::var("CARGO_MANIFEST_DIR").unwrap();
|
|
||||||
|
|
||||||
let static_lib_path = PathBuf::from(manifest_dir).join("lib");
|
|
||||||
println!("cargo::rustc-link-search=native={}", static_lib_path.display());
|
|
||||||
println!("cargo::rustc-link-lib=static=p4pillondebuglib");
|
|
||||||
|
|
||||||
let fsv_lib_path = PathBuf::from(env::var("SESAM_FSV_LIB_PATH").unwrap());
|
|
||||||
println!("cargo::rustc-link-search=native={}", fsv_lib_path.display());
|
|
||||||
println!("cargo::rustc-link-lib=dylib={}", env::var("SESAM_FSV_SSVLIB").unwrap());
|
|
||||||
|
|
||||||
if cfg!(target_os = "windows") {
|
|
||||||
let path = env::var("PATH").unwrap_or(String::new());
|
|
||||||
println!("cargo:rustc-env=PATH={};{}", fsv_lib_path.display(), path);
|
|
||||||
} else if cfg!(target_os = "linux") {
|
|
||||||
println!("cargo:rustc-env=LD_LIBRARY_PATH={}", fsv_lib_path.display());
|
|
||||||
}
|
|
||||||
}
|
|
4
crates/app/.gitignore
vendored
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
/target
|
||||||
|
|
||||||
|
# Tailwind CSS CLI
|
||||||
|
tailwindcss
|
21
crates/app/Cargo.toml
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
[package]
|
||||||
|
name = "app"
|
||||||
|
version = "0.1.0"
|
||||||
|
edition = "2021"
|
||||||
|
|
||||||
|
[dependencies]
|
||||||
|
askama = "0.12.1"
|
||||||
|
askama_axum = "0.4.0"
|
||||||
|
axum = "0.7.5"
|
||||||
|
axum-htmx = { version = "0.6", features = ["auto-vary"] }
|
||||||
|
listenfd = "1.0.1"
|
||||||
|
notify = "6.1.1"
|
||||||
|
serde = { version = "1.0.204", features = ["derive"] }
|
||||||
|
thiserror = "1.0.63"
|
||||||
|
tokio = { version = "1.39.1", features = ["macros", "rt-multi-thread"] }
|
||||||
|
tower-http = { version = "0.5.2", features = ["fs"] }
|
||||||
|
tower-livereload = "0.9.3"
|
||||||
|
|
||||||
|
[dev-dependencies]
|
||||||
|
cargo-watch = "8.5.1"
|
||||||
|
systemfd = "0.4.0"
|
35
crates/app/README.md
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
## 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
|
||||||
|
```
|
||||||
|
|
||||||
|
## Rechargement automatique (_auto-reload_)
|
||||||
|
|
||||||
|
Pour le projet `app`, nous utilisons en plus de `cargo-watch` ses librairies :
|
||||||
|
- [`systemfd`](https://github.com/mitsuhiko/systemfd) permet de redémarrer un serveur sans interrompre les connexions en cours, il transmet le descripteur de fichier du socket à une nouvelle instance du serveur (exemple: `cargo watch -x run` --> `systemfd --no-pid -s http::3000 -- cargo watch -x run`). Si le port est déjà pris il en prendra un autre.
|
||||||
|
- [`listenfd`](https://github.com/mitsuhiko/listenfd) permet, côté _Rust_, de démarrer un serveur en utilisant des connexions déjà ouvertes.
|
||||||
|
|
||||||
|
Pour notre application voici la commande à lancer :
|
||||||
|
|
||||||
|
```bash
|
||||||
|
systemfd --no-pid -s http::3000 -- cargo watch -x 'run --bin app'
|
||||||
|
```
|
||||||
|
|
||||||
|
## Chargement à chaud (_livereload_)
|
||||||
|
|
||||||
|
Pour que notre navigateur rafraîchisse automatique notre page lorsque le serveur a été recompilé, nous utilisons la librairie [`tower-livereload`](https://github.com/leotaku/tower-livereload).
|
||||||
|
|
||||||
|
A chaque changement, que ça soit sur du code en _Rust_, _HTML_, _CSS_ ou _JS_ alors le navigateur va recharger entièrement la page.
|
||||||
|
|
||||||
|
En Rust, il n'existe pas encore d'outil de _Hot Reload_ complet et intégré comme on en trouve dans d'autres environnements de développement web, comme pour _Node.js_.
|
6
crates/app/askama.toml
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
[general]
|
||||||
|
# Directories to search for templates, relative to the crate root.
|
||||||
|
dirs = [
|
||||||
|
"src/pages",
|
||||||
|
"src/components",
|
||||||
|
]
|
1203
crates/app/assets/css/style.css
Normal file
5
crates/app/assets/js/alpinejs@3.14.1.min.js
vendored
Normal file
2
crates/app/assets/js/flowbite@2.5.1.min.js
vendored
Normal file
1
crates/app/assets/js/htmx@2.0.1.min.js
vendored
Normal file
3
crates/app/css/input.css
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
@tailwind base;
|
||||||
|
@tailwind components;
|
||||||
|
@tailwind utilities;
|
23
crates/app/src/components/base.html
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
{% if hx_request %}
|
||||||
|
<title>{% block title %}{{ title }}{% endblock %}</title>
|
||||||
|
{% block body %}{% endblock %}
|
||||||
|
{% else %}
|
||||||
|
<!doctype html>
|
||||||
|
<html lang="fr" class="h-full">
|
||||||
|
<head>
|
||||||
|
<title>{% block title %}{{ title }}{% endblock %}</title>
|
||||||
|
|
||||||
|
<script src="/assets/js/htmx@2.0.1.min.js"></script>
|
||||||
|
<script src="/assets/js/alpinejs@3.14.1.min.js" defer></script>
|
||||||
|
<script src="/assets/js/flowbite@2.5.1.min.js"></script>
|
||||||
|
<link href="/assets/css/style.css" rel="stylesheet">
|
||||||
|
|
||||||
|
{% block head %}{% endblock %}
|
||||||
|
</head>
|
||||||
|
<body class="h-full">
|
||||||
|
<div class="min-h-full">
|
||||||
|
{% block body %}{% endblock %}
|
||||||
|
</div>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
{% endif %}
|
18
crates/app/src/components/navbar/menu-item.html
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
{% set selected = item.id == current %}
|
||||||
|
<li>
|
||||||
|
<a
|
||||||
|
href="{{ item.href }}"
|
||||||
|
{% if selected -%}
|
||||||
|
class="block py-2 px-3 text-white bg-blue-700 rounded md:bg-transparent md:text-blue-700 md:p-0 md:dark:text-blue-500"
|
||||||
|
aria-current="page"
|
||||||
|
{% else -%}
|
||||||
|
class="block py-2 px-3 text-gray-900 rounded hover:bg-gray-100 md:hover:bg-transparent md:hover:text-blue-700 md:p-0 dark:text-white md:dark:hover:text-blue-500 dark:hover:bg-gray-700 dark:hover:text-white md:dark:hover:bg-transparent dark:border-gray-700"
|
||||||
|
{% endif -%}
|
||||||
|
hx-get="{{ item.href }}"
|
||||||
|
hx-push-url="true"
|
||||||
|
hx-swap="outerHTML"
|
||||||
|
hx-select-oob="#menu-items,#page-header,#page-main"
|
||||||
|
>
|
||||||
|
{{ item.label }}
|
||||||
|
</a>
|
||||||
|
</li>
|
50
crates/app/src/components/navbar/navbar.html
Normal file
@ -0,0 +1,50 @@
|
|||||||
|
{% macro navbar(current) %}
|
||||||
|
|
||||||
|
{% let items=crate::menu::get_menu_items() %}
|
||||||
|
|
||||||
|
<nav class="bg-white border-gray-200 dark:bg-gray-900">
|
||||||
|
<div class="max-w-screen-xl flex flex-wrap items-center justify-between mx-auto p-4">
|
||||||
|
<a href="/" class="flex items-center space-x-3 rtl:space-x-reverse">
|
||||||
|
<img src="https://flowbite.com/docs/images/logo.svg" class="h-8" alt="Flowbite Logo" />
|
||||||
|
<span class="self-center text-2xl font-semibold whitespace-nowrap dark:text-white">Krys4lide</span>
|
||||||
|
</a>
|
||||||
|
<div class="flex items-center md:order-2 space-x-3 md:space-x-0 rtl:space-x-reverse">
|
||||||
|
<button type="button" class="flex text-sm bg-gray-800 rounded-full md:me-0 focus:ring-4 focus:ring-gray-300 dark:focus:ring-gray-600" id="user-menu-button" aria-expanded="false" data-dropdown-toggle="user-dropdown" data-dropdown-placement="bottom">
|
||||||
|
<span class="sr-only">Ouvrir le menu de profil</span>
|
||||||
|
<img class="w-8 h-8 rounded-full" src="https://flowbite.com/docs/images/people/profile-picture-3.jpg" alt="user photo">
|
||||||
|
</button>
|
||||||
|
<!-- Dropdown menu -->
|
||||||
|
<div class="z-50 hidden my-4 text-base list-none bg-white divide-y divide-gray-100 rounded-lg shadow dark:bg-gray-700 dark:divide-gray-600" id="user-dropdown">
|
||||||
|
<div class="px-4 py-3">
|
||||||
|
<span class="block text-sm text-gray-900 dark:text-white">Bonnie Green</span>
|
||||||
|
<span class="block text-sm text-gray-500 truncate dark:text-gray-400">name@flowbite.com</span>
|
||||||
|
</div>
|
||||||
|
<ul class="py-2" aria-labelledby="user-menu-button">
|
||||||
|
<li>
|
||||||
|
<a href="#" class="block px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 dark:hover:bg-gray-600 dark:text-gray-200 dark:hover:text-white">Profile</a>
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
<a href="#" class="block px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 dark:hover:bg-gray-600 dark:text-gray-200 dark:hover:text-white">Settings</a>
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
<a href="#" class="block px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 dark:hover:bg-gray-600 dark:text-gray-200 dark:hover:text-white">Sign out</a>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
<button data-collapse-toggle="navbar-user" type="button" class="inline-flex items-center p-2 w-10 h-10 justify-center text-sm text-gray-500 rounded-lg md:hidden hover:bg-gray-100 focus:outline-none focus:ring-2 focus:ring-gray-200 dark:text-gray-400 dark:hover:bg-gray-700 dark:focus:ring-gray-600" aria-controls="navbar-user" aria-expanded="false">
|
||||||
|
<span class="sr-only">Ouvrir le menu de navigation</span>
|
||||||
|
<svg class="w-5 h-5" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 17 14">
|
||||||
|
<path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M1 1h15M1 7h15M1 13h15"/>
|
||||||
|
</svg>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
<div class="items-center justify-between hidden w-full md:flex md:w-auto md:order-1" id="navbar-user">
|
||||||
|
<ul id="menu-items" class="flex flex-col font-medium p-4 md:p-0 mt-4 border border-gray-100 rounded-lg bg-gray-50 md:space-x-8 rtl:space-x-reverse md:flex-row md:mt-0 md:border-0 md:bg-white dark:bg-gray-800 md:dark:bg-gray-900 dark:border-gray-700">
|
||||||
|
{% for item in items %}
|
||||||
|
{% include "navbar/menu-item.html" %}
|
||||||
|
{% endfor %}
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</nav>
|
||||||
|
{% endmacro %}
|
22
crates/app/src/components/skeletons/card.html
Normal file
@ -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>
|
4
crates/app/src/components/skeletons/menu-items.html
Normal file
@ -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>
|
1
crates/app/src/components/skeletons/page-title.html
Normal file
@ -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>
|
21
crates/app/src/lib.rs
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
use std::path::Path;
|
||||||
|
|
||||||
|
use axum::http::{StatusCode, Uri};
|
||||||
|
use axum_htmx::AutoVaryLayer;
|
||||||
|
use tower_http::services::ServeDir;
|
||||||
|
|
||||||
|
mod menu;
|
||||||
|
mod pages;
|
||||||
|
|
||||||
|
async fn fallback(uri: Uri) -> (StatusCode, String) {
|
||||||
|
(StatusCode::NOT_FOUND, format!("No route for {uri}"))
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn get_router(assets_path: &Path) -> axum::Router {
|
||||||
|
axum::Router::new()
|
||||||
|
.nest_service("/assets", ServeDir::new(assets_path))
|
||||||
|
.merge(pages::get_routes())
|
||||||
|
.fallback(fallback)
|
||||||
|
// The AutoVaryLayer is used to avoid cache issues with htmx (cf: https://github.com/robertwayne/axum-htmx?tab=readme-ov-file#auto-caching-management)
|
||||||
|
.layer(AutoVaryLayer)
|
||||||
|
}
|
84
crates/app/src/main.rs
Normal file
@ -0,0 +1,84 @@
|
|||||||
|
use std::path::{Path, PathBuf};
|
||||||
|
use std::{env, io};
|
||||||
|
|
||||||
|
use axum::body::Body;
|
||||||
|
use axum::http::Request;
|
||||||
|
use listenfd::ListenFd;
|
||||||
|
use notify::Watcher;
|
||||||
|
use thiserror::Error;
|
||||||
|
use tokio::net::TcpListener;
|
||||||
|
use tower_livereload::predicate::Predicate;
|
||||||
|
use tower_livereload::LiveReloadLayer;
|
||||||
|
|
||||||
|
use ::app::get_router;
|
||||||
|
|
||||||
|
#[derive(Error, Debug)]
|
||||||
|
pub enum AppError {
|
||||||
|
#[error("Unable to bind to TCP listener")]
|
||||||
|
TCPListener(#[from] std::io::Error),
|
||||||
|
#[error("Error with the notify watcher")]
|
||||||
|
NotifyWatcher(#[from] notify::Error),
|
||||||
|
#[error("Missing environment variable {var}")]
|
||||||
|
MissingEnvVar { var: &'static str },
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Nous filtrons les requêtes de `htmx` pour ne pas inclure le script _JS_ qui gère le rechargement
|
||||||
|
/// Voir https://github.com/leotaku/tower-livereload/pull/3
|
||||||
|
#[derive(Copy, Clone)]
|
||||||
|
struct NotHtmxPredicate;
|
||||||
|
impl<T> Predicate<Request<T>> for NotHtmxPredicate {
|
||||||
|
fn check(&mut self, req: &Request<T>) -> bool {
|
||||||
|
!(req.headers().contains_key("hx-request"))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const DEFAULT_LISTENER: &str = "localhost:3000";
|
||||||
|
async fn get_tcp_listener() -> Result<TcpListener, io::Error> {
|
||||||
|
let mut listenfd = ListenFd::from_env();
|
||||||
|
|
||||||
|
match listenfd.take_tcp_listener(0)? {
|
||||||
|
// if we are given a tcp listener on listen fd 0, we use that one
|
||||||
|
Some(listener) => {
|
||||||
|
listener.set_nonblocking(true)?;
|
||||||
|
Ok(TcpListener::from_std(listener)?)
|
||||||
|
}
|
||||||
|
// otherwise fall back to local listening
|
||||||
|
None => Ok(TcpListener::bind(DEFAULT_LISTENER).await?),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn get_livereload_layer(
|
||||||
|
templates_paths: Vec<PathBuf>,
|
||||||
|
) -> Result<LiveReloadLayer<NotHtmxPredicate>, notify::Error> {
|
||||||
|
let livereload = LiveReloadLayer::new();
|
||||||
|
let reloader = livereload.reloader();
|
||||||
|
let mut watcher = notify::recommended_watcher(move |_| reloader.reload())?;
|
||||||
|
for templates_path in templates_paths {
|
||||||
|
watcher.watch(templates_path.as_path(), notify::RecursiveMode::Recursive)?;
|
||||||
|
}
|
||||||
|
Ok(livereload.request_predicate::<Body, NotHtmxPredicate>(NotHtmxPredicate))
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tokio::main]
|
||||||
|
async fn main() -> Result<(), AppError> {
|
||||||
|
let manifest_dir = env::var("CARGO_MANIFEST_DIR").map_err(|_| AppError::MissingEnvVar {
|
||||||
|
var: "CARGO_MANIFEST_DIR",
|
||||||
|
})?;
|
||||||
|
let assets_path = Path::new(&manifest_dir).join("assets");
|
||||||
|
let templates_paths = vec![
|
||||||
|
Path::new(&manifest_dir).join("src/pages"),
|
||||||
|
Path::new(&manifest_dir).join("src/components"),
|
||||||
|
];
|
||||||
|
|
||||||
|
let livereload_layer =
|
||||||
|
get_livereload_layer(templates_paths).map_err(AppError::NotifyWatcher)?;
|
||||||
|
let router = get_router(assets_path.as_path()).layer(livereload_layer);
|
||||||
|
|
||||||
|
let listener: TcpListener = get_tcp_listener().await.map_err(AppError::TCPListener)?;
|
||||||
|
let local_addr = listener.local_addr().map_err(AppError::TCPListener)?;
|
||||||
|
println!("Listening on: http://{}", local_addr);
|
||||||
|
|
||||||
|
// Run the server with the router
|
||||||
|
axum::serve(listener, router.into_make_service()).await?;
|
||||||
|
Ok(())
|
||||||
|
}
|
23
crates/app/src/menu.rs
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
pub struct MenuItem {
|
||||||
|
pub id: String,
|
||||||
|
pub label: String,
|
||||||
|
pub href: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Get the menu items
|
||||||
|
/// This function is the central place to define the menu items
|
||||||
|
/// It can be used directly in templates, for example in the `navbar` component to render the menu
|
||||||
|
pub fn get_menu_items() -> Vec<MenuItem> {
|
||||||
|
vec![
|
||||||
|
MenuItem {
|
||||||
|
id: "home".to_string(),
|
||||||
|
label: "Accueil".to_string(),
|
||||||
|
href: "/".to_string(),
|
||||||
|
},
|
||||||
|
MenuItem {
|
||||||
|
id: "cps".to_string(),
|
||||||
|
label: "CPS".to_string(),
|
||||||
|
href: "/cps".to_string(),
|
||||||
|
},
|
||||||
|
]
|
||||||
|
}
|
43
crates/app/src/pages/cps.html
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
{% extends "base.html" %}
|
||||||
|
{% import "navbar/navbar.html" as navbar -%}
|
||||||
|
|
||||||
|
{% block title %}Pharma Libre - CPS{% endblock %}
|
||||||
|
|
||||||
|
{% block body %}
|
||||||
|
{% call navbar::navbar(current="cps") %}
|
||||||
|
<div class="py-10">
|
||||||
|
<header id="page-header">
|
||||||
|
<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"
|
||||||
|
>
|
||||||
|
CPS
|
||||||
|
</h1>
|
||||||
|
</div>
|
||||||
|
</header>
|
||||||
|
<main id="page-main">
|
||||||
|
<div
|
||||||
|
class="mx-auto max-w-7xl px-4 py-8 sm:px-6 lg:px-8"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-96 mb-4"
|
||||||
|
>A</div>
|
||||||
|
<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"
|
||||||
|
>B</div>
|
||||||
|
<div
|
||||||
|
class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-32 md:h-64"
|
||||||
|
>C</div>
|
||||||
|
<div
|
||||||
|
class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-32 md:h-64"
|
||||||
|
>D</div>
|
||||||
|
<div
|
||||||
|
class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-32 md:h-64"
|
||||||
|
>E</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</main>
|
||||||
|
</div>
|
||||||
|
{% endblock %}
|
12
crates/app/src/pages/cps.rs
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
use askama_axum::Template;
|
||||||
|
use axum_htmx::HxRequest;
|
||||||
|
|
||||||
|
#[derive(Template)]
|
||||||
|
#[template(path = "cps.html")]
|
||||||
|
pub struct CpsTemplate {
|
||||||
|
hx_request: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn cps(HxRequest(hx_request): HxRequest) -> CpsTemplate {
|
||||||
|
CpsTemplate { hx_request }
|
||||||
|
}
|
43
crates/app/src/pages/home.html
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
{% extends "base.html" %}
|
||||||
|
{% import "navbar/navbar.html" as navbar -%}
|
||||||
|
|
||||||
|
{% block title %}Pharma Libre - Accueil{% endblock %}
|
||||||
|
|
||||||
|
{% block body %}
|
||||||
|
{% call navbar::navbar(current="home") %}
|
||||||
|
<div class="py-10">
|
||||||
|
<header id="page-header">
|
||||||
|
<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"
|
||||||
|
>
|
||||||
|
Accueil
|
||||||
|
</h1>
|
||||||
|
</div>
|
||||||
|
</header>
|
||||||
|
<main id="page-main">
|
||||||
|
<div
|
||||||
|
class="mx-auto max-w-7xl px-4 py-8 sm:px-6 lg:px-8"
|
||||||
|
>
|
||||||
|
<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"
|
||||||
|
>A</div>
|
||||||
|
<div
|
||||||
|
class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-32 md:h-64"
|
||||||
|
>B</div>
|
||||||
|
<div
|
||||||
|
class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-32 md:h-64"
|
||||||
|
>C</div>
|
||||||
|
<div
|
||||||
|
class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-32 md:h-64"
|
||||||
|
>D</div>
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-96 mb-4"
|
||||||
|
>E</div>
|
||||||
|
</div>
|
||||||
|
</main>
|
||||||
|
</div>
|
||||||
|
{% endblock %}
|
12
crates/app/src/pages/home.rs
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
use askama_axum::Template;
|
||||||
|
use axum_htmx::HxRequest;
|
||||||
|
|
||||||
|
#[derive(Template)]
|
||||||
|
#[template(path = "home.html")]
|
||||||
|
pub struct GetHomeTemplate {
|
||||||
|
hx_request: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn home(HxRequest(hx_request): HxRequest) -> GetHomeTemplate {
|
||||||
|
GetHomeTemplate { hx_request }
|
||||||
|
}
|
10
crates/app/src/pages/mod.rs
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
use axum::{routing, Router};
|
||||||
|
|
||||||
|
mod cps;
|
||||||
|
mod home;
|
||||||
|
|
||||||
|
pub fn get_routes() -> Router {
|
||||||
|
Router::new()
|
||||||
|
.route("/", axum::routing::get(home::home))
|
||||||
|
.route("/cps", routing::get(cps::cps))
|
||||||
|
}
|
12
crates/app/tailwind.config.js
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
/** @type {import('tailwindcss').Config} */
|
||||||
|
module.exports = {
|
||||||
|
content: [
|
||||||
|
'./src/**/*.html',
|
||||||
|
'./css/**/*.css',
|
||||||
|
],
|
||||||
|
theme: {
|
||||||
|
extend: {},
|
||||||
|
},
|
||||||
|
plugins: [],
|
||||||
|
}
|
||||||
|
|
7
crates/desktop/.gitignore
vendored
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
# Generated by Cargo
|
||||||
|
# will have compiled files and executables
|
||||||
|
/target/
|
||||||
|
|
||||||
|
# Generated by Tauri
|
||||||
|
# will have schema files for capabilities auto-completion
|
||||||
|
/gen/schemas
|
25
crates/desktop/Cargo.toml
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
[package]
|
||||||
|
name = "desktop"
|
||||||
|
version = "0.1.0"
|
||||||
|
description = "Un logiciel de pharmacie libre et open-source."
|
||||||
|
authors = ["p4pillon"]
|
||||||
|
edition = "2021"
|
||||||
|
|
||||||
|
[lib]
|
||||||
|
name = "desktop_lib"
|
||||||
|
crate-type = ["lib", "cdylib", "staticlib"]
|
||||||
|
|
||||||
|
[build-dependencies]
|
||||||
|
tauri-build = { version = "2.0.0-beta", features = [] }
|
||||||
|
|
||||||
|
[dependencies]
|
||||||
|
axum = "0.7.5"
|
||||||
|
tauri = { version = "2.0.0-beta", features = [] }
|
||||||
|
tower = "0.4.13"
|
||||||
|
tokio = "1.39.1"
|
||||||
|
|
||||||
|
app = { path = "../app" }
|
||||||
|
http = "1.1.0"
|
||||||
|
bytes = "1.6.1"
|
||||||
|
thiserror = "1.0.63"
|
||||||
|
|
3
crates/desktop/build.rs
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
fn main() {
|
||||||
|
tauri_build::build()
|
||||||
|
}
|
BIN
crates/desktop/icons/128x128.png
Normal file
After Width: | Height: | Size: 3.4 KiB |
BIN
crates/desktop/icons/128x128@2x.png
Normal file
After Width: | Height: | Size: 6.8 KiB |
BIN
crates/desktop/icons/32x32.png
Normal file
After Width: | Height: | Size: 974 B |
BIN
crates/desktop/icons/Square107x107Logo.png
Normal file
After Width: | Height: | Size: 2.8 KiB |
BIN
crates/desktop/icons/Square142x142Logo.png
Normal file
After Width: | Height: | Size: 3.8 KiB |
BIN
crates/desktop/icons/Square150x150Logo.png
Normal file
After Width: | Height: | Size: 3.9 KiB |
BIN
crates/desktop/icons/Square284x284Logo.png
Normal file
After Width: | Height: | Size: 7.6 KiB |
BIN
crates/desktop/icons/Square30x30Logo.png
Normal file
After Width: | Height: | Size: 903 B |
BIN
crates/desktop/icons/Square310x310Logo.png
Normal file
After Width: | Height: | Size: 8.4 KiB |
BIN
crates/desktop/icons/Square44x44Logo.png
Normal file
After Width: | Height: | Size: 1.3 KiB |
BIN
crates/desktop/icons/Square71x71Logo.png
Normal file
After Width: | Height: | Size: 2.0 KiB |
BIN
crates/desktop/icons/Square89x89Logo.png
Normal file
After Width: | Height: | Size: 2.4 KiB |
BIN
crates/desktop/icons/StoreLogo.png
Normal file
After Width: | Height: | Size: 1.5 KiB |
BIN
crates/desktop/icons/icon.icns
Normal file
BIN
crates/desktop/icons/icon.ico
Normal file
After Width: | Height: | Size: 85 KiB |
BIN
crates/desktop/icons/icon.png
Normal file
After Width: | Height: | Size: 14 KiB |
88
crates/desktop/src/lib.rs
Normal file
@ -0,0 +1,88 @@
|
|||||||
|
use axum::body::{to_bytes, Body};
|
||||||
|
use axum::Router;
|
||||||
|
use bytes::Bytes;
|
||||||
|
use http::{request, response, Request, Response};
|
||||||
|
use std::path::PathBuf;
|
||||||
|
use std::sync::Arc;
|
||||||
|
use tauri::path::BaseDirectory;
|
||||||
|
use tauri::Manager;
|
||||||
|
use thiserror::Error;
|
||||||
|
use tokio::sync::{Mutex, MutexGuard};
|
||||||
|
use tower::{Service, ServiceExt};
|
||||||
|
|
||||||
|
#[derive(Error, Debug)]
|
||||||
|
pub enum DesktopError {
|
||||||
|
#[error("Axum error:\n{0}")]
|
||||||
|
Axum(#[from] axum::Error),
|
||||||
|
#[error("Infallible error")]
|
||||||
|
Infallible(#[from] std::convert::Infallible),
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Process requests sent to Tauri (with the `axum://` protocol) and handle them with Axum
|
||||||
|
/// When an error occurs, this function is expected to panic, which should result in a 500 error
|
||||||
|
/// being sent to the client, so we let the client handle the error recovering
|
||||||
|
async fn process_tauri_request(
|
||||||
|
tauri_request: Request<Vec<u8>>,
|
||||||
|
mut router: MutexGuard<'_, Router>,
|
||||||
|
) -> Result<Response<Vec<u8>>, DesktopError> {
|
||||||
|
let (parts, body): (request::Parts, Vec<u8>) = tauri_request.into_parts();
|
||||||
|
let axum_request: Request<Body> = Request::from_parts(parts, body.into());
|
||||||
|
|
||||||
|
let axum_response: Response<Body> = router
|
||||||
|
.as_service()
|
||||||
|
.ready()
|
||||||
|
.await
|
||||||
|
.map_err(DesktopError::Infallible)?
|
||||||
|
.call(axum_request)
|
||||||
|
.await
|
||||||
|
.map_err(DesktopError::Infallible)?;
|
||||||
|
|
||||||
|
let (parts, body): (response::Parts, Body) = axum_response.into_parts();
|
||||||
|
let body: Bytes = to_bytes(body, usize::MAX).await?;
|
||||||
|
|
||||||
|
let tauri_response: Response<Vec<u8>> = Response::from_parts(parts, body.into());
|
||||||
|
Ok(tauri_response)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg_attr(mobile, tauri::mobile_entry_point)]
|
||||||
|
pub fn run() {
|
||||||
|
tauri::Builder::default()
|
||||||
|
.setup(|app| {
|
||||||
|
let assets_path: PathBuf = app
|
||||||
|
.path()
|
||||||
|
.resolve("assets", BaseDirectory::Resource)
|
||||||
|
.expect("Assets path should be resolvable");
|
||||||
|
|
||||||
|
// Adds Axum router to application state
|
||||||
|
// This makes it so we can retrieve it from any app instance (see bellow)
|
||||||
|
let router = Arc::new(Mutex::new(app::get_router(&assets_path)));
|
||||||
|
|
||||||
|
app.manage(router);
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
})
|
||||||
|
.register_asynchronous_uri_scheme_protocol("axum", move |app, request, responder| {
|
||||||
|
// Retrieve the router from the application state and clone it for the async block
|
||||||
|
let router = Arc::clone(&app.state::<Arc<Mutex<axum::Router>>>());
|
||||||
|
|
||||||
|
// Spawn a new async task to process the request
|
||||||
|
tauri::async_runtime::spawn(async move {
|
||||||
|
let router = router.lock().await;
|
||||||
|
match process_tauri_request(request, router).await {
|
||||||
|
Ok(response) => responder.respond(response),
|
||||||
|
Err(err) => {
|
||||||
|
let body = format!("Failed to process an axum:// request:\n{}", err);
|
||||||
|
responder.respond(
|
||||||
|
http::Response::builder()
|
||||||
|
.status(http::StatusCode::BAD_REQUEST)
|
||||||
|
.header(http::header::CONTENT_TYPE, "text/plain")
|
||||||
|
.body::<Vec<u8>>(body.into())
|
||||||
|
.expect("BAD_REQUEST response should be valid"),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
})
|
||||||
|
.run(tauri::generate_context!())
|
||||||
|
.expect("error while running tauri application");
|
||||||
|
}
|
6
crates/desktop/src/main.rs
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
// Prevents additional console window on Windows in release, DO NOT REMOVE!!
|
||||||
|
#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
|
||||||
|
|
||||||
|
fn main() {
|
||||||
|
desktop_lib::run()
|
||||||
|
}
|
41
crates/desktop/tauri.conf.json
Normal file
@ -0,0 +1,41 @@
|
|||||||
|
{
|
||||||
|
"productName": "Logiciel Pharma",
|
||||||
|
"version": "0.0.1",
|
||||||
|
"identifier": "org.p4pillon.pharma.desktop",
|
||||||
|
"build": {
|
||||||
|
"beforeDevCommand": {
|
||||||
|
"cwd": "../app",
|
||||||
|
"script": "cargo run"
|
||||||
|
},
|
||||||
|
"devUrl": "http://localhost:3000",
|
||||||
|
"frontendDist": "axum://place.holder/"
|
||||||
|
},
|
||||||
|
"app": {
|
||||||
|
"withGlobalTauri": true,
|
||||||
|
"windows": [
|
||||||
|
{
|
||||||
|
"title": "Logiciel Pharma",
|
||||||
|
"width": 800,
|
||||||
|
"height": 600
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"security": {
|
||||||
|
"csp": null
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"bundle": {
|
||||||
|
"active": true,
|
||||||
|
"resources": {
|
||||||
|
"../app/assets/": "./assets/"
|
||||||
|
},
|
||||||
|
"targets": "all",
|
||||||
|
"icon": [
|
||||||
|
"icons/32x32.png",
|
||||||
|
"icons/128x128.png",
|
||||||
|
"icons/128x128@2x.png",
|
||||||
|
"icons/icon.icns",
|
||||||
|
"icons/icon.ico"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
9
crates/sesam-vitale/.gitignore
vendored
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
# Ignore Rust target directory
|
||||||
|
/target
|
||||||
|
|
||||||
|
# Ignore .env files
|
||||||
|
.env
|
||||||
|
.env.build
|
||||||
|
|
||||||
|
# Ignore exploitation files - only usefull for local debugging on windows
|
||||||
|
lib/*.exp
|
13
crates/sesam-vitale/Cargo.toml
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
[package]
|
||||||
|
name = "sesam-vitale"
|
||||||
|
version = "0.1.0"
|
||||||
|
edition = "2021"
|
||||||
|
|
||||||
|
[dependencies]
|
||||||
|
anyhow = "1.0.86"
|
||||||
|
dotenv = "0.15"
|
||||||
|
libc = "0.2"
|
||||||
|
thiserror = "1.0.63"
|
||||||
|
|
||||||
|
[build-dependencies]
|
||||||
|
dotenv = "0.15"
|
34
crates/sesam-vitale/README.md
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
## Requirements
|
||||||
|
|
||||||
|
- Installer le [package FSV](https://industriels.sesam-vitale.fr/group/fournitures-sesam-vitale)
|
||||||
|
- Les librairies dynamiques (.lib, .dll, ...) fournies ne sont pas installés dans les emplacements standard du système, il faudra donc configurer leur chemin d'installation dans le fichier de configuration `.env.build` (voir ci-dessous)
|
||||||
|
- Le détail des chemins d'installation est donné dans la documentation du package FSV `fsv-mi-004_pack-FSV1.40.14_V2.3.pdf`
|
||||||
|
- Linux - par défaut : `/opt/santesocial/fsv/1.40.13/lib`
|
||||||
|
- Windows - par défaut : `C:\Program Files\santesocial\santesocial\fsv\1.40.14\lib` (ou dans Program Files (x86) si c'est le package 32bits qui a été installé)
|
||||||
|
|
||||||
|
- Installer la [CryptolibCPS](https://industriels.sesam-vitale.fr/group/galss-cryptolib-cps)
|
||||||
|
- Ce package fourni également l'utilitaire "CPS Gestion" pour obtenir des informations sur le lecteur de carte, etc.
|
||||||
|
- Linux : `cpgeslux`
|
||||||
|
- Windows : `...`
|
||||||
|
|
||||||
|
## Setup
|
||||||
|
|
||||||
|
- Créer et éditer le fichier de configuration de build `.env.build` en s'inspirant d'un des fichiers d'exemple (`.env.build.linux.example`, `.env.build.win.example`...)
|
||||||
|
- Ce fichier est nécessaire pour le build du package Rust
|
||||||
|
- Créer et éditer le fichier de configuration de l'exécution `.env` en s'inspirant d'un des fichiers d'exemple (`.env.linux.example`, `.env.win.example`...)
|
||||||
|
- Ce fichier est nécessaire pour l'exécution du package Rust compilé, et doit donc être présent aux côtés de l'exécutable généré, le cas échéant
|
||||||
|
|
||||||
|
## Build
|
||||||
|
|
||||||
|
### Windows - Compilation des headers FSV
|
||||||
|
|
||||||
|
Sous windows, la librairie dynamique fournie par le package FSV nécessite des headers qui ne sont pas présents dans la `.dll`. Il est donc nécessaire de fournir ces headers, en les renseignant dans des fichiers `crates/sesam-vitale/src/win/fsv/*.def` qui seront compilés en leur version binaire `crates/sesam-vitale/lib/*.lib`.
|
||||||
|
|
||||||
|
En cas de modification des fichiers `.def`, pour re-compiler ces headers, faire appel au script `scripts/compile_win_headers.bat`.
|
||||||
|
|
||||||
|
| /!\ Attention, le script `compile_win_headers.bat` exécute, en interne, l'utilitaire `vcvarsall.bat` et le linker `lib.exe` de Visual Studio. Visual Studio doit donc être installé et le chemin vers l'intallation le script `vcvarsall.bat`, écrit en dur dans le script `compile_win_headers.bat` doit être adapté à votre installation.
|
||||||
|
|
||||||
|
## À creuser
|
||||||
|
|
||||||
|
- Compilation cross platform facilitée par du Docker : https://github.com/cross-rs/cross
|
||||||
|
- Pour éviter l'usage de dotenv pour la configuration, on peut utiliser https://direnv.net/
|
43
crates/sesam-vitale/build.rs
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
extern crate dotenv;
|
||||||
|
|
||||||
|
use std::env;
|
||||||
|
use std::path::PathBuf;
|
||||||
|
|
||||||
|
fn main() {
|
||||||
|
// Load the .env.build file for build-time environment variables
|
||||||
|
let manifest_dir = env::var("CARGO_MANIFEST_DIR").expect("CARGO_MANIFEST_DIR must be set");
|
||||||
|
let manifest_path = PathBuf::from(manifest_dir);
|
||||||
|
dotenv::from_path(manifest_path.join(".env.build")).ok();
|
||||||
|
|
||||||
|
println!("cargo::rerun-if-env-changed=SESAM_FSV_LIB_PATH");
|
||||||
|
println!("cargo::rerun-if-env-changed=SESAM_FSV_SSVLIB");
|
||||||
|
println!("cargo::rerun-if-changed=.env.build");
|
||||||
|
println!("cargo::rerun-if-changed=build.rs");
|
||||||
|
|
||||||
|
// Add local lib directory to the linker search path (for def files and static libs)
|
||||||
|
let static_lib_path = manifest_path.join("lib");
|
||||||
|
println!(
|
||||||
|
"cargo::rustc-link-search=native={}",
|
||||||
|
static_lib_path.display()
|
||||||
|
);
|
||||||
|
|
||||||
|
// Add the SESAM_FSV_LIB_PATH to the linker search path
|
||||||
|
let fsv_lib_path =
|
||||||
|
PathBuf::from(env::var("SESAM_FSV_LIB_PATH").expect("SESAM_FSV_LIB_PATH must be set"));
|
||||||
|
println!("cargo::rustc-link-search=native={}", fsv_lib_path.display());
|
||||||
|
|
||||||
|
// Add the SESAM_FSV_LIB_PATH to the PATH environment variable
|
||||||
|
if cfg!(target_os = "windows") {
|
||||||
|
let path = env::var("PATH").unwrap_or_default();
|
||||||
|
println!("cargo:rustc-env=PATH={};{}", fsv_lib_path.display(), path);
|
||||||
|
} else if cfg!(target_os = "linux") {
|
||||||
|
println!("cargo:rustc-env=LD_LIBRARY_PATH={}", fsv_lib_path.display());
|
||||||
|
}
|
||||||
|
|
||||||
|
// Link the SESAM_FSV_SSVLIB dynamic library
|
||||||
|
println!(
|
||||||
|
"cargo::rustc-link-lib=dylib={}",
|
||||||
|
env::var("SESAM_FSV_SSVLIB").expect("SESAM_FSV_SSVLIB must be set")
|
||||||
|
);
|
||||||
|
// TODO : try `raw-dylib` instead of `dylib` on Windows to avoid the need of the `lib` headers compiled from the `def`
|
||||||
|
}
|
0
crates/sesam-vitale/lib/.gitkeep
Normal file
400
crates/sesam-vitale/src/cps.rs
Normal file
@ -0,0 +1,400 @@
|
|||||||
|
use libc::{c_void, size_t};
|
||||||
|
use std::ffi::CString;
|
||||||
|
use std::ptr;
|
||||||
|
use thiserror::Error;
|
||||||
|
|
||||||
|
use crate::libssv::{self, SSV_LireCartePS};
|
||||||
|
use crate::ssv_memory::{decode_ssv_memory, Block, SSVMemoryError};
|
||||||
|
|
||||||
|
#[derive(Error, Debug)]
|
||||||
|
pub enum CartePSError {
|
||||||
|
#[error("Unknown (group, field) pair: ({group}, {field})")]
|
||||||
|
UnknownGroupFieldPair { group: u16, field: u16 },
|
||||||
|
#[error("CString creation error: {0}")]
|
||||||
|
CString(#[from] std::ffi::NulError),
|
||||||
|
#[error("Unable to get the last situation while parsing a CartePS")]
|
||||||
|
InvalidLastSituation,
|
||||||
|
#[error(transparent)]
|
||||||
|
SSVMemory(#[from] SSVMemoryError),
|
||||||
|
#[error(transparent)]
|
||||||
|
SSVLibErrorCode(#[from] libssv::LibSSVError),
|
||||||
|
}
|
||||||
|
|
||||||
|
#[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, CartePSError> {
|
||||||
|
let resource_ps = CString::new(lecteur)?;
|
||||||
|
let resource_reader = CString::new("")?;
|
||||||
|
let card_number = CString::new(code_pin)?;
|
||||||
|
|
||||||
|
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 result != 0 {
|
||||||
|
return Err(libssv::LibSSVError::StandardErrorCode {
|
||||||
|
code: result,
|
||||||
|
function: "SSV_LireCartePS",
|
||||||
|
}
|
||||||
|
.into());
|
||||||
|
}
|
||||||
|
|
||||||
|
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()).map_err(CartePSError::SSVMemory)?;
|
||||||
|
decode_carte_ps(groups)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn get_last_mut_situation(carte_ps: &mut CartePS) -> Result<&mut SituationPS, CartePSError> {
|
||||||
|
carte_ps
|
||||||
|
.situations
|
||||||
|
.last_mut()
|
||||||
|
.ok_or(CartePSError::InvalidLastSituation)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn decode_carte_ps(groups: Vec<Block>) -> Result<CartePS, CartePSError> {
|
||||||
|
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());
|
||||||
|
get_last_mut_situation(&mut carte_ps)?
|
||||||
|
.numero_logique_de_la_situation_de_facturation_du_ps = field.content[0];
|
||||||
|
}
|
||||||
|
(2..=16, 2) => {
|
||||||
|
get_last_mut_situation(&mut carte_ps)?.mode_d_exercice =
|
||||||
|
String::from_utf8_lossy(field.content).to_string();
|
||||||
|
}
|
||||||
|
(2..=16, 3) => {
|
||||||
|
get_last_mut_situation(&mut carte_ps)?.statut_d_exercice =
|
||||||
|
String::from_utf8_lossy(field.content).to_string();
|
||||||
|
}
|
||||||
|
(2..=16, 4) => {
|
||||||
|
get_last_mut_situation(&mut carte_ps)?.secteur_d_activite =
|
||||||
|
String::from_utf8_lossy(field.content).to_string();
|
||||||
|
}
|
||||||
|
(2..=16, 5) => {
|
||||||
|
get_last_mut_situation(&mut carte_ps)?.type_d_identification_structure =
|
||||||
|
String::from_utf8_lossy(field.content).to_string();
|
||||||
|
}
|
||||||
|
(2..=16, 6) => {
|
||||||
|
get_last_mut_situation(&mut carte_ps)?.numero_d_identification_structure =
|
||||||
|
String::from_utf8_lossy(field.content).to_string();
|
||||||
|
}
|
||||||
|
(2..=16, 7) => {
|
||||||
|
get_last_mut_situation(&mut carte_ps)?
|
||||||
|
.cle_du_numero_d_identification_structure =
|
||||||
|
String::from_utf8_lossy(field.content).to_string();
|
||||||
|
}
|
||||||
|
(2..=16, 8) => {
|
||||||
|
get_last_mut_situation(&mut carte_ps)?.raison_sociale_structure =
|
||||||
|
String::from_utf8_lossy(field.content).to_string();
|
||||||
|
}
|
||||||
|
(2..=16, 9) => {
|
||||||
|
get_last_mut_situation(&mut carte_ps)?
|
||||||
|
.numero_d_identification_de_facturation_du_ps =
|
||||||
|
String::from_utf8_lossy(field.content).to_string();
|
||||||
|
}
|
||||||
|
(2..=16, 10) => {
|
||||||
|
get_last_mut_situation(&mut carte_ps)?
|
||||||
|
.cle_du_numero_d_identification_de_facturation_du_ps =
|
||||||
|
String::from_utf8_lossy(field.content).to_string();
|
||||||
|
}
|
||||||
|
(2..=16, 11) => {
|
||||||
|
get_last_mut_situation(&mut carte_ps)?
|
||||||
|
.numero_d_identification_du_ps_remplaçant =
|
||||||
|
String::from_utf8_lossy(field.content).to_string();
|
||||||
|
}
|
||||||
|
(2..=16, 12) => {
|
||||||
|
get_last_mut_situation(&mut carte_ps)?
|
||||||
|
.cle_du_numero_d_identification_du_ps_remplaçant =
|
||||||
|
String::from_utf8_lossy(field.content).to_string();
|
||||||
|
}
|
||||||
|
(2..=16, 13) => {
|
||||||
|
get_last_mut_situation(&mut carte_ps)?.code_conventionnel =
|
||||||
|
String::from_utf8_lossy(field.content).to_string();
|
||||||
|
}
|
||||||
|
(2..=16, 14) => {
|
||||||
|
get_last_mut_situation(&mut carte_ps)?.code_specialite =
|
||||||
|
String::from_utf8_lossy(field.content).to_string();
|
||||||
|
}
|
||||||
|
(2..=16, 15) => {
|
||||||
|
get_last_mut_situation(&mut carte_ps)?.code_zone_tarifaire =
|
||||||
|
String::from_utf8_lossy(field.content).to_string();
|
||||||
|
}
|
||||||
|
(2..=16, 16) => {
|
||||||
|
get_last_mut_situation(&mut carte_ps)?.code_zone_ik =
|
||||||
|
String::from_utf8_lossy(field.content).to_string();
|
||||||
|
}
|
||||||
|
(2..=16, 17) => {
|
||||||
|
get_last_mut_situation(&mut carte_ps)?.code_agrement_1 =
|
||||||
|
String::from_utf8_lossy(field.content).to_string();
|
||||||
|
}
|
||||||
|
(2..=16, 18) => {
|
||||||
|
get_last_mut_situation(&mut carte_ps)?.code_agrement_2 =
|
||||||
|
String::from_utf8_lossy(field.content).to_string();
|
||||||
|
}
|
||||||
|
(2..=16, 19) => {
|
||||||
|
get_last_mut_situation(&mut carte_ps)?.code_agrement_3 =
|
||||||
|
String::from_utf8_lossy(field.content).to_string();
|
||||||
|
}
|
||||||
|
(2..=16, 20) => {
|
||||||
|
get_last_mut_situation(&mut carte_ps)?.habilitation_à_signer_une_facture =
|
||||||
|
String::from_utf8_lossy(field.content).to_string();
|
||||||
|
}
|
||||||
|
(2..=16, 21) => {
|
||||||
|
get_last_mut_situation(&mut carte_ps)?.habilitation_à_signer_un_lot =
|
||||||
|
String::from_utf8_lossy(field.content).to_string();
|
||||||
|
}
|
||||||
|
_ => {
|
||||||
|
return Err(CartePSError::UnknownGroupFieldPair {
|
||||||
|
group: group.id,
|
||||||
|
field: 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()).unwrap();
|
||||||
|
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()).unwrap();
|
||||||
|
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!();
|
||||||
|
}
|
||||||
|
}
|
19
crates/sesam-vitale/src/lib.rs
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
pub mod cps;
|
||||||
|
pub mod libssv;
|
||||||
|
pub mod ssv_memory;
|
||||||
|
pub mod ssvlib_demo;
|
||||||
|
|
||||||
|
pub fn add(left: usize, right: usize) -> usize {
|
||||||
|
left + right
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn it_works() {
|
||||||
|
let result = add(2, 2);
|
||||||
|
assert_eq!(result, 4);
|
||||||
|
}
|
||||||
|
}
|
30
crates/sesam-vitale/src/libssv.rs
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
/// 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};
|
||||||
|
use thiserror::Error;
|
||||||
|
|
||||||
|
#[derive(Debug, Error)]
|
||||||
|
pub enum LibSSVError {
|
||||||
|
#[error("SSV library error in {function}: {code}")]
|
||||||
|
StandardErrorCode { code: u16, function: &'static str },
|
||||||
|
}
|
||||||
|
|
||||||
|
#[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;
|
||||||
|
}
|
||||||
|
// TODO : replace void* by Rust struct : https://doc.rust-lang.org/nomicon/ffi.html#representing-opaque-structs
|
10
crates/sesam-vitale/src/main.rs
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
mod cps;
|
||||||
|
mod libssv;
|
||||||
|
mod ssv_memory;
|
||||||
|
mod ssvlib_demo;
|
||||||
|
|
||||||
|
use anyhow::{Context, Result};
|
||||||
|
|
||||||
|
fn main() -> Result<()> {
|
||||||
|
ssvlib_demo::demo().context("Error while running the SSV library demo")
|
||||||
|
}
|
358
crates/sesam-vitale/src/ssv_memory.rs
Normal file
@ -0,0 +1,358 @@
|
|||||||
|
/// # SSV Memory
|
||||||
|
/// Provide functions to manipulate raw memory from SSV library.
|
||||||
|
use std::convert::TryFrom;
|
||||||
|
use thiserror::Error;
|
||||||
|
|
||||||
|
#[derive(Debug, Error)]
|
||||||
|
pub enum BytesReadingError {
|
||||||
|
#[error("Empty bytes input")]
|
||||||
|
EmptyBytes,
|
||||||
|
#[error("Invalid memory: not enough bytes ({actual}) to read the expected size ({expected})")]
|
||||||
|
InvalidSize { expected: usize, actual: usize },
|
||||||
|
#[error("Invalid memory: size ({actual}) is expected to be less than {expected} bytes")]
|
||||||
|
SizeTooBig { expected: usize, actual: usize },
|
||||||
|
#[error("Invalid memory: not enough bytes to read the block id")]
|
||||||
|
InvalidBlockId(#[from] std::array::TryFromSliceError),
|
||||||
|
#[error("Error while reading field at offset {offset}")]
|
||||||
|
InvalidField {
|
||||||
|
source: Box<BytesReadingError>,
|
||||||
|
offset: usize,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Error)]
|
||||||
|
pub enum SSVMemoryError {
|
||||||
|
#[error("Error while parsing block at offset {offset}")]
|
||||||
|
BlockParsing {
|
||||||
|
source: BytesReadingError,
|
||||||
|
offset: usize,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
#[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 = BytesReadingError;
|
||||||
|
|
||||||
|
fn try_from(bytes: &[u8]) -> Result<Self, Self::Error> {
|
||||||
|
if bytes.is_empty() {
|
||||||
|
return Err(BytesReadingError::EmptyBytes);
|
||||||
|
}
|
||||||
|
|
||||||
|
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(BytesReadingError::InvalidSize {
|
||||||
|
expected: size_bytes_len,
|
||||||
|
actual: bytes.len() - 1,
|
||||||
|
});
|
||||||
|
} else if size_bytes_len > 4 {
|
||||||
|
return Err(BytesReadingError::SizeTooBig {
|
||||||
|
expected: 4,
|
||||||
|
actual: size_bytes_len,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
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> TryFrom<&'a [u8]> for Block<'a> {
|
||||||
|
type Error = BytesReadingError;
|
||||||
|
|
||||||
|
fn try_from(bytes: &'a [u8]) -> Result<Self, Self::Error> {
|
||||||
|
let mut offset = 0;
|
||||||
|
let id = u16::from_be_bytes(
|
||||||
|
bytes[..2]
|
||||||
|
.try_into()
|
||||||
|
.map_err(BytesReadingError::InvalidBlockId)?,
|
||||||
|
);
|
||||||
|
offset += 2;
|
||||||
|
let ElementSize {
|
||||||
|
size: block_size,
|
||||||
|
pad,
|
||||||
|
} = bytes[2..].try_into()?;
|
||||||
|
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..].try_into().map_err(|err| {
|
||||||
|
BytesReadingError::InvalidField {
|
||||||
|
source: Box::new(err),
|
||||||
|
offset: field_offset,
|
||||||
|
}
|
||||||
|
})?;
|
||||||
|
field.id = field_id;
|
||||||
|
field_offset += field.size;
|
||||||
|
field_id += 1;
|
||||||
|
content.push(field);
|
||||||
|
}
|
||||||
|
Ok(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> TryFrom<&'a [u8]> for Field<'a> {
|
||||||
|
type Error = BytesReadingError;
|
||||||
|
|
||||||
|
fn try_from(bytes: &'a [u8]) -> Result<Self, Self::Error> {
|
||||||
|
let ElementSize { size, pad } = bytes.try_into()?;
|
||||||
|
let contenu = &bytes[pad..pad + size];
|
||||||
|
Ok(Field {
|
||||||
|
id: 0,
|
||||||
|
size: pad + size,
|
||||||
|
content: contenu,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn decode_ssv_memory(bytes: &[u8], size: usize) -> Result<Vec<Block>, SSVMemoryError> {
|
||||||
|
let mut blocks: Vec<Block> = Vec::new();
|
||||||
|
let mut offset = 0;
|
||||||
|
while offset < size {
|
||||||
|
let block: Block =
|
||||||
|
bytes[offset..]
|
||||||
|
.try_into()
|
||||||
|
.map_err(|err| SSVMemoryError::BlockParsing {
|
||||||
|
source: err,
|
||||||
|
offset,
|
||||||
|
})?;
|
||||||
|
offset += block.size;
|
||||||
|
blocks.push(block);
|
||||||
|
}
|
||||||
|
Ok(blocks)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod test_element_size {
|
||||||
|
use std::any::Any;
|
||||||
|
|
||||||
|
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, BytesReadingError> = bytes.try_into();
|
||||||
|
assert!(result.is_err());
|
||||||
|
assert_eq!(
|
||||||
|
result.unwrap_err().type_id(),
|
||||||
|
BytesReadingError::EmptyBytes.type_id()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn invalid_memory() {
|
||||||
|
let bytes: &[u8] = &[0b_1000_0001_u8];
|
||||||
|
let result: Result<ElementSize, BytesReadingError> = bytes.try_into();
|
||||||
|
assert!(result.is_err());
|
||||||
|
assert_eq!(
|
||||||
|
result.unwrap_err().to_string(),
|
||||||
|
BytesReadingError::InvalidSize {
|
||||||
|
expected: 1,
|
||||||
|
actual: 0
|
||||||
|
}
|
||||||
|
.to_string()
|
||||||
|
);
|
||||||
|
|
||||||
|
let bytes: &[u8] = &[0b_1000_0010_u8, 1];
|
||||||
|
let result: Result<ElementSize, BytesReadingError> = bytes.try_into();
|
||||||
|
assert!(result.is_err());
|
||||||
|
assert_eq!(
|
||||||
|
result.unwrap_err().to_string(),
|
||||||
|
BytesReadingError::InvalidSize {
|
||||||
|
expected: 2,
|
||||||
|
actual: 1
|
||||||
|
}
|
||||||
|
.to_string()
|
||||||
|
);
|
||||||
|
|
||||||
|
let bytes: &[u8] = &[0b_1000_0101_u8, 1, 1, 1, 1, 1];
|
||||||
|
let result: Result<ElementSize, BytesReadingError> = bytes.try_into();
|
||||||
|
assert!(result.is_err());
|
||||||
|
assert_eq!(
|
||||||
|
result.unwrap_err().to_string(),
|
||||||
|
BytesReadingError::SizeTooBig {
|
||||||
|
expected: 4,
|
||||||
|
actual: 5
|
||||||
|
}
|
||||||
|
.to_string()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[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.try_into().unwrap();
|
||||||
|
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.try_into().unwrap();
|
||||||
|
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.try_into().unwrap();
|
||||||
|
assert_eq!(field1.size, 2);
|
||||||
|
assert_eq!(field1.content, &[48]);
|
||||||
|
|
||||||
|
let field2: Field = bytes[field1.size..].try_into().unwrap();
|
||||||
|
assert_eq!(field2.size, 2);
|
||||||
|
assert_eq!(field2.content, &[56]);
|
||||||
|
|
||||||
|
let field3: Field = bytes[field1.size + field2.size..].try_into().unwrap();
|
||||||
|
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.try_into().unwrap();
|
||||||
|
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..].try_into().unwrap();
|
||||||
|
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()).unwrap();
|
||||||
|
assert_eq!(blocks.len(), 2);
|
||||||
|
}
|
||||||
|
}
|
86
crates/sesam-vitale/src/ssvlib_demo.rs
Normal file
@ -0,0 +1,86 @@
|
|||||||
|
/// 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 thiserror::Error;
|
||||||
|
|
||||||
|
use crate::cps::lire_carte;
|
||||||
|
use crate::libssv::{SSV_InitLIB2, SSV_LireConfig};
|
||||||
|
|
||||||
|
#[derive(Error, Debug)]
|
||||||
|
pub enum SSVDemoError {
|
||||||
|
#[error(transparent)]
|
||||||
|
CartePSReading(#[from] crate::cps::CartePSError),
|
||||||
|
#[error(transparent)]
|
||||||
|
SSVLibErrorCode(#[from] crate::libssv::LibSSVError),
|
||||||
|
}
|
||||||
|
|
||||||
|
fn ssv_init_lib_2() -> Result<(), SSVDemoError> {
|
||||||
|
let ini_str = env::var("SESAM_INI_PATH").expect("SESAM_INI_PATH must be set");
|
||||||
|
let ini = CString::new(ini_str).expect("CString::new failed");
|
||||||
|
unsafe {
|
||||||
|
let result = SSV_InitLIB2(ini.as_ptr());
|
||||||
|
println!("SSV_InitLIB2 result: {}", result);
|
||||||
|
if result != 0 {
|
||||||
|
return Err(crate::libssv::LibSSVError::StandardErrorCode {
|
||||||
|
code: result,
|
||||||
|
function: "SSV_InitLIB2",
|
||||||
|
}
|
||||||
|
.into());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn ssv_lire_config() -> Result<(), SSVDemoError> {
|
||||||
|
let mut buffer: *mut c_void = ptr::null_mut();
|
||||||
|
let mut size: size_t = 0;
|
||||||
|
unsafe {
|
||||||
|
let result = SSV_LireConfig(&mut buffer, &mut size);
|
||||||
|
println!("SSV_LireConfig result: {}", result);
|
||||||
|
if result != 0 {
|
||||||
|
return Err(crate::libssv::LibSSVError::StandardErrorCode {
|
||||||
|
code: result,
|
||||||
|
function: "SSV_LireConfig",
|
||||||
|
}
|
||||||
|
.into());
|
||||||
|
}
|
||||||
|
|
||||||
|
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);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn demo() -> Result<(), SSVDemoError> {
|
||||||
|
// 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").expect("CARGO_MANIFEST_DIR must be set");
|
||||||
|
let manifest_path = PathBuf::from(manifest_dir);
|
||||||
|
dotenv::from_path(manifest_path.join(".env")).ok();
|
||||||
|
|
||||||
|
println!("------- Demo for the SSV library --------");
|
||||||
|
|
||||||
|
ssv_init_lib_2()?;
|
||||||
|
|
||||||
|
let code_pin = "1234";
|
||||||
|
let lecteur = "HID Global OMNIKEY 3x21 Smart Card Reader 0";
|
||||||
|
let carte_ps = lire_carte(code_pin, lecteur)?;
|
||||||
|
println!("CartePS: {:#?}", carte_ps);
|
||||||
|
|
||||||
|
ssv_lire_config()?;
|
||||||
|
|
||||||
|
println!("-----------------------------------------");
|
||||||
|
Ok(())
|
||||||
|
}
|
85
docs/errors.md
Normal file
@ -0,0 +1,85 @@
|
|||||||
|
# Gestion des erreurs
|
||||||
|
|
||||||
|
Ce document décrit comment les erreurs sont gérées dans le projet.
|
||||||
|
|
||||||
|
## Gestion native
|
||||||
|
|
||||||
|
Par principe, en Rust, on évite au maximum la gestion par exception, ne la réservant qu'aux situations où un crash du programme est la meilleure solution.
|
||||||
|
En temps normal, on renvoie des `Result<Valeur, Erreur>` (pour les situations réussite/erreur) ou des `Option<Valeur>` (pour les situations valeur non-nulle/nulle).
|
||||||
|
|
||||||
|
Quand on fait face à une situation d'erreur, on cherchera à la gérer de manière explicite (voir [Récupération des erreurs](#récupération-des-erreurs)) ou à la remonter à un niveau supérieur, généralement à l'aide de l'opérateur `?`.
|
||||||
|
|
||||||
|
On évitera, par contre, au maximum de générer des exceptions (appelées "panics" en Rust), que ce soit par l'usage de `panic!` ou par des appels à des fonctions qui paniquent en cas d'erreur (comme `unwrap` ou `expect`).
|
||||||
|
|
||||||
|
De nombreux exemples des idiomes natifs de gestion des erreurs en Rust sont disponibles dans la documentation [Rust by example](https://doc.rust-lang.org/rust-by-example/error.html).
|
||||||
|
|
||||||
|
## Librairies de gestion des erreurs
|
||||||
|
|
||||||
|
Deux librairies sont utilisées pour gérer les erreurs dans le projet :
|
||||||
|
- [`anyhow`](https://docs.rs/anyhow/latest/anyhow/) : qui permet de renvoyer des erreurs faiblement typées, mais très facile à enrichir avec des messages d'explication. On l'utilise pour communiquer facilement des erreurs de haut niveau avec un utilisateur final.
|
||||||
|
```rust
|
||||||
|
use anyhow::{anyhow, Result};
|
||||||
|
|
||||||
|
fn get_cluster_info() -> Result<ClusterInfo> {
|
||||||
|
let data = fs::read_to_string("cluster.json")
|
||||||
|
.with_context(|| "failed to read cluster config")?;
|
||||||
|
let info: ClusterInfo = serde_json::from_str(&data)
|
||||||
|
.with_context(|| "failed to parse cluster config")?;
|
||||||
|
Ok(info)
|
||||||
|
}
|
||||||
|
```
|
||||||
|
- [`thiserror`](https://docs.rs/thiserror/latest/thiserror/) : qui fournit des macros pour définir des erreurs fortement typées. On l'utilise pour définir des erreurs spécifiques à une partie du code, contextualisées avec des données structurées plutôt que de simples messages d'erreurs, afin de favoriser la "récupération" face aux erreurs.
|
||||||
|
```rust
|
||||||
|
use thiserror::Error;
|
||||||
|
|
||||||
|
#[derive(Error, Debug)]
|
||||||
|
pub enum DataStoreError {
|
||||||
|
#[error("data store disconnected")]
|
||||||
|
Disconnect(#[from] io::Error),
|
||||||
|
#[error("the data for key `{0}` is not available")]
|
||||||
|
Redaction(String),
|
||||||
|
#[error("invalid header (expected {expected:?}, found {found:?})")]
|
||||||
|
InvalidHeader {
|
||||||
|
expected: String,
|
||||||
|
found: String,
|
||||||
|
},
|
||||||
|
#[error("unknown data store error")]
|
||||||
|
Unknown,
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
## Récupération des erreurs
|
||||||
|
|
||||||
|
Dans la mesure du possible, on essaie de privilégier la "récupération" face à une erreur plutôt que le "crash". Les stratégies de récupération sont :
|
||||||
|
- Réessayer l'opération, tel quel ou avec des paramètres différents
|
||||||
|
- Contourner l'opération, en la remplaçant par une autre
|
||||||
|
- À défaut, informer l'utilisateur de l'erreur et :
|
||||||
|
- arrêter / annuler l'opération en cours
|
||||||
|
- ignorer l'erreur et continuer l'exécution
|
||||||
|
|
||||||
|
Quand on ne peut pas récupérer une erreur, on la remonte à un niveau supérieur, si besoin en la convertissant dans un type d'erreur plus générique et approprié au niveau considéré.
|
||||||
|
|
||||||
|
## Conversion des erreurs
|
||||||
|
|
||||||
|
Quand on remonte une erreur à un niveau supérieur, on peut être amené à la convertir dans un type d'erreur plus générique et approprié au niveau considéré. Pour faciliter cette conversion, on implémente le trait `From`. Avec `thiserror`, on peut utiliser l'attribut `#[from]` ou le paramètre `source` pour automatiser l'implémentation de telles conversions.
|
||||||
|
|
||||||
|
On peut ensuite, lors de la gestion d'une erreur, on pourra :
|
||||||
|
- soit directement renvoyer l'erreur à l'aide de l'opérateur `?`, qui se chargera de la conversion ;
|
||||||
|
- soit convertir l'erreur explicitement, par exemple en utilisant la méthode `map_err` sur un `Result`, en particulier quand on veut enrichir l'erreur avec des informations supplémentaires.
|
||||||
|
|
||||||
|
## Usages exceptionnels de `unwrap` et `expect`
|
||||||
|
|
||||||
|
Provoquant des "panics" en cas d'erreur, les fonctions `unwrap` et `expect` ne doivent être utilisées que dans des cas exceptionnels :
|
||||||
|
- Dans les tests, pour signaler une erreur de test
|
||||||
|
- Au plus haut niveau de l'application, pour signaler une erreur fatale qui ne peut pas être récupérée
|
||||||
|
- Dans des situations où l'erreur ne peut pas se produire, par exemple après une vérification de préconditions
|
||||||
|
|
||||||
|
Dans l'idéal, on préférera l'usage de `expect` à `unwrap`, car il permet de donner un message d'erreur explicite.
|
||||||
|
|
||||||
|
## Ressources
|
||||||
|
|
||||||
|
- [The Rust Programming Language - Ch. 9: Error Handling](https://doc.rust-lang.org/book/ch09-00-error-handling.html)
|
||||||
|
- [The NRC Book - Error Handling in Rust](https://nrc.github.io/error-docs/intro.html)
|
||||||
|
- [The Error Design Patterns Book - by Project Error Handling WG](https://github.com/rust-lang/project-error-handling/blob/master/error-design-patterns-book/src/SUMMARY.md)
|
||||||
|
- [The Rust Cookbook - Error Handling](https://rust-lang-nursery.github.io/rust-cookbook/error-handling.html)
|
||||||
|
- [Le ticket initial de l'intégration de la gestion des erreurs dans le projet](https://forge.p4pillon.org/P4Pillon/Krys4lide/issues/34)
|
BIN
lib/ssvw64.exp
36
make.bat
@ -1,36 +0,0 @@
|
|||||||
@echo off
|
|
||||||
rem Set variables
|
|
||||||
set SRC_DIR=src
|
|
||||||
set LIB_DIR=lib
|
|
||||||
|
|
||||||
rem Create the %LIB_DIR% directory if it does not exist
|
|
||||||
if not exist %LIB_DIR% mkdir %LIB_DIR%
|
|
||||||
|
|
||||||
if "%1"=="/clean" (
|
|
||||||
goto clean
|
|
||||||
)
|
|
||||||
|
|
||||||
rem Configure the environment for Visual Studio
|
|
||||||
call "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" x64
|
|
||||||
|
|
||||||
rem Build %SRC_DIR%\*.c files
|
|
||||||
cl /c /Fd:%LIB_DIR%\ /Fo:%LIB_DIR%\ /Iinclude\ /I%SRC_DIR%\ %SRC_DIR%\*.c
|
|
||||||
|
|
||||||
rem Link the object files into a static library
|
|
||||||
lib %LIB_DIR%\*.obj
|
|
||||||
|
|
||||||
rem Create a ssvw64.lib file from a ssvw64.def file
|
|
||||||
lib /def:%SRC_DIR%\ssvw64.def /out:%LIB_DIR%\ssvw64.lib /machine:x64
|
|
||||||
|
|
||||||
rem Build complete
|
|
||||||
pause
|
|
||||||
exit /b 0
|
|
||||||
|
|
||||||
:clean
|
|
||||||
del %LIB_DIR%\*.obj
|
|
||||||
del %LIB_DIR%\*.lib
|
|
||||||
del %LIB_DIR%\*.exp
|
|
||||||
|
|
||||||
rem Clean complete
|
|
||||||
pause
|
|
||||||
exit /b 0
|
|
32
makefile
@ -1,32 +0,0 @@
|
|||||||
# Detect the operating system
|
|
||||||
ifeq ($(OS),Windows_NT)
|
|
||||||
MKDIR = if not exist $(LIB_DIR) mkdir $(LIB_DIR)
|
|
||||||
RM = del
|
|
||||||
else
|
|
||||||
MKDIR = mkdir -p $(LIB_DIR)
|
|
||||||
RM = rm -f
|
|
||||||
endif
|
|
||||||
|
|
||||||
CC = gcc
|
|
||||||
AR = ar
|
|
||||||
CFLAGS = -Wall -fPIC
|
|
||||||
SRC_DIR = src
|
|
||||||
LIB_DIR = lib
|
|
||||||
SRC_FILES = $(wildcard $(SRC_DIR)/*.c)
|
|
||||||
OBJ_FILES = $(SRC_FILES:$(SRC_DIR)/%.c=$(LIB_DIR)/%.o)
|
|
||||||
STATIC_LIB = $(LIB_DIR)/libp4pillondebuglib.a
|
|
||||||
|
|
||||||
all: $(STATIC_LIB)
|
|
||||||
|
|
||||||
$(STATIC_LIB): $(OBJ_FILES)
|
|
||||||
$(MKDIR)
|
|
||||||
$(AR) rcs $@ $^
|
|
||||||
|
|
||||||
$(LIB_DIR)/%.o: $(SRC_DIR)/%.c
|
|
||||||
$(MKDIR)
|
|
||||||
$(CC) $(CFLAGS) -c $< -o $@
|
|
||||||
|
|
||||||
clean:
|
|
||||||
$(RM) $(OBJ_FILES) $(STATIC_LIB)
|
|
||||||
|
|
||||||
.PHONY: all clean
|
|
0
scripts/.gitkeep
Normal file
26
scripts/compile_win_headers.bat
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
@echo off
|
||||||
|
rem Set variables
|
||||||
|
set LIB_DIR=crates/sesam-vitale/lib
|
||||||
|
set DEF_DIR=crates/sesam-vitale/src/win/fsv
|
||||||
|
|
||||||
|
if "%1"=="/clean" (
|
||||||
|
goto clean
|
||||||
|
)
|
||||||
|
|
||||||
|
rem Set the environment for the x64 platform
|
||||||
|
call "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" x64
|
||||||
|
|
||||||
|
rem Create a ssvw64.lib file from the ssvw64.def file
|
||||||
|
lib /def:ssvw64.def /out:%LIB_DIR%\ssvw64.lib /machine:x64
|
||||||
|
|
||||||
|
rem Build complete
|
||||||
|
pause
|
||||||
|
exit /b 0
|
||||||
|
|
||||||
|
:clean
|
||||||
|
del %LIB_DIR%\*.lib
|
||||||
|
del %LIB_DIR%\*.exp
|
||||||
|
|
||||||
|
rem Clean complete
|
||||||
|
pause
|
||||||
|
exit /b 0
|
@ -1,7 +0,0 @@
|
|||||||
mod p4pillondebuglib_demo;
|
|
||||||
mod ssvlib_demo;
|
|
||||||
|
|
||||||
fn main() {
|
|
||||||
p4pillondebuglib_demo::demo();
|
|
||||||
ssvlib_demo::demo();
|
|
||||||
}
|
|
@ -1,57 +0,0 @@
|
|||||||
// mylib.c
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <string.h>
|
|
||||||
|
|
||||||
char* hello() {
|
|
||||||
return "Hello, World!";
|
|
||||||
}
|
|
||||||
|
|
||||||
char* helloName(const char *name) {
|
|
||||||
char *result = (char *)malloc(strlen(name) + 9);
|
|
||||||
if (result) {
|
|
||||||
sprintf(result, "Hello, %s!", name);
|
|
||||||
}
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
void helloPtr(char *result) {
|
|
||||||
sprintf(result, "Hello, World!");
|
|
||||||
}
|
|
||||||
|
|
||||||
void helloPtrPtr(char **result, size_t *size) {
|
|
||||||
const char *message = "Hello, World!";
|
|
||||||
*size = strlen(message) + 1; // +1 for null terminator
|
|
||||||
*result = (char *)malloc(*size);
|
|
||||||
if (*result) {
|
|
||||||
strcpy(*result, message);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void helloVoidPtrPtr(void **result, size_t *size) {
|
|
||||||
const char *message = "Hello, World!";
|
|
||||||
*size = strlen(message) + 1; // +1 for null terminator
|
|
||||||
*result = malloc(*size);
|
|
||||||
if (*result != NULL) {
|
|
||||||
strcpy((char *)*result, message);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
int add(int a, int b) {
|
|
||||||
return a + b;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Add function returning result in a pointer
|
|
||||||
void addPtr(int a, int b, int *result) {
|
|
||||||
*result = a + b;
|
|
||||||
}
|
|
||||||
|
|
||||||
void fillHexValues(void **result, size_t *size) {
|
|
||||||
unsigned char values[5] = {0x05, 0xE7, 0x02, 0x00, 0x00};
|
|
||||||
|
|
||||||
*size = sizeof(values);
|
|
||||||
*result = malloc(*size);
|
|
||||||
if (*result != NULL) {
|
|
||||||
memcpy(*result, values, *size);
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,15 +0,0 @@
|
|||||||
#ifndef P4PILLONDEBUGLIB_H
|
|
||||||
#define P4PILLONDEBUGLIB_H
|
|
||||||
|
|
||||||
#include <stddef.h>
|
|
||||||
|
|
||||||
char* hello();
|
|
||||||
char* helloName(const char *name);
|
|
||||||
void helloPtr(char *result);
|
|
||||||
void helloPtrPtr(char **result, size_t *size);
|
|
||||||
void helloVoidPtrPtr(void **result, size_t *size);
|
|
||||||
int add(int a, int b);
|
|
||||||
void addPtr(int a, int b, int *result);
|
|
||||||
void fillHexValues(void **result, size_t *size);
|
|
||||||
|
|
||||||
#endif // P4PILLONDEBUGLIB_H
|
|
@ -1,101 +0,0 @@
|
|||||||
extern crate libc;
|
|
||||||
|
|
||||||
use libc::{ c_char, c_int, c_void, size_t };
|
|
||||||
use std::ffi::{ CStr, CString };
|
|
||||||
use std::ptr;
|
|
||||||
|
|
||||||
#[link(name = "p4pillondebuglib")]
|
|
||||||
extern "C" {
|
|
||||||
fn hello() -> *const c_char;
|
|
||||||
fn helloName(name: *const c_char) -> *const c_char;
|
|
||||||
fn helloPtr(result: *mut c_char);
|
|
||||||
fn helloPtrPtr(result: *mut *mut c_char, size: *mut size_t);
|
|
||||||
fn helloVoidPtrPtr(result: *mut *mut c_void, size: *mut size_t);
|
|
||||||
fn add(a: c_int, b: c_int) -> c_int;
|
|
||||||
fn addPtr(a: c_int, b: c_int, result: *mut c_int);
|
|
||||||
fn fillHexValues(result: *mut *mut c_void, size: *mut size_t);
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn demo() {
|
|
||||||
println!("------- Demo for the P4PillonDebugLib ---");
|
|
||||||
|
|
||||||
unsafe {
|
|
||||||
let c_str = hello();
|
|
||||||
let r_str: &str = CStr::from_ptr(c_str).to_str().unwrap();
|
|
||||||
println!("{} from C", r_str);
|
|
||||||
}
|
|
||||||
|
|
||||||
let name = CString::new("John").expect("CString::new failed");
|
|
||||||
unsafe {
|
|
||||||
let c_str = helloName(name.as_ptr());
|
|
||||||
let r_str = CStr::from_ptr(c_str).to_str().expect("Conversion failed");
|
|
||||||
println!("{} from C with name", r_str);
|
|
||||||
|
|
||||||
libc::free(c_str as *mut c_void);
|
|
||||||
}
|
|
||||||
|
|
||||||
let mut buffer: [c_char; 50] = [0; 50];
|
|
||||||
unsafe {
|
|
||||||
helloPtr(buffer.as_mut_ptr());
|
|
||||||
let c_str = CStr::from_ptr(buffer.as_ptr());
|
|
||||||
let r_str = c_str.to_str().unwrap();
|
|
||||||
println!("{} from C Ptr", r_str);
|
|
||||||
}
|
|
||||||
|
|
||||||
let mut buffer: *mut c_char = ptr::null_mut();
|
|
||||||
let mut size: size_t = 0;
|
|
||||||
unsafe {
|
|
||||||
helloPtrPtr(&mut buffer, &mut size);
|
|
||||||
|
|
||||||
if !buffer.is_null() {
|
|
||||||
let c_str = CStr::from_ptr(buffer);
|
|
||||||
let r_str = c_str.to_str().unwrap();
|
|
||||||
println!("{} from C Ptr Ptr (size: {})", r_str, size);
|
|
||||||
|
|
||||||
libc::free(buffer as *mut c_void);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
let mut buffer: *mut c_void = ptr::null_mut();
|
|
||||||
let mut size: size_t = 0;
|
|
||||||
unsafe {
|
|
||||||
helloVoidPtrPtr(&mut buffer, &mut size);
|
|
||||||
|
|
||||||
if !buffer.is_null() {
|
|
||||||
let c_str = CStr::from_ptr(buffer as *const c_char);
|
|
||||||
let r_str = c_str.to_str().unwrap();
|
|
||||||
println!("{} from C Void Ptr Ptr (size: {})", r_str, size);
|
|
||||||
|
|
||||||
libc::free(buffer);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
unsafe {
|
|
||||||
let result = add(1, 2);
|
|
||||||
println!("Result of 1 + 2 = {}", result);
|
|
||||||
}
|
|
||||||
|
|
||||||
unsafe {
|
|
||||||
let mut result = 0;
|
|
||||||
addPtr(1, 2, &mut result);
|
|
||||||
println!("Result Ptr of 1 + 2 = {}", result);
|
|
||||||
}
|
|
||||||
|
|
||||||
let mut buffer: *mut c_void = ptr::null_mut();
|
|
||||||
let mut size: size_t = 0;
|
|
||||||
unsafe {
|
|
||||||
fillHexValues(&mut buffer, &mut size);
|
|
||||||
|
|
||||||
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);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
println!("-----------------------------------------");
|
|
||||||
}
|
|
@ -1,84 +0,0 @@
|
|||||||
extern crate libc;
|
|
||||||
extern crate dotenv;
|
|
||||||
|
|
||||||
use libc::{ c_char, c_void, c_ushort, size_t };
|
|
||||||
use std::ffi::CString;
|
|
||||||
use std::ptr;
|
|
||||||
|
|
||||||
use dotenv::dotenv;
|
|
||||||
use std::env;
|
|
||||||
|
|
||||||
extern "C" {
|
|
||||||
fn SSV_InitLIB2(pcRepSesamIni: *const c_char) -> c_ushort;
|
|
||||||
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;
|
|
||||||
fn SSV_LireConfig(ZDonneesSortie: *mut *mut c_void, TTailleDonneesSortie: *mut size_t) -> c_ushort;
|
|
||||||
}
|
|
||||||
|
|
||||||
fn ssv_init_lib_2() {
|
|
||||||
let ini_str = env::var("SESAM_INI_PATH").expect("SESAM_INI_PATH must be set");
|
|
||||||
let ini = CString::new(ini_str).expect("CString::new failed");
|
|
||||||
unsafe {
|
|
||||||
let result = SSV_InitLIB2(ini.as_ptr());
|
|
||||||
println!("SSV_InitLIB2 result: {}", result);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
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;
|
|
||||||
unsafe {
|
|
||||||
let result = SSV_LireConfig(&mut buffer, &mut size);
|
|
||||||
println!("SSV_LireConfig 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);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn demo() {
|
|
||||||
dotenv().ok();
|
|
||||||
|
|
||||||
println!("------- Demo for the SSV library --------");
|
|
||||||
|
|
||||||
ssv_init_lib_2();
|
|
||||||
ssv_lire_carte_ps();
|
|
||||||
ssv_lire_config();
|
|
||||||
|
|
||||||
println!("-----------------------------------------");
|
|
||||||
}
|
|