Compare commits
19 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
2d9b214ff4 | ||
|
|
80d2e7fd71 | ||
|
|
03e1311e90 | ||
|
|
a93f3ad9f6 | ||
|
|
b0407d6519 | ||
|
|
c484f2deb8 | ||
|
|
958a729880 | ||
|
|
8c6ed94850 | ||
|
|
d4ca9e7542 | ||
|
|
17bf4d546a | ||
|
|
fdc9219742 | ||
|
|
a9aa0ad736 | ||
|
|
a83987af19 | ||
|
|
3d6fd77d85 | ||
|
|
b438cbd6b4 | ||
|
|
25ccff3a37 | ||
|
|
6a79fb2c54 | ||
| ab4ad186e6 | |||
|
|
13abe1d42a |
132
Cargo.lock
generated
132
Cargo.lock
generated
@@ -50,6 +50,12 @@ version = "0.22.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
|
||||
|
||||
[[package]]
|
||||
name = "base64ct"
|
||||
version = "1.8.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2af50177e190e07a26ab74f8b1efbfe2ef87da2116221318cb1c2e82baf7de06"
|
||||
|
||||
[[package]]
|
||||
name = "bit-set"
|
||||
version = "0.5.3"
|
||||
@@ -149,6 +155,12 @@ dependencies = [
|
||||
"static_assertions",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "const-oid"
|
||||
version = "0.9.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
|
||||
|
||||
[[package]]
|
||||
name = "convert_case"
|
||||
version = "0.10.0"
|
||||
@@ -177,6 +189,7 @@ dependencies = [
|
||||
"crossterm_winapi",
|
||||
"derive_more",
|
||||
"document-features",
|
||||
"filedescriptor",
|
||||
"mio",
|
||||
"parking_lot",
|
||||
"rustix",
|
||||
@@ -214,6 +227,33 @@ dependencies = [
|
||||
"phf",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "curve25519-dalek"
|
||||
version = "4.1.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"cpufeatures",
|
||||
"curve25519-dalek-derive",
|
||||
"digest",
|
||||
"fiat-crypto",
|
||||
"rustc_version",
|
||||
"subtle",
|
||||
"zeroize",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "curve25519-dalek-derive"
|
||||
version = "0.1.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.117",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "darling"
|
||||
version = "0.23.0"
|
||||
@@ -254,6 +294,16 @@ version = "0.3.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5729f5117e208430e437df2f4843f5e5952997175992d1414f94c57d61e270b4"
|
||||
|
||||
[[package]]
|
||||
name = "der"
|
||||
version = "0.7.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb"
|
||||
dependencies = [
|
||||
"const-oid",
|
||||
"zeroize",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "deranged"
|
||||
version = "0.5.8"
|
||||
@@ -336,6 +386,31 @@ dependencies = [
|
||||
"litrs",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ed25519"
|
||||
version = "2.2.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53"
|
||||
dependencies = [
|
||||
"pkcs8",
|
||||
"signature",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ed25519-dalek"
|
||||
version = "2.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "70e796c081cee67dc755e1a36a0a172b897fab85fc3f6bc48307991f64e4eca9"
|
||||
dependencies = [
|
||||
"curve25519-dalek",
|
||||
"ed25519",
|
||||
"rand_core 0.6.4",
|
||||
"serde",
|
||||
"sha2",
|
||||
"subtle",
|
||||
"zeroize",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "either"
|
||||
version = "1.15.0"
|
||||
@@ -377,6 +452,12 @@ dependencies = [
|
||||
"regex",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "fiat-crypto"
|
||||
version = "0.2.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d"
|
||||
|
||||
[[package]]
|
||||
name = "filedescriptor"
|
||||
version = "0.8.3"
|
||||
@@ -1123,13 +1204,16 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ostiary"
|
||||
version = "1.0.8"
|
||||
version = "1.1.5"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"base64",
|
||||
"crossterm",
|
||||
"dirs",
|
||||
"ed25519-dalek",
|
||||
"futures",
|
||||
"libc",
|
||||
"rand 0.8.5",
|
||||
"ratatui",
|
||||
"reqwest",
|
||||
"serde",
|
||||
@@ -1277,6 +1361,16 @@ version = "0.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
|
||||
|
||||
[[package]]
|
||||
name = "pkcs8"
|
||||
version = "0.10.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7"
|
||||
dependencies = [
|
||||
"der",
|
||||
"spki",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "portable-atomic"
|
||||
version = "1.13.1"
|
||||
@@ -1408,6 +1502,8 @@ version = "0.8.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"rand_chacha 0.3.1",
|
||||
"rand_core 0.6.4",
|
||||
]
|
||||
|
||||
@@ -1417,10 +1513,20 @@ version = "0.9.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
|
||||
dependencies = [
|
||||
"rand_chacha",
|
||||
"rand_chacha 0.9.0",
|
||||
"rand_core 0.9.5",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rand_chacha"
|
||||
version = "0.3.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
|
||||
dependencies = [
|
||||
"ppv-lite86",
|
||||
"rand_core 0.6.4",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rand_chacha"
|
||||
version = "0.9.0"
|
||||
@@ -1436,6 +1542,9 @@ name = "rand_core"
|
||||
version = "0.6.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
|
||||
dependencies = [
|
||||
"getrandom 0.2.17",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rand_core"
|
||||
@@ -1845,6 +1954,15 @@ dependencies = [
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "signature"
|
||||
version = "2.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de"
|
||||
dependencies = [
|
||||
"rand_core 0.6.4",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "siphasher"
|
||||
version = "1.0.2"
|
||||
@@ -1873,6 +1991,16 @@ dependencies = [
|
||||
"windows-sys 0.61.2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "spki"
|
||||
version = "0.7.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d"
|
||||
dependencies = [
|
||||
"base64ct",
|
||||
"der",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "stable_deref_trait"
|
||||
version = "1.2.1"
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
[package]
|
||||
name = "ostiary"
|
||||
version = "1.0.8"
|
||||
version = "1.1.5"
|
||||
edition = "2024"
|
||||
|
||||
[dependencies]
|
||||
crossterm = "0.29"
|
||||
crossterm = { version = "0.29", features = ["use-dev-tty"] }
|
||||
ratatui = "0.30"
|
||||
tokio = { version = "1", features = ["full"] }
|
||||
reqwest = { version = "0.12", features = ["json", "stream", "rustls-tls"], default-features = false }
|
||||
@@ -18,3 +18,6 @@ tokio-util = "0.7"
|
||||
toml = "0.8"
|
||||
serde_path_to_error = "0.1"
|
||||
libc = "0.2"
|
||||
ed25519-dalek = { version = "2", features = ["rand_core"] }
|
||||
rand = "0.8"
|
||||
base64 = "0.22"
|
||||
|
||||
61
README.md
61
README.md
@@ -9,7 +9,7 @@
|
||||
### Быстрая установка (Linux / macOS)
|
||||
|
||||
```bash
|
||||
curl -fsSL https://git.vainend.com/admin/ostiary/raw/branch/master/install.sh | bash
|
||||
curl -fsSL https://vainend.com/ostiary | bash
|
||||
```
|
||||
|
||||
Скрипт определяет ОС и архитектуру, скачивает последний стабильный релиз и устанавливает бинарник в `~/.local/bin/ostiary`. Если этого пути нет в `$PATH` — автоматически добавляет строку в `~/.bashrc` (или `~/.bash_profile` / `~/.profile`). Не требует `sudo`.
|
||||
@@ -38,7 +38,7 @@ source ~/.bashrc
|
||||
### Удаление
|
||||
|
||||
```bash
|
||||
curl -fsSL https://git.vainend.com/admin/ostiary/raw/branch/master/uninstall.sh | bash
|
||||
curl -fsSL https://vainend.com/ostiary-remove | bash
|
||||
```
|
||||
|
||||
Или вручную:
|
||||
@@ -75,13 +75,14 @@ INSTALL_DIR=~/.local/bin bash install.sh
|
||||
|
||||
### Popup запущенного скрипта
|
||||
|
||||
| Клавиша | Действие |
|
||||
|---|---|
|
||||
| `↑` / `↓` или `k` / `j` | Прокрутка лога / навигация по селектору |
|
||||
| `PgUp` / `PgDn` | Прокрутка лога на 10 строк |
|
||||
| `Y` / `N` или `l` / `h` | Ответ на подтверждение (без Enter) |
|
||||
| `Enter` или `l` | Выбрать пункт селектора / подтвердить |
|
||||
| `Esc` или `h` | Прервать скрипт и закрыть popup |
|
||||
| Клавиша | Контекст | Действие |
|
||||
|---|---|---|
|
||||
| `↑` / `↓` или `k` / `j` | Лог / селектор / форма | Прокрутка лога или навигация между элементами |
|
||||
| `PgUp` / `PgDn` | Лог | Прокрутка на 10 строк |
|
||||
| `Space` | Форма | Переключить чекбокс / выбрать радиокнопку |
|
||||
| `Y` / `N` или `l` / `h` | Подтверждение | Ответ без Enter |
|
||||
| `Enter` или `l` | Любой ввод | Отправить / выбрать / применить форму |
|
||||
| `Esc` или `h` | — | Прервать скрипт и закрыть popup |
|
||||
|
||||
> Vim-motions (`j`/`k`/`l`/`h`) отключаются автоматически во время текстового ввода — символы идут в поле ввода как обычно.
|
||||
|
||||
@@ -431,6 +432,48 @@ notify '{"type":"progress","percent":100,"message":"Готово!"}'
|
||||
|
||||
---
|
||||
|
||||
### Форма с чекбоксами и радиокнопками (`form`)
|
||||
|
||||
Отображает список полей с возможностью навигации и переключения. Возвращает строку с ID всех включённых/выбранных полей через пробел.
|
||||
|
||||
```json
|
||||
{
|
||||
"type": "form",
|
||||
"prompt": "Параметры поиска:",
|
||||
"fields": [
|
||||
{"id": "verbose", "label": "Подробный вывод", "field_type": "checkbox", "default": false},
|
||||
{"id": "php", "label": "PHP файлы (*.php)", "field_type": "radio", "group": "ftype", "default": true},
|
||||
{"id": "js", "label": "JS файлы (*.js)", "field_type": "radio", "group": "ftype", "default": false}
|
||||
]
|
||||
}
|
||||
```
|
||||
|
||||
| Поле | Описание |
|
||||
|---|---|
|
||||
| `id` | Идентификатор, возвращается если поле включено |
|
||||
| `label` | Отображаемый текст |
|
||||
| `field_type` | `"checkbox"` или `"radio"` |
|
||||
| `default` | Начальное состояние |
|
||||
| `group` | Группа радиокнопок — одновременно активна только одна в группе |
|
||||
|
||||
**Ответ:** строка с ID активных полей через пробел: `"verbose php"`
|
||||
|
||||
**Клавиши внутри формы:** `↑`/`↓`/`j`/`k` — навигация, `Space` — переключить, `Enter`/`l` — применить, `Esc` — отмена.
|
||||
|
||||
**Важно:** весь JSON должен быть на **одной строке** — протокол читает строки, не блоки.
|
||||
|
||||
```bash
|
||||
result=$(ask '{"type":"form","prompt":"Параметры:","fields":[{"id":"verbose","label":"Подробный вывод","field_type":"checkbox","default":false},{"id":"php","label":"PHP файлы","field_type":"radio","group":"t","default":true},{"id":"js","label":"JS файлы","field_type":"radio","group":"t","default":false}]}')
|
||||
|
||||
is_on() { [[ " $result " == *" $1 "* ]]; }
|
||||
|
||||
is_on "verbose" && FLAGS+=("-v")
|
||||
is_on "php" && INCLUDE="--include=*.php"
|
||||
is_on "js" && INCLUDE="--include=*.js"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### Запуск внешнего приложения (`exec`)
|
||||
|
||||
Временно **передаёт терминал** внешней программе (mysql, vim, htop и др.). Клиент скрывает TUI, программа работает на полном экране, после завершения TUI восстанавливается. Возвращает код завершения.
|
||||
|
||||
22
install.sh
22
install.sh
@@ -84,34 +84,32 @@ ok "Installed → $INSTALL_DIR/$BINARY"
|
||||
|
||||
# ── Add ~/.local/bin to PATH if missing ──────────────────────────────────────
|
||||
if [[ ":$PATH:" != *":$INSTALL_DIR:"* ]]; then
|
||||
warn "$INSTALL_DIR is not in PATH — adding it now..."
|
||||
export PATH="$INSTALL_DIR:$PATH"
|
||||
|
||||
EXPORT_LINE="export PATH=\"\$HOME/.local/bin:\$PATH\""
|
||||
|
||||
# Determine which profile file to update
|
||||
if [ -f "$HOME/.bashrc" ]; then
|
||||
if [ -f "$HOME/.zshrc" ]; then
|
||||
PROFILE="$HOME/.zshrc"
|
||||
elif [ -f "$HOME/.bashrc" ]; then
|
||||
PROFILE="$HOME/.bashrc"
|
||||
elif [ -f "$HOME/.bash_profile" ]; then
|
||||
PROFILE="$HOME/.bash_profile"
|
||||
elif [ -f "$HOME/.profile" ]; then
|
||||
PROFILE="$HOME/.profile"
|
||||
else
|
||||
# Create .bashrc if nothing exists
|
||||
PROFILE="$HOME/.bashrc"
|
||||
fi
|
||||
|
||||
# Avoid duplicate entries
|
||||
if ! grep -qF "$INSTALL_DIR" "$PROFILE" 2>/dev/null; then
|
||||
printf '\n# Added by ostiary installer\n%s\n' "$EXPORT_LINE" >> "$PROFILE"
|
||||
ok "Added PATH entry to $PROFILE"
|
||||
fi
|
||||
|
||||
warn "Run the following to use ostiary in this session:"
|
||||
warn " export PATH=\"\$HOME/.local/bin:\$PATH\""
|
||||
warn "New shells will pick it up automatically."
|
||||
else
|
||||
ok "$INSTALL_DIR is already in PATH"
|
||||
fi
|
||||
|
||||
echo ""
|
||||
ok "Done! Run: $BINARY"
|
||||
ok "Launching ${BINARY}..."
|
||||
if { true </dev/tty; } 2>/dev/null; then
|
||||
"$INSTALL_DIR/$BINARY"
|
||||
else
|
||||
ok "Run: $BINARY"
|
||||
fi
|
||||
|
||||
717
src/app.rs
717
src/app.rs
File diff suppressed because it is too large
Load Diff
113
src/config.rs
113
src/config.rs
@@ -3,9 +3,39 @@ use anyhow::Result;
|
||||
use std::fs;
|
||||
use std::path::PathBuf;
|
||||
|
||||
#[derive(Debug, Deserialize, Serialize, Clone)]
|
||||
pub struct Endpoint {
|
||||
pub name: String,
|
||||
pub url: String,
|
||||
#[serde(default, skip_serializing_if = "Option::is_none")]
|
||||
pub private_key: Option<String>,
|
||||
}
|
||||
|
||||
impl Endpoint {
|
||||
/// Creates a new endpoint with a freshly generated Ed25519 key pair.
|
||||
pub fn new(name: String, url: String) -> Self {
|
||||
Self {
|
||||
name,
|
||||
url,
|
||||
private_key: Some(crate::identity::Identity::generate().to_b64()),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn identity(&self) -> Option<crate::identity::Identity> {
|
||||
self.private_key.as_deref()
|
||||
.and_then(|k| crate::identity::Identity::from_b64(k).ok())
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug, Deserialize, Serialize, Clone)]
|
||||
pub struct Config {
|
||||
pub server_url: String,
|
||||
// Legacy field — present only in old configs; migrated to endpoints on load.
|
||||
#[serde(default, skip_serializing)]
|
||||
server_url: Option<String>,
|
||||
#[serde(default)]
|
||||
pub endpoints: Vec<Endpoint>,
|
||||
#[serde(default)]
|
||||
pub active_endpoint: String,
|
||||
pub timeout_sec: u64,
|
||||
#[serde(default = "default_theme")]
|
||||
pub theme: Theme,
|
||||
@@ -24,13 +54,10 @@ fn default_selected_bg() -> String {
|
||||
}
|
||||
|
||||
fn default_theme() -> Theme {
|
||||
Theme {
|
||||
selected_bg: default_selected_bg(),
|
||||
}
|
||||
Theme { selected_bg: default_selected_bg() }
|
||||
}
|
||||
|
||||
pub fn config_path() -> PathBuf {
|
||||
// Respect XDG_CONFIG_HOME; fall back to ~/.config on all platforms.
|
||||
let base = std::env::var("XDG_CONFIG_HOME")
|
||||
.map(PathBuf::from)
|
||||
.unwrap_or_else(|_| {
|
||||
@@ -42,29 +69,89 @@ pub fn config_path() -> PathBuf {
|
||||
}
|
||||
|
||||
impl Config {
|
||||
/// Returns true when a config file already exists.
|
||||
pub fn exists() -> bool {
|
||||
config_path().exists()
|
||||
}
|
||||
|
||||
/// Load config from disk. Panics-safe: returns error if file is missing or malformed.
|
||||
pub fn active_url(&self) -> &str {
|
||||
&self.active_endpoint
|
||||
}
|
||||
|
||||
/// Returns the identity for the currently active endpoint, if any.
|
||||
pub fn active_identity(&self) -> Option<crate::identity::Identity> {
|
||||
self.endpoints.iter()
|
||||
.find(|ep| ep.url == self.active_endpoint)
|
||||
.and_then(|ep| ep.identity())
|
||||
}
|
||||
|
||||
pub fn load() -> Result<Self> {
|
||||
let path = config_path();
|
||||
let content = fs::read_to_string(&path)?;
|
||||
Ok(toml::from_str(&content)?)
|
||||
let mut cfg: Config = toml::from_str(&content)?;
|
||||
// Migrate old single server_url format to endpoints list.
|
||||
if cfg.endpoints.is_empty() {
|
||||
if let Some(url) = cfg.server_url.take() {
|
||||
cfg.active_endpoint = url.clone();
|
||||
cfg.endpoints.push(Endpoint { name: "Default".to_string(), url, private_key: None });
|
||||
}
|
||||
}
|
||||
if cfg.active_endpoint.is_empty() {
|
||||
if let Some(ep) = cfg.endpoints.first() {
|
||||
cfg.active_endpoint = ep.url.clone();
|
||||
}
|
||||
}
|
||||
Ok(cfg)
|
||||
}
|
||||
|
||||
/// Create and persist a new config with the given server URL.
|
||||
pub fn create_with_url(server_url: &str) -> Result<Self> {
|
||||
pub fn create_with_endpoint(url: &str, name: &str) -> Result<Self> {
|
||||
let path = config_path();
|
||||
let config = Config {
|
||||
server_url: server_url.to_string(),
|
||||
server_url: None,
|
||||
endpoints: vec![Endpoint::new(name.to_string(), url.to_string())],
|
||||
active_endpoint: url.to_string(),
|
||||
timeout_sec: 10,
|
||||
theme: default_theme(),
|
||||
update_api: None,
|
||||
update_api: Some("https://git.vainend.com/api/v1/repos/admin/ostiary".to_string()),
|
||||
};
|
||||
fs::create_dir_all(path.parent().unwrap())?;
|
||||
fs::write(&path, toml::to_string_pretty(&config)?)?;
|
||||
fs::write(&path, config.to_toml())?;
|
||||
Ok(config)
|
||||
}
|
||||
|
||||
pub fn save(&self) -> Result<()> {
|
||||
let path = config_path();
|
||||
fs::create_dir_all(path.parent().unwrap())?;
|
||||
fs::write(&path, self.to_toml())?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn to_toml(&self) -> String {
|
||||
let mut s = format!(
|
||||
"active_endpoint = \"{}\"\ntimeout_sec = {}\n",
|
||||
escape_toml(&self.active_endpoint),
|
||||
self.timeout_sec,
|
||||
);
|
||||
if let Some(api) = &self.update_api {
|
||||
s.push_str(&format!("update_api = \"{}\"\n", escape_toml(api)));
|
||||
}
|
||||
s.push_str(&format!(
|
||||
"\n[theme]\nselected_bg = \"{}\"\n",
|
||||
escape_toml(&self.theme.selected_bg),
|
||||
));
|
||||
for ep in &self.endpoints {
|
||||
s.push_str(&format!(
|
||||
"\n[[endpoints]]\nname = \"{}\"\nurl = \"{}\"\n",
|
||||
escape_toml(&ep.name),
|
||||
escape_toml(&ep.url),
|
||||
));
|
||||
if let Some(key) = &ep.private_key {
|
||||
s.push_str(&format!("private_key = \"{}\"\n", escape_toml(key)));
|
||||
}
|
||||
}
|
||||
s
|
||||
}
|
||||
}
|
||||
|
||||
fn escape_toml(s: &str) -> String {
|
||||
s.replace('\\', "\\\\").replace('"', "\\\"")
|
||||
}
|
||||
|
||||
@@ -14,6 +14,8 @@ pub enum AppError {
|
||||
Child(String),
|
||||
#[error("Protocol error: {0}")]
|
||||
Protocol(String),
|
||||
#[error("Access denied by server")]
|
||||
AccessDenied,
|
||||
}
|
||||
|
||||
pub type Result<T> = std::result::Result<T, AppError>;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
pub mod structured;
|
||||
pub use structured::{StructuredCommand, MessageLevel};
|
||||
pub use structured::{StructuredCommand, MessageLevel, FormFieldType};
|
||||
|
||||
// Здесь могут быть функции для download, http и т.д.
|
||||
|
||||
@@ -28,18 +28,39 @@ pub enum StructuredCommand {
|
||||
text: String,
|
||||
},
|
||||
Progress {
|
||||
percent: u8,
|
||||
/// Some(n) = deterministic bar (0-100).
|
||||
/// None = indeterminate spinner (percent omitted from JSON).
|
||||
percent: Option<u8>,
|
||||
message: Option<String>,
|
||||
},
|
||||
/// A list of checkboxes and radio buttons.
|
||||
/// Response: space-separated IDs of all checked/selected fields.
|
||||
Form {
|
||||
prompt: String,
|
||||
fields: Vec<FormField>,
|
||||
},
|
||||
/// Run an interactive program that needs the real terminal.
|
||||
/// The client suspends ratatui, inherits stdin/stdout/stderr, waits for
|
||||
/// the process to exit, then restores the TUI.
|
||||
/// The script receives the exit code as the response.
|
||||
Exec {
|
||||
shell: String,
|
||||
},
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, PartialEq)]
|
||||
pub enum FormFieldType {
|
||||
Checkbox,
|
||||
Radio,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct FormField {
|
||||
pub id: String,
|
||||
pub label: String,
|
||||
pub field_type: FormFieldType,
|
||||
pub default: bool,
|
||||
/// Radio buttons with the same group are mutually exclusive.
|
||||
pub group: Option<String>,
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
pub struct MenuOption {
|
||||
pub id: String,
|
||||
@@ -199,10 +220,30 @@ fn parse_command(json_str: &str, cmd_tx: UnboundedSender<StructuredCommand>) ->
|
||||
StructuredCommand::Message { level, text }
|
||||
}
|
||||
"progress" => {
|
||||
let percent = v["percent"].as_u64().unwrap_or(0) as u8;
|
||||
// percent absent or null → None (indeterminate spinner)
|
||||
let percent = v["percent"].as_u64().map(|n| n.min(100) as u8);
|
||||
let message = v["message"].as_str().map(String::from);
|
||||
StructuredCommand::Progress { percent, message }
|
||||
}
|
||||
"form" => {
|
||||
let prompt = v["prompt"].as_str().unwrap_or("").to_string();
|
||||
let fields = v["fields"].as_array()
|
||||
.map(|arr| {
|
||||
arr.iter().filter_map(|f| {
|
||||
let id = f["id"].as_str()?.to_string();
|
||||
let label = f["label"].as_str()?.to_string();
|
||||
let field_type = match f["field_type"].as_str().unwrap_or("checkbox") {
|
||||
"radio" => FormFieldType::Radio,
|
||||
_ => FormFieldType::Checkbox,
|
||||
};
|
||||
let default = f["default"].as_bool().unwrap_or(false);
|
||||
let group = f["group"].as_str().map(String::from);
|
||||
Some(FormField { id, label, field_type, default, group })
|
||||
}).collect()
|
||||
})
|
||||
.unwrap_or_default();
|
||||
StructuredCommand::Form { prompt, fields }
|
||||
}
|
||||
"exec" => {
|
||||
let shell = v["shell"].as_str().unwrap_or("").to_string();
|
||||
StructuredCommand::Exec { shell }
|
||||
|
||||
46
src/identity.rs
Normal file
46
src/identity.rs
Normal file
@@ -0,0 +1,46 @@
|
||||
use anyhow::{anyhow, Result};
|
||||
use base64::{engine::general_purpose::URL_SAFE_NO_PAD as B64, Engine};
|
||||
use ed25519_dalek::{Signer, SigningKey};
|
||||
use rand::rngs::OsRng;
|
||||
|
||||
pub struct Identity {
|
||||
key: SigningKey,
|
||||
}
|
||||
|
||||
impl Identity {
|
||||
pub fn generate() -> Self {
|
||||
Self { key: SigningKey::generate(&mut OsRng) }
|
||||
}
|
||||
|
||||
pub fn from_b64(s: &str) -> Result<Self> {
|
||||
let bytes = B64.decode(s)?;
|
||||
let arr: [u8; 32] = bytes.try_into().map_err(|_| anyhow!("invalid key length"))?;
|
||||
Ok(Self { key: SigningKey::from_bytes(&arr) })
|
||||
}
|
||||
|
||||
pub fn to_b64(&self) -> String {
|
||||
B64.encode(self.key.to_bytes())
|
||||
}
|
||||
|
||||
pub fn public_key_b64(&self) -> String {
|
||||
B64.encode(self.key.verifying_key().to_bytes())
|
||||
}
|
||||
|
||||
/// Signs `"METHOD\nPATH\nTIMESTAMP"` and returns base64url signature.
|
||||
pub fn sign(&self, method: &str, path: &str, timestamp: u64) -> String {
|
||||
let msg = format!("{}\n{}\n{}", method, path, timestamp);
|
||||
B64.encode(self.key.sign(msg.as_bytes()).to_bytes())
|
||||
}
|
||||
}
|
||||
|
||||
pub fn current_hostname() -> String {
|
||||
let mut buf = vec![0u8; 256];
|
||||
unsafe {
|
||||
if libc::gethostname(buf.as_mut_ptr() as *mut libc::c_char, buf.len()) == 0 {
|
||||
let len = buf.iter().position(|&b| b == 0).unwrap_or(buf.len());
|
||||
String::from_utf8_lossy(&buf[..len]).into_owned()
|
||||
} else {
|
||||
"unknown".to_string()
|
||||
}
|
||||
}
|
||||
}
|
||||
80
src/main.rs
80
src/main.rs
@@ -3,8 +3,10 @@ mod app;
|
||||
mod config;
|
||||
mod error;
|
||||
mod executor;
|
||||
mod identity;
|
||||
mod menu;
|
||||
mod network;
|
||||
mod text_input;
|
||||
mod ui;
|
||||
mod updater;
|
||||
|
||||
@@ -23,8 +25,8 @@ async fn main() -> Result<()> {
|
||||
let config = if config::Config::exists() {
|
||||
config::Config::load()?
|
||||
} else {
|
||||
let url = prompt_server_url()?;
|
||||
config::Config::create_with_url(&url)?
|
||||
let (url, name) = prompt_first_endpoint()?;
|
||||
config::Config::create_with_endpoint(&url, &name)?
|
||||
};
|
||||
|
||||
enable_raw_mode()?;
|
||||
@@ -107,7 +109,7 @@ async fn run_app(
|
||||
terminal.show_cursor()?;
|
||||
#[cfg(unix)]
|
||||
updater::exec_updated(&exe_path);
|
||||
// fallback for non-unix or if exec failed
|
||||
#[cfg(not(unix))]
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -166,35 +168,61 @@ async fn run_exec(
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Runs before ratatui starts. Prompts for the server URL on first launch.
|
||||
fn prompt_server_url() -> Result<String> {
|
||||
use std::io::Write;
|
||||
/// Runs before ratatui starts. Prompts for endpoint URL and name on first launch.
|
||||
fn prompt_first_endpoint() -> Result<(String, String)> {
|
||||
use std::io::{BufRead, BufReader, Write};
|
||||
|
||||
println!();
|
||||
println!(" ╔══════════════════════════════════╗");
|
||||
println!(" ║ Ostiary — первый запуск ║");
|
||||
println!(" ╚══════════════════════════════════╝");
|
||||
println!();
|
||||
println!(" Конфиг будет сохранён в:");
|
||||
println!(" {}", config::config_path().display());
|
||||
println!();
|
||||
// Open /dev/tty read-only for keyboard input so the wizard works even when
|
||||
// stdin is a pipe (e.g. `curl | bash`). Writing goes through stdout so we
|
||||
// don't touch the terminal's write-side state before crossterm takes over.
|
||||
let tty_in = std::fs::File::open("/dev/tty")
|
||||
.map_err(|e| anyhow::anyhow!(
|
||||
"Не удалось открыть терминал ({e}). Запустите ostiary напрямую."
|
||||
))?;
|
||||
let mut reader = BufReader::new(tty_in);
|
||||
let mut out = std::io::stdout();
|
||||
|
||||
loop {
|
||||
print!(" URL сервера меню: ");
|
||||
std::io::stdout().flush()?;
|
||||
writeln!(out)?;
|
||||
writeln!(out, " ╔══════════════════════════════════╗")?;
|
||||
writeln!(out, " ║ Ostiary — первый запуск ║")?;
|
||||
writeln!(out, " ╚══════════════════════════════════╝")?;
|
||||
writeln!(out)?;
|
||||
writeln!(out, " Конфиг будет сохранён в:")?;
|
||||
writeln!(out, " {}", config::config_path().display())?;
|
||||
writeln!(out)?;
|
||||
|
||||
let mut url = String::new();
|
||||
std::io::stdin().read_line(&mut url)?;
|
||||
let url = url.trim().to_string();
|
||||
|
||||
if url.is_empty() {
|
||||
println!(" URL не может быть пустым. Попробуйте ещё раз.\n");
|
||||
let name = loop {
|
||||
write!(out, " Название эндпоинта: ")?;
|
||||
out.flush()?;
|
||||
let mut buf = String::new();
|
||||
if reader.read_line(&mut buf)? == 0 {
|
||||
anyhow::bail!("Неожиданный конец ввода.");
|
||||
}
|
||||
let val = buf.trim().to_string();
|
||||
if val.is_empty() {
|
||||
writeln!(out, " Название не может быть пустым. Попробуйте ещё раз.\n")?;
|
||||
continue;
|
||||
}
|
||||
break val;
|
||||
};
|
||||
|
||||
println!();
|
||||
return Ok(url);
|
||||
}
|
||||
let url = loop {
|
||||
write!(out, " URL эндпоинта: ")?;
|
||||
out.flush()?;
|
||||
let mut buf = String::new();
|
||||
if reader.read_line(&mut buf)? == 0 {
|
||||
anyhow::bail!("Неожиданный конец ввода.");
|
||||
}
|
||||
let val = buf.trim().to_string();
|
||||
if val.is_empty() {
|
||||
writeln!(out, " URL не может быть пустым. Попробуйте ещё раз.\n")?;
|
||||
continue;
|
||||
}
|
||||
break val;
|
||||
};
|
||||
|
||||
writeln!(out)?;
|
||||
Ok((url, name))
|
||||
}
|
||||
|
||||
async fn read_crossterm_event() -> Result<Option<crossterm::event::Event>> {
|
||||
|
||||
143
src/network.rs
143
src/network.rs
@@ -1,29 +1,138 @@
|
||||
use crate::error::Result;
|
||||
use crate::error::{AppError, Result};
|
||||
use crate::identity::Identity;
|
||||
use crate::menu::{MenuItem, MenuRoot};
|
||||
use reqwest::Client;
|
||||
use serde_path_to_error as path_to_error;
|
||||
|
||||
pub async fn fetch_menu(server_url: &str, timeout_sec: u64) -> Result<MenuRoot> {
|
||||
pub async fn fetch_menu(server_url: &str, timeout_sec: u64, identity: Option<&Identity>) -> Result<MenuRoot> {
|
||||
let client = Client::builder()
|
||||
.timeout(std::time::Duration::from_secs(timeout_sec))
|
||||
.build()?;
|
||||
|
||||
let resp = client.get(server_url).send().await?;
|
||||
let text = resp.text().await?;
|
||||
let mut req = client.get(server_url);
|
||||
|
||||
let mut deserializer = serde_json::Deserializer::from_str(&text);
|
||||
match path_to_error::deserialize(&mut deserializer) {
|
||||
Ok(root) => Ok(root),
|
||||
Err(e) => {
|
||||
// Если не удалось распарсить как объект с полем "menu",
|
||||
// пробуем интерпретировать ответ как прямой массив пунктов меню.
|
||||
match serde_json::from_str::<Vec<MenuItem>>(&text) {
|
||||
Ok(items) => Ok(MenuRoot {
|
||||
version: "1.0".to_string(),
|
||||
menu: items,
|
||||
}),
|
||||
Err(_) => Err(crate::error::AppError::Json(e.into_inner())),
|
||||
}
|
||||
if let Some(id) = identity {
|
||||
let timestamp = unix_now();
|
||||
let path = url_path(server_url);
|
||||
req = req
|
||||
.header("X-Public-Key", id.public_key_b64())
|
||||
.header("X-Timestamp", timestamp.to_string())
|
||||
.header("X-Signature", id.sign("GET", &path, timestamp));
|
||||
}
|
||||
|
||||
let resp = req.send().await?;
|
||||
|
||||
if resp.status() == reqwest::StatusCode::FORBIDDEN {
|
||||
return Err(parse_access_denied(resp).await);
|
||||
}
|
||||
|
||||
let text = resp.text().await?;
|
||||
parse_menu_body(&text)
|
||||
}
|
||||
|
||||
/// Sends an enrollment request to `{server_url}/access-request`.
|
||||
/// The server stores the public key + source IP for admin approval.
|
||||
/// Returns a human-readable status string on success.
|
||||
pub async fn request_access(server_url: &str, timeout_sec: u64, identity: &Identity) -> Result<String> {
|
||||
let access_url = enrollment_url(server_url);
|
||||
|
||||
let client = Client::builder()
|
||||
.timeout(std::time::Duration::from_secs(timeout_sec))
|
||||
.build()?;
|
||||
|
||||
let resp = client
|
||||
.post(&access_url)
|
||||
.json(&serde_json::json!({
|
||||
"public_key": identity.public_key_b64(),
|
||||
"hostname": crate::identity::current_hostname(),
|
||||
}))
|
||||
.send()
|
||||
.await?;
|
||||
|
||||
let status = resp.status();
|
||||
let body = resp.text().await.unwrap_or_default();
|
||||
|
||||
let json_status = serde_json::from_str::<serde_json::Value>(&body)
|
||||
.ok()
|
||||
.and_then(|v| v["status"].as_str().map(|s| s.to_string()));
|
||||
|
||||
if status == reqwest::StatusCode::FORBIDDEN {
|
||||
let msg = match json_status.as_deref() {
|
||||
Some("banned") => "Ваш IP заблокирован администратором.".to_string(),
|
||||
_ => format!("Сервер вернул {}: {}", status, body),
|
||||
};
|
||||
return Ok(msg);
|
||||
}
|
||||
|
||||
if !status.is_success() {
|
||||
return Err(AppError::Config(format!("Сервер вернул {}: {}", status, body)));
|
||||
}
|
||||
|
||||
let msg = match json_status.as_deref() {
|
||||
Some("pending") => "Запрос отправлен. Ожидайте одобрения администратора.".to_string(),
|
||||
Some("already_pending") => "Запрос уже был отправлен ранее. Ожидайте одобрения.".to_string(),
|
||||
Some("already_authorized") => "Ключ уже авторизован. Нажмите R для обновления меню.".to_string(),
|
||||
_ => format!("Ответ сервера: {}", body),
|
||||
};
|
||||
Ok(msg)
|
||||
}
|
||||
|
||||
// ── Helpers ──────────────────────────────────────────────────────────────────
|
||||
|
||||
fn unix_now() -> u64 {
|
||||
std::time::SystemTime::now()
|
||||
.duration_since(std::time::UNIX_EPOCH)
|
||||
.unwrap_or_default()
|
||||
.as_secs()
|
||||
}
|
||||
|
||||
/// Builds the enrollment URL: `access-request.php` in the same directory as the menu URL.
|
||||
/// `https://host/api/menu/index.php` → `https://host/api/menu/access-request.php`
|
||||
/// `https://host/api/menu/` → `https://host/api/menu/access-request.php`
|
||||
fn enrollment_url(server_url: &str) -> String {
|
||||
reqwest::Url::parse(server_url)
|
||||
.map(|mut u| {
|
||||
let path = u.path().to_string();
|
||||
let trimmed = path.trim_end_matches('/');
|
||||
// If the last path segment looks like a file (contains '.'), use its parent dir.
|
||||
let dir = match trimmed.rfind('/') {
|
||||
Some(pos) if trimmed[pos + 1..].contains('.') => &trimmed[..pos],
|
||||
_ => trimmed,
|
||||
};
|
||||
u.set_path(&format!("{}/access-request.php", dir));
|
||||
u.set_query(None);
|
||||
u.to_string()
|
||||
})
|
||||
.unwrap_or_else(|_| format!("{}/access-request.php", server_url.trim_end_matches('/')))
|
||||
}
|
||||
|
||||
/// Extracts just the path component from a URL string.
|
||||
fn url_path(url: &str) -> String {
|
||||
reqwest::Url::parse(url)
|
||||
.map(|u| u.path().to_string())
|
||||
.unwrap_or_else(|_| "/".to_string())
|
||||
}
|
||||
|
||||
/// Returns `AppError::AccessDenied` when the 403 body contains `{"error":"access_denied"}`,
|
||||
/// otherwise a generic config error.
|
||||
async fn parse_access_denied(resp: reqwest::Response) -> AppError {
|
||||
#[derive(serde::Deserialize)]
|
||||
struct ErrBody { error: String }
|
||||
if let Ok(body) = resp.json::<ErrBody>().await {
|
||||
if body.error == "access_denied" {
|
||||
return AppError::AccessDenied;
|
||||
}
|
||||
}
|
||||
AppError::Config("Сервер вернул 403 Forbidden".to_string())
|
||||
}
|
||||
|
||||
fn parse_menu_body(text: &str) -> Result<MenuRoot> {
|
||||
let mut de = serde_json::Deserializer::from_str(text);
|
||||
match path_to_error::deserialize(&mut de) {
|
||||
Ok(root) => Ok(root),
|
||||
Err(e) => match serde_json::from_str::<Vec<MenuItem>>(text) {
|
||||
Ok(items) => Ok(MenuRoot { version: "1.0".to_string(), menu: items }),
|
||||
Err(_) => Err(AppError::Json(e.into_inner())),
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
98
src/text_input.rs
Normal file
98
src/text_input.rs
Normal file
@@ -0,0 +1,98 @@
|
||||
use crossterm::event::{KeyCode, KeyEvent, KeyModifiers};
|
||||
|
||||
pub struct TextInput {
|
||||
pub buf: String,
|
||||
pub cursor: usize,
|
||||
}
|
||||
|
||||
impl TextInput {
|
||||
pub fn new() -> Self {
|
||||
Self { buf: String::new(), cursor: 0 }
|
||||
}
|
||||
|
||||
pub fn with_text(text: impl Into<String>) -> Self {
|
||||
let buf = text.into();
|
||||
let cursor = buf.chars().count();
|
||||
Self { buf, cursor }
|
||||
}
|
||||
|
||||
pub fn value(&self) -> &str {
|
||||
&self.buf
|
||||
}
|
||||
|
||||
pub fn clear(&mut self) {
|
||||
self.buf.clear();
|
||||
self.cursor = 0;
|
||||
}
|
||||
|
||||
pub fn move_left(&mut self) {
|
||||
self.cursor = self.cursor.saturating_sub(1);
|
||||
}
|
||||
|
||||
pub fn move_right(&mut self) {
|
||||
self.cursor = (self.cursor + 1).min(self.buf.chars().count());
|
||||
}
|
||||
|
||||
pub fn word_back(&mut self) {
|
||||
let chars: Vec<char> = self.buf.chars().collect();
|
||||
let mut pos = self.cursor;
|
||||
while pos > 0 && !is_word(chars[pos - 1]) { pos -= 1; }
|
||||
while pos > 0 && is_word(chars[pos - 1]) { pos -= 1; }
|
||||
self.cursor = pos;
|
||||
}
|
||||
|
||||
pub fn word_fwd(&mut self) {
|
||||
let chars: Vec<char> = self.buf.chars().collect();
|
||||
let len = chars.len();
|
||||
let mut pos = self.cursor;
|
||||
while pos < len && !is_word(chars[pos]) { pos += 1; }
|
||||
while pos < len && is_word(chars[pos]) { pos += 1; }
|
||||
self.cursor = pos;
|
||||
}
|
||||
|
||||
pub fn insert(&mut self, c: char) {
|
||||
let byte_idx = self.buf.char_indices().nth(self.cursor).map(|(b, _)| b).unwrap_or(self.buf.len());
|
||||
self.buf.insert(byte_idx, c);
|
||||
self.cursor += 1;
|
||||
}
|
||||
|
||||
pub fn backspace(&mut self) {
|
||||
if self.cursor == 0 { return; }
|
||||
let byte_idx = self.buf.char_indices().nth(self.cursor - 1).map(|(b, _)| b).unwrap_or(0);
|
||||
self.buf.remove(byte_idx);
|
||||
self.cursor -= 1;
|
||||
}
|
||||
|
||||
pub fn word_delete_back(&mut self) {
|
||||
let chars: Vec<char> = self.buf.chars().collect();
|
||||
let mut new_cursor = self.cursor;
|
||||
while new_cursor > 0 && !is_word(chars[new_cursor - 1]) { new_cursor -= 1; }
|
||||
while new_cursor > 0 && is_word(chars[new_cursor - 1]) { new_cursor -= 1; }
|
||||
if new_cursor == self.cursor { return; }
|
||||
let start_byte = self.buf.char_indices().nth(new_cursor).map(|(b, _)| b).unwrap_or(0);
|
||||
let end_byte = self.buf.char_indices().nth(self.cursor).map(|(b, _)| b).unwrap_or(self.buf.len());
|
||||
self.buf.drain(start_byte..end_byte);
|
||||
self.cursor = new_cursor;
|
||||
}
|
||||
|
||||
/// Returns true if the key was consumed.
|
||||
pub fn handle_key(&mut self, key: &KeyEvent) -> bool {
|
||||
let alt = key.modifiers.intersects(KeyModifiers::ALT | KeyModifiers::SUPER);
|
||||
match key.code {
|
||||
KeyCode::Left if alt => { self.word_back(); true }
|
||||
KeyCode::Right if alt => { self.word_fwd(); true }
|
||||
KeyCode::Char('b') if alt => { self.word_back(); true }
|
||||
KeyCode::Char('f') if alt => { self.word_fwd(); true }
|
||||
KeyCode::Left => { self.move_left(); true }
|
||||
KeyCode::Right => { self.move_right(); true }
|
||||
KeyCode::Backspace if alt => { self.word_delete_back(); true }
|
||||
KeyCode::Backspace => { self.backspace(); true }
|
||||
KeyCode::Char(c) => { self.insert(c); true }
|
||||
_ => false,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn is_word(c: char) -> bool {
|
||||
c.is_alphanumeric() || c == '_'
|
||||
}
|
||||
@@ -61,8 +61,8 @@ pub async fn check(api_base: &str, timeout_sec: u64) -> Result<Option<UpdateInfo
|
||||
let tag = tag.split('@').next().unwrap_or(tag).trim();
|
||||
let new_version = tag.to_string();
|
||||
|
||||
// Already up to date
|
||||
if new_version == current_version {
|
||||
// Only offer update if the remote version is strictly newer
|
||||
if !is_newer(&new_version, ¤t_version) {
|
||||
return Ok(None);
|
||||
}
|
||||
|
||||
@@ -185,6 +185,16 @@ pub fn take_update_target() -> Option<String> {
|
||||
Some(version.trim().to_string())
|
||||
}
|
||||
|
||||
/// Returns true if `candidate` is strictly greater than `current` by semver rules.
|
||||
/// Parses `MAJOR.MINOR.PATCH`; any unparseable component is treated as 0.
|
||||
fn is_newer(candidate: &str, current: &str) -> bool {
|
||||
fn parse(v: &str) -> (u64, u64, u64) {
|
||||
let mut parts = v.splitn(3, '.').map(|s| s.parse::<u64>().unwrap_or(0));
|
||||
(parts.next().unwrap_or(0), parts.next().unwrap_or(0), parts.next().unwrap_or(0))
|
||||
}
|
||||
parse(candidate) > parse(current)
|
||||
}
|
||||
|
||||
/// Replaces current process via execv (Unix). Never returns on success.
|
||||
/// `exe_path` must be the path captured *before* the binary was replaced —
|
||||
/// do NOT call std::env::current_exe() here, it returns "(deleted)" on Linux.
|
||||
|
||||
48
uninstall.sh
48
uninstall.sh
@@ -1,5 +1,4 @@
|
||||
#!/bin/bash
|
||||
set -e
|
||||
|
||||
BINARY="ostiary"
|
||||
INSTALL_DIR="$HOME/.local/bin"
|
||||
@@ -12,49 +11,54 @@ info() { echo -e "${CYAN}[ostiary]${NC} $*"; }
|
||||
ok() { echo -e "${GREEN}[ostiary]${NC} $*"; }
|
||||
warn() { echo -e "${YELLOW}[ostiary]${NC} $*"; }
|
||||
|
||||
# Read from /dev/tty so the script works when piped through bash
|
||||
# (e.g. curl ... | bash), where stdin is the pipe, not the terminal.
|
||||
ask() {
|
||||
local answer
|
||||
read -rp "$1 [y/N] " answer </dev/tty
|
||||
[[ "$answer" =~ ^[Yy]$ ]]
|
||||
}
|
||||
|
||||
# ── Remove binary ────────────────────────────────────────────────────────────
|
||||
BINARY_PATH="$INSTALL_DIR/$BINARY"
|
||||
|
||||
if [ -f "$BINARY_PATH" ]; then
|
||||
info "Found binary: $BINARY_PATH"
|
||||
read -rp " Remove it? [y/N] " answer
|
||||
if [[ "$answer" =~ ^[Yy]$ ]]; then
|
||||
info "Найден бинарник: $BINARY_PATH"
|
||||
if ask " Удалить?"; then
|
||||
rm "$BINARY_PATH"
|
||||
ok "Binary removed"
|
||||
ok "Бинарник удалён"
|
||||
else
|
||||
ok "Бинарник оставлен"
|
||||
fi
|
||||
else
|
||||
warn "Binary not found at $BINARY_PATH"
|
||||
warn "Бинарник не найден в $BINARY_PATH"
|
||||
fi
|
||||
|
||||
# ── Remove config ────────────────────────────────────────────────────────────
|
||||
echo ""
|
||||
if [ -d "$CONFIG_DIR" ]; then
|
||||
echo ""
|
||||
info "Config directory: $CONFIG_DIR"
|
||||
read -rp " Remove config and saved settings? [y/N] " answer
|
||||
if [[ "$answer" =~ ^[Yy]$ ]]; then
|
||||
info "Найден конфиг: $CONFIG_DIR"
|
||||
if ask " Удалить конфиг и настройки?"; then
|
||||
rm -rf "$CONFIG_DIR"
|
||||
ok "Config removed"
|
||||
ok "Конфиг удалён"
|
||||
else
|
||||
ok "Config kept at $CONFIG_DIR"
|
||||
ok "Конфиг оставлен: $CONFIG_DIR"
|
||||
fi
|
||||
fi
|
||||
|
||||
# ── Remove PATH entry from shell profile ─────────────────────────────────────
|
||||
for PROFILE in "$HOME/.bashrc" "$HOME/.bash_profile" "$HOME/.profile"; do
|
||||
if [ -f "$PROFILE" ] && grep -qF ".local/bin" "$PROFILE"; then
|
||||
if [ -f "$PROFILE" ] && grep -qF "# Added by ostiary installer" "$PROFILE"; then
|
||||
echo ""
|
||||
info "Found PATH entry in $PROFILE"
|
||||
read -rp " Remove the PATH line added by ostiary installer? [y/N] " answer
|
||||
if [[ "$answer" =~ ^[Yy]$ ]]; then
|
||||
# Remove the comment and the export line added by install.sh
|
||||
sed -i.bak '/# Added by ostiary installer/d' "$PROFILE"
|
||||
sed -i.bak '/\.local\/bin.*PATH/d' "$PROFILE"
|
||||
rm -f "${PROFILE}.bak"
|
||||
ok "PATH entry removed from $PROFILE"
|
||||
info "Найдена запись PATH в $PROFILE"
|
||||
if ask " Удалить строку PATH, добавленную установщиком?"; then
|
||||
sed -i '/# Added by ostiary installer/d' "$PROFILE"
|
||||
sed -i '/\.local\/bin.*PATH/d' "$PROFILE"
|
||||
ok "Запись PATH удалена из $PROFILE"
|
||||
fi
|
||||
break
|
||||
fi
|
||||
done
|
||||
|
||||
echo ""
|
||||
ok "Done"
|
||||
ok "Готово"
|
||||
|
||||
Reference in New Issue
Block a user