Merge pull request #24 from hyperi-io/chore/merge-to-release

chore: merge main into release

Author: catinspace-au

.cargo/audit.toml

@@ -0,0 +1,23 @@
+# Project:   hyperi-rustlib
+# File:      .cargo/audit.toml
+# Purpose:   cargo-audit advisory ignore list for transitive deps
+# Language:  TOML
+#
+# License:   FSL-1.1-ALv2
+# Copyright: (c) 2026 HYPERI PTY LIMITED
+
+# Ignored advisories — transitive deps we cannot fix.
+# Review on each major dependency update (especially sqlx, cel-interpreter).
+
+[advisories]
+ignore = [
+    # rsa timing side-channel (Marvin Attack), medium severity.
+    # Transitive: sqlx -> sqlx-mysql -> rsa. We use PostgreSQL only.
+    # No fixed version upstream. Revisit when sqlx drops default MySQL.
+    "RUSTSEC-2023-0071",
+
+    # paste crate unmaintained (no security impact).
+    # Transitive: cel-interpreter -> paste. We cannot control this.
+    # Revisit when cel-interpreter updates or replaces paste.
+    "RUSTSEC-2024-0436",
+]

.gitignore

@@ -37,6 +37,7 @@ coverage-html/
 coverage.lcov
 .cargo/
 !.cargo/config.toml
+!.cargo/audit.toml
 
 # AI agent working files (not committed)
 docs/superpowers/

TODO.md

@@ -8,31 +8,27 @@
 
 ## Current Tasks
 
-### MemoryGuard: fix underflow in `release()`
-
-`MemoryGuard::release()` uses `AtomicU64::fetch_sub` which wraps on underflow.
-Releasing more bytes than were added produces `u64::MAX - N` instead of saturating
-at zero. Found by dfe-loader resilience tests.
-
-- [ ] Change `fetch_sub` to saturating subtraction (`fetch_update` with `saturating_sub`)
-- [ ] Add unit test for over-release scenario
-- [ ] Publish patch release
-
-### CEL Expression Module — CI Fix Required `[IN PROGRESS]`
-
-**Goal:** Publish v1.13.0 with `expression` feature to JFrog
-
-Code is committed (`83713e6`), 425/426 tests pass. CI fails on pre-existing flaky test.
-
-1. [x] Create `src/expression/` module (evaluator, profile, error)
-2. [x] Add `expression` feature flag with `cel-interpreter` dependency
-3. [x] 70 integration tests + 7 unit tests passing
-4. [x] Clippy pedantic clean (`#[must_use]`, `implicit_hasher`)
-5. [ ] Fix `test_instance_id_stable` flaky test (race condition on `~/.config/hyperi/instance_id`)
-6. [ ] CI green → Semantic Release → v1.13.0 → Publish to JFrog
+### Gap Analysis P2 — HTTP Client, Database URLs, Cache `[NEXT]`
+
+- [ ] HTTP client module with retry middleware (reqwest + reqwest-middleware + reqwest-retry)
+  - Wrap reqwest with exponential backoff, configurable timeouts
+  - Auto-register config via `unmarshal_key_registered`
+  - Metrics integration (request count, duration, errors)
+- [ ] Database URL builders (PostgreSQL, ClickHouse, Redis)
+  - Build connection strings from env vars with standard prefixes
+  - `SensitiveString` for password fields
+- [ ] Cache module with disk/memory backends
+  - Consolidate secrets cache pattern into reusable module
+  - TTL, stale-while-revalidate, size bounds
 
 ### Completed Recent
 
+- [x] **Config registry** (v1.19.3-v1.19.5) — auto-registering reflectable config, `/config` admin endpoint, `SensitiveString`, heuristic redaction, change notification, `ConfigReloader` hook
+- [x] **CEL expression profile** (v1.19.2) — `matches()` blocked by default, `ProfileConfig` with per-category overrides, string literal false-positive prevention
+- [x] **Config cascade wiring** (v1.19.2) — expression, memory, version_check, scaling, grpc, secrets auto-read from figment cascade
+- [x] **MemoryGuard underflow fix** (v1.19.1) — `fetch_sub` replaced with `fetch_update` + `saturating_sub`
+- [x] **Test restructure** (v1.19.1) — `tests/integration/`, `tests/e2e/`, `tests/common/` per testing standard
+- [x] **hyperi-ci release-merge** — CLI command replaces per-project workflow files
 - [x] **Rust edition 2024** — migrated from 2021; `temp-env` replaces unsafe `set_var`/`remove_var` in tests across 6 files
 - [x] **async-trait removal** — public traits (`Sink`, `Transport`, `SecretProvider`) now use `fn ... -> impl Future + Send` (Rust 1.75+ native)
 - [x] **kafka_config module** — `config_from_file`, 7 named profiles, `merge_with_overrides`; librdkafka settings loaded from config git dir (only cascade exception)
