dirsql 0.4.84__tar.gz → 0.4.86__tar.gz

{dirsql-0.4.84 → dirsql-0.4.86}/Cargo.lock

@@ -552,7 +552,7 @@ checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8"
 
 [[package]]
 name = "dirsql"
-version = "0.4.84"
+version = "0.4.86"
 dependencies = [
  "assert_cmd",
  "axum",
@@ -586,6 +586,7 @@ dependencies = [
  "tokio",
  "tokio-stream",
  "toml",
+ "tower-http",
  "typed-path",
 ]
 
@@ -602,7 +603,7 @@ dependencies = [
 
 [[package]]
 name = "dirsql-py-ext"
-version = "0.4.84"
+version = "0.4.86"
 dependencies = [
  "dirsql",
  "pyo3",

{dirsql-0.4.84 → dirsql-0.4.86}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dirsql
-Version: 0.4.84
+Version: 0.4.86
 Requires-Dist: bin-shim>=0.1
 Summary: Ephemeral SQL index over a local directory
 Keywords: sql,filesystem,directory,sqlite,index

{dirsql-0.4.84 → dirsql-0.4.86}/docs/reference/cli.md

@@ -247,6 +247,7 @@ Config flags are subcommand-local: pass them after `server`
 | `-c, --config <path>` | none | Path to a [config file](./config.md). **Repeatable** (`-c a -c b`): the configs load and merge in argv order — see [Composing multiple configs](./config.md#composing-multiple-configs). The index root is the **invocation directory** (the current working directory) and governs path-tables; a config's `[[table]]` globs anchor at **that config's own directory** (see [glob anchor](./config.md#glob-anchor)), so `--config /elsewhere/.dirsql.toml` indexes `/elsewhere`, from any working directory. With none given, **no named tables are defined** — query the filesystem with a [path-table](./path-tables.md) (`FROM './'`). A `./.dirsql.toml` on disk is **not** auto-loaded; pass it explicitly. A `-c` naming a file that does not exist is an [error](#degraded-mode). |
 | `--host <addr>` | `localhost` | Bind address. |
 | `--port <n>` | `7117` | TCP port to bind. |
+| `--cors-origin <origin>` | off | Let browser pages on `<origin>` (an exact origin such as `http://localhost:3202`, or `*` for any) call `/query` and open `/events`. See [Cross-origin requests](#cross-origin-requests). |
 | `--persist [<path>]` | off | Keep the SQLite index on disk between runs so a restart only re-parses files that actually changed. Bare `--persist` caches at `<root>/.dirsql/cache.db`; `--persist <path>` caches at `<path>`. Off by default (the index is ephemeral). Also available on [`dirsql query`](#dirsql-query). See [Keep the index across restarts](../howto/persist.md). |
 | `--no-ignore` | off | Scan files a `.gitignore` would hide. [Path-tables](./path-tables.md#skip-rules) respect `.gitignore` files by default; this flag restores the full walk. The built-in skips (`node_modules`/`.git`) and configured `ignore` patterns still apply. Also available on [`dirsql query`](#dirsql-query). |
 | `--extension <path>` | none | Load a SQLite extension by literal path, overriding the config's `[[dirsql.extension]]` entries. Repeatable. Format: `<path>` or `<path>::<entrypoint>`. Internal plumbing for the pip/npm launchers, which resolve package-name extensions and pass the resolved paths here — not intended for direct use. When any `--extension` is present, the config file's own extension entries are not loaded. |
@@ -262,6 +263,23 @@ Config flags are subcommand-local: pass them after `server`
   command in `timeout(1)` (see
   [Bounding a hook](./hooks.md#bounding-a-hook)).
 
+### Cross-origin requests
+
+By default the server sends no CORS headers, so a browser blocks a page on
+another origin from reading `/query` responses or opening `/events`. This is
+deliberate: any web page the browser visits can send requests to
+`localhost`, and permissive CORS would let it read the indexed files.
+
+`--cors-origin <origin>` opts in. Every response then carries
+`Access-Control-Allow-Origin: <origin>`, and the preflight a JSON
+`POST /query` triggers is answered (methods `GET`, `POST`; header
+`content-type`). The value is sent verbatim: an origin is
+`scheme://host[:port]` with no trailing slash, and `*` allows every origin.
+
+```bash
+dirsql server --cors-origin http://localhost:3202
+```
+
 ### Configless mode
 
 With no `-c/--config`, the server indexes the invocation directory but

{dirsql-0.4.84/packages/rust → dirsql-0.4.86}/docs/reference/http-api.md

@@ -1,7 +1,10 @@
 # HTTP API
 
 The [`dirsql` server](./cli.md#dirsql-server) (default `localhost:7117`)
-exposes two endpoints: `POST /query` and `GET /events`.
+exposes two endpoints: `POST /query` and `GET /events`. It sends no CORS
+headers unless started with
+[`--cors-origin`](./cli.md#cross-origin-requests), so a browser page on
+another origin can reach it only after that opt-in.
 
 ## `POST /query`
 
@@ -112,4 +115,4 @@ Row values serialize as in [`POST /query`](#value-serialization).
 |---|---|
 | `200` | Stream opened (`text/event-stream`). |
 | `405` | `POST /events`. Plain-text body `method not allowed`. |
-| `503` | The server is in [degraded mode](./cli.md#degraded-mode). JSON `{"error": …}` body. |
+| `503` | The server is in [degraded mode](./cli.md#degraded-mode), or its filesystem watcher failed to start (for example, the inotify limit is exhausted). JSON `{"error": …}` body; for a watcher failure the message starts `filesystem watcher failed to start:` and gives the reason. `POST /query` keeps working. |

{dirsql-0.4.84 → dirsql-0.4.86}/packages/python/Cargo.toml

@@ -4,7 +4,7 @@ name = "dirsql-py-ext"
 # pypi/maturin handler can rewrite it via `write-version` before
 # `maturin build`. `pyproject.toml` declares `dynamic = ["version"]`
 # and maturin reads this field. Mirrors `packages/rust/Cargo.toml`.
-version = "0.4.84"
+version = "0.4.86"
 # abi3 note: the `abi3-py310` pyo3 feature (below) builds ONE stable-ABI
 # `cp310-abi3` wheel per platform that loads on every CPython >= 3.10
 # (matching `pyproject.toml`'s `requires-python = ">=3.10"`), instead of

dirsql-0.4.86/packages/python/changelog.d/2026-10-06-one-glob-compiler.md

@@ -0,0 +1,3 @@
+**Changed** A declared `[[table]] glob` is compiled by the same glob compiler
+as a path-table, so brace ranges such as `f{1..3}.md` and the other bash brace
+rules now read the same on both surfaces.

{dirsql-0.4.84/packages/rust → dirsql-0.4.86/packages/python}/docs/reference/cli.md

@@ -247,6 +247,7 @@ Config flags are subcommand-local: pass them after `server`
 | `-c, --config <path>` | none | Path to a [config file](./config.md). **Repeatable** (`-c a -c b`): the configs load and merge in argv order — see [Composing multiple configs](./config.md#composing-multiple-configs). The index root is the **invocation directory** (the current working directory) and governs path-tables; a config's `[[table]]` globs anchor at **that config's own directory** (see [glob anchor](./config.md#glob-anchor)), so `--config /elsewhere/.dirsql.toml` indexes `/elsewhere`, from any working directory. With none given, **no named tables are defined** — query the filesystem with a [path-table](./path-tables.md) (`FROM './'`). A `./.dirsql.toml` on disk is **not** auto-loaded; pass it explicitly. A `-c` naming a file that does not exist is an [error](#degraded-mode). |
 | `--host <addr>` | `localhost` | Bind address. |
 | `--port <n>` | `7117` | TCP port to bind. |
+| `--cors-origin <origin>` | off | Let browser pages on `<origin>` (an exact origin such as `http://localhost:3202`, or `*` for any) call `/query` and open `/events`. See [Cross-origin requests](#cross-origin-requests). |
 | `--persist [<path>]` | off | Keep the SQLite index on disk between runs so a restart only re-parses files that actually changed. Bare `--persist` caches at `<root>/.dirsql/cache.db`; `--persist <path>` caches at `<path>`. Off by default (the index is ephemeral). Also available on [`dirsql query`](#dirsql-query). See [Keep the index across restarts](../howto/persist.md). |
 | `--no-ignore` | off | Scan files a `.gitignore` would hide. [Path-tables](./path-tables.md#skip-rules) respect `.gitignore` files by default; this flag restores the full walk. The built-in skips (`node_modules`/`.git`) and configured `ignore` patterns still apply. Also available on [`dirsql query`](#dirsql-query). |
 | `--extension <path>` | none | Load a SQLite extension by literal path, overriding the config's `[[dirsql.extension]]` entries. Repeatable. Format: `<path>` or `<path>::<entrypoint>`. Internal plumbing for the pip/npm launchers, which resolve package-name extensions and pass the resolved paths here — not intended for direct use. When any `--extension` is present, the config file's own extension entries are not loaded. |
@@ -262,6 +263,23 @@ Config flags are subcommand-local: pass them after `server`
   command in `timeout(1)` (see
   [Bounding a hook](./hooks.md#bounding-a-hook)).
 
+### Cross-origin requests
+
+By default the server sends no CORS headers, so a browser blocks a page on
+another origin from reading `/query` responses or opening `/events`. This is
+deliberate: any web page the browser visits can send requests to
+`localhost`, and permissive CORS would let it read the indexed files.
+
+`--cors-origin <origin>` opts in. Every response then carries
+`Access-Control-Allow-Origin: <origin>`, and the preflight a JSON
+`POST /query` triggers is answered (methods `GET`, `POST`; header
+`content-type`). The value is sent verbatim: an origin is
+`scheme://host[:port]` with no trailing slash, and `*` allows every origin.
+
+```bash
+dirsql server --cors-origin http://localhost:3202
+```
+
 ### Configless mode
 
 With no `-c/--config`, the server indexes the invocation directory but

{dirsql-0.4.84 → dirsql-0.4.86}/packages/python/docs/reference/http-api.md

@@ -1,7 +1,10 @@
 # HTTP API
 
 The [`dirsql` server](./cli.md#dirsql-server) (default `localhost:7117`)
-exposes two endpoints: `POST /query` and `GET /events`.
+exposes two endpoints: `POST /query` and `GET /events`. It sends no CORS
+headers unless started with
+[`--cors-origin`](./cli.md#cross-origin-requests), so a browser page on
+another origin can reach it only after that opt-in.
 
 ## `POST /query`
 
@@ -112,4 +115,4 @@ Row values serialize as in [`POST /query`](#value-serialization).
 |---|---|
 | `200` | Stream opened (`text/event-stream`). |
 | `405` | `POST /events`. Plain-text body `method not allowed`. |
-| `503` | The server is in [degraded mode](./cli.md#degraded-mode). JSON `{"error": …}` body. |
+| `503` | The server is in [degraded mode](./cli.md#degraded-mode), or its filesystem watcher failed to start (for example, the inotify limit is exhausted). JSON `{"error": …}` body; for a watcher failure the message starts `filesystem watcher failed to start:` and gives the reason. `POST /query` keeps working. |

dirsql-0.4.86/packages/python/e2e-attestations/bot-1398-inotify-error.json

@@ -0,0 +1,7 @@
+{
+  "command": "uv run python -m pytest tests/e2e/cli_version_test.py tests/e2e/query_contract_test.py -x -q",
+  "ran_at": 1791309015,
+  "exit_code": 0,
+  "commit": "d60aff48881ae3201bccd0e6e77f52e6cd62c646",
+  "branch": "bot/1398-inotify-error"
+}

dirsql-0.4.86/packages/python/e2e-attestations/bot-1399-server-cors.json

@@ -0,0 +1,7 @@
+{
+  "command": "uv run python -m pytest tests/e2e/fanout_test.py tests/e2e/query_contract_test.py -x -q",
+  "ran_at": 1791312715,
+  "exit_code": 0,
+  "commit": "517f231592489abeec2e15d76c19865b7f651c3b",
+  "branch": "bot/1399-server-cors"
+}

dirsql-0.4.86/packages/python/e2e-attestations/bot-1401-watch-scope.json

@@ -0,0 +1,7 @@
+{
+  "command": "uv run python -m pytest tests/e2e/fanout_test.py tests/e2e/declared_table_name_test.py tests/e2e/query_contract_test.py tests/e2e/on_file_query_test.py -x -q",
+  "ran_at": 1791324350,
+  "exit_code": 0,
+  "commit": "20cb91d9d8f0a1b24c57f426b95aff4dd97e433b",
+  "branch": "bot/1401-watch-scope"
+}

dirsql-0.4.86/packages/python/e2e-attestations/bot-1407-child-place-depth.json

@@ -0,0 +1,7 @@
+{
+  "command": "uv run python -m pytest tests/e2e/fanout_test.py -x -q",
+  "ran_at": 1791310157,
+  "exit_code": 0,
+  "commit": "7104e6400efd6f912a92a53dd0d8f6d4c6c3a947",
+  "branch": "bot/1407-child-place-depth"
+}

dirsql-0.4.86/packages/python/e2e-attestations/claude-1258-one-pattern.json

@@ -0,0 +1,7 @@
+{
+  "command": "uv run python -m pytest tests/e2e/capture_collision_test.py tests/e2e/declared_table_name_test.py tests/e2e/extension_package_test.py tests/e2e/query_contract_test.py tests/e2e/plugin_discovery_test.py tests/e2e/sigint_interrupt_test.py tests/e2e/fanout_test.py tests/e2e/use_case_transcripts_test.py tests/e2e/plugin_extension_discovery_test.py -x -q",
+  "ran_at": 1791301900,
+  "exit_code": 0,
+  "commit": "14d2a11edd69bb0715bbffdb085b1d6582728dd8",
+  "branch": "claude/1258-one-pattern"
+}

dirsql-0.4.86/packages/python/e2e-attestations/claude-1330-vtab-prefetch-flag.json

@@ -0,0 +1,7 @@
+{
+  "command": "uv run python -m pytest tests/e2e/query_contract_test.py tests/e2e/declared_table_name_test.py tests/e2e/fanout_test.py -x -q",
+  "ran_at": 1791310416,
+  "exit_code": 0,
+  "commit": "bcedde49401cf6f9cc01deb2d95af1d1e907f0f7",
+  "branch": "claude/1330-vtab-prefetch-flag"
+}

dirsql-0.4.86/packages/python/migrations.d/2026-10-06-one-glob-compiler.md

@@ -0,0 +1,28 @@
+### Config table globs share the path-table glob compiler
+
+#### Summary
+
+A declared `[[table]] glob` is now compiled by the same compiler as a
+path-table. A brace range such as `f{1..3}.md` expands as in bash instead of
+matching nothing. Nothing else changes.
+
+#### Required changes
+
+_None._
+
+#### Deprecations removed
+
+_None._
+
+#### Behavior changes without code changes
+
+- `glob = "f{1..3}.md"` matches `f1.md`, `f2.md` and `f3.md`.
+
+#### Verification
+
+```bash
+cd "$(mktemp -d)"
+touch f1.md f2.md f3.md f4.md
+dirsql query "SELECT path FROM './f{1..3}.md' ORDER BY path"
+# expected: [{"path":"f1.md"},{"path":"f2.md"},{"path":"f3.md"}]
+```

{dirsql-0.4.84 → dirsql-0.4.86}/packages/rust/Cargo.toml

@@ -6,7 +6,7 @@ description = "Ephemeral SQL index over a local directory"
 # version stays for the binding crates (publish = false). The literal
 # intentionally lags the published version: putitoutthere rewrites it to
 # the planned release version at build time and never commits it back.
-version = "0.4.84"
+version = "0.4.86"
 edition.workspace = true
 # Literal `license` (not `license.workspace = true`) because
 # putitoutthere's preflight check reads `[package].license` directly
@@ -50,6 +50,7 @@ cli = [
     "dep:hex",
     "dep:reedline",
     "dep:tokio-stream",
+    "dep:tower-http",
     "tokio/rt-multi-thread",
     "tokio/macros",
     "tokio/signal",
@@ -86,6 +87,7 @@ shlex = "1"
 thiserror.workspace = true
 tokio.workspace = true
 tokio-stream = { version = "0.1", features = ["sync"], optional = true }
+tower-http = { version = "0.6", features = ["cors"], optional = true }
 toml = "0.8"
 typed-path = "0.12"
 

{dirsql-0.4.84 → dirsql-0.4.86}/packages/rust/README.md

@@ -124,7 +124,7 @@ cargo install dirsql --features cli
 dirsql "SELECT * FROM './'"
 ```
 
-`dirsql "<sql>"` runs one query and prints the rows as JSON — the default. `dirsql server` starts an HTTP server bound to `localhost:7117` that exposes the SDK over HTTP: `POST /query` for SQL and `GET /events` for a Server-Sent Events change stream. Override the bind with `dirsql server --host`, `--port`, `--config`. See the [CLI reference](https://dirsql.dev/reference/cli).
+`dirsql "<sql>"` runs one query and prints the rows as JSON — the default. `dirsql server` starts an HTTP server bound to `localhost:7117` that exposes the SDK over HTTP: `POST /query` for SQL and `GET /events` for a Server-Sent Events change stream. Override the bind with `dirsql server --host`, `--port`, `--config`; add `--cors-origin <origin>` to let a browser page on another origin call it. See the [CLI reference](https://dirsql.dev/reference/cli).
 
 The `cli` feature is **opt-in** -- `cargo add dirsql` pulls no CLI dependencies. `cargo install dirsql` without `--features cli` silently installs nothing (`required-features` skips the bin target with no warning); always include the flag, or use `npx dirsql` / `uvx dirsql` for prebuilt binaries.
 

{dirsql-0.4.84/packages/python → dirsql-0.4.86/packages/rust}/docs/reference/cli.md

@@ -247,6 +247,7 @@ Config flags are subcommand-local: pass them after `server`
 | `-c, --config <path>` | none | Path to a [config file](./config.md). **Repeatable** (`-c a -c b`): the configs load and merge in argv order — see [Composing multiple configs](./config.md#composing-multiple-configs). The index root is the **invocation directory** (the current working directory) and governs path-tables; a config's `[[table]]` globs anchor at **that config's own directory** (see [glob anchor](./config.md#glob-anchor)), so `--config /elsewhere/.dirsql.toml` indexes `/elsewhere`, from any working directory. With none given, **no named tables are defined** — query the filesystem with a [path-table](./path-tables.md) (`FROM './'`). A `./.dirsql.toml` on disk is **not** auto-loaded; pass it explicitly. A `-c` naming a file that does not exist is an [error](#degraded-mode). |
 | `--host <addr>` | `localhost` | Bind address. |
 | `--port <n>` | `7117` | TCP port to bind. |
+| `--cors-origin <origin>` | off | Let browser pages on `<origin>` (an exact origin such as `http://localhost:3202`, or `*` for any) call `/query` and open `/events`. See [Cross-origin requests](#cross-origin-requests). |
 | `--persist [<path>]` | off | Keep the SQLite index on disk between runs so a restart only re-parses files that actually changed. Bare `--persist` caches at `<root>/.dirsql/cache.db`; `--persist <path>` caches at `<path>`. Off by default (the index is ephemeral). Also available on [`dirsql query`](#dirsql-query). See [Keep the index across restarts](../howto/persist.md). |
 | `--no-ignore` | off | Scan files a `.gitignore` would hide. [Path-tables](./path-tables.md#skip-rules) respect `.gitignore` files by default; this flag restores the full walk. The built-in skips (`node_modules`/`.git`) and configured `ignore` patterns still apply. Also available on [`dirsql query`](#dirsql-query). |
 | `--extension <path>` | none | Load a SQLite extension by literal path, overriding the config's `[[dirsql.extension]]` entries. Repeatable. Format: `<path>` or `<path>::<entrypoint>`. Internal plumbing for the pip/npm launchers, which resolve package-name extensions and pass the resolved paths here — not intended for direct use. When any `--extension` is present, the config file's own extension entries are not loaded. |
@@ -262,6 +263,23 @@ Config flags are subcommand-local: pass them after `server`
   command in `timeout(1)` (see
   [Bounding a hook](./hooks.md#bounding-a-hook)).
 
+### Cross-origin requests
+
+By default the server sends no CORS headers, so a browser blocks a page on
+another origin from reading `/query` responses or opening `/events`. This is
+deliberate: any web page the browser visits can send requests to
+`localhost`, and permissive CORS would let it read the indexed files.
+
+`--cors-origin <origin>` opts in. Every response then carries
+`Access-Control-Allow-Origin: <origin>`, and the preflight a JSON
+`POST /query` triggers is answered (methods `GET`, `POST`; header
+`content-type`). The value is sent verbatim: an origin is
+`scheme://host[:port]` with no trailing slash, and `*` allows every origin.
+
+```bash
+dirsql server --cors-origin http://localhost:3202
+```
+
 ### Configless mode
 
 With no `-c/--config`, the server indexes the invocation directory but

{dirsql-0.4.84 → dirsql-0.4.86/packages/rust}/docs/reference/http-api.md

@@ -1,7 +1,10 @@
 # HTTP API
 
 The [`dirsql` server](./cli.md#dirsql-server) (default `localhost:7117`)
-exposes two endpoints: `POST /query` and `GET /events`.
+exposes two endpoints: `POST /query` and `GET /events`. It sends no CORS
+headers unless started with
+[`--cors-origin`](./cli.md#cross-origin-requests), so a browser page on
+another origin can reach it only after that opt-in.
 
 ## `POST /query`
 
@@ -112,4 +115,4 @@ Row values serialize as in [`POST /query`](#value-serialization).
 |---|---|
 | `200` | Stream opened (`text/event-stream`). |
 | `405` | `POST /events`. Plain-text body `method not allowed`. |
-| `503` | The server is in [degraded mode](./cli.md#degraded-mode). JSON `{"error": …}` body. |
+| `503` | The server is in [degraded mode](./cli.md#degraded-mode), or its filesystem watcher failed to start (for example, the inotify limit is exhausted). JSON `{"error": …}` body; for a watcher failure the message starts `filesystem watcher failed to start:` and gives the reason. `POST /query` keeps working. |

{dirsql-0.4.84 → dirsql-0.4.86}/packages/rust/src/cli/mod.rs

@@ -26,6 +26,7 @@
 use std::net::SocketAddr;
 use std::time::Duration;
 
+use axum::http::HeaderValue;
 use tokio::sync::{oneshot, watch};
 use tokio::task::JoinError;
 use tokio::task::JoinHandle;
@@ -52,12 +53,15 @@ pub use server::{serve, serve_with_state};
 pub use crate::DEFAULT_CONFIG_TOML;
 
 /// Configure how the server binds. Defaults to `localhost:7117` with a
-/// 30-second per-query timeout.
+/// 30-second per-query timeout and no CORS headers.
 #[derive(Debug, Clone)]
 pub struct ServerConfig {
     pub host: String,
     pub port: u16,
     pub query_timeout: Duration,
+    /// The `Access-Control-Allow-Origin` value sent on every response, or
+    /// `None` to send no CORS headers (browsers then block cross-origin reads).
+    pub cors_origin: Option<HeaderValue>,
 }
 
 impl ServerConfig {
@@ -68,6 +72,7 @@ impl ServerConfig {
             host: "localhost".into(),
             port: 0,
             query_timeout: Duration::from_secs(30),
+            cors_origin: None,
         }
     }
 
@@ -77,6 +82,7 @@ impl ServerConfig {
             host: host.into(),
             port,
             query_timeout: Duration::from_secs(30),
+            cors_origin: None,
         }
     }
 
@@ -86,6 +92,13 @@ impl ServerConfig {
         self.query_timeout = timeout;
         self
     }
+
+    /// Allow browser pages on `origin` (or any origin, for `*`) to read
+    /// responses and open `/events`.
+    pub fn with_cors_origin(mut self, origin: HeaderValue) -> Self {
+        self.cors_origin = Some(origin);
+        self
+    }
 }
 
 impl Default for ServerConfig {
@@ -181,6 +194,22 @@ mod tests {
         assert_eq!(cfg.host, "localhost");
         assert_eq!(cfg.port, 7117);
         assert_eq!(cfg.query_timeout, Duration::from_secs(30));
+        assert_eq!(cfg.cors_origin, None);
+    }
+
+    #[test]
+    fn ephemeral_config_binds_port_zero_on_localhost_without_cors() {
+        let cfg = ServerConfig::ephemeral();
+        assert_eq!(cfg.host, "localhost");
+        assert_eq!(cfg.port, 0);
+        assert_eq!(cfg.query_timeout, Duration::from_secs(30));
+        assert_eq!(cfg.cors_origin, None);
+    }
+
+    #[test]
+    fn with_cors_origin_sets_the_allowed_origin() {
+        let cfg = ServerConfig::ephemeral().with_cors_origin(HeaderValue::from_static("*"));
+        assert_eq!(cfg.cors_origin, Some(HeaderValue::from_static("*")));
     }
 
     #[test]

{dirsql-0.4.84 → dirsql-0.4.86}/packages/rust/src/cli/router.rs

@@ -26,6 +26,7 @@ use super::execute::{QueryFailure, execute_query, require_ready};
 pub(super) struct AppContext {
     pub state: AppState,
     pub events: broadcast::Sender<String>,
+    pub watch_failure: Option<String>,
     pub cancel: watch::Receiver<bool>,
     pub query_timeout: Duration,
 }
@@ -72,6 +73,9 @@ async fn handle_events(State(ctx): State<SharedCtx>) -> Response {
     if let Err(failure) = require_ready(&ctx.state) {
         return failure_response(&failure);
     }
+    if let Some(reason) = &ctx.watch_failure {
+        return failure_response(&QueryFailure::Unavailable(reason.clone()));
+    }
 
     // Subscribe BEFORE anything that might block so we don't drop events
     // that fire between subscribing and the first poll.
@@ -163,6 +167,21 @@ mod tests {
         );
     }
 
+    #[tokio::test]
+    async fn events_return_503_while_the_server_is_unavailable() {
+        let (events, _) = broadcast::channel::<String>(1);
+        let (_cancel_tx, cancel) = watch::channel(false);
+        let ctx = Arc::new(AppContext {
+            state: AppState::Unavailable("config failed to load".into()),
+            events,
+            watch_failure: None,
+            cancel,
+            query_timeout: Duration::from_secs(1),
+        });
+        let resp = handle_events(State(ctx)).await;
+        assert_eq!(resp.status(), StatusCode::SERVICE_UNAVAILABLE);
+    }
+
     #[test]
     fn error_response_sets_json_content_type() {
         let resp = error_response(StatusCode::BAD_REQUEST, "boom");

{dirsql-0.4.84 → dirsql-0.4.86}/packages/rust/src/cli/run.rs

@@ -26,6 +26,7 @@ use super::{
     serve_with_state, table,
 };
 use crate::{DirSQL, Extension};
+use axum::http::HeaderValue;
 use clap::{Args, Parser, Subcommand, ValueEnum};
 use serde_json::Value;
 
@@ -184,6 +185,12 @@ struct ServerArgs {
     #[arg(long, default_value_t = 7117)]
     port: u16,
 
+    /// Send `Access-Control-Allow-Origin: <ORIGIN>` so browser pages on that
+    /// origin (`*` for any) can call `/query` and open `/events`. Without it
+    /// the server sends no CORS headers.
+    #[arg(long = "cors-origin", value_name = "ORIGIN")]
+    cors_origin: Option<HeaderValue>,
+
     #[command(flatten)]
     common: ConfigArgs,
 }
@@ -330,7 +337,7 @@ pub fn run_cli(argv: Vec<String>) -> i32 {
         match cli.command.take() {
             Some(Command::Init(args)) => run_init(args),
             Some(Command::Query(args)) => run_query(args, &mut std::io::stdout()).await,
-            Some(Command::Server(args)) => run_server(args).await,
+            Some(Command::Server(args)) => run_server(args, wait_for_shutdown()).await,
             Some(Command::Context) => {
                 print!("{}", super::context::guide());
                 0
@@ -462,11 +469,17 @@ fn run_init(args: InitArgs) -> u8 {
     }
 }
 
-async fn run_server(args: ServerArgs) -> u8 {
+async fn run_server(
+    args: ServerArgs,
+    shutdown: impl std::future::Future<Output = std::io::Result<()>>,
+) -> u8 {
     // The server has no `--on-file`: clap rejects it as an unknown flag before
     // reaching here. Path-tables served over HTTP keep their stat columns.
     let state = load_state(&args.common, None);
-    let server_config = ServerConfig::bind(args.host.clone(), args.port);
+    let mut server_config = ServerConfig::bind(args.host.clone(), args.port);
+    if let Some(origin) = args.cors_origin {
+        server_config = server_config.with_cors_origin(origin);
+    }
 
     let host = args.host.clone();
     let handle = match serve_with_state(server_config, state).await {
@@ -480,7 +493,7 @@ async fn run_server(args: ServerArgs) -> u8 {
     // Echo back the user-facing hostname (not the resolved IP SocketAddr).
     println!("Running at {host}:{}", handle.local_addr().port());
 
-    if let Err(err) = wait_for_shutdown().await {
+    if let Err(err) = shutdown.await {
         eprintln!("dirsql: signal handler error: {err}");
     }
 
@@ -857,12 +870,68 @@ mod tests {
         }
     }
 
+    fn server_args(argv: &[&str]) -> ServerArgs {
+        match Cli::parse_from(argv).command {
+            Some(Command::Server(args)) => args,
+            other => panic!("expected a server subcommand, got {other:?}"),
+        }
+    }
+
+    #[tokio::test]
+    async fn run_server_exits_zero_after_a_clean_shutdown() {
+        let args = server_args(&[
+            "dirsql",
+            "server",
+            "--host",
+            "127.0.0.1",
+            "--port",
+            "0",
+            "-c",
+            "/nonexistent/.dirsql.toml",
+        ]);
+        assert_eq!(run_server(args, std::future::ready(Ok(()))).await, 0);
+    }
+
+    #[tokio::test]
+    async fn run_server_exits_one_when_the_bind_fails() {
+        let args = server_args(&[
+            "dirsql",
+            "server",
+            "--host",
+            "192.0.2.1",
+            "--port",
+            "9",
+            "-c",
+            "/nonexistent/.dirsql.toml",
+        ]);
+        assert_eq!(run_server(args, std::future::pending()).await, 1);
+    }
+
+    #[test]
+    fn server_subcommand_parses_a_cors_origin() {
+        match Cli::parse_from(["dirsql", "server", "--cors-origin", "http://localhost:3202"])
+            .command
+        {
+            Some(Command::Server(args)) => assert_eq!(
+                args.cors_origin,
+                Some(HeaderValue::from_static("http://localhost:3202"))
+            ),
+            other => panic!("expected a server subcommand, got {other:?}"),
+        }
+    }
+
+    #[test]
+    fn server_subcommand_rejects_a_cors_origin_that_is_not_a_header_value() {
+        assert!(Cli::try_parse_from(["dirsql", "server", "--cors-origin", "a\nb"]).is_err());
+    }
+
     #[test]
     fn server_subcommand_defaults_host_and_port() {
         match Cli::parse_from(["dirsql", "server"]).command {
             Some(Command::Server(args)) => {
                 assert_eq!(args.host, "localhost");
                 assert_eq!(args.port, 7117);
+                assert_eq!(args.cors_origin, None);
             }
             other => panic!("expected a server subcommand, got {other:?}"),
         }