feat: Code cleanup, split out API to be clearer and re-enable CLI build.

Author: jheretic

.github/workflows/release_build.yaml

@@ -51,20 +51,20 @@ jobs:
       - name: Install dependencies
         uses: awalsh128/cache-apt-pkgs-action@2c09a5e66da6c8016428a2172bd76e5e4f14bb17
         with:
-          packages: protobuf-compiler
+          packages: protobuf-compiler libclang-dev
           version: 1.0
       - name: Setup Rust toolchain
         uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48
       - name: Build
-        # run: cargo build --all --release && strip target/release/bitpart && strip target/release/bitpart-cli
-        run: cargo build --all --release && strip target/release/bitpart
+        run: cargo build --all --release && strip target/release/bitpart && strip target/release/bitpart-cli
       - name: Release
         uses: softprops/action-gh-release@72f2c25fcb47643c292f7107632f7a47c1df5cd8
         with:
           body: ${{ needs.bump_version.outputs.body }}
           tag_name: ${{ needs.bump_version.outputs.version }}
           files: |
             target/release/bitpart
+            target/release/bitpart-cli
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   build_image:

.github/workflows/run_checks.yaml

@@ -23,7 +23,7 @@ jobs:
           ref: ${{ env.BRANCH_NAME }}
       - uses: awalsh128/cache-apt-pkgs-action@2c09a5e66da6c8016428a2172bd76e5e4f14bb17
         with:
-          packages: protobuf-compiler
+          packages: protobuf-compiler libclang-dev
           version: 1.0
       - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48
       - run: cargo test --all-features
@@ -52,7 +52,7 @@ jobs:
           ref: ${{ env.BRANCH_NAME }}
       - uses: awalsh128/cache-apt-pkgs-action@2c09a5e66da6c8016428a2172bd76e5e4f14bb17
         with:
-          packages: protobuf-compiler
+          packages: protobuf-compiler libclang-dev
           version: 1.0
       - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48
         with:

Cargo.lock

@@ -2,7 +2,7 @@
 resolver = "2"
 members = [
   "crates/bitpart",
-  # "crates/bitpart-cli",
+  "crates/bitpart-cli",
   "crates/bitpart-common",
   "crates/presage-store-bitpart",
 ]

Cargo.toml

@@ -22,7 +22,7 @@ serde = { version = "1.0.204", features = ["derive"] }
 serde_json = "1.0.132"
 similar = "2.7.0"
 tokio = { version = "1.43.0", features = ["full"] }
-tokio-tungstenite = { version = "0.26.1", features = ["url", "native-tls"] }
+tokio-tungstenite = { version = "0.26.1", features = ["url", "rustls-tls-webpki-roots"] }
 tracing = "0.1.41"
 tracing-log = "0.2.0"
 tracing-subscriber = { version = "0.3.19", features = ["env-filter"] }

crates/bitpart-cli/Cargo.toml

@@ -44,45 +44,7 @@ impl TryInto<BotOpt> for Request {
     type Error = BitpartError;
 
     fn try_into(self) -> Result<BotOpt, Self::Error> {
-        match self {
-            // Bot
-            Request {
-                bot: Some(mut csml_bot),
-                multibot,
-                ..
-            } => {
-                csml_bot.multibot = multibot;
-
-                Ok(BotOpt::CsmlBot(Box::new(csml_bot)))
-            }
-
-            // version id
-            Request {
-                version_id: Some(version_id),
-                bot_id: Some(bot_id),
-                apps_endpoint,
-                multibot,
-                ..
-            } => Ok(BotOpt::Id {
-                version_id,
-                bot_id,
-                apps_endpoint,
-                multibot,
-            }),
-
-            // get bot by id will search for the last version id
-            Request {
-                bot_id: Some(bot_id),
-                apps_endpoint,
-                multibot,
-                ..
-            } => Ok(BotOpt::BotId {
-                bot_id,
-                apps_endpoint,
-                multibot,
-            }),
-            _ => Err(BitpartErrorKind::Interpreter("Invalid bot_opt format".to_owned()).into()),
-        }
+        (&self).try_into()
     }
 }