fix: update compose file and upgrade deps in mono & scorpio (#1899)

Author: benjamin-747

.github/workflows/base.yml

@@ -118,7 +118,6 @@ jobs:
 
   fuse:
     name: Fuse Clippy Check
-    if: ${{ github.repository == 'web3infra-foundation/mega' }}
     runs-on: [self-hosted, Linux, X64]
     env:
       CARGO_TERM_COLOR: always

.github/workflows/orion-client-deploy.yml

@@ -13,7 +13,7 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  build-and-deploy:
+  build:
     if: ${{ github.repository == 'web3infra-foundation/mega' }}
     runs-on: ubuntu-latest
     timeout-minutes: 20
@@ -44,6 +44,11 @@ jobs:
           file target/release/orion || true
           file target/release/scorpio || true
 
+  deploy:
+    if: ${{ github.repository == 'web3infra-foundation/mega' }}
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
       - name: Upload binaries via rsync
         uses: burnett01/rsync-deployments@master
         with:

.github/workflows/orion-client-image-deploy.yml

@@ -31,7 +31,6 @@ env:
 
 jobs:
   build-push-single-arch:
-    if: ${{ github.repository == 'web3infra-foundation/mega' }}
     runs-on: ubuntu-latest
     strategy:
       matrix:

.github/workflows/orion-server-deploy.yml

@@ -70,7 +70,6 @@ jobs:
   manifest:
     needs: build-push-single-arch
     runs-on: ubuntu-latest
-    if: ${{ github.repository == 'web3infra-foundation/mega' }}
     permissions:
       contents: read
     steps:

.github/workflows/web-deploy.yml

@@ -124,6 +124,7 @@ jobs:
 
   deploy:
     needs: manifest
+    if: ${{ github.repository == 'web3infra-foundation/mega' }}
     runs-on: ubuntu-latest
     permissions:
       contents: read

Cargo.toml

@@ -51,7 +51,7 @@ tracing = "0.1.44"
 tracing-subscriber = "0.3.22"
 tracing-appender = "0.2.4"
 thiserror = "2.0.18"
-clap = "4.5.54"
+clap = "4.5.57"
 
 #====
 tokio = "1.49.0"
@@ -67,18 +67,18 @@ axum-extra = "0.12.5"
 russh = "0.55.0"
 tower-http = "0.6.8"
 tower = "0.5.3"
-tower-sessions = { version = "0.14", features = ["memory-store"] }
-time = { version = "0.3.45", features = ["serde"] }
+tower-sessions = { version = "0.15", features = ["memory-store"] }
+time = { version = "0.3.46", features = ["serde"] }
 
 #====
 sea-orm = "1.1.19"
 sea-orm-migration = "1.1.19"
 
 #====
 rand = "0.9.2"
-flate2 = "1.1.8"
+flate2 = "1.1.9"
 smallvec = "1.15.1"
-bytes = "1.11"
+bytes = "1.11.1"
 chrono = { version = "0.4.43", features = ["serde"] }
 hex = "0.4.3"
 sha2 = "0.10.9"
@@ -87,8 +87,8 @@ idgenerator = "2.0.0"
 config = "0.15.19"
 reqwest = "0.13.1"
 lazy_static = "1.5.0"
-uuid = "1.19.0"
-regex = "1.12.2"
+uuid = "1.20.0"
+regex = "1.12.3"
 ed25519-dalek = "2.2.0"
 ctrlc = "3.5.1"
 cedar-policy = "4.8.2"
@@ -101,13 +101,13 @@ utoipa = { version = "5.4.0", features = ["chrono"] }
 utoipa-axum = "0.2.0"
 utoipa-swagger-ui = "9.0.2"
 tempfile = "3.24.0"
-rdkafka = "0.38.0"
+rdkafka = "0.39.0"
 dashmap = "6.1.0"
 once_cell = "1.21.3"
-testcontainers = "0.26"
+testcontainers = "0.26.3"
 scopeguard = "1.2.0"
 serial_test = "3.3.1"
-sysinfo = "0.37"
+sysinfo = "0.38"
 http = "1.4.0"
 http-body = "1.0.1"
 http-body-util = "0.1.3"
@@ -129,20 +129,20 @@ log = "0.4.29"
 env_logger = "0.11.8"
 qdrant-client = "1.16"
 walkdir = "2.5"
-dagrs = "0.5.2"
+dagrs = "0.6.0"
 tar = "0.4"
 indexmap = "2.13"
 envsubst = "0.2.1"
 diffs = "0.5.1"
 directories = "6.0.0"
 dotenv = "0.15"
-redis = "1.0.2"
+redis = "1.0.3"
 redis-test = "1.0.1"
 bincode = "2.0.1"
 rustls = "0.23.36"
 object_store = "0.13.1"
 qlean = "0.2.2"
-toml = "0.9"
+toml = "0.9.8"
 
 [profile.release]
 debug = true

docker/demo/.env.example

@@ -82,10 +82,10 @@ MEGA_AUTHENTICATION__TEST_USER_TOKEN=mega
 MEGA_BUILD__ENABLE_BUILD=true
 MEGA_BUILD__ORION_SERVER=http://orion_server:8004
 
-MEGA_OAUTH__CAMPSITE_API_DOMAIN=http://campsite_api:8080
-MEGA_OAUTH__UI_DOMAIN=http://app.gitmono.local:3000
+MEGA_OAUTH__CAMPSITE_API_DOMAIN=http://api.gitmono.local:8080
+MEGA_OAUTH__UI_DOMAIN=http://app.gitmono.local
 MEGA_OAUTH__COOKIE_DOMAIN=gitmono.local
-MEGA_OAUTH__ALLOWED_CORS_ORIGINS="http://app.gitmono.local:3000, http://localhost:3000"
+MEGA_OAUTH__ALLOWED_CORS_ORIGINS="http://app.gitmono.local"
 
 MEGA_BASE_DIR=/opt/mega
 MEGA_CACHE_DIR=/opt/mega/cache
@@ -98,7 +98,7 @@ MEGA_CACHE_DIR=/opt/mega/cache
 
 ORION_DATABASE_URL=postgres://postgres:postgres@postgres:5432/mono
 ORION_BUILD_LOG_DIR=/tmp/buck2ctl
-ORION_ALLOWED_CORS_ORIGINS=http://app.gitmono.local:3000
+ORION_ALLOWED_CORS_ORIGINS=http://app.gitmono.local
 ORION_LOGGER_STORAGE_TYPE=local
 ORION_BUCKET_NAME=orion-logs
 
@@ -123,7 +123,7 @@ RUST_LOG=info
 CAMPSITE_REDIS_URL=redis://redis:6379
 CAMPSITE_RAILS_ENV=demo
 CAMPSITE_SERVER_COMMAND=bundle exec puma
-CAMPSITE_DEV_APP_URL=http://app.gitmono.local:3000
+CAMPSITE_DEV_APP_URL=http://app.gitmono.local
 CAMPSITE_RAILS_MASTER_KEY=51d8cdb046869075795ba82cdd95807a
 
 # Run migrations only on first startup; set to 0 afterwards for faster launches.

docker/demo/docker-compose.demo.yml

@@ -154,10 +154,10 @@ services:
 
       # Campsite integration (OAuth / SSO etc.)
       MEGA_OAUTH__CAMPSITE_API_DOMAIN: ${MEGA_OAUTH__CAMPSITE_API_DOMAIN:-http://campsite_api:8080}
-      MEGA_OAUTH__UI_DOMAIN: ${MEGA_OAUTH__UI_DOMAIN:-http://localhost:3000}
+      MEGA_OAUTH__UI_DOMAIN: ${MEGA_OAUTH__UI_DOMAIN:-http://app.gitmono.local}
       MEGA_OAUTH__COOKIE_DOMAIN: ${MEGA_OAUTH__COOKIE_DOMAIN:-localhost}
       # Note: allowed_cors_origins expects an array format in TOML
-      MEGA_OAUTH__ALLOWED_CORS_ORIGINS: ${MEGA_OAUTH__ALLOWED_CORS_ORIGINS:-"http://app.gitmono.local:3000,http://localhost:3000"}
+      MEGA_OAUTH__ALLOWED_CORS_ORIGINS: ${MEGA_OAUTH__ALLOWED_CORS_ORIGINS:-"http://app.gitmono.local"}
 
       # Directory paths (can be overridden)
       MEGA_BASE_DIR: ${MEGA_BASE_DIR:-/opt/mega}
@@ -220,8 +220,8 @@ services:
       orion_server:
         condition: service_healthy
     ports:
-      # Container listens on 3000, host port is 3000
-      - "3000:3000"
+      # Container listens on 3000, host port is 80
+      - "80:3000"
     healthcheck:
       # NOTE: mega-ui image may not include curl/wget/busybox. Use bash built-in /dev/tcp.
       # With HOSTNAME=0.0.0.0, Next.js will listen on all interfaces, so 127.0.0.1 should work
@@ -257,7 +257,7 @@ services:
       MEGA_ORION_SERVER__LOGGER_STORAGE_MODE: ${ORION_LOGGER_STORAGE_MODE:-local}
       MEGA_ORION_SERVER__STORAGE_TYPE: ${ORION_STORAGE_TYPE:-local}
       MEGA_ORION_SERVER__MONOBASE_URL: ${ORION_MONOBASE_URL:-http://mega:8000}
-      MEGA_OAUTH__ALLOWED_CORS_ORIGINS: ${ORION_ALLOWED_CORS_ORIGINS:-http://localhost:3000,http://127.0.0.1:3000,http://localhost:8000}
+      MEGA_OAUTH__ALLOWED_CORS_ORIGINS: ${ORION_ALLOWED_CORS_ORIGINS:-http://app.gitmono.local}
     volumes:
       - orion-logs:/tmp/buck2ctl
     ports:
@@ -327,7 +327,7 @@ services:
       RAILS_ENV: ${CAMPSITE_RAILS_ENV:-demo}
       RAILS_MASTER_KEY: ${CAMPSITE_RAILS_MASTER_KEY:-51d8cdb046869075795ba82cdd95807a}
       SERVER_COMMAND: ${CAMPSITE_SERVER_COMMAND:-bundle exec puma}
-      DEV_APP_URL: ${CAMPSITE_DEV_APP_URL:-http://localhost:3000}
+      DEV_APP_URL: ${CAMPSITE_DEV_APP_URL:-http://app.gitmono.local}
     networks:
       default:
         aliases:

moon/apps/web/.env.demo

@@ -1,6 +1,6 @@
 NEXT_PUBLIC_API_URL=http://api.gitmono.local:8080
 NEXT_PUBLIC_MONO_API_URL=http://git.gitmono.local:8000
-NEXT_PUBLIC_WEB_URL=http://app.gitmono.local:3000
+NEXT_PUBLIC_WEB_URL=http://app.gitmono.local
 NEXT_PUBLIC_SYNC_URL=ws://sync.gitmono.local
 NEXT_PUBLIC_AUTH_URL=http://auth.gitmono.local:8080
 NEXT_PUBLIC_CRATES_PRO_URL=http://cratespro.gitmega.nju:8080

scorpio/Cargo.toml

@@ -12,46 +12,46 @@ path = "src/lib.rs"
 [dependencies]
 api-model = { path = "../api-model" }
 git-internal = { workspace = true }
-reqwest = { version = "0.12.7", features = ["json", "blocking"] }
-serde = { version = "1.0.210", features = ["derive"] }
-tokio = { version = "1.40.0", features = ["full"] }
-axum = { version = "0.8.4", features = ["macros"] }
+reqwest = { workspace = true, features = ["json", "blocking"] }
+serde = { workspace = true, features = ["derive"] }
+tokio = { workspace = true, features = ["full"] }
+axum = { workspace = true, features = ["macros"] }
 # rfuse3 version 0.0.5 provides bugfixes and API improvements,
 # including better async mount handling and error reporting.
 # This is required for Antares to improve FUSE readiness/polling and avoid
 # mount/unmount race issues observed with 0.0.4.
 # NOTE: Verify version exists at https://github.com/cberner/rfuse3/releases
 # If 0.0.5 doesn't exist, use the latest available version and update this comment.
 rfuse3 = { version = "0.0.5", features = ["tokio-runtime", "unprivileged"] }
-clap = { version = "4.0", features = ["derive"] }
+clap = { workspace = true, features = ["derive"] }
 
-toml = "0.9.0"
-libc = "0.2.158"
-log = "0.4.22"
-radix_trie = "0.2.1"
-tracing = "0.1.40"
-serde_json = "1.0.128"
-once_cell = "1.19.0"
-env_logger = "0.11.5"
+toml = { workspace = true }
+libc = "0.2.180"
+log = { workspace = true }
+radix_trie = "0.3.0"
+tracing = { workspace = true }
+serde_json = { workspace = true }
+once_cell = { workspace = true }
+env_logger = { workspace = true }
 sled = "0.34.7"
-bincode = "2.0.1"
-async-recursion = "1.1.1"
-bytes = "1.7.2"
-futures = "0.3.31"
-uuid = { version = "1.14.0", features = ["v4"] }
+bincode = { workspace = true }
+async-recursion = { workspace = true }
+bytes = { workspace = true }
+futures = { workspace = true }
+uuid = { workspace = true, features = ["v4"] }
 # libfuse-fs upgraded from 0.1.6 to 0.1.9 to address breaking API changes:
 # - Fixed FUSE mount/unmount race conditions and improved error propagation.
 # - Changed trait bounds for async operations, required for Scorpio's async FUSE integration.
 # - Updated method signatures for file/directory operations to match rfuse3 and kernel expectations.
 # - 0.1.6 had issues with incomplete async support and incorrect error handling, causing panics in Scorpio.
 # NOTE: Verify release notes at the libfuse-fs repository before upgrading versions.
-libfuse-fs = "0.1.9"
+libfuse-fs = "0.1.10"
 whoami = "1.6.0"
-thiserror = "2.0.12"
+thiserror = { workspace = true }
 crossbeam = "0.8.4"
-dashmap = "6.1.0"
-ring = "0.17.8"
-hex = "0.4.3"
+dashmap = { workspace = true }
+ring = "0.17.14"
+hex = { workspace = true }
 
 async-trait.workspace = true
 tracing-subscriber.workspace = true
@@ -70,7 +70,7 @@ testcontainers = { workspace = true, features = [
     "http_wait",
     "reusable-containers",
 ] }
-reqwest = { version = "0.12.12", features = ["blocking"] }
+reqwest = { workspace = true, features = ["blocking"] }
 http = { workspace = true }
 tower = "0.5"