New shared cargo package: hive-console-client

Author: ardatan

.cargo/config.toml

@@ -0,0 +1,3 @@
+# The following are aliases you can use with "cargo command_name"
+[alias]
+"clippy:fix" = "clippy --all --fix --allow-dirty --allow-staged"

.changeset/funny-rockets-speak.md

@@ -0,0 +1,13 @@
+---
+'hive-console-sdk-rs': patch
+'hive-apollo-router-plugin': minor
+---
+
+Extract Hive Console integration implementation into a new package `hive-console-sdk` which can
+be used by any Rust library for Hive Console integration
+
+It also includes a refactor to use less Mutexes like replacing `lru` + `Mutex` with the thread-safe `moka` package.
+Only one place that handles queueing uses `Mutex` now.
+
+
+Fixes a bug when Persisted Operations are enabled by default which should be explicitly enabled

.github/workflows/apollo-router-release.yaml

@@ -6,6 +6,7 @@ on:
       - main
     paths:
       - 'packages/libraries/router/**'
+      - 'packages/libraries/sdk-rs/**'
       - 'docker/router.dockerfile'
       - 'scripts/compress/**'
       - 'configs/cargo/Cargo.lock'
@@ -16,6 +17,7 @@ on:
   push:
     paths:
       - 'packages/libraries/router/**'
+      - 'packages/libraries/sdk-rs/**'
       - 'docker/router.dockerfile'
       - 'scripts/compress/**'
       - 'configs/cargo/Cargo.lock'
@@ -60,7 +62,7 @@ jobs:
           github_org="graphql-hive"
           router_version=$(cargo tree -i apollo-router --quiet | head -n 1 | awk -F" v" '{print $2}')
           plugin_version=$(jq -r '.version' packages/libraries/router/package.json)
-          has_changes=$(git diff HEAD~ HEAD --name-only -- 'packages/libraries/router/Cargo.toml' 'Cargo.lock' 'configs/cargo/Cargo.lock' 'packages/libraries/router/package.json')
+          has_changes=$(git diff HEAD~ HEAD --name-only -- 'packages/libraries/router/Cargo.toml' 'packages/libraries/router/package.json' 'packages/libraries/sdk-rs/Cargo.toml' 'packages/libraries/sdk-rs/package.json' 'Cargo.lock' 'configs/cargo/Cargo.lock')
 
           if [ "$has_changes" ]; then
             image_tag_version="router${router_version}-plugin${plugin_version}"

.github/workflows/publish-rust.yaml

@@ -27,7 +27,7 @@ jobs:
       - name: Look for changes
         id: rust_changed
         run: |
-          lines=$( git diff HEAD~ HEAD --name-only -- 'packages/libraries/router' 'Cargo.toml' 'configs/cargo/Cargo.lock' | wc -l )
+          lines=$( git diff HEAD~ HEAD --name-only -- 'packages/libraries/router' 'packages/libraries/sdk-rs' 'Cargo.toml' 'configs/cargo/Cargo.lock' | wc -l )
           if [ $lines -gt 0 ]; then
               echo 'rust_changed=true' >> $GITHUB_OUTPUT
           fi

.github/workflows/release-stable.yaml

@@ -123,9 +123,8 @@ jobs:
           echo "crate_version=$VERSION" >> $GITHUB_OUTPUT
           echo "crate_publish=true" >> $GITHUB_OUTPUT
 
-      - name: release hive-apollo-router-plugin to Crates.io
+      - name: release to Crates.io
         if: steps.rust-crate.outputs.crate_publish == 'true'
         run: |
-          cd packages/libraries/router
           cargo login ${{ secrets.CARGO_REGISTRY_TOKEN }}
           cargo publish --allow-dirty --no-verify

.vscode/settings.json

@@ -39,5 +39,11 @@
   ],
   "[typescript]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "[yaml]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "[rust]": {
+    "editor.defaultFormatter": "rust-lang.rust-analyzer"
   }
 }

Cargo.toml

@@ -1,3 +1,3 @@
 [workspace]
 resolver = "2"
-members = ["packages/libraries/router", "scripts/compress"]
+members = ["packages/libraries/router", "scripts/compress", "packages/libraries/sdk-rs"]

configs/cargo/Cargo.lock

@@ -361,7 +361,8 @@ target "app" {
 target "apollo-router" {
   inherits = ["router-base", get_target()]
   contexts = {
-    pkg = "${PWD}/packages/libraries/router"
+    router_pkg = "${PWD}/packages/libraries/router"
+    sdk_rs_pkg = "${PWD}/packages/libraries/sdk-rs"
     config = "${PWD}/configs/cargo"
   }
   args = {

docker/docker.hcl

@@ -1,5 +1,6 @@
 # syntax=docker/dockerfile:1
-FROM scratch AS pkg
+FROM scratch AS router_pkg
+FROM scratch AS sdk_rs_pkg
 FROM scratch AS config
 
 FROM rust:1.90-slim-bookworm AS build
@@ -12,21 +13,34 @@ RUN update-ca-certificates
 RUN rustup component add rustfmt
 
 WORKDIR /usr/src
-# Create blank project
+# Create blank projects
 RUN USER=root cargo new router
+RUN USER=root cargo new sdk-rs
 
 # Copy Cargo files
-COPY --from=pkg Cargo.toml /usr/src/router/
+COPY --from=router_pkg Cargo.toml /usr/src/router/
+COPY --from=sdk_rs_pkg Cargo.toml /usr/src/sdk-rs/
 COPY --from=config Cargo.lock /usr/src/router/
 
+WORKDIR /usr/src/sdk-rs
+# Get the dependencies cached, so we can use dummy input files so Cargo wont fail
+RUN echo 'fn main() { println!(""); }' > ./src/main.rs
+RUN echo 'fn main() { println!(""); }' > ./src/lib.rs
+RUN cargo build --release
+
+# Copy in the actual source code
+COPY --from=sdk_rs_pkg src ./src
+RUN touch ./src/main.rs
+RUN touch ./src/lib.rs
+
 WORKDIR /usr/src/router
 # Get the dependencies cached, so we can use dummy input files so Cargo wont fail
 RUN echo 'fn main() { println!(""); }' > ./src/main.rs
 RUN echo 'fn main() { println!(""); }' > ./src/lib.rs
 RUN cargo build --release
 
 # Copy in the actual source code
-COPY --from=pkg src ./src
+COPY --from=router_pkg src ./src
 RUN touch ./src/main.rs
 RUN touch ./src/lib.rs
 
@@ -53,7 +67,7 @@ RUN mkdir /dist/schema
 
 # Copy in the required files from our build image
 COPY --from=build --chown=root:root /usr/src/router/target/release/router /dist
-COPY --from=pkg router.yaml /dist/config/router.yaml
+COPY --from=router_pkg router.yaml /dist/config/router.yaml
 
 WORKDIR /dist