prod & dev docker containers

Reviewed-on: #16

.gitignore

@@ -3,6 +3,7 @@
 debug/
 target/
 .vscode/
+test_images/
 
 # These are backup files generated by rustfmt
 **/*.rs.bk

Cargo.toml

@@ -1,8 +1,8 @@
 [package]
 name = "herodb"
 version = "0.0.1"
-authors = ["Pin Fang <fpfangpin@hotmail.com>"]
+authors = ["ThreeFold Tech NV"]
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 anyhow = "1.0.59"
@@ -23,8 +23,19 @@ sha2 = "0.10"
 age = "0.10"
 secrecy = "0.8"
 ed25519-dalek = "2"
+x25519-dalek = "2"
 base64 = "0.22"
+jsonrpsee = { version = "0.25.1", features = ["http-client", "ws-client", "server", "macros"] }
 tantivy = "0.25.0"
+arrow-schema = "55.2.0"
+arrow-array = "55.2.0"
+lance = "0.37.0"
+lance-index = "0.37.0"
+arrow = "55.2.0"
+lancedb = "0.22.1"
+uuid = "1.18.1"
+ureq = { version = "2.10.0", features = ["json", "tls"] }
+reth-ipc = { git = "https://github.com/paradigmxyz/reth", package = "reth-ipc", rev = "d8451e54e7267f9f1634118d6d279b2216f7e2bb" }
 
 [dev-dependencies]
 redis = { version = "0.24", features = ["aio", "tokio-comp"] }

Dockerfile

@@ -0,0 +1,62 @@
+# Multi-stage build for production
+# Stage 1: Build the application
+FROM rust:1.90-bookworm AS builder
+
+# Install build dependencies
+RUN apt-get update && apt-get install -y \
+    pkg-config \
+    libssl-dev \
+    protobuf-compiler \
+    && rm -rf /var/lib/apt/lists/*
+
+WORKDIR /build
+
+# Copy manifests
+COPY Cargo.toml Cargo.lock ./
+
+# Create dummy main to cache dependencies
+RUN mkdir src && \
+    echo "fn main() {}" > src/main.rs && \
+    cargo build --release && \
+    rm -rf src
+
+# Copy actual source code
+COPY src ./src
+
+# Build the actual application
+RUN cargo build --release --bin herodb
+
+# Stage 2: Create minimal runtime image
+FROM debian:bookworm-slim
+
+# Install runtime dependencies (minimal)
+RUN apt-get update && apt-get install -y \
+    ca-certificates \
+    && rm -rf /var/lib/apt/lists/*
+
+# Create non-root user
+RUN useradd -m -u 1000 herodb && \
+    mkdir -p /data && \
+    chown -R herodb:herodb /data
+
+WORKDIR /app
+
+# Copy binary from builder
+COPY --from=builder /build/target/release/herodb /usr/local/bin/herodb
+
+# Switch to non-root user
+USER herodb
+
+# Create volume mount point
+VOLUME ["/data"]
+
+# Expose ports
+EXPOSE 6379 8080
+
+# Health check
+HEALTHCHECK --interval=30s --timeout=3s --start-period=5s --retries=3 \
+    CMD timeout 2 bash -c '</dev/tcp/localhost/6379' || exit 1
+
+# Default command
+ENTRYPOINT ["herodb"]
+CMD ["--dir", "/data", "--port", "6379", "--enable-rpc", "--rpc-port", "8080"]

Dockerfile.dev

@@ -0,0 +1,30 @@
+# Development Dockerfile with full toolchain
+FROM rust:1.90
+
+# Install development tools
+RUN apt-get update && apt-get install -y \
+    pkg-config \
+    libssl-dev \
+    protobuf-compiler \
+    redis-tools \
+    netcat-openbsd \
+    curl \
+    vim \
+    && rm -rf /var/lib/apt/lists/*
+
+# Install cargo tools for development
+RUN cargo install cargo-watch cargo-edit
+
+WORKDIR /app
+
+# Copy project files
+COPY . .
+
+# Pre-build dependencies (optional, for faster startup)
+RUN cargo build
+
+# Expose ports
+EXPOSE 6379 8080
+
+# Development command with hot reload
+CMD ["cargo", "run", "--", "--dir", "/data", "--port", "6379", "--enable-rpc", "--rpc-port", "8080"]

README.md

@@ -17,9 +17,27 @@ The main purpose of HeroDB is to offer a lightweight, embeddable, and Redis-comp
 - **Expiration**: Time-to-live (TTL) functionality for keys.
 - **Scanning**: Cursor-based iteration for keys and hash fields (`SCAN`, `HSCAN`).
 - **AGE Cryptography Commands**: HeroDB-specific extensions for cryptographic operations.
+- **Symmetric Encryption**: Stateless symmetric encryption using XChaCha20-Poly1305.
+- **Admin Database 0**: Centralized control for database management, access control, and per-database encryption.
 
 ## Quick Start
 
+### Docker
+
+```bash
+# Production
+docker-compose build herodb-prod
+ADMIN_SECRET=your-secret docker-compoae up -d herodb-prod
+
+# Development
+docker-compose build herodb-dev
+docker-compose up herodb-dev
+```
+
+Ports:
+- Redis on 6379 (prod) / 6380 (dev)
+- RPC on 8080 (prod) / 8081 (dev)
+
 ### Building HeroDB
 
 To build HeroDB, navigate to the project root and run:
@@ -30,31 +48,32 @@ cargo build --release
 
 ### Running HeroDB
 
-You can start HeroDB with different backends and encryption options:
+Launch HeroDB with the required `--admin-secret` flag, which encrypts the admin database (DB 0) and authorizes admin access. Optional flags include `--dir` for the database directory, `--port` for the TCP port (default 6379), `--sled` for the sled backend, `--enable-rpc` to start the HTTP JSON-RPC server on a TCP port, `--enable-rpc-ipc` to start JSON-RPC over a Unix Domain Socket (non-HTTP), and `--rpc-ipc-path <path>` to specify the socket path (default: `/tmp/herodb.ipc`).
-
-#### Default `redb` Backend
 
+Example:
 ```bash
-./target/release/herodb --dir /tmp/herodb_redb --port 6379
+./target/release/herodb --dir /tmp/herodb --admin-secret myadminsecret --port 6379 --enable-rpc
 ```
 
-#### `sled` Backend
+To enable JSON-RPC over a Unix Domain Socket at `/tmp/herodb.sock`:
-
 ```bash
-./target/release/herodb --dir /tmp/herodb_sled --port 6379 --sled
+./target/release/herodb --dir /tmp/herodb --admin-secret myadminsecret --enable-rpc-ipc --rpc-ipc-path /tmp/herodb.sock
 ```
 
-#### `redb` with Encryption
+Test the IPC endpoint interactively with socat:
-
 ```bash
-./target/release/herodb --dir /tmp/herodb_encrypted --port 6379 --encrypt --key mysecretkey
+sudo socat -d -d -t 5 - UNIX-CONNECT:/tmp/herodb.sock
+```
+Then paste a framed JSON-RPC request (Content-Length header, blank line, then JSON body). Example:
+```
+Content-Length: 73
+
+{"jsonrpc":"2.0","method":"hero_listDatabases","params":[],"id":3}
 ```
 
-#### `sled` with Encryption
+For a one-liner that auto-computes Content-Length and pretty-prints the JSON response, see docs/rpc_examples.md.
 
-```bash
+For detailed launch options, see [Basics](docs/basics.md).
-./target/release/herodb --dir /tmp/herodb_sled_encrypted --port 6379 --sled --encrypt --key mysecretkey
-```
 
 ## Usage with Redis Clients
 
@@ -62,24 +81,49 @@ HeroDB can be interacted with using any standard Redis client, such as `redis-cl
 
 ### Example with `redis-cli`
 
+Connections start with no database selected. You must SELECT a database first.
+
+- To work in the admin database (DB 0), authenticate with the admin secret:
 ```bash
+redis-cli -p 6379 SELECT 0 KEY myadminsecret
 redis-cli -p 6379 SET mykey "Hello from HeroDB!"
 redis-cli -p 6379 GET mykey
 # → "Hello from HeroDB!"
+```
 
+- To use a user database, first create one via the JSON-RPC API (see docs/rpc_examples.md), then select it:
+```bash
+# Suppose RPC created database id 1
+redis-cli -p 6379 SELECT 1
 redis-cli -p 6379 HSET user:1 name "Alice" age "30"
 redis-cli -p 6379 HGET user:1 name
 # → "Alice"
-
 redis-cli -p 6379 SCAN 0 MATCH user:* COUNT 10
-# → 1) "0"
-#    2) 1) "user:1"
 ```
 
+## Cryptography
+
+HeroDB supports asymmetric encryption/signatures via AGE commands (X25519 for encryption, Ed25519 for signatures) in stateless or key-managed modes, and symmetric encryption via SYM commands. Keys are persisted in the admin database (DB 0) for managed modes.
+
+For details, see [AGE Cryptography](docs/age.md) and [Basics](docs/basics.md).
+
+## Database Management
+
+Databases are managed via JSON-RPC API, with metadata stored in the encrypted admin database (DB 0). Databases are public by default upon creation; use RPC to set them private, requiring access keys for SELECT operations (read or readwrite based on permissions). This includes per-database encryption keys, access control, and lifecycle management.
+
+For examples, see [JSON-RPC Examples](docs/rpc_examples.md) and [Admin DB 0 Model](docs/admin.md).
+
 ## Documentation
 
 For more detailed information on commands, features, and advanced usage, please refer to the documentation:
 
-- [Basics](docs/basics.md)
+- [Basics](docs/basics.md) - Launch options, symmetric encryption, and basic usage
-- [Supported Commands](docs/cmds.md)
+- [Supported Commands](docs/cmds.md) - Complete Redis command reference and backend comparison
-- [AGE Cryptography](docs/age.md)
+- [AGE Cryptography](docs/age.md) - Asymmetric encryption and digital signatures
+- [Admin DB 0 Model](docs/admin.md) - Database management, access control, and per-database encryption
+- [JSON-RPC Examples](docs/rpc_examples.md) - Management API examples
+- [Full-Text Search](docs/search.md) - Tantivy-powered search capabilities
+- [Tantivy Backend](docs/tantivy.md) - Tantivy as a dedicated database backend
+- [Lance Vector Store](docs/lance.md) - Vector embeddings and semantic search
+- [Lance Text and Images Example](docs/lancedb_text_and_images_example.md) - End-to-end vector search examples
+- [Local Embedder Tutorial](docs/local_embedder_full_example.md) - Complete embedding models tutorial

docker-compose.yml

@@ -0,0 +1,91 @@
+services:
+  # Production service
+  herodb-prod:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    container_name: herodb-production
+    restart: unless-stopped
+    ports:
+      - "6379:6379"
+      - "8080:8080"
+    volumes:
+      - herodb-data:/data
+      # Optional: Unix socket for IPC
+      - herodb-ipc:/tmp
+    environment:
+      - RUST_LOG=${RUST_LOG:-info}
+    command: >
+      --dir /data
+      --port 6379
+      --admin-secret ${ADMIN_SECRET}
+      --enable-rpc
+      --rpc-port 8080
+      --enable-rpc-ipc
+      --rpc-ipc-path /tmp/herodb.ipc
+    healthcheck:
+      test: ["CMD", "timeout", "2", "bash", "-c", "</dev/tcp/localhost/6379"]
+      interval: 30s
+      timeout: 3s
+      retries: 3
+      start_period: 5s
+    networks:
+      - herodb-network
+
+  # Development service
+  herodb-dev:
+    build:
+      context: .
+      dockerfile: Dockerfile.dev
+    container_name: herodb-development
+    ports:
+      - "6380:6379"  # Different port to avoid conflicts
+      - "8081:8080"
+    volumes:
+      - ./:/app
+      - cargo-cache:/usr/local/cargo/registry
+      - target-cache:/app/target
+      - herodb-dev-data:/data
+    environment:
+      - RUST_LOG=debug
+      - RUST_BACKTRACE=1
+    command: >
+      cargo run --
+      --dir /data
+      --port 6379
+      --admin-secret ${ADMIN_SECRET:-devsecret}
+      --enable-rpc
+      --rpc-port 8080
+      --debug
+    stdin_open: true
+    tty: true
+    networks:
+      - herodb-network
+
+  # Optional: Redis CLI for testing
+  redis-cli:
+    image: redis:7-alpine
+    container_name: herodb-cli
+    command: redis-cli -h herodb-prod -p 6379
+    depends_on:
+      - herodb-prod
+    networks:
+      - herodb-network
+    profiles:
+      - tools
+
+volumes:
+  herodb-data:
+    driver: local
+  herodb-dev-data:
+    driver: local
+  herodb-ipc:
+    driver: local
+  cargo-cache:
+    driver: local
+  target-cache:
+    driver: local
+
+networks:
+  herodb-network:
+    driver: bridge

docs/admin.md

@@ -0,0 +1,182 @@
+# Admin Database 0 (`0.db`)
+
+This page explains what the Admin Database `DB 0` is, why HeroDB uses it, and how to work with it as a developer and end-user. It’s a practical guide covering how databases are created, listed, secured with access keys, and encrypted using per-database secrets.
+
+## What is `DB 0`?
+
+`DB 0` is the control-plane for a HeroDB instance. It stores metadata for all user databases (`db_id >= 1`) so the server can:
+- Know which databases exist (without scanning the filesystem)
+- Enforce access control (public/private with access keys)
+- Enforce per-database encryption (whether a given database must be opened encrypted and with which write-only key)
+
+`DB 0` itself is always encrypted with the admin secret (the process-level secret provided at startup).
+
+## How `DB 0` is created and secured
+
+- `DB 0` lives at `<base_dir>/0.db`
+- It is always encrypted using the `admin secret` provided at process startup (using the `--admin-secret <secret>` CLI flag)
+- Only clients that provide the correct admin secret can `SELECT 0` (see “`SELECT` + `KEY`” below)
+
+At startup, the server bootstraps `DB 0` (initializes counters and structures) if it’s missing.
+
+## Metadata stored in `DB 0`
+
+Keys in `DB 0` (internal layout, but useful to understand how things work):
+
+- `admin:next_id`
+  - String counter holding the next id to allocate (initialized to `"1"`)
+
+- `admin:dbs`
+  - A hash acting as a set of existing database ids
+  - field = id (as string), value = `"1"`
+
+- `meta:db:<id>`
+  - A hash holding db-level metadata
+  - field `public` = `"true"` or `"false"` (defaults to `true` if missing)
+
+- `meta:db:<id>:keys`
+  - A hash mapping access-key hashes to the string `Permission:created_at_seconds`
+  - Examples: `Read:1713456789` or `ReadWrite:1713456789`
+  - The plaintext access keys are never stored; only their `SHA-256` hashes are kept
+
+- `meta:db:<id>:enc`
+   - A string holding the per-database encryption key used to open `<id>.db` encrypted
+   - This value is write-only from the perspective of the management APIs (it’s set at creation and never returned)
+
+- `age:key:<name>`
+   - Base64-encoded X25519 recipient (public encryption key) for named AGE keys
+- `age:privkey:<name>`
+   - Base64-encoded X25519 identity (secret encryption key) for named AGE keys
+- `age:signpub:<name>`
+   - Base64-encoded Ed25519 verify public key for named AGE keys
+- `age:signpriv:<name>`
+   - Base64-encoded Ed25519 signing secret key for named AGE keys
+
+> You don’t need to manipulate these keys directly; they’re listed to clarify the model. AGE keys are managed via AGE commands.
+
+## Database lifecycle
+
+1) Create a database (via JSON-RPC)
+- The server allocates an id from `admin:next_id`, registers it in `admin:dbs`, and defaults the database to `public=true`
+- If you pass an optional `encryption_key` during creation, the server persists it in `meta:db:<id>:enc`. That database will be opened in encrypted mode from then on
+
+2) Open and use a database
+- Clients select a database over RESP using `SELECT`
+- Authorization and encryption state are enforced using `DB 0` metadata
+
+3) Delete database files
+- Removing `<id>.db` removes the physical storage
+- `DB 0` remains the source of truth for existence and may be updated by future management methods as the system evolves
+
+## Access control model
+
+- Public database (default)
+  - Anyone can `SELECT <id>` with no key, and will get `ReadWrite` permission
+- Private database
+  - You must provide an access key when selecting the database
+  - The server hashes the provided key with `SHA-256` and checks membership in `meta:db:<id>:keys`
+  - Permissions are `Read` or `ReadWrite` depending on how the key was added
+- Admin `DB 0`
+  - Requires the exact admin secret as the `KEY` argument to `SELECT 0`
+  - Permission is `ReadWrite` when the secret matches
+
+Connections start with no database selected. Any command that requires storage (GET, SET, H*, L*, SCAN, etc.) will return an error until you issue a SELECT to choose a database. Admin DB 0 is never accessible without authenticating via SELECT 0 KEY &lt;admin_secret&gt;.
+### How to select databases with optional `KEY`
+
+- Public DB (no key required)
+  - `SELECT <id>`
+
+- Private DB (access key required)
+  - `SELECT <id> KEY <plaintext_key>`
+
+- Admin `DB 0` (admin secret required)
+  - `SELECT 0 KEY <admin_secret>`
+
+Examples (using `redis-cli`):
+```bash
+# Public database
+redis-cli -p $PORT SELECT 1
+# → OK
+
+# Private database
+redis-cli -p $PORT SELECT 2 KEY my-db2-access-key
+# → OK
+
+# Admin DB 0
+redis-cli -p $PORT SELECT 0 KEY my-admin-secret
+# → OK
+```
+
+## Per-database encryption
+
+- At database creation, you can provide an optional per-db encryption key
+- If provided, the server persists that key in `DB 0` as `meta:db:<id>:enc`
+- When you later open the database, the engine checks whether `meta:db:<id>:enc` exists to decide if it must open `<id>.db` in encrypted mode
+- The per-db key is not returned by RPC—it is considered write-only configuration data
+
+Operationally:
+- Create with encryption: pass a non-null `encryption_key` to the `createDatabase` RPC
+- Open later: simply `SELECT` the database; encryption is transparent to clients
+
+## Management via JSON-RPC
+
+You can manage databases using the management RPC (namespaced `herodb.*`). Typical operations:
+- `createDatabase(backend, config, encryption_key?)`
+  - Allocates a new id, sets optional encryption key
+- `listDatabases()`
+  - Lists database ids and info (including whether storage is currently encrypted)
+- `getDatabaseInfo(db_id)`
+  - Returns details: backend, encrypted flag, size on disk, `key_count`, timestamps, etc.
+- `addAccessKey(db_id, key, permissions)`
+  - Adds a `Read` or `ReadWrite` access key (permissions = `"read"` | `"readwrite"`)
+- `listAccessKeys(db_id)`
+  - Returns hashes and permissions; you can use these hashes to delete keys
+- `deleteAccessKey(db_id, key_hash)`
+  - Removes a key by its hash
+- `setDatabasePublic(db_id, public)`
+  - Toggles public/private
+
+Copyable JSON examples are provided in the [RPC examples documentation](./rpc_examples.md).
+
+## Typical flows
+
+1) Public, unencrypted database
+- Create a new database without an encryption key
+- Clients can immediately `SELECT <id>` without a key
+- You can later make it private and add keys if needed
+
+2) Private, encrypted database
+- Create passing an `encryption_key`
+- Mark it private (`setDatabasePublic false`) and add access keys
+- Clients must use `SELECT <id> KEY <plaintext_access_key>`
+- Storage opens in encrypted mode automatically
+
+## Security notes
+
+- Only `SHA-256` hashes of access keys are stored in `DB 0`; keep plaintext keys safe on the client side
+- The per-db encryption key is never exposed via the API after it is set
+- The admin secret must be kept secure; anyone with it can `SELECT 0` and perform administrative actions
+
+## Troubleshooting
+
+- `ERR invalid access key` when selecting a private db
+  - Ensure you passed the `KEY` argument: `SELECT <id> KEY <plaintext_key>`
+  - If you recently added the key, confirm the permissions and that you used the exact plaintext (hash must match)
+
+- `Database X not found`
+  - The id isn’t registered in `DB 0` (`admin:dbs`). Use the management APIs to create or list databases
+
+- Cannot `SELECT 0`
+  - The `KEY` must be the exact admin secret passed at server startup
+
+## Reference
+
+- Admin metadata lives in `DB 0` (`0.db`) and controls:
+  - Existence: `admin:dbs`
+  - Access: `meta:db:<id>.public` and `meta:db:<id>:keys`
+  - Encryption: `meta:db:<id>:enc`
+
+For command examples and management payloads:
+- RESP command basics: [docs/basics.md](./basics.md)
+- Supported commands: [docs/cmds.md](./cmds.md)
+- JSON-RPC examples: [docs/rpc_examples.md](./rpc_examples.md)

docs/age.md

@@ -1,188 +1,96 @@
-# HeroDB AGE usage: Stateless vs Key‑Managed
+# HeroDB AGE Cryptography
 
-This document explains how to use the AGE cryptography commands exposed by HeroDB over the Redis protocol in two modes:
+HeroDB provides AGE-based asymmetric encryption and digital signatures over the Redis protocol using X25519 for encryption and Ed25519 for signatures. Keys can be used in stateless (ephemeral) or key-managed (persistent, named) modes.
-- Stateless (ephemeral keys; nothing stored on the server)
-- Key‑managed (server‑persisted, named keys)
 
-If you are new to the codebase, the exact tests that exercise these behaviors are:
+In key-managed mode, HeroDB uses a unified keypair concept: a single Ed25519 signing key is deterministically derived into X25519 keys for encryption, allowing one keypair to handle both encryption and signatures transparently.
-- [rust.test_07_age_stateless_suite()](herodb/tests/usage_suite.rs:495)
-- [rust.test_08_age_persistent_named_suite()](herodb/tests/usage_suite.rs:555)
 
-Implementation entry points:
+## Cryptographic Algorithms
-- [herodb/src/age.rs](herodb/src/age.rs)
-- Dispatch from [herodb/src/cmd.rs](herodb/src/cmd.rs)
 
-Note: Database-at-rest encryption flags in the test harness are unrelated to AGE commands; those flags control storage-level encryption of DB files. See the harness near [rust.start_test_server()](herodb/tests/usage_suite.rs:10).
+### X25519 (Encryption)
+- Elliptic-curve Diffie-Hellman key exchange for symmetric key derivation.
+- Used for encrypting/decrypting messages.
 
-## Quick start
+### Ed25519 (Signatures)
+- EdDSA digital signatures for message authentication.
+- Used for signing/verifying messages.
 
-Assuming the server is running on localhost on some $PORT:
+### Key Derivation
+Ed25519 signing keys are deterministically converted to X25519 keys for encryption. This enables a single keypair to support both operations without additional keys. Derivation uses the Ed25519 secret scalar clamped for X25519.
+
+In named keypairs, Ed25519 keys are stored, and X25519 keys are derived on-demand and cached.
+
+## Stateless Mode (Ephemeral Keys)
+No server-side storage; keys are provided with each command.
+
+Available commands:
+- `AGE GENENC`: Generate ephemeral X25519 keypair. Returns `[recipient, identity]`.
+- `AGE GENSIGN`: Generate ephemeral Ed25519 keypair. Returns `[verify_pub, sign_secret]`.
+- `AGE ENCRYPT <recipient> <message>`: Encrypt message. Returns base64 ciphertext.
+- `AGE DECRYPT <identity> <ciphertext_b64>`: Decrypt ciphertext. Returns plaintext.
+- `AGE SIGN <sign_secret> <message>`: Sign message. Returns base64 signature.
+- `AGE VERIFY <verify_pub> <message> <signature_b64>`: Verify signature. Returns 1 (valid) or 0 (invalid).
+
+Example:
 ```bash
-~/code/git.ourworld.tf/herocode/herodb/herodb/build.sh
+redis-cli AGE GENENC
-~/code/git.ourworld.tf/herocode/herodb/target/release/herodb --dir /tmp/data --debug --$PORT 6381 --encryption-key 1234 --encrypt
+# → 1) "age1qz..."  # recipient (X25519 public)
-```
+#    2) "AGE-SECRET-KEY-1..."  # identity (X25519 secret)
 
+redis-cli AGE ENCRYPT "age1qz..." "hello"
+# → base64_ciphertext
 
-```bash
+redis-cli AGE DECRYPT "AGE-SECRET-KEY-1..." base64_ciphertext
-export PORT=6381
-# Generate an ephemeral keypair and encrypt/decrypt a message (stateless mode)
-redis-cli -p $PORT AGE GENENC
-# → returns an array: [recipient, identity]
-
-redis-cli -p $PORT AGE ENCRYPT <recipient> "hello world"
-# → returns ciphertext (base64 in a bulk string)
-
-redis-cli -p $PORT AGE DECRYPT <identity> <ciphertext_b64>
-# → returns "hello world"
-```
-
-For key‑managed mode, generate a named key once and reference it by name afterwards:
-
-```bash
-redis-cli -p $PORT AGE KEYGEN app1
-# → persists encryption keypair under name "app1"
-
-redis-cli -p $PORT AGE ENCRYPTNAME app1 "hello"
-redis-cli -p $PORT AGE DECRYPTNAME app1 <ciphertext_b64>
-```
-
-## Stateless AGE (ephemeral)
-
-Characteristics
-
-- No server‑side storage of keys.
-- You pass the actual key material with every call.
-- Not listable via AGE LIST.
-
-Commands and examples
-
-1) Ephemeral encryption keys
-
-```bash
-# Generate an ephemeral encryption keypair 
-redis-cli -p $PORT AGE GENENC
-# Example output (abridged):
-# 1) "age1qz..."          # recipient (public key) = can be used by others e.g. to verify what I sign
-# 2) "AGE-SECRET-KEY-1..." # identity (secret) = is like my private, cannot lose this one
-
-# Encrypt with the recipient public key
-redis-cli -p $PORT AGE ENCRYPT "age1qz..." "hello world"
-
-# → returns bulk string payload: base64 ciphertext (encrypted content)
-
-# Decrypt with the identity (secret) in other words your private key
-redis-cli -p $PORT AGE DECRYPT "AGE-SECRET-KEY-1..." "<ciphertext_b64>"
-# → "hello world"
-```
-
-2) Ephemeral signing keys
-
-> ? is this same as my private key
-
-```bash
-
-# Generate an ephemeral signing keypair
-redis-cli -p $PORT AGE GENSIGN
-# Example output:
-# 1) "<verify_pub_b64>"
-# 2) "<sign_secret_b64>"
-
-# Sign a message with the secret
-redis-cli -p $PORT AGE SIGN "<sign_secret_b64>" "msg"
-# → returns "<signature_b64>"
-
-# Verify with the public key
-redis-cli -p $PORT AGE VERIFY "<verify_pub_b64>" "msg" "<signature_b64>"
-# → 1 (valid) or 0 (invalid)
-```
-
-When to use
-- You do not want the server to store private keys.
-- You already manage key material on the client side.
-- You need ad‑hoc operations without persistence.
-
-Reference test: [rust.test_07_age_stateless_suite()](herodb/tests/usage_suite.rs:495)
-
-## Key‑managed AGE (persistent, named)
-
-Characteristics
-- Server generates and persists keypairs under a chosen name.
-- Clients refer to keys by name; raw secrets are not supplied on each call.
-- Keys are discoverable via AGE LIST.
-
-Commands and examples
-
-1) Named encryption keys
-
-```bash
-# Create/persist a named encryption keypair
-redis-cli -p $PORT AGE KEYGEN app1
-# → returns [recipient, identity] but also stores them under name "app1"
-
-> TODO: should not return identity (security, but there can be separate function to export it e.g. AGE EXPORTKEY app1)
-
-# Encrypt using the stored public key
-redis-cli -p $PORT AGE ENCRYPTNAME app1 "hello"
-# → returns bulk string payload: base64 ciphertext
-
-# Decrypt using the stored secret
-redis-cli -p $PORT AGE DECRYPTNAME app1 "<ciphertext_b64>"
 # → "hello"
 ```
 
-2) Named signing keys
+## Key-Managed Mode (Persistent Named Keys)
+Keys are stored server-side under names. Supports unified keypairs for both encryption and signatures.
 
+Available commands:
+- `AGE KEYGEN <name>`: Generate and store unified keypair. Returns `[recipient, identity]` in age format.
+- `AGE SIGNKEYGEN <name>`: Generate and store Ed25519 signing keypair. Returns `[verify_pub, sign_secret]`.
+- `AGE ENCRYPTNAME <name> <message>`: Encrypt with named key. Returns base64 ciphertext.
+- `AGE DECRYPTNAME <name> <ciphertext_b64>`: Decrypt with named key. Returns plaintext.
+- `AGE SIGNNAME <name> <message>`: Sign with named key. Returns base64 signature.
+- `AGE VERIFYNAME <name> <message> <signature_b64>`: Verify with named key. Returns 1 or 0.
+- `AGE LIST`: List all stored key names. Returns sorted array of names.
+
+### AGE LIST Output
+Returns a flat, deduplicated, sorted array of key names (strings). Each name corresponds to a stored keypair, which may include encryption keys (X25519), signing keys (Ed25519), or both.
+
+Output format: `["name1", "name2", ...]`
+
+Example:
 ```bash
-# Create/persist a named signing keypair
+redis-cli AGE LIST
-redis-cli -p $PORT AGE SIGNKEYGEN app1
+# →  1) "<named_keypair_1>"
-# → returns [verify_pub_b64, sign_secret_b64] and stores under name "app1"
+#    2) "<named_keypair_2>"
-
-> TODO: should not return sign_secret_b64 (for security, but there can be separate function to export it e.g. AGE EXPORTSIGNKEY app1)
-
-# Sign using the stored secret
-redis-cli -p $PORT AGE SIGNNAME app1 "msg"
-# → returns "<signature_b64>"
-
-# Verify using the stored public key
-redis-cli -p $PORT AGE VERIFYNAME app1 "msg" "<signature_b64>"
-# → 1 (valid) or 0 (invalid)
 ```
 
-3) List stored AGE keys
+For unified keypairs (from `AGE KEYGEN`), the name handles both encryption (derived X25519) and signatures (stored Ed25519) transparently.
 
+Example with named keys:
 ```bash
-redis-cli -p $PORT AGE LIST
+redis-cli AGE KEYGEN app1
-# Example output includes labels such as "encpub" and your key names (e.g., "app1")
+# →  1) "age1..."  # recipient
+#    2) "AGE-SECRET-KEY-1..."  # identity
+
+redis-cli AGE ENCRYPTNAME app1 "secret message"
+# → base64_ciphertext
+
+redis-cli AGE DECRYPTNAME app1 base64_ciphertext
+# → "secret message"
+
+redis-cli AGE SIGNNAME app1 "message"
+# → base64_signature
+
+redis-cli AGE VERIFYNAME app1 "message" base64_signature
+# → 1
 ```
 
-When to use
+## Choosing a Mode
-- You want centralized key storage/rotation and fewer secrets on the client.
+- **Stateless**: For ad-hoc operations without persistence; client manages keys.
-- You need names/labels for workflows and can trust the server with secrets.
+- **Key-managed**: For centralized key lifecycle; server stores keys for convenience and discoverability.
-- You want discoverability (AGE LIST) and simpler client commands.
 
-Reference test: [rust.test_08_age_persistent_named_suite()](herodb/tests/usage_suite.rs:555)
+Implementation: [herodb/src/age.rs](herodb/src/age.rs) <br> 
-
+Tests: [herodb/tests/usage_suite.rs](herodb/tests/usage_suite.rs)
-## Choosing a mode
-
-- Prefer Stateless when:
-  - Minimizing server trust for secret material is the priority.
-  - Clients already have a secure mechanism to store/distribute keys.
-- Prefer Key‑managed when:
-  - Centralized lifecycle, naming, and discoverability are beneficial.
-  - You plan to integrate rotation, ACLs, or auditability on the server side.
-
-## Security notes
-
-- Treat identities and signing secrets as sensitive; avoid logging them.
-- For key‑managed mode, ensure server storage (and backups) are protected.
-- AGE operations here are application‑level crypto and are distinct from database-at-rest encryption configured in the test harness.
-
-## Repository pointers
-
-- Stateless examples in tests: [rust.test_07_age_stateless_suite()](herodb/tests/usage_suite.rs:495)
-- Key‑managed examples in tests: [rust.test_08_age_persistent_named_suite()](herodb/tests/usage_suite.rs:555)
-- AGE implementation: [herodb/src/age.rs](herodb/src/age.rs)
-- Command dispatch: [herodb/src/cmd.rs](herodb/src/cmd.rs)
-- Bash demo: [herodb/examples/age_bash_demo.sh](herodb/examples/age_bash_demo.sh)
-- Rust persistent demo: [herodb/examples/age_persist_demo.rs](herodb/examples/age_persist_demo.rs)
-- Additional notes: [herodb/instructions/encrypt.md](herodb/instructions/encrypt.md)

docs/basics.md

@@ -1,4 +1,75 @@
-Here's an expanded version of the cmds.md documentation to include the list commands:
+# HeroDB Basics
+
+## Launching HeroDB
+
+To launch HeroDB, use the binary with required and optional flags. The `--admin-secret` flag is mandatory, encrypting the admin database (DB 0) and authorizing admin access.
+
+### Launch Flags
+- `--dir <path>`: Directory for database files (default: current directory).
+- `--port <port>`: TCP port for Redis protocol (default: 6379).
+- `--debug`: Enable debug logging.
+- `--sled`: Use Sled backend (default: Redb).
+- `--enable-rpc`: Start JSON-RPC management server on port 8080 (HTTP over TCP).
+- `--rpc-port <port>`: Custom RPC port (default: 8080).
+- `--enable-rpc-ipc`: Start JSON-RPC over a Unix Domain Socket (non-HTTP).
+- `--rpc-ipc-path <path>`: Path to the Unix socket for IPC (default: `/tmp/herodb.ipc`).
+- `--admin-secret <secret>`: Required secret for DB 0 encryption and admin access.
+
+Example:
+```bash
+./target/release/herodb --dir /tmp/herodb --admin-secret mysecret --port 6379 --enable-rpc
+```
+
+To enable JSON-RPC over a Unix Domain Socket at `/tmp/herodb.sock`:
+```bash
+./target/release/herodb --dir /tmp/herodb --admin-secret mysecret --enable-rpc-ipc --rpc-ipc-path /tmp/herodb.sock
+```
+
+Test the IPC endpoint interactively with socat (non-HTTP transport):
+```bash
+sudo socat -d -d -t 5 - UNIX-CONNECT:/tmp/herodb.sock
+```
+Then paste a framed JSON-RPC request. Example:
+```
+{"jsonrpc":"2.0","method":"hero_listDatabases","params":[],"id":3}
+```
+More IPC examples are in [docs/rpc_examples.md](docs/rpc_examples.md).
+
+Deprecated flags (`--encrypt`, `--encryption-key`) are ignored for data DBs; per-database encryption is managed via RPC.
+
+## Admin Database (DB 0)
+
+DB 0 acts as the administrative database instance, storing metadata for all user databases (IDs >= 1). It controls existence, access control, and per-database encryption. DB 0 is always encrypted with the `--admin-secret`.
+
+When creating a new database, DB 0 allocates an ID, registers it, and optionally stores a per-database encryption key (write-only). Databases are public by default; use RPC to set them private, requiring access keys for SELECT (read or readwrite based on permissions). Keys are persisted in DB 0 for managed AGE operations.
+
+Access DB 0 with `SELECT 0 KEY <admin-secret>`.
+
+## Symmetric Encryption
+
+HeroDB supports stateless symmetric encryption via SYM commands, using XChaCha20-Poly1305 AEAD.
+
+Commands:
+- `SYM KEYGEN`: Generate 32-byte key. Returns base64-encoded key.
+- `SYM ENCRYPT <key_b64> <message>`: Encrypt message. Returns base64 ciphertext.
+- `SYM DECRYPT <key_b64> <ciphertext_b64>`: Decrypt. Returns plaintext.
+
+Example:
+```bash
+redis-cli SYM KEYGEN
+# → base64_key
+
+redis-cli SYM ENCRYPT base64_key "secret"
+# → base64_ciphertext
+
+redis-cli SYM DECRYPT base64_key base64_ciphertext
+# → "secret"
+```
+
+## RPC Options
+
+Enable the JSON-RPC server with `--enable-rpc` for database management. Methods include creating databases, managing access keys, and setting encryption. See [JSON-RPC Examples](./rpc_examples.md) for payloads.
+
 # HeroDB Commands
 
 HeroDB implements a subset of Redis commands over the Redis protocol. This document describes the available commands and their usage.
@@ -575,6 +646,29 @@ redis-cli -p $PORT AGE LIST
 #    2) "keyname2"
 ```
 
+## SYM Commands
+
+### SYM KEYGEN
+Generate a symmetric encryption key.
+```bash
+redis-cli -p $PORT SYM KEYGEN
+# → base64_encoded_32byte_key
+```
+
+### SYM ENCRYPT
+Encrypt a message with a symmetric key.
+```bash
+redis-cli -p $PORT SYM ENCRYPT <key_b64> "message"
+# → base64_encoded_ciphertext
+```
+
+### SYM DECRYPT
+Decrypt a ciphertext with a symmetric key.
+```bash
+redis-cli -p $PORT SYM DECRYPT <key_b64> <ciphertext_b64>
+# → decrypted_message
+```
+
 ## Server Information Commands
 
 ### INFO
@@ -621,3 +715,27 @@ This expanded documentation includes all the list commands that were implemented
 10. LINDEX - get element by index
 11. LRANGE - get range of elements
 
+
+## Updated Database Selection and Access Keys
+
+HeroDB uses an `Admin DB 0` to control database existence, access, and encryption. Access to data DBs can be public (no key) or private (requires a key). See detailed model in [docs/admin.md](./admin.md).
+
+Examples:
+
+```bash
+# Public database (no key required)
+redis-cli -p $PORT SELECT 1
+# → OK
+```
+
+```bash
+# Private database (requires access key)
+redis-cli -p $PORT SELECT 2 KEY my-db2-access-key
+# → OK
+```
+
+```bash
+# Admin DB 0 (requires admin secret)
+redis-cli -p $PORT SELECT 0 KEY my-admin-secret
+# → OK
+```

docs/cmds.md

@@ -122,4 +122,35 @@ redis-cli -p 6379 --rdb dump.rdb
 
 # Import to sled
 redis-cli -p 6381 --pipe < dump.rdb
+```
+
+## Authentication and Database Selection
+
+Connections start with no database selected. Any storage-backed command (GET, SET, H*, L*, SCAN, etc.) will return an error until you issue a SELECT to choose a database.
+
+HeroDB uses an `Admin DB 0` to govern database existence, access and per-db encryption. Access control is enforced via `Admin DB 0` metadata. See the full model in [docs/admin.md](./admin.md).
+
+Examples:
+```bash
+# Public database (no key required)
+redis-cli -p $PORT SELECT 1
+# → OK
+```
+
+```bash
+# Private database (requires access key)
+redis-cli -p $PORT SELECT 2 KEY my-db2-access-key
+# → OK
+```
+
+```bash
+# Admin DB 0 (requires admin secret)
+redis-cli -p $PORT SELECT 0 KEY my-admin-secret
+# → OK
+```
+
+```bash
+# Before selecting a DB, storage commands will fail
+redis-cli -p $PORT GET key
+# → -ERR No database selected. Use SELECT <id> [KEY <key>] first
 ```

docs/lance.md

@@ -0,0 +1,440 @@
+# Lance Vector Backend (RESP + JSON-RPC)
+
+This document explains how to use HeroDB’s Lance-backed vector store. It is text-first: users provide text, and HeroDB computes embeddings server-side (no manual vectors). It includes copy-pasteable RESP (redis-cli) and JSON-RPC examples for:
+
+- Creating a Lance database
+- Embedding provider configuration (OpenAI, Azure OpenAI, or deterministic test provider)
+- Dataset lifecycle: CREATE, LIST, INFO, DROP
+- Ingestion: STORE text (+ optional metadata)
+- Search: QUERY with K, optional FILTER and RETURN
+- Delete by id
+- Index creation (currently a placeholder/no-op)
+
+References:
+- Implementation: [src/lance_store.rs](src/lance_store.rs), [src/cmd.rs](src/cmd.rs), [src/rpc.rs](src/rpc.rs), [src/server.rs](src/server.rs), [src/embedding.rs](src/embedding.rs)
+
+Notes:
+- Admin DB 0 cannot be Lance (or Tantivy). Only databases with id >= 1 can use Lance.
+- Permissions:
+  - Read operations (SEARCH, LIST, INFO) require read permission.
+  - Mutating operations (CREATE, STORE, CREATEINDEX, DEL, DROP, EMBEDDING CONFIG SET) require readwrite permission.
+- Backend gating:
+  - If a DB is Lance, only LANCE.* and basic control commands (PING, ECHO, SELECT, INFO, CLIENT, etc.) are permitted.
+  - If a DB is not Lance, LANCE.* commands return an error.
+
+Storage layout and schema:
+- Files live at: <base_dir>/lance/<db_id>/<dataset>.lance
+- Records schema:
+  - id: Utf8 (non-null)
+  - vector: FixedSizeList<Float32, dim> (non-null)
+  - text: Utf8 (nullable)
+  - meta: Utf8 JSON (nullable)
+- Search is an L2 KNN brute-force scan for now (lower score = better). Index creation is a no-op placeholder to be implemented later.
+
+Prerequisites:
+- Start HeroDB with RPC enabled (for management calls):
+  - See [docs/basics.md](./basics.md) for flags. Example:
+    ```bash
+    ./target/release/herodb --dir /tmp/herodb --admin-secret mysecret --port 6379 --enable-rpc
+    ```
+
+
+## 0) Create a Lance-backed database (JSON-RPC)
+
+Use the management API to create a database with backend "Lance". DB 0 is reserved for admin and cannot be Lance.
+
+Request:
+```json
+{
+  "jsonrpc": "2.0",
+  "id": 1,
+  "method": "herodb_createDatabase",
+  "params": [
+    "Lance",
+    { "name": "vectors-db", "storage_path": null, "max_size": null, "redis_version": null },
+    null
+  ]
+}
+```
+
+- Response contains the allocated db_id (>= 1). Use that id below (replace 1 with your actual id).
+
+Select the database over RESP:
+```bash
+redis-cli -p 6379 SELECT 1
+# → OK
+```
+
+
+## 1) Configure embedding provider (server-side embeddings)
+
+HeroDB embeds text internally at STORE/SEARCH time using a per-dataset EmbeddingConfig sidecar. Configure provider before creating a dataset to choose dimensions and provider.
+
+Supported providers:
+- openai (standard OpenAI API or custom OpenAI-compatible endpoints)
+- testhash (deterministic, CI-friendly; no network)
+
+Environment variable for OpenAI:
+- Standard OpenAI: export OPENAI_API_KEY=sk-...
+
+RESP examples:
+```bash
+# Standard OpenAI with default dims (model-dependent, e.g. 1536)
+redis-cli -p 6379 LANCE.EMBEDDING CONFIG SET myset PROVIDER openai MODEL text-embedding-3-small
+
+# OpenAI with reduced output dimension (e.g., 512) when supported
+redis-cli -p 6379 LANCE.EMBEDDING CONFIG SET myset PROVIDER openai MODEL text-embedding-3-small PARAM dim 512
+
+# Custom OpenAI-compatible endpoint (e.g., self-hosted)
+redis-cli -p 6379 LANCE.EMBEDDING CONFIG SET myset PROVIDER openai MODEL text-embedding-3-small \
+  PARAM endpoint http://localhost:8081/v1/embeddings \
+  PARAM dim 512
+
+# Deterministic test provider (no network, stable vectors)
+redis-cli -p 6379 LANCE.EMBEDDING CONFIG SET myset PROVIDER testhash MODEL any
+```
+
+Read config:
+```bash
+redis-cli -p 6379 LANCE.EMBEDDING CONFIG GET myset
+# → JSON blob describing provider/model/params
+```
+
+JSON-RPC examples:
+```json
+{
+  "jsonrpc": "2.0",
+  "id": 2,
+  "method": "herodb_lanceSetEmbeddingConfig",
+  "params": [
+    1,
+    "myset",
+    "openai",
+    "text-embedding-3-small",
+    { "dim": "512" }
+  ]
+}
+```
+
+```json
+{
+  "jsonrpc": "2.0",
+  "id": 3,
+  "method": "herodb_lanceGetEmbeddingConfig",
+  "params": [1, "myset"]
+}
+```
+
+
+## 2) Create a dataset
+
+Choose a dimension that matches your embedding configuration. For OpenAI text-embedding-3-small without dimension override, typical dimension is 1536; when `dim` is set (e.g., 512), use that. The current API requires an explicit DIM.
+
+RESP:
+```bash
+redis-cli -p 6379 LANCE.CREATE myset DIM 512
+# → OK
+```
+
+JSON-RPC:
+```json
+{
+  "jsonrpc": "2.0",
+  "id": 4,
+  "method": "herodb_lanceCreate",
+  "params": [1, "myset", 512]
+}
+```
+
+
+## 3) Store text documents (server-side embedding)
+
+Provide your id, the text to embed, and optional META fields. The server computes the embedding using the configured provider and stores id/vector/text/meta in the Lance dataset. Upserts by id are supported via delete-then-append semantics.
+
+RESP:
+```bash
+redis-cli -p 6379 LANCE.STORE myset ID doc-1 TEXT "Hello vector world" META title "Hello" category "demo"
+# → OK
+```
+
+JSON-RPC:
+```json
+{
+  "jsonrpc": "2.0",
+  "id": 5,
+  "method": "herodb_lanceStoreText",
+  "params": [
+    1,
+    "myset",
+    "doc-1",
+    "Hello vector world",
+    { "title": "Hello", "category": "demo" }
+  ]
+}
+```
+
+
+## 4) Search with a text query
+
+Provide a query string; the server embeds it and performs KNN search. Optional: FILTER expression and RETURN subset of fields.
+
+RESP:
+```bash
+# K nearest neighbors for the query text
+redis-cli -p 6379 LANCE.SEARCH myset K 5 QUERY "greetings to vectors"
+# → Array of hits: [id, score, [k,v, ...]] pairs, lower score = closer
+
+# With a filter on meta fields and return only title
+redis-cli -p 6379 LANCE.SEARCH myset K 3 QUERY "greetings to vectors" FILTER "category = 'demo'" RETURN 1 title
+```
+
+JSON-RPC:
+```json
+{
+  "jsonrpc": "2.0",
+  "id": 6,
+  "method": "herodb_lanceSearchText",
+  "params": [1, "myset", "greetings to vectors", 5, null, null]
+}
+```
+
+With filter and selected fields:
+```json
+{
+  "jsonrpc": "2.0",
+  "id": 7,
+  "method": "herodb_lanceSearchText",
+  "params": [1, "myset", "greetings to vectors", 3, "category = 'demo'", ["title"]]
+}
+```
+
+Response shape:
+- RESP over redis-cli: an array of hits [id, score, [k, v, ...]].
+- JSON-RPC returns an object containing the RESP-encoded wire format string or a structured result depending on implementation. See [src/rpc.rs](src/rpc.rs) for details.
+
+
+## 5) Create an index (placeholder)
+
+Index creation currently returns OK but is a no-op. It will integrate Lance vector indices in a future update.
+
+RESP:
+```bash
+redis-cli -p 6379 LANCE.CREATEINDEX myset TYPE "ivf_pq" PARAM nlist 100 PARAM pq_m 16
+# → OK (no-op for now)
+```
+
+JSON-RPC:
+```json
+{
+  "jsonrpc": "2.0",
+  "id": 8,
+  "method": "herodb_lanceCreateIndex",
+  "params": [1, "myset", "ivf_pq", { "nlist": "100", "pq_m": "16" }]
+}
+```
+
+
+## 6) Inspect datasets
+
+RESP:
+```bash
+# List datasets in current Lance DB
+redis-cli -p 6379 LANCE.LIST
+
+# Get dataset info
+redis-cli -p 6379 LANCE.INFO myset
+```
+
+JSON-RPC:
+```json
+{
+  "jsonrpc": "2.0",
+  "id": 9,
+  "method": "herodb_lanceList",
+  "params": [1]
+}
+```
+
+```json
+{
+  "jsonrpc": "2.0",
+  "id": 10,
+  "method": "herodb_lanceInfo",
+  "params": [1, "myset"]
+}
+```
+
+
+## 7) Delete and drop
+
+RESP:
+```bash
+# Delete by id
+redis-cli -p 6379 LANCE.DEL myset doc-1
+# → OK
+
+# Drop the entire dataset
+redis-cli -p 6379 LANCE.DROP myset
+# → OK
+```
+
+JSON-RPC:
+```json
+{
+  "jsonrpc": "2.0",
+  "id": 11,
+  "method": "herodb_lanceDel",
+  "params": [1, "myset", "doc-1"]
+}
+```
+
+```json
+{
+  "jsonrpc": "2.0",
+  "id": 12,
+  "method": "herodb_lanceDrop",
+  "params": [1, "myset"]
+}
+```
+
+
+## 8) End-to-end example (RESP)
+
+```bash
+# 1. Select Lance DB (assume db_id=1 created via RPC)
+redis-cli -p 6379 SELECT 1
+
+# 2. Configure embedding provider (OpenAI small model at 512 dims)
+redis-cli -p 6379 LANCE.EMBEDDING CONFIG SET myset PROVIDER openai MODEL text-embedding-3-small PARAM dim 512
+
+# 3. Create dataset
+redis-cli -p 6379 LANCE.CREATE myset DIM 512
+
+# 4. Store documents
+redis-cli -p 6379 LANCE.STORE myset ID doc-1 TEXT "The quick brown fox jumps over the lazy dog" META title "Fox" category "animal"
+redis-cli -p 6379 LANCE.STORE myset ID doc-2 TEXT "A fast auburn fox vaulted a sleepy canine" META title "Fox paraphrase" category "animal"
+
+# 5. Search
+redis-cli -p 6379 LANCE.SEARCH myset K 2 QUERY "quick brown fox" RETURN 1 title
+
+# 6. Dataset info and listing
+redis-cli -p 6379 LANCE.INFO myset
+redis-cli -p 6379 LANCE.LIST
+
+# 7. Delete and drop
+redis-cli -p 6379 LANCE.DEL myset doc-2
+redis-cli -p 6379 LANCE.DROP myset
+```
+
+
+## 9) End-to-end example (JSON-RPC)
+
+Assume RPC server on port 8080. Replace ids and ports as needed.
+
+1) Create Lance DB:
+```json
+{
+  "jsonrpc": "2.0",
+  "id": 100,
+  "method": "herodb_createDatabase",
+  "params": ["Lance", { "name": "vectors-db", "storage_path": null, "max_size": null, "redis_version": null }, null]
+}
+```
+
+2) Set embedding config:
+```json
+{
+  "jsonrpc": "2.0",
+  "id": 101,
+  "method": "herodb_lanceSetEmbeddingConfig",
+  "params": [1, "myset", "openai", "text-embedding-3-small", { "dim": "512" }]
+}
+```
+
+3) Create dataset:
+```json
+{
+  "jsonrpc": "2.0",
+  "id": 102,
+  "method": "herodb_lanceCreate",
+  "params": [1, "myset", 512]
+}
+```
+
+4) Store text:
+```json
+{
+  "jsonrpc": "2.0",
+  "id": 103,
+  "method": "herodb_lanceStoreText",
+  "params": [1, "myset", "doc-1", "The quick brown fox jumps over the lazy dog", { "title": "Fox", "category": "animal" }]
+}
+```
+
+5) Search text:
+```json
+{
+  "jsonrpc": "2.0",
+  "id": 104,
+  "method": "herodb_lanceSearchText",
+  "params": [1, "myset", "quick brown fox", 2, null, ["title"]]
+}
+```
+
+6) Info/list:
+```json
+{
+  "jsonrpc": "2.0",
+  "id": 105,
+  "method": "herodb_lanceInfo",
+  "params": [1, "myset"]
+}
+```
+
+```json
+{
+  "jsonrpc": "2.0",
+  "id": 106,
+  "method": "herodb_lanceList",
+  "params": [1]
+}
+```
+
+7) Delete/drop:
+```json
+{
+  "jsonrpc": "2.0",
+  "id": 107,
+  "method": "herodb_lanceDel",
+  "params": [1, "myset", "doc-1"]
+}
+```
+
+```json
+{
+  "jsonrpc": "2.0",
+  "id": 108,
+  "method": "herodb_lanceDrop",
+  "params": [1, "myset"]
+}
+```
+
+
+## 10) Operational notes and troubleshooting
+
+- If using OpenAI and you see “missing API key env”, set:
+  - Standard: `export OPENAI_API_KEY=sk-...`
+  - Azure: `export AZURE_OPENAI_API_KEY=...` and pass `use_azure true`, `azure_endpoint`, `azure_deployment`, `azure_api_version`.
+- Dimensions mismatch:
+  - Ensure the dataset DIM equals the provider’s embedding dim. For OpenAI text-embedding-3 models, set `PARAM dim 512` (or another supported size) and use that same DIM for `LANCE.CREATE`.
+- DB 0 restriction:
+  - Lance is not allowed on DB 0. Use db_id >= 1.
+- Permissions:
+  - Read operations (SEARCH, LIST, INFO) require read permission.
+  - Mutations (CREATE, STORE, CREATEINDEX, DEL, DROP, EMBEDDING CONFIG SET) require readwrite permission.
+- Backend gating:
+  - On Lance DBs, only LANCE.* commands are accepted (plus basic control).
+- Current index behavior:
+  - `LANCE.CREATEINDEX` returns OK but is a no-op. Future versions will integrate Lance vector indices.
+- Implementation files for reference:
+  - [src/lance_store.rs](src/lance_store.rs), [src/cmd.rs](src/cmd.rs), [src/rpc.rs](src/rpc.rs), [src/server.rs](src/server.rs), [src/embedding.rs](src/embedding.rs)

docs/lancedb_text_and_images_example.md

@@ -0,0 +1,134 @@
+# LanceDB Text and Images: End-to-End Example
+
+This guide demonstrates creating a Lance backend database, ingesting two text documents and two images, performing searches over both, and cleaning up the datasets.
+
+Prerequisites
+- Build HeroDB and start the server with JSON-RPC enabled.
+Commands:
+```bash
+cargo build --release
+./target/release/herodb --dir /tmp/herodb --admin-secret mysecret --port 6379 --enable-rpc
+```
+
+We'll use:
+- redis-cli for RESP commands against port 6379
+- curl for JSON-RPC against 8080 if desired
+- Deterministic local embedders to avoid external dependencies: testhash (text, dim 64) and testimagehash (image, dim 512)
+
+0) Create a Lance-backed database (JSON-RPC)
+Request:
+```json
+{ "jsonrpc": "2.0", "id": 1, "method": "herodb_createDatabase", "params": ["Lance", { "name": "media-db", "storage_path": null, "max_size": null, "redis_version": null }, null] }
+```
+Response returns db_id (assume 1). Select DB over RESP:
+```bash
+redis-cli -p 6379 SELECT 1
+# → OK
+```
+
+1) Configure embedding providers
+We'll create two datasets with independent embedding configs:
+- textset → provider testhash, dim 64
+- imageset → provider testimagehash, dim 512
+
+Text config:
+```bash
+redis-cli -p 6379 LANCE.EMBEDDING CONFIG SET textset PROVIDER testhash MODEL any PARAM dim 64
+# → OK
+```
+Image config:
+```bash
+redis-cli -p 6379 LANCE.EMBEDDING CONFIG SET imageset PROVIDER testimagehash MODEL any PARAM dim 512
+# → OK
+```
+
+2) Create datasets
+```bash
+redis-cli -p 6379 LANCE.CREATE textset DIM 64
+# → OK
+redis-cli -p 6379 LANCE.CREATE imageset DIM 512
+# → OK
+```
+
+3) Ingest two text documents (server-side embedding)
+```bash
+redis-cli -p 6379 LANCE.STORE textset ID doc-1 TEXT "The quick brown fox jumps over the lazy dog" META title "Fox" category "animal"
+# → OK
+redis-cli -p 6379 LANCE.STORE textset ID doc-2 TEXT "A fast auburn fox vaulted a sleepy canine" META title "Paraphrase" category "animal"
+# → OK
+```
+
+4) Ingest two images
+You can provide a URI or base64 bytes. Use URI for URIs, BYTES for base64 data.
+Example using free placeholder images:
+```bash
+# Store via URI
+redis-cli -p 6379 LANCE.STOREIMAGE imageset ID img-1 URI "https://picsum.photos/seed/1/256/256" META title "Seed1" group "demo"
+# → OK
+redis-cli -p 6379 LANCE.STOREIMAGE imageset ID img-2 URI "https://picsum.photos/seed/2/256/256" META title "Seed2" group "demo"
+# → OK
+```
+If your environment blocks outbound HTTP, you can embed image bytes:
+```bash
+# Example: read a local file and base64 it (replace path)
+b64=$(base64 -w0 ./image1.png)
+redis-cli -p 6379 LANCE.STOREIMAGE imageset ID img-b64-1 BYTES "$b64" META title "Local1" group "demo"
+```
+
+5) Search text
+```bash
+# Top-2 nearest neighbors for a query
+redis-cli -p 6379 LANCE.SEARCH textset K 2 QUERY "quick brown fox" RETURN 1 title
+# → 1) [id, score, [k1,v1,...]]
+```
+With a filter (supports equality on schema or meta keys):
+```bash
+redis-cli -p 6379 LANCE.SEARCH textset K 2 QUERY "fox jumps" FILTER "category = 'animal'" RETURN 1 title
+```
+
+6) Search images
+```bash
+# Provide a URI as the query
+redis-cli -p 6379 LANCE.SEARCHIMAGE imageset K 2 QUERYURI "https://picsum.photos/seed/1/256/256" RETURN 1 title
+
+# Or provide base64 bytes as the query
+qb64=$(curl -s https://picsum.photos/seed/3/256/256 | base64 -w0)
+redis-cli -p 6379 LANCE.SEARCHIMAGE imageset K 2 QUERYBYTES "$qb64" RETURN 1 title
+```
+
+7) Inspect datasets
+```bash
+redis-cli -p 6379 LANCE.LIST
+redis-cli -p 6379 LANCE.INFO textset
+redis-cli -p 6379 LANCE.INFO imageset
+```
+
+8) Delete by id and drop datasets
+```bash
+# Delete one record
+redis-cli -p 6379 LANCE.DEL textset doc-2
+# → OK
+
+# Drop entire datasets
+redis-cli -p 6379 LANCE.DROP textset
+redis-cli -p 6379 LANCE.DROP imageset
+# → OK
+```
+
+Appendix: Using OpenAI embeddings instead of test providers
+Text:
+```bash
+export OPENAI_API_KEY=sk-...
+redis-cli -p 6379 LANCE.EMBEDDING CONFIG SET textset PROVIDER openai MODEL text-embedding-3-small PARAM dim 512
+redis-cli -p 6379 LANCE.CREATE textset DIM 512
+```
+Custom OpenAI-compatible endpoint:
+```bash
+redis-cli -p 6379 LANCE.EMBEDDING CONFIG SET textset PROVIDER openai MODEL text-embedding-3-small \
+  PARAM endpoint http://localhost:8081/v1/embeddings \
+  PARAM dim 512
+```
+Notes:
+- Ensure dataset DIM matches the configured embedding dimension.
+- Lance is only available for non-admin databases (db_id >= 1).
+- On Lance DBs, only LANCE.* and basic control commands are allowed.

docs/local_embedder_full_example.md

@@ -0,0 +1,831 @@
+# HeroDB Embedding Models: Complete Tutorial
+
+This tutorial demonstrates how to use embedding models with HeroDB for vector search, covering local self-hosted models, OpenAI's API, and deterministic test embedders.
+
+## Table of Contents
+- [Prerequisites](#prerequisites)
+- [Scenario 1: Local Embedding Model](#scenario-1-local-embedding-model-testing)
+- [Scenario 2: OpenAI API](#scenario-2-openai-api)
+- [Scenario 3: Deterministic Test Embedder](#scenario-3-deterministic-test-embedder-no-network)
+- [Troubleshooting](#troubleshooting)
+
+---
+
+## Prerequisites
+
+### Start HeroDB Server
+
+Build and start HeroDB with RPC enabled:
+
+```bash
+cargo build --release
+./target/release/herodb --dir ./data --admin-secret my-admin-secret --enable-rpc --rpc-port 8080
+```
+
+This starts:
+- Redis-compatible server on port 6379
+- JSON-RPC server on port 8080
+
+### Client Tools
+
+For Redis-like commands:
+```bash
+redis-cli -p 6379
+```
+
+For JSON-RPC calls, use `curl`:
+```bash
+curl -X POST http://localhost:8080 \
+  -H "Content-Type: application/json" \
+  -d '{"jsonrpc":"2.0","id":1,"method":"herodb_METHOD","params":[...]}'
+```
+
+---
+
+## Scenario 1: Local Embedding Model (Testing)
+
+Run your own embedding service locally for development, testing, or privacy.
+
+### Option A: Python Mock Server (Simplest)
+
+This creates a minimal OpenAI-compatible embedding server for testing.
+
+**1. Create `mock_embedder.py`:**
+
+```python
+from flask import Flask, request, jsonify
+import numpy as np
+
+app = Flask(__name__)
+
+@app.route('/v1/embeddings', methods=['POST'])
+def embeddings():
+    """OpenAI-compatible embeddings endpoint"""
+    data = request.json
+    inputs = data.get('input', [])
+    
+    # Handle both single string and array
+    if isinstance(inputs, str):
+        inputs = [inputs]
+    
+    # Generate deterministic 768-dim embeddings (hash-based)
+    embeddings = []
+    for text in inputs:
+        # Simple hash to vector (deterministic)
+        vec = np.zeros(768)
+        for i, char in enumerate(text[:768]):
+            vec[i % 768] += ord(char) / 255.0
+        
+        # L2 normalize
+        norm = np.linalg.norm(vec)
+        if norm > 0:
+            vec = vec / norm
+        
+        embeddings.append(vec.tolist())
+    
+    return jsonify({
+        "data": [{"embedding": emb, "index": i} for i, emb in enumerate(embeddings)],
+        "model": data.get('model', 'mock-local'),
+        "usage": {"total_tokens": sum(len(t) for t in inputs)}
+    })
+
+if __name__ == '__main__':
+    print("Starting mock embedding server on http://127.0.0.1:8081")
+    app.run(host='127.0.0.1', port=8081, debug=False)
+```
+
+**2. Install dependencies and run:**
+
+```bash
+pip install flask numpy
+python mock_embedder.py
+```
+
+Output: `Starting mock embedding server on http://127.0.0.1:8081`
+
+**3. Test the server (optional):**
+
+```bash
+curl -X POST http://127.0.0.1:8081/v1/embeddings \
+  -H "Content-Type: application/json" \
+  -d '{"input":["hello world"],"model":"test"}'
+```
+
+You should see a JSON response with a 768-dimensional embedding.
+
+### End-to-End Example with Local Model
+
+**Step 1: Create a Lance database**
+
+JSON-RPC:
+```json
+{
+  "jsonrpc": "2.0",
+  "id": 1,
+  "method": "herodb_createDatabase",
+  "params": [
+    "Lance",
+    { "name": "local-vectors", "storage_path": null, "max_size": null, "redis_version": null },
+    null
+  ]
+}
+```
+
+Expected response:
+```json
+{"jsonrpc":"2.0","id":1,"result":1}
+```
+
+The database ID is `1`.
+
+**Step 2: Configure embedding for the dataset**
+
+JSON-RPC:
+```json
+{
+  "jsonrpc": "2.0",
+  "id": 2,
+  "method": "herodb_lanceSetEmbeddingConfig",
+  "params": [
+    1,
+    "products",
+    {
+      "provider": "openai",
+      "model": "mock-local",
+      "dim": 768,
+      "endpoint": "http://127.0.0.1:8081/v1/embeddings",
+      "headers": {
+        "Authorization": "Bearer dummy"
+      },
+      "timeout_ms": 30000
+    }
+  ]
+}
+```
+
+Redis-like:
+```bash
+redis-cli -p 6379
+SELECT 1
+LANCE.EMBEDDING CONFIG SET products PROVIDER openai MODEL mock-local DIM 768 ENDPOINT http://127.0.0.1:8081/v1/embeddings HEADER Authorization "Bearer dummy" TIMEOUTMS 30000
+```
+
+Expected response:
+```json
+{"jsonrpc":"2.0","id":2,"result":true}
+```
+
+**Step 3: Verify configuration**
+
+JSON-RPC:
+```json
+{
+  "jsonrpc": "2.0",
+  "id": 3,
+  "method": "herodb_lanceGetEmbeddingConfig",
+  "params": [1, "products"]
+}
+```
+
+Redis-like:
+```bash
+LANCE.EMBEDDING CONFIG GET products
+```
+
+Expected: Returns your configuration with provider, model, dim, endpoint, etc.
+
+**Step 4: Insert product data**
+
+JSON-RPC (item 1):
+```json
+{
+  "jsonrpc": "2.0",
+  "id": 4,
+  "method": "herodb_lanceStoreText",
+  "params": [
+    1,
+    "products",
+    "item-1",
+    "Waterproof hiking boots with ankle support and aggressive tread",
+    { "brand": "TrailMax", "category": "footwear", "price": "129.99" }
+  ]
+}
+```
+
+Redis-like:
+```bash
+LANCE.STORE products ID item-1 TEXT "Waterproof hiking boots with ankle support and aggressive tread" META brand TrailMax category footwear price 129.99
+```
+
+JSON-RPC (item 2):
+```json
+{
+  "jsonrpc": "2.0",
+  "id": 5,
+  "method": "herodb_lanceStoreText",
+  "params": [
+    1,
+    "products",
+    "item-2",
+    "Lightweight running shoes with breathable mesh upper",
+    { "brand": "SpeedFit", "category": "footwear", "price": "89.99" }
+  ]
+}
+```
+
+JSON-RPC (item 3):
+```json
+{
+  "jsonrpc": "2.0",
+  "id": 6,
+  "method": "herodb_lanceStoreText",
+  "params": [
+    1,
+    "products",
+    "item-3",
+    "Insulated winter jacket with removable hood and multiple pockets",
+    { "brand": "WarmTech", "category": "outerwear", "price": "199.99" }
+  ]
+}
+```
+
+JSON-RPC (item 4):
+```json
+{
+  "jsonrpc": "2.0",
+  "id": 7,
+  "method": "herodb_lanceStoreText",
+  "params": [
+    1,
+    "products",
+    "item-4",
+    "Camping tent for 4 people with waterproof rainfly",
+    { "brand": "OutdoorPro", "category": "camping", "price": "249.99" }
+  ]
+}
+```
+
+Expected response for each: `{"jsonrpc":"2.0","id":N,"result":true}`
+
+**Step 5: Search by text query**
+
+JSON-RPC:
+```json
+{
+  "jsonrpc": "2.0",
+  "id": 8,
+  "method": "herodb_lanceSearchText",
+  "params": [
+    1,
+    "products",
+    "boots for hiking in wet conditions",
+    3,
+    null,
+    ["brand", "category", "price"]
+  ]
+}
+```
+
+Redis-like:
+```bash
+LANCE.SEARCH products K 3 QUERY "boots for hiking in wet conditions" RETURN 3 brand category price
+```
+
+Expected response:
+```json
+{
+  "jsonrpc": "2.0",
+  "id": 8,
+  "result": {
+    "results": [
+      {
+        "id": "item-1",
+        "score": 0.234,
+        "meta": {
+          "brand": "TrailMax",
+          "category": "footwear",
+          "price": "129.99"
+        }
+      },
+      ...
+    ]
+  }
+}
+```
+
+**Step 6: Search with metadata filter**
+
+JSON-RPC:
+```json
+{
+  "jsonrpc": "2.0",
+  "id": 9,
+  "method": "herodb_lanceSearchText",
+  "params": [
+    1,
+    "products",
+    "comfortable shoes for running",
+    5,
+    "category = 'footwear'",
+    null
+  ]
+}
+```
+
+Redis-like:
+```bash
+LANCE.SEARCH products K 5 QUERY "comfortable shoes for running" FILTER "category = 'footwear'"
+```
+
+This returns only items where `category` equals `'footwear'`.
+
+**Step 7: List datasets**
+
+JSON-RPC:
+```json
+{
+  "jsonrpc": "2.0",
+  "id": 10,
+  "method": "herodb_lanceList",
+  "params": [1]
+}
+```
+
+Redis-like:
+```bash
+LANCE.LIST
+```
+
+**Step 8: Get dataset info**
+
+JSON-RPC:
+```json
+{
+  "jsonrpc": "2.0",
+  "id": 11,
+  "method": "herodb_lanceInfo",
+  "params": [1, "products"]
+}
+```
+
+Redis-like:
+```bash
+LANCE.INFO products
+```
+
+Returns dimension, row count, and other metadata.
+
+---
+
+## Scenario 2: OpenAI API
+
+Use OpenAI's production embedding service for semantic search.
+
+### Setup
+
+**1. Set your API key:**
+
+```bash
+export OPENAI_API_KEY="sk-your-actual-openai-key-here"
+```
+
+**2. Start HeroDB** (same as before):
+
+```bash
+./target/release/herodb --dir ./data --admin-secret my-admin-secret --enable-rpc --rpc-port 8080
+```
+
+### End-to-End Example with OpenAI
+
+**Step 1: Create a Lance database**
+
+JSON-RPC:
+```json
+{
+  "jsonrpc": "2.0",
+  "id": 1,
+  "method": "herodb_createDatabase",
+  "params": [
+    "Lance",
+    { "name": "openai-vectors", "storage_path": null, "max_size": null, "redis_version": null },
+    null
+  ]
+}
+```
+
+Expected: `{"jsonrpc":"2.0","id":1,"result":1}` (database ID = 1)
+
+**Step 2: Configure OpenAI embeddings**
+
+JSON-RPC:
+```json
+{
+  "jsonrpc": "2.0",
+  "id": 2,
+  "method": "herodb_lanceSetEmbeddingConfig",
+  "params": [
+    1,
+    "documents",
+    {
+      "provider": "openai",
+      "model": "text-embedding-3-small",
+      "dim": 1536,
+      "endpoint": null,
+      "headers": {},
+      "timeout_ms": 30000
+    }
+  ]
+}
+```
+
+Redis-like:
+```bash
+redis-cli -p 6379
+SELECT 1
+LANCE.EMBEDDING CONFIG SET documents PROVIDER openai MODEL text-embedding-3-small DIM 1536 TIMEOUTMS 30000
+```
+
+Notes:
+- `endpoint` is `null` (defaults to OpenAI API: https://api.openai.com/v1/embeddings)
+- `headers` is empty (Authorization auto-added from OPENAI_API_KEY env var)
+- `dim` is 1536 for text-embedding-3-small
+
+Expected: `{"jsonrpc":"2.0","id":2,"result":true}`
+
+**Step 3: Insert documents**
+
+JSON-RPC:
+```json
+{
+  "jsonrpc": "2.0",
+  "id": 3,
+  "method": "herodb_lanceStoreText",
+  "params": [
+    1,
+    "documents",
+    "doc-1",
+    "The quick brown fox jumps over the lazy dog",
+    { "source": "example", "lang": "en", "topic": "animals" }
+  ]
+}
+```
+
+```json
+{
+  "jsonrpc": "2.0",
+  "id": 4,
+  "method": "herodb_lanceStoreText",
+  "params": [
+    1,
+    "documents",
+    "doc-2",
+    "Machine learning models require large datasets for training and validation",
+    { "source": "tech", "lang": "en", "topic": "ai" }
+  ]
+}
+```
+
+```json
+{
+  "jsonrpc": "2.0",
+  "id": 5,
+  "method": "herodb_lanceStoreText",
+  "params": [
+    1,
+    "documents",
+    "doc-3",
+    "Python is a popular programming language for data science and web development",
+    { "source": "tech", "lang": "en", "topic": "programming" }
+  ]
+}
+```
+
+Redis-like:
+```bash
+LANCE.STORE documents ID doc-1 TEXT "The quick brown fox jumps over the lazy dog" META source example lang en topic animals
+LANCE.STORE documents ID doc-2 TEXT "Machine learning models require large datasets for training and validation" META source tech lang en topic ai
+LANCE.STORE documents ID doc-3 TEXT "Python is a popular programming language for data science and web development" META source tech lang en topic programming
+```
+
+Expected for each: `{"jsonrpc":"2.0","id":N,"result":true}`
+
+**Step 4: Semantic search**
+
+JSON-RPC:
+```json
+{
+  "jsonrpc": "2.0",
+  "id": 6,
+  "method": "herodb_lanceSearchText",
+  "params": [
+    1,
+    "documents",
+    "artificial intelligence and neural networks",
+    3,
+    null,
+    ["source", "topic"]
+  ]
+}
+```
+
+Redis-like:
+```bash
+LANCE.SEARCH documents K 3 QUERY "artificial intelligence and neural networks" RETURN 2 source topic
+```
+
+Expected response (doc-2 should rank highest due to semantic similarity):
+```json
+{
+  "jsonrpc": "2.0",
+  "id": 6,
+  "result": {
+    "results": [
+      {
+        "id": "doc-2",
+        "score": 0.123,
+        "meta": {
+          "source": "tech",
+          "topic": "ai"
+        }
+      },
+      {
+        "id": "doc-3",
+        "score": 0.456,
+        "meta": {
+          "source": "tech",
+          "topic": "programming"
+        }
+      },
+      {
+        "id": "doc-1",
+        "score": 0.789,
+        "meta": {
+          "source": "example",
+          "topic": "animals"
+        }
+      }
+    ]
+  }
+}
+```
+
+Note: Lower score = better match (L2 distance).
+
+**Step 5: Search with filter**
+
+JSON-RPC:
+```json
+{
+  "jsonrpc": "2.0",
+  "id": 7,
+  "method": "herodb_lanceSearchText",
+  "params": [
+    1,
+    "documents",
+    "programming and software",
+    5,
+    "topic = 'programming'",
+    null
+  ]
+}
+```
+
+Redis-like:
+```bash
+LANCE.SEARCH documents K 5 QUERY "programming and software" FILTER "topic = 'programming'"
+```
+
+This returns only documents where `topic` equals `'programming'`.
+
+---
+
+
+---
+
+## Scenario 3: Deterministic Test Embedder (No Network)
+
+For CI/offline development, use the built-in test embedder that requires no external service.
+
+### Configuration
+
+JSON-RPC:
+```json
+{
+  "jsonrpc": "2.0",
+  "id": 1,
+  "method": "herodb_lanceSetEmbeddingConfig",
+  "params": [
+    1,
+    "testdata",
+    {
+      "provider": "test",
+      "model": "dev",
+      "dim": 64,
+      "endpoint": null,
+      "headers": {},
+      "timeout_ms": null
+    }
+  ]
+}
+```
+
+Redis-like:
+```bash
+SELECT 1
+LANCE.EMBEDDING CONFIG SET testdata PROVIDER test MODEL dev DIM 64
+```
+
+### Usage
+
+Use `lanceStoreText` and `lanceSearchText` as in previous scenarios. The embeddings are:
+- Deterministic (same text → same vector)
+- Fast (no network)
+- Not semantic (hash-based, not ML)
+
+Perfect for testing the vector storage/search mechanics without external dependencies.
+
+---
+
+## Advanced: Custom Headers and Timeouts
+
+### Example: Local model with custom auth
+
+JSON-RPC:
+```json
+{
+  "jsonrpc": "2.0",
+  "id": 1,
+  "method": "herodb_lanceSetEmbeddingConfig",
+  "params": [
+    1,
+    "secure-data",
+    {
+      "provider": "openai",
+      "model": "custom-model",
+      "dim": 512,
+      "endpoint": "http://192.168.1.100:9000/embeddings",
+      "headers": {
+        "Authorization": "Bearer my-local-token",
+        "X-Custom-Header": "value"
+      },
+      "timeout_ms": 60000
+    }
+  ]
+}
+```
+
+### Example: OpenAI with explicit API key (not from env)
+
+JSON-RPC:
+```json
+{
+  "jsonrpc": "2.0",
+  "id": 1,
+  "method": "herodb_lanceSetEmbeddingConfig",
+  "params": [
+    1,
+    "dataset",
+    {
+      "provider": "openai",
+      "model": "text-embedding-3-small",
+      "dim": 1536,
+      "endpoint": null,
+      "headers": {
+        "Authorization": "Bearer sk-your-key-here"
+      },
+      "timeout_ms": 30000
+    }
+  ]
+}
+```
+
+---
+
+## Troubleshooting
+
+### Error: "Embedding config not set for dataset"
+
+**Cause:** You tried to use `lanceStoreText` or `lanceSearchText` without configuring an embedder.
+
+**Solution:** Run `lanceSetEmbeddingConfig` first.
+
+### Error: "Embedding dimension mismatch: expected X, got Y"
+
+**Cause:** The embedding service returned vectors of a different size than configured.
+
+**Solution:** 
+- For OpenAI text-embedding-3-small, use `dim: 1536`
+- For your local mock (from this tutorial), use `dim: 768`
+- Check your embedding service's actual output dimension
+
+### Error: "Missing API key in env 'OPENAI_API_KEY'"
+
+**Cause:** Using OpenAI provider without setting the API key.
+
+**Solution:**
+- Set `export OPENAI_API_KEY="sk-..."` before starting HeroDB, OR
+- Pass the key explicitly in headers: `"Authorization": "Bearer sk-..."`
+
+### Error: "HTTP request failed" or "Embeddings API error 404"
+
+**Cause:** Cannot reach the embedding endpoint.
+
+**Solution:**
+- Verify your local server is running: `curl http://127.0.0.1:8081/v1/embeddings`
+- Check the endpoint URL in your config
+- Ensure firewall allows the connection
+
+### Error: "ERR DB backend is not Lance"
+
+**Cause:** Trying to use LANCE.* commands on a non-Lance database.
+
+**Solution:** Create the database with backend "Lance" (see Step 1).
+
+### Error: "write permission denied"
+
+**Cause:** Database is private and you haven't authenticated.
+
+**Solution:** Use `SELECT <db_id> KEY <access-key>` or make the database public via RPC.
+
+---
+
+## Complete Example Script (Bash + curl)
+
+Save as `test_embeddings.sh`:
+
+```bash
+#!/bin/bash
+
+RPC_URL="http://localhost:8080"
+
+# 1. Create Lance database
+curl -X POST $RPC_URL -H "Content-Type: application/json" -d '{
+  "jsonrpc": "2.0",
+  "id": 1,
+  "method": "herodb_createDatabase",
+  "params": ["Lance", {"name": "test-vectors", "storage_path": null, "max_size": null, "redis_version": null}, null]
+}'
+
+echo -e "\n"
+
+# 2. Configure local embedder
+curl -X POST $RPC_URL -H "Content-Type: application/json" -d '{
+  "jsonrpc": "2.0",
+  "id": 2,
+  "method": "herodb_lanceSetEmbeddingConfig",
+  "params": [1, "products", {
+    "provider": "openai",
+    "model": "mock",
+    "dim": 768,
+    "endpoint": "http://127.0.0.1:8081/v1/embeddings",
+    "headers": {"Authorization": "Bearer dummy"},
+    "timeout_ms": 30000
+  }]
+}'
+
+echo -e "\n"
+
+# 3. Insert data
+curl -X POST $RPC_URL -H "Content-Type: application/json" -d '{
+  "jsonrpc": "2.0",
+  "id": 3,
+  "method": "herodb_lanceStoreText",
+  "params": [1, "products", "item-1", "Hiking boots", {"brand": "TrailMax"}]
+}'
+
+echo -e "\n"
+
+# 4. Search
+curl -X POST $RPC_URL -H "Content-Type: application/json" -d '{
+  "jsonrpc": "2.0",
+  "id": 4,
+  "method": "herodb_lanceSearchText",
+  "params": [1, "products", "outdoor footwear", 5, null, null]
+}'
+
+echo -e "\n"
+```
+
+Run:
+```bash
+chmod +x test_embeddings.sh
+./test_embeddings.sh
+```
+
+---
+
+## Summary
+
+| Provider | Use Case | Endpoint | API Key |
+|----------|----------|----------|---------|
+| `openai` | Production semantic search | Default (OpenAI) or custom URL | OPENAI_API_KEY env or headers |
+| `openai` | Local self-hosted gateway | http://127.0.0.1:8081/... | Optional (depends on your service) |
+| `test` | CI/offline development | N/A (local hash) | None |
+| `image_test` | Image testing | N/A (local hash) | None |
+
+**Notes:**
+- The `provider` field is always `"openai"` for OpenAI-compatible services (whether cloud or local). This is because it uses the OpenAI-compatible API shape.
+- Use `endpoint` to point to your local service
+- Use `headers` for custom authentication
+- `dim` must match your embedding service's output dimension
+- Once configured, `lanceStoreText` and `lanceSearchText` handle embedding automatically

docs/rpc_examples.md

@@ -0,0 +1,161 @@
+# HeroDB JSON-RPC Examples
+
+These examples show full JSON-RPC 2.0 payloads for managing HeroDB via the RPC API (enable with `--enable-rpc`). Methods are named as `hero_<function>`. Params are positional arrays; enum values are strings (e.g., `"Redb"`). Copy-paste into Postman or similar clients.
+
+## Database Management
+
+### Create Database
+Creates a new database with optional per-database encryption key (stored write-only in Admin DB 0).
+
+```json
+{
+  "jsonrpc": "2.0",
+  "id": 1,
+  "method": "hero_createDatabase",
+  "params": [
+    "Redb",
+    { "name": null, "storage_path": null, "max_size": null, "redis_version": null },
+    null
+  ]
+}
+```
+
+With encryption:
+```json
+{
+  "jsonrpc": "2.0",
+  "id": 2,
+  "method": "hero_createDatabase",
+  "params": [
+    "Sled",
+    { "name": "secure-db", "storage_path": null, "max_size": null, "redis_version": null },
+    "my-per-db-encryption-key"
+  ]
+}
+```
+
+### List Databases
+Returns array of database infos (id, backend, encrypted status, size, etc.).
+
+```json
+{
+  "jsonrpc": "2.0",
+  "id": 3,
+  "method": "hero_listDatabases",
+  "params": []
+}
+```
+
+### Get Database Info
+Retrieves detailed info for a specific database.
+
+```json
+{
+  "jsonrpc": "2.0",
+  "id": 4,
+  "method": "hero_getDatabaseInfo",
+  "params": [1]
+}
+```
+
+### Delete Database
+Removes physical database file; metadata remains in Admin DB 0.
+
+```json
+{
+  "jsonrpc": "2.0",
+  "id": 5,
+  "method": "hero_deleteDatabase",
+  "params": [1]
+}
+```
+
+## Access Control
+
+### Add Access Key
+Adds a hashed access key for private databases. Permissions: `"read"` or `"readwrite"`.
+
+```json
+{
+  "jsonrpc": "2.0",
+  "id": 6,
+  "method": "hero_addAccessKey",
+  "params": [2, "my-access-key", "readwrite"]
+}
+```
+
+### List Access Keys
+Returns array of key hashes, permissions, and creation timestamps.
+
+```json
+{
+  "jsonrpc": "2.0",
+  "id": 7,
+  "method": "hero_listAccessKeys",
+  "params": [2]
+}
+```
+
+### Delete Access Key
+Removes key by its SHA-256 hash.
+
+```json
+{
+  "jsonrpc": "2.0",
+  "id": 8,
+  "method": "hero_deleteAccessKey",
+  "params": [2, "0123abcd...keyhash..."]
+}
+```
+
+### Set Database Public/Private
+Toggles public access (default true). Private databases require access keys.
+
+```json
+{
+  "jsonrpc": "2.0",
+  "id": 9,
+  "method": "hero_setDatabasePublic",
+  "params": [2, false]
+}
+```
+
+## Server Info
+
+### Get Server Stats
+Returns stats like total databases and uptime.
+
+```json
+{
+  "jsonrpc": "2.0",
+  "id": 10,
+  "method": "hero_getServerStats",
+  "params": []
+}
+```
+
+## Notes
+- Per-database encryption keys are write-only; set at creation and used transparently.
+- Access keys are hashed (SHA-256) for storage; provide plaintext in requests.
+- Backend options: `"Redb"` (default) or `"Sled"`.
+- Config object fields (name, storage_path, etc.) are optional and currently ignored but positional.
+
+## IPC over Unix Socket (non-HTTP)
+
+HeroDB supports JSON-RPC over a Unix Domain Socket using reth-ipc. This transport is not HTTP; messages are JSON-RPC framed with a Content-Length header.
+
+- Enable IPC on startup (adjust the socket path as needed):
+  - herodb --dir /path/to/data --admin-secret YOUR_SECRET --enable-rpc-ipc --rpc-ipc-path /tmp/herodb.sock
+
+- The same RPC methods are available as over HTTP. Namespace is "hero" (e.g. hero_listDatabases). See the RPC trait in [src/rpc.rs](src/rpc.rs) and CLI flags in [src/main.rs](src/main.rs). The IPC bootstrap is in [src/rpc_server.rs](src/rpc_server.rs).
+
+### Test via socat (interactive)
+
+1) Connect to the socket with a small timeout:
+```
+sudo socat -d -d -t 5 - UNIX-CONNECT:/tmp/herodb.sock
+```
+
+2) Paste a framed JSON-RPC request (Content-Length header, then a blank line, then the JSON body). For example to call hero_listDatabases:
+
+{"jsonrpc":"2.0","id":3,"method":"hero_listDatabases","params":[]}

docs/tantivy.md

@@ -0,0 +1,253 @@
+# Tantivy Full‑Text Backend (JSON‑RPC)
+
+This document explains how to use HeroDB’s Tantivy-backed full‑text search as a dedicated database backend and provides copy‑pasteable JSON‑RPC requests. Tantivy is available only for non‑admin databases (db_id >= 1). Admin DB 0 always uses Redb/Sled and rejects FT operations.
+
+Important characteristics:
+- Tantivy is a third backend alongside Redb and Sled. It provides search indexes only; there is no KV store backing it.
+- On Tantivy databases, Redis KV/list/hash commands are rejected; only FT commands and basic control (SELECT, CLIENT, INFO, etc.) are allowed.
+- FT JSON‑RPC is namespaced as "herodb" and methods are named with underscore: herodb_ftCreate, herodb_ftAdd, herodb_ftSearch, herodb_ftDel, herodb_ftInfo, herodb_ftDrop.
+
+Reference to server implementation:
+- RPC methods are defined in [rust.trait Rpc()](src/rpc.rs:70):
+  - [rust.fn ft_create()](src/rpc.rs:121)
+  - [rust.fn ft_add()](src/rpc.rs:130)
+  - [rust.fn ft_search()](src/rpc.rs:141)
+  - [rust.fn ft_del()](src/rpc.rs:154)
+  - [rust.fn ft_info()](src/rpc.rs:158)
+  - [rust.fn ft_drop()](src/rpc.rs:162)
+
+Notes on responses:
+- ftCreate/ftAdd/ftDel/ftDrop return a JSON boolean: true on success.
+- ftSearch/ftInfo return a JSON object with a single key "resp" containing a RESP‑encoded string (wire format used by Redis). You can display or parse it on the client side as needed.
+
+RESP usage (redis-cli):
+- For RESP clients, you must SELECT the Tantivy database first. SELECT now succeeds for Tantivy DBs without opening KV storage.
+- After SELECT, you can run FT.* commands within that DB context.
+
+Example with redis-cli:
+```bash
+# Connect to server
+redis-cli -p 6379
+
+# Select Tantivy DB 1 (public by default)
+SELECT 1
+# → OK
+
+# Create index
+FT.CREATE product_catalog SCHEMA title TEXT description TEXT category TAG price NUMERIC rating NUMERIC location GEO
+# → OK
+
+# Add a document
+FT.ADD product_catalog product:1 1.0 title "Wireless Bluetooth Headphones" description "Premium noise-canceling headphones with 30-hour battery life" category "electronics,audio" price 299.99 rating 4.5 location "-122.4194,37.7749"
+# → OK
+
+# Search
+FT.SEARCH product_catalog wireless LIMIT 0 3
+# → RESP array with hits
+```
+
+Storage layout (on disk):
+- Indices are stored per database under:
+  - <base_dir>/search_indexes/<db_id>/<index_name>
+- Example: /tmp/test/search_indexes/1/product_catalog
+
+0) Create a new Tantivy database
+
+Use herodb_createDatabase with backend "Tantivy". DB 0 cannot be Tantivy.
+
+```json
+{
+  "jsonrpc": "2.0",
+  "id": 1,
+  "method": "herodb_createDatabase",
+  "params": [
+    "Tantivy",
+    { "name": "search-db", "storage_path": null, "max_size": null, "redis_version": null },
+    null
+  ]
+}
+```
+
+The response contains the allocated db_id (>= 1). Use that id in the calls below.
+
+1) FT.CREATE — create an index with schema
+
+Method: herodb_ftCreate → [rust.fn ft_create()](src/rpc.rs:121)
+
+Schema format is an array of tuples: [ [field_name, field_type, [options...] ], ... ]
+Supported field types: "TEXT", "NUMERIC" (defaults to F64), "TAG", "GEO"
+Supported options (subset): "WEIGHT", "SORTABLE", "NOINDEX", "SEPARATOR", "CASESENSITIVE"
+
+```json
+{
+  "jsonrpc": "2.0",
+  "id": 2,
+  "method": "herodb_ftCreate",
+  "params": [
+    1,
+    "product_catalog",
+    [
+      ["title", "TEXT", ["SORTABLE"]],
+      ["description", "TEXT", []],
+      ["category", "TAG", ["SEPARATOR", ","]],
+      ["price", "NUMERIC", ["SORTABLE"]],
+      ["rating", "NUMERIC", []],
+      ["location", "GEO", []]
+    ]
+  ]
+}
+```
+
+Returns: true on success.
+
+2) FT.ADD — add or replace a document
+
+Method: herodb_ftAdd → [rust.fn ft_add()](src/rpc.rs:130)
+
+Fields is an object (map) of field_name → value (all values are sent as strings). GEO expects "lat,lon".
+
+```json
+{
+  "jsonrpc": "2.0",
+  "id": 3,
+  "method": "herodb_ftAdd",
+  "params": [
+    1,
+    "product_catalog",
+    "product:1",
+    1.0,
+    {
+      "title": "Wireless Bluetooth Headphones",
+      "description": "Premium noise-canceling headphones with 30-hour battery life",
+      "category": "electronics,audio",
+      "price": "299.99",
+      "rating": "4.5",
+      "location": "-122.4194,37.7749"
+    }
+  ]
+}
+```
+
+Returns: true on success.
+
+3) FT.SEARCH — query an index
+
+Method: herodb_ftSearch → [rust.fn ft_search()](src/rpc.rs:141)
+
+Parameters: (db_id, index_name, query, filters?, limit?, offset?, return_fields?)
+- filters: array of [field, value] pairs (Equals filter)
+- limit/offset: numbers (defaults: limit=10, offset=0)
+- return_fields: array of field names to include (optional)
+
+Simple query:
+```json
+{
+  "jsonrpc": "2.0",
+  "id": 4,
+  "method": "herodb_ftSearch",
+  "params": [1, "product_catalog", "wireless", null, 10, 0, null]
+}
+```
+
+Pagination + filters + selected fields:
+```json
+{
+  "jsonrpc": "2.0",
+  "id": 5,
+  "method": "herodb_ftSearch",
+  "params": [
+    1,
+    "product_catalog",
+    "mouse",
+    [["category", "electronics"]],
+    5,
+    0,
+    ["title", "price", "rating"]
+  ]
+}
+```
+
+Response shape:
+```json
+{
+  "jsonrpc": "2.0",
+  "id": 5,
+  "result": { "resp": "*...RESP encoded array..." }
+}
+```
+
+4) FT.INFO — index metadata
+
+Method: herodb_ftInfo → [rust.fn ft_info()](src/rpc.rs:158)
+
+```json
+{
+  "jsonrpc": "2.0",
+  "id": 6,
+  "method": "herodb_ftInfo",
+  "params": [1, "product_catalog"]
+}
+```
+
+Response shape:
+```json
+{
+  "jsonrpc": "2.0",
+  "id": 6,
+  "result": { "resp": "*...RESP encoded array with fields and counts..." }
+}
+```
+
+5) FT.DEL — delete by doc id
+
+Method: herodb_ftDel → [rust.fn ft_del()](src/rpc.rs:154)
+
+```json
+{
+  "jsonrpc": "2.0",
+  "id": 7,
+  "method": "herodb_ftDel",
+  "params": [1, "product_catalog", "product:1"]
+}
+```
+
+Returns: true on success. Note: current implementation logs and returns success; physical delete may be a no‑op until delete is finalized in the engine.
+
+6) FT.DROP — drop an index
+
+Method: herodb_ftDrop → [rust.fn ft_drop()](src/rpc.rs:162)
+
+```json
+{
+  "jsonrpc": "2.0",
+  "id": 8,
+  "method": "herodb_ftDrop",
+  "params": [1, "product_catalog"]
+}
+```
+
+Returns: true on success.
+
+Field types and options
+
+- TEXT: stored/indexed/tokenized text. "SORTABLE" marks it fast (stored + fast path in our wrapper).
+- NUMERIC: stored/indexed numeric; default precision F64. "SORTABLE" enables fast column.
+- TAG: exact matching terms. Options: "SEPARATOR" (default ","), "CASESENSITIVE" (default false).
+- GEO: "lat,lon" string; stored as two numeric fields internally.
+
+Backend and permission gating
+
+- FT methods are rejected on DB 0.
+- FT methods require the database backend to be Tantivy; otherwise RPC returns an error.
+- Write‑like FT methods (create/add/del/drop) follow the same permission model as Redis writes on selected databases.
+
+Troubleshooting
+
+- "DB backend is not Tantivy": ensure the database was created with backend "Tantivy".
+- "FT not allowed on DB 0": use a non‑admin database id (>= 1).
+- Empty search results: confirm that the queried fields are tokenized/indexed (TEXT) and that documents were added successfully.
+
+Related docs
+
+- Command‑level search overview: [docs/search.md](./search.md)
+- RPC definitions: [src/rpc.rs](../src/rpc.rs)

examples/age_persist_demo.rs

@@ -14,31 +14,25 @@ fn read_reply(s: &mut TcpStream) -> String {
     let n = s.read(&mut buf).unwrap();
     String::from_utf8_lossy(&buf[..n]).to_string()
 }
-fn parse_two_bulk(reply: &str) -> Option<(String, String)> {
+fn parse_two_bulk(reply: &str) -> Option<(String,String)> {
     let mut lines = reply.split("\r\n");
-    if lines.next()? != "*2" {
+    if lines.next()? != "*2" { return None; }
-        return None;
-    }
     let _n = lines.next()?;
     let a = lines.next()?.to_string();
     let _m = lines.next()?;
     let b = lines.next()?.to_string();
-    Some((a, b))
+    Some((a,b))
 }
 fn parse_bulk(reply: &str) -> Option<String> {
     let mut lines = reply.split("\r\n");
     let hdr = lines.next()?;
-    if !hdr.starts_with('$') {
+    if !hdr.starts_with('$') { return None; }
-        return None;
-    }
     Some(lines.next()?.to_string())
 }
 fn parse_simple(reply: &str) -> Option<String> {
     let mut lines = reply.split("\r\n");
     let hdr = lines.next()?;
-    if !hdr.starts_with('+') {
+    if !hdr.starts_with('+') { return None; }
-        return None;
-    }
     Some(hdr[1..].to_string())
 }
 
@@ -51,45 +45,39 @@ fn main() {
     let mut s = TcpStream::connect(addr).expect("connect");
 
     // Generate & persist X25519 enc keys under name "alice"
-    s.write_all(arr(&["age", "keygen", "alice"]).as_bytes())
+    s.write_all(arr(&["age","keygen","alice"]).as_bytes()).unwrap();
-        .unwrap();
     let (_alice_recip, _alice_ident) = parse_two_bulk(&read_reply(&mut s)).expect("gen enc");
 
     // Generate & persist Ed25519 signing key under name "signer"
-    s.write_all(arr(&["age", "signkeygen", "signer"]).as_bytes())
+    s.write_all(arr(&["age","signkeygen","signer"]).as_bytes()).unwrap();
-        .unwrap();
     let (_verify, _secret) = parse_two_bulk(&read_reply(&mut s)).expect("gen sign");
 
     // Encrypt by name
     let msg = "hello from persistent keys";
-    s.write_all(arr(&["age", "encryptname", "alice", msg]).as_bytes())
+    s.write_all(arr(&["age","encryptname","alice", msg]).as_bytes()).unwrap();
-        .unwrap();
     let ct_b64 = parse_bulk(&read_reply(&mut s)).expect("ct b64");
     println!("ciphertext b64: {}", ct_b64);
 
     // Decrypt by name
-    s.write_all(arr(&["age", "decryptname", "alice", &ct_b64]).as_bytes())
+    s.write_all(arr(&["age","decryptname","alice", &ct_b64]).as_bytes()).unwrap();
-        .unwrap();
     let pt = parse_bulk(&read_reply(&mut s)).expect("pt");
     assert_eq!(pt, msg);
     println!("decrypted ok");
 
     // Sign by name
-    s.write_all(arr(&["age", "signname", "signer", msg]).as_bytes())
+    s.write_all(arr(&["age","signname","signer", msg]).as_bytes()).unwrap();
-        .unwrap();
     let sig_b64 = parse_bulk(&read_reply(&mut s)).expect("sig b64");
 
     // Verify by name
-    s.write_all(arr(&["age", "verifyname", "signer", msg, &sig_b64]).as_bytes())
+    s.write_all(arr(&["age","verifyname","signer", msg, &sig_b64]).as_bytes()).unwrap();
-        .unwrap();
     let ok = parse_simple(&read_reply(&mut s)).expect("verify");
     assert_eq!(ok, "1");
     println!("signature verified");
 
     // List names
-    s.write_all(arr(&["age", "list"]).as_bytes()).unwrap();
+    s.write_all(arr(&["age","list"]).as_bytes()).unwrap();
     let list = read_reply(&mut s);
     println!("LIST -> {list}");
 
     println!("✔ persistent AGE workflow complete.");
-}
+}

examples/tantivy_search_demo.sh

@@ -1,239 +0,0 @@
-#!/bin/bash
-
-# HeroDB Tantivy Search Demo
-# This script demonstrates full-text search capabilities using Redis commands
-# HeroDB server should be running on port 6381
-
-set -e  # Exit on any error
-
-# Configuration
-REDIS_HOST="localhost"
-REDIS_PORT="6382"
-REDIS_CLI="redis-cli -h $REDIS_HOST -p $REDIS_PORT"
-
-# Start the herodb server in the background
-echo "Starting herodb server..."
-cargo run -p herodb -- --dir /tmp/herodbtest --port ${REDIS_PORT} --debug &
-SERVER_PID=$!
-echo
-sleep 2 # Give the server a moment to start
-
-# Colors for output
-RED='\033[0;31m'
-GREEN='\033[0;32m'
-BLUE='\033[0;34m'
-YELLOW='\033[1;33m'
-NC='\033[0m' # No Color
-
-# Function to print colored output
-print_header() {
-    echo -e "${BLUE}=== $1 ===${NC}"
-}
-
-print_success() {
-    echo -e "${GREEN}✓ $1${NC}"
-}
-
-print_info() {
-    echo -e "${YELLOW}ℹ $1${NC}"
-}
-
-print_error() {
-    echo -e "${RED}✗ $1${NC}"
-}
-
-# Function to check if HeroDB is running
-check_herodb() {
-    print_info "Checking if HeroDB is running on port $REDIS_PORT..."
-    if ! $REDIS_CLI ping > /dev/null 2>&1; then
-        print_error "HeroDB is not running on port $REDIS_PORT"
-        print_info "Please start HeroDB with: cargo run -- --port $REDIS_PORT"
-        exit 1
-    fi
-    print_success "HeroDB is running and responding"
-}
-
-# Function to execute Redis command with error handling
-execute_cmd() {
-    local cmd="$1"
-    local description="$2"
-    
-    echo -e "${YELLOW}Command:${NC} $cmd"
-    if result=$($REDIS_CLI $cmd 2>&1); then
-        echo -e "${GREEN}Result:${NC} $result"
-        return 0
-    else
-        print_error "Failed: $description"
-        echo "Error: $result"
-        return 1
-    fi
-}
-
-# Function to pause for readability
-pause() {
-    echo
-    read -p "Press Enter to continue..."
-    echo
-}
-
-# Main demo function
-main() {
-    clear
-    print_header "HeroDB Tantivy Search Demonstration"
-    echo "This demo shows full-text search capabilities using Redis commands"
-    echo "HeroDB runs on port $REDIS_PORT (instead of Redis default 6379)"
-    echo
-
-    # Check if HeroDB is running
-    check_herodb
-    echo
-
-    print_header "Step 1: Create Search Index"
-    print_info "Creating a product catalog search index with various field types"
-    
-    # Create search index with schema
-    execute_cmd "FT.CREATE product_catalog SCHEMA title TEXT description TEXT category TAG price NUMERIC rating NUMERIC location GEO" \
-                "Creating search index"
-    
-    print_success "Search index 'product_catalog' created successfully"
-    pause
-
-    print_header "Step 2: Add Sample Products"
-    print_info "Adding sample products to demonstrate different search scenarios"
-    
-    # Add sample products using FT.ADD
-    execute_cmd "FT.ADD product_catalog product:1 1.0 title 'Wireless Bluetooth Headphones' description 'Premium noise-canceling headphones with 30-hour battery life' category 'electronics,audio' price 299.99 rating 4.5 location '-122.4194,37.7749'" "Adding product 1"
-    execute_cmd "FT.ADD product_catalog product:2 1.0 title 'Organic Coffee Beans' description 'Single-origin Ethiopian coffee beans, medium roast' category 'food,beverages,organic' price 24.99 rating 4.8 location '-74.0060,40.7128'" "Adding product 2"
-    execute_cmd "FT.ADD product_catalog product:3 1.0 title 'Yoga Mat Premium' description 'Eco-friendly yoga mat with superior grip and cushioning' category 'fitness,wellness,eco-friendly' price 89.99 rating 4.3 location '-118.2437,34.0522'" "Adding product 3"
-    execute_cmd "FT.ADD product_catalog product:4 1.0 title 'Smart Home Speaker' description 'Voice-controlled smart speaker with AI assistant' category 'electronics,smart-home' price 149.99 rating 4.2 location '-87.6298,41.8781'" "Adding product 4"
-    execute_cmd "FT.ADD product_catalog product:5 1.0 title 'Organic Green Tea' description 'Premium organic green tea leaves from Japan' category 'food,beverages,organic,tea' price 18.99 rating 4.7 location '139.6503,35.6762'" "Adding product 5"
-    execute_cmd "FT.ADD product_catalog product:6 1.0 title 'Wireless Gaming Mouse' description 'High-precision gaming mouse with RGB lighting' category 'electronics,gaming' price 79.99 rating 4.4 location '-122.3321,47.6062'" "Adding product 6"
-    execute_cmd "FT.ADD product_catalog product:7 1.0 title 'Comfortable meditation cushion for mindfulness practice' description 'Meditation cushion with premium materials' category 'wellness,meditation' price 45.99 rating 4.6 location '-122.4194,37.7749'" "Adding product 7"
-    execute_cmd "FT.ADD product_catalog product:8 1.0 title 'Bluetooth Earbuds' description 'True wireless earbuds with active noise cancellation' category 'electronics,audio' price 199.99 rating 4.1 location '-74.0060,40.7128'" "Adding product 8"
-    
-    print_success "Added 8 products to the index"
-    pause
-
-    print_header "Step 3: Basic Text Search"
-    print_info "Searching for 'wireless' products"
-    
-    execute_cmd "FT.SEARCH product_catalog wireless" "Basic text search"
-    pause
-
-    print_header "Step 4: Search with Filters"
-    print_info "Searching for 'organic' products"
-    
-    execute_cmd "FT.SEARCH product_catalog organic" "Filtered search"
-    pause
-
-    print_header "Step 5: Numeric Range Search"
-    print_info "Searching for 'premium' products"
-    
-    execute_cmd "FT.SEARCH product_catalog premium" "Text search"
-    pause
-
-    print_header "Step 6: Sorting Results"
-    print_info "Searching for electronics"
-    
-    execute_cmd "FT.SEARCH product_catalog electronics" "Category search"
-    pause
-
-    print_header "Step 7: Limiting Results"
-    print_info "Searching for wireless products with limit"
-    
-    execute_cmd "FT.SEARCH product_catalog wireless LIMIT 0 3" "Limited results"
-    pause
-
-    print_header "Step 8: Complex Query"
-    print_info "Finding audio products with noise cancellation"
-    
-    execute_cmd "FT.SEARCH product_catalog 'noise cancellation'" "Complex query"
-    pause
-
-    print_header "Step 9: Geographic Search"
-    print_info "Searching for meditation products"
-    
-    execute_cmd "FT.SEARCH product_catalog meditation" "Text search"
-    pause
-
-    print_header "Step 10: Aggregation Example"
-    print_info "Getting index information and statistics"
-    
-    execute_cmd "FT.INFO product_catalog" "Index information"
-    pause
-
-    print_header "Step 11: Search Comparison"
-    print_info "Comparing Tantivy search vs simple key matching"
-    
-    echo -e "${YELLOW}Tantivy Full-Text Search:${NC}"
-    execute_cmd "FT.SEARCH product_catalog 'battery life'" "Full-text search for 'battery life'"
-    
-    echo
-    echo -e "${YELLOW}Simple Key Pattern Matching:${NC}"
-    execute_cmd "KEYS *battery*" "Simple pattern matching for 'battery'"
-    
-    print_info "Notice how full-text search finds relevant results even when exact words don't match keys"
-    pause
-
-    print_header "Step 12: Fuzzy Search"
-    print_info "Searching for headphones"
-    
-    execute_cmd "FT.SEARCH product_catalog headphones" "Text search"
-    pause
-
-    print_header "Step 13: Phrase Search"
-    print_info "Searching for coffee products"
-    
-    execute_cmd "FT.SEARCH product_catalog coffee" "Text search"
-    pause
-
-    print_header "Step 14: Boolean Queries"
-    print_info "Searching for gaming products"
-    
-    execute_cmd "FT.SEARCH product_catalog gaming" "Text search"
-    echo
-    execute_cmd "FT.SEARCH product_catalog tea" "Text search"
-    pause
-
-    print_header "Step 15: Cleanup"
-    print_info "Removing test data"
-    
-    # Delete the search index
-    execute_cmd "FT.DROP product_catalog" "Dropping search index"
-    
-    # Clean up documents from search index
-    for i in {1..8}; do
-        execute_cmd "FT.DEL product_catalog product:$i" "Deleting product:$i from index"
-    done
-    
-    print_success "Cleanup completed"
-    echo
-
-    print_header "Demo Summary"
-    echo "This demonstration showed:"
-    echo "• Creating search indexes with different field types"
-    echo "• Adding documents to the search index"
-    echo "• Basic and advanced text search queries"
-    echo "• Filtering by categories and numeric ranges"
-    echo "• Sorting and limiting results"
-    echo "• Geographic searches"
-    echo "• Fuzzy matching and phrase searches"
-    echo "• Boolean query operators"
-    echo "• Comparison with simple pattern matching"
-    echo
-    print_success "HeroDB Tantivy search demo completed successfully!"
-    echo
-    print_info "Key advantages of Tantivy full-text search:"
-    echo "  - Relevance scoring and ranking"
-    echo "  - Fuzzy matching and typo tolerance"
-    echo "  - Complex boolean queries"
-    echo "  - Field-specific searches and filters"
-    echo "  - Geographic and numeric range queries"
-    echo "  - Much faster than pattern matching on large datasets"
-    echo
-    print_info "To run HeroDB server: cargo run -- --port 6381"
-    print_info "To connect with redis-cli: redis-cli -h localhost -p 6381"
-}
-
-# Run the demo
-main "$@"

examples/test_tantivy_integration.sh

@@ -1,101 +0,0 @@
-#!/bin/bash
-
-# Simple Tantivy Search Integration Test for HeroDB
-# This script tests the full-text search functionality we just integrated
-
-set -e
-
-echo "🔍 Testing Tantivy Search Integration..."
-
-# Build the project first
-echo "📦 Building HeroDB..."
-cargo build --release
-
-# Start the server in the background
-echo "🚀 Starting HeroDB server on port 6379..."
-cargo run --release -- --port 6379 --dir ./test_data &
-SERVER_PID=$!
-
-# Wait for server to start
-sleep 3
-
-# Function to cleanup on exit
-cleanup() {
-    echo "🧹 Cleaning up..."
-    kill $SERVER_PID 2>/dev/null || true
-    rm -rf ./test_data
-    exit
-}
-
-# Set trap for cleanup
-trap cleanup EXIT INT TERM
-
-# Function to execute Redis command
-execute_cmd() {
-    local cmd="$1"
-    local description="$2"
-    
-    echo "📝 $description"
-    echo "   Command: $cmd"
-    
-    if result=$(redis-cli -p 6379 $cmd 2>&1); then
-        echo "   ✅ Result: $result"
-        echo
-        return 0
-    else
-        echo "   ❌ Failed: $result"
-        echo
-        return 1
-    fi
-}
-
-echo "🧪 Running Tantivy Search Tests..."
-echo
-
-# Test 1: Create a search index
-execute_cmd "ft.create books SCHEMA title TEXT description TEXT author TEXT category TAG price NUMERIC" \
-           "Creating search index 'books'"
-
-# Test 2: Add documents to the index
-execute_cmd "ft.add books book1 1.0 title \"The Great Gatsby\" description \"A classic American novel about the Jazz Age\" author \"F. Scott Fitzgerald\" category \"fiction,classic\" price \"12.99\"" \
-           "Adding first book"
-
-execute_cmd "ft.add books book2 1.0 title \"To Kill a Mockingbird\" description \"A novel about racial injustice in the American South\" author \"Harper Lee\" category \"fiction,classic\" price \"14.99\"" \
-           "Adding second book"
-
-execute_cmd "ft.add books book3 1.0 title \"Programming Rust\" description \"A comprehensive guide to Rust programming language\" author \"Jim Blandy\" category \"programming,technical\" price \"49.99\"" \
-           "Adding third book"
-
-execute_cmd "ft.add books book4 1.0 title \"The Rust Programming Language\" description \"The official book on Rust programming\" author \"Steve Klabnik\" category \"programming,technical\" price \"39.99\"" \
-           "Adding fourth book"
-
-# Test 3: Basic search
-execute_cmd "ft.search books Rust" \
-           "Searching for 'Rust'"
-
-# Test 4: Search with filters
-execute_cmd "ft.search books programming FILTER category programming" \
-           "Searching for 'programming' with category filter"
-
-# Test 5: Search with limit
-execute_cmd "ft.search books \"*\" LIMIT 0 2" \
-           "Getting first 2 documents"
-
-# Test 6: Get index info
-execute_cmd "ft.info books" \
-           "Getting index information"
-
-# Test 7: Delete a document
-execute_cmd "ft.del books book1" \
-           "Deleting book1"
-
-# Test 8: Search again to verify deletion
-execute_cmd "ft.search books Gatsby" \
-           "Searching for deleted book"
-
-# Test 9: Drop the index
-execute_cmd "ft.drop books" \
-           "Dropping the index"
-
-echo "🎉 All tests completed successfully!"
-echo "✅ Tantivy search integration is working correctly"

mock_embedder.py

@@ -0,0 +1,34 @@
+from flask import Flask, request, jsonify
+import numpy as np
+
+app = Flask(__name__)
+
+@app.route('/v1/embeddings', methods=['POST'])
+def embeddings():
+    data = request.json
+    inputs = data.get('input', [])
+    if isinstance(inputs, str):
+        inputs = [inputs]
+    
+    # Generate deterministic 768-dim embeddings (hash-based)
+    embeddings = []
+    for text in inputs:
+        # Simple hash to vector
+        vec = np.zeros(768)
+        for i, char in enumerate(text[:768]):
+            vec[i % 768] += ord(char) / 255.0
+        # Normalize
+        norm = np.linalg.norm(vec)
+        if norm > 0:
+            vec = vec / norm
+        embeddings.append(vec.tolist())
+    
+    return jsonify({
+        "data": [{"embedding": emb} for emb in embeddings],
+        "model": data.get('model', 'mock'),
+        "usage": {"total_tokens": sum(len(t) for t in inputs)}
+    })
+
+if __name__ == '__main__':
+    app.run(host='127.0.0.1', port=8081)
+

run.sh

@@ -0,0 +1,143 @@
+#!/bin/bash
+set -euo pipefail
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+cd "$SCRIPT_DIR"
+
+
+# Test script for HeroDB - Redis-compatible database with redb backend
+# This script starts the server and runs comprehensive tests
+
+# Colors for output
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+BLUE='\033[0;34m'
+NC='\033[0m' # No Color
+
+# Configuration
+DB_DIR="/tmp/test_db"
+PORT=6381
+SERVER_PID=""
+
+# Function to print colored output
+print_status() {
+    echo -e "${BLUE}[INFO]${NC} $1"
+}
+
+print_success() {
+    echo -e "${GREEN}[SUCCESS]${NC} $1"
+}
+
+print_error() {
+    echo -e "${RED}[ERROR]${NC} $1"
+}
+
+print_warning() {
+    echo -e "${YELLOW}[WARNING]${NC} $1"
+}
+
+# Function to cleanup on exit
+cleanup() {
+    if [ ! -z "$SERVER_PID" ]; then
+        print_status "Stopping HeroDB server (PID: $SERVER_PID)..."
+        kill $SERVER_PID 2>/dev/null || true
+        wait $SERVER_PID 2>/dev/null || true
+    fi
+    
+    # Clean up test database
+    if [ -d "$DB_DIR" ]; then
+        print_status "Cleaning up test database directory..."
+        rm -rf "$DB_DIR"
+    fi
+}
+
+# Set trap to cleanup on script exit
+trap cleanup EXIT
+
+# Function to wait for server to start
+wait_for_server() {
+    local max_attempts=30
+    local attempt=1
+    
+    print_status "Waiting for server to start on port $PORT..."
+    
+    while [ $attempt -le $max_attempts ]; do
+        if nc -z localhost $PORT 2>/dev/null; then
+            print_success "Server is ready!"
+            return 0
+        fi
+        
+        echo -n "."
+        sleep 1
+        attempt=$((attempt + 1))
+    done
+    
+    print_error "Server failed to start within $max_attempts seconds"
+    return 1
+}
+
+# Function to send Redis command and get response
+redis_cmd() {
+    local cmd="$1"
+    local expected="$2"
+    
+    print_status "Testing: $cmd"
+    
+    local result=$(echo "$cmd" | redis-cli -p $PORT --raw 2>/dev/null || echo "ERROR")
+    
+    if [ "$expected" != "" ] && [ "$result" != "$expected" ]; then
+        print_error "Expected: '$expected', Got: '$result'"
+        return 1
+    else
+        print_success "✓ $cmd -> $result"
+        return 0
+    fi
+}
+
+# Main execution
+main() {
+    print_status "Starting HeroDB"
+    
+    # Build the project
+    print_status "Building HeroDB..."
+    if ! cargo build -p herodb --release; then
+        print_error "Failed to build HeroDB"
+        exit 1
+    fi
+    
+    # Create test database directory
+    mkdir -p "$DB_DIR"
+    
+    # Start the server
+    print_status "Starting HeroDB server..."
+    ${SCRIPT_DIR}/target/release/herodb --dir "$DB_DIR" --port $PORT &
+    SERVER_PID=$!
+    
+    # Wait for server to start
+    if ! wait_for_server; then
+        print_error "Failed to start server"
+        exit 1
+    fi
+    
+}
+
+# Check dependencies
+check_dependencies() {
+    if ! command -v cargo &> /dev/null; then
+        print_error "cargo is required but not installed"
+        exit 1
+    fi
+    
+    if ! command -v nc &> /dev/null; then
+        print_warning "netcat (nc) not found - some tests may not work properly"
+    fi
+    
+    if ! command -v redis-cli &> /dev/null; then
+        print_warning "redis-cli not found - using netcat fallback"
+    fi
+}
+
+# Run dependency check and main function
+check_dependencies
+main "$@"
+tail -f /dev/null

run_tests.sh

@@ -1,4 +1,7 @@
 #!/bin/bash
+set -euo pipefail
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+cd "$SCRIPT_DIR"
 
 echo "🧪 Running HeroDB Redis Compatibility Tests"
 echo "=========================================="

src/admin_meta.rs

@@ -0,0 +1,501 @@
+use std::path::{Path, PathBuf};
+use std::sync::{Arc, OnceLock, Mutex, RwLock};
+use std::collections::HashMap;
+
+use crate::error::DBError;
+use crate::options;
+use crate::rpc::Permissions;
+use crate::storage::Storage;
+use crate::storage_sled::SledStorage;
+use crate::storage_trait::StorageBackend;
+
+// Key builders
+fn k_admin_next_id() -> &'static str {
+    "admin:next_id"
+}
+fn k_admin_dbs() -> &'static str {
+    "admin:dbs"
+}
+fn k_meta_db(id: u64) -> String {
+    format!("meta:db:{}", id)
+}
+fn k_meta_db_keys(id: u64) -> String {
+    format!("meta:db:{}:keys", id)
+}
+fn k_meta_db_enc(id: u64) -> String {
+    format!("meta:db:{}:enc", id)
+}
+
+// Global cache of admin DB 0 handles per base_dir to avoid sled/reDB file-lock contention
+// and to correctly isolate different test instances with distinct directories.
+static ADMIN_STORAGES: OnceLock<RwLock<HashMap<String, Arc<dyn StorageBackend>>>> = OnceLock::new();
+
+// Global registry for data DB storages to avoid double-open across process.
+static DATA_STORAGES: OnceLock<RwLock<HashMap<u64, Arc<dyn StorageBackend>>>> = OnceLock::new();
+static DATA_INIT_LOCK: Mutex<()> = Mutex::new(());
+
+fn init_admin_storage(
+    base_dir: &Path,
+    backend: options::BackendType,
+    admin_secret: &str,
+) -> Result<Arc<dyn StorageBackend>, DBError> {
+    let db_file = base_dir.join("0.db");
+    if let Some(parent_dir) = db_file.parent() {
+        std::fs::create_dir_all(parent_dir).map_err(|e| {
+            DBError(format!("Failed to create directory {}: {}", parent_dir.display(), e))
+        })?;
+    }
+    let storage: Arc<dyn StorageBackend> = match backend {
+        options::BackendType::Redb => Arc::new(Storage::new(&db_file, true, Some(admin_secret))?),
+        options::BackendType::Sled => Arc::new(SledStorage::new(&db_file, true, Some(admin_secret))?),
+        options::BackendType::Tantivy | options::BackendType::Lance => {
+            return Err(DBError("Admin DB 0 cannot use search-only backends (Tantivy/Lance)".to_string()))
+        }
+    };
+    Ok(storage)
+}
+
+// Get or initialize a cached handle to admin DB 0 per base_dir (thread-safe, no double-open race)
+pub fn open_admin_storage(
+    base_dir: &Path,
+    backend: options::BackendType,
+    admin_secret: &str,
+) -> Result<Arc<dyn StorageBackend>, DBError> {
+    let map = ADMIN_STORAGES.get_or_init(|| RwLock::new(HashMap::new()));
+    let key = base_dir.display().to_string();
+    // Fast path
+    if let Some(st) = map.read().unwrap().get(&key) {
+        return Ok(st.clone());
+    }
+    // Slow path with write lock
+    {
+        let mut w = map.write().unwrap();
+        if let Some(st) = w.get(&key) {
+            return Ok(st.clone());
+        }
+
+        // Detect existing 0.db backend by filesystem, if present.
+        let admin_path = base_dir.join("0.db");
+        let detected = if admin_path.exists() {
+            if admin_path.is_file() {
+                Some(options::BackendType::Redb)
+            } else if admin_path.is_dir() {
+                Some(options::BackendType::Sled)
+            } else {
+                None
+            }
+        } else {
+            None
+        };
+
+        let effective_backend = match detected {
+            Some(d) if d != backend => {
+                eprintln!(
+                    "warning: Admin DB 0 at {} appears to be {:?}, but process default is {:?}. Using detected backend.",
+                    admin_path.display(),
+                    d,
+                    backend
+                );
+                d
+            }
+            Some(d) => d,
+            None => backend, // First boot: use requested backend to initialize 0.db
+        };
+
+        let st = init_admin_storage(base_dir, effective_backend, admin_secret)?;
+        w.insert(key, st.clone());
+        Ok(st)
+    }
+}
+
+// Ensure admin structures exist in encrypted DB 0
+pub fn ensure_bootstrap(
+    base_dir: &Path,
+    backend: options::BackendType,
+    admin_secret: &str,
+) -> Result<(), DBError> {
+    let admin = open_admin_storage(base_dir, backend, admin_secret)?;
+
+    // Initialize next id if missing
+    if !admin.exists(k_admin_next_id())? {
+        admin.set(k_admin_next_id().to_string(), "1".to_string())?;
+    }
+    // admin:dbs is a hash; it's fine if it doesn't exist (hlen -> 0)
+    Ok(())
+}
+
+// Get or initialize a shared handle to a data DB (> 0), avoiding double-open across subsystems
+pub fn open_data_storage(
+    base_dir: &Path,
+    backend: options::BackendType,
+    admin_secret: &str,
+    id: u64,
+) -> Result<Arc<dyn StorageBackend>, DBError> {
+    if id == 0 {
+        return open_admin_storage(base_dir, backend, admin_secret);
+    }
+
+    // Validate existence in admin metadata
+    if !db_exists(base_dir, backend.clone(), admin_secret, id)? {
+        return Err(DBError(format!(
+            "Cannot open database instance {}, as that database instance does not exist.",
+            id
+        )));
+    }
+
+    let map = DATA_STORAGES.get_or_init(|| RwLock::new(HashMap::new()));
+    // Fast path
+    if let Some(st) = map.read().unwrap().get(&id) {
+        return Ok(st.clone());
+    }
+
+    // Slow path with init lock
+    let _guard = DATA_INIT_LOCK.lock().unwrap();
+    if let Some(st) = map.read().unwrap().get(&id) {
+        return Ok(st.clone());
+    }
+
+    // Resolve effective backend for this db id:
+    // 1) Try admin meta "backend" field
+    // 2) If missing, sniff filesystem (file => Redb, dir => Sled), then persist into admin meta
+    // 3) Fallback to requested 'backend' (startup default) if nothing else is known
+    let meta_backend = get_database_backend(base_dir, backend.clone(), admin_secret, id).ok().flatten();
+    let db_path = base_dir.join(format!("{}.db", id));
+    let sniffed_backend = if db_path.exists() {
+        if db_path.is_file() {
+            Some(options::BackendType::Redb)
+        } else if db_path.is_dir() {
+            Some(options::BackendType::Sled)
+        } else {
+            None
+        }
+    } else {
+        None
+    };
+    let effective_backend = meta_backend.clone().or(sniffed_backend).unwrap_or(backend.clone());
+
+    // If we had to sniff (i.e., meta missing), persist it for future robustness
+    if meta_backend.is_none() {
+        let _ = set_database_backend(base_dir, backend.clone(), admin_secret, id, effective_backend.clone());
+    }
+
+    // Warn if caller-provided backend differs from effective
+    if effective_backend != backend {
+        eprintln!(
+            "notice: Database {} backend resolved to {:?} (caller requested {:?}). Using resolved backend.",
+            id, effective_backend, backend
+        );
+    }
+
+    // Determine per-db encryption (from admin meta)
+    let enc = get_enc_key(base_dir, backend.clone(), admin_secret, id)?;
+    let should_encrypt = enc.is_some();
+
+    // Build database file path and ensure parent dir exists
+    let db_file = PathBuf::from(base_dir).join(format!("{}.db", id));
+    if let Some(parent_dir) = db_file.parent() {
+        std::fs::create_dir_all(parent_dir).map_err(|e| {
+            DBError(format!("Failed to create directory {}: {}", parent_dir.display(), e))
+        })?;
+    }
+
+    // Open storage using the effective backend
+    let storage: Arc<dyn StorageBackend> = match effective_backend {
+        options::BackendType::Redb => Arc::new(Storage::new(&db_file, should_encrypt, enc.as_deref())?),
+        options::BackendType::Sled => Arc::new(SledStorage::new(&db_file, should_encrypt, enc.as_deref())?),
+        options::BackendType::Tantivy => {
+            return Err(DBError("Tantivy backend has no KV storage; use FT.* commands only".to_string()))
+        }
+        options::BackendType::Lance => {
+            return Err(DBError("Lance backend has no KV storage; use LANCE.* commands only".to_string()))
+        }
+    };
+
+    // Publish to registry
+    map.write().unwrap().insert(id, storage.clone());
+    Ok(storage)
+}
+
+// Allocate the next DB id and persist new pointer
+pub fn allocate_next_id(
+    base_dir: &Path,
+    backend: options::BackendType,
+    admin_secret: &str,
+) -> Result<u64, DBError> {
+    let admin = open_admin_storage(base_dir, backend, admin_secret)?;
+    let cur = admin
+        .get(k_admin_next_id())?
+        .unwrap_or_else(|| "1".to_string());
+    let id: u64 = cur.parse().unwrap_or(1);
+    let next = id.checked_add(1).ok_or_else(|| DBError("next_id overflow".into()))?;
+    admin.set(k_admin_next_id().to_string(), next.to_string())?;
+
+    // Register into admin:dbs set/hash
+    let _ = admin.hset(k_admin_dbs(), vec![(id.to_string(), "1".to_string())])?;
+
+    // Default meta for the new db: public true
+    let meta_key = k_meta_db(id);
+    let _ = admin.hset(&meta_key, vec![("public".to_string(), "true".to_string())])?;
+
+    Ok(id)
+}
+
+// Check existence of a db id in admin:dbs
+pub fn db_exists(
+    base_dir: &Path,
+    backend: options::BackendType,
+    admin_secret: &str,
+    id: u64,
+) -> Result<bool, DBError> {
+    let admin = open_admin_storage(base_dir, backend, admin_secret)?;
+    Ok(admin.hexists(k_admin_dbs(), &id.to_string())?)
+}
+
+// Get per-db encryption key, if any
+pub fn get_enc_key(
+    base_dir: &Path,
+    backend: options::BackendType,
+    admin_secret: &str,
+    id: u64,
+) -> Result<Option<String>, DBError> {
+    let admin = open_admin_storage(base_dir, backend, admin_secret)?;
+    admin.get(&k_meta_db_enc(id))
+}
+
+// Set per-db encryption key (called during create)
+pub fn set_enc_key(
+    base_dir: &Path,
+    backend: options::BackendType,
+    admin_secret: &str,
+    id: u64,
+    key: &str,
+) -> Result<(), DBError> {
+    let admin = open_admin_storage(base_dir, backend, admin_secret)?;
+    admin.set(k_meta_db_enc(id), key.to_string())
+}
+
+// Set database public flag
+pub fn set_database_public(
+    base_dir: &Path,
+    backend: options::BackendType,
+    admin_secret: &str,
+    id: u64,
+    public: bool,
+) -> Result<(), DBError> {
+    let admin = open_admin_storage(base_dir, backend, admin_secret)?;
+    let mk = k_meta_db(id);
+    let _ = admin.hset(&mk, vec![("public".to_string(), public.to_string())])?;
+    Ok(())
+}
+
+// Persist per-db backend type in admin metadata (module-scope)
+pub fn set_database_backend(
+    base_dir: &Path,
+    backend: options::BackendType,
+    admin_secret: &str,
+    id: u64,
+    db_backend: options::BackendType,
+) -> Result<(), DBError> {
+    let admin = open_admin_storage(base_dir, backend, admin_secret)?;
+    let mk = k_meta_db(id);
+    let val = match db_backend {
+        options::BackendType::Redb => "Redb",
+        options::BackendType::Sled => "Sled",
+        options::BackendType::Tantivy => "Tantivy",
+        options::BackendType::Lance => "Lance",
+    };
+    let _ = admin.hset(&mk, vec![("backend".to_string(), val.to_string())])?;
+    Ok(())
+}
+
+pub fn get_database_backend(
+    base_dir: &Path,
+    backend: options::BackendType,
+    admin_secret: &str,
+    id: u64,
+) -> Result<Option<options::BackendType>, DBError> {
+    let admin = open_admin_storage(base_dir, backend, admin_secret)?;
+    let mk = k_meta_db(id);
+    match admin.hget(&mk, "backend")? {
+        Some(s) if s == "Redb" => Ok(Some(options::BackendType::Redb)),
+        Some(s) if s == "Sled" => Ok(Some(options::BackendType::Sled)),
+        Some(s) if s == "Tantivy" => Ok(Some(options::BackendType::Tantivy)),
+        Some(s) if s == "Lance" => Ok(Some(options::BackendType::Lance)),
+        _ => Ok(None),
+    }
+}
+
+// Set database name
+pub fn set_database_name(
+    base_dir: &Path,
+    backend: options::BackendType,
+    admin_secret: &str,
+    id: u64,
+    name: &str,
+) -> Result<(), DBError> {
+    let admin = open_admin_storage(base_dir, backend, admin_secret)?;
+    let mk = k_meta_db(id);
+    let _ = admin.hset(&mk, vec![("name".to_string(), name.to_string())])?;
+    Ok(())
+}
+
+// Get database name
+pub fn get_database_name(
+    base_dir: &Path,
+    backend: options::BackendType,
+    admin_secret: &str,
+    id: u64,
+) -> Result<Option<String>, DBError> {
+    let admin = open_admin_storage(base_dir, backend, admin_secret)?;
+    let mk = k_meta_db(id);
+    admin.hget(&mk, "name")
+}
+
+// Internal: load public flag; default to true when meta missing
+fn load_public(
+    admin: &Arc<dyn StorageBackend>,
+    id: u64,
+) -> Result<bool, DBError> {
+    let mk = k_meta_db(id);
+    match admin.hget(&mk, "public")? {
+        Some(v) => Ok(v == "true"),
+        None => Ok(true),
+    }
+}
+
+// Add access key for db (value format: "Read:ts" or "ReadWrite:ts")
+pub fn add_access_key(
+    base_dir: &Path,
+    backend: options::BackendType,
+    admin_secret: &str,
+    id: u64,
+    key_plain: &str,
+    perms: Permissions,
+) -> Result<(), DBError> {
+    let admin = open_admin_storage(base_dir, backend, admin_secret)?;
+    let hash = crate::rpc::hash_key(key_plain);
+    let v = match perms {
+        Permissions::Read => format!("Read:{}", now_secs()),
+        Permissions::ReadWrite => format!("ReadWrite:{}", now_secs()),
+    };
+    let _ = admin.hset(&k_meta_db_keys(id), vec![(hash, v)])?;
+    Ok(())
+}
+
+// Delete access key by hash
+pub fn delete_access_key(
+    base_dir: &Path,
+    backend: options::BackendType,
+    admin_secret: &str,
+    id: u64,
+    key_hash: &str,
+) -> Result<bool, DBError> {
+    let admin = open_admin_storage(base_dir, backend, admin_secret)?;
+    let n = admin.hdel(&k_meta_db_keys(id), vec![key_hash.to_string()])?;
+    Ok(n > 0)
+}
+
+// List access keys, returning (hash, perms, created_at_secs)
+pub fn list_access_keys(
+    base_dir: &Path,
+    backend: options::BackendType,
+    admin_secret: &str,
+    id: u64,
+) -> Result<Vec<(String, Permissions, u64)>, DBError> {
+    let admin = open_admin_storage(base_dir, backend, admin_secret)?;
+    let pairs = admin.hgetall(&k_meta_db_keys(id))?;
+    let mut out = Vec::new();
+    for (hash, val) in pairs {
+        let (perm, ts) = parse_perm_value(&val);
+        out.push((hash, perm, ts));
+    }
+    Ok(out)
+}
+
+// Verify access permission for db id with optional key
+// Returns:
+// - Ok(Some(Permissions)) when access is allowed
+// - Ok(None) when not allowed or db missing (caller can distinguish by calling db_exists)
+pub fn verify_access(
+    base_dir: &Path,
+    backend: options::BackendType,
+    admin_secret: &str,
+    id: u64,
+    key_opt: Option<&str>,
+) -> Result<Option<Permissions>, DBError> {
+    // Admin DB 0: require exact admin_secret
+    if id == 0 {
+        if let Some(k) = key_opt {
+            if k == admin_secret {
+                return Ok(Some(Permissions::ReadWrite));
+            }
+        }
+        return Ok(None);
+    }
+
+    let admin = open_admin_storage(base_dir, backend, admin_secret)?;
+    if !admin.hexists(k_admin_dbs(), &id.to_string())? {
+        return Ok(None);
+    }
+
+    let is_public = load_public(&admin, id)?;
+
+    // If a key is explicitly provided, enforce its validity strictly.
+    // Do NOT fall back to public when an invalid key is supplied.
+    if let Some(k) = key_opt {
+        let hash = crate::rpc::hash_key(k);
+        if let Some(v) = admin.hget(&k_meta_db_keys(id), &hash)? {
+            let (perm, _ts) = parse_perm_value(&v);
+            return Ok(Some(perm));
+        }
+        // Invalid key
+        return Ok(None);
+    }
+
+    // No key provided: allow access if DB is public, otherwise deny
+    if is_public {
+        Ok(Some(Permissions::ReadWrite))
+    } else {
+        Ok(None)
+    }
+}
+
+// Enumerate all db ids
+pub fn list_dbs(
+    base_dir: &Path,
+    backend: options::BackendType,
+    admin_secret: &str,
+) -> Result<Vec<u64>, DBError> {
+    let admin = open_admin_storage(base_dir, backend, admin_secret)?;
+    let ids = admin.hkeys(k_admin_dbs())?;
+    let mut out = Vec::new();
+    for s in ids {
+        if let Ok(v) = s.parse() {
+            out.push(v);
+        }
+    }
+    Ok(out)
+}
+
+// Helper: parse permission value "Read:ts" or "ReadWrite:ts"
+fn parse_perm_value(v: &str) -> (Permissions, u64) {
+    let mut parts = v.split(':');
+    let p = parts.next().unwrap_or("Read");
+    let ts = parts
+        .next()
+        .and_then(|s| s.parse().ok())
+        .unwrap_or(0u64);
+    let perm = match p {
+        "ReadWrite" => Permissions::ReadWrite,
+        _ => Permissions::Read,
+    };
+    (perm, ts)
+}
+
+fn now_secs() -> u64 {
+    use std::time::{SystemTime, UNIX_EPOCH};
+    SystemTime::now()
+        .duration_since(UNIX_EPOCH)
+        .unwrap_or_default()
+        .as_secs()
+}

src/age.rs

@@ -12,17 +12,19 @@
 
 use std::str::FromStr;
 
-use age::x25519;
-use age::{Decryptor, Encryptor};
 use secrecy::ExposeSecret;
+use age::{Decryptor, Encryptor};
+use age::x25519;
 
-use ed25519_dalek::{Signature, Signer, SigningKey, Verifier, VerifyingKey};
+use ed25519_dalek::{Signature, Signer, Verifier, SigningKey, VerifyingKey};
 
 use base64::{engine::general_purpose::STANDARD as B64, Engine as _};
+use std::collections::HashSet;
+use std::convert::TryInto;
 
-use crate::error::DBError;
 use crate::protocol::Protocol;
 use crate::server::Server;
+use crate::error::DBError;
 
 // ---------- Internal helpers ----------
 
@@ -32,7 +34,7 @@ pub enum AgeWireError {
     Crypto(String),
     Utf8,
     SignatureLen,
-    NotFound(&'static str), // which kind of key was missing
+    NotFound(&'static str),     // which kind of key was missing
     Storage(String),
 }
 
@@ -74,6 +76,125 @@ fn parse_ed25519_verifying_key(s: &str) -> Result<VerifyingKey, AgeWireError> {
     VerifyingKey::from_bytes(&key_bytes).map_err(|_| AgeWireError::ParseKey)
 }
 
+// ---------- Derivation + Raw X25519 (Ed25519 -> X25519) ----------
+//
+// We deterministically derive an X25519 keypair from an Ed25519 SigningKey.
+// We persist the X25519 public/secret as base64-encoded 32-byte raw values
+// (no "age1..."/"AGE-SECRET-KEY-1..." formatting). Name-based encrypt/decrypt
+// uses these raw values directly via x25519-dalek + ChaCha20Poly1305.
+
+use chacha20poly1305::{aead::{Aead, KeyInit}, ChaCha20Poly1305, Key, Nonce};
+use sha2::{Digest, Sha256};
+use x25519_dalek::{PublicKey as XPublicKey, StaticSecret as XStaticSecret};
+
+fn derive_x25519_raw_from_ed25519(sk: &SigningKey) -> ([u8; 32], [u8; 32]) {
+    // X25519 secret scalar (clamped) from Ed25519 secret
+    let scalar: [u8; 32] = sk.to_scalar_bytes();
+    // Build X25519 secret/public using dalek
+    let xsec = XStaticSecret::from(scalar);
+    let xpub = XPublicKey::from(&xsec);
+    (xpub.to_bytes(), xsec.to_bytes())
+}
+
+fn derive_x25519_raw_b64_from_ed25519(sk: &SigningKey) -> (String, String) {
+    let (xpub, xsec) = derive_x25519_raw_from_ed25519(sk);
+    (B64.encode(xpub), B64.encode(xsec))
+}
+
+// Helper: detect whether a stored key looks like an age-formatted string
+fn looks_like_age_format(s: &str) -> bool {
+    s.starts_with("age1") || s.starts_with("AGE-SECRET-KEY-1")
+}
+
+// Our container format for name-based raw X25519 encryption:
+// bytes = "HDBX1" (5) || eph_pub(32) || nonce(12) || ciphertext(..)
+// Entire blob is base64-encoded for transport.
+const HDBX1_MAGIC: &[u8; 5] = b"HDBX1";
+
+fn encrypt_b64_with_x25519_raw(recip_pub_b64: &str, msg: &str) -> Result<String, AgeWireError> {
+    use rand::RngCore;
+    use rand::rngs::OsRng;
+
+    // Parse recipient public key (raw 32 bytes, base64)
+    let recip_pub_bytes = B64.decode(recip_pub_b64).map_err(|_| AgeWireError::ParseKey)?;
+    if recip_pub_bytes.len() != 32 { return Err(AgeWireError::ParseKey); }
+    let recip_pub_arr: [u8; 32] = recip_pub_bytes.as_slice().try_into().map_err(|_| AgeWireError::ParseKey)?;
+    let recip_pub: XPublicKey = XPublicKey::from(recip_pub_arr);
+
+    // Generate ephemeral X25519 keypair
+    let mut eph_sec_bytes = [0u8; 32];
+    OsRng.fill_bytes(&mut eph_sec_bytes);
+    let eph_sec = XStaticSecret::from(eph_sec_bytes);
+    let eph_pub = XPublicKey::from(&eph_sec);
+
+    // ECDH
+    let shared = eph_sec.diffie_hellman(&recip_pub);
+    // Derive symmetric key via SHA-256 over context + shared + parties
+    let mut hasher = Sha256::default();
+    hasher.update(b"herodb-x25519-v1");
+    hasher.update(shared.as_bytes());
+    hasher.update(eph_pub.as_bytes());
+    hasher.update(recip_pub.as_bytes());
+    let key_bytes = hasher.finalize();
+    let key = Key::from_slice(&key_bytes[..32]);
+
+    // Nonce (12 bytes)
+    let mut nonce_bytes = [0u8; 12];
+    OsRng.fill_bytes(&mut nonce_bytes);
+    let nonce = Nonce::from_slice(&nonce_bytes);
+
+    // Encrypt
+    let cipher = ChaCha20Poly1305::new(key);
+    let ct = cipher.encrypt(nonce, msg.as_bytes())
+        .map_err(|e| AgeWireError::Crypto(format!("encrypt: {e}")))?;
+
+    // Assemble container
+    let mut out = Vec::with_capacity(5 + 32 + 12 + ct.len());
+    out.extend_from_slice(HDBX1_MAGIC);
+    out.extend_from_slice(eph_pub.as_bytes());
+    out.extend_from_slice(&nonce_bytes);
+    out.extend_from_slice(&ct);
+
+    Ok(B64.encode(out))
+}
+
+fn decrypt_b64_with_x25519_raw(identity_sec_b64: &str, ct_b64: &str) -> Result<String, AgeWireError> {
+    // Parse X25519 secret (raw 32 bytes, base64)
+    let sec_bytes = B64.decode(identity_sec_b64).map_err(|_| AgeWireError::ParseKey)?;
+    if sec_bytes.len() != 32 { return Err(AgeWireError::ParseKey); }
+    let sec_arr: [u8; 32] = sec_bytes.as_slice().try_into().map_err(|_| AgeWireError::ParseKey)?;
+    let xsec = XStaticSecret::from(sec_arr);
+    let xpub = XPublicKey::from(&xsec); // self public
+
+    // Decode container
+    let blob = B64.decode(ct_b64.as_bytes()).map_err(|e| AgeWireError::Crypto(e.to_string()))?;
+    if blob.len() < 5 + 32 + 12 { return Err(AgeWireError::Crypto("ciphertext too short".to_string())); }
+    if &blob[..5] != HDBX1_MAGIC { return Err(AgeWireError::Crypto("bad header".to_string())); }
+
+    let eph_pub_arr: [u8; 32] = blob[5..5+32].try_into().map_err(|_| AgeWireError::Crypto("bad eph pub".to_string()))?;
+    let eph_pub = XPublicKey::from(eph_pub_arr);
+    let nonce_bytes: [u8; 12] = blob[5+32..5+32+12].try_into().unwrap();
+    let ct = &blob[5+32+12..];
+
+    // Recompute shared + key
+    let shared = xsec.diffie_hellman(&eph_pub);
+    let mut hasher = Sha256::default();
+    hasher.update(b"herodb-x25519-v1");
+    hasher.update(shared.as_bytes());
+    hasher.update(eph_pub.as_bytes());
+    hasher.update(xpub.as_bytes());
+    let key_bytes = hasher.finalize();
+    let key = Key::from_slice(&key_bytes[..32]);
+
+    // Decrypt
+    let cipher = ChaCha20Poly1305::new(key);
+    let nonce = Nonce::from_slice(&nonce_bytes);
+    let pt = cipher.decrypt(nonce, ct)
+        .map_err(|e| AgeWireError::Crypto(format!("decrypt: {e}")))?;
+
+    String::from_utf8(pt).map_err(|_| AgeWireError::Utf8)
+}
+
 // ---------- Stateless crypto helpers (string in/out) ----------
 
 pub fn gen_enc_keypair() -> (String, String) {
@@ -83,38 +204,34 @@ pub fn gen_enc_keypair() -> (String, String) {
 }
 
 pub fn gen_sign_keypair() -> (String, String) {
-    use rand::rngs::OsRng;
     use rand::RngCore;
-
+    use rand::rngs::OsRng;
+    
     // Generate random 32 bytes for the signing key
     let mut secret_bytes = [0u8; 32];
     OsRng.fill_bytes(&mut secret_bytes);
-
+    
     let signing_key = SigningKey::from_bytes(&secret_bytes);
     let verifying_key = signing_key.verifying_key();
-
+    
     // Encode as base64 for storage
     let signing_key_b64 = B64.encode(signing_key.to_bytes());
     let verifying_key_b64 = B64.encode(verifying_key.to_bytes());
-
+    
     (verifying_key_b64, signing_key_b64) // (verify_pub, signing_secret)
 }
 
 /// Encrypt `msg` for `recipient_str` (X25519). Returns base64(ciphertext).
 pub fn encrypt_b64(recipient_str: &str, msg: &str) -> Result<String, AgeWireError> {
     let recipient = parse_recipient(recipient_str)?;
-    let enc =
+    let enc = Encryptor::with_recipients(vec![Box::new(recipient)])
-        Encryptor::with_recipients(vec![Box::new(recipient)]).expect("failed to create encryptor"); // Handle Option<Encryptor>
+        .expect("failed to create encryptor"); // Handle Option<Encryptor>
     let mut out = Vec::new();
     {
         use std::io::Write;
-        let mut w = enc
+        let mut w = enc.wrap_output(&mut out).map_err(|e| AgeWireError::Crypto(e.to_string()))?;
-            .wrap_output(&mut out)
+        w.write_all(msg.as_bytes()).map_err(|e| AgeWireError::Crypto(e.to_string()))?;
-            .map_err(|e| AgeWireError::Crypto(e.to_string()))?;
+        w.finish().map_err(|e| AgeWireError::Crypto(e.to_string()))?;
-        w.write_all(msg.as_bytes())
-            .map_err(|e| AgeWireError::Crypto(e.to_string()))?;
-        w.finish()
-            .map_err(|e| AgeWireError::Crypto(e.to_string()))?;
     }
     Ok(B64.encode(out))
 }
@@ -122,27 +239,19 @@ pub fn encrypt_b64(recipient_str: &str, msg: &str) -> Result<String, AgeWireErro
 /// Decrypt base64(ciphertext) with `identity_str`. Returns plaintext String.
 pub fn decrypt_b64(identity_str: &str, ct_b64: &str) -> Result<String, AgeWireError> {
     let id = parse_identity(identity_str)?;
-    let ct = B64
+    let ct = B64.decode(ct_b64.as_bytes()).map_err(|e| AgeWireError::Crypto(e.to_string()))?;
-        .decode(ct_b64.as_bytes())
-        .map_err(|e| AgeWireError::Crypto(e.to_string()))?;
     let dec = Decryptor::new(&ct[..]).map_err(|e| AgeWireError::Crypto(e.to_string()))?;
-
+    
     // The decrypt method returns a Result<StreamReader, DecryptError>
     let mut r = match dec {
-        Decryptor::Recipients(d) => d
+        Decryptor::Recipients(d) => d.decrypt(std::iter::once(&id as &dyn age::Identity))
-            .decrypt(std::iter::once(&id as &dyn age::Identity))
             .map_err(|e| AgeWireError::Crypto(e.to_string()))?,
-        Decryptor::Passphrase(_) => {
+        Decryptor::Passphrase(_) => return Err(AgeWireError::Crypto("Expected recipients, got passphrase".to_string())),
-            return Err(AgeWireError::Crypto(
-                "Expected recipients, got passphrase".to_string(),
-            ))
-        }
     };
-
+    
     let mut pt = Vec::new();
     use std::io::Read;
-    r.read_to_end(&mut pt)
+    r.read_to_end(&mut pt).map_err(|e| AgeWireError::Crypto(e.to_string()))?;
-        .map_err(|e| AgeWireError::Crypto(e.to_string()))?;
     String::from_utf8(pt).map_err(|_| AgeWireError::Utf8)
 }
 
@@ -156,9 +265,7 @@ pub fn sign_b64(signing_secret_str: &str, msg: &str) -> Result<String, AgeWireEr
 /// Verify detached signature (base64) for `msg` with pubkey.
 pub fn verify_b64(verify_pub_str: &str, msg: &str, sig_b64: &str) -> Result<bool, AgeWireError> {
     let verifying_key = parse_ed25519_verifying_key(verify_pub_str)?;
-    let sig_bytes = B64
+    let sig_bytes = B64.decode(sig_b64.as_bytes()).map_err(|e| AgeWireError::Crypto(e.to_string()))?;
-        .decode(sig_b64.as_bytes())
-        .map_err(|e| AgeWireError::Crypto(e.to_string()))?;
     if sig_bytes.len() != 64 {
         return Err(AgeWireError::SignatureLen);
     }
@@ -169,49 +276,30 @@ pub fn verify_b64(verify_pub_str: &str, msg: &str, sig_b64: &str) -> Result<bool
 // ---------- Storage helpers ----------
 
 fn sget(server: &Server, key: &str) -> Result<Option<String>, AgeWireError> {
-    let st = server
+    let st = server.current_storage().map_err(|e| AgeWireError::Storage(e.0))?;
-        .current_storage()
-        .map_err(|e| AgeWireError::Storage(e.0))?;
     st.get(key).map_err(|e| AgeWireError::Storage(e.0))
 }
 fn sset(server: &Server, key: &str, val: &str) -> Result<(), AgeWireError> {
-    let st = server
+    let st = server.current_storage().map_err(|e| AgeWireError::Storage(e.0))?;
-        .current_storage()
+    st.set(key.to_string(), val.to_string()).map_err(|e| AgeWireError::Storage(e.0))
-        .map_err(|e| AgeWireError::Storage(e.0))?;
-    st.set(key.to_string(), val.to_string())
-        .map_err(|e| AgeWireError::Storage(e.0))
 }
 
-fn enc_pub_key_key(name: &str) -> String {
+fn enc_pub_key_key(name: &str) -> String { format!("age:key:{name}") }
-    format!("age:key:{name}")
+fn enc_priv_key_key(name: &str) -> String { format!("age:privkey:{name}") }
-}
+fn sign_pub_key_key(name: &str) -> String { format!("age:signpub:{name}") }
-fn enc_priv_key_key(name: &str) -> String {
+fn sign_priv_key_key(name: &str) -> String { format!("age:signpriv:{name}") }
-    format!("age:privkey:{name}")
-}
-fn sign_pub_key_key(name: &str) -> String {
-    format!("age:signpub:{name}")
-}
-fn sign_priv_key_key(name: &str) -> String {
-    format!("age:signpriv:{name}")
-}
 
 // ---------- Command handlers (RESP Protocol) ----------
 // Basic (stateless) ones kept for completeness
 
 pub async fn cmd_age_genenc() -> Protocol {
     let (recip, ident) = gen_enc_keypair();
-    Protocol::Array(vec![
+    Protocol::Array(vec![Protocol::BulkString(recip), Protocol::BulkString(ident)])
-        Protocol::BulkString(recip),
-        Protocol::BulkString(ident),
-    ])
 }
 
 pub async fn cmd_age_gensign() -> Protocol {
     let (verify, secret) = gen_sign_keypair();
-    Protocol::Array(vec![
+    Protocol::Array(vec![Protocol::BulkString(verify), Protocol::BulkString(secret)])
-        Protocol::BulkString(verify),
-        Protocol::BulkString(secret),
-    ])
 }
 
 pub async fn cmd_age_encrypt(recipient: &str, message: &str) -> Protocol {
@@ -243,66 +331,159 @@ pub async fn cmd_age_verify(verify_pub: &str, message: &str, sig_b64: &str) -> P
     }
 }
 
+// ---------- NEW: unified stateless generator (Ed25519 + derived X25519 raw) ----------
+//
+// Returns 4-tuple:
+// [ verify_pub_b64 (32B), signpriv_b64 (32B), x25519_pub_b64 (32B), x25519_sec_b64 (32B) ]
+// No persistence (stateless).
+pub async fn cmd_age_genkey() -> Protocol {
+    use rand::RngCore;
+    use rand::rngs::OsRng;
+
+    let mut secret_bytes = [0u8; 32];
+    OsRng.fill_bytes(&mut secret_bytes);
+
+    let signing_key = SigningKey::from_bytes(&secret_bytes);
+    let verifying_key = signing_key.verifying_key();
+
+    let verify_b64 = B64.encode(verifying_key.to_bytes());
+    let sign_b64 = B64.encode(signing_key.to_bytes());
+
+    let (xpub_b64, xsec_b64) = derive_x25519_raw_b64_from_ed25519(&signing_key);
+
+    Protocol::Array(vec![
+        Protocol::BulkString(verify_b64),
+        Protocol::BulkString(sign_b64),
+        Protocol::BulkString(xpub_b64),
+        Protocol::BulkString(xsec_b64),
+    ])
+}
+
 // ---------- NEW: Persistent, named-key commands ----------
 
 pub async fn cmd_age_keygen(server: &Server, name: &str) -> Protocol {
-    let (recip, ident) = gen_enc_keypair();
+    use rand::RngCore;
-    if let Err(e) = sset(server, &enc_pub_key_key(name), &recip) {
+    use rand::rngs::OsRng;
-        return e.to_protocol();
+
-    }
+    // Generate Ed25519 keypair
-    if let Err(e) = sset(server, &enc_priv_key_key(name), &ident) {
+    let mut secret_bytes = [0u8; 32];
-        return e.to_protocol();
+    OsRng.fill_bytes(&mut secret_bytes);
-    }
+    let signing_key = SigningKey::from_bytes(&secret_bytes);
+    let verifying_key = signing_key.verifying_key();
+
+    // Encode Ed25519 as base64 (32 bytes)
+    let verify_b64 = B64.encode(verifying_key.to_bytes());
+    let sign_b64 = B64.encode(signing_key.to_bytes());
+
+    // Derive X25519 raw (32-byte) keys and encode as base64
+    let (xpub_b64, xsec_b64) = derive_x25519_raw_b64_from_ed25519(&signing_key);
+
+    // Decode to create age-formatted strings
+    let xpub_bytes = B64.decode(&xpub_b64).unwrap();
+    let xsec_bytes = B64.decode(&xsec_b64).unwrap();
+    let xpub_arr: [u8; 32] = xpub_bytes.as_slice().try_into().unwrap();
+    let xsec_arr: [u8; 32] = xsec_bytes.as_slice().try_into().unwrap();
+    let recip_str = format!("age1{}", B64.encode(xpub_arr));
+    let ident_str = format!("AGE-SECRET-KEY-1{}", B64.encode(xsec_arr));
+
+    // Persist Ed25519 and derived X25519 (key-managed mode)
+    if let Err(e) = sset(server, &sign_pub_key_key(name), &verify_b64) { return e.to_protocol(); }
+    if let Err(e) = sset(server, &sign_priv_key_key(name), &sign_b64) { return e.to_protocol(); }
+    if let Err(e) = sset(server, &enc_pub_key_key(name), &xpub_b64) { return e.to_protocol(); }
+    if let Err(e) = sset(server, &enc_priv_key_key(name), &xsec_b64) { return e.to_protocol(); }
+
+    // Return [recipient, identity] in age format
     Protocol::Array(vec![
-        Protocol::BulkString(recip),
+        Protocol::BulkString(recip_str),
-        Protocol::BulkString(ident),
+        Protocol::BulkString(ident_str),
     ])
 }
 
 pub async fn cmd_age_signkeygen(server: &Server, name: &str) -> Protocol {
     let (verify, secret) = gen_sign_keypair();
-    if let Err(e) = sset(server, &sign_pub_key_key(name), &verify) {
+    if let Err(e) = sset(server, &sign_pub_key_key(name), &verify) { return e.to_protocol(); }
-        return e.to_protocol();
+    if let Err(e) = sset(server, &sign_priv_key_key(name), &secret) { return e.to_protocol(); }
-    }
+    Protocol::Array(vec![Protocol::BulkString(verify), Protocol::BulkString(secret)])
-    if let Err(e) = sset(server, &sign_priv_key_key(name), &secret) {
-        return e.to_protocol();
-    }
-    Protocol::Array(vec![
-        Protocol::BulkString(verify),
-        Protocol::BulkString(secret),
-    ])
 }
 
 pub async fn cmd_age_encrypt_name(server: &Server, name: &str, message: &str) -> Protocol {
-    let recip = match sget(server, &enc_pub_key_key(name)) {
+    // Load stored recipient (could be raw b64 32-byte or "age1..." from legacy)
+    let recip_or_b64 = match sget(server, &enc_pub_key_key(name)) {
         Ok(Some(v)) => v,
-        Ok(None) => return AgeWireError::NotFound("recipient (age:key:{name})").to_protocol(),
+        Ok(None) => {
+            // Derive from stored Ed25519 if present, then persist
+            match sget(server, &sign_priv_key_key(name)) {
+                Ok(Some(sign_b64)) => {
+                    let sk = match parse_ed25519_signing_key(&sign_b64) {
+                        Ok(k) => k,
+                        Err(e) => return e.to_protocol(),
+                    };
+                    let (xpub_b64, xsec_b64) = derive_x25519_raw_b64_from_ed25519(&sk);
+                    if let Err(e) = sset(server, &enc_pub_key_key(name), &xpub_b64) { return e.to_protocol(); }
+                    if let Err(e) = sset(server, &enc_priv_key_key(name), &xsec_b64) { return e.to_protocol(); }
+                    xpub_b64
+                }
+                Ok(None) => return AgeWireError::NotFound("recipient (age:key:{name})").to_protocol(),
+                Err(e) => return e.to_protocol(),
+            }
+        }
         Err(e) => return e.to_protocol(),
     };
-    match encrypt_b64(&recip, message) {
+
-        Ok(ct) => Protocol::BulkString(ct),
+    if looks_like_age_format(&recip_or_b64) {
-        Err(e) => e.to_protocol(),
+        match encrypt_b64(&recip_or_b64, message) {
+            Ok(ct) => Protocol::BulkString(ct),
+            Err(e) => e.to_protocol(),
+        }
+    } else {
+        match encrypt_b64_with_x25519_raw(&recip_or_b64, message) {
+            Ok(ct) => Protocol::BulkString(ct),
+            Err(e) => e.to_protocol(),
+        }
     }
 }
 
 pub async fn cmd_age_decrypt_name(server: &Server, name: &str, ct_b64: &str) -> Protocol {
-    let ident = match sget(server, &enc_priv_key_key(name)) {
+    // Load stored identity (could be raw b64 32-byte or "AGE-SECRET-KEY-1..." from legacy)
+    let ident_or_b64 = match sget(server, &enc_priv_key_key(name)) {
         Ok(Some(v)) => v,
-        Ok(None) => return AgeWireError::NotFound("identity (age:privkey:{name})").to_protocol(),
+        Ok(None) => {
+            // Derive from stored Ed25519 if present, then persist
+            match sget(server, &sign_priv_key_key(name)) {
+                Ok(Some(sign_b64)) => {
+                    let sk = match parse_ed25519_signing_key(&sign_b64) {
+                        Ok(k) => k,
+                        Err(e) => return e.to_protocol(),
+                    };
+                    let (xpub_b64, xsec_b64) = derive_x25519_raw_b64_from_ed25519(&sk);
+                    if let Err(e) = sset(server, &enc_pub_key_key(name), &xpub_b64) { return e.to_protocol(); }
+                    if let Err(e) = sset(server, &enc_priv_key_key(name), &xsec_b64) { return e.to_protocol(); }
+                    xsec_b64
+                }
+                Ok(None) => return AgeWireError::NotFound("identity (age:privkey:{name})").to_protocol(),
+                Err(e) => return e.to_protocol(),
+            }
+        }
         Err(e) => return e.to_protocol(),
     };
-    match decrypt_b64(&ident, ct_b64) {
+
-        Ok(pt) => Protocol::BulkString(pt),
+    if looks_like_age_format(&ident_or_b64) {
-        Err(e) => e.to_protocol(),
+        match decrypt_b64(&ident_or_b64, ct_b64) {
+            Ok(pt) => Protocol::BulkString(pt),
+            Err(e) => e.to_protocol(),
+        }
+    } else {
+        match decrypt_b64_with_x25519_raw(&ident_or_b64, ct_b64) {
+            Ok(pt) => Protocol::BulkString(pt),
+            Err(e) => e.to_protocol(),
+        }
     }
 }
 
 pub async fn cmd_age_sign_name(server: &Server, name: &str, message: &str) -> Protocol {
     let sec = match sget(server, &sign_priv_key_key(name)) {
         Ok(Some(v)) => v,
-        Ok(None) => {
+        Ok(None) => return AgeWireError::NotFound("signing secret (age:signpriv:{name})").to_protocol(),
-            return AgeWireError::NotFound("signing secret (age:signpriv:{name})").to_protocol()
-        }
         Err(e) => return e.to_protocol(),
     };
     match sign_b64(&sec, message) {
@@ -311,17 +492,10 @@ pub async fn cmd_age_sign_name(server: &Server, name: &str, message: &str) -> Pr
     }
 }
 
-pub async fn cmd_age_verify_name(
+pub async fn cmd_age_verify_name(server: &Server, name: &str, message: &str, sig_b64: &str) -> Protocol {
-    server: &Server,
-    name: &str,
-    message: &str,
-    sig_b64: &str,
-) -> Protocol {
     let pubk = match sget(server, &sign_pub_key_key(name)) {
         Ok(Some(v)) => v,
-        Ok(None) => {
+        Ok(None) => return AgeWireError::NotFound("verify pubkey (age:signpub:{name})").to_protocol(),
-            return AgeWireError::NotFound("verify pubkey (age:signpub:{name})").to_protocol()
-        }
         Err(e) => return e.to_protocol(),
     };
     match verify_b64(&pubk, message, sig_b64) {
@@ -332,11 +506,8 @@ pub async fn cmd_age_verify_name(
 }
 
 pub async fn cmd_age_list(server: &Server) -> Protocol {
-    // Returns 4 arrays: ["encpub", <names...>], ["encpriv", ...], ["signpub", ...], ["signpriv", ...]
+    // Return a flat, deduplicated, sorted list of managed key names (no labels)
-    let st = match server.current_storage() {
+    let st = match server.current_storage() { Ok(s) => s, Err(e) => return Protocol::err(&e.0) };
-        Ok(s) => s,
-        Err(e) => return Protocol::err(&e.0),
-    };
 
     let pull = |pat: &str, prefix: &str| -> Result<Vec<String>, DBError> {
         let keys = st.keys(pat)?;
@@ -348,35 +519,18 @@ pub async fn cmd_age_list(server: &Server) -> Protocol {
         Ok(names)
     };
 
-    let encpub = match pull("age:key:*", "age:key:") {
+    let encpub   = match pull("age:key:*",      "age:key:")      { Ok(v) => v, Err(e)=> return Protocol::err(&e.0) };
-        Ok(v) => v,
+    let encpriv  = match pull("age:privkey:*",  "age:privkey:")  { Ok(v) => v, Err(e)=> return Protocol::err(&e.0) };
-        Err(e) => return Protocol::err(&e.0),
+    let signpub  = match pull("age:signpub:*",  "age:signpub:")  { Ok(v) => v, Err(e)=> return Protocol::err(&e.0) };
-    };
+    let signpriv = match pull("age:signpriv:*", "age:signpriv:") { Ok(v) => v, Err(e)=> return Protocol::err(&e.0) };
-    let encpriv = match pull("age:privkey:*", "age:privkey:") {
-        Ok(v) => v,
-        Err(e) => return Protocol::err(&e.0),
-    };
-    let signpub = match pull("age:signpub:*", "age:signpub:") {
-        Ok(v) => v,
-        Err(e) => return Protocol::err(&e.0),
-    };
-    let signpriv = match pull("age:signpriv:*", "age:signpriv:") {
-        Ok(v) => v,
-        Err(e) => return Protocol::err(&e.0),
-    };
 
-    let to_arr = |label: &str, v: Vec<String>| {
+    let mut set: HashSet<String> = HashSet::new();
-        let mut out = vec![Protocol::BulkString(label.to_string())];
+    for n in encpub.into_iter().chain(encpriv).chain(signpub).chain(signpriv) {
-        out.push(Protocol::Array(
+        set.insert(n);
-            v.into_iter().map(Protocol::BulkString).collect(),
+    }
-        ));
-        Protocol::Array(out)
-    };
 
-    Protocol::Array(vec![
+    let mut names: Vec<String> = set.into_iter().collect();
-        to_arr("encpub", encpub),
+    names.sort();
-        to_arr("encpriv", encpriv),
+
-        to_arr("signpub", signpub),
+    Protocol::Array(names.into_iter().map(Protocol::BulkString).collect())
-        to_arr("signpriv", signpriv),
+}
-    ])
-}

src/crypto.rs

@@ -1,8 +1,8 @@
 use chacha20poly1305::{
-    aead::{Aead, KeyInit, OsRng},
+    aead::{Aead, KeyInit},
     XChaCha20Poly1305, XNonce,
 };
-use rand::RngCore;
+use rand::{rngs::OsRng, RngCore};
 use sha2::{Digest, Sha256};
 
 const VERSION: u8 = 1;
@@ -11,9 +11,9 @@ const TAG_LEN: usize = 16;
 
 #[derive(Debug)]
 pub enum CryptoError {
-    Format,      // wrong length / header
+    Format,         // wrong length / header
-    Version(u8), // unknown version
+    Version(u8),    // unknown version
-    Decrypt,     // wrong key or corrupted data
+    Decrypt,        // wrong key or corrupted data
 }
 
 impl From<CryptoError> for crate::error::DBError {
@@ -31,7 +31,7 @@ pub struct CryptoFactory {
 impl CryptoFactory {
     /// Accepts any secret bytes; turns them into a 32-byte key (SHA-256).
     pub fn new<S: AsRef<[u8]>>(secret: S) -> Self {
-        let mut h = Sha256::new();
+        let mut h = Sha256::default();
         h.update(b"xchacha20poly1305-factory:v1"); // domain separation
         h.update(secret.as_ref());
         let digest = h.finalize(); // 32 bytes
@@ -71,4 +71,4 @@ impl CryptoFactory {
         let cipher = XChaCha20Poly1305::new(&self.key);
         cipher.decrypt(nonce, ct).map_err(|_| CryptoError::Decrypt)
     }
-}
+}

src/embedding.rs

@@ -0,0 +1,353 @@
+// Embedding abstraction with a single external provider (OpenAI-compatible) and local test providers.
+
+use std::collections::HashMap;
+use std::sync::Arc;
+
+use serde::{Deserialize, Serialize};
+
+use crate::error::DBError;
+
+// Networking for OpenAI-compatible endpoints
+use std::time::Duration;
+use ureq::{Agent, AgentBuilder};
+use serde_json::json;
+
+/// Provider identifiers (minimal set).
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
+#[serde(rename_all = "snake_case")]
+pub enum EmbeddingProvider {
+    /// External HTTP provider compatible with OpenAI's embeddings API.
+    openai,
+    /// Deterministic, local-only embedder for CI and offline development (text).
+    test,
+    /// Deterministic, local-only embedder for CI and offline development (image).
+    image_test,
+}
+
+/// Serializable embedding configuration.
+/// - provider: "openai" | "test" | "image_test"
+/// - model: provider/model id (e.g., "text-embedding-3-small"), may be ignored by local gateways
+/// - dim: required output dimension (used to create Lance datasets and validate outputs)
+/// - endpoint: optional HTTP endpoint (defaults to OpenAI API when provider == openai)
+/// - headers: optional HTTP headers (e.g., Authorization). If empty and OPENAI_API_KEY is present, Authorization will be inferred.
+/// - timeout_ms: optional HTTP timeout in milliseconds (for both read and write)
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct EmbeddingConfig {
+    pub provider: EmbeddingProvider,
+    pub model: String,
+    pub dim: usize,
+    #[serde(default)]
+    pub endpoint: Option<String>,
+    #[serde(default)]
+    pub headers: HashMap<String, String>,
+    #[serde(default)]
+    pub timeout_ms: Option<u64>,
+}
+
+/// A provider-agnostic text embedding interface.
+pub trait Embedder: Send + Sync {
+    /// Human-readable provider/model name
+    fn name(&self) -> String;
+    /// Embedding dimension
+    fn dim(&self) -> usize;
+    /// Embed a single text string into a fixed-length vector
+    fn embed(&self, text: &str) -> Result<Vec<f32>, DBError>;
+    /// Embed many texts; default maps embed() over inputs
+    fn embed_many(&self, texts: &[String]) -> Result<Vec<Vec<f32>>, DBError> {
+        texts.iter().map(|t| self.embed(t)).collect()
+    }
+}
+
+/// Image embedding interface (separate from text to keep modality-specific inputs).
+pub trait ImageEmbedder: Send + Sync {
+    /// Human-readable provider/model name
+    fn name(&self) -> String;
+    /// Embedding dimension
+    fn dim(&self) -> usize;
+    /// Embed a single image (raw bytes)
+    fn embed_image(&self, bytes: &[u8]) -> Result<Vec<f32>, DBError>;
+    /// Embed many images; default maps embed_image() over inputs
+    fn embed_many_images(&self, images: &[Vec<u8>]) -> Result<Vec<Vec<f32>>, DBError> {
+        images.iter().map(|b| self.embed_image(b)).collect()
+    }
+}
+
+//// ----------------------------- TEXT: deterministic test embedder -----------------------------
+
+/// Deterministic, no-deps, no-network embedder for CI and offline dev.
+/// Algorithm:
+/// - Fold bytes of UTF-8 into 'dim' buckets with a simple rolling hash
+/// - Apply tanh-like scaling and L2-normalize to unit length
+pub struct TestHashEmbedder {
+    dim: usize,
+    model_name: String,
+}
+
+impl TestHashEmbedder {
+    pub fn new(dim: usize, model_name: impl Into<String>) -> Self {
+        Self { dim, model_name: model_name.into() }
+    }
+
+    fn l2_normalize(mut v: Vec<f32>) -> Vec<f32> {
+        let norm: f32 = v.iter().map(|x| x * x).sum::<f32>().sqrt();
+        if norm > 0.0 {
+            for x in &mut v {
+                *x /= norm;
+            }
+        }
+        v
+    }
+}
+
+impl Embedder for TestHashEmbedder {
+    fn name(&self) -> String {
+        format!("test:{}", self.model_name)
+    }
+
+    fn dim(&self) -> usize {
+        self.dim
+    }
+
+    fn embed(&self, text: &str) -> Result<Vec<f32>, DBError> {
+        let mut acc = vec![0f32; self.dim];
+        // A simple, deterministic folding hash over bytes
+        let mut h1: u32 = 2166136261u32; // FNV-like seed
+        let mut h2: u32 = 0x9e3779b9u32; // golden ratio
+        for (i, b) in text.as_bytes().iter().enumerate() {
+            h1 ^= *b as u32;
+            h1 = h1.wrapping_mul(16777619u32);
+            h2 = h2.wrapping_add(((*b as u32) << (i % 13)) ^ (h1.rotate_left((i % 7) as u32)));
+            let idx = (h1 ^ h2) as usize % self.dim;
+            // Map byte to [-1, 1] and accumulate with mild decay by position
+            let val = ((*b as f32) / 127.5 - 1.0) * (1.0 / (1.0 + (i as f32 / 32.0)));
+            acc[idx] += val;
+        }
+        // Non-linear squashing to stabilize + normalize
+        for x in &mut acc {
+            *x = x.tanh();
+        }
+        Ok(Self::l2_normalize(acc))
+    }
+}
+
+//// ----------------------------- IMAGE: deterministic test embedder -----------------------------
+
+/// Deterministic image embedder that folds bytes into buckets, applies tanh-like nonlinearity,
+/// and L2-normalizes. Suitable for CI and offline development.
+/// NOTE: This is NOT semantic; it is a stable hash-like representation.
+pub struct TestImageHashEmbedder {
+    dim: usize,
+    model_name: String,
+}
+
+impl TestImageHashEmbedder {
+    pub fn new(dim: usize, model_name: impl Into<String>) -> Self {
+        Self { dim, model_name: model_name.into() }
+    }
+
+    fn l2_normalize(mut v: Vec<f32>) -> Vec<f32> {
+        let norm: f32 = v.iter().map(|x| x * x).sum::<f32>().sqrt();
+        if norm > 0.0 {
+            for x in &mut v {
+                *x /= norm;
+            }
+        }
+        v
+    }
+}
+
+impl ImageEmbedder for TestImageHashEmbedder {
+    fn name(&self) -> String {
+        format!("image_test:{}", self.model_name)
+    }
+
+    fn dim(&self) -> usize {
+        self.dim
+    }
+
+    fn embed_image(&self, bytes: &[u8]) -> Result<Vec<f32>, DBError> {
+        // Deterministic fold across bytes with two rolling accumulators.
+        let mut acc = vec![0f32; self.dim];
+        let mut h1: u32 = 0x811C9DC5; // FNV-like
+        let mut h2: u32 = 0x9E3779B9; // golden ratio
+        for (i, b) in bytes.iter().enumerate() {
+            h1 ^= *b as u32;
+            h1 = h1.wrapping_mul(16777619u32);
+            // combine with position and h2
+            h2 = h2.wrapping_add(((i as u32).rotate_left((i % 13) as u32)) ^ h1.rotate_left((i % 7) as u32));
+            let idx = (h1 ^ h2) as usize % self.dim;
+            // Map to [-1,1] and decay with position
+            let val = ((*b as f32) / 127.5 - 1.0) * (1.0 / (1.0 + (i as f32 / 128.0)));
+            acc[idx] += val;
+        }
+        for x in &mut acc {
+            *x = x.tanh();
+        }
+        Ok(Self::l2_normalize(acc))
+    }
+}
+
+//// ----------------------------- OpenAI-compatible HTTP embedder -----------------------------
+
+struct OpenAIEmbedder {
+    model: String,
+    dim: usize,
+    agent: Agent,
+    endpoint: String,
+    headers: Vec<(String, String)>,
+}
+
+impl OpenAIEmbedder {
+    fn new_from_config(cfg: &EmbeddingConfig) -> Result<Self, DBError> {
+        // Resolve endpoint
+        let endpoint = cfg.endpoint.clone().unwrap_or_else(|| {
+            "https://api.openai.com/v1/embeddings".to_string()
+        });
+
+        // Determine expected dimension (required by config)
+        let dim = cfg.dim;
+
+        // Build an HTTP agent with timeouts (blocking; no tokio runtime involved)
+        let to_ms = cfg.timeout_ms.unwrap_or(30_000);
+        let agent = AgentBuilder::new()
+            .timeout_read(Duration::from_millis(to_ms))
+            .timeout_write(Duration::from_millis(to_ms))
+            .build();
+
+        // Headers: start from cfg.headers, and add Authorization from env if absent and available
+        let mut headers: Vec<(String, String)> =
+            cfg.headers.iter().map(|(k, v)| (k.clone(), v.clone())).collect();
+
+        if !headers.iter().any(|(k, _)| k.eq_ignore_ascii_case("content-type")) {
+            headers.push(("Content-Type".to_string(), "application/json".to_string()));
+        }
+
+        if !headers.iter().any(|(k, _)| k.eq_ignore_ascii_case("authorization")) {
+            if let Ok(key) = std::env::var("OPENAI_API_KEY") {
+                headers.push(("Authorization".to_string(), format!("Bearer {}", key)));
+            }
+        }
+
+        Ok(Self {
+            model: cfg.model.clone(),
+            dim,
+            agent,
+            endpoint,
+            headers,
+        })
+    }
+
+    fn request_many(&self, inputs: &[String]) -> Result<Vec<Vec<f32>>, DBError> {
+        // Compose request body (OpenAI-compatible)
+        let mut body = json!({ "model": self.model, "input": inputs });
+        if self.dim > 0 {
+            body.as_object_mut()
+                .unwrap()
+                .insert("dimensions".to_string(), json!(self.dim));
+        }
+
+        // Build request
+        let mut req = self.agent.post(&self.endpoint);
+        for (k, v) in &self.headers {
+            req = req.set(k, v);
+        }
+
+        // Send and handle errors
+        let resp = req.send_json(body);
+        let text = match resp {
+            Ok(r) => r
+                .into_string()
+                .map_err(|e| DBError(format!("Failed to read embeddings response: {}", e)))?,
+            Err(ureq::Error::Status(code, r)) => {
+                let body = r.into_string().unwrap_or_default();
+                return Err(DBError(format!("Embeddings API error {}: {}", code, body)));
+            }
+            Err(e) => return Err(DBError(format!("HTTP request failed: {}", e))),
+        };
+
+        let val: serde_json::Value = serde_json::from_str(&text)
+            .map_err(|e| DBError(format!("Invalid JSON from embeddings API: {}", e)))?;
+
+        let data = val
+            .get("data")
+            .and_then(|d| d.as_array())
+            .ok_or_else(|| DBError("Embeddings API response missing 'data' array".into()))?;
+
+        let mut out: Vec<Vec<f32>> = Vec::with_capacity(data.len());
+        for item in data {
+            let emb = item
+                .get("embedding")
+                .and_then(|e| e.as_array())
+                .ok_or_else(|| DBError("Embeddings API item missing 'embedding'".into()))?;
+            let mut v: Vec<f32> = Vec::with_capacity(emb.len());
+            for n in emb {
+                let f = n
+                    .as_f64()
+                    .ok_or_else(|| DBError("Embedding element is not a number".into()))?;
+                v.push(f as f32);
+            }
+            if self.dim > 0 && v.len() != self.dim {
+                return Err(DBError(format!(
+                    "Embedding dimension mismatch: expected {}, got {}. Configure 'dim' to match output.",
+                    self.dim, v.len()
+                )));
+            }
+            out.push(v);
+        }
+        Ok(out)
+    }
+}
+
+impl Embedder for OpenAIEmbedder {
+    fn name(&self) -> String {
+        format!("openai:{}", self.model)
+    }
+
+    fn dim(&self) -> usize {
+        self.dim
+    }
+
+    fn embed(&self, text: &str) -> Result<Vec<f32>, DBError> {
+        let v = self.request_many(&[text.to_string()])?;
+        Ok(v.into_iter().next().unwrap_or_else(|| vec![0.0; self.dim]))
+    }
+
+    fn embed_many(&self, texts: &[String]) -> Result<Vec<Vec<f32>>, DBError> {
+        if texts.is_empty() {
+            return Ok(vec![]);
+        }
+        self.request_many(texts)
+    }
+}
+
+/// Create an embedder instance from a config.
+/// - openai: uses OpenAI-compatible embeddings REST API (endpoint override supported)
+/// - test: deterministic local text embedder (no network)
+/// - image_test: not valid for text (use create_image_embedder)
+pub fn create_embedder(config: &EmbeddingConfig) -> Result<Arc<dyn Embedder>, DBError> {
+    match &config.provider {
+        EmbeddingProvider::openai => {
+            let inner = OpenAIEmbedder::new_from_config(config)?;
+            Ok(Arc::new(inner))
+        }
+        EmbeddingProvider::test => {
+            Ok(Arc::new(TestHashEmbedder::new(config.dim, config.model.clone())))
+        }
+        EmbeddingProvider::image_test => {
+            Err(DBError("Use create_image_embedder() for image providers".into()))
+        }
+    }
+}
+
+/// Create an image embedder instance from a config.
+/// - image_test: deterministic local image embedder
+pub fn create_image_embedder(config: &EmbeddingConfig) -> Result<Arc<dyn ImageEmbedder>, DBError> {
+    match &config.provider {
+        EmbeddingProvider::image_test => {
+            Ok(Arc::new(TestImageHashEmbedder::new(config.dim, config.model.clone())))
+        }
+        EmbeddingProvider::test | EmbeddingProvider::openai => {
+            Err(DBError("Configured text provider; dataset expects image provider (e.g., 'image_test')".into()))
+        }
+    }
+}

src/error.rs

@@ -1,8 +1,9 @@
 use std::num::ParseIntError;
 
-use bincode;
-use redb;
 use tokio::sync::mpsc;
+use redb;
+use bincode;
+
 
 // todo: more error types
 #[derive(Debug)]

src/lance_store.rs

@@ -0,0 +1,663 @@
+// LanceDB store abstraction (per database instance)
+// This module encapsulates all Lance/LanceDB operations for a given DB id.
+// Notes:
+// - We persist each dataset (aka "table") under <base_dir>/lance/<db_id>/<name>.lance
+// - Schema convention: id: Utf8 (non-null), vector: FixedSizeList<Float32, dim> (non-null), meta: Utf8 (nullable JSON string)
+// - We implement naive KNN (L2) scan in Rust for search to avoid tight coupling to lancedb search builder API.
+//   Index creation uses lance::Dataset vector index; future optimization can route to index-aware search.
+
+use std::cmp::Ordering;
+use std::collections::{BinaryHeap, HashMap};
+use std::path::{Path, PathBuf};
+use std::sync::Arc;
+
+use crate::error::DBError;
+
+use arrow_array::{Array, RecordBatch, RecordBatchIterator, StringArray};
+use arrow_array::builder::{FixedSizeListBuilder, Float32Builder, StringBuilder};
+use arrow_array::cast::AsArray;
+use arrow_schema::{DataType, Field, Schema};
+use futures::StreamExt;
+use serde_json::Value as JsonValue;
+
+// Low-level Lance core
+use lance::dataset::{WriteMode, WriteParams};
+use lance::Dataset;
+
+// Vector index (IVF_PQ etc.)
+
+// High-level LanceDB (for deletes where available)
+use lancedb::connection::Connection;
+use arrow_array::types::Float32Type;
+
+#[derive(Clone)]
+pub struct LanceStore {
+    base_dir: PathBuf,
+    db_id: u64,
+}
+
+impl LanceStore {
+    // Create a new LanceStore rooted at <base_dir>/lance/<db_id>
+    pub fn new(base_dir: &Path, db_id: u64) -> Result<Self, DBError> {
+        let p = base_dir.join("lance").join(db_id.to_string());
+        std::fs::create_dir_all(&p)
+            .map_err(|e| DBError(format!("Failed to create Lance dir {}: {}", p.display(), e)))?;
+        Ok(Self { base_dir: p, db_id })
+    }
+
+    fn dataset_path(&self, name: &str) -> PathBuf {
+        // Store datasets as directories or files with .lance suffix
+        // We accept both "<name>" and "<name>.lance" as logical name; normalize on ".lance"
+        let has_ext = name.ends_with(".lance");
+        if has_ext {
+            self.base_dir.join(name)
+        } else {
+            self.base_dir.join(format!("{name}.lance"))
+        }
+    }
+
+    fn file_uri(path: &Path) -> String {
+        // lancedb can use filesystem path directly; keep it simple
+        // Avoid file:// scheme since local paths are supported.
+        path.to_string_lossy().to_string()
+    }
+
+    async fn connect_db(&self) -> Result<Connection, DBError> {
+        let uri = Self::file_uri(&self.base_dir);
+        lancedb::connect(&uri)
+            .execute()
+            .await
+            .map_err(|e| DBError(format!("LanceDB connect failed at {}: {}", uri, e)))
+    }
+
+    fn vector_field(dim: i32) -> Field {
+        Field::new(
+            "vector",
+            DataType::FixedSizeList(Arc::new(Field::new("item", DataType::Float32, true)), dim),
+            false,
+        )
+    }
+
+    async fn read_existing_dim(&self, name: &str) -> Result<Option<i32>, DBError> {
+        let path = self.dataset_path(name);
+        if !path.exists() {
+            return Ok(None);
+        }
+        let ds = Dataset::open(path.to_string_lossy().as_ref())
+            .await
+            .map_err(|e| DBError(format!("Open dataset failed: {}: {}", path.display(), e)))?;
+        // Scan a single batch to infer vector dimension from the 'vector' column type
+        let mut scan = ds.scan();
+        if let Err(e) = scan.project(&["vector"]) {
+            return Err(DBError(format!("Project failed while inferring dim: {}", e)));
+        }
+        let mut stream = scan
+            .try_into_stream()
+            .await
+            .map_err(|e| DBError(format!("Scan stream failed while inferring dim: {}", e)))?;
+        if let Some(batch_res) = stream.next().await {
+            let batch = batch_res.map_err(|e| DBError(format!("Batch error: {}", e)))?;
+            let vec_col = batch
+                .column_by_name("vector")
+                .ok_or_else(|| DBError("Column 'vector' missing".into()))?;
+            let fsl = vec_col.as_fixed_size_list();
+            let dim = fsl.value_length();
+            return Ok(Some(dim));
+        }
+        Ok(None)
+    }
+
+    fn build_schema(dim: i32) -> Arc<Schema> {
+        Arc::new(Schema::new(vec![
+            Field::new("id", DataType::Utf8, false),
+            Self::vector_field(dim),
+            Field::new("text", DataType::Utf8, true),
+            Field::new("media_type", DataType::Utf8, true),
+            Field::new("media_uri", DataType::Utf8, true),
+            Field::new("meta", DataType::Utf8, true),
+        ]))
+    }
+
+    fn build_one_row_batch(
+        id: &str,
+        vector: &[f32],
+        meta: &HashMap<String, String>,
+        text: Option<&str>,
+        media_type: Option<&str>,
+        media_uri: Option<&str>,
+        dim: i32,
+    ) -> Result<(Arc<Schema>, RecordBatch), DBError> {
+        if vector.len() as i32 != dim {
+            return Err(DBError(format!(
+                "Vector length mismatch: expected {}, got {}",
+                dim,
+                vector.len()
+            )));
+        }
+
+        let schema = Self::build_schema(dim);
+
+        // id column
+        let mut id_builder = StringBuilder::new();
+        id_builder.append_value(id);
+        let id_arr = Arc::new(id_builder.finish()) as Arc<dyn Array>;
+
+        // vector column (FixedSizeList<Float32, dim>)
+        let v_builder = Float32Builder::with_capacity(vector.len());
+        let mut list_builder = FixedSizeListBuilder::new(v_builder, dim);
+        for v in vector {
+            list_builder.values().append_value(*v);
+        }
+        list_builder.append(true);
+        let vec_arr = Arc::new(list_builder.finish()) as Arc<dyn Array>;
+
+        // text column (optional)
+        let mut text_builder = StringBuilder::new();
+        if let Some(t) = text {
+            text_builder.append_value(t);
+        } else {
+            text_builder.append_null();
+        }
+        let text_arr = Arc::new(text_builder.finish()) as Arc<dyn Array>;
+
+        // media_type column (optional)
+        let mut mt_builder = StringBuilder::new();
+        if let Some(mt) = media_type {
+            mt_builder.append_value(mt);
+        } else {
+            mt_builder.append_null();
+        }
+        let mt_arr = Arc::new(mt_builder.finish()) as Arc<dyn Array>;
+
+        // media_uri column (optional)
+        let mut mu_builder = StringBuilder::new();
+        if let Some(mu) = media_uri {
+            mu_builder.append_value(mu);
+        } else {
+            mu_builder.append_null();
+        }
+        let mu_arr = Arc::new(mu_builder.finish()) as Arc<dyn Array>;
+
+        // meta column (JSON string)
+        let meta_json = if meta.is_empty() {
+            None
+        } else {
+            Some(serde_json::to_string(meta).map_err(|e| DBError(format!("Serialize meta error: {e}")))?)
+        };
+        let mut meta_builder = StringBuilder::new();
+        if let Some(s) = meta_json {
+            meta_builder.append_value(&s);
+        } else {
+            meta_builder.append_null();
+        }
+        let meta_arr = Arc::new(meta_builder.finish()) as Arc<dyn Array>;
+
+        let batch =
+            RecordBatch::try_new(schema.clone(), vec![id_arr, vec_arr, text_arr, mt_arr, mu_arr, meta_arr]).map_err(|e| {
+                DBError(format!("RecordBatch build failed: {e}"))
+            })?;
+
+        Ok((schema, batch))
+    }
+
+    // Create a new dataset (vector collection) with dimension `dim`.
+    pub async fn create_dataset(&self, name: &str, dim: usize) -> Result<(), DBError> {
+        let dim_i32: i32 = dim
+            .try_into()
+            .map_err(|_| DBError("Dimension too large".into()))?;
+        let path = self.dataset_path(name);
+
+        if path.exists() {
+            // Validate dimension if present
+            if let Some(existing_dim) = self.read_existing_dim(name).await? {
+                if existing_dim != dim_i32 {
+                    return Err(DBError(format!(
+                        "Dataset '{}' already exists with dim {}, requested {}",
+                        name, existing_dim, dim_i32
+                    )));
+                }
+                // No-op
+                return Ok(());
+            }
+        }
+
+        // Create an empty dataset by writing an empty batch
+        let schema = Self::build_schema(dim_i32);
+        let empty_id = Arc::new(StringArray::new_null(0));
+        // Build an empty FixedSizeListArray
+        let v_builder = Float32Builder::new();
+        let mut list_builder = FixedSizeListBuilder::new(v_builder, dim_i32);
+        let empty_vec = Arc::new(list_builder.finish()) as Arc<dyn Array>;
+        let empty_text = Arc::new(StringArray::new_null(0));
+        let empty_media_type = Arc::new(StringArray::new_null(0));
+        let empty_media_uri = Arc::new(StringArray::new_null(0));
+        let empty_meta = Arc::new(StringArray::new_null(0));
+
+        let empty_batch =
+            RecordBatch::try_new(schema.clone(), vec![empty_id, empty_vec, empty_text, empty_media_type, empty_media_uri, empty_meta])
+                .map_err(|e| DBError(format!("Build empty batch failed: {e}")))?;
+
+        let write_params = WriteParams {
+            mode: WriteMode::Create,
+            ..Default::default()
+        };
+
+        let reader = RecordBatchIterator::new([Ok(empty_batch)], schema.clone());
+
+        Dataset::write(reader, path.to_string_lossy().as_ref(), Some(write_params))
+            .await
+            .map_err(|e| DBError(format!("Create dataset failed at {}: {}", path.display(), e)))?;
+
+        Ok(())
+    }
+
+    // Store/Upsert a single vector with ID and optional metadata (append; duplicate IDs are possible for now)
+    pub async fn store_vector(
+        &self,
+        name: &str,
+        id: &str,
+        vector: Vec<f32>,
+        meta: HashMap<String, String>,
+        text: Option<String>,
+    ) -> Result<(), DBError> {
+        // Delegate to media-aware path with no media fields
+        self.store_vector_with_media(name, id, vector, meta, text, None, None).await
+    }
+
+    /// Store/Upsert a single vector with optional text and media fields (media_type/media_uri).
+    pub async fn store_vector_with_media(
+        &self,
+        name: &str,
+        id: &str,
+        vector: Vec<f32>,
+        meta: HashMap<String, String>,
+        text: Option<String>,
+        media_type: Option<String>,
+        media_uri: Option<String>,
+    ) -> Result<(), DBError> {
+        let path = self.dataset_path(name);
+
+        // Determine dimension: use existing or infer from vector
+        let dim_i32 = if let Some(d) = self.read_existing_dim(name).await? {
+            d
+        } else {
+            vector
+                .len()
+                .try_into()
+                .map_err(|_| DBError("Vector length too large".into()))?
+        };
+
+        let (schema, batch) = Self::build_one_row_batch(
+            id,
+            &vector,
+            &meta,
+            text.as_deref(),
+            media_type.as_deref(),
+            media_uri.as_deref(),
+            dim_i32,
+        )?;
+
+        // If LanceDB table exists and provides delete, we can upsert by deleting same id
+        // Try best-effort delete; ignore errors to keep operation append-only on failure
+        if path.exists() {
+            if let Ok(conn) = self.connect_db().await {
+                if let Ok(mut tbl) = conn.open_table(name).execute().await {
+                    let _ = tbl
+                        .delete(&format!("id = '{}'", id.replace('\'', "''")))
+                        .await;
+                }
+            }
+        }
+
+        let write_params = WriteParams {
+            mode: if path.exists() {
+                WriteMode::Append
+            } else {
+                WriteMode::Create
+            },
+            ..Default::default()
+        };
+        let reader = RecordBatchIterator::new([Ok(batch)], schema.clone());
+
+        Dataset::write(reader, path.to_string_lossy().as_ref(), Some(write_params))
+            .await
+            .map_err(|e| DBError(format!("Write (append/create) failed: {}", e)))?;
+
+        Ok(())
+    }
+
+    // Delete a record by ID (best-effort; returns true if delete likely removed rows)
+    pub async fn delete_by_id(&self, name: &str, id: &str) -> Result<bool, DBError> {
+        let path = self.dataset_path(name);
+        if !path.exists() {
+            return Ok(false);
+        }
+        let conn = self.connect_db().await?;
+        let mut tbl = conn
+            .open_table(name)
+            .execute()
+            .await
+            .map_err(|e| DBError(format!("Open table '{}' failed: {}", name, e)))?;
+        // SQL-like predicate quoting
+        let pred = format!("id = '{}'", id.replace('\'', "''"));
+        // lancedb returns count or () depending on version; treat Ok as success
+        match tbl.delete(&pred).await {
+            Ok(_) => Ok(true),
+            Err(e) => Err(DBError(format!("Delete failed: {}", e))),
+        }
+    }
+
+    // Drop the entire dataset
+    pub async fn drop_dataset(&self, name: &str) -> Result<bool, DBError> {
+        let path = self.dataset_path(name);
+        // Try LanceDB drop first
+        // Best-effort logical drop via lancedb if available; ignore failures.
+        // Note: we rely on filesystem removal below for final cleanup.
+        if let Ok(conn) = self.connect_db().await {
+            if let Ok(mut t) = conn.open_table(name).execute().await {
+                // Best-effort delete-all to reduce footprint prior to fs removal
+                let _ = t.delete("true").await;
+            }
+        }
+        if path.exists() {
+            if path.is_dir() {
+                std::fs::remove_dir_all(&path)
+                    .map_err(|e| DBError(format!("Failed to drop dataset '{}': {}", name, e)))?;
+            } else {
+                std::fs::remove_file(&path)
+                    .map_err(|e| DBError(format!("Failed to drop dataset '{}': {}", name, e)))?;
+            }
+            return Ok(true);
+        }
+        Ok(false)
+    }
+
+    // Search top-k nearest with optional filter; returns tuple of (id, score (lower=L2), meta)
+    pub async fn search_vectors(
+        &self,
+        name: &str,
+        query: Vec<f32>,
+        k: usize,
+        filter: Option<String>,
+        return_fields: Option<Vec<String>>,
+    ) -> Result<Vec<(String, f32, HashMap<String, String>)>, DBError> {
+        let path = self.dataset_path(name);
+        if !path.exists() {
+            return Err(DBError(format!("Dataset '{}' not found", name)));
+        }
+        // Determine dim and validate query length
+        let dim_i32 = self
+            .read_existing_dim(name)
+            .await?
+            .ok_or_else(|| DBError("Vector column not found".into()))?;
+        if query.len() as i32 != dim_i32 {
+            return Err(DBError(format!(
+                "Query vector length mismatch: expected {}, got {}",
+                dim_i32,
+                query.len()
+            )));
+        }
+
+        let ds = Dataset::open(path.to_string_lossy().as_ref())
+            .await
+            .map_err(|e| DBError(format!("Open dataset failed: {}", e)))?;
+
+        // Build scanner with projection; we project needed fields and filter client-side to support meta keys
+        let mut scan = ds.scan();
+        if let Err(e) = scan.project(&["id", "vector", "meta", "text", "media_type", "media_uri"]) {
+            return Err(DBError(format!("Project failed: {}", e)));
+        }
+        // Note: we no longer push down filter to Lance to allow filtering on meta fields client-side.
+
+        let mut stream = scan
+            .try_into_stream()
+            .await
+            .map_err(|e| DBError(format!("Scan stream failed: {}", e)))?;
+        
+        // Parse simple equality clause from filter for client-side filtering (supports one `key = 'value'`)
+        let clause = filter.as_ref().and_then(|s| {
+            fn parse_eq(s: &str) -> Option<(String, String)> {
+                let s = s.trim();
+                let pos = s.find('=').or_else(|| s.find(" = "))?;
+                let (k, vraw) = s.split_at(pos);
+                let mut v = vraw.trim_start_matches('=').trim();
+                if (v.starts_with('\'') && v.ends_with('\'')) || (v.starts_with('"') && v.ends_with('"')) {
+                    if v.len() >= 2 {
+                        v = &v[1..v.len()-1];
+                    }
+                }
+                let key = k.trim().trim_matches('"').trim_matches('\'').to_string();
+                if key.is_empty() { return None; }
+                Some((key, v.to_string()))
+            }
+            parse_eq(s)
+        });
+
+        // Maintain a max-heap with reverse ordering to keep top-k smallest distances
+        #[derive(Debug)]
+        struct Hit {
+            dist: f32,
+            id: String,
+            meta: HashMap<String, String>,
+        }
+        impl PartialEq for Hit {
+            fn eq(&self, other: &Self) -> bool {
+                self.dist.eq(&other.dist)
+            }
+        }
+        impl Eq for Hit {}
+        impl PartialOrd for Hit {
+            fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
+                // Reverse for max-heap: larger distance = "greater"
+                other.dist.partial_cmp(&self.dist)
+            }
+        }
+        impl Ord for Hit {
+            fn cmp(&self, other: &Self) -> Ordering {
+                self.partial_cmp(other).unwrap_or(Ordering::Equal)
+            }
+        }
+
+        let mut heap: BinaryHeap<Hit> = BinaryHeap::with_capacity(k);
+
+        while let Some(batch_res) = stream.next().await {
+            let batch = batch_res.map_err(|e| DBError(format!("Stream batch error: {}", e)))?;
+
+            let id_arr = batch
+                .column_by_name("id")
+                .ok_or_else(|| DBError("Column 'id' missing".into()))?
+                .as_string::<i32>();
+            let vec_arr = batch
+                .column_by_name("vector")
+                .ok_or_else(|| DBError("Column 'vector' missing".into()))?
+                .as_fixed_size_list();
+            let meta_arr = batch
+                .column_by_name("meta")
+                .map(|a| a.as_string::<i32>().clone());
+            let text_arr = batch
+                .column_by_name("text")
+                .map(|a| a.as_string::<i32>().clone());
+            let mt_arr = batch
+                .column_by_name("media_type")
+                .map(|a| a.as_string::<i32>().clone());
+            let mu_arr = batch
+                .column_by_name("media_uri")
+                .map(|a| a.as_string::<i32>().clone());
+
+            for i in 0..batch.num_rows() {
+                // Extract id
+                let id_val = id_arr.value(i).to_string();
+
+                // Parse meta JSON if present
+                let mut meta: HashMap<String, String> = HashMap::new();
+                if let Some(meta_col) = &meta_arr {
+                    if !meta_col.is_null(i) {
+                        let s = meta_col.value(i);
+                        if let Ok(JsonValue::Object(map)) = serde_json::from_str::<JsonValue>(s) {
+                            for (k, v) in map {
+                                if let Some(vs) = v.as_str() {
+                                    meta.insert(k, vs.to_string());
+                                } else if v.is_number() || v.is_boolean() {
+                                    meta.insert(k, v.to_string());
+                                }
+                            }
+                        }
+                    }
+                }
+
+                // Evaluate simple equality filter if provided (supports one clause)
+                let passes = if let Some((ref key, ref val)) = clause {
+                    let candidate = match key.as_str() {
+                        "id" => Some(id_val.clone()),
+                        "text" => text_arr.as_ref().and_then(|col| if col.is_null(i) { None } else { Some(col.value(i).to_string()) }),
+                        "media_type" => mt_arr.as_ref().and_then(|col| if col.is_null(i) { None } else { Some(col.value(i).to_string()) }),
+                        "media_uri" => mu_arr.as_ref().and_then(|col| if col.is_null(i) { None } else { Some(col.value(i).to_string()) }),
+                        _ => meta.get(key).cloned(),
+                    };
+                    match candidate {
+                        Some(cv) => cv == *val,
+                        None => false,
+                    }
+                } else { true };
+                if !passes {
+                    continue;
+                }
+
+                // Compute L2 distance
+                let val = vec_arr.value(i);
+                let prim = val.as_primitive::<Float32Type>();
+                let mut dist: f32 = 0.0;
+                let plen = prim.len();
+                for j in 0..plen {
+                    let r = prim.value(j);
+                    let d = query[j] - r;
+                    dist += d * d;
+                }
+
+                // Apply return_fields on meta
+                let mut meta_out = meta;
+                if let Some(fields) = &return_fields {
+                    let mut filtered = HashMap::new();
+                    for f in fields {
+                        if let Some(val) = meta_out.get(f) {
+                            filtered.insert(f.clone(), val.clone());
+                        }
+                    }
+                    meta_out = filtered;
+                }
+
+                let hit = Hit { dist, id: id_val, meta: meta_out };
+
+                if heap.len() < k {
+                    heap.push(hit);
+                } else if let Some(top) = heap.peek() {
+                    if hit.dist < top.dist {
+                        heap.pop();
+                        heap.push(hit);
+                    }
+                }
+            }
+        }
+
+        // Extract and sort ascending by distance
+        let mut hits: Vec<Hit> = heap.into_sorted_vec(); // already ascending by dist due to Ord
+        let out = hits
+            .drain(..)
+            .map(|h| (h.id, h.dist, h.meta))
+            .collect::<Vec<_>>();
+        Ok(out)
+    }
+
+    // Create an ANN index on the vector column (IVF_PQ or similar)
+    pub async fn create_index(
+        &self,
+        name: &str,
+        index_type: &str,
+        params: HashMap<String, String>,
+    ) -> Result<(), DBError> {
+        let path = self.dataset_path(name);
+        if !path.exists() {
+            return Err(DBError(format!("Dataset '{}' not found", name)));
+        }
+        // Attempt to create a vector index using lance low-level API if available.
+        // Some crate versions hide IndexType; to ensure build stability, we fall back to a no-op if the API is not accessible.
+        let _ = (index_type, params); // currently unused; reserved for future tuning
+        // TODO: Implement using lance::Dataset::create_index when public API is stable across versions.
+        // For now, succeed as a no-op to keep flows working; search will operate as brute-force scan.
+        Ok(())
+    }
+
+    // List datasets (tables) under this DB (show user-level logical names without .lance)
+    pub async fn list_datasets(&self) -> Result<Vec<String>, DBError> {
+        let mut out = Vec::new();
+        if self.base_dir.exists() {
+            if let Ok(rd) = std::fs::read_dir(&self.base_dir) {
+                for entry in rd.flatten() {
+                    let p = entry.path();
+                    if let Some(name) = p.file_name().and_then(|s| s.to_str()) {
+                        // Only list .lance datasets
+                        if name.ends_with(".lance") {
+                            out.push(name.trim_end_matches(".lance").to_string());
+                        }
+                    }
+                }
+            }
+        }
+        Ok(out)
+    }
+
+    // Return basic dataset info map
+    pub async fn get_dataset_info(&self, name: &str) -> Result<HashMap<String, String>, DBError> {
+        let path = self.dataset_path(name);
+        let mut m = HashMap::new();
+        m.insert("name".to_string(), name.to_string());
+        m.insert("path".to_string(), path.display().to_string());
+        if !path.exists() {
+            return Err(DBError(format!("Dataset '{}' not found", name)));
+        }
+
+        let ds = Dataset::open(path.to_string_lossy().as_ref())
+            .await
+            .map_err(|e| DBError(format!("Open dataset failed: {}", e)))?;
+
+        // dim: infer by scanning first batch
+        let mut dim_str = "unknown".to_string();
+        {
+            let mut scan = ds.scan();
+            if scan.project(&["vector"]).is_ok() {
+                if let Ok(mut stream) = scan.try_into_stream().await {
+                    if let Some(batch_res) = stream.next().await {
+                        if let Ok(batch) = batch_res {
+                            if let Some(col) = batch.column_by_name("vector") {
+                                let fsl = col.as_fixed_size_list();
+                                dim_str = fsl.value_length().to_string();
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        m.insert("dimension".to_string(), dim_str);
+
+        // row_count (approximate by scanning)
+        let mut scan = ds.scan();
+        if let Err(e) = scan.project(&["id"]) {
+            return Err(DBError(format!("Project failed: {e}")));
+        }
+        let mut stream = scan
+            .try_into_stream()
+            .await
+            .map_err(|e| DBError(format!("Scan failed: {e}")))?;
+        let mut rows: usize = 0;
+        while let Some(batch_res) = stream.next().await {
+            let batch = batch_res.map_err(|e| DBError(format!("Scan batch error: {}", e)))?;
+            rows += batch.num_rows();
+        }
+        m.insert("row_count".to_string(), rows.to_string());
+
+        // indexes: we can’t easily enumerate; set to "unknown" (future: read index metadata)
+        m.insert("indexes".to_string(), "unknown".to_string());
+
+        Ok(m)
+    }
+}

src/lib.rs

@@ -1,12 +1,18 @@
-pub mod age; // NEW
+pub mod age;
+pub mod sym;
 pub mod cmd;
 pub mod crypto;
 pub mod error;
 pub mod options;
 pub mod protocol;
-pub mod search_cmd; // Add this
+pub mod rpc;
+pub mod rpc_server;
 pub mod server;
 pub mod storage;
-pub mod storage_sled; // Add this
+pub mod storage_trait;
-pub mod storage_trait; // Add this
+pub mod storage_sled;
+pub mod admin_meta;
 pub mod tantivy_search;
+pub mod search_cmd;
+pub mod lance_store;
+pub mod embedding;

src/main.rs

@@ -1,8 +1,10 @@
 // #![allow(unused_imports)]
 
+use std::path::PathBuf;
 use tokio::net::TcpListener;
 
 use herodb::server;
+use herodb::rpc_server;
 
 use clap::Parser;
 
@@ -12,7 +14,7 @@ use clap::Parser;
 struct Args {
     /// The directory of Redis DB file
     #[arg(long)]
-    dir: String,
+    dir: PathBuf,
 
     /// The port of the Redis server, default is 6379 if not specified
     #[arg(long)]
@@ -22,17 +24,37 @@ struct Args {
     #[arg(long)]
     debug: bool,
 
-    /// Master encryption key for encrypted databases
+    /// Master encryption key for encrypted databases (deprecated; ignored for data DBs)
     #[arg(long)]
     encryption_key: Option<String>,
 
-    /// Encrypt the database
+    /// Encrypt the database (deprecated; ignored for data DBs)
     #[arg(long)]
     encrypt: bool,
 
+    /// Enable RPC management server
+    #[arg(long)]
+    enable_rpc: bool,
+
+    /// RPC server port (default: 8080)
+    #[arg(long, default_value = "8080")]
+    rpc_port: u16,
+
+    /// Enable RPC over Unix Domain Socket (IPC)
+    #[arg(long)]
+    enable_rpc_ipc: bool,
+
+    /// RPC IPC socket path (Unix Domain Socket)
+    #[arg(long, default_value = "/tmp/herodb.ipc")]
+    rpc_ipc_path: String,
+
     /// Use the sled backend
     #[arg(long)]
     sled: bool,
+
+    /// Admin secret used to encrypt DB 0 and authorize admin access (required)
+    #[arg(long)]
+    admin_secret: String,
 }
 
 #[tokio::main]
@@ -43,13 +65,23 @@ async fn main() {
     // bind port
     let port = args.port.unwrap_or(6379);
     println!("will listen on port: {}", port);
-    let listener = TcpListener::bind(format!("127.0.0.1:{}", port))
+    let listener = TcpListener::bind(format!("0.0.0.0:{}", port))
         .await
         .unwrap();
 
+    // deprecation warnings for legacy flags
+    if args.encrypt || args.encryption_key.is_some() {
+        eprintln!("warning: --encrypt and --encryption-key are deprecated and ignored for data DBs. Admin DB 0 is always encrypted with --admin-secret.");
+    }
+    // basic validation for admin secret
+    if args.admin_secret.trim().is_empty() {
+        eprintln!("error: --admin-secret must not be empty");
+        std::process::exit(2);
+    }
+
     // new DB option
     let option = herodb::options::DBOption {
-        dir: args.dir,
+        dir: args.dir.clone(),
         port,
         debug: args.debug,
         encryption_key: args.encryption_key,
@@ -59,14 +91,66 @@ async fn main() {
         } else {
             herodb::options::BackendType::Redb
         },
+        admin_secret: args.admin_secret.clone(),
     };
 
+    let backend = option.backend.clone();
+
+    // Bootstrap admin DB 0 before opening any server storage
+    if let Err(e) = herodb::admin_meta::ensure_bootstrap(&args.dir, backend.clone(), &args.admin_secret) {
+        eprintln!("Failed to bootstrap admin DB 0: {}", e.0);
+        std::process::exit(2);
+    }
+
     // new server
     let server = server::Server::new(option).await;
 
     // Add a small delay to ensure the port is ready
     tokio::time::sleep(std::time::Duration::from_millis(100)).await;
 
+    // Start RPC server if enabled
+    let _rpc_handle = if args.enable_rpc {
+        let rpc_addr = format!("0.0.0.0:{}", args.rpc_port).parse().unwrap();
+        let base_dir = args.dir.clone();
+
+        match rpc_server::start_rpc_server(rpc_addr, base_dir, backend.clone(), args.admin_secret.clone()).await {
+            Ok(handle) => {
+                println!("RPC management server started on port {}", args.rpc_port);
+                Some(handle)
+            }
+            Err(e) => {
+                eprintln!("Failed to start RPC server: {}", e);
+                None
+            }
+        }
+    } else {
+        None
+    };
+
+    // Start IPC (Unix socket) RPC server if enabled
+    let _rpc_ipc_handle = if args.enable_rpc_ipc {
+        let base_dir = args.dir.clone();
+        let ipc_path = args.rpc_ipc_path.clone();
+
+        // Remove stale socket if present
+        if std::path::Path::new(&ipc_path).exists() {
+            let _ = std::fs::remove_file(&ipc_path);
+        }
+
+        match rpc_server::start_rpc_ipc_server(ipc_path.clone(), base_dir, backend.clone(), args.admin_secret.clone()).await {
+            Ok(handle) => {
+                println!("RPC IPC server started at {}", ipc_path);
+                Some(handle)
+            }
+            Err(e) => {
+                eprintln!("Failed to start RPC IPC server: {}", e);
+                None
+            }
+        }
+    } else {
+        None
+    };
+
     // accept new connections
     loop {
         let stream = listener.accept().await;

src/options.rs

@@ -1,15 +1,23 @@
-#[derive(Debug, Clone)]
+use std::path::PathBuf;
+
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub enum BackendType {
     Redb,
     Sled,
+    Tantivy, // Full-text search backend (no KV storage)
+    Lance,   // Vector database backend (no KV storage)
 }
 
 #[derive(Debug, Clone)]
 pub struct DBOption {
-    pub dir: String,
+    pub dir: PathBuf,
     pub port: u16,
     pub debug: bool,
+    // Deprecated for data DBs; retained for backward-compat on CLI parsing
     pub encrypt: bool,
+    // Deprecated for data DBs; retained for backward-compat on CLI parsing
     pub encryption_key: Option<String>,
     pub backend: BackendType,
+    // New: required admin secret, used to encrypt DB 0 and authorize admin operations
+    pub admin_secret: String,
 }

src/protocol.rs

@@ -81,21 +81,18 @@ impl Protocol {
     pub fn encode(&self) -> String {
         match self {
             Protocol::SimpleString(s) => format!("+{}\r\n", s),
-            Protocol::BulkString(s) => format!("${}\r\n{}\r\n", s.len(), s),
+            Protocol::BulkString(s)   => format!("${}\r\n{}\r\n", s.len(), s),
-            Protocol::Array(ss) => {
+            Protocol::Array(ss)       => {
                 format!("*{}\r\n", ss.len()) + &ss.iter().map(|x| x.encode()).collect::<String>()
             }
-            Protocol::Null => "$-1\r\n".to_string(),
+            Protocol::Null            => "$-1\r\n".to_string(),
-            Protocol::Error(s) => format!("-{}\r\n", s), // proper RESP error
+            Protocol::Error(s)        => format!("-{}\r\n", s), // proper RESP error
         }
     }
 
     fn parse_simple_string_sfx(protocol: &str) -> Result<(Self, &str), DBError> {
         match protocol.find("\r\n") {
-            Some(x) => Ok((
+            Some(x) => Ok((Self::SimpleString(protocol[..x].to_string()), &protocol[x + 2..])),
-                Self::SimpleString(protocol[..x].to_string()),
-                &protocol[x + 2..],
-            )),
             _ => Err(DBError(format!(
                 "[new simple string] unsupported protocol: {:?}",
                 protocol

src/rpc_server.rs

@@ -0,0 +1,52 @@
+use std::net::SocketAddr;
+use std::path::PathBuf;
+use jsonrpsee::server::{ServerBuilder, ServerHandle};
+use jsonrpsee::RpcModule;
+use reth_ipc::server::Builder as IpcServerBuilder;
+
+use crate::rpc::{RpcServer, RpcServerImpl};
+
+/// Start the RPC server on the specified address
+pub async fn start_rpc_server(addr: SocketAddr, base_dir: PathBuf, backend: crate::options::BackendType, admin_secret: String) -> Result<ServerHandle, Box<dyn std::error::Error + Send + Sync>> {
+    // Create the RPC server implementation
+    let rpc_impl = RpcServerImpl::new(base_dir, backend, admin_secret);
+
+    // Create the RPC module
+    let mut module = RpcModule::new(());
+    module.merge(RpcServer::into_rpc(rpc_impl))?;
+
+    // Build the server with both HTTP and WebSocket support
+    let server = ServerBuilder::default()
+        .build(addr)
+        .await?;
+
+    // Start the server
+    let handle = server.start(module);
+
+    println!("RPC server started on {}", addr);
+
+    Ok(handle)
+}
+
+/// Start the JSON-RPC IPC server on the specified Unix socket endpoint
+pub async fn start_rpc_ipc_server(
+    endpoint: String,
+    base_dir: PathBuf,
+    backend: crate::options::BackendType,
+    admin_secret: String,
+) -> Result<ServerHandle, Box<dyn std::error::Error + Send + Sync>> {
+    // Create the RPC server implementation
+    let rpc_impl = RpcServerImpl::new(base_dir, backend, admin_secret);
+
+    // Create the RPC module
+    let mut module = RpcModule::new(());
+    module.merge(RpcServer::into_rpc(rpc_impl))?;
+
+    // Build the IPC server and start it
+    let server = IpcServerBuilder::default().build(endpoint.clone());
+    let handle = server.start(module).await?;
+
+    println!("RPC IPC server started on {}", endpoint);
+
+    Ok(handle)
+}

src/search_cmd.rs

@@ -14,32 +14,57 @@ pub async fn ft_create_cmd(
     index_name: String,
     schema: Vec<(String, String, Vec<String>)>,
 ) -> Result<Protocol, DBError> {
+    if server.selected_db == 0 {
+        return Ok(Protocol::err("FT commands are not allowed on DB 0"));
+    }
+    // Enforce Tantivy backend for selected DB
+    let is_tantivy = crate::admin_meta::get_database_backend(
+        &server.option.dir,
+        server.option.backend.clone(),
+        &server.option.admin_secret,
+        server.selected_db,
+    )
+    .ok()
+    .flatten()
+    .map(|b| matches!(b, crate::options::BackendType::Tantivy))
+    .unwrap_or(false);
+    if !is_tantivy {
+        return Ok(Protocol::err("ERR DB backend is not Tantivy; FT.* commands are not allowed"));
+    }
+
+    if !server.has_write_permission() {
+        return Ok(Protocol::err("ERR write permission denied"));
+    }
+
     // Parse schema into field definitions
     let mut field_definitions = Vec::new();
-
     for (field_name, field_type, options) in schema {
         let field_def = match field_type.to_uppercase().as_str() {
             "TEXT" => {
-                let mut weight = 1.0;
                 let mut sortable = false;
                 let mut no_index = false;
-
+                // Weight is not used in current implementation
-                for opt in &options {
+                let mut _weight = 1.0f32;
-                    match opt.to_uppercase().as_str() {
+                let mut i = 0;
+                while i < options.len() {
+                    match options[i].to_uppercase().as_str() {
                         "WEIGHT" => {
-                            // Next option should be the weight value
+                            if i + 1 < options.len() {
-                            if let Some(idx) = options.iter().position(|x| x == opt) {
+                                _weight = options[i + 1].parse::<f32>().unwrap_or(1.0);
-                                if idx + 1 < options.len() {
+                                i += 2;
-                                    weight = options[idx + 1].parse().unwrap_or(1.0);
+                                continue;
-                                }
                             }
                         }
-                        "SORTABLE" => sortable = true,
+                        "SORTABLE" => {
-                        "NOINDEX" => no_index = true,
+                            sortable = true;
+                        }
+                        "NOINDEX" => {
+                            no_index = true;
+                        }
                         _ => {}
                     }
+                    i += 1;
                 }
-
                 FieldDef::Text {
                     stored: true,
                     indexed: !no_index,
@@ -48,14 +73,13 @@ pub async fn ft_create_cmd(
                 }
             }
             "NUMERIC" => {
+                // default to F64
                 let mut sortable = false;
-
                 for opt in &options {
                     if opt.to_uppercase() == "SORTABLE" {
                         sortable = true;
                     }
                 }
-
                 FieldDef::Numeric {
                     stored: true,
                     indexed: true,
@@ -66,19 +90,23 @@ pub async fn ft_create_cmd(
             "TAG" => {
                 let mut separator = ",".to_string();
                 let mut case_sensitive = false;
-
+                let mut i = 0;
-                for i in 0..options.len() {
+                while i < options.len() {
                     match options[i].to_uppercase().as_str() {
                         "SEPARATOR" => {
                             if i + 1 < options.len() {
                                 separator = options[i + 1].clone();
+                                i += 2;
+                                continue;
                             }
                         }
-                        "CASESENSITIVE" => case_sensitive = true,
+                        "CASESENSITIVE" => {
+                            case_sensitive = true;
+                        }
                         _ => {}
                     }
+                    i += 1;
                 }
-
                 FieldDef::Tag {
                     stored: true,
                     separator,
@@ -90,20 +118,12 @@ pub async fn ft_create_cmd(
                 return Err(DBError(format!("Unknown field type: {}", field_type)));
             }
         };
-
         field_definitions.push((field_name, field_def));
     }
 
     // Create the search index
     let search_path = server.search_index_path();
     let config = IndexConfig::default();
-
-    println!(
-        "Creating search index '{}' at path: {:?}",
-        index_name, search_path
-    );
-    println!("Field definitions: {:?}", field_definitions);
-
     let search_index = TantivySearch::new_with_schema(
         search_path,
         index_name.clone(),
@@ -111,8 +131,6 @@ pub async fn ft_create_cmd(
         Some(config),
     )?;
 
-    println!("Search index '{}' created successfully", index_name);
-
     // Store in registry
     let mut indexes = server.search_indexes.write().unwrap();
     indexes.insert(index_name, Arc::new(search_index));
@@ -127,14 +145,31 @@ pub async fn ft_add_cmd(
     _score: f64,
     fields: HashMap<String, String>,
 ) -> Result<Protocol, DBError> {
+    if server.selected_db == 0 {
+        return Ok(Protocol::err("FT commands are not allowed on DB 0"));
+    }
+    // Enforce Tantivy backend for selected DB
+    let is_tantivy = crate::admin_meta::get_database_backend(
+        &server.option.dir,
+        server.option.backend.clone(),
+        &server.option.admin_secret,
+        server.selected_db,
+    )
+    .ok()
+    .flatten()
+    .map(|b| matches!(b, crate::options::BackendType::Tantivy))
+    .unwrap_or(false);
+    if !is_tantivy {
+        return Ok(Protocol::err("ERR DB backend is not Tantivy; FT.* commands are not allowed"));
+    }
+    if !server.has_write_permission() {
+        return Ok(Protocol::err("ERR write permission denied"));
+    }
     let indexes = server.search_indexes.read().unwrap();
-
     let search_index = indexes
         .get(&index_name)
         .ok_or_else(|| DBError(format!("Index '{}' not found", index_name)))?;
-
     search_index.add_document_with_fields(&doc_id, fields)?;
-
     Ok(Protocol::SimpleString("OK".to_string()))
 }
 
@@ -147,13 +182,31 @@ pub async fn ft_search_cmd(
     offset: Option<usize>,
     return_fields: Option<Vec<String>>,
 ) -> Result<Protocol, DBError> {
+    if server.selected_db == 0 {
+        return Ok(Protocol::err("FT commands are not allowed on DB 0"));
+    }
+    // Enforce Tantivy backend for selected DB
+    let is_tantivy = crate::admin_meta::get_database_backend(
+        &server.option.dir,
+        server.option.backend.clone(),
+        &server.option.admin_secret,
+        server.selected_db,
+    )
+    .ok()
+    .flatten()
+    .map(|b| matches!(b, crate::options::BackendType::Tantivy))
+    .unwrap_or(false);
+    if !is_tantivy {
+        return Ok(Protocol::err("ERR DB backend is not Tantivy; FT.* commands are not allowed"));
+    }
+    if !server.has_read_permission() {
+        return Ok(Protocol::err("ERR read permission denied"));
+    }
     let indexes = server.search_indexes.read().unwrap();
-
     let search_index = indexes
         .get(&index_name)
         .ok_or_else(|| DBError(format!("Index '{}' not found", index_name)))?;
 
-    // Convert filters to search filters
     let search_filters = filters
         .into_iter()
         .map(|(field, value)| Filter {
@@ -172,36 +225,29 @@ pub async fn ft_search_cmd(
     };
 
     let results = search_index.search_with_options(&query, options)?;
-
+ 
-    // Format results as Redis protocol
+    // Format results as a flattened Redis protocol array to match client expectations:
+    // [ total, doc_id, score, field, value, field, value, ... , doc_id, score, ... ]
     let mut response = Vec::new();
-
     // First element is the total count
-    response.push(Protocol::SimpleString(results.total.to_string()));
+    response.push(Protocol::BulkString(results.total.to_string()));
-
+    // Then each document flattened
-    // Then each document
+    for mut doc in results.documents {
-    for doc in results.documents {
-        let mut doc_array = Vec::new();
-
         // Add document ID if it exists
         if let Some(id) = doc.fields.get("_id") {
-            doc_array.push(Protocol::BulkString(id.clone()));
+            response.push(Protocol::BulkString(id.clone()));
         }
-
         // Add score
-        doc_array.push(Protocol::BulkString(doc.score.to_string()));
+        response.push(Protocol::BulkString(doc.score.to_string()));
-
         // Add fields as key-value pairs
-        for (field_name, field_value) in doc.fields {
+        for (field_name, field_value) in std::mem::take(&mut doc.fields) {
             if field_name != "_id" {
-                doc_array.push(Protocol::BulkString(field_name));
+                response.push(Protocol::BulkString(field_name));
-                doc_array.push(Protocol::BulkString(field_value));
+                response.push(Protocol::BulkString(field_value));
             }
         }
-
-        response.push(Protocol::Array(doc_array));
     }
-
+ 
     Ok(Protocol::Array(response))
 }
 
@@ -210,40 +256,69 @@ pub async fn ft_del_cmd(
     index_name: String,
     doc_id: String,
 ) -> Result<Protocol, DBError> {
+    if server.selected_db == 0 {
+        return Ok(Protocol::err("FT commands are not allowed on DB 0"));
+    }
+    // Enforce Tantivy backend for selected DB
+    let is_tantivy = crate::admin_meta::get_database_backend(
+        &server.option.dir,
+        server.option.backend.clone(),
+        &server.option.admin_secret,
+        server.selected_db,
+    )
+    .ok()
+    .flatten()
+    .map(|b| matches!(b, crate::options::BackendType::Tantivy))
+    .unwrap_or(false);
+    if !is_tantivy {
+        return Ok(Protocol::err("ERR DB backend is not Tantivy; FT.* commands are not allowed"));
+    }
+    if !server.has_write_permission() {
+        return Ok(Protocol::err("ERR write permission denied"));
+    }
     let indexes = server.search_indexes.read().unwrap();
-
-    let _search_index = indexes
-        .get(&index_name)
-        .ok_or_else(|| DBError(format!("Index '{}' not found", index_name)))?;
-
-    // For now, return success
-    // In a full implementation, we'd need to add a delete method to TantivySearch
-    println!("Deleting document '{}' from index '{}'", doc_id, index_name);
-
-    Ok(Protocol::SimpleString("1".to_string()))
-}
-
-pub async fn ft_info_cmd(server: &Server, index_name: String) -> Result<Protocol, DBError> {
-    let indexes = server.search_indexes.read().unwrap();
-
     let search_index = indexes
         .get(&index_name)
         .ok_or_else(|| DBError(format!("Index '{}' not found", index_name)))?;
+    let existed = search_index.delete_document_by_id(&doc_id)?;
+    Ok(Protocol::SimpleString(if existed { "1".to_string() } else { "0".to_string() }))
+}
 
+pub async fn ft_info_cmd(server: &Server, index_name: String) -> Result<Protocol, DBError> {
+    if server.selected_db == 0 {
+        return Ok(Protocol::err("FT commands are not allowed on DB 0"));
+    }
+    // Enforce Tantivy backend for selected DB
+    let is_tantivy = crate::admin_meta::get_database_backend(
+        &server.option.dir,
+        server.option.backend.clone(),
+        &server.option.admin_secret,
+        server.selected_db,
+    )
+    .ok()
+    .flatten()
+    .map(|b| matches!(b, crate::options::BackendType::Tantivy))
+    .unwrap_or(false);
+    if !is_tantivy {
+        return Ok(Protocol::err("ERR DB backend is not Tantivy; FT.* commands are not allowed"));
+    }
+    if !server.has_read_permission() {
+        return Ok(Protocol::err("ERR read permission denied"));
+    }
+    let indexes = server.search_indexes.read().unwrap();
+    let search_index = indexes
+        .get(&index_name)
+        .ok_or_else(|| DBError(format!("Index '{}' not found", index_name)))?;
     let info = search_index.get_info()?;
 
     // Format info as Redis protocol
     let mut response = Vec::new();
-
     response.push(Protocol::BulkString("index_name".to_string()));
     response.push(Protocol::BulkString(info.name));
-
     response.push(Protocol::BulkString("num_docs".to_string()));
     response.push(Protocol::BulkString(info.num_docs.to_string()));
-
     response.push(Protocol::BulkString("num_fields".to_string()));
     response.push(Protocol::BulkString(info.fields.len().to_string()));
-
     response.push(Protocol::BulkString("fields".to_string()));
     let fields_str = info
         .fields
@@ -252,22 +327,52 @@ pub async fn ft_info_cmd(server: &Server, index_name: String) -> Result<Protocol
         .collect::<Vec<_>>()
         .join(", ");
     response.push(Protocol::BulkString(fields_str));
-
     Ok(Protocol::Array(response))
 }
 
 pub async fn ft_drop_cmd(server: &Server, index_name: String) -> Result<Protocol, DBError> {
-    let mut indexes = server.search_indexes.write().unwrap();
+    if server.selected_db == 0 {
-
+        return Ok(Protocol::err("FT commands are not allowed on DB 0"));
-    if indexes.remove(&index_name).is_some() {
-        // Also remove the index files from disk
-        let index_path = server.search_index_path().join(&index_name);
-        if index_path.exists() {
-            std::fs::remove_dir_all(index_path)
-                .map_err(|e| DBError(format!("Failed to remove index files: {}", e)))?;
-        }
-        Ok(Protocol::SimpleString("OK".to_string()))
-    } else {
-        Err(DBError(format!("Index '{}' not found", index_name)))
     }
-}
+    // Enforce Tantivy backend for selected DB
+    let is_tantivy = crate::admin_meta::get_database_backend(
+        &server.option.dir,
+        server.option.backend.clone(),
+        &server.option.admin_secret,
+        server.selected_db,
+    )
+    .ok()
+    .flatten()
+    .map(|b| matches!(b, crate::options::BackendType::Tantivy))
+    .unwrap_or(false);
+    if !is_tantivy {
+        return Ok(Protocol::err("ERR DB backend is not Tantivy; FT.* commands are not allowed"));
+    }
+
+    if !server.has_write_permission() {
+        return Ok(Protocol::err("ERR write permission denied"));
+    }
+
+    // Remove from registry and files; report error if nothing to drop
+    let mut existed = false;
+    {
+        let mut indexes = server.search_indexes.write().unwrap();
+        if indexes.remove(&index_name).is_some() {
+            existed = true;
+        }
+    }
+
+    // Remove the index files from disk
+    let index_path = server.search_index_path().join(&index_name);
+    if index_path.exists() {
+        std::fs::remove_dir_all(&index_path)
+            .map_err(|e| DBError(format!("Failed to remove index files: {}", e)))?;
+        existed = true;
+    }
+
+    if !existed {
+        return Ok(Protocol::err(&format!("ERR Index '{}' not found", index_name)));
+    }
+
+    Ok(Protocol::SimpleString("OK".to_string()))
+}

src/server.rs

@@ -1,10 +1,9 @@
 use core::str;
 use std::collections::HashMap;
 use std::sync::Arc;
-use std::sync::RwLock;
 use tokio::io::AsyncReadExt;
 use tokio::io::AsyncWriteExt;
-use tokio::sync::{oneshot, Mutex};
+use tokio::sync::{Mutex, oneshot};
 
 use std::sync::atomic::{AtomicU64, Ordering};
 
@@ -12,20 +11,39 @@ use crate::cmd::Cmd;
 use crate::error::DBError;
 use crate::options;
 use crate::protocol::Protocol;
-use crate::storage::Storage;
-use crate::storage_sled::SledStorage;
 use crate::storage_trait::StorageBackend;
-use crate::tantivy_search::TantivySearch;
+use crate::admin_meta;
+
+// Embeddings: config and cache
+use crate::embedding::{EmbeddingConfig, create_embedder, Embedder, create_image_embedder, ImageEmbedder};
+use serde_json;
+use ureq::{Agent, AgentBuilder};
+use std::time::Duration;
+use std::io::Read;
+
+const NO_DB_SELECTED: u64 = u64::MAX;
 
 #[derive(Clone)]
 pub struct Server {
-    pub db_cache: Arc<RwLock<HashMap<u64, Arc<dyn StorageBackend>>>>,
+    pub db_cache: std::sync::Arc<std::sync::RwLock<HashMap<u64, Arc<dyn StorageBackend>>>>,
-    pub search_indexes: Arc<RwLock<HashMap<String, Arc<TantivySearch>>>>,
     pub option: options::DBOption,
     pub client_name: Option<String>,
     pub selected_db: u64, // Changed from usize to u64
     pub queued_cmd: Option<Vec<(Cmd, Protocol)>>,
+    pub current_permissions: Option<crate::rpc::Permissions>,
 
+    // In-memory registry of Tantivy search indexes for this server
+    pub search_indexes: Arc<std::sync::RwLock<HashMap<String, Arc<crate::tantivy_search::TantivySearch>>>>,
+
+    // Per-DB Lance stores (vector DB), keyed by db_id
+    pub lance_stores: Arc<std::sync::RwLock<HashMap<u64, Arc<crate::lance_store::LanceStore>>>>,
+
+    // Per-(db_id, dataset) embedder cache (text)
+    pub embedders: Arc<std::sync::RwLock<HashMap<(u64, String), Arc<dyn Embedder>>>>,
+
+    // Per-(db_id, dataset) image embedder cache (image)
+    pub image_embedders: Arc<std::sync::RwLock<HashMap<(u64, String), Arc<dyn ImageEmbedder>>>>,
+    
     // BLPOP waiter registry: per (db_index, key) FIFO of waiters
     pub list_waiters: Arc<Mutex<HashMap<u64, HashMap<String, Vec<Waiter>>>>>,
     pub waiter_seq: Arc<AtomicU64>,
@@ -46,77 +64,330 @@ pub enum PopSide {
 impl Server {
     pub async fn new(option: options::DBOption) -> Self {
         Server {
-            db_cache: Arc::new(RwLock::new(HashMap::new())),
+            db_cache: Arc::new(std::sync::RwLock::new(HashMap::new())),
-            search_indexes: Arc::new(RwLock::new(HashMap::new())),
             option,
             client_name: None,
-            selected_db: 0,
+            selected_db: NO_DB_SELECTED,
             queued_cmd: None,
-
+            current_permissions: None,
+    
+            search_indexes: Arc::new(std::sync::RwLock::new(HashMap::new())),
+            lance_stores: Arc::new(std::sync::RwLock::new(HashMap::new())),
+            embedders: Arc::new(std::sync::RwLock::new(HashMap::new())),
+            image_embedders: Arc::new(std::sync::RwLock::new(HashMap::new())),
             list_waiters: Arc::new(Mutex::new(HashMap::new())),
             waiter_seq: Arc::new(AtomicU64::new(1)),
         }
     }
 
+    // Path where search indexes are stored, namespaced per selected DB:
+    // <base_dir>/search_indexes/<db_id>
+    pub fn search_index_path(&self) -> std::path::PathBuf {
+        let base = std::path::PathBuf::from(&self.option.dir)
+            .join("search_indexes")
+            .join(self.selected_db.to_string());
+        if !base.exists() {
+            let _ = std::fs::create_dir_all(&base);
+        }
+        base
+    }
+
+    // Path where Lance datasets are stored, namespaced per selected DB:
+    // <base_dir>/lance/<db_id>
+    pub fn lance_data_path(&self) -> std::path::PathBuf {
+        let base = std::path::PathBuf::from(&self.option.dir)
+            .join("lance")
+            .join(self.selected_db.to_string());
+        if !base.exists() {
+            let _ = std::fs::create_dir_all(&base);
+        }
+        base
+    }
+
     pub fn current_storage(&self) -> Result<Arc<dyn StorageBackend>, DBError> {
+        // Require explicit SELECT before any storage access
+        if self.selected_db == NO_DB_SELECTED {
+            return Err(DBError("No database selected. Use SELECT <id> [KEY <key>] first".to_string()));
+        }
+        // Admin DB 0 access must be authenticated with SELECT 0 KEY <admin_secret>
+        if self.selected_db == 0 {
+            if !matches!(self.current_permissions, Some(crate::rpc::Permissions::ReadWrite)) {
+                return Err(DBError("Admin DB 0 requires SELECT 0 KEY <admin_secret>".to_string()));
+            }
+        }
+
         let mut cache = self.db_cache.write().unwrap();
 
         if let Some(storage) = cache.get(&self.selected_db) {
             return Ok(storage.clone());
         }
 
-        // Create new database file
+        // Use process-wide shared handles to avoid sled/reDB double-open lock contention.
-        let db_file_path = std::path::PathBuf::from(self.option.dir.clone())
+        let storage = if self.selected_db == 0 {
-            .join(format!("{}.db", self.selected_db));
+            // Admin DB 0: always via singleton
-
+            admin_meta::open_admin_storage(
-        // Ensure the directory exists before creating the database file
+                &self.option.dir,
-        if let Some(parent_dir) = db_file_path.parent() {
+                self.option.backend.clone(),
-            std::fs::create_dir_all(parent_dir).map_err(|e| {
+                &self.option.admin_secret,
-                DBError(format!(
+            )?
-                    "Failed to create directory {}: {}",
+        } else {
-                    parent_dir.display(),
+            // Data DBs: via global registry keyed by id
-                    e
+            admin_meta::open_data_storage(
-                ))
+                &self.option.dir,
-            })?;
+                self.option.backend.clone(),
-        }
+                &self.option.admin_secret,
-
+                self.selected_db,
-        println!("Creating new db file: {}", db_file_path.display());
+            )?
-
-        let storage: Arc<dyn StorageBackend> = match self.option.backend {
-            options::BackendType::Redb => Arc::new(Storage::new(
-                db_file_path,
-                self.should_encrypt_db(self.selected_db),
-                self.option.encryption_key.as_deref(),
-            )?),
-            options::BackendType::Sled => Arc::new(SledStorage::new(
-                db_file_path,
-                self.should_encrypt_db(self.selected_db),
-                self.option.encryption_key.as_deref(),
-            )?),
         };
 
         cache.insert(self.selected_db, storage.clone());
         Ok(storage)
     }
 
-    fn should_encrypt_db(&self, db_index: u64) -> bool {
+    /// Get or create the LanceStore for the currently selected DB.
-        // DB 0-9 are non-encrypted, DB 10+ are encrypted
+    /// Only valid for non-zero DBs and when the backend is Lance.
-        self.option.encrypt && db_index >= 10
+    pub fn lance_store(&self) -> Result<Arc<crate::lance_store::LanceStore>, DBError> {
+        if self.selected_db == 0 {
+            return Err(DBError("Lance not available on admin DB 0".to_string()));
+        }
+        // Resolve backend for selected_db
+        let backend_opt = crate::admin_meta::get_database_backend(
+            &self.option.dir,
+            self.option.backend.clone(),
+            &self.option.admin_secret,
+            self.selected_db,
+        )
+        .ok()
+        .flatten();
+
+        if !matches!(backend_opt, Some(crate::options::BackendType::Lance)) {
+            return Err(DBError("ERR DB backend is not Lance; LANCE.* commands are not allowed".to_string()));
+        }
+
+        // Fast path: read lock
+        {
+            let map = self.lance_stores.read().unwrap();
+            if let Some(store) = map.get(&self.selected_db) {
+                return Ok(store.clone());
+            }
+        }
+
+        // Slow path: create and insert
+        let store = Arc::new(crate::lance_store::LanceStore::new(&self.option.dir, self.selected_db)?);
+        {
+            let mut map = self.lance_stores.write().unwrap();
+            map.insert(self.selected_db, store.clone());
+        }
+        Ok(store)
     }
 
-    // Add method to get search index path
+    // ----- Embedding configuration and resolution -----
-    pub fn search_index_path(&self) -> std::path::PathBuf {
+
-        std::path::PathBuf::from(&self.option.dir).join("search_indexes")
+    // Sidecar embedding config path: <base_dir>/lance/<db_id>/<dataset>.lance.embedding.json
+    fn dataset_embedding_config_path(&self, dataset: &str) -> std::path::PathBuf {
+        let mut base = self.lance_data_path();
+        // Ensure parent dir exists
+        if !base.exists() {
+            let _ = std::fs::create_dir_all(&base);
+        }
+        base.push(format!("{}.lance.embedding.json", dataset));
+        base
+    }
+
+    /// Persist per-dataset embedding config as JSON sidecar.
+    pub fn set_dataset_embedding_config(&self, dataset: &str, cfg: &EmbeddingConfig) -> Result<(), DBError> {
+        if self.selected_db == 0 {
+            return Err(DBError("Lance not available on admin DB 0".to_string()));
+        }
+        let p = self.dataset_embedding_config_path(dataset);
+        let data = serde_json::to_vec_pretty(cfg)
+            .map_err(|e| DBError(format!("Failed to serialize embedding config: {}", e)))?;
+        std::fs::write(&p, data)
+            .map_err(|e| DBError(format!("Failed to write embedding config {}: {}", p.display(), e)))?;
+        // Invalidate embedder cache entry for this dataset
+        {
+            let mut map = self.embedders.write().unwrap();
+            map.remove(&(self.selected_db, dataset.to_string()));
+        }
+        {
+            let mut map_img = self.image_embedders.write().unwrap();
+            map_img.remove(&(self.selected_db, dataset.to_string()));
+        }
+        Ok(())
+    }
+
+    /// Load per-dataset embedding config.
+    pub fn get_dataset_embedding_config(&self, dataset: &str) -> Result<EmbeddingConfig, DBError> {
+        if self.selected_db == 0 {
+            return Err(DBError("Lance not available on admin DB 0".to_string()));
+        }
+        let p = self.dataset_embedding_config_path(dataset);
+        if !p.exists() {
+            return Err(DBError(format!(
+                "Embedding config not set for dataset '{}'. Use LANCE.EMBEDDING CONFIG SET ... or RPC to configure.",
+                dataset
+            )));
+        }
+        let data = std::fs::read(&p)
+            .map_err(|e| DBError(format!("Failed to read embedding config {}: {}", p.display(), e)))?;
+        let cfg: EmbeddingConfig = serde_json::from_slice(&data)
+            .map_err(|e| DBError(format!("Failed to parse embedding config {}: {}", p.display(), e)))?;
+        Ok(cfg)
+    }
+
+    /// Resolve or build an embedder for (db_id, dataset). Caches instance.
+    pub fn get_embedder_for(&self, dataset: &str) -> Result<Arc<dyn Embedder>, DBError> {
+        if self.selected_db == 0 {
+            return Err(DBError("Lance not available on admin DB 0".to_string()));
+        }
+        // Fast path
+        {
+            let map = self.embedders.read().unwrap();
+            if let Some(e) = map.get(&(self.selected_db, dataset.to_string())) {
+                return Ok(e.clone());
+            }
+        }
+        // Load config and instantiate
+        let cfg = self.get_dataset_embedding_config(dataset)?;
+        let emb = create_embedder(&cfg)?;
+        {
+            let mut map = self.embedders.write().unwrap();
+            map.insert((self.selected_db, dataset.to_string()), emb.clone());
+        }
+        Ok(emb)
+    }
+
+    /// Resolve or build an IMAGE embedder for (db_id, dataset). Caches instance.
+    pub fn get_image_embedder_for(&self, dataset: &str) -> Result<Arc<dyn ImageEmbedder>, DBError> {
+        if self.selected_db == 0 {
+            return Err(DBError("Lance not available on admin DB 0".to_string()));
+        }
+        // Fast path
+        {
+            let map = self.image_embedders.read().unwrap();
+            if let Some(e) = map.get(&(self.selected_db, dataset.to_string())) {
+                return Ok(e.clone());
+            }
+        }
+        // Load config and instantiate
+        let cfg = self.get_dataset_embedding_config(dataset)?;
+        let emb = create_image_embedder(&cfg)?;
+        {
+            let mut map = self.image_embedders.write().unwrap();
+            map.insert((self.selected_db, dataset.to_string()), emb.clone());
+        }
+        Ok(emb)
+    }
+
+    /// Download image bytes from a URI with safety checks (size, timeout, content-type, optional host allowlist).
+    /// Env overrides:
+    /// - HERODB_IMAGE_MAX_BYTES (u64, default 10485760)
+    /// - HERODB_IMAGE_FETCH_TIMEOUT_SECS (u64, default 30)
+    /// - HERODB_IMAGE_ALLOWED_HOSTS (comma-separated, optional)
+    pub fn fetch_image_bytes_from_uri(&self, uri: &str) -> Result<Vec<u8>, DBError> {
+        // Basic scheme validation
+        if !(uri.starts_with("http://") || uri.starts_with("https://")) {
+            return Err(DBError("Only http(s) URIs are supported for image fetch".into()));
+        }
+        // Parse host (naive) for allowlist check
+        let host = {
+            let after_scheme = match uri.find("://") {
+                Some(i) => &uri[i + 3..],
+                None => uri,
+            };
+            let end = after_scheme.find('/').unwrap_or(after_scheme.len());
+            let host_port = &after_scheme[..end];
+            host_port.split('@').last().unwrap_or(host_port).split(':').next().unwrap_or(host_port).to_string()
+        };
+
+        let max_bytes: u64 = std::env::var("HERODB_IMAGE_MAX_BYTES").ok().and_then(|s| s.parse::<u64>().ok()).unwrap_or(10 * 1024 * 1024);
+        let timeout_secs: u64 = std::env::var("HERODB_IMAGE_FETCH_TIMEOUT_SECS").ok().and_then(|s| s.parse::<u64>().ok()).unwrap_or(30);
+        let allowed_hosts_env = std::env::var("HERODB_IMAGE_ALLOWED_HOSTS").ok();
+        if let Some(allow) = allowed_hosts_env {
+            if !allow.split(',').map(|s| s.trim()).filter(|s| !s.is_empty()).any(|h| h.eq_ignore_ascii_case(&host)) {
+                return Err(DBError(format!("Host '{}' not allowed for image fetch (HERODB_IMAGE_ALLOWED_HOSTS)", host)));
+            }
+        }
+
+        let agent: Agent = AgentBuilder::new()
+            .timeout_read(Duration::from_secs(timeout_secs))
+            .timeout_write(Duration::from_secs(timeout_secs))
+            .build();
+
+        let resp = agent.get(uri).call().map_err(|e| DBError(format!("HTTP GET failed: {}", e)))?;
+        // Validate content-type
+        let ctype = resp.header("Content-Type").unwrap_or("");
+        let ctype_main = ctype.split(';').next().unwrap_or("").trim().to_ascii_lowercase();
+        if !ctype_main.starts_with("image/") {
+            return Err(DBError(format!("Remote content-type '{}' is not image/*", ctype)));
+        }
+
+        // Read with cap
+        let mut reader = resp.into_reader();
+        let mut buf: Vec<u8> = Vec::with_capacity(8192);
+        let mut tmp = [0u8; 8192];
+        let mut total: u64 = 0;
+        loop {
+            let n = reader.read(&mut tmp).map_err(|e| DBError(format!("Read error: {}", e)))?;
+            if n == 0 { break; }
+            total += n as u64;
+            if total > max_bytes {
+                return Err(DBError(format!("Image exceeds max allowed bytes {}", max_bytes)));
+            }
+            buf.extend_from_slice(&tmp[..n]);
+        }
+        Ok(buf)
+    }
+
+    /// Check if current permissions allow read operations
+    pub fn has_read_permission(&self) -> bool {
+        // No DB selected -> no permissions
+        if self.selected_db == NO_DB_SELECTED {
+            return false;
+        }
+        // If an explicit permission is set for this connection, honor it.
+        if let Some(perms) = self.current_permissions.as_ref() {
+            return matches!(*perms, crate::rpc::Permissions::Read | crate::rpc::Permissions::ReadWrite);
+        }
+        // Fallback ONLY when no explicit permission context (e.g., JSON-RPC flows without SELECT).
+        match crate::admin_meta::verify_access(
+            &self.option.dir,
+            self.option.backend.clone(),
+            &self.option.admin_secret,
+            self.selected_db,
+            None,
+        ) {
+            Ok(Some(crate::rpc::Permissions::Read)) | Ok(Some(crate::rpc::Permissions::ReadWrite)) => true,
+            _ => false,
+        }
+    }
+
+    /// Check if current permissions allow write operations
+    pub fn has_write_permission(&self) -> bool {
+        // No DB selected -> no permissions
+        if self.selected_db == NO_DB_SELECTED {
+            return false;
+        }
+        // If an explicit permission is set for this connection, honor it.
+        if let Some(perms) = self.current_permissions.as_ref() {
+            return matches!(*perms, crate::rpc::Permissions::ReadWrite);
+        }
+        // Fallback ONLY when no explicit permission context (e.g., JSON-RPC flows without SELECT).
+        match crate::admin_meta::verify_access(
+            &self.option.dir,
+            self.option.backend.clone(),
+            &self.option.admin_secret,
+            self.selected_db,
+            None,
+        ) {
+            Ok(Some(crate::rpc::Permissions::ReadWrite)) => true,
+            _ => false,
+        }
     }
 
     // ----- BLPOP waiter helpers -----
 
-    pub async fn register_waiter(
+    pub async fn register_waiter(&self, db_index: u64, key: &str, side: PopSide) -> (u64, oneshot::Receiver<(String, String)>) {
-        &self,
-        db_index: u64,
-        key: &str,
-        side: PopSide,
-    ) -> (u64, oneshot::Receiver<(String, String)>) {
         let id = self.waiter_seq.fetch_add(1, Ordering::Relaxed);
         let (tx, rx) = oneshot::channel::<(String, String)>();
 
@@ -192,7 +463,10 @@ impl Server {
         Ok(())
     }
 
-    pub async fn handle(&mut self, mut stream: tokio::net::TcpStream) -> Result<(), DBError> {
+    pub async fn handle(
+        &mut self,
+        mut stream: tokio::net::TcpStream,
+    ) -> Result<(), DBError> {
         // Accumulate incoming bytes to handle partial RESP frames
         let mut acc = String::new();
         let mut buf = vec![0u8; 8192];
@@ -229,10 +503,7 @@ impl Server {
                 acc = remaining.to_string();
 
                 if self.option.debug {
-                    println!(
+                    println!("\x1b[34;1mgot command: {:?}, protocol: {:?}\x1b[0m", cmd, protocol);
-                        "\x1b[34;1mgot command: {:?}, protocol: {:?}\x1b[0m",
-                        cmd, protocol
-                    );
                 } else {
                     println!("got command: {:?}, protocol: {:?}", cmd, protocol);
                 }

src/storage/mod.rs

@@ -12,9 +12,9 @@ use crate::error::DBError;
 
 // Re-export modules
 mod storage_basic;
-mod storage_extra;
 mod storage_hset;
 mod storage_lists;
+mod storage_extra;
 
 // Re-export implementations
 // Note: These imports are used by the impl blocks in the submodules
@@ -28,8 +28,7 @@ const STRINGS_TABLE: TableDefinition<&str, &[u8]> = TableDefinition::new("string
 const HASHES_TABLE: TableDefinition<(&str, &str), &[u8]> = TableDefinition::new("hashes");
 const LISTS_TABLE: TableDefinition<&str, &[u8]> = TableDefinition::new("lists");
 const STREAMS_META_TABLE: TableDefinition<&str, &[u8]> = TableDefinition::new("streams_meta");
-const STREAMS_DATA_TABLE: TableDefinition<(&str, &str), &[u8]> =
+const STREAMS_DATA_TABLE: TableDefinition<(&str, &str), &[u8]> = TableDefinition::new("streams_data");
-    TableDefinition::new("streams_data");
 const ENCRYPTED_TABLE: TableDefinition<&str, u8> = TableDefinition::new("encrypted");
 const EXPIRATION_TABLE: TableDefinition<&str, u64> = TableDefinition::new("expiration");
 
@@ -56,13 +55,9 @@ pub struct Storage {
 }
 
 impl Storage {
-    pub fn new(
+    pub fn new(path: impl AsRef<Path>, should_encrypt: bool, master_key: Option<&str>) -> Result<Self, DBError> {
-        path: impl AsRef<Path>,
-        should_encrypt: bool,
-        master_key: Option<&str>,
-    ) -> Result<Self, DBError> {
         let db = Database::create(path)?;
-
+        
         // Create tables if they don't exist
         let write_txn = db.begin_write()?;
         {
@@ -76,28 +71,23 @@ impl Storage {
             let _ = write_txn.open_table(EXPIRATION_TABLE)?;
         }
         write_txn.commit()?;
-
+        
         // Check if database was previously encrypted
         let read_txn = db.begin_read()?;
         let encrypted_table = read_txn.open_table(ENCRYPTED_TABLE)?;
-        let was_encrypted = encrypted_table
+        let was_encrypted = encrypted_table.get("encrypted")?.map(|v| v.value() == 1).unwrap_or(false);
-            .get("encrypted")?
-            .map(|v| v.value() == 1)
-            .unwrap_or(false);
         drop(read_txn);
-
+        
         let crypto = if should_encrypt || was_encrypted {
             if let Some(key) = master_key {
                 Some(CryptoFactory::new(key.as_bytes()))
             } else {
-                return Err(DBError(
+                return Err(DBError("Encryption requested but no master key provided".to_string()));
-                    "Encryption requested but no master key provided".to_string(),
-                ));
             }
         } else {
             None
         };
-
+        
         // If we're enabling encryption for the first time, mark it
         if should_encrypt && !was_encrypted {
             let write_txn = db.begin_write()?;
@@ -107,10 +97,13 @@ impl Storage {
             }
             write_txn.commit()?;
         }
-
+        
-        Ok(Storage { db, crypto })
+        Ok(Storage {
+            db,
+            crypto,
+        })
     }
-
+    
     pub fn is_encrypted(&self) -> bool {
         self.crypto.is_some()
     }
@@ -123,7 +116,7 @@ impl Storage {
             Ok(data.to_vec())
         }
     }
-
+    
     fn decrypt_if_needed(&self, data: &[u8]) -> Result<Vec<u8>, DBError> {
         if let Some(crypto) = &self.crypto {
             Ok(crypto.decrypt(data)?)
@@ -172,22 +165,11 @@ impl StorageBackend for Storage {
         self.get_key_type(key)
     }
 
-    fn scan(
+    fn scan(&self, cursor: u64, pattern: Option<&str>, count: Option<u64>) -> Result<(u64, Vec<(String, String)>), DBError> {
-        &self,
-        cursor: u64,
-        pattern: Option<&str>,
-        count: Option<u64>,
-    ) -> Result<(u64, Vec<(String, String)>), DBError> {
         self.scan(cursor, pattern, count)
     }
 
-    fn hscan(
+    fn hscan(&self, key: &str, cursor: u64, pattern: Option<&str>, count: Option<u64>) -> Result<(u64, Vec<(String, String)>), DBError> {
-        &self,
-        key: &str,
-        cursor: u64,
-        pattern: Option<&str>,
-        count: Option<u64>,
-    ) -> Result<(u64, Vec<(String, String)>), DBError> {
         self.hscan(key, cursor, pattern, count)
     }
 
@@ -294,7 +276,7 @@ impl StorageBackend for Storage {
     fn is_encrypted(&self) -> bool {
         self.is_encrypted()
     }
-
+    
     fn info(&self) -> Result<Vec<(String, String)>, DBError> {
         self.info()
     }
@@ -302,4 +284,4 @@ impl StorageBackend for Storage {
     fn clone_arc(&self) -> Arc<dyn StorageBackend> {
         unimplemented!("Storage cloning not yet implemented for redb backend")
     }
-}
+}

src/storage/storage_basic.rs

@@ -1,6 +1,6 @@
-use super::*;
+use redb::{ReadableTable};
 use crate::error::DBError;
-use redb::ReadableTable;
+use super::*;
 
 impl Storage {
     pub fn flushdb(&self) -> Result<(), DBError> {
@@ -15,17 +15,11 @@ impl Storage {
             let mut expiration_table = write_txn.open_table(EXPIRATION_TABLE)?;
 
             // inefficient, but there is no other way
-            let keys: Vec<String> = types_table
+            let keys: Vec<String> = types_table.iter()?.map(|item| item.unwrap().0.value().to_string()).collect();
-                .iter()?
-                .map(|item| item.unwrap().0.value().to_string())
-                .collect();
             for key in keys {
                 types_table.remove(key.as_str())?;
             }
-            let keys: Vec<String> = strings_table
+            let keys: Vec<String> = strings_table.iter()?.map(|item| item.unwrap().0.value().to_string()).collect();
-                .iter()?
-                .map(|item| item.unwrap().0.value().to_string())
-                .collect();
             for key in keys {
                 strings_table.remove(key.as_str())?;
             }
@@ -40,35 +34,23 @@ impl Storage {
             for (key, field) in keys {
                 hashes_table.remove((key.as_str(), field.as_str()))?;
             }
-            let keys: Vec<String> = lists_table
+            let keys: Vec<String> = lists_table.iter()?.map(|item| item.unwrap().0.value().to_string()).collect();
-                .iter()?
-                .map(|item| item.unwrap().0.value().to_string())
-                .collect();
             for key in keys {
                 lists_table.remove(key.as_str())?;
             }
-            let keys: Vec<String> = streams_meta_table
+            let keys: Vec<String> = streams_meta_table.iter()?.map(|item| item.unwrap().0.value().to_string()).collect();
-                .iter()?
-                .map(|item| item.unwrap().0.value().to_string())
-                .collect();
             for key in keys {
                 streams_meta_table.remove(key.as_str())?;
             }
-            let keys: Vec<(String, String)> = streams_data_table
+            let keys: Vec<(String,String)> = streams_data_table.iter()?.map(|item| {
-                .iter()?
+                let binding = item.unwrap();
-                .map(|item| {
+                let (key, field) = binding.0.value();
-                    let binding = item.unwrap();
+                (key.to_string(), field.to_string())
-                    let (key, field) = binding.0.value();
+            }).collect();
-                    (key.to_string(), field.to_string())
-                })
-                .collect();
             for (key, field) in keys {
                 streams_data_table.remove((key.as_str(), field.as_str()))?;
             }
-            let keys: Vec<String> = expiration_table
+            let keys: Vec<String> = expiration_table.iter()?.map(|item| item.unwrap().0.value().to_string()).collect();
-                .iter()?
-                .map(|item| item.unwrap().0.value().to_string())
-                .collect();
             for key in keys {
                 expiration_table.remove(key.as_str())?;
             }
@@ -80,7 +62,7 @@ impl Storage {
     pub fn get_key_type(&self, key: &str) -> Result<Option<String>, DBError> {
         let read_txn = self.db.begin_read()?;
         let table = read_txn.open_table(TYPES_TABLE)?;
-
+        
         // Before returning type, check for expiration
         if let Some(type_val) = table.get(key)? {
             if type_val.value() == "string" {
@@ -101,7 +83,7 @@ impl Storage {
     // ✅ ENCRYPTION APPLIED: Value is encrypted/decrypted
     pub fn get(&self, key: &str) -> Result<Option<String>, DBError> {
         let read_txn = self.db.begin_read()?;
-
+        
         let types_table = read_txn.open_table(TYPES_TABLE)?;
         match types_table.get(key)? {
             Some(type_val) if type_val.value() == "string" => {
@@ -114,7 +96,7 @@ impl Storage {
                         return Ok(None);
                     }
                 }
-
+                
                 // Get and decrypt value
                 let strings_table = read_txn.open_table(STRINGS_TABLE)?;
                 match strings_table.get(key)? {
@@ -133,21 +115,21 @@ impl Storage {
     // ✅ ENCRYPTION APPLIED: Value is encrypted before storage
     pub fn set(&self, key: String, value: String) -> Result<(), DBError> {
         let write_txn = self.db.begin_write()?;
-
+        
         {
             let mut types_table = write_txn.open_table(TYPES_TABLE)?;
             types_table.insert(key.as_str(), "string")?;
-
+            
             let mut strings_table = write_txn.open_table(STRINGS_TABLE)?;
             // Only encrypt the value, not expiration
             let encrypted = self.encrypt_if_needed(value.as_bytes())?;
             strings_table.insert(key.as_str(), encrypted.as_slice())?;
-
+            
             // Remove any existing expiration since this is a regular SET
             let mut expiration_table = write_txn.open_table(EXPIRATION_TABLE)?;
             expiration_table.remove(key.as_str())?;
         }
-
+        
         write_txn.commit()?;
         Ok(())
     }
@@ -155,42 +137,41 @@ impl Storage {
     // ✅ ENCRYPTION APPLIED: Value is encrypted before storage
     pub fn setx(&self, key: String, value: String, expire_ms: u128) -> Result<(), DBError> {
         let write_txn = self.db.begin_write()?;
-
+        
         {
             let mut types_table = write_txn.open_table(TYPES_TABLE)?;
             types_table.insert(key.as_str(), "string")?;
-
+            
             let mut strings_table = write_txn.open_table(STRINGS_TABLE)?;
             // Only encrypt the value
             let encrypted = self.encrypt_if_needed(value.as_bytes())?;
             strings_table.insert(key.as_str(), encrypted.as_slice())?;
-
+            
             // Store expiration separately (unencrypted)
             let mut expiration_table = write_txn.open_table(EXPIRATION_TABLE)?;
             let expires_at = expire_ms + now_in_millis();
             expiration_table.insert(key.as_str(), &(expires_at as u64))?;
         }
-
+        
         write_txn.commit()?;
         Ok(())
     }
 
     pub fn del(&self, key: String) -> Result<(), DBError> {
         let write_txn = self.db.begin_write()?;
-
+        
         {
             let mut types_table = write_txn.open_table(TYPES_TABLE)?;
             let mut strings_table = write_txn.open_table(STRINGS_TABLE)?;
-            let mut hashes_table: redb::Table<(&str, &str), &[u8]> =
+            let mut hashes_table: redb::Table<(&str, &str), &[u8]> = write_txn.open_table(HASHES_TABLE)?;
-                write_txn.open_table(HASHES_TABLE)?;
             let mut lists_table = write_txn.open_table(LISTS_TABLE)?;
-
+            
             // Remove from type table
             types_table.remove(key.as_str())?;
-
+            
             // Remove from strings table
             strings_table.remove(key.as_str())?;
-
+            
             // Remove all hash fields for this key
             let mut to_remove = Vec::new();
             let mut iter = hashes_table.iter()?;
@@ -202,19 +183,19 @@ impl Storage {
                 }
             }
             drop(iter);
-
+            
             for (hash_key, field) in to_remove {
                 hashes_table.remove((hash_key.as_str(), field.as_str()))?;
             }
 
             // Remove from lists table
             lists_table.remove(key.as_str())?;
-
+            
             // Also remove expiration
             let mut expiration_table = write_txn.open_table(EXPIRATION_TABLE)?;
             expiration_table.remove(key.as_str())?;
         }
-
+        
         write_txn.commit()?;
         Ok(())
     }
@@ -222,7 +203,7 @@ impl Storage {
     pub fn keys(&self, pattern: &str) -> Result<Vec<String>, DBError> {
         let read_txn = self.db.begin_read()?;
         let table = read_txn.open_table(TYPES_TABLE)?;
-
+        
         let mut keys = Vec::new();
         let mut iter = table.iter()?;
         while let Some(entry) = iter.next() {
@@ -231,7 +212,7 @@ impl Storage {
                 keys.push(key);
             }
         }
-
+        
         Ok(keys)
     }
 }
@@ -261,4 +242,4 @@ impl Storage {
         }
         Ok(count)
     }
-}
+}

src/storage/storage_extra.rs

@@ -1,29 +1,24 @@
-use super::*;
+use redb::{ReadableTable};
 use crate::error::DBError;
-use redb::ReadableTable;
+use super::*;
 
 impl Storage {
     // ✅ ENCRYPTION APPLIED: Values are decrypted after retrieval
-    pub fn scan(
+    pub fn scan(&self, cursor: u64, pattern: Option<&str>, count: Option<u64>) -> Result<(u64, Vec<(String, String)>), DBError> {
-        &self,
-        cursor: u64,
-        pattern: Option<&str>,
-        count: Option<u64>,
-    ) -> Result<(u64, Vec<(String, String)>), DBError> {
         let read_txn = self.db.begin_read()?;
         let types_table = read_txn.open_table(TYPES_TABLE)?;
         let strings_table = read_txn.open_table(STRINGS_TABLE)?;
-
+        
         let mut result = Vec::new();
         let mut current_cursor = 0u64;
         let limit = count.unwrap_or(10) as usize;
-
+        
         let mut iter = types_table.iter()?;
         while let Some(entry) = iter.next() {
             let entry = entry?;
             let key = entry.0.value().to_string();
             let key_type = entry.1.value().to_string();
-
+            
             if current_cursor >= cursor {
                 // Apply pattern matching if specified
                 let matches = if let Some(pat) = pattern {
@@ -31,7 +26,7 @@ impl Storage {
                 } else {
                     true
                 };
-
+                
                 if matches {
                     // For scan, we return key-value pairs for string types
                     if key_type == "string" {
@@ -46,7 +41,7 @@ impl Storage {
                         // For non-string types, just return the key with type as value
                         result.push((key, key_type));
                     }
-
+                    
                     if result.len() >= limit {
                         break;
                     }
@@ -54,19 +49,15 @@ impl Storage {
             }
             current_cursor += 1;
         }
-
+        
-        let next_cursor = if result.len() < limit {
+        let next_cursor = if result.len() < limit { 0 } else { current_cursor };
-            0
-        } else {
-            current_cursor
-        };
         Ok((next_cursor, result))
     }
 
     pub fn ttl(&self, key: &str) -> Result<i64, DBError> {
         let read_txn = self.db.begin_read()?;
         let types_table = read_txn.open_table(TYPES_TABLE)?;
-
+        
         match types_table.get(key)? {
             Some(type_val) if type_val.value() == "string" => {
                 let expiration_table = read_txn.open_table(EXPIRATION_TABLE)?;
@@ -84,14 +75,14 @@ impl Storage {
                 }
             }
             Some(_) => Ok(-1), // Key exists but is not a string (no expiration support for other types)
-            None => Ok(-2),    // Key does not exist
+            None => Ok(-2), // Key does not exist
         }
     }
 
     pub fn exists(&self, key: &str) -> Result<bool, DBError> {
         let read_txn = self.db.begin_read()?;
         let types_table = read_txn.open_table(TYPES_TABLE)?;
-
+        
         match types_table.get(key)? {
             Some(type_val) if type_val.value() == "string" => {
                 // Check if string key has expired
@@ -104,7 +95,7 @@ impl Storage {
                 Ok(true)
             }
             Some(_) => Ok(true), // Key exists and is not a string
-            None => Ok(false),   // Key does not exist
+            None => Ok(false), // Key does not exist
         }
     }
 
@@ -187,12 +178,8 @@ impl Storage {
                 .unwrap_or(false);
             if is_string {
                 let mut expiration_table = write_txn.open_table(EXPIRATION_TABLE)?;
-                let expires_at_ms: u128 = if ts_secs <= 0 {
+                let expires_at_ms: u128 = if ts_secs <= 0 { 0 } else { (ts_secs as u128) * 1000 };
-                    0
+                expiration_table.insert(key, &((expires_at_ms as u64)))?;
-                } else {
-                    (ts_secs as u128) * 1000
-                };
-                expiration_table.insert(key, &(expires_at_ms as u64))?;
                 applied = true;
             }
         }
@@ -214,7 +201,7 @@ impl Storage {
             if is_string {
                 let mut expiration_table = write_txn.open_table(EXPIRATION_TABLE)?;
                 let expires_at_ms: u128 = if ts_ms <= 0 { 0 } else { ts_ms as u128 };
-                expiration_table.insert(key, &(expires_at_ms as u64))?;
+                expiration_table.insert(key, &((expires_at_ms as u64)))?;
                 applied = true;
             }
         }
@@ -236,21 +223,21 @@ pub fn glob_match(pattern: &str, text: &str) -> bool {
     if pattern == "*" {
         return true;
     }
-
+    
     // Simple glob matching - supports * and ? wildcards
     let pattern_chars: Vec<char> = pattern.chars().collect();
     let text_chars: Vec<char> = text.chars().collect();
-
+    
     fn match_recursive(pattern: &[char], text: &[char], pi: usize, ti: usize) -> bool {
         if pi >= pattern.len() {
             return ti >= text.len();
         }
-
+        
         if ti >= text.len() {
             // Check if remaining pattern is all '*'
             return pattern[pi..].iter().all(|&c| c == '*');
         }
-
+        
         match pattern[pi] {
             '*' => {
                 // Try matching zero or more characters
@@ -275,7 +262,7 @@ pub fn glob_match(pattern: &str, text: &str) -> bool {
             }
         }
     }
-
+    
     match_recursive(&pattern_chars, &text_chars, 0, 0)
 }
 
@@ -296,4 +283,4 @@ mod tests {
         assert!(glob_match("*test*", "this_is_a_test_string"));
         assert!(!glob_match("*test*", "this_is_a_string"));
     }
-}
+}

src/storage/storage_hset.rs

@@ -1,50 +1,44 @@
-use super::*;
+use redb::{ReadableTable};
 use crate::error::DBError;
-use redb::ReadableTable;
+use super::*;
 
 impl Storage {
     // ✅ ENCRYPTION APPLIED: Values are encrypted before storage
     pub fn hset(&self, key: &str, pairs: Vec<(String, String)>) -> Result<i64, DBError> {
         let write_txn = self.db.begin_write()?;
         let mut new_fields = 0i64;
-
+        
         {
             let mut types_table = write_txn.open_table(TYPES_TABLE)?;
             let mut hashes_table = write_txn.open_table(HASHES_TABLE)?;
-
+            
             let key_type = {
                 let access_guard = types_table.get(key)?;
                 access_guard.map(|v| v.value().to_string())
             };
 
             match key_type.as_deref() {
-                Some("hash") | None => {
+                Some("hash") | None => { // Proceed if hash or new key
-                    // Proceed if hash or new key
                     // Set the type to hash (only if new key or existing hash)
                     types_table.insert(key, "hash")?;
-
+                    
                     for (field, value) in pairs {
                         // Check if field already exists
                         let exists = hashes_table.get((key, field.as_str()))?.is_some();
-
+                        
                         // Encrypt the value before storing
                         let encrypted = self.encrypt_if_needed(value.as_bytes())?;
                         hashes_table.insert((key, field.as_str()), encrypted.as_slice())?;
-
+                        
                         if !exists {
                             new_fields += 1;
                         }
                     }
                 }
-                Some(_) => {
+                Some(_) => return Err(DBError("WRONGTYPE Operation against a key holding the wrong kind of value".to_string())),
-                    return Err(DBError(
-                        "WRONGTYPE Operation against a key holding the wrong kind of value"
-                            .to_string(),
-                    ))
-                }
             }
         }
-
+        
         write_txn.commit()?;
         Ok(new_fields)
     }
@@ -53,7 +47,7 @@ impl Storage {
     pub fn hget(&self, key: &str, field: &str) -> Result<Option<String>, DBError> {
         let read_txn = self.db.begin_read()?;
         let types_table = read_txn.open_table(TYPES_TABLE)?;
-
+        
         let key_type = types_table.get(key)?.map(|v| v.value().to_string());
 
         match key_type.as_deref() {
@@ -68,9 +62,7 @@ impl Storage {
                     None => Ok(None),
                 }
             }
-            Some(_) => Err(DBError(
+            Some(_) => Err(DBError("WRONGTYPE Operation against a key holding the wrong kind of value".to_string())),
-                "WRONGTYPE Operation against a key holding the wrong kind of value".to_string(),
-            )),
             None => Ok(None),
         }
     }
@@ -88,7 +80,7 @@ impl Storage {
             Some("hash") => {
                 let hashes_table = read_txn.open_table(HASHES_TABLE)?;
                 let mut result = Vec::new();
-
+                
                 let mut iter = hashes_table.iter()?;
                 while let Some(entry) = iter.next() {
                     let entry = entry?;
@@ -99,12 +91,10 @@ impl Storage {
                         result.push((field.to_string(), value));
                     }
                 }
-
+                
                 Ok(result)
             }
-            Some(_) => Err(DBError(
+            Some(_) => Err(DBError("WRONGTYPE Operation against a key holding the wrong kind of value".to_string())),
-                "WRONGTYPE Operation against a key holding the wrong kind of value".to_string(),
-            )),
             None => Ok(Vec::new()),
         }
     }
@@ -112,24 +102,24 @@ impl Storage {
     pub fn hdel(&self, key: &str, fields: Vec<String>) -> Result<i64, DBError> {
         let write_txn = self.db.begin_write()?;
         let mut deleted = 0i64;
-
+        
         // First check if key exists and is a hash
         let key_type = {
             let types_table = write_txn.open_table(TYPES_TABLE)?;
             let access_guard = types_table.get(key)?;
             access_guard.map(|v| v.value().to_string())
         };
-
+        
         match key_type.as_deref() {
             Some("hash") => {
                 let mut hashes_table = write_txn.open_table(HASHES_TABLE)?;
-
+                
                 for field in fields {
                     if hashes_table.remove((key, field.as_str()))?.is_some() {
                         deleted += 1;
                     }
                 }
-
+                
                 // Check if hash is now empty and remove type if so
                 let mut has_fields = false;
                 let mut iter = hashes_table.iter()?;
@@ -142,20 +132,16 @@ impl Storage {
                     }
                 }
                 drop(iter);
-
+                
                 if !has_fields {
                     let mut types_table = write_txn.open_table(TYPES_TABLE)?;
                     types_table.remove(key)?;
                 }
             }
-            Some(_) => {
+            Some(_) => return Err(DBError("WRONGTYPE Operation against a key holding the wrong kind of value".to_string())),
-                return Err(DBError(
-                    "WRONGTYPE Operation against a key holding the wrong kind of value".to_string(),
-                ))
-            }
             None => {} // Key does not exist, nothing to delete, return 0 deleted
         }
-
+        
         write_txn.commit()?;
         Ok(deleted)
     }
@@ -173,9 +159,7 @@ impl Storage {
                 let hashes_table = read_txn.open_table(HASHES_TABLE)?;
                 Ok(hashes_table.get((key, field))?.is_some())
             }
-            Some(_) => Err(DBError(
+            Some(_) => Err(DBError("WRONGTYPE Operation against a key holding the wrong kind of value".to_string())),
-                "WRONGTYPE Operation against a key holding the wrong kind of value".to_string(),
-            )),
             None => Ok(false),
         }
     }
@@ -192,7 +176,7 @@ impl Storage {
             Some("hash") => {
                 let hashes_table = read_txn.open_table(HASHES_TABLE)?;
                 let mut result = Vec::new();
-
+                
                 let mut iter = hashes_table.iter()?;
                 while let Some(entry) = iter.next() {
                     let entry = entry?;
@@ -201,12 +185,10 @@ impl Storage {
                         result.push(field.to_string());
                     }
                 }
-
+                
                 Ok(result)
             }
-            Some(_) => Err(DBError(
+            Some(_) => Err(DBError("WRONGTYPE Operation against a key holding the wrong kind of value".to_string())),
-                "WRONGTYPE Operation against a key holding the wrong kind of value".to_string(),
-            )),
             None => Ok(Vec::new()),
         }
     }
@@ -224,7 +206,7 @@ impl Storage {
             Some("hash") => {
                 let hashes_table = read_txn.open_table(HASHES_TABLE)?;
                 let mut result = Vec::new();
-
+                
                 let mut iter = hashes_table.iter()?;
                 while let Some(entry) = iter.next() {
                     let entry = entry?;
@@ -235,12 +217,10 @@ impl Storage {
                         result.push(value);
                     }
                 }
-
+                
                 Ok(result)
             }
-            Some(_) => Err(DBError(
+            Some(_) => Err(DBError("WRONGTYPE Operation against a key holding the wrong kind of value".to_string())),
-                "WRONGTYPE Operation against a key holding the wrong kind of value".to_string(),
-            )),
             None => Ok(Vec::new()),
         }
     }
@@ -257,7 +237,7 @@ impl Storage {
             Some("hash") => {
                 let hashes_table = read_txn.open_table(HASHES_TABLE)?;
                 let mut count = 0i64;
-
+                
                 let mut iter = hashes_table.iter()?;
                 while let Some(entry) = iter.next() {
                     let entry = entry?;
@@ -266,12 +246,10 @@ impl Storage {
                         count += 1;
                     }
                 }
-
+                
                 Ok(count)
             }
-            Some(_) => Err(DBError(
+            Some(_) => Err(DBError("WRONGTYPE Operation against a key holding the wrong kind of value".to_string())),
-                "WRONGTYPE Operation against a key holding the wrong kind of value".to_string(),
-            )),
             None => Ok(0),
         }
     }
@@ -289,7 +267,7 @@ impl Storage {
             Some("hash") => {
                 let hashes_table = read_txn.open_table(HASHES_TABLE)?;
                 let mut result = Vec::new();
-
+                
                 for field in fields {
                     match hashes_table.get((key, field.as_str()))? {
                         Some(data) => {
@@ -300,12 +278,10 @@ impl Storage {
                         None => result.push(None),
                     }
                 }
-
+                
                 Ok(result)
             }
-            Some(_) => Err(DBError(
+            Some(_) => Err(DBError("WRONGTYPE Operation against a key holding the wrong kind of value".to_string())),
-                "WRONGTYPE Operation against a key holding the wrong kind of value".to_string(),
-            )),
             None => Ok(fields.into_iter().map(|_| None).collect()),
         }
     }
@@ -314,51 +290,39 @@ impl Storage {
     pub fn hsetnx(&self, key: &str, field: &str, value: &str) -> Result<bool, DBError> {
         let write_txn = self.db.begin_write()?;
         let mut result = false;
-
+        
         {
             let mut types_table = write_txn.open_table(TYPES_TABLE)?;
             let mut hashes_table = write_txn.open_table(HASHES_TABLE)?;
-
+            
             let key_type = {
                 let access_guard = types_table.get(key)?;
                 access_guard.map(|v| v.value().to_string())
             };
 
             match key_type.as_deref() {
-                Some("hash") | None => {
+                Some("hash") | None => { // Proceed if hash or new key
-                    // Proceed if hash or new key
                     // Check if field already exists
                     if hashes_table.get((key, field))?.is_none() {
                         // Set the type to hash (only if new key or existing hash)
                         types_table.insert(key, "hash")?;
-
+                        
                         // Encrypt the value before storing
                         let encrypted = self.encrypt_if_needed(value.as_bytes())?;
                         hashes_table.insert((key, field), encrypted.as_slice())?;
                         result = true;
                     }
                 }
-                Some(_) => {
+                Some(_) => return Err(DBError("WRONGTYPE Operation against a key holding the wrong kind of value".to_string())),
-                    return Err(DBError(
-                        "WRONGTYPE Operation against a key holding the wrong kind of value"
-                            .to_string(),
-                    ))
-                }
             }
         }
-
+        
         write_txn.commit()?;
         Ok(result)
     }
 
     // ✅ ENCRYPTION APPLIED: Values are decrypted after retrieval
-    pub fn hscan(
+    pub fn hscan(&self, key: &str, cursor: u64, pattern: Option<&str>, count: Option<u64>) -> Result<(u64, Vec<(String, String)>), DBError> {
-        &self,
-        key: &str,
-        cursor: u64,
-        pattern: Option<&str>,
-        count: Option<u64>,
-    ) -> Result<(u64, Vec<(String, String)>), DBError> {
         let read_txn = self.db.begin_read()?;
         let types_table = read_txn.open_table(TYPES_TABLE)?;
         let key_type = {
@@ -372,28 +336,28 @@ impl Storage {
                 let mut result = Vec::new();
                 let mut current_cursor = 0u64;
                 let limit = count.unwrap_or(10) as usize;
-
+                
                 let mut iter = hashes_table.iter()?;
                 while let Some(entry) = iter.next() {
                     let entry = entry?;
                     let (hash_key, field) = entry.0.value();
-
+                    
                     if hash_key == key {
                         if current_cursor >= cursor {
                             let field_str = field.to_string();
-
+                            
                             // Apply pattern matching if specified
                             let matches = if let Some(pat) = pattern {
                                 super::storage_extra::glob_match(pat, &field_str)
                             } else {
                                 true
                             };
-
+                            
                             if matches {
                                 let decrypted = self.decrypt_if_needed(entry.1.value())?;
                                 let value = String::from_utf8(decrypted)?;
                                 result.push((field_str, value));
-
+                                
                                 if result.len() >= limit {
                                     break;
                                 }
@@ -402,18 +366,12 @@ impl Storage {
                         current_cursor += 1;
                     }
                 }
-
+                
-                let next_cursor = if result.len() < limit {
+                let next_cursor = if result.len() < limit { 0 } else { current_cursor };
-                    0
-                } else {
-                    current_cursor
-                };
                 Ok((next_cursor, result))
             }
-            Some(_) => Err(DBError(
+            Some(_) => Err(DBError("WRONGTYPE Operation against a key holding the wrong kind of value".to_string())),
-                "WRONGTYPE Operation against a key holding the wrong kind of value".to_string(),
-            )),
             None => Ok((0, Vec::new())),
         }
     }
-}
+}

src/storage/storage_lists.rs

@@ -1,20 +1,20 @@
-use super::*;
+use redb::{ReadableTable};
 use crate::error::DBError;
-use redb::ReadableTable;
+use super::*;
 
 impl Storage {
     // ✅ ENCRYPTION APPLIED: Elements are encrypted before storage
     pub fn lpush(&self, key: &str, elements: Vec<String>) -> Result<i64, DBError> {
         let write_txn = self.db.begin_write()?;
         let mut _length = 0i64;
-
+        
         {
             let mut types_table = write_txn.open_table(TYPES_TABLE)?;
             let mut lists_table = write_txn.open_table(LISTS_TABLE)?;
-
+            
             // Set the type to list
             types_table.insert(key, "list")?;
-
+            
             // Get current list or create empty one
             let mut list: Vec<String> = match lists_table.get(key)? {
                 Some(data) => {
@@ -23,20 +23,20 @@ impl Storage {
                 }
                 None => Vec::new(),
             };
-
+            
             // Add elements to the front (left)
             for element in elements.into_iter() {
                 list.insert(0, element);
             }
-
+            
             _length = list.len() as i64;
-
+            
             // Encrypt and store the updated list
             let serialized = serde_json::to_vec(&list)?;
             let encrypted = self.encrypt_if_needed(&serialized)?;
             lists_table.insert(key, encrypted.as_slice())?;
         }
-
+        
         write_txn.commit()?;
         Ok(_length)
     }
@@ -45,14 +45,14 @@ impl Storage {
     pub fn rpush(&self, key: &str, elements: Vec<String>) -> Result<i64, DBError> {
         let write_txn = self.db.begin_write()?;
         let mut _length = 0i64;
-
+        
         {
             let mut types_table = write_txn.open_table(TYPES_TABLE)?;
             let mut lists_table = write_txn.open_table(LISTS_TABLE)?;
-
+            
             // Set the type to list
             types_table.insert(key, "list")?;
-
+            
             // Get current list or create empty one
             let mut list: Vec<String> = match lists_table.get(key)? {
                 Some(data) => {
@@ -61,17 +61,17 @@ impl Storage {
                 }
                 None => Vec::new(),
             };
-
+            
             // Add elements to the end (right)
             list.extend(elements);
             _length = list.len() as i64;
-
+            
             // Encrypt and store the updated list
             let serialized = serde_json::to_vec(&list)?;
             let encrypted = self.encrypt_if_needed(&serialized)?;
             lists_table.insert(key, encrypted.as_slice())?;
         }
-
+        
         write_txn.commit()?;
         Ok(_length)
     }
@@ -80,12 +80,12 @@ impl Storage {
     pub fn lpop(&self, key: &str, count: u64) -> Result<Vec<String>, DBError> {
         let write_txn = self.db.begin_write()?;
         let mut result = Vec::new();
-
+        
         // First check if key exists and is a list, and get the data
         let list_data = {
             let types_table = write_txn.open_table(TYPES_TABLE)?;
             let lists_table = write_txn.open_table(LISTS_TABLE)?;
-
+            
             let result = match types_table.get(key)? {
                 Some(type_val) if type_val.value() == "list" => {
                     if let Some(data) = lists_table.get(key)? {
@@ -100,7 +100,7 @@ impl Storage {
             };
             result
         };
-
+        
         if let Some(mut list) = list_data {
             let pop_count = std::cmp::min(count as usize, list.len());
             for _ in 0..pop_count {
@@ -108,7 +108,7 @@ impl Storage {
                     result.push(list.remove(0));
                 }
             }
-
+            
             let mut lists_table = write_txn.open_table(LISTS_TABLE)?;
             if list.is_empty() {
                 // Remove the key if list is empty
@@ -122,7 +122,7 @@ impl Storage {
                 lists_table.insert(key, encrypted.as_slice())?;
             }
         }
-
+        
         write_txn.commit()?;
         Ok(result)
     }
@@ -131,12 +131,12 @@ impl Storage {
     pub fn rpop(&self, key: &str, count: u64) -> Result<Vec<String>, DBError> {
         let write_txn = self.db.begin_write()?;
         let mut result = Vec::new();
-
+        
         // First check if key exists and is a list, and get the data
         let list_data = {
             let types_table = write_txn.open_table(TYPES_TABLE)?;
             let lists_table = write_txn.open_table(LISTS_TABLE)?;
-
+            
             let result = match types_table.get(key)? {
                 Some(type_val) if type_val.value() == "list" => {
                     if let Some(data) = lists_table.get(key)? {
@@ -151,7 +151,7 @@ impl Storage {
             };
             result
         };
-
+        
         if let Some(mut list) = list_data {
             let pop_count = std::cmp::min(count as usize, list.len());
             for _ in 0..pop_count {
@@ -159,7 +159,7 @@ impl Storage {
                     result.push(list.pop().unwrap());
                 }
             }
-
+            
             let mut lists_table = write_txn.open_table(LISTS_TABLE)?;
             if list.is_empty() {
                 // Remove the key if list is empty
@@ -173,7 +173,7 @@ impl Storage {
                 lists_table.insert(key, encrypted.as_slice())?;
             }
         }
-
+        
         write_txn.commit()?;
         Ok(result)
     }
@@ -181,7 +181,7 @@ impl Storage {
     pub fn llen(&self, key: &str) -> Result<i64, DBError> {
         let read_txn = self.db.begin_read()?;
         let types_table = read_txn.open_table(TYPES_TABLE)?;
-
+        
         match types_table.get(key)? {
             Some(type_val) if type_val.value() == "list" => {
                 let lists_table = read_txn.open_table(LISTS_TABLE)?;
@@ -202,7 +202,7 @@ impl Storage {
     pub fn lindex(&self, key: &str, index: i64) -> Result<Option<String>, DBError> {
         let read_txn = self.db.begin_read()?;
         let types_table = read_txn.open_table(TYPES_TABLE)?;
-
+        
         match types_table.get(key)? {
             Some(type_val) if type_val.value() == "list" => {
                 let lists_table = read_txn.open_table(LISTS_TABLE)?;
@@ -210,13 +210,13 @@ impl Storage {
                     Some(data) => {
                         let decrypted = self.decrypt_if_needed(data.value())?;
                         let list: Vec<String> = serde_json::from_slice(&decrypted)?;
-
+                        
                         let actual_index = if index < 0 {
                             list.len() as i64 + index
                         } else {
                             index
                         };
-
+                        
                         if actual_index >= 0 && (actual_index as usize) < list.len() {
                             Ok(Some(list[actual_index as usize].clone()))
                         } else {
@@ -234,7 +234,7 @@ impl Storage {
     pub fn lrange(&self, key: &str, start: i64, stop: i64) -> Result<Vec<String>, DBError> {
         let read_txn = self.db.begin_read()?;
         let types_table = read_txn.open_table(TYPES_TABLE)?;
-
+        
         match types_table.get(key)? {
             Some(type_val) if type_val.value() == "list" => {
                 let lists_table = read_txn.open_table(LISTS_TABLE)?;
@@ -242,30 +242,22 @@ impl Storage {
                     Some(data) => {
                         let decrypted = self.decrypt_if_needed(data.value())?;
                         let list: Vec<String> = serde_json::from_slice(&decrypted)?;
-
+                        
                         if list.is_empty() {
                             return Ok(Vec::new());
                         }
-
+                        
                         let len = list.len() as i64;
-                        let start_idx = if start < 0 {
+                        let start_idx = if start < 0 { std::cmp::max(0, len + start) } else { std::cmp::min(start, len) };
-                            std::cmp::max(0, len + start)
+                        let stop_idx = if stop < 0 { std::cmp::max(-1, len + stop) } else { std::cmp::min(stop, len - 1) };
-                        } else {
+                        
-                            std::cmp::min(start, len)
-                        };
-                        let stop_idx = if stop < 0 {
-                            std::cmp::max(-1, len + stop)
-                        } else {
-                            std::cmp::min(stop, len - 1)
-                        };
-
                         if start_idx > stop_idx || start_idx >= len {
                             return Ok(Vec::new());
                         }
-
+                        
                         let start_usize = start_idx as usize;
                         let stop_usize = (stop_idx + 1) as usize;
-
+                        
                         Ok(list[start_usize..std::cmp::min(stop_usize, list.len())].to_vec())
                     }
                     None => Ok(Vec::new()),
@@ -278,12 +270,12 @@ impl Storage {
     // ✅ ENCRYPTION APPLIED: Elements are decrypted after retrieval and encrypted before storage
     pub fn ltrim(&self, key: &str, start: i64, stop: i64) -> Result<(), DBError> {
         let write_txn = self.db.begin_write()?;
-
+        
         // First check if key exists and is a list, and get the data
         let list_data = {
             let types_table = write_txn.open_table(TYPES_TABLE)?;
             let lists_table = write_txn.open_table(LISTS_TABLE)?;
-
+            
             let result = match types_table.get(key)? {
                 Some(type_val) if type_val.value() == "list" => {
                     if let Some(data) = lists_table.get(key)? {
@@ -298,25 +290,17 @@ impl Storage {
             };
             result
         };
-
+        
         if let Some(list) = list_data {
             if list.is_empty() {
                 write_txn.commit()?;
                 return Ok(());
             }
-
+            
             let len = list.len() as i64;
-            let start_idx = if start < 0 {
+            let start_idx = if start < 0 { std::cmp::max(0, len + start) } else { std::cmp::min(start, len) };
-                std::cmp::max(0, len + start)
+            let stop_idx = if stop < 0 { std::cmp::max(-1, len + stop) } else { std::cmp::min(stop, len - 1) };
-            } else {
+            
-                std::cmp::min(start, len)
-            };
-            let stop_idx = if stop < 0 {
-                std::cmp::max(-1, len + stop)
-            } else {
-                std::cmp::min(stop, len - 1)
-            };
-
             let mut lists_table = write_txn.open_table(LISTS_TABLE)?;
             if start_idx > stop_idx || start_idx >= len {
                 // Remove the entire list
@@ -327,7 +311,7 @@ impl Storage {
                 let start_usize = start_idx as usize;
                 let stop_usize = (stop_idx + 1) as usize;
                 let trimmed = list[start_usize..std::cmp::min(stop_usize, list.len())].to_vec();
-
+                
                 if trimmed.is_empty() {
                     lists_table.remove(key)?;
                     let mut types_table = write_txn.open_table(TYPES_TABLE)?;
@@ -340,7 +324,7 @@ impl Storage {
                 }
             }
         }
-
+        
         write_txn.commit()?;
         Ok(())
     }
@@ -349,12 +333,12 @@ impl Storage {
     pub fn lrem(&self, key: &str, count: i64, element: &str) -> Result<i64, DBError> {
         let write_txn = self.db.begin_write()?;
         let mut removed = 0i64;
-
+        
         // First check if key exists and is a list, and get the data
         let list_data = {
             let types_table = write_txn.open_table(TYPES_TABLE)?;
             let lists_table = write_txn.open_table(LISTS_TABLE)?;
-
+            
             let result = match types_table.get(key)? {
                 Some(type_val) if type_val.value() == "list" => {
                     if let Some(data) = lists_table.get(key)? {
@@ -369,7 +353,7 @@ impl Storage {
             };
             result
         };
-
+        
         if let Some(mut list) = list_data {
             if count == 0 {
                 // Remove all occurrences
@@ -399,7 +383,7 @@ impl Storage {
                     }
                 }
             }
-
+            
             let mut lists_table = write_txn.open_table(LISTS_TABLE)?;
             if list.is_empty() {
                 lists_table.remove(key)?;
@@ -412,8 +396,8 @@ impl Storage {
                 lists_table.insert(key, encrypted.as_slice())?;
             }
         }
-
+        
         write_txn.commit()?;
         Ok(removed)
     }
-}
+}

src/storage_sled/mod.rs

@@ -1,12 +1,12 @@
 // src/storage_sled/mod.rs
-use crate::crypto::CryptoFactory;
-use crate::error::DBError;
-use crate::storage_trait::StorageBackend;
-use serde::{Deserialize, Serialize};
-use std::collections::HashMap;
 use std::path::Path;
 use std::sync::Arc;
+use std::collections::HashMap;
 use std::time::{SystemTime, UNIX_EPOCH};
+use serde::{Deserialize, Serialize};
+use crate::error::DBError;
+use crate::storage_trait::StorageBackend;
+use crate::crypto::CryptoFactory;
 
 #[derive(Serialize, Deserialize, Debug, Clone)]
 enum ValueType {
@@ -28,56 +28,44 @@ pub struct SledStorage {
 }
 
 impl SledStorage {
-    pub fn new(
+    pub fn new(path: impl AsRef<Path>, should_encrypt: bool, master_key: Option<&str>) -> Result<Self, DBError> {
-        path: impl AsRef<Path>,
-        should_encrypt: bool,
-        master_key: Option<&str>,
-    ) -> Result<Self, DBError> {
         let db = sled::open(path).map_err(|e| DBError(format!("Failed to open sled: {}", e)))?;
-        let types = db
+        let types = db.open_tree("types").map_err(|e| DBError(format!("Failed to open types tree: {}", e)))?;
-            .open_tree("types")
+        
-            .map_err(|e| DBError(format!("Failed to open types tree: {}", e)))?;
-
         // Check if database was previously encrypted
-        let encrypted_tree = db
+        let encrypted_tree = db.open_tree("encrypted").map_err(|e| DBError(e.to_string()))?;
-            .open_tree("encrypted")
+        let was_encrypted = encrypted_tree.get("encrypted")
-            .map_err(|e| DBError(e.to_string()))?;
-        let was_encrypted = encrypted_tree
-            .get("encrypted")
             .map_err(|e| DBError(e.to_string()))?
             .map(|v| v[0] == 1)
             .unwrap_or(false);
-
+        
         let crypto = if should_encrypt || was_encrypted {
             if let Some(key) = master_key {
                 Some(CryptoFactory::new(key.as_bytes()))
             } else {
-                return Err(DBError(
+                return Err(DBError("Encryption requested but no master key provided".to_string()));
-                    "Encryption requested but no master key provided".to_string(),
-                ));
             }
         } else {
             None
         };
-
+        
         // Mark database as encrypted if enabling encryption
         if should_encrypt && !was_encrypted {
-            encrypted_tree
+            encrypted_tree.insert("encrypted", &[1u8])
-                .insert("encrypted", &[1u8])
                 .map_err(|e| DBError(e.to_string()))?;
             encrypted_tree.flush().map_err(|e| DBError(e.to_string()))?;
         }
-
+        
         Ok(SledStorage { db, types, crypto })
     }
-
+    
     fn now_millis() -> u128 {
         SystemTime::now()
             .duration_since(UNIX_EPOCH)
             .unwrap()
             .as_millis()
     }
-
+    
     fn encrypt_if_needed(&self, data: &[u8]) -> Result<Vec<u8>, DBError> {
         if let Some(crypto) = &self.crypto {
             Ok(crypto.encrypt(data))
@@ -85,7 +73,7 @@ impl SledStorage {
             Ok(data.to_vec())
         }
     }
-
+    
     fn decrypt_if_needed(&self, data: &[u8]) -> Result<Vec<u8>, DBError> {
         if let Some(crypto) = &self.crypto {
             Ok(crypto.decrypt(data)?)
@@ -93,14 +81,14 @@ impl SledStorage {
             Ok(data.to_vec())
         }
     }
-
+    
     fn get_storage_value(&self, key: &str) -> Result<Option<StorageValue>, DBError> {
         match self.db.get(key).map_err(|e| DBError(e.to_string()))? {
             Some(encrypted_data) => {
                 let decrypted = self.decrypt_if_needed(&encrypted_data)?;
                 let storage_val: StorageValue = bincode::deserialize(&decrypted)
                     .map_err(|e| DBError(format!("Deserialization error: {}", e)))?;
-
+                
                 // Check expiration
                 if let Some(expires_at) = storage_val.expires_at {
                     if Self::now_millis() > expires_at {
@@ -110,51 +98,47 @@ impl SledStorage {
                         return Ok(None);
                     }
                 }
-
+                
                 Ok(Some(storage_val))
             }
-            None => Ok(None),
+            None => Ok(None)
         }
     }
-
+    
     fn set_storage_value(&self, key: &str, storage_val: StorageValue) -> Result<(), DBError> {
         let data = bincode::serialize(&storage_val)
             .map_err(|e| DBError(format!("Serialization error: {}", e)))?;
         let encrypted = self.encrypt_if_needed(&data)?;
-        self.db
+        self.db.insert(key, encrypted).map_err(|e| DBError(e.to_string()))?;
-            .insert(key, encrypted)
+        
-            .map_err(|e| DBError(e.to_string()))?;
-
         // Store type info (unencrypted for efficiency)
         let type_str = match &storage_val.value {
             ValueType::String(_) => "string",
             ValueType::Hash(_) => "hash",
             ValueType::List(_) => "list",
         };
-        self.types
+        self.types.insert(key, type_str.as_bytes()).map_err(|e| DBError(e.to_string()))?;
-            .insert(key, type_str.as_bytes())
+        
-            .map_err(|e| DBError(e.to_string()))?;
-
         Ok(())
     }
-
+    
     fn glob_match(pattern: &str, text: &str) -> bool {
         if pattern == "*" {
             return true;
         }
-
+        
         let pattern_chars: Vec<char> = pattern.chars().collect();
         let text_chars: Vec<char> = text.chars().collect();
-
+        
         fn match_recursive(pattern: &[char], text: &[char], pi: usize, ti: usize) -> bool {
             if pi >= pattern.len() {
                 return ti >= text.len();
             }
-
+            
             if ti >= text.len() {
                 return pattern[pi..].iter().all(|&c| c == '*');
             }
-
+            
             match pattern[pi] {
                 '*' => {
                     for i in ti..=text.len() {
@@ -174,7 +158,7 @@ impl SledStorage {
                 }
             }
         }
-
+        
         match_recursive(&pattern_chars, &text_chars, 0, 0)
     }
 }
@@ -184,12 +168,12 @@ impl StorageBackend for SledStorage {
         match self.get_storage_value(key)? {
             Some(storage_val) => match storage_val.value {
                 ValueType::String(s) => Ok(Some(s)),
-                _ => Ok(None),
+                _ => Ok(None)
-            },
+            }
-            None => Ok(None),
+            None => Ok(None)
         }
     }
-
+    
     fn set(&self, key: String, value: String) -> Result<(), DBError> {
         let storage_val = StorageValue {
             value: ValueType::String(value),
@@ -199,7 +183,7 @@ impl StorageBackend for SledStorage {
         self.db.flush().map_err(|e| DBError(e.to_string()))?;
         Ok(())
     }
-
+    
     fn setx(&self, key: String, value: String, expire_ms: u128) -> Result<(), DBError> {
         let storage_val = StorageValue {
             value: ValueType::String(value),
@@ -209,27 +193,25 @@ impl StorageBackend for SledStorage {
         self.db.flush().map_err(|e| DBError(e.to_string()))?;
         Ok(())
     }
-
+    
     fn del(&self, key: String) -> Result<(), DBError> {
         self.db.remove(&key).map_err(|e| DBError(e.to_string()))?;
-        self.types
+        self.types.remove(&key).map_err(|e| DBError(e.to_string()))?;
-            .remove(&key)
-            .map_err(|e| DBError(e.to_string()))?;
         self.db.flush().map_err(|e| DBError(e.to_string()))?;
         Ok(())
     }
-
+    
     fn exists(&self, key: &str) -> Result<bool, DBError> {
         // Check with expiration
         Ok(self.get_storage_value(key)?.is_some())
     }
-
+    
     fn keys(&self, pattern: &str) -> Result<Vec<String>, DBError> {
         let mut keys = Vec::new();
         for item in self.types.iter() {
             let (key_bytes, _) = item.map_err(|e| DBError(e.to_string()))?;
             let key = String::from_utf8_lossy(&key_bytes).to_string();
-
+            
             // Check if key is expired
             if self.get_storage_value(&key)?.is_some() {
                 if Self::glob_match(pattern, &key) {
@@ -239,29 +221,24 @@ impl StorageBackend for SledStorage {
         }
         Ok(keys)
     }
-
+    
-    fn scan(
+    fn scan(&self, cursor: u64, pattern: Option<&str>, count: Option<u64>) -> Result<(u64, Vec<(String, String)>), DBError> {
-        &self,
-        cursor: u64,
-        pattern: Option<&str>,
-        count: Option<u64>,
-    ) -> Result<(u64, Vec<(String, String)>), DBError> {
         let mut result = Vec::new();
         let mut current_cursor = 0u64;
         let limit = count.unwrap_or(10) as usize;
-
+        
         for item in self.types.iter() {
             if current_cursor >= cursor {
                 let (key_bytes, type_bytes) = item.map_err(|e| DBError(e.to_string()))?;
                 let key = String::from_utf8_lossy(&key_bytes).to_string();
-
+                
                 // Check pattern match
                 let matches = if let Some(pat) = pattern {
                     Self::glob_match(pat, &key)
                 } else {
                     true
                 };
-
+                
                 if matches {
                     // Check if key is expired and get value
                     if let Some(storage_val) = self.get_storage_value(&key)? {
@@ -270,7 +247,7 @@ impl StorageBackend for SledStorage {
                             _ => String::from_utf8_lossy(&type_bytes).to_string(),
                         };
                         result.push((key, value));
-
+                        
                         if result.len() >= limit {
                             current_cursor += 1;
                             break;
@@ -280,15 +257,11 @@ impl StorageBackend for SledStorage {
             }
             current_cursor += 1;
         }
-
+        
-        let next_cursor = if result.len() < limit {
+        let next_cursor = if result.len() < limit { 0 } else { current_cursor };
-            0
-        } else {
-            current_cursor
-        };
         Ok((next_cursor, result))
     }
-
+    
     fn dbsize(&self) -> Result<i64, DBError> {
         let mut count = 0i64;
         for item in self.types.iter() {
@@ -300,42 +273,38 @@ impl StorageBackend for SledStorage {
         }
         Ok(count)
     }
-
+    
     fn flushdb(&self) -> Result<(), DBError> {
         self.db.clear().map_err(|e| DBError(e.to_string()))?;
         self.types.clear().map_err(|e| DBError(e.to_string()))?;
         self.db.flush().map_err(|e| DBError(e.to_string()))?;
         Ok(())
     }
-
+    
     fn get_key_type(&self, key: &str) -> Result<Option<String>, DBError> {
         // First check if key exists (handles expiration)
         if self.get_storage_value(key)?.is_some() {
             match self.types.get(key).map_err(|e| DBError(e.to_string()))? {
                 Some(data) => Ok(Some(String::from_utf8_lossy(&data).to_string())),
-                None => Ok(None),
+                None => Ok(None)
             }
         } else {
             Ok(None)
         }
     }
-
+    
     // Hash operations
     fn hset(&self, key: &str, pairs: Vec<(String, String)>) -> Result<i64, DBError> {
         let mut storage_val = self.get_storage_value(key)?.unwrap_or(StorageValue {
             value: ValueType::Hash(HashMap::new()),
             expires_at: None,
         });
-
+        
         let hash = match &mut storage_val.value {
             ValueType::Hash(h) => h,
-            _ => {
+            _ => return Err(DBError("WRONGTYPE Operation against a key holding the wrong kind of value".to_string())),
-                return Err(DBError(
-                    "WRONGTYPE Operation against a key holding the wrong kind of value".to_string(),
-                ))
-            }
         };
-
+        
         let mut new_fields = 0i64;
         for (field, value) in pairs {
             if !hash.contains_key(&field) {
@@ -343,46 +312,40 @@ impl StorageBackend for SledStorage {
             }
             hash.insert(field, value);
         }
-
+        
         self.set_storage_value(key, storage_val)?;
         self.db.flush().map_err(|e| DBError(e.to_string()))?;
         Ok(new_fields)
     }
-
+    
     fn hget(&self, key: &str, field: &str) -> Result<Option<String>, DBError> {
         match self.get_storage_value(key)? {
             Some(storage_val) => match storage_val.value {
                 ValueType::Hash(h) => Ok(h.get(field).cloned()),
-                _ => Ok(None),
+                _ => Ok(None)
-            },
+            }
-            None => Ok(None),
+            None => Ok(None)
         }
     }
-
+    
     fn hgetall(&self, key: &str) -> Result<Vec<(String, String)>, DBError> {
         match self.get_storage_value(key)? {
             Some(storage_val) => match storage_val.value {
                 ValueType::Hash(h) => Ok(h.into_iter().collect()),
-                _ => Ok(Vec::new()),
+                _ => Ok(Vec::new())
-            },
+            }
-            None => Ok(Vec::new()),
+            None => Ok(Vec::new())
         }
     }
-
+    
-    fn hscan(
+    fn hscan(&self, key: &str, cursor: u64, pattern: Option<&str>, count: Option<u64>) -> Result<(u64, Vec<(String, String)>), DBError> {
-        &self,
-        key: &str,
-        cursor: u64,
-        pattern: Option<&str>,
-        count: Option<u64>,
-    ) -> Result<(u64, Vec<(String, String)>), DBError> {
         match self.get_storage_value(key)? {
             Some(storage_val) => match storage_val.value {
                 ValueType::Hash(h) => {
                     let mut result = Vec::new();
                     let mut current_cursor = 0u64;
                     let limit = count.unwrap_or(10) as usize;
-
+                    
                     for (field, value) in h.iter() {
                         if current_cursor >= cursor {
                             let matches = if let Some(pat) = pattern {
@@ -390,7 +353,7 @@ impl StorageBackend for SledStorage {
                             } else {
                                 true
                             };
-
+                            
                             if matches {
                                 result.push((field.clone(), value.clone()));
                                 if result.len() >= limit {
@@ -401,115 +364,107 @@ impl StorageBackend for SledStorage {
                         }
                         current_cursor += 1;
                     }
-
+                    
-                    let next_cursor = if result.len() < limit {
+                    let next_cursor = if result.len() < limit { 0 } else { current_cursor };
-                        0
-                    } else {
-                        current_cursor
-                    };
                     Ok((next_cursor, result))
                 }
-                _ => Err(DBError(
+                _ => Err(DBError("WRONGTYPE Operation against a key holding the wrong kind of value".to_string()))
-                    "WRONGTYPE Operation against a key holding the wrong kind of value".to_string(),
+            }
-                )),
+            None => Ok((0, Vec::new()))
-            },
-            None => Ok((0, Vec::new())),
         }
     }
-
+    
     fn hdel(&self, key: &str, fields: Vec<String>) -> Result<i64, DBError> {
         let mut storage_val = match self.get_storage_value(key)? {
             Some(sv) => sv,
-            None => return Ok(0),
+            None => return Ok(0)
         };
-
+        
         let hash = match &mut storage_val.value {
             ValueType::Hash(h) => h,
-            _ => return Ok(0),
+            _ => return Ok(0)
         };
-
+        
         let mut deleted = 0i64;
         for field in fields {
             if hash.remove(&field).is_some() {
                 deleted += 1;
             }
         }
-
+        
         if hash.is_empty() {
             self.del(key.to_string())?;
         } else {
             self.set_storage_value(key, storage_val)?;
             self.db.flush().map_err(|e| DBError(e.to_string()))?;
         }
-
+        
         Ok(deleted)
     }
-
+    
     fn hexists(&self, key: &str, field: &str) -> Result<bool, DBError> {
         match self.get_storage_value(key)? {
             Some(storage_val) => match storage_val.value {
                 ValueType::Hash(h) => Ok(h.contains_key(field)),
-                _ => Ok(false),
+                _ => Ok(false)
-            },
+            }
-            None => Ok(false),
+            None => Ok(false)
         }
     }
-
+    
     fn hkeys(&self, key: &str) -> Result<Vec<String>, DBError> {
         match self.get_storage_value(key)? {
             Some(storage_val) => match storage_val.value {
                 ValueType::Hash(h) => Ok(h.keys().cloned().collect()),
-                _ => Ok(Vec::new()),
+                _ => Ok(Vec::new())
-            },
+            }
-            None => Ok(Vec::new()),
+            None => Ok(Vec::new())
         }
     }
-
+    
     fn hvals(&self, key: &str) -> Result<Vec<String>, DBError> {
         match self.get_storage_value(key)? {
             Some(storage_val) => match storage_val.value {
                 ValueType::Hash(h) => Ok(h.values().cloned().collect()),
-                _ => Ok(Vec::new()),
+                _ => Ok(Vec::new())
-            },
+            }
-            None => Ok(Vec::new()),
+            None => Ok(Vec::new())
         }
     }
-
+    
     fn hlen(&self, key: &str) -> Result<i64, DBError> {
         match self.get_storage_value(key)? {
             Some(storage_val) => match storage_val.value {
                 ValueType::Hash(h) => Ok(h.len() as i64),
-                _ => Ok(0),
+                _ => Ok(0)
-            },
+            }
-            None => Ok(0),
+            None => Ok(0)
         }
     }
-
+    
     fn hmget(&self, key: &str, fields: Vec<String>) -> Result<Vec<Option<String>>, DBError> {
         match self.get_storage_value(key)? {
             Some(storage_val) => match storage_val.value {
-                ValueType::Hash(h) => Ok(fields.into_iter().map(|f| h.get(&f).cloned()).collect()),
+                ValueType::Hash(h) => {
-                _ => Ok(fields.into_iter().map(|_| None).collect()),
+                    Ok(fields.into_iter().map(|f| h.get(&f).cloned()).collect())
-            },
+                }
-            None => Ok(fields.into_iter().map(|_| None).collect()),
+                _ => Ok(fields.into_iter().map(|_| None).collect())
+            }
+            None => Ok(fields.into_iter().map(|_| None).collect())
         }
     }
-
+    
     fn hsetnx(&self, key: &str, field: &str, value: &str) -> Result<bool, DBError> {
         let mut storage_val = self.get_storage_value(key)?.unwrap_or(StorageValue {
             value: ValueType::Hash(HashMap::new()),
             expires_at: None,
         });
-
+        
         let hash = match &mut storage_val.value {
             ValueType::Hash(h) => h,
-            _ => {
+            _ => return Err(DBError("WRONGTYPE Operation against a key holding the wrong kind of value".to_string())),
-                return Err(DBError(
-                    "WRONGTYPE Operation against a key holding the wrong kind of value".to_string(),
-                ))
-            }
         };
-
+        
         if hash.contains_key(field) {
             Ok(false)
         } else {
@@ -519,66 +474,58 @@ impl StorageBackend for SledStorage {
             Ok(true)
         }
     }
-
+    
     // List operations
     fn lpush(&self, key: &str, elements: Vec<String>) -> Result<i64, DBError> {
         let mut storage_val = self.get_storage_value(key)?.unwrap_or(StorageValue {
             value: ValueType::List(Vec::new()),
             expires_at: None,
         });
-
+        
         let list = match &mut storage_val.value {
             ValueType::List(l) => l,
-            _ => {
+            _ => return Err(DBError("WRONGTYPE Operation against a key holding the wrong kind of value".to_string())),
-                return Err(DBError(
-                    "WRONGTYPE Operation against a key holding the wrong kind of value".to_string(),
-                ))
-            }
         };
-
+        
         for element in elements.into_iter().rev() {
             list.insert(0, element);
         }
-
+        
         let len = list.len() as i64;
         self.set_storage_value(key, storage_val)?;
         self.db.flush().map_err(|e| DBError(e.to_string()))?;
         Ok(len)
     }
-
+    
     fn rpush(&self, key: &str, elements: Vec<String>) -> Result<i64, DBError> {
         let mut storage_val = self.get_storage_value(key)?.unwrap_or(StorageValue {
             value: ValueType::List(Vec::new()),
             expires_at: None,
         });
-
+        
         let list = match &mut storage_val.value {
             ValueType::List(l) => l,
-            _ => {
+            _ => return Err(DBError("WRONGTYPE Operation against a key holding the wrong kind of value".to_string())),
-                return Err(DBError(
-                    "WRONGTYPE Operation against a key holding the wrong kind of value".to_string(),
-                ))
-            }
         };
-
+        
         list.extend(elements);
         let len = list.len() as i64;
         self.set_storage_value(key, storage_val)?;
         self.db.flush().map_err(|e| DBError(e.to_string()))?;
         Ok(len)
     }
-
+    
     fn lpop(&self, key: &str, count: u64) -> Result<Vec<String>, DBError> {
         let mut storage_val = match self.get_storage_value(key)? {
             Some(sv) => sv,
-            None => return Ok(Vec::new()),
+            None => return Ok(Vec::new())
         };
-
+        
         let list = match &mut storage_val.value {
             ValueType::List(l) => l,
-            _ => return Ok(Vec::new()),
+            _ => return Ok(Vec::new())
         };
-
+        
         let mut result = Vec::new();
         for _ in 0..count.min(list.len() as u64) {
             if let Some(elem) = list.first() {
@@ -586,55 +533,55 @@ impl StorageBackend for SledStorage {
                 list.remove(0);
             }
         }
-
+        
         if list.is_empty() {
             self.del(key.to_string())?;
         } else {
             self.set_storage_value(key, storage_val)?;
             self.db.flush().map_err(|e| DBError(e.to_string()))?;
         }
-
+        
         Ok(result)
     }
-
+    
     fn rpop(&self, key: &str, count: u64) -> Result<Vec<String>, DBError> {
         let mut storage_val = match self.get_storage_value(key)? {
             Some(sv) => sv,
-            None => return Ok(Vec::new()),
+            None => return Ok(Vec::new())
         };
-
+        
         let list = match &mut storage_val.value {
             ValueType::List(l) => l,
-            _ => return Ok(Vec::new()),
+            _ => return Ok(Vec::new())
         };
-
+        
         let mut result = Vec::new();
         for _ in 0..count.min(list.len() as u64) {
             if let Some(elem) = list.pop() {
                 result.push(elem);
             }
         }
-
+        
         if list.is_empty() {
             self.del(key.to_string())?;
         } else {
             self.set_storage_value(key, storage_val)?;
             self.db.flush().map_err(|e| DBError(e.to_string()))?;
         }
-
+        
         Ok(result)
     }
-
+    
     fn llen(&self, key: &str) -> Result<i64, DBError> {
         match self.get_storage_value(key)? {
             Some(storage_val) => match storage_val.value {
                 ValueType::List(l) => Ok(l.len() as i64),
-                _ => Ok(0),
+                _ => Ok(0)
-            },
+            }
-            None => Ok(0),
+            None => Ok(0)
         }
     }
-
+    
     fn lindex(&self, key: &str, index: i64) -> Result<Option<String>, DBError> {
         match self.get_storage_value(key)? {
             Some(storage_val) => match storage_val.value {
@@ -644,19 +591,19 @@ impl StorageBackend for SledStorage {
                     } else {
                         index
                     };
-
+                    
                     if actual_index >= 0 && (actual_index as usize) < list.len() {
                         Ok(Some(list[actual_index as usize].clone()))
                     } else {
                         Ok(None)
                     }
                 }
-                _ => Ok(None),
+                _ => Ok(None)
-            },
+            }
-            None => Ok(None),
+            None => Ok(None)
         }
     }
-
+    
     fn lrange(&self, key: &str, start: i64, stop: i64) -> Result<Vec<String>, DBError> {
         match self.get_storage_value(key)? {
             Some(storage_val) => match storage_val.value {
@@ -664,68 +611,68 @@ impl StorageBackend for SledStorage {
                     if list.is_empty() {
                         return Ok(Vec::new());
                     }
-
+                    
                     let len = list.len() as i64;
-                    let start_idx = if start < 0 {
+                    let start_idx = if start < 0 { 
-                        std::cmp::max(0, len + start)
+                        std::cmp::max(0, len + start) 
-                    } else {
+                    } else { 
-                        std::cmp::min(start, len)
+                        std::cmp::min(start, len) 
                     };
-                    let stop_idx = if stop < 0 {
+                    let stop_idx = if stop < 0 { 
-                        std::cmp::max(-1, len + stop)
+                        std::cmp::max(-1, len + stop) 
-                    } else {
+                    } else { 
-                        std::cmp::min(stop, len - 1)
+                        std::cmp::min(stop, len - 1) 
                     };
-
+                    
                     if start_idx > stop_idx || start_idx >= len {
                         return Ok(Vec::new());
                     }
-
+                    
                     let start_usize = start_idx as usize;
                     let stop_usize = (stop_idx + 1) as usize;
-
+                    
                     Ok(list[start_usize..std::cmp::min(stop_usize, list.len())].to_vec())
                 }
-                _ => Ok(Vec::new()),
+                _ => Ok(Vec::new())
-            },
+            }
-            None => Ok(Vec::new()),
+            None => Ok(Vec::new())
         }
     }
-
+    
     fn ltrim(&self, key: &str, start: i64, stop: i64) -> Result<(), DBError> {
         let mut storage_val = match self.get_storage_value(key)? {
             Some(sv) => sv,
-            None => return Ok(()),
+            None => return Ok(())
         };
-
+        
         let list = match &mut storage_val.value {
             ValueType::List(l) => l,
-            _ => return Ok(()),
+            _ => return Ok(())
         };
-
+        
         if list.is_empty() {
             return Ok(());
         }
-
+        
         let len = list.len() as i64;
-        let start_idx = if start < 0 {
+        let start_idx = if start < 0 { 
-            std::cmp::max(0, len + start)
+            std::cmp::max(0, len + start) 
-        } else {
+        } else { 
-            std::cmp::min(start, len)
+            std::cmp::min(start, len) 
         };
-        let stop_idx = if stop < 0 {
+        let stop_idx = if stop < 0 { 
-            std::cmp::max(-1, len + stop)
+            std::cmp::max(-1, len + stop) 
-        } else {
+        } else { 
-            std::cmp::min(stop, len - 1)
+            std::cmp::min(stop, len - 1) 
         };
-
+        
         if start_idx > stop_idx || start_idx >= len {
             self.del(key.to_string())?;
         } else {
             let start_usize = start_idx as usize;
             let stop_usize = (stop_idx + 1) as usize;
             *list = list[start_usize..std::cmp::min(stop_usize, list.len())].to_vec();
-
+            
             if list.is_empty() {
                 self.del(key.to_string())?;
             } else {
@@ -733,23 +680,23 @@ impl StorageBackend for SledStorage {
                 self.db.flush().map_err(|e| DBError(e.to_string()))?;
             }
         }
-
+        
         Ok(())
     }
-
+    
     fn lrem(&self, key: &str, count: i64, element: &str) -> Result<i64, DBError> {
         let mut storage_val = match self.get_storage_value(key)? {
             Some(sv) => sv,
-            None => return Ok(0),
+            None => return Ok(0)
         };
-
+        
         let list = match &mut storage_val.value {
             ValueType::List(l) => l,
-            _ => return Ok(0),
+            _ => return Ok(0)
         };
-
+        
         let mut removed = 0i64;
-
+        
         if count == 0 {
             // Remove all occurrences
             let original_len = list.len();
@@ -778,17 +725,17 @@ impl StorageBackend for SledStorage {
                 }
             }
         }
-
+        
         if list.is_empty() {
             self.del(key.to_string())?;
         } else {
             self.set_storage_value(key, storage_val)?;
             self.db.flush().map_err(|e| DBError(e.to_string()))?;
         }
-
+        
         Ok(removed)
     }
-
+    
     // Expiration
     fn ttl(&self, key: &str) -> Result<i64, DBError> {
         match self.get_storage_value(key)? {
@@ -804,40 +751,40 @@ impl StorageBackend for SledStorage {
                     Ok(-1) // Key exists but has no expiration
                 }
             }
-            None => Ok(-2), // Key does not exist
+            None => Ok(-2) // Key does not exist
         }
     }
-
+    
     fn expire_seconds(&self, key: &str, secs: u64) -> Result<bool, DBError> {
         let mut storage_val = match self.get_storage_value(key)? {
             Some(sv) => sv,
-            None => return Ok(false),
+            None => return Ok(false)
         };
-
+        
         storage_val.expires_at = Some(Self::now_millis() + (secs as u128) * 1000);
         self.set_storage_value(key, storage_val)?;
         self.db.flush().map_err(|e| DBError(e.to_string()))?;
         Ok(true)
     }
-
+    
     fn pexpire_millis(&self, key: &str, ms: u128) -> Result<bool, DBError> {
         let mut storage_val = match self.get_storage_value(key)? {
             Some(sv) => sv,
-            None => return Ok(false),
+            None => return Ok(false)
         };
-
+        
         storage_val.expires_at = Some(Self::now_millis() + ms);
         self.set_storage_value(key, storage_val)?;
         self.db.flush().map_err(|e| DBError(e.to_string()))?;
         Ok(true)
     }
-
+    
     fn persist(&self, key: &str) -> Result<bool, DBError> {
         let mut storage_val = match self.get_storage_value(key)? {
             Some(sv) => sv,
-            None => return Ok(false),
+            None => return Ok(false)
         };
-
+        
         if storage_val.expires_at.is_some() {
             storage_val.expires_at = None;
             self.set_storage_value(key, storage_val)?;
@@ -847,41 +794,37 @@ impl StorageBackend for SledStorage {
             Ok(false)
         }
     }
-
+    
     fn expire_at_seconds(&self, key: &str, ts_secs: i64) -> Result<bool, DBError> {
         let mut storage_val = match self.get_storage_value(key)? {
             Some(sv) => sv,
-            None => return Ok(false),
+            None => return Ok(false)
-        };
-
-        let expires_at_ms: u128 = if ts_secs <= 0 {
-            0
-        } else {
-            (ts_secs as u128) * 1000
         };
+        
+        let expires_at_ms: u128 = if ts_secs <= 0 { 0 } else { (ts_secs as u128) * 1000 };
         storage_val.expires_at = Some(expires_at_ms);
         self.set_storage_value(key, storage_val)?;
         self.db.flush().map_err(|e| DBError(e.to_string()))?;
         Ok(true)
     }
-
+    
     fn pexpire_at_millis(&self, key: &str, ts_ms: i64) -> Result<bool, DBError> {
         let mut storage_val = match self.get_storage_value(key)? {
             Some(sv) => sv,
-            None => return Ok(false),
+            None => return Ok(false)
         };
-
+        
         let expires_at_ms: u128 = if ts_ms <= 0 { 0 } else { ts_ms as u128 };
         storage_val.expires_at = Some(expires_at_ms);
         self.set_storage_value(key, storage_val)?;
         self.db.flush().map_err(|e| DBError(e.to_string()))?;
         Ok(true)
     }
-
+    
     fn is_encrypted(&self) -> bool {
         self.crypto.is_some()
     }
-
+    
     fn info(&self) -> Result<Vec<(String, String)>, DBError> {
         let dbsize = self.dbsize()?;
         Ok(vec![
@@ -899,4 +842,4 @@ impl StorageBackend for SledStorage {
             crypto: self.crypto.clone(),
         })
     }
-}
+}

src/storage_trait.rs

@@ -13,22 +13,11 @@ pub trait StorageBackend: Send + Sync {
     fn dbsize(&self) -> Result<i64, DBError>;
     fn flushdb(&self) -> Result<(), DBError>;
     fn get_key_type(&self, key: &str) -> Result<Option<String>, DBError>;
-
+    
     // Scanning
-    fn scan(
+    fn scan(&self, cursor: u64, pattern: Option<&str>, count: Option<u64>) -> Result<(u64, Vec<(String, String)>), DBError>;
-        &self,
+    fn hscan(&self, key: &str, cursor: u64, pattern: Option<&str>, count: Option<u64>) -> Result<(u64, Vec<(String, String)>), DBError>;
-        cursor: u64,
+    
-        pattern: Option<&str>,
-        count: Option<u64>,
-    ) -> Result<(u64, Vec<(String, String)>), DBError>;
-    fn hscan(
-        &self,
-        key: &str,
-        cursor: u64,
-        pattern: Option<&str>,
-        count: Option<u64>,
-    ) -> Result<(u64, Vec<(String, String)>), DBError>;
-
     // Hash operations
     fn hset(&self, key: &str, pairs: Vec<(String, String)>) -> Result<i64, DBError>;
     fn hget(&self, key: &str, field: &str) -> Result<Option<String>, DBError>;
@@ -40,7 +29,7 @@ pub trait StorageBackend: Send + Sync {
     fn hlen(&self, key: &str) -> Result<i64, DBError>;
     fn hmget(&self, key: &str, fields: Vec<String>) -> Result<Vec<Option<String>>, DBError>;
     fn hsetnx(&self, key: &str, field: &str, value: &str) -> Result<bool, DBError>;
-
+    
     // List operations
     fn lpush(&self, key: &str, elements: Vec<String>) -> Result<i64, DBError>;
     fn rpush(&self, key: &str, elements: Vec<String>) -> Result<i64, DBError>;
@@ -51,7 +40,7 @@ pub trait StorageBackend: Send + Sync {
     fn lrange(&self, key: &str, start: i64, stop: i64) -> Result<Vec<String>, DBError>;
     fn ltrim(&self, key: &str, start: i64, stop: i64) -> Result<(), DBError>;
     fn lrem(&self, key: &str, count: i64, element: &str) -> Result<i64, DBError>;
-
+    
     // Expiration
     fn ttl(&self, key: &str) -> Result<i64, DBError>;
     fn expire_seconds(&self, key: &str, secs: u64) -> Result<bool, DBError>;
@@ -59,11 +48,11 @@ pub trait StorageBackend: Send + Sync {
     fn persist(&self, key: &str) -> Result<bool, DBError>;
     fn expire_at_seconds(&self, key: &str, ts_secs: i64) -> Result<bool, DBError>;
     fn pexpire_at_millis(&self, key: &str, ts_ms: i64) -> Result<bool, DBError>;
-
+    
     // Metadata
     fn is_encrypted(&self) -> bool;
     fn info(&self) -> Result<Vec<(String, String)>, DBError>;
-
+    
     // Clone to Arc for sharing
     fn clone_arc(&self) -> Arc<dyn StorageBackend>;
-}
+}

src/sym.rs

@@ -0,0 +1,123 @@
+//! sym.rs — Stateless symmetric encryption (Phase 1)
+//!
+//! Commands implemented (RESP):
+//! - SYM KEYGEN
+//! - SYM ENCRYPT <key_b64> <message>
+//! - SYM DECRYPT <key_b64> <ciphertext_b64>
+//!
+//! Notes:
+//! - Raw key: exactly 32 bytes, provided as Base64 in commands.
+//! - Cipher: XChaCha20-Poly1305 (AEAD) without AAD in Phase 1
+//! - Ciphertext binary layout: [version:1][nonce:24][ciphertext||tag]
+//! - Encoding for wire I/O: Base64
+
+use base64::{engine::general_purpose::STANDARD as B64, Engine as _};
+use chacha20poly1305::{
+    aead::{Aead, KeyInit, OsRng},
+    XChaCha20Poly1305, XNonce,
+};
+use rand::RngCore;
+
+use crate::protocol::Protocol;
+
+const VERSION: u8 = 1;
+const NONCE_LEN: usize = 24;
+const TAG_LEN: usize = 16;
+
+#[derive(Debug)]
+pub enum SymWireError {
+    InvalidKey,
+    BadEncoding,
+    BadFormat,
+    BadVersion(u8),
+    Crypto,
+}
+
+impl SymWireError {
+    fn to_protocol(self) -> Protocol {
+        match self {
+            SymWireError::InvalidKey => Protocol::err("ERR sym: invalid key"),
+            SymWireError::BadEncoding => Protocol::err("ERR sym: bad encoding"),
+            SymWireError::BadFormat => Protocol::err("ERR sym: bad format"),
+            SymWireError::BadVersion(v) => Protocol::err(&format!("ERR sym: unsupported version {}", v)),
+            SymWireError::Crypto => Protocol::err("ERR sym: auth failed"),
+        }
+    }
+}
+
+fn decode_key_b64(s: &str) -> Result<chacha20poly1305::Key, SymWireError> {
+    let bytes = B64.decode(s.as_bytes()).map_err(|_| SymWireError::BadEncoding)?;
+    if bytes.len() != 32 {
+        return Err(SymWireError::InvalidKey);
+    }
+    Ok(chacha20poly1305::Key::from_slice(&bytes).to_owned())
+}
+
+fn encrypt_blob(key: &chacha20poly1305::Key, plaintext: &[u8]) -> Result<Vec<u8>, SymWireError> {
+    let cipher = XChaCha20Poly1305::new(key);
+
+    let mut nonce_bytes = [0u8; NONCE_LEN];
+    OsRng.fill_bytes(&mut nonce_bytes);
+    let nonce = XNonce::from_slice(&nonce_bytes);
+
+    let mut out = Vec::with_capacity(1 + NONCE_LEN + plaintext.len() + TAG_LEN);
+    out.push(VERSION);
+    out.extend_from_slice(&nonce_bytes);
+
+    let ct = cipher.encrypt(nonce, plaintext).map_err(|_| SymWireError::Crypto)?;
+    out.extend_from_slice(&ct);
+    Ok(out)
+}
+
+fn decrypt_blob(key: &chacha20poly1305::Key, blob: &[u8]) -> Result<Vec<u8>, SymWireError> {
+    if blob.len() < 1 + NONCE_LEN + TAG_LEN {
+        return Err(SymWireError::BadFormat);
+    }
+    let ver = blob[0];
+    if ver != VERSION {
+        return Err(SymWireError::BadVersion(ver));
+    }
+    let nonce = XNonce::from_slice(&blob[1..1 + NONCE_LEN]);
+    let ct = &blob[1 + NONCE_LEN..];
+
+    let cipher = XChaCha20Poly1305::new(key);
+    cipher.decrypt(nonce, ct).map_err(|_| SymWireError::Crypto)
+}
+
+// ---------- Command handlers (RESP) ----------
+
+pub async fn cmd_sym_keygen() -> Protocol {
+    let mut key_bytes = [0u8; 32];
+    OsRng.fill_bytes(&mut key_bytes);
+    let key_b64 = B64.encode(key_bytes);
+    Protocol::BulkString(key_b64)
+}
+
+pub async fn cmd_sym_encrypt(key_b64: &str, message: &str) -> Protocol {
+    let key = match decode_key_b64(key_b64) {
+        Ok(k) => k,
+        Err(e) => return e.to_protocol(),
+    };
+    match encrypt_blob(&key, message.as_bytes()) {
+        Ok(blob) => Protocol::BulkString(B64.encode(blob)),
+        Err(e) => e.to_protocol(),
+    }
+}
+
+pub async fn cmd_sym_decrypt(key_b64: &str, ct_b64: &str) -> Protocol {
+    let key = match decode_key_b64(key_b64) {
+        Ok(k) => k,
+        Err(e) => return e.to_protocol(),
+    };
+    let blob = match B64.decode(ct_b64.as_bytes()) {
+        Ok(b) => b,
+        Err(_) => return SymWireError::BadEncoding.to_protocol(),
+    };
+    match decrypt_blob(&key, &blob) {
+        Ok(pt) => match String::from_utf8(pt) {
+            Ok(s) => Protocol::BulkString(s),
+            Err(_) => Protocol::err("ERR sym: invalid UTF-8 plaintext"),
+        },
+        Err(e) => e.to_protocol(),
+    }
+}

src/tantivy_search.rs

@@ -7,10 +7,13 @@ use tantivy::{
     collector::TopDocs,
     directory::MmapDirectory,
     query::{BooleanQuery, Occur, Query, QueryParser, TermQuery},
-    schema::{Field, Schema, TextFieldIndexing, TextOptions, Value, STORED, STRING},
+    schema::{
+        DateOptions, Field, IndexRecordOption, NumericOptions, Schema, TextFieldIndexing, TextOptions, STORED, STRING,
+    },
     tokenizer::TokenizerManager,
-    DateTime, Index, IndexReader, IndexWriter, ReloadPolicy, TantivyDocument, Term,
+    DateTime, Index, IndexReader, IndexWriter, TantivyDocument, Term,
 };
+use tantivy::schema::Value;
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub enum FieldDef {
@@ -121,25 +124,20 @@ impl TantivySearch {
                     fast: _fast,
                 } => {
                     let mut text_options = TextOptions::default();
-
                     if *stored {
                         text_options = text_options.set_stored();
                     }
-
                     if *indexed {
                         let indexing_options = if *tokenized {
                             TextFieldIndexing::default()
                                 .set_tokenizer("default")
-                                .set_index_option(
+                                .set_index_option(IndexRecordOption::WithFreqsAndPositions)
-                                    tantivy::schema::IndexRecordOption::WithFreqsAndPositions,
-                                )
                         } else {
                             TextFieldIndexing::default()
                                 .set_tokenizer("raw")
-                                .set_index_option(tantivy::schema::IndexRecordOption::Basic)
+                                .set_index_option(IndexRecordOption::Basic)
                         };
                         text_options = text_options.set_indexing_options(indexing_options);
-
                         let f = schema_builder.add_text_field(&field_name, text_options);
                         if *tokenized {
                             default_search_fields.push(f);
@@ -156,7 +154,7 @@ impl TantivySearch {
                     precision,
                 } => match precision {
                     NumericType::I64 => {
-                        let mut opts = tantivy::schema::NumericOptions::default();
+                        let mut opts = NumericOptions::default();
                         if *stored {
                             opts = opts.set_stored();
                         }
@@ -169,7 +167,7 @@ impl TantivySearch {
                         schema_builder.add_i64_field(&field_name, opts)
                     }
                     NumericType::U64 => {
-                        let mut opts = tantivy::schema::NumericOptions::default();
+                        let mut opts = NumericOptions::default();
                         if *stored {
                             opts = opts.set_stored();
                         }
@@ -182,7 +180,7 @@ impl TantivySearch {
                         schema_builder.add_u64_field(&field_name, opts)
                     }
                     NumericType::F64 => {
-                        let mut opts = tantivy::schema::NumericOptions::default();
+                        let mut opts = NumericOptions::default();
                         if *stored {
                             opts = opts.set_stored();
                         }
@@ -195,7 +193,7 @@ impl TantivySearch {
                         schema_builder.add_f64_field(&field_name, opts)
                     }
                     NumericType::Date => {
-                        let mut opts = tantivy::schema::DateOptions::default();
+                        let mut opts = DateOptions::default();
                         if *stored {
                             opts = opts.set_stored();
                         }
@@ -220,23 +218,21 @@ impl TantivySearch {
                     text_options = text_options.set_indexing_options(
                         TextFieldIndexing::default()
                             .set_tokenizer("raw")
-                            .set_index_option(tantivy::schema::IndexRecordOption::Basic),
+                            .set_index_option(IndexRecordOption::Basic),
                     );
                     schema_builder.add_text_field(&field_name, text_options)
                 }
                 FieldDef::Geo { stored } => {
                     // For now, store as two f64 fields for lat/lon
-                    let mut opts = tantivy::schema::NumericOptions::default();
+                    let mut opts = NumericOptions::default();
                     if *stored {
                         opts = opts.set_stored();
                     }
                     opts = opts.set_indexed().set_fast();
-
                     let lat_field =
                         schema_builder.add_f64_field(&format!("{}_lat", field_name), opts.clone());
                     let lon_field =
                         schema_builder.add_f64_field(&format!("{}_lon", field_name), opts);
-
                     fields.insert(
                         format!("{}_lat", field_name),
                         (
@@ -264,7 +260,6 @@ impl TantivySearch {
                     continue; // Skip adding the geo field itself
                 }
             };
-
             fields.insert(field_name.clone(), (field, field_def));
         }
 
@@ -278,9 +273,8 @@ impl TantivySearch {
         // Create or open index
         let dir = MmapDirectory::open(&index_path)
             .map_err(|e| DBError(format!("Failed to open index directory: {}", e)))?;
-
+        let mut index =
-        let mut index = Index::open_or_create(dir, schema)
+            Index::open_or_create(dir, schema).map_err(|e| DBError(format!("Failed to create index: {}", e)))?;
-            .map_err(|e| DBError(format!("Failed to create index: {}", e)))?;
 
         // Configure tokenizers
         let tokenizer_manager = TokenizerManager::default();
@@ -289,11 +283,8 @@ impl TantivySearch {
         let writer = index
             .writer(15_000_000)
             .map_err(|e| DBError(format!("Failed to create index writer: {}", e)))?;
-
         let reader = index
-            .reader_builder()
+            .reader()
-            .reload_policy(ReloadPolicy::OnCommitWithDelay)
-            .try_into()
             .map_err(|e| DBError(format!("Failed to create reader: {}", e)))?;
 
         let config = config.unwrap_or_default();
@@ -370,14 +361,11 @@ impl TantivySearch {
                         } else {
                             field_value.clone()
                         };
-
-                        // Store tags as separate terms for efficient filtering
                         for tag in tags.split(separator.as_str()) {
                             doc.add_text(*field, tag.trim());
                         }
                     }
                     FieldDef::Geo { .. } => {
-                        // Parse "lat,lon" format
                         let parts: Vec<&str> = field_value.split(',').collect();
                         if parts.len() == 2 {
                             if let (Ok(lat), Ok(lon)) =
@@ -403,11 +391,13 @@ impl TantivySearch {
         writer
             .add_document(doc)
             .map_err(|e| DBError(format!("Failed to add document: {}", e)))?;
-
         writer
             .commit()
             .map_err(|e| DBError(format!("Failed to commit: {}", e)))?;
-
+        // Make new documents visible to searches
+        self.reader
+            .reload()
+            .map_err(|e| DBError(format!("Failed to reload reader: {}", e)))?;
         Ok(())
     }
 
@@ -416,84 +406,117 @@ impl TantivySearch {
         query_str: &str,
         options: SearchOptions,
     ) -> Result<SearchResults, DBError> {
+        // Ensure reader is up to date with latest commits
+        self.reader
+            .reload()
+            .map_err(|e| DBError(format!("Failed to reload reader: {}", e)))?;
         let searcher = self.reader.searcher();
 
-        // Parse query based on search fields
+        // Ensure we have searchable fields
-        let query: Box<dyn Query> = if self.index_schema.default_search_fields.is_empty() {
+        if self.index_schema.default_search_fields.is_empty() {
-            return Err(DBError(
+            return Err(DBError("No searchable fields defined in schema".to_string()));
-                "No searchable fields defined in schema".to_string(),
+        }
-            ));
-        } else {
-            let query_parser = QueryParser::for_index(
-                &self.index,
-                self.index_schema.default_search_fields.clone(),
-            );
 
-            Box::new(
+        // Parse query based on search fields
-                query_parser
+        let query_parser = QueryParser::for_index(
-                    .parse_query(query_str)
+            &self.index,
-                    .map_err(|e| DBError(format!("Failed to parse query: {}", e)))?,
+            self.index_schema.default_search_fields.clone(),
-            )
+        );
-        };
+        let parsed_query = query_parser
+            .parse_query(query_str)
+            .map_err(|e| DBError(format!("Failed to parse query: {}", e)))?;
+        let mut clauses: Vec<(Occur, Box<dyn Query>)> = vec![(Occur::Must, parsed_query)];
 
         // Apply filters if any
-        let final_query = if !options.filters.is_empty() {
+        for filter in options.filters {
-            let mut clauses: Vec<(Occur, Box<dyn Query>)> = vec![(Occur::Must, query)];
+            if let Some((field, field_def)) = self.index_schema.fields.get(&filter.field) {
-
+                match filter.filter_type {
-            // Add filters
+                    FilterType::Equals(value) => {
-            for filter in options.filters {
+                        match field_def {
-                if let Some((field, _)) = self.index_schema.fields.get(&filter.field) {
+                            FieldDef::Text { .. } | FieldDef::Tag { .. } => {
-                    match filter.filter_type {
+                                let term_query =
-                        FilterType::Equals(value) => {
+                                    TermQuery::new(Term::from_field_text(*field, &value), IndexRecordOption::Basic);
+                                clauses.push((Occur::Must, Box::new(term_query)));
+                            }
+                            FieldDef::Numeric { precision, .. } => {
+                                // Equals on numeric fields: parse to the right numeric type and use term query
+                                match precision {
+                                    NumericType::I64 => {
+                                        if let Ok(v) = value.parse::<i64>() {
+                                            let term = Term::from_field_i64(*field, v);
+                                            let tq = TermQuery::new(term, IndexRecordOption::Basic);
+                                            clauses.push((Occur::Must, Box::new(tq)));
+                                        }
+                                    }
+                                    NumericType::U64 => {
+                                        if let Ok(v) = value.parse::<u64>() {
+                                            let term = Term::from_field_u64(*field, v);
+                                            let tq = TermQuery::new(term, IndexRecordOption::Basic);
+                                            clauses.push((Occur::Must, Box::new(tq)));
+                                        }
+                                    }
+                                    NumericType::F64 => {
+                                        if let Ok(v) = value.parse::<f64>() {
+                                            let term = Term::from_field_f64(*field, v);
+                                            let tq = TermQuery::new(term, IndexRecordOption::Basic);
+                                            clauses.push((Occur::Must, Box::new(tq)));
+                                        }
+                                    }
+                                    NumericType::Date => {
+                                        if let Ok(v) = value.parse::<i64>() {
+                                            let dt = DateTime::from_timestamp_millis(v);
+                                            let term = Term::from_field_date(*field, dt);
+                                            let tq = TermQuery::new(term, IndexRecordOption::Basic);
+                                            clauses.push((Occur::Must, Box::new(tq)));
+                                        }
+                                    }
+                                }
+                            }
+                            FieldDef::Geo { .. } => {
+                                // Geo equals isn't supported in this simplified version
+                            }
+                        }
+                    }
+                    FilterType::Range { .. } => {
+                        // TODO: Implement numeric range queries by building a RangeQuery per type
+                    }
+                    FilterType::InSet(values) => {
+                        // OR across values
+                        let mut sub_clauses: Vec<(Occur, Box<dyn Query>)> = vec![];
+                        for value in values {
                             let term_query = TermQuery::new(
                                 Term::from_field_text(*field, &value),
-                                tantivy::schema::IndexRecordOption::Basic,
+                                IndexRecordOption::Basic,
                             );
-                            clauses.push((Occur::Must, Box::new(term_query)));
+                            sub_clauses.push((Occur::Should, Box::new(term_query)));
-                        }
-                        FilterType::Range { min: _, max: _ } => {
-                            // Would need numeric field handling here
-                            // Simplified for now
-                        }
-                        FilterType::InSet(values) => {
-                            let mut sub_clauses: Vec<(Occur, Box<dyn Query>)> = vec![];
-                            for value in values {
-                                let term_query = TermQuery::new(
-                                    Term::from_field_text(*field, &value),
-                                    tantivy::schema::IndexRecordOption::Basic,
-                                );
-                                sub_clauses.push((Occur::Should, Box::new(term_query)));
-                            }
-                            clauses.push((Occur::Must, Box::new(BooleanQuery::new(sub_clauses))));
                         }
+                        clauses.push((Occur::Must, Box::new(BooleanQuery::new(sub_clauses))));
                     }
                 }
             }
+        }
 
-            Box::new(BooleanQuery::new(clauses))
+        let final_query: Box<dyn Query> = if clauses.len() == 1 {
+            clauses.pop().unwrap().1
         } else {
-            query
+            Box::new(BooleanQuery::new(clauses))
         };
 
         // Execute search
         let top_docs = searcher
-            .search(
+            .search(&*final_query, &TopDocs::with_limit(options.limit + options.offset))
-                &*final_query,
-                &TopDocs::with_limit(options.limit + options.offset),
-            )
             .map_err(|e| DBError(format!("Search failed: {}", e)))?;
-
         let total_hits = top_docs.len();
         let mut documents = Vec::new();
 
-        for (score, doc_address) in top_docs.iter().skip(options.offset).take(options.limit) {
+        for (score, doc_address) in top_docs.into_iter().skip(options.offset).take(options.limit) {
             let retrieved_doc: TantivyDocument = searcher
-                .doc(*doc_address)
+                .doc(doc_address)
                 .map_err(|e| DBError(format!("Failed to retrieve doc: {}", e)))?;
 
             let mut doc_fields = HashMap::new();
 
-            // Extract all stored fields
+            // Extract stored fields (or synthesize)
             for (field_name, (field, field_def)) in &self.index_schema.fields {
                 match field_def {
                     FieldDef::Text { stored, .. } | FieldDef::Tag { stored, .. } => {
@@ -527,7 +550,6 @@ impl TantivySearch {
                                     .and_then(|v| v.as_datetime())
                                     .map(|v| v.into_timestamp_millis().to_string()),
                             };
-
                             if let Some(v) = value_str {
                                 doc_fields.insert(field_name.clone(), v);
                             }
@@ -547,10 +569,8 @@ impl TantivySearch {
                                 .get(&format!("{}_lon", field_name))
                                 .unwrap()
                                 .0;
-
                             let lat = retrieved_doc.get_first(lat_field).and_then(|v| v.as_f64());
                             let lon = retrieved_doc.get_first(lon_field).and_then(|v| v.as_f64());
-
                             if let (Some(lat), Some(lon)) = (lat, lon) {
                                 doc_fields.insert(field_name.clone(), format!("{},{}", lat, lon));
                             }
@@ -561,7 +581,7 @@ impl TantivySearch {
 
             documents.push(SearchDocument {
                 fields: doc_fields,
-                score: *score,
+                score,
             });
         }
 
@@ -574,7 +594,6 @@ impl TantivySearch {
     pub fn get_info(&self) -> Result<IndexInfo, DBError> {
         let searcher = self.reader.searcher();
         let num_docs = searcher.num_docs();
-
         let fields_info: Vec<FieldInfo> = self
             .index_schema
             .fields
@@ -584,7 +603,6 @@ impl TantivySearch {
                 field_type: format!("{:?}", def),
             })
             .collect();
-
         Ok(IndexInfo {
             name: self.name.clone(),
             num_docs,
@@ -592,6 +610,40 @@ impl TantivySearch {
             config: self.config.clone(),
         })
     }
+
+    /// Delete a document by its _id term. Returns true if the document existed before deletion.
+    pub fn delete_document_by_id(&self, doc_id: &str) -> Result<bool, DBError> {
+        // Determine existence by running a tiny term query
+        let existed = if let Some((id_field, _)) = self.index_schema.fields.get("_id") {
+            let term = Term::from_field_text(*id_field, doc_id);
+            let searcher = self.reader.searcher();
+            let tq = TermQuery::new(term.clone(), IndexRecordOption::Basic);
+            let hits = searcher
+                .search(&tq, &TopDocs::with_limit(1))
+                .map_err(|e| DBError(format!("Failed to search for existing doc: {}", e)))?;
+            !hits.is_empty()
+        } else {
+            false
+        };
+
+        // Perform deletion and commit
+        let mut writer = self
+            .writer
+            .write()
+            .map_err(|e| DBError(format!("Failed to acquire writer lock: {}", e)))?;
+        if let Some((id_field, _)) = self.index_schema.fields.get("_id") {
+            writer.delete_term(Term::from_field_text(*id_field, doc_id));
+        }
+        writer
+            .commit()
+            .map_err(|e| DBError(format!("Failed to commit delete: {}", e)))?;
+        // Refresh reader to observe deletion
+        self.reader
+            .reload()
+            .map_err(|e| DBError(format!("Failed to reload reader: {}", e)))?;
+
+        Ok(existed)
+    }
 }
 
 #[derive(Debug, Clone)]
@@ -654,4 +706,4 @@ pub struct IndexInfo {
 pub struct FieldInfo {
     pub name: String,
     pub field_type: String,
-}
+}

test_herodb.sh

@@ -1,10 +1,11 @@
 #!/bin/bash
+set -euo pipefail
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+cd "$SCRIPT_DIR"
 
 # Test script for HeroDB - Redis-compatible database with redb backend
 # This script starts the server and runs comprehensive tests
 
-set -e
-
 # Colors for output
 RED='\033[0;31m'
 GREEN='\033[0;32m'

tests/debug_hset.rs

@@ -1,4 +1,5 @@
-use herodb::{options::DBOption, server::Server};
+use herodb::{server::Server, options::DBOption};
+use std::path::PathBuf;
 use std::time::Duration;
 use tokio::io::{AsyncReadExt, AsyncWriteExt};
 use tokio::net::TcpStream;
@@ -7,7 +8,7 @@ use tokio::time::sleep;
 // Helper function to send command and get response
 async fn send_command(stream: &mut TcpStream, command: &str) -> String {
     stream.write_all(command.as_bytes()).await.unwrap();
-
+    
     let mut buffer = [0; 1024];
     let n = stream.read(&mut buffer).await.unwrap();
     String::from_utf8_lossy(&buffer[..n]).to_string()
@@ -19,59 +20,52 @@ async fn debug_hset_simple() {
     let test_dir = "/tmp/herodb_debug_hset";
     let _ = std::fs::remove_dir_all(test_dir);
     std::fs::create_dir_all(test_dir).unwrap();
-
+    
     let port = 16500;
     let option = DBOption {
-        dir: test_dir.to_string(),
+        dir: PathBuf::from(test_dir),
         port,
         debug: false,
         encrypt: false,
         encryption_key: None,
         backend: herodb::options::BackendType::Redb,
+        admin_secret: "test-admin".to_string(),
     };
-
+    
     let mut server = Server::new(option).await;
-
+    
     // Start server in background
     tokio::spawn(async move {
         let listener = tokio::net::TcpListener::bind(format!("127.0.0.1:{}", port))
             .await
             .unwrap();
-
+        
         loop {
             if let Ok((stream, _)) = listener.accept().await {
                 let _ = server.handle(stream).await;
             }
         }
     });
-
+    
     sleep(Duration::from_millis(200)).await;
-
+    
-    let mut stream = TcpStream::connect(format!("127.0.0.1:{}", port))
+    let mut stream = TcpStream::connect(format!("127.0.0.1:{}", port)).await.unwrap();
-        .await
+    // Acquire ReadWrite permissions on this connection
-        .unwrap();
+    let resp = send_command(
-
+        &mut stream,
+        "*4\r\n$6\r\nSELECT\r\n$1\r\n0\r\n$3\r\nKEY\r\n$10\r\ntest-admin\r\n",
+    ).await;
+    assert!(resp.contains("OK"), "Failed SELECT handshake: {}", resp);
+    
     // Test simple HSET
     println!("Testing HSET...");
-    let response = send_command(
+    let response = send_command(&mut stream, "*4\r\n$4\r\nHSET\r\n$4\r\nhash\r\n$6\r\nfield1\r\n$6\r\nvalue1\r\n").await;
-        &mut stream,
-        "*4\r\n$4\r\nHSET\r\n$4\r\nhash\r\n$6\r\nfield1\r\n$6\r\nvalue1\r\n",
-    )
-    .await;
     println!("HSET response: {}", response);
     assert!(response.contains("1"), "Expected '1' but got: {}", response);
-
+    
     // Test HGET
     println!("Testing HGET...");
-    let response = send_command(
+    let response = send_command(&mut stream, "*3\r\n$4\r\nHGET\r\n$4\r\nhash\r\n$6\r\nfield1\r\n").await;
-        &mut stream,
-        "*3\r\n$4\r\nHGET\r\n$4\r\nhash\r\n$6\r\nfield1\r\n",
-    )
-    .await;
     println!("HGET response: {}", response);
-    assert!(
+    assert!(response.contains("value1"), "Expected 'value1' but got: {}", response);
-        response.contains("value1"),
+}
-        "Expected 'value1' but got: {}",
-        response
-    );
-}

tests/debug_hset_simple.rs

@@ -1,4 +1,5 @@
-use herodb::{options::DBOption, server::Server};
+use herodb::{server::Server, options::DBOption};
+use std::path::PathBuf;
 use std::time::Duration;
 use tokio::io::{AsyncReadExt, AsyncWriteExt};
 use tokio::net::TcpStream;
@@ -7,55 +8,59 @@ use tokio::time::sleep;
 #[tokio::test]
 async fn debug_hset_return_value() {
     let test_dir = "/tmp/herodb_debug_hset_return";
-
+    
     // Clean up any existing test data
     let _ = std::fs::remove_dir_all(&test_dir);
     std::fs::create_dir_all(&test_dir).unwrap();
-
+    
     let option = DBOption {
-        dir: test_dir.to_string(),
+        dir: PathBuf::from(test_dir),
         port: 16390,
         debug: false,
         encrypt: false,
         encryption_key: None,
         backend: herodb::options::BackendType::Redb,
+        admin_secret: "test-admin".to_string(),
     };
-
+    
     let mut server = Server::new(option).await;
-
+    
     // Start server in background
     tokio::spawn(async move {
         let listener = tokio::net::TcpListener::bind("127.0.0.1:16390")
             .await
             .unwrap();
-
+        
         loop {
             if let Ok((stream, _)) = listener.accept().await {
                 let _ = server.handle(stream).await;
             }
         }
     });
-
+    
     sleep(Duration::from_millis(200)).await;
-
+    
     // Connect and test HSET
     let mut stream = TcpStream::connect("127.0.0.1:16390").await.unwrap();
 
+    // Acquire ReadWrite permissions for this new connection
+    let handshake = "*4\r\n$6\r\nSELECT\r\n$1\r\n0\r\n$3\r\nKEY\r\n$10\r\ntest-admin\r\n";
+    stream.write_all(handshake.as_bytes()).await.unwrap();
+    let mut buffer = [0; 1024];
+    let n = stream.read(&mut buffer).await.unwrap();
+    let resp = String::from_utf8_lossy(&buffer[..n]);
+    assert!(resp.contains("OK"), "Failed SELECT handshake: {}", resp);
+    
     // Send HSET command
     let cmd = "*4\r\n$4\r\nHSET\r\n$4\r\nhash\r\n$6\r\nfield1\r\n$6\r\nvalue1\r\n";
     stream.write_all(cmd.as_bytes()).await.unwrap();
-
+    
-    let mut buffer = [0; 1024];
     let n = stream.read(&mut buffer).await.unwrap();
     let response = String::from_utf8_lossy(&buffer[..n]);
-
+    
     println!("HSET response: {}", response);
     println!("Response bytes: {:?}", &buffer[..n]);
-
+    
     // Check if response contains "1"
-    assert!(
+    assert!(response.contains("1"), "Expected response to contain '1', got: {}", response);
-        response.contains("1"),
+}
-        "Expected response to contain '1', got: {}",
-        response
-    );
-}

tests/debug_protocol.rs

@@ -1,15 +1,12 @@
-use herodb::cmd::Cmd;
 use herodb::protocol::Protocol;
+use herodb::cmd::Cmd;
 
 #[test]
 fn test_protocol_parsing() {
     // Test TYPE command parsing
     let type_cmd = "*2\r\n$4\r\nTYPE\r\n$7\r\nnoexist\r\n";
-    println!(
+    println!("Parsing TYPE command: {}", type_cmd.replace("\r\n", "\\r\\n"));
-        "Parsing TYPE command: {}",
+    
-        type_cmd.replace("\r\n", "\\r\\n")
-    );
-
     match Protocol::from(type_cmd) {
         Ok((protocol, _)) => {
             println!("Protocol parsed successfully: {:?}", protocol);
@@ -20,14 +17,11 @@ fn test_protocol_parsing() {
         }
         Err(e) => println!("Protocol parsing failed: {:?}", e),
     }
-
+    
     // Test HEXISTS command parsing
     let hexists_cmd = "*3\r\n$7\r\nHEXISTS\r\n$4\r\nhash\r\n$7\r\nnoexist\r\n";
-    println!(
+    println!("\nParsing HEXISTS command: {}", hexists_cmd.replace("\r\n", "\\r\\n"));
-        "\nParsing HEXISTS command: {}",
+    
-        hexists_cmd.replace("\r\n", "\\r\\n")
-    );
-
     match Protocol::from(hexists_cmd) {
         Ok((protocol, _)) => {
             println!("Protocol parsed successfully: {:?}", protocol);
@@ -38,4 +32,4 @@ fn test_protocol_parsing() {
         }
         Err(e) => println!("Protocol parsing failed: {:?}", e),
     }
-}
+}

tests/lance_integration_tests.rs

@@ -0,0 +1,484 @@
+use redis::{Client, Connection, RedisResult, Value};
+use std::process::{Child, Command};
+use std::time::Duration;
+
+use jsonrpsee::http_client::{HttpClient, HttpClientBuilder};
+use herodb::rpc::{BackendType, DatabaseConfig, RpcClient};
+use base64::Engine;
+use tokio::time::sleep;
+
+// ------------------------
+// Helpers
+// ------------------------
+
+fn get_redis_connection(port: u16) -> Connection {
+    let connection_info = format!("redis://127.0.0.1:{}", port);
+    let client = Client::open(connection_info).unwrap();
+    let mut attempts = 0;
+    loop {
+        match client.get_connection() {
+            Ok(mut conn) => {
+                if redis::cmd("PING").query::<String>(&mut conn).is_ok() {
+                    return conn;
+                }
+            }
+            Err(e) => {
+                if attempts >= 3600 {
+                    panic!("Failed to connect to Redis server after 3600 attempts: {}", e);
+                }
+            }
+        }
+        attempts += 1;
+        std::thread::sleep(Duration::from_millis(500));
+    }
+}
+
+async fn get_rpc_client(port: u16) -> HttpClient {
+    let url = format!("http://127.0.0.1:{}", port + 1); // RPC port = Redis port + 1
+    HttpClientBuilder::default().build(url).unwrap()
+}
+
+/// Wait until RPC server is responsive (getServerStats succeeds) or panic after retries.
+async fn wait_for_rpc_ready(client: &HttpClient, max_attempts: u32, delay: Duration) {
+    for _ in 0..max_attempts {
+        match client.get_server_stats().await {
+            Ok(_) => return,
+            Err(_) => {
+                sleep(delay).await;
+            }
+        }
+    }
+    panic!("RPC server did not become ready in time");
+}
+
+// A guard to ensure the server process is killed when it goes out of scope and test dir cleaned.
+struct ServerProcessGuard {
+    process: Child,
+    test_dir: String,
+}
+
+impl Drop for ServerProcessGuard {
+    fn drop(&mut self) {
+        eprintln!("Killing server process (pid: {})...", self.process.id());
+        if let Err(e) = self.process.kill() {
+            eprintln!("Failed to kill server process: {}", e);
+        }
+        match self.process.wait() {
+            Ok(status) => eprintln!("Server process exited with: {}", status),
+            Err(e) => eprintln!("Failed to wait on server process: {}", e),
+        }
+
+        // Clean up the specific test directory
+        eprintln!("Cleaning up test directory: {}", self.test_dir);
+        if let Err(e) = std::fs::remove_dir_all(&self.test_dir) {
+            eprintln!("Failed to clean up test directory: {}", e);
+        }
+    }
+}
+
+// Helper to set up the server and return guard + ports
+async fn setup_server() -> (ServerProcessGuard, u16) {
+    use std::sync::atomic::{AtomicU16, Ordering};
+    static PORT_COUNTER: AtomicU16 = AtomicU16::new(17500);
+    let port = PORT_COUNTER.fetch_add(1, Ordering::SeqCst);
+
+    let test_dir = format!("/tmp/herodb_lance_test_{}", port);
+
+    // Clean up previous test data
+    if std::path::Path::new(&test_dir).exists() {
+        let _ = std::fs::remove_dir_all(&test_dir);
+    }
+    std::fs::create_dir_all(&test_dir).unwrap();
+
+    // Start the server in a subprocess with RPC enabled (follows tantivy test pattern)
+    let child = Command::new("cargo")
+        .args(&[
+            "run",
+            "--",
+            "--dir",
+            &test_dir,
+            "--port",
+            &port.to_string(),
+            "--rpc-port",
+            &(port + 1).to_string(),
+            "--enable-rpc",
+            "--debug",
+            "--admin-secret",
+            "test-admin",
+        ])
+        .spawn()
+        .expect("Failed to start server process");
+
+    let guard = ServerProcessGuard {
+        process: child,
+        test_dir,
+    };
+
+    // Give the server time to build and start (cargo run may compile first)
+    // Increase significantly to accommodate first-time dependency compilation in CI.
+    std::thread::sleep(Duration::from_millis(5000));
+
+    (guard, port)
+}
+
+// Convenient helpers for assertions on redis::Value
+fn value_is_ok(v: &Value) -> bool {
+    match v {
+        Value::Okay => true,
+        Value::Status(s) if s == "OK" => true,
+        Value::Data(d) if d == b"OK" => true,
+        _ => false,
+    }
+}
+
+fn value_is_int_eq(v: &Value, expected: i64) -> bool {
+    matches!(v, Value::Int(n) if *n == expected)
+}
+
+fn value_is_str_eq(v: &Value, expected: &str) -> bool {
+    match v {
+        Value::Status(s) => s == expected,
+        Value::Data(d) => String::from_utf8_lossy(d) == expected,
+        _ => false,
+    }
+}
+
+fn to_string_lossy(v: &Value) -> String {
+    match v {
+        Value::Nil => "Nil".to_string(),
+        Value::Int(n) => n.to_string(),
+        Value::Status(s) => s.clone(),
+        Value::Okay => "OK".to_string(),
+        Value::Data(d) => String::from_utf8_lossy(d).to_string(),
+        Value::Bulk(items) => {
+            let inner: Vec<String> = items.iter().map(to_string_lossy).collect();
+            format!("[{}]", inner.join(", "))
+        }
+    }
+}
+
+// Extract ids from LANCE.SEARCH / LANCE.SEARCHIMAGE reply which is:
+// Array of elements: [ [id, score, [k,v,...]], [id, score, ...], ... ]
+fn extract_hit_ids(v: &Value) -> Vec<String> {
+    let mut ids = Vec::new();
+    if let Value::Bulk(items) = v {
+        for item in items {
+            if let Value::Bulk(row) = item {
+                if !row.is_empty() {
+                    // first element is id (Data or Status)
+                    let id = match &row[0] {
+                        Value::Data(d) => String::from_utf8_lossy(d).to_string(),
+                        Value::Status(s) => s.clone(),
+                        Value::Int(n) => n.to_string(),
+                        _ => continue,
+                    };
+                    ids.push(id);
+                }
+            }
+        }
+    }
+    ids
+}
+
+// Check whether a Bulk array (RESP array) contains a given string element.
+fn bulk_contains_string(v: &Value, needle: &str) -> bool {
+    match v {
+        Value::Bulk(items) => items.iter().any(|it| match it {
+            Value::Data(d) => String::from_utf8_lossy(d).contains(needle),
+            Value::Status(s) => s.contains(needle),
+            Value::Bulk(_) => bulk_contains_string(it, needle),
+            _ => false,
+        }),
+        _ => false,
+    }
+}
+
+// ------------------------
+// Test: Lance end-to-end (RESP) using only local embedders
+// ------------------------
+
+#[tokio::test]
+async fn test_lance_end_to_end() {
+    let (_guard, port) = setup_server().await;
+
+    // First, wait for RESP to be available; this also gives cargo-run child ample time to finish building.
+    // Reuse the helper that retries PING until success.
+    {
+        let _conn_ready = get_redis_connection(port);
+        // Drop immediately; we only needed readiness.
+    }
+
+    // Build RPC client and create a Lance DB
+    let rpc_client = get_rpc_client(port).await;
+    // Ensure RPC server is listening before we issue createDatabase (allow longer warm-up to accommodate first-build costs)
+    wait_for_rpc_ready(&rpc_client, 3600, Duration::from_millis(250)).await;
+
+    let db_config = DatabaseConfig {
+        name: Some("media-db".to_string()),
+        storage_path: None,
+        max_size: None,
+        redis_version: None,
+    };
+
+    let db_id = rpc_client
+        .create_database(BackendType::Lance, db_config, None)
+        .await
+        .expect("create_database Lance failed");
+
+    assert_eq!(db_id, 1, "Expected first Lance DB id to be 1");
+
+    // Add access keys
+    let _ = rpc_client
+        .add_access_key(db_id, "readwrite_key".to_string(), "readwrite".to_string())
+        .await
+        .expect("add_access_key readwrite failed");
+
+    let _ = rpc_client
+        .add_access_key(db_id, "read_key".to_string(), "read".to_string())
+        .await
+        .expect("add_access_key read failed");
+
+    // Connect to Redis and SELECT DB with readwrite key
+    let mut conn = get_redis_connection(port);
+
+    let sel_ok: RedisResult<String> = redis::cmd("SELECT")
+        .arg(db_id)
+        .arg("KEY")
+        .arg("readwrite_key")
+        .query(&mut conn);
+    assert!(sel_ok.is_ok(), "SELECT db with key failed: {:?}", sel_ok);
+    assert_eq!(sel_ok.unwrap(), "OK");
+
+    // 1) Configure embedding providers: textset -> testhash dim 64, imageset -> testimagehash dim 512
+    let v = redis::cmd("LANCE.EMBEDDING")
+        .arg("CONFIG")
+        .arg("SET")
+        .arg("textset")
+        .arg("PROVIDER")
+        .arg("testhash")
+        .arg("MODEL")
+        .arg("any")
+        .arg("PARAM")
+        .arg("dim")
+        .arg("64")
+        .query::<Value>(&mut conn)
+        .unwrap();
+    assert!(value_is_ok(&v), "Embedding config set (text) not OK: {}", to_string_lossy(&v));
+
+    let v = redis::cmd("LANCE.EMBEDDING")
+        .arg("CONFIG")
+        .arg("SET")
+        .arg("imageset")
+        .arg("PROVIDER")
+        .arg("testimagehash")
+        .arg("MODEL")
+        .arg("any")
+        .arg("PARAM")
+        .arg("dim")
+        .arg("512")
+        .query::<Value>(&mut conn)
+        .unwrap();
+    assert!(value_is_ok(&v), "Embedding config set (image) not OK: {}", to_string_lossy(&v));
+
+    // 2) Create datasets
+    let v = redis::cmd("LANCE.CREATE")
+        .arg("textset")
+        .arg("DIM")
+        .arg(64)
+        .query::<Value>(&mut conn)
+        .unwrap();
+    assert!(value_is_ok(&v), "LANCE.CREATE textset failed: {}", to_string_lossy(&v));
+
+    let v = redis::cmd("LANCE.CREATE")
+        .arg("imageset")
+        .arg("DIM")
+        .arg(512)
+        .query::<Value>(&mut conn)
+        .unwrap();
+    assert!(value_is_ok(&v), "LANCE.CREATE imageset failed: {}", to_string_lossy(&v));
+
+    // 3) Store two text documents
+    let v = redis::cmd("LANCE.STORE")
+        .arg("textset")
+        .arg("ID")
+        .arg("doc-1")
+        .arg("TEXT")
+        .arg("The quick brown fox jumps over the lazy dog")
+        .arg("META")
+        .arg("title")
+        .arg("Fox")
+        .arg("category")
+        .arg("animal")
+        .query::<Value>(&mut conn)
+        .unwrap();
+    assert!(value_is_ok(&v), "LANCE.STORE doc-1 failed: {}", to_string_lossy(&v));
+
+    let v = redis::cmd("LANCE.STORE")
+        .arg("textset")
+        .arg("ID")
+        .arg("doc-2")
+        .arg("TEXT")
+        .arg("A fast auburn fox vaulted a sleepy canine")
+        .arg("META")
+        .arg("title")
+        .arg("Paraphrase")
+        .arg("category")
+        .arg("animal")
+        .query::<Value>(&mut conn)
+        .unwrap();
+    assert!(value_is_ok(&v), "LANCE.STORE doc-2 failed: {}", to_string_lossy(&v));
+
+    // 4) Store two images via BYTES (local fake bytes; embedder only hashes bytes, not decoding)
+    let img1: Vec<u8> = b"local-image-bytes-1-abcdefghijklmnopqrstuvwxyz".to_vec();
+    let img2: Vec<u8> = b"local-image-bytes-2-ABCDEFGHIJKLMNOPQRSTUVWXYZ".to_vec();
+    let img1_b64 = base64::engine::general_purpose::STANDARD.encode(&img1);
+    let img2_b64 = base64::engine::general_purpose::STANDARD.encode(&img2);
+
+    let v = redis::cmd("LANCE.STOREIMAGE")
+        .arg("imageset")
+        .arg("ID")
+        .arg("img-1")
+        .arg("BYTES")
+        .arg(&img1_b64)
+        .arg("META")
+        .arg("title")
+        .arg("Local1")
+        .arg("group")
+        .arg("demo")
+        .query::<Value>(&mut conn)
+        .unwrap();
+    assert!(value_is_ok(&v), "LANCE.STOREIMAGE img-1 failed: {}", to_string_lossy(&v));
+
+    let v = redis::cmd("LANCE.STOREIMAGE")
+        .arg("imageset")
+        .arg("ID")
+        .arg("img-2")
+        .arg("BYTES")
+        .arg(&img2_b64)
+        .arg("META")
+        .arg("title")
+        .arg("Local2")
+        .arg("group")
+        .arg("demo")
+        .query::<Value>(&mut conn)
+        .unwrap();
+    assert!(value_is_ok(&v), "LANCE.STOREIMAGE img-2 failed: {}", to_string_lossy(&v));
+
+    // 5) Search text: K 2 QUERY "quick brown fox" RETURN 1 title
+    let v = redis::cmd("LANCE.SEARCH")
+        .arg("textset")
+        .arg("K")
+        .arg(2)
+        .arg("QUERY")
+        .arg("quick brown fox")
+        .arg("RETURN")
+        .arg(1)
+        .arg("title")
+        .query::<Value>(&mut conn)
+        .unwrap();
+
+    // Should be an array of hits
+    let ids = extract_hit_ids(&v);
+    assert!(
+        ids.contains(&"doc-1".to_string()) || ids.contains(&"doc-2".to_string()),
+        "LANCE.SEARCH should return doc-1/doc-2; got: {}",
+        to_string_lossy(&v)
+    );
+
+    // With FILTER on category
+    let v = redis::cmd("LANCE.SEARCH")
+        .arg("textset")
+        .arg("K")
+        .arg(2)
+        .arg("QUERY")
+        .arg("fox jumps")
+        .arg("FILTER")
+        .arg("category = 'animal'")
+        .arg("RETURN")
+        .arg(1)
+        .arg("title")
+        .query::<Value>(&mut conn)
+        .unwrap();
+
+    let ids_f = extract_hit_ids(&v);
+    assert!(
+        !ids_f.is_empty(),
+        "Filtered LANCE.SEARCH should return at least one document; got: {}",
+        to_string_lossy(&v)
+    );
+
+    // 6) Search images with QUERYBYTES
+    let query_img: Vec<u8> = b"local-image-query-3-1234567890".to_vec();
+    let query_img_b64 = base64::engine::general_purpose::STANDARD.encode(&query_img);
+
+    let v = redis::cmd("LANCE.SEARCHIMAGE")
+        .arg("imageset")
+        .arg("K")
+        .arg(2)
+        .arg("QUERYBYTES")
+        .arg(&query_img_b64)
+        .arg("RETURN")
+        .arg(1)
+        .arg("title")
+        .query::<Value>(&mut conn)
+        .unwrap();
+
+    // Should get 2 hits (img-1 and img-2) in some order; assert array non-empty
+    let img_ids = extract_hit_ids(&v);
+    assert!(
+        !img_ids.is_empty(),
+        "LANCE.SEARCHIMAGE should return non-empty results; got: {}",
+        to_string_lossy(&v)
+    );
+
+    // 7) Inspect datasets
+    let v = redis::cmd("LANCE.LIST").query::<Value>(&mut conn).unwrap();
+    assert!(
+        bulk_contains_string(&v, "textset"),
+        "LANCE.LIST missing textset: {}",
+        to_string_lossy(&v)
+    );
+    assert!(
+        bulk_contains_string(&v, "imageset"),
+        "LANCE.LIST missing imageset: {}",
+        to_string_lossy(&v)
+    );
+
+    // INFO textset
+    let info_text = redis::cmd("LANCE.INFO")
+        .arg("textset")
+        .query::<Value>(&mut conn)
+        .unwrap();
+    // INFO returns Array [k,v,k,v,...] including "dimension" "64" and "row_count" "...".
+    let info_str = to_string_lossy(&info_text);
+    assert!(
+        info_str.contains("dimension") && info_str.contains("64"),
+        "LANCE.INFO textset should include dimension 64; got: {}",
+        info_str
+    );
+
+    // 8) Delete by id and drop datasets
+    let v = redis::cmd("LANCE.DEL")
+        .arg("textset")
+        .arg("doc-2")
+        .query::<Value>(&mut conn)
+        .unwrap();
+    // Returns SimpleString "1" or Int 1 depending on encoding path; accept either
+    assert!(
+        value_is_int_eq(&v, 1) || value_is_str_eq(&v, "1"),
+        "LANCE.DEL doc-2 expected 1; got {}",
+        to_string_lossy(&v)
+    );
+
+    let v = redis::cmd("LANCE.DROP")
+        .arg("textset")
+        .query::<Value>(&mut conn)
+        .unwrap();
+    assert!(value_is_ok(&v), "LANCE.DROP textset failed: {}", to_string_lossy(&v));
+
+    let v = redis::cmd("LANCE.DROP")
+        .arg("imageset")
+        .query::<Value>(&mut conn)
+        .unwrap();
+    assert!(value_is_ok(&v), "LANCE.DROP imageset failed: {}", to_string_lossy(&v));
+}

tests/redis_integration_tests.rs

@@ -12,7 +12,15 @@ fn get_redis_connection(port: u16) -> Connection {
         match client.get_connection() {
             Ok(mut conn) => {
                 if redis::cmd("PING").query::<String>(&mut conn).is_ok() {
-                    return conn;
+                    // Acquire ReadWrite permissions on this connection
+                    let sel: RedisResult<String> = redis::cmd("SELECT")
+                        .arg(0)
+                        .arg("KEY")
+                        .arg("test-admin")
+                        .query(&mut conn);
+                    if sel.is_ok() {
+                        return conn;
+                    }
                 }
             }
             Err(e) => {
@@ -78,16 +86,18 @@ fn setup_server() -> (ServerProcessGuard, u16) {
             "--port",
             &port.to_string(),
             "--debug",
+            "--admin-secret",
+            "test-admin",
         ])
         .spawn()
         .expect("Failed to start server process");
-
+    
     // Create a new guard that also owns the test directory path
     let guard = ServerProcessGuard {
         process: child,
         test_dir,
     };
-
+    
     // Give the server time to build and start (cargo run may compile first)
     std::thread::sleep(Duration::from_millis(2500));
 
@@ -206,9 +216,7 @@ async fn test_expiration(conn: &mut Connection) {
 async fn test_scan_operations(conn: &mut Connection) {
     cleanup_keys(conn).await;
     for i in 0..5 {
-        let _: () = conn
+        let _: () = conn.set(format!("key{}", i), format!("value{}", i)).unwrap();
-            .set(format!("key{}", i), format!("value{}", i))
-            .unwrap();
     }
     let result: (u64, Vec<String>) = redis::cmd("SCAN")
         .arg(0)
@@ -255,9 +263,7 @@ async fn test_scan_with_count(conn: &mut Connection) {
 async fn test_hscan_operations(conn: &mut Connection) {
     cleanup_keys(conn).await;
     for i in 0..3 {
-        let _: () = conn
+        let _: () = conn.hset("testhash", format!("field{}", i), format!("value{}", i)).unwrap();
-            .hset("testhash", format!("field{}", i), format!("value{}", i))
-            .unwrap();
     }
     let result: (u64, Vec<String>) = redis::cmd("HSCAN")
         .arg("testhash")
@@ -277,16 +283,8 @@ async fn test_hscan_operations(conn: &mut Connection) {
 async fn test_transaction_operations(conn: &mut Connection) {
     cleanup_keys(conn).await;
     let _: () = redis::cmd("MULTI").query(conn).unwrap();
-    let _: () = redis::cmd("SET")
+    let _: () = redis::cmd("SET").arg("key1").arg("value1").query(conn).unwrap();
-        .arg("key1")
+    let _: () = redis::cmd("SET").arg("key2").arg("value2").query(conn).unwrap();
-        .arg("value1")
-        .query(conn)
-        .unwrap();
-    let _: () = redis::cmd("SET")
-        .arg("key2")
-        .arg("value2")
-        .query(conn)
-        .unwrap();
     let _: Vec<String> = redis::cmd("EXEC").query(conn).unwrap();
     let result: String = conn.get("key1").unwrap();
     assert_eq!(result, "value1");
@@ -298,11 +296,7 @@ async fn test_transaction_operations(conn: &mut Connection) {
 async fn test_discard_transaction(conn: &mut Connection) {
     cleanup_keys(conn).await;
     let _: () = redis::cmd("MULTI").query(conn).unwrap();
-    let _: () = redis::cmd("SET")
+    let _: () = redis::cmd("SET").arg("discard").arg("value").query(conn).unwrap();
-        .arg("discard")
-        .arg("value")
-        .query(conn)
-        .unwrap();
     let _: () = redis::cmd("DISCARD").query(conn).unwrap();
     let result: Option<String> = conn.get("discard").unwrap();
     assert_eq!(result, None);
@@ -322,6 +316,7 @@ async fn test_type_command(conn: &mut Connection) {
     cleanup_keys(conn).await;
 }
 
+
 async fn test_info_command(conn: &mut Connection) {
     cleanup_keys(conn).await;
     let result: String = redis::cmd("INFO").query(conn).unwrap();

tests/redis_tests.rs

@@ -1,4 +1,5 @@
-use herodb::{options::DBOption, server::Server};
+use herodb::{server::Server, options::DBOption};
+use std::path::PathBuf;
 use std::time::Duration;
 use tokio::io::{AsyncReadExt, AsyncWriteExt};
 use tokio::net::TcpStream;
@@ -8,33 +9,44 @@ use tokio::time::sleep;
 async fn start_test_server(test_name: &str) -> (Server, u16) {
     use std::sync::atomic::{AtomicU16, Ordering};
     static PORT_COUNTER: AtomicU16 = AtomicU16::new(16379);
-
+    
     let port = PORT_COUNTER.fetch_add(1, Ordering::SeqCst);
     let test_dir = format!("/tmp/herodb_test_{}", test_name);
-
+    
     // Clean up and create test directory
     let _ = std::fs::remove_dir_all(&test_dir);
     std::fs::create_dir_all(&test_dir).unwrap();
-
+    
     let option = DBOption {
-        dir: test_dir,
+        dir: PathBuf::from(test_dir),
         port,
         debug: true,
         encrypt: false,
         encryption_key: None,
         backend: herodb::options::BackendType::Redb,
+        admin_secret: "test-admin".to_string(),
     };
-
+    
     let server = Server::new(option).await;
     (server, port)
 }
 
-// Helper function to connect to the test server
+ // Helper function to connect to the test server
 async fn connect_to_server(port: u16) -> TcpStream {
     let mut attempts = 0;
     loop {
         match TcpStream::connect(format!("127.0.0.1:{}", port)).await {
-            Ok(stream) => return stream,
+            Ok(mut stream) => {
+                // Obtain ReadWrite permissions for this connection by selecting DB 0 with admin key
+                let resp = send_command(
+                    &mut stream,
+                    "*4\r\n$6\r\nSELECT\r\n$1\r\n0\r\n$3\r\nKEY\r\n$10\r\ntest-admin\r\n",
+                ).await;
+                if !resp.contains("OK") {
+                    panic!("Failed to acquire write permissions via SELECT 0 KEY test-admin: {}", resp);
+                }
+                return stream;
+            }
             Err(_) if attempts < 10 => {
                 attempts += 1;
                 sleep(Duration::from_millis(100)).await;
@@ -47,7 +59,7 @@ async fn connect_to_server(port: u16) -> TcpStream {
 // Helper function to send command and get response
 async fn send_command(stream: &mut TcpStream, command: &str) -> String {
     stream.write_all(command.as_bytes()).await.unwrap();
-
+    
     let mut buffer = [0; 1024];
     let n = stream.read(&mut buffer).await.unwrap();
     String::from_utf8_lossy(&buffer[..n]).to_string()
@@ -56,22 +68,22 @@ async fn send_command(stream: &mut TcpStream, command: &str) -> String {
 #[tokio::test]
 async fn test_basic_ping() {
     let (mut server, port) = start_test_server("ping").await;
-
+    
     // Start server in background
     tokio::spawn(async move {
         let listener = tokio::net::TcpListener::bind(format!("127.0.0.1:{}", port))
             .await
             .unwrap();
-
+        
         loop {
             if let Ok((stream, _)) = listener.accept().await {
                 let _ = server.handle(stream).await;
             }
         }
     });
-
+    
     sleep(Duration::from_millis(100)).await;
-
+    
     let mut stream = connect_to_server(port).await;
     let response = send_command(&mut stream, "*1\r\n$4\r\nPING\r\n").await;
     assert!(response.contains("PONG"));
@@ -80,44 +92,40 @@ async fn test_basic_ping() {
 #[tokio::test]
 async fn test_string_operations() {
     let (mut server, port) = start_test_server("string").await;
-
+    
     // Start server in background
     tokio::spawn(async move {
         let listener = tokio::net::TcpListener::bind(format!("127.0.0.1:{}", port))
             .await
             .unwrap();
-
+        
         loop {
             if let Ok((stream, _)) = listener.accept().await {
                 let _ = server.handle(stream).await;
             }
         }
     });
-
+    
     sleep(Duration::from_millis(100)).await;
-
+    
     let mut stream = connect_to_server(port).await;
-
+    
     // Test SET
-    let response = send_command(
+    let response = send_command(&mut stream, "*3\r\n$3\r\nSET\r\n$3\r\nkey\r\n$5\r\nvalue\r\n").await;
-        &mut stream,
-        "*3\r\n$3\r\nSET\r\n$3\r\nkey\r\n$5\r\nvalue\r\n",
-    )
-    .await;
     assert!(response.contains("OK"));
-
+    
     // Test GET
     let response = send_command(&mut stream, "*2\r\n$3\r\nGET\r\n$3\r\nkey\r\n").await;
     assert!(response.contains("value"));
-
+    
     // Test GET non-existent key
     let response = send_command(&mut stream, "*2\r\n$3\r\nGET\r\n$7\r\nnoexist\r\n").await;
     assert!(response.contains("$-1")); // NULL response
-
+    
     // Test DEL
     let response = send_command(&mut stream, "*2\r\n$3\r\nDEL\r\n$3\r\nkey\r\n").await;
     assert!(response.contains("1"));
-
+    
     // Test GET after DEL
     let response = send_command(&mut stream, "*2\r\n$3\r\nGET\r\n$3\r\nkey\r\n").await;
     assert!(response.contains("$-1")); // NULL response
@@ -126,37 +134,33 @@ async fn test_string_operations() {
 #[tokio::test]
 async fn test_incr_operations() {
     let (mut server, port) = start_test_server("incr").await;
-
+    
     tokio::spawn(async move {
         let listener = tokio::net::TcpListener::bind(format!("127.0.0.1:{}", port))
             .await
             .unwrap();
-
+        
         loop {
             if let Ok((stream, _)) = listener.accept().await {
                 let _ = server.handle(stream).await;
             }
         }
     });
-
+    
     sleep(Duration::from_millis(100)).await;
-
+    
     let mut stream = connect_to_server(port).await;
-
+    
     // Test INCR on non-existent key
     let response = send_command(&mut stream, "*2\r\n$4\r\nINCR\r\n$7\r\ncounter\r\n").await;
     assert!(response.contains("1"));
-
+    
     // Test INCR on existing key
     let response = send_command(&mut stream, "*2\r\n$4\r\nINCR\r\n$7\r\ncounter\r\n").await;
     assert!(response.contains("2"));
-
+    
     // Test INCR on string value (should fail)
-    send_command(
+    send_command(&mut stream, "*3\r\n$3\r\nSET\r\n$6\r\nstring\r\n$5\r\nhello\r\n").await;
-        &mut stream,
-        "*3\r\n$3\r\nSET\r\n$6\r\nstring\r\n$5\r\nhello\r\n",
-    )
-    .await;
     let response = send_command(&mut stream, "*2\r\n$4\r\nINCR\r\n$6\r\nstring\r\n").await;
     assert!(response.contains("ERR"));
 }
@@ -164,83 +168,63 @@ async fn test_incr_operations() {
 #[tokio::test]
 async fn test_hash_operations() {
     let (mut server, port) = start_test_server("hash").await;
-
+    
     tokio::spawn(async move {
         let listener = tokio::net::TcpListener::bind(format!("127.0.0.1:{}", port))
             .await
             .unwrap();
-
+        
         loop {
             if let Ok((stream, _)) = listener.accept().await {
                 let _ = server.handle(stream).await;
             }
         }
     });
-
+    
     sleep(Duration::from_millis(100)).await;
-
+    
     let mut stream = connect_to_server(port).await;
-
+    
     // Test HSET
-    let response = send_command(
+    let response = send_command(&mut stream, "*4\r\n$4\r\nHSET\r\n$4\r\nhash\r\n$6\r\nfield1\r\n$6\r\nvalue1\r\n").await;
-        &mut stream,
-        "*4\r\n$4\r\nHSET\r\n$4\r\nhash\r\n$6\r\nfield1\r\n$6\r\nvalue1\r\n",
-    )
-    .await;
     assert!(response.contains("1")); // 1 new field
-
+    
     // Test HGET
-    let response = send_command(
+    let response = send_command(&mut stream, "*3\r\n$4\r\nHGET\r\n$4\r\nhash\r\n$6\r\nfield1\r\n").await;
-        &mut stream,
-        "*3\r\n$4\r\nHGET\r\n$4\r\nhash\r\n$6\r\nfield1\r\n",
-    )
-    .await;
     assert!(response.contains("value1"));
-
+    
     // Test HSET multiple fields
     let response = send_command(&mut stream, "*6\r\n$4\r\nHSET\r\n$4\r\nhash\r\n$6\r\nfield2\r\n$6\r\nvalue2\r\n$6\r\nfield3\r\n$6\r\nvalue3\r\n").await;
     assert!(response.contains("2")); // 2 new fields
-
+    
     // Test HGETALL
     let response = send_command(&mut stream, "*2\r\n$7\r\nHGETALL\r\n$4\r\nhash\r\n").await;
     assert!(response.contains("field1"));
     assert!(response.contains("value1"));
     assert!(response.contains("field2"));
     assert!(response.contains("value2"));
-
+    
     // Test HLEN
     let response = send_command(&mut stream, "*2\r\n$4\r\nHLEN\r\n$4\r\nhash\r\n").await;
     assert!(response.contains("3"));
-
+    
     // Test HEXISTS
-    let response = send_command(
+    let response = send_command(&mut stream, "*3\r\n$7\r\nHEXISTS\r\n$4\r\nhash\r\n$6\r\nfield1\r\n").await;
-        &mut stream,
-        "*3\r\n$7\r\nHEXISTS\r\n$4\r\nhash\r\n$6\r\nfield1\r\n",
-    )
-    .await;
     assert!(response.contains("1"));
-
+    
-    let response = send_command(
+    let response = send_command(&mut stream, "*3\r\n$7\r\nHEXISTS\r\n$4\r\nhash\r\n$7\r\nnoexist\r\n").await;
-        &mut stream,
-        "*3\r\n$7\r\nHEXISTS\r\n$4\r\nhash\r\n$7\r\nnoexist\r\n",
-    )
-    .await;
     assert!(response.contains("0"));
-
+    
     // Test HDEL
-    let response = send_command(
+    let response = send_command(&mut stream, "*3\r\n$4\r\nHDEL\r\n$4\r\nhash\r\n$6\r\nfield1\r\n").await;
-        &mut stream,
-        "*3\r\n$4\r\nHDEL\r\n$4\r\nhash\r\n$6\r\nfield1\r\n",
-    )
-    .await;
     assert!(response.contains("1"));
-
+    
     // Test HKEYS
     let response = send_command(&mut stream, "*2\r\n$5\r\nHKEYS\r\n$4\r\nhash\r\n").await;
     assert!(response.contains("field2"));
     assert!(response.contains("field3"));
     assert!(!response.contains("field1")); // Should be deleted
-
+    
     // Test HVALS
     let response = send_command(&mut stream, "*2\r\n$5\r\nHVALS\r\n$4\r\nhash\r\n").await;
     assert!(response.contains("value2"));
@@ -250,50 +234,46 @@ async fn test_hash_operations() {
 #[tokio::test]
 async fn test_expiration() {
     let (mut server, port) = start_test_server("expiration").await;
-
+    
     tokio::spawn(async move {
         let listener = tokio::net::TcpListener::bind(format!("127.0.0.1:{}", port))
             .await
             .unwrap();
-
+        
         loop {
             if let Ok((stream, _)) = listener.accept().await {
                 let _ = server.handle(stream).await;
             }
         }
     });
-
+    
     sleep(Duration::from_millis(100)).await;
-
+    
     let mut stream = connect_to_server(port).await;
-
+    
     // Test SETEX (expire in 1 second)
-    let response = send_command(
+    let response = send_command(&mut stream, "*5\r\n$3\r\nSET\r\n$6\r\nexpkey\r\n$5\r\nvalue\r\n$2\r\nEX\r\n$1\r\n1\r\n").await;
-        &mut stream,
-        "*5\r\n$3\r\nSET\r\n$6\r\nexpkey\r\n$5\r\nvalue\r\n$2\r\nEX\r\n$1\r\n1\r\n",
-    )
-    .await;
     assert!(response.contains("OK"));
-
+    
     // Test TTL
     let response = send_command(&mut stream, "*2\r\n$3\r\nTTL\r\n$6\r\nexpkey\r\n").await;
     assert!(response.contains("1") || response.contains("0")); // Should be 1 or 0 seconds
-
+    
     // Test EXISTS
     let response = send_command(&mut stream, "*2\r\n$6\r\nEXISTS\r\n$6\r\nexpkey\r\n").await;
     assert!(response.contains("1"));
-
+    
     // Wait for expiration
     sleep(Duration::from_millis(1100)).await;
-
+    
     // Test GET after expiration
     let response = send_command(&mut stream, "*2\r\n$3\r\nGET\r\n$6\r\nexpkey\r\n").await;
     assert!(response.contains("$-1")); // Should be NULL
-
+    
     // Test TTL after expiration
     let response = send_command(&mut stream, "*2\r\n$3\r\nTTL\r\n$6\r\nexpkey\r\n").await;
     assert!(response.contains("-2")); // Key doesn't exist
-
+    
     // Test EXISTS after expiration
     let response = send_command(&mut stream, "*2\r\n$6\r\nEXISTS\r\n$6\r\nexpkey\r\n").await;
     assert!(response.contains("0"));
@@ -302,37 +282,33 @@ async fn test_expiration() {
 #[tokio::test]
 async fn test_scan_operations() {
     let (mut server, port) = start_test_server("scan").await;
-
+    
     tokio::spawn(async move {
         let listener = tokio::net::TcpListener::bind(format!("127.0.0.1:{}", port))
             .await
             .unwrap();
-
+        
         loop {
             if let Ok((stream, _)) = listener.accept().await {
                 let _ = server.handle(stream).await;
             }
         }
     });
-
+    
     sleep(Duration::from_millis(100)).await;
-
+    
     let mut stream = connect_to_server(port).await;
-
+    
     // Set up test data
     for i in 0..5 {
         let cmd = format!("*3\r\n$3\r\nSET\r\n$4\r\nkey{}\r\n$6\r\nvalue{}\r\n", i, i);
         send_command(&mut stream, &cmd).await;
     }
-
+    
     // Test SCAN
-    let response = send_command(
+    let response = send_command(&mut stream, "*6\r\n$4\r\nSCAN\r\n$1\r\n0\r\n$5\r\nMATCH\r\n$1\r\n*\r\n$5\r\nCOUNT\r\n$2\r\n10\r\n").await;
-        &mut stream,
-        "*6\r\n$4\r\nSCAN\r\n$1\r\n0\r\n$5\r\nMATCH\r\n$1\r\n*\r\n$5\r\nCOUNT\r\n$2\r\n10\r\n",
-    )
-    .await;
     assert!(response.contains("key"));
-
+    
     // Test KEYS
     let response = send_command(&mut stream, "*2\r\n$4\r\nKEYS\r\n$1\r\n*\r\n").await;
     assert!(response.contains("key0"));
@@ -342,32 +318,29 @@ async fn test_scan_operations() {
 #[tokio::test]
 async fn test_hscan_operations() {
     let (mut server, port) = start_test_server("hscan").await;
-
+    
     tokio::spawn(async move {
         let listener = tokio::net::TcpListener::bind(format!("127.0.0.1:{}", port))
             .await
             .unwrap();
-
+        
         loop {
             if let Ok((stream, _)) = listener.accept().await {
                 let _ = server.handle(stream).await;
             }
         }
     });
-
+    
     sleep(Duration::from_millis(100)).await;
-
+    
     let mut stream = connect_to_server(port).await;
-
+    
     // Set up hash data
     for i in 0..3 {
-        let cmd = format!(
+        let cmd = format!("*4\r\n$4\r\nHSET\r\n$8\r\ntesthash\r\n$6\r\nfield{}\r\n$6\r\nvalue{}\r\n", i, i);
-            "*4\r\n$4\r\nHSET\r\n$8\r\ntesthash\r\n$6\r\nfield{}\r\n$6\r\nvalue{}\r\n",
-            i, i
-        );
         send_command(&mut stream, &cmd).await;
     }
-
+    
     // Test HSCAN
     let response = send_command(&mut stream, "*7\r\n$5\r\nHSCAN\r\n$8\r\ntesthash\r\n$1\r\n0\r\n$5\r\nMATCH\r\n$1\r\n*\r\n$5\r\nCOUNT\r\n$2\r\n10\r\n").await;
     assert!(response.contains("field"));
@@ -377,50 +350,42 @@ async fn test_hscan_operations() {
 #[tokio::test]
 async fn test_transaction_operations() {
     let (mut server, port) = start_test_server("transaction").await;
-
+    
     tokio::spawn(async move {
         let listener = tokio::net::TcpListener::bind(format!("127.0.0.1:{}", port))
             .await
             .unwrap();
-
+        
         loop {
             if let Ok((stream, _)) = listener.accept().await {
                 let _ = server.handle(stream).await;
             }
         }
     });
-
+    
     sleep(Duration::from_millis(100)).await;
-
+    
     let mut stream = connect_to_server(port).await;
-
+    
     // Test MULTI
     let response = send_command(&mut stream, "*1\r\n$5\r\nMULTI\r\n").await;
     assert!(response.contains("OK"));
-
+    
     // Test queued commands
-    let response = send_command(
+    let response = send_command(&mut stream, "*3\r\n$3\r\nSET\r\n$4\r\nkey1\r\n$6\r\nvalue1\r\n").await;
-        &mut stream,
-        "*3\r\n$3\r\nSET\r\n$4\r\nkey1\r\n$6\r\nvalue1\r\n",
-    )
-    .await;
     assert!(response.contains("QUEUED"));
-
+    
-    let response = send_command(
+    let response = send_command(&mut stream, "*3\r\n$3\r\nSET\r\n$4\r\nkey2\r\n$6\r\nvalue2\r\n").await;
-        &mut stream,
-        "*3\r\n$3\r\nSET\r\n$4\r\nkey2\r\n$6\r\nvalue2\r\n",
-    )
-    .await;
     assert!(response.contains("QUEUED"));
-
+    
     // Test EXEC
     let response = send_command(&mut stream, "*1\r\n$4\r\nEXEC\r\n").await;
     assert!(response.contains("OK")); // Should contain results of executed commands
-
+    
     // Verify commands were executed
     let response = send_command(&mut stream, "*2\r\n$3\r\nGET\r\n$4\r\nkey1\r\n").await;
     assert!(response.contains("value1"));
-
+    
     let response = send_command(&mut stream, "*2\r\n$3\r\nGET\r\n$4\r\nkey2\r\n").await;
     assert!(response.contains("value2"));
 }
@@ -428,39 +393,35 @@ async fn test_transaction_operations() {
 #[tokio::test]
 async fn test_discard_transaction() {
     let (mut server, port) = start_test_server("discard").await;
-
+    
     tokio::spawn(async move {
         let listener = tokio::net::TcpListener::bind(format!("127.0.0.1:{}", port))
             .await
             .unwrap();
-
+        
         loop {
             if let Ok((stream, _)) = listener.accept().await {
                 let _ = server.handle(stream).await;
             }
         }
     });
-
+    
     sleep(Duration::from_millis(100)).await;
-
+    
     let mut stream = connect_to_server(port).await;
-
+    
     // Test MULTI
     let response = send_command(&mut stream, "*1\r\n$5\r\nMULTI\r\n").await;
     assert!(response.contains("OK"));
-
+    
     // Test queued command
-    let response = send_command(
+    let response = send_command(&mut stream, "*3\r\n$3\r\nSET\r\n$7\r\ndiscard\r\n$5\r\nvalue\r\n").await;
-        &mut stream,
-        "*3\r\n$3\r\nSET\r\n$7\r\ndiscard\r\n$5\r\nvalue\r\n",
-    )
-    .await;
     assert!(response.contains("QUEUED"));
-
+    
     // Test DISCARD
     let response = send_command(&mut stream, "*1\r\n$7\r\nDISCARD\r\n").await;
     assert!(response.contains("OK"));
-
+    
     // Verify command was not executed
     let response = send_command(&mut stream, "*2\r\n$3\r\nGET\r\n$7\r\ndiscard\r\n").await;
     assert!(response.contains("$-1")); // Should be NULL
@@ -469,41 +430,33 @@ async fn test_discard_transaction() {
 #[tokio::test]
 async fn test_type_command() {
     let (mut server, port) = start_test_server("type").await;
-
+    
     tokio::spawn(async move {
         let listener = tokio::net::TcpListener::bind(format!("127.0.0.1:{}", port))
             .await
             .unwrap();
-
+        
         loop {
             if let Ok((stream, _)) = listener.accept().await {
                 let _ = server.handle(stream).await;
             }
         }
     });
-
+    
     sleep(Duration::from_millis(100)).await;
-
+    
     let mut stream = connect_to_server(port).await;
-
+    
     // Test string type
-    send_command(
+    send_command(&mut stream, "*3\r\n$3\r\nSET\r\n$6\r\nstring\r\n$5\r\nvalue\r\n").await;
-        &mut stream,
-        "*3\r\n$3\r\nSET\r\n$6\r\nstring\r\n$5\r\nvalue\r\n",
-    )
-    .await;
     let response = send_command(&mut stream, "*2\r\n$4\r\nTYPE\r\n$6\r\nstring\r\n").await;
     assert!(response.contains("string"));
-
+    
     // Test hash type
-    send_command(
+    send_command(&mut stream, "*4\r\n$4\r\nHSET\r\n$4\r\nhash\r\n$5\r\nfield\r\n$5\r\nvalue\r\n").await;
-        &mut stream,
-        "*4\r\n$4\r\nHSET\r\n$4\r\nhash\r\n$5\r\nfield\r\n$5\r\nvalue\r\n",
-    )
-    .await;
     let response = send_command(&mut stream, "*2\r\n$4\r\nTYPE\r\n$4\r\nhash\r\n").await;
     assert!(response.contains("hash"));
-
+    
     // Test non-existent key
     let response = send_command(&mut stream, "*2\r\n$4\r\nTYPE\r\n$7\r\nnoexist\r\n").await;
     assert!(response.contains("none"));
@@ -512,38 +465,30 @@ async fn test_type_command() {
 #[tokio::test]
 async fn test_config_commands() {
     let (mut server, port) = start_test_server("config").await;
-
+    
     tokio::spawn(async move {
         let listener = tokio::net::TcpListener::bind(format!("127.0.0.1:{}", port))
             .await
             .unwrap();
-
+        
         loop {
             if let Ok((stream, _)) = listener.accept().await {
                 let _ = server.handle(stream).await;
             }
         }
     });
-
+    
     sleep(Duration::from_millis(100)).await;
-
+    
     let mut stream = connect_to_server(port).await;
-
+    
     // Test CONFIG GET databases
-    let response = send_command(
+    let response = send_command(&mut stream, "*3\r\n$6\r\nCONFIG\r\n$3\r\nGET\r\n$9\r\ndatabases\r\n").await;
-        &mut stream,
-        "*3\r\n$6\r\nCONFIG\r\n$3\r\nGET\r\n$9\r\ndatabases\r\n",
-    )
-    .await;
     assert!(response.contains("databases"));
     assert!(response.contains("16"));
-
+    
     // Test CONFIG GET dir
-    let response = send_command(
+    let response = send_command(&mut stream, "*3\r\n$6\r\nCONFIG\r\n$3\r\nGET\r\n$3\r\ndir\r\n").await;
-        &mut stream,
-        "*3\r\n$6\r\nCONFIG\r\n$3\r\nGET\r\n$3\r\ndir\r\n",
-    )
-    .await;
     assert!(response.contains("dir"));
     assert!(response.contains("/tmp/herodb_test_config"));
 }
@@ -551,27 +496,27 @@ async fn test_config_commands() {
 #[tokio::test]
 async fn test_info_command() {
     let (mut server, port) = start_test_server("info").await;
-
+    
     tokio::spawn(async move {
         let listener = tokio::net::TcpListener::bind(format!("127.0.0.1:{}", port))
             .await
             .unwrap();
-
+        
         loop {
             if let Ok((stream, _)) = listener.accept().await {
                 let _ = server.handle(stream).await;
             }
         }
     });
-
+    
     sleep(Duration::from_millis(100)).await;
-
+    
     let mut stream = connect_to_server(port).await;
-
+    
     // Test INFO
     let response = send_command(&mut stream, "*1\r\n$4\r\nINFO\r\n").await;
     assert!(response.contains("redis_version"));
-
+    
     // Test INFO replication
     let response = send_command(&mut stream, "*2\r\n$4\r\nINFO\r\n$11\r\nreplication\r\n").await;
     assert!(response.contains("role:master"));
@@ -580,44 +525,36 @@ async fn test_info_command() {
 #[tokio::test]
 async fn test_error_handling() {
     let (mut server, port) = start_test_server("error").await;
-
+    
     tokio::spawn(async move {
         let listener = tokio::net::TcpListener::bind(format!("127.0.0.1:{}", port))
             .await
             .unwrap();
-
+        
         loop {
             if let Ok((stream, _)) = listener.accept().await {
                 let _ = server.handle(stream).await;
             }
         }
     });
-
+    
     sleep(Duration::from_millis(100)).await;
-
+    
     let mut stream = connect_to_server(port).await;
-
+    
     // Test WRONGTYPE error - try to use hash command on string
-    send_command(
+    send_command(&mut stream, "*3\r\n$3\r\nSET\r\n$6\r\nstring\r\n$5\r\nvalue\r\n").await;
-        &mut stream,
+    let response = send_command(&mut stream, "*3\r\n$4\r\nHGET\r\n$6\r\nstring\r\n$5\r\nfield\r\n").await;
-        "*3\r\n$3\r\nSET\r\n$6\r\nstring\r\n$5\r\nvalue\r\n",
-    )
-    .await;
-    let response = send_command(
-        &mut stream,
-        "*3\r\n$4\r\nHGET\r\n$6\r\nstring\r\n$5\r\nfield\r\n",
-    )
-    .await;
     assert!(response.contains("WRONGTYPE"));
-
+    
     // Test unknown command
     let response = send_command(&mut stream, "*1\r\n$7\r\nUNKNOWN\r\n").await;
     assert!(response.contains("unknown cmd") || response.contains("ERR"));
-
+    
     // Test EXEC without MULTI
     let response = send_command(&mut stream, "*1\r\n$4\r\nEXEC\r\n").await;
     assert!(response.contains("ERR"));
-
+    
     // Test DISCARD without MULTI
     let response = send_command(&mut stream, "*1\r\n$7\r\nDISCARD\r\n").await;
     assert!(response.contains("ERR"));
@@ -626,37 +563,29 @@ async fn test_error_handling() {
 #[tokio::test]
 async fn test_list_operations() {
     let (mut server, port) = start_test_server("list").await;
-
+    
     tokio::spawn(async move {
         let listener = tokio::net::TcpListener::bind(format!("127.0.0.1:{}", port))
             .await
             .unwrap();
-
+        
         loop {
             if let Ok((stream, _)) = listener.accept().await {
                 let _ = server.handle(stream).await;
             }
         }
     });
-
+    
     sleep(Duration::from_millis(100)).await;
-
+    
     let mut stream = connect_to_server(port).await;
-
+    
     // Test LPUSH
-    let response = send_command(
+    let response = send_command(&mut stream, "*4\r\n$5\r\nLPUSH\r\n$4\r\nlist\r\n$1\r\na\r\n$1\r\nb\r\n").await;
-        &mut stream,
-        "*4\r\n$5\r\nLPUSH\r\n$4\r\nlist\r\n$1\r\na\r\n$1\r\nb\r\n",
-    )
-    .await;
     assert!(response.contains("2")); // 2 elements
-
+    
     // Test RPUSH
-    let response = send_command(
+    let response = send_command(&mut stream, "*4\r\n$5\r\nRPUSH\r\n$4\r\nlist\r\n$1\r\nc\r\n$1\r\nd\r\n").await;
-        &mut stream,
-        "*4\r\n$5\r\nRPUSH\r\n$4\r\nlist\r\n$1\r\nc\r\n$1\r\nd\r\n",
-    )
-    .await;
     assert!(response.contains("4")); // 4 elements
 
     // Test LLEN
@@ -664,52 +593,29 @@ async fn test_list_operations() {
     assert!(response.contains("4"));
 
     // Test LRANGE
-    let response = send_command(
+    let response = send_command(&mut stream, "*4\r\n$6\r\nLRANGE\r\n$4\r\nlist\r\n$1\r\n0\r\n$2\r\n-1\r\n").await;
-        &mut stream,
+    assert_eq!(response, "*4\r\n$1\r\nb\r\n$1\r\na\r\n$1\r\nc\r\n$1\r\nd\r\n");
-        "*4\r\n$6\r\nLRANGE\r\n$4\r\nlist\r\n$1\r\n0\r\n$2\r\n-1\r\n",
+    
-    )
-    .await;
-    assert_eq!(
-        response,
-        "*4\r\n$1\r\nb\r\n$1\r\na\r\n$1\r\nc\r\n$1\r\nd\r\n"
-    );
-
     // Test LINDEX
-    let response = send_command(
+    let response = send_command(&mut stream, "*3\r\n$6\r\nLINDEX\r\n$4\r\nlist\r\n$1\r\n0\r\n").await;
-        &mut stream,
-        "*3\r\n$6\r\nLINDEX\r\n$4\r\nlist\r\n$1\r\n0\r\n",
-    )
-    .await;
     assert_eq!(response, "$1\r\nb\r\n");
-
+    
     // Test LPOP
     let response = send_command(&mut stream, "*2\r\n$4\r\nLPOP\r\n$4\r\nlist\r\n").await;
     assert_eq!(response, "$1\r\nb\r\n");
-
+    
     // Test RPOP
     let response = send_command(&mut stream, "*2\r\n$4\r\nRPOP\r\n$4\r\nlist\r\n").await;
     assert_eq!(response, "$1\r\nd\r\n");
 
     // Test LREM
-    send_command(
+    send_command(&mut stream, "*3\r\n$5\r\nLPUSH\r\n$4\r\nlist\r\n$1\r\na\r\n").await; // list is now a, c, a
-        &mut stream,
+    let response = send_command(&mut stream, "*4\r\n$4\r\nLREM\r\n$4\r\nlist\r\n$1\r\n1\r\n$1\r\na\r\n").await;
-        "*3\r\n$5\r\nLPUSH\r\n$4\r\nlist\r\n$1\r\na\r\n",
-    )
-    .await; // list is now a, c, a
-    let response = send_command(
-        &mut stream,
-        "*4\r\n$4\r\nLREM\r\n$4\r\nlist\r\n$1\r\n1\r\n$1\r\na\r\n",
-    )
-    .await;
     assert!(response.contains("1"));
 
     // Test LTRIM
-    let response = send_command(
+    let response = send_command(&mut stream, "*4\r\n$5\r\nLTRIM\r\n$4\r\nlist\r\n$1\r\n0\r\n$1\r\n0\r\n").await;
-        &mut stream,
-        "*4\r\n$5\r\nLTRIM\r\n$4\r\nlist\r\n$1\r\n0\r\n$1\r\n0\r\n",
-    )
-    .await;
     assert!(response.contains("OK"));
     let response = send_command(&mut stream, "*2\r\n$4\r\nLLEN\r\n$4\r\nlist\r\n").await;
     assert!(response.contains("1"));
-}
+}

tests/rpc_tests.rs

@@ -0,0 +1,86 @@
+use herodb::rpc::{BackendType, DatabaseConfig};
+use herodb::admin_meta;
+use herodb::options::BackendType as OptionsBackendType;
+use std::path::Path;
+
+#[tokio::test]
+async fn test_rpc_server_basic() {
+    // This test would require starting the RPC server in a separate thread
+    // For now, we'll just test that the types compile correctly
+
+    // Test serialization of types
+    let backend = BackendType::Redb;
+    let config = DatabaseConfig {
+        name: Some("test_db".to_string()),
+        storage_path: Some("/tmp/test".to_string()),
+        max_size: Some(1024 * 1024),
+        redis_version: Some("7.0".to_string()),
+    };
+
+    let backend_json = serde_json::to_string(&backend).unwrap();
+    let config_json = serde_json::to_string(&config).unwrap();
+
+    assert_eq!(backend_json, "\"Redb\"");
+    assert!(config_json.contains("test_db"));
+}
+
+#[tokio::test]
+async fn test_database_config_serialization() {
+    let config = DatabaseConfig {
+        name: Some("my_db".to_string()),
+        storage_path: None,
+        max_size: Some(1000000),
+        redis_version: Some("7.0".to_string()),
+    };
+
+    let json = serde_json::to_value(&config).unwrap();
+    assert_eq!(json["name"], "my_db");
+    assert_eq!(json["max_size"], 1000000);
+    assert_eq!(json["redis_version"], "7.0");
+}
+
+#[tokio::test]
+async fn test_backend_type_serialization() {
+    // Test that both Redb and Sled backends serialize correctly
+    let redb_backend = BackendType::Redb;
+    let sled_backend = BackendType::Sled;
+
+    let redb_json = serde_json::to_string(&redb_backend).unwrap();
+    let sled_json = serde_json::to_string(&sled_backend).unwrap();
+
+    assert_eq!(redb_json, "\"Redb\"");
+    assert_eq!(sled_json, "\"Sled\"");
+
+    // Test deserialization
+    let redb_deserialized: BackendType = serde_json::from_str(&redb_json).unwrap();
+    let sled_deserialized: BackendType = serde_json::from_str(&sled_json).unwrap();
+
+    assert!(matches!(redb_deserialized, BackendType::Redb));
+    assert!(matches!(sled_deserialized, BackendType::Sled));
+}
+
+#[tokio::test]
+async fn test_database_name_persistence() {
+    let base_dir = "/tmp/test_db_name_persistence";
+    let admin_secret = "test-admin-secret";
+    let backend = OptionsBackendType::Redb;
+    let db_id = 1;
+    let test_name = "test-database-name";
+
+    // Clean up any existing test data
+    let _ = std::fs::remove_dir_all(base_dir);
+
+    // Set the database name
+    admin_meta::set_database_name(Path::new(base_dir), backend.clone(), admin_secret, db_id, test_name)
+        .expect("Failed to set database name");
+
+    // Retrieve the database name
+    let retrieved_name = admin_meta::get_database_name(Path::new(base_dir), backend, admin_secret, db_id)
+        .expect("Failed to get database name");
+
+    // Verify the name matches
+    assert_eq!(retrieved_name, Some(test_name.to_string()));
+
+    // Clean up
+    let _ = std::fs::remove_dir_all(base_dir);
+}

tests/simple_integration_test.rs

@@ -1,44 +1,51 @@
-use herodb::{options::DBOption, server::Server};
+use herodb::{server::Server, options::DBOption};
+use std::path::PathBuf;
 use std::time::Duration;
+use tokio::time::sleep;
 use tokio::io::{AsyncReadExt, AsyncWriteExt};
 use tokio::net::TcpStream;
-use tokio::time::sleep;
 
 // Helper function to start a test server with clean data directory
 async fn start_test_server(test_name: &str) -> (Server, u16) {
     use std::sync::atomic::{AtomicU16, Ordering};
     static PORT_COUNTER: AtomicU16 = AtomicU16::new(17000);
-
+    
     // Get a unique port for this test
     let port = PORT_COUNTER.fetch_add(1, Ordering::SeqCst);
-
+    
     let test_dir = format!("/tmp/herodb_test_{}", test_name);
-
+    
     // Clean up any existing test data
     let _ = std::fs::remove_dir_all(&test_dir);
     std::fs::create_dir_all(&test_dir).unwrap();
-
+    
     let option = DBOption {
-        dir: test_dir,
+        dir: PathBuf::from(test_dir),
         port,
         debug: true,
         encrypt: false,
         encryption_key: None,
         backend: herodb::options::BackendType::Redb,
+        admin_secret: "test-admin".to_string(),
     };
-
+    
     let server = Server::new(option).await;
     (server, port)
 }
 
 // Helper function to send Redis command and get response
 async fn send_redis_command(port: u16, command: &str) -> String {
-    let mut stream = TcpStream::connect(format!("127.0.0.1:{}", port))
+    let mut stream = TcpStream::connect(format!("127.0.0.1:{}", port)).await.unwrap();
-        .await
+    
-        .unwrap();
+    // Acquire ReadWrite permissions on this new connection
-    stream.write_all(command.as_bytes()).await.unwrap();
+    let handshake = "*4\r\n$6\r\nSELECT\r\n$1\r\n0\r\n$3\r\nKEY\r\n$10\r\ntest-admin\r\n";
-
+    stream.write_all(handshake.as_bytes()).await.unwrap();
     let mut buffer = [0; 1024];
+    let _ = stream.read(&mut buffer).await.unwrap(); // Read and ignore the OK for handshake
+    
+    // Now send the intended command
+    stream.write_all(command.as_bytes()).await.unwrap();
+    
     let n = stream.read(&mut buffer).await.unwrap();
     String::from_utf8_lossy(&buffer[..n]).to_string()
 }
@@ -46,13 +53,13 @@ async fn send_redis_command(port: u16, command: &str) -> String {
 #[tokio::test]
 async fn test_basic_redis_functionality() {
     let (mut server, port) = start_test_server("basic").await;
-
+    
     // Start server in background with timeout
     let server_handle = tokio::spawn(async move {
         let listener = tokio::net::TcpListener::bind(format!("127.0.0.1:{}", port))
             .await
             .unwrap();
-
+        
         // Accept only a few connections for testing
         for _ in 0..10 {
             if let Ok((stream, _)) = listener.accept().await {
@@ -60,79 +67,68 @@ async fn test_basic_redis_functionality() {
             }
         }
     });
-
+    
     sleep(Duration::from_millis(100)).await;
-
+    
     // Test PING
     let response = send_redis_command(port, "*1\r\n$4\r\nPING\r\n").await;
     assert!(response.contains("PONG"));
-
+    
     // Test SET
-    let response =
+    let response = send_redis_command(port, "*3\r\n$3\r\nSET\r\n$3\r\nkey\r\n$5\r\nvalue\r\n").await;
-        send_redis_command(port, "*3\r\n$3\r\nSET\r\n$3\r\nkey\r\n$5\r\nvalue\r\n").await;
     assert!(response.contains("OK"));
-
+    
     // Test GET
     let response = send_redis_command(port, "*2\r\n$3\r\nGET\r\n$3\r\nkey\r\n").await;
     assert!(response.contains("value"));
-
+    
     // Test HSET
-    let response = send_redis_command(
+    let response = send_redis_command(port, "*4\r\n$4\r\nHSET\r\n$4\r\nhash\r\n$5\r\nfield\r\n$5\r\nvalue\r\n").await;
-        port,
-        "*4\r\n$4\r\nHSET\r\n$4\r\nhash\r\n$5\r\nfield\r\n$5\r\nvalue\r\n",
-    )
-    .await;
     assert!(response.contains("1"));
-
+    
     // Test HGET
-    let response =
+    let response = send_redis_command(port, "*3\r\n$4\r\nHGET\r\n$4\r\nhash\r\n$5\r\nfield\r\n").await;
-        send_redis_command(port, "*3\r\n$4\r\nHGET\r\n$4\r\nhash\r\n$5\r\nfield\r\n").await;
     assert!(response.contains("value"));
-
+    
     // Test EXISTS
     let response = send_redis_command(port, "*2\r\n$6\r\nEXISTS\r\n$3\r\nkey\r\n").await;
     assert!(response.contains("1"));
-
+    
     // Test TTL
     let response = send_redis_command(port, "*2\r\n$3\r\nTTL\r\n$3\r\nkey\r\n").await;
     assert!(response.contains("-1")); // No expiration
-
+    
     // Test TYPE
     let response = send_redis_command(port, "*2\r\n$4\r\nTYPE\r\n$3\r\nkey\r\n").await;
     assert!(response.contains("string"));
-
+    
     // Test QUIT to close connection gracefully
-    let mut stream = TcpStream::connect(format!("127.0.0.1:{}", port))
+    let mut stream = TcpStream::connect(format!("127.0.0.1:{}", port)).await.unwrap();
-        .await
+    stream.write_all("*1\r\n$4\r\nQUIT\r\n".as_bytes()).await.unwrap();
-        .unwrap();
-    stream
-        .write_all("*1\r\n$4\r\nQUIT\r\n".as_bytes())
-        .await
-        .unwrap();
     let mut buffer = [0; 1024];
     let n = stream.read(&mut buffer).await.unwrap();
     let response = String::from_utf8_lossy(&buffer[..n]);
     assert!(response.contains("OK"));
-
+    
     // Ensure the stream is closed
     stream.shutdown().await.unwrap();
 
     // Stop the server
     server_handle.abort();
-
+    
     println!("✅ All basic Redis functionality tests passed!");
 }
 
 #[tokio::test]
 async fn test_hash_operations() {
     let (mut server, port) = start_test_server("hash_ops").await;
-
+    
     // Start server in background with timeout
     let server_handle = tokio::spawn(async move {
         let listener = tokio::net::TcpListener::bind(format!("127.0.0.1:{}", port))
             .await
             .unwrap();
-
+        
         // Accept only a few connections for testing
         for _ in 0..5 {
             if let Ok((stream, _)) = listener.accept().await {
@@ -140,57 +136,53 @@ async fn test_hash_operations() {
             }
         }
     });
-
+    
     sleep(Duration::from_millis(100)).await;
-
+    
     // Test HSET multiple fields
     let response = send_redis_command(port, "*6\r\n$4\r\nHSET\r\n$4\r\nhash\r\n$6\r\nfield1\r\n$6\r\nvalue1\r\n$6\r\nfield2\r\n$6\r\nvalue2\r\n").await;
     assert!(response.contains("2")); // 2 new fields
-
+    
     // Test HGETALL
     let response = send_redis_command(port, "*2\r\n$7\r\nHGETALL\r\n$4\r\nhash\r\n").await;
     assert!(response.contains("field1"));
     assert!(response.contains("value1"));
     assert!(response.contains("field2"));
     assert!(response.contains("value2"));
-
+    
     // Test HEXISTS
-    let response = send_redis_command(
+    let response = send_redis_command(port, "*3\r\n$7\r\nHEXISTS\r\n$4\r\nhash\r\n$6\r\nfield1\r\n").await;
-        port,
-        "*3\r\n$7\r\nHEXISTS\r\n$4\r\nhash\r\n$6\r\nfield1\r\n",
-    )
-    .await;
     assert!(response.contains("1"));
-
+    
     // Test HLEN
     let response = send_redis_command(port, "*2\r\n$4\r\nHLEN\r\n$4\r\nhash\r\n").await;
     assert!(response.contains("2"));
-
+    
     // Test HSCAN
     let response = send_redis_command(port, "*7\r\n$5\r\nHSCAN\r\n$4\r\nhash\r\n$1\r\n0\r\n$5\r\nMATCH\r\n$1\r\n*\r\n$5\r\nCOUNT\r\n$2\r\n10\r\n").await;
     assert!(response.contains("field1"));
     assert!(response.contains("value1"));
     assert!(response.contains("field2"));
     assert!(response.contains("value2"));
-
+    
     // Stop the server
     // For hash operations, we don't have a persistent stream, so we'll just abort the server.
     // The server should handle closing its connections.
     server_handle.abort();
-
+    
     println!("✅ All hash operations tests passed!");
 }
 
 #[tokio::test]
 async fn test_transaction_operations() {
     let (mut server, port) = start_test_server("transactions").await;
-
+    
     // Start server in background with timeout
     let server_handle = tokio::spawn(async move {
         let listener = tokio::net::TcpListener::bind(format!("127.0.0.1:{}", port))
             .await
             .unwrap();
-
+        
         // Accept only a few connections for testing
         for _ in 0..5 {
             if let Ok((stream, _)) = listener.accept().await {
@@ -198,69 +190,56 @@ async fn test_transaction_operations() {
             }
         }
     });
-
+    
     sleep(Duration::from_millis(100)).await;
-
+    
-    // Use a single connection for the transaction
+     // Use a single connection for the transaction
-    let mut stream = TcpStream::connect(format!("127.0.0.1:{}", port))
+    let mut stream = TcpStream::connect(format!("127.0.0.1:{}", port)).await.unwrap();
-        .await
+    
-        .unwrap();
+    // Acquire write permissions for this connection
-
+    let handshake = "*4\r\n$6\r\nSELECT\r\n$1\r\n0\r\n$3\r\nKEY\r\n$10\r\ntest-admin\r\n";
-    // Test MULTI
+    stream.write_all(handshake.as_bytes()).await.unwrap();
-    stream
-        .write_all("*1\r\n$5\r\nMULTI\r\n".as_bytes())
-        .await
-        .unwrap();
     let mut buffer = [0; 1024];
     let n = stream.read(&mut buffer).await.unwrap();
+    let resp = String::from_utf8_lossy(&buffer[..n]);
+    assert!(resp.contains("OK"));
+    
+    // Test MULTI
+    stream.write_all("*1\r\n$5\r\nMULTI\r\n".as_bytes()).await.unwrap();
+    let n = stream.read(&mut buffer).await.unwrap();
     let response = String::from_utf8_lossy(&buffer[..n]);
     assert!(response.contains("OK"));
-
+    
     // Test queued commands
-    stream
+    stream.write_all("*3\r\n$3\r\nSET\r\n$4\r\nkey1\r\n$6\r\nvalue1\r\n".as_bytes()).await.unwrap();
-        .write_all("*3\r\n$3\r\nSET\r\n$4\r\nkey1\r\n$6\r\nvalue1\r\n".as_bytes())
-        .await
-        .unwrap();
     let n = stream.read(&mut buffer).await.unwrap();
     let response = String::from_utf8_lossy(&buffer[..n]);
     assert!(response.contains("QUEUED"));
-
+    
-    stream
+    stream.write_all("*3\r\n$3\r\nSET\r\n$4\r\nkey2\r\n$6\r\nvalue2\r\n".as_bytes()).await.unwrap();
-        .write_all("*3\r\n$3\r\nSET\r\n$4\r\nkey2\r\n$6\r\nvalue2\r\n".as_bytes())
-        .await
-        .unwrap();
     let n = stream.read(&mut buffer).await.unwrap();
     let response = String::from_utf8_lossy(&buffer[..n]);
     assert!(response.contains("QUEUED"));
-
+    
     // Test EXEC
-    stream
+    stream.write_all("*1\r\n$4\r\nEXEC\r\n".as_bytes()).await.unwrap();
-        .write_all("*1\r\n$4\r\nEXEC\r\n".as_bytes())
-        .await
-        .unwrap();
     let n = stream.read(&mut buffer).await.unwrap();
     let response = String::from_utf8_lossy(&buffer[..n]);
     assert!(response.contains("OK")); // Should contain array of OK responses
-
+    
     // Verify commands were executed
-    stream
+    stream.write_all("*2\r\n$3\r\nGET\r\n$4\r\nkey1\r\n".as_bytes()).await.unwrap();
-        .write_all("*2\r\n$3\r\nGET\r\n$4\r\nkey1\r\n".as_bytes())
-        .await
-        .unwrap();
     let n = stream.read(&mut buffer).await.unwrap();
     let response = String::from_utf8_lossy(&buffer[..n]);
     assert!(response.contains("value1"));
-
+    
-    stream
+    stream.write_all("*2\r\n$3\r\nGET\r\n$4\r\nkey2\r\n".as_bytes()).await.unwrap();
-        .write_all("*2\r\n$3\r\nGET\r\n$4\r\nkey2\r\n".as_bytes())
-        .await
-        .unwrap();
     let n = stream.read(&mut buffer).await.unwrap();
     let response = String::from_utf8_lossy(&buffer[..n]);
     assert!(response.contains("value2"));
 
     // Stop the server
     server_handle.abort();
-
+    
     println!("✅ All transaction operations tests passed!");
-}
+}

tests/simple_redis_test.rs

@@ -1,4 +1,5 @@
-use herodb::{options::DBOption, server::Server};
+use herodb::{server::Server, options::DBOption};
+use std::path::PathBuf;
 use std::time::Duration;
 use tokio::io::{AsyncReadExt, AsyncWriteExt};
 use tokio::net::TcpStream;
@@ -8,23 +9,24 @@ use tokio::time::sleep;
 async fn start_test_server(test_name: &str) -> (Server, u16) {
     use std::sync::atomic::{AtomicU16, Ordering};
     static PORT_COUNTER: AtomicU16 = AtomicU16::new(16500);
-
+    
     let port = PORT_COUNTER.fetch_add(1, Ordering::SeqCst);
     let test_dir = format!("/tmp/herodb_simple_test_{}", test_name);
-
+    
     // Clean up any existing test data
     let _ = std::fs::remove_dir_all(&test_dir);
     std::fs::create_dir_all(&test_dir).unwrap();
-
+    
     let option = DBOption {
-        dir: test_dir,
+        dir: PathBuf::from(test_dir),
         port,
         debug: false,
         encrypt: false,
         encryption_key: None,
         backend: herodb::options::BackendType::Redb,
+        admin_secret: "test-admin".to_string(),
     };
-
+    
     let server = Server::new(option).await;
     (server, port)
 }
@@ -32,18 +34,28 @@ async fn start_test_server(test_name: &str) -> (Server, u16) {
 // Helper function to send command and get response
 async fn send_command(stream: &mut TcpStream, command: &str) -> String {
     stream.write_all(command.as_bytes()).await.unwrap();
-
+    
     let mut buffer = [0; 1024];
     let n = stream.read(&mut buffer).await.unwrap();
     String::from_utf8_lossy(&buffer[..n]).to_string()
 }
 
-// Helper function to connect to the test server
+ // Helper function to connect to the test server
 async fn connect_to_server(port: u16) -> TcpStream {
     let mut attempts = 0;
     loop {
         match TcpStream::connect(format!("127.0.0.1:{}", port)).await {
-            Ok(stream) => return stream,
+            Ok(mut stream) => {
+                // Acquire ReadWrite permissions for this connection
+                let resp = send_command(
+                    &mut stream,
+                    "*4\r\n$6\r\nSELECT\r\n$1\r\n0\r\n$3\r\nKEY\r\n$10\r\ntest-admin\r\n",
+                ).await;
+                if !resp.contains("OK") {
+                    panic!("Failed to acquire write permissions via SELECT 0 KEY test-admin: {}", resp);
+                }
+                return stream;
+            }
             Err(_) if attempts < 10 => {
                 attempts += 1;
                 sleep(Duration::from_millis(100)).await;
@@ -56,22 +68,22 @@ async fn connect_to_server(port: u16) -> TcpStream {
 #[tokio::test]
 async fn test_basic_ping_simple() {
     let (mut server, port) = start_test_server("ping").await;
-
+    
     // Start server in background
     tokio::spawn(async move {
         let listener = tokio::net::TcpListener::bind(format!("127.0.0.1:{}", port))
             .await
             .unwrap();
-
+        
         loop {
             if let Ok((stream, _)) = listener.accept().await {
                 let _ = server.handle(stream).await;
             }
         }
     });
-
+    
     sleep(Duration::from_millis(200)).await;
-
+    
     let mut stream = connect_to_server(port).await;
     let response = send_command(&mut stream, "*1\r\n$4\r\nPING\r\n").await;
     assert!(response.contains("PONG"));
@@ -80,43 +92,38 @@ async fn test_basic_ping_simple() {
 #[tokio::test]
 async fn test_hset_clean_db() {
     let (mut server, port) = start_test_server("hset_clean").await;
-
+    
     // Start server in background
     tokio::spawn(async move {
         let listener = tokio::net::TcpListener::bind(format!("127.0.0.1:{}", port))
             .await
             .unwrap();
-
+        
         loop {
             if let Ok((stream, _)) = listener.accept().await {
                 let _ = server.handle(stream).await;
             }
         }
     });
-
+    
     sleep(Duration::from_millis(200)).await;
-
+    
     let mut stream = connect_to_server(port).await;
 
-    // Test HSET - should return 1 for new field
+    // Ensure clean DB state (admin DB 0 may be shared due to global singleton)
-    let response = send_command(
+    let flush = send_command(&mut stream, "*1\r\n$7\r\nFLUSHDB\r\n").await;
-        &mut stream,
+    assert!(flush.contains("OK"), "Failed to FLUSHDB: {}", flush);
-        "*4\r\n$4\r\nHSET\r\n$4\r\nhash\r\n$6\r\nfield1\r\n$6\r\nvalue1\r\n",
-    )
-    .await;
-    println!("HSET response: {}", response);
-    assert!(
-        response.contains("1"),
-        "Expected HSET to return 1, got: {}",
-        response
-    );
 
+    // Test HSET - should return 1 for new field (use a unique key name to avoid collisions)
+    let key = "hash_clean";
+    let hset_cmd = format!("*4\r\n$4\r\nHSET\r\n${}\r\n{}\r\n$6\r\nfield1\r\n$6\r\nvalue1\r\n", key.len(), key);
+    let response = send_command(&mut stream, &hset_cmd).await;
+    println!("HSET response: {}", response);
+    assert!(response.contains("1"), "Expected HSET to return 1, got: {}", response);
+    
     // Test HGET
-    let response = send_command(
+    let hget_cmd = format!("*3\r\n$4\r\nHGET\r\n${}\r\n{}\r\n$6\r\nfield1\r\n", key.len(), key);
-        &mut stream,
+    let response = send_command(&mut stream, &hget_cmd).await;
-        "*3\r\n$4\r\nHGET\r\n$4\r\nhash\r\n$6\r\nfield1\r\n",
-    )
-    .await;
     println!("HGET response: {}", response);
     assert!(response.contains("value1"));
 }
@@ -124,101 +131,73 @@ async fn test_hset_clean_db() {
 #[tokio::test]
 async fn test_type_command_simple() {
     let (mut server, port) = start_test_server("type").await;
-
+    
     // Start server in background
     tokio::spawn(async move {
         let listener = tokio::net::TcpListener::bind(format!("127.0.0.1:{}", port))
             .await
             .unwrap();
-
+        
         loop {
             if let Ok((stream, _)) = listener.accept().await {
                 let _ = server.handle(stream).await;
             }
         }
     });
-
+    
     sleep(Duration::from_millis(200)).await;
-
+    
     let mut stream = connect_to_server(port).await;
-
+    
     // Test string type
-    send_command(
+    send_command(&mut stream, "*3\r\n$3\r\nSET\r\n$6\r\nstring\r\n$5\r\nvalue\r\n").await;
-        &mut stream,
-        "*3\r\n$3\r\nSET\r\n$6\r\nstring\r\n$5\r\nvalue\r\n",
-    )
-    .await;
     let response = send_command(&mut stream, "*2\r\n$4\r\nTYPE\r\n$6\r\nstring\r\n").await;
     println!("TYPE string response: {}", response);
     assert!(response.contains("string"));
-
+    
     // Test hash type
-    send_command(
+    send_command(&mut stream, "*4\r\n$4\r\nHSET\r\n$4\r\nhash\r\n$5\r\nfield\r\n$5\r\nvalue\r\n").await;
-        &mut stream,
-        "*4\r\n$4\r\nHSET\r\n$4\r\nhash\r\n$5\r\nfield\r\n$5\r\nvalue\r\n",
-    )
-    .await;
     let response = send_command(&mut stream, "*2\r\n$4\r\nTYPE\r\n$4\r\nhash\r\n").await;
     println!("TYPE hash response: {}", response);
     assert!(response.contains("hash"));
-
+    
     // Test non-existent key
     let response = send_command(&mut stream, "*2\r\n$4\r\nTYPE\r\n$7\r\nnoexist\r\n").await;
     println!("TYPE noexist response: {}", response);
-    assert!(
+    assert!(response.contains("none"), "Expected 'none' for non-existent key, got: {}", response);
-        response.contains("none"),
-        "Expected 'none' for non-existent key, got: {}",
-        response
-    );
 }
 
 #[tokio::test]
 async fn test_hexists_simple() {
     let (mut server, port) = start_test_server("hexists").await;
-
+    
     // Start server in background
     tokio::spawn(async move {
         let listener = tokio::net::TcpListener::bind(format!("127.0.0.1:{}", port))
             .await
             .unwrap();
-
+        
         loop {
             if let Ok((stream, _)) = listener.accept().await {
                 let _ = server.handle(stream).await;
             }
         }
     });
-
+    
     sleep(Duration::from_millis(200)).await;
-
+    
     let mut stream = connect_to_server(port).await;
-
+    
     // Set up hash
-    send_command(
+    send_command(&mut stream, "*4\r\n$4\r\nHSET\r\n$4\r\nhash\r\n$6\r\nfield1\r\n$6\r\nvalue1\r\n").await;
-        &mut stream,
+    
-        "*4\r\n$4\r\nHSET\r\n$4\r\nhash\r\n$6\r\nfield1\r\n$6\r\nvalue1\r\n",
-    )
-    .await;
-
     // Test HEXISTS for existing field
-    let response = send_command(
+    let response = send_command(&mut stream, "*3\r\n$7\r\nHEXISTS\r\n$4\r\nhash\r\n$6\r\nfield1\r\n").await;
-        &mut stream,
-        "*3\r\n$7\r\nHEXISTS\r\n$4\r\nhash\r\n$6\r\nfield1\r\n",
-    )
-    .await;
     println!("HEXISTS existing field response: {}", response);
     assert!(response.contains("1"));
-
+    
     // Test HEXISTS for non-existent field
-    let response = send_command(
+    let response = send_command(&mut stream, "*3\r\n$7\r\nHEXISTS\r\n$4\r\nhash\r\n$7\r\nnoexist\r\n").await;
-        &mut stream,
-        "*3\r\n$7\r\nHEXISTS\r\n$4\r\nhash\r\n$7\r\nnoexist\r\n",
-    )
-    .await;
     println!("HEXISTS non-existent field response: {}", response);
-    assert!(
+    assert!(response.contains("0"), "Expected HEXISTS to return 0 for non-existent field, got: {}", response);
-        response.contains("0"),
+}
-        "Expected HEXISTS to return 0 for non-existent field, got: {}",
-        response
-    );
-}

tests/tantivy_integration_tests.rs

@@ -0,0 +1,294 @@
+use redis::{Client, Connection, RedisResult};
+use std::process::{Child, Command};
+use std::time::Duration;
+use jsonrpsee::http_client::{HttpClientBuilder, HttpClient};
+use herodb::rpc::{RpcClient, BackendType, DatabaseConfig};
+
+// Helper function to get Redis connection, retrying until successful
+fn get_redis_connection(port: u16) -> Connection {
+    let connection_info = format!("redis://127.0.0.1:{}", port);
+    let client = Client::open(connection_info).unwrap();
+    let mut attempts = 0;
+    loop {
+        match client.get_connection() {
+            Ok(mut conn) => {
+                if redis::cmd("PING").query::<String>(&mut conn).is_ok() {
+                    return conn;
+                }
+            }
+            Err(e) => {
+                if attempts >= 120 {
+                    panic!(
+                        "Failed to connect to Redis server after 120 attempts: {}",
+                        e
+                    );
+                }
+            }
+        }
+        attempts += 1;
+        std::thread::sleep(Duration::from_millis(100));
+    }
+}
+
+// Helper function to get RPC client
+async fn get_rpc_client(port: u16) -> HttpClient {
+    let url = format!("http://127.0.0.1:{}", port + 1); // RPC port is Redis port + 1
+    let client = HttpClientBuilder::default().build(url).unwrap();
+    client
+}
+
+// A guard to ensure the server process is killed when it goes out of scope
+struct ServerProcessGuard {
+    process: Child,
+    test_dir: String,
+}
+
+impl Drop for ServerProcessGuard {
+    fn drop(&mut self) {
+        println!("Killing server process (pid: {})...", self.process.id());
+        if let Err(e) = self.process.kill() {
+            eprintln!("Failed to kill server process: {}", e);
+        }
+        match self.process.wait() {
+            Ok(status) => println!("Server process exited with: {}", status),
+            Err(e) => eprintln!("Failed to wait on server process: {}", e),
+        }
+
+        // Clean up the specific test directory
+        println!("Cleaning up test directory: {}", self.test_dir);
+        if let Err(e) = std::fs::remove_dir_all(&self.test_dir) {
+            eprintln!("Failed to clean up test directory: {}", e);
+        }
+    }
+}
+
+// Helper to set up the server and return connections
+async fn setup_server() -> (ServerProcessGuard, u16, Connection, HttpClient) {
+    use std::sync::atomic::{AtomicU16, Ordering};
+    static PORT_COUNTER: AtomicU16 = AtomicU16::new(16500);
+    let port = PORT_COUNTER.fetch_add(1, Ordering::SeqCst);
+
+    let test_dir = format!("/tmp/herodb_tantivy_test_{}", port);
+
+    // Clean up previous test data
+    if std::path::Path::new(&test_dir).exists() {
+        let _ = std::fs::remove_dir_all(&test_dir);
+    }
+    std::fs::create_dir_all(&test_dir).unwrap();
+
+    // Start the server in a subprocess
+    let child = Command::new("cargo")
+        .args(&[
+            "run",
+            "--",
+            "--dir",
+            &test_dir,
+            "--port",
+            &port.to_string(),
+            "--rpc-port",
+            &(port + 1).to_string(),
+            "--enable-rpc",
+            "--debug",
+            "--admin-secret",
+            "test-admin",
+        ])
+        .spawn()
+        .expect("Failed to start server process");
+
+    // Create a new guard that also owns the test directory path
+    let guard = ServerProcessGuard {
+        process: child,
+        test_dir,
+    };
+
+    // Give the server time to build and start (cargo run may compile first)
+    std::thread::sleep(Duration::from_millis(3000));
+
+    let conn = get_redis_connection(port);
+    let rpc_client = get_rpc_client(port).await;
+
+    (guard, port, conn, rpc_client)
+}
+
+
+#[tokio::test]
+async fn test_tantivy_full_text_search() {
+    let (_server_guard, _port, mut conn, rpc_client) = setup_server().await;
+
+    // Create a Tantivy database via RPC
+    let db_config = DatabaseConfig {
+        name: Some("test_tantivy_db".to_string()),
+        storage_path: None,
+        max_size: None,
+        redis_version: None,
+    };
+
+    let db_id = rpc_client.create_database(BackendType::Tantivy, db_config, None).await.unwrap();
+    assert_eq!(db_id, 1);
+
+    // Add readwrite access key
+    let _ = rpc_client.add_access_key(db_id, "readwrite_key".to_string(), "readwrite".to_string()).await.unwrap();
+
+    // Add read-only access key
+    let _ = rpc_client.add_access_key(db_id, "read_key".to_string(), "read".to_string()).await.unwrap();
+
+    // Test with readwrite permissions
+    test_tantivy_with_readwrite_permissions(&mut conn, db_id).await;
+
+    // Test with read-only permissions
+    test_tantivy_with_read_permissions(&mut conn, db_id).await;
+
+    // Test access denied for invalid key
+    test_tantivy_access_denied(&mut conn, db_id).await;
+}
+
+async fn test_tantivy_with_readwrite_permissions(conn: &mut Connection, db_id: u64) {
+    // Select database with readwrite key
+    let result: RedisResult<String> = redis::cmd("SELECT")
+        .arg(db_id)
+        .arg("KEY")
+        .arg("readwrite_key")
+        .query(conn);
+    assert!(result.is_ok());
+    assert_eq!(result.unwrap(), "OK");
+
+    // Test FT.CREATE
+    let result: RedisResult<String> = redis::cmd("FT.CREATE")
+        .arg("test_index")
+        .arg("SCHEMA")
+        .arg("title")
+        .arg("TEXT")
+        .arg("content")
+        .arg("TEXT")
+        .arg("tags")
+        .arg("TAG")
+        .query(conn);
+    assert!(result.is_ok());
+    assert_eq!(result.unwrap(), "OK");
+
+    // Test FT.ADD
+    let result: RedisResult<String> = redis::cmd("FT.ADD")
+        .arg("test_index")
+        .arg("doc1")
+        .arg("1.0")
+        .arg("title")
+        .arg("Hello World")
+        .arg("content")
+        .arg("This is a test document")
+        .arg("tags")
+        .arg("test,example")
+        .query(conn);
+    assert!(result.is_ok());
+    assert_eq!(result.unwrap(), "OK");
+
+    // Add another document
+    let result: RedisResult<String> = redis::cmd("FT.ADD")
+        .arg("test_index")
+        .arg("doc2")
+        .arg("1.0")
+        .arg("title")
+        .arg("Goodbye World")
+        .arg("content")
+        .arg("Another test document")
+        .arg("tags")
+        .arg("test,another")
+        .query(conn);
+    assert!(result.is_ok());
+    assert_eq!(result.unwrap(), "OK");
+
+    // Test FT.SEARCH
+    let result: RedisResult<Vec<String>> = redis::cmd("FT.SEARCH")
+        .arg("test_index")
+        .arg("test")
+        .query(conn);
+    assert!(result.is_ok());
+    let results = result.unwrap();
+    assert!(results.len() >= 3); // At least total count + 2 documents
+    assert_eq!(results[0], "2"); // Total matches
+
+    // Test FT.INFO
+    let result: RedisResult<Vec<String>> = redis::cmd("FT.INFO")
+        .arg("test_index")
+        .query(conn);
+    assert!(result.is_ok());
+    let info = result.unwrap();
+    assert!(info.contains(&"index_name".to_string()));
+    assert!(info.contains(&"test_index".to_string()));
+
+    // Test FT.DEL
+    let result: RedisResult<String> = redis::cmd("FT.DEL")
+        .arg("test_index")
+        .arg("doc1")
+        .query(conn);
+    assert!(result.is_ok());
+    assert_eq!(result.unwrap(), "1");
+
+    // Verify document was deleted
+    let result: RedisResult<Vec<String>> = redis::cmd("FT.SEARCH")
+        .arg("test_index")
+        .arg("Hello")
+        .query(conn);
+    assert!(result.is_ok());
+    let results = result.unwrap();
+    assert_eq!(results[0], "0"); // No matches
+
+    // Test FT.DROP
+    let result: RedisResult<String> = redis::cmd("FT.DROP")
+        .arg("test_index")
+        .query(conn);
+    assert!(result.is_ok());
+    assert_eq!(result.unwrap(), "OK");
+
+    // Verify index was dropped
+    let result: RedisResult<String> = redis::cmd("FT.INFO")
+        .arg("test_index")
+        .query(conn);
+    assert!(result.is_err()); // Should fail
+}
+
+async fn test_tantivy_with_read_permissions(conn: &mut Connection, db_id: u64) {
+    // Select database with read-only key
+    let result: RedisResult<String> = redis::cmd("SELECT")
+        .arg(db_id)
+        .arg("KEY")
+        .arg("read_key")
+        .query(conn);
+    assert!(result.is_ok());
+    assert_eq!(result.unwrap(), "OK");
+
+    // Recreate index for testing
+    let result: RedisResult<String> = redis::cmd("FT.CREATE")
+        .arg("test_index_read")
+        .arg("SCHEMA")
+        .arg("title")
+        .arg("TEXT")
+        .query(conn);
+    assert!(result.is_err()); // Should fail due to read-only permissions
+    assert!(result.unwrap_err().to_string().contains("write permission denied"));
+
+    // Add document should fail
+    let result: RedisResult<String> = redis::cmd("FT.ADD")
+        .arg("test_index_read")
+        .arg("doc1")
+        .arg("1.0")
+        .arg("title")
+        .arg("Test")
+        .query(conn);
+    assert!(result.is_err());
+    assert!(result.unwrap_err().to_string().contains("write permission denied"));
+
+    // But search should work (if index exists)
+    // First create index with write permissions, then switch to read
+    // For this test, we'll assume the index doesn't exist, so search fails differently
+}
+
+async fn test_tantivy_access_denied(conn: &mut Connection, db_id: u64) {
+    // Try to select with invalid key
+    let result: RedisResult<String> = redis::cmd("SELECT")
+        .arg(db_id)
+        .arg("KEY")
+        .arg("invalid_key")
+        .query(conn);
+    assert!(result.is_err());
+    assert!(result.unwrap_err().to_string().contains("invalid access key"));
+}

tests/usage_suite.rs

@@ -1,4 +1,5 @@
 use herodb::{options::DBOption, server::Server};
+use std::path::PathBuf;
 use tokio::io::{AsyncReadExt, AsyncWriteExt};
 use tokio::net::TcpStream;
 use tokio::time::{sleep, Duration};
@@ -17,12 +18,13 @@ async fn start_test_server(test_name: &str) -> (Server, u16) {
     std::fs::create_dir_all(&test_dir).unwrap();
 
     let option = DBOption {
-        dir: test_dir,
+        dir: PathBuf::from(test_dir),
         port,
         debug: false,
         encrypt: false,
         encryption_key: None,
         backend: herodb::options::BackendType::Redb,
+        admin_secret: "test-admin".to_string(),
     };
 
     let server = Server::new(option).await;
@@ -61,7 +63,17 @@ async fn connect(port: u16) -> TcpStream {
     let mut attempts = 0;
     loop {
         match TcpStream::connect(format!("127.0.0.1:{}", port)).await {
-            Ok(s) => return s,
+            Ok(mut s) => {
+                // Acquire ReadWrite permissions for this connection using admin DB 0
+                let resp = send_cmd(&mut s, &["SELECT", "0", "KEY", "test-admin"]).await;
+                assert_contains(&resp, "OK", "SELECT 0 KEY test-admin handshake");
+
+                // Ensure clean slate per test on DB 0
+                let fl = send_cmd(&mut s, &["FLUSHDB"]).await;
+                assert_contains(&fl, "OK", "FLUSHDB after handshake");
+
+                return s;
+            }
             Err(_) if attempts < 30 => {
                 attempts += 1;
                 sleep(Duration::from_millis(100)).await;
@@ -246,9 +258,9 @@ async fn test_01_connection_and_info() {
     let getname = send_cmd(&mut s, &["CLIENT", "GETNAME"]).await;
     assert_contains(&getname, "myapp", "CLIENT GETNAME");
 
-    // SELECT db
+    // SELECT db (requires key on DB 0)
-    let sel = send_cmd(&mut s, &["SELECT", "0"]).await;
+    let sel = send_cmd(&mut s, &["SELECT", "0", "KEY", "test-admin"]).await;
-    assert_contains(&sel, "OK", "SELECT 0");
+    assert_contains(&sel, "OK", "SELECT 0 with key");
 
     // QUIT should close connection after sending OK
     let quit = send_cmd(&mut s, &["QUIT"]).await;
@@ -279,7 +291,11 @@ async fn test_02_strings_and_expiry() {
 
     let ex0 = send_cmd(&mut s, &["EXISTS", "user:1"]).await;
     assert_contains(&ex0, "0", "EXISTS after DEL");
-
+    
+    // DEL non-existent should return 0
+    let del0 = send_cmd(&mut s, &["DEL", "user:1"]).await;
+    assert_contains(&del0, "0", "DEL user:1 when not exists -> 0");
+    
     // INCR behavior
     let i1 = send_cmd(&mut s, &["INCR", "count"]).await;
     assert_contains(&i1, "1", "INCR new key -> 1");
@@ -325,11 +341,7 @@ async fn test_03_scan_and_keys() {
     let mut s = connect(port).await;
 
     for i in 0..5 {
-        let _ = send_cmd(
+        let _ = send_cmd(&mut s, &["SET", &format!("key{}", i), &format!("value{}", i)]).await;
-            &mut s,
-            &["SET", &format!("key{}", i), &format!("value{}", i)],
-        )
-        .await;
     }
 
     let scan = send_cmd(&mut s, &["SCAN", "0", "MATCH", "key*", "COUNT", "10"]).await;
@@ -362,11 +374,7 @@ async fn test_04_hashes_suite() {
     assert_contains(&h2, "2", "HSET added 2 new fields");
 
     // HMGET
-    let hmg = send_cmd(
+    let hmg = send_cmd(&mut s, &["HMGET", "profile:1", "name", "age", "city", "nope"]).await;
-        &mut s,
-        &["HMGET", "profile:1", "name", "age", "city", "nope"],
-    )
-    .await;
     assert_contains(&hmg, "alice", "HMGET name");
     assert_contains(&hmg, "30", "HMGET age");
     assert_contains(&hmg, "paris", "HMGET city");
@@ -400,11 +408,7 @@ async fn test_04_hashes_suite() {
     assert_contains(&hnx1, "1", "HSETNX new field -> 1");
 
     // HSCAN
-    let hscan = send_cmd(
+    let hscan = send_cmd(&mut s, &["HSCAN", "profile:1", "0", "MATCH", "n*", "COUNT", "10"]).await;
-        &mut s,
-        &["HSCAN", "profile:1", "0", "MATCH", "n*", "COUNT", "10"],
-    )
-    .await;
     assert_contains(&hscan, "name", "HSCAN matches fields starting with n");
     assert_contains(&hscan, "nickname", "HSCAN nickname present");
 
@@ -436,21 +440,13 @@ async fn test_05_lists_suite_including_blpop() {
     assert_eq_resp(&lidx, "$1\r\nb\r\n", "LINDEX q:jobs 0 should be b");
 
     let lr = send_cmd(&mut a, &["LRANGE", "q:jobs", "0", "-1"]).await;
-    assert_eq_resp(
+    assert_eq_resp(&lr, "*3\r\n$1\r\nb\r\n$1\r\na\r\n$1\r\nc\r\n", "LRANGE q:jobs 0 -1 should be [b,a,c]");
-        &lr,
-        "*3\r\n$1\r\nb\r\n$1\r\na\r\n$1\r\nc\r\n",
-        "LRANGE q:jobs 0 -1 should be [b,a,c]",
-    );
 
     // LTRIM
     let ltrim = send_cmd(&mut a, &["LTRIM", "q:jobs", "0", "1"]).await;
     assert_contains(&ltrim, "OK", "LTRIM OK");
     let lr_post = send_cmd(&mut a, &["LRANGE", "q:jobs", "0", "-1"]).await;
-    assert_eq_resp(
+    assert_eq_resp(&lr_post, "*2\r\n$1\r\nb\r\n$1\r\na\r\n", "After LTRIM, list [b,a]");
-        &lr_post,
-        "*2\r\n$1\r\nb\r\n$1\r\na\r\n",
-        "After LTRIM, list [b,a]",
-    );
 
     // LREM remove first occurrence of b
     let lrem = send_cmd(&mut a, &["LREM", "q:jobs", "1", "b"]).await;
@@ -464,11 +460,7 @@ async fn test_05_lists_suite_including_blpop() {
 
     // LPOP with count on empty -> []
     let lpop0 = send_cmd(&mut a, &["LPOP", "q:jobs", "2"]).await;
-    assert_eq_resp(
+    assert_eq_resp(&lpop0, "*0\r\n", "LPOP with count on empty returns empty array");
-        &lpop0,
-        "*0\r\n",
-        "LPOP with count on empty returns empty array",
-    );
 
     // BLPOP: block on one client, push from another
     let c1 = connect(port).await;
@@ -525,11 +517,11 @@ async fn test_07_age_stateless_suite() {
     let mut s = connect(port).await;
 
     // GENENC -> [recipient, identity]
-    let gen = send_cmd(&mut s, &["AGE", "GENENC"]).await;
+    let genenc = send_cmd(&mut s, &["AGE", "GENENC"]).await;
     assert!(
-        gen.starts_with("*2\r\n$"),
+        genenc.starts_with("*2\r\n$"),
         "AGE GENENC should return array [recipient, identity], got:\n{}",
-        gen
+        genenc
     );
 
     // Parse simple RESP array of two bulk strings to extract keys
@@ -537,14 +529,14 @@ async fn test_07_age_stateless_suite() {
         // naive parse for tests
         let mut lines = resp.lines();
         let _ = lines.next(); // *2
-                              // $len
+        // $len
         let _ = lines.next();
         let recip = lines.next().unwrap_or("").to_string();
         let _ = lines.next();
         let ident = lines.next().unwrap_or("").to_string();
         (recip, ident)
     }
-    let (recipient, identity) = parse_two_bulk_array(&gen);
+    let (recipient, identity) = parse_two_bulk_array(&genenc);
     assert!(
         recipient.starts_with("age1") && identity.starts_with("AGE-SECRET-KEY-1"),
         "Unexpected AGE key formats.\nrecipient: {}\nidentity: {}",
@@ -572,16 +564,8 @@ async fn test_07_age_stateless_suite() {
     let v_ok = send_cmd(&mut s, &["AGE", "VERIFY", &verify_pub, "msg", &sig_b64]).await;
     assert_contains(&v_ok, "1", "VERIFY should be 1 for valid signature");
 
-    let v_bad = send_cmd(
+    let v_bad = send_cmd(&mut s, &["AGE", "VERIFY", &verify_pub, "tampered", &sig_b64]).await;
-        &mut s,
+    assert_contains(&v_bad, "0", "VERIFY should be 0 for invalid message/signature");
-        &["AGE", "VERIFY", &verify_pub, "tampered", &sig_b64],
-    )
-    .await;
-    assert_contains(
-        &v_bad,
-        "0",
-        "VERIFY should be 0 for invalid message/signature",
-    );
 }
 
 #[tokio::test]
@@ -613,7 +597,7 @@ async fn test_08_age_persistent_named_suite() {
         skg
     );
 
-    let sig = send_cmd(&mut s, &["AGE", "SIGNNAME", "app1", "m"]).await;
+    let sig = send_cmd(&mut s, &["AGE", "SIGNNAME", "app1", "m"] ).await;
     let sig_b64 = extract_bulk_payload(&sig).expect("Failed to parse bulk payload from SIGNNAME");
     let v1 = send_cmd(&mut s, &["AGE", "VERIFYNAME", "app1", "m", &sig_b64]).await;
     assert_contains(&v1, "1", "VERIFYNAME valid => 1");
@@ -623,75 +607,66 @@ async fn test_08_age_persistent_named_suite() {
 
     // AGE LIST
     let lst = send_cmd(&mut s, &["AGE", "LIST"]).await;
-    assert_contains(&lst, "encpub", "AGE LIST label encpub");
+    // After flattening, LIST returns a flat array of managed key names
     assert_contains(&lst, "app1", "AGE LIST includes app1");
 }
 
 #[tokio::test]
 async fn test_10_expire_pexpire_persist() {
-    let (server, port) = start_test_server("expire_suite").await;
+   let (server, port) = start_test_server("expire_suite").await;
-    spawn_listener(server, port).await;
+   spawn_listener(server, port).await;
-    sleep(Duration::from_millis(150)).await;
+   sleep(Duration::from_millis(150)).await;
 
-    let mut s = connect(port).await;
+   let mut s = connect(port).await;
 
-    // EXPIRE: seconds
+   // EXPIRE: seconds
-    let _ = send_cmd(&mut s, &["SET", "exp:s", "v"]).await;
+   let _ = send_cmd(&mut s, &["SET", "exp:s", "v"]).await;
-    let ex = send_cmd(&mut s, &["EXPIRE", "exp:s", "1"]).await;
+   let ex = send_cmd(&mut s, &["EXPIRE", "exp:s", "1"]).await;
-    assert_contains(&ex, "1", "EXPIRE exp:s 1 -> 1 (applied)");
+   assert_contains(&ex, "1", "EXPIRE exp:s 1 -> 1 (applied)");
-    let ttl1 = send_cmd(&mut s, &["TTL", "exp:s"]).await;
+   let ttl1 = send_cmd(&mut s, &["TTL", "exp:s"]).await;
-    assert!(
+   assert!(
-        ttl1.contains("1") || ttl1.contains("0"),
+       ttl1.contains("1") || ttl1.contains("0"),
-        "TTL exp:s should be 1 or 0, got: {}",
+       "TTL exp:s should be 1 or 0, got: {}",
-        ttl1
+       ttl1
-    );
+   );
-    sleep(Duration::from_millis(1100)).await;
+   sleep(Duration::from_millis(1100)).await;
-    let get_after = send_cmd(&mut s, &["GET", "exp:s"]).await;
+   let get_after = send_cmd(&mut s, &["GET", "exp:s"]).await;
-    assert_contains(&get_after, "$-1", "GET after expiry should be Null");
+   assert_contains(&get_after, "$-1", "GET after expiry should be Null");
-    let ttl_after = send_cmd(&mut s, &["TTL", "exp:s"]).await;
+   let ttl_after = send_cmd(&mut s, &["TTL", "exp:s"]).await;
-    assert_contains(&ttl_after, "-2", "TTL after expiry -> -2");
+   assert_contains(&ttl_after, "-2", "TTL after expiry -> -2");
-    let exists_after = send_cmd(&mut s, &["EXISTS", "exp:s"]).await;
+   let exists_after = send_cmd(&mut s, &["EXISTS", "exp:s"]).await;
-    assert_contains(&exists_after, "0", "EXISTS after expiry -> 0");
+   assert_contains(&exists_after, "0", "EXISTS after expiry -> 0");
 
-    // PEXPIRE: milliseconds
+   // PEXPIRE: milliseconds
-    let _ = send_cmd(&mut s, &["SET", "exp:ms", "v"]).await;
+   let _ = send_cmd(&mut s, &["SET", "exp:ms", "v"]).await;
-    let pex = send_cmd(&mut s, &["PEXPIRE", "exp:ms", "1500"]).await;
+   let pex = send_cmd(&mut s, &["PEXPIRE", "exp:ms", "1500"]).await;
-    assert_contains(&pex, "1", "PEXPIRE exp:ms 1500 -> 1 (applied)");
+   assert_contains(&pex, "1", "PEXPIRE exp:ms 1500 -> 1 (applied)");
-    let ttl_ms1 = send_cmd(&mut s, &["TTL", "exp:ms"]).await;
+   let ttl_ms1 = send_cmd(&mut s, &["TTL", "exp:ms"]).await;
-    assert!(
+   assert!(
-        ttl_ms1.contains("1") || ttl_ms1.contains("0"),
+       ttl_ms1.contains("1") || ttl_ms1.contains("0"),
-        "TTL exp:ms should be 1 or 0 soon after PEXPIRE, got: {}",
+       "TTL exp:ms should be 1 or 0 soon after PEXPIRE, got: {}",
-        ttl_ms1
+       ttl_ms1
-    );
+   );
-    sleep(Duration::from_millis(1600)).await;
+   sleep(Duration::from_millis(1600)).await;
-    let exists_ms_after = send_cmd(&mut s, &["EXISTS", "exp:ms"]).await;
+   let exists_ms_after = send_cmd(&mut s, &["EXISTS", "exp:ms"]).await;
-    assert_contains(&exists_ms_after, "0", "EXISTS exp:ms after ms expiry -> 0");
+   assert_contains(&exists_ms_after, "0", "EXISTS exp:ms after ms expiry -> 0");
 
-    // PERSIST: remove expiration
+   // PERSIST: remove expiration
-    let _ = send_cmd(&mut s, &["SET", "exp:persist", "v"]).await;
+   let _ = send_cmd(&mut s, &["SET", "exp:persist", "v"]).await;
-    let _ = send_cmd(&mut s, &["EXPIRE", "exp:persist", "5"]).await;
+   let _ = send_cmd(&mut s, &["EXPIRE", "exp:persist", "5"]).await;
-    let ttl_pre = send_cmd(&mut s, &["TTL", "exp:persist"]).await;
+   let ttl_pre = send_cmd(&mut s, &["TTL", "exp:persist"]).await;
-    assert!(
+   assert!(
-        ttl_pre.contains("5")
+       ttl_pre.contains("5") || ttl_pre.contains("4") || ttl_pre.contains("3") || ttl_pre.contains("2") || ttl_pre.contains("1") || ttl_pre.contains("0"),
-            || ttl_pre.contains("4")
+       "TTL exp:persist should be >=0 before persist, got: {}",
-            || ttl_pre.contains("3")
+       ttl_pre
-            || ttl_pre.contains("2")
+   );
-            || ttl_pre.contains("1")
+   let persist1 = send_cmd(&mut s, &["PERSIST", "exp:persist"]).await;
-            || ttl_pre.contains("0"),
+   assert_contains(&persist1, "1", "PERSIST should remove expiration");
-        "TTL exp:persist should be >=0 before persist, got: {}",
+   let ttl_post = send_cmd(&mut s, &["TTL", "exp:persist"]).await;
-        ttl_pre
+   assert_contains(&ttl_post, "-1", "TTL after PERSIST -> -1 (no expiration)");
-    );
+   // Second persist should return 0 (nothing to remove)
-    let persist1 = send_cmd(&mut s, &["PERSIST", "exp:persist"]).await;
+   let persist2 = send_cmd(&mut s, &["PERSIST", "exp:persist"]).await;
-    assert_contains(&persist1, "1", "PERSIST should remove expiration");
+   assert_contains(&persist2, "0", "PERSIST again -> 0 (no expiration to remove)");
-    let ttl_post = send_cmd(&mut s, &["TTL", "exp:persist"]).await;
-    assert_contains(&ttl_post, "-1", "TTL after PERSIST -> -1 (no expiration)");
-    // Second persist should return 0 (nothing to remove)
-    let persist2 = send_cmd(&mut s, &["PERSIST", "exp:persist"]).await;
-    assert_contains(
-        &persist2,
-        "0",
-        "PERSIST again -> 0 (no expiration to remove)",
-    );
 }
 
 #[tokio::test]
@@ -704,11 +679,7 @@ async fn test_11_set_with_options() {
 
     // SET with GET on non-existing key -> returns Null, sets value
     let set_get1 = send_cmd(&mut s, &["SET", "s1", "v1", "GET"]).await;
-    assert_contains(
+    assert_contains(&set_get1, "$-1", "SET s1 v1 GET returns Null when key didn't exist");
-        &set_get1,
-        "$-1",
-        "SET s1 v1 GET returns Null when key didn't exist",
-    );
     let g1 = send_cmd(&mut s, &["GET", "s1"]).await;
     assert_contains(&g1, "v1", "GET s1 after first SET");
 
@@ -752,42 +723,42 @@ async fn test_11_set_with_options() {
 
 #[tokio::test]
 async fn test_09_mget_mset_and_variadic_exists_del() {
-    let (server, port) = start_test_server("mget_mset_variadic").await;
+   let (server, port) = start_test_server("mget_mset_variadic").await;
-    spawn_listener(server, port).await;
+   spawn_listener(server, port).await;
-    sleep(Duration::from_millis(150)).await;
+   sleep(Duration::from_millis(150)).await;
 
-    let mut s = connect(port).await;
+   let mut s = connect(port).await;
 
-    // MSET multiple keys
+   // MSET multiple keys
-    let mset = send_cmd(&mut s, &["MSET", "k1", "v1", "k2", "v2", "k3", "v3"]).await;
+   let mset = send_cmd(&mut s, &["MSET", "k1", "v1", "k2", "v2", "k3", "v3"]).await;
-    assert_contains(&mset, "OK", "MSET k1 v1 k2 v2 k3 v3 -> OK");
+   assert_contains(&mset, "OK", "MSET k1 v1 k2 v2 k3 v3 -> OK");
 
-    // MGET should return values and Null for missing
+   // MGET should return values and Null for missing
-    let mget = send_cmd(&mut s, &["MGET", "k1", "k2", "nope", "k3"]).await;
+   let mget = send_cmd(&mut s, &["MGET", "k1", "k2", "nope", "k3"]).await;
-    // Expect an array with 4 entries; verify payloads
+   // Expect an array with 4 entries; verify payloads
-    assert_contains(&mget, "v1", "MGET k1");
+   assert_contains(&mget, "v1", "MGET k1");
-    assert_contains(&mget, "v2", "MGET k2");
+   assert_contains(&mget, "v2", "MGET k2");
-    assert_contains(&mget, "v3", "MGET k3");
+   assert_contains(&mget, "v3", "MGET k3");
-    assert_contains(&mget, "$-1", "MGET missing returns Null");
+   assert_contains(&mget, "$-1", "MGET missing returns Null");
 
-    // EXISTS variadic: count how many exist
+   // EXISTS variadic: count how many exist
-    let exists_multi = send_cmd(&mut s, &["EXISTS", "k1", "nope", "k3"]).await;
+   let exists_multi = send_cmd(&mut s, &["EXISTS", "k1", "nope", "k3"]).await;
-    // Server returns SimpleString numeric, e.g. +2
+   // Server returns SimpleString numeric, e.g. +2
-    assert_contains(&exists_multi, "2", "EXISTS k1 nope k3 -> 2");
+   assert_contains(&exists_multi, "2", "EXISTS k1 nope k3 -> 2");
 
-    // DEL variadic: delete multiple keys, return count deleted
+   // DEL variadic: delete multiple keys, return count deleted
-    let del_multi = send_cmd(&mut s, &["DEL", "k1", "k3", "nope"]).await;
+   let del_multi = send_cmd(&mut s, &["DEL", "k1", "k3", "nope"]).await;
-    assert_contains(&del_multi, "2", "DEL k1 k3 nope -> 2");
+   assert_contains(&del_multi, "2", "DEL k1 k3 nope -> 2");
 
-    // Verify deletion
+   // Verify deletion
-    let exists_after = send_cmd(&mut s, &["EXISTS", "k1", "k3"]).await;
+   let exists_after = send_cmd(&mut s, &["EXISTS", "k1", "k3"]).await;
-    assert_contains(&exists_after, "0", "EXISTS k1 k3 after DEL -> 0");
+   assert_contains(&exists_after, "0", "EXISTS k1 k3 after DEL -> 0");
 
-    // MGET after deletion should include Nulls for deleted keys
+   // MGET after deletion should include Nulls for deleted keys
-    let mget_after = send_cmd(&mut s, &["MGET", "k1", "k2", "k3"]).await;
+   let mget_after = send_cmd(&mut s, &["MGET", "k1", "k2", "k3"]).await;
-    assert_contains(&mget_after, "$-1", "MGET k1 after DEL -> Null");
+   assert_contains(&mget_after, "$-1", "MGET k1 after DEL -> Null");
-    assert_contains(&mget_after, "v2", "MGET k2 remains");
+   assert_contains(&mget_after, "v2", "MGET k2 remains");
-    assert_contains(&mget_after, "$-1", "MGET k3 after DEL -> Null");
+   assert_contains(&mget_after, "$-1", "MGET k3 after DEL -> Null");
 }
 #[tokio::test]
 async fn test_12_hash_incr() {
@@ -907,16 +878,9 @@ async fn test_14_expireat_pexpireat() {
     let mut s = connect(port).await;
 
     // EXPIREAT: seconds since epoch
-    let now_secs = SystemTime::now()
+    let now_secs = SystemTime::now().duration_since(UNIX_EPOCH).unwrap().as_secs() as i64;
-        .duration_since(UNIX_EPOCH)
-        .unwrap()
-        .as_secs() as i64;
     let _ = send_cmd(&mut s, &["SET", "exp:at:s", "v"]).await;
-    let exat = send_cmd(
+    let exat = send_cmd(&mut s, &["EXPIREAT", "exp:at:s", &format!("{}", now_secs + 1)]).await;
-        &mut s,
-        &["EXPIREAT", "exp:at:s", &format!("{}", now_secs + 1)],
-    )
-    .await;
     assert_contains(&exat, "1", "EXPIREAT exp:at:s now+1s -> 1 (applied)");
     let ttl1 = send_cmd(&mut s, &["TTL", "exp:at:s"]).await;
     assert!(
@@ -926,23 +890,12 @@ async fn test_14_expireat_pexpireat() {
     );
     sleep(Duration::from_millis(1200)).await;
     let exists_after_exat = send_cmd(&mut s, &["EXISTS", "exp:at:s"]).await;
-    assert_contains(
+    assert_contains(&exists_after_exat, "0", "EXISTS exp:at:s after EXPIREAT expiry -> 0");
-        &exists_after_exat,
-        "0",
-        "EXISTS exp:at:s after EXPIREAT expiry -> 0",
-    );
 
     // PEXPIREAT: milliseconds since epoch
-    let now_ms = SystemTime::now()
+    let now_ms = SystemTime::now().duration_since(UNIX_EPOCH).unwrap().as_millis() as i64;
-        .duration_since(UNIX_EPOCH)
-        .unwrap()
-        .as_millis() as i64;
     let _ = send_cmd(&mut s, &["SET", "exp:at:ms", "v"]).await;
-    let pexat = send_cmd(
+    let pexat = send_cmd(&mut s, &["PEXPIREAT", "exp:at:ms", &format!("{}", now_ms + 450)]).await;
-        &mut s,
-        &["PEXPIREAT", "exp:at:ms", &format!("{}", now_ms + 450)],
-    )
-    .await;
     assert_contains(&pexat, "1", "PEXPIREAT exp:at:ms now+450ms -> 1 (applied)");
     let ttl2 = send_cmd(&mut s, &["TTL", "exp:at:ms"]).await;
     assert!(
@@ -952,9 +905,5 @@ async fn test_14_expireat_pexpireat() {
     );
     sleep(Duration::from_millis(600)).await;
     let exists_after_pexat = send_cmd(&mut s, &["EXISTS", "exp:at:ms"]).await;
-    assert_contains(
+    assert_contains(&exists_after_pexat, "0", "EXISTS exp:at:ms after PEXPIREAT expiry -> 0");
-        &exists_after_pexat,
+}
-        "0",
-        "EXISTS exp:at:ms after PEXPIREAT expiry -> 0",
-    );
-}