@@ -110,7 +106,9 @@ what config keys exist, their types, defaults, or descriptions.
 - [x] `/config` admin endpoint (opt-in via `enable_config_endpoint`) — returns redacted effective + defaults JSON
 - [x] Change notification (opt-in) — `registry::on_change(key, callback)` + `registry::update()`
   - Modules that need hot-reload subscribe; others keep `OnceLock` (init-once)
-- [ ] Wire `ConfigReloader` to call `registry::update()` on reload (connect the plumbing)
+- [x] `ConfigReloader.with_registry_update(key)` connects hot-reload to registry
+- [x] `SensitiveString` type — compile-time safe, `Serialize` always redacts
+- [x] 19 registry + 12 sensitive string tests covering all redaction guarantees
 - [ ] Migrate all dfe-* and hyperi-* apps to `unmarshal_key_registered` pattern
 - [ ] Align hyperi-pylib with same registry pattern
 

src/cache/config.rs

@@ -0,0 +1,94 @@
+// Project:   hyperi-rustlib
+// File:      src/cache/config.rs
+// Purpose:   Cache configuration
+// Language:  Rust
+//
+// License:   FSL-1.1-ALv2
+// Copyright: (c) 2026 HYPERI PTY LIMITED
+
+//! Cache configuration with per-source TTL support.
+
+use std::collections::HashMap;
+
+use serde::{Deserialize, Serialize};
+
+/// Configuration for the in-memory cache.
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct CacheConfig {
+    /// Maximum number of entries. Default: 10,000.
+    #[serde(default = "default_max_capacity")]
+    pub max_capacity: u64,
+
+    /// Default TTL in seconds for entries without a source-specific TTL.
+    /// Default: 3600 (1 hour).
+    #[serde(default = "default_ttl_secs")]
+    pub default_ttl_secs: u64,
+
+    /// Per-source TTL overrides in seconds.
+    /// Keys are source names (e.g., "http", "db", "search").
+    #[serde(default)]
+    pub source_ttls: HashMap<String, u64>,
+}
+
+fn default_max_capacity() -> u64 {
+    10_000
+}
+
+fn default_ttl_secs() -> u64 {
+    3600
+}
+
+impl Default for CacheConfig {
+    fn default() -> Self {
+        Self {
+            max_capacity: default_max_capacity(),
+            default_ttl_secs: default_ttl_secs(),
+            source_ttls: HashMap::new(),
+        }
+    }
+}
+
+impl CacheConfig {
+    /// Load from the config cascade under the `cache` key.
+    #[must_use]
+    pub fn from_cascade() -> Self {
+        #[cfg(feature = "config")]
+        {
+            if let Some(cfg) = crate::config::try_get()
+                && let Ok(cc) = cfg.unmarshal_key_registered::<Self>("cache")
+            {
+                return cc;
+            }
+        }
+        Self::default()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn defaults_are_sensible() {
+        let config = CacheConfig::default();
+        assert_eq!(config.max_capacity, 10_000);
+        assert_eq!(config.default_ttl_secs, 3600);
+        assert!(config.source_ttls.is_empty());
+    }
+
+    #[test]
+    fn deserialise_with_source_ttls() {
+        let yaml = r"
+max_capacity: 5000
+default_ttl_secs: 1800
+source_ttls:
+  http: 86400
+  db: 900
+";
+        let config: CacheConfig = serde_yaml_ng::from_str(yaml).unwrap();
+        assert_eq!(config.max_capacity, 5000);
+        assert_eq!(config.default_ttl_secs, 1800);
+        assert_eq!(config.source_ttls["http"], 86400);
+        assert_eq!(config.source_ttls["db"], 900);
+    }
+}