Merge branch 'main' into hawken/updates

.config/mise/config.toml

@@ -0,0 +1,29 @@
+[env]
+_.file = '.env'
+
+[tasks.build]
+run = "cargo build"
+
+[tasks.check]
+depends = ["clippy", "format-check", "test"]
+
+[tasks.clippy]
+run = "cargo clippy --workspace --all-features --all-targets"
+
+[tasks.diff]
+run = "git diff --exit-code -- types/bindings/index.d.ts"
+
+[tasks.format]
+run = "cargo fmt --all"
+
+[tasks.format-check]
+run = "cargo fmt --all -- --check"
+
+[tasks.start]
+run = "cargo run --bin ccc-server"
+
+[tasks.test]
+run = "cargo test --workspace --all-features --all-targets --no-fail-fast"
+
+[tasks.e2e]
+run = "cargo run --bin e2e"

.env.sample

@@ -0,0 +1 @@
+BON_APPETIT_AUTH=

.github/workflows/build.yml

@@ -18,15 +18,16 @@ jobs:
       run: |
         rustup toolchain install ${{ matrix.rust }}
         rustup default ${{ matrix.rust }}
-    - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
+    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+    - uses: jdx/mise-action@5083fe46898c414b2475087cc79da59e7da859e8 # v2
     - name: Run rustfmt
       run: |
         rustup component add rustfmt
-        cargo fmt --all -- --check
+        mise run format-check
     - name: Run clippy
       run: |
         rustup component add clippy
-        cargo clippy --workspace --all-features --all-targets
+        mise run clippy
   test:
     name: Test the code
     runs-on: ubuntu-latest
@@ -39,10 +40,11 @@ jobs:
       run: |
         rustup toolchain install ${{ matrix.rust }}
         rustup default ${{ matrix.rust }}
-    - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
+    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+    - uses: jdx/mise-action@5083fe46898c414b2475087cc79da59e7da859e8 # v2
     - name: Run cargo test
       run: |
-        cargo test --workspace --all-features --all-targets --no-fail-fast
+        mise run test
     - name: Ensure index.d.ts is up-to-date after tests were run
       run: |
-        git diff --exit-code -- types/bindings/index.d.ts
+        mise run diff

.gitignore

@@ -1 +1,3 @@
 /target
+.env
+.DS_STORE

Cargo.toml

@@ -17,6 +17,7 @@ ccc-handlers = { path = "./ccc-handlers" }
 ccc-proxy = { path = "./ccc-proxy" }
 ccc-routes = { path = "./ccc-routes" }
 ccc-types = { path = "./ccc-types" }
+chrono = { version = "0.4", features = ["serde"] }
 clap = { version = "4.5.3", features = ["derive"] }
 http = "1.1.0"
 phf = { version = "0.11.2", features = ["macros"] }

README.md

@@ -1,3 +1,24 @@
 # ccc-server-next
 next generation of cautious-computing-context
 
+## Environment
+
+Config is managed with [mise](https://mise.jdx.dev)
+
+Install
+
+```sh
+brew install mise
+echo 'eval "$(mise activate zsh)"' >> ~/.zshrc
+source ~/.zshrc
+mise trust
+```
+
+Build and run
+```sh
+mise use -g rust
+mise run build
+mise run start
+```
+
+**`Bonappetit`**: You'll need to have authorization setup to get bonappetit requests working. Copy `.env.sample` to `.env` and set the token to get this working.

ccc-handlers/Cargo.toml

@@ -17,3 +17,4 @@ thiserror = { workspace = true }
 tracing = { workspace = true }
 serde_urlencoded = { workspace = true }
 phf = { workspace = true }
+chrono = { workspace = true }

ccc-handlers/src/bonapp.rs

@@ -23,10 +23,15 @@ where
 
 	let (base_url, entity) = get_query_base_url_and_entity(&query_type);
 
+	let bon_app_auth =
+		std::env::var("BON_APPETIT_AUTH").expect("BON_APPETIT_AUTH credential not set");
+	let auth_header_value = format!("Basic {}", bon_app_auth);
+
 	let request = ccc_proxy::global_proxy()
 		.client()
 		.request(Method::GET, base_url)
 		.query(&[(entity, entity_id)])
+		.header("Authorization", auth_header_value)
 		.build()
 		.map_err(ProxyError::ProxiedRequest)
 		.map_err(BonAppProxyError::GenericProxy)?;
@@ -70,9 +75,18 @@ use QueryType::*;
 #[inline]
 const fn get_query_base_url_and_entity(query_type: &QueryType) -> (&str, &str) {
 	match query_type {
-		Cafe => ("https://legacy.cafebonappetit.com/api/2/cafes", "cafe"),
-		Menu => ("https://legacy.cafebonappetit.com/api/2/menus", "cafe"),
-		ItemNutrition => ("https://legacy.cafebonappetit.com/api/2/items", "item"),
+		Cafe => (
+			"https://cafemanager-api.cafebonappetit.com/api/2/cafes",
+			"cafe",
+		),
+		Menu => (
+			"https://cafemanager-api.cafebonappetit.com/api/2/menus",
+			"cafe",
+		),
+		ItemNutrition => (
+			"https://cafemanager-api.cafebonappetit.com/api/2/items",
+			"item",
+		),
 	}
 }
 

ccc-handlers/src/lib.rs

@@ -3,3 +3,4 @@
 
 pub mod bonapp;
 pub mod github;
+pub mod streams;